Merge branch 'master' of ssh://sources.redhat.com/git/systemtap

7 files changed, 18 insertions, 18 deletions

diff --git a/includes/sys/sdt.h b/includes/sys/sdt.h
index 104973df..7affade6 100644
--- a/includes/sys/sdt.h
+++ b/includes/sys/sdt.h
@@ -18,12 +18,10 @@
 #endif
 
 /* Allocated section needs to be writable when creating pic shared objects
-   because we store relocatable addresses in them. */
-#ifdef __PIC__
+   because we store relocatable addresses in them.  We used to make this
+   read only for non-pic executables, but the new semaphore support relies
+   on having a writable .probes section to put the enabled variables in. */
 #define ALLOCSEC "\"aw\""
-#else
-#define ALLOCSEC "\"a\""
-#endif
 
 /* An allocated section .probes that holds the probe names and addrs. */
 #define STAP_PROBE_DATA_(probe,guard,arg)		\
diff --git a/runtime/staprun/relay.c b/runtime/staprun/relay.c
index 0c009235..59d7ac9a 100644
--- a/runtime/staprun/relay.c
+++ b/runtime/staprun/relay.c
@@ -22,16 +22,9 @@ static time_t *time_backlog[NR_CPUS];
 static int backlog_order=0;
 #define BACKLOG_MASK ((1 << backlog_order) - 1)
 
-/*
- * ppoll exists in glibc >= 2.4
- */
-#if (__GLIBC__ < 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ < 4))
-#define NEED_PPOLL
-#endif
-
 #ifdef NEED_PPOLL
-static int ppoll(struct pollfd *fds, nfds_t nfds,
-		 const struct timespec *timeout, const sigset_t *sigmask)
+int ppoll(struct pollfd *fds, nfds_t nfds,
+	  const struct timespec *timeout, const sigset_t *sigmask)
 {
 	sigset_t origmask;
 	int ready;
diff --git a/runtime/staprun/staprun.h b/runtime/staprun/staprun.h
index 1dcfabbe..f9f01003 100644
--- a/runtime/staprun/staprun.h
+++ b/runtime/staprun/staprun.h
@@ -186,3 +186,13 @@ extern int out_fd[NR_CPUS];
 /* relay_old uses these. Set in ctl.c */
 extern unsigned subbuf_size;
 extern unsigned n_subbufs;
+
+/*
+ * ppoll exists in glibc >= 2.4
+ */
+#if (__GLIBC__ < 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ < 4))
+#define NEED_PPOLL
+
+extern int ppoll(struct pollfd *fds, nfds_t nfds,
+		 const struct timespec *timeout, const sigset_t *sigmask);
+#endif
diff --git a/runtime/uprobes/uprobes.txt b/runtime/uprobes/uprobes.txt
index edd524be..98219eb9 100644
--- a/runtime/uprobes/uprobes.txt
+++ b/runtime/uprobes/uprobes.txt
@@ -143,7 +143,6 @@ architectures:
 - i386
 - x86_64 (AMD-64, EM64T)
 - ppc64
-- ia64
 - s390x
 
 3. Configuring Uprobes
diff --git a/tapset/ucontext-symbols.stp b/tapset/ucontext-symbols.stp
index e884a36b..574a32be 100644
--- a/tapset/ucontext-symbols.stp
+++ b/tapset/ucontext-symbols.stp
@@ -64,7 +64,7 @@ function usymdata:string (addr: long) %{ /* pure */ /* unprivileged */
  *  name  of the function containing the address, and an estimate of
  *  its position within that function.  Return nothing.
  */
-function print_ustack(stk:string) %{ /* pure */ /* unprivileged */
+function print_ustack(stk:string) %{ /* unprivileged */
         char *ptr = THIS->stk;
         char *tok = strsep(&ptr, " ");
         assert_is_myproc();
diff --git a/testsuite/buildok/netdev.stp b/testsuite/buildok/netdev.stp
index 25510379..49a1eb5c 100755
--- a/testsuite/buildok/netdev.stp
+++ b/testsuite/buildok/netdev.stp
@@ -1,4 +1,4 @@
-#! /usr/bin/env stap -wp4
+#! stap -wp4
 
 probe netdev.get_stats{
 	printf("%s", dev_name)
diff --git a/testsuite/systemtap.base/vta-test.c b/testsuite/systemtap.base/vta-test.c
index 70d965c4..40986db9 100644
--- a/testsuite/systemtap.base/vta-test.c
+++ b/testsuite/systemtap.base/vta-test.c
@@ -1,5 +1,5 @@
 #include <stdlib.h>
-#include <sys/sdt.h>
+#include "sdt.h"
 
 void
 t1 (int i)