[Xen-changelog] Merge firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1497, 2005/05/21 00:17:26+01:00, kaf24@xxxxxxxxxxxxxxxxxxxx

        Merge firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
        into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk



 init.c |   25 ++++++++-----------------
 1 files changed, 8 insertions(+), 17 deletions(-)


diff -Nru a/linux-2.6.11-xen-sparse/arch/xen/i386/mm/init.c 
b/linux-2.6.11-xen-sparse/arch/xen/i386/mm/init.c
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/mm/init.c   2005-05-20 20:04:38 
-04:00
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/mm/init.c   2005-05-20 20:04:38 
-04:00
@@ -192,7 +192,6 @@
                                }
                                pte_ofs = 0;
                        }
-                       flush_page_update_queue();
                }
                pmd_idx = 0;
        }
@@ -356,12 +355,13 @@
         */
        memcpy(pgd_base, old_pgd, PTRS_PER_PGD_NO_HV*sizeof(pgd_t));
        make_page_readonly(pgd_base);
-       queue_pgd_pin(__pa(pgd_base));
+       xen_pgd_pin(__pa(pgd_base));
        load_cr3(pgd_base);
-       queue_pgd_unpin(__pa(old_pgd));
+       xen_pgd_unpin(__pa(old_pgd));
        make_page_writable(old_pgd);
        __flush_tlb_all();
        free_bootmem(__pa(old_pgd), PAGE_SIZE);
+       init_mm.context.pinned = 1;
 
        kernel_physical_mapping_init(pgd_base);
        remap_numa_kva();
@@ -563,8 +563,7 @@
        zone_sizes_init();
 
        /* Switch to the real shared_info page, and clear the dummy page. */
-       flush_page_update_queue();
-       set_fixmap_ma(FIX_SHARED_INFO, xen_start_info.shared_info);
+       set_fixmap(FIX_SHARED_INFO, xen_start_info.shared_info);
        HYPERVISOR_shared_info = (shared_info_t *)fix_to_virt(FIX_SHARED_INFO);
        memset(empty_zero_page, 0, sizeof(empty_zero_page));
 
@@ -572,10 +571,11 @@
        /* Setup mapping of lower 1st MB */
        for (i = 0; i < NR_FIX_ISAMAPS; i++)
                if (xen_start_info.flags & SIF_PRIVILEGED)
-                       set_fixmap_ma(FIX_ISAMAP_BEGIN - i, i * PAGE_SIZE);
+                       set_fixmap(FIX_ISAMAP_BEGIN - i, i * PAGE_SIZE);
                else
-                       set_fixmap_ma_ro(FIX_ISAMAP_BEGIN - i,
-                                        virt_to_machine(empty_zero_page));
+                       __set_fixmap(FIX_ISAMAP_BEGIN - i,
+                                    virt_to_machine(empty_zero_page),
+                                    PAGE_KERNEL_RO);
 #endif
 }
 
@@ -715,18 +715,9 @@
 
 kmem_cache_t *pgd_cache;
 kmem_cache_t *pmd_cache;
-kmem_cache_t *pte_cache;
 
 void __init pgtable_cache_init(void)
 {
-       pte_cache = kmem_cache_create("pte",
-                               PTRS_PER_PTE*sizeof(pte_t),
-                               PTRS_PER_PTE*sizeof(pte_t),
-                               0,
-                               pte_ctor,
-                               pte_dtor);
-       if (!pte_cache)
-               panic("pgtable_cache_init(): Cannot create pte cache");
        if (PTRS_PER_PMD > 1) {
                pmd_cache = kmem_cache_create("pmd",
                                        PTRS_PER_PMD*sizeof(pmd_t),

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog