From 949a1c27f66a337644e0c98773c934ef1f416ca4 Mon Sep 17 00:00:00 2001 From: Lai Jiangshan Date: Sun, 28 Mar 2010 11:15:20 +0800 Subject: [PATCH] --- yaml --- r: 190995 b: refs/heads/master c: f261414f0d56dd1a0e34888e27d1d4902ad052f3 h: refs/heads/master i: 190993: 28d9a0db2b5a3f7e7ef73e1da2c19a0ae15ff79f 190991: e2bb24632bc09c0c01fcd37fe586364d3e7aca99 v: v3 --- [refs] | 2 +- trunk/kernel/rcutree.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 820bd1dd3675..5c7051fcb24b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d25eb9442bb2c38c1e742f0fa764d7132d72593f +refs/heads/master: f261414f0d56dd1a0e34888e27d1d4902ad052f3 diff --git a/trunk/kernel/rcutree.c b/trunk/kernel/rcutree.c index e54c12351227..6042fb859535 100644 --- a/trunk/kernel/rcutree.c +++ b/trunk/kernel/rcutree.c @@ -1236,11 +1236,11 @@ static void force_quiescent_state(struct rcu_state *rsp, int relaxed) break; /* grace period idle or initializing, ignore. */ case RCU_SAVE_DYNTICK: - - raw_spin_unlock(&rnp->lock); /* irqs remain disabled */ if (RCU_SIGNAL_INIT != RCU_SAVE_DYNTICK) break; /* So gcc recognizes the dead code. */ + raw_spin_unlock(&rnp->lock); /* irqs remain disabled */ + /* Record dyntick-idle state. */ force_qs_rnp(rsp, dyntick_save_progress_counter); raw_spin_lock(&rnp->lock); /* irqs already disabled */