Skip to content

Commit 932f608

Browse files
heicarstMartin Schwidefsky
authored andcommitted
s390: wire up mlock2 system call
Passes mlock2-tests test case in 64 bit and compat mode. Signed-off-by: Heiko Carstens <[email protected]> Signed-off-by: Martin Schwidefsky <[email protected]>
1 parent ddfd4a0 commit 932f608

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

arch/s390/include/uapi/asm/unistd.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,8 @@
309309
#define __NR_recvfrom 371
310310
#define __NR_recvmsg 372
311311
#define __NR_shutdown 373
312-
#define NR_syscalls 374
312+
#define __NR_mlock2 374
313+
#define NR_syscalls 375
313314

314315
/*
315316
* There are some system calls that are not present on 64 bit, some

arch/s390/kernel/compat_wrapper.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,3 +176,4 @@ COMPAT_SYSCALL_WRAP4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
176176
COMPAT_SYSCALL_WRAP3(getsockname, int, fd, struct sockaddr __user *, usockaddr, int __user *, usockaddr_len);
177177
COMPAT_SYSCALL_WRAP3(getpeername, int, fd, struct sockaddr __user *, usockaddr, int __user *, usockaddr_len);
178178
COMPAT_SYSCALL_WRAP6(sendto, int, fd, void __user *, buff, size_t, len, unsigned int, flags, struct sockaddr __user *, addr, int, addr_len);
179+
COMPAT_SYSCALL_WRAP3(mlock2, unsigned long, start, size_t, len, int, flags);

arch/s390/kernel/syscalls.S

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -382,3 +382,4 @@ SYSCALL(sys_sendmsg,compat_sys_sendmsg) /* 370 */
382382
SYSCALL(sys_recvfrom,compat_sys_recvfrom)
383383
SYSCALL(sys_recvmsg,compat_sys_recvmsg)
384384
SYSCALL(sys_shutdown,sys_shutdown)
385+
SYSCALL(sys_mlock2,compat_sys_mlock2)

0 commit comments

Comments
 (0)