Merge "Merge android-4.9.224(5791e89) into msm-4.9" (d014f6ae) · Commits · e / devices / android_kernel_fairphone_FP3

Makefile

+14 −9

Original line number	Diff line number	Diff line
		VERSION = 4
		PATCHLEVEL = 9
		SUBLEVEL = 223
		SUBLEVEL = 224
		EXTRAVERSION =
		NAME = Roaring Lionus

		@@ -763,20 +763,14 @@ export DISABLE_CFI
		endif

		ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
		KBUILD_CFLAGS += -Os $(call cc-disable-warning,maybe-uninitialized,)
		else
		ifdef CONFIG_PROFILE_ALL_BRANCHES
		KBUILD_CFLAGS += -O2 $(call cc-disable-warning,maybe-uninitialized,)
		KBUILD_CFLAGS += -Os
		else
		KBUILD_CFLAGS += -O2
		endif
		endif

		KBUILD_CFLAGS += $(call cc-ifversion, -lt, 0409, \
		$(call cc-disable-warning,maybe-uninitialized,))

		# 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)
		@@ -910,6 +904,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/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts

+2 −2

Original line number	Diff line number	Diff line
		@@ -81,8 +81,8 @@
		imx27-phycard-s-rdk {
		pinctrl_i2c1: i2c1grp {
		fsl,pins = <
		MX27_PAD_I2C2_SDA__I2C2_SDA 0x0
		MX27_PAD_I2C2_SCL__I2C2_SCL 0x0
		MX27_PAD_I2C_DATA__I2C_DATA 0x0
		MX27_PAD_I2C_CLK__I2C_CLK 0x0
		>;
		};

arch/arm/boot/dts/r8a73a4.dtsi

+8 −1

Original line number	Diff line number	Diff line
		@@ -135,7 +135,14 @@
		cmt1: timer@e6130000 {
		compatible = "renesas,cmt-48-r8a73a4", "renesas,cmt-48-gen2";
		reg = <0 0xe6130000 0 0x1004>;
		interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;
		interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>,
		<GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>,
		<GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>,
		<GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,
		<GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>,
		<GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>,
		<GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>,
		<GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>;
		clocks = <&mstp3_clks R8A73A4_CLK_CMT1>;
		clock-names = "fck";
		power-domains = <&pd_c5>;

arch/arm/boot/dts/r8a7740.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -467,7 +467,7 @@
		cpg_clocks: cpg_clocks@e6150000 {
		compatible = "renesas,r8a7740-cpg-clocks";
		reg = <0xe6150000 0x10000>;
		clocks = <&extal1_clk>, <&extalr_clk>;
		clocks = <&extal1_clk>, <&extal2_clk>, <&extalr_clk>;
		#clock-cells = <1>;
		clock-output-names = "system", "pllc0", "pllc1",
		"pllc2", "r",

arch/x86/include/asm/stackprotector.h

+6 −1

Original line number	Diff line number	Diff line
		@@ -54,8 +54,13 @@
		/*
		* Initialize the stackprotector canary value.
		*
		* NOTE: this must only be called from functions that never return,
		* NOTE: this must only be called from functions that never return
		* and it must always be inlined.
		*
		* In addition, it should be called from a compilation unit for which
		* stack protector is disabled. Alternatively, the caller should not end
		* with a function call which gets tail-call optimized as that would
		* lead to checking a modified canary value.
		*/
		static __always_inline void boot_init_stack_canary(void)
		{