From: Heiko Carstens <hca@linux.ibm.com>
Date: Tue, 3 Aug 2021 12:42:29 +0000 (+0200)
Subject: s390/mm: use page_to_virt() in __kernel_map_pages()
X-Git-Tag: v5.15-rc1~206^2~39
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cfafad6d7897b4add601ed6ee0bd0221b7f81e30;p=thirdparty%2Flinux.git

s390/mm: use page_to_virt() in __kernel_map_pages()

Fix virtual vs physical address confusion (which currently are the same).

Reviewed-by: Alexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
---

diff --git a/arch/s390/mm/pageattr.c b/arch/s390/mm/pageattr.c
index dd45010f0e8d7..45197b71d55fd 100644
--- a/arch/s390/mm/pageattr.c
+++ b/arch/s390/mm/pageattr.c
@@ -351,7 +351,7 @@ void __kernel_map_pages(struct page *page, int numpages, int enable)
 	pte_t *pte;
 
 	for (i = 0; i < numpages;) {
-		address = page_to_phys(page + i);
+		address = (unsigned long)page_to_virt(page + i);
 		pte = virt_to_kpte(address);
 		nr = (unsigned long)pte >> ilog2(sizeof(long));
 		nr = PTRS_PER_PTE - (nr & (PTRS_PER_PTE - 1));