diff options
| author | Jeremy Fitzhardinge <jeremy@xensource.com> | 2007-10-16 11:51:31 -0700 |
|---|---|---|
| committer | Jeremy Fitzhardinge <jeremy@goop.org> | 2007-10-16 11:51:31 -0700 |
| commit | fb1d84043ca73212b08ff57608f51b372529e6d6 (patch) | |
| tree | 7095ab1129588c184984524bdc24b6fbce181605 /arch/x86/xen | |
| parent | 74260714c56de4f967fcb2f17a8656bc574b75be (diff) | |
| download | linux-3.10-fb1d84043ca73212b08ff57608f51b372529e6d6.tar.gz linux-3.10-fb1d84043ca73212b08ff57608f51b372529e6d6.tar.bz2 linux-3.10-fb1d84043ca73212b08ff57608f51b372529e6d6.zip | |
xen: ask the hypervisor how much space it needs reserved
Ask the hypervisor how much space it needs reserved, since 32-on-64
doesn't need any space, and it may change in future.
Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com>
Diffstat (limited to 'arch/x86/xen')
| -rw-r--r-- | arch/x86/xen/enlighten.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 4186cb6a7f5..bc7bf5f8d07 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -1112,6 +1112,17 @@ static const struct machine_ops __initdata xen_machine_ops = { }; +static void __init xen_reserve_top(void) +{ + unsigned long top = HYPERVISOR_VIRT_START; + struct xen_platform_parameters pp; + + if (HYPERVISOR_xen_version(XENVER_platform_parameters, &pp) == 0) + top = pp.virt_start; + + reserve_top_address(-top + 2 * PAGE_SIZE); +} + /* First C function to be called on Xen boot */ asmlinkage void __init xen_start_kernel(void) { @@ -1169,7 +1180,7 @@ asmlinkage void __init xen_start_kernel(void) pv_info.kernel_rpl = 0; /* set the limit of our address space */ - reserve_top_address(-HYPERVISOR_VIRT_START + 2 * PAGE_SIZE); + xen_reserve_top(); /* set up basic CPUID stuff */ cpu_detect(&new_cpu_data); |