diff options
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/dev/glue/block.c | 2 | ||||
| -rw-r--r-- | linux/dev/init/main.c | 4 |
2 files changed, 3 insertions, 3 deletions
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); } /* |