lkml.org 
[lkml]   [2005]   [Nov]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: 2.6.15-rc3-mm1
Carlos Martín <carlosmn@gmail.com> wrote:
>
> I get this when I try to compile on a x86_64.
>
> carlos@kiopa:~/kernel/linux-2.6.15-rc2-mm1$
> CROSS_COMPILE=/cross-tools/bin/x86_64-gnu-linux- make bzImage modules
> CHK include/linux/version.h
> CHK include/linux/compile.h
> CHK usr/initramfs_list
> LD arch/x86_64/kernel/bootflag.o
> CC arch/x86_64/kernel/pci-dma.o
> arch/x86_64/kernel/pci-dma.c:29: error: conflicting types for 'dma_map_sg'
> include/asm/dma-mapping.h:149: error: previous declaration of
> 'dma_map_sg' was here
> arch/x86_64/kernel/pci-dma.c:50: error: conflicting types for 'dma_unmap_sg'
> include/asm/dma-mapping.h:151: error: previous declaration of
> 'dma_unmap_sg' was here

--- 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);
_
-
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-11-30 21:41    [W:0.726 / U:0.300 seconds]
©2003-2011 Jasper Spaans. Advertise on this site