Commit e93e59ac authored by Vineet Gupta's avatar Vineet Gupta
Browse files

ARC: mm: pmd_populate* to use the canonical set_pmd (and drop pmd_set) 



Signed-off-by: default avatarVineet Gupta <vgupta@kernel.org>
parent da773cf2

arch/arc/include/asm/pgalloc.h

+10 −4
Original line number Original line Diff line number Diff line
@@ -35,13 +35,19 @@ 
static inline void

static inline void

pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd, pte_t *pte)

pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd, pte_t *pte)

{

{

	pmd_set(pmd, pte);

	/*

	 * The cast to long below is OK in 32-bit PAE40 regime with long long pte

	 * Despite "wider" pte, the pte table needs to be in non-PAE low memory

	 * as all higher levels can only hold long pointers.

	 *

	 * The cast itself is needed given simplistic definition of set_pmd()

	 */

	set_pmd(pmd, __pmd((unsigned long)pte));

}

}





static inline void

static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, pgtable_t pte)

pmd_populate(struct mm_struct *mm, pmd_t *pmd, pgtable_t ptep)

{

{

	pmd_set(pmd, (pte_t *) ptep);

	set_pmd(pmd, __pmd((unsigned long)pte));

}

}





static inline int __get_order_pgd(void)

static inline int __get_order_pgd(void)

arch/arc/include/asm/pgtable.h

+0 −6
Original line number Original line Diff line number Diff line
@@ -222,12 +222,6 @@ extern char empty_zero_page[PAGE_SIZE]; 
/* find the logical addr (phy for ARC) of the Page Tbl ref by PMD entry */

/* find the logical addr (phy for ARC) of the Page Tbl ref by PMD entry */

#define pmd_page_vaddr(pmd)	(pmd_val(pmd) & PAGE_MASK)

#define pmd_page_vaddr(pmd)	(pmd_val(pmd) & PAGE_MASK)





/* In a 2 level sys, setup the PGD entry with PTE value */

static inline void pmd_set(pmd_t *pmdp, pte_t *ptep)

{

	pmd_val(*pmdp) = (unsigned long)ptep;

}



#define pte_none(x)			(!pte_val(x))

#define pte_none(x)			(!pte_val(x))

#define pte_present(x)			(pte_val(x) & _PAGE_PRESENT)

#define pte_present(x)			(pte_val(x) & _PAGE_PRESENT)

#define pte_clear(mm, addr, ptep)	set_pte_at(mm, addr, ptep, __pte(0))

#define pte_clear(mm, addr, ptep)	set_pte_at(mm, addr, ptep, __pte(0))