To keep a proper housekeeping namespace.

Signed-off-by: Frederic Weisbecker <fweis...@gmail.com>
Cc: Chris Metcalf <cmetc...@mellanox.com>
Cc: Rik van Riel <r...@redhat.com>
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: Thomas Gleixner <t...@linutronix.de>
Cc: Mike Galbraith <efa...@gmx.de>
Cc: Ingo Molnar <mi...@kernel.org>
Cc: Christoph Lameter <c...@linux.com>
Cc: Paul E. McKenney <paul...@linux.vnet.ibm.com>
Cc: Wanpeng Li <kernel...@gmail.com>
Cc: Luiz Capitulino <lcapitul...@redhat.com>
---
 include/linux/housekeeping.h | 2 +-
 kernel/sched/core.c          | 6 +++---
 kernel/sched/fair.c          | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/linux/housekeeping.h b/include/linux/housekeeping.h
index cbe8d63..320cc2b 100644
--- a/include/linux/housekeeping.h
+++ b/include/linux/housekeeping.h
@@ -29,7 +29,7 @@ static inline void housekeeping_affine(struct task_struct *t) 
{ }
 static inline void housekeeping_init(void) { }
 #endif /* CONFIG_NO_HZ_FULL */
 
-static inline bool is_housekeeping_cpu(int cpu)
+static inline bool housekeeping_cpu(int cpu)
 {
 #ifdef CONFIG_NO_HZ_FULL
        if (static_branch_unlikely(&housekeeping_overriden))
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 536d6a5..fd00ae3 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -527,7 +527,7 @@ int get_nohz_timer_target(void)
        int i, cpu = smp_processor_id();
        struct sched_domain *sd;
 
-       if (!idle_cpu(cpu) && is_housekeeping_cpu(cpu))
+       if (!idle_cpu(cpu) && housekeeping_cpu(cpu))
                return cpu;
 
        rcu_read_lock();
@@ -536,14 +536,14 @@ int get_nohz_timer_target(void)
                        if (cpu == i)
                                continue;
 
-                       if (!idle_cpu(i) && is_housekeeping_cpu(i)) {
+                       if (!idle_cpu(i) && housekeeping_cpu(i)) {
                                cpu = i;
                                goto unlock;
                        }
                }
        }
 
-       if (!is_housekeeping_cpu(cpu))
+       if (!housekeeping_cpu(cpu))
                cpu = housekeeping_any_cpu();
 unlock:
        rcu_read_unlock();
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 5455e98..0d8f7b1 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -8739,7 +8739,7 @@ void nohz_balance_enter_idle(int cpu)
                return;
 
        /* Spare idle load balancing on CPUs that don't want to be disturbed: */
-       if (!is_housekeeping_cpu(cpu))
+       if (!housekeeping_cpu(cpu))
                return;
 
        if (test_bit(NOHZ_TICK_STOPPED, nohz_flags(cpu)))
-- 
2.7.4

Reply via email to