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

stivale: Exit boot services in the right spot

This commit is contained in:
mintsuki 2021-03-10 03:09:42 +01:00
parent ab441fecda
commit 8bcbaa48c9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
stage23/protos/stivale.c
View File

@ -191,6 +191,10 @@ void stivale_load(char *config, char *cmdline) {
stivale_struct.fb_blue_mask_shift = fbinfo.blue_mask_shift; stivale_struct.fb_blue_mask_shift = fbinfo.blue_mask_shift;
} }
#if defined (uefi)
efi_exit_boot_services();
#endif
bool want_5lv = level5pg && (stivale_hdr.flags & (1 << 1)); bool want_5lv = level5pg && (stivale_hdr.flags & (1 << 1));
pagemap_t pagemap = stivale_build_pagemap(want_5lv); pagemap_t pagemap = stivale_build_pagemap(want_5lv);
@ -200,10 +204,6 @@ void stivale_load(char *config, char *cmdline) {
stivale_struct.memory_map_entries = (uint64_t)memmap_entries; stivale_struct.memory_map_entries = (uint64_t)memmap_entries;
stivale_struct.memory_map_addr = (uint64_t)(size_t)memmap; stivale_struct.memory_map_addr = (uint64_t)(size_t)memmap;
#if defined (uefi)
efi_exit_boot_services();
#endif
stivale_spinup(bits, want_5lv, &pagemap, stivale_spinup(bits, want_5lv, &pagemap,
entry_point, &stivale_struct, stivale_hdr.stack); entry_point, &stivale_struct, stivale_hdr.stack);
} }