diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-09-25 14:51:50 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-09-25 14:51:50 +0200 |
| commit | e5baa396af7560382d2cf3f0871d616b61fc284c (patch) | |
| tree | 6afc166894b8c8b3b2cf6add72a726be14ae2443 /include/asm-alpha/futex.h | |
| parent | [PATCH] powerpc: merge semaphore.h (diff) | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-ucb (diff) | |
| download | linux-e5baa396af7560382d2cf3f0871d616b61fc284c.tar.xz linux-e5baa396af7560382d2cf3f0871d616b61fc284c.zip | |
Merge from Linus' tree.
Diffstat (limited to 'include/asm-alpha/futex.h')
| -rw-r--r-- | include/asm-alpha/futex.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-alpha/futex.h b/include/asm-alpha/futex.h index 2cac5ecd9d00..9feff4ce1424 100644 --- a/include/asm-alpha/futex.h +++ b/include/asm-alpha/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; |