summaryrefslogtreecommitdiffstats
path: root/runtime/uprobes/uprobes.c
diff options
context:
space:
mode:
authorJim Keniston <jkenisto@us.ibm.com>2008-11-03 14:47:12 -0800
committerJim Keniston <jkenisto@us.ibm.com>2008-11-03 14:47:12 -0800
commit904b272c43bf358300719d01836bcd10c04aa356 (patch)
treec6fdb97c5643780ad37001a421080ff30ec76a5b /runtime/uprobes/uprobes.c
parentb8aa3fa820c059f0f8abb4025f464d90d1f9cb9e (diff)
downloadsystemtap-steved-904b272c43bf358300719d01836bcd10c04aa356.tar.gz
systemtap-steved-904b272c43bf358300719d01836bcd10c04aa356.tar.xz
systemtap-steved-904b272c43bf358300719d01836bcd10c04aa356.zip
Add a version of uprobes that works with the 2.6.27 version of utrace.
Diffstat (limited to 'runtime/uprobes/uprobes.c')
-rw-r--r--runtime/uprobes/uprobes.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/runtime/uprobes/uprobes.c b/runtime/uprobes/uprobes.c
index 8c187bd1..22d62ecc 100644
--- a/runtime/uprobes/uprobes.c
+++ b/runtime/uprobes/uprobes.c
@@ -1,3 +1,14 @@
+#include <linux/utrace.h>
+#ifndef UTRACE_ACTION_RESUME
+
+/*
+ * Assume the kernel is running the 2008 version of utrace.
+ * Skip the code in this file and instead use uprobes 2.
+ */
+#include "../uprobes2/uprobes.c"
+
+#else /* uprobes 1 (based on original utrace) */
+
/*
* Userspace Probes (UProbes)
* kernel/uprobes_core.c
@@ -2575,3 +2586,5 @@ static int __access_process_vm(struct task_struct *tsk, unsigned long addr, void
#endif
#include "uprobes_arch.c"
MODULE_LICENSE("GPL");
+
+#endif /* uprobes 1 (based on original utrace) */