fix CONFIG_HIGHMEM compile error in drivers/gpu/drm/i915/i915_gem.c

[~andy/linux] / block / blk-softirq.c

diff --git a/block/blk-softirq.c b/block/blk-softirq.c
index 7ab344afb16f8e26d7cd2fed856ebb4c62202d55..e660d26ca656f060ca0c5a61952681c7b7d55e66 100644 (file)
--- a/block/blk-softirq.c
+++ b/block/blk-softirq.c
@@ -154,6 +154,8 @@ do_local:
  **/
 void blk_complete_request(struct request *req)
 {
+       if (unlikely(blk_should_fake_timeout(req->q)))
+               return;
        if (!blk_mark_rq_complete(req))
                __blk_complete_request(req);
 }