Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 213072
b: refs/heads/master
c: 11a691b
h: refs/heads/master
v: v3
  • Loading branch information
Geert Uytterhoeven authored and Jens Axboe committed Oct 21, 2010
1 parent b4809af commit 556fe0c
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 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: 7681bfeeccff5efa9eb29bf09249a3c400b15327
refs/heads/master: 11a691bea48887c27425cc40bf291e74c922df25
11 changes: 9 additions & 2 deletions trunk/include/linux/bio.h
Original file line number Diff line number Diff line change
Expand Up @@ -346,8 +346,15 @@ static inline void bvec_kunmap_irq(char *buffer, unsigned long *flags)
}

#else
#define bvec_kmap_irq(bvec, flags) (page_address((bvec)->bv_page) + (bvec)->bv_offset)
#define bvec_kunmap_irq(buf, flags) do { *(flags) = 0; } while (0)
static inline char *bvec_kmap_irq(struct bio_vec *bvec, unsigned long *flags)
{
return page_address(bvec->bv_page) + bvec->bv_offset;
}

static inline void bvec_kunmap_irq(char *buffer, unsigned long *flags)
{
*flags = 0;
}
#endif

static inline char *__bio_kmap_irq(struct bio *bio, unsigned short idx,
Expand Down

0 comments on commit 556fe0c

Please sign in to comment.