From 8304827d1232761764d5e2dfde07fa29b6973c35 Mon Sep 17 00:00:00 2001 From: Franklin Wei Date: Sat, 28 Feb 2015 20:50:46 -0500 Subject: fix warnings --- drivers/ps2kbd.c | 1 + kernel/heap.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/ps2kbd.c b/drivers/ps2kbd.c index 40b06ac..27faaf4 100644 --- a/drivers/ps2kbd.c +++ b/drivers/ps2kbd.c @@ -134,6 +134,7 @@ static void handle_special_key(uint8_t scancode, int release) static void handle_extended_scancode(void) { uint8_t temp = inb(0x60); + (void) temp; //printf("Extended scancode: 0x%x\n", temp); } diff --git a/kernel/heap.c b/kernel/heap.c index d1f1021..947d0db 100644 --- a/kernel/heap.c +++ b/kernel/heap.c @@ -6,8 +6,8 @@ /* a simple pointer-arithmetic-based malloc */ /* a symbol put there by the linker */ -extern uint32_t link_mem_end; -uint32_t kmalloc_addr = &link_mem_end; +extern char link_mem_end; +uint32_t kmalloc_addr = (uint32_t)&link_mem_end; static void *kmalloc_int(size_t sz, int align, void **phys) { -- cgit v1.1