Commit be424836 authored by popcornmix's avatar popcornmix
Browse files

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

parents 87603435 f1aa865a

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 30

SUBLEVEL = 31

EXTRAVERSION =

NAME = Roaring Lionus

arch/arm64/net/bpf_jit_comp.c

+3 −2
Original line number Diff line number Diff line
@@ -252,8 +252,9 @@ static int emit_bpf_tail_call(struct jit_ctx *ctx) 
	 */

	off = offsetof(struct bpf_array, ptrs);

	emit_a64_mov_i64(tmp, off, ctx);

	emit(A64_LDR64(tmp, r2, tmp), ctx);

	emit(A64_LDR64(prg, tmp, r3), ctx);

	emit(A64_ADD(1, tmp, r2, tmp), ctx);

	emit(A64_LSL(1, prg, r3, 3), ctx);

	emit(A64_LDR64(prg, tmp, prg), ctx);

	emit(A64_CBZ(1, prg, jmp_offset), ctx);



	/* goto *(prog->bpf_func + prologue_size); */

arch/powerpc/platforms/cell/spu_base.c

+3 −1
Original line number Diff line number Diff line
@@ -197,7 +197,9 @@ static int __spu_trap_data_map(struct spu *spu, unsigned long ea, u64 dsisr) 
	    (REGION_ID(ea) != USER_REGION_ID)) {



		spin_unlock(&spu->register_lock);

		ret = hash_page(ea, _PAGE_PRESENT | _PAGE_READ, 0x300, dsisr);

		ret = hash_page(ea,

				_PAGE_PRESENT | _PAGE_READ | _PAGE_PRIVILEGED,

				0x300, dsisr);

		spin_lock(&spu->register_lock);



		if (!ret) {

arch/sparc/include/asm/pgtable_32.h

+2 −2
Original line number Diff line number Diff line
@@ -91,9 +91,9 @@ extern unsigned long pfn_base; 
 * ZERO_PAGE is a global shared page that is always zero: used

 * for zero-mapped memory areas etc..

 */

extern unsigned long empty_zero_page;

extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)];



#define ZERO_PAGE(vaddr) (virt_to_page(&empty_zero_page))

#define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page))



/*

 * In general all page table modifications should use the V8 atomic

arch/sparc/include/asm/setup.h

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ extern char reboot_command[]; 
 */

extern unsigned char boot_cpu_id;



extern unsigned long empty_zero_page;

extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)];



extern int serial_console;

static inline int con_is_present(void)