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.5.x5
[linux-2.6.git]
/
include
/
asm-arm26
/
pgtable.h
diff --git
a/include/asm-arm26/pgtable.h
b/include/asm-arm26/pgtable.h
index
55b667a
..
fdebe15
100644
(file)
--- a/
include/asm-arm26/pgtable.h
+++ b/
include/asm-arm26/pgtable.h
@@
-11,6
+11,8
@@
#ifndef _ASMARM_PGTABLE_H
#define _ASMARM_PGTABLE_H
#ifndef _ASMARM_PGTABLE_H
#define _ASMARM_PGTABLE_H
+#include <asm-generic/4level-fixup.h>
+
#include <linux/config.h>
#include <asm/memory.h>
#include <linux/config.h>
#include <asm/memory.h>
@@
-288,9
+290,7
@@
static inline pte_t mk_pte_phys(unsigned long physpage, pgprot_t pgprot)
* into virtual address `from'
*/
#define io_remap_page_range(vma,from,phys,size,prot) \
* into virtual address `from'
*/
#define io_remap_page_range(vma,from,phys,size,prot) \
- remap_page_range(vma,from,phys,size,prot)
-
-typedef pte_t *pte_addr_t;
+ remap_pfn_range(vma, from, (phys) >> PAGE_SHIFT, size, prot)
#endif /* !__ASSEMBLY__ */
#endif /* !__ASSEMBLY__ */