summaryrefslogtreecommitdiff
path: root/sys/compat/linux/common/linux_misc.c
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2002-02-18 22:24:17 +0000
committerchristos <christos@NetBSD.org>2002-02-18 22:24:17 +0000
commite52b5e4bfb2a6ba0d6baefb6006bfcddf2531b1e (patch)
treeb6233ff419a3cb51cc7d9c79e875a737f9be2262 /sys/compat/linux/common/linux_misc.c
parente96b77f08f89717239bc3379e6002a6dec387185 (diff)
Resolve alpha compile issues:
- bug with order in args in mask conversion md code. - flags can be both int and long on the alpha. kludge around that, by not passing pointers to the conversion function. - something is wrong with the toolchain look at the void * cast in copyout(). - sa_restorer is in a different place on the aplha. Deal with that, by not initializing it as before. XXX: this should be changed in the MD signal definition.
Diffstat (limited to 'sys/compat/linux/common/linux_misc.c')
-rw-r--r--sys/compat/linux/common/linux_misc.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/compat/linux/common/linux_misc.c b/sys/compat/linux/common/linux_misc.c
index 9daec51fc8b..847a10d9109 100644
--- a/sys/compat/linux/common/linux_misc.c
+++ b/sys/compat/linux/common/linux_misc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_misc.c,v 1.99 2002/02/18 18:51:51 jdolecek Exp $ */
+/* $NetBSD: linux_misc.c,v 1.100 2002/02/18 22:24:18 christos Exp $ */
/*-
* Copyright (c) 1995, 1998, 1999 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_misc.c,v 1.99 2002/02/18 18:51:51 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_misc.c,v 1.100 2002/02/18 22:24:18 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1542,9 +1542,10 @@ linux_sys_setrlimit(p, v, retval)
if ((error = copyin(SCARG(uap, rlp), &orl, sizeof(orl))) != 0)
return error;
linux_to_bsd_rlimit(&rl, &orl);
- if ((error = copyout(&rl, SCARG(uap, rlp), sizeof(rl))) != 0)
+ /* XXX: alpha complains about this */
+ if ((error = copyout(&rl, (void *)SCARG(&ap, rlp), sizeof(rl))) != 0)
return error;
- return sys_setrlimit(p, v, retval);
+ return sys_setrlimit(p, &ap, retval);
}
#ifndef __mips__