X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=block%2Fblk-merge.c;h=908d3e11ac523e032f3f73a91932eb49f1a5994a;hb=ab780f1ece0dc8d5e8e8e85435acc5e4747ccda3;hp=c77196d55899729ec6ddceccc80ef44b69f24f42;hpb=c7c22e4d5c1fdebfac4dba76de7d0338c2b0d832;p=linux-2.6-omap-h63xx.git

diff --git a/block/blk-merge.c b/block/blk-merge.c
index c77196d5589..908d3e11ac5 100644
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -400,6 +400,8 @@ static int attempt_merge(struct request_queue *q, struct request *req,
 	}
 
 	req->ioprio = ioprio_best(req->ioprio, next->ioprio);
+	if (blk_rq_cpu_valid(next))
+		req->cpu = next->cpu;
 
 	__blk_put_request(q, next);
 	return 1;