From: tip-bot for David Carrillo-Cisneros <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: pjt@google.com, sque@chromium.org, hekuang@huawei.com,
ak@linux.intel.com, acme@redhat.com, eranian@google.com,
jolsa@kernel.org, tglx@linutronix.de,
alexander.shishkin@linux.intel.com, wangnan0@huawei.com,
mhiramat@kernel.org, mingo@kernel.org, davidcc@google.com,
hpa@zytor.com, peterz@infradead.org,
linux-kernel@vger.kernel.org
Subject: [tip:perf/core] Revert "perf tools: Fix include of linux/mman.h"
Date: Mon, 17 Apr 2017 01:36:58 -0700 [thread overview]
Message-ID: <tip-16eb81365b70266c17d1141ef9b32c3110b22d17@git.kernel.org> (raw)
In-Reply-To: <20170412064919.92449-8-davidcc@google.com>
Commit-ID: 16eb81365b70266c17d1141ef9b32c3110b22d17
Gitweb: http://git.kernel.org/tip/16eb81365b70266c17d1141ef9b32c3110b22d17
Author: David Carrillo-Cisneros <davidcc@google.com>
AuthorDate: Tue, 11 Apr 2017 23:49:19 -0700
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Thu, 13 Apr 2017 11:54:46 -0300
Revert "perf tools: Fix include of linux/mman.h"
In https://lkml.org/lkml/2017/2/2/16 I reported a build error that I
believed was caused by wrong uapi includes. The synthom was fixed by
Arnaldo in:
commit 2f7db5557994 ("perf tools: Fix include of linux/mman.h")
but I was wrong attributing the problem to the uapi include.
The root cause was that I was using ARCH=x86_64, hence using the wrong
uapi include path. This explains why no one else ran into this build
problem.
Signed-off-by: David Carrillo-Cisneros <davidcc@google.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: He Kuang <hekuang@huawei.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Paul Turner <pjt@google.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Simon Que <sque@chromium.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/20170412064919.92449-8-davidcc@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/event.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index 8255a26..4d7e65f 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -1,5 +1,5 @@
#include <linux/types.h>
-#include <linux/mman.h> /* To get things like MAP_HUGETLB even on older libc headers */
+#include <uapi/linux/mman.h> /* To get things like MAP_HUGETLB even on older libc headers */
#include <api/fs/fs.h>
#include "event.h"
#include "debug.h"
next prev parent reply other threads:[~2017-04-17 8:43 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-12 6:49 [PATCH 0/6] perf tool: build and usage hints David Carrillo-Cisneros
2017-04-12 6:49 ` [PATCH 1/6] perf tools: pass PYTHON config to feature detection David Carrillo-Cisneros
2017-04-17 8:33 ` [tip:perf/core] perf tools: Pass " tip-bot for David Carrillo-Cisneros
2017-04-12 6:49 ` [PATCH 2/6] tools build: fix feature detection redefinion of build flags David Carrillo-Cisneros
2017-04-17 8:35 ` [tip:perf/core] tools build: Fix " tip-bot for David Carrillo-Cisneros
2017-04-12 6:49 ` [PATCH 2/6] tools build: fix feature redefine " David Carrillo-Cisneros
2017-04-12 7:56 ` Jiri Olsa
2017-04-12 16:30 ` David Carrillo-Cisneros
2017-04-13 14:52 ` Arnaldo Carvalho de Melo
2017-04-12 6:49 ` [PATCH 3/6] perf util: hint missing file when tool tips fail to load David Carrillo-Cisneros
2017-04-17 8:36 ` [tip:perf/core] perf util: Hint " tip-bot for David Carrillo-Cisneros
2017-04-12 6:49 ` [PATCH 4/6] perf report: hint .perfconfig error when invalid sorting key David Carrillo-Cisneros
2017-04-12 8:17 ` Jiri Olsa
2017-04-12 16:34 ` David Carrillo-Cisneros
2017-04-13 14:53 ` Arnaldo Carvalho de Melo
2017-04-12 6:49 ` [PATCH 5/6] perf tools: disable JVMTI if no ELF support available David Carrillo-Cisneros
2017-04-12 8:19 ` Jiri Olsa
2017-04-12 17:07 ` David Carrillo-Cisneros
2017-04-12 17:33 ` Jiri Olsa
2017-04-13 14:47 ` Arnaldo Carvalho de Melo
2017-04-17 8:35 ` [tip:perf/core] perf tools: Disable " tip-bot for David Carrillo-Cisneros
2017-04-13 11:40 ` [PATCH 5/6] perf tools: disable " Kim Phillips
2017-04-12 6:49 ` [PATCH 6/6] Revert "perf tools: Fix include of linux/mman.h" David Carrillo-Cisneros
2017-04-17 8:36 ` tip-bot for David Carrillo-Cisneros [this message]
2017-04-12 8:20 ` [PATCH 0/6] perf tool: build and usage hints Jiri Olsa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-16eb81365b70266c17d1141ef9b32c3110b22d17@git.kernel.org \
--to=tipbot@zytor.com \
--cc=acme@redhat.com \
--cc=ak@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=davidcc@google.com \
--cc=eranian@google.com \
--cc=hekuang@huawei.com \
--cc=hpa@zytor.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mhiramat@kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=pjt@google.com \
--cc=sque@chromium.org \
--cc=tglx@linutronix.de \
--cc=wangnan0@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome