[PATCH 1/2] perf, tools: Define MADV_*HUGEPAGE for old kernels

[PATCH 1/2] perf, tools: Define MADV_*HUGEPAGE for old kernels

[Andi Kleen]

From: Andi Kleen <ak@linux.intel.com>

Avoids this on RHEL6:

bench/numa.c: In function ‘alloc_data’:
bench/numa.c:334: error: ‘MADV_HUGEPAGE’ undeclared (first use in this function)
bench/numa.c:334: error: (Each undeclared identifier is reported only once
bench/numa.c:334: error: for each function it appears in.)
bench/numa.c:341: error: ‘MADV_NOHUGEPAGE’ undeclared (first use in this function)

Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
 tools/perf/bench/numa.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/tools/perf/bench/numa.c b/tools/perf/bench/numa.c
index 30d1c32..8f30ce1 100644
--- a/tools/perf/bench/numa.c
+++ b/tools/perf/bench/numa.c
@@ -30,6 +30,9 @@
 #include <numa.h>
 #include <numaif.h>
 
+#define MADV_HUGEPAGE   14              /* Worth backing with hugepages */
+#define MADV_NOHUGEPAGE 15              /* Not worth backing with hugepages */
+
 /*
  * Regular printout to the terminal, supressed if -q is specified:
  */
-- 
1.7.7.6

[PATCH 2/2] perf, tools: Fix compilation without newt support

[Andi Kleen]

From: Andi Kleen <ak@linux.intel.com>

Fix

builtin-annotate.c: In function ‘hists__find_annotations’:
builtin-annotate.c:161:4: error: duplicate case value
builtin-annotate.c:154:4: error: previously used here

and

builtin-report.c:479:15: error: ‘K_SWITCH_INPUT_DATA’ undeclared (first use in this function)
builtin-report.c:479:15: note: each undeclared identifier is reported only once for each function it appears in
builtin-report.c: In function ‘cmd_report’:
builtin-report.c:823:13: error: ‘K_SWITCH_INPUT_DATA’ undeclared (first use in this function)

by changing the values of the fallback K_LEFT, K_RIGHT and adding a
dummy K_SWITCH_INPUT_DATA too

Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
 tools/perf/util/hist.h |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h
index 3862468..a8d7284 100644
--- a/tools/perf/util/hist.h
+++ b/tools/perf/util/hist.h
@@ -208,8 +208,9 @@ static inline int script_browse(const char *script_opt __maybe_unused)
 	return 0;
 }
 
-#define K_LEFT -1
-#define K_RIGHT -2
+#define K_LEFT -10
+#define K_RIGHT -20
+#define K_SWITCH_INPUT_DATA -30
 #endif
 
 #ifdef GTK2_SUPPORT
-- 
1.7.7.6

Re: [PATCH 1/2] perf, tools: Define MADV_*HUGEPAGE for old kernels

[Namhyung Kim]

Hi Andi,

On Wed,  6 Mar 2013 15:19:16 -0800, Andi Kleen wrote:
> From: Andi Kleen <ak@linux.intel.com>
>
> Avoids this on RHEL6:
>
> bench/numa.c: In function ‘alloc_data’:
> bench/numa.c:334: error: ‘MADV_HUGEPAGE’ undeclared (first use in this function)
> bench/numa.c:334: error: (Each undeclared identifier is reported only once
> bench/numa.c:334: error: for each function it appears in.)
> bench/numa.c:341: error: ‘MADV_NOHUGEPAGE’ undeclared (first use in this function)

The fix was posted already but there's an issue also.  Please see

  https://lkml.org/lkml/2013/3/6/2

Thanks,
Namhyung

Re: [PATCH 2/2] perf, tools: Fix compilation without newt support

[Namhyung Kim]

On Wed,  6 Mar 2013 15:19:17 -0800, Andi Kleen wrote:
> From: Andi Kleen <ak@linux.intel.com>
>
> Fix
>
> builtin-annotate.c: In function ‘hists__find_annotations’:
> builtin-annotate.c:161:4: error: duplicate case value
> builtin-annotate.c:154:4: error: previously used here
>
> and
>
> builtin-report.c:479:15: error: ‘K_SWITCH_INPUT_DATA’ undeclared (first use in this function)
> builtin-report.c:479:15: note: each undeclared identifier is reported only once for each function it appears in
> builtin-report.c: In function ‘cmd_report’:
> builtin-report.c:823:13: error: ‘K_SWITCH_INPUT_DATA’ undeclared (first use in this function)
>
> by changing the values of the fallback K_LEFT, K_RIGHT and adding a
> dummy K_SWITCH_INPUT_DATA too

The fixes are already in the acme/perf/core.

Thanks,
Namhyung