Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...

[cascardo/linux.git] / kernel / pid.c

diff --git a/kernel/pid.c b/kernel/pid.c
index 82430c8..cd36a5e 100644 (file)
--- a/kernel/pid.c
+++ b/kernel/pid.c
@@ -79,7 +79,10 @@ struct pid_namespace init_pid_ns = {
        .level = 0,
        .child_reaper = &init_task,
        .user_ns = &init_user_ns,
-       .proc_inum = PROC_PID_INIT_INO,
+       .ns.inum = PROC_PID_INIT_INO,
+#ifdef CONFIG_PID_NS
+       .ns.ops = &pidns_operations,
+#endif
 };
 EXPORT_SYMBOL_GPL(init_pid_ns);