diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-07 08:48:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-07 08:48:39 -0700 |
| commit | addb2d6c13993060ae75f5005815b19dd2abdd64 (patch) | |
| tree | e1123e60154475217e70d5ea04636ddac812da66 /arch/microblaze/include/asm/futex.h | |
| parent | 84db18bbeb5c9c1a9c86e38a89d76ee526fd2c6f (diff) | |
| parent | af2b021fd6dc3e145d20f5eb927af9590c80bc44 (diff) | |
Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze
* 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: Remove unused variable from ptrace
microblaze: io.h: Add io big-endian function
microblaze: Enable memory leak detector
microblaze: Fix futex code
microblaze: Fix ftrace_update_ftrace_func panic
Diffstat (limited to 'arch/microblaze/include/asm/futex.h')
| -rw-r--r-- | arch/microblaze/include/asm/futex.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/microblaze/include/asm/futex.h b/arch/microblaze/include/asm/futex.h index 8dbb6e7a03a..ad3fd61b2fe 100644 --- a/arch/microblaze/include/asm/futex.h +++ b/arch/microblaze/include/asm/futex.h @@ -55,7 +55,7 @@ futex_atomic_op_inuser(int encoded_op, int __user *uaddr) __futex_atomic_op("or %1,%0,%4;", ret, oldval, uaddr, oparg); break; case FUTEX_OP_ANDN: - __futex_atomic_op("and %1,%0,%4;", ret, oldval, uaddr, oparg); + __futex_atomic_op("andn %1,%0,%4;", ret, oldval, uaddr, oparg); break; case FUTEX_OP_XOR: __futex_atomic_op("xor %1,%0,%4;", ret, oldval, uaddr, oparg); |