vserver 2.0 rc7

[linux-2.6.git] / include / asm-sparc64 / pgalloc.h

diff --git a/include/asm-sparc64/pgalloc.h b/include/asm-sparc64/pgalloc.h
index e1b0538..b9b1914 100644 (file)
--- a/include/asm-sparc64/pgalloc.h
+++ b/include/asm-sparc64/pgalloc.h
@@ -7,88 +7,25 @@
 #include <linux/sched.h>
 #include <linux/mm.h>
 
-#include <asm/page.h>
 #include <asm/spitfire.h>
-#include <asm/pgtable.h>
 #include <asm/cpudata.h>
+#include <asm/cacheflush.h>
 
 /* Page table allocation/freeing. */
 #ifdef CONFIG_SMP
 /* Sliiiicck */
-#define pgt_quicklists cpu_data(smp_processor_id())
+#define pgt_quicklists local_cpu_data()
 #else
 extern struct pgtable_cache_struct {
        unsigned long *pgd_cache;
        unsigned long *pte_cache[2];
        unsigned int pgcache_size;
-       unsigned int pgdcache_size;
 } pgt_quicklists;
 #endif
 #define pgd_quicklist          (pgt_quicklists.pgd_cache)
 #define pmd_quicklist          ((unsigned long *)0)
 #define pte_quicklist          (pgt_quicklists.pte_cache)
 #define pgtable_cache_size     (pgt_quicklists.pgcache_size)
-#define pgd_cache_size         (pgt_quicklists.pgdcache_size)
-
-#ifndef CONFIG_SMP
-
-static __inline__ void free_pgd_fast(pgd_t *pgd)
-{
-       struct page *page = virt_to_page(pgd);
-
-       preempt_disable();
-       if (!page->lru.prev) {
-               page->lru.next = (void *) pgd_quicklist;
-               pgd_quicklist = (unsigned long *)page;
-       }
-       page->lru.prev = (void *)
-         (((unsigned long)page->lru.prev) |
-          (((unsigned long)pgd & (PAGE_SIZE / 2)) ? 2 : 1));
-       pgd_cache_size++;
-       preempt_enable();
-}
-
-static __inline__ pgd_t *get_pgd_fast(void)
-{
-        struct page *ret;
-
-       preempt_disable();
-        if ((ret = (struct page *)pgd_quicklist) != NULL) {
-                unsigned long mask = (unsigned long)ret->lru.prev;
-               unsigned long off = 0;
-
-               if (mask & 1)
-                       mask &= ~1;
-               else {
-                       off = PAGE_SIZE / 2;
-                       mask &= ~2;
-               }
-               ret->lru.prev = (void *) mask;
-               if (!mask)
-                       pgd_quicklist = (unsigned long *)ret->lru.next;
-                ret = (struct page *)(__page_address(ret) + off);
-                pgd_cache_size--;
-               preempt_enable();
-        } else {
-               struct page *page;
-
-               preempt_enable();
-               page = alloc_page(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO);
-               if (page) {
-                       ret = (struct page *)page_address(page);
-                       page->lru.prev = (void *) 2UL;
-
-                       preempt_disable();
-                       page->lru.next = (void *) pgd_quicklist;
-                       pgd_quicklist = (unsigned long *)page;
-                       pgd_cache_size++;
-                       preempt_enable();
-               }
-        }
-        return (pgd_t *)ret;
-}
-
-#else /* CONFIG_SMP */
 
 static __inline__ void free_pgd_fast(pgd_t *pgd)
 {
@@ -123,9 +60,7 @@ static __inline__ void free_pgd_slow(pgd_t *pgd)
        free_page((unsigned long)pgd);
 }
 
-#endif /* CONFIG_SMP */
-
-#if (L1DCACHE_SIZE > PAGE_SIZE)                        /* is there D$ aliasing problem */
+#ifdef DCACHE_ALIASING_POSSIBLE
 #define VPTE_COLOR(address)            (((address) >> (PAGE_SHIFT + 10)) & 1UL)
 #define DCACHE_COLOR(address)          (((address) >> PAGE_SHIFT) & 1UL)
 #else
@@ -187,29 +122,16 @@ static __inline__ void free_pmd_slow(pmd_t *pmd)
 #define pmd_populate(MM,PMD,PTE_PAGE)          \
        pmd_populate_kernel(MM,PMD,page_address(PTE_PAGE))
 
-extern pte_t *__pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address);
-
-static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)
-{
-       pte_t *pte = __pte_alloc_one_kernel(mm, address);
-       if (pte) {
-               struct page *page = virt_to_page(pte);
-               page->mapping = (void *) mm;
-               page->index = address & PMD_MASK;
-       }
-       return pte;
-}
+extern pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address);
 
 static inline struct page *
 pte_alloc_one(struct mm_struct *mm, unsigned long addr)
 {
-       pte_t *pte = __pte_alloc_one_kernel(mm, addr);
-       if (pte) {
-               struct page *page = virt_to_page(pte);
-               page->mapping = (void *) mm;
-               page->index = addr & PMD_MASK;
-               return page;
-       }
+       pte_t *pte = pte_alloc_one_kernel(mm, addr);
+
+       if (pte)
+               return virt_to_page(pte);
+
        return NULL;
 }
 
@@ -246,13 +168,11 @@ static __inline__ void free_pte_slow(pte_t *pte)
 
 static inline void pte_free_kernel(pte_t *pte)
 {
-       virt_to_page(pte)->mapping = NULL;
        free_pte_fast(pte);
 }
 
 static inline void pte_free(struct page *ptepage)
 {
-       ptepage->mapping = NULL;
        free_pte_fast(page_address(ptepage));
 }