Merge "Merge remote-tracking branch 'remotes/origin/tmp-9189141' into msm-4.14" (210fe280) · Commits · e / devices / android_kernel_oneplus_sm8150

Documentation/admin-guide/kernel-parameters.txt

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2694,6 +2694,8 @@
	steal time is computed, but won't influence scheduler		steal time is computed, but won't influence scheduler
	behaviour		behaviour

			nopti [X86-64] Disable kernel page table isolation

	nolapic [X86-32,APIC] Do not enable or use the local APIC.		nolapic [X86-32,APIC] Do not enable or use the local APIC.

	nolapic_timer [X86-32,APIC] Do not use the local APIC timer.		nolapic_timer [X86-32,APIC] Do not use the local APIC timer.
	@@ -3262,6 +3264,12 @@
	pt. [PARIDE]		pt. [PARIDE]
	See Documentation/blockdev/paride.txt.		See Documentation/blockdev/paride.txt.

			pti= [X86_64]
			Control user/kernel address space isolation:
			on - enable
			off - disable
			auto - default setting

	pty.legacy_count=		pty.legacy_count=
	[KNL] Number of legacy pty's. Overwrites compiled-in		[KNL] Number of legacy pty's. Overwrites compiled-in
	default number.		default number.

Documentation/x86/x86_64/mm.txt

+13 −8

Original line number	Original line	Diff line number	Diff line
	@@ -12,7 +12,9 @@ ffffea0000000000 - ffffeaffffffffff (=40 bits) virtual memory map (1TB)
	... unused hole ...		... unused hole ...
	ffffec0000000000 - fffffbffffffffff (=44 bits) kasan shadow memory (16TB)		ffffec0000000000 - fffffbffffffffff (=44 bits) kasan shadow memory (16TB)
	... unused hole ...		... unused hole ...
	fffffe8000000000 - fffffeffffffffff (=39 bits) cpu_entry_area mapping		vaddr_end for KASLR
			fffffe0000000000 - fffffe7fffffffff (=39 bits) cpu_entry_area mapping
			fffffe8000000000 - fffffeffffffffff (=39 bits) LDT remap for PTI
	ffffff0000000000 - ffffff7fffffffff (=39 bits) %esp fixup stacks		ffffff0000000000 - ffffff7fffffffff (=39 bits) %esp fixup stacks
	... unused hole ...		... unused hole ...
	ffffffef00000000 - fffffffeffffffff (=64 GB) EFI region mapping space		ffffffef00000000 - fffffffeffffffff (=64 GB) EFI region mapping space
	@@ -29,20 +31,22 @@ Virtual memory map with 5 level page tables:
	hole caused by [56:63] sign extension		hole caused by [56:63] sign extension
	ff00000000000000 - ff0fffffffffffff (=52 bits) guard hole, reserved for hypervisor		ff00000000000000 - ff0fffffffffffff (=52 bits) guard hole, reserved for hypervisor
	ff10000000000000 - ff8fffffffffffff (=55 bits) direct mapping of all phys. memory		ff10000000000000 - ff8fffffffffffff (=55 bits) direct mapping of all phys. memory
	ff90000000000000 - ff91ffffffffffff (=49 bits) hole		ff90000000000000 - ff9fffffffffffff (=52 bits) LDT remap for PTI
	ff92000000000000 - ffd1ffffffffffff (=54 bits) vmalloc/ioremap space		ffa0000000000000 - ffd1ffffffffffff (=54 bits) vmalloc/ioremap space (12800 TB)
	ffd2000000000000 - ffd3ffffffffffff (=49 bits) hole		ffd2000000000000 - ffd3ffffffffffff (=49 bits) hole
	ffd4000000000000 - ffd5ffffffffffff (=49 bits) virtual memory map (512TB)		ffd4000000000000 - ffd5ffffffffffff (=49 bits) virtual memory map (512TB)
	... unused hole ...		... unused hole ...
	ffdf000000000000 - fffffc0000000000 (=53 bits) kasan shadow memory (8PB)		ffdf000000000000 - fffffc0000000000 (=53 bits) kasan shadow memory (8PB)
	... unused hole ...		... unused hole ...
	fffffe8000000000 - fffffeffffffffff (=39 bits) cpu_entry_area mapping		vaddr_end for KASLR
			fffffe0000000000 - fffffe7fffffffff (=39 bits) cpu_entry_area mapping
			... unused hole ...
	ffffff0000000000 - ffffff7fffffffff (=39 bits) %esp fixup stacks		ffffff0000000000 - ffffff7fffffffff (=39 bits) %esp fixup stacks
	... unused hole ...		... unused hole ...
	ffffffef00000000 - fffffffeffffffff (=64 GB) EFI region mapping space		ffffffef00000000 - fffffffeffffffff (=64 GB) EFI region mapping space
	... unused hole ...		... unused hole ...
	ffffffff80000000 - ffffffff9fffffff (=512 MB) kernel text mapping, from phys 0		ffffffff80000000 - ffffffff9fffffff (=512 MB) kernel text mapping, from phys 0
	ffffffffa0000000 - [fixmap start] (~1526 MB) module mapping space		ffffffffa0000000 - fffffffffeffffff (1520 MB) module mapping space
	[fixmap start] - ffffffffff5fffff kernel-internal fixmap range		[fixmap start] - ffffffffff5fffff kernel-internal fixmap range
	ffffffffff600000 - ffffffffff600fff (=4 kB) legacy vsyscall ABI		ffffffffff600000 - ffffffffff600fff (=4 kB) legacy vsyscall ABI
	ffffffffffe00000 - ffffffffffffffff (=2 MB) unused hole		ffffffffffe00000 - ffffffffffffffff (=2 MB) unused hole
	@@ -66,9 +70,10 @@ memory window (this size is arbitrary, it can be raised later if needed).
	The mappings are not part of any other kernel PGD and are only available		The mappings are not part of any other kernel PGD and are only available
	during EFI runtime calls.		during EFI runtime calls.

	The module mapping space size changes based on the CONFIG requirements for the
	following fixmap section.

	Note that if CONFIG_RANDOMIZE_MEMORY is enabled, the direct mapping of all		Note that if CONFIG_RANDOMIZE_MEMORY is enabled, the direct mapping of all
	physical memory, vmalloc/ioremap space and virtual memory map are randomized.		physical memory, vmalloc/ioremap space and virtual memory map are randomized.
	Their order is preserved but their base will be offset early at boot time.		Their order is preserved but their base will be offset early at boot time.

			Be very careful vs. KASLR when changing anything here. The KASLR address
			range must not overlap with anything except the KASAN shadow area, which is
			correct as KASAN disables KASLR.

Makefile

+4 −1

Original line number	Original line	Diff line number	Diff line
	# SPDX-License-Identifier: GPL-2.0		# SPDX-License-Identifier: GPL-2.0
	VERSION = 4		VERSION = 4
	PATCHLEVEL = 14		PATCHLEVEL = 14
	SUBLEVEL = 10		SUBLEVEL = 13
	EXTRAVERSION =		EXTRAVERSION =
	NAME = Petit Gorille		NAME = Petit Gorille

	@@ -817,6 +817,9 @@ KBUILD_CFLAGS += $(call cc-disable-warning, pointer-sign)
	# disable invalid "can't wrap" optimizations for signed / pointers		# disable invalid "can't wrap" optimizations for signed / pointers
	KBUILD_CFLAGS += $(call cc-option,-fno-strict-overflow)		KBUILD_CFLAGS += $(call cc-option,-fno-strict-overflow)

			# Make sure -fstack-check isn't enabled (like gentoo apparently did)
			KBUILD_CFLAGS += $(call cc-option,-fno-stack-check,)

	# conserve stack if available		# conserve stack if available
	KBUILD_CFLAGS += $(call cc-option,-fconserve-stack)		KBUILD_CFLAGS += $(call cc-option,-fconserve-stack)

arch/arc/include/asm/uaccess.h

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -668,6 +668,7 @@ __arc_strncpy_from_user(char dst, const char __user src, long count)
	return 0;		return 0;

	__asm__ __volatile__(		__asm__ __volatile__(
			" mov lp_count, %5 \n"
	" lp 3f \n"		" lp 3f \n"
	"1: ldb.ab %3, [%2, 1] \n"		"1: ldb.ab %3, [%2, 1] \n"
	" breq.d %3, 0, 3f \n"		" breq.d %3, 0, 3f \n"
	@@ -684,8 +685,8 @@ __arc_strncpy_from_user(char dst, const char __user src, long count)
	" .word 1b, 4b \n"		" .word 1b, 4b \n"
	" .previous \n"		" .previous \n"
	: "+r"(res), "+r"(dst), "+r"(src), "=r"(val)		: "+r"(res), "+r"(dst), "+r"(src), "=r"(val)
	: "g"(-EFAULT), "l"(count)		: "g"(-EFAULT), "r"(count)
	: "memory");		: "lp_count", "lp_start", "lp_end", "memory");

	return res;		return res;
	}		}

arch/parisc/include/asm/ldcw.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -12,6 +12,7 @@
	for the semaphore. */		for the semaphore. */

	#define __PA_LDCW_ALIGNMENT 16		#define __PA_LDCW_ALIGNMENT 16
			#define __PA_LDCW_ALIGN_ORDER 4
	#define __ldcw_align(a) ({ \		#define __ldcw_align(a) ({ \
	unsigned long __ret = (unsigned long) &(a)->lock[0]; \		unsigned long __ret = (unsigned long) &(a)->lock[0]; \
	__ret = (__ret + __PA_LDCW_ALIGNMENT - 1) \		__ret = (__ret + __PA_LDCW_ALIGNMENT - 1) \
	@@ -29,6 +30,7 @@
	ldcd). */		ldcd). */

	#define __PA_LDCW_ALIGNMENT 4		#define __PA_LDCW_ALIGNMENT 4
			#define __PA_LDCW_ALIGN_ORDER 2
	#define __ldcw_align(a) (&(a)->slock)		#define __ldcw_align(a) (&(a)->slock)
	#define __LDCW "ldcw,co"		#define __LDCW "ldcw,co"