2 files changed, 33 insertions, 13 deletions

diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index aff5f80b59b8..b52d397e57eb 100644
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -606,23 +606,22 @@ static int create_trace_probe(int argc, char **argv)
          */
         struct trace_probe *tp;
         int i, ret = 0;
-        int is_return = 0;
+        int is_return = 0, is_delete = 0;
         char *symbol = NULL, *event = NULL, *arg = NULL, *group = NULL;
         unsigned long offset = 0;
         void *addr = NULL;
         char buf[MAX_EVENT_NAME_LEN];
 
-        if (argc < 2) {
-                pr_info("Probe point is not specified.\n");
-                return -EINVAL;
-        }
-
+        /* argc must be >= 1 */
         if (argv[0][0] == 'p')
                 is_return = 0;
         else if (argv[0][0] == 'r')
                 is_return = 1;
+        else if (argv[0][0] == '-')
+                is_delete = 1;
         else {
-                pr_info("Probe definition must be started with 'p' or 'r'.\n");
+                pr_info("Probe definition must be started with 'p', 'r' or"
+                        " '-'.\n");
                 return -EINVAL;
         }
 
@@ -642,7 +641,29 @@ static int create_trace_probe(int argc, char **argv)
                         return -EINVAL;
                 }
         }
+        if (!group)
+                group = KPROBE_EVENT_SYSTEM;
 
+        if (is_delete) {
+                if (!event) {
+                        pr_info("Delete command needs an event name.\n");
+                        return -EINVAL;
+                }
+                tp = find_probe_event(event, group);
+                if (!tp) {
+                        pr_info("Event %s/%s doesn't exist.\n", group, event);
+                        return -ENOENT;
+                }
+                /* delete an event */
+                unregister_trace_probe(tp);
+                free_trace_probe(tp);
+                return 0;
+        }
+
+        if (argc < 2) {
+                pr_info("Probe point is not specified.\n");
+                return -EINVAL;
+        }
         if (isdigit(argv[1][0])) {
                 if (is_return) {
                         pr_info("Return probe point must be a symbol.\n");
@@ -671,8 +692,6 @@ static int create_trace_probe(int argc, char **argv)
         argc -= 2; argv += 2;
 
         /* setup a probe */
-        if (!group)
-                group = KPROBE_EVENT_SYSTEM;
         if (!event) {
                 /* Make a new event name */
                 if (symbol)
@@ -1114,7 +1133,7 @@ static int kprobe_event_define_fields(struct ftrace_event_call *event_call)
         struct trace_probe *tp = (struct trace_probe *)event_call->data;
 
         ret = trace_define_common_fields(event_call);
-        if (!ret)
+        if (ret)
                 return ret;
 
         DEFINE_FIELD(unsigned long, ip, FIELD_STRING_IP, 0);
@@ -1132,7 +1151,7 @@ static int kretprobe_event_define_fields(struct ftrace_event_call *event_call)
         struct trace_probe *tp = (struct trace_probe *)event_call->data;
 
         ret = trace_define_common_fields(event_call);
-        if (!ret)
+        if (ret)
                 return ret;
 
         DEFINE_FIELD(unsigned long, func, FIELD_STRING_FUNC, 0);
diff --git a/kernel/trace/trace_ksym.c b/kernel/trace/trace_ksym.c
index ddfa0fd43bc0..acb87d4a4ac1 100644
--- a/kernel/trace/trace_ksym.c
+++ b/kernel/trace/trace_ksym.c
@@ -79,11 +79,12 @@ void ksym_collect_stats(unsigned long hbp_hit_addr)
 }
 #endif /* CONFIG_PROFILE_KSYM_TRACER */
 
-void ksym_hbp_handler(struct perf_event *hbp, void *data)
+void ksym_hbp_handler(struct perf_event *hbp, int nmi,
+                      struct perf_sample_data *data,
+                      struct pt_regs *regs)
 {
         struct ring_buffer_event *event;
         struct ksym_trace_entry *entry;
-        struct pt_regs *regs = data;
         struct ring_buffer *buffer;
         int pc;