From: Jérôme Glisse Date: Tue, 10 Apr 2018 23:28:49 +0000 (-0700) Subject: mm/hmm: rename HMM_PFN_DEVICE_UNADDRESSABLE to HMM_PFN_DEVICE_PRIVATE X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b2744118a65efee90aea95f7cd31bf74eb8009f8;p=linux.git 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 Reviewed-by: John Hubbard Cc: Evgeny Baskakov Cc: Ralph Campbell Cc: Mark Hairgrove Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/include/linux/hmm.h b/include/linux/hmm.h index cf283db221065..e8515cad5a00f 100644 --- 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 b8affe0bf4eb5..c287fbbbf088a 100644 --- 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);