From: Eric DeVolder Date: Wed, 2 Aug 2023 16:17:50 +0000 (-0400) Subject: remove ARCH_DEFAULT_KEXEC from Kconfig.kexec X-Git-Tag: v6.6-rc1~155^2~56 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=95d1fef53782eb409d4578ce6101d2a7b055351c;p=thirdparty%2Flinux.git remove ARCH_DEFAULT_KEXEC from Kconfig.kexec This patch is a minor cleanup to the series "refactor Kconfig to consolidate KEXEC and CRASH options". In that series, a new option ARCH_DEFAULT_KEXEC was introduced in order to obtain the equivalent behavior of s390 original Kconfig settings for KEXEC. As it turns out, this new option did not fully provide the equivalent behavior, rather a "select KEXEC" did. As such, the ARCH_DEFAULT_KEXEC is not needed anymore, so remove it. Link: https://lkml.kernel.org/r/20230802161750.2215-1-eric.devolder@oracle.com Signed-off-by: Eric DeVolder Acked-by: Alexander Gordeev Signed-off-by: Andrew Morton --- diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index ab723218c0fb6..4d011f7c26e57 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -245,9 +245,6 @@ config PGTABLE_LEVELS source "kernel/livepatch/Kconfig" -config ARCH_DEFAULT_KEXEC - def_bool y - config ARCH_SUPPORTS_KEXEC def_bool y diff --git a/kernel/Kconfig.kexec b/kernel/Kconfig.kexec index ff72e45cfaef2..701cd5336f4fa 100644 --- a/kernel/Kconfig.kexec +++ b/kernel/Kconfig.kexec @@ -17,7 +17,6 @@ config HAVE_IMA_KEXEC config KEXEC bool "Enable kexec system call" - default ARCH_DEFAULT_KEXEC depends on ARCH_SUPPORTS_KEXEC select KEXEC_CORE help