summaryrefslogtreecommitdiff
path: root/kernel/nsproxy.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-08-15 12:47:19 +0200
committerTakashi Iwai <tiwai@suse.de>2011-08-15 12:47:19 +0200
commit2d9f8a6e73ef2ec8ecaa24ca98e7010d6edd089f (patch)
tree9ea035b696137b345c69532a318f55502f530558 /kernel/nsproxy.c
parentecf726f5414489fe749477eb77d6cb12bb93c8bc (diff)
parenteade7b281c9fc18401b989c77d5e5e660b25a3b7 (diff)
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'kernel/nsproxy.c')
-rw-r--r--kernel/nsproxy.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c
index d6a00f3de15d..9aeab4b98c64 100644
--- a/kernel/nsproxy.c
+++ b/kernel/nsproxy.c
@@ -271,10 +271,8 @@ out:
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);