From d6a6c7856cf5381b542290960963f0b182cb1e2b Mon Sep 17 00:00:00 2001 From: Matthias Kruk Date: Thu, 19 Sep 2019 20:18:51 +0900 Subject: [PATCH] Rename pg_dir_alloc() method to pg_dir_create() --- kernel/arch/paging.c | 9 ++++++--- kernel/arch/paging.h | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/kernel/arch/paging.c b/kernel/arch/paging.c index cf8e7d0..f473c01 100644 --- a/kernel/arch/paging.c +++ b/kernel/arch/paging.c @@ -142,7 +142,6 @@ static void _pg_dir_debug_regions(pg_dir_t *pd) void* pg_init(struct multiboot_info *info) { - extern struct cpu _cpu[CONFIG_SMP_CPUS]; struct memory_map *mmap; u64_t mem_size; u64_t i; @@ -317,7 +316,7 @@ void* pg_init(struct multiboot_info *info) return((void*)(cr3 | _pg_flags)); } -int pg_dir_alloc(pg_dir_t **dst) +int pg_dir_create(pg_dir_t **dst) { int ret_val; pg_dir_t *dir; @@ -358,7 +357,11 @@ int pg_dir_alloc(pg_dir_t **dst) for(reg = _kernel_pgdir.pd_regions; reg; reg = reg->reg_next) { switch(reg->reg_type) { case REGION_TEXT: - ret_val = pg_dir_map(dir, reg->reg_base, reg->reg_base, reg->reg_size, reg->reg_attrs); + dbg_printf("Mapping region %02x at 0x%08x:%08x\n", + reg->reg_type, reg->reg_base, reg->reg_size); + + ret_val = pg_dir_map(dir, reg->reg_base, reg->reg_base, + reg->reg_size, reg->reg_attrs); break; default: diff --git a/kernel/arch/paging.h b/kernel/arch/paging.h index d9acd8a..fc9fedc 100644 --- a/kernel/arch/paging.h +++ b/kernel/arch/paging.h @@ -91,7 +91,7 @@ struct pae_page_table { void* pg_frame_alloc_start(void); void* pg_frame_alloc_end(void); -int pg_dir_alloc(pg_dir_t**); +int pg_dir_create(pg_dir_t**); int pg_dir_map(pg_dir_t*, const void*, const void*, const u32_t, const u32_t); #endif /* __PAGING_H */ -- 2.47.3