Module Name: src
Committed By: matt
Date: Wed Nov 28 22:45:22 UTC 2012
Modified Files:
src/sys/arch/arm/include [matt-nb6-plus]: lock.h types.h
Log Message:
Make __swp for the kernel return unsigned char and restore __cpu_simple_lock_t
(match what -HEAD has).
To generate a diff of this commit:
cvs rdiff -u -r1.17.42.1 -r1.17.42.2 src/sys/arch/arm/include/lock.h
cvs rdiff -u -r1.21.8.1 -r1.21.8.2 src/sys/arch/arm/include/types.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.17.42.1 src/sys/arch/arm/include/lock.h:1.17.42.2
--- src/sys/arch/arm/include/lock.h:1.17.42.1 Wed Nov 28 22:40:29 2012
+++ src/sys/arch/arm/include/lock.h Wed Nov 28 22:45:21 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: lock.h,v 1.17.42.1 2012/11/28 22:40:29 matt Exp $ */
+/* $NetBSD: lock.h,v 1.17.42.2 2012/11/28 22:45:21 matt 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
Index: src/sys/arch/arm/include/types.h
diff -u src/sys/arch/arm/include/types.h:1.21.8.1 src/sys/arch/arm/include/types.h:1.21.8.2
--- src/sys/arch/arm/include/types.h:1.21.8.1 Wed Nov 28 22:40:30 2012
+++ src/sys/arch/arm/include/types.h Wed Nov 28 22:45:22 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.21.8.1 2012/11/28 22:40:30 matt Exp $ */
+/* $NetBSD: types.h,v 1.21.8.2 2012/11/28 22:45:22 matt Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -73,17 +73,9 @@ typedef unsigned long pmc_ctr_t;
* to user-space, we don't want ABI breakage there.
*/
#if defined(_KERNEL)
-typedef
-#if __GNUC_PREREQ__(4,5)
- volatile
-#endif
- unsigned char __cpu_simple_lock_t;
+typedef volatile unsigned char __cpu_simple_lock_t;
#else
-typedef
-#if __GNUC_PREREQ__(4,5)
- volatile
-#endif
- int __cpu_simple_lock_t;
+typedef volatile int __cpu_simple_lock_t;
#endif /* _KERNEL */
#define __SIMPLELOCK_LOCKED 1
