summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Ch. Eigler <fche@elastic.org>2009-03-22 11:20:23 -0400
committerFrank Ch. Eigler <fche@elastic.org>2009-03-22 11:20:23 -0400
commit1fa23e70a939c20664d7ae6ee5ef66b51835e0ee (patch)
treec553b06885426fae73698010bcb987017df65084
parenta99eea4f68db917268b83ab75574c832b646bd65 (diff)
downloadsystemtap-steved-1fa23e70a939c20664d7ae6ee5ef66b51835e0ee.tar.gz
systemtap-steved-1fa23e70a939c20664d7ae6ee5ef66b51835e0ee.tar.xz
systemtap-steved-1fa23e70a939c20664d7ae6ee5ef66b51835e0ee.zip
PR9974: adapt to utrace_connected_engine -> utrace_engine
Adjusted all headers that #include <linux/utrace.h> to follow with: /* PR9974: Adapt to struct renaming. */
-rw-r--r--runtime/itrace.c6
-rw-r--r--runtime/task_finder.c6
-rw-r--r--runtime/uprobes2/uprobes.c6
-rw-r--r--runtime/uprobes2/uprobes.h5
-rw-r--r--runtime/utrace_compatibility.h5
5 files changed, 28 insertions, 0 deletions
diff --git a/runtime/itrace.c b/runtime/itrace.c
index 3d9ded2f..618cbff0 100644
--- a/runtime/itrace.c
+++ b/runtime/itrace.c
@@ -18,6 +18,12 @@
#include <linux/sched.h>
#include <linux/rcupdate.h>
#include <linux/utrace.h>
+
+/* PR9974: Adapt to struct renaming. */
+#ifdef UTRACE_API_VERSION
+#define utrace_attached_engine utrace_engine
+#endif
+
#include <asm/string.h>
#include "uprobes/uprobes.h"
#include "utrace_compatibility.h"
diff --git a/runtime/task_finder.c b/runtime/task_finder.c
index 2b408763..3f4908cb 100644
--- a/runtime/task_finder.c
+++ b/runtime/task_finder.c
@@ -6,6 +6,12 @@
#endif
#include <linux/utrace.h>
+
+/* PR9974: Adapt to struct renaming. */
+#ifdef UTRACE_API_VERSION
+#define utrace_attached_engine utrace_engine
+#endif
+
#include <linux/list.h>
#include <linux/binfmts.h>
#include <linux/mount.h>
diff --git a/runtime/uprobes2/uprobes.c b/runtime/uprobes2/uprobes.c
index af187fc9..a0e9f2fe 100644
--- a/runtime/uprobes2/uprobes.c
+++ b/runtime/uprobes2/uprobes.c
@@ -29,6 +29,12 @@
#include <linux/utrace.h>
#include <linux/regset.h>
#define UPROBES_IMPLEMENTATION 1
+
+/* PR9974: Adapt to struct renaming. */
+#ifdef UTRACE_API_VERSION
+#define utrace_attached_engine utrace_engine
+#endif
+
#include "uprobes.h"
#include <linux/tracehook.h>
#include <linux/mm.h>
diff --git a/runtime/uprobes2/uprobes.h b/runtime/uprobes2/uprobes.h
index 11d01f5c..112e29e2 100644
--- a/runtime/uprobes2/uprobes.h
+++ b/runtime/uprobes2/uprobes.h
@@ -23,6 +23,11 @@
#include <linux/types.h>
#include <linux/list.h>
+/* Adapt to struct renaming. */
+#ifdef UTRACE_API_VERSION
+#define utrace_attached_engine utrace_engine
+#endif
+
struct pt_regs;
enum uprobe_type {
diff --git a/runtime/utrace_compatibility.h b/runtime/utrace_compatibility.h
index 4a70da42..5521a5c2 100644
--- a/runtime/utrace_compatibility.h
+++ b/runtime/utrace_compatibility.h
@@ -13,6 +13,11 @@
#include <linux/utrace.h>
+/* PR9974: Adapt to struct renaming. */
+#ifdef UTRACE_API_VERSION
+#define utrace_attached_engine utrace_engine
+#endif
+
#ifdef UTRACE_ACTION_RESUME
/*