diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-08-05 09:46:29 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-08-05 09:46:29 +0200 |
commit | 0bcfe75807944106a3aa655a54bb610d62f3a7f5 (patch) | |
tree | d48d848e09d1bf48fe7fa23e9226f38ef342eed4 | |
parent | eebef74695e1498e04e5f85be9c6f84bd2e7358a (diff) | |
parent | 396e894d289d69bacf5acd983c97cd6e21a14c08 (diff) | |
download | kernel_samsung_tuna-0bcfe75807944106a3aa655a54bb610d62f3a7f5.zip kernel_samsung_tuna-0bcfe75807944106a3aa655a54bb610d62f3a7f5.tar.gz kernel_samsung_tuna-0bcfe75807944106a3aa655a54bb610d62f3a7f5.tar.bz2 |
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>
-rw-r--r-- | include/linux/sched.h | 6 | ||||
-rw-r--r-- | kernel/sched.c | 10 | ||||
-rw-r--r-- | kernel/time/tick-sched.c | 2 |
3 files changed, 1 insertions, 17 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 9a7bc5b..2091ea2 100644 --- 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 16f3f77..f6c9bb6 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 17525ca..021d2f8 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 { |