Merge tag 'powerpc-5.16-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

torvalds · torvalds · commit f651faaaba5f · 2021-12-28T11:42:01.000-08:00
Pull powerpc fix from Michael Ellerman:
 "Fix DEBUG_WX never reporting any WX mappings, due to use of an
  incorrect config symbol since we converted to using generic ptdump"

* tag 'powerpc-5.16-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/ptdump: Fix DEBUG_WX since generic ptdump conversion
diff --git a/arch/powerpc/mm/ptdump/ptdump.c b/arch/powerpc/mm/ptdump/ptdump.c
@@ -183,7 +183,7 @@ static void note_prot_wx(struct pg_state *st, unsigned long addr)
 {
 	pte_t pte = __pte(st->current_flags);
 
-	if (!IS_ENABLED(CONFIG_PPC_DEBUG_WX) || !st->check_wx)
+	if (!IS_ENABLED(CONFIG_DEBUG_WX) || !st->check_wx)
 		return;
 
 	if (!pte_write(pte) || !pte_exec(pte))

Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ static void note_prot_wx(struct pg_state *st, unsigned long addr)`
`183`	`183`	`{`
`184`	`184`	`pte_t pte = __pte(st->current_flags);`
`185`	`185`
`186`		`- if (!IS_ENABLED(CONFIG_PPC_DEBUG_WX) \|\| !st->check_wx)`
	`186`	`+ if (!IS_ENABLED(CONFIG_DEBUG_WX) \|\| !st->check_wx)`
`187`	`187`	`return;`
`188`	`188`
`189`	`189`	`if (!pte_write(pte) \|\| !pte_exec(pte))`