diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-07-21 07:57:44 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-07-21 07:57:44 +0200 |
commit | f6a74a5e15df32f289837feeabf8c84829312b06 (patch) | |
tree | c8d16b12ef76c7a9e21693d1bad31f59f78436cd /tools/perf/util/auxtrace.c | |
parent | 60cd37eb100c4880b28078a47f3062fac7572095 (diff) | |
parent | 9d634c410b07be7bf637ea03362d3ff132088fe3 (diff) | |
download | lwn-f6a74a5e15df32f289837feeabf8c84829312b06.tar.gz lwn-f6a74a5e15df32f289837feeabf8c84829312b06.zip |
Merge branch 'linus' into perf/core, to refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/auxtrace.c')
-rw-r--r-- | tools/perf/util/auxtrace.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/perf/util/auxtrace.c b/tools/perf/util/auxtrace.c index 7e7405c9b936..83d9dd96fe08 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; |