Attachment #19321 for bug #12231

Lines 47-53 Link Here

(-)linux-2.6/arch/x86/kernel/acpi/boot.c (-1 / +5 lines)
47	#endif	47	#endif
48		48
49	static int __initdata acpi_force = 0;	49	static int __initdata acpi_force = 0;
50		50	u32 acpi_rsdt_forced;
51	#ifdef CONFIG_ACPI	51	#ifdef CONFIG_ACPI
52	int acpi_disabled = 0;	52	int acpi_disabled = 0;
53	#else	53	#else
Lines 1783-1788 static int __init parse_acpi(char *arg) Link Here
1783	disable_acpi();	1783	disable_acpi();
1784	acpi_ht = 1;	1784	acpi_ht = 1;
1785	}	1785	}
		1786	/* acpi=rsdt use RSDT instead of XSDT */
		1787	else if (strcmp(arg, "rsdt") == 0) {
		1788	acpi_rsdt_forced = 1;
		1789	}
1786	/* "acpi=noirq" disables ACPI interrupt routing */	1790	/* "acpi=noirq" disables ACPI interrupt routing */
1787	else if (strcmp(arg, "noirq") == 0) {	1791	else if (strcmp(arg, "noirq") == 0) {
1788	acpi_noirq_set();	1792	acpi_noirq_set();

Lines 48-53 Link Here

(-)linux-2.6/include/acpi/acpixf.h (+1 lines)
48	#include "actypes.h"	48	#include "actypes.h"
49	#include "actbl.h"	49	#include "actbl.h"
50		50
		51	extern u32 acpi_rsdt_forced;
51	/*	52	/*
52	* Global interfaces	53	* Global interfaces
53	*/	54	*/

Lines 420-426 acpi_tb_parse_root_table(acpi_physical_a Link Here

(-)linux-2.6/drivers/acpi/tables/tbutils.c (-1 / +2 lines)
420		420
421	/* Differentiate between RSDT and XSDT root tables */	421	/* Differentiate between RSDT and XSDT root tables */
422		422
423	if (rsdp->revision > 1 && rsdp->xsdt_physical_address) {	423	if (rsdp->revision > 1 && rsdp->xsdt_physical_address
		424	&& !acpi_rsdt_forced) {
424	/*	425	/*
425	* Root table is an XSDT (64-bit physical addresses). We must use the	426	* Root table is an XSDT (64-bit physical addresses). We must use the
426	* XSDT if the revision is > 1 and the XSDT pointer is present, as per	427	* XSDT if the revision is > 1 and the XSDT pointer is present, as per

Lines 65-70 EXPORT_SYMBOL(pm_idle); Link Here

(-)linux-2.6/arch/ia64/kernel/acpi.c (+1 lines)
65	void (*pm_power_off) (void);	65	void (*pm_power_off) (void);
66	EXPORT_SYMBOL(pm_power_off);	66	EXPORT_SYMBOL(pm_power_off);
67		67
		68	u32 acpi_rsdt_forced;
68	unsigned int acpi_cpei_override;	69	unsigned int acpi_cpei_override;
69	unsigned int acpi_cpei_phys_cpuid;	70	unsigned int acpi_cpei_phys_cpuid;
70		71

Lines 139-144 and is between 256 and 4096 characters. Link Here

(-)linux-2.6/Documentation/kernel-parameters.txt (+2 lines)
139	ht -- run only enough ACPI to enable Hyper Threading	139	ht -- run only enough ACPI to enable Hyper Threading
140	strict -- Be less tolerant of platforms that are not	140	strict -- Be less tolerant of platforms that are not
141	strictly ACPI specification compliant.	141	strictly ACPI specification compliant.
		142	rsdt -- RSDT is used instead of XSDT table when both
		143	exits.
142		144
143	See also Documentation/power/pm.txt, pci=noacpi	145	See also Documentation/power/pm.txt, pci=noacpi
144		146

Return to bug 12231