Messages in this thread | | | Date | Fri, 1 Feb 2013 11:26:29 +0100 | From | Ingo Molnar <> | Subject | Re: [PATCH 22/25] perf: Make EVENT_ATTR global |
| |
* Arnaldo Carvalho de Melo <acme@infradead.org> wrote:
> From: Sukadev Bhattiprolu <sukadev@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 <sukadev@linux.vnet.ibm.com> > Acked-by: Jiri Olsa <jolsa@redhat.com> > Cc: Andi Kleen <ak@linux.intel.com> > Cc: Anton Blanchard <anton@au1.ibm.com> > Cc: Ingo Molnar <mingo@redhat.com> > Cc: Jiri Olsa <jolsa@redhat.com> > Cc: Paul Mackerras <paulus@samba.org> > Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> > Cc: Robert Richter <robert.richter@amd.com> > Cc: Stephane Eranian <eranian@google.com> > Cc: linuxppc-dev@ozlabs.org > Link: http://lkml.kernel.org/r/20130123062422.GC13720@us.ibm.com > Signed-off-by: Arnaldo Carvalho de Melo <acme@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
| |