diff --git a/[refs] b/[refs] index 27bf57a7255b..70d08c6ca27c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 45626bb26a6ecd163e5eeddd14a6137052ec4495 +refs/heads/master: b59f8197c5ddd0d5d74b663650be5449dacd34aa diff --git a/trunk/kernel/acct.c b/trunk/kernel/acct.c index cf19547cc9e4..521dfa53cb99 100644 --- a/trunk/kernel/acct.c +++ b/trunk/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(¤t->sighand->siglock);