Skip to content

Commit 92d5c5c

Browse files
btw616jmberg-intel
authored andcommitted
um: Remove CONFIG_FRAME_WARN from x86_64_defconfig
The CONFIG_FRAME_WARN=1024 setting in x86_64_defconfig originates from arch/um/defconfig, which was split into i386_defconfig and x86_64_defconfig by commit e40f04d ("arch/um: make it work with defconfig and x86_64"). Currently, it's even smaller than the default on 32bit (i.e., 1280). It's no longer suitable for 64bit. Building with x86_64_defconfig triggers the following warning: lib/maple_tree.c: In function ‘mas_wr_bnode’: lib/maple_tree.c:3740:1: warning: the frame size of 1056 bytes is larger than 1024 bytes [-Wframe-larger-than=] 3740 | } | ^ Since we have a larger CONFIG_KERNEL_STACK_ORDER on 64bit (twice that of 32bit) by default, we could increase CONFIG_FRAME_WARN accordingly. Let's remove the CONFIG_FRAME_WARN=1024 setting from x86_64_defconfig and just use the default value (2048 for 64bit) defined in lib/Kconfig.debug, as we do for 32bit. Signed-off-by: Tiwei Bie <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Johannes Berg <[email protected]>
1 parent cd4126d commit 92d5c5c

1 file changed

Lines changed: 0 additions & 1 deletion

File tree

arch/um/configs/x86_64_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,4 @@ CONFIG_PROC_KCORE=y
6060
CONFIG_TMPFS=y
6161
CONFIG_NLS=y
6262
CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
63-
CONFIG_FRAME_WARN=1024
6463
CONFIG_DEBUG_KERNEL=y

0 commit comments

Comments
 (0)