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

fix fallout from caddr_t changes.

Browse Source
This commit is contained in:
yamt 2007-03-04 15:41:02 +00:00
parent 527d30e108
commit 731acd91f9
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/compat/linux/arch/alpha/linux_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: linux_machdep.c,v 1.37 2007/03/04 06:01:18 christos Exp $ */
/* $NetBSD: linux_machdep.c,v 1.38 2007/03/04 15:42:54 yamt Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.37 2007/03/04 06:01:18 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.38 2007/03/04 15:42:54 yamt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -138,11 +138,10 @@ setup_linux_rt_sigframe(struct trapframe *tf, int sig, const sigset_t *mask)
if (onstack)
sfp = (struct linux_rt_sigframe *)
((void *)l->l_sigstk.ss_sp +
l->l_sigstk.ss_size);
((char *)l->l_sigstk.ss_sp + l->l_sigstk.ss_size);
else
sfp = (struct linux_rt_sigframe *)(alpha_pal_rdusp());
sfp = (struct linux_rt_sigframe *)((void *)sfp - rndfsize);
sfp = (struct linux_rt_sigframe *)((char *)sfp - rndfsize);
#ifdef DEBUG
if ((sigdebug & SDB_KSTACK) && (p->p_pid == sigpid))
@ -244,11 +243,10 @@ void setup_linux_sigframe(tf, sig, mask)
if (onstack)
sfp = (struct linux_sigframe *)
((void *)l->l_sigstk.ss_sp +
l->l_sigstk.ss_size);
((char *)l->l_sigstk.ss_sp + l->l_sigstk.ss_size);
else
sfp = (struct linux_sigframe *)(alpha_pal_rdusp());
sfp = (struct linux_sigframe *)((void *)sfp - rndfsize);
sfp = (struct linux_sigframe *)((char *)sfp - rndfsize);
#ifdef DEBUG
if ((sigdebug & SDB_KSTACK) && (p->p_pid == sigpid))

6
sys/fs/adosfs/advnops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: advnops.c,v 1.22 2007/02/20 16:21:03 ad Exp $ */
/* $NetBSD: advnops.c,v 1.23 2007/03/04 15:41:02 yamt Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: advnops.c,v 1.22 2007/02/20 16:21:03 ad Exp $");
__KERNEL_RCSID(0, "$NetBSD: advnops.c,v 1.23 2007/03/04 15:41:02 yamt Exp $");
#if defined(_KERNEL_OPT)
#include "opt_quota.h"
@ -339,7 +339,7 @@ adosfs_read(v)
printf(" %" PRId64 "+%ld-%" PRId64 "+%ld", lbn, on, lbn, n);
#endif
n = MIN(n, size - bp->b_resid);
error = uiomove(bp->b_data + on +
error = uiomove((char *)bp->b_data + on +
amp->bsize - amp->dbsize, (int)n, uio);
brelse(bp);
} while (error == 0 && uio->uio_resid > 0 && n != 0);