diff options
author | 2009-03-08 10:30:18 -0700 | |
---|---|---|
committer | 2009-03-08 10:30:18 -0700 | |
commit | dbb9be8a79802d1d1fd487d54ad48ac0b7fc17df (patch) | |
tree | 1a6f93549250fc611bec649d78f510bb939be0ce | |
parent | Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff) | |
parent | rcu: increment quiescent state counter in ksoftirqd() (diff) | |
download | linux-dev-dbb9be8a79802d1d1fd487d54ad48ac0b7fc17df.tar.xz linux-dev-dbb9be8a79802d1d1fd487d54ad48ac0b7fc17df.zip |
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
rcu: increment quiescent state counter in ksoftirqd()
-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 bdbe9de9cd8d..9041ea7948fe 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); |