From 8df439b40b5e6fd03b6f6710b005d3f83a103e67 Mon Sep 17 00:00:00 2001
From: Anas Nashif <anas.nashif@intel.com>
Date: Tue, 18 Apr 2017 17:34:46 -0400
Subject: [PATCH] kernel: rename nanoArchInit->kernel_arch_init

Change-Id: I094665e583f506cc71185cb6b8630046b2d4b2f8
Signed-off-by: Anas Nashif <anas.nashif@intel.com>
---
 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/riscv32/include/kernel_arch_func.h |  2 +-
 arch/x86/core/irq_manage.c              | 11 ++++++-----
 arch/x86/include/kernel_arch_func.h     |  2 +-
 arch/xtensa/include/kernel_arch_func.h  |  2 +-
 kernel/init.c                           |  2 +-
 9 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/arch/arc/include/kernel_arch_func.h b/arch/arc/include/kernel_arch_func.h
index a717ee9c0f6..b9ca71668b1 100644
--- a/arch/arc/include/kernel_arch_func.h
+++ b/arch/arc/include/kernel_arch_func.h
@@ -31,7 +31,7 @@ extern "C" {
 #include <v2/irq.h>
 #endif
 
-static ALWAYS_INLINE void nanoArchInit(void)
+static ALWAYS_INLINE void kernel_arch_init(void)
 {
 	_irq_setup();
 }
diff --git a/arch/arm/core/cpu_idle.S b/arch/arm/core/cpu_idle.S
index 221527b9d3a..8bd67c6b3c9 100644
--- a/arch/arm/core/cpu_idle.S
+++ b/arch/arm/core/cpu_idle.S
@@ -39,7 +39,7 @@ GTEXT(k_cpu_atomic_idle)
  *
  * @brief Initialization of CPU idle
  *
- * Only called by nanoArchInit(). Sets SEVONPEND bit once for the system's
+ * Only called by kernel_arch_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 fea2aa9e2a6..1b13cb0d203 100644
--- a/arch/arm/include/kernel_arch_func.h
+++ b/arch/arm/include/kernel_arch_func.h
@@ -29,7 +29,7 @@ extern "C" {
 #ifndef _ASMLANGUAGE
 extern void _FaultInit(void);
 extern void _CpuIdleInit(void);
-static ALWAYS_INLINE void nanoArchInit(void)
+static ALWAYS_INLINE void kernel_arch_init(void)
 {
 	_InterruptStackSetup();
 	_ExcSetup();
diff --git a/arch/nios2/include/kernel_arch_func.h b/arch/nios2/include/kernel_arch_func.h
index 865e15ab5d1..076fd41596e 100644
--- a/arch/nios2/include/kernel_arch_func.h
+++ b/arch/nios2/include/kernel_arch_func.h
@@ -29,7 +29,7 @@ extern "C" {
 void k_cpu_idle(void);
 void k_cpu_atomic_idle(unsigned int key);
 
-static ALWAYS_INLINE void nanoArchInit(void)
+static ALWAYS_INLINE void kernel_arch_init(void)
 {
 	_kernel.irq_stack = _interrupt_stack + CONFIG_ISR_STACK_SIZE;
 }
diff --git a/arch/riscv32/include/kernel_arch_func.h b/arch/riscv32/include/kernel_arch_func.h
index 969fdd2a5c0..67fddf07abd 100644
--- a/arch/riscv32/include/kernel_arch_func.h
+++ b/arch/riscv32/include/kernel_arch_func.h
@@ -25,7 +25,7 @@ extern "C" {
 void k_cpu_idle(void);
 void k_cpu_atomic_idle(unsigned int key);
 
-static ALWAYS_INLINE void nanoArchInit(void)
+static ALWAYS_INLINE void kernel_arch_init(void)
 {
 	_kernel.irq_stack = _interrupt_stack + CONFIG_ISR_STACK_SIZE;
 }
diff --git a/arch/x86/core/irq_manage.c b/arch/x86/core/irq_manage.c
index 5563cb29240..524bd3fbace 100644
--- a/arch/x86/core/irq_manage.c
+++ b/arch/x86/core/irq_manage.c
@@ -26,11 +26,12 @@ extern void _SpuriousIntHandler(void *);
 extern void _SpuriousIntNoErrCodeHandler(void *);
 
 /*
- * These 'dummy' variables are used in nanoArchInit() to force the inclusion of
- * the spurious interrupt handlers. They *must* be declared in a module other
- * than the one they are used in to get around garbage collection issues and
- * warnings issued some compilers that they aren't used. Therefore care must
- * be taken if they are to be moved. See kernel_structs.h for more information.
+ * These 'dummy' variables are used in kernel_arch_init() to force the
+ * inclusion of the spurious interrupt handlers. They *must* be declared in a
+ * module other than the one they are used in to get around garbage collection
+ * issues and warnings issued some compilers that they aren't used. Therefore
+ * care must be taken if they are to be moved. See kernel_structs.h for more
+ * information.
  */
 void *_dummy_spurious_interrupt;
 void *_dummy_exception_vector_stub;
diff --git a/arch/x86/include/kernel_arch_func.h b/arch/x86/include/kernel_arch_func.h
index cd320ef97e5..d5b830e3545 100644
--- a/arch/x86/include/kernel_arch_func.h
+++ b/arch/x86/include/kernel_arch_func.h
@@ -30,7 +30,7 @@ extern "C" {
  *
  * @return N/A
  */
-static inline void nanoArchInit(void)
+static inline void kernel_arch_init(void)
 {
 	extern void *__isr___SpuriousIntHandler;
 	extern void *_dummy_spurious_interrupt;
diff --git a/arch/xtensa/include/kernel_arch_func.h b/arch/xtensa/include/kernel_arch_func.h
index d8f6285c50b..de55b2121d5 100644
--- a/arch/xtensa/include/kernel_arch_func.h
+++ b/arch/xtensa/include/kernel_arch_func.h
@@ -36,7 +36,7 @@ extern void _xt_coproc_init(void);
  *
  * @return N/A
  */
-static ALWAYS_INLINE void nanoArchInit(void)
+static ALWAYS_INLINE void kernel_arch_init(void)
 {
 	_kernel.nested = 0;
 #if XCHAL_CP_NUM > 0
diff --git a/kernel/init.c b/kernel/init.c
index c15a07e9fb5..09a4b7ed040 100644
--- a/kernel/init.c
+++ b/kernel/init.c
@@ -281,7 +281,7 @@ static void prepare_multithreading(struct k_thread *dummy_thread)
 
 	/* perform any architecture-specific initialization */
 
-	nanoArchInit();
+	kernel_arch_init();
 }
 
 static void switch_to_main_thread(void)