Commit efdcb6d2 authored by popcornmix's avatar popcornmix
Browse files

Merge remote-tracking branch 'stable/linux-4.14.y' into rpi-4.14.y

parents b3a4c69c 9c07fc25

Makefile

+16 −13
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 92

SUBLEVEL = 93

EXTRAVERSION =

NAME = Petit Gorille
@@ -479,18 +479,18 @@ endif 


ifeq ($(cc-name),clang)

ifneq ($(CROSS_COMPILE),)

CLANG_TARGET	:= --target=$(notdir $(CROSS_COMPILE:%-=%))

CLANG_FLAGS	:= --target=$(notdir $(CROSS_COMPILE:%-=%))

GCC_TOOLCHAIN_DIR := $(dir $(shell which $(LD)))

CLANG_PREFIX	:= --prefix=$(GCC_TOOLCHAIN_DIR)

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
@@ -954,11 +954,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
@@ -1102,6 +1097,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/arm/boot/dts/imx7d-nitrogen7.dts

+7 −2
Original line number Diff line number Diff line
@@ -117,13 +117,17 @@ 
		compatible = "regulator-fixed";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		clocks = <&clks IMX7D_CLKO2_ROOT_DIV>;

		clock-names = "slow";

		regulator-name = "reg_wlan";

		startup-delay-us = <70000>;

		gpio = <&gpio4 21 GPIO_ACTIVE_HIGH>;

		enable-active-high;

	};



	usdhc2_pwrseq: usdhc2_pwrseq {

		compatible = "mmc-pwrseq-simple";

		clocks = <&clks IMX7D_CLKO2_ROOT_DIV>;

		clock-names = "ext_clock";

	};

};



&adc1 {
@@ -430,6 +434,7 @@ 
	bus-width = <4>;

	non-removable;

	vmmc-supply = <&reg_wlan>;

	mmc-pwrseq = <&usdhc2_pwrseq>;

	cap-power-off-card;

	keep-power-in-suspend;

	status = "okay";

arch/arm/mach-imx/cpuidle-imx6sx.c

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ int __init imx6sx_cpuidle_init(void) 
	 * except for power up sw2iso which need to be

	 * larger than LDO ramp up time.

	 */

	imx_gpc_set_arm_power_up_timing(2, 1);

	imx_gpc_set_arm_power_up_timing(0xf, 1);

	imx_gpc_set_arm_power_down_timing(1, 1);



	return cpuidle_register(&imx6sx_cpuidle_driver, NULL);

arch/arm64/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ ifeq ($(CONFIG_RELOCATABLE), y) 
# Pass --no-apply-dynamic-relocs to restore pre-binutils-2.27 behaviour

# for relative relocs, since this leads to better Image compression

# with the relocation offsets always being zero.

LDFLAGS_vmlinux		+= -pie -shared -Bsymbolic \

LDFLAGS_vmlinux		+= -shared -Bsymbolic -z notext -z norelro \

			$(call ld-option, --no-apply-dynamic-relocs)

endif

arch/arm64/kernel/image.h

+17 −27
Original line number Diff line number Diff line
@@ -75,16 +75,6 @@ 


__efistub_stext_offset = stext - _text;



/*

 * Prevent the symbol aliases below from being emitted into the kallsyms

 * table, by forcing them to be absolute symbols (which are conveniently

 * ignored by scripts/kallsyms) rather than section relative symbols.

 * The distinction is only relevant for partial linking, and only for symbols

 * that are defined within a section declaration (which is not the case for

 * the definitions below) so the resulting values will be identical.

 */

#define KALLSYMS_HIDE(sym)	ABSOLUTE(sym)



/*

 * The EFI stub has its own symbol namespace prefixed by __efistub_, to

 * isolate it from the kernel proper. The following symbols are legally
@@ -94,27 +84,27 @@ __efistub_stext_offset = stext - _text; 
 * linked at. The routines below are all implemented in assembler in a

 * position independent manner

 */

__efistub_memcmp		= KALLSYMS_HIDE(__pi_memcmp);

__efistub_memchr		= KALLSYMS_HIDE(__pi_memchr);

__efistub_memcpy		= KALLSYMS_HIDE(__pi_memcpy);

__efistub_memmove		= KALLSYMS_HIDE(__pi_memmove);

__efistub_memset		= KALLSYMS_HIDE(__pi_memset);

__efistub_strlen		= KALLSYMS_HIDE(__pi_strlen);

__efistub_strnlen		= KALLSYMS_HIDE(__pi_strnlen);

__efistub_strcmp		= KALLSYMS_HIDE(__pi_strcmp);

__efistub_strncmp		= KALLSYMS_HIDE(__pi_strncmp);

__efistub___flush_dcache_area	= KALLSYMS_HIDE(__pi___flush_dcache_area);

__efistub_memcmp		= __pi_memcmp;

__efistub_memchr		= __pi_memchr;

__efistub_memcpy		= __pi_memcpy;

__efistub_memmove		= __pi_memmove;

__efistub_memset		= __pi_memset;

__efistub_strlen		= __pi_strlen;

__efistub_strnlen		= __pi_strnlen;

__efistub_strcmp		= __pi_strcmp;

__efistub_strncmp		= __pi_strncmp;

__efistub___flush_dcache_area	= __pi___flush_dcache_area;



#ifdef CONFIG_KASAN

__efistub___memcpy		= KALLSYMS_HIDE(__pi_memcpy);

__efistub___memmove		= KALLSYMS_HIDE(__pi_memmove);

__efistub___memset		= KALLSYMS_HIDE(__pi_memset);

__efistub___memcpy		= __pi_memcpy;

__efistub___memmove		= __pi_memmove;

__efistub___memset		= __pi_memset;

#endif



__efistub__text			= KALLSYMS_HIDE(_text);

__efistub__end			= KALLSYMS_HIDE(_end);

__efistub__edata		= KALLSYMS_HIDE(_edata);

__efistub_screen_info		= KALLSYMS_HIDE(screen_info);

__efistub__text			= _text;

__efistub__end			= _end;

__efistub__edata		= _edata;

__efistub_screen_info		= screen_info;



#endif