From 7f738b2076a94c6a0946fae461cf425b1f8c1d6a Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Sat, 10 Sep 2005 00:27:18 -0700 Subject: [PATCH] --- yaml --- r: 8405 b: refs/heads/master c: c2d08dade7743bd3a28cc5f68163e71c00a2a908 h: refs/heads/master i: 8403: 4939392b5b0bf00912d1fda3b49aca4659e45d95 v: v3 --- [refs] | 2 +- trunk/include/linux/bio.h | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 83374866c77d..da69c7e7797b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9adeb1b409e832c31d93106ce52482a5f0078439 +refs/heads/master: c2d08dade7743bd3a28cc5f68163e71c00a2a908 diff --git a/trunk/include/linux/bio.h b/trunk/include/linux/bio.h index cdaf03a14a51..6e1c79c8b6bf 100644 --- a/trunk/include/linux/bio.h +++ b/trunk/include/linux/bio.h @@ -314,9 +314,8 @@ void zero_fill_bio(struct bio *bio); * bvec_kmap_irq and bvec_kunmap_irq!! * * This function MUST be inlined - it plays with the CPU interrupt flags. - * Hence the `extern inline'. */ -extern 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; @@ -332,7 +331,7 @@ extern inline char *bvec_kmap_irq(struct bio_vec *bvec, unsigned long *flags) return (char *) addr + bvec->bv_offset; } -extern 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; @@ -345,7 +344,7 @@ extern inline void bvec_kunmap_irq(char *buffer, unsigned long *flags) #define bvec_kunmap_irq(buf, flags) do { *(flags) = 0; } while (0) #endif -extern inline char *__bio_kmap_irq(struct bio *bio, unsigned short idx, +static inline char *__bio_kmap_irq(struct bio *bio, unsigned short idx, unsigned long *flags) { return bvec_kmap_irq(bio_iovec_idx(bio, idx), flags);