From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 3 Jun 2021 08:01:30 +0000 (+1000)
Subject: Merge branch 'akpm-current/current'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0d7463b1fbd0a87e5319dbd5a1ae0574984ecd9a;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'akpm-current/current'
---

0d7463b1fbd0a87e5319dbd5a1ae0574984ecd9a
diff --cc arch/arm64/kvm/mmu.c
index 5742ba765ff95,5e0d40f9fb867..346f4b7c84bec
--- a/arch/arm64/kvm/mmu.c
+++ b/arch/arm64/kvm/mmu.c
@@@ -882,12 -853,9 +882,12 @@@ static int user_mem_abort(struct kvm_vc
  		return -EFAULT;
  	}
  
 -	/* Let's check if we will get back a huge page backed by hugetlbfs */
 +	/*
 +	 * Let's check if we will get back a huge page backed by hugetlbfs, or
 +	 * get block mapping for device MMIO region.
 +	 */
  	mmap_read_lock(current->mm);
- 	vma = find_vma_intersection(current->mm, hva, hva + 1);
+ 	vma = vma_lookup(current->mm, hva);
  	if (unlikely(!vma)) {
  		kvm_err("Failed to find VMA for hva 0x%lx\n", hva);
  		mmap_read_unlock(current->mm);
diff --cc arch/riscv/Kconfig
index 2eedaf621bc78,6ee11ca998b2a..ddb2230c61b79
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@@ -106,7 -104,7 +106,8 @@@ config RISC
  	select SYSCTL_EXCEPTION_TRACE
  	select THREAD_INFO_IN_TASK
  	select UACCESS_MEMCPY if !MMU
 +	select HAVE_ARCH_TRANSPARENT_HUGEPAGE if 64BIT && MMU
+ 	select ZONE_DMA32 if 64BIT
  
  config ARCH_MMAP_RND_BITS_MIN
  	default 18 if 64BIT
diff --cc drivers/block/zram/zram_drv.h
index 74c411911b6ea,6e73dc3c27690..80c3b43b4828f
--- a/drivers/block/zram/zram_drv.h
+++ b/drivers/block/zram/zram_drv.h
@@@ -112,9 -112,9 +112,9 @@@ struct zram 
  	/*
  	 * zram is claimed so open request will be failed
  	 */
 -	bool claim; /* Protected by bdev->bd_mutex */
 +	bool claim; /* Protected by disk->open_mutex */
- 	struct file *backing_dev;
  #ifdef CONFIG_ZRAM_WRITEBACK
+ 	struct file *backing_dev;
  	spinlock_t wb_limit_lock;
  	bool wb_limit_enable;
  	u64 bd_wb_limit;