Date: Sun, 25 May 2014 18:47:25 +0000 (UTC) From: Zbigniew Bodek <zbb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r266672 - head/sys/arm/arm Message-ID: <201405251847.s4PIlPtj004567@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: zbb Date: Sun May 25 18:47:24 2014 New Revision: 266672 URL: http://svnweb.freebsd.org/changeset/base/266672 Log: Fix context switch on PJ4Bv7 and remove obsolete pj4b_/arm11 functions Use armv7_setttb that sets proper PT attributes. Get rid of unused CPU functions, put nullop instead. Exchange obsolete pj4b_/arm11_ functions to the appropriate armv7_ ones. Modified: head/sys/arm/arm/cpufunc.c Modified: head/sys/arm/arm/cpufunc.c ============================================================================== --- head/sys/arm/arm/cpufunc.c Sun May 25 18:40:32 2014 (r266671) +++ head/sys/arm/arm/cpufunc.c Sun May 25 18:47:24 2014 (r266672) @@ -369,13 +369,13 @@ struct cpu_functions pj4bv7_cpufuncs = { /* CPU functions */ cpufunc_id, /* id */ - arm11_drain_writebuf, /* cpwait */ + armv7_drain_writebuf, /* cpwait */ /* MMU functions */ cpufunc_control, /* control */ cpufunc_domains, /* Domain */ - pj4b_setttb, /* Setttb */ + armv7_setttb, /* Setttb */ cpufunc_faultstatus, /* Faultstatus */ cpufunc_faultaddress, /* Faultaddress */ @@ -409,10 +409,10 @@ struct cpu_functions pj4bv7_cpufuncs = { /* Other functions */ - pj4b_drain_readbuf, /* flush_prefetchbuf */ - arm11_drain_writebuf, /* drain_writebuf */ - pj4b_flush_brnchtgt_all, /* flush_brnchtgt_C */ - pj4b_flush_brnchtgt_va, /* flush_brnchtgt_E */ + cpufunc_nullop, /* flush_prefetchbuf */ + armv7_drain_writebuf, /* drain_writebuf */ + cpufunc_nullop, /* flush_brnchtgt_C */ + (void *)cpufunc_nullop, /* flush_brnchtgt_E */ (void *)cpufunc_nullop, /* sleep */ @@ -421,7 +421,7 @@ struct cpu_functions pj4bv7_cpufuncs = { cpufunc_null_fixup, /* dataabt_fixup */ cpufunc_null_fixup, /* prefetchabt_fixup */ - arm11_context_switch, /* context_switch */ + armv7_context_switch, /* context_switch */ pj4bv7_setup /* cpu setup */ };
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405251847.s4PIlPtj004567>