1 files changed, 5 insertions, 6 deletions

diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index 928bf837040a..70b2a3a305d6 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -416,8 +416,8 @@ void __init efi_reserve_boot_services(void)
                  * - Not within any part of the kernel
                  * - Not the bios reserved area
                 */
-                if ((start+size >= virt_to_phys(_text)
-                                && start <= virt_to_phys(_end)) ||
+                if ((start+size >= __pa_symbol(_text)
+                                && start <= __pa_symbol(_end)) ||
                         !e820_all_mapped(start, start+size, E820_RAM) ||
                         memblock_is_region_reserved(start, size)) {
                         /* Could not reserve, skip it */
@@ -843,7 +843,7 @@ void __init efi_enter_virtual_mode(void)
         efi_memory_desc_t *md, *prev_md = NULL;
         efi_status_t status;
         unsigned long size;
-        u64 end, systab, end_pfn;
+        u64 end, systab, start_pfn, end_pfn;
         void *p, *va, *new_memmap = NULL;
         int count = 0;
 
@@ -896,10 +896,9 @@ void __init efi_enter_virtual_mode(void)
                 size = md->num_pages << EFI_PAGE_SHIFT;
                 end = md->phys_addr + size;
 
+                start_pfn = PFN_DOWN(md->phys_addr);
                 end_pfn = PFN_UP(end);
-                if (end_pfn <= max_low_pfn_mapped
-                    || (end_pfn > (1UL << (32 - PAGE_SHIFT))
-                        && end_pfn <= max_pfn_mapped)) {
+                if (pfn_range_is_mapped(start_pfn, end_pfn)) {
                         va = __va(md->phys_addr);
 
                         if (!(md->attribute & EFI_MEMORY_WB))