From a5d8461d74743937947fa3ad03e8ced61e9a6561 Mon Sep 17 00:00:00 2001 From: Benjamin Walsh Date: Sun, 22 Jan 2017 11:13:36 -0500 Subject: [PATCH] kernel: move volatile from k_thread.prio to k_thread.sched_locked When prio and sched_locked were moved into a struct together to create a union with the combined preempt field, the volatile qualifier moved from sched_locked to prio by mistake. Change-Id: I5a8e01324f14e77e3d7162c12515471826023633 Signed-off-by: Benjamin Walsh --- kernel/include/kernel_structs.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel/include/kernel_structs.h b/kernel/include/kernel_structs.h index 31da33f914b..f0f55cdb7e2 100644 --- a/kernel/include/kernel_structs.h +++ b/kernel/include/kernel_structs.h @@ -103,11 +103,11 @@ struct _thread_base { union { struct { #if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ - uint8_t sched_locked; - volatile int8_t prio; + volatile uint8_t sched_locked; + int8_t prio; #else /* LITTLE and PDP */ - volatile int8_t prio; - uint8_t sched_locked; + int8_t prio; + volatile uint8_t sched_locked; #endif }; uint16_t preempt;