|
@@ -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;
|
|
|
|
|
@@ -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;
|
|
|
|