diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-03-01 02:55:20 -0500 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-03-01 02:55:20 -0500 |
commit | 35858adbfca13678af99fb31618ef4428d6dedb0 (patch) | |
tree | 3336feaa61324486945816cb52c347733e7c0821 /kernel/acct.c | |
parent | 197d4db752e67160d79fed09968c2140376a80a3 (diff) | |
parent | 4b70858ba8d4537daf782defebe5f2ff80ccef2b (diff) |
Merge branch 'next' into for-linus
Diffstat (limited to 'kernel/acct.c')
-rw-r--r-- | kernel/acct.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/acct.c b/kernel/acct.c index 9a4715a2f6bf..a6605ca921b6 100644 --- a/kernel/acct.c +++ b/kernel/acct.c | |||
@@ -536,7 +536,8 @@ static void do_acct_process(struct bsd_acct_struct *acct, | |||
536 | do_div(elapsed, AHZ); | 536 | do_div(elapsed, AHZ); |
537 | ac.ac_btime = get_seconds() - elapsed; | 537 | ac.ac_btime = get_seconds() - elapsed; |
538 | /* we really need to bite the bullet and change layout */ | 538 | /* we really need to bite the bullet and change layout */ |
539 | current_uid_gid(&ac.ac_uid, &ac.ac_gid); | 539 | ac.ac_uid = orig_cred->uid; |
540 | ac.ac_gid = orig_cred->gid; | ||
540 | #if ACCT_VERSION==2 | 541 | #if ACCT_VERSION==2 |
541 | ac.ac_ahz = AHZ; | 542 | ac.ac_ahz = AHZ; |
542 | #endif | 543 | #endif |