You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
93 lines
3.8 KiB
93 lines
3.8 KiB
commit b38c9cdb58061d357cdf9bca4f6967d487becb82 |
|
Author: Florian Weimer <fweimer@redhat.com> |
|
Date: Wed May 4 15:37:21 2022 +0200 |
|
|
|
Linux: Define MMAP_CALL_INTERNAL |
|
|
|
Unlike MMAP_CALL, this avoids a TCB dependency for an errno update |
|
on failure. |
|
|
|
<mmap_internal.h> cannot be included as is on several architectures |
|
due to the definition of page_unit, so introduce a separate header |
|
file for the definition of MMAP_CALL and MMAP_CALL_INTERNAL, |
|
<mmap_call.h>. |
|
|
|
Reviewed-by: Stefan Liebler <stli@linux.ibm.com> |
|
(cherry picked from commit c1b68685d438373efe64e5f076f4215723004dfb) |
|
|
|
diff --git a/sysdeps/unix/sysv/linux/mmap_call.h b/sysdeps/unix/sysv/linux/mmap_call.h |
|
new file mode 100644 |
|
index 0000000000000000..3547c99e149e5064 |
|
--- /dev/null |
|
+++ b/sysdeps/unix/sysv/linux/mmap_call.h |
|
@@ -0,0 +1,22 @@ |
|
+/* Generic definition of MMAP_CALL and MMAP_CALL_INTERNAL. |
|
+ Copyright (C) 2017-2022 Free Software Foundation, Inc. |
|
+ This file is part of the GNU C Library. |
|
+ |
|
+ The GNU C Library is free software; you can redistribute it and/or |
|
+ modify it under the terms of the GNU Lesser General Public |
|
+ License as published by the Free Software Foundation; either |
|
+ version 2.1 of the License, or (at your option) any later version. |
|
+ |
|
+ The GNU C Library is distributed in the hope that it will be useful, |
|
+ but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
|
+ Lesser General Public License for more details. |
|
+ |
|
+ You should have received a copy of the GNU Lesser General Public |
|
+ License along with the GNU C Library; if not, see |
|
+ <https://www.gnu.org/licenses/>. */ |
|
+ |
|
+#define MMAP_CALL(__nr, __addr, __len, __prot, __flags, __fd, __offset) \ |
|
+ INLINE_SYSCALL_CALL (__nr, __addr, __len, __prot, __flags, __fd, __offset) |
|
+#define MMAP_CALL_INTERNAL(__nr, __addr, __len, __prot, __flags, __fd, __offset) \ |
|
+ INTERNAL_SYSCALL_CALL (__nr, __addr, __len, __prot, __flags, __fd, __offset) |
|
diff --git a/sysdeps/unix/sysv/linux/mmap_internal.h b/sysdeps/unix/sysv/linux/mmap_internal.h |
|
index 5ca6976191137f95..989eb0c7c6b57dc1 100644 |
|
--- a/sysdeps/unix/sysv/linux/mmap_internal.h |
|
+++ b/sysdeps/unix/sysv/linux/mmap_internal.h |
|
@@ -40,10 +40,6 @@ static uint64_t page_unit; |
|
/* Do not accept offset not multiple of page size. */ |
|
#define MMAP_OFF_LOW_MASK (MMAP2_PAGE_UNIT - 1) |
|
|
|
-/* An architecture may override this. */ |
|
-#ifndef MMAP_CALL |
|
-# define MMAP_CALL(__nr, __addr, __len, __prot, __flags, __fd, __offset) \ |
|
- INLINE_SYSCALL_CALL (__nr, __addr, __len, __prot, __flags, __fd, __offset) |
|
-#endif |
|
+#include <mmap_call.h> |
|
|
|
#endif /* MMAP_INTERNAL_LINUX_H */ |
|
diff --git a/sysdeps/unix/sysv/linux/s390/mmap_internal.h b/sysdeps/unix/sysv/linux/s390/mmap_call.h |
|
similarity index 78% |
|
rename from sysdeps/unix/sysv/linux/s390/mmap_internal.h |
|
rename to sysdeps/unix/sysv/linux/s390/mmap_call.h |
|
index 46f1c3769d6b586a..bdd30cc83764c2c1 100644 |
|
--- a/sysdeps/unix/sysv/linux/s390/mmap_internal.h |
|
+++ b/sysdeps/unix/sysv/linux/s390/mmap_call.h |
|
@@ -16,9 +16,6 @@ |
|
License along with the GNU C Library; if not, see |
|
<https://www.gnu.org/licenses/>. */ |
|
|
|
-#ifndef MMAP_S390_INTERNAL_H |
|
-# define MMAP_S390_INTERNAL_H |
|
- |
|
#define MMAP_CALL(__nr, __addr, __len, __prot, __flags, __fd, __offset) \ |
|
({ \ |
|
long int __args[6] = { (long int) (__addr), (long int) (__len), \ |
|
@@ -26,7 +23,10 @@ |
|
(long int) (__fd), (long int) (__offset) }; \ |
|
INLINE_SYSCALL_CALL (__nr, __args); \ |
|
}) |
|
- |
|
-#include_next <mmap_internal.h> |
|
- |
|
-#endif |
|
+#define MMAP_CALL_INTERNAL(__nr, __addr, __len, __prot, __flags, __fd, __offset) \ |
|
+ ({ \ |
|
+ long int __args[6] = { (long int) (__addr), (long int) (__len), \ |
|
+ (long int) (__prot), (long int) (__flags), \ |
|
+ (long int) (__fd), (long int) (__offset) }; \ |
|
+ INTERNAL_SYSCALL_CALL (__nr, __args); \ |
|
+ })
|
|
|