diff options
author | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2012-09-12 11:16:27 -0400 |
---|---|---|
committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2012-09-12 11:18:57 -0400 |
commit | 98104c3480e568d9c145adbc7dc56c9d4d170e30 (patch) | |
tree | 95fd6366645fe16b496032e23d57d70411998944 /arch/x86/xen/enlighten.c | |
parent | 25a765b7f05cb8460fa01b54568894b20e184862 (diff) | |
parent | 328731876451a837f56e66ffa11de053ed5daf73 (diff) |
Merge branch 'stable/128gb.v5.1' into stable/for-linus-3.7
* stable/128gb.v5.1:
xen/mmu: If the revector fails, don't attempt to revector anything else.
xen/p2m: When revectoring deal with holes in the P2M array.
xen/mmu: Release just the MFN list, not MFN list and part of pagetables.
xen/mmu: Remove from __ka space PMD entries for pagetables.
xen/mmu: Copy and revector the P2M tree.
xen/p2m: Add logic to revector a P2M tree to use __va leafs.
xen/mmu: Recycle the Xen provided L4, L3, and L2 pages
xen/mmu: For 64-bit do not call xen_map_identity_early
xen/mmu: use copy_page instead of memcpy.
xen/mmu: Provide comments describing the _ka and _va aliasing issue
xen/mmu: The xen_setup_kernel_pagetable doesn't need to return anything.
Revert "xen/x86: Workaround 64-bit hypervisor and 32-bit initial domain." and "xen/x86: Use memblock_reserve for sensitive areas."
xen/x86: Workaround 64-bit hypervisor and 32-bit initial domain.
xen/x86: Use memblock_reserve for sensitive areas.
xen/p2m: Fix the comment describing the P2M tree.
Conflicts:
arch/x86/xen/mmu.c
The pagetable_init is the old xen_pagetable_setup_done and xen_pagetable_setup_start
rolled in one.
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'arch/x86/xen/enlighten.c')
-rw-r--r-- | arch/x86/xen/enlighten.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 2766746de27..47b3acdc2ac 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c | |||
@@ -1290,7 +1290,6 @@ asmlinkage void __init xen_start_kernel(void) | |||
1290 | { | 1290 | { |
1291 | struct physdev_set_iopl set_iopl; | 1291 | struct physdev_set_iopl set_iopl; |
1292 | int rc; | 1292 | int rc; |
1293 | pgd_t *pgd; | ||
1294 | 1293 | ||
1295 | if (!xen_start_info) | 1294 | if (!xen_start_info) |
1296 | return; | 1295 | return; |
@@ -1382,8 +1381,6 @@ asmlinkage void __init xen_start_kernel(void) | |||
1382 | acpi_numa = -1; | 1381 | acpi_numa = -1; |
1383 | #endif | 1382 | #endif |
1384 | 1383 | ||
1385 | pgd = (pgd_t *)xen_start_info->pt_base; | ||
1386 | |||
1387 | /* Don't do the full vcpu_info placement stuff until we have a | 1384 | /* Don't do the full vcpu_info placement stuff until we have a |
1388 | possible map and a non-dummy shared_info. */ | 1385 | possible map and a non-dummy shared_info. */ |
1389 | per_cpu(xen_vcpu, 0) = &HYPERVISOR_shared_info->vcpu_info[0]; | 1386 | per_cpu(xen_vcpu, 0) = &HYPERVISOR_shared_info->vcpu_info[0]; |
@@ -1392,7 +1389,7 @@ asmlinkage void __init xen_start_kernel(void) | |||
1392 | early_boot_irqs_disabled = true; | 1389 | early_boot_irqs_disabled = true; |
1393 | 1390 | ||
1394 | xen_raw_console_write("mapping kernel into physical memory\n"); | 1391 | xen_raw_console_write("mapping kernel into physical memory\n"); |
1395 | pgd = xen_setup_kernel_pagetable(pgd, xen_start_info->nr_pages); | 1392 | xen_setup_kernel_pagetable((pgd_t *)xen_start_info->pt_base, xen_start_info->nr_pages); |
1396 | 1393 | ||
1397 | /* Allocate and initialize top and mid mfn levels for p2m structure */ | 1394 | /* Allocate and initialize top and mid mfn levels for p2m structure */ |
1398 | xen_build_mfn_list_list(); | 1395 | xen_build_mfn_list_list(); |