From 61e7751eca16b3bbc16168c631f6cbcd28206ab2 Mon Sep 17 00:00:00 2001
From: Miod Vallat <miod@cvs.openbsd.org>
Date: Sat, 5 Jan 2008 00:36:14 +0000
Subject: 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@
---
 sys/kern/init_sysent.c   | 6 +++---
 sys/kern/syscalls.c      | 4 ++--
 sys/kern/syscalls.master | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'sys/kern')

diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index 5669a213d78..389a2d1700a 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: init_sysent.c,v 1.100 2007/11/28 13:48:31 deraadt Exp $	*/
+/*	$OpenBSD: init_sysent.c,v 1.101 2008/01/05 00:36:13 miod Exp $	*/
 
 /*
  * System call switch table.
@@ -214,8 +214,8 @@ struct sysent sysent[] = {
 	    sys_sstk },				/* 70 = sstk */
 	{ 6, s(struct compat_43_sys_mmap_args), 0,
 	    compat_43(sys_mmap) },		/* 71 = compat_43 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/kern/syscalls.c b/sys/kern/syscalls.c
index 0bf9c94c45e..05366f8374a 100644
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: syscalls.c,v 1.101 2007/11/28 13:48:31 deraadt Exp $	*/
+/*	$OpenBSD: syscalls.c,v 1.102 2008/01/05 00:36:13 miod Exp $	*/
 
 /*
  * System call names.
@@ -92,7 +92,7 @@ char *syscallnames[] = {
 	"sbrk",			/* 69 = sbrk */
 	"sstk",			/* 70 = sstk */
 	"compat_43_ommap",	/* 71 = compat_43 ommap */
-	"vadvise",			/* 72 = vadvise */
+	"#72 (obsolete vadvise)",		/* 72 = obsolete vadvise */
 	"munmap",			/* 73 = munmap */
 	"mprotect",			/* 74 = mprotect */
 	"madvise",			/* 75 = madvise */
diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master
index 137936b56e9..9611838bc9d 100644
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
@@ -1,4 +1,4 @@
-;	$OpenBSD: syscalls.master,v 1.88 2007/11/28 13:47:02 deraadt Exp $
+;	$OpenBSD: syscalls.master,v 1.89 2008/01/05 00:36:13 miod Exp $
 ;	$NetBSD: syscalls.master,v 1.32 1996/04/23 10:24:21 mycroft Exp $
 
 ;	@(#)syscalls.master	8.2 (Berkeley) 1/13/94
@@ -162,7 +162,7 @@
 70	STD		{ int sys_sstk(int incr); }
 71	COMPAT_43	{ int sys_mmap(caddr_t addr, size_t len, int prot, \
 			    int flags, int fd, long pos); } ommap
-72	STD		{ int sys_ovadvise(int anom); } vadvise
+72	OBSOL		vadvise
 73	STD		{ int sys_munmap(void *addr, size_t len); }
 74	STD		{ int sys_mprotect(void *addr, size_t len, \
 			    int prot); }
-- 
cgit v1.2.3