git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
[safe/jmp/linux-2.6]
/
kernel
/
exit.c
diff --git
a/kernel/exit.c
b/kernel/exit.c
index
cab535c
..
51d1fe3
100644
(file)
--- a/
kernel/exit.c
+++ b/
kernel/exit.c
@@
-1472,6
+1472,7
@@
static int wait_consider_task(struct task_struct *parent, int ptrace,
*/
if (*notask_error)
*notask_error = ret;
+ return 0;
}
if (likely(!ptrace) && unlikely(p->ptrace)) {