Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754842AbbEOTO0 (ORCPT ); Fri, 15 May 2015 15:14:26 -0400 Received: from www.osadl.org ([62.245.132.105]:45079 "EHLO www.osadl.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752912AbbEOTOW (ORCPT ); Fri, 15 May 2015 15:14:22 -0400 From: Nicholas Mc Guire To: Ingo Molnar Cc: Peter Zijlstra , linux-kernel@vger.kernel.org, Nicholas Mc Guire Subject: [PATCH RFC] sched: fix function declaration return type mismatch Date: Fri, 15 May 2015 21:05:42 +0200 Message-Id: <1431716742-11077-1-git-send-email-hofrat@osadl.org> X-Mailer: git-send-email 1.7.10.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2289 Lines: 62 static code checking was unhappy with ./kernel/sched/fair.c:162 WARNING: return of wrong type int != unsigned int get_update_sysctl_factor() is declared to return int but is currently returning an unsigned int. The first few preprocessed lines are: static int get_update_sysctl_factor(void) { unsigned int cpus = ({ int __min1 = (cpumask_weight(cpu_online_mask)); int __min2 = (8); __min1 < __min2 ? __min1: __min2; }); unsigned int factor; min_t should be unsigned int and return type of get_update_sysctl_factor also unsigned int as its call-site update_sysctl() is expecting unsigned int and the values utilizing factor sysctl_sched_min_granularity , sched_nr_latency and sysctl_sched_wakeup_granularity are also unsigned int (and cpumask_weight also is returning unsigned int). Patch was compile tested with x86_64_defconfig + CONFIG_SCHED_DEBUG=y and changed sections in kernel/sched/fair.i reviewed. Patch is against 4.1-rc3 (localversion-next is -next-20150514) Signed-off-by: Nicholas Mc Guire --- kernel/sched/fair.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 8c1510a..a9895b0 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -141,9 +141,9 @@ static inline void update_load_set(struct load_weight *lw, unsigned long w) * * This idea comes from the SD scheduler of Con Kolivas: */ -static int get_update_sysctl_factor(void) +static unsigned int get_update_sysctl_factor(void) { - unsigned int cpus = min_t(int, num_online_cpus(), 8); + unsigned int cpus = min_t(unsigned int, num_online_cpus(), 8); unsigned int factor; switch (sysctl_sched_tunable_scaling) { @@ -576,7 +576,7 @@ int sched_proc_update_handler(struct ctl_table *table, int write, loff_t *ppos) { int ret = proc_dointvec_minmax(table, write, buffer, lenp, ppos); - int factor = get_update_sysctl_factor(); + unsigned int factor = get_update_sysctl_factor(); if (ret || !write) return ret; -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/