diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-04 18:49:19 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-04 18:49:19 +0100 |
| commit | 28b1bd1cbc33cae95a309691d814399a69cf3070 (patch) | |
| tree | 6474d10332662f5302be0df8527c9e9e31e32a95 /include/linux/sched.h | |
| parent | 2602c3ba4508f528db024c1d209256513ea05de6 (diff) | |
| parent | 1075414b06109a99b0e87601e84c74a95bd45681 (diff) | |
Merge branch 'core/locking' into tracing/ftrace
Diffstat (limited to 'include/linux/sched.h')
| -rw-r--r-- | include/linux/sched.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 698ce978e97..0237d124089 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -333,7 +333,9 @@ extern signed long schedule_timeout(signed long timeout); extern signed long schedule_timeout_interruptible(signed long timeout); extern signed long schedule_timeout_killable(signed long timeout); extern signed long schedule_timeout_uninterruptible(signed long timeout); +asmlinkage void __schedule(void); asmlinkage void schedule(void); +extern int mutex_spin_on_owner(struct mutex *lock, struct thread_info *owner); struct nsproxy; struct user_namespace; @@ -1330,6 +1332,7 @@ struct task_struct { int lockdep_depth; unsigned int lockdep_recursion; struct held_lock held_locks[MAX_LOCK_DEPTH]; + gfp_t lockdep_reclaim_gfp; #endif /* journalling filesystem info */ |