From 468cd4d98f627a7d43b8e1cd29aac93982b4a8e2 Mon Sep 17 00:00:00 2001 From: "Charles E. Youse" Date: Wed, 24 Jul 2019 12:30:14 -0700 Subject: [PATCH] arch/x86: add support for CONFIG_STACK_SENTINEL Apparently I missed the arch-dependent bit of this. Fixed. Signed-off-by: Charles E. Youse --- arch/x86/core/intel64/locore.S | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/x86/core/intel64/locore.S b/arch/x86/core/intel64/locore.S index e0936836026..2c1a4ad5fe3 100644 --- a/arch/x86/core/intel64/locore.S +++ b/arch/x86/core/intel64/locore.S @@ -509,7 +509,11 @@ irq_dispatch: cli subq $CONFIG_ISR_STACK_SIZE, ist1 decl _kernel_offset_to_nested(%rsi) - jz __resume /* not nested, just __resume (might change threads) */ + /* not nested, exit via __resume (might change threads) */ +#ifdef CONFIG_STACK_SENTINEL + call z_check_stack_sentinel +#endif + jz __resume irq_exit_nested: fxrstor (%rsp)