These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / ia64 / kernel / efi.c

diff --git a/kernel/arch/ia64/kernel/efi.c b/kernel/arch/ia64/kernel/efi.c
index c52d754..caae3f4 100644 (file)
--- a/kernel/arch/ia64/kernel/efi.c
+++ b/kernel/arch/ia64/kernel/efi.c
@@ -464,7 +464,6 @@ efi_map_pal_code (void)
                 GRANULEROUNDDOWN((unsigned long) pal_vaddr),
                 pte_val(pfn_pte(__pa(pal_vaddr) >> PAGE_SHIFT, PAGE_KERNEL)),
                 IA64_GRANULE_SHIFT);
-       paravirt_dv_serialize_data();
        ia64_set_psr(psr);              /* restore psr */
 }
 
@@ -1223,6 +1222,10 @@ efi_initialize_iomem_resources(struct resource *code_resource,
                                flags |= IORESOURCE_DISABLED;
                                break;
 
+                       case EFI_PERSISTENT_MEMORY:
+                               name = "Persistent Memory";
+                               break;
+
                        case EFI_RESERVED_TYPE:
                        case EFI_RUNTIME_SERVICES_CODE:
                        case EFI_RUNTIME_SERVICES_DATA: