Merge branches 'x86/apic', 'x86/asm', 'x86/fixmap', 'x86/memtest', 'x86/mm', 'x86/urgent', 'linus' and 'core/percpu' into x86/core

2009-03-10 09:26:38 +01:00
parent 1f442d70c8 7ab152470e 8827247ffc d1a8e77920 0feca851c1 d0fc63f7bd 7a203f3b08 3a450de136
commit 467c88fee5
143 changed files with 2069 additions and 2156 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);