public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: David Carrillo-Cisneros <davidcc@google.com>
To: linux-kernel@vger.kernel.org
Cc: Peter Zijlstra <peterz@infradead.org>,
	Ingo Molnar <mingo@redhat.com>,
	Arnaldo Carvalho de Melo <acme@kernel.org>,
	Alexander Shishkin <alexander.shishkin@linux.intel.com>,
	Andi Kleen <ak@linux.intel.com>, Simon Que <sque@chromium.org>,
	Wang Nan <wangnan0@huawei.com>, Jiri Olsa <jolsa@kernel.org>,
	He Kuang <hekuang@huawei.com>,
	Masami Hiramatsu <mhiramat@kernel.org>,
	Stephane Eranian <eranian@google.com>,
	Paul Turner <pjt@google.com>,
	David Carrillo-Cisneros <davidcc@google.com>
Subject: [PATCH 6/6] Revert "perf tools: Fix include of linux/mman.h"
Date: Tue, 11 Apr 2017 23:49:19 -0700	[thread overview]
Message-ID: <20170412064919.92449-8-davidcc@google.com> (raw)
In-Reply-To: <20170412064919.92449-1-davidcc@google.com>

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>
---
 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 76b9c6bc8369..1046a1a83f81 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"
-- 
2.12.2.715.g7642488e1d-goog

  parent reply	other threads:[~2017-04-12  6:49 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 ` David Carrillo-Cisneros [this message]
2017-04-17  8:36   ` [tip:perf/core] Revert "perf tools: Fix include of linux/mman.h" tip-bot for David Carrillo-Cisneros
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=20170412064919.92449-8-davidcc@google.com \
    --to=davidcc@google.com \
    --cc=acme@kernel.org \
    --cc=ak@linux.intel.com \
    --cc=alexander.shishkin@linux.intel.com \
    --cc=eranian@google.com \
    --cc=hekuang@huawei.com \
    --cc=jolsa@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mhiramat@kernel.org \
    --cc=mingo@redhat.com \
    --cc=peterz@infradead.org \
    --cc=pjt@google.com \
    --cc=sque@chromium.org \
    --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