diff options
author | Randy Dunlap <randy.dunlap@oracle.com> | 2009-01-29 19:28:02 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-29 21:19:29 -0500 |
commit | 5872fb94f85d2e4fdef94657bd14e1a492df9825 (patch) | |
tree | bbd15217dc327f691396d1db082935ae88e2f852 /arch | |
parent | ca493d171b66e96f542501b7eb572bc8380f690d (diff) |
Documentation: move DMA-mapping.txt to Doc/PCI/
Move DMA-mapping.txt to Documentation/PCI/.
DMA-mapping.txt was supposed to be moved from Documentation/ to
Documentation/PCI/. The 00-INDEX files in those two directories
were updated, along with a few other text files, but the file
itself somehow escaped being moved, so move it and update more
text files and source files with its new location.
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/ia64/hp/common/sba_iommu.c | 12 | ||||
-rw-r--r-- | arch/parisc/include/asm/dma-mapping.h | 2 | ||||
-rw-r--r-- | arch/parisc/kernel/pci-dma.c | 2 | ||||
-rw-r--r-- | arch/x86/include/asm/dma-mapping.h | 4 | ||||
-rw-r--r-- | arch/x86/kernel/pci-gart_64.c | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c index d98f0f4ff83f..6d5e6c5630e3 100644 --- a/arch/ia64/hp/common/sba_iommu.c +++ b/arch/ia64/hp/common/sba_iommu.c | |||
@@ -906,7 +906,7 @@ sba_mark_invalid(struct ioc *ioc, dma_addr_t iova, size_t byte_cnt) | |||
906 | * @dir: R/W or both. | 906 | * @dir: R/W or both. |
907 | * @attrs: optional dma attributes | 907 | * @attrs: optional dma attributes |
908 | * | 908 | * |
909 | * See Documentation/DMA-mapping.txt | 909 | * See Documentation/PCI/PCI-DMA-mapping.txt |
910 | */ | 910 | */ |
911 | dma_addr_t | 911 | dma_addr_t |
912 | sba_map_single_attrs(struct device *dev, void *addr, size_t size, int dir, | 912 | sba_map_single_attrs(struct device *dev, void *addr, size_t size, int dir, |
@@ -1024,7 +1024,7 @@ sba_mark_clean(struct ioc *ioc, dma_addr_t iova, size_t size) | |||
1024 | * @dir: R/W or both. | 1024 | * @dir: R/W or both. |
1025 | * @attrs: optional dma attributes | 1025 | * @attrs: optional dma attributes |
1026 | * | 1026 | * |
1027 | * See Documentation/DMA-mapping.txt | 1027 | * See Documentation/PCI/PCI-DMA-mapping.txt |
1028 | */ | 1028 | */ |
1029 | void sba_unmap_single_attrs(struct device *dev, dma_addr_t iova, size_t size, | 1029 | void sba_unmap_single_attrs(struct device *dev, dma_addr_t iova, size_t size, |
1030 | int dir, struct dma_attrs *attrs) | 1030 | int dir, struct dma_attrs *attrs) |
@@ -1102,7 +1102,7 @@ EXPORT_SYMBOL(sba_unmap_single_attrs); | |||
1102 | * @size: number of bytes mapped in driver buffer. | 1102 | * @size: number of bytes mapped in driver buffer. |
1103 | * @dma_handle: IOVA of new buffer. | 1103 | * @dma_handle: IOVA of new buffer. |
1104 | * | 1104 | * |
1105 | * See Documentation/DMA-mapping.txt | 1105 | * See Documentation/PCI/PCI-DMA-mapping.txt |
1106 | */ | 1106 | */ |
1107 | void * | 1107 | void * |
1108 | sba_alloc_coherent (struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flags) | 1108 | sba_alloc_coherent (struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flags) |
@@ -1165,7 +1165,7 @@ sba_alloc_coherent (struct device *dev, size_t size, dma_addr_t *dma_handle, gfp | |||
1165 | * @vaddr: virtual address IOVA of "consistent" buffer. | 1165 | * @vaddr: virtual address IOVA of "consistent" buffer. |
1166 | * @dma_handler: IO virtual address of "consistent" buffer. | 1166 | * @dma_handler: IO virtual address of "consistent" buffer. |
1167 | * | 1167 | * |
1168 | * See Documentation/DMA-mapping.txt | 1168 | * See Documentation/PCI/PCI-DMA-mapping.txt |
1169 | */ | 1169 | */ |
1170 | void sba_free_coherent (struct device *dev, size_t size, void *vaddr, dma_addr_t dma_handle) | 1170 | void sba_free_coherent (struct device *dev, size_t size, void *vaddr, dma_addr_t dma_handle) |
1171 | { | 1171 | { |
@@ -1420,7 +1420,7 @@ sba_coalesce_chunks(struct ioc *ioc, struct device *dev, | |||
1420 | * @dir: R/W or both. | 1420 | * @dir: R/W or both. |
1421 | * @attrs: optional dma attributes | 1421 | * @attrs: optional dma attributes |
1422 | * | 1422 | * |
1423 | * See Documentation/DMA-mapping.txt | 1423 | * See Documentation/PCI/PCI-DMA-mapping.txt |
1424 | */ | 1424 | */ |
1425 | int sba_map_sg_attrs(struct device *dev, struct scatterlist *sglist, int nents, | 1425 | int sba_map_sg_attrs(struct device *dev, struct scatterlist *sglist, int nents, |
1426 | int dir, struct dma_attrs *attrs) | 1426 | int dir, struct dma_attrs *attrs) |
@@ -1512,7 +1512,7 @@ EXPORT_SYMBOL(sba_map_sg_attrs); | |||
1512 | * @dir: R/W or both. | 1512 | * @dir: R/W or both. |
1513 | * @attrs: optional dma attributes | 1513 | * @attrs: optional dma attributes |
1514 | * | 1514 | * |
1515 | * See Documentation/DMA-mapping.txt | 1515 | * See Documentation/PCI/PCI-DMA-mapping.txt |
1516 | */ | 1516 | */ |
1517 | void sba_unmap_sg_attrs(struct device *dev, struct scatterlist *sglist, | 1517 | void sba_unmap_sg_attrs(struct device *dev, struct scatterlist *sglist, |
1518 | int nents, int dir, struct dma_attrs *attrs) | 1518 | int nents, int dir, struct dma_attrs *attrs) |
diff --git a/arch/parisc/include/asm/dma-mapping.h b/arch/parisc/include/asm/dma-mapping.h index 53af696f23d2..da6943380908 100644 --- a/arch/parisc/include/asm/dma-mapping.h +++ b/arch/parisc/include/asm/dma-mapping.h | |||
@@ -5,7 +5,7 @@ | |||
5 | #include <asm/cacheflush.h> | 5 | #include <asm/cacheflush.h> |
6 | #include <asm/scatterlist.h> | 6 | #include <asm/scatterlist.h> |
7 | 7 | ||
8 | /* See Documentation/DMA-mapping.txt */ | 8 | /* See Documentation/PCI/PCI-DMA-mapping.txt */ |
9 | struct hppa_dma_ops { | 9 | struct hppa_dma_ops { |
10 | int (*dma_supported)(struct device *dev, u64 mask); | 10 | int (*dma_supported)(struct device *dev, u64 mask); |
11 | void *(*alloc_consistent)(struct device *dev, size_t size, dma_addr_t *iova, gfp_t flag); | 11 | void *(*alloc_consistent)(struct device *dev, size_t size, dma_addr_t *iova, gfp_t flag); |
diff --git a/arch/parisc/kernel/pci-dma.c b/arch/parisc/kernel/pci-dma.c index ccd61b9567a6..df47895db828 100644 --- a/arch/parisc/kernel/pci-dma.c +++ b/arch/parisc/kernel/pci-dma.c | |||
@@ -2,7 +2,7 @@ | |||
2 | ** PARISC 1.1 Dynamic DMA mapping support. | 2 | ** PARISC 1.1 Dynamic DMA mapping support. |
3 | ** This implementation is for PA-RISC platforms that do not support | 3 | ** This implementation is for PA-RISC platforms that do not support |
4 | ** I/O TLBs (aka DMA address translation hardware). | 4 | ** I/O TLBs (aka DMA address translation hardware). |
5 | ** See Documentation/DMA-mapping.txt for interface definitions. | 5 | ** See Documentation/PCI/PCI-DMA-mapping.txt for interface definitions. |
6 | ** | 6 | ** |
7 | ** (c) Copyright 1999,2000 Hewlett-Packard Company | 7 | ** (c) Copyright 1999,2000 Hewlett-Packard Company |
8 | ** (c) Copyright 2000 Grant Grundler | 8 | ** (c) Copyright 2000 Grant Grundler |
diff --git a/arch/x86/include/asm/dma-mapping.h b/arch/x86/include/asm/dma-mapping.h index 4035357f5b9d..132a134d12f2 100644 --- a/arch/x86/include/asm/dma-mapping.h +++ b/arch/x86/include/asm/dma-mapping.h | |||
@@ -2,8 +2,8 @@ | |||
2 | #define _ASM_X86_DMA_MAPPING_H | 2 | #define _ASM_X86_DMA_MAPPING_H |
3 | 3 | ||
4 | /* | 4 | /* |
5 | * IOMMU interface. See Documentation/DMA-mapping.txt and DMA-API.txt for | 5 | * IOMMU interface. See Documentation/PCI/PCI-DMA-mapping.txt and |
6 | * documentation. | 6 | * Documentation/DMA-API.txt for documentation. |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include <linux/scatterlist.h> | 9 | #include <linux/scatterlist.h> |
diff --git a/arch/x86/kernel/pci-gart_64.c b/arch/x86/kernel/pci-gart_64.c index 00c2bcd41463..d5768b1af080 100644 --- a/arch/x86/kernel/pci-gart_64.c +++ b/arch/x86/kernel/pci-gart_64.c | |||
@@ -5,7 +5,7 @@ | |||
5 | * This allows to use PCI devices that only support 32bit addresses on systems | 5 | * This allows to use PCI devices that only support 32bit addresses on systems |
6 | * with more than 4GB. | 6 | * with more than 4GB. |
7 | * | 7 | * |
8 | * See Documentation/DMA-mapping.txt for the interface specification. | 8 | * See Documentation/PCI/PCI-DMA-mapping.txt for the interface specification. |
9 | * | 9 | * |
10 | * Copyright 2002 Andi Kleen, SuSE Labs. | 10 | * Copyright 2002 Andi Kleen, SuSE Labs. |
11 | * Subject to the GNU General Public License v2 only. | 11 | * Subject to the GNU General Public License v2 only. |