2 files changed, 3 insertions, 4 deletions

diff --git a/drivers/gpu/drm/nouveau/Kconfig b/drivers/gpu/drm/nouveau/Kconfig
index dba2613f7180..6303d203ab1d 100644
--- a/drivers/gpu/drm/nouveau/Kconfig
+++ b/drivers/gpu/drm/nouveau/Kconfig
@@ -85,10 +85,10 @@ config DRM_NOUVEAU_BACKLIGHT
 config DRM_NOUVEAU_SVM
         bool "(EXPERIMENTAL) Enable SVM (Shared Virtual Memory) support"
         depends on ARCH_HAS_HMM
+        depends on DEVICE_PRIVATE
         depends on DRM_NOUVEAU
         depends on STAGING
         select HMM_MIRROR
-        select DEVICE_PRIVATE
         default n
         help
           Say Y here if you want to enable experimental support for
diff --git a/mm/Kconfig b/mm/Kconfig
index 6f35b85b3052..eecf037a54b3 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -677,13 +677,13 @@ config ARCH_HAS_HMM_MIRROR
 
 config ARCH_HAS_HMM
         bool
-        default y
         depends on (X86_64 || PPC64)
         depends on ZONE_DEVICE
         depends on MMU && 64BIT
         depends on MEMORY_HOTPLUG
         depends on MEMORY_HOTREMOVE
         depends on SPARSEMEM_VMEMMAP
+        default y
 
 config MIGRATE_VMA_HELPER
         bool
@@ -709,8 +709,7 @@ config HMM_MIRROR
 
 config DEVICE_PRIVATE
         bool "Unaddressable device memory (GPU memory, ...)"
-        depends on ARCH_HAS_HMM
-        select HMM
+        depends on ZONE_DEVICE
         select DEV_PAGEMAP_OPS
 
         help