From 8bddaf900773c80269d0416da191e8b50ff695a3 Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Wed, 25 Aug 2010 20:37:58 +0000 Subject: [PATCH] Correctly ensure that the CPU family is 0x6, not non-zero. Submitted by: Dimitry Andric --- sys/x86/pci/qpi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/x86/pci/qpi.c b/sys/x86/pci/qpi.c index 570f913e1619..169c1cd61021 100644 --- a/sys/x86/pci/qpi.c +++ b/sys/x86/pci/qpi.c @@ -62,7 +62,8 @@ qpi_identify(driver_t *driver, device_t parent) { /* Check CPUID to ensure this is an i7 CPU of some sort. */ - if (!(cpu_vendor_id == CPU_VENDOR_INTEL && CPUID_TO_FAMILY(cpu_id) && + if (!(cpu_vendor_id == CPU_VENDOR_INTEL && + CPUID_TO_FAMILY(cpu_id) == 0x6 && (CPUID_TO_MODEL(cpu_id) == 0x1a || CPUID_TO_MODEL(cpu_id) == 0x2c))) return;