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 /drivers/infiniband/hw/ehca/ehca_mrmw.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 'drivers/infiniband/hw/ehca/ehca_mrmw.c')
-rw-r--r-- | drivers/infiniband/hw/ehca/ehca_mrmw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/ehca/ehca_mrmw.c b/drivers/infiniband/hw/ehca/ehca_mrmw.c index abce676c0ae0..0a5e2214cc5f 100644 --- a/drivers/infiniband/hw/ehca/ehca_mrmw.c +++ b/drivers/infiniband/hw/ehca/ehca_mrmw.c | |||
@@ -53,7 +53,7 @@ static struct ehca_mr *ehca_mr_new(void) | |||
53 | { | 53 | { |
54 | struct ehca_mr *me; | 54 | struct ehca_mr *me; |
55 | 55 | ||
56 | me = kmem_cache_alloc(mr_cache, SLAB_KERNEL); | 56 | me = kmem_cache_alloc(mr_cache, GFP_KERNEL); |
57 | if (me) { | 57 | if (me) { |
58 | memset(me, 0, sizeof(struct ehca_mr)); | 58 | memset(me, 0, sizeof(struct ehca_mr)); |
59 | spin_lock_init(&me->mrlock); | 59 | spin_lock_init(&me->mrlock); |
@@ -72,7 +72,7 @@ static struct ehca_mw *ehca_mw_new(void) | |||
72 | { | 72 | { |
73 | struct ehca_mw *me; | 73 | struct ehca_mw *me; |
74 | 74 | ||
75 | me = kmem_cache_alloc(mw_cache, SLAB_KERNEL); | 75 | me = kmem_cache_alloc(mw_cache, GFP_KERNEL); |
76 | if (me) { | 76 | if (me) { |
77 | memset(me, 0, sizeof(struct ehca_mw)); | 77 | memset(me, 0, sizeof(struct ehca_mw)); |
78 | spin_lock_init(&me->mwlock); | 78 | spin_lock_init(&me->mwlock); |