projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'x86/alternatives', 'x86/cleanups', 'x86/commandline', 'x86/crashdump...
[cascardo/linux.git]
/
include
/
asm-x86
/
futex.h
diff --git
a/include/asm-x86/futex.h
b/include/asm-x86/futex.h
index
e7a76b3
..
06b924e
100644
(file)
--- a/
include/asm-x86/futex.h
+++ b/
include/asm-x86/futex.h
@@
-1,5
+1,5
@@
-#ifndef
_ASM_X86
_FUTEX_H
-#define
_ASM_X86
_FUTEX_H
+#ifndef
ASM_X86_
_FUTEX_H
+#define
ASM_X86_
_FUTEX_H
#ifdef __KERNEL__
#ifdef __KERNEL__
@@
-25,7
+25,7
@@
asm volatile("1:\tmovl %2, %0\n" \
"\tmovl\t%0, %3\n" \
"\t" insn "\n" \
asm volatile("1:\tmovl %2, %0\n" \
"\tmovl\t%0, %3\n" \
"\t" insn "\n" \
- "2:\t
lock; cmpxchgl %3, %2\n"
\
+ "2:\t
" LOCK_PREFIX "cmpxchgl %3, %2\n"
\
"\tjnz\t1b\n" \
"3:\t.section .fixup,\"ax\"\n" \
"4:\tmov\t%5, %1\n" \
"\tjnz\t1b\n" \
"3:\t.section .fixup,\"ax\"\n" \
"4:\tmov\t%5, %1\n" \
@@
-64,7
+64,7
@@
static inline int futex_atomic_op_inuser(int encoded_op, int __user *uaddr)
__futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg);
break;
case FUTEX_OP_ADD:
__futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg);
break;
case FUTEX_OP_ADD:
- __futex_atomic_op1(
"lock;
xaddl %0, %2", ret, oldval,
+ __futex_atomic_op1(
LOCK_PREFIX "
xaddl %0, %2", ret, oldval,
uaddr, oparg);
break;
case FUTEX_OP_OR:
uaddr, oparg);
break;
case FUTEX_OP_OR:
@@
-122,7
+122,7
@@
static inline int futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval,
if (!access_ok(VERIFY_WRITE, uaddr, sizeof(int)))
return -EFAULT;
if (!access_ok(VERIFY_WRITE, uaddr, sizeof(int)))
return -EFAULT;
- asm volatile("1:\t
lock;
cmpxchgl %3, %1\n"
+ asm volatile("1:\t
" LOCK_PREFIX "
cmpxchgl %3, %1\n"
"2:\t.section .fixup, \"ax\"\n"
"3:\tmov %2, %0\n"
"\tjmp 2b\n"
"2:\t.section .fixup, \"ax\"\n"
"3:\tmov %2, %0\n"
"\tjmp 2b\n"
@@
-137,4
+137,4
@@
static inline int futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval,
}
#endif
}
#endif
-#endif
+#endif
/* ASM_X86__FUTEX_H */