summaryrefslogtreecommitdiff
path: root/arch/riscv
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-11-29 22:19:26 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2020-11-29 22:19:26 +0300
commitf91a3aa6bce480fe6e08df540129f4a923222419 (patch)
treee8a9063323abbd850adebbd4f1d50b5d51364e5f /arch/riscv
parent8b7a51ba2637ee53ce90624f5f98aaf8ec9b2bcc (diff)
parent6e1d2bc675bd57640f5658a4a657ae488db4c204 (diff)
downloadlinux-f91a3aa6bce480fe6e08df540129f4a923222419.tar.xz
Merge tag 'locking-urgent-2020-11-29' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull locking fixes from Thomas Gleixner: "Two more places which invoke tracing from RCU disabled regions in the idle path. Similar to the entry path the low level idle functions have to be non-instrumentable" * tag 'locking-urgent-2020-11-29' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: intel_idle: Fix intel_idle() vs tracing sched/idle: Fix arch_cpu_idle() vs tracing
Diffstat (limited to 'arch/riscv')
-rw-r--r--arch/riscv/kernel/process.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/riscv/kernel/process.c b/arch/riscv/kernel/process.c
index 19225ec65db6..dd5f985b1f40 100644
--- a/arch/riscv/kernel/process.c
+++ b/arch/riscv/kernel/process.c
@@ -36,7 +36,7 @@ extern asmlinkage void ret_from_kernel_thread(void);
void arch_cpu_idle(void)
{
wait_for_interrupt();
- local_irq_enable();
+ raw_local_irq_enable();
}
void show_regs(struct pt_regs *regs)