From owner-svn-src-user@FreeBSD.ORG Sat Jan 31 17:45:49 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4C751966; Sat, 31 Jan 2015 17:45:49 +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 38D5C841; Sat, 31 Jan 2015 17:45:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0VHjnbv000998; Sat, 31 Jan 2015 17:45:49 GMT (envelope-from dchagin@FreeBSD.org) Received: (from dchagin@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0VHjnEd000995; Sat, 31 Jan 2015 17:45:49 GMT (envelope-from dchagin@FreeBSD.org) Message-Id: <201501311745.t0VHjnEd000995@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dchagin set sender to dchagin@FreeBSD.org using -f From: Dmitry Chagin Date: Sat, 31 Jan 2015 17:45:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r277986 - 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-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 31 Jan 2015 17:45:49 -0000 Author: dchagin Date: Sat Jan 31 17:45:48 2015 New Revision: 277986 URL: https://svnweb.freebsd.org/changeset/base/277986 Log: Clean a style(9) bug. Use process sysentvec to detect the linux ABI. 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 Jan 31 17:35:53 2015 (r277985) +++ user/dchagin/lemul/sys/compat/linux/linux_misc.c Sat Jan 31 17:45:48 2015 (r277986) @@ -2004,7 +2004,6 @@ linux_sched_rr_get_interval(struct threa struct thread * linux_tdfind(struct thread *td, lwpid_t tid, pid_t pid) { - struct linux_pemuldata *pem; struct linux_emuldata *em; struct thread *tdt; struct proc *p; @@ -2020,9 +2019,8 @@ linux_tdfind(struct thread *td, lwpid_t * Initial thread where the tid equal to the pid. */ p = pfind(tid); - if (p) { - pem = pem_find(p); - if (pem == NULL) { + if (p != NULL) { + if (SV_PROC_ABI(p) != SV_ABI_LINUX) { /* * p is not a Linuxulator process. */