sync

4 files changed, 8 insertions, 31 deletions

diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index 2b46cda280b..5e200033463 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: init_sysent.c,v 1.189 2017/08/12 00:04:06 tedu Exp $	*/
+/*	$OpenBSD: init_sysent.c,v 1.190 2017/11/28 06:05:15 guenther Exp $	*/
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.177 2017/08/12 00:03:10 tedu Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.179 2017/11/28 06:03:41 guenther Exp 
  */
 
 #include <sys/param.h>
@@ -258,13 +258,8 @@ struct sysent sysent[] = {
 	    sys_sigsuspend },			/* 111 = sigsuspend */
 	{ 3, s(struct sys_sendsyslog_args), 0,
 	    sys_sendsyslog },			/* 112 = sendsyslog */
-#ifdef KTRACE
-	{ 4, s(struct sys_fktrace_args), 0,
-	    sys_fktrace },			/* 113 = fktrace */
-#else
 	{ 0, 0, 0,
 	    sys_nosys },			/* 113 = unimplemented fktrace */
-#endif
 	{ 0, 0, 0,
 	    sys_nosys },			/* 114 = obsolete osendmsg */
 	{ 0, 0, 0,
diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index 0bd41a89b71..668382aacd3 100644
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscalls.c,v 1.188 2017/08/12 00:04:06 tedu Exp $	*/
+/*	$OpenBSD: syscalls.c,v 1.189 2017/11/28 06:05:16 guenther Exp $	*/
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.177 2017/08/12 00:03:10 tedu Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.179 2017/11/28 06:03:41 guenther Exp 
  */
 
 char *syscallnames[] = {
@@ -133,11 +133,7 @@ char *syscallnames[] = {
 	"pselect",			/* 110 = pselect */
 	"sigsuspend",			/* 111 = sigsuspend */
 	"sendsyslog",			/* 112 = sendsyslog */
-#ifdef KTRACE
-	"fktrace",			/* 113 = fktrace */
-#else
 	"#113 (unimplemented fktrace)",		/* 113 = unimplemented fktrace */
-#endif
 	"#114 (obsolete osendmsg)",		/* 114 = obsolete osendmsg */
 	"#115 (obsolete vtrace)",		/* 115 = obsolete vtrace */
 	"#116 (obsolete t32_gettimeofday)",		/* 116 = obsolete t32_gettimeofday */
diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h
index efdb1c2d6f7..fa8c6652b9a 100644
--- a/sys/sys/syscall.h
+++ b/sys/sys/syscall.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscall.h,v 1.188 2017/09/25 23:00:33 espie Exp $	*/
+/*	$OpenBSD: syscall.h,v 1.189 2017/11/28 06:05:15 guenther Exp $	*/
 
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.177 2017/08/12 00:03:10 tedu Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.179 2017/11/28 06:03:41 guenther Exp 
  */
 
 /* syscall: "syscall" ret: "int" args: "int" "..." */
@@ -342,9 +342,6 @@
 /* syscall: "sendsyslog" ret: "int" args: "const char *" "size_t" "int" */
 #define	SYS_sendsyslog	112
 
-/* syscall: "fktrace" ret: "int" args: "int" "int" "int" "pid_t" */
-#define	SYS_fktrace	113
-
 				/* 114 is obsolete osendmsg */
 				/* 115 is obsolete vtrace */
 				/* 116 is obsolete t32_gettimeofday */
diff --git a/sys/sys/syscallargs.h b/sys/sys/syscallargs.h
index 2af8ebccc9b..09fc80bb2ee 100644
--- a/sys/sys/syscallargs.h
+++ b/sys/sys/syscallargs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscallargs.h,v 1.191 2017/09/25 23:00:33 espie Exp $	*/
+/*	$OpenBSD: syscallargs.h,v 1.192 2017/11/28 06:05:15 guenther Exp $	*/
 
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.177 2017/08/12 00:03:10 tedu Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.179 2017/11/28 06:03:41 guenther Exp 
  */
 
 #ifdef	syscallarg
@@ -568,13 +568,6 @@ struct sys_sendsyslog_args {
 	syscallarg(int) flags;
 };
 
-struct sys_fktrace_args {
-	syscallarg(int) fd;
-	syscallarg(int) ops;
-	syscallarg(int) facs;
-	syscallarg(pid_t) pid;
-};
-
 struct sys_getsockopt_args {
 	syscallarg(int) s;
 	syscallarg(int) level;
@@ -1226,10 +1219,6 @@ int	sys_ppoll(struct proc *, void *, register_t *);
 int	sys_pselect(struct proc *, void *, register_t *);
 int	sys_sigsuspend(struct proc *, void *, register_t *);
 int	sys_sendsyslog(struct proc *, void *, register_t *);
-#ifdef KTRACE
-int	sys_fktrace(struct proc *, void *, register_t *);
-#else
-#endif
 int	sys_getsockopt(struct proc *, void *, register_t *);
 int	sys_thrkill(struct proc *, void *, register_t *);
 int	sys_readv(struct proc *, void *, register_t *);