Skip to content

Commit

Permalink
mm/hmm: rename HMM_PFN_DEVICE_UNADDRESSABLE to HMM_PFN_DEVICE_PRIVATE
Browse files Browse the repository at this point in the history
Make naming consistent across code, DEVICE_PRIVATE is the name use outside
HMM code so use that one.

Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Jérôme Glisse <[email protected]>
Reviewed-by: John Hubbard <[email protected]>
Cc: Evgeny Baskakov <[email protected]>
Cc: Ralph Campbell <[email protected]>
Cc: Mark Hairgrove <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
Jérôme Glisse authored and torvalds committed Apr 11, 2018
1 parent 5504ed2 commit b274411
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions include/linux/hmm.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

/*
Expand Down
2 changes: 1 addition & 1 deletion mm/hmm.c
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ static int hmm_vma_walk_pmd(pmd_t *pmdp,
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);
Expand Down

0 comments on commit b274411

Please sign in to comment.