projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6.15
[powerpc.git]
/
include
/
asm-ia64
/
futex.h
diff --git
a/include/asm-ia64/futex.h
b/include/asm-ia64/futex.h
index
2cac5ec
..
9feff4c
100644
(file)
--- a/
include/asm-ia64/futex.h
+++ b/
include/asm-ia64/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;