diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-18 18:31:20 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-18 18:31:20 -0400 |
| commit | 6c0741fbdee5bd0f8ed13ac287c4ab18e8ba7d83 (patch) | |
| tree | 7513cdadc661cfe0bd1625145a4876e54df191ca /include | |
| parent | 628f87f3d585bd0c2b0e39df039585d7a5831cc9 (diff) | |
| parent | 118ec0b3e02e7d22cf27b9f5a2836fa6f395b61a (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/futex.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/futex.h b/include/asm-arm/futex.h index 2cac5ecd9d00..9feff4ce1424 100644 --- a/include/asm-arm/futex.h +++ b/include/asm-arm/futex.h | |||
| @@ -14,7 +14,7 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr) | |||
| 14 | int cmp = (encoded_op >> 24) & 15; | 14 | int cmp = (encoded_op >> 24) & 15; |
| 15 | int oparg = (encoded_op << 8) >> 20; | 15 | int oparg = (encoded_op << 8) >> 20; |
| 16 | int cmparg = (encoded_op << 20) >> 20; | 16 | int cmparg = (encoded_op << 20) >> 20; |
| 17 | int oldval = 0, ret, tem; | 17 | int oldval = 0, ret; |
| 18 | if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28)) | 18 | if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28)) |
| 19 | oparg = 1 << oparg; | 19 | oparg = 1 << oparg; |
| 20 | 20 | ||