From 1338da056ec6f58dca819e6bb6ec315595cdb97b Mon Sep 17 00:00:00 2001 From: Nicolas Joly Date: Fri, 4 Apr 2008 12:38:53 +0000 Subject: [PATCH] Cleanup. Kill linux_sys_msync and use sys___msync13 instead. No functional changes expected. --- sys/compat/linux/arch/alpha/syscalls.master | 4 ++-- sys/compat/linux/arch/amd64/syscalls.master | 4 ++-- sys/compat/linux/arch/arm/syscalls.master | 4 ++-- sys/compat/linux/arch/i386/syscalls.master | 4 ++-- sys/compat/linux/arch/m68k/syscalls.master | 4 ++-- sys/compat/linux/arch/mips/syscalls.master | 4 ++-- sys/compat/linux/arch/powerpc/syscalls.master | 4 ++-- sys/compat/linux/common/linux_misc.c | 23 ++--------------------- 8 files changed, 16 insertions(+), 35 deletions(-) diff --git a/sys/compat/linux/arch/alpha/syscalls.master b/sys/compat/linux/arch/alpha/syscalls.master index 285385b327a..0bdbc7714be 100644 --- a/sys/compat/linux/arch/alpha/syscalls.master +++ b/sys/compat/linux/arch/alpha/syscalls.master @@ -1,4 +1,4 @@ - $NetBSD: syscalls.master,v 1.60 2007/12/21 22:26:20 njoly Exp $ + $NetBSD: syscalls.master,v 1.61 2007/12/24 14:17:17 njoly Exp $ ; ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 @@ -397,7 +397,7 @@ 214 UNIMPL 215 UNIMPL 216 UNIMPL -217 STD { int linux_sys_msync(void *addr, int len, int fl); } +217 NOARGS { int sys___msync13(void *addr, size_t len, int flags); } 218 UNIMPL 219 UNIMPL 220 UNIMPL diff --git a/sys/compat/linux/arch/amd64/syscalls.master b/sys/compat/linux/arch/amd64/syscalls.master index 7303a5bcc0b..bb21bbf8605 100644 --- a/sys/compat/linux/arch/amd64/syscalls.master +++ b/sys/compat/linux/arch/amd64/syscalls.master @@ -1,4 +1,4 @@ - $NetBSD: syscalls.master,v 1.21 2007/12/21 22:26:21 njoly Exp $ + $NetBSD: syscalls.master,v 1.22 2007/12/24 14:17:17 njoly Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 @@ -108,7 +108,7 @@ 24 STD { int linux_sys_sched_yield(void); } 25 STD { void *linux_sys_mremap(void *old_address, \ size_t old_size, size_t new_size, u_long flags); } -26 STD { int linux_sys_msync(void *addr, int len, int fl); } +26 NOARGS { int sys___msync13(void *addr, size_t len, int flags); } 27 NOARGS { int sys_mincore(void *addr, size_t len, char *vec); } 28 NOARGS { int sys_madvise(void *addr, size_t len, int behav); } #ifdef SYSVSHM diff --git a/sys/compat/linux/arch/arm/syscalls.master b/sys/compat/linux/arch/arm/syscalls.master index da4f027cd73..3777187cf92 100644 --- a/sys/compat/linux/arch/arm/syscalls.master +++ b/sys/compat/linux/arch/arm/syscalls.master @@ -1,4 +1,4 @@ - $NetBSD: syscalls.master,v 1.32 2007/12/24 14:17:17 njoly Exp $ + $NetBSD: syscalls.master,v 1.33 2008/01/15 22:38:34 njoly Exp $ ; Derived from sys/compat/linux/arch/*/syscalls.master ; and from Linux 2.4.12 arch/arm/kernel/calls.S @@ -250,7 +250,7 @@ fd_set *writefds, fd_set *exceptfds, \ struct timeval *timeout); } 143 NOARGS { int sys_flock(int fd, int how); } -144 STD { int linux_sys_msync(void *addr, int len, int fl); } +144 NOARGS { int sys___msync13(void *addr, size_t len, int flags); } 145 NOARGS { int sys_readv(int fd, struct iovec *iovp, \ u_int iovcnt); } 146 NOARGS { int sys_writev(int fd, struct iovec *iovp, \ diff --git a/sys/compat/linux/arch/i386/syscalls.master b/sys/compat/linux/arch/i386/syscalls.master index 6363d949541..45d69da68da 100644 --- a/sys/compat/linux/arch/i386/syscalls.master +++ b/sys/compat/linux/arch/i386/syscalls.master @@ -1,4 +1,4 @@ - $NetBSD: syscalls.master,v 1.88 2007/12/24 14:17:18 njoly Exp $ + $NetBSD: syscalls.master,v 1.89 2008/01/15 22:38:34 njoly Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 @@ -261,7 +261,7 @@ fd_set *writefds, fd_set *exceptfds, \ struct timeval *timeout); } 143 NOARGS { int sys_flock(int fd, int how); } -144 STD { int linux_sys_msync(void *addr, int len, int fl); } +144 NOARGS { int sys___msync13(void *addr, size_t len, int flags); } 145 NOARGS { int sys_readv(int fd, struct iovec *iovp, \ u_int iovcnt); } 146 NOARGS { int sys_writev(int fd, struct iovec *iovp, \ diff --git a/sys/compat/linux/arch/m68k/syscalls.master b/sys/compat/linux/arch/m68k/syscalls.master index 174cfd1ad90..09d87d12711 100644 --- a/sys/compat/linux/arch/m68k/syscalls.master +++ b/sys/compat/linux/arch/m68k/syscalls.master @@ -1,4 +1,4 @@ - $NetBSD: syscalls.master,v 1.58 2007/12/24 14:17:18 njoly Exp $ + $NetBSD: syscalls.master,v 1.59 2008/01/15 22:38:34 njoly Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 @@ -267,7 +267,7 @@ fd_set *writefds, fd_set *exceptfds, \ struct timeval *timeout); } 143 NOARGS { int sys_flock(int fd, int how); } -144 STD { int linux_sys_msync(void *addr, int len, int fl); } +144 NOARGS { int sys___msync13(void *addr, size_t len, int flags); } 145 NOARGS { int sys_readv(int fd, struct iovec *iovp, \ u_int iovcnt); } 146 NOARGS { int sys_writev(int fd, struct iovec *iovp, \ diff --git a/sys/compat/linux/arch/mips/syscalls.master b/sys/compat/linux/arch/mips/syscalls.master index 30a13f4b54d..3aedfe511f1 100644 --- a/sys/compat/linux/arch/mips/syscalls.master +++ b/sys/compat/linux/arch/mips/syscalls.master @@ -1,4 +1,4 @@ - $NetBSD: syscalls.master,v 1.26 2007/12/21 22:26:21 njoly Exp $ + $NetBSD: syscalls.master,v 1.27 2007/12/24 14:17:18 njoly Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 @@ -249,7 +249,7 @@ fd_set *writefds, fd_set *exceptfds, \ struct timeval *timeout); } 143 NOARGS { int sys_flock(int fd, int how); } -144 STD { int linux_sys_msync(void *addr, int len, int fl); } +144 NOARGS { int sys___msync13(void *addr, size_t len, int flags); } 145 NOARGS { int sys_readv(int fd, struct iovec *iovp, \ u_int iovcnt); } 146 NOARGS { int sys_writev(int fd, struct iovec *iovp, \ diff --git a/sys/compat/linux/arch/powerpc/syscalls.master b/sys/compat/linux/arch/powerpc/syscalls.master index 520c963b14e..13551698d31 100644 --- a/sys/compat/linux/arch/powerpc/syscalls.master +++ b/sys/compat/linux/arch/powerpc/syscalls.master @@ -1,4 +1,4 @@ - $NetBSD: syscalls.master,v 1.34 2007/12/21 22:26:22 njoly Exp $ + $NetBSD: syscalls.master,v 1.35 2007/12/24 14:17:18 njoly Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 @@ -278,7 +278,7 @@ fd_set *writefds, fd_set *exceptfds, \ struct timeval *timeout); } 143 NOARGS { int sys_flock(int fd, int how); } -144 STD { int linux_sys_msync(void *addr, int len, int fl); } +144 NOARGS { int sys___msync13(void *addr, size_t len, int flags); } 145 NOARGS { int sys_readv(int fd, struct iovec *iovp, \ u_int iovcnt); } 146 NOARGS { int sys_writev(int fd, struct iovec *iovp, \ diff --git a/sys/compat/linux/common/linux_misc.c b/sys/compat/linux/common/linux_misc.c index adb5f1e4be9..eef9382b9a9 100644 --- a/sys/compat/linux/common/linux_misc.c +++ b/sys/compat/linux/common/linux_misc.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_misc.c,v 1.193 2008/01/15 22:38:34 njoly Exp $ */ +/* $NetBSD: linux_misc.c,v 1.194 2008/03/21 21:54:58 ad Exp $ */ /*- * Copyright (c) 1995, 1998, 1999, 2008 The NetBSD Foundation, Inc. @@ -64,7 +64,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: linux_misc.c,v 1.193 2008/01/15 22:38:34 njoly Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_misc.c,v 1.194 2008/03/21 21:54:58 ad Exp $"); #if defined(_KERNEL_OPT) #include "opt_ptrace.h" @@ -550,25 +550,6 @@ done: } int -linux_sys_msync(struct lwp *l, const struct linux_sys_msync_args *uap, register_t *retval) -{ - /* { - syscallarg(void *) addr; - syscallarg(int) len; - syscallarg(int) fl; - } */ - - struct sys___msync13_args bma; - - /* flags are ignored */ - SCARG(&bma, addr) = SCARG(uap, addr); - SCARG(&bma, len) = SCARG(uap, len); - SCARG(&bma, flags) = SCARG(uap, fl); - - return sys___msync13(l, &bma, retval); -} - -int linux_sys_mprotect(struct lwp *l, const struct linux_sys_mprotect_args *uap, register_t *retval) { /* { -- 2.11.4.GIT