Skip to content

Commit

Permalink
Do not __always_inline bvec_kmap_irq() and bvec_kunmap_irq()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Alberto Bertogli authored and Jens Axboe committed Nov 2, 2009
1 parent dddb745 commit 4f570f9
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions include/linux/bio.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
* 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,
unsigned long *flags)
static inline char *bvec_kmap_irq(struct bio_vec *bvec, unsigned long *flags)
{
unsigned long addr;

Expand All @@ -470,8 +467,7 @@ static __always_inline char *bvec_kmap_irq(struct bio_vec *bvec,
return (char *) addr + bvec->bv_offset;
}

static __always_inline void bvec_kunmap_irq(char *buffer,
unsigned long *flags)
static inline void bvec_kunmap_irq(char *buffer, unsigned long *flags)
{
unsigned long ptr = (unsigned long) buffer & PAGE_MASK;

Expand Down

0 comments on commit 4f570f9

Please sign in to comment.