diff options
Diffstat (limited to 'meta-filesystems/recipes-utils/xfsprogs/files/0001-Check-for-MAP_SYNC-in-sys-mman.h.patch')
-rw-r--r-- | meta-filesystems/recipes-utils/xfsprogs/files/0001-Check-for-MAP_SYNC-in-sys-mman.h.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/meta-filesystems/recipes-utils/xfsprogs/files/0001-Check-for-MAP_SYNC-in-sys-mman.h.patch b/meta-filesystems/recipes-utils/xfsprogs/files/0001-Check-for-MAP_SYNC-in-sys-mman.h.patch new file mode 100644 index 000000000..75b227ac1 --- /dev/null +++ b/meta-filesystems/recipes-utils/xfsprogs/files/0001-Check-for-MAP_SYNC-in-sys-mman.h.patch | |||
@@ -0,0 +1,52 @@ | |||
1 | From f41ef1f06d428c81fcdef73d896dfc7ceda1809c Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 23 Aug 2018 04:59:39 +0000 | ||
4 | Subject: [PATCH] Check for MAP_SYNC in sys/mman.h | ||
5 | |||
6 | Not all arches have wired MAP_SYNC e.g. mips | ||
7 | which have conflicts with definition, so checking | ||
8 | a generic file is going to mis-configure xfsprogs | ||
9 | for such arches. | ||
10 | |||
11 | libc now has added the relevant macros to | ||
12 | sys/mman.h, and returns the right values for arches | ||
13 | where its implemented and nothing for others | ||
14 | unlike asm-generic/mman.h which only checks | ||
15 | for kernel headers and ignored arches | ||
16 | |||
17 | Upstream-Status: Pending | ||
18 | |||
19 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
20 | --- | ||
21 | include/linux.h | 3 +-- | ||
22 | m4/package_libcdev.m4 | 3 +-- | ||
23 | 2 files changed, 2 insertions(+), 4 deletions(-) | ||
24 | |||
25 | diff --git a/include/linux.h b/include/linux.h | ||
26 | index 1998941..7e5c9ab 100644 | ||
27 | --- a/include/linux.h | ||
28 | +++ b/include/linux.h | ||
29 | @@ -331,8 +331,7 @@ fsmap_advance( | ||
30 | #define MAP_SYNC 0 | ||
31 | #define MAP_SHARED_VALIDATE 0 | ||
32 | #else | ||
33 | -#include <asm-generic/mman.h> | ||
34 | -#include <asm-generic/mman-common.h> | ||
35 | +#include <sys/mman.h> | ||
36 | #endif /* HAVE_MAP_SYNC */ | ||
37 | |||
38 | #endif /* __XFS_LINUX_H__ */ | ||
39 | diff --git a/m4/package_libcdev.m4 b/m4/package_libcdev.m4 | ||
40 | index 0a6b514..2b47d2f 100644 | ||
41 | --- a/m4/package_libcdev.m4 | ||
42 | +++ b/m4/package_libcdev.m4 | ||
43 | @@ -335,8 +335,7 @@ AC_DEFUN([AC_HAVE_STATFS_FLAGS], | ||
44 | AC_DEFUN([AC_HAVE_MAP_SYNC], | ||
45 | [ AC_MSG_CHECKING([for MAP_SYNC]) | ||
46 | AC_TRY_COMPILE([ | ||
47 | -#include <asm-generic/mman.h> | ||
48 | -#include <asm-generic/mman-common.h> | ||
49 | +#include <sys/mman.h> | ||
50 | ], [ | ||
51 | int flags = MAP_SYNC | MAP_SHARED_VALIDATE; | ||
52 | ], have_map_sync=yes | ||