kernel/timeout: Fix another recursive spinlock()

The fix in commit e664c78b82 ("kernel/timeout: Fix recursive
spinlock in z_set_timeout_expiry()") missed a spot that had also been
introduced with recent locking work.  The new
_get_next_timeout_expiry() implementation takes its own lock, which is
recursive when called from z_clock_announce().  Fix by calling the
wrapped implementation instead.

Signed-off-by: Andy Ross <andrew.j.ross@intel.com>
This commit is contained in:
Andy Ross 2019-01-30 12:31:25 -08:00 committed by Andrew Boie
parent 7367b84f8e
commit 8b583acf23

View File

@ -198,7 +198,7 @@ void z_clock_announce(s32_t ticks)
curr_tick += announce_remaining;
announce_remaining = 0;
z_clock_set_timeout(_get_next_timeout_expiry(), false);
z_clock_set_timeout(next_timeout(), false);
k_spin_unlock(&timeout_lock, key);
}