Re: 2.4.19-pre8 doesn't compile (missing skip_ioapic_setup)

[Mikael Pettersson]

Ben Castricum writes:
 > Having a go at 2.4.19-pre8 gives me this error:
 > ...
 > init/main.o: In function `smp_init':
 > init/main.o(.text.init+0x59e): undefined reference to `skip_ioapic_setup'
 > arch/i386/kernel/kernel.o: In function `broken_pirq':
 > arch/i386/kernel/kernel.o(.text.init+0x3096): undefined reference to
 > `skip_ioapic_setup'
 > make: *** [vmlinux] Error 1
 > 
 > 
 > Not using local io-apic makes the problem (and the feature) go away. This
 > is on a uni-processor system with SMP disabled. Full .config at

Apply the patch below.

/Mikael

--- linux-2.4.19-pre8/arch/i386/kernel/dmi_scan.c.~1~	Sat May  4 15:35:10 2002
+++ linux-2.4.19-pre8/arch/i386/kernel/dmi_scan.c	Sat May  4 17:51:32 2002
@@ -418,7 +418,7 @@
 	printk(KERN_INFO " *** If you see IRQ problems, in paticular SCSI resets and hangs at boot\n");
 	printk(KERN_INFO " *** contact your hardware vendor and ask about updates.\n");
 	printk(KERN_INFO " *** Building an SMP kernel may evade the bug some of the time.\n");
-#ifdef CONFIG_X86_UP_APIC
+#ifdef CONFIG_X86_IO_APIC
 	skip_ioapic_setup = 0;
 #endif
 	return 0;
--- linux-2.4.19-pre8/init/main.c.~1~	Sat May  4 15:35:18 2002
+++ linux-2.4.19-pre8/init/main.c	Sat May  4 17:51:32 2002
@@ -293,11 +293,9 @@
 #ifndef CONFIG_SMP
 
 #ifdef CONFIG_X86_LOCAL_APIC
-extern int skip_ioapic_setup;
 static void __init smp_init(void)
 {
-	if (!skip_ioapic_setup)
-		APIC_init_uniprocessor();
+	APIC_init_uniprocessor();
 }
 #else
 #define smp_init()	do { } while (0)