git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus-3.12-merge' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
include
/
linux
/
user_namespace.h
diff --git
a/include/linux/user_namespace.h
b/include/linux/user_namespace.h
index
14105c2
..
4db2985
100644
(file)
--- a/
include/linux/user_namespace.h
+++ b/
include/linux/user_namespace.h
@@
-27,8
+27,6
@@
struct user_namespace {
kuid_t owner;
kgid_t group;
unsigned int proc_inum;
- bool may_mount_sysfs;
- bool may_mount_proc;
};
extern struct user_namespace init_user_ns;
@@
-85,6
+83,4
@@
static inline void put_user_ns(struct user_namespace *ns)
#endif
-void update_mnt_policy(struct user_namespace *userns);
-
#endif /* _LINUX_USER_H */