summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/kern/init_sysent.c9
-rw-r--r--sys/kern/syscalls.c6
-rw-r--r--sys/sys/syscall.h8
-rw-r--r--sys/sys/syscallargs.h13
4 files changed, 12 insertions, 24 deletions
diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index ebafe0d25b5..448c45cdae5 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -1,10 +1,10 @@
-/* $OpenBSD: init_sysent.c,v 1.136 2012/06/21 00:57:59 guenther Exp $ */
+/* $OpenBSD: init_sysent.c,v 1.137 2012/08/23 06:13:02 deraadt Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from; OpenBSD: syscalls.master,v 1.124 2012/06/21 00:56:59 guenther Exp
+ * created from; OpenBSD: syscalls.master,v 1.125 2012/08/23 06:12:49 deraadt Exp
*/
#include <sys/param.h>
@@ -14,7 +14,6 @@
#include <sys/syscallargs.h>
#include <sys/poll.h>
#include <sys/event.h>
-#include <nnpfs/nnpfs_pioctl.h>
#ifdef COMPAT_O48
#define compat_o48(func) __CONCAT(compat_o48_,func)
@@ -467,8 +466,8 @@ struct sysent sysent[] = {
sys_futimes }, /* 206 = futimes */
{ 1, s(struct sys_getpgid_args), 0,
sys_getpgid }, /* 207 = getpgid */
- { 5, s(struct sys_nnpfspioctl_args), 0,
- sys_nnpfspioctl }, /* 208 = nnpfspioctl */
+ { 0, 0, 0,
+ sys_nosys }, /* 208 = obsolete nnpfspioctl */
{ 0, 0, 0,
sys_nosys }, /* 209 = unimplemented */
#ifdef LKM
diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index 76948ba5c25..8ebaf105f32 100644
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -1,10 +1,10 @@
-/* $OpenBSD: syscalls.c,v 1.137 2012/06/21 00:57:59 guenther Exp $ */
+/* $OpenBSD: syscalls.c,v 1.138 2012/08/23 06:13:02 deraadt Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from; OpenBSD: syscalls.master,v 1.124 2012/06/21 00:56:59 guenther Exp
+ * created from; OpenBSD: syscalls.master,v 1.125 2012/08/23 06:12:49 deraadt Exp
*/
char *syscallnames[] = {
@@ -232,7 +232,7 @@ char *syscallnames[] = {
"#205 (unimplemented sys_undelete)", /* 205 = unimplemented sys_undelete */
"futimes", /* 206 = futimes */
"getpgid", /* 207 = getpgid */
- "nnpfspioctl", /* 208 = nnpfspioctl */
+ "#208 (obsolete nnpfspioctl)", /* 208 = obsolete nnpfspioctl */
"#209 (unimplemented)", /* 209 = unimplemented */
#ifdef LKM
"lkmnosys", /* 210 = lkmnosys */
diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h
index ea25ac066e3..502180734fe 100644
--- a/sys/sys/syscall.h
+++ b/sys/sys/syscall.h
@@ -1,10 +1,10 @@
-/* $OpenBSD: syscall.h,v 1.136 2012/06/21 00:57:59 guenther Exp $ */
+/* $OpenBSD: syscall.h,v 1.137 2012/08/23 06:13:02 deraadt Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from; OpenBSD: syscalls.master,v 1.124 2012/06/21 00:56:59 guenther Exp
+ * created from; OpenBSD: syscalls.master,v 1.125 2012/08/23 06:12:49 deraadt Exp
*/
/* syscall: "syscall" ret: "int" args: "int" "..." */
@@ -446,9 +446,7 @@
/* syscall: "getpgid" ret: "pid_t" args: "pid_t" */
#define SYS_getpgid 207
-/* syscall: "nnpfspioctl" ret: "int" args: "int" "char *" "int" "struct ViceIoctl *" "int" */
-#define SYS_nnpfspioctl 208
-
+ /* 208 is obsolete nnpfspioctl */
/* syscall: "semget" ret: "int" args: "key_t" "int" "int" */
#define SYS_semget 221
diff --git a/sys/sys/syscallargs.h b/sys/sys/syscallargs.h
index 164ffb23216..4d703bfc48b 100644
--- a/sys/sys/syscallargs.h
+++ b/sys/sys/syscallargs.h
@@ -1,10 +1,10 @@
-/* $OpenBSD: syscallargs.h,v 1.138 2012/06/21 00:57:59 guenther Exp $ */
+/* $OpenBSD: syscallargs.h,v 1.139 2012/08/23 06:13:02 deraadt Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from; OpenBSD: syscalls.master,v 1.124 2012/06/21 00:56:59 guenther Exp
+ * created from; OpenBSD: syscalls.master,v 1.125 2012/08/23 06:12:49 deraadt Exp
*/
#ifdef syscallarg
@@ -635,14 +635,6 @@ struct sys_getpgid_args {
syscallarg(pid_t) pid;
};
-struct sys_nnpfspioctl_args {
- syscallarg(int) operation;
- syscallarg(char *) a_pathP;
- syscallarg(int) a_opcode;
- syscallarg(struct ViceIoctl *) a_paramsP;
- syscallarg(int) a_followSymlinks;
-};
-
struct sys_semget_args {
syscallarg(key_t) key;
syscallarg(int) nsems;
@@ -1173,7 +1165,6 @@ int sys_mlock(struct proc *, void *, register_t *);
int sys_munlock(struct proc *, void *, register_t *);
int sys_futimes(struct proc *, void *, register_t *);
int sys_getpgid(struct proc *, void *, register_t *);
-int sys_nnpfspioctl(struct proc *, void *, register_t *);
#ifdef LKM
int sys_lkmnosys(struct proc *, void *, register_t *);
int sys_lkmnosys(struct proc *, void *, register_t *);