Merge tag '9p-for-5.15-rc1' of git://github.com/martinetd/linux

[linux-2.6-microblaze.git] / arch / powerpc / Kconfig

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 663766f..ba5b661 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -94,10 +94,6 @@ config STACKTRACE_SUPPORT
        bool
        default y
 
-config TRACE_IRQFLAGS_SUPPORT
-       bool
-       default y
-
 config LOCKDEP_SUPPORT
        bool
        default y
@@ -123,6 +119,7 @@ config PPC
        select ARCH_HAS_COPY_MC                 if PPC64
        select ARCH_HAS_DEBUG_VIRTUAL
        select ARCH_HAS_DEBUG_VM_PGTABLE
+       select ARCH_HAS_DEBUG_WX                if STRICT_KERNEL_RWX
        select ARCH_HAS_DEVMEM_IS_ALLOWED
        select ARCH_HAS_DMA_MAP_DIRECT          if PPC_PSERIES
        select ARCH_HAS_ELF_RANDOMIZE
@@ -182,9 +179,8 @@ config PPC
        select GENERIC_IRQ_SHOW
        select GENERIC_IRQ_SHOW_LEVEL
        select GENERIC_PCI_IOMAP                if PCI
+       select GENERIC_PTDUMP
        select GENERIC_SMP_IDLE_THREAD
-       select GENERIC_STRNCPY_FROM_USER
-       select GENERIC_STRNLEN_USER
        select GENERIC_TIME_VSYSCALL
        select GENERIC_VDSO_TIME_NS
        select HAVE_ARCH_AUDITSYSCALL
@@ -270,6 +266,7 @@ config PPC
        select STRICT_KERNEL_RWX if STRICT_MODULE_RWX
        select SYSCTL_EXCEPTION_TRACE
        select THREAD_INFO_IN_TASK
+       select TRACE_IRQFLAGS_SUPPORT
        select VIRT_TO_BUS                      if !PPC64
        #
        # Please keep this list sorted alphabetically.