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

Commit 5e2e3176 authored by Alexander Gordeev's avatar Alexander Gordeev Committed by Greg Kroah-Hartman
Browse files

s390/mm: fix phys vs virt confusion in mark_kernel_pXd() functions family 



[ Upstream commit 3784231b1e091857bd129fd9658a8b3cedbdcd58 ]

Due to historical reasons mark_kernel_pXd() functions
misuse the notion of physical vs virtual addresses
difference.

Signed-off-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Stable-dep-of: 44d930452476 ("s390/cmma: fix detection of DAT pages")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent c8580e0b

arch/s390/mm/page-states.c

+4 −4
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static void mark_kernel_pmd(pud_t *pud, unsigned long addr, unsigned long end) 
		next = pmd_addr_end(addr, end);

		if (pmd_none(*pmd) || pmd_large(*pmd))

			continue;

		page = virt_to_page(pmd_val(*pmd));

		page = phys_to_page(pmd_val(*pmd));

		set_bit(PG_arch_1, &page->flags);

	} while (pmd++, addr = next, addr != end);

}
@@ -136,7 +136,7 @@ static void mark_kernel_pud(p4d_t *p4d, unsigned long addr, unsigned long end) 
		if (pud_none(*pud) || pud_large(*pud))

			continue;

		if (!pud_folded(*pud)) {

			page = virt_to_page(pud_val(*pud));

			page = phys_to_page(pud_val(*pud));

			for (i = 0; i < 3; i++)

				set_bit(PG_arch_1, &page[i].flags);

		}
@@ -157,7 +157,7 @@ static void mark_kernel_p4d(pgd_t *pgd, unsigned long addr, unsigned long end) 
		if (p4d_none(*p4d))

			continue;

		if (!p4d_folded(*p4d)) {

			page = virt_to_page(p4d_val(*p4d));

			page = phys_to_page(p4d_val(*p4d));

			for (i = 0; i < 3; i++)

				set_bit(PG_arch_1, &page[i].flags);

		}
@@ -179,7 +179,7 @@ static void mark_kernel_pgd(void) 
		if (pgd_none(*pgd))

			continue;

		if (!pgd_folded(*pgd)) {

			page = virt_to_page(pgd_val(*pgd));

			page = phys_to_page(pgd_val(*pgd));

			for (i = 0; i < 3; i++)

				set_bit(PG_arch_1, &page[i].flags);

		}