diff --git a/[refs] b/[refs]
index 1cc2e328f3eb..cfce3a4adfde 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72fe4858544292ad64600765cb78bc02298c6b1c
+refs/heads/master: 1954448fb0c03dd5e301d7bef2dda71cd9b2fcf2
diff --git a/trunk/include/asm-x86/spinlock.h b/trunk/include/asm-x86/spinlock.h
index 97d52b506af8..2076d5d62d83 100644
--- a/trunk/include/asm-x86/spinlock.h
+++ b/trunk/include/asm-x86/spinlock.h
@@ -19,15 +19,6 @@
  * (the type definitions are in asm/spinlock_types.h)
  */
 
-#ifdef CONFIG_PARAVIRT
-#include <asm/paravirt.h>
-#else
-#define CLI_STRING	"cli"
-#define STI_STRING	"sti"
-#define CLI_STI_CLOBBERS
-#define CLI_STI_INPUT_ARGS
-#endif /* CONFIG_PARAVIRT */
-
 #ifdef CONFIG_X86_32
 typedef char _slock_t;
 # define LOCK_INS_DEC "decb"