Commit-ID: 8a3da6c7d0031fcb6a0d17f9c7a68b0e01f52855 Gitweb: http://git.kernel.org/tip/8a3da6c7d0031fcb6a0d17f9c7a68b0e01f52855 Author: Ingo Molnar <mi...@kernel.org> AuthorDate: Sat, 28 Sep 2013 15:48:48 +0200 Committer: Ingo Molnar <mi...@kernel.org> CommitDate: Sat, 28 Sep 2013 15:48:48 +0200
perf/x86: Fix PMU detection printout when no PMU is detected Ran into this cryptic PMU bootup log recently: [ 0.124047] Performance Events: [ 0.125000] smpboot: ... Turns out we print this if no PMU is detected. Fall back to the right condition so that the following is printed: [ 0.122381] Performance Events: no PMU driver, software events only. Cc: Peter Zijlstra <a.p.zijls...@chello.nl> Cc: Arnaldo Carvalho de Melo <a...@redhat.com> Link: http://lkml.kernel.org/n/tip-u2fwauffakjp0qkprfqlj...@git.kernel.org Signed-off-by: Ingo Molnar <mi...@kernel.org> --- arch/x86/kernel/cpu/perf_event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c index a9c606b..897783b 100644 --- a/arch/x86/kernel/cpu/perf_event.c +++ b/arch/x86/kernel/cpu/perf_event.c @@ -1506,7 +1506,7 @@ static int __init init_hw_perf_events(void) err = amd_pmu_init(); break; default: - return 0; + err = -ENOTSUPP; } if (err != 0) { pr_cont("no PMU driver, software events only.\n"); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
