lkml.org 
[lkml]   [2005]   [Nov]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: 2.6.15-rc3-mm1
On 30/11/05, Andrew Morton <akpm@osdl.org> 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/

\
 
 \ /
  Last update: 2005-12-01 00:26    [W:0.049 / U:0.044 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site