zephyrproject-rtos · stephanosio · Oct 23, 2019
diff --git a/arch/arm/core/cortex_m/fault.c b/arch/arm/core/cortex_m/fault.c
@@ -11,11 +11,8 @@
  * Common fault handler for ARM Cortex-M processors.
  */
 
-#include <toolchain.h>
-#include <linker/sections.h>
-
 #include <kernel.h>
-#include <kernel_structs.h>
+#include <kernel_arch.h>
 #include <inttypes.h>
 #include <exc_handle.h>
 #include <logging/log.h>

diff --git a/arch/arm/core/cortex_r/fault.c b/arch/arm/core/cortex_r/fault.c
@@ -5,7 +5,7 @@
  */
 
 #include <kernel.h>
-#include <kernel_structs.h>
+#include <kernel_arch.h>
 
 /**
  *

diff --git a/arch/arm/core/fatal.c b/arch/arm/core/fatal.c
@@ -17,7 +17,7 @@
 #include <inttypes.h>
 
 #include <kernel.h>
-#include <kernel_structs.h>
+#include <kernel_arch.h>
 #include <logging/log.h>
 LOG_MODULE_DECLARE(os);
 

diff --git a/arch/arm/core/offsets/offsets.c b/arch/arm/core/offsets/offsets.c
@@ -23,6 +23,8 @@
  */
 
 #include <gen_offset.h>
+#include <kernel.h>
+#include <kernel_arch_data.h>
 #include <kernel_structs.h>
 #include <kernel_offsets.h>
 

diff --git a/arch/arm/core/swap.c b/arch/arm/core/swap.c
@@ -6,7 +6,7 @@
 
 #include <kernel.h>
 #include <toolchain.h>
-#include <kernel_structs.h>
+#include <kernel_arch.h>
 
 #ifdef CONFIG_EXECUTION_BENCHMARKING
 extern void read_timer_start_of_swap(void);

diff --git a/arch/arm/core/thread.c b/arch/arm/core/thread.c
@@ -14,7 +14,7 @@
 
 #include <kernel.h>
 #include <toolchain.h>
-#include <kernel_structs.h>
+#include <kernel_arch.h>
 #include <wait_q.h>
 
 #ifdef CONFIG_USERSPACE

diff --git a/arch/arm/include/kernel_arch_func.h b/arch/arm/include/kernel_arch_func.h
@@ -22,6 +22,8 @@
 #ifndef ZEPHYR_ARCH_ARM_INCLUDE_KERNEL_ARCH_FUNC_H_
 #define ZEPHYR_ARCH_ARM_INCLUDE_KERNEL_ARCH_FUNC_H_
 
+#include <kernel_arch_data.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/arch/nios2/core/crt0.S b/arch/nios2/core/crt0.S
@@ -4,7 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel_structs.h>
+#include <toolchain.h>
+#include <linker/sections.h>
 
 /* exports */
 GTEXT(__start)

diff --git a/arch/nios2/core/exception.S b/arch/nios2/core/exception.S
@@ -4,7 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel_structs.h>
+#include <toolchain.h>
+#include <linker/sections.h>
 #include <offsets_short.h>
 
 /* exports */

diff --git a/arch/nios2/core/prep_c.c b/arch/nios2/core/prep_c.c
@@ -16,11 +16,7 @@
  * initialization is performed.
  */
 
-#include <zephyr/types.h>
-#include <toolchain.h>
-#include <linker/linker-defs.h>
-#include <kernel_structs.h>
-#include <kernel_internal.h>
+#include <kernel_arch.h>
 
 /**
  *

diff --git a/arch/nios2/core/reset.S b/arch/nios2/core/reset.S
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <arch/cpu.h>
-#include <kernel_structs.h>
+#include <toolchain.h>
 #include <offsets_short.h>
+#include <arch/cpu.h>
 
 GTEXT(__start)
 
diff --git a/arch/nios2/core/swap.S b/arch/nios2/core/swap.S
@@ -4,7 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel_structs.h>
+#include <toolchain.h>
+#include <linker/sections.h>
 #include <offsets_short.h>
 
 /* exports */

diff --git a/arch/nios2/include/kernel_arch_func.h b/arch/nios2/include/kernel_arch_func.h
@@ -20,6 +20,8 @@
 #ifndef ZEPHYR_ARCH_NIOS2_INCLUDE_KERNEL_ARCH_FUNC_H_
 #define ZEPHYR_ARCH_NIOS2_INCLUDE_KERNEL_ARCH_FUNC_H_
 
+#include <kernel_arch_data.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/arch/riscv/core/irq_manage.c b/arch/riscv/core/irq_manage.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <toolchain.h>
-#include <kernel_structs.h>
+#include <kernel.h>
+#include <kernel_arch.h>
 #include <logging/log.h>
 LOG_MODULE_DECLARE(os);
 

diff --git a/arch/riscv/core/isr.S b/arch/riscv/core/isr.S
@@ -7,8 +7,8 @@
 
 #include <toolchain.h>
 #include <linker/sections.h>
-#include <kernel_structs.h>
 #include <offsets_short.h>
+#include <arch/cpu.h>
 
 /* imports */
 GDATA(_sw_isr_table)

diff --git a/arch/riscv/core/reset.S b/arch/riscv/core/reset.S
@@ -5,7 +5,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel_structs.h>
+#include <toolchain.h>
+#include <linker/sections.h>
 
 /* exports */
 GTEXT(__initialize)

diff --git a/arch/riscv/core/swap.S b/arch/riscv/core/swap.S
@@ -4,9 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <irq.h>
-#include <kernel_structs.h>
+#include <toolchain.h>
+#include <linker/sections.h>
 #include <offsets_short.h>
+#include <arch/cpu.h>
 
 /* exports */
 GTEXT(z_arch_swap)

diff --git a/arch/riscv/include/kernel_arch_func.h b/arch/riscv/include/kernel_arch_func.h
@@ -15,7 +15,7 @@
 #ifndef ZEPHYR_ARCH_RISCV_INCLUDE_KERNEL_ARCH_FUNC_H_
 #define ZEPHYR_ARCH_RISCV_INCLUDE_KERNEL_ARCH_FUNC_H_
 
-#include <soc.h>
+#include <kernel_arch_data.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/arch/x86/core/ia32/cache_s.S b/arch/x86/core/ia32/cache_s.S
@@ -10,6 +10,8 @@
  * This module contains functions for manipulating caches.
  */
 
+#include <toolchain.h>
+#include <linker/sections.h>
 #include <arch/x86/ia32/asm.h>
 
 #ifndef CONFIG_CLFLUSH_INSTRUCTION_SUPPORTED

diff --git a/arch/x86/core/ia32/crt0.S b/arch/x86/core/ia32/crt0.S
@@ -11,6 +11,8 @@
  * after having been loaded into RAM.
  */
 
+#include <toolchain.h>
+#include <linker/sections.h>
 #include <arch/x86/ia32/asm.h>
 #include <arch/x86/msr.h>
 #include <kernel_arch_data.h>

diff --git a/arch/x86/core/ia32/excstub.S b/arch/x86/core/ia32/excstub.S
@@ -14,10 +14,11 @@
  * and exiting a C exception handler.
  */
 
-#include <kernel_structs.h>
+#include <toolchain.h>
+#include <linker/sections.h>
+#include <offsets_short.h>
 #include <arch/x86/ia32/asm.h>
 #include <arch/x86/ia32/arch.h> /* For MK_ISR_NAME */
-#include <offsets_short.h>
 
 
 	/* exports (internal APIs) */

diff --git a/arch/x86/core/ia32/fatal.c b/arch/x86/core/ia32/fatal.c
@@ -13,7 +13,7 @@
 #include <linker/sections.h>
 
 #include <kernel.h>
-#include <kernel_structs.h>
+#include <kernel_arch.h>
 #include <drivers/interrupt_controller/sysapic.h>
 #include <arch/x86/ia32/segmentation.h>
 #include <ia32/exception.h>

diff --git a/arch/x86/core/ia32/float.c b/arch/x86/core/ia32/float.c
@@ -43,8 +43,7 @@
  * to enable FP register sharing on its behalf.
  */
 
-#include <kernel_structs.h>
-#include <toolchain.h>
+#include <kernel_arch.h>
 
 /* SSE control/status register default value (used by assembler code) */
 extern u32_t _sse_mxcsr_default_value;

diff --git a/arch/x86/core/ia32/intstub.S b/arch/x86/core/ia32/intstub.S
@@ -14,9 +14,10 @@
  * entering and exiting a C interrupt handler.
  */
 
-#include <kernel_structs.h>
-#include <arch/x86/ia32/asm.h>
+#include <toolchain.h>
+#include <linker/sections.h>
 #include <offsets_short.h>
+#include <arch/x86/ia32/asm.h>
 #include <arch/cpu.h>
 #include <drivers/interrupt_controller/sysapic.h>
 

diff --git a/arch/x86/core/ia32/swap.S b/arch/x86/core/ia32/swap.S
@@ -11,9 +11,12 @@
  * This module implements the z_arch_swap() routine for the IA-32 architecture.
  */
 
-#include <kernel_structs.h>
-#include <arch/x86/ia32/asm.h>
+#include <toolchain.h>
+#include <linker/sections.h>
 #include <offsets_short.h>
+#include <kernel.h>
+#include <kernel_arch_data.h>
+#include <arch/x86/ia32/asm.h>
 
 	/* exports (internal APIs) */
 

diff --git a/arch/x86/core/ia32/userspace.S b/arch/x86/core/ia32/userspace.S
@@ -4,10 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel_structs.h>
+#include <toolchain.h>
+#include <linker/sections.h>
+#include <offsets_short.h>
 #include <arch/x86/ia32/asm.h>
 #include <arch/cpu.h>
-#include <offsets_short.h>
 #include <syscall.h>
 
 /* Exports */

diff --git a/arch/x86/core/ia32/x86_mmu.c b/arch/x86/core/ia32/x86_mmu.c
@@ -8,7 +8,7 @@
 #include <arch/x86/mmustructs.h>
 #include <linker/linker-defs.h>
 #include <kernel_internal.h>
-#include <kernel_structs.h>
+#include <kernel_arch.h>
 #include <init.h>
 #include <ctype.h>
 #include <string.h>

diff --git a/arch/x86/core/prep_c.c b/arch/x86/core/prep_c.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel_structs.h>
+#include <kernel_arch.h>
 #include <arch/x86/acpi.h>
 #include <arch/x86/multiboot.h>
 

diff --git a/arch/x86/include/ia32/kernel_arch_func.h b/arch/x86/include/ia32/kernel_arch_func.h
@@ -12,7 +12,7 @@
 
 #ifndef _ASMLANGUAGE
 
-#include <stddef.h> /* For size_t */
+#include <kernel_arch_data.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/arch/x86/include/intel64/kernel_arch_func.h b/arch/x86/include/intel64/kernel_arch_func.h
@@ -6,7 +6,7 @@
 #ifndef ZEPHYR_ARCH_X86_INCLUDE_INTEL64_KERNEL_ARCH_FUNC_H_
 #define ZEPHYR_ARCH_X86_INCLUDE_INTEL64_KERNEL_ARCH_FUNC_H_
 
-#include <kernel_structs.h>
+#include <kernel_arch_data.h>
 
 #ifndef _ASMLANGUAGE
 

diff --git a/arch/xtensa/core/offsets/offsets.c b/arch/xtensa/core/offsets/offsets.c
@@ -27,8 +27,8 @@
 
 /* list of headers that define whose structure offsets will be generated */
 
+#include <kernel_arch_data.h>
 #include <kernel_structs.h>
-
 #include <kernel_offsets.h>
 
 /* Xtensa-specific k_thread structure member offsets */

diff --git a/include/arch/arm/irq.h b/include/arch/arm/irq.h
@@ -14,6 +14,7 @@
 #ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_IRQ_H_
 #define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_IRQ_H_
 
+#include <kernel_structs.h>
 #include <irq.h>
 #include <sw_isr_table.h>
 #include <stdbool.h>

diff --git a/include/sys/mutex.h b/include/sys/mutex.h
@@ -110,7 +110,7 @@ static inline int sys_mutex_unlock(struct sys_mutex *mutex)
 
 #else
 #include <kernel.h>
-#include <kernel_structs.h>
+#include <kernel_arch.h>
 
 struct sys_mutex {
 	struct k_mutex kernel_mutex;

diff --git a/kernel/errno.c b/kernel/errno.c
@@ -12,8 +12,8 @@
  * context switching.
  */
 
-#include <kernel_structs.h>
-#include <syscall_handler.h>
+#include <kernel.h>
+#include <kernel_arch.h>
 
 /*
  * Define _k_neg_eagain for use in assembly files as errno.h is
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ @@
      */
     #include <kernel.h>
-    #include <kernel_structs.h>
+    #include <kernel_arch.h>
     /**
      *
@@ Expand Down @@