[haiku-commits] haiku: hrev46938 - headers/private/kernel/arch/arm
- From: kallisti5@xxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 26 Feb 2014 20:22:30 +0100 (CET)
hrev46938 adds 1 changeset to branch 'master'
old head: b6994f96c0edb0d10620cf8b40a7b21888f715f6
new head: 8cfbbff4df895f36e749e45a28699c493be522e8
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=8cfbbff+%5Eb6994f9
----------------------------------------------------------------------------
8cfbbff: ARM: Fix dmb opcode 2 on ARMv6
* Typo, also fix tabs
* Sorry for the spam, this should be correct now
[ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev46938
Commit: 8cfbbff4df895f36e749e45a28699c493be522e8
URL: http://cgit.haiku-os.org/haiku/commit/?id=8cfbbff
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Wed Feb 26 19:22:18 2014 UTC
----------------------------------------------------------------------------
1 file changed, 4 insertions(+), 4 deletions(-)
headers/private/kernel/arch/arm/arch_atomic.h | 8 ++++----
----------------------------------------------------------------------------
diff --git a/headers/private/kernel/arch/arm/arch_atomic.h
b/headers/private/kernel/arch/arm/arch_atomic.h
index 1c5b5e3..abe3943 100644
--- a/headers/private/kernel/arch/arm/arch_atomic.h
+++ b/headers/private/kernel/arch/arm/arch_atomic.h
@@ -12,15 +12,15 @@
#if __ARM_ARCH__ <= 5
#define isb() __asm__ __volatile__("" : : : "memory")
#define dsb() __asm__ __volatile__("mcr p15, 0, %0, c7, c10, 4" \
- : : "r" (0) : "memory")
+ : : "r" (0) : "memory")
#define dmb() __asm__ __volatile__("" : : : "memory")
#elif __ARM_ARCH__ == 6
#define isb() __asm__ __volatile__("mcr p15, 0, %0, c7, c5, 4" \
: : "r" (0) : "memory")
#define dsb() __asm__ __volatile__("mcr p15, 0, %0, c7, c10, 4" \
- : : "r" (0) : "memory")
-#define dmb() __asm__ __volatile__("mcr p15, 0, %0, c7, c10, 4" \
- : : "r" (0) : "memory")
+ : : "r" (0) : "memory")
+#define dmb() __asm__ __volatile__("mcr p15, 0, %0, c7, c10, 5" \
+ : : "r" (0) : "memory")
#else /* ARMv7+ */
#define isb() __asm__ __volatile__("isb" : : : "memory")
#define dsb() __asm__ __volatile__("dsb" : : : "memory")
Other related posts:
- » [haiku-commits] haiku: hrev46938 - headers/private/kernel/arch/arm - kallisti5
