ovl: Fix ovl_getattr() to get number of blocks from lower

[linux.git] / mm / hmm.c

diff --git a/mm/hmm.c b/mm/hmm.c
index e63e353830e8f6bb32e9600fcbbd5b5e4c3be438..de7b6bf7720104fa9312dab54618d7cc425c3f05 100644 (file)
--- a/mm/hmm.c
+++ b/mm/hmm.c
@@ -35,15 +35,6 @@
 
 #define PA_SECTION_SIZE (1UL << PA_SECTION_SHIFT)
 
-#if defined(CONFIG_DEVICE_PRIVATE) || defined(CONFIG_DEVICE_PUBLIC)
-/*
- * Device private memory see HMM (Documentation/vm/hmm.rst) or hmm.h
- */
-DEFINE_STATIC_KEY_FALSE(device_private_key);
-EXPORT_SYMBOL(device_private_key);
-#endif /* CONFIG_DEVICE_PRIVATE || CONFIG_DEVICE_PUBLIC */
-
-
 #if IS_ENABLED(CONFIG_HMM_MIRROR)
 static const struct mmu_notifier_ops hmm_mmu_notifier_ops;
 
@@ -1167,7 +1158,7 @@ struct hmm_devmem *hmm_devmem_add(const struct hmm_devmem_ops *ops,
        resource_size_t addr;
        int ret;
 
-       static_branch_enable(&device_private_key);
+       dev_pagemap_get_ops();
 
        devmem = devres_alloc_node(&hmm_devmem_release, sizeof(*devmem),
                                   GFP_KERNEL, dev_to_node(device));
@@ -1261,7 +1252,7 @@ struct hmm_devmem *hmm_devmem_add_resource(const struct hmm_devmem_ops *ops,
        if (res->desc != IORES_DESC_DEVICE_PUBLIC_MEMORY)
                return ERR_PTR(-EINVAL);
 
-       static_branch_enable(&device_private_key);
+       dev_pagemap_get_ops();
 
        devmem = devres_alloc_node(&hmm_devmem_release, sizeof(*devmem),
                                   GFP_KERNEL, dev_to_node(device));