aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-08-05 09:46:29 +0200
committerIngo Molnar <mingo@elte.hu>2010-08-05 09:46:29 +0200
commit0bcfe75807944106a3aa655a54bb610d62f3a7f5 (patch)
treed48d848e09d1bf48fe7fa23e9226f38ef342eed4 /kernel
parenteebef74695e1498e04e5f85be9c6f84bd2e7358a (diff)
parent396e894d289d69bacf5acd983c97cd6e21a14c08 (diff)
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>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sched.c10
-rw-r--r--kernel/time/tick-sched.c2
2 files changed, 1 insertions, 11 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index 16f3f77f71b..f6c9bb6ac70 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)
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
index 17525cac6cf..021d2f878f1 100644
--- 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 {