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

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

Merge "Merge commit 'refs/changes/47/2477947/2' of... 

Merge "Merge commit 'refs/changes/47/2477947/2' of ssh://git.quicinc.com:29418/kernel/msm-4.14 into HEAD" into kernel.lnx.4.14.r1
parents 80e560b2 0980b7c2

Makefile

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

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 74

SUBLEVEL = 75

EXTRAVERSION =

NAME = Petit Gorille

arch/arc/include/asm/atomic.h

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ static inline int atomic_fetch_##op(int i, atomic_t *v) \ 
	"1:	llock   %[orig], [%[ctr]]		\n"		\

	"	" #asm_op " %[val], %[orig], %[i]	\n"		\

	"	scond   %[val], [%[ctr]]		\n"		\

	"						\n"		\

	"	bnz     1b				\n"		\

	: [val]	"=&r"	(val),						\

	  [orig] "=&r" (orig)						\

	: [ctr]	"r"	(&v->counter),					\

arch/arm64/include/asm/jump_label.h

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 


static __always_inline bool arch_static_branch(struct static_key *key, bool branch)

{

	asm goto("1: nop\n\t"

	asm_volatile_goto("1: nop\n\t"

		 ".pushsection __jump_table,  \"aw\"\n\t"

		 ".align 3\n\t"

		 ".quad 1b, %l[l_yes], %c0\n\t"
@@ -42,7 +42,7 @@ static __always_inline bool arch_static_branch(struct static_key *key, bool bran 


static __always_inline bool arch_static_branch_jump(struct static_key *key, bool branch)

{

	asm goto("1: b %l[l_yes]\n\t"

	asm_volatile_goto("1: b %l[l_yes]\n\t"

		 ".pushsection __jump_table,  \"aw\"\n\t"

		 ".align 3\n\t"

		 ".quad 1b, %l[l_yes], %c0\n\t"

arch/hexagon/include/asm/bitops.h

+2 −2
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ static inline long ffz(int x) 
 * This is defined the same way as ffs.

 * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.

 */

static inline long fls(int x)

static inline int fls(int x)

{

	int r;
@@ -232,7 +232,7 @@ static inline long fls(int x) 
 * the libc and compiler builtin ffs routines, therefore

 * differs in spirit from the above ffz (man ffs).

 */

static inline long ffs(int x)

static inline int ffs(int x)

{

	int r;

arch/hexagon/kernel/dma.c

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ static void *hexagon_dma_alloc_coherent(struct device *dev, size_t size, 
			panic("Can't create %s() memory pool!", __func__);

		else

			gen_pool_add(coherent_pool,

				pfn_to_virt(max_low_pfn),

				(unsigned long)pfn_to_virt(max_low_pfn),

				hexagon_coherent_pool_size, -1);

	}