diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-06 18:18:26 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-06 20:06:53 +0400 |
| commit | 0962f402af1bb0b53ccee626785d202a10c12fff (patch) | |
| tree | 26fa57193f16e45c6e0557049d02164f129077ed /include/asm-x86/page_64.h | |
| parent | 19268ed7449c561694d048a34601a30e2d1aaf79 (diff) | |
| parent | 8d7ccaa545490cdffdfaff0842436a8dd85cf47b (diff) | |
| download | linux-0962f402af1bb0b53ccee626785d202a10c12fff.tar.xz | |
Merge branch 'x86/prototypes' into x86-v28-for-linus-phase1
Conflicts:
arch/x86/kernel/process_32.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/page_64.h')
| -rw-r--r-- | include/asm-x86/page_64.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-x86/page_64.h b/include/asm-x86/page_64.h index 87aef3c48b5f..5e64acfed0a4 100644 --- a/include/asm-x86/page_64.h +++ b/include/asm-x86/page_64.h @@ -91,6 +91,7 @@ extern unsigned long init_memory_mapping(unsigned long start, unsigned long end); extern void initmem_init(unsigned long start_pfn, unsigned long end_pfn); +extern void free_initmem(void); extern void init_extra_mapping_uc(unsigned long phys, unsigned long size); extern void init_extra_mapping_wb(unsigned long phys, unsigned long size); |