diff options
author | Jan Beulich <jbeulich@novell.com> | 2011-08-19 09:54:26 +0100 |
---|---|---|
committer | Jan Beulich <jbeulich@novell.com> | 2011-08-19 09:54:26 +0100 |
commit | bc4a68f21f43c2e37346cf5a1f37c19a53b540c2 (patch) | |
tree | 3b4af0bd3182a264bbe3b84a65e21a606e4f43ab /xen/arch/x86/x86_64/mm.c | |
parent | 2f399b3bb0cae8072ed42856eac6a805728516fe (diff) | |
download | xen-bc4a68f21f43c2e37346cf5a1f37c19a53b540c2.tar.gz xen-bc4a68f21f43c2e37346cf5a1f37c19a53b540c2.tar.bz2 xen-bc4a68f21f43c2e37346cf5a1f37c19a53b540c2.zip |
x86: make run-time part of trampoline relocatable
In order to eliminate an initial hack in the EFI boot code (where
memory for the trampoline was just "claimed" instead of properly
allocated), the trampoline code must no longer make assumption on the
address at which it would be located. For the time being, the fixed
address is being retained for the traditional multiboot path.
As an additional benefit (at least from my pov) it allows confining
the visibility of the BOOT_TRAMPOLINE definition to just the boot
code.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Diffstat (limited to 'xen/arch/x86/x86_64/mm.c')
-rw-r--r-- | xen/arch/x86/x86_64/mm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c index 9ff343b97e..1df64998e8 100644 --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -829,7 +829,7 @@ void __init zap_low_mappings(void) flush_local(FLUSH_TLB_GLOBAL); /* Replace with mapping of the boot trampoline only. */ - map_pages_to_xen(BOOT_TRAMPOLINE, BOOT_TRAMPOLINE >> PAGE_SHIFT, + map_pages_to_xen(trampoline_phys, trampoline_phys >> PAGE_SHIFT, PFN_UP(trampoline_end - trampoline_start), __PAGE_HYPERVISOR); } |