Aren
/
rulimine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

misc: Fix up some no_unwind globals

This commit is contained in:
mintsuki 2022-09-17 15:09:08 +02:00
parent 710757420b
commit b09b816ee2
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/lib/term.s2.c
View File

@ -5,7 +5,7 @@
#include <lib/misc.h> #include <lib/misc.h>
#include <lib/real.h> #include <lib/real.h>
no_unwind int current_video_mode = -1; int current_video_mode = -1;
int term_backend = _NOT_READY; int term_backend = _NOT_READY;
size_t term_rows, term_cols; size_t term_rows, term_cols;
bool term_runtime = false; bool term_runtime = false;

6
common/menu.c
View File

@ -536,9 +536,9 @@ static size_t print_tree(const char *shift, size_t level, size_t base_index, siz
static struct memmap_entry *rewound_memmap = NULL; static struct memmap_entry *rewound_memmap = NULL;
static size_t rewound_memmap_entries = 0; static size_t rewound_memmap_entries = 0;
static uint8_t *rewound_data; static no_unwind uint8_t *rewound_data;
#if defined (BIOS) #if defined (BIOS)
static uint8_t *rewound_s2_data; static no_unwind uint8_t *rewound_s2_data;
#endif #endif
extern symbol data_begin; extern symbol data_begin;
@ -575,6 +575,8 @@ noreturn void _menu(bool timeout_enabled) {
#endif #endif
} }
term_fallback();
if (bad_config == false) { if (bad_config == false) {
volume_iterate_parts(boot_volume, volume_iterate_parts(boot_volume,
if (!init_config_disk(_PART)) { if (!init_config_disk(_PART)) {