diff options
| author | James Morris <jmorris@namei.org> | 2009-06-10 21:03:14 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-06-10 21:03:14 -0400 |
| commit | 73fbad283cfbbcf02939bdbda31fc4a30e729cca (patch) | |
| tree | 7c89fe13e1b4a2c7f2d60f4ea6eaf69c14bccab7 /kernel/exit.c | |
| parent | 769f3e8c384795cc350e2aae27de2a12374d19d4 (diff) | |
| parent | 35f2c2f6f6ae13ef23c4f68e6d3073753077ca43 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'kernel/exit.c')
| -rw-r--r-- | kernel/exit.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index abf9cf3b95c6..036e8d740169 100644 --- a/kernel/exit.c +++ b/kernel/exit.c | |||
| @@ -1476,6 +1476,7 @@ static int wait_consider_task(struct task_struct *parent, int ptrace, | |||
| 1476 | */ | 1476 | */ |
| 1477 | if (*notask_error) | 1477 | if (*notask_error) |
| 1478 | *notask_error = ret; | 1478 | *notask_error = ret; |
| 1479 | return 0; | ||
| 1479 | } | 1480 | } |
| 1480 | 1481 | ||
| 1481 | if (likely(!ptrace) && unlikely(p->ptrace)) { | 1482 | if (likely(!ptrace) && unlikely(p->ptrace)) { |