Commit 3a7b4b91 authored by popcornmix's avatar popcornmix
Browse files

Merge remote-tracking branch 'stable/linux-4.19.y' into rpi-4.19.y

parents e95c533e 7a6bfa08

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 57

SUBLEVEL = 58

EXTRAVERSION =

NAME = "People's Front"

arch/arm/boot/dts/armada-xp-98dx3236.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -336,3 +336,11 @@ 
	status = "disabled";

};



&uart0 {

	compatible = "marvell,armada-38x-uart";

};



&uart1 {

	compatible = "marvell,armada-38x-uart";

};

arch/arm64/kernel/module.c

+6 −2
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 


void *module_alloc(unsigned long size)

{

	u64 module_alloc_end = module_alloc_base + MODULES_VSIZE;

	gfp_t gfp_mask = GFP_KERNEL;

	void *p;
@@ -39,9 +40,12 @@ void *module_alloc(unsigned long size) 
	if (IS_ENABLED(CONFIG_ARM64_MODULE_PLTS))

		gfp_mask |= __GFP_NOWARN;



	if (IS_ENABLED(CONFIG_KASAN))

		/* don't exceed the static module region - see below */

		module_alloc_end = MODULES_END;



	p = __vmalloc_node_range(size, MODULE_ALIGN, module_alloc_base,

				module_alloc_base + MODULES_VSIZE,

				gfp_mask, PAGE_KERNEL_EXEC, 0,

				module_alloc_end, gfp_mask, PAGE_KERNEL_EXEC, 0,

				NUMA_NO_NODE, __builtin_return_address(0));



	if (!p && IS_ENABLED(CONFIG_ARM64_MODULE_PLTS) &&

arch/mips/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ archscripts: scripts_basic 
	$(Q)$(MAKE) $(build)=arch/mips/boot/tools relocs



KBUILD_DEFCONFIG := 32r2el_defconfig

KBUILD_DTBS      := dtbs



#

# Select the object file format to substitute into the linker script.
@@ -385,7 +386,7 @@ quiet_cmd_64 = OBJCOPY $@ 
vmlinux.64: vmlinux

	$(call cmd,64)



all:	$(all-y)

all:	$(all-y) $(KBUILD_DTBS)



# boot

$(boot-y): $(vmlinux-32) FORCE

arch/mips/mm/mmap.c

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ unsigned long arch_randomize_brk(struct mm_struct *mm) 


int __virt_addr_valid(const volatile void *kaddr)

{

	unsigned long vaddr = (unsigned long)vaddr;

	unsigned long vaddr = (unsigned long)kaddr;



	if ((vaddr < PAGE_OFFSET) || (vaddr >= MAP_BASE))

		return 0;