From 963114c05e532ad4743911de2f5fc4ff860c03ae Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Wed, 29 Oct 2008 14:10:51 +0100 Subject: [PATCH] --- yaml --- r: 118503 b: refs/heads/master c: f92131c3dd567fc6df18ce3f46fcf57ecbdefbe0 h: refs/heads/master i: 118501: d065a80e0e4c1e4acedf4ec4cb81e2d2bade94b2 118499: 9e7c55b13a714174e79391f0a89df2bf82858c4d 118495: eefb2e9054b1d63b9f024090c298215a531d76bf v: v3 --- [refs] | 2 +- trunk/include/linux/bio.h | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index eeb13c2fb840..637e72fd962c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 43381785a5ba1cb424b36812373a6a04054b5c3c +refs/heads/master: f92131c3dd567fc6df18ce3f46fcf57ecbdefbe0 diff --git a/trunk/include/linux/bio.h b/trunk/include/linux/bio.h index 1c91a176b9ae..6a642098e5c3 100644 --- a/trunk/include/linux/bio.h +++ b/trunk/include/linux/bio.h @@ -236,12 +236,16 @@ static inline void *bio_data(struct bio *bio) #define __BVEC_END(bio) bio_iovec_idx((bio), (bio)->bi_vcnt - 1) #define __BVEC_START(bio) bio_iovec_idx((bio), (bio)->bi_idx) +/* Default implementation of BIOVEC_PHYS_MERGEABLE */ +#define __BIOVEC_PHYS_MERGEABLE(vec1, vec2) \ + ((bvec_to_phys((vec1)) + (vec1)->bv_len) == bvec_to_phys((vec2))) + /* * allow arch override, for eg virtualized architectures (put in asm/io.h) */ #ifndef BIOVEC_PHYS_MERGEABLE #define BIOVEC_PHYS_MERGEABLE(vec1, vec2) \ - ((bvec_to_phys((vec1)) + (vec1)->bv_len) == bvec_to_phys((vec2))) + __BIOVEC_PHYS_MERGEABLE(vec1, vec2) #endif #define __BIO_SEG_BOUNDARY(addr1, addr2, mask) \