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

Commit f281b5d5 authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Michael Ellerman
Browse files

powerpc/mm: Don't use pmd_val, pud_val and pgd_val as lvalue 



We convert them static inline function here as we did with pte_val in
the previous patch

Acked-by: default avatarScott Wood <scottwood@freescale.com>
Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 10bd3808

arch/powerpc/include/asm/book3s/32/pgtable.h

+5 −1
Original line number Diff line number Diff line
@@ -105,7 +105,11 @@ extern unsigned long ioremap_bot; 
#define pmd_none(pmd)		(!pmd_val(pmd))

#define	pmd_bad(pmd)		(pmd_val(pmd) & _PMD_BAD)

#define	pmd_present(pmd)	(pmd_val(pmd) & _PMD_PRESENT_MASK)

#define	pmd_clear(pmdp)		do { pmd_val(*(pmdp)) = 0; } while (0)

static inline void pmd_clear(pmd_t *pmdp)

{

	*pmdp = __pmd(0);

}





/*

 * When flushing the tlb entry for a page, we also need to flush the hash

arch/powerpc/include/asm/book3s/64/hash-4k.h

+5 −1
Original line number Diff line number Diff line
@@ -71,9 +71,13 @@ 
#define pgd_none(pgd)		(!pgd_val(pgd))

#define pgd_bad(pgd)		(pgd_val(pgd) == 0)

#define pgd_present(pgd)	(pgd_val(pgd) != 0)

#define pgd_clear(pgdp)		(pgd_val(*(pgdp)) = 0)

#define pgd_page_vaddr(pgd)	(pgd_val(pgd) & ~PGD_MASKED_BITS)



static inline void pgd_clear(pgd_t *pgdp)

{

	*pgdp = __pgd(0);

}



static inline pte_t pgd_pte(pgd_t pgd)

{

	return __pte(pgd_val(pgd));

arch/powerpc/include/asm/book3s/64/pgtable.h

+27 −9
Original line number Diff line number Diff line
@@ -236,21 +236,38 @@ 
#define PMD_BAD_BITS		(PTE_TABLE_SIZE-1)

#define PUD_BAD_BITS		(PMD_TABLE_SIZE-1)



#define pmd_set(pmdp, pmdval)	(pmd_val(*(pmdp)) = (pmdval))

static inline void pmd_set(pmd_t *pmdp, unsigned long val)

{

	*pmdp = __pmd(val);

}



static inline void pmd_clear(pmd_t *pmdp)

{

	*pmdp = __pmd(0);

}





#define pmd_none(pmd)		(!pmd_val(pmd))

#define	pmd_bad(pmd)		(!is_kernel_addr(pmd_val(pmd)) \

				 || (pmd_val(pmd) & PMD_BAD_BITS))

#define	pmd_present(pmd)	(!pmd_none(pmd))

#define	pmd_clear(pmdp)		(pmd_val(*(pmdp)) = 0)

#define pmd_page_vaddr(pmd)	(pmd_val(pmd) & ~PMD_MASKED_BITS)

extern struct page *pmd_page(pmd_t pmd);



#define pud_set(pudp, pudval)	(pud_val(*(pudp)) = (pudval))

static inline void pud_set(pud_t *pudp, unsigned long val)

{

	*pudp = __pud(val);

}



static inline void pud_clear(pud_t *pudp)

{

	*pudp = __pud(0);

}



#define pud_none(pud)		(!pud_val(pud))

#define	pud_bad(pud)		(!is_kernel_addr(pud_val(pud)) \

				 || (pud_val(pud) & PUD_BAD_BITS))

#define pud_present(pud)	(pud_val(pud) != 0)

#define pud_clear(pudp)		(pud_val(*(pudp)) = 0)

#define pud_page_vaddr(pud)	(pud_val(pud) & ~PUD_MASKED_BITS)



extern struct page *pud_page(pud_t pud);
@@ -265,8 +282,11 @@ static inline pud_t pte_pud(pte_t pte) 
	return __pud(pte_val(pte));

}

#define pud_write(pud)		pte_write(pud_pte(pud))

#define pgd_set(pgdp, pudp)	({pgd_val(*(pgdp)) = (unsigned long)(pudp);})

#define pgd_write(pgd)		pte_write(pgd_pte(pgd))

static inline void pgd_set(pgd_t *pgdp, unsigned long val)

{

	*pgdp = __pgd(val);

}



/*

 * Find an entry in a page-table-directory.  We combine the address region
@@ -588,14 +608,12 @@ static inline pmd_t pmd_mkhuge(pmd_t pmd) 


static inline pmd_t pmd_mknotpresent(pmd_t pmd)

{

	pmd_val(pmd) &= ~_PAGE_PRESENT;

	return pmd;

	return __pmd(pmd_val(pmd) & ~_PAGE_PRESENT);

}



static inline pmd_t pmd_mksplitting(pmd_t pmd)

{

	pmd_val(pmd) |= _PAGE_SPLITTING;

	return pmd;

	return __pmd(pmd_val(pmd) | _PAGE_SPLITTING);

}



#define __HAVE_ARCH_PMD_SAME

arch/powerpc/include/asm/page.h

+26 −8
Original line number Diff line number Diff line
@@ -304,21 +304,30 @@ typedef struct { pte_t pte; } real_pte_t; 
/* PMD level */

#ifdef CONFIG_PPC64

typedef struct { unsigned long pmd; } pmd_t;

#define pmd_val(x)	((x).pmd)

#define __pmd(x)	((pmd_t) { (x) })

static inline unsigned long pmd_val(pmd_t x)

{

	return x.pmd;

}



/* PUD level exusts only on 4k pages */

#ifndef CONFIG_PPC_64K_PAGES

typedef struct { unsigned long pud; } pud_t;

#define pud_val(x)	((x).pud)

#define __pud(x)	((pud_t) { (x) })

static inline unsigned long pud_val(pud_t x)

{

	return x.pud;

}

#endif /* !CONFIG_PPC_64K_PAGES */

#endif /* CONFIG_PPC64 */



/* PGD level */

typedef struct { unsigned long pgd; } pgd_t;

#define pgd_val(x)	((x).pgd)

#define __pgd(x)	((pgd_t) { (x) })

static inline unsigned long pgd_val(pgd_t x)

{

	return x.pgd;

}



/* Page protection bits */

typedef struct { unsigned long pgprot; } pgprot_t;
@@ -347,22 +356,31 @@ typedef pte_t real_pte_t; 


#ifdef CONFIG_PPC64

typedef unsigned long pmd_t;

#define pmd_val(x)	(x)

#define __pmd(x)	(x)

static inline unsigned long pmd_val(pmd_t pmd)

{

	return pmd;

}



#ifndef CONFIG_PPC_64K_PAGES

typedef unsigned long pud_t;

#define pud_val(x)	(x)

#define __pud(x)	(x)

static inline unsigned long pud_val(pud_t pud)

{

	return pud;

}

#endif /* !CONFIG_PPC_64K_PAGES */

#endif /* CONFIG_PPC64 */



typedef unsigned long pgd_t;

#define pgd_val(x)	(x)

#define pgprot_val(x)	(x)

#define __pgd(x)	(x)

static inline unsigned long pgd_val(pgd_t pgd)

{

	return pgd;

}



typedef unsigned long pgprot_t;

#define __pgd(x)	(x)

#define pgprot_val(x)	(x)

#define __pgprot(x)	(x)



#endif

arch/powerpc/include/asm/pgalloc-32.h

+26 −8
Original line number Diff line number Diff line
@@ -21,16 +21,34 @@ extern void pgd_free(struct mm_struct *mm, pgd_t *pgd); 
/* #define pgd_populate(mm, pmd, pte)      BUG() */



#ifndef CONFIG_BOOKE

#define pmd_populate_kernel(mm, pmd, pte)	\

		(pmd_val(*(pmd)) = __pa(pte) | _PMD_PRESENT)

#define pmd_populate(mm, pmd, pte)	\

		(pmd_val(*(pmd)) = (page_to_pfn(pte) << PAGE_SHIFT) | _PMD_PRESENT)



static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmdp,

				       pte_t *pte)

{

	*pmdp = __pmd(__pa(pte) | _PMD_PRESENT);

}



static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmdp,

				pgtable_t pte_page)

{

	*pmdp = __pmd((page_to_pfn(pte_page) << PAGE_SHIFT) | _PMD_PRESENT);

}



#define pmd_pgtable(pmd) pmd_page(pmd)

#else

#define pmd_populate_kernel(mm, pmd, pte)	\

		(pmd_val(*(pmd)) = (unsigned long)pte | _PMD_PRESENT)

#define pmd_populate(mm, pmd, pte)	\

		(pmd_val(*(pmd)) = (unsigned long)lowmem_page_address(pte) | _PMD_PRESENT)



static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmdp,

				       pte_t *pte)

{

	*pmdp = __pmd((unsigned long)pte | _PMD_PRESENT);

}



static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmdp,

				pgtable_t pte_page)

{

	*pmdp = __pmd((unsigned long)lowmem_page_address(pte_page) | _PMD_PRESENT);

}



#define pmd_pgtable(pmd) pmd_page(pmd)

#endif