From 059544d1aef36a091013e14f6694a6aaed933656 Mon Sep 17 00:00:00 2001 From: Maciek Borzecki Date: Thu, 18 May 2017 12:16:45 +0200 Subject: [PATCH] kernel: make sure that CONFIG_OBJECT_TRACING structs are properly ifdef'ed Fixes sparse warnings: /zephyr/kernel/timer.c:15:16: warning: symbol '_trace_list_k_timer' was not declared. Should it be static? /zephyr/kernel/sem.c:32:14: warning: symbol'_trace_list_k_sem' was not declared. Should it be static? /zephyr/kernel/stack.c:24:16: warning: symbol '_trace_list_k_stack' was not declared. Should it be static? /zephyr/kernel/queue.c:27:16: warning: symbol '_trace_list_k_queue' was not declared. Should it be static? /zephyr/kernel/pipes.c:40:15: warning: symbol '_trace_list_k_pipe' was not declared. Should it be static? /zephyr/kernel/mutex.c:46:16: warning: symbol '_trace_list_k_mutex' was not declared. Should it be static? /zephyr/kernel/msg_q.c:26:15: warning: symbol '_trace_list_k_msgq' was not declared. Should it be static? /zephyr/kernel/mem_slab.c:20:19: warning: symbol '_trace_list_k_mem_slab' was not declared. Should it be static? /zephyr/kernel/mailbox.c:53:15: warning: symbol '_trace_list_k_mbox' was not declared. Should it be static? Change-Id: I42d55aea9855b9c1dd560852ca033c9a19f1ac21 Signed-off-by: Maciek Borzecki --- kernel/mailbox.c | 2 ++ kernel/mem_slab.c | 2 ++ kernel/msg_q.c | 4 ++-- kernel/mutex.c | 4 ++-- kernel/pipes.c | 2 ++ kernel/queue.c | 4 ++-- kernel/sem.c | 4 ++-- kernel/stack.c | 4 ++-- kernel/timer.c | 4 ++-- 9 files changed, 18 insertions(+), 12 deletions(-) diff --git a/kernel/mailbox.c b/kernel/mailbox.c index 05dd3979e09..0c3d4b11644 100644 --- a/kernel/mailbox.c +++ b/kernel/mailbox.c @@ -50,7 +50,9 @@ static inline void _mbox_async_free(struct k_mbox_async *async) extern struct k_mbox _k_mbox_list_start[]; extern struct k_mbox _k_mbox_list_end[]; +#ifdef CONFIG_OBJECT_TRACING struct k_mbox *_trace_list_k_mbox; +#endif /* CONFIG_OBJECT_TRACING */ #if (CONFIG_NUM_MBOX_ASYNC_MSGS > 0) || \ defined(CONFIG_OBJECT_TRACING) diff --git a/kernel/mem_slab.c b/kernel/mem_slab.c index bac69eda098..4ac708e1a03 100644 --- a/kernel/mem_slab.c +++ b/kernel/mem_slab.c @@ -17,7 +17,9 @@ extern struct k_mem_slab _k_mem_slab_list_start[]; extern struct k_mem_slab _k_mem_slab_list_end[]; +#ifdef CONFIG_OBJECT_TRACING struct k_mem_slab *_trace_list_k_mem_slab; +#endif /* CONFIG_OBJECT_TRACING */ /** * @brief Initialize kernel memory slab subsystem. diff --git a/kernel/msg_q.c b/kernel/msg_q.c index d5a24815b50..94896e759c8 100644 --- a/kernel/msg_q.c +++ b/kernel/msg_q.c @@ -23,10 +23,10 @@ extern struct k_msgq _k_msgq_list_start[]; extern struct k_msgq _k_msgq_list_end[]; -struct k_msgq *_trace_list_k_msgq; - #ifdef CONFIG_OBJECT_TRACING +struct k_msgq *_trace_list_k_msgq; + /* * Complete initialization of statically defined message queues. */ diff --git a/kernel/mutex.c b/kernel/mutex.c index ff9ce087a76..ccf5a885bd3 100644 --- a/kernel/mutex.c +++ b/kernel/mutex.c @@ -43,10 +43,10 @@ extern struct k_mutex _k_mutex_list_start[]; extern struct k_mutex _k_mutex_list_end[]; -struct k_mutex *_trace_list_k_mutex; - #ifdef CONFIG_OBJECT_TRACING +struct k_mutex *_trace_list_k_mutex; + /* * Complete initialization of statically defined mutexes. */ diff --git a/kernel/pipes.c b/kernel/pipes.c index 6b64a593198..77d72f1f646 100644 --- a/kernel/pipes.c +++ b/kernel/pipes.c @@ -37,7 +37,9 @@ struct k_pipe_async { extern struct k_pipe _k_pipe_list_start[]; extern struct k_pipe _k_pipe_list_end[]; +#ifdef CONFIG_OBJECT_TRACING struct k_pipe *_trace_list_k_pipe; +#endif /* CONFIG_OBJECT_TRACING */ #if (CONFIG_NUM_PIPE_ASYNC_MSGS > 0) diff --git a/kernel/queue.c b/kernel/queue.c index c817b338d1f..5a5c75d0841 100644 --- a/kernel/queue.c +++ b/kernel/queue.c @@ -24,10 +24,10 @@ extern struct k_queue _k_queue_list_start[]; extern struct k_queue _k_queue_list_end[]; -struct k_queue *_trace_list_k_queue; - #ifdef CONFIG_OBJECT_TRACING +struct k_queue *_trace_list_k_queue; + /* * Complete initialization of statically defined queues. */ diff --git a/kernel/sem.c b/kernel/sem.c index 949e2564995..50d0f0093ff 100644 --- a/kernel/sem.c +++ b/kernel/sem.c @@ -29,10 +29,10 @@ extern struct k_sem _k_sem_list_start[]; extern struct k_sem _k_sem_list_end[]; -struct k_sem *_trace_list_k_sem; - #ifdef CONFIG_OBJECT_TRACING +struct k_sem *_trace_list_k_sem; + /* * Complete initialization of statically defined semaphores. */ diff --git a/kernel/stack.c b/kernel/stack.c index f39b2a03d68..b5d59d6abeb 100644 --- a/kernel/stack.c +++ b/kernel/stack.c @@ -21,10 +21,10 @@ extern struct k_stack _k_stack_list_start[]; extern struct k_stack _k_stack_list_end[]; -struct k_stack *_trace_list_k_stack; - #ifdef CONFIG_OBJECT_TRACING +struct k_stack *_trace_list_k_stack; + /* * Complete initialization of statically defined stacks. */ diff --git a/kernel/timer.c b/kernel/timer.c index 62c06183b9a..b60e20759c1 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -12,10 +12,10 @@ extern struct k_timer _k_timer_list_start[]; extern struct k_timer _k_timer_list_end[]; -struct k_timer *_trace_list_k_timer; - #ifdef CONFIG_OBJECT_TRACING +struct k_timer *_trace_list_k_timer; + /* * Complete initialization of statically defined timers. */