]> git.karo-electronics.de Git - mv-sheeva.git/blobdiff - arch/x86/kernel/cpu/cpufreq/p4-clockmod.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
[mv-sheeva.git] / arch / x86 / kernel / cpu / cpufreq / p4-clockmod.c
index 7b8a8ba67b0779911991ba8fbb1cbab28b6fa749..52c93648e492f10c8c6da916f7c1cd4dc25f2807 100644 (file)
@@ -158,9 +158,9 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
 {
        if (c->x86 == 0x06) {
                if (cpu_has(c, X86_FEATURE_EST))
-                       printk(KERN_WARNING PFX "Warning: EST-capable CPU "
-                              "detected. The acpi-cpufreq module offers "
-                              "voltage scaling in addition of frequency "
+                       printk_once(KERN_WARNING PFX "Warning: EST-capable "
+                              "CPU detected. The acpi-cpufreq module offers "
+                              "voltage scaling in addition to frequency "
                               "scaling. You should use that instead of "
                               "p4-clockmod, if possible.\n");
                switch (c->x86_model) {
@@ -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. */