blob: 876c712658494c34cb67a333b1e8d323e0e098c9 [file] [log] [blame] [edit]
From 1687df12d5691a19764081012c56b0ec2fa4bf31 Mon Sep 17 00:00:00 2001
From: Aashish Sharma <shraash@google.com>
Date: Mon, 16 May 2022 20:55:19 +0530
Subject: [PATCH] CHROMIUM: arm: enable CONFIG_WERROR for arm on test builds
Currently test builds for ARM (32 bit) have CONFIG_WERROR disabled
because of frame size errors observed otherwise. To mitigate the
warning pertaining to frame size, set the frame size warning limit
for test builds on ARM to 8192 and then enable the CONFIG_WERROR for
the same.
BUG=b:232656957
TEST=compile
Signed-off-by: Aashish Sharma <shraash@google.com>
Change-Id: I593343212a12446b8a07334998642a7b7873c6b3
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/3650257
Reviewed-by: Guenter Roeck <groeck@chromium.org>
---
init/Kconfig | 2 +-
lib/Kconfig.debug | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/init/Kconfig b/init/Kconfig
index cec06fdbb26f5c35c62eff43c10bad156cc48499..0d8bd54334d2998425287de2bc635fbc3d3b369c 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -155,7 +155,7 @@ config COMPILE_TEST
config WERROR
bool "Compile the kernel with warnings as errors"
- depends on !COMPILE_TEST || ARM64 || X86
+ depends on !COMPILE_TEST || ARM64 || X86 || ARM
default COMPILE_TEST
help
A kernel build should not cause any compiler warnings, and this
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index c3c0b077ade33c4b7240a4b5247cfc02e5c71182..b733ef1f1ac9faa1a47f3c6a12429ae4350e2f65 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -396,6 +396,7 @@ config FRAME_WARN
int "Warn for stack frames larger than"
range 0 8192
default 0 if KMSAN
+ default 8192 if ARM && COMPILE_TEST
default 2048 if GCC_PLUGIN_LATENT_ENTROPY
default 2048 if PARISC
default 1536 if (!64BIT && XTENSA)
--
2.38.1.584.g0f3c55d4c2-goog