Commit-ID: 4ca3ef71f54655af98b66e8ff308a47a2a580a53 Gitweb: http://git.kernel.org/tip/4ca3ef71f54655af98b66e8ff308a47a2a580a53 Author: Mike Galbraith <efault@xxxxxx> AuthorDate: Thu, 10 Dec 2009 09:25:53 +0100 Committer: Ingo Molnar <mingo@xxxxxxx> CommitDate: Thu, 10 Dec 2009 09:34:50 +0100 sched: Fix build warning in get_update_sysctl_factor() Signed-off-by: Mike Galbraith <efault@xxxxxx> Acked-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx> Signed-off-by: Ingo Molnar <mingo@xxxxxxx> LKML-Reference: <new-submission> --- kernel/sched.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/kernel/sched.c b/kernel/sched.c index 0a60e8e..3de3dea 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -7033,7 +7033,7 @@ cpumask_var_t nohz_cpu_mask; */ static int get_update_sysctl_factor(void) { - unsigned int cpus = min(num_online_cpus(), 8); + unsigned int cpus = min_t(int, num_online_cpus(), 8); unsigned int factor; switch (sysctl_sched_tunable_scaling) { -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html