3 files changed, 6 insertions, 18 deletions

diff --git a/sys/alpha/linux/linux_proto.h b/sys/alpha/linux/linux_proto.h
index 6fceb670d0c2..08cc723ffc90 100644
--- a/sys/alpha/linux/linux_proto.h
+++ b/sys/alpha/linux/linux_proto.h
@@ -59,16 +59,10 @@ struct	linux_lseek_args {
 	l_off_t	off;	char off_[PAD_(l_off_t)];
 	l_int	whence;	char whence_[PAD_(l_int)];
 };
-struct	linux_getpid_args {
-	register_t dummy;
-};
 struct	linux_umount_args {
 	char *	path;	char path_[PAD_(char *)];
 	l_int	flags;	char flags_[PAD_(l_int)];
 };
-struct	linux_getuid_args {
-	register_t dummy;
-};
 struct	linux_ptrace_args {
 	register_t dummy;
 };
@@ -85,9 +79,6 @@ struct	linux_open_args {
 	l_int	flags;	char flags_[PAD_(l_int)];
 	l_int	mode;	char mode_[PAD_(l_int)];
 };
-struct	linux_getgid_args {
-	register_t dummy;
-};
 struct	osf1_sigprocmask_args {
 	int	how;	char how_[PAD_(int)];
 	u_long	mask;	char mask_[PAD_(u_long)];
@@ -589,14 +580,11 @@ 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_getpid __P((struct proc *, struct linux_getpid_args *));
 int	linux_umount __P((struct proc *, struct linux_umount_args *));
-int	linux_getuid __P((struct proc *, struct linux_getuid_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	linux_getgid __P((struct proc *, struct linux_getgid_args *));
 int	osf1_sigprocmask __P((struct proc *, struct osf1_sigprocmask_args *));
 int	linux_sigpending __P((struct proc *, struct linux_sigpending_args *));
 int	linux_ioctl __P((struct proc *, struct linux_ioctl_args *));
diff --git a/sys/alpha/linux/linux_syscall.h b/sys/alpha/linux/linux_syscall.h
index 36411203b836..ebcd87e0f40c 100644
--- a/sys/alpha/linux/linux_syscall.h
+++ b/sys/alpha/linux/linux_syscall.h
@@ -21,10 +21,10 @@
 #define	LINUX_SYS_linux_chown	16
 #define	LINUX_SYS_linux_brk	17
 #define	LINUX_SYS_linux_lseek	19
-#define	LINUX_SYS_linux_getpid	20
+#define	LINUX_SYS_getpid	20
 #define	LINUX_SYS_linux_umount	22
 #define	LINUX_SYS_setuid	23
-#define	LINUX_SYS_linux_getuid	24
+#define	LINUX_SYS_getuid	24
 #define	LINUX_SYS_linux_ptrace	26
 #define	LINUX_SYS_linux_access	33
 #define	LINUX_SYS_sync	36
@@ -33,7 +33,7 @@
 #define	LINUX_SYS_dup	41
 #define	LINUX_SYS_pipe	42
 #define	LINUX_SYS_linux_open	45
-#define	LINUX_SYS_linux_getgid	47
+#define	LINUX_SYS_getgid	47
 #define	LINUX_SYS_osf1_sigprocmask	48
 #define	LINUX_SYS_acct	51
 #define	LINUX_SYS_linux_sigpending	52
diff --git a/sys/alpha/linux/linux_sysent.c b/sys/alpha/linux/linux_sysent.c
index 6e1f260a6030..d06db89f49cb 100644
--- a/sys/alpha/linux/linux_sysent.c
+++ b/sys/alpha/linux/linux_sysent.c
@@ -37,11 +37,11 @@ struct sysent linux_sysent[] = {
 	{ AS(linux_brk_args), (sy_call_t *)linux_brk },	/* 17 = linux_brk */
 	{ 0, (sy_call_t *)nosys },			/* 18 =  */
 	{ AS(linux_lseek_args), (sy_call_t *)linux_lseek },	/* 19 = linux_lseek */
-	{ 0, (sy_call_t *)linux_getpid },		/* 20 = linux_getpid */
+	{ 0, (sy_call_t *)getpid },			/* 20 = getpid */
 	{ 0, (sy_call_t *)nosys },			/* 21 = osf1_mount */
 	{ AS(linux_umount_args), (sy_call_t *)linux_umount },	/* 22 = linux_umount */
 	{ AS(setuid_args), (sy_call_t *)setuid },	/* 23 = setuid */
-	{ 0, (sy_call_t *)linux_getuid },		/* 24 = linux_getuid */
+	{ 0, (sy_call_t *)getuid },			/* 24 = getuid */
 	{ 0, (sy_call_t *)nosys },			/* 25 =  */
 	{ 0, (sy_call_t *)linux_ptrace },		/* 26 = linux_ptrace */
 	{ 0, (sy_call_t *)nosys },			/* 27 =  */
@@ -64,7 +64,7 @@ struct sysent linux_sysent[] = {
 	{ 0, (sy_call_t *)nosys },			/* 44 =  */
 	{ AS(linux_open_args), (sy_call_t *)linux_open },	/* 45 = linux_open */
 	{ 0, (sy_call_t *)nosys },			/* 46 =  */
-	{ 0, (sy_call_t *)linux_getgid },		/* 47 = linux_getgid */
+	{ 0, (sy_call_t *)getgid },			/* 47 = getgid */
 	{ AS(osf1_sigprocmask_args), (sy_call_t *)osf1_sigprocmask },	/* 48 = osf1_sigprocmask */
 	{ 0, (sy_call_t *)nosys },			/* 49 =  */
 	{ 0, (sy_call_t *)nosys },			/* 50 =  */