--- kernel/include/asm-x86/kvm_host.h	2008-07-09 08:02:20.000000000 +0000
+++ kernel/include/asm-x86/kvm_host.h	2008-07-09 08:02:58.000000000 +0000
@@ -597,7 +597,7 @@
 	asm("mov %0, %%gs" : : "rm"(sel));
 }
 
-#ifndef load_ldt
+#if !(defined(load_ldt) || defined(CONFIG_X86_VMI))
 static inline void load_ldt(u16 sel)
 {
 	asm("lldt %0" : : "rm"(sel));