Skip to content

Commit

Permalink
arch/intel64: prase multiboot2 header before revoking the lower memory
Browse files Browse the repository at this point in the history
__revoke_low_memory() is called in intel64_lowsetup()

fixes b4b96a6 (PR apache#11758) in which the multiboot2 header was accessed
after revoking the low memory which caused page fault.

Signed-off-by: p-szafonimateusz <p-szafonimateusz@xiaomi.com>
  • Loading branch information
szafonimateusz-mi committed Feb 24, 2024
1 parent 8c4612b commit d35711f
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions arch/x86_64/src/intel64/intel64_start.c
Original file line number Diff line number Diff line change
Expand Up @@ -125,16 +125,16 @@ void __nxstart(void)
*dest++ = 0;
}

/* Low-level, pre-OS initialization */

intel64_lowsetup();

#ifdef CONFIG_ARCH_MULTIBOOT2
/* Handle multiboot2 info */

x86_64_mb2_config();
#endif

/* Low-level, pre-OS initialization */

intel64_lowsetup();

/* perform board-specific initializations */

x86_64_boardinitialize();
Expand Down

0 comments on commit d35711f

Please sign in to comment.