Merge "Merge android-4.14-p.98 (848d71f) into msm-4.14" (3633dccc) · Commits · e / devices / android_kernel_oneplus_sm8150

Documentation/filesystems/proc.txt

+3 −1

Original line number	Diff line number	Diff line
		@@ -498,7 +498,9 @@ manner. The codes are the following:

		Note that there is no guarantee that every flag and associated mnemonic will
		be present in all further kernel releases. Things get changed, the flags may
		be vanished or the reverse -- new added.
		be vanished or the reverse -- new added. Interpretation of their meaning
		might change in future as well. So each consumer of these flags has to
		follow each specific kernel version for the exact semantic.

		The "Name" field will only be present on a mapping that has been named by
		userspace, and will show the name passed in by userspace.

Makefile

+18 −13

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

		@@ -490,16 +490,18 @@ endif
		ifeq ($(cc-name),clang)
		ifneq ($(CROSS_COMPILE),)
		CLANG_TRIPLE ?= $(CROSS_COMPILE)
		CLANG_TARGET := --target=$(notdir $(CLANG_TRIPLE:%-=%))
		GCC_TOOLCHAIN := $(realpath $(dir $(shell which $(LD)))/..)
		CLANG_FLAGS := --target=$(notdir $(CLANG_TRIPLE:%-=%))
		GCC_TOOLCHAIN_DIR := $(dir $(shell which $(LD)))
		CLANG_FLAGS += --prefix=$(GCC_TOOLCHAIN_DIR)
		GCC_TOOLCHAIN := $(realpath $(GCC_TOOLCHAIN_DIR)/..)
		endif
		ifneq ($(GCC_TOOLCHAIN),)
		CLANG_GCC_TC := --gcc-toolchain=$(GCC_TOOLCHAIN)
		CLANG_FLAGS += --gcc-toolchain=$(GCC_TOOLCHAIN)
		endif
		KBUILD_CFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC) $(CLANG_PREFIX)
		KBUILD_AFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC) $(CLANG_PREFIX)
		KBUILD_CFLAGS += $(call cc-option, -no-integrated-as)
		KBUILD_AFLAGS += $(call cc-option, -no-integrated-as)
		CLANG_FLAGS += -no-integrated-as
		KBUILD_CFLAGS += $(CLANG_FLAGS)
		KBUILD_AFLAGS += $(CLANG_FLAGS)
		export CLANG_FLAGS
		endif

		RETPOLINE_CFLAGS_GCC := -mindirect-branch=thunk-extern -mindirect-branch-register
		@@ -1035,11 +1037,6 @@ ifdef CONFIG_STACK_VALIDATION
		ifeq ($(has_libelf),1)
		objtool_target := tools/objtool FORCE
		else
		ifdef CONFIG_UNWINDER_ORC
		$(error "Cannot generate ORC metadata for CONFIG_UNWINDER_ORC=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel")
		else
		$(warning "Cannot use CONFIG_STACK_VALIDATION=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel")
		endif
		SKIP_STACK_VALIDATION := 1
		export SKIP_STACK_VALIDATION
		endif
		@@ -1183,6 +1180,14 @@ uapi-asm-generic:

		PHONY += prepare-objtool
		prepare-objtool: $(objtool_target)
		ifeq ($(SKIP_STACK_VALIDATION),1)
		ifdef CONFIG_UNWINDER_ORC
		@echo "error: Cannot generate ORC metadata for CONFIG_UNWINDER_ORC=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel" >&2
		@false
		else
		@echo "warning: Cannot use CONFIG_STACK_VALIDATION=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel" >&2
		endif
		endif

		# Check for CONFIG flags that require compiler support. Abort the build
		# after .config has been processed, but before the kernel build starts.

arch/arc/include/asm/perf_event.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -103,7 +103,8 @@ static const char * const arc_pmu_ev_hw_map[] = {

		/* counts condition */
		[PERF_COUNT_HW_INSTRUCTIONS] = "iall",
		[PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = "ijmp", /* Excludes ZOL jumps */
		/* All jump instructions that are taken */
		[PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = "ijmptak",
		[PERF_COUNT_ARC_BPOK] = "bpok", /* NP-NT, PT-T, PNT-NT */
		#ifdef CONFIG_ISA_ARCV2
		[PERF_COUNT_HW_BRANCH_MISSES] = "bpmp",

arch/arc/lib/memset-archs.S

+32 −8

Original line number	Diff line number	Diff line
		@@ -7,11 +7,39 @@
		*/

		#include <linux/linkage.h>
		#include <asm/cache.h>

		#undef PREALLOC_NOT_AVAIL
		/*
		* The memset implementation below is optimized to use prefetchw and prealloc
		* instruction in case of CPU with 64B L1 data cache line (L1_CACHE_SHIFT == 6)
		* If you want to implement optimized memset for other possible L1 data cache
		* line lengths (32B and 128B) you should rewrite code carefully checking
		* we don't call any prefetchw/prealloc instruction for L1 cache lines which
		* don't belongs to memset area.
		*/

		#if L1_CACHE_SHIFT == 6

		.macro PREALLOC_INSTR reg, off
		prealloc [\reg, \off]
		.endm

		.macro PREFETCHW_INSTR reg, off
		prefetchw [\reg, \off]
		.endm

		#else

		.macro PREALLOC_INSTR
		.endm

		.macro PREFETCHW_INSTR
		.endm

		#endif

		ENTRY_CFI(memset)
		prefetchw [r0] ; Prefetch the write location
		PREFETCHW_INSTR r0, 0 ; Prefetch the first write location
		mov.f 0, r2
		;;; if size is zero
		jz.d [blink]
		@@ -48,11 +76,8 @@ ENTRY_CFI(memset)

		lpnz @.Lset64bytes
		;; LOOP START
		#ifdef PREALLOC_NOT_AVAIL
		prefetchw [r3, 64] ;Prefetch the next write location
		#else
		prealloc [r3, 64]
		#endif
		PREALLOC_INSTR r3, 64 ; alloc next line w/o fetching

		#ifdef CONFIG_ARC_HAS_LL64
		std.ab r4, [r3, 8]
		std.ab r4, [r3, 8]
		@@ -85,7 +110,6 @@ ENTRY_CFI(memset)
		lsr.f lp_count, r2, 5 ;Last remaining max 124 bytes
		lpnz .Lset32bytes
		;; LOOP START
		prefetchw [r3, 32] ;Prefetch the next write location
		#ifdef CONFIG_ARC_HAS_LL64
		std.ab r4, [r3, 8]
		std.ab r4, [r3, 8]

arch/arc/mm/init.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -138,7 +138,8 @@ void __init setup_arch_memory(void)
		*/

		memblock_add_node(low_mem_start, low_mem_sz, 0);
		memblock_reserve(low_mem_start, __pa(_end) - low_mem_start);
		memblock_reserve(CONFIG_LINUX_LINK_BASE,
		__pa(_end) - CONFIG_LINUX_LINK_BASE);

		#ifdef CONFIG_BLK_DEV_INITRD
		if (initrd_start)