diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2018-02-20 10:59:45 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-03-09 07:59:24 +0100 |
| commit | dd707247ababb685ac4b8b2c6a7bf2923725e6ac (patch) | |
| tree | afa448d57a98d7d008bc67289b904d24a2f5e38b /kernel | |
| parent | af3fe03c562055bc3c116eabe73f141ae31bf234 (diff) | |
| download | linux-stable-dd707247ababb685ac4b8b2c6a7bf2923725e6ac.tar.gz linux-stable-dd707247ababb685ac4b8b2c6a7bf2923725e6ac.tar.bz2 linux-stable-dd707247ababb685ac4b8b2c6a7bf2923725e6ac.zip | |
sched/nohz: Merge CONFIG_NO_HZ_COMMON blocks
Now that we have two back-to-back NO_HZ_COMMON blocks, merge them.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched/fair.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 0da79d8a6a2c..d6767f533029 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -9487,11 +9487,7 @@ out: */ WRITE_ONCE(nohz.has_blocked, 1); } -#else -static inline void nohz_balancer_kick(struct rq *rq) { } -#endif -#ifdef CONFIG_NO_HZ_COMMON /* * In CONFIG_NO_HZ_COMMON case, the idle balance kickee will do the * rebalancing for all the CPUs for whom scheduler ticks are stopped. @@ -9598,12 +9594,14 @@ abort: return true; } -#else +#else /* !CONFIG_NO_HZ_COMMON */ +static inline void nohz_balancer_kick(struct rq *rq) { } + static bool nohz_idle_balance(struct rq *this_rq, enum cpu_idle_type idle) { return false; } -#endif +#endif /* CONFIG_NO_HZ_COMMON */ /* * run_rebalance_domains is triggered when needed from the scheduler tick. |