summaryrefslogtreecommitdiff
path: root/i386
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 /i386
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 'i386')
-rw-r--r--i386/i386/phys.c3
-rw-r--r--i386/intel/pmap.c1
2 files changed, 3 insertions, 1 deletions
diff --git a/i386/i386/phys.c b/i386/i386/phys.c
index d55bdd9..8681fba 100644
--- a/i386/i386/phys.c
+++ b/i386/i386/phys.c
@@ -77,7 +77,8 @@ pmap_copy_page(
vm_offset_t dst)
{
vm_offset_t src_addr_v, dst_addr_v;
- pmap_mapwindow_t *src_map, *dst_map;
+ pmap_mapwindow_t *src_map = NULL;
+ pmap_mapwindow_t *dst_map;
boolean_t src_mapped = src >= phys_last_addr;
boolean_t dst_mapped = dst >= phys_last_addr;
assert(src != vm_page_fictitious_addr);
diff --git a/i386/intel/pmap.c b/i386/intel/pmap.c
index cf7a736..22e20c9 100644
--- a/i386/intel/pmap.c
+++ b/i386/intel/pmap.c
@@ -83,6 +83,7 @@
#include <i386/proc_reg.h>
#include <i386/locore.h>
#include <i386/model_dep.h>
+#include <i386at/model_dep.h>
#ifdef MACH_PSEUDO_PHYS
#define WRITE_PTE(pte_p, pte_entry) *(pte_p) = pte_entry?pa_to_ma(pte_entry):0;