mm/hmm: rename HMM_PFN_DEVICE_UNADDRESSABLE to HMM_PFN_DEVICE_PRIVATE

Make naming consistent across code, DEVICE_PRIVATE is the name use outside
HMM code so use that one.

Link: http://lkml.kernel.org/r/20180323005527.758-12-jglisse@redhat.com
Signed-off-by: Jérôme Glisse <jglisse@redhat.com>
Reviewed-by: John Hubbard <jhubbard@nvidia.com>
Cc: Evgeny Baskakov <ebaskakov@nvidia.com>
Cc: Ralph Campbell <rcampbell@nvidia.com>
Cc: Mark Hairgrove <mhairgrove@nvidia.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/include/linux/hmm.h b/include/linux/hmm.h
index cf283db2210651b701aa45376205a47f67e4ae30..e8515cad5a00fbb859383481b31c01d7678be534 100644 (file)
--- a/include/linux/hmm.h
+++ b/include/linux/hmm.h
@@ -88,13 +88,13 @@ struct hmm;
  *      result of vm_insert_pfn() or vm_insert_page(). Therefore, it should not
  *      be mirrored by a device, because the entry will never have HMM_PFN_VALID
  *      set and the pfn value is undefined.
- * HMM_PFN_DEVICE_UNADDRESSABLE: unaddressable device memory (ZONE_DEVICE)
+ * HMM_PFN_DEVICE_PRIVATE: unaddressable device memory (ZONE_DEVICE)
  */
 #define HMM_PFN_VALID (1 << 0)
 #define HMM_PFN_WRITE (1 << 1)
 #define HMM_PFN_ERROR (1 << 2)
 #define HMM_PFN_SPECIAL (1 << 3)
-#define HMM_PFN_DEVICE_UNADDRESSABLE (1 << 4)
+#define HMM_PFN_DEVICE_PRIVATE (1 << 4)
 #define HMM_PFN_SHIFT 5
 
 /*

diff --git a/mm/hmm.c b/mm/hmm.c
index b8affe0bf4eb5ae8a0a19e984cc90dc23b1cc90b..c287fbbbf088a296108785352446a12145e0f2c4 100644 (file)
--- a/mm/hmm.c
+++ b/mm/hmm.c
@@ -472,7 +472,7 @@ again:
                                        pfns[i] |= HMM_PFN_WRITE;
                                } else if (write_fault)
                                        goto fault;
-                               pfns[i] |= HMM_PFN_DEVICE_UNADDRESSABLE;
+                               pfns[i] |= HMM_PFN_DEVICE_PRIVATE;
                        } else if (is_migration_entry(entry)) {
                                if (hmm_vma_walk->fault) {
                                        pte_unmap(ptep);