From: David S. Miller <davem@davemloft.net>
Date: Mon, 21 Jul 2008 20:17:38 +0000 (-0700)
Subject: sparc64: Do not define BIO_VMERGE_BOUNDARY.
X-Git-Tag: v2.6.26.1~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff7cd39223eb9ce6e668535fcad851ab0ea5876c;p=thirdparty%2Fkernel%2Fstable.git

sparc64: Do not define BIO_VMERGE_BOUNDARY.

[ Upstream commit 74988bd85d1cb97987534fd7ffbc570e81145418 ]

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 <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/include/asm-sparc64/io.h b/include/asm-sparc64/io.h
index 3158960f3eb56..38e7ba6091e79 100644
--- a/include/asm-sparc64/io.h
+++ b/include/asm-sparc64/io.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)
 {