aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Burton <paul.burton@imgtec.com>2016-09-22 15:47:40 +0100
committerRalf Baechle <ralf@linux-mips.org>2016-09-25 01:59:16 +0200
commit116e7111c8e3cc65ceef9664741bd593483e9517 (patch)
tree1ae6cda95eddf35d3424b27d7f567b316804bf66
parent8f46cca1e6c06a058374816887059bcc017b382f (diff)
downloadkernel_i9300_mainline-116e7111c8e3cc65ceef9664741bd593483e9517.zip
kernel_i9300_mainline-116e7111c8e3cc65ceef9664741bd593483e9517.tar.gz
kernel_i9300_mainline-116e7111c8e3cc65ceef9664741bd593483e9517.tar.bz2
MIPS: Fix delay slot emulation count in debugfs
Commit 432c6bacbd0c ("MIPS: Use per-mm page to execute branch delay slot instructions") accidentally removed use of the MIPS_FPU_EMU_INC_STATS macro from do_dsemulret, leading to the ds_emul file in debugfs always returning zero even though we perform delay slot emulations. Fix this by re-adding the use of the MIPS_FPU_EMU_INC_STATS macro. Signed-off-by: Paul Burton <paul.burton@imgtec.com> Fixes: 432c6bacbd0c ("MIPS: Use per-mm page to execute branch delay slot instructions") Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/14301/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r--arch/mips/math-emu/dsemul.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/math-emu/dsemul.c b/arch/mips/math-emu/dsemul.c
index 72a4642..4a094f7 100644
--- a/arch/mips/math-emu/dsemul.c
+++ b/arch/mips/math-emu/dsemul.c
@@ -298,5 +298,6 @@ bool do_dsemulret(struct pt_regs *xcp)
/* Set EPC to return to post-branch instruction */
xcp->cp0_epc = current->thread.bd_emu_cont_pc;
pr_debug("dsemulret to 0x%08lx\n", xcp->cp0_epc);
+ MIPS_FPU_EMU_INC_STATS(ds_emul);
return true;
}