Skip to contentSkip to conversation

Hibernate and PM QoS updates for 2.6.40

GIT PULL Rafael J. Wysocki 1 participant 1 message May 27, 2011

lore
Share & tools
lore
#0 lore raw

Hi Linus,

Please pull more power management updates for 2.6.40 from:

git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6.git for-linus

They are three hibernate patches that fix comments and remove an unused architecture hook and a PM QoS fix that didn't make it into my first request.

 arch/frv/include/asm/suspend.h       |   20 ---
 arch/mips/include/asm/suspend.h      |    2 -
 arch/powerpc/include/asm/suspend.h   |    6 -
 arch/powerpc/kernel/swsusp.c         |    1 -
 arch/s390/include/asm/suspend.h      |   10 --
 arch/sh/include/asm/suspend.h        |    1 -
 arch/unicore32/include/asm/suspend.h |    1 -
 arch/x86/include/asm/suspend_32.h    |    2 -
 arch/x86/include/asm/suspend_64.h    |    5 -
 kernel/pm_qos_params.c               |   33 ++++--
 kernel/power/hibernate.c             |  220 +++++++++++++++++-----------------
 11 files changed, 134 insertions(+), 167 deletions(-)

---------------

Rafael J. Wysocki (4):
PM / Hibernate: Update some comments in core hibernate code PM / Hibernate: Remove arch_prepare_suspend()
PM / Hibernate: Update kerneldoc comments in hibernate.c
PM: Fix PM QOS's user mode interface to work with ASCII input