| From bceff746aadaf2323db12b211b19abca3d8ce790 Mon Sep 17 00:00:00 2001 |
| From: David S. Miller <davem@davemloft.net> |
| Date: Mon, 21 Jul 2008 13:17:38 -0700 |
| Subject: sparc64: Do not define BIO_VMERGE_BOUNDARY. |
| |
| From: David S. Miller <davem@davemloft.net> |
| |
| [ 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> |
| |
| --- |
| include/asm-sparc64/io.h | 1 - |
| 1 file changed, 1 deletion(-) |
| |
| --- 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) |
| { |
