diff options
| author | Roland McGrath <roland@gnu.org> | 2001-08-20 09:26:48 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2001-08-20 09:26:48 +0000 |
| commit | bf2db2b1a143ed4e38ddeb64570805131bbeee4d (patch) | |
| tree | 60d6f8632fdf7a3dfcce7893180786af94ae96c1 /kern | |
| parent | bd4568df4e4ebfcd333a36c44afd58a8717a8722 (diff) | |
2001-08-18 Roland McGrath <roland@frob.com>
* i386/i386at/model_dep.c (boot_info): Define a struct, not a pointer.
(c_boot_entry): Copy the contents into it rather than setting the ptr.
(c_boot_entry, init_alloc_aligned, pmap_valid_page, mem_size_init):
Update uses.
(init_alloc_aligned): Don't need to skip the boot_info memory.
* kern/bootstrap.c (boot_info): Update decl.
(bootstrap_create): Update uses.
Diffstat (limited to 'kern')
| -rw-r--r-- | kern/bootstrap.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kern/bootstrap.c b/kern/bootstrap.c index 159276b..39a039d 100644 --- a/kern/bootstrap.c +++ b/kern/bootstrap.c @@ -57,7 +57,7 @@ static mach_port_t boot_device_port; /* local name */ static mach_port_t boot_host_port; /* local name */ -extern struct multiboot_info *boot_info; +extern struct multiboot_info boot_info; extern char *kernel_cmdline; static void user_bootstrap(); /* forward */ @@ -87,12 +87,12 @@ void bootstrap_create() { struct multiboot_module *bmod; - if (!(boot_info->flags & MULTIBOOT_MODS) - || (boot_info->mods_count == 0)) + if (!(boot_info.flags & MULTIBOOT_MODS) + || (boot_info.mods_count == 0)) panic("No bootstrap code loaded with the kernel!"); - if (boot_info->mods_count > 1) + if (boot_info.mods_count > 1) printf("Warning: only one boot module currently used by Mach\n"); - bmod = (struct multiboot_module *)phystokv(boot_info->mods_addr); + bmod = (struct multiboot_module *)phystokv(boot_info.mods_addr); bootstrap_exec((void*)phystokv(bmod->mod_start)); /* XXX at this point, we could free all the memory used |