Date: Sun, 26 Aug 2012 00:46:58 +0000 (UTC) From: Oleksandr Tymoshenko <gonzo@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r239697 - head/sys/arm/arm Message-ID: <201208260046.q7Q0kwg0025554@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gonzo Date: Sun Aug 26 00:46:57 2012 New Revision: 239697 URL: http://svn.freebsd.org/changeset/base/239697 Log: Merge fix for hang on ARM11 from NetBSD Modified: head/sys/arm/arm/cpufunc_asm_arm11.S Modified: head/sys/arm/arm/cpufunc_asm_arm11.S ============================================================================== --- head/sys/arm/arm/cpufunc_asm_arm11.S Sat Aug 25 23:59:31 2012 (r239696) +++ head/sys/arm/arm/cpufunc_asm_arm11.S Sun Aug 26 00:46:57 2012 (r239697) @@ -44,9 +44,11 @@ __FBSDID("$FreeBSD$"); * addresses that are about to change. */ ENTRY(arm11_setttb) +#ifdef PMAP_CACHE_VIVT stmfd sp!, {r0, lr} bl _C_LABEL(armv5_idcache_wbinv_all) ldmfd sp!, {r0, lr} +#endif mcr p15, 0, r0, c2, c0, 0 /* load new TTB */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208260046.q7Q0kwg0025554>