 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_exec_machdep.c,v 1.14 2008/11/20 09:26:06 ad Exp $ */
+/*	$NetBSD: linux_exec_machdep.c,v 1.15 2009/03/15 15:55:51 cegger Exp $ */
 /*-
  * Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
 @@ -22,27 +22,27 @@
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
  * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_exec_machdep.c,v 1.14 2008/11/20 09:26:06 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_exec_machdep.c,v 1.15 2009/03/15 15:55:51 cegger Exp $");
 #ifdef __amd64__
 #define ELFSIZE 64
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/resource.h>
 #include <sys/proc.h>
 #include <sys/conf.h>
 #include <sys/malloc.h>
 #include <sys/exec_elf.h>
 @@ -114,32 +114,28 @@ linux_exec_setup_stack(struct lwp *l, st
 	    access_size), noaccess_size);
 	if (noaccess_size > 0) {
 		NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_zero, noaccess_size,
 		    noaccess_linear_min, NULLVP, 0, VM_PROT_NONE);
+	}
 	KASSERT(access_size > 0);
 	NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_zero, access_size,
 	    access_linear_min, NULLVP, 0, VM_PROT_READ | VM_PROT_WRITE);
 	return 0;
+}
 int
-ELFNAME2(linux,copyargs)(l, pack, arginfo, stackp, argp)
+ELFNAME2(linux,copyargs)(struct lwp *l, struct exec_package *pack,
-	struct lwp *l;
+	struct ps_strings *arginfo, char **stackp, void *argp)
 	struct exec_package *pack;
 	struct ps_strings *arginfo;
 	char **stackp;
 	void *argp;
+{
 	struct linux_extra_stack_data64 *esdp, esd;
 	struct elf_args *ap;
 	struct vattr *vap;
 	Elf_Ehdr *eh;
 	Elf_Phdr *ph;
 	u_long phsize;
 	Elf_Addr phdr = 0;
 	int error;
 	int i;
 	if ((error = copyargs(l, pack, arginfo, stackp, argp)) != 0)
 		return error;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_exec.c,v 1.111 2009/03/14 21:04:18 dsl Exp $	*/
+/*	$NetBSD: linux_exec.c,v 1.112 2009/03/15 15:55:51 cegger Exp $	*/
 /*-
  * Copyright (c) 1994, 1995, 1998, 2000, 2007, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Christos Zoulas, Frank van der Linden, Eric Haszlakiewicz and
  * Thor Lancelot Simon.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -21,27 +21,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_exec.c,v 1.111 2009/03/14 21:04:18 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_exec.c,v 1.112 2009/03/15 15:55:51 cegger Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/namei.h>
 #include <sys/vnode.h>
 #include <sys/mount.h>
 #include <sys/exec.h>
 #include <sys/exec_elf.h>
 #include <sys/mman.h>
 @@ -361,30 +361,27 @@ linux_nptl_proc_exit(struct proc *p)
 		SCARG(&cup, op) = LINUX_FUTEX_WAKE;
 		SCARG(&cup, val) = 0x7fffffff; /* Awake everyone */
 		SCARG(&cup, timeout) = NULL;
 		SCARG(&cup, uaddr2) = NULL;
 		SCARG(&cup, val3) = 0;
 		if ((error = linux_sys_futex(curlwp, &cup, &retval)) != 0)
 			printf("%s: linux_sys_futex failed\n", __func__);
+	}
 	return;
+}
 void
-linux_nptl_proc_fork(p, parent, luserret)
+linux_nptl_proc_fork(struct proc *p, struct proc *parent, void (*luserret)(void))
 	struct proc *p;
 	struct proc *parent;
 	void (*luserret)(void);
+{
 	struct linux_emuldata *e = p->p_emuldata;
 	/* LINUX_CLONE_CHILD_CLEARTID: clear TID in child's memory on exit() */
 	if (e->clone_flags & LINUX_CLONE_CHILD_CLEARTID)
 		e->clear_tid = e->child_tidptr;
 	/* LINUX_CLONE_PARENT_SETTID: set child's TID in parent's memory */
 	if (e->clone_flags & LINUX_CLONE_PARENT_SETTID) {
 		if (copyout_proc(parent, &p->p_pid,
 		    e->parent_tidptr,  sizeof(p->p_pid)) != 0)
 			printf("%s: LINUX_CLONE_PARENT_SETTID "
 			    "failed (e->parent_tidptr = %p, "

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_exec_elf32.c,v 1.82 2008/11/20 09:26:06 ad Exp $	*/
+/*	$NetBSD: linux_exec_elf32.c,v 1.83 2009/03/15 15:55:51 cegger Exp $	*/
 /*-
  * Copyright (c) 1995, 1998, 2000, 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Christos Zoulas, Frank van der Linden, Eric Haszlakiewicz and
  * Emmanuel Dreyfus.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -25,27 +25,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * based on exec_aout.c, sunos_exec.c and svr4_exec.c
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_exec_elf32.c,v 1.82 2008/11/20 09:26:06 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_exec_elf32.c,v 1.83 2009/03/15 15:55:51 cegger Exp $");
 #ifndef ELFSIZE
 /* XXX should die */
 #define	ELFSIZE		32
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/namei.h>
 #include <sys/vnode.h>
 @@ -211,30 +211,27 @@ ELFNAME2(linux,gcc_signature)(l, epp, eh
 	error = ENOEXEC;
 out:
 	free(sh, M_TEMP);
 	return (error);
+}
 #endif
 #ifdef LINUX_DEBUGLINK_SIGNATURE
 /*
  * Look for a .gnu_debuglink, specific to x86_64 interpeter
  */
 int
-ELFNAME2(linux,debuglink_signature)(l, epp, eh)
+ELFNAME2(linux,debuglink_signature)(struct lwp *l, struct exec_package *epp, Elf_Ehdr *eh)
 	struct lwp *l;
 	struct exec_package *epp;
 	Elf_Ehdr *eh;
+{
 	size_t shsize;
 	int strndx;
 	size_t i;
 	static const char signature[] = ".gnu_debuglink";
 	char *strtable = NULL;
 	Elf_Shdr *sh;
 	int error;
 	/*
 	 * load the section header table
 	 */
 @@ -276,31 +273,27 @@ ELFNAME2(linux,debuglink_signature)(l, e
+		}
+	}
 	error = ENOEXEC;
 out:
 	free(sh, M_TEMP);
 	if (strtable)
 		free(strtable, M_TEMP);
 	return (error);
+}
 #endif
 int
-ELFNAME2(linux,signature)(l, epp, eh, itp)
+ELFNAME2(linux,signature)(struct lwp *l, struct exec_package *epp, Elf_Ehdr *eh, char *itp)
 	struct lwp *l;
 	struct exec_package *epp;
 	Elf_Ehdr *eh;
 	char *itp;
+{
 	size_t i;
 	Elf_Phdr *ph;
 	size_t phsize;
 	int error;
 	static const char linux[] = "Linux";
 	if (eh->e_ident[EI_OSABI] == 3 ||
 	    memcmp(&eh->e_ident[EI_ABIVERSION], linux, sizeof(linux)) == 0)
 		return 0;
 	phsize = eh->e_phnum * sizeof(Elf_Phdr);
 	ph = (Elf_Phdr *)malloc(phsize, M_TEMP, M_WAITOK);

 @@ -1,14 +1,14 @@
-/* 	$NetBSD: linux_limit.h,v 1.3 2008/04/28 20:23:43 martin Exp $ */
+/* 	$NetBSD: linux_limit.h,v 1.4 2009/03/15 15:55:51 cegger Exp $ */
 /*-
  * Copyright (c) 1995, 1998, 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Frank van der Linden and Eric Haszlakiewicz; by Jason R. Thorpe
  * of the Numerical Aerospace Simulation Facility, NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -47,28 +47,27 @@ static int linux_to_bsd_limit(int);
     LINUX_RLIM_INFINITY : (int32_t)(b)->f
 #endif
 #define bsd_to_linux_rlimit(l, b) \
     bsd_to_linux_rlimit1(l, b, rlim_cur); \
     bsd_to_linux_rlimit1(l, b, rlim_max)
 #define linux_to_bsd_rlimit1(b, l, f) \
     (b)->f = (l)->f == LINUX_RLIM_INFINITY ? RLIM_INFINITY : (l)->f
 #define linux_to_bsd_rlimit(b, l) \
     linux_to_bsd_rlimit1(b, l, rlim_cur); \
     linux_to_bsd_rlimit1(b, l, rlim_max)
 static int
-linux_to_bsd_limit(lim)
+linux_to_bsd_limit(int lim)
 	int lim;
+{
 	switch (lim) {
 	case LINUX_RLIMIT_CPU:
 		return RLIMIT_CPU;
 	case LINUX_RLIMIT_FSIZE:
 		return RLIMIT_FSIZE;
 	case LINUX_RLIMIT_DATA:
 		return RLIMIT_DATA;
 	case LINUX_RLIMIT_STACK:
 		return RLIMIT_STACK;
 	case LINUX_RLIMIT_CORE:
 		return RLIMIT_CORE;
 	case LINUX_RLIMIT_RSS:

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_statfs.h,v 1.3 2008/04/28 20:23:44 martin Exp $	*/
+/*	$NetBSD: linux_statfs.h,v 1.4 2009/03/15 15:55:51 cegger Exp $	*/
 /*-
  * Copyright (c) 1995, 1998, 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Frank van der Linden and Eric Haszlakiewicz; by Jason R. Thorpe
  * of the Numerical Aerospace Simulation Facility, NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -32,29 +32,27 @@
 #ifndef _LINUX_STATFS_H
 #define _LINUX_STATFS_H
 static void bsd_to_linux_statfs(const struct statvfs *,
     struct linux_statfs *);
 /*
  * Convert NetBSD statvfs structure to Linux statfs structure.
  * Linux doesn't have f_flag, and we can't set f_frsize due
  * to glibc statvfs() bug (see below).
  */
 static void
-bsd_to_linux_statfs(bsp, lsp)
+bsd_to_linux_statfs(const struct statvfs *bsp, struct linux_statfs *lsp)
 	const struct statvfs *bsp;
 	struct linux_statfs *lsp;
+{
 	int i;
 	for (i = 0; i < linux_fstypes_cnt; i++) {
 		if (strcmp(bsp->f_fstypename, linux_fstypes[i].bsd) == 0) {
 			lsp->l_ftype = linux_fstypes[i].linux;
 			break;
+		}
+	}
 	if (i == linux_fstypes_cnt) {
 		lsp->l_ftype = LINUX_DEFAULT_SUPER_MAGIC;
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_termios.h,v 1.18 2008/06/28 21:34:32 chris Exp $	*/
+/*	$NetBSD: linux_termios.h,v 1.19 2009/03/15 15:55:51 cegger Exp $	*/
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Eric Haszlakiewicz.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -175,33 +175,29 @@ static void bsd_termios_to_linux_termios
 /*
  * Deal with termio ioctl cruft. This doesn't look very good..
  * XXX too much code duplication, obviously..
+ *
  * The conversion routines between Linux and BSD structures assume
  * that the fields are already filled with the current values,
  * so that fields present in BSD but not in Linux keep their current
  * values.
  */
 static void
 #ifdef COMPAT_LINUX32
-linux32_termio_to_bsd_termios(lt, bts)
+linux32_termio_to_bsd_termios(struct linux32_termio *lt, struct termios *bts)
 	struct linux32_termio *lt;
 	struct termios *bts;
 #else
-linux_termio_to_bsd_termios(lt, bts)
+linux_termio_to_bsd_termios(struct linux_termio *lt, struct termios *bts)
 	struct linux_termio *lt;
 	struct termios *bts;
 #endif
+{
 	int index;
 	bts->c_iflag = 0;
 	bts->c_iflag |= cvtto_bsd_mask(lt->c_iflag, LINUX_IGNBRK, IGNBRK);
 	bts->c_iflag |= cvtto_bsd_mask(lt->c_iflag, LINUX_BRKINT, BRKINT);
 	bts->c_iflag |= cvtto_bsd_mask(lt->c_iflag, LINUX_IGNPAR, IGNPAR);
 	bts->c_iflag |= cvtto_bsd_mask(lt->c_iflag, LINUX_INPCK, INPCK);
 	bts->c_iflag |= cvtto_bsd_mask(lt->c_iflag, LINUX_ISTRIP, ISTRIP);
 	bts->c_iflag |= cvtto_bsd_mask(lt->c_iflag, LINUX_INLCR, INLCR);
 	bts->c_iflag |= cvtto_bsd_mask(lt->c_iflag, LINUX_IGNCR, IGNCR);
 	bts->c_iflag |= cvtto_bsd_mask(lt->c_iflag, LINUX_ICRNL, ICRNL);
 @@ -264,33 +260,29 @@ linux_termio_to_bsd_termios(lt, bts)
 	bts->c_ispeed = bts->c_ospeed = linux_speeds[index];
 	bts->c_cc[VINTR] = lt->c_cc[LINUX_OLD_VINTR];
 	bts->c_cc[VQUIT] = lt->c_cc[LINUX_OLD_VQUIT];
 	bts->c_cc[VERASE] = lt->c_cc[LINUX_OLD_VERASE];
 	bts->c_cc[VKILL] = lt->c_cc[LINUX_OLD_VKILL];
 	bts->c_cc[VEOF] = lt->c_cc[LINUX_OLD_VEOF];
 	bts->c_cc[VTIME] = lt->c_cc[LINUX_OLD_VTIME];
 	bts->c_cc[VMIN] = lt->c_cc[LINUX_OLD_VMIN];
+}
 static void
 #ifdef COMPAT_LINUX32
-bsd_termios_to_linux32_termio(bts, lt)
+bsd_termios_to_linux32_termio(struct termios *bts, struct linux32_termio *lt)
 	struct termios *bts;
 	struct linux32_termio *lt;
 #else
-bsd_termios_to_linux_termio(bts, lt)
+bsd_termios_to_linux_termio(struct termios *bts, struct linux_termio *lt)
 	struct termios *bts;
 	struct linux_termio *lt;
 #endif
+{
 	int i, mask;
 	lt->c_iflag = 0;
 	lt->c_iflag |= cvtto_linux_mask(bts->c_iflag, IGNBRK, LINUX_IGNBRK);
 	lt->c_iflag |= cvtto_linux_mask(bts->c_iflag, BRKINT, LINUX_BRKINT);
 	lt->c_iflag |= cvtto_linux_mask(bts->c_iflag, IGNPAR, LINUX_IGNPAR);
 	lt->c_iflag |= cvtto_linux_mask(bts->c_iflag, INPCK, LINUX_INPCK);
 	lt->c_iflag |= cvtto_linux_mask(bts->c_iflag, ISTRIP, LINUX_ISTRIP);
 	lt->c_iflag |= cvtto_linux_mask(bts->c_iflag, INLCR, LINUX_INLCR);
 	lt->c_iflag |= cvtto_linux_mask(bts->c_iflag, IGNCR, LINUX_IGNCR);
 	lt->c_iflag |= cvtto_linux_mask(bts->c_iflag, ICRNL, LINUX_ICRNL);
 @@ -356,33 +348,29 @@ bsd_termios_to_linux_termio(bts, lt)
 	lt->c_cc[LINUX_VERASE] = bts->c_cc[VERASE];
 	lt->c_cc[LINUX_VKILL] = bts->c_cc[VKILL];
 	lt->c_cc[LINUX_VEOF] = bts->c_cc[VEOF];
 	lt->c_cc[LINUX_VTIME] = bts->c_cc[VTIME];
 	lt->c_cc[LINUX_VMIN] = bts->c_cc[VMIN];
 	lt->c_cc[LINUX_VSWTC] = 0;
 	/* XXX should be fixed someday */
 	lt->c_line = 0;
+}
 static void
 #ifdef COMPAT_LINUX32
-linux32_termios_to_bsd_termios(lts, bts)
+linux32_termios_to_bsd_termios(struct linux32_termios *lts, struct termios *bts)
 	struct linux32_termios *lts;
 	struct termios *bts;
 #else
-linux_termios_to_bsd_termios(lts, bts)
+linux_termios_to_bsd_termios(struct linux_termios *lts, struct termios *bts)
 	struct linux_termios *lts;
 	struct termios *bts;
 #endif
+{
 	int index;
 	bts->c_iflag = 0;
 	bts->c_iflag |= cvtto_bsd_mask(lts->c_iflag, LINUX_IGNBRK, IGNBRK);
 	bts->c_iflag |= cvtto_bsd_mask(lts->c_iflag, LINUX_BRKINT, BRKINT);
 	bts->c_iflag |= cvtto_bsd_mask(lts->c_iflag, LINUX_IGNPAR, IGNPAR);
 	bts->c_iflag |= cvtto_bsd_mask(lts->c_iflag, LINUX_INPCK, INPCK);
 	bts->c_iflag |= cvtto_bsd_mask(lts->c_iflag, LINUX_ISTRIP, ISTRIP);
 	bts->c_iflag |= cvtto_bsd_mask(lts->c_iflag, LINUX_INLCR, INLCR);
 	bts->c_iflag |= cvtto_bsd_mask(lts->c_iflag, LINUX_IGNCR, IGNCR);
 	bts->c_iflag |= cvtto_bsd_mask(lts->c_iflag, LINUX_ICRNL, ICRNL);
 @@ -457,33 +445,29 @@ linux_termios_to_bsd_termios(lts, bts)
 	bts->c_cc[VEOL] = lts->c_cc[LINUX_VEOL];
 	bts->c_cc[VEOL2] = lts->c_cc[LINUX_VEOL2];
 	bts->c_cc[VWERASE] = lts->c_cc[LINUX_VWERASE];
 	bts->c_cc[VSUSP] = lts->c_cc[LINUX_VSUSP];
 	bts->c_cc[VSTART] = lts->c_cc[LINUX_VSTART];
 	bts->c_cc[VSTOP] = lts->c_cc[LINUX_VSTOP];
 	bts->c_cc[VLNEXT] = lts->c_cc[LINUX_VLNEXT];
 	bts->c_cc[VDISCARD] = lts->c_cc[LINUX_VDISCARD];
 	bts->c_cc[VREPRINT] = lts->c_cc[LINUX_VREPRINT];
+}
 static void
 #ifdef COMPAT_LINUX32
-bsd_termios_to_linux32_termios(bts, lts)
+bsd_termios_to_linux32_termios(struct termios *bts, struct linux32_termios *lts)
 	struct termios *bts;
 	struct linux32_termios *lts;
 #else
-bsd_termios_to_linux_termios(bts, lts)
+bsd_termios_to_linux_termios(struct termios *bts, struct linux_termios *lts)
 	struct termios *bts;
 	struct linux_termios *lts;
 #endif
+{
 	int i, mask;
 	lts->c_iflag = 0;
 	lts->c_iflag |= cvtto_linux_mask(bts->c_iflag, IGNBRK, LINUX_IGNBRK);
 	lts->c_iflag |= cvtto_linux_mask(bts->c_iflag, BRKINT, LINUX_BRKINT);
 	lts->c_iflag |= cvtto_linux_mask(bts->c_iflag, IGNPAR, LINUX_IGNPAR);
 	lts->c_iflag |= cvtto_linux_mask(bts->c_iflag, INPCK, LINUX_INPCK);
 	lts->c_iflag |= cvtto_linux_mask(bts->c_iflag, ISTRIP, LINUX_ISTRIP);
 	lts->c_iflag |= cvtto_linux_mask(bts->c_iflag, INLCR, LINUX_INLCR);
 	lts->c_iflag |= cvtto_linux_mask(bts->c_iflag, IGNCR, LINUX_IGNCR);
 	lts->c_iflag |= cvtto_linux_mask(bts->c_iflag, ICRNL, LINUX_ICRNL);