summaryrefslogtreecommitdiffstats
path: root/arch/csky
diff options
context:
space:
mode:
authorLiu Yibin <jiulong@linux.alibaba.com>2020-05-13 15:54:15 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-06-03 08:21:14 +0200
commit68d72327999af2c7d9955ded4c0e9033fd3f477f (patch)
treeb242cacbb4e1b908e35089c84f7f61bf7616d365 /arch/csky
parent99bd434f88930e8212b61827f8b591017835d94b (diff)
downloadlinux-stable-68d72327999af2c7d9955ded4c0e9033fd3f477f.tar.gz
linux-stable-68d72327999af2c7d9955ded4c0e9033fd3f477f.tar.bz2
linux-stable-68d72327999af2c7d9955ded4c0e9033fd3f477f.zip
csky: Fixup remove duplicate irq_disable
[ Upstream commit 6633a5aa8eb6bda70eb3a9837efd28a67ccc6e0a ] Interrupt has been disabled in __schedule() with local_irq_disable() and enabled in finish_task_switch->finish_lock_switch() with local_irq_enabled(), So needn't to disable irq here. Signed-off-by: Liu Yibin <jiulong@linux.alibaba.com> Signed-off-by: Guo Ren <guoren@linux.alibaba.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'arch/csky')
-rw-r--r--arch/csky/kernel/entry.S2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/csky/kernel/entry.S b/arch/csky/kernel/entry.S
index a7a5b67df898..65c55f22532a 100644
--- a/arch/csky/kernel/entry.S
+++ b/arch/csky/kernel/entry.S
@@ -318,8 +318,6 @@ ENTRY(__switch_to)
mfcr a2, psr /* Save PSR value */
stw a2, (a3, THREAD_SR) /* Save PSR in task struct */
- bclri a2, 6 /* Disable interrupts */
- mtcr a2, psr
SAVE_SWITCH_STACK