Commit d1398ccf authored Mar 13, 2013 by Vinson Lee Committed by Arnaldo Carvalho de Melo Mar 14, 2013

perf tools: Fix LIBNUMA build with glibc 2.12 and older.



The tokens MADV_HUGEPAGE and MADV_NOHUGEPAGE are not available with
glibc 2.12 and older. Define these tokens if they are not already
defined.

This patch fixes these build errors with older versions of glibc.

    CC bench/numa.o
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)
make: *** [bench/numa.o] Error 1

Signed-off-by: Vinson Lee <vlee@twitter.com>
Acked-by: Ingo Molnar <mingo@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Irina Tirdea <irina.tirdea@intel.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1363214064-4671-2-git-send-email-vlee@twitter.com


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 3bf7b07e

tools/perf/bench/bench.h

+24 −0

Original line number	Diff line number	Diff line
		#ifndef BENCH_H
		#define BENCH_H

		/*
		* The madvise transparent hugepage constants were added in glibc
		* 2.13. For compatibility with older versions of glibc, define these
		* tokens if they are not already defined.
		*
		* PA-RISC uses different madvise values from other architectures and
		* needs to be special-cased.
		*/
		#ifdef __hppa__
		# ifndef MADV_HUGEPAGE
		# define MADV_HUGEPAGE 67
		# endif
		# ifndef MADV_NOHUGEPAGE
		# define MADV_NOHUGEPAGE 68
		# endif
		#else
		# ifndef MADV_HUGEPAGE
		# define MADV_HUGEPAGE 14
		# endif
		# ifndef MADV_NOHUGEPAGE
		# define MADV_NOHUGEPAGE 15
		# endif
		#endif

		extern int bench_numa(int argc, const char *argv, const char prefix);
		extern int bench_sched_messaging(int argc, const char *argv, const char prefix);
		extern int bench_sched_pipe(int argc, const char *argv, const char prefix);

Admin message