o Remove the linux_setpgid() stub.

o  Stop using linux_getpgid(); use getpgid() instead.

PR: kern/21402

4 files changed, 8 insertions, 30 deletions

diff --git a/sys/alpha/linux/linux_machdep.c b/sys/alpha/linux/linux_machdep.c
index d1d2927..e5adea8 100644
--- a/sys/alpha/linux/linux_machdep.c
+++ b/sys/alpha/linux/linux_machdep.c
@@ -352,21 +352,6 @@ linux_munmap(td, uap)
 	return (munmap(td, (void *)uap));
 }
 
-/*
- * linux/alpha has 2 mappings for this,
- * This is here purely to shut the compiler up.
- */
-
-int
-linux_setpgid(td, uap)
-	struct thread *td;
-	struct linux_setpgid_args *uap;
-{
-
-	return (setpgid(td, (void *)uap));
-}
-
-
 static unsigned int linux_to_bsd_resource[LINUX_RLIM_NLIMITS] = {
 	RLIMIT_CPU, RLIMIT_FSIZE, RLIMIT_DATA, RLIMIT_STACK,
 	RLIMIT_CORE, RLIMIT_RSS, RLIMIT_NOFILE, -1,
diff --git a/sys/alpha/linux/linux_proto.h b/sys/alpha/linux/linux_proto.h
index 31f052c..a54fd0e 100644
--- a/sys/alpha/linux/linux_proto.h
+++ b/sys/alpha/linux/linux_proto.h
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.48 2001/09/08 18:49:31 marcel Exp 
+ * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.49 2001/09/28 01:36:45 marcel Exp 
  */
 
 #ifndef _LINUX_SYSPROTO_H_
@@ -169,9 +169,8 @@ struct linux_getgroups_args {
 	char gidsetsize_l_[PADL_(l_int)]; l_int gidsetsize; char gidsetsize_r_[PADR_(l_int)];
 	char grouplist_l_[PADL_(l_gid_t *)]; l_gid_t * grouplist; char grouplist_r_[PADR_(l_gid_t *)];
 };
-struct linux_setpgid_args {
-	char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)];
-	char pgid_l_[PADL_(l_pid_t)]; l_pid_t pgid; char pgid_r_[PADR_(l_pid_t)];
+struct LINUX {
+	register_t dummy;
 };
 struct osf1_setitimer_args {
 	char which_l_[PADL_(u_int)]; u_int which; char which_r_[PADR_(u_int)];
@@ -338,9 +337,6 @@ struct linux_msync_args {
 	char len_l_[PADL_(l_size_t)]; l_size_t len; char len_r_[PADR_(l_size_t)];
 	char fl_l_[PADL_(l_int)]; l_int fl; char fl_r_[PADR_(l_int)];
 };
-struct linux_getpgid_args {
-	char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)];
-};
 struct linux_getsid_args {
 	char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)];
 };
@@ -631,7 +627,6 @@ int	linux_madvise __P((struct thread *, struct linux_madvise_args *));
 int	linux_vhangup __P((struct thread *, struct linux_vhangup_args *));
 int	linux_setgroups __P((struct thread *, struct linux_setgroups_args *));
 int	linux_getgroups __P((struct thread *, struct linux_getgroups_args *));
-int	linux_setpgid __P((struct thread *, struct linux_setpgid_args *));
 int	osf1_setitimer __P((struct thread *, struct osf1_setitimer_args *));
 int	linux_gethostname __P((struct thread *, struct linux_gethostname_args *));
 int	linux_getdtablesize __P((struct thread *, struct linux_getdtablesize_args *));
@@ -669,7 +664,6 @@ int	linux_shmctl __P((struct thread *, struct linux_shmctl_args *));
 int	linux_shmdt __P((struct thread *, struct linux_shmdt_args *));
 int	linux_shmget __P((struct thread *, struct linux_shmget_args *));
 int	linux_msync __P((struct thread *, struct linux_msync_args *));
-int	linux_getpgid __P((struct thread *, struct linux_getpgid_args *));
 int	linux_getsid __P((struct thread *, struct linux_getsid_args *));
 int	linux_sigaltstack __P((struct thread *, struct linux_sigaltstack_args *));
 int	osf1_sysinfo __P((struct thread *, struct osf1_sysinfo_args *));
diff --git a/sys/alpha/linux/linux_syscall.h b/sys/alpha/linux/linux_syscall.h
index b2c1b28..e7259f7 100644
--- a/sys/alpha/linux/linux_syscall.h
+++ b/sys/alpha/linux/linux_syscall.h
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.48 2001/09/08 18:49:31 marcel Exp 
+ * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.49 2001/09/28 01:36:45 marcel Exp 
  */
 
 #define	LINUX_SYS_exit	1
@@ -55,7 +55,6 @@
 #define	LINUX_SYS_linux_vhangup	76
 #define	LINUX_SYS_linux_setgroups	79
 #define	LINUX_SYS_linux_getgroups	80
-#define	LINUX_SYS_linux_setpgid	82
 #define	LINUX_SYS_osf1_setitimer	83
 #define	LINUX_SYS_linux_gethostname	87
 #define	LINUX_SYS_osethostname	88
@@ -121,7 +120,7 @@
 #define	LINUX_SYS_linux_shmdt	211
 #define	LINUX_SYS_linux_shmget	212
 #define	LINUX_SYS_linux_msync	217
-#define	LINUX_SYS_linux_getpgid	233
+#define	LINUX_SYS_getpgid	233
 #define	LINUX_SYS_linux_getsid	234
 #define	LINUX_SYS_linux_sigaltstack	235
 #define	LINUX_SYS_osf1_sysinfo	241
diff --git a/sys/alpha/linux/linux_sysent.c b/sys/alpha/linux/linux_sysent.c
index c6f87bf..077ebbb 100644
--- a/sys/alpha/linux/linux_sysent.c
+++ b/sys/alpha/linux/linux_sysent.c
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.48 2001/09/08 18:49:31 marcel Exp 
+ * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.49 2001/09/28 01:36:45 marcel Exp 
  */
 
 #include "opt_compat.h"
@@ -99,7 +99,7 @@ struct sysent linux_sysent[] = {
 	{ AS(linux_setgroups_args), (sy_call_t *)linux_setgroups },	/* 79 = linux_setgroups */
 	{ AS(linux_getgroups_args), (sy_call_t *)linux_getgroups },	/* 80 = linux_getgroups */
 	{ 0, (sy_call_t *)nosys },			/* 81 =  */
-	{ AS(linux_setpgid_args), (sy_call_t *)linux_setpgid },	/* 82 = linux_setpgid */
+	{ AS(setpgid_args), (sy_call_t *)setpgid },	/* 82 = NODEF */
 	{ AS(osf1_setitimer_args), (sy_call_t *)osf1_setitimer },	/* 83 = osf1_setitimer */
 	{ 0, (sy_call_t *)nosys },			/* 84 =  */
 	{ 0, (sy_call_t *)nosys },			/* 85 =  */
@@ -250,7 +250,7 @@ struct sysent linux_sysent[] = {
 	{ 0, (sy_call_t *)nosys },			/* 230 =  */
 	{ 0, (sy_call_t *)nosys },			/* 231 =  */
 	{ 0, (sy_call_t *)nosys },			/* 232 =  */
-	{ AS(linux_getpgid_args), (sy_call_t *)linux_getpgid },	/* 233 = linux_getpgid */
+	{ AS(getpgid_args), (sy_call_t *)getpgid },	/* 233 = getpgid */
 	{ AS(linux_getsid_args), (sy_call_t *)linux_getsid },	/* 234 = linux_getsid */
 	{ 0, (sy_call_t *)linux_sigaltstack },		/* 235 = linux_sigaltstack */
 	{ 0, (sy_call_t *)nosys },			/* 236 =  */