From a4e033fdba2eceb28ee8eaa021a0efd915cbcade Mon Sep 17 00:00:00 2001 From: Benjamin Walsh Date: Fri, 18 Nov 2016 16:08:24 -0500 Subject: [PATCH] kernel: fix obsolete access to fields in K_DEBUG() calls When moving arch-specific thread structure to arch-agnostic, some field accesses were missed when used in K_DEBUG statements, which are turned off by default. Change-Id: Ife0f49b8185a0db468deab73555f7034f20ca3e8 Signed-off-by: Benjamin Walsh --- kernel/unified/include/ksched.h | 2 +- kernel/unified/mutex.c | 4 ++-- kernel/unified/sched.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/kernel/unified/include/ksched.h b/kernel/unified/include/ksched.h index e016b02d2fc..2fc71c0c182 100644 --- a/kernel/unified/include/ksched.h +++ b/kernel/unified/include/ksched.h @@ -204,7 +204,7 @@ static inline void _sched_lock(void) atomic_inc(&_current->base.sched_locked); K_DEBUG("scheduler locked (%p:%d)\n", - _current, _current->sched_locked); + _current, _current->base.sched_locked); } /** diff --git a/kernel/unified/mutex.c b/kernel/unified/mutex.c index be0640ad34a..18ef96ece6c 100644 --- a/kernel/unified/mutex.c +++ b/kernel/unified/mutex.c @@ -121,7 +121,7 @@ static void adjust_owner_prio(struct k_mutex *mutex, int new_prio) K_DEBUG("%p (ready (y/n): %c) prio changed to %d (was %d)\n", mutex->owner, _is_thread_ready(mutex->owner) ? 'y' : 'n', - new_prio, mutex->owner->prio); + new_prio, mutex->owner->base.prio); _thread_priority_set(mutex->owner, new_prio); } @@ -238,7 +238,7 @@ void k_mutex_unlock(struct k_mutex *mutex) struct k_thread *new_owner = _unpend_first_thread(&mutex->wait_q); K_DEBUG("new owner of mutex %p: %p (prio: %d)\n", - mutex, new_owner, new_owner ? new_owner->prio : -1000); + mutex, new_owner, new_owner ? new_owner->base.prio : -1000); if (new_owner) { _abort_thread_timeout(new_owner); diff --git a/kernel/unified/sched.c b/kernel/unified/sched.c index a877da5cc31..361ac4f951f 100644 --- a/kernel/unified/sched.c +++ b/kernel/unified/sched.c @@ -123,7 +123,7 @@ void k_sched_unlock(void) atomic_dec(&_current->base.sched_locked); K_DEBUG("scheduler unlocked (%p:%d)\n", - _current, _current->sched_locked); + _current, _current->base.sched_locked); _reschedule_threads(key); } @@ -220,7 +220,7 @@ struct k_thread *_get_next_ready_thread(void) int __must_switch_threads(void) { K_DEBUG("current prio: %d, highest prio: %d\n", - _current->prio, _get_highest_ready_prio()); + _current->base.prio, _get_highest_ready_prio()); extern void _dump_ready_q(void); _dump_ready_q();