diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-03-26 15:45:22 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-26 15:45:22 +0100 |
| commit | a5ebc0b1a7843508b375f7ab8a36a628e5c9f372 (patch) | |
| tree | 04d3ab410e08b4d9174c663dd6bf95611dd16d0a /kernel/rcuclassic.c | |
| parent | Merge branches 'timers/clockevents', 'timers/hpet', 'timers/hrtimers' and 'timers/urgent' into timers/core (diff) | |
| parent | Linux 2.6.29 (diff) | |
| download | linux-dev-a5ebc0b1a7843508b375f7ab8a36a628e5c9f372.tar.xz linux-dev-a5ebc0b1a7843508b375f7ab8a36a628e5c9f372.zip | |
Merge commit 'v2.6.29' into timers/core
Diffstat (limited to 'kernel/rcuclassic.c')
| -rw-r--r-- | kernel/rcuclassic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/rcuclassic.c b/kernel/rcuclassic.c index bd5a9003497c..654c640a6b9c 100644 --- a/kernel/rcuclassic.c +++ b/kernel/rcuclassic.c @@ -679,8 +679,8 @@ int rcu_needs_cpu(int cpu) void rcu_check_callbacks(int cpu, int user) { if (user || - (idle_cpu(cpu) && !in_softirq() && - hardirq_count() <= (1 << HARDIRQ_SHIFT))) { + (idle_cpu(cpu) && rcu_scheduler_active && + !in_softirq() && hardirq_count() <= (1 << HARDIRQ_SHIFT))) { /* * Get here if this CPU took its interrupt from user |