Re: CVS commit: [netbsd-5] src/sys/kern

[Iain Hibbert <plunky%rya-online.net@localhost>]

On Sat, 18 Jun 2011, Manuel Bouyer wrote:

> Module Name:  src
> Committed By: bouyer
> Date:         Sat Jun 18 16:42:04 UTC 2011
>
> Modified Files:
>       src/sys/kern [netbsd-5]: uipc_domain.c uipc_proto.c uipc_usrreq.c
>
> Log Message:
> Pull up following revision(s) (requested by manu in ticket #1633):
>       sys/kern/uipc_domain.c: revision 1.86

This broke the build. I think it needs either revision 1.77 which
introduced domain_sysctllog but that may introduce other complexities, or
the attached patch which makes it use the local clog as per other
instances..

iain

Index: uipc_domain.c
===================================================================
RCS file: /cvsroot/src/sys/kern/uipc_domain.c,v
retrieving revision 1.76.12.1
diff -u -p -r1.76.12.1 uipc_domain.c
--- uipc_domain.c       18 Jun 2011 16:42:03 -0000      1.76.12.1
+++ uipc_domain.c       19 Jun 2011 16:49:21 -0000
@@ -496,7 +496,7 @@ SYSCTL_SETUP(sysctl_net_setup, "sysctl n
                       SYSCTL_DESCR("SOCK_SEQPACKET settings"),
                       NULL, 0, NULL, 0,
                       CTL_NET, PF_LOCAL, SOCK_SEQPACKET, CTL_EOL);
-       sysctl_createv(&domain_sysctllog, 0, NULL, NULL,
+       sysctl_createv(clog, 0, NULL, NULL,
                       CTLFLAG_PERMANENT,
                       CTLTYPE_NODE, "dgram",
                       SYSCTL_DESCR("SOCK_DGRAM settings"),
@@ -516,7 +516,7 @@ SYSCTL_SETUP(sysctl_net_setup, "sysctl n
                                    "block list"),
                       sysctl_unpcblist, 0, NULL, 0,
                       CTL_NET, PF_LOCAL, SOCK_SEQPACKET, CTL_CREATE, CTL_EOL);
-       sysctl_createv(&domain_sysctllog, 0, NULL, NULL,
+       sysctl_createv(clog, 0, NULL, NULL,
                       CTLFLAG_PERMANENT,
                       CTLTYPE_STRUCT, "pcblist",
                       SYSCTL_DESCR("SOCK_DGRAM protocol control block list"),