Hi Linus, please pull from: git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git release These fix 2.6.24 regressions, and will update the files shown below. thanks! -Len ps. individual patches are available on linux-acpi@xxxxxxxxxxxxxxx and a consolidated plain patch is available here: ftp://ftp.kernel.org/pub/linux/kernel/people/lenb/acpi/patches/release/2.6.24/acpi-release-20070126-2.6.24-rc4.diff.gz arch/x86/kernel/acpi/wakeup_32.S | 4 ---- drivers/char/apm-emulation.c | 15 ++++++++------- drivers/hwmon/coretemp.c | 5 ++--- fs/jffs2/background.c | 2 +- init/do_mounts_initrd.c | 12 +++++++++--- 5 files changed, 20 insertions(+), 18 deletions(-) through these commits: Pavel Machek (1): ACPI: suspend: old debugging hacks sneaked back Rafael J. Wysocki (4): Freezer: Fix s2disk resume from initrd Freezer: Fix APM emulation breakage HWMON: coretemp, suspend fix Freezer: Fix JFFS2 garbage collector freezing issue (rev. 2) with this log: commit 982286d1b8e438f595cdc9304cc4c185c7b90a39 Merge: 9213148... 8baabde... Author: Len Brown <len.brown@xxxxxxxxx> Date: Thu Dec 6 16:52:00 2007 -0500 Pull bugzilla-9345 into release branch commit 921314811be704252ad2caa8dde507d4c421ddc4 Merge: f7a5274... cb43c54... Author: Len Brown <len.brown@xxxxxxxxx> Date: Thu Dec 6 16:51:29 2007 -0500 Pull apm-freeze-fix into release branch commit f7a5274d7dde0022dedfb6bca5b4438bbf30e9ce Merge: ceaeee6... 74d0f33... Author: Len Brown <len.brown@xxxxxxxxx> Date: Thu Dec 6 16:26:52 2007 -0500 Pull suspend-2.6.24 into release branch commit 74d0f3338fbb3c69894968df1fedaf10c88cd0e4 Author: Pavel Machek <pavel@xxxxxx> Date: Thu Dec 6 09:50:40 2007 +0100 ACPI: suspend: old debugging hacks sneaked back Old debugging hack sneaked back during x86 merge, this removes it. Signed-off-by: Pavel Machek <pavel@xxxxxxx> Acked-by: Rafael J. Wysocki <rjw@xxxxxxx> Signed-off-by: Len Brown <len.brown@xxxxxxxxx> commit e136e769d471e7f3d24a8f6bf9c91dcb372bd0ab Author: Rafael J. Wysocki <rjw@xxxxxxx> Date: Tue Dec 4 01:11:09 2007 +0100 Freezer: Fix JFFS2 garbage collector freezing issue (rev. 2) Fix breakage caused by commit d5d8c5976d6adeddb8208c240460411e2198b393 "freezer: do not send signals to kernel threads" in jffs2_garbage_collect_thread() that assumed it would be sent signals by the freezer. Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx> Cc: David Woodhouse <dwmw2@xxxxxxxxxxxxx> Cc: Pete MacKay <armlinux@xxxxxxxxxxxxxxxxxx> Signed-off-by: Len Brown <len.brown@xxxxxxxxx> commit 561d9a969455cb009bb15b63e1d925dc527e7a9d Author: Rafael J. Wysocki <rjw@xxxxxxx> Date: Mon Dec 3 18:01:50 2007 +0100 HWMON: coretemp, suspend fix It's not permitted to unregister a device after devices have been suspended. It causes deadlocks to appear on systems with coretemp hwmon loaded. To avoid this, we can make coretemp_cpu_callback() do nothing if the _FROZEN bit is set in action. Also, in other cases it's generally too late to unregister the coretemp device if the CPU is already dead, so it should be unregistered on CPU_DOWN_PREPARE. Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx> Acked-by: Mark M. Hoffman <mhoffman@xxxxxxxxxxxxx> Cc: Jiri Slaby <jirislaby@xxxxxxxxx> Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Signed-off-by: Len Brown <len.brown@xxxxxxxxx> commit cb43c54ca05c01533c45e4d3abfe8f99b7acf624 Author: Rafael J. Wysocki <rjw@xxxxxxx> Date: Wed Nov 21 02:53:14 2007 +0100 Freezer: Fix APM emulation breakage The APM emulation is currently broken as a result of commit 831441862956fffa17b9801db37e6ea1650b0f69 "Freezer: make kernel threads nonfreezable by default" that removed the PF_NOFREEZE annotations from apm_ioctl() without adding the appropriate freezer hooks. Fix it and remove the unnecessary variable flags from apm_ioctl(). Special thanks to Franck Bui-Huu <vagabon.xyz@xxxxxxxxx> for pointing out the problem. Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx> Cc: Pavel Machek <pavel@xxxxxx> Cc: Franck Bui-Huu <vagabon.xyz@xxxxxxxxx> Cc: Nigel Cunningham <nigel@xxxxxxxxxxxxxxxxxx> Signed-off-by: Len Brown <len.brown@xxxxxxxxx> commit 8baabde66c60a84781c718c28fe283ed411a7bd0 Author: Rafael J. Wysocki <rjw@xxxxxxx> Date: Wed Nov 21 02:50:17 2007 +0100 Freezer: Fix s2disk resume from initrd Add appropriate freezer annotations to handle_initrd(), so that it's possible to resume from disk from an initrd. http://bugzilla.kernel.org/show_bug.cgi?id=9345 Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx> Cc: Pavel Machek <pavel@xxxxxx> Cc: Nigel Cunningham <nigel@xxxxxxxxxxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Cc: Chris Friedhoff <chris@xxxxxxxxxxxxx> Signed-off-by: Len Brown <len.brown@xxxxxxxxx> - To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
