From 76588d1319cccde6c3e68279db2a4dcdf2ce7562 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Thu, 31 Dec 2015 14:54:56 +0100 Subject: [PATCH] xen/relocator: Use local symbol to ensure that code is relocation-free. --- grub-core/lib/x86_64/xen/relocator.S | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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