Merge branch 'master'

1 files changed, 2 insertions, 1 deletions

diff --git a/include/linux/namespace.h b/include/linux/namespace.h
index 0e5a86f13b2f..6731977c4c13 100644
--- a/include/linux/namespace.h
+++ b/include/linux/namespace.h
@@ -9,7 +9,8 @@ struct namespace {
         atomic_t                count;
         struct vfsmount *       root;
         struct list_head        list;
-        struct rw_semaphore     sem;
+        wait_queue_head_t poll;
+        int event;
 };
 
 extern int copy_namespace(int, struct task_struct *);