upgrade to linux 2.6.10-1.12_FC2

[linux-2.6.git] / drivers / s390 / block / dasd_eckd.c

diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index cfd5884..c2396fe 100644 (file)
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -7,7 +7,7 @@
  * Bugreports.to..: <Linux390@de.ibm.com>
  * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000
  *
- * $Revision: 1.63 $
+ * $Revision: 1.65 $
  */
 
 #include <linux/config.h>
@@ -1037,7 +1037,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_ATOMIC | SLAB_DMA | __GFP_NOWARN);
+                                                     SLAB_DMA | __GFP_NOWARN);
                        if (copy && rq_data_dir(req) == WRITE)
                                memcpy(copy + bv->bv_offset, dst, bv->bv_len);
                        if (copy)
@@ -1133,7 +1133,7 @@ dasd_eckd_free_cp(struct dasd_ccw_req *cqr, struct request *req)
                                if (dst != cda) {
                                        if (rq_data_dir(req) == READ)
                                                memcpy(dst, cda, bv->bv_len);
-                                       kmem_cache_free(dasd_page_cache, 
+                                       kmem_cache_free(dasd_page_cache,
                                            (void *)((addr_t)cda & PAGE_MASK));
                                }
                                dst = NULL;