diff options
| author | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2012-05-07 15:33:27 -0400 |
|---|---|---|
| committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2012-05-07 15:33:27 -0400 |
| commit | 4b3451ad1313134821ad13b6fe821d0b4409aa18 (patch) | |
| tree | 6544c050ac52e139e01025c1a992c15a26c95b57 /arch/x86/xen/enlighten.c | |
| parent | f62805f1f30a40e354bd036b4cb799863a39be4b (diff) | |
| parent | 83d51ab473dddde7df858015070ed22b84ebe9a9 (diff) | |
| download | linux-4b3451ad1313134821ad13b6fe821d0b4409aa18.tar.bz2 | |
Merge branch 'stable/autoballoon.v5.2' into stable/for-linus-3.5
* stable/autoballoon.v5.2:
xen/setup: update VA mapping when releasing memory during setup
xen/setup: Combine the two hypercall functions - since they are quite similar.
xen/setup: Populate freed MFNs from non-RAM E820 entries and gaps to E820 RAM
xen/setup: Only print "Freeing XXX-YYY pfn range: Z pages freed" if Z > 0
xen/p2m: An early bootup variant of set_phys_to_machine
xen/p2m: Collapse early_alloc_p2m_middle redundant checks.
xen/p2m: Allow alloc_p2m_middle to call reserve_brk depending on argument
xen/p2m: Move code around to allow for better re-usage.
Diffstat (limited to 'arch/x86/xen/enlighten.c')
| -rw-r--r-- | arch/x86/xen/enlighten.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index eca90e5be1e7..d1f9a0472d44 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -1316,7 +1316,6 @@ asmlinkage void __init xen_start_kernel(void) xen_raw_console_write("mapping kernel into physical memory\n"); pgd = xen_setup_kernel_pagetable(pgd, xen_start_info->nr_pages); - xen_ident_map_ISA(); /* Allocate and initialize top and mid mfn levels for p2m structure */ xen_build_mfn_list_list(); |