From eaa2b632bed65d0251093f98b72fcc1681ea1c61 Mon Sep 17 00:00:00 2001
From: Alberto Bertogli <albertito@blitiri.com.ar>
Date: Mon, 2 Feb 2009 12:41:07 +0100
Subject: [PATCH] --- yaml --- r: 130704 b: refs/heads/master c:
 c52440a69df22dca69794936a91e2fb529a707fb h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 70a8d2658830..7a894741a07a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 20b636bf7c946da260391cd4570b16506f140a2c
+refs/heads/master: c52440a69df22dca69794936a91e2fb529a707fb
diff --git a/trunk/include/linux/bio.h b/trunk/include/linux/bio.h
index 99728320cc05..2aa283ab062b 100644
--- a/trunk/include/linux/bio.h
+++ b/trunk/include/linux/bio.h
@@ -456,7 +456,8 @@ extern struct biovec_slab bvec_slabs[BIOVEC_NR_POOLS] __read_mostly;
  *
  * This function MUST be inlined - it plays with the CPU interrupt flags.
  */
-static inline char *bvec_kmap_irq(struct bio_vec *bvec, unsigned long *flags)
+static __always_inline char *bvec_kmap_irq(struct bio_vec *bvec,
+		unsigned long *flags)
 {
 	unsigned long addr;
 
@@ -472,7 +473,8 @@ static inline char *bvec_kmap_irq(struct bio_vec *bvec, unsigned long *flags)
 	return (char *) addr + bvec->bv_offset;
 }
 
-static inline void bvec_kunmap_irq(char *buffer, unsigned long *flags)
+static __always_inline void bvec_kunmap_irq(char *buffer,
+		unsigned long *flags)
 {
 	unsigned long ptr = (unsigned long) buffer & PAGE_MASK;