---

yaml --- r: 234687 b: refs/heads/master c: c305d52 h: refs/heads/master i: 234685: 366d497 234683: 92e6b2a 234679: 174d32d 234671: 2815d1b 234655: 4a15cb7 234623: 647b60f v: v3
git-mirror · Feb 8, 2011 · 6c9ff4c · 6c9ff4c
1 parent a12ea46
commit 6c9ff4c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c9a443cdf7726ce8b78c3177c6ae601ce37292fc
+refs/heads/master: c305d524e5dd3c3c7a6035083e30950bea1b52dc
diff --git a/trunk/kernel/softirq.c b/trunk/kernel/softirq.c
@@ -738,7 +738,10 @@ static int run_ksoftirqd(void * __bind_cpu)
 			   don't process */
 			if (cpu_is_offline((long)__bind_cpu))
 				goto wait_to_die;
-			do_softirq();
+			local_irq_disable();
+			if (local_softirq_pending())
+				__do_softirq();
+			local_irq_enable();
 			preempt_enable_no_resched();
 			cond_resched();
 			preempt_disable();