---

yaml --- r: 131666 b: refs/heads/master c: 6defa2f h: refs/heads/master v: v3
git-mirror · Feb 22, 2009 · 0b623e7 · 0b623e7
1 parent ed99663
commit 0b623e7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e6bd6760c92dc8475c79c4c4a8a16ac313c0b93d
+refs/heads/master: 6defa2fe2019f3729933516fba5cfd75eecd07de
diff --git a/trunk/arch/x86/kernel/acpi/wakeup_64.S b/trunk/arch/x86/kernel/acpi/wakeup_64.S
@@ -73,7 +73,9 @@ ENTRY(do_suspend_lowlevel)
 	addq	$8, %rsp
 	movl	$3, %edi
 	xorl	%eax, %eax
-	jmp	acpi_enter_sleep_state
+	call	acpi_enter_sleep_state
+	/* in case something went wrong, restore the machine status and go on */
+	jmp	resume_point
 
 	.align 4
 resume_point: