lkml.org 
[lkml]   [2008]   [Oct]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] x86 suspend: Sanitize wakeup_64.S
Date
Hi,

Please queue as .29 material.

Thanks,
Rafael

---
From: Rafael J. Wysocki <rjw@sisk.pl>
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 <rjw@sisk.pl>
---
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

bogus_64_magic:
+ hlt
jmp bogus_64_magic

.align 2
--
1.5.6


\
 
 \ /
  Last update: 2008-10-26 20:39    [W:0.025 / U:0.788 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site