[PATCH] 2.5.4 PREEMPT on UP x86 breakage

Mikael Pettersson (mikpe@csd.uu.se)
Mon, 11 Feb 2002 18:44:56 +0100 (MET)

In 2.5.4, CONFIG_PREEMPT breaks UP x86 kernels by triggering
the BUG in release_kernel_lock(), kernel/sched.c, line 664.
The patch below fixed it for me. It's a bit crude, but smp.h
doesn't export the #define if CONFIG_SMP is disabled.

/Mikael

--- linux-2.5.4/include/asm-i386/smplock.h.~1~ Mon Feb 11 12:21:46 2002
+++ linux-2.5.4/include/asm-i386/smplock.h Mon Feb 11 16:55:18 2002
@@ -15,7 +15,7 @@
#else
#ifdef CONFIG_PREEMPT
#define kernel_locked() preempt_get_count()
-#define global_irq_holder 0
+#define global_irq_holder 0xFF /* XXX: NO_PROC_ID */
#else
#define kernel_locked() 1
#endif
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/