From 82b664585fe4331a28dbf1012e250eb03dcad4fe Mon Sep 17 00:00:00 2001 From: matt Date: Fri, 31 Aug 2012 17:29:08 +0000 Subject: [PATCH] The arm11 barriers are mcr (write), not mrc (read) --- sys/arch/arm/include/lock.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/arch/arm/include/lock.h b/sys/arch/arm/include/lock.h index e14ce7516a78..200259c72632 100644 --- a/sys/arch/arm/include/lock.h +++ b/sys/arch/arm/include/lock.h @@ -1,4 +1,4 @@ -/* $NetBSD: lock.h,v 1.20 2012/08/29 07:04:14 matt Exp $ */ +/* $NetBSD: lock.h,v 1.21 2012/08/31 17:29:08 matt Exp $ */ /*- * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc. @@ -90,7 +90,7 @@ __swp(__cpu_simple_lock_t __val, volatile __cpu_simple_lock_t *__ptr) #ifdef _ARM_ARCH_7 "dmb" #else - "mrc p15, 0, %[__tmp], c7, c10, 5" + "mcr\tp15, 0, %[__tmp], c7, c10, 5" #endif : [__rv] "=&r" (__rv), [__tmp] "=&r"(__tmp) : [__val] "r" (__val), [__ptr] "r" (__ptr) : "cc", "memory"); @@ -105,7 +105,7 @@ __swp(__cpu_simple_lock_t __val, volatile __cpu_simple_lock_t *__ptr) #ifdef _ARM_ARCH_7 "nop" #else - "mrc p15, 0, %[__tmp], c7, c10, 5" + "mcr\tp15, 0, %[__tmp], c7, c10, 5" #endif : [__rv] "=&r" (__rv), [__tmp] "=&r"(__tmp) : [__val] "r" (__val), [__ptr] "r" (__ptr) : "cc", "memory"); @@ -146,7 +146,7 @@ __swp(int __val, volatile int *__ptr) #ifdef _ARM_ARCH_7 "dmb" #elif defined(_ARM_ARCH_6) - "mrc p15, 0, %[__tmp], c7, c10, 5" + "mcr\tp15, 0, %[__tmp], c7, c10, 5" #else "nop" #endif