aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikael Pettersson <mikpe@it.uu.se>2008-07-30 18:40:50 -0400
committerDavid S. Miller <davem@davemloft.net>2008-07-30 18:40:50 -0400
commitd72609e17fd93bb2f7e0f7e1bdc70b6d20e43843 (patch)
treed2b2ec57bbee2759e6cfdbc4269211dad888e79f
parent19fd3cabbabe5d37b83f833a1593592ed9878236 (diff)
sparc64: FUTEX_OP_ANDN fix
Correct sparc64's implementation of FUTEX_OP_ANDN to do a bitwise negate of the oparg parameter before applying the AND operation. All other archs that support FUTEX_OP_ANDN either negate oparg explicitly (frv, ia64, mips, sh, x86), or do so indirectly by using an and-not instruction (powerpc). Since sparc64 has and-not, I chose to use that solution. I've not found any use of FUTEX_OP_ANDN in glibc so the impact of this bug is probably minor. But other user-space components may try to use it so it should still get fixed. Signed-off-by: Mikael Pettersson <mikpe@it.uu.se> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--arch/sparc/include/asm/futex_64.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/include/asm/futex_64.h b/arch/sparc/include/asm/futex_64.h
index d8378935ae90..47f95839dc69 100644
--- a/arch/sparc/include/asm/futex_64.h
+++ b/arch/sparc/include/asm/futex_64.h
@@ -59,7 +59,7 @@ static inline int futex_atomic_op_inuser(int encoded_op, int __user *uaddr)
59 __futex_cas_op("or\t%2, %4, %1", ret, oldval, uaddr, oparg); 59 __futex_cas_op("or\t%2, %4, %1", ret, oldval, uaddr, oparg);
60 break; 60 break;
61 case FUTEX_OP_ANDN: 61 case FUTEX_OP_ANDN:
62 __futex_cas_op("and\t%2, %4, %1", ret, oldval, uaddr, oparg); 62 __futex_cas_op("andn\t%2, %4, %1", ret, oldval, uaddr, oparg);
63 break; 63 break;
64 case FUTEX_OP_XOR: 64 case FUTEX_OP_XOR:
65 __futex_cas_op("xor\t%2, %4, %1", ret, oldval, uaddr, oparg); 65 __futex_cas_op("xor\t%2, %4, %1", ret, oldval, uaddr, oparg);