|
From: <sv...@va...> - 2013-04-04 10:55:17
|
petarj 2013-04-04 11:55:09 +0100 (Thu, 04 Apr 2013)
New Revision: 13359
Log:
mips: add different value for SOCK_STREAM
MIPS uses different values for socket types.
This is protected by ARCH_HAS_SOCKET_TYPES in Linux kernel and we introduce
it here too. This is important for log-socket feature, and it resolves the
issue reported in https://bugs.kde.org/show_bug.cgi?id=313267#c21.
Modified files:
trunk/include/vki/vki-linux.h
trunk/include/vki/vki-mips32-linux.h
trunk/include/vki/vki-mips64-linux.h
Modified: trunk/include/vki/vki-linux.h (+2 -0)
===================================================================
--- trunk/include/vki/vki-linux.h 2013-04-04 00:43:11 -23:00 (rev 13358)
+++ trunk/include/vki/vki-linux.h 2013-04-04 11:55:09 +01:00 (rev 13359)
@@ -588,10 +588,12 @@
#define VKI_SYS_RECVMSG 17 /* sys_recvmsg(2) */
#define VKI_SYS_ACCEPT4 18 /* sys_accept4(2) */
+#ifndef ARCH_HAS_SOCKET_TYPES
enum vki_sock_type {
VKI_SOCK_STREAM = 1,
// [[others omitted]]
};
+#endif /* ARCH_HAS_SOCKET_TYPES */
//----------------------------------------------------------------------
// From linux-2.6.8.1/include/linux/uio.h
Modified: trunk/include/vki/vki-mips32-linux.h (+9 -1)
===================================================================
--- trunk/include/vki/vki-mips32-linux.h 2013-04-04 00:43:11 -23:00 (rev 13358)
+++ trunk/include/vki/vki-mips32-linux.h 2013-04-04 11:55:09 +01:00 (rev 13359)
@@ -964,9 +964,17 @@
#define VKI_BRK_OVERFLOW 6 /* Overflow check */
#define VKI_BRK_DIVZERO 7 /* Divide by zero check */
+//----------------------------------------------------------------------
+// From linux-3.6.35.5/arch/mips/include/socket.h
+//----------------------------------------------------------------------
+enum vki_sock_type {
+ VKI_SOCK_STREAM = 2,
+ // [[others omitted]]
+};
+#define ARCH_HAS_SOCKET_TYPES 1
+
#endif // __VKI_MIPS32_LINUX_H
-
/*--------------------------------------------------------------------*/
/*--- end vki-mips32-linux.h ---*/
/*--------------------------------------------------------------------*/
Modified: trunk/include/vki/vki-mips64-linux.h (+9 -0)
===================================================================
--- trunk/include/vki/vki-mips64-linux.h 2013-04-04 00:43:11 -23:00 (rev 13358)
+++ trunk/include/vki/vki-mips64-linux.h 2013-04-04 11:55:09 +01:00 (rev 13359)
@@ -987,6 +987,15 @@
#define VKI_BRK_OVERFLOW 6 /* Overflow check */
#define VKI_BRK_DIVZERO 7 /* Divide by zero check */
+//----------------------------------------------------------------------
+// From linux-3.6.35.5/arch/mips/include/socket.h
+//----------------------------------------------------------------------
+enum vki_sock_type {
+ VKI_SOCK_STREAM = 2,
+ // [[others omitted]]
+};
+#define ARCH_HAS_SOCKET_TYPES 1
+
#endif // __VKI_MIPS64_LINUX_H
/*--------------------------------------------------------------------*/
|