From: "Maciej W. Rozycki" <macro@imgtec.com>

Date: Fri, 16 Jun 2017 00:15:22 +0100

Subject: [PATCH] MIPS: Fix a typo: s/preset/present/ in r2-to-r6 emulation

 error message

References: bnc#1060662

Patch-mainline: v4.12.4

Git-commit: 27fe2200dad2de8207a694024a7b9037dff1b280

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>

Signed-off-by: Jiri Slaby <jslaby@suse.cz>

---

 arch/mips/kernel/branch.c | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/mips/kernel/branch.c b/arch/mips/kernel/branch.c

index 6d536e5581e1..e53379c689b2 100644

--- a/arch/mips/kernel/branch.c

+++ b/arch/mips/kernel/branch.c

@@ -823,7 +823,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;

-- 

2.14.2