summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlberto Bertogli <albertito@blitiri.com.ar>2009-11-02 11:40:16 +0100
committerJens Axboe <jens.axboe@oracle.com>2009-11-02 11:40:16 +0100
commit4f570f995f68ef77aae7e5a441222f59232f2d0e (patch)
treead526f40f01a92f894f40fabb4bebed6819f5410
parentdddb74519aec2081204d203a97578c9fc4e9fb64 (diff)
downloadlinux-3.10-4f570f995f68ef77aae7e5a441222f59232f2d0e.tar.gz
linux-3.10-4f570f995f68ef77aae7e5a441222f59232f2d0e.tar.bz2
linux-3.10-4f570f995f68ef77aae7e5a441222f59232f2d0e.zip
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>
-rw-r--r--include/linux/bio.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/include/linux/bio.h b/include/linux/bio.h
index 5be93f18d84..474792b825d 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -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;