summaryrefslogtreecommitdiff
path: root/include/linux/namespace.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-11-07 22:51:47 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-11-07 22:51:47 -0500
commit6b995751c2e851d2bc9c277b5884d0adb519e31d (patch)
tree7a15b41b5d8ce612915584a0773c670d5c0ab5b8 /include/linux/namespace.h
parent6c2f4267833f453156f8f439cc32eb4c92f357b4 (diff)
parentd27ba47e7e8c466c18983a1779d611f82d6a354f (diff)
downloadolio-linux-3.10-6b995751c2e851d2bc9c277b5884d0adb519e31d.tar.xz
olio-linux-3.10-6b995751c2e851d2bc9c277b5884d0adb519e31d.zip
Merge branch 'master'
Diffstat (limited to 'include/linux/namespace.h')
-rw-r--r--include/linux/namespace.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/namespace.h b/include/linux/namespace.h
index 0e5a86f13b2..6731977c4c1 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 *);