diff options
63 files changed, 135 insertions, 135 deletions
diff --git a/sys/alpha/alpha/machdep.c b/sys/alpha/alpha/machdep.c index c8f3d3390261..89195b78ebe2 100644 --- a/sys/alpha/alpha/machdep.c +++ b/sys/alpha/alpha/machdep.c @@ -199,7 +199,7 @@ int ncpus; /* number of cpus */ vm_offset_t phys_avail[10]; static int -sysctl_hw_physmem SYSCTL_HANDLER_ARGS +sysctl_hw_physmem (SYSCTL_HANDLER_ARGS) { int error = sysctl_handle_int(oidp, 0, alpha_ptob(physmem), req); return (error); @@ -209,7 +209,7 @@ SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_INT|CTLFLAG_RD, 0, 0, sysctl_hw_physmem, "I", ""); static int -sysctl_hw_usermem SYSCTL_HANDLER_ARGS +sysctl_hw_usermem (SYSCTL_HANDLER_ARGS) { int error = sysctl_handle_int(oidp, 0, alpha_ptob(physmem - cnt.v_wire_count), req); @@ -2011,7 +2011,7 @@ bad: } static int -sysctl_machdep_adjkerntz SYSCTL_HANDLER_ARGS +sysctl_machdep_adjkerntz (SYSCTL_HANDLER_ARGS) { int error; error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index ef6ac62ace2f..9da221133efc 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -156,7 +156,7 @@ int cold = 1; static void osendsig __P((sig_t catcher, int sig, sigset_t *mask, u_long code)); static int -sysctl_hw_physmem SYSCTL_HANDLER_ARGS +sysctl_hw_physmem (SYSCTL_HANDLER_ARGS) { int error = sysctl_handle_int(oidp, 0, ctob(physmem), req); return (error); @@ -166,7 +166,7 @@ SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_INT|CTLFLAG_RD, 0, 0, sysctl_hw_physmem, "I", ""); static int -sysctl_hw_usermem SYSCTL_HANDLER_ARGS +sysctl_hw_usermem (SYSCTL_HANDLER_ARGS) { int error = sysctl_handle_int(oidp, 0, ctob(physmem - cnt.v_wire_count), req); @@ -177,7 +177,7 @@ SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_INT|CTLFLAG_RD, 0, 0, sysctl_hw_usermem, "I", ""); static int -sysctl_hw_availpages SYSCTL_HANDLER_ARGS +sysctl_hw_availpages (SYSCTL_HANDLER_ARGS) { int error = sysctl_handle_int(oidp, 0, i386_btop(avail_end - avail_start), req); @@ -188,7 +188,7 @@ SYSCTL_PROC(_hw, OID_AUTO, availpages, CTLTYPE_INT|CTLFLAG_RD, 0, 0, sysctl_hw_availpages, "I", ""); static int -sysctl_machdep_msgbuf SYSCTL_HANDLER_ARGS +sysctl_machdep_msgbuf (SYSCTL_HANDLER_ARGS) { int error; @@ -211,7 +211,7 @@ SYSCTL_PROC(_machdep, OID_AUTO, msgbuf, CTLTYPE_STRING|CTLFLAG_RD, static int msgbuf_clear; static int -sysctl_machdep_msgbuf_clear SYSCTL_HANDLER_ARGS +sysctl_machdep_msgbuf_clear (SYSCTL_HANDLER_ARGS) { int error; error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, @@ -1078,7 +1078,7 @@ setregs(p, entry, stack, ps_strings) } static int -sysctl_machdep_adjkerntz SYSCTL_HANDLER_ARGS +sysctl_machdep_adjkerntz (SYSCTL_HANDLER_ARGS) { int error; error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, diff --git a/sys/amd64/amd64/prof_machdep.c b/sys/amd64/amd64/prof_machdep.c index d934ee56eee6..1262fbe39b18 100644 --- a/sys/amd64/amd64/prof_machdep.c +++ b/sys/amd64/amd64/prof_machdep.c @@ -232,7 +232,7 @@ cputime() } static int -sysctl_machdep_cputime_clock SYSCTL_HANDLER_ARGS +sysctl_machdep_cputime_clock (SYSCTL_HANDLER_ARGS) { int clock; int error; diff --git a/sys/amd64/amd64/tsc.c b/sys/amd64/amd64/tsc.c index b75f775077c6..40142842ed3a 100644 --- a/sys/amd64/amd64/tsc.c +++ b/sys/amd64/amd64/tsc.c @@ -1144,7 +1144,7 @@ setstatclockrate(int newhz) } static int -sysctl_machdep_i8254_freq SYSCTL_HANDLER_ARGS +sysctl_machdep_i8254_freq (SYSCTL_HANDLER_ARGS) { int error; u_int freq; @@ -1169,7 +1169,7 @@ SYSCTL_PROC(_machdep, OID_AUTO, i8254_freq, CTLTYPE_INT | CTLFLAG_RW, 0, sizeof(u_int), sysctl_machdep_i8254_freq, "I", ""); static int -sysctl_machdep_tsc_freq SYSCTL_HANDLER_ARGS +sysctl_machdep_tsc_freq (SYSCTL_HANDLER_ARGS) { int error; u_int freq; diff --git a/sys/amd64/isa/clock.c b/sys/amd64/isa/clock.c index b75f775077c6..40142842ed3a 100644 --- a/sys/amd64/isa/clock.c +++ b/sys/amd64/isa/clock.c @@ -1144,7 +1144,7 @@ setstatclockrate(int newhz) } static int -sysctl_machdep_i8254_freq SYSCTL_HANDLER_ARGS +sysctl_machdep_i8254_freq (SYSCTL_HANDLER_ARGS) { int error; u_int freq; @@ -1169,7 +1169,7 @@ SYSCTL_PROC(_machdep, OID_AUTO, i8254_freq, CTLTYPE_INT | CTLFLAG_RW, 0, sizeof(u_int), sysctl_machdep_i8254_freq, "I", ""); static int -sysctl_machdep_tsc_freq SYSCTL_HANDLER_ARGS +sysctl_machdep_tsc_freq (SYSCTL_HANDLER_ARGS) { int error; u_int freq; diff --git a/sys/compat/linux/linux_mib.c b/sys/compat/linux/linux_mib.c index a7ef8f01ca40..2be9334e0afe 100644 --- a/sys/compat/linux/linux_mib.c +++ b/sys/compat/linux/linux_mib.c @@ -51,7 +51,7 @@ SYSCTL_NODE(_compat, OID_AUTO, linux, CTLFLAG_RW, 0, static char linux_osname[LINUX_MAX_UTSNAME] = "Linux"; static int -linux_sysctl_osname SYSCTL_HANDLER_ARGS +linux_sysctl_osname (SYSCTL_HANDLER_ARGS) { char osname[LINUX_MAX_UTSNAME]; int error; @@ -72,7 +72,7 @@ SYSCTL_PROC(_compat_linux, OID_AUTO, osname, static char linux_osrelease[LINUX_MAX_UTSNAME] = "2.2.12"; static int -linux_sysctl_osrelease SYSCTL_HANDLER_ARGS +linux_sysctl_osrelease (SYSCTL_HANDLER_ARGS) { char osrelease[LINUX_MAX_UTSNAME]; int error; @@ -93,7 +93,7 @@ SYSCTL_PROC(_compat_linux, OID_AUTO, osrelease, static int linux_oss_version = 0x030600; static int -linux_sysctl_oss_version SYSCTL_HANDLER_ARGS +linux_sysctl_oss_version (SYSCTL_HANDLER_ARGS) { int oss_version; int error; diff --git a/sys/ddb/db_sysctl.c b/sys/ddb/db_sysctl.c index 5e067c259b59..af9039690ae7 100644 --- a/sys/ddb/db_sysctl.c +++ b/sys/ddb/db_sysctl.c @@ -51,7 +51,7 @@ #define MODE_GDB "gdb" static int -sysctl_debug_enter_debugger SYSCTL_HANDLER_ARGS +sysctl_debug_enter_debugger (SYSCTL_HANDLER_ARGS) { char dmode[64]; int error; diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c index 371208447f41..4b9aa69faecc 100644 --- a/sys/dev/ata/ata-all.c +++ b/sys/dev/ata/ata-all.c @@ -1615,7 +1615,7 @@ ata_change_mode(struct ata_softc *scp, int32_t device, int32_t mode) } static int -sysctl_hw_ata SYSCTL_HANDLER_ARGS +sysctl_hw_ata (SYSCTL_HANDLER_ARGS) { struct ata_softc *scp; int ctlr, error, i; diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c index 5fef0d92f387..50b32e39ec5d 100644 --- a/sys/dev/sio/sio.c +++ b/sys/dev/sio/sio.c @@ -459,7 +459,7 @@ static Port_t likely_esp_ports[] = { 0x140, 0x180, 0x280, 0 }; */ static int -sysctl_machdep_comdefaultrate SYSCTL_HANDLER_ARGS +sysctl_machdep_comdefaultrate (SYSCTL_HANDLER_ARGS) { int error, s; speed_t newspeed; diff --git a/sys/fs/nwfs/nwfs_node.c b/sys/fs/nwfs/nwfs_node.c index 25d92251d1d8..18b4556d93b4 100644 --- a/sys/fs/nwfs/nwfs_node.c +++ b/sys/fs/nwfs/nwfs_node.c @@ -66,7 +66,7 @@ static int nwhashlock = 0; MALLOC_DEFINE(M_NWNODE, "NWFS node", "NWFS vnode private part"); MALLOC_DEFINE(M_NWFSHASH, "NWFS hash", "NWFS has table"); -static int nwfs_sysctl_vnprint SYSCTL_HANDLER_ARGS; +static int nwfs_sysctl_vnprint (SYSCTL_HANDLER_ARGS); extern struct linker_set sysctl_vfs_nwfs; @@ -86,7 +86,7 @@ nwfs_hash_free(void) { } int -nwfs_sysctl_vnprint SYSCTL_HANDLER_ARGS { +nwfs_sysctl_vnprint (SYSCTL_HANDLER_ARGS) { struct nwnode *np; struct nwnode_hash_head *nhpp; struct vnode *vp; diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c index ef6ac62ace2f..9da221133efc 100644 --- a/sys/i386/i386/machdep.c +++ b/sys/i386/i386/machdep.c @@ -156,7 +156,7 @@ int cold = 1; static void osendsig __P((sig_t catcher, int sig, sigset_t *mask, u_long code)); static int -sysctl_hw_physmem SYSCTL_HANDLER_ARGS +sysctl_hw_physmem (SYSCTL_HANDLER_ARGS) { int error = sysctl_handle_int(oidp, 0, ctob(physmem), req); return (error); @@ -166,7 +166,7 @@ SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_INT|CTLFLAG_RD, 0, 0, sysctl_hw_physmem, "I", ""); static int -sysctl_hw_usermem SYSCTL_HANDLER_ARGS +sysctl_hw_usermem (SYSCTL_HANDLER_ARGS) { int error = sysctl_handle_int(oidp, 0, ctob(physmem - cnt.v_wire_count), req); @@ -177,7 +177,7 @@ SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_INT|CTLFLAG_RD, 0, 0, sysctl_hw_usermem, "I", ""); static int -sysctl_hw_availpages SYSCTL_HANDLER_ARGS +sysctl_hw_availpages (SYSCTL_HANDLER_ARGS) { int error = sysctl_handle_int(oidp, 0, i386_btop(avail_end - avail_start), req); @@ -188,7 +188,7 @@ SYSCTL_PROC(_hw, OID_AUTO, availpages, CTLTYPE_INT|CTLFLAG_RD, 0, 0, sysctl_hw_availpages, "I", ""); static int -sysctl_machdep_msgbuf SYSCTL_HANDLER_ARGS +sysctl_machdep_msgbuf (SYSCTL_HANDLER_ARGS) { int error; @@ -211,7 +211,7 @@ SYSCTL_PROC(_machdep, OID_AUTO, msgbuf, CTLTYPE_STRING|CTLFLAG_RD, static int msgbuf_clear; static int -sysctl_machdep_msgbuf_clear SYSCTL_HANDLER_ARGS +sysctl_machdep_msgbuf_clear (SYSCTL_HANDLER_ARGS) { int error; error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, @@ -1078,7 +1078,7 @@ setregs(p, entry, stack, ps_strings) } static int -sysctl_machdep_adjkerntz SYSCTL_HANDLER_ARGS +sysctl_machdep_adjkerntz (SYSCTL_HANDLER_ARGS) { int error; error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, diff --git a/sys/i386/i386/mp_clock.c b/sys/i386/i386/mp_clock.c index bd9c397d3f9d..d7e6af19705c 100644 --- a/sys/i386/i386/mp_clock.c +++ b/sys/i386/i386/mp_clock.c @@ -63,7 +63,7 @@ SYSCTL_OPAQUE(_debug, OID_AUTO, piix_timecounter, CTLFLAG_RD, &piix_timecounter, sizeof(piix_timecounter), "S,timecounter", ""); static int -sysctl_machdep_piix_freq SYSCTL_HANDLER_ARGS +sysctl_machdep_piix_freq (SYSCTL_HANDLER_ARGS) { int error; u_int freq; diff --git a/sys/i386/i386/tsc.c b/sys/i386/i386/tsc.c index b75f775077c6..40142842ed3a 100644 --- a/sys/i386/i386/tsc.c +++ b/sys/i386/i386/tsc.c @@ -1144,7 +1144,7 @@ setstatclockrate(int newhz) } static int -sysctl_machdep_i8254_freq SYSCTL_HANDLER_ARGS +sysctl_machdep_i8254_freq (SYSCTL_HANDLER_ARGS) { int error; u_int freq; @@ -1169,7 +1169,7 @@ SYSCTL_PROC(_machdep, OID_AUTO, i8254_freq, CTLTYPE_INT | CTLFLAG_RW, 0, sizeof(u_int), sysctl_machdep_i8254_freq, "I", ""); static int -sysctl_machdep_tsc_freq SYSCTL_HANDLER_ARGS +sysctl_machdep_tsc_freq (SYSCTL_HANDLER_ARGS) { int error; u_int freq; diff --git a/sys/i386/i386/userconfig.c b/sys/i386/i386/userconfig.c index 8ebad5d4c5c4..51455c5cdeec 100644 --- a/sys/i386/i386/userconfig.c +++ b/sys/i386/i386/userconfig.c @@ -136,7 +136,7 @@ static void free_devtab(void); static void save_resource(struct uc_device *); static int -sysctl_machdep_uc_devlist SYSCTL_HANDLER_ARGS +sysctl_machdep_uc_devlist (SYSCTL_HANDLER_ARGS) { struct uc_device *id; int error=0; @@ -2799,7 +2799,7 @@ set_device_disable(CmdParm *parms) #if NPNP > 0 static int -sysctl_machdep_uc_pnplist SYSCTL_HANDLER_ARGS +sysctl_machdep_uc_pnplist (SYSCTL_HANDLER_ARGS) { int error=0; diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c index b75f775077c6..40142842ed3a 100644 --- a/sys/i386/isa/clock.c +++ b/sys/i386/isa/clock.c @@ -1144,7 +1144,7 @@ setstatclockrate(int newhz) } static int -sysctl_machdep_i8254_freq SYSCTL_HANDLER_ARGS +sysctl_machdep_i8254_freq (SYSCTL_HANDLER_ARGS) { int error; u_int freq; @@ -1169,7 +1169,7 @@ SYSCTL_PROC(_machdep, OID_AUTO, i8254_freq, CTLTYPE_INT | CTLFLAG_RW, 0, sizeof(u_int), sysctl_machdep_i8254_freq, "I", ""); static int -sysctl_machdep_tsc_freq SYSCTL_HANDLER_ARGS +sysctl_machdep_tsc_freq (SYSCTL_HANDLER_ARGS) { int error; u_int freq; diff --git a/sys/i386/isa/prof_machdep.c b/sys/i386/isa/prof_machdep.c index d934ee56eee6..1262fbe39b18 100644 --- a/sys/i386/isa/prof_machdep.c +++ b/sys/i386/isa/prof_machdep.c @@ -232,7 +232,7 @@ cputime() } static int -sysctl_machdep_cputime_clock SYSCTL_HANDLER_ARGS +sysctl_machdep_cputime_clock (SYSCTL_HANDLER_ARGS) { int clock; int error; diff --git a/sys/i386/linux/linux_mib.c b/sys/i386/linux/linux_mib.c index a7ef8f01ca40..2be9334e0afe 100644 --- a/sys/i386/linux/linux_mib.c +++ b/sys/i386/linux/linux_mib.c @@ -51,7 +51,7 @@ SYSCTL_NODE(_compat, OID_AUTO, linux, CTLFLAG_RW, 0, static char linux_osname[LINUX_MAX_UTSNAME] = "Linux"; static int -linux_sysctl_osname SYSCTL_HANDLER_ARGS +linux_sysctl_osname (SYSCTL_HANDLER_ARGS) { char osname[LINUX_MAX_UTSNAME]; int error; @@ -72,7 +72,7 @@ SYSCTL_PROC(_compat_linux, OID_AUTO, osname, static char linux_osrelease[LINUX_MAX_UTSNAME] = "2.2.12"; static int -linux_sysctl_osrelease SYSCTL_HANDLER_ARGS +linux_sysctl_osrelease (SYSCTL_HANDLER_ARGS) { char osrelease[LINUX_MAX_UTSNAME]; int error; @@ -93,7 +93,7 @@ SYSCTL_PROC(_compat_linux, OID_AUTO, osrelease, static int linux_oss_version = 0x030600; static int -linux_sysctl_oss_version SYSCTL_HANDLER_ARGS +linux_sysctl_oss_version (SYSCTL_HANDLER_ARGS) { int oss_version; int error; diff --git a/sys/isa/atrtc.c b/sys/isa/atrtc.c index b75f775077c6..40142842ed3a 100644 --- a/sys/isa/atrtc.c +++ b/sys/isa/atrtc.c @@ -1144,7 +1144,7 @@ setstatclockrate(int newhz) } static int -sysctl_machdep_i8254_freq SYSCTL_HANDLER_ARGS +sysctl_machdep_i8254_freq (SYSCTL_HANDLER_ARGS) { int error; u_int freq; @@ -1169,7 +1169,7 @@ SYSCTL_PROC(_machdep, OID_AUTO, i8254_freq, CTLTYPE_INT | CTLFLAG_RW, 0, sizeof(u_int), sysctl_machdep_i8254_freq, "I", ""); static int -sysctl_machdep_tsc_freq SYSCTL_HANDLER_ARGS +sysctl_machdep_tsc_freq (SYSCTL_HANDLER_ARGS) { int error; u_int freq; diff --git a/sys/isa/sio.c b/sys/isa/sio.c index 5fef0d92f387..50b32e39ec5d 100644 --- a/sys/isa/sio.c +++ b/sys/isa/sio.c @@ -459,7 +459,7 @@ static Port_t likely_esp_ports[] = { 0x140, 0x180, 0x280, 0 }; */ static int -sysctl_machdep_comdefaultrate SYSCTL_HANDLER_ARGS +sysctl_machdep_comdefaultrate (SYSCTL_HANDLER_ARGS) { int error, s; speed_t newspeed; diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c index 791100bde396..b0524ab16472 100644 --- a/sys/kern/kern_clock.c +++ b/sys/kern/kern_clock.c @@ -413,7 +413,7 @@ statclock(frame) * Return information about system clocks. */ static int -sysctl_kern_clockrate SYSCTL_HANDLER_ARGS +sysctl_kern_clockrate (SYSCTL_HANDLER_ARGS) { struct clockinfo clkinfo; /* diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 89121ac2fdd9..6c4ea412f18c 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -1269,7 +1269,7 @@ dupfdopen(fdp, indx, dfd, mode, error) * Get file structures. */ static int -sysctl_kern_file SYSCTL_HANDLER_ARGS +sysctl_kern_file (SYSCTL_HANDLER_ARGS) { int error; struct file *fp; diff --git a/sys/kern/kern_environment.c b/sys/kern/kern_environment.c index 404aaa3cada4..a00a20b1c28e 100644 --- a/sys/kern/kern_environment.c +++ b/sys/kern/kern_environment.c @@ -102,7 +102,7 @@ getenv_quad(char *name, quad_t *data) } static int -sysctl_kernenv SYSCTL_HANDLER_ARGS +sysctl_kernenv (SYSCTL_HANDLER_ARGS) { int *name = (int *)arg1; u_int namelen = arg2; diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index 35aa1135042f..a83b7659cd08 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -154,7 +154,7 @@ static int nextpid = 0; static int randompid = 0; static int -sysctl_kern_randompid SYSCTL_HANDLER_ARGS +sysctl_kern_randompid (SYSCTL_HANDLER_ARGS) { int error, pid; diff --git a/sys/kern/kern_mib.c b/sys/kern/kern_mib.c index 35c70fb19b17..8f7dd0c41d85 100644 --- a/sys/kern/kern_mib.c +++ b/sys/kern/kern_mib.c @@ -142,7 +142,7 @@ SYSCTL_STRING(_hw, HW_MACHINE_ARCH, machine_arch, CTLFLAG_RD, char hostname[MAXHOSTNAMELEN]; static int -sysctl_hostname SYSCTL_HANDLER_ARGS +sysctl_hostname (SYSCTL_HANDLER_ARGS) { int error; @@ -165,7 +165,7 @@ SYSCTL_PROC(_kern, KERN_HOSTNAME, hostname, int securelevel = -1; static int -sysctl_kern_securelvl SYSCTL_HANDLER_ARGS +sysctl_kern_securelvl (SYSCTL_HANDLER_ARGS) { int error, level; diff --git a/sys/kern/kern_ntptime.c b/sys/kern/kern_ntptime.c index bfec5380d76e..c0163c0975df 100644 --- a/sys/kern/kern_ntptime.c +++ b/sys/kern/kern_ntptime.c @@ -198,7 +198,7 @@ static void hardupdate(long offset); * See the timex.h header file for synopsis and API description. */ static int -ntp_sysctl SYSCTL_HANDLER_ARGS +ntp_sysctl (SYSCTL_HANDLER_ARGS) { struct ntptimeval ntv; /* temporary structure */ struct timespec atv; /* nanosecond time */ diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 6cb35729b6f9..581aab791600 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -560,7 +560,7 @@ sysctl_out_proc(struct proc *p, struct sysctl_req *req, int doingzomb) } static int -sysctl_kern_proc SYSCTL_HANDLER_ARGS +sysctl_kern_proc (SYSCTL_HANDLER_ARGS) { int *name = (int*) arg1; u_int namelen = arg2; @@ -656,7 +656,7 @@ sysctl_kern_proc SYSCTL_HANDLER_ARGS * title to a string of its own choice. */ static int -sysctl_kern_proc_args SYSCTL_HANDLER_ARGS +sysctl_kern_proc_args (SYSCTL_HANDLER_ARGS) { int *name = (int*) arg1; u_int namelen = arg2; diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c index 18cd1a4fde7b..5057c3fa698f 100644 --- a/sys/kern/kern_shutdown.c +++ b/sys/kern/kern_shutdown.c @@ -437,7 +437,7 @@ dump_conf(dummy) SYSINIT(dump_conf, SI_SUB_DUMP_CONF, SI_ORDER_FIRST, dump_conf, NULL) static int -sysctl_kern_dumpdev SYSCTL_HANDLER_ARGS +sysctl_kern_dumpdev (SYSCTL_HANDLER_ARGS) { int error; udev_t ndumpdev; diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c index 0a8e17678a77..2d9ad3c7f6a7 100644 --- a/sys/kern/kern_synch.c +++ b/sys/kern/kern_synch.c @@ -76,7 +76,7 @@ static void schedcpu __P((void *arg)); static void updatepri __P((struct proc *p)); static int -sysctl_kern_quantum SYSCTL_HANDLER_ARGS +sysctl_kern_quantum (SYSCTL_HANDLER_ARGS) { int error, new_val; diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index 1da9a0b71c35..1ff0218fd543 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -63,7 +63,7 @@ static struct sysctl_lock { int sl_locked; } memlock; -static int sysctl_root SYSCTL_HANDLER_ARGS; +static int sysctl_root (SYSCTL_HANDLER_ARGS); struct sysctl_oid_list sysctl__children; /* root list */ @@ -203,7 +203,7 @@ sysctl_sysctl_debug_dump_node(struct sysctl_oid_list *l, int i) } static int -sysctl_sysctl_debug SYSCTL_HANDLER_ARGS +sysctl_sysctl_debug (SYSCTL_HANDLER_ARGS) { sysctl_sysctl_debug_dump_node(&sysctl__children, 0); return ENOENT; @@ -213,7 +213,7 @@ SYSCTL_PROC(_sysctl, 0, debug, CTLTYPE_STRING|CTLFLAG_RD, 0, 0, sysctl_sysctl_debug, "-", ""); static int -sysctl_sysctl_name SYSCTL_HANDLER_ARGS +sysctl_sysctl_name (SYSCTL_HANDLER_ARGS) { int *name = (int *) arg1; u_int namelen = arg2; @@ -323,7 +323,7 @@ sysctl_sysctl_next_ls (struct sysctl_oid_list *lsp, int *name, u_int namelen, } static int -sysctl_sysctl_next SYSCTL_HANDLER_ARGS +sysctl_sysctl_next (SYSCTL_HANDLER_ARGS) { int *name = (int *) arg1; u_int namelen = arg2; @@ -399,7 +399,7 @@ name2oid (char *name, int *oid, int *len, struct sysctl_oid **oidpp) } static int -sysctl_sysctl_name2oid SYSCTL_HANDLER_ARGS +sysctl_sysctl_name2oid (SYSCTL_HANDLER_ARGS) { char *p; int error, oid[CTL_MAXNAME], len; @@ -435,7 +435,7 @@ SYSCTL_PROC(_sysctl, 3, name2oid, CTLFLAG_RW|CTLFLAG_ANYBODY, 0, 0, sysctl_sysctl_name2oid, "I", ""); static int -sysctl_sysctl_oidfmt SYSCTL_HANDLER_ARGS +sysctl_sysctl_oidfmt (SYSCTL_HANDLER_ARGS) { struct sysctl_oid *oid; int error; @@ -468,7 +468,7 @@ SYSCTL_NODE(_sysctl, 4, oidfmt, CTLFLAG_RD, sysctl_sysctl_oidfmt, ""); */ int -sysctl_handle_int SYSCTL_HANDLER_ARGS +sysctl_handle_int (SYSCTL_HANDLER_ARGS) { int error = 0; @@ -492,7 +492,7 @@ sysctl_handle_int SYSCTL_HANDLER_ARGS */ int -sysctl_handle_long SYSCTL_HANDLER_ARGS +sysctl_handle_long (SYSCTL_HANDLER_ARGS) { int error = 0; @@ -515,7 +515,7 @@ sysctl_handle_long SYSCTL_HANDLER_ARGS */ int -sysctl_handle_string SYSCTL_HANDLER_ARGS +sysctl_handle_string (SYSCTL_HANDLER_ARGS) { int error=0; @@ -541,7 +541,7 @@ sysctl_handle_string SYSCTL_HANDLER_ARGS */ int -sysctl_handle_opaque SYSCTL_HANDLER_ARGS +sysctl_handle_opaque (SYSCTL_HANDLER_ARGS) { int error; @@ -736,7 +736,7 @@ sysctl_find_oid(int *name, u_int namelen, struct sysctl_oid **noid, */ int -sysctl_root SYSCTL_HANDLER_ARGS +sysctl_root (SYSCTL_HANDLER_ARGS) { struct sysctl_oid *oid; int error, indx; diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c index 23a6606b8d63..020e02304c18 100644 --- a/sys/kern/kern_tc.c +++ b/sys/kern/kern_tc.c @@ -402,7 +402,7 @@ tc_windup(void) } static int -sysctl_kern_timecounter_hardware SYSCTL_HANDLER_ARGS +sysctl_kern_timecounter_hardware (SYSCTL_HANDLER_ARGS) { char newname[32]; struct timecounter *newtc, *tc; diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index e6c6bcfeaa79..ec91ca92c40b 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -1097,7 +1097,7 @@ device_set_unit(device_t dev, int unit) SYSCTL_NODE(_hw, OID_AUTO, devices, CTLFLAG_RW, 0, "A list of all devices"); static int -sysctl_handle_children SYSCTL_HANDLER_ARGS +sysctl_handle_children (SYSCTL_HANDLER_ARGS) { device_t dev = arg1; device_t child; @@ -1123,7 +1123,7 @@ sysctl_handle_children SYSCTL_HANDLER_ARGS } static int -sysctl_handle_state SYSCTL_HANDLER_ARGS +sysctl_handle_state (SYSCTL_HANDLER_ARGS) { device_t dev = arg1; diff --git a/sys/kern/subr_devstat.c b/sys/kern/subr_devstat.c index fe14002aa0c0..921aabe1055b 100644 --- a/sys/kern/subr_devstat.c +++ b/sys/kern/subr_devstat.c @@ -261,7 +261,7 @@ devstat_end_transaction_bio(struct devstat *ds, struct bio *bp) * guarantee that the generation number and the statistics match up. */ static int -sysctl_devstat SYSCTL_HANDLER_ARGS +sysctl_devstat (SYSCTL_HANDLER_ARGS) { int error, i; struct devstat *nds; diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c index 01cfcf26b1c5..0dcf2654d2b5 100644 --- a/sys/kern/subr_disk.c +++ b/sys/kern/subr_disk.c @@ -116,7 +116,7 @@ disk_enumerate(struct disk *disk) } static int -sysctl_disks SYSCTL_HANDLER_ARGS +sysctl_disks (SYSCTL_HANDLER_ARGS) { struct disk *disk; int error, first; diff --git a/sys/kern/subr_prof.c b/sys/kern/subr_prof.c index 117f0309981a..e3fe859ec2e7 100644 --- a/sys/kern/subr_prof.c +++ b/sys/kern/subr_prof.c @@ -276,7 +276,7 @@ kmstartup(dummy) * Return kernel profiling information. */ static int -sysctl_kern_prof SYSCTL_HANDLER_ARGS +sysctl_kern_prof (SYSCTL_HANDLER_ARGS) { int *name = (int *) arg1; u_int namelen = arg2; diff --git a/sys/kern/tty.c b/sys/kern/tty.c index d69ae8394d15..5c6ecf3c6f76 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -2429,7 +2429,7 @@ ttyregister(tp) } static int -sysctl_kern_ttys SYSCTL_HANDLER_ARGS +sysctl_kern_ttys (SYSCTL_HANDLER_ARGS) { int error; struct tty *tp, t; diff --git a/sys/kern/tty_cons.c b/sys/kern/tty_cons.c index 080e1aa00fe7..7f9520034ef3 100644 --- a/sys/kern/tty_cons.c +++ b/sys/kern/tty_cons.c @@ -202,7 +202,7 @@ cnuninit(void) * This may require us to open or close the device in question. */ static int -sysctl_kern_consmute SYSCTL_HANDLER_ARGS +sysctl_kern_consmute (SYSCTL_HANDLER_ARGS) { int error; int ocn_mute; diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 38ac3b0d3ae3..9766c322762c 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -723,7 +723,7 @@ prison_unpcb(struct proc *p, struct unpcb *unp) } static int -unp_pcblist SYSCTL_HANDLER_ARGS +unp_pcblist (SYSCTL_HANDLER_ARGS) { int error, i, n; struct unpcb *unp, **unp_list; diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c index 2588464434e5..eaec53b5f2c9 100644 --- a/sys/kern/vfs_export.c +++ b/sys/kern/vfs_export.c @@ -2028,10 +2028,10 @@ DB_SHOW_COMMAND(lockedvnodes, lockedvnodes) /* * Top level filesystem related information gathering. */ -static int sysctl_ovfs_conf __P(SYSCTL_HANDLER_ARGS); +static int sysctl_ovfs_conf __P((SYSCTL_HANDLER_ARGS)); static int -vfs_sysctl SYSCTL_HANDLER_ARGS +vfs_sysctl (SYSCTL_HANDLER_ARGS) { int *name = (int *)arg1 - 1; /* XXX */ u_int namelen = arg2 + 1; /* XXX */ @@ -2081,7 +2081,7 @@ SYSCTL_NODE(_vfs, VFS_GENERIC, generic, CTLFLAG_RD, vfs_sysctl, #if 1 || defined(COMPAT_PRELITE2) static int -sysctl_ovfs_conf SYSCTL_HANDLER_ARGS +sysctl_ovfs_conf (SYSCTL_HANDLER_ARGS) { int error; struct vfsconf *vfsp; @@ -2110,7 +2110,7 @@ sysctl_ovfs_conf SYSCTL_HANDLER_ARGS */ /* ARGSUSED */ static int -sysctl_vnode SYSCTL_HANDLER_ARGS +sysctl_vnode (SYSCTL_HANDLER_ARGS) { struct proc *p = curproc; /* XXX */ struct mount *mp, *nmp; diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 2588464434e5..eaec53b5f2c9 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -2028,10 +2028,10 @@ DB_SHOW_COMMAND(lockedvnodes, lockedvnodes) /* * Top level filesystem related information gathering. */ -static int sysctl_ovfs_conf __P(SYSCTL_HANDLER_ARGS); +static int sysctl_ovfs_conf __P((SYSCTL_HANDLER_ARGS)); static int -vfs_sysctl SYSCTL_HANDLER_ARGS +vfs_sysctl (SYSCTL_HANDLER_ARGS) { int *name = (int *)arg1 - 1; /* XXX */ u_int namelen = arg2 + 1; /* XXX */ @@ -2081,7 +2081,7 @@ SYSCTL_NODE(_vfs, VFS_GENERIC, generic, CTLFLAG_RD, vfs_sysctl, #if 1 || defined(COMPAT_PRELITE2) static int -sysctl_ovfs_conf SYSCTL_HANDLER_ARGS +sysctl_ovfs_conf (SYSCTL_HANDLER_ARGS) { int error; struct vfsconf *vfsp; @@ -2110,7 +2110,7 @@ sysctl_ovfs_conf SYSCTL_HANDLER_ARGS */ /* ARGSUSED */ static int -sysctl_vnode SYSCTL_HANDLER_ARGS +sysctl_vnode (SYSCTL_HANDLER_ARGS) { struct proc *p = curproc; /* XXX */ struct mount *mp, *nmp; diff --git a/sys/net/bridge.c b/sys/net/bridge.c index 633b65afae20..b07c86038792 100644 --- a/sys/net/bridge.c +++ b/sys/net/bridge.c @@ -223,7 +223,7 @@ bdg_promisc_on() } static int -sysctl_bdg SYSCTL_HANDLER_ARGS +sysctl_bdg (SYSCTL_HANDLER_ARGS) { int error, oldval = do_bridge ; @@ -296,7 +296,7 @@ parse_bdg_cfg() } static int -sysctl_bdg_cfg SYSCTL_HANDLER_ARGS +sysctl_bdg_cfg (SYSCTL_HANDLER_ARGS) { int error = 0 ; char oldval[256] ; diff --git a/sys/net/if_mib.c b/sys/net/if_mib.c index a4489ca01e4e..ae957fdfe1c5 100644 --- a/sys/net/if_mib.c +++ b/sys/net/if_mib.c @@ -68,7 +68,7 @@ SYSCTL_INT(_net_link_generic_system, IFMIB_IFCOUNT, ifcount, CTLFLAG_RD, &if_index, 0, "Number of configured interfaces"); static int -sysctl_ifdata SYSCTL_HANDLER_ARGS /* XXX bad syntax! */ +sysctl_ifdata (SYSCTL_HANDLER_ARGS) /* XXX bad syntax! */ { int *name = (int *)arg1; int error, ifnlen; diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index e03eb61361a9..5f76a70d71fb 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -937,7 +937,7 @@ sysctl_iflist(af, w) } static int -sysctl_rtsock SYSCTL_HANDLER_ARGS +sysctl_rtsock (SYSCTL_HANDLER_ARGS) { int *name = (int *)arg1; u_int namelen = arg2; diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 6d7b23a5af66..9aa37215e269 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -95,7 +95,7 @@ int ipport_hilastauto = IPPORT_HILASTAUTO; /* 65535 */ else if ((var) > (max)) { (var) = (max); } static int -sysctl_net_ipport_check SYSCTL_HANDLER_ARGS +sysctl_net_ipport_check (SYSCTL_HANDLER_ARGS) { int error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req); diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index a3ddb2398b8c..5a61eb94df2d 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -568,7 +568,7 @@ rip_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *nam, } static int -rip_pcblist SYSCTL_HANDLER_ARGS +rip_pcblist (SYSCTL_HANDLER_ARGS) { int error, i, n, s; struct inpcb *inp, **inp_list; diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index e38a2a7bf452..92594b019d05 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -772,7 +772,7 @@ tcp_notify(inp, error) } static int -tcp_pcblist SYSCTL_HANDLER_ARGS +tcp_pcblist (SYSCTL_HANDLER_ARGS) { int error, i, n, s; struct inpcb *inp, **inp_list; @@ -864,7 +864,7 @@ SYSCTL_PROC(_net_inet_tcp, TCPCTL_PCBLIST, pcblist, CTLFLAG_RD, 0, 0, tcp_pcblist, "S,xtcpcb", "List of active TCP connections"); static int -tcp_getcred SYSCTL_HANDLER_ARGS +tcp_getcred (SYSCTL_HANDLER_ARGS) { struct sockaddr_in addrs[2]; struct inpcb *inp; @@ -894,7 +894,7 @@ SYSCTL_PROC(_net_inet_tcp, OID_AUTO, getcred, CTLTYPE_OPAQUE|CTLFLAG_RW, #ifdef INET6 static int -tcp6_getcred SYSCTL_HANDLER_ARGS +tcp6_getcred (SYSCTL_HANDLER_ARGS) { struct sockaddr_in6 addrs[2]; struct inpcb *inp; diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c index 1cf64fe2cb96..c927aee11c67 100644 --- a/sys/netinet/tcp_timer.c +++ b/sys/netinet/tcp_timer.c @@ -68,7 +68,7 @@ #endif static int -sysctl_msec_to_ticks SYSCTL_HANDLER_ARGS +sysctl_msec_to_ticks (SYSCTL_HANDLER_ARGS) { int error, s, tt; diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c index e38a2a7bf452..92594b019d05 100644 --- a/sys/netinet/tcp_timewait.c +++ b/sys/netinet/tcp_timewait.c @@ -772,7 +772,7 @@ tcp_notify(inp, error) } static int -tcp_pcblist SYSCTL_HANDLER_ARGS +tcp_pcblist (SYSCTL_HANDLER_ARGS) { int error, i, n, s; struct inpcb *inp, **inp_list; @@ -864,7 +864,7 @@ SYSCTL_PROC(_net_inet_tcp, TCPCTL_PCBLIST, pcblist, CTLFLAG_RD, 0, 0, tcp_pcblist, "S,xtcpcb", "List of active TCP connections"); static int -tcp_getcred SYSCTL_HANDLER_ARGS +tcp_getcred (SYSCTL_HANDLER_ARGS) { struct sockaddr_in addrs[2]; struct inpcb *inp; @@ -894,7 +894,7 @@ SYSCTL_PROC(_net_inet_tcp, OID_AUTO, getcred, CTLTYPE_OPAQUE|CTLFLAG_RW, #ifdef INET6 static int -tcp6_getcred SYSCTL_HANDLER_ARGS +tcp6_getcred (SYSCTL_HANDLER_ARGS) { struct sockaddr_in6 addrs[2]; struct inpcb *inp; diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index 3eac9ee1602d..d6f5f0ce4dfe 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -513,7 +513,7 @@ udp_ctlinput(cmd, sa, vip) } static int -udp_pcblist SYSCTL_HANDLER_ARGS +udp_pcblist (SYSCTL_HANDLER_ARGS) { int error, i, n, s; struct inpcb *inp, **inp_list; @@ -599,7 +599,7 @@ SYSCTL_PROC(_net_inet_udp, UDPCTL_PCBLIST, pcblist, CTLFLAG_RD, 0, 0, udp_pcblist, "S,xinpcb", "List of active UDP sockets"); static int -udp_getcred SYSCTL_HANDLER_ARGS +udp_getcred (SYSCTL_HANDLER_ARGS) { struct sockaddr_in addrs[2]; struct inpcb *inp; diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c index efe0aeabbc33..41706012b5ed 100644 --- a/sys/netinet6/in6_proto.c +++ b/sys/netinet6/in6_proto.c @@ -328,7 +328,7 @@ SYSCTL_NODE(_net_inet6, IPPROTO_ESP, ipsec6, CTLFLAG_RW, 0, "IPSEC6"); /* net.inet6.ip6 */ static int -sysctl_ip6_forwarding SYSCTL_HANDLER_ARGS +sysctl_ip6_forwarding (SYSCTL_HANDLER_ARGS) { int error = 0; int old_ip6_forwarding; diff --git a/sys/netinet6/udp6_usrreq.c b/sys/netinet6/udp6_usrreq.c index b42bc1817202..cbb7e1012be5 100644 --- a/sys/netinet6/udp6_usrreq.c +++ b/sys/netinet6/udp6_usrreq.c @@ -459,7 +459,7 @@ udp6_ctlinput(cmd, sa, d) } static int -udp6_getcred SYSCTL_HANDLER_ARGS +udp6_getcred (SYSCTL_HANDLER_ARGS) { struct sockaddr_in6 addrs[2]; struct inpcb *inp; diff --git a/sys/netncp/ncp_conn.c b/sys/netncp/ncp_conn.c index 026f2622ee59..0248d409b42e 100644 --- a/sys/netncp/ncp_conn.c +++ b/sys/netncp/ncp_conn.c @@ -57,7 +57,7 @@ struct ncp_handle_head lhlist={NULL}; static int ncp_next_handle = 1; static struct lock lhlock; -static int ncp_sysctl_connstat SYSCTL_HANDLER_ARGS; +static int ncp_sysctl_connstat (SYSCTL_HANDLER_ARGS); static int ncp_conn_lock_any(struct ncp_conn *conn, struct proc *p, struct ucred *cred); @@ -512,7 +512,7 @@ ncp_conn_getinfo(struct ncp_conn *ncp, struct ncp_conn_stat *ncs) { } static int -ncp_sysctl_connstat SYSCTL_HANDLER_ARGS { +ncp_sysctl_connstat (SYSCTL_HANDLER_ARGS) { int error; struct ncp_conn_stat ncs; struct ncp_conn *ncp; diff --git a/sys/nwfs/nwfs_node.c b/sys/nwfs/nwfs_node.c index 25d92251d1d8..18b4556d93b4 100644 --- a/sys/nwfs/nwfs_node.c +++ b/sys/nwfs/nwfs_node.c @@ -66,7 +66,7 @@ static int nwhashlock = 0; MALLOC_DEFINE(M_NWNODE, "NWFS node", "NWFS vnode private part"); MALLOC_DEFINE(M_NWFSHASH, "NWFS hash", "NWFS has table"); -static int nwfs_sysctl_vnprint SYSCTL_HANDLER_ARGS; +static int nwfs_sysctl_vnprint (SYSCTL_HANDLER_ARGS); extern struct linker_set sysctl_vfs_nwfs; @@ -86,7 +86,7 @@ nwfs_hash_free(void) { } int -nwfs_sysctl_vnprint SYSCTL_HANDLER_ARGS { +nwfs_sysctl_vnprint (SYSCTL_HANDLER_ARGS) { struct nwnode *np; struct nwnode_hash_head *nhpp; struct vnode *vp; diff --git a/sys/pc98/cbus/clock.c b/sys/pc98/cbus/clock.c index 7e2f75d14082..1dcde713d39d 100644 --- a/sys/pc98/cbus/clock.c +++ b/sys/pc98/cbus/clock.c @@ -1486,7 +1486,7 @@ setstatclockrate(int newhz) } static int -sysctl_machdep_i8254_freq SYSCTL_HANDLER_ARGS +sysctl_machdep_i8254_freq (SYSCTL_HANDLER_ARGS) { int error; u_int freq; @@ -1511,7 +1511,7 @@ SYSCTL_PROC(_machdep, OID_AUTO, i8254_freq, CTLTYPE_INT | CTLFLAG_RW, 0, sizeof(u_int), sysctl_machdep_i8254_freq, "I", ""); static int -sysctl_machdep_tsc_freq SYSCTL_HANDLER_ARGS +sysctl_machdep_tsc_freq (SYSCTL_HANDLER_ARGS) { int error; u_int freq; diff --git a/sys/pc98/cbus/pcrtc.c b/sys/pc98/cbus/pcrtc.c index 7e2f75d14082..1dcde713d39d 100644 --- a/sys/pc98/cbus/pcrtc.c +++ b/sys/pc98/cbus/pcrtc.c @@ -1486,7 +1486,7 @@ setstatclockrate(int newhz) } static int -sysctl_machdep_i8254_freq SYSCTL_HANDLER_ARGS +sysctl_machdep_i8254_freq (SYSCTL_HANDLER_ARGS) { int error; u_int freq; @@ -1511,7 +1511,7 @@ SYSCTL_PROC(_machdep, OID_AUTO, i8254_freq, CTLTYPE_INT | CTLFLAG_RW, 0, sizeof(u_int), sysctl_machdep_i8254_freq, "I", ""); static int -sysctl_machdep_tsc_freq SYSCTL_HANDLER_ARGS +sysctl_machdep_tsc_freq (SYSCTL_HANDLER_ARGS) { int error; u_int freq; diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c index cc9b11e82646..3f23590db164 100644 --- a/sys/pc98/cbus/sio.c +++ b/sys/pc98/cbus/sio.c @@ -878,7 +878,7 @@ static Port_t likely_esp_ports[] = { 0x140, 0x180, 0x280, 0 }; */ static int -sysctl_machdep_comdefaultrate SYSCTL_HANDLER_ARGS +sysctl_machdep_comdefaultrate (SYSCTL_HANDLER_ARGS) { int error, s; speed_t newspeed; diff --git a/sys/pc98/i386/machdep.c b/sys/pc98/i386/machdep.c index b8b4e7f6bdad..c4f78f321801 100644 --- a/sys/pc98/i386/machdep.c +++ b/sys/pc98/i386/machdep.c @@ -166,7 +166,7 @@ int cold = 1; static void osendsig __P((sig_t catcher, int sig, sigset_t *mask, u_long code)); static int -sysctl_hw_physmem SYSCTL_HANDLER_ARGS +sysctl_hw_physmem (SYSCTL_HANDLER_ARGS) { int error = sysctl_handle_int(oidp, 0, ctob(physmem), req); return (error); @@ -176,7 +176,7 @@ SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_INT|CTLFLAG_RD, 0, 0, sysctl_hw_physmem, "I", ""); static int -sysctl_hw_usermem SYSCTL_HANDLER_ARGS +sysctl_hw_usermem (SYSCTL_HANDLER_ARGS) { int error = sysctl_handle_int(oidp, 0, ctob(physmem - cnt.v_wire_count), req); @@ -187,7 +187,7 @@ SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_INT|CTLFLAG_RD, 0, 0, sysctl_hw_usermem, "I", ""); static int -sysctl_hw_availpages SYSCTL_HANDLER_ARGS +sysctl_hw_availpages (SYSCTL_HANDLER_ARGS) { int error = sysctl_handle_int(oidp, 0, i386_btop(avail_end - avail_start), req); @@ -198,7 +198,7 @@ SYSCTL_PROC(_hw, OID_AUTO, availpages, CTLTYPE_INT|CTLFLAG_RD, 0, 0, sysctl_hw_availpages, "I", ""); static int -sysctl_machdep_msgbuf SYSCTL_HANDLER_ARGS +sysctl_machdep_msgbuf (SYSCTL_HANDLER_ARGS) { int error; @@ -221,7 +221,7 @@ SYSCTL_PROC(_machdep, OID_AUTO, msgbuf, CTLTYPE_STRING|CTLFLAG_RD, static int msgbuf_clear; static int -sysctl_machdep_msgbuf_clear SYSCTL_HANDLER_ARGS +sysctl_machdep_msgbuf_clear (SYSCTL_HANDLER_ARGS) { int error; error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, @@ -1078,7 +1078,7 @@ setregs(p, entry, stack, ps_strings) } static int -sysctl_machdep_adjkerntz SYSCTL_HANDLER_ARGS +sysctl_machdep_adjkerntz (SYSCTL_HANDLER_ARGS) { int error; error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, diff --git a/sys/pc98/i386/userconfig.c b/sys/pc98/i386/userconfig.c index 1c86df294655..5bd3d99e80ca 100644 --- a/sys/pc98/i386/userconfig.c +++ b/sys/pc98/i386/userconfig.c @@ -140,7 +140,7 @@ static void free_devtab(void); static void save_resource(struct uc_device *); static int -sysctl_machdep_uc_devlist SYSCTL_HANDLER_ARGS +sysctl_machdep_uc_devlist (SYSCTL_HANDLER_ARGS) { struct uc_device *id; int error=0; @@ -2827,7 +2827,7 @@ set_device_disable(CmdParm *parms) #if NPNP > 0 static int -sysctl_machdep_uc_pnplist SYSCTL_HANDLER_ARGS +sysctl_machdep_uc_pnplist (SYSCTL_HANDLER_ARGS) { int error=0; diff --git a/sys/pc98/pc98/clock.c b/sys/pc98/pc98/clock.c index 7e2f75d14082..1dcde713d39d 100644 --- a/sys/pc98/pc98/clock.c +++ b/sys/pc98/pc98/clock.c @@ -1486,7 +1486,7 @@ setstatclockrate(int newhz) } static int -sysctl_machdep_i8254_freq SYSCTL_HANDLER_ARGS +sysctl_machdep_i8254_freq (SYSCTL_HANDLER_ARGS) { int error; u_int freq; @@ -1511,7 +1511,7 @@ SYSCTL_PROC(_machdep, OID_AUTO, i8254_freq, CTLTYPE_INT | CTLFLAG_RW, 0, sizeof(u_int), sysctl_machdep_i8254_freq, "I", ""); static int -sysctl_machdep_tsc_freq SYSCTL_HANDLER_ARGS +sysctl_machdep_tsc_freq (SYSCTL_HANDLER_ARGS) { int error; u_int freq; diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c index b8b4e7f6bdad..c4f78f321801 100644 --- a/sys/pc98/pc98/machdep.c +++ b/sys/pc98/pc98/machdep.c @@ -166,7 +166,7 @@ int cold = 1; static void osendsig __P((sig_t catcher, int sig, sigset_t *mask, u_long code)); static int -sysctl_hw_physmem SYSCTL_HANDLER_ARGS +sysctl_hw_physmem (SYSCTL_HANDLER_ARGS) { int error = sysctl_handle_int(oidp, 0, ctob(physmem), req); return (error); @@ -176,7 +176,7 @@ SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_INT|CTLFLAG_RD, 0, 0, sysctl_hw_physmem, "I", ""); static int -sysctl_hw_usermem SYSCTL_HANDLER_ARGS +sysctl_hw_usermem (SYSCTL_HANDLER_ARGS) { int error = sysctl_handle_int(oidp, 0, ctob(physmem - cnt.v_wire_count), req); @@ -187,7 +187,7 @@ SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_INT|CTLFLAG_RD, 0, 0, sysctl_hw_usermem, "I", ""); static int -sysctl_hw_availpages SYSCTL_HANDLER_ARGS +sysctl_hw_availpages (SYSCTL_HANDLER_ARGS) { int error = sysctl_handle_int(oidp, 0, i386_btop(avail_end - avail_start), req); @@ -198,7 +198,7 @@ SYSCTL_PROC(_hw, OID_AUTO, availpages, CTLTYPE_INT|CTLFLAG_RD, 0, 0, sysctl_hw_availpages, "I", ""); static int -sysctl_machdep_msgbuf SYSCTL_HANDLER_ARGS +sysctl_machdep_msgbuf (SYSCTL_HANDLER_ARGS) { int error; @@ -221,7 +221,7 @@ SYSCTL_PROC(_machdep, OID_AUTO, msgbuf, CTLTYPE_STRING|CTLFLAG_RD, static int msgbuf_clear; static int -sysctl_machdep_msgbuf_clear SYSCTL_HANDLER_ARGS +sysctl_machdep_msgbuf_clear (SYSCTL_HANDLER_ARGS) { int error; error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, @@ -1078,7 +1078,7 @@ setregs(p, entry, stack, ps_strings) } static int -sysctl_machdep_adjkerntz SYSCTL_HANDLER_ARGS +sysctl_machdep_adjkerntz (SYSCTL_HANDLER_ARGS) { int error; error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, diff --git a/sys/pc98/pc98/sio.c b/sys/pc98/pc98/sio.c index cc9b11e82646..3f23590db164 100644 --- a/sys/pc98/pc98/sio.c +++ b/sys/pc98/pc98/sio.c @@ -878,7 +878,7 @@ static Port_t likely_esp_ports[] = { 0x140, 0x180, 0x280, 0 }; */ static int -sysctl_machdep_comdefaultrate SYSCTL_HANDLER_ARGS +sysctl_machdep_comdefaultrate (SYSCTL_HANDLER_ARGS) { int error, s; speed_t newspeed; diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h index d5697a6edb10..a19ec3e5996f 100644 --- a/sys/sys/sysctl.h +++ b/sys/sys/sysctl.h @@ -92,8 +92,8 @@ struct ctlname { #define OID_AUTO (-1) #ifdef _KERNEL -#define SYSCTL_HANDLER_ARGS (struct sysctl_oid *oidp, void *arg1, int arg2, \ - struct sysctl_req *req) +#define SYSCTL_HANDLER_ARGS struct sysctl_oid *oidp, void *arg1, int arg2, \ + struct sysctl_req *req /* * This describes the access space for a sysctl request. This is needed @@ -126,18 +126,18 @@ struct sysctl_oid { void *oid_arg1; int oid_arg2; const char *oid_name; - int (*oid_handler) SYSCTL_HANDLER_ARGS; + int (*oid_handler) (SYSCTL_HANDLER_ARGS); const char *oid_fmt; }; #define SYSCTL_IN(r, p, l) (r->newfunc)(r, p, l) #define SYSCTL_OUT(r, p, l) (r->oldfunc)(r, p, l) -int sysctl_handle_int SYSCTL_HANDLER_ARGS; -int sysctl_handle_long SYSCTL_HANDLER_ARGS; -int sysctl_handle_intptr SYSCTL_HANDLER_ARGS; -int sysctl_handle_string SYSCTL_HANDLER_ARGS; -int sysctl_handle_opaque SYSCTL_HANDLER_ARGS; +int sysctl_handle_int (SYSCTL_HANDLER_ARGS); +int sysctl_handle_long (SYSCTL_HANDLER_ARGS); +int sysctl_handle_intptr (SYSCTL_HANDLER_ARGS); +int sysctl_handle_string (SYSCTL_HANDLER_ARGS); +int sysctl_handle_opaque (SYSCTL_HANDLER_ARGS); /* * These functions are used to add/remove an oid from the mib. diff --git a/sys/vm/vm_meter.c b/sys/vm/vm_meter.c index 3cb98ada5722..962a1861cd53 100644 --- a/sys/vm/vm_meter.c +++ b/sys/vm/vm_meter.c @@ -125,7 +125,7 @@ SYSCTL_STRUCT(_vm, VM_LOADAVG, loadavg, CTLFLAG_RD, &averunnable, loadavg, "Machine loadaverage history"); static int -vmtotal SYSCTL_HANDLER_ARGS +vmtotal (SYSCTL_HANDLER_ARGS) { struct proc *p; struct vmtotal total, *totalp; diff --git a/sys/vm/vm_zone.c b/sys/vm/vm_zone.c index d7bbfaa3cba7..85410fecce71 100644 --- a/sys/vm/vm_zone.c +++ b/sys/vm/vm_zone.c @@ -50,7 +50,7 @@ static MALLOC_DEFINE(M_ZONE, "ZONE", "Zone header"); */ static struct vm_zone *zlist; -static int sysctl_vm_zone SYSCTL_HANDLER_ARGS; +static int sysctl_vm_zone (SYSCTL_HANDLER_ARGS); static int zone_kmem_pages, zone_kern_pages, zone_kmem_kvaspace; /* @@ -390,7 +390,7 @@ _zget(vm_zone_t z) } static int -sysctl_vm_zone SYSCTL_HANDLER_ARGS +sysctl_vm_zone (SYSCTL_HANDLER_ARGS) { int error=0; vm_zone_t curzone, nextzone; |