From f0c062df0c2a674d67af12eb5e18f22bd8412c15 Mon Sep 17 00:00:00 2001 From: Ada Christine Date: Thu, 3 Feb 2022 19:46:07 +0000 Subject: don't pass kernel boot parameters to init functions, just use an accessor --- kc/core/memory.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'kc/core/memory.c') diff --git a/kc/core/memory.c b/kc/core/memory.c index ba0ca57..2d5dd75 100644 --- a/kc/core/memory.c +++ b/kc/core/memory.c @@ -329,8 +329,10 @@ static void init_vm_node( } } -void memory_init(struct kc_boot_data *boot_data) +void memory_init(void) { + struct kc_boot_data *boot_data = get_boot_data(); + init_create_page_array( boot_data->phys_memory_map.base, boot_data->phys_memory_map.entries); @@ -339,21 +341,23 @@ void memory_init(struct kc_boot_data *boot_data) boot_data->object_space.size + (uintptr_t)boot_data->object_space.base, 1); - kputs("vm node 1\n"); + kputs("static vm node 1\n"); init_vm_node( &core_image_node, &core_image_object, &kc_image_base, object_space_head); core_image_node.object->handler = core_image_handler; - kputs("vm node 2\n"); + + kputs("static vm node 2\n"); init_vm_node( &core_vmobject_node, &core_vmobject, object_space_head, (char *)object_space_head + vm_object_space_size); core_vmobject_node.object->handler = core_vmobject_handler; - kputs("vm node 3\n"); + + kputs("static vm node 3\n"); init_vm_node(&core_pagemaps_node, NULL, vm_temp, (void *)-1); vm_next_free = (char *)object_space_head + vm_object_space_size; } -- cgit v1.3.1-1-g115d