Skip to content

Commit 3457380

Browse files
finikorgjhedberg
authored andcommitted
arch: x86_64: Rename _exception_stack to z_x86_exception_stack
Rename stack name according to MISRA-C standard. Signed-off-by: Andrei Emeltchenko <[email protected]>
1 parent a4dbb51 commit 3457380

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

arch/x86/core/intel64/cpu.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ __weak uint8_t x86_cpu_loapics[] = { 0, 1, 2, 3 };
2323

2424
extern char x86_ap_start[]; /* AP entry point in locore.S */
2525

26-
extern uint8_t _exception_stack[];
27-
extern uint8_t _exception_stack1[];
28-
extern uint8_t _exception_stack2[];
29-
extern uint8_t _exception_stack3[];
26+
extern uint8_t z_x86_exception_stack[];
27+
extern uint8_t z_x86_exception_stack1[];
28+
extern uint8_t z_x86_exception_stack2[];
29+
extern uint8_t z_x86_exception_stack3[];
3030

3131
extern uint8_t z_x86_nmi_stack[];
3232
extern uint8_t z_x86_nmi_stack1[];
@@ -46,7 +46,7 @@ struct x86_tss64 tss0 = {
4646
.ist2 = (uint64_t) z_x86_trampoline_stack + Z_X86_TRAMPOLINE_STACK_SIZE,
4747
#endif
4848
.ist6 = (uint64_t) z_x86_nmi_stack + CONFIG_X86_EXCEPTION_STACK_SIZE,
49-
.ist7 = (uint64_t) _exception_stack + CONFIG_X86_EXCEPTION_STACK_SIZE,
49+
.ist7 = (uint64_t) z_x86_exception_stack + CONFIG_X86_EXCEPTION_STACK_SIZE,
5050
.iomapb = 0xFFFF,
5151
.cpu = &(_kernel.cpus[0])
5252
};
@@ -58,7 +58,7 @@ struct x86_tss64 tss1 = {
5858
.ist2 = (uint64_t) z_x86_trampoline_stack1 + Z_X86_TRAMPOLINE_STACK_SIZE,
5959
#endif
6060
.ist6 = (uint64_t) z_x86_nmi_stack1 + CONFIG_X86_EXCEPTION_STACK_SIZE,
61-
.ist7 = (uint64_t) _exception_stack1 + CONFIG_X86_EXCEPTION_STACK_SIZE,
61+
.ist7 = (uint64_t) z_x86_exception_stack1 + CONFIG_X86_EXCEPTION_STACK_SIZE,
6262
.iomapb = 0xFFFF,
6363
.cpu = &(_kernel.cpus[1])
6464
};
@@ -71,7 +71,7 @@ struct x86_tss64 tss2 = {
7171
.ist2 = (uint64_t) z_x86_trampoline_stack2 + Z_X86_TRAMPOLINE_STACK_SIZE,
7272
#endif
7373
.ist6 = (uint64_t) z_x86_nmi_stack2 + CONFIG_X86_EXCEPTION_STACK_SIZE,
74-
.ist7 = (uint64_t) _exception_stack2 + CONFIG_X86_EXCEPTION_STACK_SIZE,
74+
.ist7 = (uint64_t) z_x86_exception_stack2 + CONFIG_X86_EXCEPTION_STACK_SIZE,
7575
.iomapb = 0xFFFF,
7676
.cpu = &(_kernel.cpus[2])
7777
};
@@ -84,7 +84,7 @@ struct x86_tss64 tss3 = {
8484
.ist2 = (uint64_t) z_x86_trampoline_stack3 + Z_X86_TRAMPOLINE_STACK_SIZE,
8585
#endif
8686
.ist6 = (uint64_t) z_x86_nmi_stack3 + CONFIG_X86_EXCEPTION_STACK_SIZE,
87-
.ist7 = (uint64_t) _exception_stack3 + CONFIG_X86_EXCEPTION_STACK_SIZE,
87+
.ist7 = (uint64_t) z_x86_exception_stack3 + CONFIG_X86_EXCEPTION_STACK_SIZE,
8888
.iomapb = 0xFFFF,
8989
.cpu = &(_kernel.cpus[3])
9090
};

arch/x86/core/intel64/locore.S

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1066,19 +1066,19 @@ gdt80: /* LGDT descriptor for long mode */
10661066
* Known-good stack for handling CPU exceptions.
10671067
*/
10681068

1069-
.global _exception_stack
1069+
.global z_x86_exception_stack
10701070
.align 16
1071-
_exception_stack:
1071+
z_x86_exception_stack:
10721072
.fill CONFIG_X86_EXCEPTION_STACK_SIZE, 1, 0xAA
10731073
.global z_x86_nmi_stack
10741074
.align 16
10751075
z_x86_nmi_stack:
10761076
.fill CONFIG_X86_EXCEPTION_STACK_SIZE, 1, 0xAA
10771077

10781078
#if CONFIG_MP_NUM_CPUS > 1
1079-
.global _exception_stack1
1079+
.global z_x86_exception_stack1
10801080
.align 16
1081-
_exception_stack1:
1081+
z_x86_exception_stack1:
10821082
.fill CONFIG_X86_EXCEPTION_STACK_SIZE, 1, 0xAA
10831083
.global z_x86_nmi_stack1
10841084
.align 16
@@ -1087,9 +1087,9 @@ z_x86_nmi_stack1:
10871087
#endif
10881088

10891089
#if CONFIG_MP_NUM_CPUS > 2
1090-
.global _exception_stack2
1090+
.global z_x86_exception_stack2
10911091
.align 16
1092-
_exception_stack2:
1092+
z_x86_exception_stack2:
10931093
.fill CONFIG_X86_EXCEPTION_STACK_SIZE, 1, 0xAA
10941094
.global z_x86_nmi_stack2
10951095
.align 16
@@ -1098,9 +1098,9 @@ z_x86_nmi_stack2:
10981098
#endif
10991099

11001100
#if CONFIG_MP_NUM_CPUS > 3
1101-
.global _exception_stack3
1101+
.global z_x86_exception_stack3
11021102
.align 16
1103-
_exception_stack3:
1103+
z_x86_exception_stack3:
11041104
.fill CONFIG_X86_EXCEPTION_STACK_SIZE, 1, 0xAA
11051105
.global z_x86_nmi_stack3
11061106
.align 16

0 commit comments

Comments
 (0)