diff options
| -rw-r--r-- | i386/i386/phys.c | 3 | ||||
| -rw-r--r-- | i386/intel/pmap.c | 1 | ||||
| -rw-r--r-- | kern/mach_clock.c | 2 | ||||
| -rw-r--r-- | linux/dev/glue/block.c | 2 | ||||
| -rw-r--r-- | linux/dev/init/main.c | 4 |
5 files changed, 7 insertions, 5 deletions
diff --git a/i386/i386/phys.c b/i386/i386/phys.c index d55bdd9d..8681fba3 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 cf7a736e..22e20c97 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; diff --git a/kern/mach_clock.c b/kern/mach_clock.c index c6e2d9df..1817ce22 100644 --- a/kern/mach_clock.c +++ b/kern/mach_clock.c @@ -539,7 +539,7 @@ void mapable_time_init(void) if (kmem_alloc_wired(kernel_map, (vm_offset_t *) &mtime, PAGE_SIZE) != KERN_SUCCESS) panic("mapable_time_init"); - memset(mtime, 0, PAGE_SIZE); + memset((void *) mtime, 0, PAGE_SIZE); update_mapped_time(&time); } diff --git a/linux/dev/glue/block.c b/linux/dev/glue/block.c index da4ef38e..453e10be 100644 --- a/linux/dev/glue/block.c +++ b/linux/dev/glue/block.c @@ -1157,7 +1157,7 @@ out: { ipc_kobject_set (bd->port, IKO_NULL, IKOT_NONE); ipc_port_dealloc_kernel (bd->port); - *devp = IP_NULL; + *devp = (device_t) IP_NULL; } kfree ((vm_offset_t) bd, sizeof (struct block_data)); bd = NULL; diff --git a/linux/dev/init/main.c b/linux/dev/init/main.c index ecbd0b68..8737b62c 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); } /* |