Merge branch 'linus' into core/ipi

2009-03-13 02:14:25 +01:00
parent 0b13fda1e0 9ead64974b
commit 25d500067d
556 changed files with 8956 additions and 4469 deletions
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -626,6 +626,7 @@ static int ksoftirqd(void * __bind_cpu)
 			preempt_enable_no_resched();
 			cond_resched();
 			preempt_disable();
+			rcu_qsctr_inc((long)__bind_cpu);
 		}
 		preempt_enable();
 		set_current_state(TASK_INTERRUPTIBLE);