aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@linux-m68k.org>2019-06-17 23:22:20 +0200
committerMichael Ellerman <mpe@ellerman.id.au>2019-06-19 20:05:08 +1000
commit46c2478af610efb3212b8b08f74389d69899ef70 (patch)
tree7e52136acb5f0f32cfccf610225d28f8bdf1c1f0
parentpowerpc/32s: fix suspend/resume when IBATs 4-7 are used (diff)
downloadlinux-dev-46c2478af610efb3212b8b08f74389d69899ef70.tar.xz
linux-dev-46c2478af610efb3212b8b08f74389d69899ef70.zip
powerpc/mm/32s: fix condition that is always true
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>
-rw-r--r--arch/powerpc/mm/pgtable_32.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c
index 16ada373b32b..f3aab4398082 100644
--- a/arch/powerpc/mm/pgtable_32.c
+++ b/arch/powerpc/mm/pgtable_32.c
@@ -365,7 +365,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);