Module Name: src
Committed By: pooka
Date: Wed Apr 23 17:05:18 UTC 2014
Modified Files:
src/sys/kern: uipc_domain.c
src/sys/rump: ldscript.rump
Log Message:
domains are attached by module(-like) constructors, so no need to
play link_set games with them.
To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 src/sys/kern/uipc_domain.c
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/ldscript.rump
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/uipc_domain.c
diff -u src/sys/kern/uipc_domain.c:1.92 src/sys/kern/uipc_domain.c:1.93
--- src/sys/kern/uipc_domain.c:1.92 Thu Apr 17 16:14:22 2014
+++ src/sys/kern/uipc_domain.c Wed Apr 23 17:05:18 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_domain.c,v 1.92 2014/04/17 16:14:22 christos Exp $ */
+/* $NetBSD: uipc_domain.c,v 1.93 2014/04/23 17:05:18 pooka Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_domain.c,v 1.92 2014/04/17 16:14:22 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_domain.c,v 1.93 2014/04/23 17:05:18 pooka Exp $");
#include <sys/param.h>
#include <sys/socket.h>
@@ -77,6 +77,10 @@ u_int pffasttimo_now;
static struct sysctllog *domain_sysctllog;
static void sysctl_net_setup(void);
+/* ensure successful linkage even without any domains in link sets */
+static struct domain domain_dummy;
+__link_set_add_rodata(domains,domain_dummy);
+
void
domaininit(bool addroute)
{
@@ -91,6 +95,8 @@ domaininit(bool addroute)
* domain is added last.
*/
__link_set_foreach(dpp, domains) {
+ if (*dpp == &domain_dummy)
+ continue;
if ((*dpp)->dom_family == PF_ROUTE)
rt_domain = *dpp;
else
Index: src/sys/rump/ldscript.rump
diff -u src/sys/rump/ldscript.rump:1.2 src/sys/rump/ldscript.rump:1.3
--- src/sys/rump/ldscript.rump:1.2 Mon Mar 1 13:12:19 2010
+++ src/sys/rump/ldscript.rump Wed Apr 23 17:05:18 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ldscript.rump,v 1.2 2010/03/01 13:12:19 pooka Exp $ */
+/* $NetBSD: ldscript.rump,v 1.3 2014/04/23 17:05:18 pooka Exp $ */
/*
* From binutils 2.19 onwards (in NetBSD) binutils ld PROVIDEs
@@ -18,13 +18,6 @@ SECTIONS
__stop_link_set_modules = .;
}
- link_set_domains :
- {
- __start_link_set_domains = .;
- *(link_set_domains);
- __stop_link_set_domains = .;
- }
-
link_set_rump_components :
{
__start_link_set_rump_components = .;
