Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1624608

[tip:perf/core] Revert "perf tools: Fix include of linux/mman.h"

Show all headers | View raw

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"

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/6] perf tool: build and usage hints David Carrillo-Cisneros <davidcc@google.com> - 2017-04-12 08:50 +0200
  [PATCH 1/6] perf tools: pass PYTHON config to feature detection David Carrillo-Cisneros <davidcc@google.com> - 2017-04-12 08:50 +0200
    [tip:perf/core] perf tools: Pass PYTHON config to feature detection tip-bot for David Carrillo-Cisneros <tipbot@zytor.com> - 2017-04-17 10:50 +0200
  [PATCH 5/6] perf tools: disable JVMTI if no ELF support available David Carrillo-Cisneros <davidcc@google.com> - 2017-04-12 08:50 +0200
    Re: [PATCH 5/6] perf tools: disable JVMTI if no ELF support available Jiri Olsa <jolsa@redhat.com> - 2017-04-12 10:20 +0200
      [PATCH 5/6] perf tools: disable JVMTI if no ELF support available David Carrillo-Cisneros <davidcc@google.com> - 2017-04-12 19:10 +0200
        Re: [PATCH 5/6] perf tools: disable JVMTI if no ELF support available Jiri Olsa <jolsa@redhat.com> - 2017-04-12 19:40 +0200
          Re: [PATCH 5/6] perf tools: disable JVMTI if no ELF support available Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-13 16:50 +0200
        [tip:perf/core] perf tools: Disable JVMTI if no ELF support  available tip-bot for David Carrillo-Cisneros <tipbot@zytor.com> - 2017-04-17 10:50 +0200
    Re: [PATCH 5/6] perf tools: disable JVMTI if no ELF support  available Kim Phillips <kim.phillips@arm.com> - 2017-04-13 13:50 +0200
  [PATCH 2/6] tools build: fix feature redefine build flags David Carrillo-Cisneros <davidcc@google.com> - 2017-04-12 09:00 +0200
    Re: [PATCH 2/6] tools build: fix feature redefine build flags Jiri Olsa <jolsa@redhat.com> - 2017-04-12 10:00 +0200
      Re: [PATCH 2/6] tools build: fix feature redefine build flags David Carrillo-Cisneros <davidcc@google.com> - 2017-04-12 18:40 +0200
        Re: [PATCH 2/6] tools build: fix feature redefine build flags Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-13 17:00 +0200
  [PATCH 4/6] perf report: hint .perfconfig error when invalid sorting key David Carrillo-Cisneros <davidcc@google.com> - 2017-04-12 09:00 +0200
    Re: [PATCH 4/6] perf report: hint .perfconfig error when invalid  sorting key Jiri Olsa <jolsa@redhat.com> - 2017-04-12 10:20 +0200
      Re: [PATCH 4/6] perf report: hint .perfconfig error when invalid  sorting key David Carrillo-Cisneros <davidcc@google.com> - 2017-04-12 18:40 +0200
        Re: [PATCH 4/6] perf report: hint .perfconfig error when invalid  sorting key Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-13 17:00 +0200
  [PATCH 3/6] perf util: hint missing file when tool tips fail to load David Carrillo-Cisneros <davidcc@google.com> - 2017-04-12 09:00 +0200
    [tip:perf/core] perf util: Hint missing file when tool tips fail to  load tip-bot for David Carrillo-Cisneros <tipbot@zytor.com> - 2017-04-17 10:50 +0200
  [PATCH 2/6] tools build: fix feature detection redefinion of build flags David Carrillo-Cisneros <davidcc@google.com> - 2017-04-12 09:00 +0200
    [tip:perf/core] tools build: Fix feature detection redefinion of  build flags tip-bot for David Carrillo-Cisneros <tipbot@zytor.com> - 2017-04-17 10:50 +0200
  [PATCH 6/6] Revert "perf tools: Fix include of linux/mman.h" David Carrillo-Cisneros <davidcc@google.com> - 2017-04-12 09:00 +0200
    [tip:perf/core] Revert "perf tools: Fix include of linux/mman.h" tip-bot for David Carrillo-Cisneros <tipbot@zytor.com> - 2017-04-17 10:50 +0200
  Re: [PATCH 0/6] perf tool: build and usage hints Jiri Olsa <jolsa@redhat.com> - 2017-04-12 10:30 +0200

csiph-web