From: Palmer Dabbelt <palmer@rivosinc.com>
Date: Thu, 8 Dec 2022 23:31:44 +0000 (-0800)
Subject: Merge patch "RISC-V: Fix unannoted hardirqs-on in return to userspace slow-path"
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e1ceb096416311be1564de69ea40bb872d7cc327;p=linux.git

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>
---

e1ceb096416311be1564de69ea40bb872d7cc327
diff --cc arch/riscv/kernel/entry.S
index da44fe2d0d821,58dfa8595e19d..32b2ddafedb0c
--- a/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