diff options
author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2009-08-09 22:53:13 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-08-10 03:34:59 -0400 |
commit | 02f7a18935eef0e56d9180fc3c35da6aad1ff3bb (patch) | |
tree | 26435d2e792b4e61f55e41c8e91f106b3e030cd8 /arch/sparc/kernel | |
parent | bc0a14f154069cc4e42ea903c2c2b9984a94e4b7 (diff) |
sparc: Use asm-generic/dma-mapping-common.h
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Tested-by: Robert Reif <reif@earthlink.net>
Acked-by: David S. Miller <davem@davemloft.net>
Cc: tony.luck@intel.com
Cc: fenghua.yu@intel.com
LKML-Reference: <1249872797-1314-5-git-send-email-fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/sparc/kernel')
-rw-r--r-- | arch/sparc/kernel/dma.c | 4 | ||||
-rw-r--r-- | arch/sparc/kernel/iommu.c | 4 | ||||
-rw-r--r-- | arch/sparc/kernel/pci_sun4v.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/arch/sparc/kernel/dma.c b/arch/sparc/kernel/dma.c index 473a3fc7ab5b..15820a918171 100644 --- a/arch/sparc/kernel/dma.c +++ b/arch/sparc/kernel/dma.c | |||
@@ -165,7 +165,7 @@ static void dma32_sync_sg_for_device(struct device *dev, | |||
165 | BUG(); | 165 | BUG(); |
166 | } | 166 | } |
167 | 167 | ||
168 | static const struct dma_map_ops dma32_dma_ops = { | 168 | static struct dma_map_ops dma32_dma_ops = { |
169 | .alloc_coherent = dma32_alloc_coherent, | 169 | .alloc_coherent = dma32_alloc_coherent, |
170 | .free_coherent = dma32_free_coherent, | 170 | .free_coherent = dma32_free_coherent, |
171 | .map_page = dma32_map_page, | 171 | .map_page = dma32_map_page, |
@@ -178,5 +178,5 @@ static const struct dma_map_ops dma32_dma_ops = { | |||
178 | .sync_sg_for_device = dma32_sync_sg_for_device, | 178 | .sync_sg_for_device = dma32_sync_sg_for_device, |
179 | }; | 179 | }; |
180 | 180 | ||
181 | const struct dma_map_ops *dma_ops = &dma32_dma_ops; | 181 | struct dma_map_ops *dma_ops = &dma32_dma_ops; |
182 | EXPORT_SYMBOL(dma_ops); | 182 | EXPORT_SYMBOL(dma_ops); |
diff --git a/arch/sparc/kernel/iommu.c b/arch/sparc/kernel/iommu.c index a9f0ad955186..74b289cab552 100644 --- a/arch/sparc/kernel/iommu.c +++ b/arch/sparc/kernel/iommu.c | |||
@@ -826,7 +826,7 @@ static void dma_4u_sync_sg_for_cpu(struct device *dev, | |||
826 | spin_unlock_irqrestore(&iommu->lock, flags); | 826 | spin_unlock_irqrestore(&iommu->lock, flags); |
827 | } | 827 | } |
828 | 828 | ||
829 | static const struct dma_map_ops sun4u_dma_ops = { | 829 | static struct dma_map_ops sun4u_dma_ops = { |
830 | .alloc_coherent = dma_4u_alloc_coherent, | 830 | .alloc_coherent = dma_4u_alloc_coherent, |
831 | .free_coherent = dma_4u_free_coherent, | 831 | .free_coherent = dma_4u_free_coherent, |
832 | .map_page = dma_4u_map_page, | 832 | .map_page = dma_4u_map_page, |
@@ -837,7 +837,7 @@ static const struct dma_map_ops sun4u_dma_ops = { | |||
837 | .sync_sg_for_cpu = dma_4u_sync_sg_for_cpu, | 837 | .sync_sg_for_cpu = dma_4u_sync_sg_for_cpu, |
838 | }; | 838 | }; |
839 | 839 | ||
840 | const struct dma_map_ops *dma_ops = &sun4u_dma_ops; | 840 | struct dma_map_ops *dma_ops = &sun4u_dma_ops; |
841 | EXPORT_SYMBOL(dma_ops); | 841 | EXPORT_SYMBOL(dma_ops); |
842 | 842 | ||
843 | int dma_supported(struct device *dev, u64 device_mask) | 843 | int dma_supported(struct device *dev, u64 device_mask) |
diff --git a/arch/sparc/kernel/pci_sun4v.c b/arch/sparc/kernel/pci_sun4v.c index c4f7dce577dd..ee800f927929 100644 --- a/arch/sparc/kernel/pci_sun4v.c +++ b/arch/sparc/kernel/pci_sun4v.c | |||
@@ -539,7 +539,7 @@ static void dma_4v_sync_sg_for_cpu(struct device *dev, | |||
539 | /* Nothing to do... */ | 539 | /* Nothing to do... */ |
540 | } | 540 | } |
541 | 541 | ||
542 | static const struct dma_map_ops sun4v_dma_ops = { | 542 | static struct dma_map_ops sun4v_dma_ops = { |
543 | .alloc_coherent = dma_4v_alloc_coherent, | 543 | .alloc_coherent = dma_4v_alloc_coherent, |
544 | .free_coherent = dma_4v_free_coherent, | 544 | .free_coherent = dma_4v_free_coherent, |
545 | .map_page = dma_4v_map_page, | 545 | .map_page = dma_4v_map_page, |