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

Commit 566660b1 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge remote-tracking branch '4.9/tmp-77d35888' into 4.9"

parents ff12b671 303cde80

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 30

SUBLEVEL = 31

EXTRAVERSION =

NAME = Roaring Lionus

arch/alpha/include/uapi/asm/socket.h

+2 −0
Original line number Diff line number Diff line
@@ -97,4 +97,6 @@ 


#define SO_CNX_ADVICE		53



#define SO_COOKIE		57



#endif /* _UAPI_ASM_SOCKET_H */

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/avr32/include/uapi/asm/socket.h

+2 −0
Original line number Diff line number Diff line
@@ -90,4 +90,6 @@ 


#define SO_CNX_ADVICE		53



#define SO_COOKIE		57



#endif /* _UAPI__ASM_AVR32_SOCKET_H */

arch/frv/include/uapi/asm/socket.h

+2 −0
Original line number Diff line number Diff line
@@ -90,5 +90,7 @@ 


#define SO_CNX_ADVICE		53



#define SO_COOKIE		57



#endif /* _ASM_SOCKET_H */