Module Name: src
Committed By: matt
Date: Thu Mar 13 12:59:08 UTC 2014
Modified Files:
src/sys/arch/arm/include: lock.h
Log Message:
Fix non-armv6 case.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/arm/include/lock.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/include/lock.h
diff -u src/sys/arch/arm/include/lock.h:1.26 src/sys/arch/arm/include/lock.h:1.27
--- src/sys/arch/arm/include/lock.h:1.26 Wed Mar 12 17:55:02 2014
+++ src/sys/arch/arm/include/lock.h Thu Mar 13 12:59:08 2014
@@ -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 @@ __swp(unsigned char __val, __cpu_simple_
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 @@ __swp(int __val, __cpu_simple_lock_t *__
"\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;
}
