Skip to contentSkip to conversation

Power management fix for 3.3-rc2

GIT PULL Rafael J. Wysocki 1 participant 1 message Jan 29, 2012

lore
Share & tools
lore
#0 lore raw

Hi Linus,

Please pull a hibernate (s2disk) regression fix for 3.3 based on commit 0a9626575400879d1d5e6bc8768188b938d7c501:

Merge tag 'driver-core-3.3-rc1-bugfixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

as commit 181e9bdef37bfcaa41f3ab6c948a2a0d60a268b5:

PM / Hibernate: Fix s2disk regression related to freezing workqueues

from the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm-fix-for-3.3-rc2

This fixes a regression introduced during the 3.2 merge window causing s2disk to trigger BUG_ON() in freeze_workqueues_begin() if there's not enough swap space to save the image.

Thanks!

 include/linux/freezer.h |    2 ++
 kernel/power/process.c  |   19 +++++++++++++++++++
 kernel/power/user.c     |    9 +++++++++
 3 files changed, 30 insertions(+), 0 deletions(-)

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

Rafael J. Wysocki (1):
PM / Hibernate: Fix s2disk regression related to freezing workqueues