diff options
author | Yinghai Lu <yinghai@kernel.org> | 2010-02-10 04:20:24 -0500 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2010-02-12 12:42:38 -0500 |
commit | a678c2be75773e112f6d656a22a7f1645c4dbd6c (patch) | |
tree | 5c2220110d7733d935eb2e5fa3d84e3b43d0ac20 /arch/x86/include/asm | |
parent | db8f77c889542b09457b8b97efb311343c99a75d (diff) |
x86: Separate early_res related code from e820.c
... to make e820.c smaller.
-v2: fix 32bit compiling with MAX_DMA32_PFN
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
LKML-Reference: <1265793639-15071-21-git-send-email-yinghai@kernel.org>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/include/asm')
-rw-r--r-- | arch/x86/include/asm/e820.h | 13 | ||||
-rw-r--r-- | arch/x86/include/asm/early_res.h | 20 |
2 files changed, 21 insertions, 12 deletions
diff --git a/arch/x86/include/asm/e820.h b/arch/x86/include/asm/e820.h index 7d72e5fb7008..efad699a2c22 100644 --- a/arch/x86/include/asm/e820.h +++ b/arch/x86/include/asm/e820.h | |||
@@ -109,19 +109,8 @@ static inline void early_memtest(unsigned long start, unsigned long end) | |||
109 | 109 | ||
110 | extern unsigned long end_user_pfn; | 110 | extern unsigned long end_user_pfn; |
111 | 111 | ||
112 | extern u64 find_e820_area(u64 start, u64 end, u64 size, u64 align); | ||
113 | extern u64 find_e820_area_size(u64 start, u64 *sizep, u64 align); | ||
114 | extern void reserve_early(u64 start, u64 end, char *name); | ||
115 | extern void reserve_early_overlap_ok(u64 start, u64 end, char *name); | ||
116 | extern void free_early(u64 start, u64 end); | ||
117 | extern void early_res_to_bootmem(u64 start, u64 end); | ||
118 | extern u64 early_reserve_e820(u64 startt, u64 sizet, u64 align); | 112 | extern u64 early_reserve_e820(u64 startt, u64 sizet, u64 align); |
119 | 113 | #include <asm/early_res.h> | |
120 | void reserve_early_without_check(u64 start, u64 end, char *name); | ||
121 | u64 find_early_area(u64 ei_start, u64 ei_last, u64 start, u64 end, | ||
122 | u64 size, u64 align); | ||
123 | #include <linux/range.h> | ||
124 | int get_free_all_memory_range(struct range **rangep, int nodeid); | ||
125 | 114 | ||
126 | extern unsigned long e820_end_of_ram_pfn(void); | 115 | extern unsigned long e820_end_of_ram_pfn(void); |
127 | extern unsigned long e820_end_of_low_ram_pfn(void); | 116 | extern unsigned long e820_end_of_low_ram_pfn(void); |
diff --git a/arch/x86/include/asm/early_res.h b/arch/x86/include/asm/early_res.h new file mode 100644 index 000000000000..2d43b166782d --- /dev/null +++ b/arch/x86/include/asm/early_res.h | |||
@@ -0,0 +1,20 @@ | |||
1 | #ifndef _ASM_X86_EARLY_RES_H | ||
2 | #define _ASM_X86_EARLY_RES_H | ||
3 | #ifdef __KERNEL__ | ||
4 | |||
5 | extern u64 find_e820_area(u64 start, u64 end, u64 size, u64 align); | ||
6 | extern u64 find_e820_area_size(u64 start, u64 *sizep, u64 align); | ||
7 | extern void reserve_early(u64 start, u64 end, char *name); | ||
8 | extern void reserve_early_overlap_ok(u64 start, u64 end, char *name); | ||
9 | extern void free_early(u64 start, u64 end); | ||
10 | extern void early_res_to_bootmem(u64 start, u64 end); | ||
11 | |||
12 | void reserve_early_without_check(u64 start, u64 end, char *name); | ||
13 | u64 find_early_area(u64 ei_start, u64 ei_last, u64 start, u64 end, | ||
14 | u64 size, u64 align); | ||
15 | #include <linux/range.h> | ||
16 | int get_free_all_memory_range(struct range **rangep, int nodeid); | ||
17 | |||
18 | #endif /* __KERNEL__ */ | ||
19 | |||
20 | #endif /* _ASM_X86_EARLY_RES_H */ | ||