svn commit: r304689 - head/sys/arm64/arm64

[Andrew Turner]

Author: andrew
Date: Tue Aug 23 16:37:34 2016
New Revision: 304689
URL: https://svnweb.freebsd.org/changeset/base/304689

Log:
  Also adjust the virtual address passed to vm_page_pa_tryrelock.
  
  Reported by:	alc
  Obtained from:	ABT Systems Ltd
  MFC after:	1 month
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sys/arm64/arm64/pmap.c

Modified: head/sys/arm64/arm64/pmap.c
==============================================================================
--- head/sys/arm64/arm64/pmap.c	Tue Aug 23 16:20:56 2016	(r304688)
+++ head/sys/arm64/arm64/pmap.c	Tue Aug 23 16:37:34 2016	(r304689)
@@ -1028,7 +1028,8 @@ retry:
 			default:
 				off = 0;
 			}
-			if (vm_page_pa_tryrelock(pmap, tpte & ~ATTR_MASK, &pa))
+			if (vm_page_pa_tryrelock(pmap,
+			    (tpte & ~ATTR_MASK) | off, &pa))
 				goto retry;
 			m = PHYS_TO_VM_PAGE((tpte & ~ATTR_MASK) | off);
 			vm_page_hold(m);