From owner-svn-src-all@freebsd.org Wed Mar 15 17:16:44 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5CBD0D0E72F; Wed, 15 Mar 2017 17:16:44 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 2BE361368; Wed, 15 Mar 2017 17:16:44 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2FHGhwc054688; Wed, 15 Mar 2017 17:16:43 GMT (envelope-from dchagin@FreeBSD.org) Received: (from dchagin@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2FHGhC7054687; Wed, 15 Mar 2017 17:16:43 GMT (envelope-from dchagin@FreeBSD.org) Message-Id: <201703151716.v2FHGhC7054687@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dchagin set sender to dchagin@FreeBSD.org using -f From: Dmitry Chagin Date: Wed, 15 Mar 2017 17:16:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r315316 - stable/11/sys/compat/linux X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Mar 2017 17:16:44 -0000 Author: dchagin Date: Wed Mar 15 17:16:43 2017 New Revision: 315316 URL: https://svnweb.freebsd.org/changeset/base/315316 Log: MFC r314643: Hide Linux socketcall constants under corresponding #ifdef since they are used only in i386 Linuxulator. Modified: stable/11/sys/compat/linux/linux_socket.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/compat/linux/linux_socket.h ============================================================================== --- stable/11/sys/compat/linux/linux_socket.h Wed Mar 15 17:14:05 2017 (r315315) +++ stable/11/sys/compat/linux/linux_socket.h Wed Mar 15 17:16:43 2017 (r315316) @@ -141,7 +141,6 @@ struct l_ucred { }; #if defined(__i386__) || (defined(__amd64__) && defined(COMPAT_LINUX32)) - struct linux_accept_args { register_t s; register_t addr; @@ -150,12 +149,7 @@ struct linux_accept_args { int linux_accept(struct thread *td, struct linux_accept_args *args); -#endif /* __i386__ || (__amd64__ && COMPAT_LINUX32) */ - - - /* Operations for socketcall */ - #define LINUX_SOCKET 1 #define LINUX_BIND 2 #define LINUX_CONNECT 3 @@ -176,6 +170,7 @@ int linux_accept(struct thread *td, stru #define LINUX_ACCEPT4 18 #define LINUX_RECVMMSG 19 #define LINUX_SENDMMSG 20 +#endif /* __i386__ || (__amd64__ && COMPAT_LINUX32) */ /* Socket options */ #define LINUX_IP_TOS 1