summaryrefslogtreecommitdiff
path: root/sys/compat/linux
diff options
context:
space:
mode:
authornjoly <njoly@NetBSD.org>2007-11-07 00:24:29 +0000
committernjoly <njoly@NetBSD.org>2007-11-07 00:24:29 +0000
commitb32d95bfbf7aed71069ea7b5d733075cffc6f626 (patch)
treeb4faeecf22c938c1e097afcc3a8ef566d3863607 /sys/compat/linux
parent9b336836dfece87ee8bd7c7b99f79842ef6f6d70 (diff)
Remove remaining 64-bit compat linux syscalls linux_sys_xxx() (except
for ones without arguments), and replace them by their 32-bit equivalent linux32_sys_xxxx().
Diffstat (limited to 'sys/compat/linux')
-rw-r--r--sys/compat/linux/common/linux_misc.c6
-rw-r--r--sys/compat/linux/common/linux_misc_notalpha.c8
2 files changed, 8 insertions, 6 deletions
diff --git a/sys/compat/linux/common/linux_misc.c b/sys/compat/linux/common/linux_misc.c
index 94c927062cd..7095990e969 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.184 2007/10/19 18:52:11 njoly Exp $ */
+/* $NetBSD: linux_misc.c,v 1.185 2007/11/07 00:24:29 njoly 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.184 2007/10/19 18:52:11 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_misc.c,v 1.185 2007/11/07 00:24:29 njoly Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ptrace.h"
@@ -1032,6 +1032,7 @@ linux_sys_personality(struct lwp *l, void *v, register_t *retval)
/*
* The calls are here because of type conversions.
*/
+#ifndef COMPAT_LINUX32
int
linux_sys_setreuid16(l, v, retval)
struct lwp *l;
@@ -1117,6 +1118,7 @@ linux_sys_setresgid16(l, v, retval)
return linux_sys_setresgid(l, &lsa, retval);
}
+#endif /* COMPAT_LINUX32 */
int
linux_sys_getgroups16(l, v, retval)
diff --git a/sys/compat/linux/common/linux_misc_notalpha.c b/sys/compat/linux/common/linux_misc_notalpha.c
index 7df2899092f..a376bcee4ee 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.95 2007/10/19 18:52:11 njoly Exp $ */
+/* $NetBSD: linux_misc_notalpha.c,v 1.96 2007/11/07 00:24:30 njoly 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.95 2007/10/19 18:52:11 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_misc_notalpha.c,v 1.96 2007/11/07 00:24:30 njoly Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -188,7 +188,7 @@ linux_sys_alarm(l, v, retval)
}
#endif /* !COMPAT_LINUX32 */
-#if !defined(__amd64__) || defined(COMPAT_LINUX32)
+#if !defined(__amd64__)
int
linux_sys_nice(l, v, retval)
struct lwp *l;
@@ -205,7 +205,7 @@ linux_sys_nice(l, v, retval)
SCARG(&bsa, prio) = SCARG(uap, incr);
return sys_setpriority(l, &bsa, retval);
}
-#endif /* !__amd64__ || COMPAT_LINUX32 */
+#endif /* !__amd64__ */
#ifndef COMPAT_LINUX32
#ifndef __amd64__