diff options
| author | YuanJunQing <yuanjunqing66@163.com> | 2020-05-27 14:11:30 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-06-20 10:25:13 +0200 |
| commit | 2e509421f07620fd0f7567c6ecf2d9cc9e3e4366 (patch) | |
| tree | 0966b7e40477bc2eb7a77245baf52c87dd8a7689 /arch | |
| parent | 537036f278f69f2a4a3f7f9d91c680c201692f90 (diff) | |
| download | linux-2e509421f07620fd0f7567c6ecf2d9cc9e3e4366.tar.gz linux-2e509421f07620fd0f7567c6ecf2d9cc9e3e4366.tar.bz2 linux-2e509421f07620fd0f7567c6ecf2d9cc9e3e4366.zip | |
MIPS: Fix IRQ tracing when call handle_fpe() and handle_msa_fpe()
[ Upstream commit 31e1b3efa802f97a17628dde280006c4cee4ce5e ]
Register "a1" is unsaved in this function,
when CONFIG_TRACE_IRQFLAGS is enabled,
the TRACE_IRQS_OFF macro will call trace_hardirqs_off(),
and this may change register "a1".
The changed register "a1" as argument will be send
to do_fpe() and do_msa_fpe().
Signed-off-by: YuanJunQing <yuanjunqing66@163.com>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mips/kernel/genex.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/kernel/genex.S b/arch/mips/kernel/genex.S index 37b9383eacd3..cf74a963839f 100644 --- a/arch/mips/kernel/genex.S +++ b/arch/mips/kernel/genex.S @@ -431,20 +431,20 @@ NESTED(nmi_handler, PT_SIZE, sp) .endm .macro __build_clear_fpe + CLI + TRACE_IRQS_OFF .set push /* gas fails to assemble cfc1 for some archs (octeon).*/ \ .set mips1 SET_HARDFLOAT cfc1 a1, fcr31 .set pop - CLI - TRACE_IRQS_OFF .endm .macro __build_clear_msa_fpe - _cfcmsa a1, MSA_CSR CLI TRACE_IRQS_OFF + _cfcmsa a1, MSA_CSR .endm .macro __build_clear_ade |