diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-12-28 20:42:01 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-12-28 20:42:01 +0100 |
| commit | f651faaaba5f41ffac195e64f58483721e60eafc (patch) | |
| tree | 77d3ab88b81aa3a309a2ff5fe8a233a25f604250 /arch | |
| parent | Merge tag 'efi-urgent-for-v5.16-2' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | powerpc/ptdump: Fix DEBUG_WX since generic ptdump conversion (diff) | |
| download | linux-f651faaaba5f41ffac195e64f58483721e60eafc.tar.xz linux-f651faaaba5f41ffac195e64f58483721e60eafc.zip | |
Merge tag 'powerpc-5.16-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc fix from Michael Ellerman:
"Fix DEBUG_WX never reporting any WX mappings, due to use of an
incorrect config symbol since we converted to using generic ptdump"
* tag 'powerpc-5.16-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
powerpc/ptdump: Fix DEBUG_WX since generic ptdump conversion
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/mm/ptdump/ptdump.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/mm/ptdump/ptdump.c b/arch/powerpc/mm/ptdump/ptdump.c index bf251191e78d..32bfb215c485 100644 --- a/arch/powerpc/mm/ptdump/ptdump.c +++ b/arch/powerpc/mm/ptdump/ptdump.c @@ -183,7 +183,7 @@ static void note_prot_wx(struct pg_state *st, unsigned long addr) { pte_t pte = __pte(st->current_flags); - if (!IS_ENABLED(CONFIG_PPC_DEBUG_WX) || !st->check_wx) + if (!IS_ENABLED(CONFIG_DEBUG_WX) || !st->check_wx) return; if (!pte_write(pte) || !pte_exec(pte)) |