xen: fix bio vec merging

[pandora-kernel.git] / drivers / xen / biomerge.c

diff --git a/drivers/xen/biomerge.c b/drivers/xen/biomerge.c
index ba6eda4..0d23e1f 100644 (file)
--- a/drivers/xen/biomerge.c
+++ b/drivers/xen/biomerge.c
@@ -8,6 +8,5 @@ bool xen_biovec_phys_mergeable(const struct bio_vec *vec1,
        unsigned long mfn1 = pfn_to_mfn(page_to_pfn(vec1->bv_page));
        unsigned long mfn2 = pfn_to_mfn(page_to_pfn(vec2->bv_page));
 
-       return __BIOVEC_PHYS_MERGEABLE(vec1, vec2) &&
-               ((mfn1 == mfn2) || ((mfn1+1) == mfn2));
+       return mfn1 + PFN_DOWN(vec1->bv_offset + vec1->bv_len) == mfn2;
 }