From owner-svn-src-all@freebsd.org Wed Oct 7 06:16:39 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CA6033FC7D8; Wed, 7 Oct 2020 06:16:39 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4C5kcl52NBz4PLS; Wed, 7 Oct 2020 06:16:39 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 75E4512F6D; Wed, 7 Oct 2020 06:16:39 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0976GdiW028369; Wed, 7 Oct 2020 06:16:39 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0976Gclk028363; Wed, 7 Oct 2020 06:16:38 GMT (envelope-from imp@FreeBSD.org) Message-Id: <202010070616.0976Gclk028363@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Wed, 7 Oct 2020 06:16:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r366508 - in head/sys: dev/rt geom/eli kern sys X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head/sys: dev/rt geom/eli kern sys X-SVN-Commit-Revision: 366508 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Oct 2020 06:16:39 -0000 Author: imp Date: Wed Oct 7 06:16:37 2020 New Revision: 366508 URL: https://svnweb.freebsd.org/changeset/base/366508 Log: Move kernel env global variables, etc to sys/kenv.h The kernel globals for kenv are confined to 2 files that need them and a few that likely shouldn't (but as written the code does). Move them from sys/systm.h to sys/kenv.h. This removed a XXX from systm.h and cleans it up a little bit... Modified: head/sys/dev/rt/if_rt.c head/sys/geom/eli/g_eli.c head/sys/kern/kern_environment.c head/sys/kern/subr_hints.c head/sys/sys/kenv.h head/sys/sys/systm.h Modified: head/sys/dev/rt/if_rt.c ============================================================================== --- head/sys/dev/rt/if_rt.c Wed Oct 7 05:44:35 2020 (r366507) +++ head/sys/dev/rt/if_rt.c Wed Oct 7 06:16:37 2020 (r366508) @@ -38,6 +38,8 @@ __FBSDID("$FreeBSD$"); #include "if_rtvar.h" #include "if_rtreg.h" +#include + #include #include #include Modified: head/sys/geom/eli/g_eli.c ============================================================================== --- head/sys/geom/eli/g_eli.c Wed Oct 7 05:44:35 2020 (r366507) +++ head/sys/geom/eli/g_eli.c Wed Oct 7 06:16:37 2020 (r366508) @@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include Modified: head/sys/kern/kern_environment.c ============================================================================== --- head/sys/kern/kern_environment.c Wed Oct 7 05:44:35 2020 (r366507) +++ head/sys/kern/kern_environment.c Wed Oct 7 06:16:37 2020 (r366508) @@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include Modified: head/sys/kern/subr_hints.c ============================================================================== --- head/sys/kern/subr_hints.c Wed Oct 7 05:44:35 2020 (r366507) +++ head/sys/kern/subr_hints.c Wed Oct 7 06:16:37 2020 (r366508) @@ -31,6 +31,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include Modified: head/sys/sys/kenv.h ============================================================================== --- head/sys/sys/kenv.h Wed Oct 7 05:44:35 2020 (r366507) +++ head/sys/sys/kenv.h Wed Oct 7 06:16:37 2020 (r366508) @@ -42,4 +42,18 @@ #define KENV_MNAMELEN 128 /* Maximum name length (for the syscall) */ #define KENV_MVALLEN 128 /* Maximum value length (for the syscall) */ +#ifdef _KERNEL +/* + * Most of these variables should be const. + */ +extern bool dynamic_kenv; +extern struct mtx kenv_lock; +extern char *kern_envp; +extern char *md_envp; +extern char static_env[]; +extern char static_hints[]; /* by config for now */ + +extern char **kenvp; +#endif /* _KERNEL */ + #endif /* !_SYS_KENV_H_ */ Modified: head/sys/sys/systm.h ============================================================================== --- head/sys/sys/systm.h Wed Oct 7 05:44:35 2020 (r366507) +++ head/sys/sys/systm.h Wed Oct 7 06:16:37 2020 (r366508) @@ -204,21 +204,7 @@ void kassert_panic(const char *fmt, ...) __printflike }) #define SCHEDULER_STOPPED() SCHEDULER_STOPPED_TD(curthread) -/* - * XXX the hints declarations are even more misplaced than most declarations - * in this file, since they are needed in one file (per arch) and only used - * in two files. - * XXX most of these variables should be const. - */ extern int osreldate; -extern bool dynamic_kenv; -extern struct mtx kenv_lock; -extern char *kern_envp; -extern char *md_envp; -extern char static_env[]; -extern char static_hints[]; /* by config for now */ - -extern char **kenvp; extern const void *zero_region; /* address space maps to a zeroed page */