Skip to content

Commit

Permalink
perf_counter, x86: Fix lapic printk message
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ingo Molnar committed Aug 11, 2009
1 parent 85dfd81 commit 3c581a7
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/x86/kernel/cpu/perf_counter.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit 3c581a7

Please sign in to comment.