michaelh/zephyr
1
0
Fork 0
Code Releases Activity

unified: Fix building of the unified kernel

Browse source 
Change-Id: I6824cdb9123a574a56af10efdebdc1c8b82427f8
Signed-off-by: Iván Briano <ivan.briano@intel.com>
This commit is contained in:
Iván Briano 2016-10-04 18:11:05 -03:00
commit 9c7b5eacea
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/kernel.h
View file

@ -479,7 +479,7 @@ struct k_work_q {
* @brief Work flags. * @brief Work flags.
*/ */
enum { enum {
NANO_WORK_STATE_PENDING, /* Work item pending state */ K_WORK_STATE_PENDING, /* Work item pending state */
}; };
/** /**
@ -538,7 +538,7 @@ static inline void k_work_submit_to_queue(struct k_work_q *work_q,
*/ */
static inline int k_work_pending(struct k_work *work) static inline int k_work_pending(struct k_work *work)
{ {
return atomic_test_bit(work->flags, NANO_WORK_STATE_PENDING); return atomic_test_bit(work->flags, K_WORK_STATE_PENDING);
} }
/** /**

2
kernel/unified/work_q.c
View file

@ -40,7 +40,7 @@ static void work_q_main(void *work_q_ptr, void *p2, void *p3)
handler = work->handler; handler = work->handler;
/* Reset pending state so it can be resubmitted by handler */ /* Reset pending state so it can be resubmitted by handler */
if (atomic_test_and_reset_bit(work->flags, if (atomic_test_and_clear_bit(work->flags,
K_WORK_STATE_PENDING)) { K_WORK_STATE_PENDING)) {
handler(work); handler(work);
} }