tracing/blktrace: move the tracing file to kernel/trace

Impact: cleanup Move blktrace.c to kernel/trace, also move its config entry. Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com> Acked-by: Jens Axboe <jens.axboe@oracle.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>

Author: fweisbec

block/Kconfig

@@ -44,30 +44,6 @@ config LBD
 
  If unsure, say N.
 
-config BLK_DEV_IO_TRACE
-bool "Support for tracing block io actions"
-depends on SYSFS
-select RELAY
-select DEBUG_FS
-select TRACEPOINTS
-select TRACING
-select STACKTRACE
-help
- Say Y here if you want to be able to trace the block layer actions
- on a given queue. Tracing allows you to see any traffic happening
- on a block device queue. For more information (and the userspace
- support tools needed), fetch the blktrace tools from:
-
- git://git.kernel.dk/blktrace.git
-
- Tracing also is possible using the ftrace interface, e.g.:
-
- echo 1 > /sys/block/sda/sda1/trace/enable
- echo blk > /sys/kernel/debug/tracing/current_tracer
- cat /sys/kernel/debug/tracing/trace_pipe
-
- If unsure, say N.
-
 config BLK_DEV_BSG
 bool "Block layer SG support v4 (EXPERIMENTAL)"
 depends on EXPERIMENTAL

block/Makefile

@@ -13,6 +13,5 @@ obj-$(CONFIG_IOSCHED_AS)	+= as-iosched.o
 obj-$(CONFIG_IOSCHED_DEADLINE)+= deadline-iosched.o
 obj-$(CONFIG_IOSCHED_CFQ)+= cfq-iosched.o
 
-obj-$(CONFIG_BLK_DEV_IO_TRACE)+= blktrace.o
 obj-$(CONFIG_BLOCK_COMPAT)+= compat_ioctl.o
 obj-$(CONFIG_BLK_DEV_INTEGRITY)+= blk-integrity.o

kernel/trace/Kconfig

@@ -302,6 +302,29 @@ config WORKQUEUE_TRACER
  For example it can help a developer to decide whether he should
  choose a per cpu workqueue instead of a singlethreaded one.
 
+config BLK_DEV_IO_TRACE
+bool "Support for tracing block io actions"
+depends on SYSFS
+select RELAY
+select DEBUG_FS
+select TRACEPOINTS
+select TRACING
+select STACKTRACE
+help
+ Say Y here if you want to be able to trace the block layer actions
+ on a given queue. Tracing allows you to see any traffic happening
+ on a block device queue. For more information (and the userspace
+ support tools needed), fetch the blktrace tools from:
+
+ git://git.kernel.dk/blktrace.git
+
+ Tracing also is possible using the ftrace interface, e.g.:
+
+ echo 1 > /sys/block/sda/sda1/trace/enable
+ echo blk > /sys/kernel/debug/tracing/current_tracer
+ cat /sys/kernel/debug/tracing/trace_pipe
+
+ If unsure, say N.
 
 config DYNAMIC_FTRACE
 bool "enable/disable ftrace tracepoints dynamically"

kernel/trace/Makefile

@@ -37,5 +37,6 @@ obj-$(CONFIG_HW_BRANCH_TRACER) += trace_hw_branches.o
 obj-$(CONFIG_POWER_TRACER) += trace_power.o
 obj-$(CONFIG_KMEMTRACE) += kmemtrace.o
 obj-$(CONFIG_WORKQUEUE_TRACER) += trace_workqueue.o
+obj-$(CONFIG_BLK_DEV_IO_TRACE)+= blktrace.o
 
 libftrace-y := ftrace.o

block/blktrace.c kernel/trace/blktrace.cblock/blktrace.c renamed to kernel/trace/blktrace.c

@@ -25,7 +25,7 @@
 #include <linux/time.h>
 #include <trace/block.h>
 #include <linux/uaccess.h>
-#include <../kernel/trace/trace_output.h>
+#include "trace_output.h"
 
 static unsigned int blktrace_seq __read_mostly = 1;