2 files changed, 2 insertions, 3 deletions

diff --git a/init/Kconfig b/init/Kconfig
index f0f636cf0ce7..6de46ef12e3f 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -931,7 +931,6 @@ config UIDGID_CONVERTED
         depends on FS_POSIX_ACL = n
         depends on QUOTA = n
         depends on QUOTACTL = n
-        depends on BSD_PROCESS_ACCT = n
 
         # Networking
         depends on NET_9P = n
diff --git a/kernel/acct.c b/kernel/acct.c
index 02e6167a53b0..6cd7529c9e6a 100644
--- a/kernel/acct.c
+++ b/kernel/acct.c
@@ -507,8 +507,8 @@ static void do_acct_process(struct bsd_acct_struct *acct,
         do_div(elapsed, AHZ);
         ac.ac_btime = get_seconds() - elapsed;
         /* we really need to bite the bullet and change layout */
-        ac.ac_uid = orig_cred->uid;
-        ac.ac_gid = orig_cred->gid;
+        ac.ac_uid = from_kuid_munged(file->f_cred->user_ns, orig_cred->uid);
+        ac.ac_gid = from_kgid_munged(file->f_cred->user_ns, orig_cred->gid);
 #if ACCT_VERSION==2
         ac.ac_ahz = AHZ;
 #endif