summaryrefslogtreecommitdiff
path: root/sys/compat/linux
diff options
context:
space:
mode:
authornjoly <njoly@NetBSD.org>2008-04-04 12:38:52 +0000
committernjoly <njoly@NetBSD.org>2008-04-04 12:38:52 +0000
commitdcde97da0ea324763f5969401a62c2e6e24344ae (patch)
tree8908bf2520d92820e8a35a025f4f725ef3819626 /sys/compat/linux
parent229f1dede15fe970eccf1f96a8dc769b7123e10c (diff)
Cleanup. Kill linux_sys_msync and use sys___msync13 instead.
No functional changes expected.
Diffstat (limited to 'sys/compat/linux')
-rw-r--r--sys/compat/linux/arch/alpha/syscalls.master4
-rw-r--r--sys/compat/linux/arch/amd64/syscalls.master4
-rw-r--r--sys/compat/linux/arch/arm/syscalls.master4
-rw-r--r--sys/compat/linux/arch/i386/syscalls.master4
-rw-r--r--sys/compat/linux/arch/m68k/syscalls.master4
-rw-r--r--sys/compat/linux/arch/mips/syscalls.master4
-rw-r--r--sys/compat/linux/arch/powerpc/syscalls.master4
-rw-r--r--sys/compat/linux/common/linux_misc.c23
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 b4486197dec..7d38e21e55a 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.61 2007/12/24 14:17:17 njoly Exp $
+ $NetBSD: syscalls.master,v 1.62 2008/04/04 12:38:52 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 445313eae7d..4f32da731d3 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.22 2007/12/24 14:17:17 njoly Exp $
+ $NetBSD: syscalls.master,v 1.23 2008/04/04 12:38:52 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 5c39a425fac..a70de9c665c 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.33 2008/01/15 22:38:34 njoly Exp $
+ $NetBSD: syscalls.master,v 1.34 2008/04/04 12:38:52 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 a8b9f0a67a2..f630e55f185 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.89 2008/01/15 22:38:34 njoly Exp $
+ $NetBSD: syscalls.master,v 1.90 2008/04/04 12:38:52 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 3e9b2dbae01..ebfe748b770 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.59 2008/01/15 22:38:34 njoly Exp $
+ $NetBSD: syscalls.master,v 1.60 2008/04/04 12:38:53 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 b46994531d9..97ed00d16c7 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.27 2007/12/24 14:17:18 njoly Exp $
+ $NetBSD: syscalls.master,v 1.28 2008/04/04 12:38:53 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 5f9cba9d982..97ae4d670a1 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.35 2007/12/24 14:17:18 njoly Exp $
+ $NetBSD: syscalls.master,v 1.36 2008/04/04 12:38:53 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 6abbf6b2860..85c46171636 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.194 2008/03/21 21:54:58 ad Exp $ */
+/* $NetBSD: linux_misc.c,v 1.195 2008/04/04 12:38:53 njoly Exp $ */
/*-
* Copyright (c) 1995, 1998, 1999, 2008 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_misc.c,v 1.194 2008/03/21 21:54:58 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_misc.c,v 1.195 2008/04/04 12:38:53 njoly 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)
{
/* {