unified: Fix building of the unified kernel

Change-Id: I6824cdb9123a574a56af10efdebdc1c8b82427f8 Signed-off-by: Iván Briano <[email protected]>
k0d · Oct 4, 2016 · 9c7b5ea · 9c7b5ea
1 parent 340d00a
commit 9c7b5ea
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/include/kernel.h b/include/kernel.h
@@ -479,7 +479,7 @@ struct k_work_q {
  * @brief Work flags.
  */
 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)
 {
-	return atomic_test_bit(work->flags, NANO_WORK_STATE_PENDING);
+	return atomic_test_bit(work->flags, K_WORK_STATE_PENDING);
 }
 
 /**

diff --git a/kernel/unified/work_q.c b/kernel/unified/work_q.c
@@ -40,7 +40,7 @@ static void work_q_main(void *work_q_ptr, void *p2, void *p3)
 		handler = work->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)) {
 			handler(work);
 		}