From: Jérôme Glisse <jglisse@xxxxxxxxxx> Subject: 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@xxxxxxxxxx Signed-off-by: Jérôme Glisse <jglisse@xxxxxxxxxx> Reviewed-by: John Hubbard <jhubbard@xxxxxxxxxx> Cc: Evgeny Baskakov <ebaskakov@xxxxxxxxxx> Cc: Ralph Campbell <rcampbell@xxxxxxxxxx> Cc: Mark Hairgrove <mhairgrove@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/hmm.h | 4 ++-- mm/hmm.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff -puN include/linux/hmm.h~mm-hmm-rename-hmm_pfn_device_unaddressable-to-hmm_pfn_device_private include/linux/hmm.h --- a/include/linux/hmm.h~mm-hmm-rename-hmm_pfn_device_unaddressable-to-hmm_pfn_device_private +++ a/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 -puN mm/hmm.c~mm-hmm-rename-hmm_pfn_device_unaddressable-to-hmm_pfn_device_private mm/hmm.c --- a/mm/hmm.c~mm-hmm-rename-hmm_pfn_device_unaddressable-to-hmm_pfn_device_private +++ a/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); _ -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
