From 7f6b53660c10925fd640e91a0e16dc2beb51c45e Mon Sep 17 00:00:00 2001
From: Jens Axboe <jaxboe@fusionio.com>
Date: Fri, 11 Mar 2011 20:17:08 +0100
Subject: [PATCH] --- yaml --- r: 242287 b: refs/heads/master c:
 1f940bdfc0d03265d178d9dfd840d854819f797d h: refs/heads/master i:   242285:
 58cda32834b74180af34caed072a6e3f78c60562   242283:
 bc280dcf0ee3baacc344da0a1aa5dbbaf005eaa8   242279:
 24e90a82c57392b1c307a2be6aa0b0b7e54a0c38   242271:
 066a1ca0da3fce9e0b900638cfc3c5dcd70427ff v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/blkdev.h | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 678287786470..cde4ff695aa7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eba2ed9c9636d9e7ed203a2498ed230b48341709
+refs/heads/master: 1f940bdfc0d03265d178d9dfd840d854819f797d
diff --git a/trunk/include/linux/blkdev.h b/trunk/include/linux/blkdev.h
index 91fa428fa2c1..16a902f099ac 100644
--- a/trunk/include/linux/blkdev.h
+++ b/trunk/include/linux/blkdev.h
@@ -1297,15 +1297,18 @@ static inline long nr_blockdev_pages(void)
 	return 0;
 }
 
-static inline void blk_start_plug(struct list_head *list)
+struct blk_plug {
+};
+
+static inline void blk_start_plug(struct blk_plug *plug)
 {
 }
 
-static inline void blk_finish_plug(struct list_head *list)
+static inline void blk_finish_plug(struct blk_plug *plug)
 {
 }
 
-static inline void blk_flush_plug(struct task_struct *tsk)
+static inline void blk_flush_plug(struct task_struct *task)
 {
 }