2 files changed, 3 insertions, 8 deletions

diff --git a/block/as-iosched.c b/block/as-iosched.c
index 9735acb5b4f5..cf4eb0eefbbf 100644
--- a/block/as-iosched.c
+++ b/block/as-iosched.c
@@ -837,8 +837,7 @@ static void as_completed_request(struct request_queue *q, struct request *rq)
         WARN_ON(!list_empty(&rq->queuelist));
 
         if (RQ_STATE(rq) != AS_RQ_REMOVED) {
-                printk("rq->state %d\n", RQ_STATE(rq));
-                WARN_ON(1);
+                WARN(1, "rq->state %d\n", RQ_STATE(rq));
                 goto out;
         }
 
diff --git a/block/blk-map.c b/block/blk-map.c
index ddd96fb11a7d..af37e4ae62f5 100644
--- a/block/blk-map.c
+++ b/block/blk-map.c
@@ -269,7 +269,6 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
         int reading = rq_data_dir(rq) == READ;
         int do_copy = 0;
         struct bio *bio;
-        unsigned long stack_mask = ~(THREAD_SIZE - 1);
 
         if (len > (q->max_hw_sectors << 9))
                 return -EINVAL;
@@ -278,11 +277,8 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
 
         kaddr = (unsigned long)kbuf;
         alignment = queue_dma_alignment(q) | q->dma_pad_mask;
-        do_copy = ((kaddr & alignment) || (len & alignment));
-
-        if (!((kaddr & stack_mask) ^
-              ((unsigned long)current->stack & stack_mask)))
-                do_copy = 1;
+        do_copy = ((kaddr & alignment) || (len & alignment) ||
+                   object_is_on_stack(kbuf));
 
         if (do_copy)
                 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);