svn commit: r262002 - stable/10/sys/ia64/ia64

[Marcel Moolenaar]

Author: marcel
Date: Sun Feb 16 22:12:13 2014
New Revision: 262002
URL: http://svnweb.freebsd.org/changeset/base/262002

Log:
  MFC r260914:
  In pmap_set_pte(), make sure to enforce ordering by inserting a memory fence.

Modified:
  stable/10/sys/ia64/ia64/pmap.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/ia64/ia64/pmap.c
==============================================================================
--- stable/10/sys/ia64/ia64/pmap.c	Sun Feb 16 22:01:44 2014	(r262001)
+++ stable/10/sys/ia64/ia64/pmap.c	Sun Feb 16 22:12:13 2014	(r262002)
@@ -1318,6 +1318,8 @@ pmap_set_pte(struct ia64_lpte *pte, vm_o
 
 	pte->itir = PAGE_SHIFT << 2;
 
+	ia64_mf();
+
 	pte->tag = ia64_ttag(va);
 }
 
@@ -1336,8 +1338,8 @@ pmap_remove_pte(pmap_t pmap, struct ia64
 	 * First remove from the VHPT.
 	 */
 	error = pmap_remove_vhpt(va);
-	if (error)
-		return (error);
+	KASSERT(error == 0, ("%s: pmap_remove_vhpt returned %d",
+	    __func__, error));
 
 	pmap_invalidate_page(va);