From owner-svn-src-user@FreeBSD.ORG Sun Mar 30 08:38:52 2014 Return-Path: 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 5527B83C; Sun, 30 Mar 2014 08:38:52 +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 4075020B; Sun, 30 Mar 2014 08:38:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2U8cqb9065439; Sun, 30 Mar 2014 08:38:52 GMT (envelope-from dchagin@svn.freebsd.org) Received: (from dchagin@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2U8cqaO065438; Sun, 30 Mar 2014 08:38:52 GMT (envelope-from dchagin@svn.freebsd.org) Message-Id: <201403300838.s2U8cqaO065438@svn.freebsd.org> From: Dmitry Chagin Date: Sun, 30 Mar 2014 08:38:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r263931 - 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.17 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: Sun, 30 Mar 2014 08:38:52 -0000 Author: dchagin Date: Sun Mar 30 08:38:51 2014 New Revision: 263931 URL: http://svnweb.freebsd.org/changeset/base/263931 Log: lxs_args[] constant is used only by the socketcall(), so move lxs_args[] declaration under the corresponding define. Modified: user/dchagin/lemul/sys/compat/linux/linux_socket.c Modified: user/dchagin/lemul/sys/compat/linux/linux_socket.c ============================================================================== --- user/dchagin/lemul/sys/compat/linux/linux_socket.c Sun Mar 30 05:06:06 2014 (r263930) +++ user/dchagin/lemul/sys/compat/linux/linux_socket.c Sun Mar 30 08:38:51 2014 (r263931) @@ -1529,6 +1529,8 @@ linux_getsockopt(struct thread *td, stru return (error); } +#if defined(__i386__) || (defined(__amd64__) && defined(COMPAT_LINUX32)) + /* Argument list sizes for linux_socketcall */ #define LINUX_AL(x) ((x) * sizeof(l_ulong)) @@ -1548,7 +1550,6 @@ static const unsigned char lxs_args[] = #define LINUX_AL_SIZE sizeof(lxs_args) / sizeof(lxs_args[0]) - 1 -#if defined(__i386__) || (defined(__amd64__) && defined(COMPAT_LINUX32)) int linux_socketcall(struct thread *td, struct linux_socketcall_args *args) {