diff options
Diffstat (limited to 'arch/parisc')
-rw-r--r-- | arch/parisc/include/asm/dma-mapping.h | 2 | ||||
-rw-r--r-- | arch/parisc/kernel/irq.c | 2 | ||||
-rw-r--r-- | arch/parisc/kernel/pci-dma.c | 2 |
3 files changed, 3 insertions, 3 deletions
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/irq.c b/arch/parisc/kernel/irq.c index ac2c822928c7..704341b0b098 100644 --- a/arch/parisc/kernel/irq.c +++ b/arch/parisc/kernel/irq.c | |||
@@ -183,7 +183,7 @@ int show_interrupts(struct seq_file *p, void *v) | |||
183 | seq_printf(p, "%3d: ", i); | 183 | seq_printf(p, "%3d: ", i); |
184 | #ifdef CONFIG_SMP | 184 | #ifdef CONFIG_SMP |
185 | for_each_online_cpu(j) | 185 | for_each_online_cpu(j) |
186 | seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]); | 186 | seq_printf(p, "%10u ", kstat_irqs_cpu(i, j)); |
187 | #else | 187 | #else |
188 | seq_printf(p, "%10u ", kstat_irqs(i)); | 188 | seq_printf(p, "%10u ", kstat_irqs(i)); |
189 | #endif | 189 | #endif |
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 |