From 12ac1ce1fd438516d852df4d13c784b7687f83d6 Mon Sep 17 00:00:00 2001
From: Jens Axboe <jens.axboe@oracle.com>
Date: Fri, 12 Jan 2007 12:20:26 +0100
Subject: [PATCH] --- yaml --- r: 45504 b: refs/heads/master c:
 c43a5082a61f351248c5f015ee5d4641309bd96e h: refs/heads/master v: v3

---
 [refs]            | 2 +-
 trunk/mm/bounce.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7ded6402e890..4c2e3becd310 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d39c9400ae0d60aaaf534b1ad860a9bc1413d8af
+refs/heads/master: c43a5082a61f351248c5f015ee5d4641309bd96e
diff --git a/trunk/mm/bounce.c b/trunk/mm/bounce.c
index e4b62d2a4024..643efbe82402 100644
--- a/trunk/mm/bounce.c
+++ b/trunk/mm/bounce.c
@@ -237,6 +237,8 @@ static void __blk_queue_bounce(request_queue_t *q, struct bio **bio_orig,
 	if (!bio)
 		return;
 
+	blk_add_trace_bio(q, *bio_orig, BLK_TA_BOUNCE);
+
 	/*
 	 * at least one page was bounced, fill in possible non-highmem
 	 * pages
@@ -291,8 +293,6 @@ void blk_queue_bounce(request_queue_t *q, struct bio **bio_orig)
 		pool = isa_page_pool;
 	}
 
-	blk_add_trace_bio(q, *bio_orig, BLK_TA_BOUNCE);
-
 	/*
 	 * slow path
 	 */