* Greg KH <[email protected]> wrote:
> On Thu, Mar 24, 2011 at 01:18:17AM +0100, Jiri Slaby wrote:
> > On 03/23/2011 09:34 PM, Greg KH wrote:
> > > --- a/kernel/perf_event.c
> > > +++ b/kernel/perf_event.c
> > > @@ -4167,6 +4167,8 @@ static void tp_perf_event_destroy(struct perf_event
> > > *event)
> > >
> > > static const struct pmu *tp_perf_event_init(struct perf_event *event)
> > > {
> > > + if (event->hw.state & PERF_HES_STOPPED)
> > > + return 0;
> > > /*
> > > * Raw tracepoint data is a severe data leak, only allow root to
> > > * have these.
> >
> > This causes build to fail:
> > /usr/src/packages/BUILD/kernel-vanilla-2.6.32.34/linux-2.6.32/kernel/perf_event.c:
> > In function 'tp_perf_event_init':
> > /usr/src/packages/BUILD/kernel-vanilla-2.6.32.34/linux-2.6.32/kernel/perf_event.c:4170:
> > error: 'struct hw_perf_event' has no member named 'state'
> > /usr/src/packages/BUILD/kernel-vanilla-2.6.32.34/linux-2.6.32/kernel/perf_event.c:4170:
> > error: 'PERF_HES_STOPPED' undeclared (first use in this function)
> > /usr/src/packages/BUILD/kernel-vanilla-2.6.32.34/linux-2.6.32/kernel/perf_event.c:4170:
> > error: (Each undeclared identifier is reported only once
> > /usr/src/packages/BUILD/kernel-vanilla-2.6.32.34/linux-2.6.32/kernel/perf_event.c:4170:
> > error: for each function it appears in.)
> >
> >
> > The source:
> > commit 6f197b73304b3bd3d5a43b931383a5331d6b2987
> > Author: Frederic Weisbecker <[email protected]>
> > Date: Mon Mar 7 21:27:09 2011 +0100
> >
> > perf: Handle stopped state with tracepoints
> >
> > commit a0f7d0f7fc02465bb9758501f611f63381792996 upstream.
> >
> > We toggle the state from start and stop callbacks but actually
> > don't check it when the event triggers. Do it so that
> > these callbacks actually work.
>
> Ick, I don't know why it builds fine here. Federic, should I just drop
> this patch for the .32 tree?
Yes, please drop it.
Thanks,
Ingo
_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable
