Merge remote-tracking branch 'risc-v/for-next'

diff --cc arch/riscv/Kconfig
Simple merge

diff --cc arch/riscv/Makefile
Simple merge

diff --cc arch/riscv/include/asm/page.h
index b0ca5058e7ae6a7d1f7c49399d8d837addc708e4,d34327be75746c255ab4702890b7dbb847f7fe74..109c97e991a6391f243045451907cd9bf680e830
--- 1/arch/riscv/include/asm/page.h
--- 2/arch/riscv/include/asm/page.h
+++ b/arch/riscv/include/asm/page.h
@@@ -103,13 -101,12 +101,13 @@@ struct kernel_mapping 
  };
  
  extern struct kernel_mapping kernel_map;
 +extern phys_addr_t phys_ram_base;
  
- #ifdef CONFIG_64BIT
  #define is_kernel_mapping(x)  \
        ((x) >= kernel_map.virt_addr && (x) < (kernel_map.virt_addr + kernel_map.size))
+ 
  #define is_linear_mapping(x)  \
-       ((x) >= PAGE_OFFSET && (x) < kernel_map.virt_addr)
+       ((x) >= PAGE_OFFSET && (!IS_ENABLED(CONFIG_64BIT) || (x) < kernel_map.virt_addr))
  
  #define linear_mapping_pa_to_va(x)    ((void *)((unsigned long)(x) + kernel_map.va_pa_offset))
  #define kernel_mapping_pa_to_va(y)    ({                                              \

diff --cc arch/riscv/kernel/setup.c
Simple merge

diff --cc arch/riscv/mm/init.c
index 7cb4f391d106f4561250648144fb773584a70037,248f9ec393c12aa5845bdaed9aaae700e8642dc9..96e360cf3de0746bbd92db48582340abde8399cc
--- 1/arch/riscv/mm/init.c
--- 2/arch/riscv/mm/init.c
+++ b/arch/riscv/mm/init.c
@@@ -589,16 -594,8 +615,16 @@@ asmlinkage void __init setup_vm(uintptr
  
        /* Sanity check alignment and size */
        BUG_ON((PAGE_OFFSET % PGDIR_SIZE) != 0);
-       BUG_ON((kernel_map.phys_addr % map_size) != 0);
+       BUG_ON((kernel_map.phys_addr % PMD_SIZE) != 0);
  
 +#ifdef CONFIG_64BIT
 +      /*
 +       * The last 4K bytes of the addressable memory can not be mapped because
 +       * of IS_ERR_VALUE macro.
 +       */
 +      BUG_ON((kernel_map.virt_addr + kernel_map.size) > ADDRESS_SPACE_END - SZ_4K);
 +#endif
 +
        pt_ops.alloc_pte = alloc_pte_early;
        pt_ops.get_pte_virt = get_pte_virt_early;
  #ifndef __PAGETABLE_PMD_FOLDED