update from netbsd

1 files changed, 53 insertions, 58 deletions

diff --git a/sys/compat/hpux/hpux_sysent.c b/sys/compat/hpux/hpux_sysent.c
index bad0ac8abd6..22e9507d10d 100644
--- a/sys/compat/hpux/hpux_sysent.c
+++ b/sys/compat/hpux/hpux_sysent.c
@@ -2,23 +2,18 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.8 1995/10/07 06:26:42 mycroft Exp 
+ * created from	NetBSD: syscalls.master,v 1.9 1995/11/28 08:39:56 thorpej Exp 
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/signal.h>
 #include <sys/mount.h>
+#include <sys/exec.h>
 #include <sys/syscallargs.h>
 #include <compat/hpux/hpux.h>
 #include <compat/hpux/hpux_syscallargs.h>
 
-#ifdef COMPAT_HPUX_6X
-#define compat_hpux_6x(func) __CONCAT(compat_hpux_6x_,func)
-#else
-#define compat_hpux_6x(func) sys_nosys
-#endif
-
 #define	s(type)	sizeof(type)
 
 struct sysent hpux_sysent[] = {
@@ -42,24 +37,24 @@ struct sysent hpux_sysent[] = {
 	    hpux_sys_creat },			/* 8 = creat */
 	{ 2, s(struct sys_link_args),
 	    sys_link },				/* 9 = link */
-	{ 1, s(struct sys_unlink_args),
-	    sys_unlink },			/* 10 = unlink */
+	{ 1, s(struct hpux_sys_unlink_args),
+	    hpux_sys_unlink },			/* 10 = unlink */
 	{ 2, s(struct hpux_sys_execv_args),
 	    hpux_sys_execv },			/* 11 = execv */
-	{ 1, s(struct sys_chdir_args),
-	    sys_chdir },			/* 12 = chdir */
-	{ 1, s(struct compat_hpux_6x_sys_time_args),
-	    compat_hpux_6x(sys_time) },		/* 13 = compat_hpux_6x time */
-	{ 3, s(struct sys_mknod_args),
-	    sys_mknod },			/* 14 = mknod */
-	{ 2, s(struct sys_chmod_args),
-	    sys_chmod },			/* 15 = chmod */
-	{ 3, s(struct sys_chown_args),
-	    sys_chown },			/* 16 = chown */
+	{ 1, s(struct hpux_sys_chdir_args),
+	    hpux_sys_chdir },			/* 12 = chdir */
+	{ 1, s(struct hpux_sys_time_6x_args),
+	    hpux_sys_time_6x },			/* 13 = time_6x */
+	{ 3, s(struct hpux_sys_mknod_args),
+	    hpux_sys_mknod },			/* 14 = mknod */
+	{ 2, s(struct hpux_sys_chmod_args),
+	    hpux_sys_chmod },			/* 15 = chmod */
+	{ 3, s(struct hpux_sys_chown_args),
+	    hpux_sys_chown },			/* 16 = chown */
 	{ 1, s(struct sys_obreak_args),
 	    sys_obreak },			/* 17 = obreak */
-	{ 2, s(struct compat_hpux_6x_sys_stat_args),
-	    compat_hpux_6x(sys_stat) },		/* 18 = compat_hpux_6x stat */
+	{ 2, s(struct hpux_sys_stat_6x_args),
+	    hpux_sys_stat_6x },			/* 18 = stat_6x */
 	{ 3, s(struct compat_43_sys_lseek_args),
 	    compat_43_sys_lseek },		/* 19 = lseek */
 	{ 0, 0,
@@ -72,28 +67,28 @@ struct sysent hpux_sysent[] = {
 	    sys_setuid },			/* 23 = setuid */
 	{ 0, 0,
 	    sys_getuid },			/* 24 = getuid */
-	{ 1, s(struct compat_hpux_6x_sys_stime_args),
-	    compat_hpux_6x(sys_stime) },	/* 25 = compat_hpux_6x stime */
+	{ 1, s(struct hpux_sys_stime_6x_args),
+	    hpux_sys_stime_6x },		/* 25 = stime_6x */
 	{ 4, s(struct hpux_sys_ptrace_args),
 	    hpux_sys_ptrace },			/* 26 = ptrace */
-	{ 1, s(struct compat_hpux_6x_sys_alarm_args),
-	    compat_hpux_6x(sys_alarm) },	/* 27 = compat_hpux_6x alarm */
-	{ 2, s(struct compat_hpux_6x_sys_fstat_args),
-	    compat_hpux_6x(sys_fstat) },	/* 28 = compat_hpux_6x fstat */
-	{ 0, 0,
-	    compat_hpux_6x(sys_pause) },	/* 29 = compat_hpux_6x pause */
-	{ 2, s(struct compat_hpux_6x_sys_utime_args),
-	    compat_hpux_6x(sys_utime) },	/* 30 = compat_hpux_6x utime */
-	{ 2, s(struct compat_hpux_6x_sys_stty_args),
-	    compat_hpux_6x(sys_stty) },		/* 31 = compat_hpux_6x stty */
-	{ 2, s(struct compat_hpux_6x_sys_gtty_args),
-	    compat_hpux_6x(sys_gtty) },		/* 32 = compat_hpux_6x gtty */
-	{ 2, s(struct sys_access_args),
-	    sys_access },			/* 33 = access */
-	{ 1, s(struct compat_hpux_6x_sys_nice_args),
-	    compat_hpux_6x(sys_nice) },		/* 34 = compat_hpux_6x nice */
-	{ 1, s(struct compat_hpux_6x_sys_ftime_args),
-	    compat_hpux_6x(sys_ftime) },	/* 35 = compat_hpux_6x ftime */
+	{ 1, s(struct hpux_sys_alarm_6x_args),
+	    hpux_sys_alarm_6x },		/* 27 = alarm_6x */
+	{ 2, s(struct hpux_sys_fstat_6x_args),
+	    hpux_sys_fstat_6x },		/* 28 = fstat_6x */
+	{ 0, 0,
+	    hpux_sys_pause_6x },		/* 29 = pause_6x */
+	{ 2, s(struct hpux_sys_utime_6x_args),
+	    hpux_sys_utime_6x },		/* 30 = utime_6x */
+	{ 2, s(struct hpux_sys_stty_6x_args),
+	    hpux_sys_stty_6x },			/* 31 = stty_6x */
+	{ 2, s(struct hpux_sys_gtty_6x_args),
+	    hpux_sys_gtty_6x },			/* 32 = gtty_6x */
+	{ 2, s(struct hpux_sys_access_args),
+	    hpux_sys_access },			/* 33 = access */
+	{ 1, s(struct hpux_sys_nice_6x_args),
+	    hpux_sys_nice_6x },			/* 34 = nice_6x */
+	{ 1, s(struct hpux_sys_ftime_6x_args),
+	    hpux_sys_ftime_6x },		/* 35 = ftime_6x */
 	{ 0, 0,
 	    sys_sync },				/* 36 = sync */
 	{ 2, s(struct hpux_sys_kill_args),
@@ -101,15 +96,15 @@ struct sysent hpux_sysent[] = {
 	{ 2, s(struct hpux_sys_stat_args),
 	    hpux_sys_stat },			/* 38 = stat */
 	{ 0, 0,
-	    compat_hpux_6x(sys_setpgrp) },	/* 39 = compat_hpux_6x setpgrp */
+	    hpux_sys_setpgrp_6x },		/* 39 = setpgrp_6x */
 	{ 2, s(struct hpux_sys_lstat_args),
 	    hpux_sys_lstat },			/* 40 = lstat */
 	{ 1, s(struct hpux_sys_dup_args),
 	    hpux_sys_dup },			/* 41 = dup */
 	{ 0, 0,
 	    sys_pipe },				/* 42 = pipe */
-	{ 1, s(struct compat_hpux_6x_sys_times_args),
-	    compat_hpux_6x(sys_times) },	/* 43 = compat_hpux_6x times */
+	{ 1, s(struct hpux_sys_times_6x_args),
+	    hpux_sys_times_6x },		/* 43 = times_6x */
 	{ 4, s(struct sys_profil_args),
 	    sys_profil },			/* 44 = profil */
 	{ 0, 0,
@@ -118,8 +113,8 @@ struct sysent hpux_sysent[] = {
 	    sys_setgid },			/* 46 = setgid */
 	{ 0, 0,
 	    sys_getgid },			/* 47 = getgid */
-	{ 2, s(struct compat_hpux_6x_sys_ssig_args),
-	    compat_hpux_6x(sys_ssig) },		/* 48 = compat_hpux_6x ssig */
+	{ 2, s(struct hpux_sys_ssig_6x_args),
+	    hpux_sys_ssig_6x },			/* 48 = ssig_6x */
 	{ 0, 0,
 	    sys_nosys },			/* 49 = unimplemented reserved for USG */
 	{ 0, 0,
@@ -134,12 +129,12 @@ struct sysent hpux_sysent[] = {
 	    hpux_sys_ioctl },			/* 54 = ioctl */
 	{ 0, 0,
 	    sys_nosys },			/* 55 = unimplemented reboot */
-	{ 2, s(struct sys_symlink_args),
-	    sys_symlink },			/* 56 = symlink */
+	{ 2, s(struct hpux_sys_symlink_args),
+	    hpux_sys_symlink },			/* 56 = symlink */
 	{ 3, s(struct hpux_sys_utssys_args),
 	    hpux_sys_utssys },			/* 57 = utssys */
-	{ 3, s(struct sys_readlink_args),
-	    sys_readlink },			/* 58 = readlink */
+	{ 3, s(struct hpux_sys_readlink_args),
+	    hpux_sys_readlink },		/* 58 = readlink */
 	{ 3, s(struct sys_execve_args),
 	    sys_execve },			/* 59 = execve */
 	{ 1, s(struct sys_umask_args),
@@ -278,10 +273,10 @@ struct sysent hpux_sysent[] = {
 	    hpux_sys_setresuid },		/* 126 = setresuid */
 	{ 3, s(struct hpux_sys_setresgid_args),
 	    hpux_sys_setresgid },		/* 127 = setresgid */
-	{ 2, s(struct sys_rename_args),
-	    sys_rename },			/* 128 = rename */
-	{ 2, s(struct compat_43_sys_truncate_args),
-	    compat_43_sys_truncate },		/* 129 = truncate */
+	{ 2, s(struct hpux_sys_rename_args),
+	    hpux_sys_rename },			/* 128 = rename */
+	{ 2, s(struct hpux_sys_truncate_args),
+	    hpux_sys_truncate },		/* 129 = truncate */
 	{ 2, s(struct compat_43_sys_ftruncate_args),
 	    compat_43_sys_ftruncate },		/* 130 = ftruncate */
 	{ 0, 0,
@@ -294,10 +289,10 @@ struct sysent hpux_sysent[] = {
 	    sys_nosys },			/* 134 = unimplemented */
 	{ 0, 0,
 	    sys_nosys },			/* 135 = unimplemented */
-	{ 2, s(struct sys_mkdir_args),
-	    sys_mkdir },			/* 136 = mkdir */
-	{ 1, s(struct sys_rmdir_args),
-	    sys_rmdir },			/* 137 = rmdir */
+	{ 2, s(struct hpux_sys_mkdir_args),
+	    hpux_sys_mkdir },			/* 136 = mkdir */
+	{ 1, s(struct hpux_sys_rmdir_args),
+	    hpux_sys_rmdir },			/* 137 = rmdir */
 	{ 0, 0,
 	    sys_nosys },			/* 138 = unimplemented */
 	{ 0, 0,