On Sat, Mar 21, 2020 at 09:43:47AM +0100, Christoph Hellwig wrote:

On Fri, Mar 20, 2020 at 01:49:05PM -0300, Jason Gunthorpe wrote:

...

From: Jason Gunthorpe jgg@mellanox.com

swp_offset() should not be called directly, the wrappers are supposed to abstract away the encoding of the device_private specific information in the swap entry.

Signed-off-by: Jason Gunthorpe jgg@mellanox.com mm/hmm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mm/hmm.c b/mm/hmm.c index a09b4908e9c81a..fd9ee2b5fd9989 100644 +++ b/mm/hmm.c @@ -259,8 +259,8 @@ static int hmm_vma_handle_pte(struct mm_walk *walk, unsigned long addr, * the PFN even if not present. */ if (hmm_is_device_private_entry(range, entry)) {

• 	*pfn = hmm_device_entry_from_pfn(range,
  

• 			    swp_offset(entry));
  

• 	*pfn = hmm_device_entry_from_pfn(
  

• 		range, device_private_entry_to_pfn(entry));
  

The range parameter can stay on the first line..

Done. Makes the diff smaller.

Thanks, Jason