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 2.0 rc7
[linux-2.6.git]
/
include
/
asm-sh
/
pgtable.h
diff --git
a/include/asm-sh/pgtable.h
b/include/asm-sh/pgtable.h
index
8853eb2
..
cd847a4
100644
(file)
--- a/
include/asm-sh/pgtable.h
+++ b/
include/asm-sh/pgtable.h
@@
-44,7
+44,7
@@
extern unsigned long empty_zero_page[1024];
#define PGDIR_MASK (~(PGDIR_SIZE-1))
#define USER_PTRS_PER_PGD (TASK_SIZE/PGDIR_SIZE)
#define PGDIR_MASK (~(PGDIR_SIZE-1))
#define USER_PTRS_PER_PGD (TASK_SIZE/PGDIR_SIZE)
-#define FIRST_USER_
PGD_NR
0
+#define FIRST_USER_
ADDRESS
0
#define PTE_PHYS_MASK 0x1ffff000
#define PTE_PHYS_MASK 0x1ffff000
@@
-164,7
+164,7
@@
extern unsigned long empty_zero_page[1024];
#define pte_none(x) (!pte_val(x))
#define pte_present(x) (pte_val(x) & (_PAGE_PRESENT | _PAGE_PROTNONE))
#define pte_none(x) (!pte_val(x))
#define pte_present(x) (pte_val(x) & (_PAGE_PRESENT | _PAGE_PROTNONE))
-#define pte_clear(
xp) do { set_pte(
xp, __pte(0)); } while (0)
+#define pte_clear(
mm,addr,xp) do { set_pte_at(mm, addr,
xp, __pte(0)); } while (0)
#define pmd_none(x) (!pmd_val(x))
#define pmd_present(x) (pmd_val(x) & _PAGE_PRESENT)
#define pmd_none(x) (!pmd_val(x))
#define pmd_present(x) (pmd_val(x) & _PAGE_PRESENT)
@@
-279,6
+279,13
@@
typedef pte_t *pte_addr_t;
#define io_remap_page_range(vma, vaddr, paddr, size, prot) \
remap_pfn_range(vma, vaddr, (paddr) >> PAGE_SHIFT, size, prot)
#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)
+
/*
* No page table caches to initialise
*/
/*
* No page table caches to initialise
*/
@@
-290,7
+297,7
@@
extern unsigned int kobjsize(const void *objp);
#if defined(CONFIG_CPU_SH4) || defined(CONFIG_SH7705_CACHE_32KB)
#define __HAVE_ARCH_PTEP_GET_AND_CLEAR
#if defined(CONFIG_CPU_SH4) || defined(CONFIG_SH7705_CACHE_32KB)
#define __HAVE_ARCH_PTEP_GET_AND_CLEAR
-extern pte_t ptep_get_and_clear(pte_t *ptep);
+extern pte_t ptep_get_and_clear(
struct mm_struct *mm, unsigned long addr,
pte_t *ptep);
#endif
#include <asm-generic/pgtable.h>
#endif
#include <asm-generic/pgtable.h>