mn10300: move sg_dma_{address,len}() to asm/scatterlist.h (91201957) · Commits · 戴 / test

mn10300 was the only architecture where sg_dma_{address,len}() were not in asm/scatterlist.h, and it's not a big surprise that this caused a compile error somewhere: /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/media/video/videobuf-dma-sg.c: In function `videobuf_dma_map': /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/media/video/videobuf-dma-sg.c:238: error: implicit declaration of function 'sg_dma_address' Acked-by:

David Howells <dhowells@redhat.com> Signed-off-by:

Adrian Bunk <bunk@kernel.org> Signed-off-by:

Andrew Morton <akpm@linux-foundation.org> Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

include/asm-mn10300/pci.h

+0 −9

Original line number	Diff line number	Diff line
		@@ -74,15 +74,6 @@ struct pci_dev;
		/* This is always fine. */
		#define pci_dac_dma_supported(pci_dev, mask) (0)

		/*
		* These macros should be used after a pci_map_sg call has been done
		* to get bus addresses of each of the SG entries and their lengths.
		* You should only work with the number of sg entries pci_map_sg
		* returns.
		*/
		#define sg_dma_address(sg) ((sg)->dma_address)
		#define sg_dma_len(sg) ((sg)->length)

		/* Return the index of the PCI controller for device. */
		static inline int pci_controller_num(struct pci_dev *dev)
		{

include/asm-mn10300/scatterlist.h

+9 −0

Original line number	Diff line number	Diff line
		@@ -43,4 +43,13 @@ struct scatterlist {

		#define ISA_DMA_THRESHOLD (0x00ffffff)

		/*
		* These macros should be used after a pci_map_sg call has been done
		* to get bus addresses of each of the SG entries and their lengths.
		* You should only work with the number of sg entries pci_map_sg
		* returns.
		*/
		#define sg_dma_address(sg) ((sg)->dma_address)
		#define sg_dma_len(sg) ((sg)->length)

		#endif /* _ASM_SCATTERLIST_H */

Admin message