Merge branch 'perf/urgent' into perf/core, to pick up fixes (290d9bf2) · Commits · e / devices / android_kernel_oneplus_sm7250

Makefile

+7 −6

Original line number	Original line	Diff line number	Diff line
	@@ -396,7 +396,7 @@ LINUXINCLUDE := \
	KBUILD_CPPFLAGS := -D__KERNEL__		KBUILD_CPPFLAGS := -D__KERNEL__

	KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \		KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
	-fno-strict-aliasing -fno-common \		-fno-strict-aliasing -fno-common -fshort-wchar \
	-Werror-implicit-function-declaration \		-Werror-implicit-function-declaration \
	-Wno-format-security \		-Wno-format-security \
	-std=gnu89 $(call cc-option,-fno-PIE)		-std=gnu89 $(call cc-option,-fno-PIE)
	@@ -442,7 +442,7 @@ export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn \
	# ===========================================================================		# ===========================================================================
	# Rules shared between *config targets and build targets		# Rules shared between *config targets and build targets

	# Basic helpers built in scripts/		# Basic helpers built in scripts/basic/
	PHONY += scripts_basic		PHONY += scripts_basic
	scripts_basic:		scripts_basic:
	$(Q)$(MAKE) $(build)=scripts/basic		$(Q)$(MAKE) $(build)=scripts/basic
	@@ -505,7 +505,7 @@ ifeq ($(KBUILD_EXTMOD),)
	endif		endif
	endif		endif
	endif		endif
	# install and module_install need also be processed one by one		# install and modules_install need also be processed one by one
	ifneq ($(filter install,$(MAKECMDGOALS)),)		ifneq ($(filter install,$(MAKECMDGOALS)),)
	ifneq ($(filter modules_install,$(MAKECMDGOALS)),)		ifneq ($(filter modules_install,$(MAKECMDGOALS)),)
	mixed-targets := 1		mixed-targets := 1
	@@ -964,7 +964,7 @@ export KBUILD_VMLINUX_MAIN := $(core-y) $(libs-y2) $(drivers-y) $(net-y) $(virt-
	export KBUILD_VMLINUX_LIBS := $(libs-y1)		export KBUILD_VMLINUX_LIBS := $(libs-y1)
	export KBUILD_LDS := arch/$(SRCARCH)/kernel/vmlinux.lds		export KBUILD_LDS := arch/$(SRCARCH)/kernel/vmlinux.lds
	export LDFLAGS_vmlinux		export LDFLAGS_vmlinux
	# used by scripts/pacmage/Makefile		# used by scripts/package/Makefile
	export KBUILD_ALLDIRS := $(sort $(filter-out arch/%,$(vmlinux-alldirs)) arch Documentation include samples scripts tools)		export KBUILD_ALLDIRS := $(sort $(filter-out arch/%,$(vmlinux-alldirs)) arch Documentation include samples scripts tools)

	vmlinux-deps := $(KBUILD_LDS) $(KBUILD_VMLINUX_INIT) $(KBUILD_VMLINUX_MAIN) $(KBUILD_VMLINUX_LIBS)		vmlinux-deps := $(KBUILD_LDS) $(KBUILD_VMLINUX_INIT) $(KBUILD_VMLINUX_MAIN) $(KBUILD_VMLINUX_LIBS)
	@@ -1184,6 +1184,7 @@ PHONY += kselftest
	kselftest:		kselftest:
	$(Q)$(MAKE) -C tools/testing/selftests run_tests		$(Q)$(MAKE) -C tools/testing/selftests run_tests

			PHONY += kselftest-clean
	kselftest-clean:		kselftest-clean:
	$(Q)$(MAKE) -C tools/testing/selftests clean		$(Q)$(MAKE) -C tools/testing/selftests clean

arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -266,6 +266,7 @@

	&hdmicec {		&hdmicec {
	status = "okay";		status = "okay";
			needs-hpd;
	};		};

	&hsi2c_4 {		&hsi2c_4 {

arch/arm/mach-at91/Kconfig

+1 −1

Original line number	Original line	Diff line number	Diff line
	menuconfig ARCH_AT91		menuconfig ARCH_AT91
	bool "Atmel SoCs"		bool "Atmel SoCs"
	depends on ARCH_MULTI_V4T \|\| ARCH_MULTI_V5 \|\| ARCH_MULTI_V7 \|\| ARM_SINGLE_ARMV7M		depends on ARCH_MULTI_V4T \|\| ARCH_MULTI_V5 \|\| ARCH_MULTI_V7 \|\| ARM_SINGLE_ARMV7M
	select ARM_CPU_SUSPEND if PM		select ARM_CPU_SUSPEND if PM && ARCH_MULTI_V7
	select COMMON_CLK_AT91		select COMMON_CLK_AT91
	select GPIOLIB		select GPIOLIB
	select PINCTRL		select PINCTRL

arch/arm/mach-at91/pm.c

+12 −0

Original line number	Original line	Diff line number	Diff line
	@@ -608,6 +608,9 @@ static void __init at91_pm_init(void (*pm_idle)(void))

	void __init at91rm9200_pm_init(void)		void __init at91rm9200_pm_init(void)
	{		{
			if (!IS_ENABLED(CONFIG_SOC_AT91RM9200))
			return;

	at91_dt_ramc();		at91_dt_ramc();

	/*		/*
	@@ -620,18 +623,27 @@ void __init at91rm9200_pm_init(void)

	void __init at91sam9_pm_init(void)		void __init at91sam9_pm_init(void)
	{		{
			if (!IS_ENABLED(CONFIG_SOC_AT91SAM9))
			return;

	at91_dt_ramc();		at91_dt_ramc();
	at91_pm_init(at91sam9_idle);		at91_pm_init(at91sam9_idle);
	}		}

	void __init sama5_pm_init(void)		void __init sama5_pm_init(void)
	{		{
			if (!IS_ENABLED(CONFIG_SOC_SAMA5))
			return;

	at91_dt_ramc();		at91_dt_ramc();
	at91_pm_init(NULL);		at91_pm_init(NULL);
	}		}

	void __init sama5d2_pm_init(void)		void __init sama5d2_pm_init(void)
	{		{
			if (!IS_ENABLED(CONFIG_SOC_SAMA5D2))
			return;

	at91_pm_backup_init();		at91_pm_backup_init();
	sama5_pm_init();		sama5_pm_init();
	}		}

drivers/acpi/acpica/nsxfeval.c

+7 −3

Original line number	Original line	Diff line number	Diff line
	@@ -100,10 +100,14 @@ acpi_evaluate_object_typed(acpi_handle handle,
	free_buffer_on_error = TRUE;		free_buffer_on_error = TRUE;
	}		}

			if (pathname) {
	status = acpi_get_handle(handle, pathname, &target_handle);		status = acpi_get_handle(handle, pathname, &target_handle);
	if (ACPI_FAILURE(status)) {		if (ACPI_FAILURE(status)) {
	return_ACPI_STATUS(status);		return_ACPI_STATUS(status);
	}		}
			} else {
			target_handle = handle;
			}

	full_pathname = acpi_ns_get_external_pathname(target_handle);		full_pathname = acpi_ns_get_external_pathname(target_handle);
	if (!full_pathname) {		if (!full_pathname) {