summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2023-12-27 16:14:41 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2023-12-27 16:14:41 -0800
commitf5837722ffecbbedf1b1dbab072a063565f0dad1 (patch)
tree9dadaf7d06c71556a5a30734dec38fc405febc0e /kernel
parent1997b3cb4217b09e49659b634c94da47f0340409 (diff)
parent1803d0c5ee1a3bbee23db2336e21add067824f02 (diff)
downloadlinux-stable-f5837722ffecbbedf1b1dbab072a063565f0dad1.tar.gz
linux-stable-f5837722ffecbbedf1b1dbab072a063565f0dad1.tar.bz2
linux-stable-f5837722ffecbbedf1b1dbab072a063565f0dad1.zip
Merge tag 'mm-hotfixes-stable-2023-12-27-15-00' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Pull misc fixes from Andrew Morton: "11 hotfixes. 7 are cc:stable and the other 4 address post-6.6 issues or are not considered backporting material" * tag 'mm-hotfixes-stable-2023-12-27-15-00' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm: mailmap: add an old address for Naoya Horiguchi mm/memory-failure: cast index to loff_t before shifting it mm/memory-failure: check the mapcount of the precise page mm/memory-failure: pass the folio and the page to collect_procs() selftests: secretmem: floor the memory size to the multiple of page_size mm: migrate high-order folios in swap cache correctly maple_tree: do not preallocate nodes for slot stores mm/filemap: avoid buffered read/write race to read inconsistent data kunit: kasan_test: disable fortify string checker on kmalloc_oob_memset kexec: select CRYPTO from KEXEC_FILE instead of depending on it kexec: fix KEXEC_FILE dependencies
Diffstat (limited to 'kernel')
-rw-r--r--kernel/Kconfig.kexec2
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/Kconfig.kexec b/kernel/Kconfig.kexec
index 2fd510256604..946dffa048b7 100644
--- a/kernel/Kconfig.kexec
+++ b/kernel/Kconfig.kexec
@@ -36,6 +36,8 @@ config KEXEC
config KEXEC_FILE
bool "Enable kexec file based system call"
depends on ARCH_SUPPORTS_KEXEC_FILE
+ select CRYPTO
+ select CRYPTO_SHA256
select KEXEC_CORE
help
This is new version of kexec system call. This system call is