Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input

[pandora-kernel.git] / include / linux / namespace.h

diff --git a/include/linux/namespace.h b/include/linux/namespace.h
index 0e5a86f..3abc8e3 100644 (file)
--- a/include/linux/namespace.h
+++ b/include/linux/namespace.h
@@ -9,11 +9,13 @@ 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 *);
 extern void __put_namespace(struct namespace *namespace);
+extern struct namespace *dup_namespace(struct task_struct *, struct fs_struct *);
 
 static inline void put_namespace(struct namespace *namespace)
 {