aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederic Weisbecker <frederic@kernel.org>2017-10-26 22:42:33 -0400
committerIngo Molnar <mingo@kernel.org>2017-10-27 03:55:28 -0400
commit204c083a009378dfa751175b5fcddc75988bab6c (patch)
tree4cf5864a13daa51b73d0a10b1149fd228ed7e9b8
parente179f5a04ba46ee5c5439480c2bfd68c358168b7 (diff)
sched/isolation: Rename is_housekeeping_cpu() to housekeeping_cpu()
Fit it into the housekeeping_*() namespace. Signed-off-by: Frederic Weisbecker <frederic@kernel.org> Acked-by: Thomas Gleixner <tglx@linutronix.de> Cc: Chris Metcalf <cmetcalf@mellanox.com> Cc: Christoph Lameter <cl@linux.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Luiz Capitulino <lcapitulino@redhat.com> Cc: Mike Galbraith <efault@gmx.de> Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Rik van Riel <riel@redhat.com> Cc: Wanpeng Li <kernellwp@gmail.com> Link: http://lkml.kernel.org/r/1509072159-31808-7-git-send-email-frederic@kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r--include/linux/sched/isolation.h2
-rw-r--r--kernel/sched/core.c6
-rw-r--r--kernel/sched/fair.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/sched/isolation.h b/include/linux/sched/isolation.h
index 194c586fbb12..ad0f5d986a2e 100644
--- a/include/linux/sched/isolation.h
+++ b/include/linux/sched/isolation.h
@@ -29,7 +29,7 @@ static inline void housekeeping_affine(struct task_struct *t) { }
29static inline void housekeeping_init(void) { } 29static inline void housekeeping_init(void) { }
30#endif /* CONFIG_NO_HZ_FULL */ 30#endif /* CONFIG_NO_HZ_FULL */
31 31
32static inline bool is_housekeeping_cpu(int cpu) 32static inline bool housekeeping_cpu(int cpu)
33{ 33{
34#ifdef CONFIG_NO_HZ_FULL 34#ifdef CONFIG_NO_HZ_FULL
35 if (static_branch_unlikely(&housekeeping_overriden)) 35 if (static_branch_unlikely(&housekeeping_overriden))
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index ad188acb7636..d0fb448dd43a 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -527,7 +527,7 @@ int get_nohz_timer_target(void)
527 int i, cpu = smp_processor_id(); 527 int i, cpu = smp_processor_id();
528 struct sched_domain *sd; 528 struct sched_domain *sd;
529 529
530 if (!idle_cpu(cpu) && is_housekeeping_cpu(cpu)) 530 if (!idle_cpu(cpu) && housekeeping_cpu(cpu))
531 return cpu; 531 return cpu;
532 532
533 rcu_read_lock(); 533 rcu_read_lock();
@@ -536,14 +536,14 @@ int get_nohz_timer_target(void)
536 if (cpu == i) 536 if (cpu == i)
537 continue; 537 continue;
538 538
539 if (!idle_cpu(i) && is_housekeeping_cpu(i)) { 539 if (!idle_cpu(i) && housekeeping_cpu(i)) {
540 cpu = i; 540 cpu = i;
541 goto unlock; 541 goto unlock;
542 } 542 }
543 } 543 }
544 } 544 }
545 545
546 if (!is_housekeeping_cpu(cpu)) 546 if (!housekeeping_cpu(cpu))
547 cpu = housekeeping_any_cpu(); 547 cpu = housekeeping_any_cpu();
548unlock: 548unlock:
549 rcu_read_unlock(); 549 rcu_read_unlock();
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 591481db8c6a..cdece8f967f0 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -9027,7 +9027,7 @@ void nohz_balance_enter_idle(int cpu)
9027 return; 9027 return;
9028 9028
9029 /* Spare idle load balancing on CPUs that don't want to be disturbed: */ 9029 /* Spare idle load balancing on CPUs that don't want to be disturbed: */
9030 if (!is_housekeeping_cpu(cpu)) 9030 if (!housekeeping_cpu(cpu))
9031 return; 9031 return;
9032 9032
9033 if (test_bit(NOHZ_TICK_STOPPED, nohz_flags(cpu))) 9033 if (test_bit(NOHZ_TICK_STOPPED, nohz_flags(cpu)))