Merge branch 'parisc-5.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...

[linux.git] / arch / parisc / Kconfig

diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index e7f611c2719d9f111ce1afb116dac94e37067873..ecef9aff9d7296789e9d694ad68c13317e0536e2 100644 (file)
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -34,6 +34,7 @@ config PARISC
        select GENERIC_SMP_IDLE_THREAD
        select GENERIC_CPU_DEVICES
        select GENERIC_STRNCPY_FROM_USER
+       select GENERIC_LIB_DEVMEM_IS_ALLOWED
        select SYSCTL_ARCH_UNALIGN_ALLOW
        select SYSCTL_EXCEPTION_TRACE
        select HAVE_MOD_ARCH_SPECIFIC
@@ -310,6 +311,16 @@ config IRQSTACKS
          for handling hard and soft interrupts.  This can help avoid
          overflowing the process kernel stacks.
 
+config TLB_PTLOCK
+       bool "Use page table locks in TLB fault handler"
+       depends on SMP
+       default n
+       help
+         Select this option to enable page table locking in the TLB
+         fault handler. This ensures that page table entries are
+         updated consistently on SMP machines at the expense of some
+         loss in performance.
+
 config HOTPLUG_CPU
        bool
        default y if SMP