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 'master' into for_paulus
[firefly-linux-kernel-4.4.55.git]
/
include
/
linux
/
nsproxy.h
diff --git
a/include/linux/nsproxy.h
b/include/linux/nsproxy.h
index fdfb0e44912f1ce68794e52f6ca5cf5756f45ae7..0b9f0dc30d6114a1f5177a7fde829d2199137172 100644
(file)
--- a/
include/linux/nsproxy.h
+++ b/
include/linux/nsproxy.h
@@
-24,7
+24,6
@@
struct pid_namespace;
struct nsproxy {
atomic_t count;
spinlock_t nslock;
- unsigned long id;
struct uts_namespace *uts_ns;
struct ipc_namespace *ipc_ns;
struct mnt_namespace *mnt_ns;