Mark vadvise(2) as obsolete and remove its implementation, so instead of

returning EINVAL, you'll get ENOSYS. No serious code has used this system
call in at least fifteen years.

The libc stub will be removed at the next major crank time.

ok henning@ deraadt@ krw@ toby@

5 files changed, 10 insertions, 13 deletions

diff --git a/sys/compat/bsdos/bsdos_syscall.h b/sys/compat/bsdos/bsdos_syscall.h
index 37bc98abef7..4d92ba8cacb 100644
--- a/sys/compat/bsdos/bsdos_syscall.h
+++ b/sys/compat/bsdos/bsdos_syscall.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bsdos_syscall.h,v 1.19 2007/11/27 18:05:59 art Exp $	*/
+/*	$OpenBSD: bsdos_syscall.h,v 1.20 2008/01/05 00:36:10 miod Exp $	*/
 
 /*
  * System call numbers.
@@ -217,9 +217,7 @@
 /* syscall: "ommap" ret: "int" args: "caddr_t" "size_t" "int" "int" "int" "long" */
 #define	BSDOS_SYS_ommap	71
 
-/* syscall: "vadvise" ret: "int" args: "int" */
-#define	BSDOS_SYS_vadvise	72
-
+				/* 72 is obsolete vadvise */
 /* syscall: "munmap" ret: "int" args: "caddr_t" "size_t" */
 #define	BSDOS_SYS_munmap	73
 
diff --git a/sys/compat/bsdos/bsdos_syscallargs.h b/sys/compat/bsdos/bsdos_syscallargs.h
index 2977b4cb46e..015d4659c4a 100644
--- a/sys/compat/bsdos/bsdos_syscallargs.h
+++ b/sys/compat/bsdos/bsdos_syscallargs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bsdos_syscallargs.h,v 1.20 2007/11/27 18:05:59 art Exp $	*/
+/*	$OpenBSD: bsdos_syscallargs.h,v 1.21 2008/01/05 00:36:10 miod Exp $	*/
 
 /*
  * System call argument lists.
@@ -111,7 +111,6 @@ int	sys_vfork(struct proc *, void *, register_t *);
 int	sys_sbrk(struct proc *, void *, register_t *);
 int	sys_sstk(struct proc *, void *, register_t *);
 int	compat_43_sys_mmap(struct proc *, void *, register_t *);
-int	sys_ovadvise(struct proc *, void *, register_t *);
 int	sys_munmap(struct proc *, void *, register_t *);
 int	sys_mprotect(struct proc *, void *, register_t *);
 int	sys_madvise(struct proc *, void *, register_t *);
diff --git a/sys/compat/bsdos/bsdos_syscalls.c b/sys/compat/bsdos/bsdos_syscalls.c
index 463db61b86c..cd7184e1fd5 100644
--- a/sys/compat/bsdos/bsdos_syscalls.c
+++ b/sys/compat/bsdos/bsdos_syscalls.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bsdos_syscalls.c,v 1.19 2007/11/27 18:05:59 art Exp $	*/
+/*	$OpenBSD: bsdos_syscalls.c,v 1.20 2008/01/05 00:36:11 miod Exp $	*/
 
 /*
  * System call names.
@@ -92,7 +92,7 @@ char *bsdos_syscallnames[] = {
 	"sbrk",			/* 69 = sbrk */
 	"sstk",			/* 70 = sstk */
 	"ommap",			/* 71 = ommap */
-	"vadvise",			/* 72 = vadvise */
+	"#72 (obsolete vadvise)",		/* 72 = obsolete vadvise */
 	"munmap",			/* 73 = munmap */
 	"mprotect",			/* 74 = mprotect */
 	"madvise",			/* 75 = madvise */
diff --git a/sys/compat/bsdos/bsdos_sysent.c b/sys/compat/bsdos/bsdos_sysent.c
index a653f8353d8..15076e64c88 100644
--- a/sys/compat/bsdos/bsdos_sysent.c
+++ b/sys/compat/bsdos/bsdos_sysent.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bsdos_sysent.c,v 1.19 2007/11/27 18:05:59 art Exp $	*/
+/*	$OpenBSD: bsdos_sysent.c,v 1.20 2008/01/05 00:36:11 miod Exp $	*/
 
 /*
  * System call switch table.
@@ -176,8 +176,8 @@ struct sysent bsdos_sysent[] = {
 	    sys_sstk },				/* 70 = sstk */
 	{ 6, s(struct compat_43_sys_mmap_args), 0,
 	    compat_43_sys_mmap },		/* 71 = ommap */
-	{ 1, s(struct sys_ovadvise_args), 0,
-	    sys_ovadvise },			/* 72 = vadvise */
+	{ 0, 0, 0,
+	    sys_nosys },			/* 72 = obsolete vadvise */
 	{ 2, s(struct sys_munmap_args), 0,
 	    sys_munmap },			/* 73 = munmap */
 	{ 3, s(struct sys_mprotect_args), 0,
diff --git a/sys/compat/bsdos/syscalls.master b/sys/compat/bsdos/syscalls.master
index a2dd6c5408a..0a73988e904 100644
--- a/sys/compat/bsdos/syscalls.master
+++ b/sys/compat/bsdos/syscalls.master
@@ -1,4 +1,4 @@
-	$OpenBSD: syscalls.master,v 1.17 2006/09/22 15:29:57 pedro Exp $
+	$OpenBSD: syscalls.master,v 1.18 2008/01/05 00:36:11 miod Exp $
 
 ; OpenBSD COMPAT_BSDOS system call name/number "master" file.
 ; (See syscalls.conf to see what it is processed into.)
@@ -148,7 +148,7 @@
 70	NOARGS		{ int sys_sstk(int incr); }
 71	NOARGS		{ int compat_43_sys_mmap(caddr_t addr, size_t len, \
 			    int prot, int flags, int fd, long pos); } ommap
-72	NOARGS		{ int sys_ovadvise(int anom); } vadvise
+72	OBSOL		vadvise
 73	NOARGS		{ int sys_munmap(caddr_t addr, size_t len); }
 74	NOARGS		{ int sys_mprotect(caddr_t addr, size_t len, \
 			    int prot); }