acpi: drop CONFIG_ACPI_BOOT and use CONFIG_ACPI instead

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>
Drop CONFIG_ACPI conditionals completely from x86 code.

Signed-off-by: Jan Beulich <jbeulich@suse.com>

diff --git a/xen/arch/x86/dmi_scan.c b/xen/arch/x86/dmi_scan.c
index 8e07f8d5469f2bab0fe7beebe8c9006a1ea9a334..b049e3193b514641a14e2d69267226f97d2b6659 100644 (file)
--- a/xen/arch/x86/dmi_scan.c
+++ b/xen/arch/x86/dmi_scan.c
@@ -498,9 +498,7 @@ static __init int reset_videomode_after_s3(struct dmi_blacklist *d)
 }
 #endif
 
-
-#ifdef CONFIG_ACPI_BOOT
-static __init __attribute__((unused)) int dmi_disable_acpi(struct dmi_blacklist *d) 
+static __init int dmi_disable_acpi(struct dmi_blacklist *d) 
 { 
        if (!acpi_force) { 
                printk(KERN_NOTICE "%s detected: acpi off\n",d->ident);
@@ -515,7 +513,7 @@ static __init __attribute__((unused)) int dmi_disable_acpi(struct dmi_blacklist
 /*
  * Limit ACPI to CPU enumeration for HT
  */
-static __init __attribute__((unused)) int force_acpi_ht(struct dmi_blacklist *d) 
+static __init int force_acpi_ht(struct dmi_blacklist *d) 
 { 
        if (!acpi_force) { 
                printk(KERN_NOTICE "%s detected: force use of acpi=ht\n", d->ident);
@@ -527,7 +525,6 @@ static __init __attribute__((unused)) int force_acpi_ht(struct dmi_blacklist *d)
        }
        return 0;
 } 
-#endif
 
 /*
  *     Process the DMI blacklists
@@ -564,7 +561,6 @@ static __initdata struct dmi_blacklist dmi_blacklist[]={
                }
        },
 
-#ifdef CONFIG_ACPI_BOOT
        /*
         * If your system is blacklisted here, but you find that acpi=force
         * works for you, please contact acpi-devel@sourceforge.net
@@ -643,8 +639,6 @@ static __initdata struct dmi_blacklist dmi_blacklist[]={
                        MATCH(DMI_PRODUCT_NAME, "eserver xSeries 440"),
                        NO_MATCH, NO_MATCH }},
 
-#endif // CONFIG_ACPI_BOOT
-
        { NULL, }
 };
 

diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c
index 7b9cf16546171d6f224652448a2360428331fab5..8b2f03a3cefc1c37f0c076fa055fb4763525541e 100644 (file)
--- a/xen/arch/x86/io_apic.c
+++ b/xen/arch/x86/io_apic.c
@@ -2096,7 +2096,6 @@ void ioapic_resume(void)
                           ACPI-based IOAPIC Configuration
    -------------------------------------------------------------------------- */
 
-#ifdef CONFIG_ACPI_BOOT
 
 int __init io_apic_get_unique_id (int ioapic, int apic_id)
 {
@@ -2265,8 +2264,6 @@ int io_apic_set_pci_routing (int ioapic, int pin, int irq, int edge_level, int a
     return 0;
 }
 
-#endif /*CONFIG_ACPI_BOOT*/
-
 static int ioapic_physbase_to_id(unsigned long physbase)
 {
     int apic;

diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h
index 4527ce371de0f507fba8de6d67d290066124fe65..f6f5a109a5fd1cc154147fe9086b5adb141b6598 100644 (file)
--- 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 b318a3624aa32ea374002366f50f916917a6eff0..baa30323fcf80470dc7e9ff09a830420a260ec7c 100644 (file)
--- a/xen/include/asm-x86/io_apic.h
+++ b/xen/include/asm-x86/io_apic.h
@@ -173,12 +173,10 @@ extern bool_t skip_ioapic_setup;
 extern bool_t ioapic_ack_new;
 extern bool_t ioapic_ack_forced;
 
-#ifdef CONFIG_ACPI_BOOT
 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*/
 
 extern void init_ioapic_mappings(void);
 

diff --git a/xen/include/xen/acpi.h b/xen/include/xen/acpi.h
index 7a5abbe7123474d416bb68d32d06be8924f86f84..30ec0eec5f6dff1d32d153f509031b7074f09208 100644 (file)
--- 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);