[PATCH] Fix compilation errors in 20030813 when IO APIC not configured

[PATCH] Fix compilation errors in 20030813 when IO APIC not configured

[Stefan Becker (NMP/Salo)]

[-- Attachment #1: Type: text/plain, Size: 445 bytes --]

Hi,

when I tried to compile 2.4.22-rc2 + ACPI 20030813 I got a compilation 
error in setup.c. Adding a CONFIG_X86_IO_APIC around the offending 
places fixed the problem. See the attached diffs.

Reading some recent messages on this mailing list, I think I should try 
to enable the kernel options LOCAL APIC and IO APIC for my laptop though...

Regards,

	Stefan

---
Stefan Becker
E-Mail: Stefan.Becker-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org

[-- Attachment #2: acpi-20030813-2.4.22-rc2-FIX.diff --]
[-- Type: text/plain, Size: 822 bytes --]

--- linux-2.4.22-rc2/arch/i386/kernel/setup.c~	2003-08-20 18:36:25.000000000 +0300
+++ linux-2.4.22-rc2/arch/i386/kernel/setup.c	2003-08-20 19:01:50.000000000 +0300
@@ -179,6 +179,9 @@
 int acpi_disabled __initdata = 0;
 int acpi_ht __initdata = 1; 	/* enable HT */
 int acpi_force __initdata = 0;
+#ifdef  CONFIG_X86_IO_APIC
+extern int skip_ioapic_setup;
+#endif
 #else
 int acpi_disabled __initdata = 1;
 #endif
@@ -825,11 +828,13 @@
 			if (!acpi_force) acpi_disabled = 1; 
 		} 
 
+#ifdef CONFIG_X86_IO_APIC
                 /* disable IO-APIC */
                 else if (!memcmp(from, "noapic", 6)) {
                         skip_ioapic_setup = 1;
                 }
 #endif
+#endif
 		/*
 		 * highmem=size forces highmem to be exactly 'size' bytes.
 		 * This works even on boxes that have no highmem otherwise.