[Xen-devel] xen: acpi: Drop CONFIG_ACPI_BOOT and use CONFIG_ACPI instead

Message ID 1458306449-50671-1-git-send-email-shannon.zhao@linaro.org
State New
Headers show

Commit Message

Shannon Zhao March 18, 2016, 1:07 p.m.
While there is no difference between CONFIG_ACPI and CONFIG_ACPI_BOOT in
current acpi codes, so it's unnecessary to keep CONFIG_ACPI_BOOT and we
use CONFIG_ACPI instead as Jan suggested.

Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
---
 xen/arch/x86/dmi_scan.c       | 6 +++---
 xen/arch/x86/io_apic.c        | 4 ++--
 xen/include/asm-x86/config.h  | 1 -
 xen/include/asm-x86/io_apic.h | 4 ++--
 xen/include/xen/acpi.h        | 6 +++---
 5 files changed, 10 insertions(+), 11 deletions(-)

Patch

diff --git a/xen/arch/x86/dmi_scan.c b/xen/arch/x86/dmi_scan.c
index 8e07f8d..1e937ec 100644
--- a/xen/arch/x86/dmi_scan.c
+++ b/xen/arch/x86/dmi_scan.c
@@ -499,7 +499,7 @@  static __init int reset_videomode_after_s3(struct dmi_blacklist *d)
 #endif
 
 
-#ifdef	CONFIG_ACPI_BOOT
+#ifdef	CONFIG_ACPI
 static __init __attribute__((unused)) int dmi_disable_acpi(struct dmi_blacklist *d) 
 { 
 	if (!acpi_force) { 
@@ -564,7 +564,7 @@  static __initdata struct dmi_blacklist dmi_blacklist[]={
 		}
 	},
 
-#ifdef	CONFIG_ACPI_BOOT
+#ifdef	CONFIG_ACPI
 	/*
 	 * If your system is blacklisted here, but you find that acpi=force
 	 * works for you, please contact acpi-devel@sourceforge.net
@@ -643,7 +643,7 @@  static __initdata struct dmi_blacklist dmi_blacklist[]={
 			MATCH(DMI_PRODUCT_NAME, "eserver xSeries 440"),
 			NO_MATCH, NO_MATCH }},
 
-#endif	// CONFIG_ACPI_BOOT
+#endif	// CONFIG_ACPI
 
 	{ NULL, }
 };
diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c
index 7b9cf16..869a446 100644
--- a/xen/arch/x86/io_apic.c
+++ b/xen/arch/x86/io_apic.c
@@ -2096,7 +2096,7 @@  void ioapic_resume(void)
                           ACPI-based IOAPIC Configuration
    -------------------------------------------------------------------------- */
 
-#ifdef CONFIG_ACPI_BOOT
+#ifdef CONFIG_ACPI
 
 int __init io_apic_get_unique_id (int ioapic, int apic_id)
 {
@@ -2265,7 +2265,7 @@  int io_apic_set_pci_routing (int ioapic, int pin, int irq, int edge_level, int a
     return 0;
 }
 
-#endif /*CONFIG_ACPI_BOOT*/
+#endif /*CONFIG_ACPI*/
 
 static int ioapic_physbase_to_id(unsigned long physbase)
 {
diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h
index 4527ce3..f6f5a10 100644
--- a/xen/include/asm-x86/config.h
+++ b/xen/include/asm-x86/config.h
@@ -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_BOOT 1
 #define CONFIG_ACPI_SLEEP 1
 #define CONFIG_ACPI_NUMA 1
 #define CONFIG_ACPI_SRAT 1
diff --git a/xen/include/asm-x86/io_apic.h b/xen/include/asm-x86/io_apic.h
index b318a36..8e27761 100644
--- a/xen/include/asm-x86/io_apic.h
+++ b/xen/include/asm-x86/io_apic.h
@@ -173,12 +173,12 @@  extern bool_t skip_ioapic_setup;
 extern bool_t ioapic_ack_new;
 extern bool_t ioapic_ack_forced;
 
-#ifdef CONFIG_ACPI_BOOT
+#ifdef CONFIG_ACPI
 extern int io_apic_get_unique_id (int ioapic, int apic_id);
 extern int io_apic_get_version (int ioapic);
 extern int io_apic_get_redir_entries (int ioapic);
 extern int io_apic_set_pci_routing (int ioapic, int pin, int irq, int edge_level, int active_high_low);
-#endif /*CONFIG_ACPI_BOOT*/
+#endif /*CONFIG_ACPI*/
 
 extern void init_ioapic_mappings(void);
 
diff --git a/xen/include/xen/acpi.h b/xen/include/xen/acpi.h
index 7a5abbe..30ec0ee 100644
--- a/xen/include/xen/acpi.h
+++ b/xen/include/xen/acpi.h
@@ -49,7 +49,7 @@ 
                 (!(entry)) || (unsigned long)(entry) + sizeof(*(entry)) > (end) ||  \
                 (entry)->header.length < sizeof(*(entry)))
 
-#ifdef CONFIG_ACPI_BOOT
+#ifdef CONFIG_ACPI
 
 enum acpi_interrupt_id {
 	ACPI_INTERRUPT_PMI	= 1,
@@ -107,7 +107,7 @@  extern int acpi_mp_config;
 
 extern u32 pci_mmcfg_base_addr;
 
-#else	/*!CONFIG_ACPI_BOOT*/
+#else	/*!CONFIG_ACPI*/
 
 #define acpi_mp_config	0
 
@@ -121,7 +121,7 @@  static inline int acpi_boot_table_init(void)
 	return 0;
 }
 
-#endif 	/*!CONFIG_ACPI_BOOT*/
+#endif 	/*!CONFIG_ACPI*/
 
 int get_cpu_id(u32 acpi_id);