From owner-svn-src-user@FreeBSD.ORG  Fri May 30 18:05:44 2014
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])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 65A5AF3D;
 Fri, 30 May 2014 18:05:44 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 53E0220F7;
 Fri, 30 May 2014 18:05:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4UI5iKS096023;
 Fri, 30 May 2014 18:05:44 GMT (envelope-from cognet@svn.freebsd.org)
Received: (from cognet@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4UI5iVT096022;
 Fri, 30 May 2014 18:05:44 GMT (envelope-from cognet@svn.freebsd.org)
Message-Id: <201405301805.s4UI5iVT096022@svn.freebsd.org>
From: Olivier Houchard <cognet@FreeBSD.org>
Date: Fri, 30 May 2014 18:05:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r266899 - 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.18
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: Fri, 30 May 2014 18:05:44 -0000

Author: cognet
Date: Fri May 30 18:05:43 2014
New Revision: 266899
URL: http://svnweb.freebsd.org/changeset/base/266899

Log:
  Choose /compat/linux or /compat/linux64 as prefix depending on if the
  process is a 32bits or 64bits process.

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

Modified: user/dchagin/lemul/sys/compat/linux/linux_util.c
==============================================================================
--- user/dchagin/lemul/sys/compat/linux/linux_util.c	Fri May 30 18:05:04 2014	(r266898)
+++ user/dchagin/lemul/sys/compat/linux/linux_util.c	Fri May 30 18:05:43 2014	(r266899)
@@ -59,6 +59,7 @@ MALLOC_DEFINE(M_FUTEX, "futex", "Linux f
 MALLOC_DEFINE(M_FUTEX_WP, "futex wp", "Linux futexes wp");
 
 const char      linux_emul_path[] = "/compat/linux";
+const char	linux64_emul_path[] = "/compat/linux64";
 
 /*
  * Search an alternate path before passing pathname arguments on to
@@ -71,9 +72,14 @@ int
 linux_emul_convpath(struct thread *td, const char *path, enum uio_seg pathseg,
     char **pbuf, int cflag, int dfd)
 {
+	const char *lemul_path;
 	int retval;
 
-	retval = kern_alternate_path(td, linux_emul_path, path, pathseg, pbuf,
+	if (td->td_proc->p_sysent->sv_flags & SV_LP64)
+		lemul_path = linux64_emul_path;
+	else
+		lemul_path = linux_emul_path;
+	retval = kern_alternate_path(td, lemul_path, path, pathseg, pbuf,
 	    cflag, dfd);
 
 	return (retval);