rcu: Consolidate expedited GP code into exp_funnel_lock()

[cascardo/linux.git] / kernel / rcu / tree.c

diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
index 5b1c8fd..e8fff14 100644 (file)
--- a/kernel/rcu/tree.c
+++ b/kernel/rcu/tree.c
@@ -3653,6 +3653,8 @@ fastpath:
                mutex_unlock(&rsp->exp_mutex);
                return true;
        }
+       rcu_exp_gp_seq_start(rsp);
+       trace_rcu_exp_grace_period(rsp->name, s, TPS("start"));
        return false;
 }
 
@@ -3905,9 +3907,6 @@ void synchronize_sched_expedited(void)
        if (exp_funnel_lock(rsp, s))
                return;  /* Someone else did our work for us. */
 
-       rcu_exp_gp_seq_start(rsp);
-       trace_rcu_exp_grace_period(rsp->name, s, TPS("start"));
-
        /* Initialize the rcu_node tree in preparation for the wait. */
        sync_rcu_exp_select_cpus(rsp, sync_sched_exp_handler);