mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

PSCI fixes for v4.10 

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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABCAAGBQJYa+b3AAoJEIKLOaai0TZ/GrQQAJ1CcQfVQXUh07wgIHM5UJZU
 dZi0oGOCg8CkE9T7UCkDnrTtcZBegUctqmOH0qhmmcODPOdNEJrcV5I4EISe9IMU
 5n2w3QnPLjJH4G7T3z1zrfiMZV+WZMNh3YFRPSuohjqyhyQ4IsUcMqdXdPqbwiuu
 rz4ZWzdSSZXvDRQOH1uU/zgXHQ4FiFCYJk3R+iCxZQQs7MeMMVnytPTXDJ3+y7+5
 JsOzURbAItE9azuBiMip8MZKHCHrcIge6pj/GfCA6oa6Dmer9UGjUkVT4HUzBS0D
 A33SDoM+lwxpDegv0QtaiDKtvM0vjcdtrzk2aY2tTJUAjEMmpoGEj0kxgopk8Z6A
 +bwOjanr/NnOcyL+U/+gdV9qBH4EYSbZ18zm3QI9XjNIyEEwYu+KW3z7VIzR1djU
 SWaFR1ibeaUVPrWjxHGCOPYfvCf27OwsvFLCdhL9T85TXhAygMCHQf1pRBl9EiXi
 P5hlxPkAvvadcTYlKJz5xu0a8EtBoE9bN7T3arHNASLheKwypRj/oC7UZkn2wUgR
 il4hmr/qfcgPK2IABiWqr6/DiJgQ++4wjn44F1LcOAevXvKw7XB+hFykO6Duo0Kt
 Z3fvbKageOWLGxAeH8nHqiLg0ouLmLM9Gq5lWGvCoK9BuF93yLYqIzFk1C2pzknh
 77itDAz82bYIOcM4R8VP
 =gTZM
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Arnd Bergmann 2017-01-04 16:38:39 +01:00
parent 46db9914c3 32d53d1baf
commit 5c6ec6a02c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MAINTAINERS
View File

@ -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

4
drivers/firmware/psci_checker.c
View File

@ -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;
/*