diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2014-12-11 03:31:59 +0100 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-12-11 03:31:59 +0100 |
| commit | 707c5960f102f8cdafb9406047b158abc71b391f (patch) | |
| tree | 31d195b1c48cefa2d04da7cc801824f87a0a9887 /kernel/pid.c | |
| parent | Merge branch 'iov_iter' into for-next (diff) | |
| parent | kill proc_ns completely (diff) | |
| download | linux-707c5960f102f8cdafb9406047b158abc71b391f.tar.xz linux-707c5960f102f8cdafb9406047b158abc71b391f.zip | |
Merge branch 'nsfs' into for-next
Diffstat (limited to 'kernel/pid.c')
| -rw-r--r-- | kernel/pid.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/pid.c b/kernel/pid.c index 9b9a26698144..c17a993a4d2a 100644 --- 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); |