(no commit message)

diff --git a/xen/arch/x86/dmi_scan.c b/xen/arch/x86/dmi_scan.c
index fcdf2d3952e8a8dbc2a33a04811127bd57fc9b2b..d1743180f257ff4ced1ed4352cf781b1cab0cb81 100644 (file)
--- a/xen/arch/x86/dmi_scan.c
+++ b/xen/arch/x86/dmi_scan.c
@@ -370,6 +370,7 @@ static int __init dmi_iterate(void (*decode)(struct dmi_header *))
        return -1;
 }
 
+#ifdef BUILD_PE
 static int __init dmi_efi_iterate(void (*decode)(struct dmi_header *))
 {
        int ret = -1;
@@ -426,6 +427,7 @@ static int __init dmi_efi_iterate(void (*decode)(struct dmi_header *))
 
        return ret;
 }
+#endif
 
 static char *__initdata dmi_ident[DMI_STRING_MAX];
 

diff --git a/xen/arch/x86/mpparse.c b/xen/arch/x86/mpparse.c
index 49140e46f0375053b84ee1c1a25651d47cf9f266..77dde1e418896cad174a2038d15aa9a8d922c639 100644 (file)
--- a/xen/arch/x86/mpparse.c
+++ b/xen/arch/x86/mpparse.c
@@ -695,6 +695,7 @@ static int __init smp_scan_config (unsigned long base, unsigned long length)
        return 0;
 }
 
+#ifdef BUILD_PE
 static void __init efi_check_config(void)
 {
        struct intel_mp_floating *mpf;
@@ -716,6 +717,7 @@ static void __init efi_check_config(void)
        else
                efi_unmap_mpf();
 }
+#endif
 
 void __init find_smp_config (void)
 {

diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S
index f93d5d7e1603154a77fb2318676781934a22e0d3..9fa40a6d4819dd0eb5501c63a1c197a5ada61101 100644 (file)
--- a/xen/arch/x86/xen.lds.S
+++ b/xen/arch/x86/xen.lds.S
@@ -304,10 +304,6 @@ SECTIONS
   } :text
 #endif
 
-#ifndef BUILD_PE
-  efi = .;
-#endif
-
   /* Sections to be discarded */
   /DISCARD/ : {
        *(.exit.text)

diff --git a/xen/drivers/acpi/osl.c b/xen/drivers/acpi/osl.c
index 4c8bb7839edab0234ea1babf6a00ea154c1530c4..387056020347fa96075346f24a4c1fe739e77a12 100644 (file)
--- a/xen/drivers/acpi/osl.c
+++ b/xen/drivers/acpi/osl.c
@@ -69,6 +69,7 @@ acpi_physical_address __init acpi_os_get_root_pointer(void)
        if (rsdp_hint)
                return rsdp_hint;
 
+#ifdef BUILD_PE
        if (efi_enabled(EFI_BOOT)) {
                if (efi.acpi20 != EFI_INVALID_TABLE_ADDR)
                        return efi.acpi20;
@@ -79,7 +80,9 @@ acpi_physical_address __init acpi_os_get_root_pointer(void)
                               "System description tables not found\n");
                        return 0;
                }
-       } else if (IS_ENABLED(CONFIG_ACPI_LEGACY_TABLES_LOOKUP)) {
+       } else
+#endif
+       if (IS_ENABLED(CONFIG_ACPI_LEGACY_TABLES_LOOKUP)) {
                acpi_physical_address pa = 0;
 
                acpi_find_root_pointer(&pa);