Commit a7fde09a authored Jul 14, 2015 by Adrian Hunter Committed by Arnaldo Carvalho de Melo Jul 15, 2015

perf auxtrace: Fix misplaced check for HAVE_SYNC_COMPARE_AND_SWAP_SUPPORT



Move the checking for HAVE_SYNC_COMPARE_AND_SWAP_SUPPORT for AUX area mmaps
until after checking if such mmaps are used anyway.

Reported-by: Alexey Brodkin <Alexey.Brodkin@synopsys.com>
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Tested-by: Alexey Brodkin <Alexey.Brodkin@synopsys.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Vineet Gupta <Vineet.Gupta1@synopsys.com>
Cc: linux-arch@vger.kernel.org
Link: http://lkml.kernel.org/r/55A5023C.7020907@intel.com


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

parent 65ea03e3

tools/perf/util/auxtrace.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -53,11 +53,6 @@ int auxtrace_mmap__mmap(struct auxtrace_mmap *mm,
		{
		struct perf_event_mmap_page *pc = userpg;

		#if BITS_PER_LONG != 64 && !defined(HAVE_SYNC_COMPARE_AND_SWAP_SUPPORT)
		pr_err("Cannot use AUX area tracing mmaps\n");
		return -1;
		#endif

		WARN_ONCE(mm->base, "Uninitialized auxtrace_mmap\n");

		mm->userpg = userpg;
		@@ -73,6 +68,11 @@ int auxtrace_mmap__mmap(struct auxtrace_mmap *mm,
		return 0;
		}

		#if BITS_PER_LONG != 64 && !defined(HAVE_SYNC_COMPARE_AND_SWAP_SUPPORT)
		pr_err("Cannot use AUX area tracing mmaps\n");
		return -1;
		#endif

		pc->aux_offset = mp->offset;
		pc->aux_size = mp->len;

Admin message