diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2014-12-11 05:31:59 +0300 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-12-11 05:31:59 +0300 |
| commit | 707c5960f102f8cdafb9406047b158abc71b391f (patch) | |
| tree | 31d195b1c48cefa2d04da7cc801824f87a0a9887 /init | |
| parent | ba00410b8131b23edfb0e09f8b6dd26c8eb621fb (diff) | |
| parent | 3d3d35b1e94ec918fc0ae670663235bf197d8609 (diff) | |
| download | linux-707c5960f102f8cdafb9406047b158abc71b391f.tar.xz | |
Merge branch 'nsfs' into for-next
Diffstat (limited to 'init')
| -rw-r--r-- | init/main.c | 2 | ||||
| -rw-r--r-- | init/version.c | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c index 321d0ceb26d3..40240c8e31e8 100644 --- a/init/main.c +++ b/init/main.c @@ -78,6 +78,7 @@ #include <linux/context_tracking.h> #include <linux/random.h> #include <linux/list.h> +#include <linux/proc_ns.h> #include <asm/io.h> #include <asm/bugs.h> @@ -660,6 +661,7 @@ asmlinkage __visible void __init start_kernel(void) /* rootfs populating might need page-writeback */ page_writeback_init(); proc_root_init(); + nsfs_init(); cgroup_init(); cpuset_init(); taskstats_init_early(); diff --git a/init/version.c b/init/version.c index 1a4718e500fe..fe41a63efed6 100644 --- a/init/version.c +++ b/init/version.c @@ -35,7 +35,10 @@ struct uts_namespace init_uts_ns = { .domainname = UTS_DOMAINNAME, }, .user_ns = &init_user_ns, - .proc_inum = PROC_UTS_INIT_INO, + .ns.inum = PROC_UTS_INIT_INO, +#ifdef CONFIG_UTS_NS + .ns.ops = &utsns_operations, +#endif }; EXPORT_SYMBOL_GPL(init_uts_ns); |