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 /include/linux | |
| parent | sched: Use correct macro to display sched_child_runs_first in /proc/sched_debug (diff) | |
| parent | sched: Revert nohz_ratelimit() for now (diff) | |
| download | linux-dev-0bcfe75807944106a3aa655a54bb610d62f3a7f5.tar.xz linux-dev-0bcfe75807944106a3aa655a54bb610d62f3a7f5.zip | |
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 'include/linux')
| -rw-r--r-- | include/linux/sched.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 9a7bc5ba7e7e..2091ea2a2c5c 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 /* |