From 3783b39042b233e4591201f23197d5656f907f4f Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@linux.intel.com>
Date: Tue, 8 May 2012 21:22:33 +0300
Subject: [PATCH] --- yaml --- r: 309149 b: refs/heads/master c:
 024742861124ef26dae4cfc620250f8f47ac934a h: refs/heads/master i:   309147:
 f9f34ebb0fa80a3055da1db36311547456b16114 v: v3

---
 [refs]                                     |  2 +-
 trunk/arch/x86/realmode/rm/trampoline_64.S | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 119049dff859..f0cfa3455fe8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 487f50ffeb142d8f86fff6e43a8852ce3d46c173
+refs/heads/master: 024742861124ef26dae4cfc620250f8f47ac934a
diff --git a/trunk/arch/x86/realmode/rm/trampoline_64.S b/trunk/arch/x86/realmode/rm/trampoline_64.S
index 063da008d520..66c58cf15503 100644
--- a/trunk/arch/x86/realmode/rm/trampoline_64.S
+++ b/trunk/arch/x86/realmode/rm/trampoline_64.S
@@ -80,6 +80,7 @@ no_longmode:
 	jmp no_longmode
 #include "../kernel/verify_cpu.S"
 
+	.section ".text32","ax"
 	.code32
 	.balign 4
 ENTRY(startup_32)
@@ -114,6 +115,7 @@ ENTRY(startup_32)
 	 */
 	ljmpl	*(pa_startup_64_vector)
 
+	.section ".text64","ax"
 	.code64
 	.balign 4
 ENTRY(startup_64)
@@ -123,7 +125,8 @@ ENTRY(startup_64)
 	addl	%esi, %eax
 	jmp	*%rax
 
-	# Careful these need to be in the same 64K segment as the above;
+	.section ".rodata","a"
+	.balign	16
 tidt:
 	.word	0			# idt limit = 0
 	.word	0, 0			# idt base = 0L
@@ -153,9 +156,8 @@ startup_64_vector:
 	.word	__KERNEL_CS, 0
 
 	.data
-
 	.balign 4
-ENTRY(trampoline_status)
+GLOBAL(trampoline_status)
 	.long	0
 
 trampoline_stack:
@@ -164,7 +166,7 @@ trampoline_stack_end:
 
 	.globl	level3_ident_pgt
 	.globl	level3_kernel_pgt
-ENTRY(trampoline_level4_pgt)
+GLOBAL(trampoline_level4_pgt)
 	level3_ident_pgt:	.quad	0
 	.fill 510,8,0
 	level3_kernel_pgt:	.quad	0