From 32a444c54e4e0e022a6135296df54c1acb858070 Mon Sep 17 00:00:00 2001 From: Andy Ross Date: Fri, 8 Dec 2017 17:19:14 -0800 Subject: [PATCH] kernel: Fix nano_internal.h inclusion _Swap() is defined in nano_internal.h. Everything calls _Swap(). Pretty much nothing that called _Swap() included nano_internal.h, expecting it to be picked up automatically through other headers (as it happened, from the kernel arch-specific include file). A new _Swap() is going to need some other symbols in the inline definition, so I needed to break that cycle. Now nothing sees _Swap() defined anymore. Put nano_internal.h everywhere it's needed. Our kernel includes remain a big awful yucky mess. This makes things more correct but no less ugly. Needs cleanup. Signed-off-by: Andy Ross --- arch/xtensa/core/thread.c | 1 + kernel/init.c | 1 + kernel/mailbox.c | 2 +- kernel/mem_slab.c | 1 + kernel/mempool.c | 1 + kernel/msg_q.c | 1 + kernel/mutex.c | 1 + kernel/pipes.c | 1 + kernel/poll.c | 1 + kernel/posix/pthread_barrier.c | 1 + kernel/posix/pthread_cond.c | 1 + kernel/queue.c | 1 + kernel/sched.c | 1 + kernel/sem.c | 1 + kernel/stack.c | 1 + kernel/thread.c | 1 + kernel/timer.c | 1 + tests/kernel/fatal/src/main.c | 1 + 18 files changed, 18 insertions(+), 1 deletion(-) diff --git a/arch/xtensa/core/thread.c b/arch/xtensa/core/thread.c index 35f8c551f0f..d574e0e7207 100644 --- a/arch/xtensa/core/thread.c +++ b/arch/xtensa/core/thread.c @@ -12,6 +12,7 @@ #include #include #include +#include extern void _xt_user_exit(void); diff --git a/kernel/init.c b/kernel/init.c index e1d8cf7cd5d..43b71e46e66 100644 --- a/kernel/init.c +++ b/kernel/init.c @@ -27,6 +27,7 @@ #include #include #include +#include /* kernel build timestamp items */ diff --git a/kernel/mailbox.c b/kernel/mailbox.c index 47a4fbddf4c..42dcd7c908f 100644 --- a/kernel/mailbox.c +++ b/kernel/mailbox.c @@ -17,7 +17,7 @@ #include #include #include - +#include #if (CONFIG_NUM_MBOX_ASYNC_MSGS > 0) diff --git a/kernel/mem_slab.c b/kernel/mem_slab.c index d13c3d021ec..6a4f4935a46 100644 --- a/kernel/mem_slab.c +++ b/kernel/mem_slab.c @@ -13,6 +13,7 @@ #include #include #include +#include extern struct k_mem_slab _k_mem_slab_list_start[]; extern struct k_mem_slab _k_mem_slab_list_end[]; diff --git a/kernel/mempool.c b/kernel/mempool.c index 81d3d829d0d..372cdefe3d7 100644 --- a/kernel/mempool.c +++ b/kernel/mempool.c @@ -10,6 +10,7 @@ #include #include #include +#include /* Linker-defined symbols bound the static pool structs */ extern struct k_mem_pool _k_mem_pool_list_start[]; diff --git a/kernel/msg_q.c b/kernel/msg_q.c index e9ab416fbbc..e9b7a6906bd 100644 --- a/kernel/msg_q.c +++ b/kernel/msg_q.c @@ -20,6 +20,7 @@ #include #include #include +#include extern struct k_msgq _k_msgq_list_start[]; extern struct k_msgq _k_msgq_list_end[]; diff --git a/kernel/mutex.c b/kernel/mutex.c index 711ad7fae7e..22b9ff9c45c 100644 --- a/kernel/mutex.c +++ b/kernel/mutex.c @@ -36,6 +36,7 @@ #include #include #include +#include #define RECORD_STATE_CHANGE(mutex) do { } while ((0)) #define RECORD_CONFLICT(mutex) do { } while ((0)) diff --git a/kernel/pipes.c b/kernel/pipes.c index ff8f142a9f4..b1eb1f480d3 100644 --- a/kernel/pipes.c +++ b/kernel/pipes.c @@ -19,6 +19,7 @@ #include #include #include +#include struct k_pipe_desc { unsigned char *buffer; /* Position in src/dest buffer */ diff --git a/kernel/poll.c b/kernel/poll.c index 0cc7d06a29b..806606336aa 100644 --- a/kernel/poll.c +++ b/kernel/poll.c @@ -16,6 +16,7 @@ #include #include +#include #include #include #include diff --git a/kernel/posix/pthread_barrier.c b/kernel/posix/pthread_barrier.c index 2a40480fa7b..f4966afb872 100644 --- a/kernel/posix/pthread_barrier.c +++ b/kernel/posix/pthread_barrier.c @@ -8,6 +8,7 @@ #include #include "ksched.h" #include "wait_q.h" +#include void ready_one_thread(_wait_q_t *wq); diff --git a/kernel/posix/pthread_cond.c b/kernel/posix/pthread_cond.c index e6df9277b31..48f1a16996e 100644 --- a/kernel/posix/pthread_cond.c +++ b/kernel/posix/pthread_cond.c @@ -8,6 +8,7 @@ #include #include "ksched.h" #include "wait_q.h" +#include void ready_one_thread(_wait_q_t *wq); diff --git a/kernel/queue.c b/kernel/queue.c index 6197f22916f..ab3b2c62011 100644 --- a/kernel/queue.c +++ b/kernel/queue.c @@ -20,6 +20,7 @@ #include #include #include +#include extern struct k_queue _k_queue_list_start[]; extern struct k_queue _k_queue_list_end[]; diff --git a/kernel/sched.c b/kernel/sched.c index cbb335a1ee7..9e2dc56d915 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -11,6 +11,7 @@ #include #include #include +#include /* the only struct _kernel instance */ struct _kernel _kernel = {0}; diff --git a/kernel/sem.c b/kernel/sem.c index f3e389061dc..85d3b9423b9 100644 --- a/kernel/sem.c +++ b/kernel/sem.c @@ -27,6 +27,7 @@ #include #include #include +#include extern struct k_sem _k_sem_list_start[]; extern struct k_sem _k_sem_list_end[]; diff --git a/kernel/stack.c b/kernel/stack.c index 58eeaea69e3..d6fbdd163bc 100644 --- a/kernel/stack.c +++ b/kernel/stack.c @@ -18,6 +18,7 @@ #include #include #include +#include extern struct k_stack _k_stack_list_start[]; extern struct k_stack _k_stack_list_end[]; diff --git a/kernel/thread.c b/kernel/thread.c index 24de5031b62..8f4c148c000 100644 --- a/kernel/thread.c +++ b/kernel/thread.c @@ -24,6 +24,7 @@ #include #include #include +#include extern struct _static_thread_data _static_thread_data_list_start[]; extern struct _static_thread_data _static_thread_data_list_end[]; diff --git a/kernel/timer.c b/kernel/timer.c index 07564357d14..840b3cc7630 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -9,6 +9,7 @@ #include #include #include +#include extern struct k_timer _k_timer_list_start[]; extern struct k_timer _k_timer_list_end[]; diff --git a/tests/kernel/fatal/src/main.c b/tests/kernel/fatal/src/main.c index d5c2480366e..135c678ee48 100644 --- a/tests/kernel/fatal/src/main.c +++ b/tests/kernel/fatal/src/main.c @@ -9,6 +9,7 @@ #include #include #include +#include #if defined(CONFIG_X86) && defined(CONFIG_X86_MMU) #define STACKSIZE (8192)