summaryrefslogtreecommitdiffstats
path: root/drivers/s390/block/dasd_eckd.c
diff options
context:
space:
mode:
authorChristoph Lameter2006-12-07 05:33:19 +0100
committerLinus Torvalds2006-12-07 17:39:24 +0100
commit441e143e95f5aa1e04026cb0aa71c801ba53982f (patch)
tree884855ea1fdaa65ebc885ffebc65ee3a26f8a78f /drivers/s390/block/dasd_eckd.c
parent[PATCH] slab: remove SLAB_KERNEL (diff)
downloadkernel-qcow2-linux-441e143e95f5aa1e04026cb0aa71c801ba53982f.tar.gz
kernel-qcow2-linux-441e143e95f5aa1e04026cb0aa71c801ba53982f.tar.xz
kernel-qcow2-linux-441e143e95f5aa1e04026cb0aa71c801ba53982f.zip
[PATCH] slab: remove SLAB_DMA
SLAB_DMA is an alias of GFP_DMA. This is the last one so we remove the leftover comment too. 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/s390/block/dasd_eckd.c')
-rw-r--r--drivers/s390/block/dasd_eckd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index 5ecea3e4fdef..fdaa471e845f 100644
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -1215,7 +1215,7 @@ dasd_eckd_build_cp(struct dasd_device * device, struct request *req)
dst = page_address(bv->bv_page) + bv->bv_offset;
if (dasd_page_cache) {
char *copy = kmem_cache_alloc(dasd_page_cache,
- SLAB_DMA | __GFP_NOWARN);
+ GFP_DMA | __GFP_NOWARN);
if (copy && rq_data_dir(req) == WRITE)
memcpy(copy + bv->bv_offset, dst, bv->bv_len);
if (copy)