diff options
| author | Gleb Smirnoff <glebius@FreeBSD.org> | 2018-11-13 23:45:38 +0000 |
|---|---|---|
| committer | Gleb Smirnoff <glebius@FreeBSD.org> | 2018-11-13 23:45:38 +0000 |
| commit | a760c50c9ea7c75a4f2605170dd8bbb36457c53b (patch) | |
| tree | 779618428e848ff0357b3bd2f895263c785b6db7 /sys/kern | |
| parent | d4f7db47642344bc7b746a9571d08b0fb4d8c9dd (diff) | |
| download | src-a760c50c9ea7c75a4f2605170dd8bbb36457c53b.tar.gz src-a760c50c9ea7c75a4f2605170dd8bbb36457c53b.zip | |
With epoch not inlined, there is no point in using _lite KPI. While here,
remove some unnecessary casts.
Notes
Notes:
svn path=/head/; revision=340417
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/genoffset.c | 1 | ||||
| -rw-r--r-- | sys/kern/subr_epoch.c | 26 |
2 files changed, 13 insertions, 14 deletions
diff --git a/sys/kern/genoffset.c b/sys/kern/genoffset.c index 4a1e12a1d072..aadb909e943c 100644 --- a/sys/kern/genoffset.c +++ b/sys/kern/genoffset.c @@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$"); #include <sys/assym.h> #include <sys/proc.h> -OFFSYM(td_pre_epoch_prio, thread, u_char); OFFSYM(td_priority, thread, u_char); OFFSYM(td_epochnest, thread, u_char); OFFSYM(td_critnest, thread, u_int); diff --git a/sys/kern/subr_epoch.c b/sys/kern/subr_epoch.c index 13a3a915075d..4f20af2cc8d4 100644 --- a/sys/kern/subr_epoch.c +++ b/sys/kern/subr_epoch.c @@ -240,7 +240,7 @@ void epoch_enter_preempt(epoch_t epoch, epoch_tracker_t et) { struct epoch_record *er; - struct thread_lite *td; + struct thread *td; MPASS(cold || epoch != NULL); INIT_CHECK(epoch); @@ -249,11 +249,11 @@ epoch_enter_preempt(epoch_t epoch, epoch_tracker_t et) et->et_magic_pre = EPOCH_MAGIC0; et->et_magic_post = EPOCH_MAGIC1; #endif - td = (struct thread_lite *)curthread; - et->et_td = (void*)td; + td = curthread; + et->et_td = td; td->td_epochnest++; critical_enter(); - sched_pin_lite(td); + sched_pin(); td->td_pre_epoch_prio = td->td_priority; er = epoch_currecord(epoch); @@ -265,12 +265,12 @@ epoch_enter_preempt(epoch_t epoch, epoch_tracker_t et) void epoch_enter(epoch_t epoch) { - struct thread_lite *td; + struct thread *td; epoch_record_t er; MPASS(cold || epoch != NULL); INIT_CHECK(epoch); - td = (struct thread_lite *)curthread; + td = curthread; td->td_epochnest++; critical_enter(); @@ -282,18 +282,18 @@ void epoch_exit_preempt(epoch_t epoch, epoch_tracker_t et) { struct epoch_record *er; - struct thread_lite *td; + struct thread *td; INIT_CHECK(epoch); - td = (struct thread_lite *)curthread; + td = curthread; critical_enter(); - sched_unpin_lite(td); + sched_unpin(); MPASS(td->td_epochnest); td->td_epochnest--; er = epoch_currecord(epoch); MPASS(epoch->e_flags & EPOCH_PREEMPT); MPASS(et != NULL); - MPASS(et->et_td == (struct thread *)td); + MPASS(et->et_td == td); #ifdef EPOCH_TRACKER_DEBUG MPASS(et->et_magic_pre == EPOCH_MAGIC0); MPASS(et->et_magic_post == EPOCH_MAGIC1); @@ -307,18 +307,18 @@ epoch_exit_preempt(epoch_t epoch, epoch_tracker_t et) TAILQ_REMOVE(&er->er_tdlist, et, et_link); er->er_gen++; if (__predict_false(td->td_pre_epoch_prio != td->td_priority)) - epoch_adjust_prio((struct thread *)td, td->td_pre_epoch_prio); + epoch_adjust_prio(td, td->td_pre_epoch_prio); critical_exit(); } void epoch_exit(epoch_t epoch) { - struct thread_lite *td; + struct thread *td; epoch_record_t er; INIT_CHECK(epoch); - td = (struct thread_lite *)curthread; + td = curthread; MPASS(td->td_epochnest); td->td_epochnest--; er = epoch_currecord(epoch); |