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 /arch/x86/kernel/efi.c | |
parent | 3cbd09e482ade50d212511d4693bd754d4d9dd55 (diff) |
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 'arch/x86/kernel/efi.c')
-rw-r--r-- | arch/x86/kernel/efi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/efi.c b/arch/x86/kernel/efi.c index 834ecfb41e97..57b57778bf60 100644 --- a/arch/x86/kernel/efi.c +++ b/arch/x86/kernel/efi.c @@ -396,7 +396,7 @@ static void __init runtime_code_page_mkexec(void) md = p; end = md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT); if (md->type == EFI_RUNTIME_SERVICES_CODE && - (end >> PAGE_SHIFT) <= end_pfn_map) + (end >> PAGE_SHIFT) <= max_pfn_mapped) change_page_attr_addr(md->virt_addr, md->num_pages, PAGE_KERNEL_EXEC_NOCACHE); @@ -429,7 +429,7 @@ void __init efi_enter_virtual_mode(void) continue; end = md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT); if ((md->attribute & EFI_MEMORY_WB) && - ((end >> PAGE_SHIFT) <= end_pfn_map)) + ((end >> PAGE_SHIFT) <= max_pfn_mapped)) md->virt_addr = (unsigned long)__va(md->phys_addr); else md->virt_addr = (unsigned long) |