Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cast to char* before doing pointer arithmetic.

This commit is contained in:
he 2007-03-05 20:48:42 +00:00
parent f1f47464be
commit 9f6b24c0fa
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arch/amiga/dev/zssc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: zssc.c,v 1.39 2007/03/04 05:59:30 christos Exp $ */
/* $NetBSD: zssc.c,v 1.40 2007/03/05 20:48:42 he Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: zssc.c,v 1.39 2007/03/04 05:59:30 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: zssc.c,v 1.40 2007/03/05 20:48:42 he Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -114,7 +114,7 @@ zsscattach(struct device *pdp, struct device *dp, void *auxp)
zap = auxp;
sc = (struct siop_softc *)dp;
sc->sc_siopp = rp = (siop_regmap_p)((void *)zap->va + 0x4000);
sc->sc_siopp = rp = (siop_regmap_p)((char *)zap->va + 0x4000);
/*
* CTEST7 = 00

12
sys/arch/x68k/x68k/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.138 2007/03/05 12:50:17 tsutsui Exp $ */
/* $NetBSD: machdep.c,v 1.139 2007/03/05 20:51:11 he Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.138 2007/03/05 12:50:17 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.139 2007/03/05 20:51:11 he Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@ -1073,7 +1073,7 @@ mem_exists(void *mem, u_long basemax)
int baseismem;
int exists = 0;
void *base;
void *begin_check, end_check;
void *begin_check, *end_check;
label_t faultbuf;
DPRINTF (("Enter mem_exists(%p, %x)\n", mem, basemax));
@ -1098,7 +1098,7 @@ mem_exists(void *mem, u_long basemax)
__asm("lea %%pc@(begin_check_mem),%0" : "=a"(begin_check));
__asm("lea %%pc@(end_check_mem),%0" : "=a"(end_check));
if (base >= begin_check && base < end_check) {
size_t off = end_check - begin_check;
size_t off = (char*)end_check - (char*)begin_check;
DPRINTF ((" Adjusting the testing area.\n"));
m -= off;
@ -1221,9 +1221,9 @@ setmemrange(void)
h = 0;
/* range check */
for (s = minimum; s <= maximum; s += 0x00100000) {
if (!mem_exists(mlist[i].base + s - 4, basemax))
if (!mem_exists((char*)mlist[i].base + s - 4, basemax))
break;
h = (u_long)(mlist[i].base + s);
h = (u_long)((char*)mlist[i].base + s);
}
if ((u_long)mlist[i].base < h) {
uvm_page_physload(atop(mlist[i].base), atop(h),