git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
include
/
asm-x86_64
/
bitops.h
diff --git
a/include/asm-x86_64/bitops.h
b/include/asm-x86_64/bitops.h
index
7921212
..
f7ba57b
100644
(file)
--- a/
include/asm-x86_64/bitops.h
+++ b/
include/asm-x86_64/bitops.h
@@
-5,13
+5,7
@@
* Copyright 1992, Linus Torvalds.
*/
-#include <linux/config.h>
-
-#ifdef CONFIG_SMP
-#define LOCK_PREFIX "lock ; "
-#else
-#define LOCK_PREFIX ""
-#endif
+#include <asm/alternative.h>
#define ADDR (*(volatile long *) addr)