]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
powerpc/ptdump: get out of note_prot_wx() when CONFIG_PPC_DEBUG_WX is not selected.
authorChristophe Leroy <christophe.leroy@c-s.fr>
Wed, 14 Aug 2019 12:36:12 +0000 (12:36 +0000)
committerMichael Ellerman <mpe@ellerman.id.au>
Tue, 20 Aug 2019 11:22:09 +0000 (21:22 +1000)
When CONFIG_PPC_DEBUG_WX, note_prot_wx() is useless.

Get out of it early and inconditionnally in that case,
so that GCC can kick all the code out.

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/ff6c8f631bd4ce3a10e0cc241eb569816187bc20.1565786091.git.christophe.leroy@c-s.fr
arch/powerpc/mm/ptdump/ptdump.c

index 9a2186c133e67550fe2b4d4af6bc37feeb603fc3..ab6a572202b482f9b1a4c356a57553d10144b22f 100644 (file)
@@ -177,7 +177,7 @@ static void dump_addr(struct pg_state *st, unsigned long addr)
 
 static void note_prot_wx(struct pg_state *st, unsigned long addr)
 {
-       if (!st->check_wx)
+       if (!IS_ENABLED(CONFIG_PPC_DEBUG_WX) || !st->check_wx)
                return;
 
        if (!((st->current_flags & pgprot_val(PAGE_KERNEL_X)) == pgprot_val(PAGE_KERNEL_X)))