From ee4383d969d78f2d0375405f736eaeed3eeebbf8 Mon Sep 17 00:00:00 2001 From: "Steven J. Hill" Date: Mon, 25 Mar 2013 13:41:47 -0500 Subject: [PATCH] --- yaml --- r: 375213 b: refs/heads/master c: b1bac3734581ab6788bbfe125c62914f8d6d5e01 h: refs/heads/master i: 375211: 41372b4ec59aaad58a29a940f402365ff2ad52ca v: v3 --- [refs] | 2 +- trunk/arch/mips/lib/strlen_user.S | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a687053d3b98..00a5be159a0a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0131f2b2c93bc8f0b0d9d599cf72d1df76ad3f01 +refs/heads/master: b1bac3734581ab6788bbfe125c62914f8d6d5e01 diff --git a/trunk/arch/mips/lib/strlen_user.S b/trunk/arch/mips/lib/strlen_user.S index fdbb970f670d..e362dcdc69d1 100644 --- a/trunk/arch/mips/lib/strlen_user.S +++ b/trunk/arch/mips/lib/strlen_user.S @@ -3,8 +3,9 @@ * License. See the file "COPYING" in the main directory of this archive * for more details. * - * Copyright (c) 1996, 1998, 1999, 2004 by Ralf Baechle - * Copyright (c) 1999 Silicon Graphics, Inc. + * Copyright (C) 1996, 1998, 1999, 2004 by Ralf Baechle + * Copyright (C) 1999 Silicon Graphics, Inc. + * Copyright (C) 2011 MIPS Technologies, Inc. */ #include #include @@ -28,9 +29,9 @@ LEAF(__strlen_user_asm) FEXPORT(__strlen_user_nocheck_asm) move v0, a0 -1: EX(lb, t0, (v0), .Lfault) +1: EX(lbu, v1, (v0), .Lfault) PTR_ADDIU v0, 1 - bnez t0, 1b + bnez v1, 1b PTR_SUBU v0, a0 jr ra END(__strlen_user_asm)