From owner-svn-src-user@FreeBSD.ORG  Sat Mar  2 18:38:30 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 0F782EB0;
 Sat,  2 Mar 2013 18:38:30 +0000 (UTC)
 (envelope-from dchagin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 027B9CB8;
 Sat,  2 Mar 2013 18:38:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r22IcTcH096523;
 Sat, 2 Mar 2013 18:38:29 GMT (envelope-from dchagin@svn.freebsd.org)
Received: (from dchagin@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r22IcTCo096522;
 Sat, 2 Mar 2013 18:38:29 GMT (envelope-from dchagin@svn.freebsd.org)
Message-Id: <201303021838.r22IcTCo096522@svn.freebsd.org>
From: Dmitry Chagin <dchagin@FreeBSD.org>
Date: Sat, 2 Mar 2013 18:38:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r247664 - user/dchagin/lemul/sys/compat/linux
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 02 Mar 2013 18:38:30 -0000

Author: dchagin
Date: Sat Mar  2 18:38:29 2013
New Revision: 247664
URL: http://svnweb.freebsd.org/changeset/base/247664

Log:
  Fix a bug introduced in r247493.
  Use proper type to handle ia32 pointers.

Modified:
  user/dchagin/lemul/sys/compat/linux/linux_misc.c

Modified: user/dchagin/lemul/sys/compat/linux/linux_misc.c
==============================================================================
--- user/dchagin/lemul/sys/compat/linux/linux_misc.c	Sat Mar  2 18:27:51 2013	(r247663)
+++ user/dchagin/lemul/sys/compat/linux/linux_misc.c	Sat Mar  2 18:38:29 2013	(r247664)
@@ -118,7 +118,7 @@ struct l_sysinfo {
 };
 
 struct l_pselect6arg {
-	l_sigset_t	*ss;
+	l_uintptr_t	ss;
 	l_size_t	ss_len;
 };
 
@@ -2095,7 +2095,7 @@ linux_pselect6(struct thread *td, struct
 			return (error);
 		if (lpse6.ss_len != sizeof(l_ss))
 			return (EINVAL);
-		error = copyin(lpse6.ss, &l_ss, sizeof(l_ss));
+		error = copyin(PTRIN(lpse6.ss), &l_ss, sizeof(l_ss));
 		if (error)
 			return (error);
 		linux_to_bsd_sigset(&l_ss, &ss);