diff options
author | Christoph Lameter <clameter@sgi.com> | 2006-12-06 23:33:17 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 11:39:24 -0500 |
commit | e94b1766097d53e6f3ccfb36c8baa562ffeda3fc (patch) | |
tree | 93fa0a8ab84976d4e89c50768ca8b8878d642a0d /security/keys/key.c | |
parent | 54e6ecb23951b195d02433a741c7f7cb0b796c78 (diff) |
[PATCH] slab: remove SLAB_KERNEL
SLAB_KERNEL is an alias of GFP_KERNEL.
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'security/keys/key.c')
-rw-r--r-- | security/keys/key.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/keys/key.c b/security/keys/key.c index 70eacbe5abd..157bac658bf 100644 --- a/security/keys/key.c +++ b/security/keys/key.c | |||
@@ -285,7 +285,7 @@ struct key *key_alloc(struct key_type *type, const char *desc, | |||
285 | } | 285 | } |
286 | 286 | ||
287 | /* allocate and initialise the key and its description */ | 287 | /* allocate and initialise the key and its description */ |
288 | key = kmem_cache_alloc(key_jar, SLAB_KERNEL); | 288 | key = kmem_cache_alloc(key_jar, GFP_KERNEL); |
289 | if (!key) | 289 | if (!key) |
290 | goto no_memory_2; | 290 | goto no_memory_2; |
291 | 291 | ||