Module Name: src
Committed By: jruoho
Date: Thu Feb 24 05:14:58 UTC 2011
Modified Files:
src/sys/arch/x86/x86: est.c
Log Message:
Also check CPU vendor in the match-function.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/x86/x86/est.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/est.c
diff -u src/sys/arch/x86/x86/est.c:1.20 src/sys/arch/x86/x86/est.c:1.21
--- src/sys/arch/x86/x86/est.c:1.20 Wed Feb 23 11:43:23 2011
+++ src/sys/arch/x86/x86/est.c Thu Feb 24 05:14:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: est.c,v 1.20 2011/02/23 11:43:23 jruoho Exp $ */
+/* $NetBSD: est.c,v 1.21 2011/02/24 05:14:58 jruoho Exp $ */
/*
* Copyright (c) 2003 Michael Eriksson.
* All rights reserved.
@@ -76,7 +76,7 @@
* http://www.codemonkey.org.uk/projects/cpufreq/cpufreq-2.4.22-pre6-1.gz
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: est.c,v 1.20 2011/02/23 11:43:23 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: est.c,v 1.21 2011/02/24 05:14:58 jruoho Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -1018,6 +1018,10 @@
if (strcmp(cfaa->name, "est") != 0)
return 0;
+ if (cpu_vendor != CPUVENDOR_IDT &&
+ cpu_vendor != CPUVENDOR_INTEL)
+ return 0;
+
if ((ci->ci_feat_val[1] & CPUID2_EST) == 0)
return 0;
