diff --git a/sys/compat/linux/arch/alpha/syscalls.master b/sys/compat/linux/arch/alpha/syscalls.master
index 4b85ff04200a..b4486197dece 100644
--- a/sys/compat/linux/arch/alpha/syscalls.master
+++ b/sys/compat/linux/arch/alpha/syscalls.master
@@ -1,4 +1,4 @@
-	$NetBSD: syscalls.master,v 1.60 2007/12/21 22:26:20 njoly Exp $
+	$NetBSD: syscalls.master,v 1.61 2007/12/24 14:17:17 njoly Exp $
 ;
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
 
@@ -413,7 +413,7 @@
 230	UNIMPL
 231	UNIMPL
 232	UNIMPL
-233	STD		{ int linux_sys_getpgid(int pid); }
+233	NOARGS		{ pid_t sys_getpgid(pid_t pid); }
 234	NOARGS		{ pid_t sys_getsid(pid_t pid); }
 235	UNIMPL		sigaltstack
 236	UNIMPL
diff --git a/sys/compat/linux/arch/amd64/syscalls.master b/sys/compat/linux/arch/amd64/syscalls.master
index eebdb14f103f..445313eae7dd 100644
--- a/sys/compat/linux/arch/amd64/syscalls.master
+++ b/sys/compat/linux/arch/amd64/syscalls.master
@@ -1,4 +1,4 @@
-	$NetBSD: syscalls.master,v 1.21 2007/12/21 22:26:21 njoly Exp $
+	$NetBSD: syscalls.master,v 1.22 2007/12/24 14:17:17 njoly Exp $
 
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
 
@@ -270,7 +270,7 @@
 			    gid_t sgid); }
 120	STD		{ int linux_sys_getresgid(gid_t *rgid, gid_t *egid, \
 			    gid_t *sgid); }
-121	STD		{ int linux_sys_getpgid(int pid); }
+121	NOARGS		{ pid_t sys_getpgid(pid_t pid); }
 122	STD		{ int linux_sys_setfsuid(uid_t uid); }
 123	STD		{ int linux_sys_setfsgid(gid_t gid); }
 124	NOARGS		{ pid_t sys_getsid(pid_t pid); }
diff --git a/sys/compat/linux/arch/arm/syscalls.master b/sys/compat/linux/arch/arm/syscalls.master
index 61e704b6430b..573d627911ae 100644
--- a/sys/compat/linux/arch/arm/syscalls.master
+++ b/sys/compat/linux/arch/arm/syscalls.master
@@ -1,4 +1,4 @@
-	$NetBSD: syscalls.master,v 1.31 2007/12/21 22:26:21 njoly Exp $
+	$NetBSD: syscalls.master,v 1.32 2007/12/24 14:17:17 njoly Exp $
 
 ; Derived from sys/compat/linux/arch/*/syscalls.master
 ; and from Linux 2.4.12 arch/arm/kernel/calls.S
@@ -229,7 +229,7 @@
 129	UNIMPL		delete_module
 130	UNIMPL		get_kernel_syms
 131	UNIMPL		quotactl
-132	STD		{ int linux_sys_getpgid(int pid); }
+132	NOARGS		{ pid_t sys_getpgid(pid_t pid); }
 133	NOARGS		{ int sys_fchdir(int fd); }
 134	UNIMPL		bdflush
 135	UNIMPL		sysfs
diff --git a/sys/compat/linux/arch/i386/syscalls.master b/sys/compat/linux/arch/i386/syscalls.master
index 193437592014..77bfda542d58 100644
--- a/sys/compat/linux/arch/i386/syscalls.master
+++ b/sys/compat/linux/arch/i386/syscalls.master
@@ -1,4 +1,4 @@
-	$NetBSD: syscalls.master,v 1.87 2007/12/21 22:26:21 njoly Exp $
+	$NetBSD: syscalls.master,v 1.88 2007/12/24 14:17:18 njoly Exp $
 
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
 
@@ -241,7 +241,7 @@
 129	UNIMPL		delete_module
 130	UNIMPL		get_kernel_syms
 131	UNIMPL		quotactl
-132	STD		{ int linux_sys_getpgid(int pid); }
+132	NOARGS		{ pid_t sys_getpgid(pid_t pid); }
 133	NOARGS		{ int sys_fchdir(int fd); }
 134	UNIMPL		bdflush
 135	UNIMPL		sysfs
diff --git a/sys/compat/linux/arch/m68k/syscalls.master b/sys/compat/linux/arch/m68k/syscalls.master
index a2191aa313c0..515af29ce5cb 100644
--- a/sys/compat/linux/arch/m68k/syscalls.master
+++ b/sys/compat/linux/arch/m68k/syscalls.master
@@ -1,4 +1,4 @@
-	$NetBSD: syscalls.master,v 1.57 2007/12/21 22:26:21 njoly Exp $
+	$NetBSD: syscalls.master,v 1.58 2007/12/24 14:17:18 njoly Exp $
 
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
 
@@ -246,7 +246,7 @@
 129	UNIMPL		delete_module
 130	UNIMPL		get_kernel_syms
 131	UNIMPL		quotactl
-132	STD		{ int linux_sys_getpgid(int pid); }
+132	NOARGS		{ pid_t sys_getpgid(pid_t pid); }
 133	NOARGS		{ int sys_fchdir(int fd); }
 134	UNIMPL		bdflush
 135	UNIMPL		sysfs
diff --git a/sys/compat/linux/arch/mips/syscalls.master b/sys/compat/linux/arch/mips/syscalls.master
index 23afe73cc538..b46994531d9e 100644
--- a/sys/compat/linux/arch/mips/syscalls.master
+++ b/sys/compat/linux/arch/mips/syscalls.master
@@ -1,4 +1,4 @@
-	$NetBSD: syscalls.master,v 1.26 2007/12/21 22:26:21 njoly Exp $  
+	$NetBSD: syscalls.master,v 1.27 2007/12/24 14:17:18 njoly Exp $  
 
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
 
@@ -233,7 +233,7 @@
 129	UNIMPL		delete_module
 130	UNIMPL		get_kernel_syms
 131	UNIMPL		quotactl
-132	STD		{ int linux_sys_getpgid(int pid); }
+132	NOARGS		{ pid_t sys_getpgid(pid_t pid); }
 133	NOARGS		{ int sys_fchdir(int fd); }
 134	UNIMPL		bdflush
 135	UNIMPL		sysfs
diff --git a/sys/compat/linux/arch/powerpc/syscalls.master b/sys/compat/linux/arch/powerpc/syscalls.master
index eb2b92907e3e..5f9cba9d9828 100644
--- a/sys/compat/linux/arch/powerpc/syscalls.master
+++ b/sys/compat/linux/arch/powerpc/syscalls.master
@@ -1,4 +1,4 @@
-	$NetBSD: syscalls.master,v 1.34 2007/12/21 22:26:22 njoly Exp $  
+	$NetBSD: syscalls.master,v 1.35 2007/12/24 14:17:18 njoly Exp $  
 
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
 
@@ -262,7 +262,7 @@
 129	UNIMPL		delete_module
 130	UNIMPL		get_kernel_syms
 131	UNIMPL		quotactl
-132	STD		{ int linux_sys_getpgid(int pid); }
+132	NOARGS		{ pid_t sys_getpgid(pid_t pid); }
 133	NOARGS		{ int sys_fchdir(int fd); }
 134	UNIMPL		bdflush
 135	UNIMPL		sysfs
diff --git a/sys/compat/linux/common/linux_misc.c b/sys/compat/linux/common/linux_misc.c
index 51135720d57a..a984e1c1ad35 100644
--- a/sys/compat/linux/common/linux_misc.c
+++ b/sys/compat/linux/common/linux_misc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_misc.c,v 1.191 2007/12/21 22:26:22 njoly Exp $	*/
+/*	$NetBSD: linux_misc.c,v 1.192 2007/12/24 14:17:18 njoly Exp $	*/
 
 /*-
  * Copyright (c) 1995, 1998, 1999 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_misc.c,v 1.191 2007/12/21 22:26:22 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_misc.c,v 1.192 2007/12/24 14:17:18 njoly Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_ptrace.h"
@@ -942,30 +942,6 @@ linux_select1(l, retval, nfds, readfds, writefds, exceptfds, timeout)
 	return 0;
 }
 
-/*
- * Get the process group of a certain process. Look it up
- * and return the value.
- */
-int
-linux_sys_getpgid(struct lwp *l, const struct linux_sys_getpgid_args *uap, register_t *retval)
-{
-	/* {
-		syscallarg(int) pid;
-	} */
-	struct proc *p = l->l_proc;
-	struct proc *targp;
-
-	if (SCARG(uap, pid) != 0 && SCARG(uap, pid) != p->p_pid) {
-		if ((targp = pfind(SCARG(uap, pid))) == 0)
-			return ESRCH;
-	}
-	else
-		targp = p;
-
-	retval[0] = targp->p_pgid;
-	return 0;
-}
-
 /*
  * Set the 'personality' (emulation mode) for the current process. Only
  * accept the Linux personality here (0). This call is needed because