46 files changed, 97 insertions, 97 deletions

diff --git a/sys/alpha/alpha/machdep.c b/sys/alpha/alpha/machdep.c
index a7f0a52e9c5ea..02dd85086573a 100644
--- a/sys/alpha/alpha/machdep.c
+++ b/sys/alpha/alpha/machdep.c
@@ -208,7 +208,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);
@@ -218,7 +218,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);
@@ -2036,7 +2036,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/ddb/db_sysctl.c b/sys/ddb/db_sysctl.c
index 5e067c259b596..bc00e112c415f 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 69338d00ceef5..12ddcceeb55e4 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/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index 5edd0947bbcc4..8549cccf53841 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -161,7 +161,7 @@ int physmem = 0;
 int cold = 1;
 
 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);
@@ -171,7 +171,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);
@@ -182,7 +182,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);
@@ -193,7 +193,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;
 
@@ -216,7 +216,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,
@@ -1102,7 +1102,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 4345a531d4620..ca81341559936 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/userconfig.c b/sys/i386/i386/userconfig.c
index 1a4e644878a81..655527e20e77d 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;
@@ -2802,7 +2802,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 ea39018548b97..a2475a2ac8b7d 100644
--- a/sys/i386/isa/clock.c
+++ b/sys/i386/isa/clock.c
@@ -1141,7 +1141,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;
@@ -1166,7 +1166,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 d934ee56eee6a..ab1a269436caf 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 a7ef8f01ca406..867b511e16261 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/sio.c b/sys/isa/sio.c
index e4923ecb58349..d1e2aae7f6377 100644
--- a/sys/isa/sio.c
+++ b/sys/isa/sio.c
@@ -431,7 +431,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 8c830037fb6b0..f6bead6d605ed 100644
--- a/sys/kern/kern_clock.c
+++ b/sys/kern/kern_clock.c
@@ -465,7 +465,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;
 	/*
@@ -823,7 +823,7 @@ SYSCTL_INT(_kern_timecounter, OID_AUTO, method, CTLFLAG_RW, &tco_method, 0,
 );
 
 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/kern_descrip.c b/sys/kern/kern_descrip.c
index 89121ac2fdd98..c75b12873da2f 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 404aaa3cada41..000306213d323 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 62296b27d60e2..488e24db59c5d 100644
--- a/sys/kern/kern_fork.c
+++ b/sys/kern/kern_fork.c
@@ -153,7 +153,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 a07988e829ffe..08cfd286a1ea2 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 883bc9dfdd715..089fb90dbf0a8 100644
--- a/sys/kern/kern_ntptime.c
+++ b/sys/kern/kern_ntptime.c
@@ -197,7 +197,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 df9f1c569fedb..0a4621f0308f4 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -522,7 +522,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;
@@ -618,7 +618,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 e4a4696ccbeeb..2f3e74c46e4ee 100644
--- a/sys/kern/kern_shutdown.c
+++ b/sys/kern/kern_shutdown.c
@@ -436,7 +436,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 3ae903d39d529..0f95e30680734 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 c84737d28c30c..c4ce4d1cb8b18 100644
--- a/sys/kern/kern_sysctl.c
+++ b/sys/kern/kern_sysctl.c
@@ -64,7 +64,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 */
 
@@ -204,7 +204,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;
@@ -214,7 +214,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;
@@ -324,7 +324,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;
@@ -400,7 +400,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;
@@ -436,7 +436,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;
@@ -469,7 +469,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;
 
@@ -493,7 +493,7 @@ sysctl_handle_int SYSCTL_HANDLER_ARGS
  */
 
 int
-sysctl_handle_long SYSCTL_HANDLER_ARGS
+sysctl_handle_long(SYSCTL_HANDLER_ARGS)
 {
 	int error = 0;
 
@@ -516,7 +516,7 @@ sysctl_handle_long SYSCTL_HANDLER_ARGS
  */
 
 int
-sysctl_handle_string SYSCTL_HANDLER_ARGS
+sysctl_handle_string(SYSCTL_HANDLER_ARGS)
 {
 	int error=0;
 
@@ -542,7 +542,7 @@ sysctl_handle_string SYSCTL_HANDLER_ARGS
  */
 
 int
-sysctl_handle_opaque SYSCTL_HANDLER_ARGS
+sysctl_handle_opaque(SYSCTL_HANDLER_ARGS)
 {
 	int error;
 
@@ -737,7 +737,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/subr_bus.c b/sys/kern/subr_bus.c
index b123e6963114a..87d116751d07e 100644
--- a/sys/kern/subr_bus.c
+++ b/sys/kern/subr_bus.c
@@ -1203,7 +1203,7 @@ device_shutdown(device_t dev)
 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;
@@ -1229,7 +1229,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 20da4ba6c454b..8f76d731a009a 100644
--- a/sys/kern/subr_devstat.c
+++ b/sys/kern/subr_devstat.c
@@ -261,7 +261,7 @@ devstat_end_transaction_buf(struct devstat *ds, struct buf *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_prof.c b/sys/kern/subr_prof.c
index 117f0309981a8..4fa5223acaf47 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 f393cafe3738b..c66036a69aaae 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -2421,7 +2421,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 080e1aa00fe70..f4e2bd45d4679 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 5c0e82385cc2a..3ae93454f61cf 100644
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
@@ -722,7 +722,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_subr.c b/sys/kern/vfs_subr.c
index 320ad529cd55e..3d0b455cf5a5e 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 d247b0d57014b..5eb86ce0e3929 100644
--- a/sys/net/bridge.c
+++ b/sys/net/bridge.c
@@ -224,7 +224,7 @@ bdg_promisc_on()
 }
 
 static int
-sysctl_bdg SYSCTL_HANDLER_ARGS
+sysctl_bdg(SYSCTL_HANDLER_ARGS)
 {
     int error, oldval = do_bridge ;
 
@@ -297,7 +297,7 @@ parse_bdg_cfg()
 }
 
 static int
-sysctl_bdg_cfg SYSCTL_HANDLER_ARGS
+sysctl_bdg_cfg(SYSCTL_HANDLER_ARGS)
 {
     int error = 0 ;
     char oldval[256] ;
@@ -323,7 +323,7 @@ sysctl_bdg_cfg SYSCTL_HANDLER_ARGS
 }
 
 static int
-sysctl_refresh SYSCTL_HANDLER_ARGS
+sysctl_refresh(SYSCTL_HANDLER_ARGS)
 {
     if (req->newptr)
 	    bdgtakeifaces();
diff --git a/sys/net/if_mib.c b/sys/net/if_mib.c
index a4489ca01e4ef..ee497a62f367a 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 dc5d093d0a52b..d778e01125ab3 100644
--- a/sys/net/rtsock.c
+++ b/sys/net/rtsock.c
@@ -940,7 +940,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 7597247f67705..358793beacfbb 100644
--- a/sys/netinet/in_pcb.c
+++ b/sys/netinet/in_pcb.c
@@ -94,7 +94,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 cf0797010b230..5d056cefadf65 100644
--- a/sys/netinet/raw_ip.c
+++ b/sys/netinet/raw_ip.c
@@ -567,7 +567,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 5586c5b9f90ce..68f87aa173b52 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -768,7 +768,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;
@@ -860,7 +860,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;
@@ -890,7 +890,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 4555eac600797..7e111a884f81a 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/udp_usrreq.c b/sys/netinet/udp_usrreq.c
index 3c393b0fde46e..eec4e82814f39 100644
--- a/sys/netinet/udp_usrreq.c
+++ b/sys/netinet/udp_usrreq.c
@@ -520,7 +520,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;
@@ -606,7 +606,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 974465cb4c038..b3bd121aa99c8 100644
--- a/sys/netinet6/in6_proto.c
+++ b/sys/netinet6/in6_proto.c
@@ -431,7 +431,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;
@@ -475,7 +475,7 @@ sysctl_ip6_forwarding SYSCTL_HANDLER_ARGS
 }
 
 static int
-sysctl_icmp6_ratelimit SYSCTL_HANDLER_ARGS
+sysctl_icmp6_ratelimit(SYSCTL_HANDLER_ARGS)
 {
 	int rate_usec, error, s;
 
diff --git a/sys/netinet6/udp6_usrreq.c b/sys/netinet6/udp6_usrreq.c
index 82a8256bd7d69..beda1e92db097 100644
--- a/sys/netinet6/udp6_usrreq.c
+++ b/sys/netinet6/udp6_usrreq.c
@@ -468,7 +468,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 026f2622ee596..7d7b019099404 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 25d92251d1d81..f61e4c24171e3 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/i386/machdep.c b/sys/pc98/i386/machdep.c
index 29d1f39688518..34b991f9fc026 100644
--- a/sys/pc98/i386/machdep.c
+++ b/sys/pc98/i386/machdep.c
@@ -171,7 +171,7 @@ int physmem = 0;
 int cold = 1;
 
 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);
@@ -181,7 +181,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);
@@ -192,7 +192,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);
@@ -203,7 +203,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;
 
@@ -226,7 +226,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,
@@ -1102,7 +1102,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 520d081307154..5ab6f58fed27b 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;
@@ -2829,7 +2829,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 bd29e52a5a27a..da8464694a8d8 100644
--- a/sys/pc98/pc98/clock.c
+++ b/sys/pc98/pc98/clock.c
@@ -1483,7 +1483,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;
@@ -1508,7 +1508,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/sio.c b/sys/pc98/pc98/sio.c
index 99fd758114439..69ce6188ec616 100644
--- a/sys/pc98/pc98/sio.c
+++ b/sys/pc98/pc98/sio.c
@@ -850,7 +850,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 b227da12aa4df..dbb90afe9d6d6 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 d8be3024fe619..66829bb54a64e 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 b53cfa0220b71..85b2c81342bb8 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;
 
 /*
@@ -382,7 +382,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;