Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] i386: pte simplify ops

Browse source 
Add comment and condense code to make use of native_local_ptep_get_and_clear
function.  Also, it turns out the 2-level and 3-level paging definitions were
identical, so move the common definition into pgtable.h

Signed-off-by: Zachary Amsden <zach@vmware.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Andi Kleen <ak@suse.de>
This commit is contained in:
Zachary Amsden 2007-05-02 19:27:19 +02:00 committed by Andi Kleen
parent 142dd97591
commit 9e5e3162b2
3 changed files with 15 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/asm-i386/pgtable-2level.h
View file

@ -41,16 +41,6 @@ static inline void native_pte_clear(struct mm_struct *mm, unsigned long addr, pt
*xp = __pte(0); *xp = __pte(0);
} }
/* local pte updates need not use xchg for locking */
static inline pte_t native_local_ptep_get_and_clear(pte_t *ptep)
{
pte_t res;
res = *ptep;
native_pte_clear(NULL, 0, ptep);
return res;
}
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
static inline pte_t native_ptep_get_and_clear(pte_t *xp) static inline pte_t native_ptep_get_and_clear(pte_t *xp)
{ {

10
include/asm-i386/pgtable-3level.h
View file

@ -139,16 +139,6 @@ static inline void pud_clear (pud_t * pud) { }
#define pmd_offset(pud, address) ((pmd_t *) pud_page(*(pud)) + \ #define pmd_offset(pud, address) ((pmd_t *) pud_page(*(pud)) + \
pmd_index(address)) pmd_index(address))
/* local pte updates need not use xchg for locking */
static inline pte_t native_local_ptep_get_and_clear(pte_t *ptep)
{
pte_t res;
res = *ptep;
native_pte_clear(NULL, 0, ptep);
return res;
}
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
static inline pte_t native_ptep_get_and_clear(pte_t *ptep) static inline pte_t native_ptep_get_and_clear(pte_t *ptep)
{ {

17
include/asm-i386/pgtable.h
View file

@ -269,6 +269,16 @@ extern void vmalloc_sync_all(void);
#define pte_update_defer(mm, addr, ptep) do { } while (0) #define pte_update_defer(mm, addr, ptep) do { } while (0)
#endif #endif
/* local pte updates need not use xchg for locking */
static inline pte_t native_local_ptep_get_and_clear(pte_t *ptep)
{
pte_t res = *ptep;
/* Pure native function needs no input for mm, addr */
native_pte_clear(NULL, 0, ptep);
return res;
}
/* /*
* We only update the dirty/accessed state if we set * We only update the dirty/accessed state if we set
* the dirty bit by hand in the kernel, since the hardware * the dirty bit by hand in the kernel, since the hardware
@ -343,8 +353,11 @@ static inline pte_t ptep_get_and_clear_full(struct mm_struct *mm, unsigned long
{ {
pte_t pte; pte_t pte;
if (full) { if (full) {
pte = *ptep; /*
native_pte_clear(mm, addr, ptep); * Full address destruction in progress; paravirt does not
* care about updates and native needs no locking
*/
pte = native_local_ptep_get_and_clear(ptep);
} else { } else {
pte = ptep_get_and_clear(mm, addr, ptep); pte = ptep_get_and_clear(mm, addr, ptep);
} }