From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1753099AbdDLGt4 (ORCPT <rfc822;w@1wt.eu>);
        Wed, 12 Apr 2017 02:49:56 -0400
Received: from mail-pf0-f172.google.com ([209.85.192.172]:36781 "EHLO
        mail-pf0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1751308AbdDLGtw (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Wed, 12 Apr 2017 02:49:52 -0400
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
Message-Id: <20170412064919.92449-8-davidcc@google.com>
X-Mailer: git-send-email 2.12.2.715.g7642488e1d-goog
In-Reply-To: <20170412064919.92449-1-davidcc@google.com>
References: <20170412064919.92449-1-davidcc@google.com>
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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