Merge tag 'psci-fixes-4.10' of... (5c6ec6a0) · Commits · 戴 / test

Merge tag 'psci-fixes-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/linux into fixes Pull "PSCI fixes for v4.10" from Lorenzo Pieralisi: Two minor fixes following the merge of the PSCI checker: - Annotate the PSCI checker timer on the stack used to wake-up from suspend to prevent warnings when the DEBUG_OBJECTS config option is enabled - Extend the PSCI entry in the maintainers list to also include the PSCI checker code * tag 'psci-fixes-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/linux: MAINTAINERS: extend PSCI entry to cover the newly add PSCI checker code drivers: psci: annotate timer on stack to silence odebug messages

MAINTAINERS

+1 −1

Original line number	Diff line number	Diff line
		@@ -9842,7 +9842,7 @@ M: Mark Rutland <mark.rutland@arm.com>
		M: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
		L: linux-arm-kernel@lists.infradead.org
		S: Maintained
		F: drivers/firmware/psci.c
		F: drivers/firmware/psci*.c
		F: include/linux/psci.h
		F: include/uapi/linux/psci.h

drivers/firmware/psci_checker.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -270,8 +270,7 @@ static int suspend_test_thread(void *arg)
		struct cpuidle_device *dev;
		struct cpuidle_driver *drv;
		/* No need for an actual callback, we just want to wake up the CPU. */
		struct timer_list wakeup_timer =
		TIMER_INITIALIZER(dummy_callback, 0, 0);
		struct timer_list wakeup_timer;

		/* Wait for the main thread to give the start signal. */
		wait_for_completion(&suspend_threads_started);
		@@ -287,6 +286,7 @@ static int suspend_test_thread(void *arg)
		pr_info("CPU %d entering suspend cycles, states 1 through %d\n",
		cpu, drv->state_count - 1);

		setup_timer_on_stack(&wakeup_timer, dummy_callback, 0);
		for (i = 0; i < NUM_SUSPEND_CYCLE; ++i) {
		int index;
		/*

Admin message