vserver 2.0 rc7

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

diff --git a/include/asm-sh64/pgtable.h b/include/asm-sh64/pgtable.h
index 4b3f31a..525e152 100644 (file)
--- a/include/asm-sh64/pgtable.h
+++ b/include/asm-sh64/pgtable.h
@@ -136,6 +136,7 @@ static __inline__ void set_pte(pte_t *pteptr, pte_t pteval)
         */
        *(xp) = (x & NPHYS_SIGN) ? (x | NPHYS_MASK) : x;
 }
+#define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval)
 
 static __inline__ void pmd_set(pmd_t *pmdp,pte_t *ptep)
 {
@@ -237,7 +238,7 @@ static inline pmd_t * pmd_offset(pgd_t * dir, unsigned long address)
 
 /* Round it up ! */
 #define USER_PTRS_PER_PGD      ((TASK_SIZE+PGDIR_SIZE-1)/PGDIR_SIZE)
-#define FIRST_USER_PGD_NR      0
+#define FIRST_USER_ADDRESS     0
 
 #ifndef __ASSEMBLY__
 #define VMALLOC_END    0xff000000
@@ -280,8 +281,6 @@ static inline pmd_t * pmd_offset(pgd_t * dir, unsigned long address)
 
 /* Mask which drops software flags */
 #define _PAGE_FLAGS_HARDWARE_MASK      0xfffffffffffff3dbLL
-/* Flags default: 4KB, Read, Not write, Not execute, Not user */
-#define _PAGE_FLAGS_HARDWARE_DEFAULT   0x0000000000000040LL
 
 /*
  * HugeTLB support
@@ -383,7 +382,7 @@ extern void __handle_bad_pmd_kernel(pmd_t * pmd);
  */
 #define _PTE_EMPTY     0x0
 #define pte_present(x) (pte_val(x) & _PAGE_PRESENT)
-#define pte_clear(xp)  (set_pte(xp, __pte(_PTE_EMPTY)))
+#define pte_clear(mm,addr,xp)  (set_pte_at(mm, addr, xp, __pte(_PTE_EMPTY)))
 #define pte_none(x)    (pte_val(x) == _PTE_EMPTY)
 
 /*
@@ -483,6 +482,14 @@ extern void update_mmu_cache(struct vm_area_struct * vma,
 
 #define io_remap_page_range(vma, vaddr, paddr, size, prot)             \
                remap_pfn_range(vma, vaddr, (paddr) >> PAGE_SHIFT, size, prot)
+
+#define io_remap_pfn_range(vma, vaddr, pfn, size, prot)                \
+               remap_pfn_range(vma, vaddr, pfn, size, prot)
+
+#define MK_IOSPACE_PFN(space, pfn)     (pfn)
+#define GET_IOSPACE(pfn)               0
+#define GET_PFN(pfn)                   (pfn)
+
 #endif /* !__ASSEMBLY__ */
 
 /*