Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6] / security / keys / key.c

diff --git a/security/keys/key.c b/security/keys/key.c
index 700400d801dcc1e5360427bfc07c9c722a256c46..01bbc6d9d19b0997a8d984cdd2373d9adc96090b 100644 (file)
--- a/security/keys/key.c
+++ b/security/keys/key.c
@@ -1001,7 +1001,7 @@ void __init key_init(void)
 {
        /* allocate a slab in which we can store keys */
        key_jar = kmem_cache_create("key_jar", sizeof(struct key),
-                       0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL, NULL);
+                       0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
 
        /* add the special key types */
        list_add_tail(&key_type_keyring.link, &key_types_list);