powerpc,s390: ptdump: define ptdump_check_wx() regardless of CONFIG_DEBUG_WX

[linux-2.6-block.git] / arch / powerpc / mm / ptdump / ptdump.c

diff --git a/arch/powerpc/mm/ptdump/ptdump.c b/arch/powerpc/mm/ptdump/ptdump.c
index 620d4917ebe8a64687fbbc3fbad3290039201a31..b835c80371cd28093d16f0442f9cdad6f4935b97 100644 (file)
--- a/arch/powerpc/mm/ptdump/ptdump.c
+++ b/arch/powerpc/mm/ptdump/ptdump.c
@@ -184,13 +184,14 @@ static void note_prot_wx(struct pg_state *st, unsigned long addr)
 {
        pte_t pte = __pte(st->current_flags);
 
-       if (!IS_ENABLED(CONFIG_DEBUG_WX) || !st->check_wx)
+       if (!st->check_wx)
                return;
 
        if (!pte_write(pte) || !pte_exec(pte))
                return;
 
-       WARN_ONCE(1, "powerpc/mm: Found insecure W+X mapping at address %p/%pS\n",
+       WARN_ONCE(IS_ENABLED(CONFIG_DEBUG_WX),
+                 "powerpc/mm: Found insecure W+X mapping at address %p/%pS\n",
                  (void *)st->start_address, (void *)st->start_address);
 
        st->wx_pages += (addr - st->start_address) / PAGE_SIZE;
@@ -326,7 +327,6 @@ static void __init build_pgtable_complete_mask(void)
                                pg_level[i].mask |= pg_level[i].flag[j].mask;
 }
 
-#ifdef CONFIG_DEBUG_WX
 void ptdump_check_wx(void)
 {
        struct pg_state st = {
@@ -354,7 +354,6 @@ void ptdump_check_wx(void)
        else
                pr_info("Checked W+X mappings: passed, no W+X pages found\n");
 }
-#endif
 
 static int __init ptdump_init(void)
 {