Commit 3f6cbef1 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge
Browse files

x86: unify pud_large 



Impact: cleanup

Unify and demacro pud_large.

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

arch/x86/include/asm/pgtable.h

+6 −0
Original line number Diff line number Diff line
@@ -540,6 +540,12 @@ static inline unsigned long pmd_pfn(pmd_t pmd) 
{

	return (pmd_val(pmd) & PTE_PFN_MASK) >> PAGE_SHIFT;

}



static inline int pud_large(pud_t pud)

{

	return (pud_val(pud) & (_PAGE_PSE | _PAGE_PRESENT)) ==

		(_PAGE_PSE | _PAGE_PRESENT);

}

#endif	/* PAGETABLE_LEVELS > 2 */



#if PAGETABLE_LEVELS > 3

arch/x86/include/asm/pgtable_32.h

+0 −2
Original line number Diff line number Diff line
@@ -95,8 +95,6 @@ extern unsigned long pg0[]; 
# include <asm/pgtable-2level.h>

#endif



static inline int pud_large(pud_t pud) { return 0; }



#if defined(CONFIG_HIGHPTE)

#define pte_offset_map(dir, address)					\

	((pte_t *)kmap_atomic_pte(pmd_page(*(dir)), KM_PTE0) +		\

arch/x86/include/asm/pgtable_64.h

+0 −6
Original line number Diff line number Diff line
@@ -184,12 +184,6 @@ static inline int pgd_large(pgd_t pgd) { return 0; } 


/* PUD - Level3 access */



static inline int pud_large(pud_t pte)

{

	return (pud_val(pte) & (_PAGE_PSE | _PAGE_PRESENT)) ==

		(_PAGE_PSE | _PAGE_PRESENT);

}



/* PMD  - Level 2 access */

#define pte_to_pgoff(pte) ((pte_val((pte)) & PHYSICAL_PAGE_MASK) >> PAGE_SHIFT)

#define pgoff_to_pte(off) ((pte_t) { .pte = ((off) << PAGE_SHIFT) |	\