Module Name: src
Committed By: pgoyette
Date: Tue Sep 11 02:53:56 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_compat_09.c
netbsd32_compat_12.c netbsd32_compat_13.c netbsd32_compat_20.c
netbsd32_compat_30.c netbsd32_compat_50.c netbsd32_compat_60.c
Log Message:
Use netbsd32 syscall names in the establish/disestablish tables
To generate a diff of this commit:
cvs rdiff -u -r1.18.86.1 -r1.18.86.2 \
src/sys/compat/netbsd32/netbsd32_compat_09.c
cvs rdiff -u -r1.33.36.3 -r1.33.36.4 \
src/sys/compat/netbsd32/netbsd32_compat_12.c
cvs rdiff -u -r1.26.28.2 -r1.26.28.3 \
src/sys/compat/netbsd32/netbsd32_compat_13.c
cvs rdiff -u -r1.36.10.4 -r1.36.10.5 \
src/sys/compat/netbsd32/netbsd32_compat_20.c
cvs rdiff -u -r1.31.16.3 -r1.31.16.4 \
src/sys/compat/netbsd32/netbsd32_compat_30.c
cvs rdiff -u -r1.32.16.2 -r1.32.16.3 \
src/sys/compat/netbsd32/netbsd32_compat_50.c
cvs rdiff -u -r1.3.2.2 -r1.3.2.3 src/sys/compat/netbsd32/netbsd32_compat_60.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/netbsd32/netbsd32_compat_09.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_09.c:1.18.86.1 src/sys/compat/netbsd32/netbsd32_compat_09.c:1.18.86.2
--- src/sys/compat/netbsd32/netbsd32_compat_09.c:1.18.86.1 Mon Sep 10 09:54:47 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_09.c Tue Sep 11 02:53:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_09.c,v 1.18.86.1 2018/09/10 09:54:47 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_09.c,v 1.18.86.2 2018/09/11 02:53:56 pgoyette Exp $ */
/*
* Copyright (c) 1998 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_09.c,v 1.18.86.1 2018/09/10 09:54:47 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_09.c,v 1.18.86.2 2018/09/11 02:53:56 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -41,6 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_com
#include <sys/sysctl.h>
#include <compat/netbsd32/netbsd32.h>
+#include <compat/netbsd32/netbsd32_syscall.h>
#include <compat/netbsd32/netbsd32_syscallargs.h>
int
@@ -86,13 +87,14 @@ compat_09_netbsd32_uname(struct lwp *l,
NETBSD32TOP_UAP(name, struct outsname);
return (compat_09_sys_uname(l, &ua, retval));
}
-
+NETBSD32_SYS_compat_30_netbsd32_fhstat
static struct syscall_package compat_netbsd32_09_syscalls[] = {
- { NETBSD32_SYS_ogetdomainname, 0,
+ { NETBSD32_SYS_compat_30_netbsd32_ogetdomainname, 0,
(sy_call_t *)compat_09_netbsd32_ogetdomainname },
- { NETBSD32_SYS_osetdomainname, 0,
+ { NETBSD32_SYS_compat_30_netbsd32_osetdomainname, 0,
(sy_call_t *)compat_09_netbsd32_osetdomainname },
- { NETBSD32_SYS_ouname, 0, (sy_call_t *)compat_09_netbsd32_uname },
+ { NETBSD32_SYS_compat_30_netbsd32_ouname, 0,
+ (sy_call_t *)compat_09_netbsd32_uname },
{ 0, 0, NULL }
};
Index: src/sys/compat/netbsd32/netbsd32_compat_12.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_12.c:1.33.36.3 src/sys/compat/netbsd32/netbsd32_compat_12.c:1.33.36.4
--- src/sys/compat/netbsd32/netbsd32_compat_12.c:1.33.36.3 Tue Sep 11 01:52:00 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_12.c Tue Sep 11 02:53:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_12.c,v 1.33.36.3 2018/09/11 01:52:00 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_12.c,v 1.33.36.4 2018/09/11 02:53:56 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_12.c,v 1.33.36.3 2018/09/11 01:52:00 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_12.c,v 1.33.36.4 2018/09/11 02:53:56 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -51,6 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_com
#include <compat/sys/stat.h>
#include <compat/netbsd32/netbsd32.h>
+#include <compat/netbsd32/netbsd32_syscall.h>
#include <compat/netbsd32/netbsd32_syscallargs.h>
static void netbsd32_stat12_to_netbsd32(struct stat12 *,
@@ -211,19 +212,19 @@ compat_12_netbsd32_getdirentries(struct
}
static struct syscall_package compat_netbsd32_12_syscalls[] = {
- { NETBSD32_SYS_reboot, 0,
+ { NETBSD32_SYS_compat_12_netbsd32_reboot, 0,
(sy_call_t *)compat_12_netbsd32_reboot },
- { NETBSD32_SYS_msync, 0,
+ { NETBSD32_SYS_compat_12_netbsd32_msync, 0,
(sy_call_t *)compat_12_netbsd32_msync },
- { NETBSD32_SYS_swapon, 0,
+ { NETBSD32_SYS_compat_12_netbsd32_swapon, 0,
(sy_call_t *)compat_12_netbsd32_swapon },
- { NETBSD32_SYS_stat12, 0,
+ { NETBSD32_SYS_compat_12_netbsd32_stat12, 0,
(sy_call_t *)compat_12_netbsd32_stat12 },
- { NETBSD32_SYS_fstat12, 0,
+ { NETBSD32_SYS_compat_12_netbsd32_fstat12, 0,
(sy_call_t *)compat_12_netbsd32_fstat12 },
- { NETBSD32_SYS_lstat12, 0,
+ { NETBSD32_SYS_compat_12_netbsd32_lstat12, 0,
(sy_call_t *)compat_12_netbsd32_lstat12 },
- { NETBSD32_SYS_getdirentries, 0,
+ { NETBSD32_SYS_compat_12_netbsd32_getdirentries, 0,
(sy_call_t *)compat_12_netbsd32_getdirentries },
{ 0, 0, NULL }
};
Index: src/sys/compat/netbsd32/netbsd32_compat_13.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_13.c:1.26.28.2 src/sys/compat/netbsd32/netbsd32_compat_13.c:1.26.28.3
--- src/sys/compat/netbsd32/netbsd32_compat_13.c:1.26.28.2 Tue Sep 11 01:52:00 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_13.c Tue Sep 11 02:53:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_13.c,v 1.26.28.2 2018/09/11 01:52:00 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_13.c,v 1.26.28.3 2018/09/11 02:53:56 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_13.c,v 1.26.28.2 2018/09/11 01:52:00 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_13.c,v 1.26.28.3 2018/09/11 02:53:56 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -40,6 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_com
#include <sys/syscallvar.h>
#include <compat/netbsd32/netbsd32.h>
+#include <compat/netbsd32/netbsd32_syscall.h>
#include <compat/netbsd32/netbsd32_syscallargs.h>
#include <compat/sys/stat.h>
@@ -94,11 +95,11 @@ compat_13_netbsd32_sigsuspend(struct lwp
}
static struct syscall_package compat_netbsd32_13_syscalls[] = {
- { NETBSD32_SYS_sigaltstack13, 0,
+ { NETBSD32_SYS_compat_13_netbsd32_sigaltstack13, 0,
(sy_call_t *)compat_13_netbsd32_sigaltstack13 },
- { NETBSD32_SYS_sigprocmask, 0,
+ { NETBSD32_SYS_compat_13_sigprocmask13, 0,
(sy_call_t *)compat_13_netbsd32_sigprocmask },
- { NETBSD32_SYS_sigsuspend, 0,
+ { NETBSD32_SYS_compat_13_sigsuspend13, 0,
(sy_call_t *)compat_13_netbsd32_sigsuspend },
{ 0, 0, NULL }
};
Index: src/sys/compat/netbsd32/netbsd32_compat_20.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_20.c:1.36.10.4 src/sys/compat/netbsd32/netbsd32_compat_20.c:1.36.10.5
--- src/sys/compat/netbsd32/netbsd32_compat_20.c:1.36.10.4 Tue Sep 11 01:52:00 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_20.c Tue Sep 11 02:53:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_20.c,v 1.36.10.4 2018/09/11 01:52:00 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_20.c,v 1.36.10.5 2018/09/11 02:53:56 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_20.c,v 1.36.10.4 2018/09/11 01:52:00 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_20.c,v 1.36.10.5 2018/09/11 02:53:56 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -47,6 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_com
#include <sys/dirent.h>
#include <compat/netbsd32/netbsd32.h>
+#include <compat/netbsd32/netbsd32_syscall.h>
#include <compat/netbsd32/netbsd32_syscallargs.h>
#include <compat/netbsd32/netbsd32_conv.h>
@@ -220,13 +221,13 @@ compat_20_netbsd32_fhstatfs(struct lwp *
}
static struct syscall_package compat_netbsd32_20_syscalls[] = {
- { NETBSD32_SYS_statfs, 0,
+ { NETBSD32_SYS_compat_20_netbsd32_statfs, 0,
(sy_call_t *)compat_20_netbsd32_statfs },
- { NETBSD32_SYS_fstatfs, 0,
+ { NETBSD32_SYS_compat_20_netbsd32_fstatfs, 0,
(sy_call_t *)compat_20_netbsd32_fstatfs },
- { NETBSD32_SYS_fhstatfs, 0,
+ { NETBSD32_SYS_compat_20_netbsd32_fhstatfs, 0,
(sy_call_t *)compat_20_netbsd32_fhstatfs },
- { NETBSD32_SYS_getfsstat, 0,
+ { NETBSD32_SYS_compat_20_netbsd32_getfsstat, 0,
(sy_call_t *)compat_20_netbsd32_getfsstat },
{ 0, 0, NULL }
};
Index: src/sys/compat/netbsd32/netbsd32_compat_30.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_30.c:1.31.16.3 src/sys/compat/netbsd32/netbsd32_compat_30.c:1.31.16.4
--- src/sys/compat/netbsd32/netbsd32_compat_30.c:1.31.16.3 Tue Sep 11 01:52:00 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_30.c Tue Sep 11 02:53:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_30.c,v 1.31.16.3 2018/09/11 01:52:00 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_30.c,v 1.31.16.4 2018/09/11 02:53:56 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_30.c,v 1.31.16.3 2018/09/11 01:52:00 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_30.c,v 1.31.16.4 2018/09/11 02:53:56 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -52,6 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_com
#include <sys/vfs_syscalls.h>
#include <compat/netbsd32/netbsd32.h>
+#include <compat/netbsd32/netbsd32_syscall.h>
#include <compat/netbsd32/netbsd32_syscallargs.h>
#include <compat/netbsd32/netbsd32_conv.h>
#include <compat/sys/mount.h>
@@ -297,25 +298,25 @@ compat_30_netbsd32_fhopen(struct lwp *l,
}
static struct syscall_package compat_netbsd32_30_syscalls[] = {
- { NETBSD32_SYS_getdents, 0,
+ { NETBSD32_SYS_compat_30_netbsd32_getdents, 0,
(sy_call_t *)compat_30_netbsd32_getdents },
- { NETBSD32_SYS_stat13, 0,
+ { NETBSD32_SYS_compat_30_netbsd32___stat13, 0,
(sy_call_t *)compat_30_netbsd32___stat13 },
- { NETBSD32_SYS_fstat13, 0,
+ { NETBSD32_SYS_compat_30_netbsd32___fstat13, 0,
(sy_call_t *)compat_30_netbsd32___fstat13 },
- { NETBSD32_SYS_lstat13, 0,
+ { NETBSD32_SYS_compat_30_netbsd32___lstat13, 0,
(sy_call_t *)compat_30_netbsd32___lstat13 },
- { NETBSD32_SYS_fhstat, 0,
+ { NETBSD32_SYS_compat_30_netbsd32_fhstat, 0,
(sy_call_t *)compat_30_netbsd32_fhstat },
- { NETBSD32_SYS_fhstatvfs1, 0,
+ { NETBSD32_SYS_compat_30_netbsd32_fhstatvfs1, 0,
(sy_call_t *)compat_30_netbsd32_fhstatvfs1 },
- { NETBSD32_SYS_socket, 0,
+ { NETBSD32_SYS_compat_30_netbsd32_socket, 0,
(sy_call_t *)compat_30_netbsd32_socket },
- { NETBSD32_SYS_getfh, 0,
+ { NETBSD32_SYS_compat_30_netbsd32_getfh, 0,
(sy_call_t *)compat_30_netbsd32_getfh },
- { NETBSD32_SYS_fhstat30, 0,
+ { NETBSD32_SYS_compat_30_netbsd32___fhstat30, 0,
(sy_call_t *)compat_30_netbsd32___fhstat30 },
- { NETBSD32_SYS_fhopen, 0,
+ { NETBSD32_SYS_compat_30_netbsd32_fhopen, 0,
(sy_call_t *)compat_30_netbsd32___fhopen },
{ 0, 0, NULL }
};
Index: src/sys/compat/netbsd32/netbsd32_compat_50.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_50.c:1.32.16.2 src/sys/compat/netbsd32/netbsd32_compat_50.c:1.32.16.3
--- src/sys/compat/netbsd32/netbsd32_compat_50.c:1.32.16.2 Tue Sep 11 01:52:00 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_50.c Tue Sep 11 02:53:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_50.c,v 1.32.16.2 2018/09/11 01:52:00 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_50.c,v 1.32.16.3 2018/09/11 02:53:56 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50.c,v 1.32.16.2 2018/09/11 01:52:00 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50.c,v 1.32.16.3 2018/09/11 02:53:56 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -67,6 +67,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_com
#include <sys/vfs_syscalls.h>
#include <compat/netbsd32/netbsd32.h>
+#include <compat/netbsd32/netbsd32_syscall.h>
#include <compat/netbsd32/netbsd32_syscallargs.h>
#include <compat/netbsd32/netbsd32_conv.h>
#include <compat/sys/mount.h>
@@ -927,59 +928,61 @@ compat_50_netbsd32_quotactl(struct lwp *
}
static struct syscall_package compat_netbsd32_50_syscalls[] = {
- { NETBSD32_SYS_mknod, 0,
+ { NETBSD32_SYS_compat_50_netbsd32_mknod, 0,
(sy_call_t *)compat_50_netbsd32_mknod },
- { NETBSD32_SYS_select, 0,
+ { NETBSD32_SYS_compat_50_netbsd32_select, 0,
(sy_call_t *)compat_50_netbsd32_select },
- { NETBSD32_SYS_gettimeofday, 0,
+ { NETBSD32_SYS_compat_50_netbsd32_gettimeofday, 0,
(sy_call_t *)compat_50_netbsd32_gettimeofday },
- { NETBSD32_SYS_settimeofday, 0,
+ { NETBSD32_SYS_compat_50_netbsd32_settimeofday, 0,
(sy_call_t *)compat_50_netbsd32_settimeofday },
- { NETBSD32_SYS_utimes, 0,
+ { NETBSD32_SYS_compat_50_netbsd32_utimes, 0,
(sy_call_t *)compat_50_netbsd32_utimes },
- { NETBSD32_SYS_futimes, 0,
+ { NETBSD32_SYS_compat_50_netbsd32_futimes, 0,
(sy_call_t *)compat_50_netbsd32_futimes },
- { NETBSD32_SYS_adjtime, 0,
+ { NETBSD32_SYS_compat_50_netbsd32_adjtime, 0,
(sy_call_t *)compat_50_netbsd32_adjtime },
- { NETBSD32_SYS_clock_gettime, 0,
+ { NETBSD32_SYS_compat_50_netbsd32_clock_gettime, 0,
(sy_call_t *)compat_50_netbsd32_clock_gettime },
- { NETBSD32_SYS_clock_settime, 0,
+ { NETBSD32_SYS_compat_50_netbsd32_clock_settime, 0,
(sy_call_t *)compat_50_netbsd32_clock_settime },
- { NETBSD32_SYS_clock_getres, 0,
+ { NETBSD32_SYS_compat_50_netbsd32_clock_getres, 0,
(sy_call_t *)compat_50_netbsd32_clock_getres },
- { NETBSD32_SYS_timer_settime, 0,
+ { NETBSD32_SYS_compat_50_netbsd32_timer_settime, 0,
(sy_call_t *)compat_50_netbsd32_timer_settime },
- { NETBSD32_SYS_timer_gettime, 0,
+ { NETBSD32_SYS_compat_50_netbsd32_timer_gettime, 0,
(sy_call_t *)compat_50_netbsd32_timer_gettime },
- { NETBSD32_SYS_nanosleep, 0,
+ { NETBSD32_SYS_compat_50_netbsd32_nanosleep, 0,
(sy_call_t *)compat_50_netbsd32_nanosleep },
- { NETBSD32_SYS_sigtimedwait, 0,
+ { NETBSD32_SYS_compat_50_netbsd32___sigtimedwait, 0,
(sy_call_t *)compat_50_netbsd32___sigtimedwait },
- { NETBSD32_SYS_lutimes, 0,
+ { NETBSD32_SYS_compat_50_netbsd32_lutimes, 0,
(sy_call_t *)compat_50_netbsd32_lutimes },
- { NETBSD32_SYS__lwp_park, 0,
+ { NETBSD32_SYS_compat_50_netbsd32__lwp_park, 0,
(sy_call_t *)compat_50_netbsd32__lwp_park },
- { NETBSD32_SYS_kevent, 0,
+ { NETBSD32_SYS_compat_50_netbsd32_kevent, 0,
(sy_call_t *)compat_50_netbsd32_kevent },
- { NETBSD32_SYS_pselect, 0,
+ { NETBSD32_SYS_compat_50_netbsd32_pselect, 0,
(sy_call_t *)compat_50_netbsd32_pselect },
- { NETBSD32_SYS_pollts, 0,
+ { NETBSD32_SYS_compat_50_netbsd32_pollts, 0,
(sy_call_t *)compat_50_netbsd32_pollts },
- { NETBSD32_SYS___stat30, 0,
+ { NETBSD32_SYS_compat_50_netbsd32___stat30, 0,
(sy_call_t *)compat_50_netbsd32___stat30 },
- { NETBSD32_SYS___lstat30, 0,
- (sy_call_t *)compat_50_netbsd32___lstat30 },
- { NETBSD32_SYS___fstat30, 0,
+ { NETBSD32_SYS_compat_50_netbsd32___fstat30, 0,
(sy_call_t *)compat_50_netbsd32___fstat30 },
- { NETBSD32_SYS___fhstat40, 0,
+ { NETBSD32_SYS_compat_50_netbsd32___lstat30, 0,
+ (sy_call_t *)compat_50_netbsd32___lstat30 },
+ { NETBSD32_SYS_compat_50_netbsd32___fhstat40, 0,
(sy_call_t *)compat_50_netbsd32___fhstat40 },
- { NETBSD32_SYS_wait4, 0,
+ { NETBSD32_SYS_compat_50_netbsd32_wait4, 0,
(sy_call_t *)compat_50_netbsd32_wait4 },
- { NETBSD32_SYS_getrusage, 0,
+ { NETBSD32_SYS_compat_50_netbsd32_getrusage, 0,
(sy_call_t *)compat_50_netbsd32_getrusage },
- { NETBSD32_SYS_setitimer, 0,
+ { NETBSD32_SYS_compat_50_netbsd32_setitimer, 0,
(sy_call_t *)compat_50_netbsd32_setitimer },
- { NETBSD32_SYS_quotactl, 0,
+ { NETBSD32_SYS_compat_50_netbsd32_getitimer, 0,
+ (sy_call_t *)compat_50_netbsd32_getitimer },
+ { NETBSD32_SYS_compat_50_netbsd32_quotactl, 0,
(sy_call_t *)compat_50_netbsd32_quotactl },
{ 0, 0, NULL }
};
Index: src/sys/compat/netbsd32/netbsd32_compat_60.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_60.c:1.3.2.2 src/sys/compat/netbsd32/netbsd32_compat_60.c:1.3.2.3
--- src/sys/compat/netbsd32/netbsd32_compat_60.c:1.3.2.2 Tue Sep 11 01:52:00 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_60.c Tue Sep 11 02:53:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_60.c,v 1.3.2.2 2018/09/11 01:52:00 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_60.c,v 1.3.2.3 2018/09/11 02:53:56 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_60.c,v 1.3.2.2 2018/09/11 01:52:00 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_60.c,v 1.3.2.3 2018/09/11 02:53:56 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,6 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_com
#include <sys/syscallvar.h>
#include <compat/netbsd32/netbsd32.h>
+#include <compat/netbsd32/netbsd32_syscall.h>
#include <compat/netbsd32/netbsd32_syscallargs.h>
#include <compat/netbsd32/netbsd32_conv.h>
@@ -88,7 +89,7 @@ compat_60_netbsd32__lwp_park(struct lwp
}
static struct syscall_package compat_netbsd32_60_syscalls[] = {
- { NETBSD32_SYS__lwp_park, 0,
+ { NETBSD32_SYS_compat_60_netbsd32__lwp_park, 0,
(sy_call_t *)compat_60_netbsd32__lwp_park },
{ 0, 0, NULL }
};
@@ -97,7 +98,7 @@ static struct syscall_package compat_net
MODULE(MODULE_CLASS_EXEC, compat_netbsd32_60, "compat_netbsd,compat_60");
static int
-compat_netbsd32_60_modcmd(modcmd_t CMD, void *arg)
+compat_netbsd32_60_modcmd(modcmd_t cmd, void *arg)
{
switch (cmd) {
