From 979cce11147c3681d1682bcb9bb14cb9612e60b2 Mon Sep 17 00:00:00 2001 From: Dave Jones Date: Tue, 3 Aug 2010 13:47:30 -0400 Subject: [PATCH] --- yaml --- r: 202537 b: refs/heads/master c: 9d1f44ee206a23b975d7d7c6f759efb25e0e61ac h: refs/heads/master i: 202535: 12fe4536413dfdc6be8c51891bbfeeef7223c467 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 005dca549d83..1df1ee31082b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 307069cf6c53632adc27de4f49bf5d1d67cb87bb +refs/heads/master: 9d1f44ee206a23b975d7d7c6f759efb25e0e61ac diff --git a/trunk/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c b/trunk/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c index 7b8a8ba67b07..bd1cac747f67 100644 --- a/trunk/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c +++ b/trunk/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c @@ -178,13 +178,8 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c) } } - if (c->x86 != 0xF) { - if (!cpu_has(c, X86_FEATURE_EST)) - printk(KERN_WARNING PFX "Unknown CPU. " - "Please send an e-mail to " - "\n"); + if (c->x86 != 0xF) return 0; - } /* on P-4s, the TSC runs with constant frequency independent whether * throttling is active or not. */