diff --git a/[refs] b/[refs]
index fa996afcccf2..354d1b265566 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4fc2fba804cae404d2665e23b8cbd46d5f63a07e
+refs/heads/master: 58f6f6ea1d5031f998b5e7d640d7bc45ed86d0c8
diff --git a/trunk/include/asm-x86/processor.h b/trunk/include/asm-x86/processor.h
index 41c002440de7..cc549bf819a4 100644
--- a/trunk/include/asm-x86/processor.h
+++ b/trunk/include/asm-x86/processor.h
@@ -3,6 +3,10 @@
 
 #include <asm/processor-flags.h>
 
+/* migration helpers, for KVM - will be removed in 2.6.25: */
+#include <asm/vm86.h>
+#define Xgt_desc_struct	desc_ptr
+
 /* Forward declaration, a strange C thing */
 struct task_struct;
 struct mm_struct;