--- 2.2.15pre14-long-cli/include/asm-alpha/smplock.h.~1~	Thu Mar 16 23:49:33 2000
+++ 2.2.15pre14-long-cli/include/asm-alpha/smplock.h	Wed Mar 29 14:46:34 2000
@@ -17,8 +17,6 @@
 {
 	if (task->lock_depth >= 0)
 		spin_unlock(&kernel_flag);
-	release_irqlock(cpu);
-	__sti();
 }
 
 /*
--- 2.2.15pre14-long-cli/include/asm-arm/smplock.h.~1~	Mon Jan 17 16:44:44 2000
+++ 2.2.15pre14-long-cli/include/asm-arm/smplock.h	Wed Mar 29 14:47:04 2000
@@ -15,8 +15,6 @@
 do { \
 	if (task->lock_depth >= 0) \
 		spin_unlock(&kernel_flag); \
-	release_irqlock(cpu); \
-	__sti(); \
 } while (0)
 
 /*
--- 2.2.15pre14-long-cli/include/asm-generic/smplock.h.~1~	Mon Jan 17 16:44:44 2000
+++ 2.2.15pre14-long-cli/include/asm-generic/smplock.h	Wed Mar 29 14:48:01 2000
@@ -15,8 +15,6 @@
 do { \
 	if (task->lock_depth >= 0) \
 		spin_unlock(&kernel_flag); \
-	release_irqlock(cpu); \
-	__sti(); \
 } while (0)
 
 /*
--- 2.2.15pre14-long-cli/include/asm-i386/smplock.h.~1~	Wed Mar 29 02:14:01 2000
+++ 2.2.15pre14-long-cli/include/asm-i386/smplock.h	Wed Mar 29 14:46:26 2000
@@ -15,8 +15,6 @@
 do { \
 	if (task->lock_depth >= 0) \
 		spin_unlock(&kernel_flag); \
-	release_irqlock(cpu); \
-	__sti(); \
 } while (0)
 
 /*
--- 2.2.15pre14-long-cli/include/asm-m68k/smplock.h.~1~	Mon Jan 17 16:44:45 2000
+++ 2.2.15pre14-long-cli/include/asm-m68k/smplock.h	Wed Mar 29 14:48:06 2000
@@ -15,8 +15,6 @@
 do { \
 	if (task->lock_depth >= 0) \
 		spin_unlock(&kernel_flag); \
-	release_irqlock(cpu); \
-	__sti(); \
 } while (0)
 
 /*
--- 2.2.15pre14-long-cli/include/asm-mips/smplock.h.~1~	Mon Jan 17 16:44:45 2000
+++ 2.2.15pre14-long-cli/include/asm-mips/smplock.h	Wed Mar 29 14:48:10 2000
@@ -18,8 +18,6 @@
 do { \
 	if (task->lock_depth >= 0) \
 		spin_unlock(&kernel_flag); \
-	release_irqlock(cpu); \
-	__sti(); \
 } while (0)
 
 /*
--- 2.2.15pre14-long-cli/include/asm-ppc/smplock.h.~1~	Mon Jan 17 16:44:45 2000
+++ 2.2.15pre14-long-cli/include/asm-ppc/smplock.h	Wed Mar 29 14:48:13 2000
@@ -15,8 +15,6 @@
 do { \
 	if (task->lock_depth >= 0) \
 		spin_unlock(&kernel_flag); \
-	release_irqlock(cpu); \
-	__sti(); \
 } while (0)
 
 /*
--- 2.2.15pre14-long-cli/include/asm-s390/smplock.h.~1~	Mon Jan 17 16:44:45 2000
+++ 2.2.15pre14-long-cli/include/asm-s390/smplock.h	Wed Mar 29 14:48:17 2000
@@ -18,8 +18,6 @@
 do {                                       \
 	if (task->lock_depth >= 0)         \
 		spin_unlock(&kernel_flag); \
-	release_irqlock(cpu);              \
-	__sti();                           \
 } while (0)
 
 /*
--- 2.2.15pre14-long-cli/include/asm-sparc/smplock.h.~1~	Mon Jan 17 16:44:46 2000
+++ 2.2.15pre14-long-cli/include/asm-sparc/smplock.h	Wed Mar 29 14:48:20 2000
@@ -15,8 +15,6 @@
 do { \
 	if (task->lock_depth >= 0) \
 		spin_unlock(&kernel_flag); \
-	release_irqlock(cpu); \
-	__sti(); \
 } while (0)
 
 /*
--- 2.2.15pre14-long-cli/include/asm-sparc64/smplock.h.~1~	Mon Jan 17 16:44:46 2000
+++ 2.2.15pre14-long-cli/include/asm-sparc64/smplock.h	Wed Mar 29 14:48:23 2000
@@ -16,8 +16,6 @@
 do { \
 	if (task->lock_depth >= 0) \
 		spin_unlock(&kernel_flag); \
-	release_irqlock(cpu); \
-	__sti(); \
 } while (0)
 
 /*
--- 2.2.15pre14-long-cli/kernel/sched.c.~1~	Wed Jan  5 14:16:56 2000
+++ 2.2.15pre14-long-cli/kernel/sched.c	Wed Mar 29 14:44:25 2000
@@ -689,6 +689,7 @@
 	struct task_struct *prev, *next, *p;
 	int this_cpu, c;
 
+	sti();
 	if (tq_scheduler)
 		goto handle_tq_scheduler;
 tq_scheduler_back: