Merge patch series "RISC-V: Align the shadow stack"

Palmer Dabbelt <palmer@rivosinc.com> says:

This contains a pair of cleanups that depend on a fix that has already
landed upstream.

* b4-shazam-merge:
  RISC-V: Add some comments about the shadow and overflow stacks
  RISC-V: Align the shadow stack
  riscv: fix race when vmap stack overflow

Link: https://lore.kernel.org/r/20221130023515.20217-1-palmer@rivosinc.com
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>

diff --cc arch/riscv/include/asm/asm.h
Simple merge

diff --cc arch/riscv/kernel/entry.S
Simple merge

diff --cc arch/riscv/kernel/traps.c
index f3e96d60a2ff384a4ff7b342ba8daa45e22aaff1,336d4aadadb1cd357ed340870f0e7c9bf44e409d..549bde5c970a13e9412148c7c45aca1ef2034825
--- 1/arch/riscv/kernel/traps.c
--- 2/arch/riscv/kernel/traps.c
+++ b/arch/riscv/kernel/traps.c
@@@ -207,7 -194,16 +207,11 @@@ int is_valid_bugaddr(unsigned long pc
  }
  #endif /* CONFIG_GENERIC_BUG */
  
 -/* stvec & scratch is already set from head.S */
 -void __init trap_init(void)
 -{
 -}
 -
  #ifdef CONFIG_VMAP_STACK
+ /*
+  * Extra stack space that allows us to provide panic messages when the kernel
+  * has overflowed its stack.
+  */
  static DEFINE_PER_CPU(unsigned long [OVERFLOW_STACK_SIZE/sizeof(long)],
                overflow_stack)__aligned(16);
  /*