Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757613AbZCYDHk (ORCPT ); Tue, 24 Mar 2009 23:07:40 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757182AbZCYDGx (ORCPT ); Tue, 24 Mar 2009 23:06:53 -0400 Received: from sh.osrg.net ([192.16.179.4]:56068 "EHLO sh.osrg.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757344AbZCYDGw (ORCPT ); Tue, 24 Mar 2009 23:06:52 -0400 Date: Wed, 25 Mar 2009 11:58:26 +0900 To: beckyb@kernel.crashing.org Cc: linux-kernel@vger.kernel.org, mingo@elte.hu, fujita.tomonori@lab.ntt.co.jp, ian.campbell@citrix.com, jeremy@goop.org Subject: Re: [PATCH 4/5] swiotlb: map_page fix for highmem systems From: FUJITA Tomonori In-Reply-To: <1237930126-6741-5-git-send-email-beckyb@kernel.crashing.org> References: <1237930126-6741-3-git-send-email-beckyb@kernel.crashing.org> <1237930126-6741-4-git-send-email-beckyb@kernel.crashing.org> <1237930126-6741-5-git-send-email-beckyb@kernel.crashing.org> Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-Id: <20090325115039P.fujita.tomonori@lab.ntt.co.jp> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (sh.osrg.net [192.16.179.4]); Wed, 25 Mar 2009 11:58:27 +0900 (JST) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1485 Lines: 34 On Tue, 24 Mar 2009 16:28:45 -0500 Becky Bruce wrote: > The current code calls virt_to_phys() on address that might > be in highmem, which is bad. This wasn't needed, anyway, because > we already have the physical address we need. Get rid of the > now-unused virtual address as well. > > Signed-off-by: Becky Bruce > --- > lib/swiotlb.c | 3 +-- > 1 files changed, 1 insertions(+), 2 deletions(-) > > diff --git a/lib/swiotlb.c b/lib/swiotlb.c > index c152f17..b33180e 100644 > --- a/lib/swiotlb.c > +++ b/lib/swiotlb.c > @@ -640,7 +640,6 @@ dma_addr_t swiotlb_map_page(struct device *dev, struct page *page, > struct dma_attrs *attrs) > { > phys_addr_t phys = page_to_phys(page) + offset; > - void *ptr = page_address(page) + offset; > dma_addr_t dev_addr = swiotlb_phys_to_bus(dev, phys); > void *map; > > @@ -651,7 +650,7 @@ dma_addr_t swiotlb_map_page(struct device *dev, struct page *page, > * buffering it. > */ > if (!address_needs_mapping(dev, dev_addr, size) && > - !range_needs_mapping(virt_to_phys(ptr), size)) > + !range_needs_mapping(phys, size)) > return dev_addr; Acked-by: FUJITA Tomonori -- 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/