Merge tag 'mxs-clk-dt-lookup' into mxs/dt-for-3.7-2

[~andy/linux] / drivers / md / md.h

diff --git a/drivers/md/md.h b/drivers/md/md.h
index 8f998e08fb8760d1aae86338c3b72c04e6979a1d..f385b038589d32313014e07af203b8f742bec4a7 100644 (file)
--- a/drivers/md/md.h
+++ b/drivers/md/md.h
@@ -629,7 +629,7 @@ extern struct bio *bio_alloc_mddev(gfp_t gfp_mask, int nr_iovecs,
                                   struct mddev *mddev);
 extern void md_trim_bio(struct bio *bio, int offset, int size);
 
-extern void md_unplug(struct blk_plug_cb *cb);
+extern void md_unplug(struct blk_plug_cb *cb, bool from_schedule);
 static inline int mddev_check_plugged(struct mddev *mddev)
 {
        return !!blk_check_plugged(md_unplug, mddev,