From: Jan Beulich <jbeulich@suse.com>
Date: Mon, 11 Nov 2013 10:00:21 +0000 (+0100)
Subject: x86/Intel: don't probe CPUID faulting on family 0xf CPUs
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~6043
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f214ac959a471176e6ea195fb1952429f50ad7de;p=xen.git

x86/Intel: don't probe CPUID faulting on family 0xf CPUs

These are known to not support the feature, so we can save ourselves
from emitting the resulting #GP fault recovery related message (which
might worry people looking at the logs).

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Liu Jinsong <jinsong.liu@intel.com>
Acked-by: Keir Fraser <keir@xen.org>
---

diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c
index e85521109c..27fe762eca 100644
--- a/xen/arch/x86/cpu/intel.c
+++ b/xen/arch/x86/cpu/intel.c
@@ -204,7 +204,7 @@ static void __devinit init_intel(struct cpuinfo_x86 *c)
 		detect_ht(c);
 	}
 
-	if (smp_processor_id() == 0) {
+	if (c == &boot_cpu_data && c->x86 == 6) {
 		if (probe_intel_cpuid_faulting())
 			set_bit(X86_FEATURE_CPUID_FAULTING, c->x86_capability);
 	} else if (boot_cpu_has(X86_FEATURE_CPUID_FAULTING)) {