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

Commit b552aaf6 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-4.14-p.105 (e7422533) into msm-4.14"

parents 403f8234 57c2bb95

Makefile

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

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 104

SUBLEVEL = 105

EXTRAVERSION =

NAME = Petit Gorille

arch/arc/include/asm/bitops.h

+3 −3
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ static inline __attribute__ ((const)) int __fls(unsigned long x) 
/*

 * __ffs: Similar to ffs, but zero based (0-31)

 */

static inline __attribute__ ((const)) int __ffs(unsigned long word)

static inline __attribute__ ((const)) unsigned long __ffs(unsigned long word)

{

	if (!word)

		return word;
@@ -400,9 +400,9 @@ static inline __attribute__ ((const)) int ffs(unsigned long x) 
/*

 * __ffs: Similar to ffs, but zero based (0-31)

 */

static inline __attribute__ ((const)) int __ffs(unsigned long x)

static inline __attribute__ ((const)) unsigned long __ffs(unsigned long x)

{

	int n;

	unsigned long n;



	asm volatile(

	"	ffs.f	%0, %1		\n"  /* 0:31; 31(Z) if src 0 */

arch/mips/kernel/cmpxchg.c

+1 −2
Original line number Diff line number Diff line
@@ -54,10 +54,9 @@ unsigned long __xchg_small(volatile void *ptr, unsigned long val, unsigned int s 
unsigned long __cmpxchg_small(volatile void *ptr, unsigned long old,

			      unsigned long new, unsigned int size)

{

	u32 mask, old32, new32, load32;

	u32 mask, old32, new32, load32, load;

	volatile u32 *ptr32;

	unsigned int shift;

	u8 load;



	/* Check that ptr is naturally aligned */

	WARN_ON((unsigned long)ptr & (size - 1));

arch/mips/net/ebpf_jit.c

+1 −1
Original line number Diff line number Diff line
@@ -1971,7 +1971,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog) 


	/* Update the icache */

	flush_icache_range((unsigned long)ctx.target,

			   (unsigned long)(ctx.target + ctx.idx * sizeof(u32)));

			   (unsigned long)&ctx.target[ctx.idx]);



	if (bpf_jit_enable > 1)

		/* Dump JIT code */

arch/powerpc/include/asm/epapr_hcalls.h

+6 −6
Original line number Diff line number Diff line
@@ -508,7 +508,7 @@ static unsigned long epapr_hypercall(unsigned long *in, 


static inline long epapr_hypercall0_1(unsigned int nr, unsigned long *r2)

{

	unsigned long in[8];

	unsigned long in[8] = {0};

	unsigned long out[8];

	unsigned long r;
@@ -520,7 +520,7 @@ static inline long epapr_hypercall0_1(unsigned int nr, unsigned long *r2) 


static inline long epapr_hypercall0(unsigned int nr)

{

	unsigned long in[8];

	unsigned long in[8] = {0};

	unsigned long out[8];



	return epapr_hypercall(in, out, nr);
@@ -528,7 +528,7 @@ static inline long epapr_hypercall0(unsigned int nr) 


static inline long epapr_hypercall1(unsigned int nr, unsigned long p1)

{

	unsigned long in[8];

	unsigned long in[8] = {0};

	unsigned long out[8];



	in[0] = p1;
@@ -538,7 +538,7 @@ static inline long epapr_hypercall1(unsigned int nr, unsigned long p1) 
static inline long epapr_hypercall2(unsigned int nr, unsigned long p1,

				    unsigned long p2)

{

	unsigned long in[8];

	unsigned long in[8] = {0};

	unsigned long out[8];



	in[0] = p1;
@@ -549,7 +549,7 @@ static inline long epapr_hypercall2(unsigned int nr, unsigned long p1, 
static inline long epapr_hypercall3(unsigned int nr, unsigned long p1,

				    unsigned long p2, unsigned long p3)

{

	unsigned long in[8];

	unsigned long in[8] = {0};

	unsigned long out[8];



	in[0] = p1;
@@ -562,7 +562,7 @@ static inline long epapr_hypercall4(unsigned int nr, unsigned long p1, 
				    unsigned long p2, unsigned long p3,

				    unsigned long p4)

{

	unsigned long in[8];

	unsigned long in[8] = {0};

	unsigned long out[8];



	in[0] = p1;