Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 8405
b: refs/heads/master
c: c2d08da
h: refs/heads/master
i:
  8403: 4939392
v: v3
  • Loading branch information
Adrian Bunk authored and Linus Torvalds committed Sep 10, 2005
1 parent adba1a8 commit 7f738b2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9adeb1b409e832c31d93106ce52482a5f0078439
refs/heads/master: c2d08dade7743bd3a28cc5f68163e71c00a2a908
7 changes: 3 additions & 4 deletions trunk/include/linux/bio.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

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

Expand All @@ -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);
Expand Down

0 comments on commit 7f738b2

Please sign in to comment.