Merge patch "RISC-V: Fix unannoted hardirqs-on in return to userspace slow-path"

I'm merging this in as a single patch to make it easier to handle the
backports.

* b4-shazam-merge:
  RISC-V: Fix unannoted hardirqs-on in return to userspace slow-path

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

diff --cc arch/riscv/kernel/entry.S
index da44fe2d0d821126d4ded9ea21fc97210ad741cf,58dfa8595e19df6bb6fc6905ac22af975f45b154..32b2ddafedb0cb1083492bbd68ab3e3c2df0bfb7
--- 1/arch/riscv/kernel/entry.S
--- 2/arch/riscv/kernel/entry.S
+++ b/arch/riscv/kernel/entry.S
@@@ -262,9 -262,7 +262,8 @@@ SYM_CODE_START_NOALIGN(ret_from_excepti
        andi s0, s0, SR_SPP
  #endif
        bnez s0, resume_kernel
 +SYM_CODE_END(ret_from_exception)
  
- resume_userspace:
        /* Interrupts must be disabled here so flags are checked atomically */
        REG_L s0, TASK_TI_FLAGS(tp) /* current_thread_info->flags */
        andi s1, s0, _TIF_WORK_MASK