diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-01-23 18:07:21 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-01-23 18:07:21 -0500 |
| commit | 9156ad48338e0306e508ead5c0d9986050744475 (patch) | |
| tree | 37f3a90e38190052ecf3cdf9171dfdddd37b56fd /kernel/acct.c | |
| parent | fa28237cfcc5827553044cbd6ee52e33692b0faa (diff) | |
| parent | 8f7b3d156d348b6766833cd4e272d0d19b501e64 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'kernel/acct.c')
| -rw-r--r-- | kernel/acct.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/acct.c b/kernel/acct.c index cf19547cc9e4..521dfa53cb99 100644 --- a/kernel/acct.c +++ b/kernel/acct.c | |||
| @@ -482,7 +482,7 @@ static void do_acct_process(struct file *file) | |||
| 482 | #endif | 482 | #endif |
| 483 | #if ACCT_VERSION==3 | 483 | #if ACCT_VERSION==3 |
| 484 | ac.ac_pid = current->tgid; | 484 | ac.ac_pid = current->tgid; |
| 485 | ac.ac_ppid = current->parent->tgid; | 485 | ac.ac_ppid = current->real_parent->tgid; |
| 486 | #endif | 486 | #endif |
| 487 | 487 | ||
| 488 | spin_lock_irq(¤t->sighand->siglock); | 488 | spin_lock_irq(¤t->sighand->siglock); |