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

Commit 126b1922 authored by Andi Kleen's avatar Andi Kleen Committed by Andi Kleen
Browse files

[PATCH] x86-64: Remove mk_pte_phys() 



- Convert last user to pfn_pte
- Remove mk_pte_phys

Suggested by Jan Beulich

Signed-off-by: default avatarAndi Kleen <ak@suse.de>
parent 22c5ace7

arch/x86_64/mm/pageattr.c

+3 −1
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ static void revert_page(unsigned long address, pgprot_t ref_prot) 
	pud_t *pud;

	pmd_t *pmd;

	pte_t large_pte;

	unsigned long pfn;



	pgd = pgd_offset_k(address);

	BUG_ON(pgd_none(*pgd));
@@ -114,7 +115,8 @@ static void revert_page(unsigned long address, pgprot_t ref_prot) 
	BUG_ON(pud_none(*pud));

	pmd = pmd_offset(pud, address);

	BUG_ON(pmd_val(*pmd) & _PAGE_PSE);

	large_pte = mk_pte_phys(__pa(address) & LARGE_PAGE_MASK, ref_prot);

	pfn = (__pa(address) & LARGE_PAGE_MASK) >> PAGE_SHIFT;

	large_pte = pfn_pte(pfn, ref_prot);

	large_pte = pte_mkhuge(large_pte);

	set_pte((pte_t *)pmd, large_pte);

}

include/asm-x86_64/pgtable.h

+0 −9
Original line number Diff line number Diff line
@@ -359,15 +359,6 @@ static inline int pmd_large(pmd_t pte) { 
#define mk_pte(page, pgprot)	pfn_pte(page_to_pfn(page), (pgprot))

#define mk_pte_huge(entry) (pte_val(entry) |= _PAGE_PRESENT | _PAGE_PSE)

 

/* physical address -> PTE */

static inline pte_t mk_pte_phys(unsigned long physpage, pgprot_t pgprot)

{ 

	pte_t pte;

	pte_val(pte) = physpage | pgprot_val(pgprot); 

	pte_val(pte) &= __supported_pte_mask;

	return pte; 

}

 

/* Change flags of a PTE */

static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)

{