diff options
| author | Roland Dreier <rolandd@cisco.com> | 2005-10-24 13:55:29 -0400 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2005-10-24 13:55:29 -0400 |
| commit | ec329a135974f1c400214dab02f09584d4beeba9 (patch) | |
| tree | 235be754f76f4e7d51975d2434f226cfc75cdd08 /include/asm-arm/locks.h | |
| parent | bbf207860931b6a033d0fbcd170ae2332c0d8216 (diff) | |
| parent | 5d7edb3c1a01310725d86f0d83fb3be45685dc82 (diff) | |
Manual merge of for-linus to upstream (fix conflicts in drivers/infiniband/core/ucm.c)
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 f08dc8447913..852220eecdbc 100644 --- a/include/asm-arm/locks.h +++ b/include/asm-arm/locks.h | |||
| @@ -103,7 +103,7 @@ | |||
| 103 | ({ \ | 103 | ({ \ |
| 104 | smp_mb(); \ | 104 | smp_mb(); \ |
| 105 | __asm__ __volatile__( \ | 105 | __asm__ __volatile__( \ |
| 106 | "@ up_op_read\n" \ | 106 | "@ up_op_write\n" \ |
| 107 | "1: ldrex lr, [%0]\n" \ | 107 | "1: ldrex lr, [%0]\n" \ |
| 108 | " adds lr, lr, %1\n" \ | 108 | " adds lr, lr, %1\n" \ |
| 109 | " strex ip, lr, [%0]\n" \ | 109 | " strex ip, lr, [%0]\n" \ |
| @@ -231,7 +231,7 @@ | |||
| 231 | #define __up_op_write(ptr,wake) \ | 231 | #define __up_op_write(ptr,wake) \ |
| 232 | ({ \ | 232 | ({ \ |
| 233 | __asm__ __volatile__( \ | 233 | __asm__ __volatile__( \ |
| 234 | "@ up_op_read\n" \ | 234 | "@ up_op_write\n" \ |
| 235 | " mrs ip, cpsr\n" \ | 235 | " mrs ip, cpsr\n" \ |
| 236 | " orr lr, ip, #128\n" \ | 236 | " orr lr, ip, #128\n" \ |
| 237 | " msr cpsr_c, lr\n" \ | 237 | " msr cpsr_c, lr\n" \ |