From 1ebfaabf61261f77b625524a786451fdead3a1a0 Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Tue, 18 Oct 2005 07:51:34 +0100 Subject: [PATCH] --- yaml --- r: 9993 b: refs/heads/master c: 9b15c6c4e22cbb381373fac3bee8cacb811147a9 h: refs/heads/master i: 9991: c5cbf0353155c9d934fa837da01e0283d16ba46a v: v3 --- [refs] | 2 +- trunk/include/asm-arm/locks.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7b98fd900cbc..67f59c5b44cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c086f282c01d7e5a887c3f7b190520538267f12e +refs/heads/master: 9b15c6c4e22cbb381373fac3bee8cacb811147a9 diff --git a/trunk/include/asm-arm/locks.h b/trunk/include/asm-arm/locks.h index f08dc8447913..852220eecdbc 100644 --- a/trunk/include/asm-arm/locks.h +++ b/trunk/include/asm-arm/locks.h @@ -103,7 +103,7 @@ ({ \ smp_mb(); \ __asm__ __volatile__( \ - "@ up_op_read\n" \ + "@ up_op_write\n" \ "1: ldrex lr, [%0]\n" \ " adds lr, lr, %1\n" \ " strex ip, lr, [%0]\n" \ @@ -231,7 +231,7 @@ #define __up_op_write(ptr,wake) \ ({ \ __asm__ __volatile__( \ - "@ up_op_read\n" \ + "@ up_op_write\n" \ " mrs ip, cpsr\n" \ " orr lr, ip, #128\n" \ " msr cpsr_c, lr\n" \