diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-19 03:44:37 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-19 03:44:37 -0500 |
| commit | 3ac3ba0b396fd99550e08034b0e4c27fdf39c252 (patch) | |
| tree | f9f69fac41d66540a37a33808714d055d702328f /include/linux/sched.h | |
| parent | 934352f214b3251eb0793c1209d346595a661d80 (diff) | |
| parent | 7f0f598a0069d1ab072375965a4b69137233169c (diff) | |
Merge branch 'linus' into sched/core
Conflicts:
kernel/Makefile
Diffstat (limited to 'include/linux/sched.h')
| -rw-r--r-- | include/linux/sched.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 295b7c756ca6..644ffbda17ca 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
| @@ -247,6 +247,7 @@ extern void init_idle(struct task_struct *idle, int cpu); | |||
| 247 | extern void init_idle_bootup_task(struct task_struct *idle); | 247 | extern void init_idle_bootup_task(struct task_struct *idle); |
| 248 | 248 | ||
| 249 | extern int runqueue_is_locked(void); | 249 | extern int runqueue_is_locked(void); |
| 250 | extern void task_rq_unlock_wait(struct task_struct *p); | ||
| 250 | 251 | ||
| 251 | extern cpumask_t nohz_cpu_mask; | 252 | extern cpumask_t nohz_cpu_mask; |
| 252 | #if defined(CONFIG_SMP) && defined(CONFIG_NO_HZ) | 253 | #if defined(CONFIG_SMP) && defined(CONFIG_NO_HZ) |