summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorSteven Rostedt (VMware) <rostedt@goodmis.org>2017-04-20 11:31:35 -0400
committerSteven Rostedt (VMware) <rostedt@goodmis.org>2017-04-20 22:06:47 -0400
commitd2afd57a4b96f3824220bbb8c067558ca215543f (patch)
tree7830d43d825fada98393e7ce8d48bef4870635e9 /kernel
parent6e4443199e5354255e8a4c1e8e5cfc8ef064c3ce (diff)
downloadblackbird-op-linux-d2afd57a4b96f3824220bbb8c067558ca215543f.tar.gz
blackbird-op-linux-d2afd57a4b96f3824220bbb8c067558ca215543f.zip
tracing/ftrace: Allow instances to have their own function probes
Pass around the local trace_array that is the descriptor for tracing instances, when enabling and disabling probes. This by default sets the enable/disable of event probe triggers to work with instances. The other probes will need some more work to get them working with instances. Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/trace/ftrace.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 774e9108e5dc..6615197e6597 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -3077,7 +3077,7 @@ static void *
t_probe_next(struct seq_file *m, loff_t *pos)
{
struct ftrace_iterator *iter = m->private;
- struct trace_array *tr = global_ops.private;
+ struct trace_array *tr = iter->ops->private;
struct list_head *func_probes;
struct ftrace_hash *hash;
struct list_head *next;
@@ -4311,7 +4311,7 @@ static int ftrace_process_regex(struct ftrace_iterator *iter,
char *buff, int len, int enable)
{
struct ftrace_hash *hash = iter->hash;
- struct trace_array *tr = global_ops.private;
+ struct trace_array *tr = iter->ops->private;
char *func, *command, *next = buff;
struct ftrace_func_command *p;
int ret = -EINVAL;
OpenPOWER on IntegriCloud