Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758112AbYLLIsW (ORCPT ); Fri, 12 Dec 2008 03:48:22 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756946AbYLLIsJ (ORCPT ); Fri, 12 Dec 2008 03:48:09 -0500 Received: from sh.osrg.net ([192.16.179.4]:50265 "EHLO sh.osrg.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756926AbYLLIsI (ORCPT ); Fri, 12 Dec 2008 03:48:08 -0500 Date: Fri, 12 Dec 2008 17:47:49 +0900 To: jens.axboe@oracle.com Cc: rth@twiddle.net, ink@jurassic.park.msu.ru, linux-kernel@vger.kernel.org, linux-alpha@vger.kernel.org Subject: [RESEND] [PATCH] alpha: remove dead BIO_VMERGE_BOUNDARY From: FUJITA Tomonori Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-Id: <20081212174824M.fujita.tomonori@lab.ntt.co.jp> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1389 Lines: 38 This is a resend of: http://marc.info/?l=linux-kernel&m=122482703716610&w=2 Jens, can you merge this via your tree? There is no tree for Alpha. = From: FUJITA Tomonori Subject: [PATCH] alpha: remove dead BIO_VMERGE_BOUNDARY The block layer dropped the virtual merge feature (b8b3e16cfe6435d961f6aaebcfd52a1ff2a988c5). BIO_VMERGE_BOUNDARY definition is meaningless now. Signed-off-by: FUJITA Tomonori Cc: Richard Henderson Cc: Ivan Kokshaysky --- arch/alpha/include/asm/io.h | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/arch/alpha/include/asm/io.h b/arch/alpha/include/asm/io.h index e971ab0..eda9b90 100644 --- a/arch/alpha/include/asm/io.h +++ b/arch/alpha/include/asm/io.h @@ -96,9 +96,6 @@ static inline dma_addr_t __deprecated isa_page_to_bus(struct page *page) return page_to_phys(page); } -/* This depends on working iommu. */ -#define BIO_VMERGE_BOUNDARY (alpha_mv.mv_pci_tbi ? PAGE_SIZE : 0) - /* Maximum PIO space address supported? */ #define IO_SPACE_LIMIT 0xffff -- 1.5.6.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/