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>

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 9a7bc5ba7e7e501a6850e2cef17afe3a11ddb2c3..2091ea2a2c5cbb0b0ad2dca9a534aeac682abf11 100644 (file)
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -273,14 +273,8 @@ extern cpumask_var_t nohz_cpu_mask;
 #if defined(CONFIG_SMP) && defined(CONFIG_NO_HZ)
 extern void select_nohz_load_balancer(int stop_tick);
 extern int get_nohz_timer_target(void);
-extern int nohz_ratelimit(int cpu);
 #else
 static inline void select_nohz_load_balancer(int stop_tick) { }
-
-static inline int nohz_ratelimit(int cpu)
-{
-       return 0;
-}
 #endif
 
 /*

diff --git a/kernel/sched.c b/kernel/sched.c
index 16f3f77f71beccb828d47e3870a3650a9db255c5..f6c9bb6ac70b382a29a907833f13bca9bc2bb61e 100644 (file)
--- 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)

diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
index 17525cac6cfefd136d9a4f68e942dfe0346bffa1..021d2f878f193bfe6eb2bacebd313dc3a4f5f072 100644 (file)
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
@@ -325,7 +325,7 @@ void tick_nohz_stop_sched_tick(int inidle)
        } while (read_seqretry(&xtime_lock, seq));
 
        if (rcu_needs_cpu(cpu) || printk_needs_cpu(cpu) ||
-           arch_needs_cpu(cpu) || nohz_ratelimit(cpu)) {
+           arch_needs_cpu(cpu)) {
                next_jiffies = last_jiffies + 1;
                delta_jiffies = 1;
        } else {