From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933129AbdDQIni (ORCPT ); Mon, 17 Apr 2017 04:43:38 -0400 Received: from terminus.zytor.com ([65.50.211.136]:34897 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932354AbdDQIng (ORCPT ); Mon, 17 Apr 2017 04:43:36 -0400 Date: Mon, 17 Apr 2017 01:36:58 -0700 From: tip-bot for David Carrillo-Cisneros Message-ID: 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 Reply-To: linux-kernel@vger.kernel.org, peterz@infradead.org, mingo@kernel.org, mhiramat@kernel.org, hpa@zytor.com, davidcc@google.com, eranian@google.com, jolsa@kernel.org, acme@redhat.com, wangnan0@huawei.com, tglx@linutronix.de, alexander.shishkin@linux.intel.com, hekuang@huawei.com, ak@linux.intel.com, sque@chromium.org, pjt@google.com In-Reply-To: <20170412064919.92449-8-davidcc@google.com> References: <20170412064919.92449-8-davidcc@google.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] Revert "perf tools: Fix include of linux/mman.h" Git-Commit-ID: 16eb81365b70266c17d1141ef9b32c3110b22d17 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 16eb81365b70266c17d1141ef9b32c3110b22d17 Gitweb: http://git.kernel.org/tip/16eb81365b70266c17d1141ef9b32c3110b22d17 Author: David Carrillo-Cisneros AuthorDate: Tue, 11 Apr 2017 23:49:19 -0700 Committer: Arnaldo Carvalho de Melo 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 Acked-by: Jiri Olsa Cc: Alexander Shishkin Cc: Andi Kleen Cc: He Kuang Cc: Masami Hiramatsu Cc: Paul Turner Cc: Peter Zijlstra Cc: Simon Que Cc: Stephane Eranian Cc: Wang Nan Link: http://lkml.kernel.org/r/20170412064919.92449-8-davidcc@google.com Signed-off-by: Arnaldo Carvalho de Melo --- 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 -#include /* To get things like MAP_HUGETLB even on older libc headers */ +#include /* To get things like MAP_HUGETLB even on older libc headers */ #include #include "event.h" #include "debug.h"