@@ -23,10 +23,10 @@ __weak uint8_t x86_cpu_loapics[] = { 0, 1, 2, 3 };
2323
2424extern 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
3131extern uint8_t z_x86_nmi_stack [];
3232extern 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};
0 commit comments