Merge 4.4.187 into android-4.4

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / kernel / user.c

diff --git a/kernel/user.c b/kernel/user.c
index b069ccb..41e94e4 100644 (file)
--- a/kernel/user.c
+++ b/kernel/user.c
@@ -16,6 +16,7 @@
 #include <linux/interrupt.h>
 #include <linux/export.h>
 #include <linux/user_namespace.h>
+#include <linux/proc_fs.h>
 #include <linux/proc_ns.h>
 
 /*
@@ -201,6 +202,7 @@ struct user_struct *alloc_uid(kuid_t uid)
                }
                spin_unlock_irq(&uidhash_lock);
        }
+       proc_register_uid(uid);
 
        return up;
 
@@ -222,6 +224,7 @@ static int __init uid_cache_init(void)
        spin_lock_irq(&uidhash_lock);
        uid_hash_insert(&root_user, uidhashentry(GLOBAL_ROOT_UID));
        spin_unlock_irq(&uidhash_lock);
+       proc_register_uid(GLOBAL_ROOT_UID);
 
        return 0;
 }