From 07699a4bf9d1b9553d150c9cb8a6031cf4d4ff98 Mon Sep 17 00:00:00 2001
From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Fri, 7 Jan 2011 08:53:58 +0100
Subject: [PATCH] --- yaml --- r: 230610 b: refs/heads/master c:
 23036f1a340beec19cc451ba9719526c4ffb3a57 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/kernel/trace/blktrace.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index cf8978107761..2e1fed707295 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 329a67815b596d23daf0caa588ae0800e925320f
+refs/heads/master: 23036f1a340beec19cc451ba9719526c4ffb3a57
diff --git a/trunk/kernel/trace/blktrace.c b/trunk/kernel/trace/blktrace.c
index 2b8e2ee7c0ef..fab31aff9d97 100644
--- a/trunk/kernel/trace/blktrace.c
+++ b/trunk/kernel/trace/blktrace.c
@@ -782,7 +782,8 @@ static void blk_add_trace_bio_bounce(void *ignore,
 }
 
 static void blk_add_trace_bio_complete(void *ignore,
-				       struct request_queue *q, struct bio *bio)
+				       struct request_queue *q, struct bio *bio,
+				       int error)
 {
 	blk_add_trace_bio(q, bio, BLK_TA_COMPLETE);
 }