Commit 5d63a459 authored by popcornmix's avatar popcornmix
Browse files

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

parents 60feca6e 0d7866d5

Makefile

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

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 97

SUBLEVEL = 98

EXTRAVERSION =

NAME = Petit Gorille

arch/arm/mach-cns3xxx/pcie.c

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static void __iomem *cns3xxx_pci_map_bus(struct pci_bus *bus, 
	} else /* remote PCI bus */

		base = cnspci->cfg1_regs + ((busno & 0xf) << 20);



	return base + (where & 0xffc) + (devfn << 12);

	return base + where + (devfn << 12);

}



static int cns3xxx_pci_read_config(struct pci_bus *bus, unsigned int devfn,

arch/arm64/kernel/hibernate.c

+3 −1
Original line number Diff line number Diff line
@@ -299,8 +299,10 @@ int swsusp_arch_suspend(void) 
		dcache_clean_range(__idmap_text_start, __idmap_text_end);



		/* Clean kvm setup code to PoC? */

		if (el2_reset_needed())

		if (el2_reset_needed()) {

			dcache_clean_range(__hyp_idmap_text_start, __hyp_idmap_text_end);

			dcache_clean_range(__hyp_text_start, __hyp_text_end);

		}



		/* make the crash dump kernel image protected again */

		crash_post_resume();

arch/arm64/kernel/hyp-stub.S

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ 
#include <asm/virt.h>



	.text

	.pushsection	.hyp.text, "ax"



	.align 11



ENTRY(__hyp_stub_vectors)

arch/arm64/kernel/kaslr.c

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ u64 __init kaslr_early_init(u64 dt_phys) 
	 * we end up running with module randomization disabled.

	 */

	module_alloc_base = (u64)_etext - MODULES_VSIZE;

	__flush_dcache_area(&module_alloc_base, sizeof(module_alloc_base));



	/*

	 * Try to map the FDT early. If this fails, we simply bail,