1 files changed, 6 insertions, 6 deletions

diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
index 71395e91b876..81105141b6a8 100644
--- a/kernel/rcu/tree.c
+++ b/kernel/rcu/tree.c
@@ -1912,7 +1912,7 @@ rcu_report_unblock_qs_rnp(struct rcu_node *rnp, unsigned long flags)
         struct rcu_node *rnp_p;
 
         raw_lockdep_assert_held_rcu_node(rnp);
-        if (WARN_ON_ONCE(!IS_ENABLED(CONFIG_PREEMPT)) ||
+        if (WARN_ON_ONCE(!IS_ENABLED(CONFIG_PREEMPTION)) ||
             WARN_ON_ONCE(rcu_preempt_blocked_readers_cgp(rnp)) ||
             rnp->qsmask != 0) {
                 raw_spin_unlock_irqrestore_rcu_node(rnp, flags);
@@ -2266,7 +2266,7 @@ static void force_qs_rnp(int (*f)(struct rcu_data *rdp))
                 mask = 0;
                 raw_spin_lock_irqsave_rcu_node(rnp, flags);
                 if (rnp->qsmask == 0) {
-                        if (!IS_ENABLED(CONFIG_PREEMPT) ||
+                        if (!IS_ENABLED(CONFIG_PREEMPTION) ||
                             rcu_preempt_blocked_readers_cgp(rnp)) {
                                 /*
                                  * No point in scanning bits because they
@@ -2681,7 +2681,7 @@ static int rcu_blocking_is_gp(void)
 {
         int ret;
 
-        if (IS_ENABLED(CONFIG_PREEMPT))
+        if (IS_ENABLED(CONFIG_PREEMPTION))
                 return rcu_scheduler_active == RCU_SCHEDULER_INACTIVE;
         might_sleep();  /* Check for RCU read-side critical section. */
         preempt_disable();
@@ -3297,13 +3297,13 @@ static int __init rcu_spawn_gp_kthread(void)
         t = kthread_create(rcu_gp_kthread, NULL, "%s", rcu_state.name);
         if (WARN_ONCE(IS_ERR(t), "%s: Could not start grace-period kthread, OOM is now expected behavior\n", __func__))
                 return 0;
-        rnp = rcu_get_root();
-        raw_spin_lock_irqsave_rcu_node(rnp, flags);
-        rcu_state.gp_kthread = t;
         if (kthread_prio) {
                 sp.sched_priority = kthread_prio;
                 sched_setscheduler_nocheck(t, SCHED_FIFO, &sp);
         }
+        rnp = rcu_get_root();
+        raw_spin_lock_irqsave_rcu_node(rnp, flags);
+        rcu_state.gp_kthread = t;
         raw_spin_unlock_irqrestore_rcu_node(rnp, flags);
         wake_up_process(t);
         rcu_spawn_nocb_kthreads();