summaryrefslogtreecommitdiff
path: root/linux/dev/init/main.c
diff options
context:
space:
mode:
authorFlavio Cruz <flaviocruz@gmail.com>2015-12-31 19:08:19 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2016-01-01 17:09:06 +0100
commiteb8c15953a316a780f2ea6c8d1eb47c878909d94 (patch)
tree00600d1e5427e5b3651e6aca812a0efdd6ed90a5 /linux/dev/init/main.c
parent130c43f6da56e9ed1d9f954975ceeeec66c1d2eb (diff)
fix some compiler warnings in gnumach
* linux/dev/glue/block.c (out): Cast to device_t. * linux/dev/init/main.c (alloc_contig_mem): Initialize addr and cast return value to void *. * i386/i386/phys.c (pmap_copy_page): Initialize src_map. * i386/intel/pmap.c: Include i386at/model_dep.h. * kern/mach_clock.c (mapable_time_init): Cast to void *.
Diffstat (limited to 'linux/dev/init/main.c')
-rw-r--r--linux/dev/init/main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/dev/init/main.c b/linux/dev/init/main.c
index ecbd0b6..8737b62 100644
--- a/linux/dev/init/main.c
+++ b/linux/dev/init/main.c
@@ -193,7 +193,7 @@ alloc_contig_mem (unsigned size, unsigned limit,
unsigned *bits, len;
void *m;
vm_page_t p, page_list, tail, prev;
- vm_offset_t addr, max_addr;
+ vm_offset_t addr = 0, max_addr;
if (size == 0)
return (NULL);
@@ -296,7 +296,7 @@ alloc_contig_mem (unsigned size, unsigned limit,
kfree ((vm_offset_t) bits, bits_len);
if (pages)
*pages = page_list;
- return phystokv(m);
+ return (void *) phystokv(m);
}
/*