aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/efi.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2008-01-30 07:34:05 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-30 07:34:05 -0500
commitf87519e8f4f1de9b39a40e56479a7ad2443169dd (patch)
treea7397b18ae3dadde8ec6c173ffcae3948b971c44 /arch/x86/kernel/efi.c
parent3cbd09e482ade50d212511d4693bd754d4d9dd55 (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.c4
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)
396 md = p; 396 md = p;
397 end = md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT); 397 end = md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT);
398 if (md->type == EFI_RUNTIME_SERVICES_CODE && 398 if (md->type == EFI_RUNTIME_SERVICES_CODE &&
399 (end >> PAGE_SHIFT) <= end_pfn_map) 399 (end >> PAGE_SHIFT) <= max_pfn_mapped)
400 change_page_attr_addr(md->virt_addr, 400 change_page_attr_addr(md->virt_addr,
401 md->num_pages, 401 md->num_pages,
402 PAGE_KERNEL_EXEC_NOCACHE); 402 PAGE_KERNEL_EXEC_NOCACHE);
@@ -429,7 +429,7 @@ void __init efi_enter_virtual_mode(void)
429 continue; 429 continue;
430 end = md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT); 430 end = md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT);
431 if ((md->attribute & EFI_MEMORY_WB) && 431 if ((md->attribute & EFI_MEMORY_WB) &&
432 ((end >> PAGE_SHIFT) <= end_pfn_map)) 432 ((end >> PAGE_SHIFT) <= max_pfn_mapped))
433 md->virt_addr = (unsigned long)__va(md->phys_addr); 433 md->virt_addr = (unsigned long)__va(md->phys_addr);
434 else 434 else
435 md->virt_addr = (unsigned long) 435 md->virt_addr = (unsigned long)