:: commit 5b51d110ca3c59124f4baacc6c7f1329c0ee3fa8

diff --git a/stage23/drivers/gop.c b/stage23/drivers/gop.c
index 52b2af10..f31fc088 100644
--- a/stage23/drivers/gop.c
+++ b/stage23/drivers/gop.c
@@ -125,7 +125,7 @@ static bool try_mode(struct fb_info *ret, size_t mode, int width, int height, in
 
 #define INVALID_PRESET_MODE 0xffffffff
 
-static size_t preset_mode = INVALID_PRESET_MODE;
+static no_unwind size_t preset_mode = INVALID_PRESET_MODE;
 
 bool init_gop(struct fb_info *ret,
               uint16_t target_width, uint16_t target_height, uint16_t target_bpp) {
diff --git a/stage23/lib/blib.c b/stage23/lib/blib.c
index a9f7f2f5..0e2ae840 100644
--- a/stage23/lib/blib.c
+++ b/stage23/lib/blib.c
@@ -166,7 +166,7 @@ uint32_t hex2bin(uint8_t *str, uint32_t size) {
 
 #if uefi == 1
 
-bool efi_boot_services_exited = false;
+no_unwind bool efi_boot_services_exited = false;
 
 #define EFI_COPY_MAX_ENTRIES 512
 
diff --git a/stage23/lib/term.s2.c b/stage23/lib/term.s2.c
index c81dae38..6e232c96 100644
--- a/stage23/lib/term.s2.c
+++ b/stage23/lib/term.s2.c
@@ -11,7 +11,7 @@
 // Tries to implement this standard for terminfo
 // https://man7.org/linux/man-pages/man4/console_codes.4.html
 
-int current_video_mode = -1;
+no_unwind int current_video_mode = -1;
 int term_backend = NOT_READY;
 size_t term_rows, term_cols;
 bool term_runtime = false;