aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorFranklin Wei <frankhwei536@gmail.com>2015-02-28 20:50:46 -0500
committerFranklin Wei <frankhwei536@gmail.com>2015-02-28 20:50:46 -0500
commit8304827d1232761764d5e2dfde07fa29b6973c35 (patch)
tree9320c0694fc70cfdaba737c9557cb006431cc7d0 /kernel
parentc8345286f72ecef202c4268883ff3fce8c5b8b7c (diff)
downloadkappa-8304827d1232761764d5e2dfde07fa29b6973c35.zip
kappa-8304827d1232761764d5e2dfde07fa29b6973c35.tar.gz
kappa-8304827d1232761764d5e2dfde07fa29b6973c35.tar.bz2
kappa-8304827d1232761764d5e2dfde07fa29b6973c35.tar.xz
fix warnings
Diffstat (limited to 'kernel')
-rw-r--r--kernel/heap.c4
1 files changed, 2 insertions, 2 deletions
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)
{