aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorMike Galbraith <efault@gmx.de>2009-12-10 09:25:53 +0100
committerIngo Molnar <mingo@elte.hu>2009-12-10 09:34:50 +0100
commit4ca3ef71f54655af98b66e8ff308a47a2a580a53 (patch)
tree8c9bb089d56fbf1dd3902cb0a9f43b9b49d4fdc6 /kernel
parentacb4a848da821a095ae9e4d8b22ae2d9633ba5cd (diff)
downloadkernel_samsung_aries-4ca3ef71f54655af98b66e8ff308a47a2a580a53.zip
kernel_samsung_aries-4ca3ef71f54655af98b66e8ff308a47a2a580a53.tar.gz
kernel_samsung_aries-4ca3ef71f54655af98b66e8ff308a47a2a580a53.tar.bz2
sched: Fix build warning in get_update_sysctl_factor()
Signed-off-by: Mike Galbraith <efault@gmx.de> Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Signed-off-by: Ingo Molnar <mingo@elte.hu> LKML-Reference: <new-submission>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sched.c2
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) {