Date: Fri, 20 Nov 2020 15:21:44 +0000 From: "mhorne (Mitchell Horne)" <phabric-noreply@FreeBSD.org> To: Phabricator <phabric-noreply@FreeBSD.org> Cc: dev-reviews@freebsd.org Subject: [Differential] D25034: riscv: honor the environment set via the kernel config file Message-ID: <3cfe102e37804bf5254e912965cca56c@localhost.localdomain> In-Reply-To: <differential-rev-PHID-DREV-ezelkykcpwbhvkcw5mot-req@reviews.freebsd.org> References: <differential-rev-PHID-DREV-ezelkykcpwbhvkcw5mot-req@reviews.freebsd.org>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] This revision was automatically updated to reflect the committed changes. Closed by commit rS367896: riscv: always initialize the static kernel environment (authored by mhorne). CHANGED PRIOR TO COMMIT https://reviews.freebsd.org/D25034?vs=79334&id=79802#toc REPOSITORY rS FreeBSD src repository CHANGES SINCE LAST UPDATE https://reviews.freebsd.org/D25034?vs=79334&id=79802 CHANGES SINCE LAST ACTION https://reviews.freebsd.org/D25034/new/ REVISION DETAIL https://reviews.freebsd.org/D25034 AFFECTED FILES head/sys/riscv/riscv/machdep.c CHANGE DETAILS diff --git a/head/sys/riscv/riscv/machdep.c b/head/sys/riscv/riscv/machdep.c --- a/head/sys/riscv/riscv/machdep.c +++ b/head/sys/riscv/riscv/machdep.c @@ -130,6 +130,8 @@ extern int *end; +static char static_kenv[PAGE_SIZE]; + static void cpu_startup(void *dummy) { @@ -836,6 +838,8 @@ kern_envp = MD_FETCH(kmdp, MODINFOMD_ENVP, char *); if (kern_envp != NULL) init_static_kenv(kern_envp, 0); + else + init_static_kenv(static_kenv, sizeof(static_kenv)); #ifdef DDB ksym_start = MD_FETCH(kmdp, MODINFOMD_SSYM, uintptr_t); ksym_end = MD_FETCH(kmdp, MODINFOMD_ESYM, uintptr_t); EMAIL PREFERENCES https://reviews.freebsd.org/settings/panel/emailpreferences/ To: mhorne, philip, kp, #riscv, syrinx Cc: jrtc27, mhorne, imp, dev-reviews [-- Attachment #2 --] diff --git a/head/sys/riscv/riscv/machdep.c b/head/sys/riscv/riscv/machdep.c --- a/head/sys/riscv/riscv/machdep.c +++ b/head/sys/riscv/riscv/machdep.c @@ -130,6 +130,8 @@ extern int *end; +static char static_kenv[PAGE_SIZE]; + static void cpu_startup(void *dummy) { @@ -836,6 +838,8 @@ kern_envp = MD_FETCH(kmdp, MODINFOMD_ENVP, char *); if (kern_envp != NULL) init_static_kenv(kern_envp, 0); + else + init_static_kenv(static_kenv, sizeof(static_kenv)); #ifdef DDB ksym_start = MD_FETCH(kmdp, MODINFOMD_SSYM, uintptr_t); ksym_end = MD_FETCH(kmdp, MODINFOMD_ESYM, uintptr_t);help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3cfe102e37804bf5254e912965cca56c>