From b23c10c26a922db0586bff9c662e0f42834a493b Mon Sep 17 00:00:00 2001 From: Borislav Petkov Date: Wed, 5 Sep 2012 00:50:26 +0200 Subject: [PATCH] --- yaml --- r: 328711 b: refs/heads/master c: 56835e6cc053c29bf1a15a07dbeb78f219a15214 h: refs/heads/master i: 328709: 1a2804c394fb97026aff414285469af833b881cf 328707: d63cfab74405f77bb279e453c1df37e1c88525ec 328703: 45eabca46d34e184a393a3eca6b3522666321668 v: v3 --- [refs] | 2 +- trunk/drivers/cpufreq/powernow-k8.c | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 7613620171f3..c060a7755413 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2d175069f2b5477692d4bd7586bc530ffe8107bb +refs/heads/master: 56835e6cc053c29bf1a15a07dbeb78f219a15214 diff --git a/trunk/drivers/cpufreq/powernow-k8.c b/trunk/drivers/cpufreq/powernow-k8.c index c0e816468e30..33f17c4a1342 100644 --- a/trunk/drivers/cpufreq/powernow-k8.c +++ b/trunk/drivers/cpufreq/powernow-k8.c @@ -1265,12 +1265,15 @@ static void __cpuinit powernowk8_cpu_init_on_cpu(void *_init_on_cpu) init_on_cpu->rc = 0; } +static const char missing_pss_msg[] = + KERN_ERR + FW_BUG PFX "No compatible ACPI _PSS objects found.\n" + FW_BUG PFX "First, make sure Cool'N'Quiet is enabled in the BIOS.\n" + FW_BUG PFX "If that doesn't help, try upgrading your BIOS.\n"; + /* per CPU init entry point to the driver */ static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol) { - static const char ACPI_PSS_BIOS_BUG_MSG[] = - KERN_ERR FW_BUG PFX "No compatible ACPI _PSS objects found.\n" - FW_BUG PFX "Try again with latest BIOS.\n"; struct powernow_k8_data *data; struct init_on_cpu init_on_cpu; int rc; @@ -1298,7 +1301,7 @@ static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol) * an UP version, and is deprecated by AMD. */ if (num_online_cpus() != 1) { - printk_once(ACPI_PSS_BIOS_BUG_MSG); + printk_once(missing_pss_msg); goto err_out; } if (pol->cpu != 0) {