patch-2.1.37 linux/kernel/softirq.c

• Lines: 20
• Date: Tue May 13 21:40:00 1997
• Orig file: v2.1.36/linux/kernel/softirq.c
• Orig date: Mon Apr 14 16:28:26 1997

diff -u --recursive --new-file v2.1.36/linux/kernel/softirq.c linux/kernel/softirq.c
@@ -62,13 +62,14 @@
 
 asmlinkage void do_bottom_half(void)
 {
-	int cpu = smp_processor_id();
+	if (softirq_trylock()) {
+		int cpu = smp_processor_id();
 
-	if (hardirq_trylock(cpu)) {
-		if (softirq_trylock()) {
+		if (hardirq_trylock(cpu)) {
+			__sti();
 			run_bottom_halves();
-			softirq_endlock();
+			hardirq_endlock(cpu);
 		}
-		hardirq_endlock(cpu);
+		softirq_endlock();
 	}
 }