[PATCH] x86: trivial move of __HAVE macros in i386 pagetable headers
Move the __HAVE_ARCH_PTEP defines to accompany the function definitions. Anything else is just a complete nightmare to track through the 2/3-level paging code, and this caused duplicate definitions to be needed (pte_same), which could have easily been taken care of with the asm-generic pgtable functions. Signed-off-by: Zachary Amsden <zach@vmware.com> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
673eae8230
commit
6049742dbc
|
@ -21,8 +21,9 @@
|
||||||
#define pte_clear(mm,addr,xp) do { set_pte_at(mm, addr, xp, __pte(0)); } while (0)
|
#define pte_clear(mm,addr,xp) do { set_pte_at(mm, addr, xp, __pte(0)); } while (0)
|
||||||
#define pmd_clear(xp) do { set_pmd(xp, __pmd(0)); } while (0)
|
#define pmd_clear(xp) do { set_pmd(xp, __pmd(0)); } while (0)
|
||||||
|
|
||||||
|
#define __HAVE_ARCH_PTEP_GET_AND_CLEAR
|
||||||
#define ptep_get_and_clear(mm,addr,xp) __pte(xchg(&(xp)->pte_low, 0))
|
#define ptep_get_and_clear(mm,addr,xp) __pte(xchg(&(xp)->pte_low, 0))
|
||||||
#define pte_same(a, b) ((a).pte_low == (b).pte_low)
|
|
||||||
#define pte_page(x) pfn_to_page(pte_pfn(x))
|
#define pte_page(x) pfn_to_page(pte_pfn(x))
|
||||||
#define pte_none(x) (!(x).pte_low)
|
#define pte_none(x) (!(x).pte_low)
|
||||||
#define pte_pfn(x) ((unsigned long)(((x).pte_low >> PAGE_SHIFT)))
|
#define pte_pfn(x) ((unsigned long)(((x).pte_low >> PAGE_SHIFT)))
|
||||||
|
|
|
@ -105,6 +105,7 @@ static inline void pmd_clear(pmd_t *pmd)
|
||||||
*(tmp + 1) = 0;
|
*(tmp + 1) = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#define __HAVE_ARCH_PTEP_GET_AND_CLEAR
|
||||||
static inline pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
|
static inline pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
|
||||||
{
|
{
|
||||||
pte_t res;
|
pte_t res;
|
||||||
|
@ -117,6 +118,7 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr,
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#define __HAVE_ARCH_PTE_SAME
|
||||||
static inline int pte_same(pte_t a, pte_t b)
|
static inline int pte_same(pte_t a, pte_t b)
|
||||||
{
|
{
|
||||||
return a.pte_low == b.pte_low && a.pte_high == b.pte_high;
|
return a.pte_low == b.pte_low && a.pte_high == b.pte_high;
|
||||||
|
|
|
@ -246,6 +246,7 @@ static inline pte_t pte_mkhuge(pte_t pte) { (pte).pte_low |= _PAGE_PSE; return p
|
||||||
# include <asm/pgtable-2level.h>
|
# include <asm/pgtable-2level.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_DIRTY
|
||||||
static inline int ptep_test_and_clear_dirty(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep)
|
static inline int ptep_test_and_clear_dirty(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep)
|
||||||
{
|
{
|
||||||
if (!pte_dirty(*ptep))
|
if (!pte_dirty(*ptep))
|
||||||
|
@ -253,6 +254,7 @@ static inline int ptep_test_and_clear_dirty(struct vm_area_struct *vma, unsigned
|
||||||
return test_and_clear_bit(_PAGE_BIT_DIRTY, &ptep->pte_low);
|
return test_and_clear_bit(_PAGE_BIT_DIRTY, &ptep->pte_low);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG
|
||||||
static inline int ptep_test_and_clear_young(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep)
|
static inline int ptep_test_and_clear_young(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep)
|
||||||
{
|
{
|
||||||
if (!pte_young(*ptep))
|
if (!pte_young(*ptep))
|
||||||
|
@ -260,6 +262,7 @@ static inline int ptep_test_and_clear_young(struct vm_area_struct *vma, unsigned
|
||||||
return test_and_clear_bit(_PAGE_BIT_ACCESSED, &ptep->pte_low);
|
return test_and_clear_bit(_PAGE_BIT_ACCESSED, &ptep->pte_low);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#define __HAVE_ARCH_PTEP_GET_AND_CLEAR_FULL
|
||||||
static inline pte_t ptep_get_and_clear_full(struct mm_struct *mm, unsigned long addr, pte_t *ptep, int full)
|
static inline pte_t ptep_get_and_clear_full(struct mm_struct *mm, unsigned long addr, pte_t *ptep, int full)
|
||||||
{
|
{
|
||||||
pte_t pte;
|
pte_t pte;
|
||||||
|
@ -272,6 +275,7 @@ static inline pte_t ptep_get_and_clear_full(struct mm_struct *mm, unsigned long
|
||||||
return pte;
|
return pte;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#define __HAVE_ARCH_PTEP_SET_WRPROTECT
|
||||||
static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
|
static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
|
||||||
{
|
{
|
||||||
clear_bit(_PAGE_BIT_RW, &ptep->pte_low);
|
clear_bit(_PAGE_BIT_RW, &ptep->pte_low);
|
||||||
|
@ -441,12 +445,6 @@ extern void noexec_setup(const char *str);
|
||||||
#define GET_IOSPACE(pfn) 0
|
#define GET_IOSPACE(pfn) 0
|
||||||
#define GET_PFN(pfn) (pfn)
|
#define GET_PFN(pfn) (pfn)
|
||||||
|
|
||||||
#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG
|
|
||||||
#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_DIRTY
|
|
||||||
#define __HAVE_ARCH_PTEP_GET_AND_CLEAR
|
|
||||||
#define __HAVE_ARCH_PTEP_GET_AND_CLEAR_FULL
|
|
||||||
#define __HAVE_ARCH_PTEP_SET_WRPROTECT
|
|
||||||
#define __HAVE_ARCH_PTE_SAME
|
|
||||||
#include <asm-generic/pgtable.h>
|
#include <asm-generic/pgtable.h>
|
||||||
|
|
||||||
#endif /* _I386_PGTABLE_H */
|
#endif /* _I386_PGTABLE_H */
|
||||||
|
|
Loading…
Reference in New Issue