Commit 0f3bf303 authored by Alexander Gordeev's avatar Alexander Gordeev Committed by Vasily Gorbik
Browse files

s390/mm: fix invalid __pa() usage in pfn_pXd() macros 



There is little sense in applying __pa() to a physical
address, but that what pfn_pXd() macros do.

Signed-off-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
Reviewed-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent 86c827b3

arch/s390/include/asm/pgtable.h

+2 −2
Original line number Diff line number Diff line
@@ -1329,7 +1329,7 @@ static inline bool gup_fast_permitted(unsigned long start, unsigned long end) 
}

#define gup_fast_permitted gup_fast_permitted



#define pfn_pte(pfn,pgprot) mk_pte_phys(__pa((pfn) << PAGE_SHIFT),(pgprot))

#define pfn_pte(pfn, pgprot)	mk_pte_phys(((pfn) << PAGE_SHIFT), (pgprot))

#define pte_pfn(x) (pte_val(x) >> PAGE_SHIFT)

#define pte_page(x) pfn_to_page(pte_pfn(x))
@@ -1636,7 +1636,7 @@ static inline pmd_t pmdp_collapse_flush(struct vm_area_struct *vma, 
}

#define pmdp_collapse_flush pmdp_collapse_flush



#define pfn_pmd(pfn, pgprot)	mk_pmd_phys(__pa((pfn) << PAGE_SHIFT), (pgprot))

#define pfn_pmd(pfn, pgprot)	mk_pmd_phys(((pfn) << PAGE_SHIFT), (pgprot))

#define mk_pmd(page, pgprot)	pfn_pmd(page_to_pfn(page), (pgprot))



static inline int pmd_trans_huge(pmd_t pmd)