diff options
| author | zbb <zbb@FreeBSD.org> | 2014-05-25 18:47:24 +0000 |
|---|---|---|
| committer | zbb <zbb@FreeBSD.org> | 2014-05-25 18:47:24 +0000 |
| commit | 91f916d87421170a1b4c4959d745f4c7e87746ee (patch) | |
| tree | d4d66fc668dbbbf7adf3123331d4c554b2c5c486 /sys/arm | |
| parent | 001dede6f087701477030b809e4935e3c02c6cbd (diff) | |
| download | FreeBSD-src-91f916d87421170a1b4c4959d745f4c7e87746ee.zip FreeBSD-src-91f916d87421170a1b4c4959d745f4c7e87746ee.tar.gz | |
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.
Diffstat (limited to 'sys/arm')
| -rw-r--r-- | sys/arm/arm/cpufunc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/arm/arm/cpufunc.c b/sys/arm/arm/cpufunc.c index 7ed6932..79636b5 100644 --- a/sys/arm/arm/cpufunc.c +++ b/sys/arm/arm/cpufunc.c @@ -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 */ }; |
