diff options
author | Christoph Lameter <clameter@sgi.com> | 2006-12-06 23:33:19 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 11:39:24 -0500 |
commit | 441e143e95f5aa1e04026cb0aa71c801ba53982f (patch) | |
tree | 884855ea1fdaa65ebc885ffebc65ee3a26f8a78f /drivers/s390/block | |
parent | e94b1766097d53e6f3ccfb36c8baa562ffeda3fc (diff) |
[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')
-rw-r--r-- | drivers/s390/block/dasd_eckd.c | 2 | ||||
-rw-r--r-- | drivers/s390/block/dasd_fba.c | 2 |
2 files changed, 2 insertions, 2 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) | |||
1215 | dst = page_address(bv->bv_page) + bv->bv_offset; | 1215 | dst = page_address(bv->bv_page) + bv->bv_offset; |
1216 | if (dasd_page_cache) { | 1216 | if (dasd_page_cache) { |
1217 | char *copy = kmem_cache_alloc(dasd_page_cache, | 1217 | char *copy = kmem_cache_alloc(dasd_page_cache, |
1218 | SLAB_DMA | __GFP_NOWARN); | 1218 | GFP_DMA | __GFP_NOWARN); |
1219 | if (copy && rq_data_dir(req) == WRITE) | 1219 | if (copy && rq_data_dir(req) == WRITE) |
1220 | memcpy(copy + bv->bv_offset, dst, bv->bv_len); | 1220 | memcpy(copy + bv->bv_offset, dst, bv->bv_len); |
1221 | if (copy) | 1221 | if (copy) |
diff --git a/drivers/s390/block/dasd_fba.c b/drivers/s390/block/dasd_fba.c index 80926c548228..b857fd5893fd 100644 --- a/drivers/s390/block/dasd_fba.c +++ b/drivers/s390/block/dasd_fba.c | |||
@@ -308,7 +308,7 @@ dasd_fba_build_cp(struct dasd_device * device, struct request *req) | |||
308 | dst = page_address(bv->bv_page) + bv->bv_offset; | 308 | dst = page_address(bv->bv_page) + bv->bv_offset; |
309 | if (dasd_page_cache) { | 309 | if (dasd_page_cache) { |
310 | char *copy = kmem_cache_alloc(dasd_page_cache, | 310 | char *copy = kmem_cache_alloc(dasd_page_cache, |
311 | SLAB_DMA | __GFP_NOWARN); | 311 | GFP_DMA | __GFP_NOWARN); |
312 | if (copy && rq_data_dir(req) == WRITE) | 312 | if (copy && rq_data_dir(req) == WRITE) |
313 | memcpy(copy + bv->bv_offset, dst, bv->bv_len); | 313 | memcpy(copy + bv->bv_offset, dst, bv->bv_len); |
314 | if (copy) | 314 | if (copy) |