diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2008-01-30 13:34:05 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:34:05 +0100 |
| commit | f87519e8f4f1de9b39a40e56479a7ad2443169dd (patch) | |
| tree | a7397b18ae3dadde8ec6c173ffcae3948b971c44 /include | |
| parent | 3cbd09e482ade50d212511d4693bd754d4d9dd55 (diff) | |
| download | op-kernel-dev-f87519e8f4f1de9b39a40e56479a7ad2443169dd.zip op-kernel-dev-f87519e8f4f1de9b39a40e56479a7ad2443169dd.tar.gz | |
x86: introduce max_pfn_mapped
64bit uses end_pfn_map and 32bit uses max_low_pfn. There are several
files which have #ifdef'ed defines which map either to end_pfn_map or
max_low_pfn. Replace this by a universal define and clean up all the
other instances.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-x86/efi.h | 2 | ||||
| -rw-r--r-- | include/asm-x86/page.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-x86/efi.h b/include/asm-x86/efi.h index 9e08ae8..9c68a1f 100644 --- a/include/asm-x86/efi.h +++ b/include/asm-x86/efi.h @@ -35,8 +35,6 @@ extern unsigned long asmlinkage efi_call_phys(void *, ...); #define efi_ioremap(addr, size) ioremap(addr, size) -#define end_pfn_map max_low_pfn - #else /* !CONFIG_X86_32 */ #define MAX_EFI_IO_PAGES 100 diff --git a/include/asm-x86/page.h b/include/asm-x86/page.h index eba88d9..e2c79d8 100644 --- a/include/asm-x86/page.h +++ b/include/asm-x86/page.h @@ -33,8 +33,10 @@ #ifdef CONFIG_X86_64 #include <asm/page_64.h> +#define max_pfn_mapped end_pfn_map #else #include <asm/page_32.h> +#define max_pfn_mapped max_low_pfn #endif /* CONFIG_X86_64 */ #define PAGE_OFFSET ((unsigned long)__PAGE_OFFSET) |
