summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Heidelberg <david@ixit.cz>2021-08-09 19:07:30 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-09-18 13:40:09 +0200
commitce7e64e63acf42f9d1fe36ec300e56af63958814 (patch)
tree454ab4a141ce5a3f59da3f2b3470a2189b92ee95
parentba73bc1666153257550a47f6bcc67a5fc4871427 (diff)
downloadlinux-stable-ce7e64e63acf42f9d1fe36ec300e56af63958814.tar.gz
linux-stable-ce7e64e63acf42f9d1fe36ec300e56af63958814.tar.bz2
linux-stable-ce7e64e63acf42f9d1fe36ec300e56af63958814.zip
ARM: 9105/1: atags_to_fdt: don't warn about stack size
commit b30d0289de72c62516df03fdad8d53f552c69839 upstream. The merge_fdt_bootargs() function by definition consumes more than 1024 bytes of stack because it has a 1024 byte command line on the stack, meaning that we always get a warning when building this file: arch/arm/boot/compressed/atags_to_fdt.c: In function 'merge_fdt_bootargs': arch/arm/boot/compressed/atags_to_fdt.c:98:1: warning: the frame size of 1032 bytes is larger than 1024 bytes [-Wframe-larger-than=] However, as this is the decompressor and we know that it has a very shallow call chain, and we do not actually risk overflowing the kernel stack at runtime here. This just shuts up the warning by disabling the warning flag for this file. Tested on Nexus 7 2012 builds. Acked-by: Nicolas Pitre <nico@fluxnic.net> Signed-off-by: David Heidelberg <david@ixit.cz> Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: <stable@vger.kernel.org> Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/arm/boot/compressed/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
index 0d6ee56f5831..175213d7a1aa 100644
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
@@ -84,6 +84,8 @@ compress-$(CONFIG_KERNEL_LZ4) = lz4
libfdt_objs := fdt_rw.o fdt_ro.o fdt_wip.o fdt.o
ifeq ($(CONFIG_ARM_ATAG_DTB_COMPAT),y)
+CFLAGS_REMOVE_atags_to_fdt.o += -Wframe-larger-than=${CONFIG_FRAME_WARN}
+CFLAGS_atags_to_fdt.o += -Wframe-larger-than=1280
OBJS += $(libfdt_objs) atags_to_fdt.o
endif