From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Thu, 31 Dec 2015 13:54:56 +0000 (+0100)
Subject: xen/relocator: Use local symbol to ensure that code is relocation-free.
X-Git-Tag: 2.02-beta3~142
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76588d1319cccde6c3e68279db2a4dcdf2ce7562;p=thirdparty%2Fgrub.git

xen/relocator: Use local symbol to ensure that code is relocation-free.
---

diff --git a/grub-core/lib/x86_64/xen/relocator.S b/grub-core/lib/x86_64/xen/relocator.S
index 78c123350..92e9e72a9 100644
--- a/grub-core/lib/x86_64/xen/relocator.S
+++ b/grub-core/lib/x86_64/xen/relocator.S
@@ -89,7 +89,7 @@ VARIABLE(grub_relocator_xen_mfn_list)
 
 	loop 1b
 
-	leaq   EXT_C(grub_relocator_xen_mmu_op) (%rip), %rdi
+	leaq   LOCAL(mmu_op) (%rip), %rdi
 	movq   $3, %rsi
 	movq   $0, %rdx
 	movq   $0x7FF0, %r10
@@ -104,6 +104,7 @@ VARIABLE(grub_relocator_xen_remap_continue)
 
 	jmp *%rax
 
+LOCAL(mmu_op):
 VARIABLE(grub_relocator_xen_mmu_op)
 	.space 256