arch: x86_64: Rename _nmi_stack to z_x86_nmi_stack

Rename stack name according to MISRA-C standard.

Signed-off-by: Andrei Emeltchenko <[email protected]>

Author: finikorg

arch/x86/core/intel64/cpu.c

@@ -28,10 +28,10 @@ extern uint8_t _exception_stack1[];
 extern uint8_t _exception_stack2[];
 extern uint8_t _exception_stack3[];
 
-extern uint8_t _nmi_stack[];
-extern uint8_t _nmi_stack1[];
-extern uint8_t _nmi_stack2[];
-extern uint8_t _nmi_stack3[];
+extern uint8_t z_x86_nmi_stack[];
+extern uint8_t z_x86_nmi_stack1[];
+extern uint8_t z_x86_nmi_stack2[];
+extern uint8_t z_x86_nmi_stack3[];
 
 #ifdef CONFIG_X86_KPTI
 extern uint8_t z_x86_trampoline_stack[];
@@ -45,7 +45,7 @@ struct x86_tss64 tss0 = {
 #ifdef CONFIG_X86_KPTI
 	.ist2 = (uint64_t) z_x86_trampoline_stack + Z_X86_TRAMPOLINE_STACK_SIZE,
 #endif
-	.ist6 = (uint64_t) _nmi_stack + CONFIG_X86_EXCEPTION_STACK_SIZE,
+	.ist6 = (uint64_t) z_x86_nmi_stack + CONFIG_X86_EXCEPTION_STACK_SIZE,
 	.ist7 = (uint64_t) _exception_stack + CONFIG_X86_EXCEPTION_STACK_SIZE,
 	.iomapb = 0xFFFF,
 	.cpu = &(_kernel.cpus[0])
@@ -57,7 +57,7 @@ struct x86_tss64 tss1 = {
 #ifdef CONFIG_X86_KPTI
 	.ist2 = (uint64_t) z_x86_trampoline_stack1 + Z_X86_TRAMPOLINE_STACK_SIZE,
 #endif
-	.ist6 = (uint64_t) _nmi_stack1 + CONFIG_X86_EXCEPTION_STACK_SIZE,
+	.ist6 = (uint64_t) z_x86_nmi_stack1 + CONFIG_X86_EXCEPTION_STACK_SIZE,
 	.ist7 = (uint64_t) _exception_stack1 + CONFIG_X86_EXCEPTION_STACK_SIZE,
 	.iomapb = 0xFFFF,
 	.cpu = &(_kernel.cpus[1])
@@ -70,7 +70,7 @@ struct x86_tss64 tss2 = {
 #ifdef CONFIG_X86_KPTI
 	.ist2 = (uint64_t) z_x86_trampoline_stack2 + Z_X86_TRAMPOLINE_STACK_SIZE,
 #endif
-	.ist6 = (uint64_t) _nmi_stack2 + CONFIG_X86_EXCEPTION_STACK_SIZE,
+	.ist6 = (uint64_t) z_x86_nmi_stack2 + CONFIG_X86_EXCEPTION_STACK_SIZE,
 	.ist7 = (uint64_t) _exception_stack2 + CONFIG_X86_EXCEPTION_STACK_SIZE,
 	.iomapb = 0xFFFF,
 	.cpu = &(_kernel.cpus[2])
@@ -83,7 +83,7 @@ struct x86_tss64 tss3 = {
 #ifdef CONFIG_X86_KPTI
 	.ist2 = (uint64_t) z_x86_trampoline_stack3 + Z_X86_TRAMPOLINE_STACK_SIZE,
 #endif
-	.ist6 = (uint64_t) _nmi_stack3 + CONFIG_X86_EXCEPTION_STACK_SIZE,
+	.ist6 = (uint64_t) z_x86_nmi_stack3 + CONFIG_X86_EXCEPTION_STACK_SIZE,
 	.ist7 = (uint64_t) _exception_stack3 + CONFIG_X86_EXCEPTION_STACK_SIZE,
 	.iomapb = 0xFFFF,
 	.cpu = &(_kernel.cpus[3])

arch/x86/core/intel64/locore.S

@@ -1070,19 +1070,19 @@ gdt80:  /* LGDT descriptor for long mode */
 .align 16
 _exception_stack:
 	.fill CONFIG_X86_EXCEPTION_STACK_SIZE, 1, 0xAA
-.global _nmi_stack
+.global z_x86_nmi_stack
 .align 16
-_nmi_stack:
+z_x86_nmi_stack:
 	.fill CONFIG_X86_EXCEPTION_STACK_SIZE, 1, 0xAA
 
 #if CONFIG_MP_NUM_CPUS > 1
 .global _exception_stack1
 .align 16
 _exception_stack1:
 	.fill CONFIG_X86_EXCEPTION_STACK_SIZE, 1, 0xAA
-.global _nmi_stack1
+.global z_x86_nmi_stack1
 .align 16
-_nmi_stack1:
+z_x86_nmi_stack1:
 	.fill CONFIG_X86_EXCEPTION_STACK_SIZE, 1, 0xAA
 #endif
 
@@ -1091,9 +1091,9 @@ _nmi_stack1:
 .align 16
 _exception_stack2:
 	.fill CONFIG_X86_EXCEPTION_STACK_SIZE, 1, 0xAA
-.global _nmi_stack2
+.global z_x86_nmi_stack2
 .align 16
-_nmi_stack2:
+z_x86_nmi_stack2:
 	.fill CONFIG_X86_EXCEPTION_STACK_SIZE, 1, 0xAA
 #endif
 
@@ -1102,9 +1102,9 @@ _nmi_stack2:
 .align 16
 _exception_stack3:
 	.fill CONFIG_X86_EXCEPTION_STACK_SIZE, 1, 0xAA
-.global _nmi_stack3
+.global z_x86_nmi_stack3
 .align 16
-_nmi_stack3:
+z_x86_nmi_stack3:
 	.fill CONFIG_X86_EXCEPTION_STACK_SIZE, 1, 0xAA
 #endif
 

tests/arch/x86/nmi/src/main.c

@@ -17,19 +17,19 @@
 
 static volatile int int_handler_executed;
 
-extern uint8_t _nmi_stack[];
-extern uint8_t _nmi_stack1[];
-extern uint8_t _nmi_stack2[];
-extern uint8_t _nmi_stack3[];
+extern uint8_t z_x86_nmi_stack[];
+extern uint8_t z_x86_nmi_stack1[];
+extern uint8_t z_x86_nmi_stack2[];
+extern uint8_t z_x86_nmi_stack3[];
 
 uint8_t *nmi_stacks[] = {
-	_nmi_stack,
+	z_x86_nmi_stack,
 #if CONFIG_MP_NUM_CPUS > 1
-	_nmi_stack1,
+	z_x86_nmi_stack1,
 #if CONFIG_MP_NUM_CPUS > 2
-	_nmi_stack2,
+	z_x86_nmi_stack2,
 #if CONFIG_MP_NUM_CPUS > 3
-	_nmi_stack3
+	z_x86_nmi_stack3
 #endif
 #endif
 #endif