summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/alpha/alpha/conf.c5
-rw-r--r--sys/arch/amd64/amd64/conf.c5
-rw-r--r--sys/arch/arm/arm/conf.c6
-rw-r--r--sys/arch/hppa/hppa/conf.c7
-rw-r--r--sys/arch/hppa64/hppa64/conf.c7
-rw-r--r--sys/arch/i386/i386/conf.c5
-rw-r--r--sys/arch/landisk/landisk/conf.c6
-rw-r--r--sys/arch/loongson/loongson/conf.c5
-rw-r--r--sys/arch/luna88k/luna88k/conf.c5
-rw-r--r--sys/arch/macppc/macppc/conf.c6
-rw-r--r--sys/arch/octeon/octeon/conf.c5
-rw-r--r--sys/arch/sgi/sgi/conf.c5
-rw-r--r--sys/arch/socppc/socppc/conf.c6
-rw-r--r--sys/arch/sparc/sparc/conf.c5
-rw-r--r--sys/arch/sparc64/sparc64/conf.c5
-rw-r--r--sys/conf/files8
16 files changed, 34 insertions, 57 deletions
diff --git a/sys/arch/alpha/alpha/conf.c b/sys/arch/alpha/alpha/conf.c
index f2635e3d0fa..dbdd31fcd54 100644
--- a/sys/arch/alpha/alpha/conf.c
+++ b/sys/arch/alpha/alpha/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.80 2016/02/26 09:10:04 natano Exp $ */
+/* $OpenBSD: conf.c,v 1.81 2016/04/25 20:09:14 tedu Exp $ */
/* $NetBSD: conf.c,v 1.16 1996/10/18 21:26:57 cgd Exp $ */
/*-
@@ -120,7 +120,6 @@ cdev_decl(cy);
cdev_decl(pci);
#endif
-#include "systrace.h"
#include "hotplug.h"
#include "vscsi.h"
#include "pppx.h"
@@ -178,7 +177,7 @@ struct cdevsw cdevsw[] =
cdev_ulpt_init(NULPT,ulpt), /* 47: USB printer */
cdev_usbdev_init(NUGEN,ugen), /* 48: USB generic driver */
cdev_tty_init(NUCOM, ucom), /* 49: USB tty */
- cdev_systrace_init(NSYSTRACE,systrace), /* 50 system call tracing */
+ cdev_notdef(), /* 50 */
cdev_notdef(), /* 51 */
#ifdef USER_PCICONF
cdev_pci_init(NPCI,pci), /* 52: PCI user */
diff --git a/sys/arch/amd64/amd64/conf.c b/sys/arch/amd64/amd64/conf.c
index 8fa9d1bbe0a..10091446bbd 100644
--- a/sys/arch/amd64/amd64/conf.c
+++ b/sys/arch/amd64/amd64/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.57 2016/02/26 09:10:04 natano Exp $ */
+/* $OpenBSD: conf.c,v 1.58 2016/04/25 20:09:14 tedu Exp $ */
/*
* Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved.
@@ -117,7 +117,6 @@ int nblkdev = nitems(bdevsw);
#define mmwrite mmrw
cdev_decl(mm);
cdev_decl(wd);
-#include "systrace.h"
#include "bio.h"
#include "pty.h"
#include "com.h"
@@ -277,7 +276,7 @@ struct cdevsw cdevsw[] =
cdev_notdef(),
cdev_radio_init(NRADIO, radio), /* 76: generic radio I/O */
cdev_notdef(), /* 77: was USB scanners */
- cdev_systrace_init(NSYSTRACE,systrace), /* 78: system call tracing */
+ cdev_notdef(), /* 78 */
cdev_bio_init(NBIO,bio), /* 79: ioctl tunnel */
cdev_notdef(), /* 80: gpr? XXX */
cdev_ptm_init(NPTY,ptm), /* 81: pseudo-tty ptm device */
diff --git a/sys/arch/arm/arm/conf.c b/sys/arch/arm/arm/conf.c
index 79957ff7cd0..a376e6c4429 100644
--- a/sys/arch/arm/arm/conf.c
+++ b/sys/arch/arm/arm/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.43 2016/02/26 09:10:04 natano Exp $ */
+/* $OpenBSD: conf.c,v 1.44 2016/04/25 20:09:14 tedu Exp $ */
/* $NetBSD: conf.c,v 1.10 2002/04/19 01:04:38 wiz Exp $ */
/*
@@ -253,8 +253,6 @@ struct bdevsw bdevsw[] = {
#define ptctty ptytty
#define ptcioctl ptyioctl
-#include "systrace.h"
-
#include "hotplug.h"
#include "vscsi.h"
#include "pppx.h"
@@ -323,7 +321,7 @@ struct cdevsw cdevsw[] = {
cdev_notdef(), /* 47: was: /dev/crypto */
cdev_notdef(), /* 48: reserved */
cdev_notdef(), /* 49: reserved */
- cdev_systrace_init(NSYSTRACE,systrace), /* 50: system call tracing */
+ cdev_notdef(), /* 50: reserved */
cdev_notdef(), /* 51: reserved */
cdev_bio_init(NBIO,bio), /* 52: ioctl tunnel */
cdev_notdef(), /* 53: reserved */
diff --git a/sys/arch/hppa/hppa/conf.c b/sys/arch/hppa/hppa/conf.c
index e51e89c6b35..9ef0253bc00 100644
--- a/sys/arch/hppa/hppa/conf.c
+++ b/sys/arch/hppa/hppa/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.63 2015/10/23 15:10:52 claudio Exp $ */
+/* $OpenBSD: conf.c,v 1.64 2016/04/25 20:09:14 tedu Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -100,7 +100,6 @@ cdev_decl(com);
#include "pf.h"
-#include "systrace.h"
#include "hotplug.h"
#include "vscsi.h"
#include "pppx.h"
@@ -157,9 +156,9 @@ struct cdevsw cdevsw[] =
#else
cdev_notdef(), /* 31: */
#endif
- cdev_notdef(),
+ cdev_notdef(), /* 32 */
cdev_video_init(NVIDEO,video), /* 33: generic video I/O */
- cdev_systrace_init(NSYSTRACE,systrace), /* 34: system call tracing */
+ cdev_notdef(), /* 34 */
cdev_audio_init(NAUDIO,audio), /* 35: /dev/audio */
cdev_notdef(), /* 36: was: /dev/crypto */
cdev_bio_init(NBIO,bio), /* 37: ioctl tunnel */
diff --git a/sys/arch/hppa64/hppa64/conf.c b/sys/arch/hppa64/hppa64/conf.c
index 174420bce6b..cee5e1b5246 100644
--- a/sys/arch/hppa64/hppa64/conf.c
+++ b/sys/arch/hppa64/hppa64/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.30 2015/10/23 15:10:52 claudio Exp $ */
+/* $OpenBSD: conf.c,v 1.31 2016/04/25 20:09:14 tedu Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -100,7 +100,6 @@ cdev_decl(com);
#include "pf.h"
-#include "systrace.h"
#include "hotplug.h"
#include "vscsi.h"
#include "pppx.h"
@@ -157,9 +156,9 @@ struct cdevsw cdevsw[] =
#else
cdev_notdef(), /* 31: */
#endif
- cdev_notdef(),
+ cdev_notdef(), /* 32 */
cdev_video_init(NVIDEO,video), /* 33: generic video I/O */
- cdev_systrace_init(NSYSTRACE,systrace), /* 34: system call tracing */
+ cdev_notdef(), /* 34 */
cdev_audio_init(NAUDIO,audio), /* 35: /dev/audio */
cdev_notdef(), /* 36: was: /dev/crypto */
cdev_bio_init(NBIO,bio), /* 37: ioctl tunnel */
diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c
index 75082038ecf..6f7b31f99fe 100644
--- a/sys/arch/i386/i386/conf.c
+++ b/sys/arch/i386/i386/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.154 2016/02/26 09:10:04 natano Exp $ */
+/* $OpenBSD: conf.c,v 1.155 2016/04/25 20:09:14 tedu Exp $ */
/* $NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $ */
/*
@@ -110,7 +110,6 @@ int nblkdev = nitems(bdevsw);
#define mmwrite mmrw
cdev_decl(mm);
cdev_decl(wd);
-#include "systrace.h"
#include "bio.h"
#include "pty.h"
#include "com.h"
@@ -271,7 +270,7 @@ struct cdevsw cdevsw[] =
cdev_notdef(),
cdev_radio_init(NRADIO, radio), /* 76: generic radio I/O */
cdev_notdef(), /* 77: was USB scanners */
- cdev_systrace_init(NSYSTRACE,systrace), /* 78: system call tracing */
+ cdev_notdef(), /* 78: */
cdev_bio_init(NBIO,bio), /* 79: ioctl tunnel */
cdev_ch_init(NGPR,gpr), /* 80: GPR400 SmartCard reader */
cdev_ptm_init(NPTY,ptm), /* 81: pseudo-tty ptm device */
diff --git a/sys/arch/landisk/landisk/conf.c b/sys/arch/landisk/landisk/conf.c
index 154ceae0adf..48ea972a282 100644
--- a/sys/arch/landisk/landisk/conf.c
+++ b/sys/arch/landisk/landisk/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.34 2016/03/05 17:16:33 tobiasu Exp $ */
+/* $OpenBSD: conf.c,v 1.35 2016/04/25 20:09:14 tedu Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -240,8 +240,6 @@ struct bdevsw bdevsw[] = {
#define ptctty ptytty
#define ptcioctl ptyioctl
-#include "systrace.h"
-
#include "hotplug.h"
#include "scif.h"
#include "vscsi.h"
@@ -299,7 +297,7 @@ struct cdevsw cdevsw[] = {
cdev_notdef(), /* 47: was /dev/crypto */
cdev_notdef(), /* 48: reserved */
cdev_notdef(), /* 49: reserved */
- cdev_systrace_init(NSYSTRACE,systrace), /* 50: system call tracing */
+ cdev_notdef(), /* 50: reserved */
cdev_notdef(), /* 51: reserved */
cdev_notdef(), /* 52: reserved */
cdev_notdef(), /* 53: reserved */
diff --git a/sys/arch/loongson/loongson/conf.c b/sys/arch/loongson/loongson/conf.c
index b81460ec77e..87bce553d57 100644
--- a/sys/arch/loongson/loongson/conf.c
+++ b/sys/arch/loongson/loongson/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.20 2015/10/23 15:10:52 claudio Exp $ */
+/* $OpenBSD: conf.c,v 1.21 2016/04/25 20:09:14 tedu Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -115,7 +115,6 @@ cdev_decl(wd);
cdev_decl(pci);
#include "pf.h"
-#include "systrace.h"
#include "usb.h"
#include "uhid.h"
@@ -183,7 +182,7 @@ struct cdevsw cdevsw[] =
cdev_notdef(), /* 47: was: /dev/crypto */
cdev_notdef(), /* 48: */
cdev_bio_init(NBIO,bio), /* 49: ioctl tunnel */
- cdev_systrace_init(NSYSTRACE,systrace), /* 50: system call tracing */
+ cdev_notdef(), /* 50: */
cdev_notdef(), /* 51: */
cdev_ptm_init(NPTY,ptm), /* 52: pseudo-tty ptm device */
cdev_notdef(), /* 53: */
diff --git a/sys/arch/luna88k/luna88k/conf.c b/sys/arch/luna88k/luna88k/conf.c
index 7b35998f008..b5e90357fa2 100644
--- a/sys/arch/luna88k/luna88k/conf.c
+++ b/sys/arch/luna88k/luna88k/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.27 2015/10/23 15:10:52 claudio Exp $ */
+/* $OpenBSD: conf.c,v 1.28 2016/04/25 20:09:14 tedu Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -67,7 +67,6 @@
#include "wsmux.h"
#include "pf.h"
-#include "systrace.h"
#include "vscsi.h"
#include "pppx.h"
#include "fuse.h"
@@ -150,7 +149,7 @@ struct cdevsw cdevsw[] =
cdev_notdef(), /* 47 */
cdev_notdef(), /* 48 */
cdev_bio_init(NBIO,bio), /* 49: ioctl tunnel */
- cdev_systrace_init(NSYSTRACE,systrace), /* 50 system call tracing */
+ cdev_notdef(), /* 50 */
cdev_notdef(), /* 51 */
cdev_ptm_init(NPTY,ptm), /* 52: pseudo-tty ptm device */
cdev_vscsi_init(NVSCSI,vscsi), /* 53: vscsi */
diff --git a/sys/arch/macppc/macppc/conf.c b/sys/arch/macppc/macppc/conf.c
index b8d76c46841..ebd45e0c206 100644
--- a/sys/arch/macppc/macppc/conf.c
+++ b/sys/arch/macppc/macppc/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.64 2016/02/26 09:10:05 natano Exp $ */
+/* $OpenBSD: conf.c,v 1.65 2016/04/25 20:09:14 tedu Exp $ */
/*
* Copyright (c) 1997 Per Fogelstrom
@@ -117,8 +117,6 @@ cdev_decl(pci);
#include "pf.h"
-#include "systrace.h"
-
#include "radio.h"
#include "bktr.h"
#include "hotplug.h"
@@ -179,7 +177,7 @@ struct cdevsw cdevsw[] = {
cdev_notdef(), /* 47: was: /dev/crypto */
cdev_notdef(), /* 48 */
cdev_notdef(), /* 49 */
- cdev_systrace_init(NSYSTRACE,systrace), /* 50 system call tracing */
+ cdev_notdef(), /* 50 */
cdev_notdef(), /* 51 */
cdev_midi_init(NMIDI,midi), /* 52: MIDI I/O */
cdev_notdef(), /* 53 was: sequencer I/O */
diff --git a/sys/arch/octeon/octeon/conf.c b/sys/arch/octeon/octeon/conf.c
index c1fbe887ed9..47de018405e 100644
--- a/sys/arch/octeon/octeon/conf.c
+++ b/sys/arch/octeon/octeon/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.16 2015/10/23 15:10:52 claudio Exp $ */
+/* $OpenBSD: conf.c,v 1.17 2016/04/25 20:09:14 tedu Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -130,7 +130,6 @@ cdev_decl(amdcf);
cdev_decl(pci);
#include "pf.h"
-#include "systrace.h"
#include "usb.h"
#include "uhid.h"
@@ -202,7 +201,7 @@ struct cdevsw cdevsw[] =
cdev_notdef(), /* 47: was: /dev/crypto */
cdev_notdef(), /* 48: */
cdev_bio_init(NBIO,bio), /* 49: ioctl tunnel */
- cdev_systrace_init(NSYSTRACE,systrace), /* 50: system call tracing */
+ cdev_notdef(), /* 50: */
cdev_notdef(), /* 51: */
cdev_ptm_init(NPTY,ptm), /* 52: pseudo-tty ptm device */
cdev_fuse_init(NFUSE,fuse), /* 53: fuse */
diff --git a/sys/arch/sgi/sgi/conf.c b/sys/arch/sgi/sgi/conf.c
index 9271185680f..891253c2d0e 100644
--- a/sys/arch/sgi/sgi/conf.c
+++ b/sys/arch/sgi/sgi/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.36 2015/10/23 15:10:52 claudio Exp $ */
+/* $OpenBSD: conf.c,v 1.37 2016/04/25 20:09:14 tedu Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -116,7 +116,6 @@ cdev_decl(wd);
cdev_decl(pci);
#include "pf.h"
-#include "systrace.h"
#include "usb.h"
#include "uhid.h"
@@ -184,7 +183,7 @@ struct cdevsw cdevsw[] =
cdev_notdef(), /* 47: was: /dev/crypto */
cdev_notdef(), /* 48: */
cdev_bio_init(NBIO,bio), /* 49: ioctl tunnel */
- cdev_systrace_init(NSYSTRACE,systrace), /* 50: system call tracing */
+ cdev_notdef(), /* 50: */
cdev_notdef(), /* 51: */
cdev_ptm_init(NPTY,ptm), /* 52: pseudo-tty ptm device */
cdev_notdef(), /* 53: */
diff --git a/sys/arch/socppc/socppc/conf.c b/sys/arch/socppc/socppc/conf.c
index 865cb64110a..aee8351b3bb 100644
--- a/sys/arch/socppc/socppc/conf.c
+++ b/sys/arch/socppc/socppc/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.25 2016/02/26 09:10:05 natano Exp $ */
+/* $OpenBSD: conf.c,v 1.26 2016/04/25 20:09:14 tedu Exp $ */
/*
* Copyright (c) 1997 Per Fogelstrom
@@ -96,8 +96,6 @@ cdev_decl(pci);
#include "pf.h"
-#include "systrace.h"
-
#include "ksyms.h"
#include "usb.h"
#include "uhid.h"
@@ -161,7 +159,7 @@ struct cdevsw cdevsw[] = {
cdev_notdef(), /* 47: was: /dev/crypto */
cdev_notdef(), /* 48 */
cdev_notdef(), /* 49 */
- cdev_systrace_init(NSYSTRACE,systrace), /* 50 system call tracing */
+ cdev_notdef(), /* 50 */
cdev_notdef(), /* 51 */
cdev_notdef(), /* 52 */
cdev_notdef(), /* 53 */
diff --git a/sys/arch/sparc/sparc/conf.c b/sys/arch/sparc/sparc/conf.c
index ca78ce25a52..6be2d464a70 100644
--- a/sys/arch/sparc/sparc/conf.c
+++ b/sys/arch/sparc/sparc/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.66 2016/02/26 09:10:05 natano Exp $ */
+/* $OpenBSD: conf.c,v 1.67 2016/04/25 20:09:14 tedu Exp $ */
/* $NetBSD: conf.c,v 1.40 1996/04/11 19:20:03 thorpej Exp $ */
/*
@@ -119,7 +119,6 @@ struct bdevsw bdevsw[] =
int nblkdev = nitems(bdevsw);
#include "pf.h"
-#include "systrace.h"
#include "tctrl.h"
#include "vscsi.h"
#include "pppx.h"
@@ -178,7 +177,7 @@ struct cdevsw cdevsw[] =
cdev_notdef(), /* 47 */
cdev_notdef(), /* 48 */
cdev_notdef(), /* 49 */
- cdev_systrace_init(NSYSTRACE,systrace), /* 50 system call tracing */
+ cdev_notdef(), /* 50 */
cdev_notdef(), /* 51 */
cdev_notdef(), /* 52 */
cdev_notdef(), /* 53 */
diff --git a/sys/arch/sparc64/sparc64/conf.c b/sys/arch/sparc64/sparc64/conf.c
index ae5f28e705e..b05cec2a8ec 100644
--- a/sys/arch/sparc64/sparc64/conf.c
+++ b/sys/arch/sparc64/sparc64/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.76 2016/02/26 09:10:05 natano Exp $ */
+/* $OpenBSD: conf.c,v 1.77 2016/04/25 20:09:14 tedu Exp $ */
/* $NetBSD: conf.c,v 1.17 2001/03/26 12:33:26 lukem Exp $ */
/*
@@ -111,7 +111,6 @@ cdev_decl(pci);
#include "ksyms.h"
-#include "systrace.h"
#include "hotplug.h"
#include "vscsi.h"
#include "pppx.h"
@@ -200,7 +199,7 @@ struct cdevsw cdevsw[] =
cdev_notdef(), /* 47 */
cdev_notdef(), /* 48 */
cdev_notdef(), /* 49 */
- cdev_systrace_init(NSYSTRACE,systrace), /* 50 system call tracing */
+ cdev_notdef(), /* 50 */
cdev_notdef(), /* 51 */
#ifdef USER_PCICONF
cdev_pci_init(NPCI,pci), /* 52: PCI user */
diff --git a/sys/conf/files b/sys/conf/files
index 048b557b6b7..d22604bc13b 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-# $OpenBSD: files,v 1.617 2016/04/19 10:12:36 mpi Exp $
+# $OpenBSD: files,v 1.618 2016/04/25 20:09:14 tedu Exp $
# $NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
@@ -59,7 +59,6 @@ define onewire_bitbang
# net device attributes - we have generic code for ether(net)
define crypto
-define systrace
define ether
define sppp
define wlan
@@ -550,8 +549,6 @@ pseudo-device vether: ifnet, ether
pseudo-device pppx: ifnet
pseudo-device vxlan: ifnet, ether, ifmedia
-pseudo-device systrace
-
pseudo-device ksyms
file dev/ksyms.c ksyms needs-flag
@@ -627,7 +624,6 @@ file dev/ic/tc921x.c tc921x
file dev/ic/pt2254a.c pt2254a
file dev/midi.c midi | midibus needs-flag
file dev/mulaw.c audio needs-flag
-file dev/systrace.c systrace needs-flag
file dev/vnd.c vnd needs-flag
file dev/rnd.c
file dev/video.c video needs-flag
@@ -699,7 +695,7 @@ file kern/subr_userconf.c boot_config
file kern/subr_xxx.c
file kern/sys_generic.c
file kern/sys_pipe.c
-file kern/sys_process.c ptrace | systrace
+file kern/sys_process.c ptrace
file kern/sys_socket.c
file kern/syscalls.c syscall_debug
file kern/sysv_ipc.c sysvshm | sysvsem | sysvmsg