Merge tag 'asm-generic-timers-5.11' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 5181872..e307f77 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -146,6 +146,7 @@ config PPC
        select ARCH_MIGHT_HAVE_PC_SERIO
        select ARCH_OPTIONAL_KERNEL_RWX         if ARCH_HAS_STRICT_KERNEL_RWX
        select ARCH_SUPPORTS_ATOMIC_RMW
+       select ARCH_SUPPORTS_DEBUG_PAGEALLOC    if PPC32 || PPC_BOOK3S_64
        select ARCH_USE_BUILTIN_BSWAP
        select ARCH_USE_CMPXCHG_LOCKREF         if PPC64
        select ARCH_USE_QUEUED_RWLOCKS          if PPC_QUEUED_SPINLOCKS
@@ -164,7 +165,6 @@ config PPC
        select EDAC_ATOMIC_SCRUB
        select EDAC_SUPPORT
        select GENERIC_ATOMIC64                 if PPC32
-       select GENERIC_CLOCKEVENTS
        select GENERIC_CLOCKEVENTS_BROADCAST    if SMP
        select GENERIC_CMOS_UPDATE
        select GENERIC_CPU_AUTOPROBE
@@ -356,10 +356,6 @@ config PPC_OF_PLATFORM_PCI
        depends on PCI
        depends on PPC64 # not supported on 32 bits yet
 
-config ARCH_SUPPORTS_DEBUG_PAGEALLOC
-       depends on PPC32 || PPC_BOOK3S_64
-       def_bool y
-
 config ARCH_SUPPORTS_UPROBES
        def_bool y
 
@@ -410,6 +406,7 @@ menu "Kernel options"
 config HIGHMEM
        bool "High memory support"
        depends on PPC32
+       select KMAP_LOCAL
 
 source "kernel/Kconfig.hz"