Attachment #5762 for bug #1364

View | Details | Raw Unified | Return to bug 1364
Collapse All | Expand All





#define PREFIX			"ACPI: "

#ifdef CONFIG_ACPI_PCI
int acpi_noirq __initdata;	/* skip ACPI IRQ initialization */
int acpi_pci_disabled __initdata;	/* skip ACPI PCI scan and IRQ initialization */
#else
int acpi_noirq __initdata = 1;
int acpi_pci_disabled __initdata = 1;
#endif
int acpi_ht __initdata = 1;	/* enable HT */

int acpi_lapic;


#ifdef __i386__

#ifdef	CONFIG_ACPI_PCI
static int __init disable_acpi_irq(struct dmi_system_id *d)
{
	if (!acpi_force) {

	}
	return 0;
}
#endif

static int __init dmi_disable_acpi(struct dmi_system_id *d)
{

		     },
	 },

#ifdef	CONFIG_ACPI_PCI
	/*
	 * Boxes that need ACPI PCI IRQ routing disabled
	 */

		     DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 360"),
		     },
	 },
#endif
	{}
};





#

menu "ACPI (Advanced Configuration and Power Interface) Support"
	depends on PM
	depends on !X86_VISWS
	depends on !IA64_HP_SIM
	depends on IA64 || X86

config ACPI
	bool "ACPI Support"
	depends on IA64 || X86
	select PM
	select PCI

	default y
	---help---

	bool
	default y

config ACPI_PCI
	bool
	default PCI

config ACPI_SYSTEM
	bool
	default y




	 * Initialize PCI configuration space access, as we'll need to access
	 * it while walking the namespace (bus 0 and root bridges w/ _BBNs).
	 */
#ifdef CONFIG_ACPI_PCI
	if (!raw_pci_ops) {
		printk(KERN_ERR PREFIX
		       "Access to PCI configuration space unavailable\n");
		return AE_NULL_ENTRY;
	}
#endif
	kacpid_wq = create_singlethread_workqueue("kacpid");
	BUG_ON(!kacpid_wq);


	return AE_OK;
}

#ifdef CONFIG_ACPI_PCI

acpi_status
acpi_os_read_pci_configuration(struct acpi_pci_id * pci_id, u32 reg,
			       void *value, u32 width)

	acpi_os_derive_pci_id_2(rhandle, chandle, id, &is_bridge, &bus_number);
}

#else				/*!CONFIG_ACPI_PCI */

acpi_status
acpi_os_write_pci_configuration(struct acpi_pci_id * pci_id,
				u32 reg, acpi_integer value, u32 width)
{
	return AE_SUPPORT;
}

acpi_status
acpi_os_read_pci_configuration(struct acpi_pci_id * pci_id,
			       u32 reg, void *value, u32 width)
{
	return AE_SUPPORT;
}

void acpi_os_derive_pci_id(acpi_handle rhandle,	/* upper bound  */
			   acpi_handle chandle,	/* current node */
			   struct acpi_pci_id **id)
{
}

#endif				/*CONFIG_ACPI_PCI */

static void acpi_os_execute_deferred(void *context)
{
	struct acpi_os_dpc *dpc = NULL;

Lines 47-54 Link Here

(-)linux-acpi-2.6/include/acpi/acpi_drivers.h (-4 lines)
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) */
Lines 78-85 int acpi_pci_bind_root(struct acpi_devic Link Here
78	struct pci_bus pci_acpi_scan_root(struct acpi_device device, int domain,	76	struct 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	-------------------------------------------------------------------------- */





#endif

#else	/* !CONFIG_ACPI */
#  define acpi_lapic 0
#  define acpi_ioapic 0

#endif

#ifdef CONFIG_ACPI_PCI
static inline void acpi_noirq_set(void) { acpi_noirq = 1; }
static inline void acpi_disable_pci(void) 
{

	acpi_noirq_set();
}
extern int acpi_irq_balance_set(char *str);

#else	/* !CONFIG_ACPI */

#define acpi_lapic 0
#define acpi_ioapic 0
static inline void acpi_noirq_set(void) { }
static inline void acpi_disable_pci(void) { }

#endif	/* !CONFIG_ACPI */


#ifdef CONFIG_ACPI_SLEEP





#define FIX_ACPI_PAGES 4

extern int acpi_gsi_to_irq(u32 gsi, unsigned int *irq);

#else	/* !CONFIG_ACPI */
#define acpi_lapic 0
#define acpi_ioapic 0
#endif /* !CONFIG_ACPI */

extern int acpi_numa;
extern int acpi_scan_nodes(unsigned long start, unsigned long end);
#define NR_NODE_MEMBLKS (MAX_NUMNODES*2)

#ifdef CONFIG_ACPI_PCI
static inline void acpi_noirq_set(void) { acpi_noirq = 1; }
static inline void acpi_disable_pci(void) 
{

	acpi_noirq_set();
}
extern int acpi_irq_balance_set(char *str);

#else	/* !CONFIG_ACPI */

#define acpi_lapic 0
#define acpi_ioapic 0
static inline void acpi_noirq_set(void) { }
static inline void acpi_disable_pci(void) { }

#endif /* !CONFIG_ACPI */

extern int acpi_numa;
extern int acpi_scan_nodes(unsigned long start, unsigned long end);
#define NR_NODE_MEMBLKS (MAX_NUMNODES*2)

#ifdef CONFIG_ACPI_SLEEP


Lines 1075-1081 static void pirq_penalize_isa_irq(int ir Link Here

(-)linux-acpi-2.6/arch/i386/pci/irq.c (-1 / +1 lines)
1075		1075
1076	void pcibios_penalize_isa_irq(int irq, int active)	1076	void 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

Lines 445-451 int acpi_gsi_to_irq (u32 gsi, unsigned i Link Here

(-)linux-acpi-2.6/include/linux/acpi.h (-2 / +2 lines)
445	*/	445	*/
446	void acpi_unregister_gsi (u32 gsi);	446	void acpi_unregister_gsi (u32 gsi);
447		447
448	#ifdef CONFIG_ACPI_PCI	448	#ifdef CONFIG_ACPI
449		449
450	struct acpi_prt_entry {	450	struct acpi_prt_entry {
451	struct list_head node;	451	struct list_head node;
Lines 479-485 struct acpi_pci_driver { Link Here
479	int acpi_pci_register_driver(struct acpi_pci_driver *driver);	479	int acpi_pci_register_driver(struct acpi_pci_driver *driver);
480	void acpi_pci_unregister_driver(struct acpi_pci_driver *driver);	480	void 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

Lines 5-11 obj-$(CONFIG_PCI_MMCONFIG) += mmconfig.o Link Here

(-)linux-acpi-2.6/arch/i386/pci/Makefile (-1 / +1 lines)
5	obj-$(CONFIG_PCI_DIRECT) += direct.o	5	obj-$(CONFIG_PCI_DIRECT) += direct.o
6		6
7	pci-y := fixup.o	7	pci-y := fixup.o
8	pci-$(CONFIG_ACPI_PCI) += acpi.o	8	pci-$(CONFIG_ACPI) += acpi.o
9	pci-y += legacy.o irq.o	9	pci-y += legacy.o irq.o
10		10
11	pci-$(CONFIG_X86_VISWS) := visws.o fixup.o	11	pci-$(CONFIG_X86_VISWS) := visws.o fixup.o

Lines 44-50 obj-$(CONFIG_ACPI_EC) += ec.o Link Here

(-)linux-acpi-2.6/drivers/acpi/Makefile (-1 / +1 lines)
44	obj-$(CONFIG_ACPI_FAN) += fan.o	44	obj-$(CONFIG_ACPI_FAN) += fan.o
45	obj-$(CONFIG_ACPI_VIDEO) += video.o	45	obj-$(CONFIG_ACPI_VIDEO) += video.o
46	obj-$(CONFIG_ACPI_HOTKEY) += hotkey.o	46	obj-$(CONFIG_ACPI_HOTKEY) += hotkey.o
47	obj-$(CONFIG_ACPI_PCI) += pci_root.o pci_link.o pci_irq.o pci_bind.o	47	obj-y += pci_root.o pci_link.o pci_irq.o pci_bind.o
48	obj-$(CONFIG_ACPI_POWER) += power.o	48	obj-$(CONFIG_ACPI_POWER) += power.o
49	obj-$(CONFIG_ACPI_PROCESSOR) += processor.o	49	obj-$(CONFIG_ACPI_PROCESSOR) += processor.o
50	obj-$(CONFIG_ACPI_CONTAINER) += container.o	50	obj-$(CONFIG_ACPI_CONTAINER) += container.o

Lines 151-157 CONFIG_ACPI_BLACKLIST_YEAR=2001 Link Here

(-)linux-acpi-2.6/arch/x86_64/defconfig (-1 lines)
151	# CONFIG_ACPI_DEBUG is not set	151	# CONFIG_ACPI_DEBUG is not set
152	CONFIG_ACPI_EC=y	152	CONFIG_ACPI_EC=y
153	CONFIG_ACPI_POWER=y	153	CONFIG_ACPI_POWER=y
154	CONFIG_ACPI_PCI=y
155	CONFIG_ACPI_SYSTEM=y	154	CONFIG_ACPI_SYSTEM=y
156	# CONFIG_ACPI_CONTAINER is not set	155	# CONFIG_ACPI_CONTAINER is not set
157		156

Lines 144-150 CONFIG_ACPI_THERMAL=y Link Here

(-)linux-acpi-2.6/arch/i386/defconfig (-1 lines)
144	# CONFIG_ACPI_DEBUG is not set	144	# CONFIG_ACPI_DEBUG is not set
145	CONFIG_ACPI_EC=y	145	CONFIG_ACPI_EC=y
146	CONFIG_ACPI_POWER=y	146	CONFIG_ACPI_POWER=y
147	CONFIG_ACPI_PCI=y
148	CONFIG_ACPI_SYSTEM=y	147	CONFIG_ACPI_SYSTEM=y
149	# CONFIG_X86_PM_TIMER is not set	148	# CONFIG_X86_PM_TIMER is not set
150		149

Lines 126-132 CONFIG_ACPI_THERMAL=m Link Here

(-)linux-acpi-2.6/arch/ia64/defconfig (-1 lines)
126	CONFIG_ACPI_NUMA=y	126	CONFIG_ACPI_NUMA=y
127	# CONFIG_ACPI_DEBUG is not set	127	# CONFIG_ACPI_DEBUG is not set
128	CONFIG_ACPI_POWER=y	128	CONFIG_ACPI_POWER=y
129	CONFIG_ACPI_PCI=y
130	CONFIG_ACPI_SYSTEM=y	129	CONFIG_ACPI_SYSTEM=y
131	CONFIG_ACPI_CONTAINER=m	130	CONFIG_ACPI_CONTAINER=m
132		131

Lines 113-119 CONFIG_ACPI_PROCESSOR=m Link Here

(-)linux-acpi-2.6/arch/ia64/configs/bigsur_defconfig (-1 lines)
113	CONFIG_ACPI_THERMAL=m	113	CONFIG_ACPI_THERMAL=m
114	# CONFIG_ACPI_DEBUG is not set	114	# CONFIG_ACPI_DEBUG is not set
115	CONFIG_ACPI_POWER=y	115	CONFIG_ACPI_POWER=y
116	CONFIG_ACPI_PCI=y
117	CONFIG_ACPI_SYSTEM=y	116	CONFIG_ACPI_SYSTEM=y
118		117
119	#	118	#

Lines 134-140 CONFIG_ACPI_PROCESSOR=y Link Here

(-)linux-acpi-2.6/arch/ia64/configs/zx1_defconfig (-1 lines)
134	CONFIG_ACPI_THERMAL=y	134	CONFIG_ACPI_THERMAL=y
135	# CONFIG_ACPI_DEBUG is not set	135	# CONFIG_ACPI_DEBUG is not set
136	CONFIG_ACPI_POWER=y	136	CONFIG_ACPI_POWER=y
137	CONFIG_ACPI_PCI=y
138	CONFIG_ACPI_SYSTEM=y	137	CONFIG_ACPI_SYSTEM=y
139	# CONFIG_ACPI_CONTAINER is not set	138	# CONFIG_ACPI_CONTAINER is not set
140		139

Lines 135-141 CONFIG_ACPI_PROCESSOR=m Link Here

(-)linux-acpi-2.6/arch/ia64/configs/tiger_defconfig (-1 lines)
135	CONFIG_ACPI_THERMAL=m	135	CONFIG_ACPI_THERMAL=m
136	# CONFIG_ACPI_DEBUG is not set	136	# CONFIG_ACPI_DEBUG is not set
137	CONFIG_ACPI_POWER=y	137	CONFIG_ACPI_POWER=y
138	CONFIG_ACPI_PCI=y
139	CONFIG_ACPI_SYSTEM=y	138	CONFIG_ACPI_SYSTEM=y
140	# CONFIG_ACPI_CONTAINER is not set	139	# CONFIG_ACPI_CONTAINER is not set
141		140

Lines 136-142 CONFIG_ACPI=y Link Here

(-)linux-acpi-2.6/arch/ia64/configs/sn2_defconfig (-1 lines)
136	CONFIG_ACPI_NUMA=y	136	CONFIG_ACPI_NUMA=y
137	# CONFIG_ACPI_DEBUG is not set	137	# CONFIG_ACPI_DEBUG is not set
138	CONFIG_ACPI_POWER=y	138	CONFIG_ACPI_POWER=y
139	CONFIG_ACPI_PCI=y
140	CONFIG_ACPI_SYSTEM=y	139	CONFIG_ACPI_SYSTEM=y
141	# CONFIG_ACPI_CONTAINER is not set	140	# CONFIG_ACPI_CONTAINER is not set
142		141

Lines 8-14 CFLAGS += -I arch/i386/pci Link Here

(-)linux-acpi-2.6/arch/x86_64/pci/Makefile-BUS (-1 / +1 lines)
8	obj-y := i386.o	8	obj-y := i386.o
9	obj-$(CONFIG_PCI_DIRECT)+= direct.o	9	obj-$(CONFIG_PCI_DIRECT)+= direct.o
10	obj-y += fixup.o	10	obj-y += fixup.o
11	obj-$(CONFIG_ACPI_PCI) += acpi.o	11	obj-$(CONFIG_ACPI) += acpi.o
12	obj-y += legacy.o irq.o common.o	12	obj-y += legacy.o irq.o common.o
13	# mmconfig has a 64bit special	13	# mmconfig has a 64bit special
14	obj-$(CONFIG_PCI_MMCONFIG) += mmconfig.o	14	obj-$(CONFIG_PCI_MMCONFIG) += mmconfig.o

Lines 8-14 CFLAGS += -Iarch/i386/pci Link Here

(-)linux-acpi-2.6/arch/x86_64/pci/Makefile (-1 / +1 lines)
8	obj-y := i386.o	8	obj-y := i386.o
9	obj-$(CONFIG_PCI_DIRECT)+= direct.o	9	obj-$(CONFIG_PCI_DIRECT)+= direct.o
10	obj-y += fixup.o	10	obj-y += fixup.o
11	obj-$(CONFIG_ACPI_PCI) += acpi.o	11	obj-$(CONFIG_ACPI) += acpi.o
12	obj-y += legacy.o irq.o common.o	12	obj-y += legacy.o irq.o common.o
13	# mmconfig has a 64bit special	13	# mmconfig has a 64bit special
14	obj-$(CONFIG_PCI_MMCONFIG) += mmconfig.o	14	obj-$(CONFIG_PCI_MMCONFIG) += mmconfig.o

Return to bug 1364

Lines 66-78 static inline int ioapic_setup_disabled( Link Here

(-)linux-acpi-2.6/arch/i386/kernel/acpi/boot.c (-9 lines)
66		66
67	#define PREFIX "ACPI: "	67	#define PREFIX "ACPI: "
68		68
69	#ifdef CONFIG_ACPI_PCI
70	int acpi_noirq __initdata; /* skip ACPI IRQ initialization */	69	int acpi_noirq __initdata; /* skip ACPI IRQ initialization */
71	int acpi_pci_disabled __initdata; /* skip ACPI PCI scan and IRQ initialization */	70	int acpi_pci_disabled __initdata; /* skip ACPI PCI scan and IRQ initialization */
72	#else
73	int acpi_noirq __initdata = 1;
74	int acpi_pci_disabled __initdata = 1;
75	#endif
76	int acpi_ht __initdata = 1; /* enable HT */	71	int acpi_ht __initdata = 1; /* enable HT */
77		72
78	int acpi_lapic;	73	int acpi_lapic;
Lines 849-855 extern int acpi_force; Link Here
849		844
850	#ifdef __i386__	845	#ifdef __i386__
851		846
852	#ifdef CONFIG_ACPI_PCI
853	static int __init disable_acpi_irq(struct dmi_system_id *d)	847	static int __init disable_acpi_irq(struct dmi_system_id *d)
854	{	848	{
855	if (!acpi_force) {	849	if (!acpi_force) {
Lines 869-875 static int __init disable_acpi_pci(struc Link Here
869	}	863	}
870	return 0;	864	return 0;
871	}	865	}
872	#endif
873		866
874	static int __init dmi_disable_acpi(struct dmi_system_id *d)	867	static int __init dmi_disable_acpi(struct dmi_system_id *d)
875	{	868	{
Lines 1017-1023 static struct dmi_system_id __initdata a Link Here
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	*/
Lines 1055-1061 static struct dmi_system_id __initdata a Link Here
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

Lines 86-98 acpi_status acpi_os_initialize1(void) Link Here

(-)linux-acpi-2.6/drivers/acpi/osl.c (-28 lines)
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
Lines 484-491 acpi_os_write_memory(acpi_physical_addre Link Here
484	return AE_OK;	482	return AE_OK;
485	}	483	}
486		484
487	#ifdef CONFIG_ACPI_PCI
488
489	acpi_status	485	acpi_status
490	acpi_os_read_pci_configuration(struct acpi_pci_id * pci_id, u32 reg,	486	acpi_os_read_pci_configuration(struct acpi_pci_id * pci_id, u32 reg,
491	void *value, u32 width)	487	void *value, u32 width)
Lines 618-647 void acpi_os_derive_pci_id(acpi_handle r Link Here
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
623	acpi_status
624	acpi_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
630	acpi_status
631	acpi_os_read_pci_configuration(struct acpi_pci_id * pci_id,
632	u32 reg, void *value, u32 width)
633	{
634	return AE_SUPPORT;
635	}
636
637	void 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
645	static void acpi_os_execute_deferred(void *context)	617	static void acpi_os_execute_deferred(void *context)
646	{	618	{
647	struct acpi_os_dpc *dpc = NULL;	619	struct acpi_os_dpc *dpc = NULL;

Lines 3-9 Link Here

(-)linux-acpi-2.6/drivers/acpi/Kconfig (-5 / +2 lines)
3	#	3	#
4		4
5	menu "ACPI (Advanced Configuration and Power Interface) Support"	5	menu "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
Lines 11-16 menu "ACPI (Advanced Configuration and P Link Here
11	config ACPI	10	config 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---
Lines 281-290 config ACPI_POWER Link Here
281	bool	282	bool
282	default y	283	default y
283		284
284	config ACPI_PCI
285	bool
286	default PCI
287
288	config ACPI_SYSTEM	285	config ACPI_SYSTEM
289	bool	286	bool
290	default y	287	default y

Lines 146-158 static inline void check_acpi_pci(void) Link Here

(-)linux-acpi-2.6/include/asm-i386/acpi.h (-10 / +8 lines)
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
156	static inline void acpi_noirq_set(void) { acpi_noirq = 1; }	149	static inline void acpi_noirq_set(void) { acpi_noirq = 1; }
157	static inline void acpi_disable_pci(void)	150	static inline void acpi_disable_pci(void)
158	{	151	{
Lines 160-170 static inline void acpi_disable_pci(void Link Here
160	acpi_noirq_set();	153	acpi_noirq_set();
161	}	154	}
162	extern int acpi_irq_balance_set(char *str);	155	extern 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
164	static inline void acpi_noirq_set(void) { }	161	static inline void acpi_noirq_set(void) { }
165	static inline void acpi_disable_pci(void) { }	162	static inline void acpi_disable_pci(void) { }
166	static 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

Lines 121-137 static inline void disable_acpi(void) Link Here

(-)linux-acpi-2.6/include/asm-x86_64/acpi.h (-14 / +11 lines)
121	#define FIX_ACPI_PAGES 4	121	#define FIX_ACPI_PAGES 4
122		122
123	extern int acpi_gsi_to_irq(u32 gsi, unsigned int *irq);	123	extern 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
130	extern int acpi_numa;
131	extern int acpi_scan_nodes(unsigned long start, unsigned long end);
132	#define NR_NODE_MEMBLKS (MAX_NUMNODES*2)
133
134	#ifdef CONFIG_ACPI_PCI
135	static inline void acpi_noirq_set(void) { acpi_noirq = 1; }	124	static inline void acpi_noirq_set(void) { acpi_noirq = 1; }
136	static inline void acpi_disable_pci(void)	125	static inline void acpi_disable_pci(void)
137	{	126	{
Lines 139-149 static inline void acpi_disable_pci(void Link Here
139	acpi_noirq_set();	128	acpi_noirq_set();
140	}	129	}
141	extern int acpi_irq_balance_set(char *str);	130	extern 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
143	static inline void acpi_noirq_set(void) { }	136	static inline void acpi_noirq_set(void) { }
144	static inline void acpi_disable_pci(void) { }	137	static inline void acpi_disable_pci(void) { }
145	static inline int acpi_irq_balance_set(char *str) { return 0; }	138
146	#endif	139	#endif /* !CONFIG_ACPI */
		140
		141	extern int acpi_numa;
		142	extern 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