]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
powerpc/mm/32s: fix condition that is always true
authorAndreas Schwab <schwab@linux-m68k.org>
Mon, 17 Jun 2019 21:22:20 +0000 (23:22 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 26 Jul 2019 07:11:08 +0000 (09:11 +0200)
commit 46c2478af610efb3212b8b08f74389d69899ef70 upstream.

Move a misplaced paren that makes the condition always true.

Fixes: 63b2bc619565 ("powerpc/mm/32s: Use BATs for STRICT_KERNEL_RWX")
Cc: stable@vger.kernel.org # v5.1+
Signed-off-by: Andreas Schwab <schwab@linux-m68k.org>
Reviewed-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/powerpc/mm/pgtable_32.c

index d53188dee18ff6063cf2084f614446f0acc3e7ea..35cb96cfc258d0b45cc1aa94054201af62b0fb19 100644 (file)
@@ -360,7 +360,7 @@ void mark_initmem_nx(void)
        unsigned long numpages = PFN_UP((unsigned long)_einittext) -
                                 PFN_DOWN((unsigned long)_sinittext);
 
-       if (v_block_mapped((unsigned long)_stext) + 1)
+       if (v_block_mapped((unsigned long)_stext + 1))
                mmu_mark_initmem_nx();
        else
                change_page_attr(page, numpages, PAGE_KERNEL);