Merge branch 'rework/kthreads' into for-linus

[linux-2.6-microblaze.git] / include / linux / proc_ns.h

diff --git a/include/linux/proc_ns.h b/include/linux/proc_ns.h
index 6abe85c..75807ec 100644 (file)
--- a/include/linux/proc_ns.h
+++ b/include/linux/proc_ns.h
@@ -8,7 +8,7 @@
 #include <linux/ns_common.h>
 
 struct pid_namespace;
-struct nsproxy;
+struct nsset;
 struct path;
 struct task_struct;
 struct inode;
@@ -19,7 +19,7 @@ struct proc_ns_operations {
        int type;
        struct ns_common *(*get)(struct task_struct *task);
        void (*put)(struct ns_common *ns);
-       int (*install)(struct nsproxy *nsproxy, struct ns_common *ns);
+       int (*install)(struct nsset *nsset, struct ns_common *ns);
        struct user_namespace *(*owner)(struct ns_common *ns);
        struct ns_common *(*get_parent)(struct ns_common *ns);
 } __randomize_layout;