block: remove some includings of blktrace_api.h

When porting blktrace to tracepoints, we changed to trace/block.h
for trace prober declarations.

Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

diff --git a/block/blk-core.c b/block/blk-core.c
index 94d88fabc4bde21b2144952b24dd62888e8822fe..b06cf5c2a829c49a17dc4a23ab4421d8933b3401 100644 (file)
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -26,7 +26,6 @@
 #include <linux/swap.h>
 #include <linux/writeback.h>
 #include <linux/task_io_accounting_ops.h>
-#include <linux/blktrace_api.h>
 #include <linux/fault-inject.h>
 
 #define CREATE_TRACE_POINTS

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index b22cec97ea194e148427f998a5c310bc3eedf262..c7a527c08a0980d542c1fffbd30687bbc95289d0 100644 (file)
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -38,7 +38,6 @@
 #include <linux/hdreg.h>
 #include <linux/spinlock.h>
 #include <linux/compat.h>
-#include <linux/blktrace_api.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 

diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 3fd8b1e65483da53070f0fe633e82843ac1a5ba0..48db308fae67103b221eeb1c10e4411560b88135 100644 (file)
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -19,7 +19,6 @@
 #include <linux/slab.h>
 #include <linux/idr.h>
 #include <linux/hdreg.h>
-#include <linux/blktrace_api.h>
 
 #include <trace/events/block.h>
 

diff --git a/fs/bio.c b/fs/bio.c
index 5f80848c320c7a66c6425e75aea21533607134fa..24c9140435323e4caabbdf00156efd0060d1be55 100644 (file)
--- a/fs/bio.c
+++ b/fs/bio.c
@@ -25,7 +25,6 @@
 #include <linux/module.h>
 #include <linux/mempool.h>
 #include <linux/workqueue.h>
-#include <linux/blktrace_api.h>
 #include <scsi/sg.h>           /* for struct sg_iovec */
 
 #include <trace/events/block.h>

diff --git a/mm/bounce.c b/mm/bounce.c
index 4ebe3ea837952a3f784159a9009212c3506e4a0f..a2b76a588e348e0d46f2bfed4131af6ac3eea86b 100644 (file)
--- a/mm/bounce.c
+++ b/mm/bounce.c
@@ -13,7 +13,6 @@
 #include <linux/init.h>
 #include <linux/hash.h>
 #include <linux/highmem.h>
-#include <linux/blktrace_api.h>
 #include <asm/tlbflush.h>
 
 #include <trace/events/block.h>

diff --git a/mm/highmem.c b/mm/highmem.c
index 68eb1d9b63fa5daba881a8b6551fa38f8e0eabfc..25878cc49daa268806f46dfa4e05af8d6f8f3998 100644 (file)
--- a/mm/highmem.c
+++ b/mm/highmem.c
@@ -26,7 +26,6 @@
 #include <linux/init.h>
 #include <linux/hash.h>
 #include <linux/highmem.h>
-#include <linux/blktrace_api.h>
 #include <asm/tlbflush.h>
 
 /*