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@

23 files changed, 46 insertions, 57 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); }
diff --git a/sys/compat/freebsd/freebsd_syscall.h b/sys/compat/freebsd/freebsd_syscall.h
index 1e53c5ea547..6d7bf5eff69 100644
--- a/sys/compat/freebsd/freebsd_syscall.h
+++ b/sys/compat/freebsd/freebsd_syscall.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: freebsd_syscall.h,v 1.34 2007/11/28 13:48:31 deraadt Exp $	*/
+/*	$OpenBSD: freebsd_syscall.h,v 1.35 2008/01/05 00:36:13 miod Exp $	*/
 
 /*
  * System call numbers.
@@ -217,9 +217,7 @@
 /* syscall: "ommap" ret: "int" args: "caddr_t" "size_t" "int" "int" "int" "long" */
 #define	FREEBSD_SYS_ommap	71
 
-/* syscall: "vadvise" ret: "int" args: "int" */
-#define	FREEBSD_SYS_vadvise	72
-
+				/* 72 is obsolete vadvise */
 /* syscall: "munmap" ret: "int" args: "caddr_t" "size_t" */
 #define	FREEBSD_SYS_munmap	73
 
diff --git a/sys/compat/freebsd/freebsd_syscallargs.h b/sys/compat/freebsd/freebsd_syscallargs.h
index f8f2e31550a..edf28f87c89 100644
--- a/sys/compat/freebsd/freebsd_syscallargs.h
+++ b/sys/compat/freebsd/freebsd_syscallargs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: freebsd_syscallargs.h,v 1.36 2007/11/28 13:48:31 deraadt Exp $	*/
+/*	$OpenBSD: freebsd_syscallargs.h,v 1.37 2008/01/05 00:36:13 miod Exp $	*/
 
 /*
  * System call argument lists.
@@ -350,7 +350,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	freebsd_sys_madvise(struct proc *, void *, register_t *);
diff --git a/sys/compat/freebsd/freebsd_syscalls.c b/sys/compat/freebsd/freebsd_syscalls.c
index 404d03cbcc2..b390dc79f40 100644
--- a/sys/compat/freebsd/freebsd_syscalls.c
+++ b/sys/compat/freebsd/freebsd_syscalls.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: freebsd_syscalls.c,v 1.34 2007/11/28 13:48:31 deraadt Exp $	*/
+/*	$OpenBSD: freebsd_syscalls.c,v 1.35 2008/01/05 00:36:13 miod Exp $	*/
 
 /*
  * System call names.
@@ -92,7 +92,7 @@ char *freebsd_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/freebsd/freebsd_sysent.c b/sys/compat/freebsd/freebsd_sysent.c
index 27d0a1425b9..e90168ea487 100644
--- a/sys/compat/freebsd/freebsd_sysent.c
+++ b/sys/compat/freebsd/freebsd_sysent.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: freebsd_sysent.c,v 1.35 2007/11/28 13:48:31 deraadt Exp $	*/
+/*	$OpenBSD: freebsd_sysent.c,v 1.36 2008/01/05 00:36:13 miod Exp $	*/
 
 /*
  * System call switch table.
@@ -178,8 +178,8 @@ struct sysent freebsd_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/freebsd/syscalls.master b/sys/compat/freebsd/syscalls.master
index d7ef67eb5e9..bec6737eb5b 100644
--- a/sys/compat/freebsd/syscalls.master
+++ b/sys/compat/freebsd/syscalls.master
@@ -1,4 +1,4 @@
-	$OpenBSD: syscalls.master,v 1.32 2007/11/28 13:47:02 deraadt Exp $
+	$OpenBSD: syscalls.master,v 1.33 2008/01/05 00:36:13 miod Exp $
 ;	$NetBSD: syscalls.master,v 1.3 1995/10/10 18:28:40 mycroft Exp $
 
 ;	from: @(#)syscalls.master	8.2 (Berkeley) 1/13/94
@@ -158,7 +158,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); }
diff --git a/sys/compat/osf1/osf1_syscall.h b/sys/compat/osf1/osf1_syscall.h
index 0b006149cc7..48dde365750 100644
--- a/sys/compat/osf1/osf1_syscall.h
+++ b/sys/compat/osf1/osf1_syscall.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: osf1_syscall.h,v 1.12 2007/11/27 18:05:59 art Exp $	*/
+/*	$OpenBSD: osf1_syscall.h,v 1.13 2008/01/05 00:36:13 miod Exp $	*/
 
 /*
  * System call numbers.
@@ -164,6 +164,7 @@
 /* syscall: "mmap" ret: "caddr_t" args: "caddr_t" "size_t" "int" "int" "int" "off_t" */
 #define	OSF1_SYS_mmap	71
 
+				/* 72 is obsolete vadvise */
 /* syscall: "munmap" ret: "int" args: "caddr_t" "size_t" */
 #define	OSF1_SYS_munmap	73
 
diff --git a/sys/compat/osf1/osf1_sysent.c b/sys/compat/osf1/osf1_sysent.c
index de3752c0df4..2264fb25bda 100644
--- a/sys/compat/osf1/osf1_sysent.c
+++ b/sys/compat/osf1/osf1_sysent.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: osf1_sysent.c,v 1.12 2007/11/27 18:05:59 art Exp $	*/
+/*	$OpenBSD: osf1_sysent.c,v 1.13 2008/01/05 00:36:13 miod Exp $	*/
 
 /*
  * System call switch table.
@@ -169,7 +169,7 @@ struct sysent osf1_sysent[] = {
 	{ 6, s(struct osf1_sys_mmap_args), 0,
 	    osf1_sys_mmap },			/* 71 = mmap */
 	{ 0, 0, 0,
-	    sys_nosys },			/* 72 = unimplemented ovadvise */
+	    sys_nosys },			/* 72 = obsolete vadvise */
 	{ 2, s(struct sys_munmap_args), 0,
 	    sys_munmap },			/* 73 = munmap */
 	{ 3, s(struct osf1_sys_mprotect_args), 0,
diff --git a/sys/compat/osf1/syscalls.master b/sys/compat/osf1/syscalls.master
index 62c13fcae99..7d9720f630e 100644
--- a/sys/compat/osf1/syscalls.master
+++ b/sys/compat/osf1/syscalls.master
@@ -1,4 +1,4 @@
-	$OpenBSD: syscalls.master,v 1.10 2004/05/28 18:28:14 tedu Exp $
+	$OpenBSD: syscalls.master,v 1.11 2008/01/05 00:36:13 miod Exp $
 ;	$NetBSD: syscalls.master,v 1.29 1999/05/10 03:33:04 cgd Exp $
 
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
@@ -138,7 +138,7 @@
 70	UNIMPL		sstk
 71	STD		{ caddr_t osf1_sys_mmap(caddr_t addr, size_t len, \
 			    int prot, int flags, int fd, off_t pos); }
-72	UNIMPL		ovadvise
+72	OBSOL		vadvise
 73	NOARGS		{ int sys_munmap(caddr_t addr, size_t len); }
 74	STD		{ int osf1_sys_mprotect(void *addr, size_t len, \
 			    int prot); }
diff --git a/sys/compat/sunos/sunos_syscall.h b/sys/compat/sunos/sunos_syscall.h
index ccc310eb7d2..0f9b4d5a13f 100644
--- a/sys/compat/sunos/sunos_syscall.h
+++ b/sys/compat/sunos/sunos_syscall.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sunos_syscall.h,v 1.19 2007/11/27 18:05:59 art Exp $	*/
+/*	$OpenBSD: sunos_syscall.h,v 1.20 2008/01/05 00:36:13 miod Exp $	*/
 
 /*
  * System call numbers.
@@ -163,9 +163,7 @@
 /* syscall: "mmap" ret: "int" args: "caddr_t" "size_t" "int" "int" "int" "long" */
 #define	SUNOS_SYS_mmap	71
 
-/* syscall: "vadvise" ret: "int" args: "int" */
-#define	SUNOS_SYS_vadvise	72
-
+				/* 72 is obsolete vadvise */
 /* syscall: "munmap" ret: "int" args: "caddr_t" "size_t" */
 #define	SUNOS_SYS_munmap	73
 
diff --git a/sys/compat/sunos/sunos_syscallargs.h b/sys/compat/sunos/sunos_syscallargs.h
index 6eeaf94050d..19b6375f7b1 100644
--- a/sys/compat/sunos/sunos_syscallargs.h
+++ b/sys/compat/sunos/sunos_syscallargs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sunos_syscallargs.h,v 1.20 2007/11/27 18:05:59 art Exp $	*/
+/*	$OpenBSD: sunos_syscallargs.h,v 1.21 2008/01/05 00:36:13 miod Exp $	*/
 
 /*
  * System call argument lists.
@@ -283,7 +283,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	sunos_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/sunos/sunos_syscalls.c b/sys/compat/sunos/sunos_syscalls.c
index de80c97086e..5035388d1cc 100644
--- a/sys/compat/sunos/sunos_syscalls.c
+++ b/sys/compat/sunos/sunos_syscalls.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sunos_syscalls.c,v 1.19 2007/11/27 18:05:59 art Exp $	*/
+/*	$OpenBSD: sunos_syscalls.c,v 1.20 2008/01/05 00:36:13 miod Exp $	*/
 
 /*
  * System call names.
@@ -88,7 +88,7 @@ char *sunos_syscallnames[] = {
 	"sbrk",			/* 69 = sbrk */
 	"sstk",			/* 70 = sstk */
 	"mmap",			/* 71 = mmap */
-	"vadvise",			/* 72 = vadvise */
+	"#72 (obsolete vadvise)",		/* 72 = obsolete vadvise */
 	"munmap",			/* 73 = munmap */
 	"mprotect",			/* 74 = mprotect */
 	"madvise",			/* 75 = madvise */
diff --git a/sys/compat/sunos/sunos_sysent.c b/sys/compat/sunos/sunos_sysent.c
index 740d5d38b18..e2c4bc1a9d9 100644
--- a/sys/compat/sunos/sunos_sysent.c
+++ b/sys/compat/sunos/sunos_sysent.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sunos_sysent.c,v 1.19 2007/11/27 18:05:59 art Exp $	*/
+/*	$OpenBSD: sunos_sysent.c,v 1.20 2008/01/05 00:36:13 miod Exp $	*/
 
 /*
  * System call switch table.
@@ -173,8 +173,8 @@ struct sysent sunos_sysent[] = {
 	    sys_sstk },				/* 70 = sstk */
 	{ 6, s(struct sunos_sys_mmap_args), 0,
 	    sunos_sys_mmap },			/* 71 = mmap */
-	{ 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/sunos/syscalls.master b/sys/compat/sunos/syscalls.master
index 5415c656b63..08dc24dc39f 100644
--- a/sys/compat/sunos/syscalls.master
+++ b/sys/compat/sunos/syscalls.master
@@ -1,4 +1,4 @@
-	$OpenBSD: syscalls.master,v 1.16 2004/07/09 23:52:02 millert Exp $
+	$OpenBSD: syscalls.master,v 1.17 2008/01/05 00:36:13 miod Exp $
 ;	$NetBSD: syscalls.master,v 1.33 1996/02/28 16:05:43 pk Exp $
 
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
@@ -130,7 +130,7 @@
 70	NOARGS		{ int sys_sstk(int incr); }
 71	STD		{ int sunos_sys_mmap(caddr_t addr, size_t len, \
 			    int prot, int flags, int fd, long pos); }
-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); }
diff --git a/sys/compat/ultrix/syscalls.master b/sys/compat/ultrix/syscalls.master
index 784131c9927..703cda506c0 100644
--- a/sys/compat/ultrix/syscalls.master
+++ b/sys/compat/ultrix/syscalls.master
@@ -1,4 +1,4 @@
-	$OpenBSD: syscalls.master,v 1.11 2004/07/09 23:52:02 millert Exp $
+	$OpenBSD: syscalls.master,v 1.12 2008/01/05 00:36:13 miod Exp $
 ;	$NetBSD: syscalls.master,v 1.15 1996/01/07 13:38:57 jonathan Exp $
 
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
@@ -123,7 +123,7 @@
 70	NOARGS		{ int sys_sstk(int incr); }
 71	STD		{ int ultrix_sys_mmap(caddr_t addr, size_t len, \
 			    int prot, u_int flags, int fd, long pos); }
-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); }
diff --git a/sys/compat/ultrix/ultrix_syscall.h b/sys/compat/ultrix/ultrix_syscall.h
index 1405c21fcea..204bc2bb273 100644
--- a/sys/compat/ultrix/ultrix_syscall.h
+++ b/sys/compat/ultrix/ultrix_syscall.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ultrix_syscall.h,v 1.14 2007/11/27 18:05:59 art Exp $	*/
+/*	$OpenBSD: ultrix_syscall.h,v 1.15 2008/01/05 00:36:13 miod Exp $	*/
 
 /*
  * System call numbers.
@@ -160,9 +160,7 @@
 /* syscall: "mmap" ret: "int" args: "caddr_t" "size_t" "int" "u_int" "int" "long" */
 #define	ULTRIX_SYS_mmap	71
 
-/* syscall: "vadvise" ret: "int" args: "int" */
-#define	ULTRIX_SYS_vadvise	72
-
+				/* 72 is obsolete vadvise */
 /* syscall: "munmap" ret: "int" args: "caddr_t" "size_t" */
 #define	ULTRIX_SYS_munmap	73
 
diff --git a/sys/compat/ultrix/ultrix_syscallargs.h b/sys/compat/ultrix/ultrix_syscallargs.h
index 07c6ff48dcc..a808d790f13 100644
--- a/sys/compat/ultrix/ultrix_syscallargs.h
+++ b/sys/compat/ultrix/ultrix_syscallargs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ultrix_syscallargs.h,v 1.15 2007/11/27 18:05:59 art Exp $	*/
+/*	$OpenBSD: ultrix_syscallargs.h,v 1.16 2008/01/05 00:36:13 miod Exp $	*/
 
 /*
  * System call argument lists.
@@ -241,7 +241,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	ultrix_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/ultrix/ultrix_syscalls.c b/sys/compat/ultrix/ultrix_syscalls.c
index e081e1a6500..302dfedb3cb 100644
--- a/sys/compat/ultrix/ultrix_syscalls.c
+++ b/sys/compat/ultrix/ultrix_syscalls.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ultrix_syscalls.c,v 1.14 2007/11/27 18:05:59 art Exp $	*/
+/*	$OpenBSD: ultrix_syscalls.c,v 1.15 2008/01/05 00:36:13 miod Exp $	*/
 
 /*
  * System call names.
@@ -84,7 +84,7 @@ char *ultrix_syscallnames[] = {
 	"sbrk",			/* 69 = sbrk */
 	"sstk",			/* 70 = sstk */
 	"mmap",			/* 71 = mmap */
-	"vadvise",			/* 72 = vadvise */
+	"#72 (obsolete vadvise)",		/* 72 = obsolete vadvise */
 	"munmap",			/* 73 = munmap */
 	"mprotect",			/* 74 = mprotect */
 	"madvise",			/* 75 = madvise */
diff --git a/sys/compat/ultrix/ultrix_sysent.c b/sys/compat/ultrix/ultrix_sysent.c
index b7feb2757b2..836f7276be1 100644
--- a/sys/compat/ultrix/ultrix_sysent.c
+++ b/sys/compat/ultrix/ultrix_sysent.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ultrix_sysent.c,v 1.14 2007/11/27 18:05:59 art Exp $	*/
+/*	$OpenBSD: ultrix_sysent.c,v 1.15 2008/01/05 00:36:13 miod Exp $	*/
 
 /*
  * System call switch table.
@@ -166,8 +166,8 @@ struct sysent ultrix_sysent[] = {
 	    sys_sstk },				/* 70 = sstk */
 	{ 6, s(struct ultrix_sys_mmap_args), 0,
 	    ultrix_sys_mmap },			/* 71 = mmap */
-	{ 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,