From: David S. Miller Date: Mon, 21 Jul 2008 20:17:38 +0000 (-0700) Subject: sparc64: Do not define BIO_VMERGE_BOUNDARY. X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=74988bd85d1cb97987534fd7ffbc570e81145418;p=deliverable%2Flinux.git sparc64: Do not define BIO_VMERGE_BOUNDARY. The IOMMU code and the block layer can split things up using different rules, so this can't work reliably. Signed-off-by: David S. Miller --- diff --git a/include/asm-sparc/io_64.h b/include/asm-sparc/io_64.h index f4907414b39d..11daa31cdaf9 100644 --- a/include/asm-sparc/io_64.h +++ b/include/asm-sparc/io_64.h @@ -16,7 +16,6 @@ /* BIO layer definitions. */ extern unsigned long kern_base, kern_size; #define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT) -#define BIO_VMERGE_BOUNDARY 8192 static inline u8 _inb(unsigned long addr) {