diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2021-11-02 17:52:36 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2021-11-02 17:52:36 +0100 |
| commit | 8a5b8c8b0a4c26bb588e0e0c4034e1bef28ff82f (patch) | |
| tree | 252e2e1e0a2c24bffc0e2aae30ffd12eda708f09 /arch/arm/boot | |
| parent | f9d6c5b38776d05c5c99ae84b68caf7639c22d2f (diff) | |
| parent | e0018f4c9325b36ae75a591d54879bf9a9f41a26 (diff) | |
Merge 4.4.291 into android-4.4-p
Changes in 4.4.291
ARM: 9133/1: mm: proc-macros: ensure *_tlb_fns are 4B aligned
ARM: 9134/1: remove duplicate memcpy() definition
ARM: 9139/1: kprobes: fix arch_init_kprobes() prototype
ARM: 8819/1: Remove '-p' from LDFLAGS
usbnet: sanity check for maxpacket
usbnet: fix error return code in usbnet_probe()
ata: sata_mv: Fix the error handling of mv_chip_id()
nfc: port100: fix using -ERRNO as command type mask
Revert "net: mdiobus: Fix memory leak in __mdiobus_register"
mmc: vub300: fix control-message timeouts
mmc: dw_mmc: exynos: fix the finding clock sample value
mmc: sdhci: Map more voltage level to SDHCI_POWER_330
net: lan78xx: fix division by zero in send path
regmap: Fix possible double-free in regcache_rbtree_exit()
nios2: Make NIOS2_DTB_SOURCE_BOOL depend on !COMPILE_TEST
sctp: use init_tag from inithdr for ABORT chunk
sctp: add vtag check in sctp_sf_violation
Linux 4.4.291
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I32546318dfb86394483636588558ceced64faae0
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/bootp/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/boot/compressed/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/boot/compressed/decompress.c | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/boot/bootp/Makefile b/arch/arm/boot/bootp/Makefile index 5761f0039133..9ee49d50842f 100644 --- a/arch/arm/boot/bootp/Makefile +++ b/arch/arm/boot/bootp/Makefile @@ -7,7 +7,7 @@ GCOV_PROFILE := n -LDFLAGS_bootp :=-p --no-undefined -X \ +LDFLAGS_bootp := --no-undefined -X \ --defsym initrd_phys=$(INITRD_PHYS) \ --defsym params_phys=$(PARAMS_PHYS) -T AFLAGS_initrd.o :=-DINITRD=\"$(INITRD)\" diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile index 7f167276d4c5..b4631e07b3b6 100644 --- a/arch/arm/boot/compressed/Makefile +++ b/arch/arm/boot/compressed/Makefile @@ -122,8 +122,6 @@ endif ifeq ($(CONFIG_CPU_ENDIAN_BE8),y) LDFLAGS_vmlinux += --be8 endif -# ? -LDFLAGS_vmlinux += -p # Report unresolved symbol references LDFLAGS_vmlinux += --no-undefined # Delete all temporary local symbols diff --git a/arch/arm/boot/compressed/decompress.c b/arch/arm/boot/compressed/decompress.c index a0765e7ed6c7..b0255cbf3b76 100644 --- a/arch/arm/boot/compressed/decompress.c +++ b/arch/arm/boot/compressed/decompress.c @@ -46,7 +46,10 @@ extern char * strstr(const char * s1, const char *s2); #endif #ifdef CONFIG_KERNEL_XZ +/* Prevent KASAN override of string helpers in decompressor */ +#undef memmove #define memmove memmove +#undef memcpy #define memcpy memcpy #include "../../../../lib/decompress_unxz.c" #endif |