git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
arch
/
mips
/
kernel
/
irixsig.c
diff --git
a/arch/mips/kernel/irixsig.c
b/arch/mips/kernel/irixsig.c
index
8150f07
..
08273a2
100644
(file)
--- a/
arch/mips/kernel/irixsig.c
+++ b/
arch/mips/kernel/irixsig.c
@@
-603,7
+603,7
@@
repeat:
/* move to end of parent's list to avoid starvation */
write_lock_irq(&tasklist_lock);
remove_parent(p);
/* move to end of parent's list to avoid starvation */
write_lock_irq(&tasklist_lock);
remove_parent(p);
- add_parent(p);
+ add_parent(p
, p->parent
);
write_unlock_irq(&tasklist_lock);
retval = ru ? getrusage(p, RUSAGE_BOTH, ru) : 0;
if (retval)
write_unlock_irq(&tasklist_lock);
retval = ru ? getrusage(p, RUSAGE_BOTH, ru) : 0;
if (retval)
@@
-643,7
+643,7
@@
repeat:
write_lock_irq(&tasklist_lock);
remove_parent(p);
p->parent = p->real_parent;
write_lock_irq(&tasklist_lock);
remove_parent(p);
p->parent = p->real_parent;
- add_parent(p);
+ add_parent(p
, p->parent
);
do_notify_parent(p, SIGCHLD);
write_unlock_irq(&tasklist_lock);
} else
do_notify_parent(p, SIGCHLD);
write_unlock_irq(&tasklist_lock);
} else