From 0c5a6077fc569d27aeadde690810f820b3256fbd Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Wed, 23 Dec 2015 15:33:02 -0500 Subject: [PATCH] nmi: Don't try to switch onto extra stack in NMI handler The NMI could occur when already on the extra stack, which would corrupt it. Always use the current stack on an NMI to avoid this. Signed-off-by: Kevin O'Connor --- src/romlayout.S | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/romlayout.S b/src/romlayout.S index fedadfe..53cc0f5 100644 --- a/src/romlayout.S +++ b/src/romlayout.S @@ -548,7 +548,10 @@ entry_post: ENTRY_INTO32 _cfunc32flat_handle_post // Normal entry point ORG 0xe2c3 - IRQ_ENTRY 02 + .global entry_02 +entry_02: + ENTRY handle_02 // NMI handler does not switch onto extra stack + iretw ORG 0xe3fe .global entry_13_official -- 2.39.5