svn commit: r315316 - stable/11/sys/compat/linux

[Dmitry Chagin]

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