From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 3 Apr 2022 17:17:48 +0000 (-0700)
Subject: Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm
X-Git-Tag: baikal/aarch64/sdk6.1~4276
X-Git-Url: https://git.baikalelectronics.ru/?a=commitdiff_plain;h=0037c1e3ac5c5e1d328d4c684dda1cf391ad3d5a;p=kernel.git

Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm

Pull ARM fixes from Russell King:

 - avoid unnecessary rebuilds for library objects

 - fix return value of __setup handlers

 - fix invalid input check for "crashkernel=" kernel option

 - silence KASAN warnings in unwind_frame

* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 9191/1: arm/stacktrace, kasan: Silence KASAN warnings in unwind_frame()
  ARM: 9190/1: kdump: add invalid input check for 'crashkernel=0'
  ARM: 9187/1: JIVE: fix return value of __setup handler
  ARM: 9189/1: decompressor: fix unneeded rebuilds of library objects
---

0037c1e3ac5c5e1d328d4c684dda1cf391ad3d5a
diff --cc arch/arm/boot/compressed/Makefile
index 187a187706cbe,e65c7ad5dd4ca..41bcbb460fac4
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
@@@ -92,6 -92,13 +92,8 @@@ ifeq ($(CONFIG_USE_OF),y
  OBJS	+= $(libfdt_objs) fdt_check_mem_start.o
  endif
  
 -# -fstack-protector-strong triggers protection checks in this code,
 -# but it is being used too early to link to meaningful stack_chk logic.
 -$(foreach o, $(libfdt_objs) atags_to_fdt.o fdt_check_mem_start.o, \
 -	$(eval CFLAGS_$(o) := -I $(srctree)/scripts/dtc/libfdt -fno-stack-protector))
 -
+ OBJS	+= lib1funcs.o ashldi3.o bswapsdi2.o
+ 
  targets       := vmlinux vmlinux.lds piggy_data piggy.o \
  		 head.o $(OBJS)