diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-03-05 01:32:45 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-03-05 01:32:45 -0500 |
| commit | ca764aaf025d2c83054191895b366fa81a9ccf48 (patch) | |
| tree | e8e3bc880f4b269c924ccdf51ba8d6f3ff33b765 /arch/x86/include/asm | |
| parent | d04c579f971bf7d995db1ef7a7161c0143068859 (diff) | |
| parent | 078a198906c796981f93ff100c210506e91aade5 (diff) | |
Merge branch 'x86-mm' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into x86/mm
Diffstat (limited to 'arch/x86/include/asm')
| -rw-r--r-- | arch/x86/include/asm/page_types.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/include/asm/page_types.h b/arch/x86/include/asm/page_types.h index 97e6007e4ed..bce688d54c1 100644 --- a/arch/x86/include/asm/page_types.h +++ b/arch/x86/include/asm/page_types.h | |||
| @@ -54,8 +54,6 @@ static inline phys_addr_t get_max_mapped(void) | |||
| 54 | extern unsigned long init_memory_mapping(unsigned long start, | 54 | extern unsigned long init_memory_mapping(unsigned long start, |
| 55 | unsigned long end); | 55 | unsigned long end); |
| 56 | 56 | ||
| 57 | void init_memory_mapping_high(void); | ||
| 58 | |||
| 59 | extern void initmem_init(void); | 57 | extern void initmem_init(void); |
| 60 | extern void free_initmem(void); | 58 | extern void free_initmem(void); |
| 61 | 59 | ||