@@ -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
@@ -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;
@@ -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_VIDEO) += video
@@ -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
@@ -36,7 +36,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
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@cardoe.com> --- CC: Keir Fraser <keir@xen.org> CC: Jan Beulich <jbeulich@suse.com> CC: Andrew Cooper <andrew.cooper3@citrix.com> --- 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(-)