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);