git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
include
/
asm-i386
/
cmpxchg.h
diff --git
a/include/asm-i386/cmpxchg.h
b/include/asm-i386/cmpxchg.h
index
64dcdf4
..
f86ede2
100644
(file)
--- a/
include/asm-i386/cmpxchg.h
+++ b/
include/asm-i386/cmpxchg.h
@@
-34,7
+34,7
@@
static inline void __set_64bit (unsigned long long * ptr,
"\n1:\t"
"movl (%0), %%eax\n\t"
"movl 4(%0), %%edx\n\t"
"\n1:\t"
"movl (%0), %%eax\n\t"
"movl 4(%0), %%edx\n\t"
-
"lock
cmpxchg8b (%0)\n\t"
+
LOCK_PREFIX "
cmpxchg8b (%0)\n\t"
"jnz 1b"
: /* no outputs */
: "D"(ptr),
"jnz 1b"
: /* no outputs */
: "D"(ptr),