Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~keithp/linux into...

[~andy/linux] / arch / x86 / lguest / boot.c

diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
index 13ee258442ae2b58cb195374c02c1a213f8333ee..cf4603ba866f7a10549ee7acdaf6fb2866e464ba 100644 (file)
--- a/arch/x86/lguest/boot.c
+++ b/arch/x86/lguest/boot.c
@@ -56,6 +56,7 @@
 #include <linux/lguest_launcher.h>
 #include <linux/virtio_console.h>
 #include <linux/pm.h>
+#include <linux/export.h>
 #include <asm/apic.h>
 #include <asm/lguest.h>
 #include <asm/paravirt.h>
@@ -70,6 +71,7 @@
 #include <asm/i387.h>
 #include <asm/stackprotector.h>
 #include <asm/reboot.h>                /* for struct machine_ops */
+#include <asm/kvm_para.h>
 
 /*G:010
  * Welcome to the Guest!
@@ -455,6 +457,15 @@ static void lguest_cpuid(unsigned int *ax, unsigned int *bx,
                *ax &= 0xFFFFF0FF;
                *ax |= 0x00000500;
                break;
+
+       /*
+        * This is used to detect if we're running under KVM.  We might be,
+        * but that's a Host matter, not us.  So say we're not.
+        */
+       case KVM_CPUID_SIGNATURE:
+               *bx = *cx = *dx = 0;
+               break;
+
        /*
         * 0x80000000 returns the highest Extended Function, so we futureproof
         * like we do above by limiting it to known fields.