2 files changed, 22 insertions, 4 deletions

diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c
index ce0d9da52a8a..94966edfb44d 100644
--- a/drivers/char/sysrq.c
+++ b/drivers/char/sysrq.c
@@ -274,6 +274,22 @@ static struct sysrq_key_op sysrq_showstate_blocked_op = {
         .enable_mask    = SYSRQ_ENABLE_DUMP,
 };
 
+#ifdef CONFIG_TRACING
+#include <linux/ftrace.h>
+
+static void sysrq_ftrace_dump(int key, struct tty_struct *tty)
+{
+        ftrace_dump();
+}
+static struct sysrq_key_op sysrq_ftrace_dump_op = {
+        .handler        = sysrq_ftrace_dump,
+        .help_msg       = "dumpZ-ftrace-buffer",
+        .action_msg     = "Dump ftrace buffer",
+        .enable_mask    = SYSRQ_ENABLE_DUMP,
+};
+#else
+#define sysrq_ftrace_dump_op (*(struct sysrq_key_op *)0)
+#endif
 
 static void sysrq_handle_showmem(int key, struct tty_struct *tty)
 {
@@ -406,7 +422,7 @@ static struct sysrq_key_op *sysrq_key_table[36] = {
         NULL,                           /* x */
         /* y: May be registered on sparc64 for global register dump */
         NULL,                           /* y */
-        NULL                            /* z */
+        &sysrq_ftrace_dump_op,          /* z */
 };
 
 /* key2index calculation, -1 on invalid index */
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index c99e4728ff41..343094c3feeb 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -21,6 +21,7 @@
 #include <linux/idr.h>
 #include <linux/hdreg.h>
 #include <linux/blktrace_api.h>
+#include <trace/block.h>
 
 #define DM_MSG_PREFIX "core"
 
@@ -51,6 +52,8 @@ struct dm_target_io {
         union map_info info;
 };
 
+DEFINE_TRACE(block_bio_complete);
+
 union map_info *dm_get_mapinfo(struct bio *bio)
 {
         if (bio && bio->bi_private)
@@ -504,8 +507,7 @@ static void dec_pending(struct dm_io *io, int error)
                 end_io_acct(io);
 
                 if (io->error != DM_ENDIO_REQUEUE) {
-                        blk_add_trace_bio(io->md->queue, io->bio,
-                                          BLK_TA_COMPLETE);
+                        trace_block_bio_complete(io->md->queue, io->bio);
 
                         bio_endio(io->bio, io->error);
                 }
@@ -598,7 +600,7 @@ static void __map_bio(struct dm_target *ti, struct bio *clone,
         if (r == DM_MAPIO_REMAPPED) {
                 /* the bio has been remapped so dispatch it */
 
-                blk_add_trace_remap(bdev_get_queue(clone->bi_bdev), clone,
+                trace_block_remap(bdev_get_queue(clone->bi_bdev), clone,
                                     tio->io->bio->bi_bdev->bd_dev,
                                     clone->bi_sector, sector);