From 2a91d2a57c7ea6b74dd875f60ff4748abe473af7 Mon Sep 17 00:00:00 2001
From: Shaohua Li <shaohua.li@intel.com>
Date: Fri, 23 Jun 2006 02:04:50 -0700
Subject: [PATCH] --- yaml --- r: 29008 b: refs/heads/master c:
 daacf8bc0dd37a6ad3a87d1a667599e15940815e h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/arch/i386/kernel/acpi/wakeup.S | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 8d4913040f63..70639625013d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e084dbd3a995f99f5444a9046e66d93c1b92c348
+refs/heads/master: daacf8bc0dd37a6ad3a87d1a667599e15940815e
diff --git a/trunk/arch/i386/kernel/acpi/wakeup.S b/trunk/arch/i386/kernel/acpi/wakeup.S
index dcb4d3c68ebb..9f408eee4e6f 100644
--- a/trunk/arch/i386/kernel/acpi/wakeup.S
+++ b/trunk/arch/i386/kernel/acpi/wakeup.S
@@ -265,11 +265,6 @@ ENTRY(acpi_copy_wakeup_routine)
 	movl	$0x12345678, saved_magic
 	ret
 
-.data
-ALIGN
-ENTRY(saved_magic)	.long	0
-ENTRY(saved_eip)	.long	0
-
 save_registers:
 	leal	4(%esp), %eax
 	movl	%eax, saved_context_esp
@@ -304,7 +299,11 @@ ret_point:
 	call	restore_processor_state
 	ret
 
+.data
 ALIGN
+ENTRY(saved_magic)	.long	0
+ENTRY(saved_eip)	.long	0
+
 # saved registers
 saved_gdt:	.long	0,0
 saved_idt:	.long	0,0