2013-10-07 06:48:43

by Chia-I Wu

Subject: [PATCH] perf timechart: remove lock_depth from trace_entry

struct trace_entry went out-of-sync with the kernel since

commit b000c8065 "tracing: Remove the extra 4 bytes of padding in events"

causing "perf timechart" to be broken.

Signed-off-by: Chia-I Wu <[email protected]>
---
tools/perf/builtin-timechart.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/tools/perf/builtin-timechart.c b/tools/perf/builtin-timechart.c
index c2e0231..f9cbc18 100644
--- a/tools/perf/builtin-timechart.c
+++ b/tools/perf/builtin-timechart.c
@@ -303,7 +303,6 @@ struct trace_entry {
unsigned char flags;
unsigned char preempt_count;
int pid;
- int lock_depth;
};

#ifdef SUPPORT_OLD_POWER_EVENTS
--
1.8.3.1

2013-10-22 10:38:43

by Stanislav Fomichev

Subject: Re: [PATCH] perf timechart: remove lock_depth from trace_entry

On Mon, Oct 07, 2013 at 02:48:34PM +0800, Chia-I Wu wrote:
> struct trace_entry went out-of-sync with the kernel since
>
> commit b000c8065 "tracing: Remove the extra 4 bytes of padding in events"
>
> causing "perf timechart" to be broken.
>
> Signed-off-by: Chia-I Wu <[email protected]>
Reviewed-by: Stanislav Fomichev <[email protected]>

For some reason nobody noticed this patch on lkml, so resending to the
maintainers...
This also makes sense to merge it into the stable line.

> ---
> tools/perf/builtin-timechart.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/tools/perf/builtin-timechart.c b/tools/perf/builtin-timechart.c
> index c2e0231..f9cbc18 100644
> --- a/tools/perf/builtin-timechart.c
> +++ b/tools/perf/builtin-timechart.c
> @@ -303,7 +303,6 @@ struct trace_entry {
> unsigned char flags;
> unsigned char preempt_count;
> int pid;
> - int lock_depth;
> };
>
> #ifdef SUPPORT_OLD_POWER_EVENTS
> --
> 1.8.3.1