Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ba7c913 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge
Browse files

x86: unify pud_present 



Impact: cleanup

Unify and demacro pud_present.

Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
parent 7c683851

arch/x86/include/asm/pgtable-3level.h

+0 −5
Original line number Diff line number Diff line
@@ -28,11 +28,6 @@ static inline int pud_bad(pud_t pud) 
	return (pud_val(pud) & ~(PTE_PFN_MASK | _KERNPG_TABLE | _PAGE_USER)) != 0;

}



static inline int pud_present(pud_t pud)

{

	return pud_val(pud) & _PAGE_PRESENT;

}



/* Rules for using set_pte: the pte being assigned *must* be

 * either not present or in a state where the hardware will

 * not attempt to update the pte.  In places where this is

arch/x86/include/asm/pgtable.h

+7 −0
Original line number Diff line number Diff line
@@ -445,6 +445,13 @@ static inline int pte_present(pte_t a) 
	return pte_flags(a) & (_PAGE_PRESENT | _PAGE_PROTNONE);

}



#if PAGETABLE_LEVELS > 2

static inline int pud_present(pud_t pud)

{

	return pud_val(pud) & _PAGE_PRESENT;

}

#endif	/* PAGETABLE_LEVELS > 2 */



#endif	/* __ASSEMBLY__ */



#ifdef CONFIG_X86_32

arch/x86/include/asm/pgtable_64.h

+0 −1
Original line number Diff line number Diff line
@@ -194,7 +194,6 @@ static inline int pgd_large(pgd_t pgd) { return 0; } 
#define pud_index(address) (((address) >> PUD_SHIFT) & (PTRS_PER_PUD - 1))

#define pud_offset(pgd, address)					\

	((pud_t *)pgd_page_vaddr(*(pgd)) + pud_index((address)))

#define pud_present(pud) (pud_val((pud)) & _PAGE_PRESENT)



static inline int pud_large(pud_t pte)

{