Mike Kelly, le sam. 26 sept. 2026 23:28:40 +0100, a ecrit:
> Also generalised a small number of static functions within biosmem.c
> to support deferred multiboot2 implementation.
> ---
> i386/i386at/biosmem.c | 22 ++++++++++++++--------
> i386/i386at/biosmem.h | 4 +++-
> i386/i386at/model_dep.c | 6 +++++-
> 3 files changed, 22 insertions(+), 10 deletions(-)
>
> diff --git a/i386/i386at/biosmem.c b/i386/i386at/biosmem.c
> index 99af593f..0e87ce08 100644
> --- a/i386/i386at/biosmem.c
> +++ b/i386/i386at/biosmem.c
> @@ -797,15 +797,21 @@ biosmem_xen_bootstrap(void)
> #else /* MACH_HYP */
>
> void __boot
> -biosmem_bootstrap(const struct multiboot_raw_info *mbi)
> +biosmem_mb1_bootstrap(const struct multiboot_raw_info *mbi)
> {
> if (mbi->flags & MULTIBOOT_LOADER_MMAP)
> biosmem_map_build(mbi);
> else
> - biosmem_map_build_simple(mbi);
> + biosmem_map_build_simple(mbi->mem_lower, mbi->mem_upper);
>
> biosmem_bootstrap_common();
> - biosmem_setup_allocator(mbi);
> + biosmem_setup_allocator(mbi->mem_upper);
> +}
> +
> +void __boot
> +biosmem_mb2_bootstrap(const struct multiboot2_raw_info* mbi)
> +{
> + (void)mbi;
Here as well, better make it abort already for now.
Samuel
