diff --git a/[refs] b/[refs]
index 968bbb369fdb..8c800fdac08e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d2f5a616d65e3c08acde3195694c4ab8afbc1b7
+refs/heads/master: 4bf0b77158d581c952af237aec79d0604b78fe27
diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c
index 2208692dc4a0..10aa6e1ae3dd 100644
--- a/trunk/kernel/sched_fair.c
+++ b/trunk/kernel/sched_fair.c
@@ -248,8 +248,8 @@ static u64 __sched_period(unsigned long nr_running)
 	unsigned long nr_latency = sched_nr_latency;
 
 	if (unlikely(nr_running > nr_latency)) {
+		period = sysctl_sched_min_granularity;
 		period *= nr_running;
-		do_div(period, nr_latency);
 	}
 
 	return period;