summaryrefslogtreecommitdiff
path: root/sys/compat/linux
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2007-06-13 02:11:40 +0000
committerchristos <christos@NetBSD.org>2007-06-13 02:11:40 +0000
commit564f9b3b2f8b80715741cff54d2cbcaaaabe1130 (patch)
treecd6dde29a6e680383daad1bb0352b6573454d35f /sys/compat/linux
parent7ae95bbb8f20aca9ed1cf383419d4f0a59a632d2 (diff)
cleanup some bitrot; from Matthew Orgass
Diffstat (limited to 'sys/compat/linux')
-rw-r--r--sys/compat/linux/arch/i386/linux_machdep.h3
-rw-r--r--sys/compat/linux/arch/mips/linux_machdep.c12
2 files changed, 8 insertions, 7 deletions
diff --git a/sys/compat/linux/arch/i386/linux_machdep.h b/sys/compat/linux/arch/i386/linux_machdep.h
index 002cd44f92c..c923a6c7988 100644
--- a/sys/compat/linux/arch/i386/linux_machdep.h
+++ b/sys/compat/linux/arch/i386/linux_machdep.h
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_machdep.h,v 1.30 2007/05/10 21:30:15 christos Exp $ */
+/* $NetBSD: linux_machdep.h,v 1.31 2007/06/13 02:11:40 christos Exp $ */
/*-
* Copyright (c) 1995, 2000 The NetBSD Foundation, Inc.
@@ -210,6 +210,7 @@ struct linux_sigframe {
#define LINUX_IOCTL_MAX_PASS (LINUX_VMWARE_LAST+8)
#define LINUX_UNAME_ARCH linux_get_uname_arch()
+#define LINUX_NPTL
#ifdef _KERNEL
__BEGIN_DECLS
diff --git a/sys/compat/linux/arch/mips/linux_machdep.c b/sys/compat/linux/arch/mips/linux_machdep.c
index 9cb661eac9b..f61f38d10da 100644
--- a/sys/compat/linux/arch/mips/linux_machdep.c
+++ b/sys/compat/linux/arch/mips/linux_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_machdep.c,v 1.30 2007/03/04 06:01:22 christos Exp $ */
+/* $NetBSD: linux_machdep.c,v 1.31 2007/06/13 02:11:40 christos Exp $ */
/*-
* Copyright (c) 1995, 2000, 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.30 2007/03/04 06:01:22 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.31 2007/06/13 02:11:40 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -157,7 +157,7 @@ linux_sendsig(ksi, mask)
*/
if (onstack)
fp = (struct linux_sigframe *)
- ((void *)l->l_sigstk.ss_sp
+ ((uint8_t *)l->l_sigstk.ss_sp
+ l->l_sigstk.ss_size);
else
/* cast for _MIPS_BSD_API == _MIPS_BSD_API_LP32_64CLEAN case */
@@ -197,7 +197,7 @@ linux_sendsig(ksi, mask)
*/
fp -= sizeof(struct linux_sigframe);
mutex_exit(&p->p_smutex);
- error = copyout(&sf, fp, sizeof(sf);
+ error = copyout(&sf, fp, sizeof(sf));
mutex_enter(&p->p_smutex);
if (error != 0) {
@@ -337,8 +337,8 @@ linux_fakedev(dev, raw)
* We come here in a last attempt to satisfy a Linux ioctl() call
*/
int
-linux_machdepioctl(p, v, retval)
- struct proc *p;
+linux_machdepioctl(l, v, retval)
+ struct lwp *l;
void *v;
register_t *retval;
{