aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-09-18 15:31:20 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-18 15:31:20 -0700
commit6c0741fbdee5bd0f8ed13ac287c4ab18e8ba7d83 (patch)
tree7513cdadc661cfe0bd1625145a4876e54df191ca /include
parent628f87f3d585bd0c2b0e39df039585d7a5831cc9 (diff)
parent118ec0b3e02e7d22cf27b9f5a2836fa6f395b61a (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include')
-rw-r--r--include/asm-arm/futex.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/futex.h b/include/asm-arm/futex.h
index 2cac5ecd9d0..9feff4ce142 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)
int cmp = (encoded_op >> 24) & 15;
int oparg = (encoded_op << 8) >> 20;
int cmparg = (encoded_op << 20) >> 20;
- int oldval = 0, ret, tem;
+ int oldval = 0, ret;
if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28))
oparg = 1 << oparg;