Merge tag 'hwspinlock-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad...

[firefly-linux-kernel-4.4.55.git] / kernel / rcutree_plugin.h

diff --git a/kernel/rcutree_plugin.h b/kernel/rcutree_plugin.h
index 71bd7337d0ccf2e49ff15ae3cdd687a2519352f8..170814dc418f63a4753b1cfdae39d4d2dbff78cf 100644 (file)
--- a/kernel/rcutree_plugin.h
+++ b/kernel/rcutree_plugin.h
@@ -1706,7 +1706,7 @@ static void rcu_prepare_for_idle(int cpu)
                return;
 
        /* If this is a no-CBs CPU, no callbacks, just return. */
-       if (is_nocb_cpu(cpu))
+       if (rcu_is_nocb_cpu(cpu))
                return;
 
        /*
@@ -1748,7 +1748,7 @@ static void rcu_cleanup_after_idle(int cpu)
        struct rcu_data *rdp;
        struct rcu_state *rsp;
 
-       if (is_nocb_cpu(cpu))
+       if (rcu_is_nocb_cpu(cpu))
                return;
        rcu_try_advance_all_cbs();
        for_each_rcu_flavor(rsp) {