Messages in this thread Patch in this message | | | Date | Mon, 6 Jul 2015 23:49:43 -0700 | From | tip-bot for Boqun Feng <> | Subject | [tip:sched/core] sched/fair: Clean up the __sched_period() code |
| |
Commit-ID: 8e2b0bf397279878babcb39b021edcafe7c945eb Gitweb: http://git.kernel.org/tip/8e2b0bf397279878babcb39b021edcafe7c945eb Author: Boqun Feng <boqun.feng@gmail.com> AuthorDate: Thu, 2 Jul 2015 22:25:52 +0800 Committer: Ingo Molnar <mingo@kernel.org> CommitDate: Tue, 7 Jul 2015 08:46:10 +0200
sched/fair: Clean up the __sched_period() code
Since commit:
4bf0b77158 ("sched: remove do_div() from __sched_slice()")
... the logic of __sched_period() can be implemented as a single if-else without any local variables, so this patch cleans it up with an if-else statement, which expresses the function's logic straightforwardly.
Signed-off-by: Boqun Feng <boqun.feng@gmail.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/1435847152-29543-1-git-send-email-boqun.feng@gmail.com Signed-off-by: Ingo Molnar <mingo@kernel.org> --- kernel/sched/fair.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index a53a610..03ea05b 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -616,15 +616,10 @@ static inline u64 calc_delta_fair(u64 delta, struct sched_entity *se) */ static u64 __sched_period(unsigned long nr_running) { - u64 period = sysctl_sched_latency; - unsigned long nr_latency = sched_nr_latency; - - if (unlikely(nr_running > nr_latency)) { - period = sysctl_sched_min_granularity; - period *= nr_running; - } - - return period; + if (unlikely(nr_running > sched_nr_latency)) + return nr_running * sysctl_sched_min_granularity; + else + return sysctl_sched_latency; } /*
| |