From 47ef7f1bd5d50a54914b47935b74adacebbabded Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Fri, 17 Jul 2009 21:47:44 -0600
Subject: [PATCH] --- yaml --- r: 155518 b: refs/heads/master c:
 7a5049205f7265620c48781814155f2763e70abb h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/arch/x86/lguest/boot.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 883e0982d3ea..f7e8c303db11 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 27de22d03d6808a82bbe9bd7e3cc75d60132ba9e
+refs/heads/master: 7a5049205f7265620c48781814155f2763e70abb
diff --git a/trunk/arch/x86/lguest/boot.c b/trunk/arch/x86/lguest/boot.c
index 0188fd37b6c0..f2bf1f73d468 100644
--- a/trunk/arch/x86/lguest/boot.c
+++ b/trunk/arch/x86/lguest/boot.c
@@ -379,6 +379,11 @@ static void lguest_cpuid(unsigned int *ax, unsigned int *bx,
 
 	native_cpuid(ax, bx, cx, dx);
 	switch (function) {
+	case 0: /* ID and highest CPUID.  Futureproof a little by sticking to
+		 * older ones. */
+		if (*ax > 5)
+			*ax = 5;
+		break;
 	case 1:	/* Basic feature request. */
 		/* We only allow kernel to see SSE3, CMPXCHG16B and SSSE3 */
 		*cx &= 0x00002201;