Merge branches 'release', 'asus', 'sony-laptop' and 'thinkpad' into release

[~andy/linux] / kernel / acct.c

diff --git a/kernel/acct.c b/kernel/acct.c
index cf19547cc9e42d346c49b0e51e89aa5fb19364d6..521dfa53cb999657ce8971494f1f573d88d55df7 100644 (file)
--- a/kernel/acct.c
+++ b/kernel/acct.c
@@ -482,7 +482,7 @@ static void do_acct_process(struct file *file)
 #endif
 #if ACCT_VERSION==3
        ac.ac_pid = current->tgid;
-       ac.ac_ppid = current->parent->tgid;
+       ac.ac_ppid = current->real_parent->tgid;
 #endif
 
        spin_lock_irq(&current->sighand->siglock);