From: Daniel Kiper <daniel.kiper@oracle.com>
Date: Fri, 7 Apr 2017 11:36:01 +0000 (+0200)
Subject: x86/setup: use XEN_IMG_OFFSET instead of...
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=8c17af4aba2edb19249d9516e3ee7b827a9cecb2;p=people%2Froyger%2Fxen.git

x86/setup: use XEN_IMG_OFFSET instead of...

..calculating its value during runtime.

Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Doug Goldstein <cardoe@cardoe.com>
---

diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index e5690b3ec0..6cfb0bd9e8 100644
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -951,7 +951,6 @@ void __init noreturn __start_xen(unsigned long mbi_p)
             l4_pgentry_t *pl4e;
             l3_pgentry_t *pl3e;
             l2_pgentry_t *pl2e;
-            uint64_t load_start;
             int i, j, k;
 
             /* Select relocation address. */
@@ -965,9 +964,8 @@ void __init noreturn __start_xen(unsigned long mbi_p)
              * with a barrier(). After this we must *not* modify static/global
              * data until after we have switched to the relocated pagetables!
              */
-            load_start = (unsigned long)_start - XEN_VIRT_START;
             barrier();
-            move_memory(e + load_start, load_start, _end - _start, 1);
+            move_memory(e + XEN_IMG_OFFSET, XEN_IMG_OFFSET, _end - _start, 1);
 
             /* Walk initial pagetables, relocating page directory entries. */
             pl4e = __va(__pa(idle_pg_table));