git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
include
/
asm-alpha
/
pgtable.h
diff --git
a/include/asm-alpha/pgtable.h
b/include/asm-alpha/pgtable.h
index
62954be
..
3f1ed39
100644
(file)
--- a/
include/asm-alpha/pgtable.h
+++ b/
include/asm-alpha/pgtable.h
@@
-83,7
+83,7
@@
#define __DIRTY_BITS (_PAGE_DIRTY | _PAGE_KWE | _PAGE_UWE)
#define __ACCESS_BITS (_PAGE_ACCESSED | _PAGE_KRE | _PAGE_URE)
#define __DIRTY_BITS (_PAGE_DIRTY | _PAGE_KWE | _PAGE_UWE)
#define __ACCESS_BITS (_PAGE_ACCESSED | _PAGE_KRE | _PAGE_URE)
-#define _PFN_MASK 0xFFFFFFFF00000000
+#define _PFN_MASK 0xFFFFFFFF00000000
UL
#define _PAGE_TABLE (_PAGE_VALID | __DIRTY_BITS | __ACCESS_BITS)
#define _PAGE_CHG_MASK (_PFN_MASK | __DIRTY_BITS | __ACCESS_BITS)
#define _PAGE_TABLE (_PAGE_VALID | __DIRTY_BITS | __ACCESS_BITS)
#define _PAGE_CHG_MASK (_PFN_MASK | __DIRTY_BITS | __ACCESS_BITS)
@@
-328,7
+328,7
@@
extern inline pte_t mk_swap_pte(unsigned long type, unsigned long offset)
#endif
#define io_remap_page_range(vma, start, busaddr, size, prot) \
#endif
#define io_remap_page_range(vma, start, busaddr, size, prot) \
- remap_page_range(vma, start, virt_to_phys(__ioremap(busaddr, size)), size, prot)
+ remap_page_range(vma, start, virt_to_phys(
(void *)
__ioremap(busaddr, size)), size, prot)
#define pte_ERROR(e) \
printk("%s:%d: bad pte %016lx.\n", __FILE__, __LINE__, pte_val(e))
#define pte_ERROR(e) \
printk("%s:%d: bad pte %016lx.\n", __FILE__, __LINE__, pte_val(e))
@@
-349,6
+349,4
@@
extern void paging_init(void);
/* We have our own get_unmapped_area to cope with ADDR_LIMIT_32BIT. */
#define HAVE_ARCH_UNMAPPED_AREA
/* We have our own get_unmapped_area to cope with ADDR_LIMIT_32BIT. */
#define HAVE_ARCH_UNMAPPED_AREA
-typedef pte_t *pte_addr_t;
-
#endif /* _ALPHA_PGTABLE_H */
#endif /* _ALPHA_PGTABLE_H */