aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMaciej W. Rozycki <macro@imgtec.com>2017-06-16 00:15:22 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-07-27 15:06:08 -0700
commit775e4dba9d07a0fd0ab3c0b6cfaf55b15907149d (patch)
tree1ad1a84d5d2c660126e9e40fa22e70abbc7a184c /arch
parentf28e32a8e37995400750a83fdcfbee3d61d14e15 (diff)
downloadlinux-linaro-stable-775e4dba9d07a0fd0ab3c0b6cfaf55b15907149d.tar.gz
MIPS: Fix a typo: s/preset/present/ in r2-to-r6 emulation error message
commit 27fe2200dad2de8207a694024a7b9037dff1b280 upstream. This is a user-visible message, so we want it to be spelled correctly. Fixes: 5f9f41c474be ("MIPS: kernel: Prepare the JR instruction for emulation on MIPS R6") Signed-off-by: Maciej W. Rozycki <macro@imgtec.com> Cc: James Hogan <james.hogan@imgtec.com> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/16400/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/kernel/branch.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/branch.c b/arch/mips/kernel/branch.c
index 7fc87184c8b6..71e8f4c0b8da 100644
--- a/arch/mips/kernel/branch.c
+++ b/arch/mips/kernel/branch.c
@@ -845,7 +845,7 @@ sigill_dsp:
force_sig(SIGILL, current);
return -EFAULT;
sigill_r2r6:
- pr_info("%s: R2 branch but r2-to-r6 emulator is not preset - sending SIGILL.\n",
+ pr_info("%s: R2 branch but r2-to-r6 emulator is not present - sending SIGILL.\n",
current->comm);
force_sig(SIGILL, current);
return -EFAULT;