Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 202537
b: refs/heads/master
c: 9d1f44e
h: refs/heads/master
i:
  202535: 12fe453
v: v3
  • Loading branch information
Dave Jones committed Aug 3, 2010
1 parent 41ce3fe commit 979cce1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 307069cf6c53632adc27de4f49bf5d1d67cb87bb
refs/heads/master: 9d1f44ee206a23b975d7d7c6f759efb25e0e61ac
7 changes: 1 addition & 6 deletions trunk/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 "
"<cpufreq@vger.kernel.org>\n");
if (c->x86 != 0xF)
return 0;
}

/* on P-4s, the TSC runs with constant frequency independent whether
* throttling is active or not. */
Expand Down

0 comments on commit 979cce1

Please sign in to comment.