diff --git a/coregrind/vgdb-invoker-ptrace.c b/coregrind/vgdb-invoker-ptrace.c
index acb4d0dac..f69154a02 100644
--- a/coregrind/vgdb-invoker-ptrace.c
+++ b/coregrind/vgdb-invoker-ptrace.c
@@ -64,6 +64,13 @@
 
 #include <sys/procfs.h>
 
+#if defined(VGA_s390x)
+/* RHEL 5 uses glibc 2.3.4 which does not define PTRACE_GETSIGINFO */
+#   ifndef PTRACE_GETSIGINFO
+#   define PTRACE_GETSIGINFO 0x4202
+#   endif
+#endif
+
 #if VEX_HOST_WORDSIZE == 8
 typedef Addr64 CORE_ADDR;
 #elif VEX_HOST_WORDSIZE == 4
diff --git a/gdbserver_tests/filter_stderr b/gdbserver_tests/filter_stderr
index efe81ec28..866457777 100755
--- a/gdbserver_tests/filter_stderr
+++ b/gdbserver_tests/filter_stderr
@@ -3,6 +3,7 @@
 dir=`dirname $0`
 
 $dir/../tests/filter_stderr_basic    |
+perl  -0777 -p -e   's/error 4 Interrupted system call\nVG_\(poll\) failed \(old kernel \?\) retrying .*\n//g' |
 sed -e '/^Copyright (C) /d' \
     \
     -e '/TO DEBUG THIS PROCESS USING GDB/d' \