diff options
| author | manu <manu@NetBSD.org> | 2006-08-25 16:17:05 +0000 |
|---|---|---|
| committer | manu <manu@NetBSD.org> | 2006-08-25 16:17:05 +0000 |
| commit | 753fce01f419f4a64fef23d4cd3b53bf82e4813a (patch) | |
| tree | 0940b79633427d0e51a4a4fedb2b6dc65b84f814 /sys/compat/linux32 | |
| parent | 2af744a1fb9b77b1b44e233a401e5cd6a723644f (diff) | |
netbsd32_sys_ioctl was called with improper syscall argument structure, this
caused any X11 program to fail because FIONREAD ioctl always returned an
error.
Diffstat (limited to 'sys/compat/linux32')
| -rw-r--r-- | sys/compat/linux32/common/linux32_termios.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/compat/linux32/common/linux32_termios.c b/sys/compat/linux32/common/linux32_termios.c index e126837dd1e..4a622e33605 100644 --- a/sys/compat/linux32/common/linux32_termios.c +++ b/sys/compat/linux32/common/linux32_termios.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux32_termios.c,v 1.1 2006/02/15 09:31:17 manu Exp $ */ +/* $NetBSD: linux32_termios.c,v 1.2 2006/08/25 16:17:05 manu Exp $ */ /*- * Copyright (c) 1995-2006 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux32_termios.c,v 1.1 2006/02/15 09:31:17 manu Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux32_termios.c,v 1.2 2006/08/25 16:17:05 manu Exp $"); #include "opt_compat_linux32.h" @@ -85,7 +85,7 @@ linux32_ioctl_termios(l, uap, retval) struct linux32_termios tmplts; struct termios tmpbts; int idat; - struct sys_ioctl_args ia; + struct netbsd32_ioctl_args ia; int error; char tioclinux; int (*bsdioctl)(struct file *, u_long, void *, struct lwp *); @@ -338,7 +338,7 @@ linux32_ioctl_termios(l, uap, retval) SCARG(&ia, fd) = SCARG(uap, fd); SCARG(&ia, com) = TIOCPTSNAME; - SCARG(&ia, data) = ptmp; + SCARG(&ia, data) = (netbsd32_u_long)(u_long)ptmp; if ((error = sys_ioctl(curlwp, &ia, retval)) != 0) goto out; @@ -359,7 +359,7 @@ linux32_ioctl_termios(l, uap, retval) } SCARG(&ia, fd) = SCARG(uap, fd); - SCARG(&ia, data) = NETBSD32PTR64(SCARG(uap, data)); + SCARG(&ia, data) = SCARG(uap, data); /* XXX NJWLWP */ error = netbsd32_ioctl(curlwp, &ia, retval); out: |
