From 3d83717ea2def6af1c88498c90d0406623fbbbf3 Mon Sep 17 00:00:00 2001 From: "Paul E. McKenney" Date: Fri, 5 Aug 2011 22:39:02 -0700 Subject: [PATCH] --- yaml --- r: 268969 b: refs/heads/master c: 717f98f0f87c16c1e5768ac8f67c27f3d3535a25 h: refs/heads/master i: 268967: 959b37d79379b80a05d06223ca35564e4922b401 v: v3 --- [refs] | 2 +- trunk/kernel/rcutree.c | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/[refs] b/[refs] index afc9703ef8d4..66079721b816 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fc0763f53e3ff6a6bfa66934662a3446b9ca6f16 +refs/heads/master: 717f98f0f87c16c1e5768ac8f67c27f3d3535a25 diff --git a/trunk/kernel/rcutree.c b/trunk/kernel/rcutree.c index 7e2f297aeec8..0c6c30dc6a7c 100644 --- a/trunk/kernel/rcutree.c +++ b/trunk/kernel/rcutree.c @@ -373,13 +373,6 @@ void rcu_enter_nohz(void) smp_mb__after_atomic_inc(); /* Force ordering with next sojourn. */ WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1); local_irq_restore(flags); - - /* If the interrupt queued a callback, get out of dyntick mode. */ - if (in_irq() && - (__get_cpu_var(rcu_sched_data).nxtlist || - __get_cpu_var(rcu_bh_data).nxtlist || - rcu_preempt_needs_cpu(smp_processor_id()))) - set_need_resched(); } /*