Skip to contentSkip to conversation

2.4.19-pre7+ I/O-APIC inconsistency

PATCH Mikael Pettersson 1 participant 1 message May 11, 2002

lore
Share & tools
lore
#0 lore raw

2.4.19-pre7 changed the behaviour of CONFIG_X86_UP_IOAPIC due to the following patch

arch/i386/kernel/io_apic.c +5 -1
@@ -191,15 +191,27 @@
 #define MAX_PIRQS 8
 int pirq_entries [MAX_PIRQS];
 int pirqs_enabled;
-int skip_ioapic_setup;
+#ifdef CONFIG_X86_UP_APIC
+int skip_ioapic_setup=1;
+#else
+int skip_ioapic_setup=0;
+#endif
 

which patch-2.4.19.log seems to attribute to <[email protected]>.

This causes CONFIG_X86_UP_IOAPIC to no longer attempt to use the I/O-APIC like it used to: now you also have to append an "apic" command-line option to the kernel. Not only is this a break from previous behaviour and the documentation (Configure.help), but it's also inconsistent with SMP, since an SMP kernel _will_ try to use the I/O-APIC without any additional hackery needed.

(I just helped some high-speed Linux routing colleagues over here debug a problem with their new dual P4 Xeon E7500 chipset boxes. SMP kernels worked, but they couldn't figure out why UP_IOAPIC kernels wouldn't detect and use the I/O-APIC. The patch above was the culprit.)

Unless this change is absolutely necessary (note that the "noapic" command line option is still functional for those that need it), I suggest applying the patch below to restore the previous behaviour.

/Mikael

arch/i386/kernel/io_apic.c renamed from arch/i386/kernel/io_apic.c.~1~ +1 -5
@@ -191,11 +191,7 @@
 #define MAX_PIRQS 8
 int pirq_entries [MAX_PIRQS];
 int pirqs_enabled;
-#ifdef CONFIG_X86_UP_APIC
-int skip_ioapic_setup=1;
-#else
-int skip_ioapic_setup=0;
-#endif
+int skip_ioapic_setup;
 
 static int __init noioapic_setup(char *str)
 {