diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 20:31:38 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 20:31:38 -0500 |
commit | 80c0531514516e43ae118ddf38424e06e5c3cb3c (patch) | |
tree | 2eef8cf8fdf505b18f83078d1eb41167e98f5b54 /kernel/fork.c | |
parent | a457aa6c2bdd743bbbffd3f9e4fdbd8c71f8af1b (diff) | |
parent | 11b751ae8c8ca3fa24c85bd5a3e51dd9f95cda17 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/mingo/mutex-2.6
Diffstat (limited to 'kernel/fork.c')
-rw-r--r-- | kernel/fork.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index 72e3252c6763..b18d64554feb 100644 --- a/kernel/fork.c +++ b/kernel/fork.c | |||
@@ -979,6 +979,10 @@ static task_t *copy_process(unsigned long clone_flags, | |||
979 | } | 979 | } |
980 | #endif | 980 | #endif |
981 | 981 | ||
982 | #ifdef CONFIG_DEBUG_MUTEXES | ||
983 | p->blocked_on = NULL; /* not blocked yet */ | ||
984 | #endif | ||
985 | |||
982 | p->tgid = p->pid; | 986 | p->tgid = p->pid; |
983 | if (clone_flags & CLONE_THREAD) | 987 | if (clone_flags & CLONE_THREAD) |
984 | p->tgid = current->tgid; | 988 | p->tgid = current->tgid; |