Attachment #2575 for bug #1203

Lines 122-127 Link Here

(-)1.44/Documentation/kernel-parameters.txt (+4 lines)
122		122
123	acpi_serialize [HW,ACPI] force serialization of AML methods	123	acpi_serialize [HW,ACPI] force serialization of AML methods
124		124
		125	acpi_skip_timer_override [HW,ACPI]
		126	Recognize and ignore IRQ0/pin2 Interrupt Override.
		127	For broken nForce2 BIOS resulting in XT-PIC timer.
		128
125	ad1816= [HW,OSS]	129	ad1816= [HW,OSS]
126	Format: <io>,<irq>,<dma>,<dma2>	130	Format: <io>,<irq>,<dma>,<dma2>
127	See also Documentation/sound/oss/AD1816.	131	See also Documentation/sound/oss/AD1816.

Lines 614-619 Link Here

(-)1.115/arch/i386/kernel/setup.c (+3 lines)
614	else if (!memcmp(from, "acpi_sci=low", 12))	614	else if (!memcmp(from, "acpi_sci=low", 12))
615	acpi_sci_flags.polarity = 3;	615	acpi_sci_flags.polarity = 3;
616		616
		617	else if (!memcmp(from, "acpi_skip_timer_override", 24))
		618	acpi_skip_timer_override = 1;
		619
617	#ifdef CONFIG_X86_LOCAL_APIC	620	#ifdef CONFIG_X86_LOCAL_APIC
618	/* disable IO-APIC */	621	/* disable IO-APIC */
619	else if (!memcmp(from, "noapic", 6))	622	else if (!memcmp(from, "noapic", 6))

Lines 62-67 Link Here

(-)1.57/arch/i386/kernel/acpi/boot.c (+7 lines)
62		62
63	acpi_interrupt_flags acpi_sci_flags __initdata;	63	acpi_interrupt_flags acpi_sci_flags __initdata;
64	int acpi_sci_override_gsi __initdata;	64	int acpi_sci_override_gsi __initdata;
		65	int acpi_skip_timer_override __initdata;
65		66
66	#ifdef CONFIG_X86_LOCAL_APIC	67	#ifdef CONFIG_X86_LOCAL_APIC
67	static u64 acpi_lapic_addr __initdata = APIC_DEFAULT_PHYS_BASE;	68	static u64 acpi_lapic_addr __initdata = APIC_DEFAULT_PHYS_BASE;
Lines 327-332 Link Here
327	acpi_sci_ioapic_setup(intsrc->global_irq,	328	acpi_sci_ioapic_setup(intsrc->global_irq,
328	intsrc->flags.polarity, intsrc->flags.trigger);	329	intsrc->flags.polarity, intsrc->flags.trigger);
329	return 0;	330	return 0;
		331	}
		332
		333	if (acpi_skip_timer_override &&
		334	intsrc->bus_irq == 0 && intsrc->global_irq == 2) {
		335	printk(PREFIX "BIOS IRQ0 pin2 override ignored.\n");
		336	return 0;
330	}	337	}
331		338
332	mp_override_legacy_irq (	339	mp_override_legacy_irq (

Lines 118-123 Link Here

(-)1.18/include/asm-i386/acpi.h (+1 lines)
118	#ifdef CONFIG_X86_IO_APIC	118	#ifdef CONFIG_X86_IO_APIC
119	extern int skip_ioapic_setup;	119	extern int skip_ioapic_setup;
120	extern int acpi_irq_to_vector(u32 irq); /* deprecated in favor of acpi_gsi_to_irq */	120	extern int acpi_irq_to_vector(u32 irq); /* deprecated in favor of acpi_gsi_to_irq */
		121	extern int acpi_skip_timer_override;
121		122
122	static inline void disable_ioapic_setup(void)	123	static inline void disable_ioapic_setup(void)
123	{	124	{

Lines 108-113 Link Here

(-)1.9/include/asm-x86_64/acpi.h (+1 lines)
108	extern int acpi_disabled;	108	extern int acpi_disabled;
109	extern int acpi_ht;	109	extern int acpi_ht;
110	static inline void disable_acpi(void) { acpi_disabled = 1; acpi_ht = 0; }	110	static inline void disable_acpi(void) { acpi_disabled = 1; acpi_ht = 0; }
		111	#define acpi_skip_timer_override 0
111		112
112	/* Fixmap pages to reserve for ACPI boot-time tables (see fixmap.h) */	113	/* Fixmap pages to reserve for ACPI boot-time tables (see fixmap.h) */
113	#define FIX_ACPI_PAGES 4	114	#define FIX_ACPI_PAGES 4

Return to bug 1203