aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjolsa@redhat.com <jolsa@redhat.com>2009-07-16 15:44:26 -0400
committerIngo Molnar <mingo@elte.hu>2009-07-18 06:21:16 -0400
commit566b0aaf798a0dddfc455d1a5b05c424c6686c65 (patch)
treece8e8bfb62986ba4e5ba1b1d7d729c83aeb74387
parent45bceffc3013bda7d2ebc7802e9b153b674e2d44 (diff)
tracing: Remove unused fields/variables
Signed-off-by: Jiri Olsa <jolsa@redhat.com> Cc: rostedt@goodmis.org LKML-Reference: <1247773468-11594-2-git-send-email-jolsa@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--kernel/trace/ftrace.c3
-rw-r--r--kernel/trace/trace.c3
2 files changed, 1 insertions, 5 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 6227dc80637..24e3ff53b24 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -1339,7 +1339,6 @@ struct ftrace_iterator {
1339 unsigned flags; 1339 unsigned flags;
1340 unsigned char buffer[FTRACE_BUFF_MAX+1]; 1340 unsigned char buffer[FTRACE_BUFF_MAX+1];
1341 unsigned buffer_idx; 1341 unsigned buffer_idx;
1342 unsigned filtered;
1343}; 1342};
1344 1343
1345static void * 1344static void *
@@ -2268,7 +2267,6 @@ ftrace_regex_write(struct file *file, const char __user *ubuf,
2268 } 2267 }
2269 2268
2270 if (isspace(ch)) { 2269 if (isspace(ch)) {
2271 iter->filtered++;
2272 iter->buffer[iter->buffer_idx] = 0; 2270 iter->buffer[iter->buffer_idx] = 0;
2273 ret = ftrace_process_regex(iter->buffer, 2271 ret = ftrace_process_regex(iter->buffer,
2274 iter->buffer_idx, enable); 2272 iter->buffer_idx, enable);
@@ -2399,7 +2397,6 @@ ftrace_regex_release(struct inode *inode, struct file *file, int enable)
2399 iter = file->private_data; 2397 iter = file->private_data;
2400 2398
2401 if (iter->buffer_idx) { 2399 if (iter->buffer_idx) {
2402 iter->filtered++;
2403 iter->buffer[iter->buffer_idx] = 0; 2400 iter->buffer[iter->buffer_idx] = 0;
2404 ftrace_match_records(iter->buffer, iter->buffer_idx, enable); 2401 ftrace_match_records(iter->buffer, iter->buffer_idx, enable);
2405 } 2402 }
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 60a49488b79..e30e6b1dbd4 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -4265,7 +4265,6 @@ void ftrace_dump(void)
4265 4265
4266__init static int tracer_alloc_buffers(void) 4266__init static int tracer_alloc_buffers(void)
4267{ 4267{
4268 struct trace_array_cpu *data;
4269 int ring_buf_size; 4268 int ring_buf_size;
4270 int i; 4269 int i;
4271 int ret = -ENOMEM; 4270 int ret = -ENOMEM;
@@ -4315,7 +4314,7 @@ __init static int tracer_alloc_buffers(void)
4315 4314
4316 /* Allocate the first page for all buffers */ 4315 /* Allocate the first page for all buffers */
4317 for_each_tracing_cpu(i) { 4316 for_each_tracing_cpu(i) {
4318 data = global_trace.data[i] = &per_cpu(global_trace_cpu, i); 4317 global_trace.data[i] = &per_cpu(global_trace_cpu, i);
4319 max_tr.data[i] = &per_cpu(max_data, i); 4318 max_tr.data[i] = &per_cpu(max_data, i);
4320 } 4319 }
4321 4320