summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancesco Dolcini <francesco.dolcini@toradex.com>2026-03-10 04:50:19 +0100
committerFrancesco Dolcini <francesco.dolcini@toradex.com>2026-03-10 04:50:19 +0100
commit973db7360a2fde8ff52222330cabd28ea8ebd4ae (patch)
treead3cb6fc6a066cd96d25a576f6c8a22fd14577e3
parentba1b9781ebbd47530efc16901cc62b395e4c2a4e (diff)
parentf2ddafa93a259310ca47507153b7811ec54ab7fd (diff)
Merge tag 'v6.1.166'toradex_ti-linux-6.1.y
Merge 6.1.166 stable release Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>
-rw-r--r--Makefile2
-rw-r--r--arch/x86/kernel/setup.c6
2 files changed, 1 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 37f10614c5b2..f5b695aa3353 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
VERSION = 6
PATCHLEVEL = 1
-SUBLEVEL = 165
+SUBLEVEL = 166
EXTRAVERSION =
NAME = Curry Ramen
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 38f48875df91..18a034613d94 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -377,15 +377,9 @@ int __init ima_free_kexec_buffer(void)
int __init ima_get_kexec_buffer(void **addr, size_t *size)
{
- int ret;
-
if (!ima_kexec_buffer_size)
return -ENOENT;
- ret = ima_validate_range(ima_kexec_buffer_phys, ima_kexec_buffer_size);
- if (ret)
- return ret;
-
*addr = __va(ima_kexec_buffer_phys);
*size = ima_kexec_buffer_size;