Merge branch 'sched/urgent' into sched/core

Conflicts:
	include/linux/sched.h

Merge reason: Add the leftover .35 urgent bits, fix the conflict.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 0 insertions, 10 deletions

diff --git a/kernel/sched.c b/kernel/sched.c
index 16f3f77f71be..f6c9bb6ac70b 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -1255,16 +1255,6 @@ void wake_up_idle_cpu(int cpu)
                 smp_send_reschedule(cpu);
 }
 
-int nohz_ratelimit(int cpu)
-{
-        struct rq *rq = cpu_rq(cpu);
-        u64 diff = rq->clock - rq->nohz_stamp;
-
-        rq->nohz_stamp = rq->clock;
-
-        return diff < (NSEC_PER_SEC / HZ) >> 1;
-}
-
 #endif /* CONFIG_NO_HZ */
 
 static u64 sched_avg_period(void)