]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
csky: Fixup remove duplicate irq_disable
authorLiu Yibin <jiulong@linux.alibaba.com>
Wed, 13 May 2020 07:54:15 +0000 (15:54 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 3 Jun 2020 06:23:09 +0000 (08:23 +0200)
[ 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>
arch/csky/kernel/entry.S

index 00770632800005baebc0525a0eb887f48e118de6..9718388448a4b7c523014256cb168f4ffa101cc8 100644 (file)
@@ -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