klibc-bot for Ben Hutchings
2024-Oct-07  21:36 UTC
[klibc] [klibc:master] syscalls: Define mlock() etc. on all architectures
Commit-ID:  b0b8629919ddaa19149a4fae81fb459baf51eabb
Gitweb:    
http://git.kernel.org/?p=libs/klibc/klibc.git;a=commit;h=b0b8629919ddaa19149a4fae81fb459baf51eabb
Author:     Ben Hutchings <ben at decadent.org.uk>
AuthorDate: Tue, 1 Oct 2024 23:36:14 +0200
Committer:  Ben Hutchings <ben at decadent.org.uk>
CommitDate: Wed, 2 Oct 2024 02:07:27 +0200
[klibc] syscalls: Define mlock() etc. on all architectures
Due to an error in editing preprocessor conditionals long ago, the
m{,un}lock{,all}() system call wrappers are only generated on
architectures where we use mmap() and not mmap2().  Move the #endif to
the right place.
Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
---
 usr/klibc/SYSCALLS.def | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/usr/klibc/SYSCALLS.def b/usr/klibc/SYSCALLS.def
index ff32b2ed..65cf1c2e 100644
--- a/usr/klibc/SYSCALLS.def
+++ b/usr/klibc/SYSCALLS.def
@@ -219,15 +219,15 @@ int munmap(void *, size_t);
 void * mremap(void *, size_t, size_t, unsigned long);
 int msync(const void *, size_t, int);
 int mprotect(const void *, size_t, int);
-# if _KLIBC_USE_MMAP2
+#if _KLIBC_USE_MMAP2
 <!s390> void * mmap2::__mmap2(void *, size_t, int, int, int, long);
-# else
+#else
 <!s390x> void * mmap(void *, size_t, int, int, int, long);
+#endif
 int mlockall(int);
 int munlockall();
 int mlock(const void *, size_t);
 int munlock(const void *, size_t);
-#endif
 
 /*
  * System stuff