diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-13 02:14:25 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-13 02:14:25 +0100 |
commit | 25d500067d5a666d1336598d1b324793554e5496 (patch) | |
tree | 3402308c4c69a66d02ce55f5c165e242fad2a8a9 /kernel/softirq.c | |
parent | generic-ipi: cleanups (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes (diff) | |
download | linux-25d500067d5a666d1336598d1b324793554e5496.tar.xz linux-25d500067d5a666d1336598d1b324793554e5496.zip |
Merge branch 'linus' into core/ipi
Diffstat (limited to 'kernel/softirq.c')
-rw-r--r-- | kernel/softirq.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/softirq.c b/kernel/softirq.c index 48c3d5d627a8..ebe2a4d59f2c 100644 --- 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); |