patch-2_6_7-vs1_9_1_12

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

diff --git a/include/asm-um/pgtable.h b/include/asm-um/pgtable.h
index 2d7896d..148dd8e 100644 (file)
--- a/include/asm-um/pgtable.h
+++ b/include/asm-um/pgtable.h
@@ -384,18 +384,6 @@ static inline pmd_t * pmd_offset(pgd_t * dir, unsigned long address)
 #define pte_unmap(pte) kunmap_atomic((pte), KM_PTE0)
 #define pte_unmap_nested(pte) kunmap_atomic((pte), KM_PTE1)
 
-#if defined(CONFIG_HIGHPTE) && defined(CONFIG_HIGHMEM4G)
-typedef u32 pte_addr_t;
-#endif
-
-#if defined(CONFIG_HIGHPTE) && defined(CONFIG_HIGHMEM64G)
-typedef u64 pte_addr_t;
-#endif
-
-#if !defined(CONFIG_HIGHPTE)
-typedef pte_t *pte_addr_t;
-#endif
-
 #define update_mmu_cache(vma,address,pte) do ; while (0)
 
 /* Encode and de-code a swap entry */