From: Andreas Schwab <schwab@linux-m68k.org>
To: Christophe Leroy <christophe.leroy@c-s.fr>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
Michael Ellerman <mpe@ellerman.id.au>,
j.neuschaefer@gmx.net, linux-kernel@vger.kernel.org,
linuxppc-dev@lists.ozlabs.org
Subject: [PATCH] powerpc/mm/32s: fix condition that is always true
Date: Mon, 17 Jun 2019 23:22:20 +0200 [thread overview]
Message-ID: <87muif52lv.fsf_-_@igel.home> (raw)
In-Reply-To: <1e412310cc18ea654fb2ce4c935654d8d1069f27.1550775950.git.christophe.leroy@c-s.fr> (Christophe Leroy's message of "Thu, 21 Feb 2019 19:08:49 +0000 (UTC)")
Move a misplaced paren that makes the condition always true.
Fixes: 63b2bc619565 ("powerpc/mm/32s: Use BATs for STRICT_KERNEL_RWX")
Signed-off-by: Andreas Schwab <schwab@linux-m68k.org>
---
arch/powerpc/mm/pgtable_32.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c
index d53188dee18f..35cb96cfc258 100644
--- a/arch/powerpc/mm/pgtable_32.c
+++ b/arch/powerpc/mm/pgtable_32.c
@@ -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);
--
2.22.0
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1
"And now for something completely different."
WARNING: multiple messages have this Message-ID (diff)
From: Andreas Schwab <schwab@linux-m68k.org>
To: Christophe Leroy <christophe.leroy@c-s.fr>
Cc: j.neuschaefer@gmx.net, linux-kernel@vger.kernel.org,
Paul Mackerras <paulus@samba.org>,
linuxppc-dev@lists.ozlabs.org
Subject: [PATCH] powerpc/mm/32s: fix condition that is always true
Date: Mon, 17 Jun 2019 23:22:20 +0200 [thread overview]
Message-ID: <87muif52lv.fsf_-_@igel.home> (raw)
In-Reply-To: <1e412310cc18ea654fb2ce4c935654d8d1069f27.1550775950.git.christophe.leroy@c-s.fr> (Christophe Leroy's message of "Thu, 21 Feb 2019 19:08:49 +0000 (UTC)")
Move a misplaced paren that makes the condition always true.
Fixes: 63b2bc619565 ("powerpc/mm/32s: Use BATs for STRICT_KERNEL_RWX")
Signed-off-by: Andreas Schwab <schwab@linux-m68k.org>
---
arch/powerpc/mm/pgtable_32.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c
index d53188dee18f..35cb96cfc258 100644
--- a/arch/powerpc/mm/pgtable_32.c
+++ b/arch/powerpc/mm/pgtable_32.c
@@ -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);
--
2.22.0
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1
"And now for something completely different."
next prev parent reply other threads:[~2019-06-17 21:35 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-21 19:08 [PATCH v5 00/16] powerpc/32: Use BATs/LTLBs for STRICT_KERNEL_RWX Christophe Leroy
2019-02-21 19:08 ` Christophe Leroy
2019-02-21 19:08 ` [PATCH v5 01/16] powerpc/wii: properly disable use of BATs when requested Christophe Leroy
2019-02-21 19:08 ` Christophe Leroy
2019-02-26 3:27 ` [v5,01/16] " Michael Ellerman
2019-02-26 3:27 ` [v5, 01/16] " Michael Ellerman
2019-02-21 19:08 ` [PATCH v5 02/16] powerpc/mm/32: add base address to mmu_mapin_ram() Christophe Leroy
2019-02-21 19:08 ` Christophe Leroy
2019-02-21 19:08 ` [PATCH v5 03/16] powerpc/mm/32s: rework mmu_mapin_ram() Christophe Leroy
2019-02-21 19:08 ` Christophe Leroy
2019-02-21 19:08 ` [PATCH v5 04/16] powerpc/mm/32s: use generic mmu_mapin_ram() for all blocks Christophe Leroy
2019-02-21 19:08 ` Christophe Leroy
2019-02-21 19:08 ` [PATCH v5 05/16] powerpc/32: always populate page tables for Abatron BDI Christophe Leroy
2019-02-21 19:08 ` Christophe Leroy
2019-02-21 19:08 ` [PATCH v5 06/16] powerpc/wii: remove wii_mmu_mapin_mem2() Christophe Leroy
2019-02-21 19:08 ` Christophe Leroy
2019-02-21 19:08 ` [PATCH v5 07/16] powerpc/mm/32s: use _PAGE_EXEC in setbat() Christophe Leroy
2019-02-21 19:08 ` Christophe Leroy
2019-02-21 19:08 ` [PATCH v5 08/16] powerpc/32: add helper to write into segment registers Christophe Leroy
2019-02-21 19:08 ` Christophe Leroy
2019-02-21 19:08 ` [PATCH v5 09/16] powerpc/mmu: add is_strict_kernel_rwx() helper Christophe Leroy
2019-02-21 19:08 ` Christophe Leroy
2019-02-21 19:08 ` [PATCH v5 10/16] powerpc/kconfig: define PAGE_SHIFT inside Kconfig Christophe Leroy
2019-02-21 19:08 ` Christophe Leroy
2019-02-21 19:08 ` [PATCH v5 11/16] powerpc/kconfig: define CONFIG_DATA_SHIFT and CONFIG_ETEXT_SHIFT Christophe Leroy
2019-02-21 19:08 ` Christophe Leroy
2019-02-21 19:08 ` [PATCH v5 12/16] powerpc/mm/32s: add setibat() clearibat() and update_bats() Christophe Leroy
2019-02-21 19:08 ` Christophe Leroy
2019-02-21 19:08 ` [PATCH v5 13/16] powerpc/mm/32s: Use BATs for STRICT_KERNEL_RWX Christophe Leroy
2019-02-21 19:08 ` Christophe Leroy
2019-06-15 11:23 ` Andreas Schwab
2019-06-15 11:23 ` Andreas Schwab
2019-06-15 13:22 ` Christophe Leroy
2019-06-15 13:22 ` Christophe Leroy
2019-06-16 8:20 ` christophe leroy
2019-06-16 8:20 ` christophe leroy
2019-06-16 9:29 ` Andreas Schwab
2019-06-16 9:29 ` Andreas Schwab
2019-06-16 10:13 ` Andreas Schwab
2019-06-16 10:13 ` Andreas Schwab
2019-06-15 12:28 ` Andreas Schwab
2019-06-15 12:28 ` Andreas Schwab
2019-06-16 8:01 ` christophe leroy
2019-06-16 8:01 ` christophe leroy
2019-06-16 8:45 ` Andreas Schwab
2019-06-16 8:45 ` Andreas Schwab
2019-06-15 12:47 ` [PATCH] powerpc/mm/32s: only use MMU to mark initmem NX if STRICT_KERNEL_RWX Andreas Schwab
2019-06-15 12:47 ` Andreas Schwab
2019-06-15 13:25 ` Christophe Leroy
2019-06-15 13:25 ` Christophe Leroy
2019-06-15 14:36 ` Andreas Schwab
2019-06-15 14:36 ` Andreas Schwab
2019-06-16 8:06 ` christophe leroy
2019-06-16 8:06 ` christophe leroy
2019-06-17 21:22 ` Andreas Schwab [this message]
2019-06-17 21:22 ` [PATCH] powerpc/mm/32s: fix condition that is always true Andreas Schwab
2019-06-17 21:47 ` Christophe Leroy
2019-06-17 21:47 ` Christophe Leroy
2019-06-30 8:37 ` Michael Ellerman
2019-06-30 8:37 ` Michael Ellerman
2019-02-21 19:08 ` [PATCH v5 14/16] powerpc/kconfig: make _etext and data areas alignment configurable on Book3s 32 Christophe Leroy
2019-02-21 19:08 ` Christophe Leroy
2019-02-21 19:08 ` [PATCH v5 15/16] powerpc/8xx: don't disable large TLBs with CONFIG_STRICT_KERNEL_RWX Christophe Leroy
2019-02-21 19:08 ` Christophe Leroy
2019-02-21 19:08 ` [PATCH v5 16/16] powerpc/kconfig: make _etext and data areas alignment configurable on 8xx Christophe Leroy
2019-02-21 19:08 ` Christophe Leroy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87muif52lv.fsf_-_@igel.home \
--to=schwab@linux-m68k.org \
--cc=benh@kernel.crashing.org \
--cc=christophe.leroy@c-s.fr \
--cc=j.neuschaefer@gmx.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.