bio.h: If they MUST be inlined, then use __always_inline
authorAlberto Bertogli <albertito@blitiri.com.ar>
Mon, 2 Feb 2009 11:41:07 +0000 (12:41 +0100)
committerJens Axboe <jens.axboe@oracle.com>
Mon, 2 Feb 2009 11:41:07 +0000 (12:41 +0100)
bvec_kmap_irq() and bvec_kunmap_irq() comments say they MUST be inlined,
so mark them as __always_inline.

Signed-off-by: Alberto Bertogli <albertito@blitiri.com.ar>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
include/linux/bio.h

index 99728320cc0552e5c90b631a51cce714df1e2321..2aa283ab062b215ddb37975d8e55193ecd502c5f 100644 (file)
@@ -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;