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 branch 'topic/intel8x0' into for-linus
[firefly-linux-kernel-4.4.55.git]
/
include
/
linux
/
nsproxy.h
diff --git
a/include/linux/nsproxy.h
b/include/linux/nsproxy.h
index c8a768e59640665af635cedb9c84745e421fdbab..afad7dec1b36fd2fee9e967c804f6b3f87a69bf8 100644
(file)
--- a/
include/linux/nsproxy.h
+++ b/
include/linux/nsproxy.h
@@
-27,7
+27,6
@@
struct nsproxy {
struct ipc_namespace *ipc_ns;
struct mnt_namespace *mnt_ns;
struct pid_namespace *pid_ns;
- struct user_namespace *user_ns;
struct net *net_ns;
};
extern struct nsproxy init_nsproxy;