summaryrefslogtreecommitdiff
path: root/sys/kern
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2012-08-23 06:12:51 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2012-08-23 06:12:51 +0000
commitc343f2aa369b41128ae609328b467c51b9e65ef7 (patch)
treefa9596c3ceec58d3803447552752a15b46d5fd17 /sys/kern
parentb66f74bb17041ff405381b457300f30d75715e35 (diff)
kill nnpfs dead
Diffstat (limited to 'sys/kern')
-rw-r--r--sys/kern/syscalls.master7
-rw-r--r--sys/kern/vfs_init.c10
2 files changed, 3 insertions, 14 deletions
diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master
index 33b04db32ed..bd1217afaef 100644
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
@@ -1,4 +1,4 @@
-; $OpenBSD: syscalls.master,v 1.124 2012/06/21 00:56:59 guenther Exp $
+; $OpenBSD: syscalls.master,v 1.125 2012/08/23 06:12:49 deraadt Exp $
; $NetBSD: syscalls.master,v 1.32 1996/04/23 10:24:21 mycroft Exp $
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -41,7 +41,6 @@
#include <sys/syscallargs.h>
#include <sys/poll.h>
#include <sys/event.h>
-#include <nnpfs/nnpfs_pioctl.h>
; Reserved/unimplemented system calls in the range 0-150 inclusive
; are reserved for use in future Berkeley releases.
@@ -337,9 +336,7 @@
206 STD { int sys_futimes(int fd, \
const struct timeval *tptr); }
207 STD { pid_t sys_getpgid(pid_t pid); }
-208 STD { int sys_nnpfspioctl(int operation, char *a_pathP, \
- int a_opcode, struct ViceIoctl *a_paramsP, \
- int a_followSymlinks); }
+208 OBSOL nnpfspioctl
209 UNIMPL
;
; Syscalls 210-219 are reserved for dynamically loaded syscalls
diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c
index 63b626b9ce6..a37e98642e0 100644
--- a/sys/kern/vfs_init.c
+++ b/sys/kern/vfs_init.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vfs_init.c,v 1.29 2011/04/07 13:42:53 thib Exp $ */
+/* $OpenBSD: vfs_init.c,v 1.30 2012/08/23 06:12:49 deraadt Exp $ */
/* $NetBSD: vfs_init.c,v 1.6 1996/02/09 19:00:58 christos Exp $ */
/*
@@ -77,10 +77,6 @@ extern const struct vfsops cd9660_vfsops;
extern const struct vfsops ext2fs_vfsops;
#endif
-#ifdef NNPFS
-extern const struct vfsops nnpfs_vfsops;
-#endif
-
#ifdef NTFS
extern const struct vfsops ntfs_vfsops;
#endif
@@ -115,10 +111,6 @@ static struct vfsconf vfsconflist[] = {
{ &nfs_vfsops, MOUNT_NFS, 2, 0, 0, NULL },
#endif
-#ifdef NNPFS
- { &nnpfs_vfsops, MOUNT_NNPFS, 21, 0, 0, NULL },
-#endif
-
#ifdef PROCFS
{ &procfs_vfsops, MOUNT_PROCFS, 12, 0, 0, NULL },
#endif