diff options
| author |   dlg <dlg@openbsd.org> | 2014-03-15 06:18:00 +0000 |
|---|---|---|
| committer | dlg <dlg@openbsd.org> | 2014-03-15 06:18:00 +0000 |
| commit | 4f9765beeb3c952f2bb8639d0289c5b74d54f744 (patch) | |
| tree | 7739acbc33dee38726aaa4c5519b46c0ca814a2e | |
| parent | sync (diff) | |
| download | wireguard-openbsd-4f9765beeb3c952f2bb8639d0289c5b74d54f744.tar.xz wireguard-openbsd-4f9765beeb3c952f2bb8639d0289c5b74d54f744.zip | |
make the membars look more correct for any memory ordering mode.
ok kettenis@
| -rw-r--r-- | sys/arch/sparc64/include/atomic.h | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/sys/arch/sparc64/include/atomic.h b/sys/arch/sparc64/include/atomic.h index 47c81401708..84f6e1c411c 100644 --- a/sys/arch/sparc64/include/atomic.h +++ b/sys/arch/sparc64/include/atomic.h @@ -1,4 +1,4 @@ -/* $OpenBSD: atomic.h,v 1.9 2014/01/30 12:27:10 kettenis Exp $ */ +/* $OpenBSD: atomic.h,v 1.10 2014/03/15 06:18:00 dlg Exp $ */ /* * Copyright (c) 2007 Artur Grabowski <art@openbsd.org> * @@ -129,15 +129,11 @@ atomic_clearbits_int(volatile unsigned int *uip, unsigned int v) } while (r != e); } -#if KERN_MM != PSTATE_MM_TSO -#error membar operations only support KERN_MM = PSTATE_MM_TSO -#endif - -#define membar_enter() membar(LoadLoad) -#define membar_exit() membar(LoadLoad) -#define membar_producer() membar(0) +#define membar_enter() membar(StoreLoad|StoreStore) +#define membar_exit() membar(LoadStore|StoreStore) +#define membar_producer() membar(StoreStore) #define membar_consumer() membar(LoadLoad) -#define membar_sync() membar(LoadLoad) +#define membar_sync() membar(Sync) #endif /* defined(_KERNEL) */ #endif /* _MACHINE_ATOMIC_H_ */ |