From 1fa23e70a939c20664d7ae6ee5ef66b51835e0ee Mon Sep 17 00:00:00 2001
From: "Frank Ch. Eigler" <fche@elastic.org>
Date: Sun, 22 Mar 2009 11:20:23 -0400
Subject: PR9974: adapt to utrace_connected_engine -> utrace_engine

Adjusted all headers that #include <linux/utrace.h> to follow with:

/* PR9974: Adapt to struct renaming. */
---
 runtime/uprobes2/uprobes.h | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'runtime/uprobes2/uprobes.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 {
-- 
cgit 


From 9d4518784bedd11e8563c999658f307c5c01b3a3 Mon Sep 17 00:00:00 2001
From: Jim Keniston <jkenisto@us.ibm.com>
Date: Wed, 15 Apr 2009 16:11:17 -0700
Subject: PR9940: add/use unmap_u[ret]probe For uprobes 1 and 2, add
 unmap_u[ret]probe() and define UPROBES_API_VERSION=2. Adapt tapsets.cxx
 accordingly.

---
 runtime/uprobes2/uprobes.h | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'runtime/uprobes2/uprobes.h')

diff --git a/runtime/uprobes2/uprobes.h b/runtime/uprobes2/uprobes.h
index 112e29e2..ae0692f0 100644
--- a/runtime/uprobes2/uprobes.h
+++ b/runtime/uprobes2/uprobes.h
@@ -28,6 +28,9 @@
 #define utrace_attached_engine utrace_engine
 #endif
 
+/* Version 2 includes unmap_u[ret]probe(). */
+#define UPROBES_API_VERSION 2
+
 struct pt_regs;
 
 enum uprobe_type {
@@ -82,6 +85,9 @@ extern void unregister_uprobe(struct uprobe *u);
 /* For runtime, assume uprobes support includes uretprobes. */
 extern int register_uretprobe(struct uretprobe *rp);
 extern void unregister_uretprobe(struct uretprobe *rp);
+/* For PRs 9940, 6852... */
+extern void unmap_uprobe(struct uprobe *u);
+extern void unmap_uretprobe(struct uretprobe *rp);
 
 #ifdef UPROBES_IMPLEMENTATION
 
-- 
cgit