From 556fe0c03d3ead7892d1b33f8ae3a3e03746b9a4 Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Thu, 21 Oct 2010 10:32:29 +0200
Subject: [PATCH] --- yaml --- r: 213072 b: refs/heads/master c:
 11a691bea48887c27425cc40bf291e74c922df25 h: refs/heads/master v: v3

---
 [refs]                    |  2 +-
 trunk/include/linux/bio.h | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b85100f2258c..36c2b13d9464 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7681bfeeccff5efa9eb29bf09249a3c400b15327
+refs/heads/master: 11a691bea48887c27425cc40bf291e74c922df25
diff --git a/trunk/include/linux/bio.h b/trunk/include/linux/bio.h
index 2c3fd7421607..ba679992d39b 100644
--- a/trunk/include/linux/bio.h
+++ b/trunk/include/linux/bio.h
@@ -346,8 +346,15 @@ static inline void bvec_kunmap_irq(char *buffer, unsigned long *flags)
 }
 
 #else
-#define bvec_kmap_irq(bvec, flags)	(page_address((bvec)->bv_page) + (bvec)->bv_offset)
-#define bvec_kunmap_irq(buf, flags)	do { *(flags) = 0; } while (0)
+static inline char *bvec_kmap_irq(struct bio_vec *bvec, unsigned long *flags)
+{
+	return page_address(bvec->bv_page) + bvec->bv_offset;
+}
+
+static inline void bvec_kunmap_irq(char *buffer, unsigned long *flags)
+{
+	*flags = 0;
+}
 #endif
 
 static inline char *__bio_kmap_irq(struct bio *bio, unsigned short idx,