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-s390
/
pgtable.h
diff --git
a/include/asm-s390/pgtable.h
b/include/asm-s390/pgtable.h
index
85f043c
..
859b5e9
100644
(file)
--- a/
include/asm-s390/pgtable.h
+++ b/
include/asm-s390/pgtable.h
@@
-36,6
+36,7
@@
#include <linux/threads.h>
struct vm_area_struct; /* forward declaration (include/linux/mm.h) */
#include <linux/threads.h>
struct vm_area_struct; /* forward declaration (include/linux/mm.h) */
+struct mm_struct;
extern pgd_t swapper_pg_dir[] __attribute__ ((aligned (4096)));
extern void paging_init(void);
extern pgd_t swapper_pg_dir[] __attribute__ ((aligned (4096)));
extern void paging_init(void);
@@
-95,14
+96,14
@@
extern char empty_zero_page[PAGE_SIZE];
# define USER_PTRS_PER_PGD 512
# define USER_PGD_PTRS 512
# define KERNEL_PGD_PTRS 512
# define USER_PTRS_PER_PGD 512
# define USER_PGD_PTRS 512
# define KERNEL_PGD_PTRS 512
-# define FIRST_USER_PGD_NR 0
#else /* __s390x__ */
# define USER_PTRS_PER_PGD 2048
# define USER_PGD_PTRS 2048
# define KERNEL_PGD_PTRS 2048
#else /* __s390x__ */
# define USER_PTRS_PER_PGD 2048
# define USER_PGD_PTRS 2048
# define KERNEL_PGD_PTRS 2048
-# define FIRST_USER_PGD_NR 0
#endif /* __s390x__ */
#endif /* __s390x__ */
+#define FIRST_USER_ADDRESS 0
+
#define pte_ERROR(e) \
printk("%s:%d: bad pte %p.\n", __FILE__, __LINE__, (void *) pte_val(e))
#define pmd_ERROR(e) \
#define pte_ERROR(e) \
printk("%s:%d: bad pte %p.\n", __FILE__, __LINE__, (void *) pte_val(e))
#define pmd_ERROR(e) \
@@
-318,73
+319,74
@@
extern char empty_zero_page[PAGE_SIZE];
* within a page table are directly modified. Thus, the following
* hook is made available.
*/
* within a page table are directly modified. Thus, the following
* hook is made available.
*/
-
extern
inline void set_pte(pte_t *pteptr, pte_t pteval)
+
static
inline void set_pte(pte_t *pteptr, pte_t pteval)
{
*pteptr = pteval;
}
{
*pteptr = pteval;
}
+#define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval)
/*
* pgd/pmd/pte query functions
*/
#ifndef __s390x__
/*
* pgd/pmd/pte query functions
*/
#ifndef __s390x__
-
extern
inline int pgd_present(pgd_t pgd) { return 1; }
-
extern
inline int pgd_none(pgd_t pgd) { return 0; }
-
extern
inline int pgd_bad(pgd_t pgd) { return 0; }
+
static
inline int pgd_present(pgd_t pgd) { return 1; }
+
static
inline int pgd_none(pgd_t pgd) { return 0; }
+
static
inline int pgd_bad(pgd_t pgd) { return 0; }
-
extern
inline int pmd_present(pmd_t pmd) { return pmd_val(pmd) & _SEG_PRESENT; }
-
extern
inline int pmd_none(pmd_t pmd) { return pmd_val(pmd) & _PAGE_TABLE_INV; }
-
extern
inline int pmd_bad(pmd_t pmd)
+
static
inline int pmd_present(pmd_t pmd) { return pmd_val(pmd) & _SEG_PRESENT; }
+
static
inline int pmd_none(pmd_t pmd) { return pmd_val(pmd) & _PAGE_TABLE_INV; }
+
static
inline int pmd_bad(pmd_t pmd)
{
return (pmd_val(pmd) & (~PAGE_MASK & ~_PAGE_TABLE_INV)) != _PAGE_TABLE;
}
#else /* __s390x__ */
{
return (pmd_val(pmd) & (~PAGE_MASK & ~_PAGE_TABLE_INV)) != _PAGE_TABLE;
}
#else /* __s390x__ */
-
extern
inline int pgd_present(pgd_t pgd)
+
static
inline int pgd_present(pgd_t pgd)
{
return (pgd_val(pgd) & ~PAGE_MASK) == _PGD_ENTRY;
}
{
return (pgd_val(pgd) & ~PAGE_MASK) == _PGD_ENTRY;
}
-
extern
inline int pgd_none(pgd_t pgd)
+
static
inline int pgd_none(pgd_t pgd)
{
return pgd_val(pgd) & _PGD_ENTRY_INV;
}
{
return pgd_val(pgd) & _PGD_ENTRY_INV;
}
-
extern
inline int pgd_bad(pgd_t pgd)
+
static
inline int pgd_bad(pgd_t pgd)
{
return (pgd_val(pgd) & (~PAGE_MASK & ~_PGD_ENTRY_INV)) != _PGD_ENTRY;
}
{
return (pgd_val(pgd) & (~PAGE_MASK & ~_PGD_ENTRY_INV)) != _PGD_ENTRY;
}
-
extern
inline int pmd_present(pmd_t pmd)
+
static
inline int pmd_present(pmd_t pmd)
{
return (pmd_val(pmd) & ~PAGE_MASK) == _PMD_ENTRY;
}
{
return (pmd_val(pmd) & ~PAGE_MASK) == _PMD_ENTRY;
}
-
extern
inline int pmd_none(pmd_t pmd)
+
static
inline int pmd_none(pmd_t pmd)
{
return pmd_val(pmd) & _PMD_ENTRY_INV;
}
{
return pmd_val(pmd) & _PMD_ENTRY_INV;
}
-
extern
inline int pmd_bad(pmd_t pmd)
+
static
inline int pmd_bad(pmd_t pmd)
{
return (pmd_val(pmd) & (~PAGE_MASK & ~_PMD_ENTRY_INV)) != _PMD_ENTRY;
}
#endif /* __s390x__ */
{
return (pmd_val(pmd) & (~PAGE_MASK & ~_PMD_ENTRY_INV)) != _PMD_ENTRY;
}
#endif /* __s390x__ */
-
extern
inline int pte_none(pte_t pte)
+
static
inline int pte_none(pte_t pte)
{
return (pte_val(pte) & _PAGE_INVALID_MASK) == _PAGE_INVALID_EMPTY;
}
{
return (pte_val(pte) & _PAGE_INVALID_MASK) == _PAGE_INVALID_EMPTY;
}
-
extern
inline int pte_present(pte_t pte)
+
static
inline int pte_present(pte_t pte)
{
return !(pte_val(pte) & _PAGE_INVALID) ||
(pte_val(pte) & _PAGE_INVALID_MASK) == _PAGE_INVALID_NONE;
}
{
return !(pte_val(pte) & _PAGE_INVALID) ||
(pte_val(pte) & _PAGE_INVALID_MASK) == _PAGE_INVALID_NONE;
}
-
extern
inline int pte_file(pte_t pte)
+
static
inline int pte_file(pte_t pte)
{
return (pte_val(pte) & _PAGE_INVALID_MASK) == _PAGE_INVALID_FILE;
}
{
return (pte_val(pte) & _PAGE_INVALID_MASK) == _PAGE_INVALID_FILE;
}
@@
-395,12
+397,12
@@
extern inline int pte_file(pte_t pte)
* query functions pte_write/pte_dirty/pte_young only work if
* pte_present() is true. Undefined behaviour if not..
*/
* query functions pte_write/pte_dirty/pte_young only work if
* pte_present() is true. Undefined behaviour if not..
*/
-
extern
inline int pte_write(pte_t pte)
+
static
inline int pte_write(pte_t pte)
{
return (pte_val(pte) & _PAGE_RO) == 0;
}
{
return (pte_val(pte) & _PAGE_RO) == 0;
}
-
extern
inline int pte_dirty(pte_t pte)
+
static
inline int pte_dirty(pte_t pte)
{
/* A pte is neither clean nor dirty on s/390. The dirty bit
* is in the storage key. See page_test_and_clear_dirty for
{
/* A pte is neither clean nor dirty on s/390. The dirty bit
* is in the storage key. See page_test_and_clear_dirty for
@@
-409,7
+411,7
@@
extern inline int pte_dirty(pte_t pte)
return 0;
}
return 0;
}
-
extern
inline int pte_young(pte_t pte)
+
static
inline int pte_young(pte_t pte)
{
/* A pte is neither young nor old on s/390. The young bit
* is in the storage key. See page_test_and_clear_young for
{
/* A pte is neither young nor old on s/390. The young bit
* is in the storage key. See page_test_and_clear_young for
@@
-418,7
+420,7
@@
extern inline int pte_young(pte_t pte)
return 0;
}
return 0;
}
-
extern
inline int pte_read(pte_t pte)
+
static
inline int pte_read(pte_t pte)
{
/* All pages are readable since we don't use the fetch
* protection bit in the storage key.
{
/* All pages are readable since we don't use the fetch
* protection bit in the storage key.
@@
-432,9
+434,9
@@
extern inline int pte_read(pte_t pte)
#ifndef __s390x__
#ifndef __s390x__
-
extern
inline void pgd_clear(pgd_t * pgdp) { }
+
static
inline void pgd_clear(pgd_t * pgdp) { }
-
extern
inline void pmd_clear(pmd_t * pmdp)
+
static
inline void pmd_clear(pmd_t * pmdp)
{
pmd_val(pmdp[0]) = _PAGE_TABLE_INV;
pmd_val(pmdp[1]) = _PAGE_TABLE_INV;
{
pmd_val(pmdp[0]) = _PAGE_TABLE_INV;
pmd_val(pmdp[1]) = _PAGE_TABLE_INV;
@@
-444,12
+446,12
@@
extern inline void pmd_clear(pmd_t * pmdp)
#else /* __s390x__ */
#else /* __s390x__ */
-
extern
inline void pgd_clear(pgd_t * pgdp)
+
static
inline void pgd_clear(pgd_t * pgdp)
{
pgd_val(*pgdp) = _PGD_ENTRY_INV | _PGD_ENTRY;
}
{
pgd_val(*pgdp) = _PGD_ENTRY_INV | _PGD_ENTRY;
}
-
extern
inline void pmd_clear(pmd_t * pmdp)
+
static
inline void pmd_clear(pmd_t * pmdp)
{
pmd_val(*pmdp) = _PMD_ENTRY_INV | _PMD_ENTRY;
pmd_val1(*pmdp) = _PMD_ENTRY_INV | _PMD_ENTRY;
{
pmd_val(*pmdp) = _PMD_ENTRY_INV | _PMD_ENTRY;
pmd_val1(*pmdp) = _PMD_ENTRY_INV | _PMD_ENTRY;
@@
-457,7
+459,7
@@
extern inline void pmd_clear(pmd_t * pmdp)
#endif /* __s390x__ */
#endif /* __s390x__ */
-
extern inline void pte_clear(
pte_t *ptep)
+
static inline void pte_clear(struct mm_struct *mm, unsigned long addr,
pte_t *ptep)
{
pte_val(*ptep) = _PAGE_INVALID_EMPTY;
}
{
pte_val(*ptep) = _PAGE_INVALID_EMPTY;
}
@@
-466,14
+468,14
@@
extern inline void pte_clear(pte_t *ptep)
* The following pte modification functions only work if
* pte_present() is true. Undefined behaviour if not..
*/
* The following pte modification functions only work if
* pte_present() is true. Undefined behaviour if not..
*/
-
extern
inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
+
static
inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
{
pte_val(pte) &= PAGE_MASK;
pte_val(pte) |= pgprot_val(newprot);
return pte;
}
{
pte_val(pte) &= PAGE_MASK;
pte_val(pte) |= pgprot_val(newprot);
return pte;
}
-
extern
inline pte_t pte_wrprotect(pte_t pte)
+
static
inline pte_t pte_wrprotect(pte_t pte)
{
/* Do not clobber _PAGE_INVALID_NONE pages! */
if (!(pte_val(pte) & _PAGE_INVALID))
{
/* Do not clobber _PAGE_INVALID_NONE pages! */
if (!(pte_val(pte) & _PAGE_INVALID))
@@
-481,13
+483,13
@@
extern inline pte_t pte_wrprotect(pte_t pte)
return pte;
}
return pte;
}
-extern inline pte_t pte_mkwrite(pte_t pte)
+static inline pte_t pte_mkwrite(pte_t pte)
{
pte_val(pte) &= ~_PAGE_RO;
return pte;
}
{
pte_val(pte) &= ~_PAGE_RO;
return pte;
}
-
extern
inline pte_t pte_mkclean(pte_t pte)
+
static
inline pte_t pte_mkclean(pte_t pte)
{
/* The only user of pte_mkclean is the fork() code.
We must *not* clear the *physical* page dirty bit
{
/* The only user of pte_mkclean is the fork() code.
We must *not* clear the *physical* page dirty bit
@@
-496,7
+498,7
@@
extern inline pte_t pte_mkclean(pte_t pte)
return pte;
}
return pte;
}
-
extern
inline pte_t pte_mkdirty(pte_t pte)
+
static
inline pte_t pte_mkdirty(pte_t pte)
{
/* We do not explicitly set the dirty bit because the
* sske instruction is slow. It is faster to let the
{
/* We do not explicitly set the dirty bit because the
* sske instruction is slow. It is faster to let the
@@
-505,7
+507,7
@@
extern inline pte_t pte_mkdirty(pte_t pte)
return pte;
}
return pte;
}
-
extern
inline pte_t pte_mkold(pte_t pte)
+
static
inline pte_t pte_mkold(pte_t pte)
{
/* S/390 doesn't keep its dirty/referenced bit in the pte.
* There is no point in clearing the real referenced bit.
{
/* S/390 doesn't keep its dirty/referenced bit in the pte.
* There is no point in clearing the real referenced bit.
@@
-513,7
+515,7
@@
extern inline pte_t pte_mkold(pte_t pte)
return pte;
}
return pte;
}
-
extern
inline pte_t pte_mkyoung(pte_t pte)
+
static
inline pte_t pte_mkyoung(pte_t pte)
{
/* S/390 doesn't keep its dirty/referenced bit in the pte.
* There is no point in setting the real referenced bit.
{
/* S/390 doesn't keep its dirty/referenced bit in the pte.
* There is no point in setting the real referenced bit.
@@
-521,7
+523,7
@@
extern inline pte_t pte_mkyoung(pte_t pte)
return pte;
}
return pte;
}
-static inline int ptep_test_and_clear_young(pte_t *ptep)
+static inline int ptep_test_and_clear_young(
struct vm_area_struct *vma, unsigned long addr,
pte_t *ptep)
{
return 0;
}
{
return 0;
}
@@
-531,10
+533,10
@@
ptep_clear_flush_young(struct vm_area_struct *vma,
unsigned long address, pte_t *ptep)
{
/* No need to flush TLB; bits are in storage key */
unsigned long address, pte_t *ptep)
{
/* No need to flush TLB; bits are in storage key */
- return ptep_test_and_clear_young(ptep);
+ return ptep_test_and_clear_young(
vma, address,
ptep);
}
}
-static inline int ptep_test_and_clear_dirty(pte_t *ptep)
+static inline int ptep_test_and_clear_dirty(
struct vm_area_struct *vma, unsigned long addr,
pte_t *ptep)
{
return 0;
}
{
return 0;
}
@@
-544,13
+546,13
@@
ptep_clear_flush_dirty(struct vm_area_struct *vma,
unsigned long address, pte_t *ptep)
{
/* No need to flush TLB; bits are in storage key */
unsigned long address, pte_t *ptep)
{
/* No need to flush TLB; bits are in storage key */
- return ptep_test_and_clear_dirty(ptep);
+ return ptep_test_and_clear_dirty(
vma, address,
ptep);
}
}
-static inline pte_t ptep_get_and_clear(pte_t *ptep)
+static inline pte_t ptep_get_and_clear(
struct mm_struct *mm, unsigned long addr,
pte_t *ptep)
{
pte_t pte = *ptep;
{
pte_t pte = *ptep;
- pte_clear(ptep);
+ pte_clear(
mm, addr,
ptep);
return pte;
}
return pte;
}
@@
-573,19
+575,14
@@
ptep_clear_flush(struct vm_area_struct *vma,
: "=m" (*ptep) : "m" (*ptep),
"a" (ptep), "a" (address) );
#endif /* __s390x__ */
: "=m" (*ptep) : "m" (*ptep),
"a" (ptep), "a" (address) );
#endif /* __s390x__ */
- pte_
clear(ptep)
;
+ pte_
val(*ptep) = _PAGE_INVALID_EMPTY
;
return pte;
}
return pte;
}
-static inline void ptep_set_wrprotect(pte_t *ptep)
+static inline void ptep_set_wrprotect(
struct mm_struct *mm, unsigned long addr,
pte_t *ptep)
{
pte_t old_pte = *ptep;
{
pte_t old_pte = *ptep;
- set_pte(ptep, pte_wrprotect(old_pte));
-}
-
-static inline void ptep_mkdirty(pte_t *ptep)
-{
- pte_mkdirty(*ptep);
+ set_pte_at(mm, addr, ptep, pte_wrprotect(old_pte));
}
static inline void
}
static inline void
@@
-698,7
+695,7
@@
static inline pte_t mk_pte_phys(unsigned long physpage, pgprot_t pgprot)
#ifndef __s390x__
/* Find an entry in the second-level page table.. */
#ifndef __s390x__
/* Find an entry in the second-level page table.. */
-
extern
inline pmd_t * pmd_offset(pgd_t * dir, unsigned long address)
+
static
inline pmd_t * pmd_offset(pgd_t * dir, unsigned long address)
{
return (pmd_t *) dir;
}
{
return (pmd_t *) dir;
}
@@
-756,11
+753,17
@@
extern inline pmd_t * pmd_offset(pgd_t * dir, unsigned long address)
* 0000000000111111111122222222223333333333444444444455 5555 5 55566 66
* 0123456789012345678901234567890123456789012345678901 2345 6 78901 23
*/
* 0000000000111111111122222222223333333333444444444455 5555 5 55566 66
* 0123456789012345678901234567890123456789012345678901 2345 6 78901 23
*/
-extern inline pte_t mk_swap_pte(unsigned long type, unsigned long offset)
+#ifndef __s390x__
+#define __SWP_OFFSET_MASK (~0UL >> 12)
+#else
+#define __SWP_OFFSET_MASK (~0UL >> 11)
+#endif
+static inline pte_t mk_swap_pte(unsigned long type, unsigned long offset)
{
pte_t pte;
{
pte_t pte;
+ offset &= __SWP_OFFSET_MASK;
pte_val(pte) = _PAGE_INVALID_SWAP | ((type & 0x1f) << 2) |
pte_val(pte) = _PAGE_INVALID_SWAP | ((type & 0x1f) << 2) |
- ((offset & 1
) << 7) | ((offset & 0xffffe
) << 11);
+ ((offset & 1
UL) << 7) | ((offset & ~1UL
) << 11);
return pte;
}
return pte;
}
@@
-802,7
+805,6
@@
extern inline pte_t mk_swap_pte(unsigned long type, unsigned long offset)
#define __HAVE_ARCH_PTEP_GET_AND_CLEAR
#define __HAVE_ARCH_PTEP_CLEAR_FLUSH
#define __HAVE_ARCH_PTEP_SET_WRPROTECT
#define __HAVE_ARCH_PTEP_GET_AND_CLEAR
#define __HAVE_ARCH_PTEP_CLEAR_FLUSH
#define __HAVE_ARCH_PTEP_SET_WRPROTECT
-#define __HAVE_ARCH_PTEP_MKDIRTY
#define __HAVE_ARCH_PTE_SAME
#define __HAVE_ARCH_PAGE_TEST_AND_CLEAR_DIRTY
#define __HAVE_ARCH_PAGE_TEST_AND_CLEAR_YOUNG
#define __HAVE_ARCH_PTE_SAME
#define __HAVE_ARCH_PAGE_TEST_AND_CLEAR_DIRTY
#define __HAVE_ARCH_PAGE_TEST_AND_CLEAR_YOUNG