diff options
| author | Andi Kleen <andi@firstfloor.org> | 2008-03-12 03:53:28 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 17:41:30 +0200 |
| commit | cc6150321903ca4c3bc9d53b0cdafb05d77d64d0 (patch) | |
| tree | cfdb0ee512da7da82c15d4b1aae66d1f25640f31 /include/asm-x86 | |
| parent | 67794292c8615b05f46419ba8d4fd99e7c9a5db9 (diff) | |
x86: account overlapped mappings in max_pfn_mapped
When end_pfn is not aligned to 2MB (or 1GB) then the kernel might
map more memory than end_pfn. Account this in max_pfn_mapped.
Signed-off-by: Andi Kleen <ak@suse.de>
Cc: andreas.herrmann3@amd.com
Cc: mingo@elte.hu
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86')
| -rw-r--r-- | include/asm-x86/page_64.h | 3 | ||||
| -rw-r--r-- | include/asm-x86/proto.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/asm-x86/page_64.h b/include/asm-x86/page_64.h index 54d5db634858..6ea72859c491 100644 --- a/include/asm-x86/page_64.h +++ b/include/asm-x86/page_64.h @@ -80,6 +80,9 @@ typedef struct { pteval_t pte; } pte_t; #define vmemmap ((struct page *)VMEMMAP_START) +extern unsigned long init_memory_mapping(unsigned long start, + unsigned long end); + #endif /* !__ASSEMBLY__ */ #ifdef CONFIG_FLATMEM diff --git a/include/asm-x86/proto.h b/include/asm-x86/proto.h index 9da46af3b0e9..1e17bcce450e 100644 --- a/include/asm-x86/proto.h +++ b/include/asm-x86/proto.h @@ -7,8 +7,6 @@ extern void early_idt_handler(void); -extern void init_memory_mapping(unsigned long start, unsigned long end); - extern void system_call(void); extern void syscall_init(void); |