powerpc/ptdump: Fix DEBUG_WX since generic ptdump conversion
authorMichael Ellerman <mpe@ellerman.id.au>
Fri, 3 Dec 2021 12:41:12 +0000 (23:41 +1100)
committerMichael Ellerman <mpe@ellerman.id.au>
Tue, 21 Dec 2021 02:05:59 +0000 (13:05 +1100)
In note_prot_wx() we bail out without reporting anything if
CONFIG_PPC_DEBUG_WX is disabled.

But CONFIG_PPC_DEBUG_WX was removed in the conversion to generic ptdump,
we now need to use CONFIG_DEBUG_WX instead.

Fixes: e084728393a5 ("powerpc/ptdump: Convert powerpc to GENERIC_PTDUMP")
Cc: stable@vger.kernel.org # v5.15+
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Reviewed-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Link: https://lore.kernel.org/r/20211203124112.2912562-1-mpe@ellerman.id.au
arch/powerpc/mm/ptdump/ptdump.c

index bf251191e78d96baa389d625ea2ec208a254e66c..32bfb215c48583be6a06d8800250f17dac944df0 100644 (file)
@@ -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))