diff --git a/patches/mainline/b584bfbd7ec417f257f651cc00a90c66e31dfbf1.patch b/patches/mainline/b584bfbd7ec417f257f651cc00a90c66e31dfbf1.patch deleted file mode 100644 index 0ffa8bdd..00000000 --- a/patches/mainline/b584bfbd7ec417f257f651cc00a90c66e31dfbf1.patch +++ /dev/null @@ -1,54 +0,0 @@ -From b584bfbd7ec417f257f651cc00a90c66e31dfbf1 Mon Sep 17 00:00:00 2001 -From: Nathan Chancellor -Date: Wed, 14 Jan 2026 16:27:11 -0700 -Subject: ACPI: APEI: GHES: Disable KASAN instrumentation when compile testing - with clang < 18 - -After a recent innocuous change to drivers/acpi/apei/ghes.c, building -ARCH=arm64 allmodconfig with clang-17 or older (which has both -CONFIG_KASAN=y and CONFIG_WERROR=y) fails with: - - drivers/acpi/apei/ghes.c:902:13: error: stack frame size (2768) exceeds limit (2048) in 'ghes_do_proc' [-Werror,-Wframe-larger-than] - 902 | static void ghes_do_proc(struct ghes *ghes, - | ^ - -A KASAN pass that removes unneeded stack instrumentation, enabled by -default in clang-18 [1], drastically improves stack usage in this case. - -To avoid the warning in the common allmodconfig case when it can break -the build, disable KASAN for ghes.o when compile testing with clang-17 -and older. Disabling KASAN outright may hide legitimate runtime issues, -so live with the warning in that case; the user can either increase the -frame warning limit or disable -Werror, which they should probably do -when debugging with KASAN anyways. - -Closes: https://github.com/ClangBuiltLinux/linux/issues/2148 -Link: https://github.com/llvm/llvm-project/commit/51fbab134560ece663517bf1e8c2a30300d08f1a [1] -Signed-off-by: Nathan Chancellor -Cc: All applicable -Link: https://patch.msgid.link/20260114-ghes-avoid-wflt-clang-older-than-18-v1-1-9c8248bfe4f4@kernel.org -Signed-off-by: Rafael J. Wysocki ---- -Link: https://git.kernel.org/rafael/linux-pm/c/b584bfbd7ec417f257f651cc00a90c66e31dfbf1 ---- - drivers/acpi/apei/Makefile | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/drivers/acpi/apei/Makefile b/drivers/acpi/apei/Makefile -index 2c474e6477e1..346cdf0a0ef9 100644 ---- a/drivers/acpi/apei/Makefile -+++ b/drivers/acpi/apei/Makefile -@@ -1,6 +1,10 @@ - # SPDX-License-Identifier: GPL-2.0 - obj-$(CONFIG_ACPI_APEI) += apei.o - obj-$(CONFIG_ACPI_APEI_GHES) += ghes.o -+# clang versions prior to 18 may blow out the stack with KASAN -+ifeq ($(CONFIG_COMPILE_TEST)_$(CONFIG_CC_IS_CLANG)_$(call clang-min-version, 180000),y_y_) -+KASAN_SANITIZE_ghes.o := n -+endif - obj-$(CONFIG_ACPI_APEI_EINJ) += einj.o - einj-y := einj-core.o - einj-$(CONFIG_ACPI_APEI_EINJ_CXL) += einj-cxl.o --- -cgit 1.2.3-korg - diff --git a/patches/mainline/series b/patches/mainline/series index 361e5cc2..3199f2cb 100644 --- a/patches/mainline/series +++ b/patches/mainline/series @@ -1,3 +1,2 @@ 0a76a17238f805b231d97b118232a5185bbb7a18.patch 20260129_linux_hwmon_macsmc_fix_regressions_in_apple_silicon_smc_hwmon_driver.patch -b584bfbd7ec417f257f651cc00a90c66e31dfbf1.patch