Merge tag 'please-pull-misc-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git...

[deliverable/linux.git] / kernel / user.c

diff --git a/kernel/user.c b/kernel/user.c
index a7ca84bad8e6c544b77537fe5a295fc81ef9381d..b069ccbfb0b0375b5ab03445472f2679d6981bbf 100644 (file)
--- a/kernel/user.c
+++ b/kernel/user.c
@@ -51,6 +51,10 @@ struct user_namespace init_user_ns = {
        .owner = GLOBAL_ROOT_UID,
        .group = GLOBAL_ROOT_GID,
        .ns.inum = PROC_USER_INIT_INO,
+#ifdef CONFIG_USER_NS
+       .ns.ops = &userns_operations,
+#endif
+       .flags = USERNS_INIT_FLAGS,
 #ifdef CONFIG_PERSISTENT_KEYRINGS
        .persistent_keyring_register_sem =
        __RWSEM_INITIALIZER(init_user_ns.persistent_keyring_register_sem),