X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=include%2Fasm-x86_64%2Fbitops.h;h=5b535eaf5309b08252097cbcb630fb6afee89a72;hb=da181a8b3916aa7f2e3c5775d2bd2fe3454cf82d;hp=e9bf933d25d0a78f55d45be879b4dee1f7e4b770;hpb=28e4b224955cbe30275b2a7842e729023a4f4b03;p=powerpc.git

diff --git a/include/asm-x86_64/bitops.h b/include/asm-x86_64/bitops.h
index e9bf933d25..5b535eaf53 100644
--- a/include/asm-x86_64/bitops.h
+++ b/include/asm-x86_64/bitops.h
@@ -5,12 +5,7 @@
  * Copyright 1992, Linus Torvalds.
  */
 
-
-#ifdef CONFIG_SMP
-#define LOCK_PREFIX "lock ; "
-#else
-#define LOCK_PREFIX ""
-#endif
+#include <asm/alternative.h>
 
 #define ADDR (*(volatile long *) addr)
 
@@ -404,6 +399,8 @@ static __inline__ int fls(int x)
 	return r+1;
 }
 
+#define ARCH_HAS_FAST_MULTIPLIER 1
+
 #include <asm-generic/bitops/hweight.h>
 
 #endif /* __KERNEL__ */