On Fri, May 31, 2013 at 10:47:21AM +0200, Robert Richter wrote: > From: Robert Richter <robert.rich...@calxeda.com> > > The mce_record tracepoint needs tracepoints to be enabled. Fixing > build error for no-tracepoints configs. > > Signed-off-by: Robert Richter <robert.rich...@calxeda.com> > --- > arch/x86/kernel/cpu/mcheck/mce.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/arch/x86/kernel/cpu/mcheck/mce.c > b/arch/x86/kernel/cpu/mcheck/mce.c > index 0ecf4a2..d421937 100644 > --- a/arch/x86/kernel/cpu/mcheck/mce.c > +++ b/arch/x86/kernel/cpu/mcheck/mce.c > @@ -1987,6 +1987,8 @@ 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)) { > @@ -2001,6 +2003,8 @@ int __init mcheck_init_tp(void) > */ > fs_initcall_sync(mcheck_init_tp); > > +#endif /* CONFIG_TRACEPOINTS */ > +
Right, since my persistent patches are in no tree yet, we should merge this one with, I think, the last one in my set and keep them all together. Thanks. -- 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/