diff options
| author | Jason Gunthorpe <jgg@nvidia.com> | 2020-12-01 20:40:50 -0400 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@nvidia.com> | 2020-12-01 20:40:50 -0400 |
| commit | 2b0a999ba003ea9b48910d75c318ae63246bc6f3 (patch) | |
| tree | 71dc50d336f2a7aac158e36aed1c6b99db821f2d /arch/csky/kernel/process.c | |
| parent | f93c39bc95472dae3b5de71da5c005f47ece3148 (diff) | |
| parent | b65054597872ce3aefbc6a666385eabdf9e288da (diff) | |
| download | linux-2b0a999ba003ea9b48910d75c318ae63246bc6f3.tar.gz linux-2b0a999ba003ea9b48910d75c318ae63246bc6f3.tar.bz2 linux-2b0a999ba003ea9b48910d75c318ae63246bc6f3.zip | |
Merge tag 'v5.10-rc6' into rdma.git for-next
For dependencies in following patches
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Diffstat (limited to 'arch/csky/kernel/process.c')
| -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 |