diff options
| author | Alberto Bertogli <albertito@blitiri.com.ar> | 2009-02-02 12:41:07 +0100 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-02-02 12:41:07 +0100 |
| commit | c52440a69df22dca69794936a91e2fb529a707fb (patch) | |
| tree | efcf06527de98e9704ca4149cfd8dcf1b592032c /include | |
| parent | 20b636bf7c946da260391cd4570b16506f140a2c (diff) | |
| download | talos-op-linux-c52440a69df22dca69794936a91e2fb529a707fb.tar.gz talos-op-linux-c52440a69df22dca69794936a91e2fb529a707fb.zip | |
bio.h: If they MUST be inlined, then use __always_inline
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/bio.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/bio.h b/include/linux/bio.h index 99728320cc05..2aa283ab062b 100644 --- a/include/linux/bio.h +++ b/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; |
