Skip to contentSkip to conversation

perf_counter, x86: Fix lapic printk message

tip:perfcounters/urgent tip-bot for Ingo Molnar 1 participant 1 message Aug 11, 2009 x86

lore
Share & tools
lore
#0 lore raw
Commit-ID:  3c581a7f94542341bf0da496a226b44ac63521a8
Gitweb:     http://git.kernel.org/tip/3c581a7f94542341bf0da496a226b44ac63521a8
Author:     Ingo Molnar <[email protected]>
AuthorDate: Tue, 11 Aug 2009 10:47:36 +0200
Committer:  Ingo Molnar <[email protected]>
CommitDate: Tue, 11 Aug 2009 10:58:25 +0200

perf_counter, x86: Fix lapic printk message

Instead of this garbled bootup on UP Pentium-M systems:

[    0.015048] Performance Counters:
[    0.016004] no Local APIC, try rebooting with lapicno PMU driver, software counters only.

Print:

[    0.015050] Performance Counters:
[    0.016004] no APIC, boot with the "lapic" boot parameter to force-enable it.
[    0.017003] no PMU driver, software counters only.

Cf: Frederic Weisbecker <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Arnaldo Carvalho de Melo <[email protected]>
Cc: Frederic Weisbecker <[email protected]>
LKML-Reference: <new-submission>

---
 arch/x86/kernel/cpu/perf_counter.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/kernel/cpu/perf_counter.c +1 -1
index a7aa8f9..40e233a 100644
@@ -1590,7 +1590,7 @@ static int p6_pmu_init(void)
 	}
 
 	if (!cpu_has_apic) {
-		pr_info("no Local APIC, try rebooting with lapic");
+		pr_info("no APIC, boot with the \"lapic\" boot parameter to force-enable it.\n");
 		return -ENODEV;
 	}