Skip to content

Commit 4f11559

Browse files
a13xp0p0vbp3tk0v
authored andcommitted
x86/Kconfig: Reenable PTDUMP on i386
The commit f9aad62 ("mm: rename GENERIC_PTDUMP and PTDUMP_CORE") has broken PTDUMP and the Kconfig options that use it on ARCH=i386, including CONFIG_DEBUG_WX. CONFIG_GENERIC_PTDUMP was renamed into CONFIG_ARCH_HAS_PTDUMP, but it was mistakenly moved from "config X86" to "config X86_64". That made PTDUMP unavailable for i386. Move CONFIG_ARCH_HAS_PTDUMP back to "config X86" to fix it. [ bp: Massage commit message. ] Fixes: f9aad62 ("mm: rename GENERIC_PTDUMP and PTDUMP_CORE") Signed-off-by: Alexander Popov <alex.popov@linux.com> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Cc: stable@vger.kernel.org
1 parent 07e27ad commit 4f11559

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/x86/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ config X86_64
2626
depends on 64BIT
2727
# Options that are inherently 64-bit kernel only:
2828
select ARCH_HAS_GIGANTIC_PAGE
29-
select ARCH_HAS_PTDUMP
3029
select ARCH_SUPPORTS_MSEAL_SYSTEM_MAPPINGS
3130
select ARCH_SUPPORTS_INT128 if CC_HAS_INT128
3231
select ARCH_SUPPORTS_PER_VMA_LOCK
@@ -99,6 +98,7 @@ config X86
9998
select ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE
10099
select ARCH_HAS_PMEM_API if X86_64
101100
select ARCH_HAS_PREEMPT_LAZY
101+
select ARCH_HAS_PTDUMP
102102
select ARCH_HAS_PTE_SPECIAL
103103
select ARCH_HAS_HW_PTE_YOUNG
104104
select ARCH_HAS_NONLEAF_PMD_YOUNG if PGTABLE_LEVELS > 2

0 commit comments

Comments
 (0)