[Xen-changelog] [xen master] build: consolidate CONFIG_HAS_ACPI and CONFIG_ACPI

[patchbot@xxxxxxx]

commit fb1e853c53580c4d9be3519e552141805b75b19c
Author:     Doug Goldstein <cardoe@xxxxxxxxxx>
AuthorDate: Fri Feb 26 12:31:47 2016 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Fri Feb 26 12:31:47 2016 +0100

    build: consolidate CONFIG_HAS_ACPI and CONFIG_ACPI
    
    No real advantage to keeping these separate. The use case of this from
    Linux is when the platform or target board has support for something but
    the user wants to be given the option to disable it.
    
    Signed-off-by: Doug Goldstein <cardoe@xxxxxxxxxx>
    Reviewed-by: Jan Beulich <jbeulich@xxxxxxxx>
---
 xen/arch/x86/Kconfig         | 2 +-
 xen/common/sysctl.c          | 2 +-
 xen/drivers/Makefile         | 2 +-
 xen/drivers/acpi/Kconfig     | 4 ++--
 xen/include/asm-x86/config.h | 1 -
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig
index 3a90f47..63f4b19 100644
--- a/xen/arch/x86/Kconfig
+++ b/xen/arch/x86/Kconfig
@@ -3,9 +3,9 @@ config X86_64
 
 config X86
        def_bool y
+       select ACPI
        select ACPI_LEGACY_TABLES_LOOKUP
        select COMPAT
-       select HAS_ACPI
        select HAS_CPUFREQ
        select HAS_EHCI
        select HAS_GDBSX
diff --git a/xen/common/sysctl.c b/xen/common/sysctl.c
index 1624024..58162f5 100644
--- a/xen/common/sysctl.c
+++ b/xen/common/sysctl.c
@@ -171,7 +171,7 @@ long do_sysctl(XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) 
u_sysctl)
         op->u.availheap.avail_bytes <<= PAGE_SHIFT;
         break;
 
-#if defined (CONFIG_HAS_ACPI) && defined (CONFIG_HAS_CPUFREQ)
+#if defined (CONFIG_ACPI) && defined (CONFIG_HAS_CPUFREQ)
     case XEN_SYSCTL_get_pmstat:
         ret = do_get_pm_info(&op->u.get_pmstat);
         break;
diff --git a/xen/drivers/Makefile b/xen/drivers/Makefile
index 7bbb654..6270e83 100644
--- a/xen/drivers/Makefile
+++ b/xen/drivers/Makefile
@@ -2,5 +2,5 @@ subdir-y += char
 subdir-$(CONFIG_HAS_CPUFREQ) += cpufreq
 subdir-$(CONFIG_HAS_PCI) += pci
 subdir-$(CONFIG_HAS_PASSTHROUGH) += passthrough
-subdir-$(CONFIG_HAS_ACPI) += acpi
+subdir-$(CONFIG_ACPI) += acpi
 subdir-$(CONFIG_HAS_VIDEO) += video
diff --git a/xen/drivers/acpi/Kconfig b/xen/drivers/acpi/Kconfig
index 82d73ca..1edcca7 100644
--- a/xen/drivers/acpi/Kconfig
+++ b/xen/drivers/acpi/Kconfig
@@ -1,6 +1,6 @@
 
-# Select HAS_ACPI if ACPI is supported
-config HAS_ACPI
+# Select ACPI if ACPI is supported
+config ACPI
        bool
 
 config ACPI_LEGACY_TABLES_LOOKUP
diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h
index c9f08c2..e907741 100644
--- a/xen/include/asm-x86/config.h
+++ b/xen/include/asm-x86/config.h
@@ -37,7 +37,6 @@
 /* Intel P4 currently has largest cache line (L2 line size is 128 bytes). */
 #define CONFIG_X86_L1_CACHE_SHIFT 7
 
-#define CONFIG_ACPI 1
 #define CONFIG_ACPI_BOOT 1
 #define CONFIG_ACPI_SLEEP 1
 #define CONFIG_ACPI_NUMA 1
--
generated by git-patchbot for /home/xen/git/xen.git#master

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