Merge branch 'linus' into x86/cleanups

[linux-2.6-omap-h63xx.git] / include / asm-x86 / atomic_64.h

diff --git a/include/asm-x86/atomic_64.h b/include/asm-x86/atomic_64.h
index 3e0cd7d3833569bab88b4e7414201aafa0d0dab2..fe589c153db8c0eb7edf188c0107e54c636af6b7 100644 (file)
--- a/include/asm-x86/atomic_64.h
+++ b/include/asm-x86/atomic_64.h
@@ -11,12 +11,6 @@
  * resource counting etc..
  */
 
-#ifdef CONFIG_SMP
-#define LOCK "lock ; "
-#else
-#define LOCK ""
-#endif
-
 /*
  * Make sure gcc doesn't try to be clever and move things around
  * on us. We need to use _exactly_ the address the user gave us,