diff options
Diffstat (limited to 'sys/arch/arm/include')
| -rw-r--r-- | sys/arch/arm/include/atomic.h | 6 | ||||
| -rw-r--r-- | sys/arch/arm/include/cpufunc.h | 6 | ||||
| -rw-r--r-- | sys/arch/arm/include/lock.h | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/sys/arch/arm/include/atomic.h b/sys/arch/arm/include/atomic.h index 5b2de71e43b..83f3a42c6d8 100644 --- a/sys/arch/arm/include/atomic.h +++ b/sys/arch/arm/include/atomic.h @@ -1,4 +1,4 @@ -/* $OpenBSD: atomic.h,v 1.8 2011/03/23 16:54:34 pirofti Exp $ */ +/* $OpenBSD: atomic.h,v 1.9 2014/03/29 18:09:28 guenther Exp $ */ /* Public Domain */ @@ -12,8 +12,8 @@ * in the kernel and atomic updates are necessary without full mutexes */ -void atomic_setbits_int(__volatile unsigned int *, unsigned int); -void atomic_clearbits_int(__volatile unsigned int *, unsigned int); +void atomic_setbits_int(volatile unsigned int *, unsigned int); +void atomic_clearbits_int(volatile unsigned int *, unsigned int); #endif /* defined(_KERNEL) */ #endif /* _ARM_ATOMIC_H_ */ diff --git a/sys/arch/arm/include/cpufunc.h b/sys/arch/arm/include/cpufunc.h index d76f3de5786..43753ac52ab 100644 --- a/sys/arch/arm/include/cpufunc.h +++ b/sys/arch/arm/include/cpufunc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpufunc.h,v 1.14 2013/03/30 01:30:30 patrick Exp $ */ +/* $OpenBSD: cpufunc.h,v 1.15 2014/03/29 18:09:28 guenther Exp $ */ /* $NetBSD: cpufunc.h,v 1.29 2003/09/06 09:08:35 rearnsha Exp $ */ /* @@ -479,7 +479,7 @@ __set_cpsr_c(u_int bic, u_int eor) { u_int32_t tmp, ret; - __asm __volatile( + __asm volatile( "mrs %0, cpsr\n\t" /* Get the CPSR */ "bic %1, %0, %2\n\t" /* Clear bits */ "eor %1, %1, %3\n\t" /* XOR bits */ @@ -495,7 +495,7 @@ __get_cpsr() { u_int32_t ret; - __asm __volatile("mrs %0, cpsr" : "=&r" (ret)); + __asm volatile("mrs %0, cpsr" : "=&r" (ret)); return ret; } diff --git a/sys/arch/arm/include/lock.h b/sys/arch/arm/include/lock.h index d8d581eb1c1..cf4b7e4ca38 100644 --- a/sys/arch/arm/include/lock.h +++ b/sys/arch/arm/include/lock.h @@ -1,4 +1,4 @@ -/* $OpenBSD: lock.h,v 1.4 2010/04/21 03:03:25 deraadt Exp $ */ +/* $OpenBSD: lock.h,v 1.5 2014/03/29 18:09:28 guenther Exp $ */ /* $NetBSD: lock.h,v 1.3 2002/10/07 23:19:49 bjh21 Exp $ */ /*- @@ -44,16 +44,16 @@ #include <arm/atomic.h> -typedef __volatile int __cpu_simple_lock_t; +typedef volatile int __cpu_simple_lock_t; #define __SIMPLELOCK_LOCKED 1 #define __SIMPLELOCK_UNLOCKED 0 static __inline int -__swp(int __val, __volatile int *__ptr) +__swp(int __val, volatile int *__ptr) { - __asm __volatile("swp %0, %1, [%2]" + __asm volatile("swp %0, %1, [%2]" : "=r" (__val) : "r" (__val), "r" (__ptr) : "memory"); return __val; } |