Merge branch 'rt/head' into rt/2.6.31

0902912a · Thomas Gleixner · c4fabb49 · ca0b4bfa · 0902912a
Commit 0902912a authored Nov 10, 2009 by Thomas Gleixner
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

kernel/softirq.c kernel/softirq.c +1 -1

No files found.
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -1033,10 +1033,10 @@ sleep_more:
 				goto sleep_more;
 			}
 			per_cpu(softirq_running, cpu) |= softirq_mask;
-			__preempt_enable_no_resched();
 			set_softirq_pending(local_softirq_pending() & ~softirq_mask);
 			local_bh_disable();
 			local_irq_enable();
+			preempt_enable();

 			h = &softirq_vec[data->nr];
 			if (h)