LKML Archive on
help / color / mirror / Atom feed
* [PATCH] x86 suspend: Sanitize wakeup_64.S
@ 2008-10-26 19:42 Rafael J. Wysocki
  0 siblings, 0 replies; only message in thread
From: Rafael J. Wysocki @ 2008-10-26 19:42 UTC (permalink / raw)
  To: Ingo Molnar
  Cc: ACPI Devel Maling List, H. Peter Anvin, Len Brown, LKML, pm list


Please queue as .29 material.


From: Rafael J. Wysocki <>
Subject: x86 suspend: Sanitize wakeup_64.S

Segment registers are already set by head_64.S, which jumps into
wakeup_64.S, to the same values that wakeup_64.S wants them to
contain.  Remove the unnecessary initialization of segment registers
from wakeup_64.S.

Add hlt into the endless loop under bogus_64_magic.

Signed-off-by: Rafael J. Wysocki <>
 arch/x86/kernel/acpi/wakeup_64.S |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/arch/x86/kernel/acpi/wakeup_64.S b/arch/x86/kernel/acpi/wakeup_64.S
index bcc2934..0c5bf2f 100644
--- a/arch/x86/kernel/acpi/wakeup_64.S
+++ b/arch/x86/kernel/acpi/wakeup_64.S
@@ -19,12 +19,6 @@ wakeup_long64:
 	cmpq	%rdx, %rax
 	jne	bogus_64_magic
-	movw	$__KERNEL_DS, %ax
-	movw	%ax, %ss	
-	movw	%ax, %ds
-	movw	%ax, %es
-	movw	%ax, %fs
-	movw	%ax, %gs
 	movq	saved_rsp, %rsp
 	movq	saved_rbx, %rbx
@@ -36,6 +30,7 @@ wakeup_long64:
 	jmp	*%rax
+	hlt
 	jmp	bogus_64_magic
 	.align 2

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2008-10-26 19:37 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-10-26 19:42 [PATCH] x86 suspend: Sanitize wakeup_64.S Rafael J. Wysocki

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).