Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[linux-2.6-omap-h63xx.git] / include / linux / nsproxy.h

diff --git a/include/linux/nsproxy.h b/include/linux/nsproxy.h
index 7ebe66670c592d64cba6b829ce42307b141e44cb..f6baecdeecd6d1dd15dcaa11482d5fa87121ec77 100644 (file)
--- a/include/linux/nsproxy.h
+++ b/include/linux/nsproxy.h
@@ -5,6 +5,8 @@
 #include <linux/sched.h>
 
 struct namespace;
+struct uts_namespace;
+struct ipc_namespace;
 
 /*
  * A structure to contain pointers to all per-process
@@ -21,6 +23,8 @@ struct namespace;
 struct nsproxy {
        atomic_t count;
        spinlock_t nslock;
+       struct uts_namespace *uts_ns;
+       struct ipc_namespace *ipc_ns;
        struct namespace *namespace;
 };
 extern struct nsproxy init_nsproxy;