Commit 05c4e272 authored by Huang Pei's avatar Huang Pei Committed by Thomas Bogendoerfer
Browse files

MIPS: fix local_irq_{disable,enable} in asmmacro.h 



commit ba9196d2 ("MIPS: Make DIEI support as a config option")
use CPU_HAS_DIEI to indicate whether di/ei is implemented correctly,
without this patch, "local_irq_disable" from entry.S in 3A1000
(with buggy di/ei) lose protection of commit e97c5b60 ("MIPS:
Make irqflags.h functions preempt-safe for non-mipsr2 cpus")

Fixes: ba9196d2 ("MIPS: Make DIEI support as a config option")
Signed-off-by: default avatarHuang Pei <huangpei@loongson.cn>
Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
parent 2132ce5d

arch/mips/include/asm/asmmacro.h

+1 −2
Original line number Diff line number Diff line
@@ -44,8 +44,7 @@ 
	.endm

#endif



#if defined(CONFIG_CPU_MIPSR2) || defined(CONFIG_CPU_MIPSR5) || \

    defined(CONFIG_CPU_MIPSR6)

#ifdef CONFIG_CPU_HAS_DIEI

	.macro	local_irq_enable reg=t0

	ei

	irq_enable_hazard