aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-10-29 10:52:16 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-10-29 10:52:16 -0400
commitce949717b559709423c1ef716a9db16d1dcadaed (patch)
tree003c5c064cd6104c8bff431e3431314bd614d7e0 /arch
parent249842477c589ea29ff161ace9c8666d96e9883a (diff)
parent0acf00014bcfd71090c3b0d43c98e970108064e4 (diff)
Merge git://github.com/rustyrussell/linux
* git://github.com/rustyrussell/linux: lguest: move process freezing before pending signals check lguest: don't allow KVM-detection cpuid. lguest: Allow running under paravirt-enabled KVM.
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/lguest/boot.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
index 13ee258442a..f63da5ef217 100644
--- a/arch/x86/lguest/boot.c
+++ b/arch/x86/lguest/boot.c
@@ -70,6 +70,7 @@
70#include <asm/i387.h> 70#include <asm/i387.h>
71#include <asm/stackprotector.h> 71#include <asm/stackprotector.h>
72#include <asm/reboot.h> /* for struct machine_ops */ 72#include <asm/reboot.h> /* for struct machine_ops */
73#include <asm/kvm_para.h>
73 74
74/*G:010 75/*G:010
75 * Welcome to the Guest! 76 * Welcome to the Guest!
@@ -455,6 +456,15 @@ static void lguest_cpuid(unsigned int *ax, unsigned int *bx,
455 *ax &= 0xFFFFF0FF; 456 *ax &= 0xFFFFF0FF;
456 *ax |= 0x00000500; 457 *ax |= 0x00000500;
457 break; 458 break;
459
460 /*
461 * This is used to detect if we're running under KVM. We might be,
462 * but that's a Host matter, not us. So say we're not.
463 */
464 case KVM_CPUID_SIGNATURE:
465 *bx = *cx = *dx = 0;
466 break;
467
458 /* 468 /*
459 * 0x80000000 returns the highest Extended Function, so we futureproof 469 * 0x80000000 returns the highest Extended Function, so we futureproof
460 * like we do above by limiting it to known fields. 470 * like we do above by limiting it to known fields.