From 094fa2061197b4084ca5faf588a13d0bda69ab25 Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Sat, 13 Dec 2008 17:44:59 +0000 Subject: [PATCH] --- yaml --- r: 123085 b: refs/heads/master c: 3045b3cb0b068c9f7601786841cda1e0b4647bd9 h: refs/heads/master i: 123083: 9d5925234e25143e5752c81e6694f920f53a3e13 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/include/asm/io.h | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 4235d6f9e75e..0e93d36e740a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7fe519c207e3400dea6d67e1d483a16b11608423 +refs/heads/master: 3045b3cb0b068c9f7601786841cda1e0b4647bd9 diff --git a/trunk/arch/powerpc/include/asm/io.h b/trunk/arch/powerpc/include/asm/io.h index 08266d2728b3..494cd8b0a278 100644 --- a/trunk/arch/powerpc/include/asm/io.h +++ b/trunk/arch/powerpc/include/asm/io.h @@ -713,13 +713,6 @@ static inline void * phys_to_virt(unsigned long address) */ #define page_to_phys(page) ((phys_addr_t)page_to_pfn(page) << PAGE_SHIFT) -/* We do NOT want virtual merging, it would put too much pressure on - * our iommu allocator. Instead, we want drivers to be smart enough - * to coalesce sglists that happen to have been mapped in a contiguous - * way by the iommu - */ -#define BIO_VMERGE_BOUNDARY 0 - /* * 32 bits still uses virt_to_bus() for it's implementation of DMA * mappings se we have to keep it defined here. We also have some old