Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 11803
b: refs/heads/master
c: 9e4e23b
h: refs/heads/master
i:
  11801: d342dfe
  11799: fb2f6fe
v: v3
  • Loading branch information
Oleg Nesterov authored and Linus Torvalds committed Oct 31, 2005
1 parent 00ef13a commit 4a88212
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 833d304b22edff5cc687ab7e5549c2f0dcdd951a
refs/heads/master: 9e4e23bccb127fac109e765dfb7f9372661cb415
7 changes: 3 additions & 4 deletions trunk/fs/exec.c
Original file line number Diff line number Diff line change
Expand Up @@ -630,10 +630,9 @@ static inline int de_thread(struct task_struct *tsk)
/*
* Account for the thread group leader hanging around:
*/
count = 2;
if (thread_group_leader(current))
count = 1;
else {
count = 1;
if (!thread_group_leader(current)) {
count = 2;
/*
* The SIGALRM timer survives the exec, but needs to point
* at us as the new group leader now. We have a race with
Expand Down

0 comments on commit 4a88212

Please sign in to comment.