From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753138AbbGBO1x (ORCPT ); Thu, 2 Jul 2015 10:27:53 -0400 Received: from mail-pd0-f180.google.com ([209.85.192.180]:36649 "EHLO mail-pd0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753557AbbGBO1n (ORCPT ); Thu, 2 Jul 2015 10:27:43 -0400 From: Boqun Feng To: Ingo Molnar , Peter Zijlstra Cc: linux-kernel@vger.kernel.org, Srikar Dronamraju , Boqun Feng Subject: [PATCH] sched/fair: code clean up for __sched_period() Date: Thu, 2 Jul 2015 22:25:52 +0800 Message-Id: <1435847152-29543-1-git-send-email-boqun.feng@gmail.com> X-Mailer: git-send-email 2.4.5 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 variable, so this patch cleans it up with an if-else statement, which expresses the function's logic straightforwardly. Signed-off-by: Boqun Feng --- 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 4b6e5f6..341a51f 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; } /* -- 2.4.5