Skip to contentSkip to conversation

PM fixes for 2.6.31

GIT PULL Rafael J. Wysocki 1 participant 1 message Jul 29, 2009 VFS

lore
Share & tools
lore
#0 lore raw

Hi Linus,

Please pull power management fixes for 2.6.31 from:

git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6.git pm-fixes

This will fix two regressions, one related to the handling of the ACPI SCI_EN bit during resume from suspend to RAM (machine with a broken BIOS has to be blacklisted) and the other caused by putting bdget() under a spinlock in the hibernation code.

 drivers/acpi/sleep.c |    8 ++++++++
 fs/block_dev.c       |   10 ++++++++++
 include/linux/fs.h   |    1 +
 mm/swapfile.c        |    4 ++--
 4 files changed, 21 insertions(+), 2 deletions(-)

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

Alan Jenkins (1):
PM / Hibernate: Replace bdget call with simple atomic_inc of i_count

Bartlomiej Zolnierkiewicz (1):
PM / ACPI: HP G7000 Notebook needs a SCI_EN resume quirk