From: Geert Uytterhoeven <geert+renesas@glider.be>
Date: Mon, 15 Sep 2025 07:11:05 +0000 (+0200)
Subject: init: INITRAMFS_PRESERVE_MTIME should depend on BLK_DEV_INITRD
X-Git-Tag: v6.1.156~147
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=258acc8c6a5c336c3848ed44f4bb0461ea88d5b3;p=thirdparty%2Fkernel%2Fstable.git

init: INITRAMFS_PRESERVE_MTIME should depend on BLK_DEV_INITRD

[ Upstream commit 74792608606a525a0e0df7e8d48acd8000561389 ]

INITRAMFS_PRESERVE_MTIME is only used in init/initramfs.c and
init/initramfs_test.c.  Hence add a dependency on BLK_DEV_INITRD, to
prevent asking the user about this feature when configuring a kernel
without initramfs support.

Fixes: 1274aea127b2e8c9 ("initramfs: add INITRAMFS_PRESERVE_MTIME Kconfig option")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Martin Wilck <mwilck@suse.com>
Reviewed-by: David Disseldorp <ddiss@suse.de>
Signed-off-by: Christian Brauner <brauner@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/init/Kconfig b/init/Kconfig
index 8b6a2848da4a5..b70e0e05a1856 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1405,6 +1405,7 @@ config BOOT_CONFIG_EMBED_FILE
 
 config INITRAMFS_PRESERVE_MTIME
 	bool "Preserve cpio archive mtimes in initramfs"
+	depends on BLK_DEV_INITRD
 	default y
 	help
 	  Each entry in an initramfs cpio archive carries an mtime value. When