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

This project is archived. Its data is read-only.

Commit 361feeef authored Dec 18, 2018 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Dec 18, 2018

Merge "Merge android-4.4.167 (ad9ce19d) into msm-4.4"

parents 897db080 ed2e9423

Makefile

+4 −1

Original line number	Diff line number	Diff line
		VERSION = 4
		PATCHLEVEL = 4
		SUBLEVEL = 166
		SUBLEVEL = 167
		EXTRAVERSION =
		NAME = Blurry Fish Butt

		@@ -814,6 +814,9 @@ KBUILD_CFLAGS += $(call cc-option,-Wdeclaration-after-statement,)
		# disable pointer signed / unsigned warnings in gcc 4.0
		KBUILD_CFLAGS += $(call cc-disable-warning, pointer-sign)

		# disable stringop warnings in gcc 8+
		KBUILD_CFLAGS += $(call cc-disable-warning, stringop-truncation)

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

arch/arc/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -96,7 +96,7 @@ endmenu

		choice
		prompt "ARC Instruction Set"
		default ISA_ARCOMPACT
		default ISA_ARCV2

		config ISA_ARCOMPACT
		bool "ARCompact ISA"

arch/arc/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -12,7 +12,7 @@ ifeq ($(CROSS_COMPILE),)
		CROSS_COMPILE := arc-linux-
		endif

		KBUILD_DEFCONFIG := nsim_700_defconfig
		KBUILD_DEFCONFIG := nsim_hs_defconfig

		cflags-y += -fno-common -pipe -fno-builtin -mmedium-calls -D__linux__
		cflags-$(CONFIG_ISA_ARCOMPACT) += -mA7

arch/arc/configs/axs101_defconfig

+2 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@ CONFIG_PERF_EVENTS=y
		# CONFIG_VM_EVENT_COUNTERS is not set
		# CONFIG_SLUB_DEBUG is not set
		# CONFIG_COMPAT_BRK is not set
		CONFIG_ISA_ARCOMPACT=y
		CONFIG_MODULES=y
		CONFIG_PARTITION_ADVANCED=y
		CONFIG_ARC_PLAT_AXS10X=y
		@@ -97,6 +98,7 @@ CONFIG_NTFS_FS=y
		CONFIG_TMPFS=y
		CONFIG_JFFS2_FS=y
		CONFIG_NFS_FS=y
		CONFIG_NFS_V3_ACL=y
		CONFIG_NLS_CODEPAGE_437=y
		CONFIG_NLS_ISO8859_1=y
		# CONFIG_ENABLE_WARN_DEPRECATED is not set

arch/arc/configs/axs103_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -103,6 +103,7 @@ CONFIG_NTFS_FS=y
		CONFIG_TMPFS=y
		CONFIG_JFFS2_FS=y
		CONFIG_NFS_FS=y
		CONFIG_NFS_V3_ACL=y
		CONFIG_NLS_CODEPAGE_437=y
		CONFIG_NLS_ISO8859_1=y
		# CONFIG_ENABLE_WARN_DEPRECATED is not set