From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S977779AbdDXVSi (ORCPT ); Mon, 24 Apr 2017 17:18:38 -0400 Received: from terminus.zytor.com ([65.50.211.136]:57163 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S976371AbdDXVS2 (ORCPT ); Mon, 24 Apr 2017 17:18:28 -0400 Date: Mon, 24 Apr 2017 14:16:11 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: viro@zeniv.linux.org.uk, acme@redhat.com, dhowells@redhat.com, wangnan0@huawei.com, jolsa@kernel.org, dsahern@gmail.com, mingo@kernel.org, adrian.hunter@intel.com, linux-kernel@vger.kernel.org, namhyung@kernel.org, hpa@zytor.com, tglx@linutronix.de Reply-To: viro@zeniv.linux.org.uk, dhowells@redhat.com, wangnan0@huawei.com, acme@redhat.com, jolsa@kernel.org, dsahern@gmail.com, namhyung@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, adrian.hunter@intel.com, tglx@linutronix.de, mingo@kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] tools: Update asm-generic/mman-common.h copy from the kernel Git-Commit-ID: 04ec75e0befbc60ff473ca1a593cad7501729526 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: 04ec75e0befbc60ff473ca1a593cad7501729526 Gitweb: http://git.kernel.org/tip/04ec75e0befbc60ff473ca1a593cad7501729526 Author: Arnaldo Carvalho de Melo AuthorDate: Tue, 25 Oct 2016 17:02:11 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 24 Apr 2017 13:43:35 -0300 tools: Update asm-generic/mman-common.h copy from the kernel To get the changes in the commit Fixes: 3209f68b3ca4 ("statx: Include a mask for stx_attributes in struct statx") Silencing this perf build warning: Warning: tools/include/uapi/linux/stat.h differs from kernel No need to change the statx syscall beautifiers in 'perf trace' at this time. Cc: Adrian Hunter Cc: Al Viro Cc: David Ahern Cc: David Howells Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-y8bgiyzuvura62lffvh1zbg9@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/include/uapi/linux/stat.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/include/uapi/linux/stat.h b/tools/include/uapi/linux/stat.h index 51a6b86..d538897 100644 --- a/tools/include/uapi/linux/stat.h +++ b/tools/include/uapi/linux/stat.h @@ -114,7 +114,7 @@ struct statx { __u64 stx_ino; /* Inode number */ __u64 stx_size; /* File size */ __u64 stx_blocks; /* Number of 512-byte blocks allocated */ - __u64 __spare1[1]; + __u64 stx_attributes_mask; /* Mask to show what's supported in stx_attributes */ /* 0x40 */ struct statx_timestamp stx_atime; /* Last access time */ struct statx_timestamp stx_btime; /* File creation time */ @@ -152,9 +152,10 @@ struct statx { #define STATX_BASIC_STATS 0x000007ffU /* The stuff in the normal stat struct */ #define STATX_BTIME 0x00000800U /* Want/got stx_btime */ #define STATX_ALL 0x00000fffU /* All currently supported flags */ +#define STATX__RESERVED 0x80000000U /* Reserved for future struct statx expansion */ /* - * Attributes to be found in stx_attributes + * Attributes to be found in stx_attributes and masked in stx_attributes_mask. * * These give information about the features or the state of a file that might * be of use to ordinary userspace programs such as GUIs or ls rather than