On Fri, Apr 15, 2016 at 11:36:54AM +0100, Paul Burton wrote: > The same definition for pte_page is duplicated for the MIPS32 > PHYS_ADDR_T_64BIT case & the generic case. Unify them by moving a single > definition outside of preprocessor conditionals. > > Signed-off-by: Paul Burton <paul.burton@xxxxxxxxxx> Reviewed-by: James Hogan <james.hogan@xxxxxxxxxx> Cheers James > --- > > arch/mips/include/asm/pgtable-32.h | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/arch/mips/include/asm/pgtable-32.h b/arch/mips/include/asm/pgtable-32.h > index 832e216..181bd8e 100644 > --- a/arch/mips/include/asm/pgtable-32.h > +++ b/arch/mips/include/asm/pgtable-32.h > @@ -104,7 +104,7 @@ static inline void pmd_clear(pmd_t *pmdp) > } > > #if defined(CONFIG_PHYS_ADDR_T_64BIT) && defined(CONFIG_CPU_MIPS32) > -#define pte_page(x) pfn_to_page(pte_pfn(x)) > + > #define pte_pfn(x) (((unsigned long)((x).pte_high >> _PFN_SHIFT)) | (unsigned long)((x).pte_low << _PAGE_PRESENT_SHIFT)) > static inline pte_t > pfn_pte(unsigned long pfn, pgprot_t prot) > @@ -120,8 +120,6 @@ pfn_pte(unsigned long pfn, pgprot_t prot) > > #else > > -#define pte_page(x) pfn_to_page(pte_pfn(x)) > - > #ifdef CONFIG_CPU_VR41XX > #define pte_pfn(x) ((unsigned long)((x).pte >> (PAGE_SHIFT + 2))) > #define pfn_pte(pfn, prot) __pte(((pfn) << (PAGE_SHIFT + 2)) | pgprot_val(prot)) > @@ -131,6 +129,8 @@ pfn_pte(unsigned long pfn, pgprot_t prot) > #endif > #endif /* defined(CONFIG_PHYS_ADDR_T_64BIT) && defined(CONFIG_CPU_MIPS32) */ > > +#define pte_page(x) pfn_to_page(pte_pfn(x)) > + > #define __pgd_offset(address) pgd_index(address) > #define __pud_offset(address) (((address) >> PUD_SHIFT) & (PTRS_PER_PUD-1)) > #define __pmd_offset(address) (((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1)) > -- > 2.8.0 >
Attachment:
signature.asc
Description: Digital signature
