Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751221AbVK3XYN (ORCPT ); Wed, 30 Nov 2005 18:24:13 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751242AbVK3XYN (ORCPT ); Wed, 30 Nov 2005 18:24:13 -0500 Received: from nproxy.gmail.com ([64.233.182.203]:27800 "EHLO nproxy.gmail.com") by vger.kernel.org with ESMTP id S1751221AbVK3XYM convert rfc822-to-8bit (ORCPT ); Wed, 30 Nov 2005 18:24:12 -0500 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=aCnGTiRS8YmosXdyEtvNgKKt0PYRAlHBcvZX0cn2AMNg9i/vFSU1tPCEt88dBzwMdK9WFLpRmCSlHf2zvrDyc9unopK0pxzDv3o9nUnw9QtQDr2G8tzuDUxV1VjGh7gldIAyhBiSJxneZPpy5X4IDPl6fkXnRAQIKbaf0cozxxU= Message-ID: Date: Thu, 1 Dec 2005 00:24:10 +0100 From: =?ISO-8859-1?Q?Carlos_Mart=EDn?= To: Andrew Morton Subject: Re: 2.6.15-rc3-mm1 Cc: linux-kernel@vger.kernel.org In-Reply-To: <20051130123920.35193b6a.akpm@osdl.org> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8BIT Content-Disposition: inline References: <20051129203134.13b93f48.akpm@osdl.org> <20051130123920.35193b6a.akpm@osdl.org> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1905 Lines: 58 On 30/11/05, Andrew Morton wrote: > --- devel/arch/x86_64/kernel/pci-dma.c~move-swiotlb-header-file-into-common-code-fix-2 2005-11-30 12:38:52.000000000 -0800 > +++ devel-akpm/arch/x86_64/kernel/pci-dma.c 2005-11-30 12:38:52.000000000 -0800 > @@ -25,11 +25,11 @@ > * the same here. > */ > int dma_map_sg(struct device *hwdev, struct scatterlist *sg, > - int nents, int direction) > + int nents, enum dma_data_direction dir) > { > int i; > > - BUG_ON(direction == DMA_NONE); > + BUG_ON(dir == DMA_NONE); > for (i = 0; i < nents; i++ ) { > struct scatterlist *s = &sg[i]; > BUG_ON(!s->page); > @@ -38,7 +38,6 @@ int dma_map_sg(struct device *hwdev, str > } > return nents; > } > - > EXPORT_SYMBOL(dma_map_sg); > > /* Unmap a set of streaming mode DMA translations. > @@ -46,7 +45,7 @@ EXPORT_SYMBOL(dma_map_sg); > * pci_unmap_single() above. > */ > void dma_unmap_sg(struct device *dev, struct scatterlist *sg, > - int nents, int dir) > + int nents, enum dma_data_direction dir) > { > int i; > for (i = 0; i < nents; i++) { > @@ -56,5 +55,4 @@ void dma_unmap_sg(struct device *dev, st > dma_unmap_single(dev, s->dma_address, s->dma_length, dir); > } > } > - > EXPORT_SYMBOL(dma_unmap_sg); > _ > > Right, of course, I should have seen that. It's running nicely with an uptime of two and a half hours. The patch is missing the header, btw. cmn -- Carlos Mart?n Nieto http://www.cmartin.tk "?C?mo voy a decir bobadas si soy mudo?" -- CACHAI - 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/