diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-17 08:16:35 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-17 08:16:35 -0800 |
| commit | 759b650f54ed13e9b3d6c064c763a72ee09c74dd (patch) | |
| tree | 173f08e5432e169c00a40a4d2296d965fe8f9c22 /include/asm-ia64/acpi.h | |
| parent | 69454e6991091d0d6eb7461653f2695d985e1a74 (diff) | |
| parent | 8f8b1138fc9f65e3591aac83a4ee394fef34ac1d (diff) | |
| download | linux-next-759b650f54ed13e9b3d6c064c763a72ee09c74dd.tar.gz | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'include/asm-ia64/acpi.h')
| -rw-r--r-- | include/asm-ia64/acpi.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-ia64/acpi.h b/include/asm-ia64/acpi.h index 3a544ffc5008..f7a517654308 100644 --- a/include/asm-ia64/acpi.h +++ b/include/asm-ia64/acpi.h @@ -106,6 +106,8 @@ extern unsigned int can_cpei_retarget(void); extern unsigned int is_cpu_cpei_target(unsigned int cpu); extern void set_cpei_target_cpu(unsigned int cpu); extern unsigned int get_cpei_target_cpu(void); +extern void prefill_possible_map(void); +extern int additional_cpus; #ifdef CONFIG_ACPI_NUMA /* Proximity bitmap length; _PXM is at most 255 (8 bit)*/ |