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

Commit 53014c1c authored by Helge Deller's avatar Helge Deller Committed by Greg Kroah-Hartman
Browse files

parisc: Fix set_fixmap() on PA1.x CPUs 



commit 6e866a462867b60841202e900f10936a0478608c upstream.

Fix a kernel crash which happens on PA1.x CPUs while initializing the
FTRACE/KPROBE breakpoints.  The PTE table entries for the fixmap area
were not created correctly.

Signed-off-by: default avatarHelge Deller <deller@gmx.de>
Fixes: ccfbc68d ("parisc: add set_fixmap()/clear_fixmap()")
Cc: stable@vger.kernel.org # v5.2+
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 645d6dfd

arch/parisc/mm/fixmap.c

+1 −4
Original line number Diff line number Diff line
@@ -18,12 +18,9 @@ void notrace set_fixmap(enum fixed_addresses idx, phys_addr_t phys) 
	pte_t *pte;



	if (pmd_none(*pmd))

		pmd = pmd_alloc(NULL, pgd, vaddr);



	pte = pte_offset_kernel(pmd, vaddr);

	if (pte_none(*pte))

		pte = pte_alloc_kernel(pmd, vaddr);



	pte = pte_offset_kernel(pmd, vaddr);

	set_pte_at(&init_mm, vaddr, pte, __mk_pte(phys, PAGE_KERNEL_RWX));

	flush_tlb_kernel_range(vaddr, vaddr + PAGE_SIZE);

}