Do not __always_inline bvec_kmap_irq() and bvec_kunmap_irq()

So remove both the comment and the inline requirement, going back to the
inline hint.

Signed-off-by: Alberto Bertogli <albertito@blitiri.com.ar>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
This commit is contained in:
Alberto Bertogli 2009-11-02 11:40:16 +01:00 committed by Jens Axboe
parent dddb74519a
commit 4f570f995f

View File

@ -450,11 +450,8 @@ extern struct biovec_slab bvec_slabs[BIOVEC_NR_POOLS] __read_mostly;
/* /*
* remember never ever reenable interrupts between a bvec_kmap_irq and * remember never ever reenable interrupts between a bvec_kmap_irq and
* bvec_kunmap_irq! * bvec_kunmap_irq!
*
* This function MUST be inlined - it plays with the CPU interrupt flags.
*/ */
static __always_inline char *bvec_kmap_irq(struct bio_vec *bvec, static inline char *bvec_kmap_irq(struct bio_vec *bvec, unsigned long *flags)
unsigned long *flags)
{ {
unsigned long addr; unsigned long addr;
@ -470,8 +467,7 @@ static __always_inline char *bvec_kmap_irq(struct bio_vec *bvec,
return (char *) addr + bvec->bv_offset; return (char *) addr + bvec->bv_offset;
} }
static __always_inline void bvec_kunmap_irq(char *buffer, static inline void bvec_kunmap_irq(char *buffer, unsigned long *flags)
unsigned long *flags)
{ {
unsigned long ptr = (unsigned long) buffer & PAGE_MASK; unsigned long ptr = (unsigned long) buffer & PAGE_MASK;