diff options
Diffstat (limited to 'arch/mips')
-rw-r--r-- | arch/mips/cavium-octeon/executive/cvmx-helper.c | 2 | ||||
-rw-r--r-- | arch/mips/mm/dma-noncoherent.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper.c b/arch/mips/cavium-octeon/executive/cvmx-helper.c index 75108ec669eb..6c79e8a16a26 100644 --- a/arch/mips/cavium-octeon/executive/cvmx-helper.c +++ b/arch/mips/cavium-octeon/executive/cvmx-helper.c | |||
@@ -67,7 +67,7 @@ void (*cvmx_override_pko_queue_priority) (int pko_port, | |||
67 | void (*cvmx_override_ipd_port_setup) (int ipd_port); | 67 | void (*cvmx_override_ipd_port_setup) (int ipd_port); |
68 | 68 | ||
69 | /* Port count per interface */ | 69 | /* Port count per interface */ |
70 | static int interface_port_count[5]; | 70 | static int interface_port_count[9]; |
71 | 71 | ||
72 | /** | 72 | /** |
73 | * Return the number of interfaces the chip has. Each interface | 73 | * Return the number of interfaces the chip has. Each interface |
diff --git a/arch/mips/mm/dma-noncoherent.c b/arch/mips/mm/dma-noncoherent.c index e6c9485cadcf..cb38461391cb 100644 --- a/arch/mips/mm/dma-noncoherent.c +++ b/arch/mips/mm/dma-noncoherent.c | |||
@@ -50,7 +50,7 @@ void *arch_dma_alloc(struct device *dev, size_t size, | |||
50 | void *ret; | 50 | void *ret; |
51 | 51 | ||
52 | ret = dma_direct_alloc_pages(dev, size, dma_handle, gfp, attrs); | 52 | ret = dma_direct_alloc_pages(dev, size, dma_handle, gfp, attrs); |
53 | if (!ret && !(attrs & DMA_ATTR_NON_CONSISTENT)) { | 53 | if (ret && !(attrs & DMA_ATTR_NON_CONSISTENT)) { |
54 | dma_cache_wback_inv((unsigned long) ret, size); | 54 | dma_cache_wback_inv((unsigned long) ret, size); |
55 | ret = (void *)UNCAC_ADDR(ret); | 55 | ret = (void *)UNCAC_ADDR(ret); |
56 | } | 56 | } |