The patch titled
acpi: asus s3-resume fix
has been added to the -mm tree. Its filename is
acpi-asus-s3-resume-fix.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: acpi: asus s3-resume fix
From: "Yu, Luming" <luming.yu@xxxxxxxxx>
See http://bugzilla.kernel.org/show_bug.cgi?id=6655
Cc: "Brown, Len" <len.brown@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/i386/kernel/reboot.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff -puN arch/i386/kernel/reboot.c~acpi-asus-s3-resume-fix arch/i386/kernel/reboot.c
--- a/arch/i386/kernel/reboot.c~acpi-asus-s3-resume-fix
+++ a/arch/i386/kernel/reboot.c
@@ -31,6 +31,12 @@ static int reboot_thru_bios;
#ifdef CONFIG_SMP
static int reboot_cpu = -1;
#endif
+#ifdef CONFIG_ACPI
+extern u32 acpi_disable(void);
+#else
+static u32 acpi_disable(void){};
+#endif
+
static int __init reboot_setup(char *str)
{
while(1) {
@@ -322,6 +328,8 @@ void machine_shutdown(void)
void machine_emergency_restart(void)
{
+
+ acpi_disable();
if (!reboot_thru_bios) {
if (efi_enabled) {
efi.reset_system(EFI_RESET_COLD, EFI_SUCCESS, 0, NULL);
_
Patches currently in -mm which might be from luming.yu@xxxxxxxxx are
git-acpi.patch
acpi-atlas-acpi-driver.patch
acpi-add-ibm-r60e-laptop-to-proc-idle-blacklist.patch
clear-abnormal-poweroff-flag-on-via-southbridges-fix-resume.patch
clear-abnormal-poweroff-flag-on-via-southbridges-fix-resume-fix.patch
remove-empty-node-at-boot-time.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
