projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'char-misc-3.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
user.c
diff --git
a/kernel/user.c
b/kernel/user.c
index 69b800aebf13574a4b3a57445016a62d83e9d87b..b069ccbfb0b0375b5ab03445472f2679d6981bbf 100644
(file)
--- a/
kernel/user.c
+++ b/
kernel/user.c
@@
-54,6
+54,7
@@
struct user_namespace init_user_ns = {
#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),