From 6cf3c2ef2fe1d21fab1ffdd0e73f62d692037eb1 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Sun, 11 Aug 2019 13:11:10 +0000 Subject: [PATCH] xlat: provide fallback definition for MAP_UNINITIALIZED Linux commit v5.3-rc1~65^2~86 fixed the definition of MAP_UNINITIALIZED flag that used to depend on CONFIG_MMAP_ALLOW_UNINITIALIZED. * xlat/mmap_flags.in (MAP_UNINITIALIZED): Add fallback definition. --- xlat/mmap_flags.in | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/xlat/mmap_flags.in b/xlat/mmap_flags.in index 5a592494..0fb82403 100644 --- a/xlat/mmap_flags.in +++ b/xlat/mmap_flags.in @@ -1,4 +1,4 @@ -/* Generated by maint/gen_xlat_defs.sh -f '#x' -p '_?MAP_' -c 'asm-generic/mman*.h' -a 'asm/mman.h' */ +/* Generated by maint/gen_xlat_defs.sh -f '#x' -p '_?MAP_' -c '[al]*/mman*.h' -a 'asm/mman.h' */ MAP_SHARED 0x1 @@ -151,9 +151,15 @@ MAP_HUGETLB 0x40000 MAP_SYNC 0x80000 -#if defined MAP_UNINITIALIZED && MAP_UNINITIALIZED > 0 -MAP_UNINITIALIZED -#endif +#if defined MAP_UNINITIALIZED && MAP_UNINITIALIZED == 0 /* MAP_UNINITIALIZED is special */ +/* Linux commit v5.3-rc1~65^2~86 fixed the definition of MAP_UNINITIALIZED */ +/* flag that used to depend on CONFIG_MMAP_ALLOW_UNINITIALIZED. */ +# ifndef STRACE_WORKAROUND_FOR_MAP_UNINITIALIZED +# define STRACE_WORKAROUND_FOR_MAP_UNINITIALIZED +# undef MAP_UNINITIALIZED +# endif /* STRACE_WORKAROUND_FOR_MAP_UNINITIALIZED */ +#endif /* MAP_UNINITIALIZED == 0 */ +MAP_UNINITIALIZED 0x4000000 #if defined __alpha__ MAP_FIXED_NOREPLACE 0x200000 -- 2.40.0