Merge pull request #98 from derfelot/lineage-17.1_update2 (0e23d85e) · Commits · e / devices / android_kernel_sony_msm8998

AndroidKernel.mk

+31 −11

Original line number	Diff line number	Diff line
		@@ -47,12 +47,32 @@ else
		KERNEL_CROSS_COMPILE := $(shell pwd)/$(TARGET_TOOLS_PREFIX)
		endif

		ifeq ($(KERNEL_LLVM_SUPPORT), true)
		ifeq ($(KERNEL_SD_LLVM_SUPPORT), true) #Using sd-llvm compiler
		ifeq ($(shell echo $(SDCLANG_PATH) \| head -c 1),/)
		KERNEL_LLVM_BIN := $(SDCLANG_PATH)/clang
		else
		KERNEL_LLVM_BIN := $(shell pwd)/$(SDCLANG_PATH)/clang
		endif
		$(warning "Using sdllvm" $(KERNEL_LLVM_BIN))
		else
		KERNEL_LLVM_BIN := $(shell pwd)/$(CLANG) #Using aosp-llvm compiler
		$(warning "Using aosp-llvm" $(KERNEL_LLVM_BIN))
		endif
		endif

		ifeq ($(TARGET_PREBUILT_KERNEL),)

		KERNEL_GCC_NOANDROID_CHK := $(shell (echo "int main() {return 0;}" \| $(KERNEL_CROSS_COMPILE)gcc -E -mno-android - > /dev/null 2>&1 ; echo $$?))

		real_cc :=
		ifeq ($(KERNEL_LLVM_SUPPORT),true)
		real_cc := REAL_CC=$(KERNEL_LLVM_BIN) CLANG_TRIPLE=aarch64-linux-gnu-
		else
		ifeq ($(strip $(KERNEL_GCC_NOANDROID_CHK)),0)
		KERNEL_CFLAGS := KCFLAGS=-mno-android
		endif
		endif

		mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
		current_dir := $(notdir $(patsubst %/,%,$(dir $(mkfile_path))))
		@@ -143,14 +163,14 @@ $(KERNEL_OUT):

		$(KERNEL_CONFIG): $(KERNEL_OUT) FORCE
		env KBUILD_DIFFCONFIG=$(KERNEL_DIFFCONFIG) \
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(KERNEL_DEFCONFIG)
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) $(KERNEL_DEFCONFIG)

		$(TARGET_PREBUILT_INT_KERNEL): $(KERNEL_OUT) $(KERNEL_HEADERS_INSTALL)
		$(hide) echo "Building kernel..."
		$(hide) rm -rf $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/dts
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(KERNEL_CFLAGS)
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(KERNEL_CFLAGS) modules
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) INSTALL_MOD_PATH=$(BUILD_ROOT_LOC)../$(KERNEL_MODULES_INSTALL) INSTALL_MOD_STRIP=1 $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) modules_install
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) $(KERNEL_CFLAGS)
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) $(KERNEL_CFLAGS) modules
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) INSTALL_MOD_PATH=$(BUILD_ROOT_LOC)../$(KERNEL_MODULES_INSTALL) INSTALL_MOD_STRIP=1 $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) modules_install
		$(mv-modules)
		$(clean-module-folder)

		@@ -158,20 +178,20 @@ $(KERNEL_HEADERS_INSTALL): $(KERNEL_OUT)
		$(hide) if [ ! -z "$(KERNEL_HEADER_DEFCONFIG)" ]; then \
		rm -f $(BUILD_ROOT_LOC)$(KERNEL_CONFIG); \
		env KBUILD_DIFFCONFIG=$(KERNEL_DIFFCONFIG) \
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_HEADER_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(KERNEL_HEADER_DEFCONFIG); \
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_HEADER_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) headers_install; fi
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_HEADER_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) $(KERNEL_HEADER_DEFCONFIG); \
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_HEADER_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) headers_install; fi
		$(hide) if [ "$(KERNEL_HEADER_DEFCONFIG)" != "$(KERNEL_DEFCONFIG)" ]; then \
		echo "Used a different defconfig for header generation"; \
		rm -f $(BUILD_ROOT_LOC)$(KERNEL_CONFIG); \
		env KBUILD_DIFFCONFIG=$(KERNEL_DIFFCONFIG) \
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(KERNEL_DEFCONFIG); fi
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) $(KERNEL_DEFCONFIG); fi
		$(hide) if [ ! -z "$(KERNEL_CONFIG_OVERRIDE)" ]; then \
		echo "Overriding kernel config with '$(KERNEL_CONFIG_OVERRIDE)'"; \
		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) oldconfig; fi
		$(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

		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) tags
		$(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 \
		echo "Overriding kernel config with '$(KERNEL_CONFIG_OVERRIDE)'"; \
		echo $(KERNEL_CONFIG_OVERRIDE) >> $(KERNEL_OUT)/.config; \
		@@ -183,9 +203,9 @@ platformconfig: 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) menuconfig
		$(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
		@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) savedefconfig
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) savedefconfig
		@env KCONFIG_NOTIMESTAMP=true KBUILD_DIFFCONFIG=$(KERNEL_DIFFCONFIG) \
		$(MAKE) -C kernel O=../$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) savediffconfig
		@if [ ! -z "$(KERNEL_CONFIG_OVERRIDE)" ]; then \

Documentation/accounting/getdelays.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -135,7 +135,7 @@ static int send_cmd(int sd, __u16 nlmsg_type, __u32 nlmsg_pid,
		msg.g.version = 0x1;
		na = (struct nlattr *) GENLMSG_DATA(&msg);
		na->nla_type = nla_type;
		na->nla_len = nla_len + 1 + NLA_HDRLEN;
		na->nla_len = nla_len + NLA_HDRLEN;
		memcpy(NLA_DATA(na), nla_data, nla_len);
		msg.n.nlmsg_len += NLMSG_ALIGN(na->nla_len);

Makefile

+15 −2

Original line number	Diff line number	Diff line
		VERSION = 4
		PATCHLEVEL = 4
		SUBLEVEL = 218
		SUBLEVEL = 224
		EXTRAVERSION =
		NAME = Blurry Fish Butt

		@@ -640,7 +640,6 @@ ARCH_CFLAGS :=
		include arch/$(SRCARCH)/Makefile

		KBUILD_CFLAGS += $(call cc-option,-fno-delete-null-pointer-checks,)
		KBUILD_CFLAGS += $(call cc-disable-warning,maybe-uninitialized,)
		KBUILD_CFLAGS += $(call cc-disable-warning,frame-address,)
		KBUILD_CFLAGS += $(call cc-disable-warning, format-truncation)
		KBUILD_CFLAGS += $(call cc-disable-warning, format-overflow)
		@@ -664,6 +663,7 @@ endif

		# Tell gcc to never replace conditional load with a non-conditional one
		KBUILD_CFLAGS += $(call cc-option,--param=allow-store-data-races=0)
		KBUILD_CFLAGS += $(call cc-option,-fno-allow-store-data-races)

		# check for 'asm goto'
		ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLAGS)), y)
		@@ -736,6 +736,8 @@ KBUILD_CFLAGS += $(call cc-disable-warning, format-invalid-specifier)
		KBUILD_CFLAGS += $(call cc-disable-warning, gnu)
		KBUILD_CFLAGS += $(call cc-disable-warning, duplicate-decl-specifier)
		KBUILD_CFLAGS += $(call cc-disable-warning, pointer-bool-conversion)
		KBUILD_CFLAGS += -Wno-tautological-constant-out-of-range-compare

		# Quiet clang warning: comparison of unsigned expression < 0 is always false
		KBUILD_CFLAGS += $(call cc-disable-warning, tautological-compare)
		# CLANG uses a _MergedGlobals as optimization, but this breaks modpost, as the
		@@ -819,6 +821,17 @@ KBUILD_CFLAGS += $(call cc-disable-warning, pointer-sign)
		# disable stringop warnings in gcc 8+
		KBUILD_CFLAGS += $(call cc-disable-warning, stringop-truncation)

		# We'll want to enable this eventually, but it's not going away for 5.7 at least
		KBUILD_CFLAGS += $(call cc-disable-warning, zero-length-bounds)
		KBUILD_CFLAGS += $(call cc-disable-warning, array-bounds)
		KBUILD_CFLAGS += $(call cc-disable-warning, stringop-overflow)

		# Another good warning that we'll want to enable eventually
		KBUILD_CFLAGS += $(call cc-disable-warning, restrict)

		# Enabled with W=2, disabled by default as noisy
		KBUILD_CFLAGS += $(call cc-disable-warning, maybe-uninitialized)

		# disable invalid "can't wrap" optimizations for signed / pointers
		KBUILD_CFLAGS += $(call cc-option,-fno-strict-overflow)

arch/alpha/kernel/pci-sysfs.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -77,10 +77,10 @@ static int pci_mmap_resource(struct kobject *kobj,
		if (i >= PCI_ROM_RESOURCE)
		return -ENODEV;

		if (!__pci_mmap_fits(pdev, i, vma, sparse))
		if (res->flags & IORESOURCE_MEM && iomem_is_exclusive(res->start))
		return -EINVAL;

		if (iomem_is_exclusive(res->start))
		if (!__pci_mmap_fits(pdev, i, vma, sparse))
		return -EINVAL;

		pcibios_resource_to_bus(pdev->bus, &bar, res);

arch/arm/Makefile

+4 −1

Original line number	Diff line number	Diff line
		@@ -313,8 +313,11 @@ all: $(KBUILD_IMAGE) $(KBUILD_DTBS)

		boot := arch/arm/boot

		archheaders:
		$(Q)$(MAKE) $(build)=arch/arm/tools uapi

		archprepare:
		$(Q)$(MAKE) $(build)=arch/arm/tools include/generated/mach-types.h
		$(Q)$(MAKE) $(build)=arch/arm/tools kapi

		# Convert bzImage to zImage
		bzImage: zImage