From patchwork Sun Dec 14 03:44:59 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: FUJITA Tomonori X-Patchwork-Id: 13889 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 9B125DE13B for ; Sun, 14 Dec 2008 14:56:52 +1100 (EST) X-Original-To: linuxppc-dev@ozlabs.org Delivered-To: linuxppc-dev@ozlabs.org X-Greylist: delayed 622 seconds by postgrey-1.31 at ozlabs; Sun, 14 Dec 2008 14:55:37 EST Received: from sh.osrg.net (sh.osrg.net [192.16.179.4]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 765A0DDFE3 for ; Sun, 14 Dec 2008 14:55:37 +1100 (EST) Received: from localhost (viola.osrg.net [10.76.0.4]) by sh.osrg.net (8.13.8/8.13.8/OSRG-NET) with ESMTP id mBE3ixYq009963; Sun, 14 Dec 2008 12:44:59 +0900 Date: Sun, 14 Dec 2008 12:44:59 +0900 To: linuxppc-dev@ozlabs.org Subject: [RESEND] [PATCH] powerpc: remove dead BIO_VMERGE_BOUNDARY definition From: FUJITA Tomonori Mime-Version: 1.0 Message-Id: <20081214124508U.fujita.tomonori@lab.ntt.co.jp> Lines: 40 X-Virus-Scanned: ClamAV 0.94.2/8753/Sun Dec 14 09:26:44 2008 on sh.osrg.net X-Virus-Status: Clean Cc: paulus@samba.org, linux-kernel@vger.kernel.org, jens.axboe@oracle.com X-BeenThere: linuxppc-dev@ozlabs.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org This is a resend of: http://marc.info/?l=linux-kernel&m=122482703616607&w=2 = From: FUJITA Tomonori Subject: [PATCH] powerpc: remove dead BIO_VMERGE_BOUNDARY definition The block layer dropped the virtual merge feature (b8b3e16cfe6435d961f6aaebcfd52a1ff2a988c5). BIO_VMERGE_BOUNDARY definition is meaningless now (For POWER, BIO_VMERGE_BOUNDARY has been meaningless for a long time since POWER disables the virtual merge feature). Signed-off-by: FUJITA Tomonori Acked-by: Jens Axboe --- arch/powerpc/include/asm/io.h | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/arch/powerpc/include/asm/io.h b/arch/powerpc/include/asm/io.h index 08266d2..494cd8b 100644 --- a/arch/powerpc/include/asm/io.h +++ b/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