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
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[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
..
a590250
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>
@@
-60,6
+62,13
@@
#define PTRS_PER_PMD 1
#define PTRS_PER_PTE 32
#define PTRS_PER_PMD 1
#define PTRS_PER_PTE 32
+/*
+ * This is the lowest virtual address we can permit any user space
+ * mapping to be mapped at. This is particularly important for
+ * non-high vector CPUs.
+ */
+#define FIRST_USER_ADDRESS PAGE_SIZE
+
#define FIRST_USER_PGD_NR 1
#define USER_PTRS_PER_PGD ((TASK_SIZE/PGD_SIZE) - FIRST_USER_PGD_NR)
#define FIRST_USER_PGD_NR 1
#define USER_PTRS_PER_PGD ((TASK_SIZE/PGD_SIZE) - FIRST_USER_PGD_NR)
@@
-89,8
+98,6
@@
extern struct page *empty_zero_page;
#define pfn_pte(pfn,prot) (__pte(((pfn) << PAGE_SHIFT) | pgprot_val(prot)))
#define pages_to_mb(x) ((x) >> (20 - PAGE_SHIFT))
#define mk_pte(page,prot) pfn_pte(page_to_pfn(page),prot)
#define pfn_pte(pfn,prot) (__pte(((pfn) << PAGE_SHIFT) | pgprot_val(prot)))
#define pages_to_mb(x) ((x) >> (20 - PAGE_SHIFT))
#define mk_pte(page,prot) pfn_pte(page_to_pfn(page),prot)
-#define page_pte_prot(page,prot) mk_pte(page, prot)
-#define page_pte(page) mk_pte(page, __pgprot(0))
/*
* Terminology: PGD = Page Directory, PMD = Page Middle Directory,
/*
* Terminology: PGD = Page Directory, PMD = Page Middle Directory,
@@
-152,7
+159,8
@@
extern struct page *empty_zero_page;
#define pte_none(pte) (!pte_val(pte))
#define pte_present(pte) (pte_val(pte) & _PAGE_PRESENT)
#define set_pte(pte_ptr, pte) ((*(pte_ptr)) = (pte))
#define pte_none(pte) (!pte_val(pte))
#define pte_present(pte) (pte_val(pte) & _PAGE_PRESENT)
#define set_pte(pte_ptr, pte) ((*(pte_ptr)) = (pte))
-#define pte_clear(ptep) set_pte((ptep), __pte(0))
+#define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval)
+#define pte_clear(mm,addr,ptep) set_pte_at((mm),(addr),(ptep), __pte(0))
/* macros to ease the getting of pointers to stuff... */
#define pgd_offset(mm, addr) ((pgd_t *)(mm)->pgd + __pgd_index(addr))
/* macros to ease the getting of pointers to stuff... */
#define pgd_offset(mm, addr) ((pgd_t *)(mm)->pgd + __pgd_index(addr))
@@
-284,13
+292,15
@@
static inline pte_t mk_pte_phys(unsigned long physpage, pgprot_t pgprot)
#include <asm-generic/pgtable.h>
/*
#include <asm-generic/pgtable.h>
/*
- * remap a physical
address `phys
' of size `size' with page protection `prot'
+ * remap a physical
page `pfn
' of size `size' with page protection `prot'
* into virtual address `from'
*/
* into virtual address `from'
*/
-#define io_remap_p
age_range(vma,from,phys
,size,prot) \
- remap_p
age_range(vma,from,phys,size,
prot)
+#define io_remap_p
fn_range(vma,from,pfn
,size,prot) \
+ remap_p
fn_range(vma, from, pfn, size,
prot)
-typedef pte_t *pte_addr_t;
+#define MK_IOSPACE_PFN(space, pfn) (pfn)
+#define GET_IOSPACE(pfn) 0
+#define GET_PFN(pfn) (pfn)
#endif /* !__ASSEMBLY__ */
#endif /* !__ASSEMBLY__ */