---

yaml
---
r: 309151
b: refs/heads/master
c: 056a43a
h: refs/heads/master
i:
  309149: 3783b39
  309147: f9f34eb
  309143: d769503
  309135: 217b681
  309119: a3827c8
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7436a9da902922a48cccc208099763b87d6171f
+refs/heads/master: 056a43a6d3ab903a798d8ee4435ad67d6fccc3e6

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)