Cast to char* before doing pointer arithmetic.
This commit is contained in:
parent
f216f1649f
commit
8485493114
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: pmap.c,v 1.15 2007/03/04 05:59:03 christos Exp $ */
|
||||
/* $NetBSD: pmap.c,v 1.16 2007/03/05 16:42:38 he Exp $ */
|
||||
/*-
|
||||
* Copyright (c) 1997, 1998, 2000 Ben Harris
|
||||
* All rights reserved.
|
||||
@ -102,7 +102,7 @@
|
||||
|
||||
#include <sys/param.h>
|
||||
|
||||
__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.15 2007/03/04 05:59:03 christos Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.16 2007/03/05 16:42:38 he Exp $");
|
||||
|
||||
#include <sys/kernel.h> /* for cold */
|
||||
#include <sys/malloc.h>
|
||||
@ -300,7 +300,8 @@ pmap_steal_memory(vsize_t size, vaddr_t *vstartp, vaddr_t *vendp)
|
||||
for (i = 0; i < vm_nphysseg; i++) {
|
||||
if (vm_physmem[i].avail_start < vm_physmem[i].avail_end) {
|
||||
addr = (vaddr_t)
|
||||
(MEMC_PHYS_BASE + ptoa(vm_physmem[i].avail_start));
|
||||
((char*)MEMC_PHYS_BASE +
|
||||
ptoa(vm_physmem[i].avail_start));
|
||||
vm_physmem[i].avail_start++;
|
||||
break;
|
||||
}
|
||||
@ -1062,7 +1063,7 @@ pmap_find(paddr_t pa)
|
||||
if (pv->pv_pmap != NULL && (pv->pv_pmap->pm_flags & PM_ACTIVE))
|
||||
return (void *)ptoa(pv->pv_lpn);
|
||||
#endif
|
||||
return MEMC_PHYS_BASE + pa;
|
||||
return (char*)MEMC_PHYS_BASE + pa;
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: bus_dma.c,v 1.17 2007/03/04 05:59:08 christos Exp $ */
|
||||
/* $NetBSD: bus_dma.c,v 1.18 2007/03/05 16:41:03 he Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1997, 1998, 2001 The NetBSD Foundation, Inc.
|
||||
@ -39,7 +39,7 @@
|
||||
|
||||
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
|
||||
|
||||
__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.17 2007/03/04 05:59:08 christos Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.18 2007/03/05 16:41:03 he Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
@ -742,7 +742,7 @@ _bus_dmamem_mmap(bus_dma_tag_t t, bus_dma_segment_t *segs, int nsegs,
|
||||
continue;
|
||||
}
|
||||
|
||||
return (mips_btop((void *)segs[i].ds_addr + off));
|
||||
return (mips_btop((char *)segs[i].ds_addr + off));
|
||||
}
|
||||
|
||||
/* Page not found. */
|
||||
|
Loading…
Reference in New Issue
Block a user