]> git.corax.cc Git - corax/commitdiff
Rename pg_dir_alloc() method to pg_dir_create()
authorMatthias Kruk <m@m10k.eu>
Thu, 19 Sep 2019 11:18:51 +0000 (20:18 +0900)
committerMatthias Kruk <m@m10k.eu>
Thu, 19 Sep 2019 11:18:51 +0000 (20:18 +0900)
kernel/arch/paging.c
kernel/arch/paging.h

index cf8e7d0a025e6d81b23fd59274fa9f406acaa0be..f473c018fbbe019bb9354b5e08e1acf45dab77fc 100644 (file)
@@ -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:
index d9acd8a7f7f3623489ccb9af18dd72e72f25c12d..fc9fedcfc50b12f8644867e5d8d8b7fb60b43b99 100644 (file)
@@ -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 */