leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sched/urgent' into sched/core

Browse Source 
Conflicts:
	include/linux/sched.h

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

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar
2010-08-05 09:46:29 +02:00
parent eebef74695 396e894d28
commit 0bcfe75807
3 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/linux/sched.h
View File

@@ -273,14 +273,8 @@ extern cpumask_var_t nohz_cpu_mask;
#if defined(CONFIG_SMP) && defined(CONFIG_NO_HZ) #if defined(CONFIG_SMP) && defined(CONFIG_NO_HZ)
extern void select_nohz_load_balancer(int stop_tick); extern void select_nohz_load_balancer(int stop_tick);
extern int get_nohz_timer_target(void); extern int get_nohz_timer_target(void);
extern int nohz_ratelimit(int cpu);
#else #else
static inline void select_nohz_load_balancer(int stop_tick) { } static inline void select_nohz_load_balancer(int stop_tick) { }
static inline int nohz_ratelimit(int cpu)
{
return 0;
}
#endif #endif
/* /*

10
kernel/sched.c
View File

@@ -1255,16 +1255,6 @@ void wake_up_idle_cpu(int cpu)
smp_send_reschedule(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 */ #endif /* CONFIG_NO_HZ */
static u64 sched_avg_period(void) static u64 sched_avg_period(void)

2
kernel/time/tick-sched.c
View File

@@ -325,7 +325,7 @@ void tick_nohz_stop_sched_tick(int inidle)
} while (read_seqretry(&xtime_lock, seq)); } while (read_seqretry(&xtime_lock, seq));
if (rcu_needs_cpu(cpu) || printk_needs_cpu(cpu) || 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; next_jiffies = last_jiffies + 1;
delta_jiffies = 1; delta_jiffies = 1;
} else { } else {