Skip to content

Commit

Permalink
tools headers UAPI: Sync linux/mman.h with the kernel
Browse files Browse the repository at this point in the history
To get the changes in:

  e346b38 ("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 <[email protected]>
Cc: Jiri Olsa <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Brian Geffon <[email protected]>
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
  • Loading branch information
acmel committed Apr 14, 2020
1 parent 027fa8f commit f60b387
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
5 changes: 3 additions & 2 deletions tools/include/uapi/linux/mman.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
#include <asm/mman.h>
#include <asm-generic/hugetlb_encode.h>

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

#define OVERCOMMIT_GUESS 0
#define OVERCOMMIT_ALWAYS 1
Expand Down
1 change: 1 addition & 0 deletions tools/perf/trace/beauty/mmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit f60b387

Please sign in to comment.