aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/i386/defconfig1
-rw-r--r--arch/i386/kernel/acpi/boot.c6
-rw-r--r--arch/i386/kernel/mpparse.c4
-rw-r--r--arch/ia64/configs/bigsur_defconfig1
-rw-r--r--arch/ia64/configs/sn2_defconfig1
-rw-r--r--arch/ia64/configs/tiger_defconfig1
-rw-r--r--arch/ia64/configs/zx1_defconfig1
-rw-r--r--arch/ia64/defconfig1
-rw-r--r--arch/x86_64/defconfig1
-rw-r--r--arch/x86_64/kernel/genapic.c4
-rw-r--r--arch/x86_64/kernel/mpparse.c4
11 files changed, 2 insertions, 23 deletions
diff --git a/arch/i386/defconfig b/arch/i386/defconfig
index f137a32634ac..1a387856c870 100644
--- a/arch/i386/defconfig
+++ b/arch/i386/defconfig
@@ -142,7 +142,6 @@ CONFIG_ACPI_THERMAL=y
142# CONFIG_ACPI_ASUS is not set 142# CONFIG_ACPI_ASUS is not set
143# CONFIG_ACPI_TOSHIBA is not set 143# CONFIG_ACPI_TOSHIBA is not set
144# CONFIG_ACPI_DEBUG is not set 144# CONFIG_ACPI_DEBUG is not set
145CONFIG_ACPI_BUS=y
146CONFIG_ACPI_EC=y 145CONFIG_ACPI_EC=y
147CONFIG_ACPI_POWER=y 146CONFIG_ACPI_POWER=y
148CONFIG_ACPI_PCI=y 147CONFIG_ACPI_PCI=y
diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c
index 84befaecedf8..552fc85691ac 100644
--- a/arch/i386/kernel/acpi/boot.c
+++ b/arch/i386/kernel/acpi/boot.c
@@ -408,8 +408,6 @@ acpi_parse_nmi_src(acpi_table_entry_header * header, const unsigned long end)
408 408
409#endif /* CONFIG_X86_IO_APIC */ 409#endif /* CONFIG_X86_IO_APIC */
410 410
411#ifdef CONFIG_ACPI_BUS
412
413/* 411/*
414 * acpi_pic_sci_set_trigger() 412 * acpi_pic_sci_set_trigger()
415 * 413 *
@@ -460,8 +458,6 @@ void __init acpi_pic_sci_set_trigger(unsigned int irq, u16 trigger)
460 outb(new >> 8, 0x4d1); 458 outb(new >> 8, 0x4d1);
461} 459}
462 460
463#endif /* CONFIG_ACPI_BUS */
464
465int acpi_gsi_to_irq(u32 gsi, unsigned int *irq) 461int acpi_gsi_to_irq(u32 gsi, unsigned int *irq)
466{ 462{
467#ifdef CONFIG_X86_IO_APIC 463#ifdef CONFIG_X86_IO_APIC
@@ -637,12 +633,10 @@ static int __init acpi_parse_fadt(unsigned long phys, unsigned long size)
637 /* initialize sci_int early for INT_SRC_OVR MADT parsing */ 633 /* initialize sci_int early for INT_SRC_OVR MADT parsing */
638 acpi_fadt.sci_int = fadt->sci_int; 634 acpi_fadt.sci_int = fadt->sci_int;
639 635
640#ifdef CONFIG_ACPI_BUS
641 /* initialize rev and apic_phys_dest_mode for x86_64 genapic */ 636 /* initialize rev and apic_phys_dest_mode for x86_64 genapic */
642 acpi_fadt.revision = fadt->revision; 637 acpi_fadt.revision = fadt->revision;
643 acpi_fadt.force_apic_physical_destination_mode = 638 acpi_fadt.force_apic_physical_destination_mode =
644 fadt->force_apic_physical_destination_mode; 639 fadt->force_apic_physical_destination_mode;
645#endif
646 640
647#ifdef CONFIG_X86_PM_TIMER 641#ifdef CONFIG_X86_PM_TIMER
648 /* detect the location of the ACPI PM Timer */ 642 /* detect the location of the ACPI PM Timer */
diff --git a/arch/i386/kernel/mpparse.c b/arch/i386/kernel/mpparse.c
index db90d141481d..97dbf289dbd5 100644
--- a/arch/i386/kernel/mpparse.c
+++ b/arch/i386/kernel/mpparse.c
@@ -1069,11 +1069,9 @@ int mp_register_gsi (u32 gsi, int edge_level, int active_high_low)
1069 */ 1069 */
1070 static int gsi_to_irq[MAX_GSI_NUM]; 1070 static int gsi_to_irq[MAX_GSI_NUM];
1071 1071
1072#ifdef CONFIG_ACPI_BUS
1073 /* Don't set up the ACPI SCI because it's already set up */ 1072 /* Don't set up the ACPI SCI because it's already set up */
1074 if (acpi_fadt.sci_int == gsi) 1073 if (acpi_fadt.sci_int == gsi)
1075 return gsi; 1074 return gsi;
1076#endif
1077 1075
1078 ioapic = mp_find_ioapic(gsi); 1076 ioapic = mp_find_ioapic(gsi);
1079 if (ioapic < 0) { 1077 if (ioapic < 0) {
@@ -1116,13 +1114,11 @@ int mp_register_gsi (u32 gsi, int edge_level, int active_high_low)
1116 if (gsi < MAX_GSI_NUM) { 1114 if (gsi < MAX_GSI_NUM) {
1117 if (gsi > 15) 1115 if (gsi > 15)
1118 gsi = pci_irq++; 1116 gsi = pci_irq++;
1119#ifdef CONFIG_ACPI_BUS
1120 /* 1117 /*
1121 * Don't assign IRQ used by ACPI SCI 1118 * Don't assign IRQ used by ACPI SCI
1122 */ 1119 */
1123 if (gsi == acpi_fadt.sci_int) 1120 if (gsi == acpi_fadt.sci_int)
1124 gsi = pci_irq++; 1121 gsi = pci_irq++;
1125#endif
1126 gsi_to_irq[irq] = gsi; 1122 gsi_to_irq[irq] = gsi;
1127 } else { 1123 } else {
1128 printk(KERN_ERR "GSI %u is too high\n", gsi); 1124 printk(KERN_ERR "GSI %u is too high\n", gsi);
diff --git a/arch/ia64/configs/bigsur_defconfig b/arch/ia64/configs/bigsur_defconfig
index 2c3ba6a6ec7f..996144e840d3 100644
--- a/arch/ia64/configs/bigsur_defconfig
+++ b/arch/ia64/configs/bigsur_defconfig
@@ -114,7 +114,6 @@ CONFIG_ACPI_PROCESSOR=m
114CONFIG_ACPI_THERMAL=m 114CONFIG_ACPI_THERMAL=m
115CONFIG_ACPI_BLACKLIST_YEAR=0 115CONFIG_ACPI_BLACKLIST_YEAR=0
116# CONFIG_ACPI_DEBUG is not set 116# CONFIG_ACPI_DEBUG is not set
117CONFIG_ACPI_BUS=y
118CONFIG_ACPI_POWER=y 117CONFIG_ACPI_POWER=y
119CONFIG_ACPI_PCI=y 118CONFIG_ACPI_PCI=y
120CONFIG_ACPI_SYSTEM=y 119CONFIG_ACPI_SYSTEM=y
diff --git a/arch/ia64/configs/sn2_defconfig b/arch/ia64/configs/sn2_defconfig
index 6a0c114e086a..4644ebea8eab 100644
--- a/arch/ia64/configs/sn2_defconfig
+++ b/arch/ia64/configs/sn2_defconfig
@@ -138,7 +138,6 @@ CONFIG_ACPI_HOTKEY=m
138CONFIG_ACPI_NUMA=y 138CONFIG_ACPI_NUMA=y
139CONFIG_ACPI_BLACKLIST_YEAR=0 139CONFIG_ACPI_BLACKLIST_YEAR=0
140# CONFIG_ACPI_DEBUG is not set 140# CONFIG_ACPI_DEBUG is not set
141CONFIG_ACPI_BUS=y
142CONFIG_ACPI_POWER=y 141CONFIG_ACPI_POWER=y
143CONFIG_ACPI_PCI=y 142CONFIG_ACPI_PCI=y
144CONFIG_ACPI_SYSTEM=y 143CONFIG_ACPI_SYSTEM=y
diff --git a/arch/ia64/configs/tiger_defconfig b/arch/ia64/configs/tiger_defconfig
index dec24a6de6a4..f5fa113f302d 100644
--- a/arch/ia64/configs/tiger_defconfig
+++ b/arch/ia64/configs/tiger_defconfig
@@ -137,7 +137,6 @@ CONFIG_ACPI_PROCESSOR=m
137CONFIG_ACPI_THERMAL=m 137CONFIG_ACPI_THERMAL=m
138CONFIG_ACPI_BLACKLIST_YEAR=0 138CONFIG_ACPI_BLACKLIST_YEAR=0
139# CONFIG_ACPI_DEBUG is not set 139# CONFIG_ACPI_DEBUG is not set
140CONFIG_ACPI_BUS=y
141CONFIG_ACPI_POWER=y 140CONFIG_ACPI_POWER=y
142CONFIG_ACPI_PCI=y 141CONFIG_ACPI_PCI=y
143CONFIG_ACPI_SYSTEM=y 142CONFIG_ACPI_SYSTEM=y
diff --git a/arch/ia64/configs/zx1_defconfig b/arch/ia64/configs/zx1_defconfig
index d318087bfcbd..1e6d286ad0f3 100644
--- a/arch/ia64/configs/zx1_defconfig
+++ b/arch/ia64/configs/zx1_defconfig
@@ -136,7 +136,6 @@ CONFIG_ACPI_PROCESSOR=y
136CONFIG_ACPI_THERMAL=y 136CONFIG_ACPI_THERMAL=y
137CONFIG_ACPI_BLACKLIST_YEAR=0 137CONFIG_ACPI_BLACKLIST_YEAR=0
138# CONFIG_ACPI_DEBUG is not set 138# CONFIG_ACPI_DEBUG is not set
139CONFIG_ACPI_BUS=y
140CONFIG_ACPI_POWER=y 139CONFIG_ACPI_POWER=y
141CONFIG_ACPI_PCI=y 140CONFIG_ACPI_PCI=y
142CONFIG_ACPI_SYSTEM=y 141CONFIG_ACPI_SYSTEM=y
diff --git a/arch/ia64/defconfig b/arch/ia64/defconfig
index e6d34df7d2ff..163ef12641b7 100644
--- a/arch/ia64/defconfig
+++ b/arch/ia64/defconfig
@@ -127,7 +127,6 @@ CONFIG_ACPI_THERMAL=m
127CONFIG_ACPI_NUMA=y 127CONFIG_ACPI_NUMA=y
128CONFIG_ACPI_BLACKLIST_YEAR=0 128CONFIG_ACPI_BLACKLIST_YEAR=0
129# CONFIG_ACPI_DEBUG is not set 129# CONFIG_ACPI_DEBUG is not set
130CONFIG_ACPI_BUS=y
131CONFIG_ACPI_POWER=y 130CONFIG_ACPI_POWER=y
132CONFIG_ACPI_PCI=y 131CONFIG_ACPI_PCI=y
133CONFIG_ACPI_SYSTEM=y 132CONFIG_ACPI_SYSTEM=y
diff --git a/arch/x86_64/defconfig b/arch/x86_64/defconfig
index 8ccb4a12eed5..62abdc0adab8 100644
--- a/arch/x86_64/defconfig
+++ b/arch/x86_64/defconfig
@@ -149,7 +149,6 @@ CONFIG_ACPI_NUMA=y
149CONFIG_ACPI_TOSHIBA=y 149CONFIG_ACPI_TOSHIBA=y
150CONFIG_ACPI_BLACKLIST_YEAR=2001 150CONFIG_ACPI_BLACKLIST_YEAR=2001
151# CONFIG_ACPI_DEBUG is not set 151# CONFIG_ACPI_DEBUG is not set
152CONFIG_ACPI_BUS=y
153CONFIG_ACPI_EC=y 152CONFIG_ACPI_EC=y
154CONFIG_ACPI_POWER=y 153CONFIG_ACPI_POWER=y
155CONFIG_ACPI_PCI=y 154CONFIG_ACPI_PCI=y
diff --git a/arch/x86_64/kernel/genapic.c b/arch/x86_64/kernel/genapic.c
index 30c843a5efdd..f031358906f5 100644
--- a/arch/x86_64/kernel/genapic.c
+++ b/arch/x86_64/kernel/genapic.c
@@ -20,7 +20,7 @@
20#include <asm/smp.h> 20#include <asm/smp.h>
21#include <asm/ipi.h> 21#include <asm/ipi.h>
22 22
23#if defined(CONFIG_ACPI_BUS) 23#if defined(CONFIG_ACPI)
24#include <acpi/acpi_bus.h> 24#include <acpi/acpi_bus.h>
25#endif 25#endif
26 26
@@ -47,7 +47,7 @@ void __init clustered_apic_check(void)
47 u8 cluster_cnt[NUM_APIC_CLUSTERS]; 47 u8 cluster_cnt[NUM_APIC_CLUSTERS];
48 int num_cpus = 0; 48 int num_cpus = 0;
49 49
50#if defined(CONFIG_ACPI_BUS) 50#if defined(CONFIG_ACPI)
51 /* 51 /*
52 * Some x86_64 machines use physical APIC mode regardless of how many 52 * Some x86_64 machines use physical APIC mode regardless of how many
53 * procs/clusters are present (x86_64 ES7000 is an example). 53 * procs/clusters are present (x86_64 ES7000 is an example).
diff --git a/arch/x86_64/kernel/mpparse.c b/arch/x86_64/kernel/mpparse.c
index 86445f320d86..8d8ed6ae1d0c 100644
--- a/arch/x86_64/kernel/mpparse.c
+++ b/arch/x86_64/kernel/mpparse.c
@@ -927,11 +927,9 @@ int mp_register_gsi(u32 gsi, int edge_level, int active_high_low)
927 if (acpi_irq_model != ACPI_IRQ_MODEL_IOAPIC) 927 if (acpi_irq_model != ACPI_IRQ_MODEL_IOAPIC)
928 return gsi; 928 return gsi;
929 929
930#ifdef CONFIG_ACPI_BUS
931 /* Don't set up the ACPI SCI because it's already set up */ 930 /* Don't set up the ACPI SCI because it's already set up */
932 if (acpi_fadt.sci_int == gsi) 931 if (acpi_fadt.sci_int == gsi)
933 return gsi; 932 return gsi;
934#endif
935 933
936 ioapic = mp_find_ioapic(gsi); 934 ioapic = mp_find_ioapic(gsi);
937 if (ioapic < 0) { 935 if (ioapic < 0) {
@@ -971,13 +969,11 @@ int mp_register_gsi(u32 gsi, int edge_level, int active_high_low)
971 if (gsi < MAX_GSI_NUM) { 969 if (gsi < MAX_GSI_NUM) {
972 if (gsi > 15) 970 if (gsi > 15)
973 gsi = pci_irq++; 971 gsi = pci_irq++;
974#ifdef CONFIG_ACPI_BUS
975 /* 972 /*
976 * Don't assign IRQ used by ACPI SCI 973 * Don't assign IRQ used by ACPI SCI
977 */ 974 */
978 if (gsi == acpi_fadt.sci_int) 975 if (gsi == acpi_fadt.sci_int)
979 gsi = pci_irq++; 976 gsi = pci_irq++;
980#endif
981 gsi_to_irq[irq] = gsi; 977 gsi_to_irq[irq] = gsi;
982 } else { 978 } else {
983 printk(KERN_ERR "GSI %u is too high\n", gsi); 979 printk(KERN_ERR "GSI %u is too high\n", gsi);