[src/trunk]: src/sys/arch/arm/include Fix non-armv6 case.

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/09102c921609
branches:  trunk
changeset: 327664:09102c921609
user:      matt <matt%NetBSD.org@localhost>
date:      Thu Mar 13 12:59:08 2014 +0000

description:
Fix non-armv6 case.

diffstat:

 sys/arch/arm/include/lock.h |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 0b26e904383c -r 09102c921609 sys/arch/arm/include/lock.h
--- a/sys/arch/arm/include/lock.h       Thu Mar 13 12:54:49 2014 +0000
+++ b/sys/arch/arm/include/lock.h       Thu Mar 13 12:59:08 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lock.h,v 1.26 2014/03/12 17:55:02 matt Exp $   */
+/*     $NetBSD: lock.h,v 1.27 2014/03/13 12:59:08 matt Exp $   */
 
 /*-
  * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -121,7 +121,7 @@
 static __inline int
 __swp(int __val, __cpu_simple_lock_t *__ptr)
 {
-       int __tmp;
+       int __tmp, __rv;
        __asm volatile(
 #if 1
        "1:\t"  "swp    %[__rv], %[__val], [%[__ptr]]"
@@ -133,7 +133,7 @@
        "\n\t"  "cmp    %[__tmp],#0"
        "\n\t"  "bne    1b"
        "\n"    "2:"
-           : [__rv] "=&r" (__rv), [__tmp] "=&r" (__tmp__)
+           : [__rv] "=&r" (__rv), [__tmp] "=&r" (__tmp)
            : [__val] "r" (__val), [__ptr] "r" (__ptr) : "cc", "memory");
        return __rv;
 }