Merge branch 'for-2.6.31' of git://git.kernel.dk/linux-2.6-block

[sfrench/cifs-2.6.git] / mm / bounce.c

diff --git a/mm/bounce.c b/mm/bounce.c
index 8dcd4315e01c03e46f40fb10866b483c6829df08..4ebe3ea837952a3f784159a9009212c3506e4a0f 100644 (file)
--- a/mm/bounce.c
+++ b/mm/bounce.c
@@ -14,16 +14,15 @@
 #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)
 {