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

Commit 74b345dd authored by Niranjan Reddy Dumbala's avatar Niranjan Reddy Dumbala
Browse files

Merge commit 'refs/changes/05/2487005/1' of... 

Merge commit 'refs/changes/05/2487005/1' of ssh://git-android-hyd.quicinc.com:29418/kernel/msm-4.14

 into HEAD

Change-Id: Ibb0c429ef6dd042deeda3c43dbb475704658667e
Signed-off-by: default avatarAshwini Muduganti <amudug@codeaurora.org>
Signed-off-by: default avatarNiranjan Reddy Dumbala <dnreddy@codeaurora.org>
parents 719afa89 5fe0bb52

Makefile

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

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 77

SUBLEVEL = 78

EXTRAVERSION =

NAME = Petit Gorille

arch/arc/Makefile

+1 −23
Original line number Diff line number Diff line
@@ -6,34 +6,12 @@ 
# published by the Free Software Foundation.

#



ifeq ($(CROSS_COMPILE),)

ifndef CONFIG_CPU_BIG_ENDIAN

CROSS_COMPILE := arc-linux-

else

CROSS_COMPILE := arceb-linux-

endif

endif



KBUILD_DEFCONFIG := nsim_700_defconfig



cflags-y	+= -fno-common -pipe -fno-builtin -mmedium-calls -D__linux__

cflags-$(CONFIG_ISA_ARCOMPACT)	+= -mA7

cflags-$(CONFIG_ISA_ARCV2)	+= -mcpu=archs



is_700 = $(shell $(CC) -dM -E - < /dev/null | grep -q "ARC700" && echo 1 || echo 0)



ifdef CONFIG_ISA_ARCOMPACT

ifeq ($(is_700), 0)

    $(error Toolchain not configured for ARCompact builds)

endif

endif



ifdef CONFIG_ISA_ARCV2

ifeq ($(is_700), 1)

    $(error Toolchain not configured for ARCv2 builds)

endif

endif



ifdef CONFIG_ARC_CURR_IN_REG

# For a global register defintion, make sure it gets passed to every file

# We had a customer reported bug where some code built in kernel was NOT using
@@ -87,7 +65,7 @@ ldflags-$(CONFIG_CPU_BIG_ENDIAN) += -EB 
# --build-id w/o "-marclinux". Default arc-elf32-ld is OK

ldflags-$(upto_gcc44)			+= -marclinux



LIBGCC	:= $(shell $(CC) $(cflags-y) --print-libgcc-file-name)

LIBGCC	= $(shell $(CC) $(cflags-y) --print-libgcc-file-name)



# Modules with short calls might break for calls into builtin-kernel

KBUILD_CFLAGS_MODULE	+= -mlong-calls -mno-millicode

arch/powerpc/include/asm/code-patching.h

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ unsigned int create_cond_branch(const unsigned int *addr, 
				unsigned long target, int flags);

int patch_branch(unsigned int *addr, unsigned long target, int flags);

int patch_instruction(unsigned int *addr, unsigned int instr);

int raw_patch_instruction(unsigned int *addr, unsigned int instr);



int instr_is_relative_branch(unsigned int instr);

int instr_is_relative_link_branch(unsigned int instr);

arch/powerpc/kernel/tm.S

+17 −3
Original line number Diff line number Diff line
@@ -167,13 +167,27 @@ _GLOBAL(tm_reclaim) 
	std	r1, PACATMSCRATCH(r13)

	ld	r1, PACAR1(r13)



	/* Store the PPR in r11 and reset to decent value */

	std	r11, GPR11(r1)			/* Temporary stash */



	/*

	 * Move the saved user r1 to the kernel stack in case PACATMSCRATCH is

	 * clobbered by an exception once we turn on MSR_RI below.

	 */

	ld	r11, PACATMSCRATCH(r13)

	std	r11, GPR1(r1)



	/*

	 * Store r13 away so we can free up the scratch SPR for the SLB fault

	 * handler (needed once we start accessing the thread_struct).

	 */

	GET_SCRATCH0(r11)

	std	r11, GPR13(r1)



	/* Reset MSR RI so we can take SLB faults again */

	li	r11, MSR_RI

	mtmsrd	r11, 1



	/* Store the PPR in r11 and reset to decent value */

	mfspr	r11, SPRN_PPR

	HMT_MEDIUM
@@ -198,11 +212,11 @@ _GLOBAL(tm_reclaim) 
	SAVE_GPR(8, r7)				/* user r8 */

	SAVE_GPR(9, r7)				/* user r9 */

	SAVE_GPR(10, r7)			/* user r10 */

	ld	r3, PACATMSCRATCH(r13)		/* user r1 */

	ld	r3, GPR1(r1)			/* user r1 */

	ld	r4, GPR7(r1)			/* user r7 */

	ld	r5, GPR11(r1)			/* user r11 */

	ld	r6, GPR12(r1)			/* user r12 */

	GET_SCRATCH0(8)				/* user r13 */

	ld	r8, GPR13(r1)			/* user r13 */

	std	r3, GPR1(r7)

	std	r4, GPR7(r7)

	std	r5, GPR11(r7)

arch/powerpc/lib/code-patching.c

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ static int __patch_instruction(unsigned int *exec_addr, unsigned int instr, 
	return 0;

}



static int raw_patch_instruction(unsigned int *addr, unsigned int instr)

int raw_patch_instruction(unsigned int *addr, unsigned int instr)

{

	return __patch_instruction(addr, instr, addr);

}
@@ -156,7 +156,7 @@ static int do_patch_instruction(unsigned int *addr, unsigned int instr) 
	 * when text_poke_area is not ready, but we still need

	 * to allow patching. We just do the plain old patching

	 */

	if (!this_cpu_read(*PTRRELOC(&text_poke_area)))

	if (!this_cpu_read(text_poke_area))

		return raw_patch_instruction(addr, instr);



	local_irq_save(flags);