arm64: mm: fix show_pte KERN_CONT fallout (6ef4fb38) · Commits · 戴 / test

Recent changes made KERN_CONT mandatory for continued lines. In the absence of KERN_CONT, a newline may be implicit inserted by the core printk code. In show_pte, we (erroneously) use printk without KERN_CONT for continued prints, resulting in output being split across a number of lines, and not matching the intended output, e.g. [ff000000000000] *pgd=00000009f511b003 , *pud=00000009f4a80003 , *pmd=0000000000000000 Fix this by using pr_cont() for all the continuations. Acked-by:

Will Deacon <will.deacon@arm.com> Signed-off-by:

Mark Rutland <mark.rutland@arm.com> Signed-off-by:

Catalin Marinas <catalin.marinas@arm.com>

arch/arm64/mm/fault.c

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -88,21 +88,21 @@ void show_pte(struct mm_struct *mm, unsigned long addr)
	break;		break;

	pud = pud_offset(pgd, addr);		pud = pud_offset(pgd, addr);
	printk(", pud=%016llx", pud_val(pud));		pr_cont(", pud=%016llx", pud_val(pud));
	if (pud_none(pud) \|\| pud_bad(pud))		if (pud_none(pud) \|\| pud_bad(pud))
	break;		break;

	pmd = pmd_offset(pud, addr);		pmd = pmd_offset(pud, addr);
	printk(", pmd=%016llx", pmd_val(pmd));		pr_cont(", pmd=%016llx", pmd_val(pmd));
	if (pmd_none(pmd) \|\| pmd_bad(pmd))		if (pmd_none(pmd) \|\| pmd_bad(pmd))
	break;		break;

	pte = pte_offset_map(pmd, addr);		pte = pte_offset_map(pmd, addr);
	printk(", pte=%016llx", pte_val(pte));		pr_cont(", pte=%016llx", pte_val(pte));
	pte_unmap(pte);		pte_unmap(pte);
	} while(0);		} while(0);

	printk("\n");		pr_cont("\n");
	}		}

	#ifdef CONFIG_ARM64_HW_AFDBM		#ifdef CONFIG_ARM64_HW_AFDBM

Admin message