commit 6657719390cd05be45f4e3b501d8bb46889c0a19
author Al Viro <viro@zeniv.linux.org.uk> Tue Jun 28 15:41:10 2011 -0400
committer Al Viro <viro@zeniv.linux.org.uk> Wed Jul 20 01:44:07 2011 -0400
tree 8d2d97f645b05badd134526659f5d9adc7ab9234
parent 1ba106818615faddb63ba782f85f3498b9eb61c6

make sure that nsproxy_cache is initialized early enough

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

kernel/fork.c

diff --git a/kernel/fork.c b/kernel/fork.c
index 0276c30..31fa13e 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1574,6 +1574,7 @@
 			SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_NOTRACK, NULL);
 	vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC);
 	mmap_init();
+	nsproxy_cache_init();
 }
 
 /*

kernel/nsproxy.c

diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c
index d6a00f3..9aeab4b 100644
--- a/kernel/nsproxy.c
+++ b/kernel/nsproxy.c
@@ -271,10 +271,8 @@
 	return err;
 }
 
-static int __init nsproxy_cache_init(void)
+int __init nsproxy_cache_init(void)
 {
 	nsproxy_cachep = KMEM_CACHE(nsproxy, SLAB_PANIC);
 	return 0;
 }
-
-module_init(nsproxy_cache_init);