Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux...

[linux.git] / arch / arm64 / Kconfig

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index b2024db225a9dd116cf5d2ba49d62bc79c8e0bf8..300146dc8433beacbd8d5a09337b1b4273eb1793 100644 (file)
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -41,6 +41,7 @@ config ARM64
        select EDAC_SUPPORT
        select FRAME_POINTER
        select GENERIC_ALLOCATOR
+       select GENERIC_ARCH_TOPOLOGY
        select GENERIC_CLOCKEVENTS
        select GENERIC_CLOCKEVENTS_BROADCAST
        select GENERIC_CPU_AUTOPROBE
@@ -205,7 +206,7 @@ config GENERIC_CALIBRATE_DELAY
 config ZONE_DMA
        def_bool y
 
-config HAVE_GENERIC_RCU_GUP
+config HAVE_GENERIC_GUP
        def_bool y
 
 config ARCH_DMA_ADDR_T_64BIT