From 6df64895664e5f3b9c83eecb60bea5ed6364b5f3 Mon Sep 17 00:00:00 2001
From: Li Zefan <lizf@cn.fujitsu.com>
Date: Tue, 16 Jun 2009 11:19:36 +0200
Subject: [PATCH] --- yaml --- r: 151094 b: refs/heads/master c:
 e212d6f25084e8e9b02a04ba514d7bb1e4a4924a h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/block/blk-core.c      | 1 -
 trunk/drivers/block/cciss.c | 1 -
 trunk/drivers/md/dm.c       | 1 -
 trunk/fs/bio.c              | 1 -
 trunk/mm/bounce.c           | 1 -
 trunk/mm/highmem.c          | 1 -
 7 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index b40b85e92165..66ed960e4df2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ced504b1bd1979378de35c56aa5d3d79fb5033f
+refs/heads/master: e212d6f25084e8e9b02a04ba514d7bb1e4a4924a
diff --git a/trunk/block/blk-core.c b/trunk/block/blk-core.c
index 94d88fabc4bd..b06cf5c2a829 100644
--- a/trunk/block/blk-core.c
+++ b/trunk/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/trunk/drivers/block/cciss.c b/trunk/drivers/block/cciss.c
index b22cec97ea19..c7a527c08a09 100644
--- a/trunk/drivers/block/cciss.c
+++ b/trunk/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/trunk/drivers/md/dm.c b/trunk/drivers/md/dm.c
index 3fd8b1e65483..48db308fae67 100644
--- a/trunk/drivers/md/dm.c
+++ b/trunk/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/trunk/fs/bio.c b/trunk/fs/bio.c
index 5f80848c320c..24c914043532 100644
--- a/trunk/fs/bio.c
+++ b/trunk/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/trunk/mm/bounce.c b/trunk/mm/bounce.c
index 4ebe3ea83795..a2b76a588e34 100644
--- a/trunk/mm/bounce.c
+++ b/trunk/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/trunk/mm/highmem.c b/trunk/mm/highmem.c
index 68eb1d9b63fa..25878cc49daa 100644
--- a/trunk/mm/highmem.c
+++ b/trunk/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>
 
 /*