build: convert HAS_ACPI use to Kconfig

Use the Kconfig generated CONFIG_HAS_ACPI defines in the code base.

Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
Acked-by: Jan Beulich <jbeulich@suse.com>

diff --git a/xen/Rules.mk b/xen/Rules.mk
index b12ad7385b5c5c5dce9402b54811fb4c1c97b139..09783e760eac81e0fc51313ebca5c1ab82577c6a 100644 (file)
--- a/xen/Rules.mk
+++ b/xen/Rules.mk
@@ -56,7 +56,6 @@ CFLAGS-$(crash_debug)   += -DCRASH_DEBUG
 CFLAGS-$(perfc)         += -DPERF_COUNTERS
 CFLAGS-$(perfc_arrays)  += -DPERF_ARRAYS
 CFLAGS-$(lock_profile)  += -DLOCK_PROFILE
-CFLAGS-$(HAS_ACPI)      += -DHAS_ACPI
 CFLAGS-$(HAS_GDBSX)     += -DHAS_GDBSX
 CFLAGS-$(HAS_MEM_ACCESS)  += -DHAS_MEM_ACCESS
 CFLAGS-$(HAS_MEM_PAGING)  += -DHAS_MEM_PAGING

diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig
index c13ef2931d5d41d38bb2584879abd0748a8dcef1..5e6c6c901aa1cb865a516b01ffac6528ac7f96e9 100644 (file)
--- a/xen/arch/x86/Kconfig
+++ b/xen/arch/x86/Kconfig
@@ -3,6 +3,7 @@ config X86_64
 
 config X86
        def_bool y
+       select HAS_ACPI
        select HAS_IOPORTS
        select HAS_NS16550
        select HAS_PASSTHROUGH

diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk
index 05973870e5d539f8b83ba79425ba3b850096dbfa..66d50f4930894f5a483efdcbb444c75ba9da15ce 100644 (file)
--- a/xen/arch/x86/Rules.mk
+++ b/xen/arch/x86/Rules.mk
@@ -1,7 +1,6 @@
 ########################################
 # x86-specific definitions
 
-HAS_ACPI := y
 HAS_NUMA := y
 HAS_VGA  := y
 HAS_VIDEO  := y

diff --git a/xen/common/sysctl.c b/xen/common/sysctl.c
index 47d115eb721a450444f08acd162370707d484666..a3007b86f0532edcb05b98dd0a4d8d77e3a9d456 100644 (file)
--- 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;
 
-#ifdef HAS_ACPI
+#ifdef CONFIG_HAS_ACPI
     case XEN_SYSCTL_get_pmstat:
         ret = do_get_pm_info(&op->u.get_pmstat);
         break;

diff --git a/xen/drivers/Kconfig b/xen/drivers/Kconfig
index fe6fcca2ef3f13f6395f1d3d5aaefc9b327f2dbd..eb01d472d5d937afdf69566cfbb836c735d66c5f 100644 (file)
--- a/xen/drivers/Kconfig
+++ b/xen/drivers/Kconfig
@@ -1,5 +1,7 @@
 menu "Device Drivers"
 
+source "drivers/acpi/Kconfig"
+
 source "drivers/char/Kconfig"
 
 source "drivers/passthrough/Kconfig"

diff --git a/xen/drivers/Makefile b/xen/drivers/Makefile
index eb32d69835a12c437bfceb2848c598ed96235f85..9f6c18bcc3d1d4f47af8fbb26f2da261b2d6854a 100644 (file)
--- a/xen/drivers/Makefile
+++ b/xen/drivers/Makefile
@@ -2,5 +2,5 @@ subdir-y += char
 subdir-$(HAS_CPUFREQ) += cpufreq
 subdir-$(CONFIG_HAS_PCI) += pci
 subdir-$(CONFIG_HAS_PASSTHROUGH) += passthrough
-subdir-$(HAS_ACPI) += acpi
+subdir-$(CONFIG_HAS_ACPI) += acpi
 subdir-$(HAS_VIDEO) += video

diff --git a/xen/drivers/acpi/Kconfig b/xen/drivers/acpi/Kconfig
new file mode 100644 (file)
index 0000000..11ab5e4
--- /dev/null
+++ b/xen/drivers/acpi/Kconfig
@@ -0,0 +1,4 @@
+
+# Select HAS_ACPI if ACPI is supported
+config HAS_ACPI
+       bool