summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2018-10-30 16:50:08 -0300
committerSeung-Woo Kim <sw0312.kim@samsung.com>2019-12-31 13:50:57 +0900
commit6aa1395d0d94eb1ba34154a9be80762ef108b043 (patch)
tree8094b0620367ea898ed98c5257dfa9d48ea3ec62
parent950ba572adebbbc492273fa8fa1d91c645b86e42 (diff)
downloadlinux-rpi3-6aa1395d0d94eb1ba34154a9be80762ef108b043.tar.gz
linux-rpi3-6aa1395d0d94eb1ba34154a9be80762ef108b043.tar.bz2
linux-rpi3-6aa1395d0d94eb1ba34154a9be80762ef108b043.zip
tools include uapi: Update linux/mmap.h copy
To pick up the changes from: 20916d4636a9 ("mm/hugetlb: add mmap() encodings for 32MB and 512MB page sizes") That do not entail changes in in tools, this just shows that we have to consider bits [26:31] of flags to beautify that in tools like 'perf trace' This silences this perf build warning: Warning: Kernel ABI header at 'tools/include/uapi/linux/mman.h' differs from latest version at 'include/uapi/linux/mman.h' diff -u tools/include/uapi/linux/mman.h include/uapi/linux/mman.h Cc: Anshuman Khandual <anshuman.khandual@arm.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Namhyung Kim <namhyung@kernel.org> Link: https://lkml.kernel.org/n/tip-3rvc39lon93kgt5pl31d8g4x@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> [sw0312.kim: cherry-pick mainline commit 685626dc26bd for perf build] Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com> Change-Id: Ifcded1bb028928b2d32c3c315c7bfa8cfd0a9d58
-rw-r--r--tools/include/uapi/linux/mman.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/include/uapi/linux/mman.h b/tools/include/uapi/linux/mman.h
index bfd5938fede6..d0f515d53299 100644
--- a/tools/include/uapi/linux/mman.h
+++ b/tools/include/uapi/linux/mman.h
@@ -28,7 +28,9 @@
#define MAP_HUGE_2MB HUGETLB_FLAG_ENCODE_2MB
#define MAP_HUGE_8MB HUGETLB_FLAG_ENCODE_8MB
#define MAP_HUGE_16MB HUGETLB_FLAG_ENCODE_16MB
+#define MAP_HUGE_32MB HUGETLB_FLAG_ENCODE_32MB
#define MAP_HUGE_256MB HUGETLB_FLAG_ENCODE_256MB
+#define MAP_HUGE_512MB HUGETLB_FLAG_ENCODE_512MB
#define MAP_HUGE_1GB HUGETLB_FLAG_ENCODE_1GB
#define MAP_HUGE_2GB HUGETLB_FLAG_ENCODE_2GB
#define MAP_HUGE_16GB HUGETLB_FLAG_ENCODE_16GB