Skip to contentSkip to conversation

fix ioapic build breakage

PATCH In review Jeff Garzik 3 participants 4 messages Aug 20, 2003 – Aug 21, 2003

lore
Share & tools
lore

Jeff Garzik

author
#0 lore raw

PATCH 1/1 fix ioapic build breakage

===== arch/i386/kernel/setup.c 1.92 vs edited =====

arch/i386/kernel/setup.c +3 -1
@@ -543,11 +543,13 @@
 			if (!acpi_force) acpi_disabled = 1;
 		}
 
+#ifdef CONFIG_X86_LOCAL_APIC
 		/* disable IO-APIC */
 		else if (!memcmp(from, "noapic", 6)) {
 			skip_ioapic_setup = 1;
 		}
-#endif
+#endif /* CONFIG_X86_LOCAL_APIC */
+#endif /* CONFIG_ACPI_BOOT */
 
 		/*
 		 * highmem=size forces highmem to be exactly 'size' bytes.
#1 lore raw

On Wed, 20 Aug 2003, Jeff Garzik wrote:

[Snip]

This appears to fix it for me.

Signature · 2 lines
Alex Goddard
agoddard at purdue.edu
#2 lore raw
In reply to Jeff Garzik
Quoted 7 lines · Jeff Garzik

===== arch/i386/kernel/setup.c 1.92 vs edited =====

arch/i386/kernel/setup.c +0 -0
@@ -543,11 +543,13 @@
 			if (!acpi_force) acpi_disabled = 1;

arch/i386/kernel/setup.c line 552

Quoted 10 lines
arch/i386/kernel/setup.c +3 -1
 		}
 
+#ifdef CONFIG_X86_LOCAL_APIC
 		/* disable IO-APIC */
 		else if (!memcmp(from, "noapic", 6)) {
 			skip_ioapic_setup = 1;
 		}
-#endif
+#endif /* CONFIG_X86_LOCAL_APIC */
+#endif /* CONFIG_ACPI_BOOT */

Shouldn't that be CONFIG_X86_IO_APIC ?

author
#3 lore raw
Quoted 11 lines · Zwane Mwaikambo
Quoted 8 lines · Jeff Garzik

===== arch/i386/kernel/setup.c 1.92 vs edited =====

arch/i386/kernel/setup.c +0 -0
@@ -543,11 +543,13 @@
 			if (!acpi_force) acpi_disabled = 1;
 		}
Quoted 11 lines

arch/i386/kernel/setup.c line 552

Quoted 8 lines
arch/i386/kernel/setup.c +3 -1
+#ifdef CONFIG_X86_LOCAL_APIC
 		/* disable IO-APIC */
 		else if (!memcmp(from, "noapic", 6)) {
 			skip_ioapic_setup = 1;
 		}
-#endif
+#endif /* CONFIG_X86_LOCAL_APIC */
+#endif /* CONFIG_ACPI_BOOT */

Shouldn't that be CONFIG_X86_IO_APIC ?

If so, other code wants changing, too...

Jeff