4 files changed, 13 insertions, 5 deletions

diff --git a/arch/mips/bcm63xx/dev-enet.c b/arch/mips/bcm63xx/dev-enet.c
index 07b4c65a88a4..8e73d65f3480 100644
--- a/arch/mips/bcm63xx/dev-enet.c
+++ b/arch/mips/bcm63xx/dev-enet.c
@@ -70,6 +70,8 @@ static struct platform_device bcm63xx_enet_shared_device = {
 
 static int shared_device_registered;
 
+static u64 enet_dmamask = DMA_BIT_MASK(32);
+
 static struct resource enet0_res[] = {
         {
                 .start          = -1, /* filled at runtime */
@@ -99,6 +101,8 @@ static struct platform_device bcm63xx_enet0_device = {
         .resource       = enet0_res,
         .dev            = {
                 .platform_data = &enet0_pd,
+                .dma_mask = &enet_dmamask,
+                .coherent_dma_mask = DMA_BIT_MASK(32),
         },
 };
 
@@ -131,6 +135,8 @@ static struct platform_device bcm63xx_enet1_device = {
         .resource       = enet1_res,
         .dev            = {
                 .platform_data = &enet1_pd,
+                .dma_mask = &enet_dmamask,
+                .coherent_dma_mask = DMA_BIT_MASK(32),
         },
 };
 
@@ -157,6 +163,8 @@ static struct platform_device bcm63xx_enetsw_device = {
         .resource       = enetsw_res,
         .dev            = {
                 .platform_data = &enetsw_pd,
+                .dma_mask = &enet_dmamask,
+                .coherent_dma_mask = DMA_BIT_MASK(32),
         },
 };
 
diff --git a/arch/mips/kernel/cmpxchg.c b/arch/mips/kernel/cmpxchg.c
index 0b9535bc2c53..6b2a4a902a98 100644
--- a/arch/mips/kernel/cmpxchg.c
+++ b/arch/mips/kernel/cmpxchg.c
@@ -54,10 +54,9 @@ unsigned long __xchg_small(volatile void *ptr, unsigned long val, unsigned int s
 unsigned long __cmpxchg_small(volatile void *ptr, unsigned long old,
                               unsigned long new, unsigned int size)
 {
-        u32 mask, old32, new32, load32;
+        u32 mask, old32, new32, load32, load;
         volatile u32 *ptr32;
         unsigned int shift;
-        u8 load;
 
         /* Check that ptr is naturally aligned */
         WARN_ON((unsigned long)ptr & (size - 1));
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index 8c6c48ed786a..d2e5a5ad0e6f 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -384,7 +384,8 @@ static void __init bootmem_init(void)
         init_initrd();
         reserved_end = (unsigned long) PFN_UP(__pa_symbol(&_end));
 
-        memblock_reserve(PHYS_OFFSET, reserved_end << PAGE_SHIFT);
+        memblock_reserve(PHYS_OFFSET,
+                         (reserved_end << PAGE_SHIFT) - PHYS_OFFSET);
 
         /*
          * max_low_pfn is not a number of pages. The number of pages
diff --git a/arch/mips/lantiq/xway/vmmc.c b/arch/mips/lantiq/xway/vmmc.c
index 577ec81b557d..3deab9a77718 100644
--- a/arch/mips/lantiq/xway/vmmc.c
+++ b/arch/mips/lantiq/xway/vmmc.c
@@ -31,8 +31,8 @@ static int vmmc_probe(struct platform_device *pdev)
         dma_addr_t dma;
 
         cp1_base =
-                (void *) CPHYSADDR(dma_alloc_coherent(NULL, CP1_SIZE,
-                                                    &dma, GFP_ATOMIC));
+                (void *) CPHYSADDR(dma_alloc_coherent(&pdev->dev, CP1_SIZE,
+                                                    &dma, GFP_KERNEL));
 
         gpio_count = of_gpio_count(pdev->dev.of_node);
         while (gpio_count > 0) {