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

+9 -9
+1 -1
MAINTAINERS
··· 15411 15411 L: openrisc@lists.librecores.org 15412 15412 S: Maintained 15413 15413 W: http://openrisc.io 15414 - T: git git://github.com/openrisc/linux.git 15414 + T: git https://github.com/openrisc/linux.git 15415 15415 F: Documentation/devicetree/bindings/openrisc/ 15416 15416 F: Documentation/openrisc/ 15417 15417 F: arch/openrisc/
+8 -8
arch/openrisc/kernel/dma.c
··· 74 74 * We need to iterate through the pages, clearing the dcache for 75 75 * them and setting the cache-inhibit bit. 76 76 */ 77 - mmap_read_lock(&init_mm); 78 - error = walk_page_range(&init_mm, va, va + size, &set_nocache_walk_ops, 79 - NULL); 80 - mmap_read_unlock(&init_mm); 77 + mmap_write_lock(&init_mm); 78 + error = walk_page_range_novma(&init_mm, va, va + size, 79 + &set_nocache_walk_ops, NULL, NULL); 80 + mmap_write_unlock(&init_mm); 81 81 82 82 if (error) 83 83 return ERR_PTR(error); ··· 88 88 { 89 89 unsigned long va = (unsigned long)cpu_addr; 90 90 91 - mmap_read_lock(&init_mm); 91 + mmap_write_lock(&init_mm); 92 92 /* walk_page_range shouldn't be able to fail here */ 93 - WARN_ON(walk_page_range(&init_mm, va, va + size, 94 - &clear_nocache_walk_ops, NULL)); 95 - mmap_read_unlock(&init_mm); 93 + WARN_ON(walk_page_range_novma(&init_mm, va, va + size, 94 + &clear_nocache_walk_ops, NULL, NULL)); 95 + mmap_write_unlock(&init_mm); 96 96 } 97 97 98 98 void arch_sync_dma_for_device(phys_addr_t addr, size_t size,