Page MenuHomeFreeBSD
Files F168724258

D58709.id183880.diff
No OneTemporary
Actions

D58709.id183880.diff
View Options

diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -1154,7 +1154,7 @@
callout_init(&pmap_invl_callout, 1);
pmap_invl_callout_inited = true;
}
-SYSINIT(pmap_di_callout, SI_SUB_CPU + 1, SI_ORDER_ANY,
+SYSINIT(pmap_di_callout, SI_SUB_CPU, SI_ORDER_LAST,
pmap_delayed_invl_callout_init, NULL);
/*
@@ -11186,7 +11186,7 @@
CPU_COPY(&all_cpus, &kernel_pmap->pm_active);
pmap_pti_init();
}
-SYSINIT(pmap_cpu, SI_SUB_CPU + 1, SI_ORDER_ANY, pmap_cpu_init, NULL);
+SYSINIT(pmap_cpu, SI_SUB_CPU, SI_ORDER_LAST, pmap_cpu_init, NULL);
static pdp_entry_t *
pmap_pti_pdpe(vm_offset_t va)
diff --git a/sys/compat/linuxkpi/common/src/linux_current.c b/sys/compat/linuxkpi/common/src/linux_current.c
--- a/sys/compat/linuxkpi/common/src/linux_current.c
+++ b/sys/compat/linuxkpi/common/src/linux_current.c
@@ -299,8 +299,8 @@
linuxkpi_thread_dtor, NULL, EVENTHANDLER_PRI_ANY);
lkpi_alloc_current = linux_alloc_current;
}
-SYSINIT(linux_current, SI_SUB_EVENTHANDLER + 1, SI_ORDER_SECOND,
- linux_current_init, NULL);
+SYSINIT(linux_current, SI_SUB_EVENTHANDLER, SI_ORDER_LAST, linux_current_init,
+ NULL);
static void
linux_current_uninit(void *arg __unused)
@@ -333,5 +333,5 @@
uma_zdestroy(linux_current_zone);
uma_zdestroy(linux_mm_zone);
}
-SYSUNINIT(linux_current, SI_SUB_EVENTHANDLER + 1, SI_ORDER_SECOND,
+SYSUNINIT(linux_current, SI_SUB_EVENTHANDLER, SI_ORDER_LAST,
linux_current_uninit, NULL);
diff --git a/sys/dev/random/fenestrasX/fx_brng.c b/sys/dev/random/fenestrasX/fx_brng.c
--- a/sys/dev/random/fenestrasX/fx_brng.c
+++ b/sys/dev/random/fenestrasX/fx_brng.c
@@ -134,12 +134,6 @@
FXRNG_BRNG_UNLOCK(rng);
}
-/*
- * Sysentvec and VDSO are initialized much later than SI_SUB_RANDOM. When
- * they're online, go ahead and push an initial root seed version.
- * INIT_SYSENTVEC runs at SI_SUB_EXEC:SI_ORDER_ANY, and SI_ORDER_ANY is the
- * maximum value, so we must run at SI_SUB_EXEC+1.
- */
static void
fxrng_vdso_sysinit(void *dummy __unused)
{
@@ -147,7 +141,7 @@
fxrng_push_seed_generation(fxrng_root.brng_generation);
FXRNG_BRNG_UNLOCK(&fxrng_root);
}
-SYSINIT(fxrng_vdso, SI_SUB_EXEC + 1, SI_ORDER_ANY, fxrng_vdso_sysinit, NULL);
+SYSINIT(fxrng_vdso, SI_SUB_EXEC, SI_ORDER_LAST, fxrng_vdso_sysinit, NULL);
/*
* Grab some bytes off an initialized, current generation RNG.
diff --git a/sys/geom/eli/g_eli.c b/sys/geom/eli/g_eli.c
--- a/sys/geom/eli/g_eli.c
+++ b/sys/geom/eli/g_eli.c
@@ -165,7 +165,7 @@
kern_unsetenv("kern.geom.eli.passphrase");
}
}
-SYSINIT(geli_fetch_loader_passphrase, SI_SUB_KMEM + 1, SI_ORDER_ANY,
+SYSINIT(geli_fetch_loader_passphrase, SI_SUB_KMEM, SI_ORDER_LAST,
fetch_loader_passphrase, NULL);
static void
diff --git a/sys/kern/kern_environment.c b/sys/kern/kern_environment.c
--- a/sys/kern/kern_environment.c
+++ b/sys/kern/kern_environment.c
@@ -511,7 +511,7 @@
mtx_init(&kenv_lock, "kernel environment", NULL, MTX_DEF);
dynamic_kenv = true;
}
-SYSINIT(kenv, SI_SUB_KMEM + 1, SI_ORDER_FIRST, init_dynamic_kenv, NULL);
+SYSINIT(kenv, SI_SUB_KMEM, SI_ORDER_LAST, init_dynamic_kenv, NULL);
void
freeenv(char *env)
diff --git a/sys/kern/kern_umtx.c b/sys/kern/kern_umtx.c
--- a/sys/kern/kern_umtx.c
+++ b/sys/kern/kern_umtx.c
@@ -180,7 +180,7 @@
static int do_unlock_pp(struct thread *td, struct umutex *m, uint32_t flags,
bool rb);
static void umtx_thread_cleanup(struct thread *td);
-SYSINIT(umtx, SI_SUB_EVENTHANDLER+1, SI_ORDER_MIDDLE, umtxq_sysinit, NULL);
+SYSINIT(umtx, SI_SUB_EVENTHANDLER, SI_ORDER_LAST, umtxq_sysinit, NULL);
#define umtxq_signal(key, nwake) umtxq_signal_queue((key), (nwake), UMTX_SHARED_QUEUE)
diff --git a/sys/kern/subr_hints.c b/sys/kern/subr_hints.c
--- a/sys/kern/subr_hints.c
+++ b/sys/kern/subr_hints.c
@@ -88,7 +88,7 @@
}
/* Any time after dynamic env is setup */
-SYSINIT(hintenv, SI_SUB_KMEM + 1, SI_ORDER_SECOND, static_hints_to_env, NULL);
+SYSINIT(hintenv, SI_SUB_KMEM, SI_ORDER_LAST, static_hints_to_env, NULL);
/*
* Checks the environment to see if we even have any hints. If it has no hints,
diff --git a/sys/net/debugnet.c b/sys/net/debugnet.c
--- a/sys/net/debugnet.c
+++ b/sys/net/debugnet.c
@@ -917,7 +917,7 @@
dn_attach_cookie = EVENTHANDLER_REGISTER(ifnet_link_event,
dn_ifnet_event, NULL, EVENTHANDLER_PRI_ANY);
}
-SYSINIT(dn_evh_init, SI_SUB_EVENTHANDLER + 1, SI_ORDER_ANY, dn_evh_init, NULL);
+SYSINIT(dn_evh_init, SI_SUB_EVENTHANDLER, SI_ORDER_LAST, dn_evh_init, NULL);
/*
* DDB parsing helpers for debugnet(4) consumers.
diff --git a/sys/netinet/tcp_ratelimit.c b/sys/netinet/tcp_ratelimit.c
--- a/sys/netinet/tcp_ratelimit.c
+++ b/sys/netinet/tcp_ratelimit.c
@@ -1790,5 +1790,5 @@
printf("TCP_ratelimit: Is now initialized\n");
}
-SYSINIT(tcp_rl_init, SI_SUB_SMP + 1, SI_ORDER_ANY, tcp_rs_init, NULL);
+SYSINIT(tcp_rl_init, SI_SUB_SMP, SI_ORDER_LAST, tcp_rs_init, NULL);
#endif
diff --git a/sys/sys/kernel.h b/sys/sys/kernel.h
--- a/sys/sys/kernel.h
+++ b/sys/sys/kernel.h
@@ -194,7 +194,8 @@
SI_ORDER_SEVENTH = 0x0000006, /* seventh */
SI_ORDER_EIGHTH = 0x0000007, /* eighth */
SI_ORDER_MIDDLE = 0x1000000, /* somewhere in the middle */
- SI_ORDER_ANY = 0xfffffff /* last */
+ SI_ORDER_ANY = 0xf000000, /* default */
+ SI_ORDER_LAST = 0xfffffff /* last */
};
/*
diff --git a/sys/x86/x86/ucode.c b/sys/x86/x86/ucode.c
--- a/sys/x86/x86/ucode.c
+++ b/sys/x86/x86/ucode.c
@@ -360,7 +360,7 @@
goto restart;
}
}
-SYSINIT(ucode_release, SI_SUB_SMP + 1, SI_ORDER_ANY, ucode_release, NULL);
+SYSINIT(ucode_release, SI_SUB_SMP, SI_ORDER_LAST, ucode_release, NULL);
void
ucode_load_ap(int cpu)

File Metadata

Mime Type
text/plain
Expires
Sun, Aug 30, 8:02 PM (8 h, 19 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37547111
Default Alt Text
D58709.id183880.diff (5 KB)

Event Timeline