Merge master.kernel.org:/home/rmk/linux-2.6-arm

2005-09-18 15:31:20 -07:00
parent 628f87f3d5 118ec0b3e0
commit 6c0741fbde
4 changed files with 11 additions and 2 deletions
@@ -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;