diff options
| author | David Vrabel <david.vrabel@citrix.com> | 2014-06-02 17:58:01 +0100 |
|---|---|---|
| committer | David Vrabel <david.vrabel@citrix.com> | 2014-06-05 14:22:27 +0100 |
| commit | abacaadc4144a8849782cc0917a624a7114ffbb1 (patch) | |
| tree | f9c47de717c40deb7b3ef1793b57b7e61ff5204b /arch/x86/xen/enlighten.c | |
| parent | 77945ca73e9a66cae25882fcab33ae0c6692763f (diff) | |
| download | linux-abacaadc4144a8849782cc0917a624a7114ffbb1.tar.bz2 | |
x86/xen: fix memory setup for PVH dom0
Since af06d66ee32b (x86: fix setup of PVH Dom0 memory map) in Xen, PVH
dom0 need only use the memory memory provided by Xen which has already
setup all the correct holes.
xen_memory_setup() then ends up being trivial for a PVH guest so
introduce a new function (xen_auto_xlated_memory_setup()).
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
Acked-by: Roger Pau Monné <roger.pau@citrix.com>
Tested-by: Roger Pau Monné <roger.pau@citrix.com>
Diffstat (limited to 'arch/x86/xen/enlighten.c')
| -rw-r--r-- | arch/x86/xen/enlighten.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 662bdcbbbd18..3123d1f74415 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -1537,7 +1537,10 @@ asmlinkage void __init xen_start_kernel(void) if (!xen_pvh_domain()) pv_cpu_ops = xen_cpu_ops; - x86_init.resources.memory_setup = xen_memory_setup; + if (xen_feature(XENFEAT_auto_translated_physmap)) + x86_init.resources.memory_setup = xen_auto_xlated_memory_setup; + else + x86_init.resources.memory_setup = xen_memory_setup; x86_init.oem.arch_setup = xen_arch_setup; x86_init.oem.banner = xen_banner; |