From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752208AbdBJHvf (ORCPT ); Fri, 10 Feb 2017 02:51:35 -0500 Received: from terminus.zytor.com ([65.50.211.136]:51416 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751059AbdBJHvc (ORCPT ); Fri, 10 Feb 2017 02:51:32 -0500 Date: Thu, 9 Feb 2017 23:48:15 -0800 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: jolsa@kernel.org, davidcc@google.com, mingo@kernel.org, tglx@linutronix.de, alexander.shishkin@linux.intel.com, u.kleine-koenig@pengutronix.de, pjt@google.com, eranian@google.com, hekuang@huawei.com, hpa@zytor.com, peterz@infradead.org, wangnan0@huawei.com, mmarek@suse.com, linux-kernel@vger.kernel.org, acme@redhat.com Reply-To: peterz@infradead.org, wangnan0@huawei.com, hpa@zytor.com, mmarek@suse.com, acme@redhat.com, linux-kernel@vger.kernel.org, mingo@kernel.org, jolsa@kernel.org, davidcc@google.com, tglx@linutronix.de, u.kleine-koenig@pengutronix.de, alexander.shishkin@linux.intel.com, pjt@google.com, hekuang@huawei.com, eranian@google.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Fix include of linux/mman.h Git-Commit-ID: 2f7db55579943cb7723e7567bd9b9927d3777d29 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: 2f7db55579943cb7723e7567bd9b9927d3777d29 Gitweb: http://git.kernel.org/tip/2f7db55579943cb7723e7567bd9b9927d3777d29 Author: Arnaldo Carvalho de Melo AuthorDate: Tue, 7 Feb 2017 16:15:21 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 8 Feb 2017 16:06:21 -0300 perf tools: Fix include of linux/mman.h It was using uapi/linux/mmap.h which caused for at least one reporter, that hasn't specified in what environment the problem manifests itself: ---- The original error is: In file included from util/event.c:2:0: ...tools/include/uapi/linux/mman.h:4:27: fatal error: uapi/asm/mman.h: No such file or directory #include ^ compilation terminated. ---- Test built it on these containers: # dm 1 alpine:3.4: Ok 2 android-ndk:r12b-arm: Ok 3 archlinux:latest: Ok 4 centos:5: Ok 5 centos:6: Ok 6 centos:7: Ok 7 debian:7: Ok 8 debian:8: Ok 9 debian:experimental: Ok 10 debian:experimental-x-arm64: Ok 11 debian:experimental-x-mips: Ok 12 debian:experimental-x-mips64: Ok 13 debian:experimental-x-mipsel: Ok 14 fedora:20: Ok 15 fedora:21: Ok 16 fedora:22: Ok 17 fedora:23: Ok 18 fedora:24: Ok 19 fedora:24-x-ARC-uClibc: Ok 20 fedora:25: Ok 21 fedora:rawhide: Ok 22 mageia:5: Ok 23 opensuse:13.2: Ok 24 opensuse:42.1: Ok 25 opensuse:tumbleweed: Ok 26 ubuntu:12.04.5: Ok 27 ubuntu:14.04.4-x-linaro-arm64: Ok 28 ubuntu:15.10: Ok 29 ubuntu:16.04: Ok 30 ubuntu:16.04-x-arm: Ok 31 ubuntu:16.04-x-arm64: Ok 32 ubuntu:16.04-x-powerpc: Ok 33 ubuntu:16.04-x-powerpc64: Ok 34 ubuntu:16.04-x-powerpc64el: Ok 35 ubuntu:16.04-x-s390: Ok 36 ubuntu:16.10: Ok Reported-by: David Carrillo-Cisneros Cc: Alexander Shishkin Cc: He Kuang Cc: Jiri Olsa Cc: Michal Marek Cc: Paul Turner Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Uwe Kleine-König Cc: Wang Nan Fixes: fbef103fad50 ("perf tools: Do hugetlb handling in more systems") Link: http://lkml.kernel.org/n/tip-4wm5xmjz5wgbq7ucyz4dyd72@git.kernel.org 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 8ab0d7d..4ea7ce7 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"