aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2005-08-25 12:27:09 -0400
committerLen Brown <len.brown@intel.com>2005-08-25 12:40:44 -0400
commit6153df7b2f4d27c8bde054db1b947369a6f64d83 (patch)
tree2e30598ad48d05d0ea956b6097e0943a178d6299
parent07fefe4ca93b3e45b2bea32871a4496067888852 (diff)
[ACPI] delete CONFIG_ACPI_PCI
Delete the ability to build an ACPI kernel that does not include PCI support. When such a machine is created and it requires a tuned kernel, send a patch. http://bugzilla.kernel.org/show_bug.cgi?id=1364 Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r--arch/i386/defconfig1
-rw-r--r--arch/i386/kernel/acpi/boot.c9
-rw-r--r--arch/i386/pci/Makefile2
-rw-r--r--arch/i386/pci/irq.c2
-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/pci/Makefile2
-rw-r--r--arch/x86_64/pci/Makefile-BUS2
-rw-r--r--drivers/acpi/Kconfig7
-rw-r--r--drivers/acpi/Makefile2
-rw-r--r--drivers/acpi/osl.c28
-rw-r--r--include/acpi/acpi_drivers.h4
-rw-r--r--include/asm-i386/acpi.h18
-rw-r--r--include/asm-x86_64/acpi.h25
-rw-r--r--include/linux/acpi.h4
19 files changed, 28 insertions, 84 deletions
diff --git a/arch/i386/defconfig b/arch/i386/defconfig
index 1a387856c870..6a431b926019 100644
--- a/arch/i386/defconfig
+++ b/arch/i386/defconfig
@@ -144,7 +144,6 @@ CONFIG_ACPI_THERMAL=y
144# CONFIG_ACPI_DEBUG is not set 144# CONFIG_ACPI_DEBUG is not set
145CONFIG_ACPI_EC=y 145CONFIG_ACPI_EC=y
146CONFIG_ACPI_POWER=y 146CONFIG_ACPI_POWER=y
147CONFIG_ACPI_PCI=y
148CONFIG_ACPI_SYSTEM=y 147CONFIG_ACPI_SYSTEM=y
149# CONFIG_X86_PM_TIMER is not set 148# CONFIG_X86_PM_TIMER is not set
150 149
diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c
index 552fc85691ac..0fb23c30eb98 100644
--- a/arch/i386/kernel/acpi/boot.c
+++ b/arch/i386/kernel/acpi/boot.c
@@ -66,13 +66,8 @@ static inline int ioapic_setup_disabled(void)
66 66
67#define PREFIX "ACPI: " 67#define PREFIX "ACPI: "
68 68
69#ifdef CONFIG_ACPI_PCI
70int acpi_noirq __initdata; /* skip ACPI IRQ initialization */ 69int acpi_noirq __initdata; /* skip ACPI IRQ initialization */
71int acpi_pci_disabled __initdata; /* skip ACPI PCI scan and IRQ initialization */ 70int acpi_pci_disabled __initdata; /* skip ACPI PCI scan and IRQ initialization */
72#else
73int acpi_noirq __initdata = 1;
74int acpi_pci_disabled __initdata = 1;
75#endif
76int acpi_ht __initdata = 1; /* enable HT */ 71int acpi_ht __initdata = 1; /* enable HT */
77 72
78int acpi_lapic; 73int acpi_lapic;
@@ -849,7 +844,6 @@ extern int acpi_force;
849 844
850#ifdef __i386__ 845#ifdef __i386__
851 846
852#ifdef CONFIG_ACPI_PCI
853static int __init disable_acpi_irq(struct dmi_system_id *d) 847static int __init disable_acpi_irq(struct dmi_system_id *d)
854{ 848{
855 if (!acpi_force) { 849 if (!acpi_force) {
@@ -869,7 +863,6 @@ static int __init disable_acpi_pci(struct dmi_system_id *d)
869 } 863 }
870 return 0; 864 return 0;
871} 865}
872#endif
873 866
874static int __init dmi_disable_acpi(struct dmi_system_id *d) 867static int __init dmi_disable_acpi(struct dmi_system_id *d)
875{ 868{
@@ -1017,7 +1010,6 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = {
1017 }, 1010 },
1018 }, 1011 },
1019 1012
1020#ifdef CONFIG_ACPI_PCI
1021 /* 1013 /*
1022 * Boxes that need ACPI PCI IRQ routing disabled 1014 * Boxes that need ACPI PCI IRQ routing disabled
1023 */ 1015 */
@@ -1055,7 +1047,6 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = {
1055 DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 360"), 1047 DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 360"),
1056 }, 1048 },
1057 }, 1049 },
1058#endif
1059 {} 1050 {}
1060}; 1051};
1061 1052
diff --git a/arch/i386/pci/Makefile b/arch/i386/pci/Makefile
index 1bff03f36965..ead6122dd06d 100644
--- a/arch/i386/pci/Makefile
+++ b/arch/i386/pci/Makefile
@@ -5,7 +5,7 @@ obj-$(CONFIG_PCI_MMCONFIG) += mmconfig.o
5obj-$(CONFIG_PCI_DIRECT) += direct.o 5obj-$(CONFIG_PCI_DIRECT) += direct.o
6 6
7pci-y := fixup.o 7pci-y := fixup.o
8pci-$(CONFIG_ACPI_PCI) += acpi.o 8pci-$(CONFIG_ACPI) += acpi.o
9pci-y += legacy.o irq.o 9pci-y += legacy.o irq.o
10 10
11pci-$(CONFIG_X86_VISWS) := visws.o fixup.o 11pci-$(CONFIG_X86_VISWS) := visws.o fixup.o
diff --git a/arch/i386/pci/irq.c b/arch/i386/pci/irq.c
index 86348b68fda1..326a2edc3834 100644
--- a/arch/i386/pci/irq.c
+++ b/arch/i386/pci/irq.c
@@ -1075,7 +1075,7 @@ static void pirq_penalize_isa_irq(int irq, int active)
1075 1075
1076void pcibios_penalize_isa_irq(int irq, int active) 1076void pcibios_penalize_isa_irq(int irq, int active)
1077{ 1077{
1078#ifdef CONFIG_ACPI_PCI 1078#ifdef CONFIG_ACPI
1079 if (!acpi_noirq) 1079 if (!acpi_noirq)
1080 acpi_penalize_isa_irq(irq, active); 1080 acpi_penalize_isa_irq(irq, active);
1081 else 1081 else
diff --git a/arch/ia64/configs/bigsur_defconfig b/arch/ia64/configs/bigsur_defconfig
index 71dcfe0e3f73..3b65cbb31b1d 100644
--- a/arch/ia64/configs/bigsur_defconfig
+++ b/arch/ia64/configs/bigsur_defconfig
@@ -113,7 +113,6 @@ CONFIG_ACPI_PROCESSOR=m
113CONFIG_ACPI_THERMAL=m 113CONFIG_ACPI_THERMAL=m
114# CONFIG_ACPI_DEBUG is not set 114# CONFIG_ACPI_DEBUG is not set
115CONFIG_ACPI_POWER=y 115CONFIG_ACPI_POWER=y
116CONFIG_ACPI_PCI=y
117CONFIG_ACPI_SYSTEM=y 116CONFIG_ACPI_SYSTEM=y
118 117
119# 118#
diff --git a/arch/ia64/configs/sn2_defconfig b/arch/ia64/configs/sn2_defconfig
index ac17ed2ff979..1ca6e6e11b42 100644
--- a/arch/ia64/configs/sn2_defconfig
+++ b/arch/ia64/configs/sn2_defconfig
@@ -136,7 +136,6 @@ CONFIG_ACPI=y
136CONFIG_ACPI_NUMA=y 136CONFIG_ACPI_NUMA=y
137# CONFIG_ACPI_DEBUG is not set 137# CONFIG_ACPI_DEBUG is not set
138CONFIG_ACPI_POWER=y 138CONFIG_ACPI_POWER=y
139CONFIG_ACPI_PCI=y
140CONFIG_ACPI_SYSTEM=y 139CONFIG_ACPI_SYSTEM=y
141# CONFIG_ACPI_CONTAINER is not set 140# CONFIG_ACPI_CONTAINER is not set
142 141
diff --git a/arch/ia64/configs/tiger_defconfig b/arch/ia64/configs/tiger_defconfig
index 3a629414229e..3ec94a12eac0 100644
--- a/arch/ia64/configs/tiger_defconfig
+++ b/arch/ia64/configs/tiger_defconfig
@@ -135,7 +135,6 @@ CONFIG_ACPI_PROCESSOR=m
135CONFIG_ACPI_THERMAL=m 135CONFIG_ACPI_THERMAL=m
136# CONFIG_ACPI_DEBUG is not set 136# CONFIG_ACPI_DEBUG is not set
137CONFIG_ACPI_POWER=y 137CONFIG_ACPI_POWER=y
138CONFIG_ACPI_PCI=y
139CONFIG_ACPI_SYSTEM=y 138CONFIG_ACPI_SYSTEM=y
140# CONFIG_ACPI_CONTAINER is not set 139# CONFIG_ACPI_CONTAINER is not set
141 140
diff --git a/arch/ia64/configs/zx1_defconfig b/arch/ia64/configs/zx1_defconfig
index 84cdf32ede7c..d4cf73d124bc 100644
--- a/arch/ia64/configs/zx1_defconfig
+++ b/arch/ia64/configs/zx1_defconfig
@@ -134,7 +134,6 @@ CONFIG_ACPI_PROCESSOR=y
134CONFIG_ACPI_THERMAL=y 134CONFIG_ACPI_THERMAL=y
135# CONFIG_ACPI_DEBUG is not set 135# CONFIG_ACPI_DEBUG is not set
136CONFIG_ACPI_POWER=y 136CONFIG_ACPI_POWER=y
137CONFIG_ACPI_PCI=y
138CONFIG_ACPI_SYSTEM=y 137CONFIG_ACPI_SYSTEM=y
139# CONFIG_ACPI_CONTAINER is not set 138# CONFIG_ACPI_CONTAINER is not set
140 139
diff --git a/arch/ia64/defconfig b/arch/ia64/defconfig
index 7002d5a3cc14..b6ec8d32c346 100644
--- a/arch/ia64/defconfig
+++ b/arch/ia64/defconfig
@@ -126,7 +126,6 @@ CONFIG_ACPI_THERMAL=m
126CONFIG_ACPI_NUMA=y 126CONFIG_ACPI_NUMA=y
127# CONFIG_ACPI_DEBUG is not set 127# CONFIG_ACPI_DEBUG is not set
128CONFIG_ACPI_POWER=y 128CONFIG_ACPI_POWER=y
129CONFIG_ACPI_PCI=y
130CONFIG_ACPI_SYSTEM=y 129CONFIG_ACPI_SYSTEM=y
131CONFIG_ACPI_CONTAINER=m 130CONFIG_ACPI_CONTAINER=m
132 131
diff --git a/arch/x86_64/defconfig b/arch/x86_64/defconfig
index 62abdc0adab8..b95c6cf26591 100644
--- a/arch/x86_64/defconfig
+++ b/arch/x86_64/defconfig
@@ -151,7 +151,6 @@ CONFIG_ACPI_BLACKLIST_YEAR=2001
151# CONFIG_ACPI_DEBUG is not set 151# CONFIG_ACPI_DEBUG is not set
152CONFIG_ACPI_EC=y 152CONFIG_ACPI_EC=y
153CONFIG_ACPI_POWER=y 153CONFIG_ACPI_POWER=y
154CONFIG_ACPI_PCI=y
155CONFIG_ACPI_SYSTEM=y 154CONFIG_ACPI_SYSTEM=y
156# CONFIG_ACPI_CONTAINER is not set 155# CONFIG_ACPI_CONTAINER is not set
157 156
diff --git a/arch/x86_64/pci/Makefile b/arch/x86_64/pci/Makefile
index 37c92e841dec..bb34e5ef916c 100644
--- a/arch/x86_64/pci/Makefile
+++ b/arch/x86_64/pci/Makefile
@@ -8,7 +8,7 @@ CFLAGS += -Iarch/i386/pci
8obj-y := i386.o 8obj-y := i386.o
9obj-$(CONFIG_PCI_DIRECT)+= direct.o 9obj-$(CONFIG_PCI_DIRECT)+= direct.o
10obj-y += fixup.o 10obj-y += fixup.o
11obj-$(CONFIG_ACPI_PCI) += acpi.o 11obj-$(CONFIG_ACPI) += acpi.o
12obj-y += legacy.o irq.o common.o 12obj-y += legacy.o irq.o common.o
13# mmconfig has a 64bit special 13# mmconfig has a 64bit special
14obj-$(CONFIG_PCI_MMCONFIG) += mmconfig.o 14obj-$(CONFIG_PCI_MMCONFIG) += mmconfig.o
diff --git a/arch/x86_64/pci/Makefile-BUS b/arch/x86_64/pci/Makefile-BUS
index 291985f0d2e4..4f0c05abd408 100644
--- a/arch/x86_64/pci/Makefile-BUS
+++ b/arch/x86_64/pci/Makefile-BUS
@@ -8,7 +8,7 @@ CFLAGS += -I arch/i386/pci
8obj-y := i386.o 8obj-y := i386.o
9obj-$(CONFIG_PCI_DIRECT)+= direct.o 9obj-$(CONFIG_PCI_DIRECT)+= direct.o
10obj-y += fixup.o 10obj-y += fixup.o
11obj-$(CONFIG_ACPI_PCI) += acpi.o 11obj-$(CONFIG_ACPI) += acpi.o
12obj-y += legacy.o irq.o common.o 12obj-y += legacy.o irq.o common.o
13# mmconfig has a 64bit special 13# mmconfig has a 64bit special
14obj-$(CONFIG_PCI_MMCONFIG) += mmconfig.o 14obj-$(CONFIG_PCI_MMCONFIG) += mmconfig.o
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 83cac52308db..3998c9d35fe1 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -3,7 +3,6 @@
3# 3#
4 4
5menu "ACPI (Advanced Configuration and Power Interface) Support" 5menu "ACPI (Advanced Configuration and Power Interface) Support"
6 depends on PM
7 depends on !X86_VISWS 6 depends on !X86_VISWS
8 depends on !IA64_HP_SIM 7 depends on !IA64_HP_SIM
9 depends on IA64 || X86 8 depends on IA64 || X86
@@ -11,6 +10,8 @@ menu "ACPI (Advanced Configuration and Power Interface) Support"
11config ACPI 10config ACPI
12 bool "ACPI Support" 11 bool "ACPI Support"
13 depends on IA64 || X86 12 depends on IA64 || X86
13 select PM
14 select PCI
14 15
15 default y 16 default y
16 ---help--- 17 ---help---
@@ -281,10 +282,6 @@ config ACPI_POWER
281 bool 282 bool
282 default y 283 default y
283 284
284config ACPI_PCI
285 bool
286 default PCI
287
288config ACPI_SYSTEM 285config ACPI_SYSTEM
289 bool 286 bool
290 default y 287 default y
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index b6a3c9192385..a18243488c66 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -44,7 +44,7 @@ obj-$(CONFIG_ACPI_EC) += ec.o
44obj-$(CONFIG_ACPI_FAN) += fan.o 44obj-$(CONFIG_ACPI_FAN) += fan.o
45obj-$(CONFIG_ACPI_VIDEO) += video.o 45obj-$(CONFIG_ACPI_VIDEO) += video.o
46obj-$(CONFIG_ACPI_HOTKEY) += hotkey.o 46obj-$(CONFIG_ACPI_HOTKEY) += hotkey.o
47obj-$(CONFIG_ACPI_PCI) += pci_root.o pci_link.o pci_irq.o pci_bind.o 47obj-y += pci_root.o pci_link.o pci_irq.o pci_bind.o
48obj-$(CONFIG_ACPI_POWER) += power.o 48obj-$(CONFIG_ACPI_POWER) += power.o
49obj-$(CONFIG_ACPI_PROCESSOR) += processor.o 49obj-$(CONFIG_ACPI_PROCESSOR) += processor.o
50obj-$(CONFIG_ACPI_CONTAINER) += container.o 50obj-$(CONFIG_ACPI_CONTAINER) += container.o
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 81f0eb863a76..dc69d8760a54 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -86,13 +86,11 @@ acpi_status acpi_os_initialize1(void)
86 * Initialize PCI configuration space access, as we'll need to access 86 * Initialize PCI configuration space access, as we'll need to access
87 * it while walking the namespace (bus 0 and root bridges w/ _BBNs). 87 * it while walking the namespace (bus 0 and root bridges w/ _BBNs).
88 */ 88 */
89#ifdef CONFIG_ACPI_PCI
90 if (!raw_pci_ops) { 89 if (!raw_pci_ops) {
91 printk(KERN_ERR PREFIX 90 printk(KERN_ERR PREFIX
92 "Access to PCI configuration space unavailable\n"); 91 "Access to PCI configuration space unavailable\n");
93 return AE_NULL_ENTRY; 92 return AE_NULL_ENTRY;
94 } 93 }
95#endif
96 kacpid_wq = create_singlethread_workqueue("kacpid"); 94 kacpid_wq = create_singlethread_workqueue("kacpid");
97 BUG_ON(!kacpid_wq); 95 BUG_ON(!kacpid_wq);
98 96
@@ -484,8 +482,6 @@ acpi_os_write_memory(acpi_physical_address phys_addr, u32 value, u32 width)
484 return AE_OK; 482 return AE_OK;
485} 483}
486 484
487#ifdef CONFIG_ACPI_PCI
488
489acpi_status 485acpi_status
490acpi_os_read_pci_configuration(struct acpi_pci_id * pci_id, u32 reg, 486acpi_os_read_pci_configuration(struct acpi_pci_id * pci_id, u32 reg,
491 void *value, u32 width) 487 void *value, u32 width)
@@ -618,30 +614,6 @@ void acpi_os_derive_pci_id(acpi_handle rhandle, /* upper bound */
618 acpi_os_derive_pci_id_2(rhandle, chandle, id, &is_bridge, &bus_number); 614 acpi_os_derive_pci_id_2(rhandle, chandle, id, &is_bridge, &bus_number);
619} 615}
620 616
621#else /*!CONFIG_ACPI_PCI */
622
623acpi_status
624acpi_os_write_pci_configuration(struct acpi_pci_id * pci_id,
625 u32 reg, acpi_integer value, u32 width)
626{
627 return AE_SUPPORT;
628}
629
630acpi_status
631acpi_os_read_pci_configuration(struct acpi_pci_id * pci_id,
632 u32 reg, void *value, u32 width)
633{
634 return AE_SUPPORT;
635}
636
637void acpi_os_derive_pci_id(acpi_handle rhandle, /* upper bound */
638 acpi_handle chandle, /* current node */
639 struct acpi_pci_id **id)
640{
641}
642
643#endif /*CONFIG_ACPI_PCI */
644
645static void acpi_os_execute_deferred(void *context) 617static void acpi_os_execute_deferred(void *context)
646{ 618{
647 struct acpi_os_dpc *dpc = NULL; 619 struct acpi_os_dpc *dpc = NULL;
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h
index e976cb109b13..c1b4e1f882e4 100644
--- a/include/acpi/acpi_drivers.h
+++ b/include/acpi/acpi_drivers.h
@@ -47,8 +47,6 @@
47 PCI 47 PCI
48 -------------------------------------------------------------------------- */ 48 -------------------------------------------------------------------------- */
49 49
50#ifdef CONFIG_ACPI_PCI
51
52#define ACPI_PCI_COMPONENT 0x00400000 50#define ACPI_PCI_COMPONENT 0x00400000
53 51
54/* ACPI PCI Interrupt Link (pci_link.c) */ 52/* ACPI PCI Interrupt Link (pci_link.c) */
@@ -78,8 +76,6 @@ int acpi_pci_bind_root(struct acpi_device *device, struct acpi_pci_id *id,
78struct pci_bus *pci_acpi_scan_root(struct acpi_device *device, int domain, 76struct pci_bus *pci_acpi_scan_root(struct acpi_device *device, int domain,
79 int bus); 77 int bus);
80 78
81#endif /*CONFIG_ACPI_PCI */
82
83/* -------------------------------------------------------------------------- 79/* --------------------------------------------------------------------------
84 Power Resource 80 Power Resource
85 -------------------------------------------------------------------------- */ 81 -------------------------------------------------------------------------- */
diff --git a/include/asm-i386/acpi.h b/include/asm-i386/acpi.h
index 1f1ade923d69..df4ed323aa4d 100644
--- a/include/asm-i386/acpi.h
+++ b/include/asm-i386/acpi.h
@@ -146,13 +146,6 @@ static inline void check_acpi_pci(void) { }
146 146
147#endif 147#endif
148 148
149#else /* !CONFIG_ACPI */
150# define acpi_lapic 0
151# define acpi_ioapic 0
152
153#endif
154
155#ifdef CONFIG_ACPI_PCI
156static inline void acpi_noirq_set(void) { acpi_noirq = 1; } 149static inline void acpi_noirq_set(void) { acpi_noirq = 1; }
157static inline void acpi_disable_pci(void) 150static inline void acpi_disable_pci(void)
158{ 151{
@@ -160,11 +153,16 @@ static inline void acpi_disable_pci(void)
160 acpi_noirq_set(); 153 acpi_noirq_set();
161} 154}
162extern int acpi_irq_balance_set(char *str); 155extern int acpi_irq_balance_set(char *str);
163#else 156
157#else /* !CONFIG_ACPI */
158
159#define acpi_lapic 0
160#define acpi_ioapic 0
164static inline void acpi_noirq_set(void) { } 161static inline void acpi_noirq_set(void) { }
165static inline void acpi_disable_pci(void) { } 162static inline void acpi_disable_pci(void) { }
166static inline int acpi_irq_balance_set(char *str) { return 0; } 163
167#endif 164#endif /* !CONFIG_ACPI */
165
168 166
169#ifdef CONFIG_ACPI_SLEEP 167#ifdef CONFIG_ACPI_SLEEP
170 168
diff --git a/include/asm-x86_64/acpi.h b/include/asm-x86_64/acpi.h
index 7d537e1867c7..aa1c7b2e438c 100644
--- a/include/asm-x86_64/acpi.h
+++ b/include/asm-x86_64/acpi.h
@@ -121,17 +121,6 @@ static inline void disable_acpi(void)
121#define FIX_ACPI_PAGES 4 121#define FIX_ACPI_PAGES 4
122 122
123extern int acpi_gsi_to_irq(u32 gsi, unsigned int *irq); 123extern int acpi_gsi_to_irq(u32 gsi, unsigned int *irq);
124
125#else /* !CONFIG_ACPI */
126#define acpi_lapic 0
127#define acpi_ioapic 0
128#endif /* !CONFIG_ACPI */
129
130extern int acpi_numa;
131extern int acpi_scan_nodes(unsigned long start, unsigned long end);
132#define NR_NODE_MEMBLKS (MAX_NUMNODES*2)
133
134#ifdef CONFIG_ACPI_PCI
135static inline void acpi_noirq_set(void) { acpi_noirq = 1; } 124static inline void acpi_noirq_set(void) { acpi_noirq = 1; }
136static inline void acpi_disable_pci(void) 125static inline void acpi_disable_pci(void)
137{ 126{
@@ -139,11 +128,19 @@ static inline void acpi_disable_pci(void)
139 acpi_noirq_set(); 128 acpi_noirq_set();
140} 129}
141extern int acpi_irq_balance_set(char *str); 130extern int acpi_irq_balance_set(char *str);
142#else 131
132#else /* !CONFIG_ACPI */
133
134#define acpi_lapic 0
135#define acpi_ioapic 0
143static inline void acpi_noirq_set(void) { } 136static inline void acpi_noirq_set(void) { }
144static inline void acpi_disable_pci(void) { } 137static inline void acpi_disable_pci(void) { }
145static inline int acpi_irq_balance_set(char *str) { return 0; } 138
146#endif 139#endif /* !CONFIG_ACPI */
140
141extern int acpi_numa;
142extern int acpi_scan_nodes(unsigned long start, unsigned long end);
143#define NR_NODE_MEMBLKS (MAX_NUMNODES*2)
147 144
148#ifdef CONFIG_ACPI_SLEEP 145#ifdef CONFIG_ACPI_SLEEP
149 146
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 6882b32aa40f..026c3c011dc0 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -445,7 +445,7 @@ int acpi_gsi_to_irq (u32 gsi, unsigned int *irq);
445 */ 445 */
446void acpi_unregister_gsi (u32 gsi); 446void acpi_unregister_gsi (u32 gsi);
447 447
448#ifdef CONFIG_ACPI_PCI 448#ifdef CONFIG_ACPI
449 449
450struct acpi_prt_entry { 450struct acpi_prt_entry {
451 struct list_head node; 451 struct list_head node;
@@ -479,7 +479,7 @@ struct acpi_pci_driver {
479int acpi_pci_register_driver(struct acpi_pci_driver *driver); 479int acpi_pci_register_driver(struct acpi_pci_driver *driver);
480void acpi_pci_unregister_driver(struct acpi_pci_driver *driver); 480void acpi_pci_unregister_driver(struct acpi_pci_driver *driver);
481 481
482#endif /*CONFIG_ACPI_PCI*/ 482#endif /* CONFIG_ACPI */
483 483
484#ifdef CONFIG_ACPI_EC 484#ifdef CONFIG_ACPI_EC
485 485