Commit f651faaa authored by Linus Torvalds's avatar Linus Torvalds

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

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
parents a8ad9a24 8d84fca4
...@@ -183,7 +183,7 @@ static void note_prot_wx(struct pg_state *st, unsigned long addr) ...@@ -183,7 +183,7 @@ static void note_prot_wx(struct pg_state *st, unsigned long addr)
{ {
pte_t pte = __pte(st->current_flags); 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; return;
if (!pte_write(pte) || !pte_exec(pte)) if (!pte_write(pte) || !pte_exec(pte))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment