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

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

Merge "Merge android-4.9.111 (03c70fea) into msm-4.9"

parents 83701819 fe646305

Documentation/printk-formats.txt

+1 −2
Original line number Diff line number Diff line
@@ -279,11 +279,10 @@ struct clk: 


	%pC	pll1

	%pCn	pll1

	%pCr	1560000000



	For printing struct clk structures. '%pC' and '%pCn' print the name

	(Common Clock Framework) or address (legacy clock framework) of the

	structure; '%pCr' prints the current clock rate.

	structure.



	Passed by reference.

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 110

SUBLEVEL = 111

EXTRAVERSION =

NAME = Roaring Lionus

arch/arm/include/asm/kgdb.h

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ extern int kgdb_fault_expected; 


#define KGDB_MAX_NO_CPUS	1

#define BUFMAX			400

#define NUMREGBYTES		(DBG_MAX_REG_NUM << 2)

#define NUMREGBYTES		(GDB_MAX_REGS << 2)

#define NUMCRITREGBYTES		(32 << 2)



#define _R0			0

arch/arm64/kernel/cpufeature.c

+1 −1
Original line number Diff line number Diff line
@@ -825,7 +825,7 @@ static int __init parse_kpti(char *str) 
	__kpti_forced = enabled ? 1 : -1;

	return 0;

}

__setup("kpti=", parse_kpti);

early_param("kpti", parse_kpti);

#endif	/* CONFIG_UNMAP_KERNEL_AT_EL0 */



static const struct arm64_cpu_capabilities arm64_features[] = {

arch/arm64/mm/proc.S

+3 −2
Original line number Diff line number Diff line
@@ -241,8 +241,9 @@ ENDPROC(idmap_cpu_replace_ttbr1) 


	.macro __idmap_kpti_put_pgtable_ent_ng, type

	orr	\type, \type, #PTE_NG		// Same bit for blocks and pages

	str	\type, [cur_\()\type\()p]	// Update the entry and ensure it

	dc	civac, cur_\()\type\()p		// is visible to all CPUs.

	str	\type, [cur_\()\type\()p]	// Update the entry and ensure

	dmb	sy				// that it is visible to all

	dc	civac, cur_\()\type\()p		// CPUs.

	.endm



/*