2011-02-08 13:20:50

by Stephane Eranian

Subject: [PATCH] perf: fix compile error in annotate.h

The following patch is necessary to compile without NEWT.

Signed-off-by: Stephane Eranian <[email protected]>
---

diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h
index b1253aa..bc08b36 100644
--- a/tools/perf/util/annotate.h
+++ b/tools/perf/util/annotate.h
@@ -82,7 +82,7 @@ int symbol__tty_annotate(struct symbol *sym, struct map *map, int evidx,
int max_lines);

#ifdef NO_NEWT_SUPPORT
-static inline int symbol__tui_annotate(symbol *sym __used,
+static inline int symbol__tui_annotate(struct symbol *sym __used,
struct map *map __used, int evidx __used)
{
return 0;

2011-02-08 13:53:16

by Arnaldo Carvalho de Melo

Subject: Re: [PATCH] perf: fix compile error in annotate.h

Em Tue, Feb 08, 2011 at 02:20:01PM +0200, Stephane Eranian escreveu:
> The following patch is necessary to compile without NEWT.

Merged already, Borislav Petkov sent a similar patch.

Thanks,

- Arnaldo

> Signed-off-by: Stephane Eranian <[email protected]>
> ---
>
> diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h
> index b1253aa..bc08b36 100644
> --- a/tools/perf/util/annotate.h
> +++ b/tools/perf/util/annotate.h
> @@ -82,7 +82,7 @@ int symbol__tty_annotate(struct symbol *sym, struct map *map, int evidx,
> int max_lines);
>
> #ifdef NO_NEWT_SUPPORT
> -static inline int symbol__tui_annotate(symbol *sym __used,
> +static inline int symbol__tui_annotate(struct symbol *sym __used,
> struct map *map __used, int evidx __used)
> {
> return 0;

2011-02-08 15:19:54

by Ingo Molnar

Subject: Re: [PATCH] perf: fix compile error in annotate.h

* Arnaldo Carvalho de Melo <[email protected]> wrote:

> Em Tue, Feb 08, 2011 at 02:20:01PM +0200, Stephane Eranian escreveu:
> > The following patch is necessary to compile without NEWT.
>
> Merged already, Borislav Petkov sent a similar patch.

I just pushed it out - Stephane, mind checking that latest -tip indeed fixes things
for you?

Thanks,

Ingo

2011-02-08 15:47:20

by Stephane Eranian

Subject: Re: [PATCH] perf: fix compile error in annotate.h

On Tue, Feb 8, 2011 at 4:19 PM, Ingo Molnar <[email protected]> wrote:
>
> * Arnaldo Carvalho de Melo <[email protected]> wrote:
>
>> Em Tue, Feb 08, 2011 at 02:20:01PM +0200, Stephane Eranian escreveu:
>> > The following patch is necessary to compile without NEWT.
>>
>> Merged already, Borislav Petkov sent a similar patch.
>
> I just pushed it out - Stephane, mind checking that latest -tip indeed fixes things
> for you?
>
Works for me now, thanks.

Acked-by: Stephane Eranian <[email protected]>