Commit 9274b888 authored Apr 14, 2020 by Arnaldo Carvalho de Melo Committed by Michael Bestas May 18, 2025

UPSTREAM: tools headers UAPI: Sync linux/mman.h with the kernel



To get the changes in:

  e346b3813067 ("mm/mremap: add MREMAP_DONTUNMAP to mremap()")

Add that to 'perf trace's mremap 'flags' decoder.

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: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Brian Geffon <bgeffon@google.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
(cherry picked from commit f60b3878f47311a61fe2d4c5ef77c52e31554c52)

Bug: 176847609
Signed-off-by: Kalesh Singh <kaleshsingh@google.com>
Change-Id: Iab7117411cf9c4c32356da2b3de598a0df299a7c

parent 33293c4d

tools/include/uapi/linux/mman.h

+3 −2

Original line number	Diff line number	Diff line
		@@ -7,6 +7,7 @@

		#define MREMAP_MAYMOVE 1
		#define MREMAP_FIXED 2
		#define MREMAP_DONTUNMAP 4

		#define OVERCOMMIT_GUESS 0
		#define OVERCOMMIT_ALWAYS 1

tools/perf/trace/beauty/mmap.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -69,6 +69,7 @@ static size_t syscall_arg__scnprintf_mremap_flags(char *bf, size_t size,

		P_MREMAP_FLAG(MAYMOVE);
		P_MREMAP_FLAG(FIXED);
		P_MREMAP_FLAG(DONTUNMAP);
		#undef P_MREMAP_FLAG

		if (flags)