aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-10 11:34:43 -0400
committerIngo Molnar <mingo@elte.hu>2009-03-10 11:34:43 -0400
commit8c54436ae9f59146b3d02820a3ebbf71e61f2aee (patch)
tree0ab1a3847809bd7d5f44fc52b1f16fabd953c4bb /kernel
parent5ed0cec0ac5f1b3759bdbe4d9df32ee4ff8afb5a (diff)
parent7a203f3b089be4410fe065dd9927027eade94557 (diff)
Merge branches 'sched/cleanups' and 'linus' into sched/core
Diffstat (limited to 'kernel')
-rw-r--r--kernel/softirq.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/softirq.c b/kernel/softirq.c
index bdbe9de9cd8d..9041ea7948fe 100644
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -626,6 +626,7 @@ static int ksoftirqd(void * __bind_cpu)
626 preempt_enable_no_resched(); 626 preempt_enable_no_resched();
627 cond_resched(); 627 cond_resched();
628 preempt_disable(); 628 preempt_disable();
629 rcu_qsctr_inc((long)__bind_cpu);
629 } 630 }
630 preempt_enable(); 631 preempt_enable();
631 set_current_state(TASK_INTERRUPTIBLE); 632 set_current_state(TASK_INTERRUPTIBLE);