aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/softirq.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-12 21:14:25 -0400
committerIngo Molnar <mingo@elte.hu>2009-03-12 21:14:25 -0400
commit25d500067d5a666d1336598d1b324793554e5496 (patch)
tree3402308c4c69a66d02ce55f5c165e242fad2a8a9 /kernel/softirq.c
parent0b13fda1e0936b3d64c4c407f183d33fa6bd2ad4 (diff)
parent9ead64974b05501bbac0d63a47c99fa786d064ba (diff)
Merge branch 'linus' into core/ipi
Diffstat (limited to 'kernel/softirq.c')
-rw-r--r--kernel/softirq.c1
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)
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);