From f6fb634b89b3542a3e4a58ab8d8e2891f5efa015 Mon Sep 17 00:00:00 2001 From: Andrew Boie Date: Sat, 21 Sep 2019 16:30:51 -0700 Subject: [PATCH] kernel: rename kernel_arch_init() This is part of the core kernel -> architecture interface and has been renamed z_arch_kernel_init(). Signed-off-by: Andrew Boie --- arch/arc/include/kernel_arch_func.h | 2 +- arch/arm/core/cpu_idle.S | 2 +- arch/arm/include/kernel_arch_func.h | 2 +- arch/nios2/include/kernel_arch_func.h | 2 +- arch/posix/include/kernel_arch_func.h | 2 +- arch/riscv/include/kernel_arch_func.h | 2 +- arch/x86/Kconfig | 2 +- arch/x86/core/ia32/x86_mmu.c | 2 +- arch/x86/include/ia32/kernel_arch_func.h | 2 +- arch/x86/include/intel64/kernel_arch_func.h | 2 +- arch/x86_64/include/kernel_arch_func.h | 2 +- arch/xtensa/include/kernel_arch_func.h | 2 +- kernel/init.c | 2 +- soc/xtensa/esp32/soc.c | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/arch/arc/include/kernel_arch_func.h b/arch/arc/include/kernel_arch_func.h index d6433bec393..206a14e908b 100644 --- a/arch/arc/include/kernel_arch_func.h +++ b/arch/arc/include/kernel_arch_func.h @@ -44,7 +44,7 @@ static ALWAYS_INLINE _cpu_t *z_arch_curr_cpu(void) #endif } -static ALWAYS_INLINE void kernel_arch_init(void) +static ALWAYS_INLINE void z_arch_kernel_init(void) { z_irq_setup(); _current_cpu->irq_stack = diff --git a/arch/arm/core/cpu_idle.S b/arch/arm/core/cpu_idle.S index 8933e8ae1aa..4f326ea5729 100644 --- a/arch/arm/core/cpu_idle.S +++ b/arch/arm/core/cpu_idle.S @@ -37,7 +37,7 @@ GTEXT(z_arch_cpu_atomic_idle) * * @brief Initialization of CPU idle * - * Only called by kernel_arch_init(). Sets SEVONPEND bit once for the system's + * Only called by z_arch_kernel_init(). Sets SEVONPEND bit once for the system's * duration. * * @return N/A diff --git a/arch/arm/include/kernel_arch_func.h b/arch/arm/include/kernel_arch_func.h index 77233722a10..53ae0e58668 100644 --- a/arch/arm/include/kernel_arch_func.h +++ b/arch/arm/include/kernel_arch_func.h @@ -34,7 +34,7 @@ extern void z_arch_configure_static_mpu_regions(void); extern void z_arch_configure_dynamic_mpu_regions(struct k_thread *thread); #endif /* CONFIG_ARM_MPU */ -static ALWAYS_INLINE void kernel_arch_init(void) +static ALWAYS_INLINE void z_arch_kernel_init(void) { z_InterruptStackSetup(); z_ExcSetup(); diff --git a/arch/nios2/include/kernel_arch_func.h b/arch/nios2/include/kernel_arch_func.h index 65407121b56..7580d07c46c 100644 --- a/arch/nios2/include/kernel_arch_func.h +++ b/arch/nios2/include/kernel_arch_func.h @@ -26,7 +26,7 @@ extern "C" { #ifndef _ASMLANGUAGE -static ALWAYS_INLINE void kernel_arch_init(void) +static ALWAYS_INLINE void z_arch_kernel_init(void) { _kernel.irq_stack = Z_THREAD_STACK_BUFFER(_interrupt_stack) + CONFIG_ISR_STACK_SIZE; diff --git a/arch/posix/include/kernel_arch_func.h b/arch/posix/include/kernel_arch_func.h index 7726bd2b2d8..b405d9b30b0 100644 --- a/arch/posix/include/kernel_arch_func.h +++ b/arch/posix/include/kernel_arch_func.h @@ -36,7 +36,7 @@ void z_arch_switch_to_main_thread(struct k_thread *main_thread, * * @return N/A */ -static inline void kernel_arch_init(void) +static inline void z_arch_kernel_init(void) { /* Nothing to be done */ } diff --git a/arch/riscv/include/kernel_arch_func.h b/arch/riscv/include/kernel_arch_func.h index 3b106581de3..e388b88d904 100644 --- a/arch/riscv/include/kernel_arch_func.h +++ b/arch/riscv/include/kernel_arch_func.h @@ -22,7 +22,7 @@ extern "C" { #endif #ifndef _ASMLANGUAGE -static ALWAYS_INLINE void kernel_arch_init(void) +static ALWAYS_INLINE void z_arch_kernel_init(void) { _kernel.irq_stack = Z_THREAD_STACK_BUFFER(_interrupt_stack) + CONFIG_ISR_STACK_SIZE; diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 9967aa7224e..2432981ce1f 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -151,7 +151,7 @@ config X86_VERY_EARLY_CONSOLE Non-emulated X86 devices often require special hardware to attach a debugger, which may not be easily available. This option adds a very minimal serial driver which gets initialized at the very - beginning of z_cstart(), via kernel_arch_init(). This driver enables + beginning of z_cstart(), via z_arch_kernel_init(). This driver enables printk to emit messages to the 16550 UART port 0 instance in device tree. This mini-driver assumes I/O to the UART is done via ports. diff --git a/arch/x86/core/ia32/x86_mmu.c b/arch/x86/core/ia32/x86_mmu.c index a1cc7088bdb..ec6ba60eaf6 100644 --- a/arch/x86/core/ia32/x86_mmu.c +++ b/arch/x86/core/ia32/x86_mmu.c @@ -506,7 +506,7 @@ static void add_mmu_region(struct x86_mmu_pdpt *pdpt, struct mmu_region *rgn, extern struct mmu_region z_x86_mmulist_start[]; extern struct mmu_region z_x86_mmulist_end[]; -/* Called from x86's kernel_arch_init() */ +/* Called from x86's z_arch_kernel_init() */ void z_x86_paging_init(void) { size_t pages_free; diff --git a/arch/x86/include/ia32/kernel_arch_func.h b/arch/x86/include/ia32/kernel_arch_func.h index f2c262e5e11..12ae84ad6c1 100644 --- a/arch/x86/include/ia32/kernel_arch_func.h +++ b/arch/x86/include/ia32/kernel_arch_func.h @@ -41,7 +41,7 @@ void z_x86_paging_init(void); * * @return N/A */ -static inline void kernel_arch_init(void) +static inline void z_arch_kernel_init(void) { /* No-op on this arch */ } diff --git a/arch/x86/include/intel64/kernel_arch_func.h b/arch/x86/include/intel64/kernel_arch_func.h index 3ba2d6450f7..f9639c3ba6a 100644 --- a/arch/x86/include/intel64/kernel_arch_func.h +++ b/arch/x86/include/intel64/kernel_arch_func.h @@ -10,7 +10,7 @@ extern void z_arch_switch(void *switch_to, void **switched_from); -static inline void kernel_arch_init(void) +static inline void z_arch_kernel_init(void) { /* nothing */; } diff --git a/arch/x86_64/include/kernel_arch_func.h b/arch/x86_64/include/kernel_arch_func.h index 4b21e8b24dc..a60254af8e5 100644 --- a/arch/x86_64/include/kernel_arch_func.h +++ b/arch/x86_64/include/kernel_arch_func.h @@ -9,7 +9,7 @@ #include #include -static inline void kernel_arch_init(void) +static inline void z_arch_kernel_init(void) { /* This is a noop, we already took care of things before * z_cstart() is entered diff --git a/arch/xtensa/include/kernel_arch_func.h b/arch/xtensa/include/kernel_arch_func.h index 6a02fbf35be..b5315b59a14 100644 --- a/arch/xtensa/include/kernel_arch_func.h +++ b/arch/xtensa/include/kernel_arch_func.h @@ -61,7 +61,7 @@ static ALWAYS_INLINE _cpu_t *z_arch_curr_cpu(void) * * @return N/A */ -static ALWAYS_INLINE void kernel_arch_init(void) +static ALWAYS_INLINE void z_arch_kernel_init(void) { _cpu_t *cpu0 = &_kernel.cpus[0]; diff --git a/kernel/init.c b/kernel/init.c index 2a2339eceed..21e5456f800 100644 --- a/kernel/init.c +++ b/kernel/init.c @@ -493,7 +493,7 @@ FUNC_NORETURN void z_cstart(void) } /* perform any architecture-specific initialization */ - kernel_arch_init(); + z_arch_kernel_init(); #ifdef CONFIG_MULTITHREADING struct k_thread dummy_thread = { diff --git a/soc/xtensa/esp32/soc.c b/soc/xtensa/esp32/soc.c index daf3975cd94..e6e18c114b9 100644 --- a/soc/xtensa/esp32/soc.c +++ b/soc/xtensa/esp32/soc.c @@ -64,7 +64,7 @@ void __attribute__((section(".iram1"))) __start(void) /* Initialize the architecture CPU pointer. Some of the * initialization code wants a valid _current before - * kernel_arch_init() is invoked. + * z_arch_kernel_init() is invoked. */ __asm__ volatile("wsr.MISC0 %0; rsync" : : "r"(&_kernel.cpus[0]));