[src/matt-nb6-plus]: src/sys/arch/arm/include Make __swp for the kernel retur...

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

details:   https://anonhg.NetBSD.org/src/rev/e2a1d9afa3e7
branches:  matt-nb6-plus
changeset: 774511:e2a1d9afa3e7
user:      matt <matt%NetBSD.org@localhost>
date:      Wed Nov 28 22:45:21 2012 +0000

description:
Make __swp for the kernel return unsigned char and restore __cpu_simple_lock_t
(match what -HEAD has).

diffstat:

 sys/arch/arm/include/lock.h  |   4 ++--
 sys/arch/arm/include/types.h |  14 +++-----------
 2 files changed, 5 insertions(+), 13 deletions(-)

diffs (47 lines):

diff -r b85933b9c554 -r e2a1d9afa3e7 sys/arch/arm/include/lock.h
--- a/sys/arch/arm/include/lock.h       Wed Nov 28 22:40:09 2012 +0000
+++ b/sys/arch/arm/include/lock.h       Wed Nov 28 22:45:21 2012 +0000
@@ -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 @@
 #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
diff -r b85933b9c554 -r e2a1d9afa3e7 sys/arch/arm/include/types.h
--- a/sys/arch/arm/include/types.h      Wed Nov 28 22:40:09 2012 +0000
+++ b/sys/arch/arm/include/types.h      Wed Nov 28 22:45:21 2012 +0000
@@ -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 @@
  * 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