Commit fc878126 by malcolm

Fixes warnings

parent 28633c72
Showing with 3 additions and 3 deletions
......@@ -43,7 +43,7 @@ void load_error_handlers()
}
}
void default_handler(struct reg_state reg, uint32_t interrupt, uint32_t error, struct stack_state stack)
void default_handler(struct reg_state __attribute__((unused))reg, uint32_t interrupt, uint32_t error, struct stack_state stack)
{
if(interrupt<32)
stack.eip+=2;
......
......@@ -81,7 +81,7 @@ page_directory_entry* mem_init_kern_tables(multiboot_memory_map* mmap, multiboot
uint32_t i;
for (i = 0; i+0x1000000 < mmap->length; i += 0x1000000)
{
populate_page_table(next_table, (void*) mmap->base_addr + i, 1024 ,0);
populate_page_table(next_table, (void*)(intptr_t) mmap->base_addr + i, 1024 ,0);
page_directory[current_dir_entry] = (uint32_t) next_table;
page_directory[current_dir_entry] |= PAGE_WRITABLE | PAGE_PRESENT;
......@@ -92,7 +92,7 @@ page_directory_entry* mem_init_kern_tables(multiboot_memory_map* mmap, multiboot
// full page table to be mapped. This handlis this case.
if (i != mmap->length)
{
populate_page_table(next_table, (void*) mmap->base_addr + i, (mmap->length - i) / 0x1000 ,0);
populate_page_table(next_table, (void*)(intptr_t) mmap->base_addr + i, (mmap->length - i) / 0x1000 ,0);
page_directory[current_dir_entry] = (uint32_t) next_table;
page_directory[current_dir_entry] |= PAGE_WRITABLE | PAGE_PRESENT;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment