Merge tag 'for-linus' of https://github.com/openrisc/linux

Pull OpenRISC updates from Stafford Horne:
 "I have relocated to London so not much work from me while I get
  settled.

  Still, OpenRISC picked up two patches in this window:

   - Fix for kernel page table walking from Jann Horn

   - MAINTAINER entry cleanup from Palmer Dabbelt"

* tag 'for-linus' of https://github.com/openrisc/linux:
  MAINTAINERS: git://github -> https://github.com for openrisc
  openrisc: Fix pagewalk usage in arch_dma_{clear, set}_uncached

diff --git a/MAINTAINERS b/MAINTAINERS
index 72e80c0f6d55b8ea540011f883a7e260fefff00e..cf0f1850237247013eacce7f737d35793e69024b 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -15411,7 +15411,7 @@ M:      Stafford Horne <shorne@gmail.com>
 L:     openrisc@lists.librecores.org
 S:     Maintained
 W:     http://openrisc.io
-T:     git git://github.com/openrisc/linux.git
+T:     git https://github.com/openrisc/linux.git
 F:     Documentation/devicetree/bindings/openrisc/
 F:     Documentation/openrisc/
 F:     arch/openrisc/

diff --git a/arch/openrisc/kernel/dma.c b/arch/openrisc/kernel/dma.c
index a82b2caaa560d6e3dc8e2b5bbcfc2240cfb54291..b3edbb33b621d0431665374c9d87313163b0312c 100644 (file)
--- a/arch/openrisc/kernel/dma.c
+++ b/arch/openrisc/kernel/dma.c
@@ -74,10 +74,10 @@ void *arch_dma_set_uncached(void *cpu_addr, size_t size)
         * We need to iterate through the pages, clearing the dcache for
         * them and setting the cache-inhibit bit.
         */
-       mmap_read_lock(&init_mm);
-       error = walk_page_range(&init_mm, va, va + size, &set_nocache_walk_ops,
-                       NULL);
-       mmap_read_unlock(&init_mm);
+       mmap_write_lock(&init_mm);
+       error = walk_page_range_novma(&init_mm, va, va + size,
+                       &set_nocache_walk_ops, NULL, NULL);
+       mmap_write_unlock(&init_mm);
 
        if (error)
                return ERR_PTR(error);
@@ -88,11 +88,11 @@ void arch_dma_clear_uncached(void *cpu_addr, size_t size)
 {
        unsigned long va = (unsigned long)cpu_addr;
 
-       mmap_read_lock(&init_mm);
+       mmap_write_lock(&init_mm);
        /* walk_page_range shouldn't be able to fail here */
-       WARN_ON(walk_page_range(&init_mm, va, va + size,
-                       &clear_nocache_walk_ops, NULL));
-       mmap_read_unlock(&init_mm);
+       WARN_ON(walk_page_range_novma(&init_mm, va, va + size,
+                       &clear_nocache_walk_ops, NULL, NULL));
+       mmap_write_unlock(&init_mm);
 }
 
 void arch_sync_dma_for_device(phys_addr_t addr, size_t size,