---

yaml --- r: 145571 b: refs/heads/master c: 0de5108 h: refs/heads/master i: 145569: d385dba 145567: f8fa893 v: v3
git-mirror · Jun 10, 2009 · 6e55460 · 6e55460
1 parent 80a9794
commit 6e55460
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b83868723d090078ac0e2120e06a1cc94dbaef0
+refs/heads/master: 0de51088e6a82bc8413d3ca9e28bbca2788b5b53
diff --git a/trunk/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c b/trunk/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
@@ -90,11 +90,7 @@ static int check_est_cpu(unsigned int cpuid)
 {
 	struct cpuinfo_x86 *cpu = &cpu_data(cpuid);
 
-	if (cpu->x86_vendor != X86_VENDOR_INTEL ||
-	    !cpu_has(cpu, X86_FEATURE_EST))
-		return 0;
-
-	return 1;
+	return cpu_has(cpu, X86_FEATURE_EST);
 }
 
 static unsigned extract_io(u32 value, struct acpi_cpufreq_data *data)