vserver 1.9.5.x5

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

diff --git a/include/asm-sparc64/pgtable.h b/include/asm-sparc64/pgtable.h
index cb0b469..83adf80 100644 (file)
--- a/include/asm-sparc64/pgtable.h
+++ b/include/asm-sparc64/pgtable.h
@@ -12,6 +12,8 @@
  * the SpitFire page tables.
  */
 
+#include <asm-generic/pgtable-nopud.h>
+
 #include <linux/config.h>
 #include <asm/spitfire.h>
 #include <asm/asi.h>
@@ -261,23 +263,23 @@ static inline pte_t pte_modify(pte_t orig_pte, pgprot_t new_prot)
 }
 #define pmd_set(pmdp, ptep)    \
        (pmd_val(*(pmdp)) = (__pa((unsigned long) (ptep)) >> 11UL))
-#define pgd_set(pgdp, pmdp)    \
-       (pgd_val(*(pgdp)) = (__pa((unsigned long) (pmdp)) >> 11UL))
+#define pud_set(pudp, pmdp)    \
+       (pud_val(*(pudp)) = (__pa((unsigned long) (pmdp)) >> 11UL))
 #define __pmd_page(pmd)                \
        ((unsigned long) __va((((unsigned long)pmd_val(pmd))<<11UL)))
 #define pmd_page(pmd)                  virt_to_page((void *)__pmd_page(pmd))
-#define pgd_page(pgd)          \
-       ((unsigned long) __va((((unsigned long)pgd_val(pgd))<<11UL)))
+#define pud_page(pud)          \
+       ((unsigned long) __va((((unsigned long)pud_val(pud))<<11UL)))
 #define pte_none(pte)                  (!pte_val(pte))
 #define pte_present(pte)               (pte_val(pte) & _PAGE_PRESENT)
 #define pmd_none(pmd)                  (!pmd_val(pmd))
 #define pmd_bad(pmd)                   (0)
 #define pmd_present(pmd)               (pmd_val(pmd) != 0U)
 #define pmd_clear(pmdp)                        (pmd_val(*(pmdp)) = 0U)
-#define pgd_none(pgd)                  (!pgd_val(pgd))
-#define pgd_bad(pgd)                   (0)
-#define pgd_present(pgd)               (pgd_val(pgd) != 0U)
-#define pgd_clear(pgdp)                        (pgd_val(*(pgdp)) = 0U)
+#define pud_none(pud)                  (!pud_val(pud))
+#define pud_bad(pud)                   (0)
+#define pud_present(pud)               (pud_val(pud) != 0U)
+#define pud_clear(pudp)                        (pud_val(*(pudp)) = 0U)
 
 /* The following only work if pte_present() is true.
  * Undefined behaviour if not..
@@ -310,10 +312,15 @@ static inline pte_t pte_modify(pte_t orig_pte, pgprot_t new_prot)
 /* to find an entry in a kernel page-table-directory */
 #define pgd_offset_k(address) pgd_offset(&init_mm, address)
 
+/* extract the pgd cache used for optimizing the tlb miss
+ * slow path when executing 32-bit compat processes
+ */
+#define get_pgd_cache(pgd)     ((unsigned long) pgd_val(*pgd) << 11)
+
 /* Find an entry in the second-level page table.. */
-#define pmd_offset(dir, address)       \
-       ((pmd_t *) pgd_page(*(dir)) + \
-        ((address >> PMD_SHIFT) & (REAL_PTRS_PER_PMD-1)))
+#define pmd_offset(pudp, address)      \
+       ((pmd_t *) pud_page(*(pudp)) + \
+        (((address) >> PMD_SHIFT) & (REAL_PTRS_PER_PMD-1)))
 
 /* Find an entry in the third-level page table.. */
 #define pte_index(dir, address)        \
@@ -382,6 +389,7 @@ static __inline__ unsigned long
 sun4u_get_pte (unsigned long addr)
 {
        pgd_t *pgdp;
+       pud_t *pudp;
        pmd_t *pmdp;
        pte_t *ptep;
 
@@ -390,7 +398,8 @@ sun4u_get_pte (unsigned long addr)
        if ((addr >= LOW_OBP_ADDRESS) && (addr < HI_OBP_ADDRESS))
                return prom_virt_to_phys(addr, NULL);
        pgdp = pgd_offset_k(addr);
-       pmdp = pmd_offset(pgdp, addr);
+       pudp = pud_offset(pgdp, addr);
+       pmdp = pmd_offset(pudp, addr);
        ptep = pte_offset_kernel(pmdp, addr);
        return pte_val(*ptep) & _PAGE_PADDR;
 }