Merge branch 'omap-clock-for-next' of git://git.pwsan.com/linux-2.6 into devel

[firefly-linux-kernel-4.4.55.git] / mm / bounce.c

diff --git a/mm/bounce.c b/mm/bounce.c
index 8dcd4315e01c03e46f40fb10866b483c6829df08..a2b76a588e348e0d46f2bfed4131af6ac3eea86b 100644 (file)
--- a/mm/bounce.c
+++ b/mm/bounce.c
@@ -13,17 +13,15 @@
 #include <linux/init.h>
 #include <linux/hash.h>
 #include <linux/highmem.h>
-#include <linux/blktrace_api.h>
-#include <trace/block.h>
 #include <asm/tlbflush.h>
 
+#include <trace/events/block.h>
+
 #define POOL_SIZE      64
 #define ISA_POOL_SIZE  16
 
 static mempool_t *page_pool, *isa_page_pool;
 
-DEFINE_TRACE(block_bio_bounce);
-
 #ifdef CONFIG_HIGHMEM
 static __init int init_emergency_pool(void)
 {