Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 92cf048b authored by derfelot's avatar derfelot
Browse files

Merge Linux 4.4.291 kernel 

Changes in 4.4.291: (18 commits)
        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
parents 91ad97f1 e0018f4c

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 4

SUBLEVEL = 290

SUBLEVEL = 291

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/arm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
# Ensure linker flags are correct

LDFLAGS		:=



LDFLAGS_vmlinux	:=-p --no-undefined -X --pic-veneer

LDFLAGS_vmlinux	:= --no-undefined -X --pic-veneer

ifeq ($(CONFIG_CPU_ENDIAN_BE8),y)

LDFLAGS_vmlinux	+= --be8

LDFLAGS_MODULE	+= --be8

arch/arm/boot/bootp/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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)\"

arch/arm/boot/compressed/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -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

arch/arm/boot/compressed/decompress.c

+3 −0
Original line number Diff line number Diff line
@@ -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