diff options
| author | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2024-07-27 09:13:09 +0100 |
|---|---|---|
| committer | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2024-07-27 09:13:09 +0100 |
| commit | d7ac67b94390945872713f9bb0c141bf158c83aa (patch) | |
| tree | 6ece8ec7e74c0f2fe55c4a87a6d0c952738247b0 /arch/arm/boot | |
| parent | 657a292d679ae3a6c733ab0e939e24ae44b20faf (diff) | |
| parent | 2335c9cb831faba1a4efcc612886073b6f175fe4 (diff) | |
Merge branches 'fixes' and 'misc' into for-linus
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/compressed/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/boot/compressed/vmlinux.lds.S | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile index 6bca03c0c7f0..945b5975fce2 100644 --- a/arch/arm/boot/compressed/Makefile +++ b/arch/arm/boot/compressed/Makefile @@ -9,6 +9,7 @@ OBJS = HEAD = head.o OBJS += misc.o decompress.o +CFLAGS_decompress.o += $(DISABLE_STACKLEAK_PLUGIN) ifeq ($(CONFIG_DEBUG_UNCOMPRESS),y) OBJS += debug.o AFLAGS_head.o += -DDEBUG diff --git a/arch/arm/boot/compressed/vmlinux.lds.S b/arch/arm/boot/compressed/vmlinux.lds.S index 3fcb3e62dc56..d411abd4310e 100644 --- a/arch/arm/boot/compressed/vmlinux.lds.S +++ b/arch/arm/boot/compressed/vmlinux.lds.S @@ -125,7 +125,7 @@ SECTIONS . = BSS_START; __bss_start = .; - .bss : { *(.bss) } + .bss : { *(.bss .bss.*) } _end = .; . = ALIGN(8); /* the stack must be 64-bit aligned */ |