diff options
| author |   jsing <jsing@openbsd.org> | 2012-06-05 15:06:10 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2012-06-05 15:06:10 +0000 |
| commit | 42e40dddfb1d4ecc6279005b4f302a7e2e7c4c0f (patch) | |
| tree | 33fc5285afca657ac3a5a8340ff6361775562207 | |
| parent | Implement actual mutexes for hppa64. (diff) | |
| download | wireguard-openbsd-42e40dddfb1d4ecc6279005b4f302a7e2e7c4c0f.tar.xz wireguard-openbsd-42e40dddfb1d4ecc6279005b4f302a7e2e7c4c0f.zip | |
As specified in PA RISC 2.0 errata, the 16-byte alignment restriction does
not apply if the coherent operation cache control completer is specified
for the ldcw/ldcd instruction. As a result, remove the alignment
requirement and add the necessary completer.
ok kettenis@
| -rw-r--r-- | sys/arch/hppa64/include/lock.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/hppa64/include/lock.h b/sys/arch/hppa64/include/lock.h index c0a92a194b1..784909894d0 100644 --- a/sys/arch/hppa64/include/lock.h +++ b/sys/arch/hppa64/include/lock.h @@ -1,4 +1,4 @@ -/* $OpenBSD: lock.h,v 1.4 2011/06/24 12:49:06 jsing Exp $ */ +/* $OpenBSD: lock.h,v 1.5 2012/06/05 15:06:10 jsing Exp $ */ /* public domain */ @@ -7,7 +7,7 @@ #include <machine/atomic.h> -typedef volatile u_int __cpu_simple_lock_t __attribute__((__aligned__(16))); +typedef volatile u_int __cpu_simple_lock_t; #define __SIMPLELOCK_LOCKED 0 #define __SIMPLELOCK_UNLOCKED 1 @@ -25,7 +25,7 @@ __cpu_simple_lock(__cpu_simple_lock_t *l) do { __asm__ __volatile__ - ("ldcw %1, %0" : "=r" (old), "=m" (l) : "m" (l)); + ("ldcw,co %1, %0" : "=r" (old), "=m" (l) : "m" (l)); } while (old != __SIMPLELOCK_UNLOCKED); } @@ -35,7 +35,7 @@ __cpu_simple_lock_try(__cpu_simple_lock_t *l) volatile u_int old; __asm__ __volatile__ - ("ldcw %1, %0" : "=r" (old), "=m" (l) : "m" (l)); + ("ldcw,co %1, %0" : "=r" (old), "=m" (l) : "m" (l)); return (old == __SIMPLELOCK_UNLOCKED); } |