Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit e212d6f25084e8e9b02a04ba514d7bb1e4a4924a

Authored by Li Zefan
Committed by Jens Axboe
1 parent 5ced504b1b
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

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>

Showing 6 changed files with 0 additions and 6 deletions Side-by-side Diff

... ... @@ -26,7 +26,6 @@
26 26 #include <linux/swap.h>
27 27 #include <linux/writeback.h>
28 28 #include <linux/task_io_accounting_ops.h>
29   -#include <linux/blktrace_api.h>
30 29 #include <linux/fault-inject.h>
31 30  
32 31 #define CREATE_TRACE_POINTS
drivers/block/cciss.c
Diff comments   View file @ e212d6f
... ... @@ -38,7 +38,6 @@
38 38 #include <linux/hdreg.h>
39 39 #include <linux/spinlock.h>
40 40 #include <linux/compat.h>
41   -#include <linux/blktrace_api.h>
42 41 #include <asm/uaccess.h>
43 42 #include <asm/io.h>
44 43  
... ... @@ -19,7 +19,6 @@
19 19 #include <linux/slab.h>
20 20 #include <linux/idr.h>
21 21 #include <linux/hdreg.h>
22   -#include <linux/blktrace_api.h>
23 22  
24 23 #include <trace/events/block.h>
25 24  
... ... @@ -25,7 +25,6 @@
25 25 #include <linux/module.h>
26 26 #include <linux/mempool.h>
27 27 #include <linux/workqueue.h>
28   -#include <linux/blktrace_api.h>
29 28 #include <scsi/sg.h> /* for struct sg_iovec */
30 29  
31 30 #include <trace/events/block.h>
... ... @@ -13,7 +13,6 @@
13 13 #include <linux/init.h>
14 14 #include <linux/hash.h>
15 15 #include <linux/highmem.h>
16   -#include <linux/blktrace_api.h>
17 16 #include <asm/tlbflush.h>
18 17  
19 18 #include <trace/events/block.h>
... ... @@ -26,7 +26,6 @@
26 26 #include <linux/init.h>
27 27 #include <linux/hash.h>
28 28 #include <linux/highmem.h>
29   -#include <linux/blktrace_api.h>
30 29 #include <asm/tlbflush.h>
31 30  
32 31 /*