diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-01 16:27:50 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-01 16:27:50 -0500 |
commit | 3e01dfce1387f8bec41018f0d7b42fd88ad4163f (patch) | |
tree | 88223ad43e3afe6e0ebdec1f636a2d04975fdf9d /include/asm-x86 | |
parent | 45f37e86f1ef95f002386d8a0ab508407cec9bf3 (diff) | |
parent | d987402695f16ae33999d7315b915099d64616d4 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
x86: avoid section mismatch involving arch_register_cpu
x86: fixes for lookup_address args
x86: fix sparse warnings in cpu/common.c
x86: make early_console static in early_printk.c
x86: remove unneeded round_up
x86: fix section mismatch warning in kernel/pci-calgary
x86: fix section mismatch warning in acpi/boot.c
x86: fix section mismatch warnings when referencing notifiers
x86: silence section mismatch warning in smpboot_64.c
x86: fix comments in vmlinux_64.lds
x86_64: make bootmap_start page align v6
x86_64: add debug name for early_res
Diffstat (limited to 'include/asm-x86')
-rw-r--r-- | include/asm-x86/cpu.h | 3 | ||||
-rw-r--r-- | include/asm-x86/e820_64.h | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/asm-x86/cpu.h b/include/asm-x86/cpu.h index 85ece5f10e9e..73f2ea84fd74 100644 --- a/include/asm-x86/cpu.h +++ b/include/asm-x86/cpu.h | |||
@@ -10,8 +10,9 @@ | |||
10 | struct x86_cpu { | 10 | struct x86_cpu { |
11 | struct cpu cpu; | 11 | struct cpu cpu; |
12 | }; | 12 | }; |
13 | extern int arch_register_cpu(int num); | 13 | |
14 | #ifdef CONFIG_HOTPLUG_CPU | 14 | #ifdef CONFIG_HOTPLUG_CPU |
15 | extern int arch_register_cpu(int num); | ||
15 | extern void arch_unregister_cpu(int); | 16 | extern void arch_unregister_cpu(int); |
16 | #endif | 17 | #endif |
17 | 18 | ||
diff --git a/include/asm-x86/e820_64.h b/include/asm-x86/e820_64.h index 51e4170f9ca5..a560c4f5d500 100644 --- a/include/asm-x86/e820_64.h +++ b/include/asm-x86/e820_64.h | |||
@@ -15,7 +15,7 @@ | |||
15 | 15 | ||
16 | #ifndef __ASSEMBLY__ | 16 | #ifndef __ASSEMBLY__ |
17 | extern unsigned long find_e820_area(unsigned long start, unsigned long end, | 17 | extern unsigned long find_e820_area(unsigned long start, unsigned long end, |
18 | unsigned size); | 18 | unsigned size, unsigned long align); |
19 | extern void add_memory_region(unsigned long start, unsigned long size, | 19 | extern void add_memory_region(unsigned long start, unsigned long size, |
20 | int type); | 20 | int type); |
21 | extern void setup_memory_region(void); | 21 | extern void setup_memory_region(void); |
@@ -41,7 +41,7 @@ extern void finish_e820_parsing(void); | |||
41 | extern struct e820map e820; | 41 | extern struct e820map e820; |
42 | extern void update_e820(void); | 42 | extern void update_e820(void); |
43 | 43 | ||
44 | extern void reserve_early(unsigned long start, unsigned long end); | 44 | extern void reserve_early(unsigned long start, unsigned long end, char *name); |
45 | extern void early_res_to_bootmem(void); | 45 | extern void early_res_to_bootmem(void); |
46 | 46 | ||
47 | #endif/*!__ASSEMBLY__*/ | 47 | #endif/*!__ASSEMBLY__*/ |