svn commit: r211821 - head/sys/x86/pci

[John Baldwin]

Author: jhb
Date: Wed Aug 25 20:37:58 2010
New Revision: 211821
URL: http://svn.freebsd.org/changeset/base/211821

Log:
  Correctly ensure that the CPU family is 0x6, not non-zero.
  
  Submitted by:	Dimitry Andric

Modified:
  head/sys/x86/pci/qpi.c

Modified: head/sys/x86/pci/qpi.c
==============================================================================
--- head/sys/x86/pci/qpi.c	Wed Aug 25 19:12:05 2010	(r211820)
+++ head/sys/x86/pci/qpi.c	Wed Aug 25 20:37:58 2010	(r211821)
@@ -62,7 +62,8 @@ qpi_identify(driver_t *driver, device_t 
 {
 
         /* 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;