diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-10-25 16:59:03 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-27 16:45:52 +1000 |
| commit | 89edce0b4e71f6f78e27d7c18c63e957469b74d3 (patch) | |
| tree | 15d9c66f27aa86c27435b83d3cda8418d6cf22f1 | |
| parent | 8168f902fa9c2ca8930ea8d72cce283234df03b8 (diff) | |
| download | linux-3.10-89edce0b4e71f6f78e27d7c18c63e957469b74d3.tar.gz linux-3.10-89edce0b4e71f6f78e27d7c18c63e957469b74d3.tar.bz2 linux-3.10-89edce0b4e71f6f78e27d7c18c63e957469b74d3.zip | |
[PATCH] powerpc: merge scatterlist.h
This depends on the 64bit dma_addr_t patch.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
| -rw-r--r-- | include/asm-powerpc/scatterlist.h (renamed from include/asm-ppc64/scatterlist.h) | 22 | ||||
| -rw-r--r-- | include/asm-ppc/scatterlist.h | 25 |
2 files changed, 18 insertions, 29 deletions
diff --git a/include/asm-ppc64/scatterlist.h b/include/asm-powerpc/scatterlist.h index 65a2a027ac9..8c992d1491d 100644 --- a/include/asm-ppc64/scatterlist.h +++ b/include/asm-powerpc/scatterlist.h @@ -1,6 +1,5 @@ -#ifndef _PPC64_SCATTERLIST_H -#define _PPC64_SCATTERLIST_H - +#ifndef _ASM_POWERPC_SCATTERLIST_H +#define _ASM_POWERPC_SCATTERLIST_H /* * Copyright (C) 2001 PPC64 Team, IBM Corp * @@ -10,6 +9,7 @@ * 2 of the License, or (at your option) any later version. */ +#ifdef __KERNEL__ #include <linux/types.h> #include <asm/dma.h> @@ -23,9 +23,23 @@ struct scatterlist { u32 dma_length; }; +/* + * These macros should be used after a dma_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, or alternatively stop on the first sg_dma_len(sg) which + * is 0. + */ #define sg_dma_address(sg) ((sg)->dma_address) +#ifdef __powerpc64__ #define sg_dma_len(sg) ((sg)->dma_length) +#else +#define sg_dma_len(sg) ((sg)->length) +#endif +#ifdef __powerpc64__ #define ISA_DMA_THRESHOLD (~0UL) +#endif -#endif /* !(_PPC64_SCATTERLIST_H) */ +#endif /* __KERNEL__ */ +#endif /* _ASM_POWERPC_SCATTERLIST_H */ diff --git a/include/asm-ppc/scatterlist.h b/include/asm-ppc/scatterlist.h deleted file mode 100644 index f21f18f5654..00000000000 --- a/include/asm-ppc/scatterlist.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifdef __KERNEL__ -#ifndef _PPC_SCATTERLIST_H -#define _PPC_SCATTERLIST_H - -#include <asm/dma.h> - -struct scatterlist { - struct page *page; - unsigned int offset; - dma_addr_t dma_address; - unsigned int length; -}; - -/* - * 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, or alternatively stop on the first sg_dma_len(sg) which - * is 0. - */ -#define sg_dma_address(sg) ((sg)->dma_address) -#define sg_dma_len(sg) ((sg)->length) - -#endif /* !(_PPC_SCATTERLIST_H) */ -#endif /* __KERNEL__ */ |