Merge tag 'riscv-for-linus-5.15-rc8' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 30 Oct 2021 16:28:24 +0000 (09:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 30 Oct 2021 16:28:24 +0000 (09:28 -0700)
Pull RISC-V fixes from Palmer Dabbelt:
 "These are pretty late, but they do fix concrete issues.

   - ensure the trap vector's address is aligned.

   - avoid re-populating the KASAN shadow memory.

   - allow kasan to build without warnings, which have recently become
     errors"

* tag 'riscv-for-linus-5.15-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
  riscv: Fix asan-stack clang build
  riscv: Do not re-populate shadow memory with kasan_populate_early_shadow
  riscv: fix misalgned trap vector base address

1  2 
arch/riscv/Kconfig

diff --combined arch/riscv/Kconfig
@@@ -163,6 -163,12 +163,12 @@@ config PAGE_OFFSE
        default 0xffffffff80000000 if 64BIT && MAXPHYSMEM_2GB
        default 0xffffffe000000000 if 64BIT && MAXPHYSMEM_128GB
  
+ config KASAN_SHADOW_OFFSET
+       hex
+       depends on KASAN_GENERIC
+       default 0xdfffffc800000000 if 64BIT
+       default 0xffffffff if 32BIT
  config ARCH_FLATMEM_ENABLE
        def_bool !NUMA
  
@@@ -236,7 -242,7 +242,7 @@@ config ARCH_RV32
  config ARCH_RV64I
        bool "RV64I"
        select 64BIT
 -      select ARCH_SUPPORTS_INT128 if CC_HAS_INT128 && GCC_VERSION >= 50000
 +      select ARCH_SUPPORTS_INT128 if CC_HAS_INT128
        select HAVE_DYNAMIC_FTRACE if !XIP_KERNEL && MMU && $(cc-option,-fpatchable-function-entry=8)
        select HAVE_DYNAMIC_FTRACE_WITH_REGS if HAVE_DYNAMIC_FTRACE
        select HAVE_FTRACE_MCOUNT_RECORD if !XIP_KERNEL
@@@ -561,3 -567,5 +567,3 @@@ menu "Power management options
  source "kernel/power/Kconfig"
  
  endmenu
 -
 -source "drivers/firmware/Kconfig"