summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-08-11 10:47:36 +0200
committerIngo Molnar <mingo@elte.hu>2009-08-11 10:58:25 +0200
commit3c581a7f94542341bf0da496a226b44ac63521a8 (patch)
tree925ec40487d16373ce89ce578851d90559c6ac8e /arch
parent85dfd81dc57e8183a277ddd7a56aa65c96f3f487 (diff)
downloadop-kernel-dev-3c581a7f94542341bf0da496a226b44ac63521a8.zip
op-kernel-dev-3c581a7f94542341bf0da496a226b44ac63521a8.tar.gz
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 <fweisbec@gmail.com> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Paul Mackerras <paulus@samba.org> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> LKML-Reference: <new-submission> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/cpu/perf_counter.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/perf_counter.c b/arch/x86/kernel/cpu/perf_counter.c
index a7aa8f9..40e233a 100644
--- a/arch/x86/kernel/cpu/perf_counter.c
+++ b/arch/x86/kernel/cpu/perf_counter.c
@@ -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;
}
OpenPOWER on IntegriCloud