Skip to main content

Browse the archive

Revision 9fc005c017101c498f336329c6bdf510bce8ef6e authored by Linus Torvalds on 17 March 2012, 00:03:15 UTC, committed by Linus Torvalds on 17 March 2012, 00:03:15 UTC 
Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming
 
Pull c6x bugfix from Mark Salter:
 "Remove dead code from entry.S which causes a build failure when using
  a newer assembler (v2.22 complains about it, v2.20 ignores it)."

* tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming:
  C6X: remove dead code from entry.S
2 parent s c017386 + 6e780cf
Raw File
biomerge.c 
#include <linux/bio.h>
#include <linux/io.h>
#include <linux/export.h>
#include <xen/page.h>

bool xen_biovec_phys_mergeable(const struct bio_vec *vec1,
			       const struct bio_vec *vec2)
{
	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));
}
EXPORT_SYMBOL(xen_biovec_phys_mergeable);
back to top