From: "Yu, Luming" <luming.yu@intel.com>

See http://bugzilla.kernel.org/show_bug.cgi?id=6655

Cc: "Brown, Len" <len.brown@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 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);
_