|
From: <sv...@va...> - 2014-11-23 12:38:29
|
Author: sewardj
Date: Sun Nov 23 12:38:22 2014
New Revision: 14755
Log:
Merge, from trunk, r14646 (just the fix, not the test)
339706 Fix false positive for ioctl(TIOCSIG) on linux
14646 (just the fix)
Modified:
branches/VALGRIND_3_10_BRANCH/coregrind/m_syswrap/syswrap-linux.c (contents, props changed)
branches/VALGRIND_3_10_BRANCH/include/vki/vki-linux.h (contents, props changed)
Modified: branches/VALGRIND_3_10_BRANCH/coregrind/m_syswrap/syswrap-linux.c
==============================================================================
--- branches/VALGRIND_3_10_BRANCH/coregrind/m_syswrap/syswrap-linux.c (original)
+++ branches/VALGRIND_3_10_BRANCH/coregrind/m_syswrap/syswrap-linux.c Sun Nov 23 12:38:22 2014
@@ -5481,6 +5481,7 @@
case VKI_TCXONC:
case VKI_TCSBRKP:
case VKI_TCFLSH:
+ case VKI_TIOCSIG:
/* These just take an int by value */
break;
case VKI_TIOCGWINSZ:
@@ -8269,6 +8270,7 @@
case VKI_TCXONC:
case VKI_TCSBRKP:
case VKI_TCFLSH:
+ case VKI_TIOCSIG:
break;
case VKI_TIOCGWINSZ:
POST_MEM_WRITE( ARG3, sizeof(struct vki_winsize) );
Modified: branches/VALGRIND_3_10_BRANCH/include/vki/vki-linux.h
==============================================================================
--- branches/VALGRIND_3_10_BRANCH/include/vki/vki-linux.h (original)
+++ branches/VALGRIND_3_10_BRANCH/include/vki/vki-linux.h Sun Nov 23 12:38:22 2014
@@ -2955,6 +2955,10 @@
#define VKI_FIOQSIZE 0x5460 /* Value differs on some platforms */
#endif
+#ifndef VKI_TIOCSIG
+#define VKI_TIOCSIG _VKI_IOW('T', 0x36, int) /* Value differs on some platforms */
+#endif
+
//----------------------------------------------------------------------
// From kernel/common/include/linux/ashmem.h
//----------------------------------------------------------------------
|