summaryrefslogtreecommitdiffstats
path: root/kernel/user.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2014-11-01 02:32:53 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2014-12-04 14:34:47 -0500
commit33c429405a2c8d9e42afb9fee88a63cfb2de1e98 (patch)
treed2ffe096cd36852049b844c8befd1ba0ba6cf18c /kernel/user.c
parent6344c433a452b1a05d03a61a6a85d89f793bb7b8 (diff)
downloadblackbird-op-linux-33c429405a2c8d9e42afb9fee88a63cfb2de1e98.tar.gz
blackbird-op-linux-33c429405a2c8d9e42afb9fee88a63cfb2de1e98.zip
copy address of proc_ns_ops into ns_common
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'kernel/user.c')
-rw-r--r--kernel/user.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/user.c b/kernel/user.c
index a7ca84bad8e6..69b800aebf13 100644
--- a/kernel/user.c
+++ b/kernel/user.c
@@ -51,6 +51,9 @@ 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
#ifdef CONFIG_PERSISTENT_KEYRINGS
.persistent_keyring_register_sem =
__RWSEM_INITIALIZER(init_user_ns.persistent_keyring_register_sem),
OpenPOWER on IntegriCloud