]>
Commit | Line | Data |
---|---|---|
7eda830b MT |
1 | From d2356ebb0084a0d80dbfe33040c9afe938c15d19 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Liska <mliska@suse.cz> | |
3 | Date: Mon, 11 Jul 2022 22:03:14 +0200 | |
4 | Subject: [PATCH] libsanitizer: cherry-pick 9cf13067cb5088626ba7 from upstream | |
5 | ||
6 | 9cf13067cb5088626ba7ee1ec4c42ec59c7995a0 [sanitizer] Remove #include <linux/fs.h> to resolve fsconfig_command/mount_attr conflict with glibc 2.36 | |
7 | ||
8 | (cherry picked from commit 2701442d0cf6292f6624443c15813d6d1a3562fe) | |
9 | --- | |
10 | .../sanitizer_platform_limits_posix.cpp | 10 ++++++---- | |
11 | 1 file changed, 6 insertions(+), 4 deletions(-) | |
12 | ||
13 | diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp | |
14 | index 025e575b5bc..5743516c046 100644 | |
15 | --- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp | |
16 | +++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp | |
17 | @@ -72,7 +72,9 @@ | |
18 | #include <sys/vt.h> | |
19 | #include <linux/cdrom.h> | |
20 | #include <linux/fd.h> | |
21 | +#if SANITIZER_ANDROID | |
22 | #include <linux/fs.h> | |
23 | +#endif | |
24 | #include <linux/hdreg.h> | |
25 | #include <linux/input.h> | |
26 | #include <linux/ioctl.h> | |
27 | @@ -828,10 +830,10 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); | |
28 | unsigned IOCTL_EVIOCGPROP = IOCTL_NOT_PRESENT; | |
29 | unsigned IOCTL_EVIOCSKEYCODE_V2 = IOCTL_NOT_PRESENT; | |
30 | #endif | |
31 | - unsigned IOCTL_FS_IOC_GETFLAGS = FS_IOC_GETFLAGS; | |
32 | - unsigned IOCTL_FS_IOC_GETVERSION = FS_IOC_GETVERSION; | |
33 | - unsigned IOCTL_FS_IOC_SETFLAGS = FS_IOC_SETFLAGS; | |
34 | - unsigned IOCTL_FS_IOC_SETVERSION = FS_IOC_SETVERSION; | |
35 | + unsigned IOCTL_FS_IOC_GETFLAGS = _IOR('f', 1, long); | |
36 | + unsigned IOCTL_FS_IOC_GETVERSION = _IOR('v', 1, long); | |
37 | + unsigned IOCTL_FS_IOC_SETFLAGS = _IOW('f', 2, long); | |
38 | + unsigned IOCTL_FS_IOC_SETVERSION = _IOW('v', 2, long); | |
39 | unsigned IOCTL_GIO_CMAP = GIO_CMAP; | |
40 | unsigned IOCTL_GIO_FONT = GIO_FONT; | |
41 | unsigned IOCTL_GIO_UNIMAP = GIO_UNIMAP; | |
42 | -- | |
43 | 2.30.2 | |
44 |