From ce4900bc8adfa34bae6d3ac01ff71ee07e32ec2a Mon Sep 17 00:00:00 2001
From: Mitchell Horne <mhorne@FreeBSD.org>
Date: Thu, 15 Oct 2020 20:21:15 +0000
Subject: [PATCH] Simplify preload_dump() condition

Hiding this feature behind RB_VERBOSE is gratuitous. The tunable is enough
to limit its use to only those who explicitly request it.

Suggested by:	kevans
---
 sys/amd64/amd64/machdep.c | 3 +--
 sys/arm/arm/machdep.c     | 3 +--
 sys/arm64/arm64/machdep.c | 3 +--
 sys/riscv/riscv/machdep.c | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index a6f725ebdcb4..28380bf10f21 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -1859,8 +1859,7 @@ hammer_time(u_int64_t modulep, u_int64_t physfree)
 	 * output is required. If it's grossly incorrect the kernel will never
 	 * make it this far.
 	 */
-	if ((boothowto & RB_VERBOSE) &&
-	    getenv_is_true("debug.dump_modinfo_at_boot"))
+	if (getenv_is_true("debug.dump_modinfo_at_boot"))
 		preload_dump();
 
 #ifdef DEV_ISA
diff --git a/sys/arm/arm/machdep.c b/sys/arm/arm/machdep.c
index c92d493b21d6..4a9822f90835 100644
--- a/sys/arm/arm/machdep.c
+++ b/sys/arm/arm/machdep.c
@@ -1032,8 +1032,7 @@ initarm(struct arm_boot_params *abp)
 	 * output is required. If it's grossly incorrect the kernel will never
 	 * make it this far.
 	 */
-	if ((boothowto & RB_VERBOSE) &&
-	    getenv_is_true("debug.dump_modinfo_at_boot"))
+	if (getenv_is_true("debug.dump_modinfo_at_boot"))
 		preload_dump();
 
 	env = kern_getenv("kernelname");
diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c
index 23187d42ceed..b57934e6dd3b 100644
--- a/sys/arm64/arm64/machdep.c
+++ b/sys/arm64/arm64/machdep.c
@@ -1247,8 +1247,7 @@ initarm(struct arm64_bootparams *abp)
 	 * output is required. If it's grossly incorrect the kernel will never
 	 * make it this far.
 	 */
-	if ((boothowto & RB_VERBOSE) &&
-	    getenv_is_true("debug.dump_modinfo_at_boot"))
+	if (getenv_is_true("debug.dump_modinfo_at_boot"))
 		preload_dump();
 
 	init_proc0(abp->kern_stack);
diff --git a/sys/riscv/riscv/machdep.c b/sys/riscv/riscv/machdep.c
index b71f24ad4920..550d440cddc1 100644
--- a/sys/riscv/riscv/machdep.c
+++ b/sys/riscv/riscv/machdep.c
@@ -954,8 +954,7 @@ initriscv(struct riscv_bootparams *rvbp)
 	 * output is required. If it's grossly incorrect the kernel will never
 	 * make it this far.
 	 */
-	if ((boothowto & RB_VERBOSE) &&
-	    getenv_is_true("debug.dump_modinfo_at_boot"))
+	if (getenv_is_true("debug.dump_modinfo_at_boot"))
 		preload_dump();
 
 	init_proc0(rvbp->kern_stack);