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

Commit 8fdeb0be authored by Alex Shi's avatar Alex Shi
Browse files

Merge tag 'v3.18.27' into linux-linaro-lsk-v3.18 

 This is the 3.18.27 stable release
parents 130faf37 2c07053b

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 26

SUBLEVEL = 27

EXTRAVERSION =

NAME = Diseased Newt

arch/arm/boot/dts/sama5d4.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -985,7 +985,7 @@ 
			dbgu: serial@fc069000 {

				compatible = "atmel,at91sam9260-usart";

				reg = <0xfc069000 0x200>;

				interrupts = <2 IRQ_TYPE_LEVEL_HIGH 7>;

				interrupts = <45 IRQ_TYPE_LEVEL_HIGH 7>;

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_dbgu>;

				clocks = <&dbgu_clk>;

arch/arm/boot/dts/ste-nomadik-stn8815.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ 
			mmcsd_default_mux: mmcsd_mux {

				mmcsd_default_mux {

					ste,function = "mmcsd";

					ste,pins = "mmcsd_a_1";

					ste,pins = "mmcsd_a_1", "mmcsd_b_1";

				};

			};

			mmcsd_default_mode: mmcsd_default {
@@ -127,9 +127,9 @@ 
					ste,output = <0>;

				};

				mmcsd_default_cfg2 {

					/* MCCMDDIR, MCDAT0DIR, MCDAT31DIR */

					/* MCCMDDIR, MCDAT0DIR, MCDAT31DIR, MCDATDIR2 */

					ste,pins = "GPIO10_C11", "GPIO15_A12",

					"GPIO16_C13";

					"GPIO16_C13", "GPIO23_D15";

					ste,output = <1>;

				};

				mmcsd_default_cfg3 {

arch/arm/net/bpf_jit_32.c

+1 −15
Original line number Diff line number Diff line
@@ -161,19 +161,6 @@ static inline int mem_words_used(struct jit_ctx *ctx) 
	return fls(ctx->seen & SEEN_MEM);

}



static inline bool is_load_to_a(u16 inst)

{

	switch (inst) {

	case BPF_LD | BPF_W | BPF_LEN:

	case BPF_LD | BPF_W | BPF_ABS:

	case BPF_LD | BPF_H | BPF_ABS:

	case BPF_LD | BPF_B | BPF_ABS:

		return true;

	default:

		return false;

	}

}



static void jit_fill_hole(void *area, unsigned int size)

{

	u32 *ptr;
@@ -185,7 +172,6 @@ static void jit_fill_hole(void *area, unsigned int size) 
static void build_prologue(struct jit_ctx *ctx)

{

	u16 reg_set = saved_regs(ctx);

	u16 first_inst = ctx->skf->insns[0].code;

	u16 off;



#ifdef CONFIG_FRAME_POINTER
@@ -215,7 +201,7 @@ static void build_prologue(struct jit_ctx *ctx) 
		emit(ARM_MOV_I(r_X, 0), ctx);



	/* do not leak kernel data to userspace */

	if ((first_inst != (BPF_RET | BPF_K)) && !(is_load_to_a(first_inst)))

	if (bpf_needs_clear_a(&ctx->skf->insns[0]))

		emit(ARM_MOV_I(r_A, 0), ctx);



	/* stack space for the BPF_MEM words */

arch/arm64/kernel/setup.c

+4 −0
Original line number Diff line number Diff line
@@ -503,6 +503,10 @@ static int c_show(struct seq_file *m, void *v) 
		seq_printf(m, "processor\t: %d\n", i);

#endif



		seq_printf(m, "BogoMIPS\t: %lu.%02lu\n",

			   loops_per_jiffy / (500000UL/HZ),

			   loops_per_jiffy / (5000UL/HZ) % 100);



		/*

		 * Dump out the common processor features in a single line.

		 * Userspace should read the hwcaps with getauxval(AT_HWCAP)