aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/asm-x86/cpu.h3
-rw-r--r--include/asm-x86/e820_64.h4
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 @@
10struct x86_cpu { 10struct x86_cpu {
11 struct cpu cpu; 11 struct cpu cpu;
12}; 12};
13extern int arch_register_cpu(int num); 13
14#ifdef CONFIG_HOTPLUG_CPU 14#ifdef CONFIG_HOTPLUG_CPU
15extern int arch_register_cpu(int num);
15extern void arch_unregister_cpu(int); 16extern 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__
17extern unsigned long find_e820_area(unsigned long start, unsigned long end, 17extern unsigned long find_e820_area(unsigned long start, unsigned long end,
18 unsigned size); 18 unsigned size, unsigned long align);
19extern void add_memory_region(unsigned long start, unsigned long size, 19extern void add_memory_region(unsigned long start, unsigned long size,
20 int type); 20 int type);
21extern void setup_memory_region(void); 21extern void setup_memory_region(void);
@@ -41,7 +41,7 @@ extern void finish_e820_parsing(void);
41extern struct e820map e820; 41extern struct e820map e820;
42extern void update_e820(void); 42extern void update_e820(void);
43 43
44extern void reserve_early(unsigned long start, unsigned long end); 44extern void reserve_early(unsigned long start, unsigned long end, char *name);
45extern void early_res_to_bootmem(void); 45extern void early_res_to_bootmem(void);
46 46
47#endif/*!__ASSEMBLY__*/ 47#endif/*!__ASSEMBLY__*/