summaryrefslogtreecommitdiff
path: root/sys/compat/linux/common/linux_misc_notalpha.c
diff options
context:
space:
mode:
authormanu <manu@NetBSD.org>2006-02-09 19:18:56 +0000
committermanu <manu@NetBSD.org>2006-02-09 19:18:56 +0000
commitee0c5b44def8a80be34fd2e5867cafdcc76275b6 (patch)
tree183be75b62d5300967eea39ead22b2c61ee63277 /sys/compat/linux/common/linux_misc_notalpha.c
parent0cf592aa8aff28200eebc1da22b795caa7423277 (diff)
Add initial (but unfinished) COMPAT_LINUX32 for amd64. This is good enough so
that the i386 license manager part of amd64 version of Fluent works. While I'm here, add SysV IPC to COMPAT_LINUX/amd64
Diffstat (limited to 'sys/compat/linux/common/linux_misc_notalpha.c')
-rw-r--r--sys/compat/linux/common/linux_misc_notalpha.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/sys/compat/linux/common/linux_misc_notalpha.c b/sys/compat/linux/common/linux_misc_notalpha.c
index 5a0ccd9d6c3..5551a6c66e4 100644
--- a/sys/compat/linux/common/linux_misc_notalpha.c
+++ b/sys/compat/linux/common/linux_misc_notalpha.c
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_misc_notalpha.c,v 1.76 2005/12/11 12:20:19 christos Exp $ */
+/* $NetBSD: linux_misc_notalpha.c,v 1.77 2006/02/09 19:18:56 manu Exp $ */
/*-
* Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_misc_notalpha.c,v 1.76 2005/12/11 12:20:19 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_misc_notalpha.c,v 1.77 2006/02/09 19:18:56 manu Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -81,6 +81,7 @@ __KERNEL_RCSID(0, "$NetBSD: linux_misc_notalpha.c,v 1.76 2005/12/11 12:20:19 chr
#define DPRINTF(a)
#endif
+#ifndef COMPAT_LINUX32
#if !defined(__m68k__)
static void bsd_to_linux_statfs64(const struct statvfs *,
struct linux_statfs64 *);
@@ -178,8 +179,9 @@ linux_sys_alarm(l, v, retval)
return 0;
}
+#endif /* !COMPAT_LINUX32 */
-#ifndef __amd64__
+#if !defined(__amd64__) || defined(COMPAT_LINUX32)
int
linux_sys_nice(l, v, retval)
struct lwp *l;
@@ -196,8 +198,9 @@ linux_sys_nice(l, v, retval)
SCARG(&bsa, prio) = SCARG(uap, incr);
return sys_setpriority(l, &bsa, retval);
}
-#endif
+#endif /* !__amd64__ || COMPAT_LINUX32 */
+#ifndef COMPAT_LINUX32
#ifndef __amd64__
/*
* The old Linux readdir was only able to read one entry at a time,
@@ -538,3 +541,4 @@ linux_sys_fstatfs64(l, v, retval)
return copyout((caddr_t) &ltmp, (caddr_t) SCARG(uap, sp), sizeof ltmp);
}
#endif /* !__m68k__ */
+#endif /* !COMPAT_LINUX32 */