aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2007-03-09 19:58:43 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-26 04:55:18 -0400
commitc6e87566ea080bbbe926c0e429fed48e6f680d93 (patch)
tree36d13a5bdef56329cd5be6eef1ada88fb7d8a802
parent0bba2dd823fd995ed805ae5cbd5a1c1381257a12 (diff)
[SPARC64]: Const'ify pci_iommu_ops.
Based upon a similar patch for x86_64 written by Stephen Hemminger. Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--arch/sparc64/kernel/pci.c4
-rw-r--r--arch/sparc64/kernel/pci_iommu.c2
-rw-r--r--arch/sparc64/kernel/pci_sun4v.c2
-rw-r--r--include/asm-sparc64/pci.h2
4 files changed, 5 insertions, 5 deletions
diff --git a/arch/sparc64/kernel/pci.c b/arch/sparc64/kernel/pci.c
index a7809a00324c..914a216da339 100644
--- a/arch/sparc64/kernel/pci.c
+++ b/arch/sparc64/kernel/pci.c
@@ -282,10 +282,10 @@ int __init pcic_present(void)
282 return pci_controller_scan(pci_is_controller); 282 return pci_controller_scan(pci_is_controller);
283} 283}
284 284
285struct pci_iommu_ops *pci_iommu_ops; 285const struct pci_iommu_ops *pci_iommu_ops;
286EXPORT_SYMBOL(pci_iommu_ops); 286EXPORT_SYMBOL(pci_iommu_ops);
287 287
288extern struct pci_iommu_ops pci_sun4u_iommu_ops, 288extern const struct pci_iommu_ops pci_sun4u_iommu_ops,
289 pci_sun4v_iommu_ops; 289 pci_sun4v_iommu_ops;
290 290
291/* Find each controller in the system, attach and initialize 291/* Find each controller in the system, attach and initialize
diff --git a/arch/sparc64/kernel/pci_iommu.c b/arch/sparc64/kernel/pci_iommu.c
index 554daabb381e..aefdcc51045b 100644
--- a/arch/sparc64/kernel/pci_iommu.c
+++ b/arch/sparc64/kernel/pci_iommu.c
@@ -759,7 +759,7 @@ static void pci_4u_dma_sync_sg_for_cpu(struct pci_dev *pdev, struct scatterlist
759 spin_unlock_irqrestore(&iommu->lock, flags); 759 spin_unlock_irqrestore(&iommu->lock, flags);
760} 760}
761 761
762struct pci_iommu_ops pci_sun4u_iommu_ops = { 762const struct pci_iommu_ops pci_sun4u_iommu_ops = {
763 .alloc_consistent = pci_4u_alloc_consistent, 763 .alloc_consistent = pci_4u_alloc_consistent,
764 .free_consistent = pci_4u_free_consistent, 764 .free_consistent = pci_4u_free_consistent,
765 .map_single = pci_4u_map_single, 765 .map_single = pci_4u_map_single,
diff --git a/arch/sparc64/kernel/pci_sun4v.c b/arch/sparc64/kernel/pci_sun4v.c
index c6feae6e9690..a8c12c1e8039 100644
--- a/arch/sparc64/kernel/pci_sun4v.c
+++ b/arch/sparc64/kernel/pci_sun4v.c
@@ -583,7 +583,7 @@ static void pci_4v_dma_sync_sg_for_cpu(struct pci_dev *pdev, struct scatterlist
583 /* Nothing to do... */ 583 /* Nothing to do... */
584} 584}
585 585
586struct pci_iommu_ops pci_sun4v_iommu_ops = { 586const struct pci_iommu_ops pci_sun4v_iommu_ops = {
587 .alloc_consistent = pci_4v_alloc_consistent, 587 .alloc_consistent = pci_4v_alloc_consistent,
588 .free_consistent = pci_4v_free_consistent, 588 .free_consistent = pci_4v_free_consistent,
589 .map_single = pci_4v_map_single, 589 .map_single = pci_4v_map_single,
diff --git a/include/asm-sparc64/pci.h b/include/asm-sparc64/pci.h
index b14a725b430d..47cea16e1bad 100644
--- a/include/asm-sparc64/pci.h
+++ b/include/asm-sparc64/pci.h
@@ -54,7 +54,7 @@ struct pci_iommu_ops {
54 void (*dma_sync_sg_for_cpu)(struct pci_dev *, struct scatterlist *, int, int); 54 void (*dma_sync_sg_for_cpu)(struct pci_dev *, struct scatterlist *, int, int);
55}; 55};
56 56
57extern struct pci_iommu_ops *pci_iommu_ops; 57extern const struct pci_iommu_ops *pci_iommu_ops;
58 58
59/* Allocate and map kernel buffer using consistent mode DMA for a device. 59/* Allocate and map kernel buffer using consistent mode DMA for a device.
60 * hwdev should be valid struct pci_dev pointer for PCI devices. 60 * hwdev should be valid struct pci_dev pointer for PCI devices.