Commit 4f115596 authored by Alexander Popov's avatar Alexander Popov Committed by Borislav Petkov (AMD)
Browse files

x86/Kconfig: Reenable PTDUMP on i386 



The commit

  f9aad622 ("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: f9aad622 ("mm: rename GENERIC_PTDUMP and PTDUMP_CORE")
Signed-off-by: default avatarAlexander Popov <alex.popov@linux.com>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Cc: stable@vger.kernel.org
parent 07e27ad1

arch/x86/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ config X86_64 
	depends on 64BIT

	# Options that are inherently 64-bit kernel only:

	select ARCH_HAS_GIGANTIC_PAGE

	select ARCH_HAS_PTDUMP

	select ARCH_SUPPORTS_MSEAL_SYSTEM_MAPPINGS

	select ARCH_SUPPORTS_INT128 if CC_HAS_INT128

	select ARCH_SUPPORTS_PER_VMA_LOCK
@@ -99,6 +98,7 @@ config X86 
	select ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE

	select ARCH_HAS_PMEM_API		if X86_64

	select ARCH_HAS_PREEMPT_LAZY

	select ARCH_HAS_PTDUMP

	select ARCH_HAS_PTE_SPECIAL

	select ARCH_HAS_HW_PTE_YOUNG

	select ARCH_HAS_NONLEAF_PMD_YOUNG	if PGTABLE_LEVELS > 2