diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-20 10:06:09 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-20 10:06:09 -0400 |
| commit | 902f90735b693550eb51a3989895f3148b8229d8 (patch) | |
| tree | faddc60f0b27ed6d2a26f20c2c09f365dc4a2d7d /include/asm-arm/locks.h | |
| parent | 07b8fede6da76ae6a0f547716c44b801a116bb4a (diff) | |
| parent | 93918e9afc76717176e9e114e79cdbb602a45ae8 (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/asm-arm/locks.h')
| -rw-r--r-- | include/asm-arm/locks.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-arm/locks.h b/include/asm-arm/locks.h index f08dc844791..852220eecdb 100644 --- a/include/asm-arm/locks.h +++ b/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" \ |