From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753742AbbGRDWk (ORCPT ); Fri, 17 Jul 2015 23:22:40 -0400 Received: from terminus.zytor.com ([198.137.202.10]:56542 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752115AbbGRDWi (ORCPT ); Fri, 17 Jul 2015 23:22:38 -0400 Date: Fri, 17 Jul 2015 20:21:45 -0700 From: tip-bot for Adrian Hunter Message-ID: Cc: Alexey.Brodkin@synopsys.com, fweisbec@gmail.com, adrian.hunter@intel.com, tglx@linutronix.de, namhyung@gmail.com, dsahern@gmail.com, linux-kernel@vger.kernel.org, acme@redhat.com, eranian@google.com, peterz@infradead.org, Vineet.Gupta1@synopsys.com, hpa@zytor.com, jolsa@redhat.com, mingo@kernel.org Reply-To: Vineet.Gupta1@synopsys.com, mingo@kernel.org, hpa@zytor.com, jolsa@redhat.com, tglx@linutronix.de, namhyung@gmail.com, Alexey.Brodkin@synopsys.com, fweisbec@gmail.com, adrian.hunter@intel.com, peterz@infradead.org, eranian@google.com, linux-kernel@vger.kernel.org, acme@redhat.com, dsahern@gmail.com In-Reply-To: <55A5023C.7020907@intel.com> References: <55A5023C.7020907@intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf auxtrace: Fix misplaced check for HAVE_SYNC_COMPARE_AND_SWAP_SUPPORT Git-Commit-ID: a7fde09a78a8ae40b81cfb5096c3cefef6c078c9 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: a7fde09a78a8ae40b81cfb5096c3cefef6c078c9 Gitweb: http://git.kernel.org/tip/a7fde09a78a8ae40b81cfb5096c3cefef6c078c9 Author: Adrian Hunter AuthorDate: Tue, 14 Jul 2015 15:32:41 +0300 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 15 Jul 2015 11:57:28 -0300 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 Signed-off-by: Adrian Hunter Tested-by: Alexey Brodkin Cc: David Ahern Cc: Frederic Weisbecker Cc: Jiri Olsa Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Vineet Gupta Cc: linux-arch@vger.kernel.org Link: http://lkml.kernel.org/r/55A5023C.7020907@intel.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/auxtrace.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/perf/util/auxtrace.c b/tools/perf/util/auxtrace.c index 7e7405c..83d9dd9 100644 --- a/tools/perf/util/auxtrace.c +++ b/tools/perf/util/auxtrace.c @@ -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;