Date: Sun, 16 Feb 2014 22:12:13 +0000 (UTC) From: Marcel Moolenaar <marcel@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r262002 - stable/10/sys/ia64/ia64 Message-ID: <201402162212.s1GMCDBc075198@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402162212.s1GMCDBc075198>