 @@ -1,14 +1,14 @@
-/*	$NetBSD: sysctl.c,v 1.33 2014/05/16 09:41:42 martin Exp $	*/
+/*	$NetBSD: sysctl.c,v 1.34 2014/05/16 12:22:32 martin Exp $	*/
 /*-
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -24,27 +24,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)sysctl.c	8.2 (Berkeley) 1/4/94";
 #else
-__RCSID("$NetBSD: sysctl.c,v 1.33 2014/05/16 09:41:42 martin Exp $");
+__RCSID("$NetBSD: sysctl.c,v 1.34 2014/05/16 12:22:32 martin Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 #include "namespace.h"
 #include <sys/param.h>
 #define __COMPAT_SYSCTL
 #include <sys/sysctl.h>
 #include <assert.h>
 #include <errno.h>
 #include <paths.h>
 #include <stdio.h>
 #include <string.h>
 @@ -99,62 +99,51 @@ sysctl(const int *name, unsigned int nam
+	}
 	return (0);
+}
 static int
 user_sysctl(const int *name, unsigned int namelen,
 	void *oldp, size_t *oldlenp,
 	const void *newp, size_t newlen)
+{
 #define _INT(s, n, v, d) {					\
 	.sysctl_flags = CTLFLAG_IMMEDIATE|CTLFLAG_PERMANENT|	\
 			CTLTYPE_INT|SYSCTL_VERSION,		\
-	sysc_init_field(_sysctl_size, sizeof(int)),		\
+	.sysctl_size = sizeof(int),				\
 	.sysctl_name = (s),					\
 	.sysctl_num = (n),					\
-	.sysctl_un = { .scu_idata = (v), },			\
+	.sysctl_un.scu_idata = (v),				\
-	sysc_init_field(_sysctl_desc, (d)),			\
+	.sysctl_desc = (d),					\
+	}
 	/*
 	 * the nodes under the "user" node
 	 */
 	static const struct sysctlnode sysctl_usermib[] = {
 #if defined(lint)
 		/*
 		 * lint doesn't like my initializers
 		 */
 #else /* !lint */
+		{
 			.sysctl_flags = SYSCTL_VERSION|CTLFLAG_PERMANENT|
 				CTLTYPE_STRING,
-			sysc_init_field(_sysctl_size, sizeof(_PATH_STDPATH)),
+			.sysctl_size = sizeof(_PATH_STDPATH),
 			.sysctl_name = "cs_path",
 			.sysctl_num = USER_CS_PATH,
-			/*
+			.sysctl_data = __UNCONST(_PATH_STDPATH),
-			 * XXX these nasty initializers (and the one in
+			.sysctl_desc = __UNCONST(
 			 * the _INT() macro) can go away once all ports
 			 * are using gcc3, and become
 			 *	.sysctl_data = _PATH_STDPATH,
 			 *	.sysctl_desc = NULL,
 			 */
 			.sysctl_un = { .scu_data = {
 				sysc_init_field(_sud_data,
 				__UNCONST(_PATH_STDPATH)),
 				}, },
 			sysc_init_field(_sysctl_desc,
 				"A value for the PATH environment variable "
 				"that finds all the standard utilities"),
 		},
 		_INT("bc_base_max", USER_BC_BASE_MAX, BC_BASE_MAX,
 		     "The maximum ibase/obase values in the bc(1) utility"),
 		_INT("bc_dim_max", USER_BC_DIM_MAX, BC_DIM_MAX,
 		     "The maximum array size in the bc(1) utility"),
 		_INT("bc_scale_max", USER_BC_SCALE_MAX, BC_SCALE_MAX,
 		     "The maximum scale value in the bc(1) utility"),
 		_INT("bc_string_max", USER_BC_STRING_MAX, BC_STRING_MAX,
 		     "The maximum string length in the bc(1) utility"),
 		_INT("coll_weights_max", USER_COLL_WEIGHTS_MAX,
 		     COLL_WEIGHTS_MAX, "The maximum number of weights that can "

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sysctlgetmibinfo.c,v 1.10 2012/03/13 21:13:37 christos Exp $ */
+/*	$NetBSD: sysctlgetmibinfo.c,v 1.11 2014/05/16 12:22:32 martin Exp $ */
 /*-
  * Copyright (c) 2003,2004 The NetBSD Foundation, Inc.
  *	All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Brown.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -21,27 +21,27 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: sysctlgetmibinfo.c,v 1.10 2012/03/13 21:13:37 christos Exp $");
+__RCSID("$NetBSD: sysctlgetmibinfo.c,v 1.11 2014/05/16 12:22:32 martin Exp $");
 #endif /* LIBC_SCCS and not lint */
 #ifndef RUMP_ACTION
 #include "namespace.h"
 #ifdef _REENTRANT
 #include "reentrant.h"
 #endif /* _REENTRANT */
 #endif /* RUMP_ACTION */
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #include <assert.h>
 #include <errno.h>
 @@ -61,27 +61,27 @@ __weak_alias(sysctlgetmibinfo,_sysctlget
 /*
  * the place where we attach stuff we learn on the fly, not
  * necessarily used.
  */
 static struct sysctlnode sysctl_mibroot = {
 #if defined(lint)
 	/*
 	 * lint doesn't like my initializers
 	 */
 #else /* !lint */
 	.sysctl_flags = SYSCTL_VERSION|CTLFLAG_ROOT|CTLTYPE_NODE,
-	sysc_init_field(_sysctl_size, sizeof(struct sysctlnode)),
+	.sysctl_size = sizeof(struct sysctlnode),
 	.sysctl_name = "(root)",
 #endif /* !lint */
 };
 /*
  * routines to handle learning and cleanup
  */
 static int compar(const void *, const void *);
 static void free_children(struct sysctlnode *);
 static void relearnhead(void);
 /*
  * specifically not static since sysctl(8) "borrows" it.

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sysctl.c,v 1.152 2014/05/16 08:59:24 martin Exp $ */
+/*	$NetBSD: sysctl.c,v 1.153 2014/05/16 12:22:32 martin Exp $ */
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
  *	All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Brown.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -58,27 +58,27 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1993\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)sysctl.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: sysctl.c,v 1.152 2014/05/16 08:59:24 martin Exp $");
+__RCSID("$NetBSD: sysctl.c,v 1.153 2014/05/16 12:22:32 martin Exp $");
 #endif
 #endif /* not lint */
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #include <sys/mount.h>
 #include <sys/resource.h>
 #include <sys/stat.h>
 #include <sys/sched.h>
 #include <sys/socket.h>
 #include <sys/bitops.h>
 #include <netinet/in.h>
 @@ -232,27 +232,27 @@ static const struct handlespec {
 	/*
 	 * these will only be called when the given node has no children
 	 */
 	{ "/net/[^/]+",				printother, NULL, NULL },
 	{ "/debug",				printother, NULL, NULL },
 	{ "/ddb",				printother, NULL, NULL },
 	{ "/vendor",				printother, NULL, NULL },
 	{ NULL,					NULL, NULL, NULL },
 };
 struct sysctlnode my_root = {
 	.sysctl_flags = SYSCTL_VERSION|CTLFLAG_ROOT|CTLTYPE_NODE,
-	sysc_init_field(_sysctl_size, sizeof(struct sysctlnode)),
+	.sysctl_size = sizeof(struct sysctlnode),
 	.sysctl_num = 0,
 	.sysctl_name = "(prog_root)",
 };
 int	Aflag, aflag, dflag, Mflag, nflag, qflag, rflag, wflag, xflag;
 size_t	nr;
 char	*fn;
 int	req, stale, errs;
 FILE	*warnfp = stderr;
 #define MAXPORTS	0x10000
 /*

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_sysctl.c,v 1.42 2014/02/25 18:30:09 pooka Exp $	*/
+/*	$NetBSD: linux_sysctl.c,v 1.43 2014/05/16 12:22:32 martin Exp $	*/
 /*-
  * Copyright (c) 2003, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Brown.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -24,27 +24,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * sysctl system call.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_sysctl.c,v 1.42 2014/02/25 18:30:09 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_sysctl.c,v 1.43 2014/05/16 12:22:32 martin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/proc.h>
 #include <sys/mount.h>
 #include <sys/sysctl.h>
 #include <sys/sched.h>
 #include <sys/syscallargs.h>
 #include <sys/ktrace.h>
 #include <compat/linux/common/linux_types.h>
 #include <compat/linux/common/linux_signal.h>
 @@ -55,27 +55,27 @@ __KERNEL_RCSID(0, "$NetBSD: linux_sysctl
 #include <compat/linux/common/linux_sysctl.h>
 #include <compat/linux/common/linux_exec.h>
 #include <compat/linux/common/linux_machdep.h>
 char linux_sysname[128] = "Linux";
 char linux_release[128] = "3.11.6";
 char linux_version[128] = "#1 SMP PREEMPT Thu Oct 24 16:23:02 UTC 2013";
 struct sysctlnode linux_sysctl_root = {
 	.sysctl_flags = SYSCTL_VERSION|
 	    CTLFLAG_ROOT|CTLTYPE_NODE|CTLFLAG_READWRITE,
 	.sysctl_num = 0,
 	.sysctl_name = "(linux_root)",
-	sysc_init_field(_sysctl_size, sizeof(struct sysctlnode)),
+	.sysctl_size = sizeof(struct sysctlnode),
 };
 static struct sysctllog *linux_clog1;
 static struct sysctllog *linux_clog2;
 void
 linux_sysctl_fini(void)
+{
 	sysctl_teardown(&linux_clog2);
 	sysctl_teardown(&linux_clog1);
 	sysctl_free(&linux_sysctl_root);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux32_sysctl.c,v 1.15 2014/02/25 18:30:09 pooka Exp $ */
+/*	$NetBSD: linux32_sysctl.c,v 1.16 2014/05/16 12:22:32 martin Exp $ */
 /*-
  * Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
 @@ -21,27 +21,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE THE AUTHOR AND CONTRIBUTORS ``AS IS''
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
  * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux32_sysctl.c,v 1.15 2014/02/25 18:30:09 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_sysctl.c,v 1.16 2014/05/16 12:22:32 martin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/proc.h>
 #include <sys/mount.h>
 #include <sys/sysctl.h>
 #include <sys/syscallargs.h>
 #include <sys/ktrace.h>
 #include <compat/netbsd32/netbsd32.h>
 #include <compat/linux/common/linux_types.h>
 @@ -55,27 +55,27 @@ __KERNEL_RCSID(0, "$NetBSD: linux32_sysc
 #include <compat/linux32/common/linux32_signal.h>
 #include <compat/linux32/common/linux32_sysctl.h>
 #include <compat/linux32/linux32_syscallargs.h>
 char linux32_sysname[128] = "Linux";
 char linux32_release[128] = "3.11.6";
 char linux32_version[128] = "#1 SMP PREEMPT Thu Oct 24 16:23:02 UTC 2013";
 struct sysctlnode linux32_sysctl_root = {
 	.sysctl_flags = SYSCTL_VERSION|
 	    CTLFLAG_ROOT|CTLTYPE_NODE|CTLFLAG_READWRITE,
 	.sysctl_num = 0,
 	.sysctl_name = "(linux32_root)",
-	sysc_init_field(_sysctl_size, sizeof(struct sysctlnode)),
+	.sysctl_size = sizeof(struct sysctlnode),
 };
 static struct sysctllog *linux32_clog1;
 static struct sysctllog *linux32_clog2;
 void
 linux32_sysctl_fini(void)
+{
 	sysctl_teardown(&linux32_clog2);
 	sysctl_teardown(&linux32_clog1);
 	sysctl_free(&linux32_sysctl_root);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: netbsd32_sysctl.c,v 1.33 2012/01/20 14:08:07 joerg Exp $	*/
+/*	$NetBSD: netbsd32_sysctl.c,v 1.34 2014/05/16 12:22:32 martin Exp $	*/
 /*
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Brown.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -22,27 +22,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysctl.c,v 1.33 2012/01/20 14:08:07 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysctl.c,v 1.34 2014/05/16 12:22:32 martin Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_ddb.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/mount.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/vnode.h>
 #include <sys/syscallargs.h>
 @@ -57,27 +57,27 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_sys
 #include <compat/netbsd32/netbsd32_syscall.h>
 #include <compat/netbsd32/netbsd32_syscallargs.h>
 #include <compat/netbsd32/netbsd32_conv.h>
 #include <compat/netbsd32/netbsd32_sysctl.h>
 #if defined(DDB)
 #include <ddb/ddbvar.h>
 #endif
 struct sysctlnode netbsd32_sysctl_root = {
 	.sysctl_flags = SYSCTL_VERSION|CTLFLAG_ROOT|CTLTYPE_NODE,
 	.sysctl_num = 0,
 	.sysctl_name = "(netbsd32_root)",
-	sysc_init_field(_sysctl_size, sizeof(struct sysctlnode)),
+	.sysctl_size = sizeof(struct sysctlnode),
 };
 static struct sysctllog *netbsd32_clog;
 /*
  * sysctl helper routine for netbsd32's kern.boottime node
  */
 static int
 netbsd32_sysctl_kern_boottime(SYSCTLFN_ARGS)
+{
 	struct sysctlnode node;
 	struct netbsd32_timespec bt32;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_sysctl.c,v 1.249 2014/03/27 21:09:33 christos Exp $	*/
+/*	$NetBSD: kern_sysctl.c,v 1.250 2014/05/16 12:22:32 martin Exp $	*/
 /*-
  * Copyright (c) 2003, 2007, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Brown.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -58,27 +58,27 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)kern_sysctl.c	8.9 (Berkeley) 5/20/95
  */
 /*
  * sysctl system call.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_sysctl.c,v 1.249 2014/03/27 21:09:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sysctl.c,v 1.250 2014/05/16 12:22:32 martin Exp $");
 #include "opt_defcorename.h"
 #include "ksyms.h"
 #include <sys/param.h>
 #define __COMPAT_SYSCTL
 #include <sys/sysctl.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/ksyms.h>
 #include <sys/malloc.h>
 #include <sys/mount.h>
 #include <sys/syscallargs.h>
 @@ -113,33 +113,27 @@ struct sysctllog {
 	const struct sysctlnode *log_root;
 	int *log_num;
 	int log_size, log_left;
 };
 /*
  * the "root" of the new sysctl tree
  */
 struct sysctlnode sysctl_root = {
 	.sysctl_flags = SYSCTL_VERSION|
 	    CTLFLAG_ROOT|CTLFLAG_READWRITE|
 	    CTLTYPE_NODE,
 	.sysctl_num = 0,
-	/*
+	.sysctl_size = sizeof(struct sysctlnode),
 	 * XXX once all ports are on gcc3, we can get rid of this
 	 * ugliness and simply make it into
 	 *	.sysctl_size = sizeof(struct sysctlnode),
 	 */
 	sysc_init_field(_sysctl_size, sizeof(struct sysctlnode)),
 	.sysctl_name = "(root)",
 };
 /*
  * link set of functions that add nodes at boot time (see also
  * sysctl_buildtree())
  */
 __link_set_decl(sysctl_funcs, sysctl_setup_func);
 /*
  * The `sysctl_treelock' is intended to serialize access to the sysctl
  * tree.  XXX This has serious problems; allocating memory and
  * copying data out with the lock held is insane.