lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests 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)
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
/*