diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-11-29 11:19:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-11-29 11:19:26 -0800 |
| commit | f91a3aa6bce480fe6e08df540129f4a923222419 (patch) | |
| tree | e8a9063323abbd850adebbd4f1d50b5d51364e5f /arch/um | |
| parent | 8b7a51ba2637ee53ce90624f5f98aaf8ec9b2bcc (diff) | |
| parent | 6e1d2bc675bd57640f5658a4a657ae488db4c204 (diff) | |
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/um')
| -rw-r--r-- | arch/um/kernel/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c index 3bed09538dd9..9505a7e87396 100644 --- a/arch/um/kernel/process.c +++ b/arch/um/kernel/process.c @@ -217,7 +217,7 @@ void arch_cpu_idle(void) { cpu_tasks[current_thread_info()->cpu].pid = os_getpid(); um_idle_sleep(); - local_irq_enable(); + raw_local_irq_enable(); } int __cant_sleep(void) { |