From 8c06d9c262dd96ac1adbbf31d1429b6e66976f44 Mon Sep 17 00:00:00 2001
From: Jens Axboe <jaxboe@fusionio.com>
Date: Fri, 25 Mar 2011 16:58:59 +0100
Subject: [PATCH] --- yaml --- r: 242351 b: refs/heads/master c:
 ad3d9d7ede04a9c71be7a9fe1a23961817f371f7 h: refs/heads/master i:   242349:
 b68fbf552bf891d3c109ad7c3627d30796aac6dc   242347:
 4db3320c27cb5157e1221ec508cd648894f07288   242343:
 bb711d0d590dbb967d50a00101197006b4c59a42   242335:
 8830b6dd03605203d70b2e59373f41975ce97895 v: v3

---
 [refs]                 | 2 +-
 trunk/block/blk-core.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b8439a427f3a..62b16bdac15d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 401a18e92ce32cd0ddfa5738899ca2b8114f2bbf
+refs/heads/master: ad3d9d7ede04a9c71be7a9fe1a23961817f371f7
diff --git a/trunk/block/blk-core.c b/trunk/block/blk-core.c
index 64e96ee1d6af..e0a062363937 100644
--- a/trunk/block/blk-core.c
+++ b/trunk/block/blk-core.c
@@ -271,7 +271,7 @@ EXPORT_SYMBOL(blk_start_queue);
  **/
 void blk_stop_queue(struct request_queue *q)
 {
-	cancel_delayed_work(&q->delay_work);
+	__cancel_delayed_work(&q->delay_work);
 	queue_flag_set(QUEUE_FLAG_STOPPED, q);
 }
 EXPORT_SYMBOL(blk_stop_queue);