Merge branch 'rust-osdev:main' into master

Author: kennystrawnmusic

uefi/src/main.rs

@@ -138,7 +138,9 @@ fn main_inner(image: Handle, mut st: SystemTable<Boot>) -> Status {
     );
 
     log::trace!("exiting boot services");
-    let (system_table, memory_map) = st.exit_boot_services();
+    let (system_table, mut memory_map) = st.exit_boot_services();
+
+    memory_map.sort();
 
     let mut frame_allocator =
         LegacyFrameAllocator::new(memory_map.entries().copied().map(UefiMemoryDescriptor));