Commit 0bcfe758 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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: default avatarIngo Molnar <mingo@elte.hu>
parents eebef746 396e894d

include/linux/sched.h

+0 −6
Original line number Diff line number Diff line
@@ -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



/*

kernel/sched.c

+0 −10
Original line number Diff line number Diff line
@@ -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)

kernel/time/tick-sched.c

+1 −1
Original line number Diff line number Diff line
@@ -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 {