The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=4dc6c65704de05ed4bf74585d28b106fcb50452c
commit 4dc6c65704de05ed4bf74585d28b106fcb50452c Author: Zhenlei Huang <[email protected]> AuthorDate: 2025-09-03 10:14:21 +0000 Commit: Zhenlei Huang <[email protected]> CommitDate: 2025-10-04 16:43:22 +0000 init_main: Fix logging the subsystem of pre-loaded kernel modules The pre-load, aka linker_preload() runs at the order of SI_SUB_KLD, but a pre-loaded module may have SYSINITs that have startup order prior to SI_SUB_KLD, e.g. TUNABLE_INT() / TUNABLE_LONG(), hence it is possible that we run into abnormal orders. Without this change, the subsystem of the pre-loaded kernel modules will be melted into previous one. That is mostly harmless but confusing. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47904 (cherry picked from commit 11f1dd193af57dfa5128eadc62b084502292a784) (cherry picked from commit b2293f7f60c238e7a83551472aed9452cd017769) --- sys/kern/init_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index f827000d9200..438b2fd5c996 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -284,7 +284,7 @@ restart: continue; #if defined(VERBOSE_SYSINIT) - if ((*sipp)->subsystem > last && verbose_sysinit != 0) { + if ((*sipp)->subsystem != last && verbose_sysinit != 0) { verbose = 1; last = (*sipp)->subsystem; printf("subsystem %x\n", last);
