Additional patch for MIPS against RML's 2.4.19-2 preemptiable kernel patch.

http://www.kernel.org/pub/linux/kernel/people/rml/preempt-kernel/v2.4/preempt-kernel-rml-2.4.19-2.patch

Jun

diff -Nru link/arch/mips/kernel/irq.c.orig link/arch/mips/kernel/irq.c
--- link/arch/mips/kernel/irq.c.orig	Tue Dec 17 09:44:29 2002
+++ link/arch/mips/kernel/irq.c	Tue Dec 17 09:44:45 2002
@@ -507,13 +507,13 @@
 		}
 
 		current->preempt_count ++;
-		sti();
+		__sti();
 		if (user_mode(regs)) {
 			schedule();
 		} else {
 			preempt_schedule();
 		}
-		cli();
+		__cli();
 	}
 #endif
 
diff -Nru link/arch/mips/kernel/time.c.orig link/arch/mips/kernel/time.c
--- link/arch/mips/kernel/time.c.orig	Mon Dec  2 16:56:03 2002
+++ link/arch/mips/kernel/time.c	Tue Dec 17 09:53:37 2002
@@ -416,6 +416,8 @@
 {
 	int cpu = smp_processor_id();
 
+	preempt_disable();
+
 	irq_enter(cpu, irq);
 	kstat.irqs[cpu][irq]++;
 
@@ -426,12 +428,34 @@
 
 	if (softirq_pending(cpu))
 		do_softirq();
+
+#if defined(CONFIG_PREEMPT)
+        while (--current->preempt_count == 0) {
+                db_assert(intr_off());
+                db_assert(!in_interrupt());
+
+                if (current->need_resched == 0) {
+                        break;
+                }
+
+                current->preempt_count ++;
+                __sti();
+                if (user_mode(regs)) {
+                        schedule();
+                } else {
+                        preempt_schedule();
+                }
+                __cli();
+        }
+#endif
 }
 
 asmlinkage void ll_local_timer_interrupt(int irq, struct pt_regs *regs)
 {
 	int cpu = smp_processor_id();
 
+	preempt_disable();
+
 	irq_enter(cpu, irq);
 	kstat.irqs[cpu][irq]++;
 
@@ -442,6 +466,26 @@
 
 	if (softirq_pending(cpu))
 		do_softirq();
+
+#if defined(CONFIG_PREEMPT)
+	while (--current->preempt_count == 0) {
+		db_assert(intr_off());
+		db_assert(!in_interrupt());
+
+		if (current->need_resched == 0) {
+			break;
+		}
+
+		current->preempt_count ++;
+		__sti();
+		if (user_mode(regs)) {
+			schedule();
+		} else {
+			preempt_schedule();
+		}
+		__cli();
+	}
+#endif
 }
 
 /*
diff -Nru link/include/asm-mips/softirq.h.orig link/include/asm-mips/softirq.h
--- link/include/asm-mips/softirq.h.orig	Tue Dec 17 09:44:29 2002
+++ link/include/asm-mips/softirq.h	Tue Dec 17 09:54:13 2002
@@ -10,6 +10,9 @@
 #ifndef _ASM_SOFTIRQ_H
 #define _ASM_SOFTIRQ_H
 
+#include <linux/sched.h>
+#include <linux/spinlock.h>
+
 #include <asm/atomic.h>
 #include <asm/hardirq.h>