Regen

3 files changed, 13 insertions, 13 deletions

diff --git a/sys/alpha/linux/linux_proto.h b/sys/alpha/linux/linux_proto.h
index c55b626..a686dae 100644
--- a/sys/alpha/linux/linux_proto.h
+++ b/sys/alpha/linux/linux_proto.h
@@ -59,8 +59,9 @@ struct	linux_lseek_args {
 	long	off;	char off_[PAD_(long)];
 	int	whence;	char whence_[PAD_(int)];
 };
-struct	linux_umount_args {
+struct	linux_umount2_args {
 	char *	path;	char path_[PAD_(char *)];
+	int	flags;	char flags_[PAD_(int)];
 };
 struct	linux_ptrace_args {
 	register_t dummy;
@@ -82,10 +83,6 @@ struct	osf1_sigprocmask_args {
 	int	how;	char how_[PAD_(int)];
 	u_long	mask;	char mask_[PAD_(u_long)];
 };
-struct	linux_umount2_args {
-	char *	path;	char path_[PAD_(char *)];
-	int	flags;	char flags_[PAD_(int)];
-};
 struct	linux_ioctl_args {
 	int	fd;	char fd_[PAD_(int)];
 	u_long	cmd;	char cmd_[PAD_(u_long)];
@@ -387,6 +384,9 @@ struct	linux_sysctl_args {
 struct	linux_idle_args {
 	register_t dummy;
 };
+struct	linux_umount_args {
+	char *	path;	char path_[PAD_(char *)];
+};
 struct	linux_times_args {
 	struct linux_times_argv *	buf;	char buf_[PAD_(struct linux_times_argv *)];
 };
@@ -534,13 +534,12 @@ int	linux_chmod __P((struct proc *, struct linux_chmod_args *));
 int	linux_chown __P((struct proc *, struct linux_chown_args *));
 int	linux_brk __P((struct proc *, struct linux_brk_args *));
 int	linux_lseek __P((struct proc *, struct linux_lseek_args *));
-int	linux_umount __P((struct proc *, struct linux_umount_args *));
+int	linux_umount2 __P((struct proc *, struct linux_umount2_args *));
 int	linux_ptrace __P((struct proc *, struct linux_ptrace_args *));
 int	linux_access __P((struct proc *, struct linux_access_args *));
 int	linux_kill __P((struct proc *, struct linux_kill_args *));
 int	linux_open __P((struct proc *, struct linux_open_args *));
 int	osf1_sigprocmask __P((struct proc *, struct osf1_sigprocmask_args *));
-int	linux_umount2 __P((struct proc *, struct linux_umount2_args *));
 int	linux_ioctl __P((struct proc *, struct linux_ioctl_args *));
 int	linux_symlink __P((struct proc *, struct linux_symlink_args *));
 int	linux_readlink __P((struct proc *, struct linux_readlink_args *));
@@ -609,6 +608,7 @@ int	linux_uselib __P((struct proc *, struct linux_uselib_args *));
 int	linux_sysinfo __P((struct proc *, struct linux_sysinfo_args *));
 int	linux_sysctl __P((struct proc *, struct linux_sysctl_args *));
 int	linux_idle __P((struct proc *, struct linux_idle_args *));
+int	linux_umount __P((struct proc *, struct linux_umount_args *));
 int	linux_times __P((struct proc *, struct linux_times_args *));
 int	linux_personality __P((struct proc *, struct linux_personality_args *));
 int	linux_setfsuid __P((struct proc *, struct linux_setfsuid_args *));
diff --git a/sys/alpha/linux/linux_syscall.h b/sys/alpha/linux/linux_syscall.h
index 1bbb319..1df0078 100644
--- a/sys/alpha/linux/linux_syscall.h
+++ b/sys/alpha/linux/linux_syscall.h
@@ -22,7 +22,7 @@
 #define	LINUX_SYS_linux_brk	17
 #define	LINUX_SYS_linux_lseek	19
 #define	LINUX_SYS_getpid	20
-#define	LINUX_SYS_linux_umount	22
+#define	LINUX_SYS_linux_umount2	22
 #define	LINUX_SYS_setuid	23
 #define	LINUX_SYS_getuid	24
 #define	LINUX_SYS_linux_ptrace	26
@@ -36,7 +36,6 @@
 #define	LINUX_SYS_getgid	47
 #define	LINUX_SYS_osf1_sigprocmask	48
 #define	LINUX_SYS_acct	51
-#define	LINUX_SYS_linux_umount2	52
 #define	LINUX_SYS_linux_ioctl	54
 #define	LINUX_SYS_linux_symlink	57
 #define	LINUX_SYS_linux_readlink	58
@@ -140,6 +139,7 @@
 #define	LINUX_SYS_linux_sysinfo	318
 #define	LINUX_SYS_linux_sysctl	319
 #define	LINUX_SYS_linux_idle	320
+#define	LINUX_SYS_linux_umount	321
 #define	LINUX_SYS_swapon	322
 #define	LINUX_SYS_linux_times	323
 #define	LINUX_SYS_linux_personality	324
diff --git a/sys/alpha/linux/linux_sysent.c b/sys/alpha/linux/linux_sysent.c
index 6554061..db1c2e8 100644
--- a/sys/alpha/linux/linux_sysent.c
+++ b/sys/alpha/linux/linux_sysent.c
@@ -38,8 +38,8 @@ struct sysent linux_sysent[] = {
 	{ 0, (sy_call_t *)nosys },			/* 18 =  */
 	{ AS(linux_lseek_args), (sy_call_t *)linux_lseek },	/* 19 = linux_lseek */
 	{ 0, (sy_call_t *)getpid },			/* 20 = getpid */
-	{ 0, (sy_call_t *)nosys },			/* 21 =  */
-	{ AS(linux_umount_args), (sy_call_t *)linux_umount },	/* 22 = linux_umount */
+	{ 0, (sy_call_t *)nosys },			/* 21 = osf1_mount */
+	{ AS(linux_umount2_args), (sy_call_t *)linux_umount2 },	/* 22 = linux_umount2 */
 	{ AS(setuid_args), (sy_call_t *)setuid },	/* 23 = setuid */
 	{ 0, (sy_call_t *)getuid },			/* 24 = getuid */
 	{ 0, (sy_call_t *)nosys },			/* 25 =  */
@@ -69,7 +69,7 @@ struct sysent linux_sysent[] = {
 	{ 0, (sy_call_t *)nosys },			/* 49 =  */
 	{ 0, (sy_call_t *)nosys },			/* 50 =  */
 	{ AS(acct_args), (sy_call_t *)acct },		/* 51 = acct */
-	{ AS(linux_umount2_args), (sy_call_t *)linux_umount2 },	/* 52 = linux_umount2 */
+	{ 0, (sy_call_t *)nosys },			/* 52 = sigpending */
 	{ 0, (sy_call_t *)nosys },			/* 53 =  */
 	{ AS(linux_ioctl_args), (sy_call_t *)linux_ioctl },	/* 54 = linux_ioctl */
 	{ 0, (sy_call_t *)nosys },			/* 55 =  */
@@ -338,7 +338,7 @@ struct sysent linux_sysent[] = {
 	{ 0, (sy_call_t *)linux_sysinfo },		/* 318 = linux_sysinfo */
 	{ 0, (sy_call_t *)linux_sysctl },		/* 319 = linux_sysctl */
 	{ 0, (sy_call_t *)linux_idle },			/* 320 = linux_idle */
-	{ 0, (sy_call_t *)nosys },			/* 321 = old_umount */
+	{ AS(linux_umount_args), (sy_call_t *)linux_umount },	/* 321 = linux_umount */
 	{ AS(swapon_args), (sy_call_t *)swapon },	/* 322 = swapon */
 	{ AS(linux_times_args), (sy_call_t *)linux_times },	/* 323 = linux_times */
 	{ AS(linux_personality_args), (sy_call_t *)linux_personality },	/* 324 = linux_personality */