Em Wed, Aug 22, 2012 at 10:35:40AM +0200, Jiri Olsa escreveu:
> On Tue, Aug 21, 2012 at 07:11:56PM +0200, Peter Zijlstra wrote:
> > On Tue, 2012-08-21 at 08:49 -0700, tip-bot for Jiri Olsa wrote:
> > > #define PERF_ATTR_SIZE_VER3 88 /* add: sample_regs_user */
> > > +#define PERF_ATTR_SIZE_VER4 96 /* add: sample_stack_user */
> >
> > Both are introduced in this patch set, there's no release in between,
> > why are we doing two version increments? Seems like pointless version
> > space inflation to me.
>
> not sure why I did that, attached patch returns that to version3
I'm lazy so couldn't quickly find any problem in applying this patch,
Peter, can you see any problem?
Will add your Acked-by if you can't.
- Arnaldo
> jirka
>
> ---
> Stashing version 4 under version 3 and removing version 4,
> because both version changes were within single patchset.
>
> Reported-by: Peter Zijlstra <a.p.zijls...@chello.nl>
> Cc: Arnaldo Carvalho de Melo <a...@ghostprotocols.net>
> Cc: Peter Zijlstra <a.p.zijls...@chello.nl>
> Cc: Ingo Molnar <mi...@elte.hu>
> Cc: Paul Mackerras <pau...@samba.org>
> Cc: Corey Ashford <cjash...@linux.vnet.ibm.com>
> Cc: Frederic Weisbecker <fweis...@gmail.com>
> Signed-off-by: Jiri Olsa <jo...@redhat.com>
> ---
> include/linux/perf_event.h | 4 ++--
> tools/perf/util/header.c | 1 -
> 2 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
> index 297ca3d..28f9cee 100644
> --- a/include/linux/perf_event.h
> +++ b/include/linux/perf_event.h
> @@ -205,8 +205,8 @@ enum perf_event_read_format {
> #define PERF_ATTR_SIZE_VER0 64 /* sizeof first published struct */
> #define PERF_ATTR_SIZE_VER1 72 /* add: config2 */
> #define PERF_ATTR_SIZE_VER2 80 /* add: branch_sample_type */
> -#define PERF_ATTR_SIZE_VER3 88 /* add: sample_regs_user */
> -#define PERF_ATTR_SIZE_VER4 96 /* add: sample_stack_user */
> +#define PERF_ATTR_SIZE_VER3 96 /* add: sample_regs_user */
> + /* add: sample_stack_user */
>
> /*
> * Hardware event_id to monitor via a performance monitoring event:
> diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
> index 1e5b6aa..5ed4812 100644
> --- a/tools/perf/util/header.c
> +++ b/tools/perf/util/header.c
> @@ -1831,7 +1831,6 @@ static const int attr_file_abi_sizes[] = {
> [1] = PERF_ATTR_SIZE_VER1,
> [2] = PERF_ATTR_SIZE_VER2,
> [3] = PERF_ATTR_SIZE_VER3,
> - [4] = PERF_ATTR_SIZE_VER4,
> 0,
> };
>
> --
> 1.7.11.4
--
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/
