upgrade to fedora-2.6.12-1.1398.FC4 + vserver 2.0.rc7

[linux-2.6.git] / arch / um / kernel / physmem.c

diff --git a/arch/um/kernel/physmem.c b/arch/um/kernel/physmem.c
index 3253bc0..420e6d5 100644 (file)
--- a/arch/um/kernel/physmem.c
+++ b/arch/um/kernel/physmem.c
@@ -294,7 +294,6 @@ int init_maps(unsigned long physmem, unsigned long iomem, unsigned long highmem)
                INIT_LIST_HEAD(&p->lru);
        }
 
-       mem_map = map;
        max_mapnr = total_pages;
        return(0);
 }
@@ -309,7 +308,7 @@ struct page *__virt_to_page(const unsigned long virt)
        return(&mem_map[__pa(virt) >> PAGE_SHIFT]);
 }
 
-unsigned long page_to_phys(struct page *page)
+phys_t page_to_phys(struct page *page)
 {
        return((page - mem_map) << PAGE_SHIFT);
 }
@@ -318,8 +317,9 @@ pte_t mk_pte(struct page *page, pgprot_t pgprot)
 {
        pte_t pte;
 
-       pte_val(pte) = page_to_phys(page) + pgprot_val(pgprot);
-       if(pte_present(pte)) pte_mknewprot(pte_mknewpage(pte));
+       pte_set_val(pte, page_to_phys(page), pgprot);
+       if(pte_present(pte))
+               pte_mknewprot(pte_mknewpage(pte));
        return(pte);
 }