From 3afc358f6421b645f7342ea7435822b2b72ef8bd Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@linux.intel.com>
Date: Tue, 8 May 2012 21:22:35 +0300
Subject: [PATCH] --- yaml --- r: 309151 b: refs/heads/master c:
 056a43a6d3ab903a798d8ee4435ad67d6fccc3e6 h: refs/heads/master i:   309149:
 3783b39042b233e4591201f23197d5656f907f4f   309147:
 f9f34ebb0fa80a3055da1db36311547456b16114   309143:
 d7695033a89b2cb3702a181fb6a584dc2e85b278   309135:
 217b68133e2f4043f52e87ee5386121406aad823   309119:
 a3827c8855f144b14e1de5e43b512fbfe9f457e0 v: v3

---
 [refs]                                     |  2 +-
 trunk/arch/x86/realmode/rm/trampoline_64.S | 15 ++-------------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 715e298eea7f..c8986468adce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7436a9da902922a48cccc208099763b87d6171f
+refs/heads/master: 056a43a6d3ab903a798d8ee4435ad67d6fccc3e6
diff --git a/trunk/arch/x86/realmode/rm/trampoline_64.S b/trunk/arch/x86/realmode/rm/trampoline_64.S
index 66c58cf15503..77b72b45d705 100644
--- a/trunk/arch/x86/realmode/rm/trampoline_64.S
+++ b/trunk/arch/x86/realmode/rm/trampoline_64.S
@@ -73,7 +73,7 @@ ENTRY(trampoline_data)
 	lmsw	%ax			# into protected mode
 
 	# flush prefetch and jump to startup_32
-	ljmpl	*(startup_32_vector)
+	ljmpl	$__KERNEL32_CS, $pa_startup_32
 
 no_longmode:
 	hlt
@@ -113,7 +113,7 @@ ENTRY(startup_32)
 	 * EFER.LMA = 1). Now we want to jump in 64bit mode, to do that we use
 	 * the new gdt/idt that has __KERNEL_CS with CS.L = 1.
 	 */
-	ljmpl	*(pa_startup_64_vector)
+	ljmpl	$__KERNEL_CS, $pa_startup_64
 
 	.section ".text64","ax"
 	.code64
@@ -144,17 +144,6 @@ tgdt:
 	.quad	0x00cf93000000ffff	# __KERNEL_DS
 tgdt_end:
 
-	.balign 4
-startup_32_vector:
-	.long	pa_startup_32
-	.word	__KERNEL32_CS, 0
-
-	.balign 4
-	.globl startup_64_vector
-startup_64_vector:
-	.long	pa_startup_64
-	.word	__KERNEL_CS, 0
-
 	.data
 	.balign 4
 GLOBAL(trampoline_status)