summaryrefslogtreecommitdiffstats
path: root/include/asm-parisc/futex.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-09-24 00:26:49 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-09-24 00:26:49 -0400
commit98ed72deebfd2b55b7e1bb94c8175b1169999212 (patch)
treef1682a68f65e0a38159f55a58c054779d749f8df /include/asm-parisc/futex.h
parentdbaa9a9d2b37d838125fb7f2b9fdc5dc5fa4eaa9 (diff)
parent87e807b6c461bbd449496a4c3ab78ab164a4ba97 (diff)
downloadop-kernel-dev-98ed72deebfd2b55b7e1bb94c8175b1169999212.zip
op-kernel-dev-98ed72deebfd2b55b7e1bb94c8175b1169999212.tar.gz
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'include/asm-parisc/futex.h')
-rw-r--r--include/asm-parisc/futex.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-parisc/futex.h b/include/asm-parisc/futex.h
index 2cac5ec..9feff4ce 100644
--- a/include/asm-parisc/futex.h
+++ b/include/asm-parisc/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;
OpenPOWER on IntegriCloud