From 3489e3b6396ee9944a6a2e19e675ca54c36993b4 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Wed, 22 Aug 2018 14:59:50 +0200 Subject: Update to FreeBSD head 2018-09-17 Git mirror commit 6c2192b1ef8c50788c751f878552526800b1e319. Update #3472. --- rtemsbsd/rtems/rtems-kernel-epoch.c | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) (limited to 'rtemsbsd/rtems') diff --git a/rtemsbsd/rtems/rtems-kernel-epoch.c b/rtemsbsd/rtems/rtems-kernel-epoch.c index 9eb8487c..7d42bf32 100644 --- a/rtemsbsd/rtems/rtems-kernel-epoch.c +++ b/rtemsbsd/rtems/rtems-kernel-epoch.c @@ -165,8 +165,8 @@ epoch_sysinit(void) } SYSINIT(epoch, SI_SUB_TUNABLES, SI_ORDER_SECOND, epoch_sysinit, NULL); -static void -epoch_enter_preempt_next(epoch_t epoch, epoch_tracker_t et) +void +epoch_enter_preempt(epoch_t epoch, epoch_tracker_t et) { Per_CPU_Control *cpu_self; ISR_lock_Context lock_context; @@ -189,8 +189,8 @@ epoch_enter_preempt_next(epoch_t epoch, epoch_tracker_t et) _Thread_Dispatch_enable(cpu_self); } -static void -epoch_exit_preempt_next(epoch_t epoch, epoch_tracker_t et) +void +epoch_exit_preempt(epoch_t epoch, epoch_tracker_t et) { Per_CPU_Control *cpu_self; ISR_lock_Context lock_context; @@ -215,23 +215,6 @@ epoch_exit_preempt_next(epoch_t epoch, epoch_tracker_t et) } } -/* FIXME: Must be removed in next FreeBSD baseline update step. */ -static __thread epoch_tracker_t et; - -void -epoch_enter_preempt(epoch_t epoch) -{ - - epoch_enter_preempt_next(epoch, &et); -} - -void -epoch_exit_preempt(epoch_t epoch) -{ - - epoch_exit_preempt_next(epoch, &et); -} - static void epoch_block_handler(struct ck_epoch *g __unused, ck_epoch_record_t *c __unused, void *arg __unused) -- cgit v1.2.3