diff options
Diffstat (limited to 'include/asm-x86/e820.h')
-rw-r--r-- | include/asm-x86/e820.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/asm-x86/e820.h b/include/asm-x86/e820.h index 4b26604b3c19..06633b01dd5b 100644 --- a/include/asm-x86/e820.h +++ b/include/asm-x86/e820.h | |||
@@ -59,7 +59,10 @@ struct e820map { | |||
59 | struct e820entry map[E820_X_MAX]; | 59 | struct e820entry map[E820_X_MAX]; |
60 | }; | 60 | }; |
61 | 61 | ||
62 | #ifdef __KERNEL__ | ||
63 | /* see comment in arch/x86/kernel/e820.c */ | ||
62 | extern struct e820map e820; | 64 | extern struct e820map e820; |
65 | extern struct e820map e820_saved; | ||
63 | 66 | ||
64 | extern int e820_any_mapped(u64 start, u64 end, unsigned type); | 67 | extern int e820_any_mapped(u64 start, u64 end, unsigned type); |
65 | extern int e820_all_mapped(u64 start, u64 end, unsigned type); | 68 | extern int e820_all_mapped(u64 start, u64 end, unsigned type); |
@@ -97,7 +100,8 @@ extern void free_early(u64 start, u64 end); | |||
97 | extern void early_res_to_bootmem(u64 start, u64 end); | 100 | extern void early_res_to_bootmem(u64 start, u64 end); |
98 | extern u64 early_reserve_e820(u64 startt, u64 sizet, u64 align); | 101 | extern u64 early_reserve_e820(u64 startt, u64 sizet, u64 align); |
99 | 102 | ||
100 | extern unsigned long e820_end_of_ram(void); | 103 | extern unsigned long e820_end_of_ram_pfn(void); |
104 | extern unsigned long e820_end_of_low_ram_pfn(void); | ||
101 | extern int e820_find_active_region(const struct e820entry *ei, | 105 | extern int e820_find_active_region(const struct e820entry *ei, |
102 | unsigned long start_pfn, | 106 | unsigned long start_pfn, |
103 | unsigned long last_pfn, | 107 | unsigned long last_pfn, |
@@ -112,7 +116,7 @@ extern void setup_memory_map(void); | |||
112 | extern char *default_machine_specific_memory_setup(void); | 116 | extern char *default_machine_specific_memory_setup(void); |
113 | extern char *machine_specific_memory_setup(void); | 117 | extern char *machine_specific_memory_setup(void); |
114 | extern char *memory_setup(void); | 118 | extern char *memory_setup(void); |
115 | 119 | #endif /* __KERNEL__ */ | |
116 | #endif /* __ASSEMBLY__ */ | 120 | #endif /* __ASSEMBLY__ */ |
117 | 121 | ||
118 | #define ISA_START_ADDRESS 0xa0000 | 122 | #define ISA_START_ADDRESS 0xa0000 |