From 34699045eda8dd02d4d8aed444063b95aeaaa2d1 Mon Sep 17 00:00:00 2001
From: Mike Galbraith <efault@gmx.de>
Date: Thu, 10 Dec 2009 09:25:53 +0100
Subject: [PATCH] --- yaml --- r: 175593 b: refs/heads/master c:
 4ca3ef71f54655af98b66e8ff308a47a2a580a53 h: refs/heads/master i:   175591:
 27cabfa3a5eace82a063967528ce48ec884913b7 v: v3

---
 [refs]               | 2 +-
 trunk/kernel/sched.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 95b2c40d9874..cee362f539a5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: acb4a848da821a095ae9e4d8b22ae2d9633ba5cd
+refs/heads/master: 4ca3ef71f54655af98b66e8ff308a47a2a580a53
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index 0a60e8e9b094..3de3deab8095 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/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) {