diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-11 13:52:25 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-11 13:52:25 -0500 |
| commit | 2f96cb57cde9957bac0991c712068d29364b2ac9 (patch) | |
| tree | 60e3f985b9e865f3a1fdda131599fa84159cc73e /include/linux | |
| parent | 09eb3b5b1bcab7b25e9dd57e90ee9753adf7afe2 (diff) | |
| parent | 2002c69595a092518107f7e3c1294c9710bc92ae (diff) | |
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
sched: release buddies on yield
fix for account_group_exec_runtime(), make sure ->signal can't be freed under rq->lock
sched: clean up debug info
Diffstat (limited to 'include/linux')
| -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) |