* Thomas Renninger <trenn@xxxxxxx> wrote: > - Make the message shorter and easier to grep for > - Use printk_once instead of WARN_ONCE (functionality of these was mixed up) > > Also see bug: http://bugzilla.kernel.org/show_bug.cgi?id=13146 > for reference. > > Signed-off-by: Thomas Renninger <trenn@xxxxxxx> > Cc: Langsdorf, Mark <mark.langsdorf@xxxxxxx> > Cc: Ingo Molnar <mingo@xxxxxxx> > --- > arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 19 +++++-------------- > 1 files changed, 5 insertions(+), 14 deletions(-) > > diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c > index 4709ead..feef10c 100644 > --- a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c > +++ b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c > @@ -1215,13 +1215,16 @@ static int powernowk8_verify(struct cpufreq_policy *pol) > return cpufreq_frequency_table_verify(pol, data->powernow_table); > } > > +static const char ACPI_PSS_BIOS_BUG_MSG[] = > + KERN_ERR FW_BUG PFX "No compatible ACPI _PSS objects found.\n" > + KERN_ERR FW_BUG PFX "Try again with latest BIOS.\n"; > + > /* per CPU init entry point to the driver */ > static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol) > { > struct powernow_k8_data *data; > cpumask_t oldmask; > int rc; > - static int print_once; > > if (!cpu_online(pol->cpu)) > return -ENODEV; > @@ -1244,19 +1247,7 @@ static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol) > * an UP version, and is deprecated by AMD. > */ > if (num_online_cpus() != 1) { > - /* > - * Replace this one with print_once as soon as such a > - * thing gets introduced > - */ > - if (!print_once) { > - WARN_ONCE(1, KERN_ERR FW_BUG PFX "Your BIOS " > - "does not provide ACPI _PSS objects " > - "in a way that Linux understands. " > - "Please report this to the Linux ACPI" > - " maintainers and complain to your " > - "BIOS vendor.\n"); > - print_once++; > - } > + printk_once(ACPI_PSS_BIOS_BUG_MSG); > goto err_out; > } > if (pol->cpu != 0) { Acked-by: Ingo Molnar <mingo@xxxxxxx> Ingo -- To unsubscribe from this list: send the line "unsubscribe cpufreq" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
