* Arnaldo Carvalho de Melo <a...@infradead.org> wrote: > From: Sukadev Bhattiprolu <suka...@linux.vnet.ibm.com> > > Rename EVENT_ATTR() to PMU_EVENT_ATTR() and make it global so it is > available to all architectures. > > Further to allow architectures flexibility, have PMU_EVENT_ATTR() pass > in the variable name as a parameter. > > Changelog[v2] > - [Jiri Olsa] No need to define PMU_EVENT_PTR() > > Signed-off-by: Sukadev Bhattiprolu <suka...@linux.vnet.ibm.com> > Acked-by: Jiri Olsa <jo...@redhat.com> > Cc: Andi Kleen <a...@linux.intel.com> > Cc: Anton Blanchard <an...@au1.ibm.com> > Cc: Ingo Molnar <mi...@redhat.com> > Cc: Jiri Olsa <jo...@redhat.com> > Cc: Paul Mackerras <pau...@samba.org> > Cc: Peter Zijlstra <a.p.zijls...@chello.nl> > Cc: Robert Richter <robert.rich...@amd.com> > Cc: Stephane Eranian <eran...@google.com> > Cc: linuxppc-...@ozlabs.org > Link: http://lkml.kernel.org/r/20130123062422.gc13...@us.ibm.com > Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com> > --- > arch/x86/kernel/cpu/perf_event.c | 13 +++---------- > include/linux/perf_event.h | 11 +++++++++++ > 2 files changed, 14 insertions(+), 10 deletions(-)
so this one started conflicting non-trivially with tip:perf/x86 - the pending memory profiling kernel-side bits. Can we merge the memory profiling tooling side bits together with the kernel side bits - or does it need more work? For now I've excluded perf/x86 from tip:master until this is resolved. Thanks, Ingo -- 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/