diff --git a/kernel/microkernel/include/minik.h b/kernel/microkernel/include/minik.h index ba983f6535f..ab6c2acbfae 100644 --- a/kernel/microkernel/include/minik.h +++ b/kernel/microkernel/include/minik.h @@ -175,7 +175,7 @@ extern void K_monitor_task(struct k_proc *, uint32_t d2); extern void K_monitor_args(struct k_args *); extern void K_monitor_read(struct k_args *); -extern const int K_monitor_mask; +extern const int _k_monitor_mask; /* task level monitor bits */ diff --git a/kernel/microkernel/k_task.c b/kernel/microkernel/k_task.c index b0231376e59..62337a7e57c 100644 --- a/kernel/microkernel/k_task.c +++ b/kernel/microkernel/k_task.c @@ -86,7 +86,7 @@ void reset_state_bit(struct k_proc *X, /* ptr to task */ #ifdef CONFIG_TASK_MONITOR f_new ^= f_old; - if ((K_monitor_mask & MON_STATE) && (f_new)) { + if ((_k_monitor_mask & MON_STATE) && (f_new)) { /* * Task monitoring is enabled and the new state bits are * different than the old state bits. @@ -172,7 +172,7 @@ void set_state_bit( #ifdef CONFIG_TASK_MONITOR new_state_bits ^= old_state_bits; - if ((K_monitor_mask & MON_STATE) && (new_state_bits)) { + if ((_k_monitor_mask & MON_STATE) && (new_state_bits)) { /* * Task monitoring is enabled and the new state bits are * different than the old state bits. diff --git a/kernel/microkernel/task_monitor.c b/kernel/microkernel/task_monitor.c index 389e20ab28e..7cf9f0da521 100644 --- a/kernel/microkernel/task_monitor.c +++ b/kernel/microkernel/task_monitor.c @@ -43,7 +43,7 @@ static struct k_mrec __noinit k_monitor_buff[CONFIG_TASK_MONITOR_CAPACITY]; static const int k_monitor_capacity = CONFIG_TASK_MONITOR_CAPACITY; -const int K_monitor_mask = CONFIG_TASK_MONITOR_MASK; +const int _k_monitor_mask = CONFIG_TASK_MONITOR_MASK; static struct k_mrec *K_monitor_wptr = k_monitor_buff; static int K_monitor_nrec = 0; diff --git a/kernel/nanokernel/core/microk.c b/kernel/nanokernel/core/microk.c index 70f3efeb00d..9509db13aee 100644 --- a/kernel/nanokernel/core/microk.c +++ b/kernel/nanokernel/core/microk.c @@ -93,14 +93,14 @@ FUNC_NORETURN void K_swapper(int parameter1, /* not used */ event = (kevent_t)(pArgs); if (event < (kevent_t)_k_num_events) { #ifdef CONFIG_TASK_MONITOR - if (K_monitor_mask & MON_EVENT) { + if (_k_monitor_mask & MON_EVENT) { K_monitor_args(pArgs); } #endif K_sigevent(event); } else { #ifdef CONFIG_TASK_MONITOR - if (K_monitor_mask & MON_KSERV) { + if (_k_monitor_mask & MON_KSERV) { K_monitor_args(pArgs); } #endif @@ -162,7 +162,7 @@ FUNC_NORETURN void K_swapper(int parameter1, /* not used */ _NanoKernel.task = (tCCS *)pNextTask->workspace; #ifdef CONFIG_TASK_MONITOR - if (K_monitor_mask & MON_TSWAP) { + if (_k_monitor_mask & MON_TSWAP) { K_monitor_task(_k_current_task, 0); } #endif