[<prev] [next>] [day] [month] [year] [list]
Message-Id: <200810262042.20295.rjw@sisk.pl>
Date: Sun, 26 Oct 2008 20:42:19 +0100
From: "Rafael J. Wysocki" <rjw@...k.pl>
To: Ingo Molnar <mingo@...e.hu>
Cc: ACPI Devel Maling List <linux-acpi@...r.kernel.org>,
"H. Peter Anvin" <hpa@...or.com>, Len Brown <lenb@...nel.org>,
LKML <linux-kernel@...r.kernel.org>,
pm list <linux-pm@...ts.linux-foundation.org>
Subject: [PATCH] x86 suspend: Sanitize wakeup_64.S
Hi,
Please queue as .29 material.
Thanks,
Rafael
---
From: Rafael J. Wysocki <rjw@...k.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@...k.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists