diff options
author | Tony Lindgren <tony@atomide.com> | 2013-04-01 11:55:04 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2013-04-01 11:55:04 -0400 |
commit | d29778a01d5fc4b69ca1e7bc21121536e5c1c31d (patch) | |
tree | 0fb90068b5b19436723d55bc44350776588c2992 /kernel/user.c | |
parent | ce9df0b00ac7f0a733d361c23bebdd79f32f8adc (diff) | |
parent | 469d633d20c774ecd34ac615c838193e1e150c62 (diff) |
Merge tag 'omap-devel-b-for-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.10/fixes-non-critical
Some miscellaneous OMAP hwmod, powerdomain, and clock fixes for 3.10.
Basic test logs are here:
http://www.pwsan.com/omap/testlogs/prcm_fixes_a_3.10/20130331205716/
Diffstat (limited to 'kernel/user.c')
-rw-r--r-- | kernel/user.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/user.c b/kernel/user.c index e81978e8c03b..8e635a18ab52 100644 --- a/kernel/user.c +++ b/kernel/user.c | |||
@@ -51,6 +51,8 @@ struct user_namespace init_user_ns = { | |||
51 | .owner = GLOBAL_ROOT_UID, | 51 | .owner = GLOBAL_ROOT_UID, |
52 | .group = GLOBAL_ROOT_GID, | 52 | .group = GLOBAL_ROOT_GID, |
53 | .proc_inum = PROC_USER_INIT_INO, | 53 | .proc_inum = PROC_USER_INIT_INO, |
54 | .may_mount_sysfs = true, | ||
55 | .may_mount_proc = true, | ||
54 | }; | 56 | }; |
55 | EXPORT_SYMBOL_GPL(init_user_ns); | 57 | EXPORT_SYMBOL_GPL(init_user_ns); |
56 | 58 | ||