[Xen-changelog] [xen master] ACPI: add config for BIOS table scan

[patchbot@xxxxxxx]

commit 123d8d1b9b18d6b036d37b3acfdc43434644cc87
Author:     Graeme Gregory <graeme.gregory@xxxxxxxxxx>
AuthorDate: Mon Feb 1 13:56:16 2016 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Mon Feb 1 13:56:16 2016 +0100

    ACPI: add config for BIOS table scan
    
    With the addition of ARM64 that does not have a traditional BIOS to
    scan, add a config option which is selected on x86 (ia64 doesn't need
    it either, it is EFI/UEFI based system) to do the traditional BIOS
    scanning for tables.
    
    Signed-off-by: Graeme Gregory <graeme.gregory@xxxxxxxxxx>
    Signed-off-by: Hanjun Guo <hanjun.guo@xxxxxxxxxx>
    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
    [Linux commit 8a1664be0b922dd6afd60eca96a992ef5ec22c40]
    [Include <xen/kconfig.h> in osl.c so that it could use IS_ENABLED]
    Signed-off-by: Shannon Zhao <shannon.zhao@xxxxxxxxxx>
    Reviewed-by: Doug Goldstein <cardoe@xxxxxxxxxx>
    Acked-by: Jan Beulich <jbeulich@xxxxxxxx>
---
 xen/arch/x86/Kconfig     | 1 +
 xen/drivers/acpi/Kconfig | 3 +++
 xen/drivers/acpi/osl.c   | 5 ++++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig
index 1fd72fa..3a90f47 100644
--- a/xen/arch/x86/Kconfig
+++ b/xen/arch/x86/Kconfig
@@ -3,6 +3,7 @@ config X86_64
 
 config X86
        def_bool y
+       select ACPI_LEGACY_TABLES_LOOKUP
        select COMPAT
        select HAS_ACPI
        select HAS_CPUFREQ
diff --git a/xen/drivers/acpi/Kconfig b/xen/drivers/acpi/Kconfig
index 11ab5e4..82d73ca 100644
--- a/xen/drivers/acpi/Kconfig
+++ b/xen/drivers/acpi/Kconfig
@@ -2,3 +2,6 @@
 # Select HAS_ACPI if ACPI is supported
 config HAS_ACPI
        bool
+
+config ACPI_LEGACY_TABLES_LOOKUP
+       bool
diff --git a/xen/drivers/acpi/osl.c b/xen/drivers/acpi/osl.c
index ce15470..2f1d723 100644
--- a/xen/drivers/acpi/osl.c
+++ b/xen/drivers/acpi/osl.c
@@ -38,6 +38,7 @@
 #include <xen/domain_page.h>
 #include <xen/efi.h>
 #include <xen/vmap.h>
+#include <xen/kconfig.h>
 
 #define _COMPONENT             ACPI_OS_SERVICES
 ACPI_MODULE_NAME("osl")
@@ -75,12 +76,14 @@ acpi_physical_address __init acpi_os_get_root_pointer(void)
                               "System description tables not found\n");
                        return 0;
                }
-       } else {
+       } else if (IS_ENABLED(CONFIG_ACPI_LEGACY_TABLES_LOOKUP)) {
                acpi_physical_address pa = 0;
 
                acpi_find_root_pointer(&pa);
                return pa;
        }
+
+       return 0;
 }
 
 void __iomem *
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog