Merge pull request #6 from derfelot/lineage-17.1_update (47025c2e) · Commits · e / devices / android_kernel_sony_msm8998

AndroidKernel.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -190,6 +190,7 @@ $(KERNEL_HEADERS_INSTALL): $(KERNEL_OUT)
		echo $(KERNEL_CONFIG_OVERRIDE) >> $(KERNEL_OUT)/.config; \
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) oldconfig; fi

		.PHONY: kerneltags
		kerneltags: $(KERNEL_OUT) $(KERNEL_CONFIG)
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) tags
		@if [ ! -z "$(KERNEL_CONFIG_OVERRIDE)" ]; then \
		@@ -201,6 +202,7 @@ kerneltags: $(KERNEL_OUT) $(KERNEL_CONFIG)
		platformconfig: KERNEL_DIFFCONFIG=""
		platformconfig: kernelconfig

		.PHONY: kernelconfig
		kernelconfig: $(KERNEL_OUT) $(KERNEL_CONFIG)
		@env KCONFIG_NOTIMESTAMP=true \
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) menuconfig

Documentation/ABI/testing/sysfs-bus-iio

+2 −1

Original line number	Diff line number	Diff line
		@@ -1470,7 +1470,8 @@ What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_voc_raw
		KernelVersion: 4.3
		Contact: linux-iio@vger.kernel.org
		Description:
		Raw (unscaled no offset etc.) percentage reading of a substance.
		Raw (unscaled no offset etc.) reading of a substance. Units
		after application of scale and offset are percents.

		What: /sys/bus/iio/devices/iio:deviceX/in_resistance_raw
		What: /sys/bus/iio/devices/iio:deviceX/in_resistanceX_raw

Makefile

+13 −10

Original line number	Diff line number	Diff line
		VERSION = 4
		PATCHLEVEL = 4
		SUBLEVEL = 232
		SUBLEVEL = 235
		EXTRAVERSION =
		NAME = Blurry Fish Butt

		@@ -401,6 +401,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ $(call cc-option,-fno-PIE)
		KBUILD_AFLAGS_MODULE := -DMODULE
		KBUILD_CFLAGS_MODULE := -DMODULE
		KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds
		CLANG_FLAGS :=

		# Read KERNELRELEASE from include/config/kernel.release (if it exists)
		KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)
		@@ -611,21 +612,23 @@ all: vmlinux
		ifeq ($(cc-name),clang)
		ifneq ($(CROSS_COMPILE),)
		CLANG_TRIPLE ?= $(CROSS_COMPILE)
		CLANG_TARGET := --target=$(notdir $(CLANG_TRIPLE:%-=%))
		ifeq ($(shell $(srctree)/scripts/clang-android.sh $(CC) $(CLANG_TARGET)), y)
		CLANG_FLAGS += --target=$(notdir $(CLANG_TRIPLE:%-=%))
		ifeq ($(shell $(srctree)/scripts/clang-android.sh $(CC) $(CLANG_FLAGS)), y)
		$(error "Clang with Android --target detected. Did you specify CLANG_TRIPLE?")
		endif
		GCC_TOOLCHAIN_DIR := $(dir $(shell which $(CROSS_COMPILE)elfedit))
		CLANG_PREFIX := --prefix=$(GCC_TOOLCHAIN_DIR)$(notdir $(CROSS_COMPILE))
		CLANG_FLAGS += --prefix=$(GCC_TOOLCHAIN_DIR)$(notdir $(CROSS_COMPILE))
		GCC_TOOLCHAIN := $(realpath $(GCC_TOOLCHAIN_DIR)/..)
		endif
		ifneq ($(GCC_TOOLCHAIN),)
		CLANG_GCC_TC := --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 += --gcc-toolchain=$(GCC_TOOLCHAIN)
		endif
		CLANG_FLAGS += -no-integrated-as
		CLANG_FLAGS += -Werror=unknown-warning-option
		CLANG_FLAGS += $(call cc-option, -Wno-misleading-indentation)
		CLANG_FLAGS += $(call cc-option, -Wno-bool-operation)
		KBUILD_CFLAGS += $(CLANG_FLAGS)
		KBUILD_AFLAGS += $(CLANG_FLAGS)
		endif

		# The arch Makefile can set ARCH_{CPP,A,C}FLAGS to override the default

arch/alpha/include/asm/io.h

+4 −4

Original line number	Diff line number	Diff line
		@@ -491,10 +491,10 @@ extern inline void writeq(u64 b, volatile void __iomem *addr)
		}
		#endif

		#define ioread16be(p) be16_to_cpu(ioread16(p))
		#define ioread32be(p) be32_to_cpu(ioread32(p))
		#define iowrite16be(v,p) iowrite16(cpu_to_be16(v), (p))
		#define iowrite32be(v,p) iowrite32(cpu_to_be32(v), (p))
		#define ioread16be(p) swab16(ioread16(p))
		#define ioread32be(p) swab32(ioread32(p))
		#define iowrite16be(v,p) iowrite16(swab16(v), (p))
		#define iowrite32be(v,p) iowrite32(swab32(v), (p))

		#define inb_p inb
		#define inw_p inw

arch/arm/include/asm/percpu.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@
		#ifndef _ASM_ARM_PERCPU_H_
		#define _ASM_ARM_PERCPU_H_

		#include <asm/thread_info.h>

		/*
		* Same as asm-generic/percpu.h, except that we store the per cpu offset
		* in the TPIDRPRW. TPIDRPRW only exists on V6K and V7