Module Name: src
Committed By: pgoyette
Date: Sun Nov 25 20:40:30 UTC 2012
Modified Files:
src/sys/arch/arm/include: lock.h
Log Message:
For consistency, define the _KERNEL version of __swp() using a non-volatile
type, similar to how it is defined in non-KERNEL
Fixes the 'build.sh release' for evbarm-{eb,el}
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 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.21 src/sys/arch/arm/include/lock.h:1.22
--- src/sys/arch/arm/include/lock.h:1.21 Fri Aug 31 17:29:08 2012
+++ src/sys/arch/arm/include/lock.h Sun Nov 25 20:40:30 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: lock.h,v 1.21 2012/08/31 17:29:08 matt Exp $ */
+/* $NetBSD: lock.h,v 1.22 2012/11/25 20:40:30 pgoyette Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@ __cpu_simple_lock_set(__cpu_simple_lock_
#endif
#if defined(_KERNEL)
-static __inline __cpu_simple_lock_t
+static __inline unsigned char
__swp(__cpu_simple_lock_t __val, volatile __cpu_simple_lock_t *__ptr)
{
#ifdef _ARM_ARCH_6
