From: Borislav Petkov <b...@suse.de> ... for MCEs collection.
Changes made by Robert Richter <robert.rich...@linaro.org>: The mce_record tracepoint needs tracepoints to be enabled. Fixing build error for no-tracepoints configs. Signed-off-by: Borislav Petkov <b...@suse.de> [ Fix build error for no-tracepoints configs ] Signed-off-by: Robert Richter <robert.rich...@linaro.org> Signed-off-by: Robert Richter <r...@kernel.org> --- arch/x86/kernel/cpu/mcheck/mce.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c index 9239504..d421937 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c @@ -1987,6 +1987,24 @@ int __init mcheck_init(void) return 0; } +#ifdef CONFIG_TRACEPOINTS + +int __init mcheck_init_tp(void) +{ + if (perf_add_persistent_event_by_id(event_mce_record.event.type)) { + pr_err("Error adding MCE persistent event.\n"); + return -EINVAL; + } + return 0; +} +/* + * We can't run earlier because persistent events uses anon_inode_getfile and + * its anon_inode_mnt gets initialized as a fs_initcall. + */ +fs_initcall_sync(mcheck_init_tp); + +#endif /* CONFIG_TRACEPOINTS */ + /* * mce_syscore: PM support */ -- 1.8.1.1 -- 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/