Hi, I should have split out this segfault fix.
On Tuesday 22 February 2011 23:16:54 Greg KH wrote: > 2.6.37-stable review patch. If anyone has any objections, please let > us know. > > ------------------ > > From: Thomas Renninger <[email protected]> > > commit 20c457b8587bee4644d998331d9e13be82e05b4c upstream. > > [This patch is part of mainline git commit 20c457b8587bee4644d9. > This should fix: > http://www.mail-archive.com/linux-perf- > [email protected]/msg00057.html > > The regression was introduced by git commit: > 4c21adf26f8fcf86a755b9b9f55c2e9fd241e1fb] Above link is a nice pointer. the rest of the changelog (below) does not fit and describes the mainline patch, the tiny fix was part of. Don't know whether it's worth to touch it, but if, the changelog (or title) of the patch should be as short as: perf: timechart (userspace): Do not segfault on power_end events Thomas > builtin-timechart must only pass -e power:xy events if they are supported by > the running kernel, otherwise try to fetch the old power:power{start,end} > events. > > For this I added the tiny helper function: > > int is_valid_tracepoint(const char *event_string) > > to parse-events.[hc], which could be more generic as an interface and support > hardware/software/... events, not only tracepoints, but someone else could > extend that if needed... > > Signed-off-by: Thomas Renninger <[email protected]> > Acked-by: Arjan van de Ven <[email protected]> > Acked-by: Jean Pihet <[email protected]> > LKML-Reference: <[email protected]> > Signed-off-by: Ingo Molnar <[email protected]> > Signed-off-by: Greg Kroah-Hartman <[email protected]> > > --- > tools/perf/builtin-timechart.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > --- a/tools/perf/builtin-timechart.c > +++ b/tools/perf/builtin-timechart.c > @@ -502,7 +502,7 @@ static int process_sample_event(event_t > c_state_start(pe->cpu_id, data.time, pe->value); > > if (strcmp(event_str, "power:power_end") == 0) > - c_state_end(pe->cpu_id, data.time); > + c_state_end(data.cpu, data.time); > > if (strcmp(event_str, "power:power_frequency") == 0) > p_state_change(pe->cpu_id, data.time, pe->value); > > > _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
