diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-11-29 20:19:26 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-11-29 20:19:26 +0100 |
| commit | f91a3aa6bce480fe6e08df540129f4a923222419 (patch) | |
| tree | e8a9063323abbd850adebbd4f1d50b5d51364e5f /arch/csky/kernel | |
| parent | Merge tag 'irq-urgent-2020-11-29' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| parent | intel_idle: Fix intel_idle() vs tracing (diff) | |
| download | linux-f91a3aa6bce480fe6e08df540129f4a923222419.tar.xz linux-f91a3aa6bce480fe6e08df540129f4a923222419.zip | |
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/csky/kernel')
| -rw-r--r-- | arch/csky/kernel/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/csky/kernel/process.c b/arch/csky/kernel/process.c index f730869e21ee..69af6bc87e64 100644 --- a/arch/csky/kernel/process.c +++ b/arch/csky/kernel/process.c @@ -102,6 +102,6 @@ void arch_cpu_idle(void) #ifdef CONFIG_CPU_PM_STOP asm volatile("stop\n"); #endif - local_irq_enable(); + raw_local_irq_enable(); } #endif |