ccio-dma/iommu-helper in 2.6.24-rc4

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hello Kyle,

While building new 2.6.24-rc4 (from your parisc-2.6.git tree) I encountered the following issue:

gcc -Wp,-MD,drivers/parisc/.ccio-dma.o.d -nostdinc -isystem /usr/lib/gcc/hppa-linux-gnu/4.2.3/include -D__KERNEL__ -Iinclude -Iinclude2 -I/CAD/linux-2.6.24-rc4-pa-git-20071206-trace/include -include include/linux/autoconf.h -I/CAD/linux-2.6.24-rc4-pa-git-20071206-trace/drivers/parisc -Idrivers/parisc -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -Werror-implicit-function-declaration -O2 -pipe -mno-space-regs -mfast-indirect-calls -mdisable-fpregs -ffunction-sections -march=1.1 -mschedule=7200 -fomit-frame-pointer -fno-stack-protector -Wdeclaration-after-statement -Wno-pointer-sign -D"KBUILD_STR(s)=#s" -D"KBUILD_BASENAME=KBUILD_STR(ccio_dma)" -D"KBUILD_MODNAME=KBUILD_STR(ccio_dma)" -c -o drivers/parisc/ccio-dma.o /CAD/linux-2.6.24-rc4-pa-git-20071206-trace/drivers/parisc/ccio-dma.c
/CAD/linux-2.6.24-rc4-pa-git-20071206-trace/drivers/parisc/ccio-dma.c: In function 'ccio_alloc_range':
/CAD/linux-2.6.24-rc4-pa-git-20071206-trace/drivers/parisc/ccio-dma.c:428: warning: unused variable 'res_idx'
In file included from /CAD/linux-2.6.24-rc4-pa-git-20071206-trace/drivers/parisc/ccio-dma.c:982:
/CAD/linux-2.6.24-rc4-pa-git-20071206-trace/drivers/parisc/iommu-helpers.h: In function 'iommu_fill_pdir':
/CAD/linux-2.6.24-rc4-pa-git-20071206-trace/drivers/parisc/iommu-helpers.h:67: error: implicit declaration of function 'sg_virt'

After a short search, I find a similar pb in <http://www.kernel.org/pub/linux/kernel/v2.6/snapshots/patch-2.6.24-rc1-git1.log>:
[snip]
commit 18ccc4194389c6edc78ede76ada3bf753525b11c
Author: Haavard Skinnemoen <hskinnemoen@xxxxxxxxx>
Date:   Wed Oct 24 10:16:02 2007 +0200

    AVR32: Fix sg_page breakage

    The latest sg changes introduce the following build errors on AVR32:

    include/asm/dma-mapping.h: In function ‘dma_map_sg’:
    include/asm/dma-mapping.h:220: error: implicit declaration of function ‘sg_page’
    include/asm/dma-mapping.h:220: error: invalid operands to binary -
    include/asm/dma-mapping.h:221: error: implicit declaration of function ‘sg_virt’
    include/asm/dma-mapping.h:221: warning: assignment makes pointer from integer without a cast
    include/asm/dma-mapping.h: In function ‘dma_sync_sg_for_device’:
    include/asm/dma-mapping.h:330: warning: passing argument 2 of ‘dma_cache_sync’ makes pointer from integer without a cast

    Fix it by including the correct header file, i.e. linux/scatterlist.h
    instead of asm/scatterlist.h.

    Signed-off-by: Haavard Skinnemoen <hskinnemoen@xxxxxxxxx>
[snip]

and so tied the same fix:
Signed-off-by: Joel Soete <soete dot joel at scarlet dot be>
Index: linux-trace-pa/include/asm-parisc/dma-mapping.h
===================================================================
--- linux-trace-pa.orig/include/asm-parisc/dma-mapping.h	2008-01-05 15:26:28.000000000 +0000
+++ linux-trace-pa/include/asm-parisc/dma-mapping.h	2008-01-05 15:26:56.000000000 +0000
@@ -2,8 +2,8 @@
 #define _PARISC_DMA_MAPPING_H

 #include <linux/mm.h>
+#include <linux/scatterlist.h>
 #include <asm/cacheflush.h>
-#include <asm/scatterlist.h>

 /* See Documentation/DMA-mapping.txt */
 struct hppa_dma_ops {
=== <> ===

What do you think about?

Tia,
	r.
-
To unsubscribe from this list: send the line "unsubscribe linux-parisc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux SoC]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux