Re: Linux 2.4.19-pre8

[Christoph Hellwig]

On Fri, May 03, 2002 at 08:32:12AM -0600, Ivan G. wrote:
> Upgrading 2.4.19-pre3 to 2.4.19-pre8
> but problem is probably created by 2.4.19-pre7 where i saw apic changes

I think the following patch should fix it:

diff -uNr -Xdontdiff linux-2.4.19-pre7/arch/i386/kernel/dmi_scan.c linux/arch/i386/kernel/dmi_scan.c
--- linux-2.4.19-pre7/arch/i386/kernel/dmi_scan.c	Tue Apr 16 20:49:06 2002
+++ linux/arch/i386/kernel/dmi_scan.c	Tue Apr 16 20:56:03 2002
@@ -362,7 +362,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_UP_IOAPIC
 	skip_ioapic_setup = 0;
 #endif
 	return 0;
diff -uNr -Xdontdiff linux-2.4.19-pre7/init/main.c linux/init/main.c
--- linux-2.4.19-pre7/init/main.c	Tue Apr 16 20:47:46 2002
+++ linux/init/main.c	Tue Apr 16 20:59:56 2002
@@ -296,8 +296,7 @@
 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)