From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753404AbdK2Glj (ORCPT ); Wed, 29 Nov 2017 01:41:39 -0500 Received: from terminus.zytor.com ([65.50.211.136]:47089 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751997AbdK2Glh (ORCPT ); Wed, 29 Nov 2017 01:41:37 -0500 Date: Tue, 28 Nov 2017 22:39:22 -0800 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: hpa@zytor.com, jolsa@kernel.org, jack@suse.cz, mingo@kernel.org, dsahern@gmail.com, linux-kernel@vger.kernel.org, acme@redhat.com, dan.j.williams@intel.com, adrian.hunter@intel.com, tglx@linutronix.de, namhyung@kernel.org, wangnan0@huawei.com Reply-To: linux-kernel@vger.kernel.org, jack@suse.cz, mingo@kernel.org, dsahern@gmail.com, hpa@zytor.com, jolsa@kernel.org, namhyung@kernel.org, wangnan0@huawei.com, adrian.hunter@intel.com, tglx@linutronix.de, dan.j.williams@intel.com, acme@redhat.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] tools headers: Syncronize mman.h ABI header Git-Commit-ID: 1b3b5219abfd6a214e99018747e9fe98514b43ca 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: 1b3b5219abfd6a214e99018747e9fe98514b43ca Gitweb: https://git.kernel.org/tip/1b3b5219abfd6a214e99018747e9fe98514b43ca Author: Arnaldo Carvalho de Melo AuthorDate: Mon, 27 Nov 2017 12:18:23 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 28 Nov 2017 14:31:56 -0300 tools headers: Syncronize mman.h ABI header To add support for the MAP_SYNC flag introduced in: b6fb293f2497 ("mm: Define MAP_SYNC and VM_SYNC flags") Update tools/perf/trace/beauty/mmap.c to support that flag. This silences this perf build warning: Warning: Kernel ABI header at 'tools/include/uapi/asm-generic/mman.h' differs from latest version at 'include/uapi/asm-generic/mman.h' Cc: Adrian Hunter Cc: Dan Williams Cc: David Ahern Cc: Jan Kara Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Link: https://lkml.kernel.org/n/tip-14zyk3iywrj37c7g1eagmzbo@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/include/uapi/asm-generic/mman.h | 1 + tools/perf/trace/beauty/mmap.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/tools/include/uapi/asm-generic/mman.h b/tools/include/uapi/asm-generic/mman.h index 2dffcbf..653687d 100644 --- a/tools/include/uapi/asm-generic/mman.h +++ b/tools/include/uapi/asm-generic/mman.h @@ -13,6 +13,7 @@ #define MAP_NONBLOCK 0x10000 /* do not block on IO */ #define MAP_STACK 0x20000 /* give out an address that is best suited for process/thread stacks */ #define MAP_HUGETLB 0x40000 /* create a huge page mapping */ +#define MAP_SYNC 0x80000 /* perform synchronous page faults for the mapping */ /* Bits [26:31] are reserved, see mman-common.h for MAP_HUGETLB usage */ diff --git a/tools/perf/trace/beauty/mmap.c b/tools/perf/trace/beauty/mmap.c index 9e1668b..417e3ec 100644 --- a/tools/perf/trace/beauty/mmap.c +++ b/tools/perf/trace/beauty/mmap.c @@ -62,6 +62,9 @@ static size_t syscall_arg__scnprintf_mmap_flags(char *bf, size_t size, P_MMAP_FLAG(POPULATE); P_MMAP_FLAG(STACK); P_MMAP_FLAG(UNINITIALIZED); +#ifdef MAP_SYNC + P_MMAP_FLAG(SYNC); +#endif #undef P_MMAP_FLAG if (flags)