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>

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 6227dc806377b98dfa64498f0af75416412d671c..24e3ff53b24b373514e712f459f6843ed5d31b03 100644 (file)
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -1339,7 +1339,6 @@ struct ftrace_iterator {
        unsigned                flags;
        unsigned char           buffer[FTRACE_BUFF_MAX+1];
        unsigned                buffer_idx;
-       unsigned                filtered;
 };
 
 static void *
@@ -2268,7 +2267,6 @@ ftrace_regex_write(struct file *file, const char __user *ubuf,
        }
 
        if (isspace(ch)) {
-               iter->filtered++;
                iter->buffer[iter->buffer_idx] = 0;
                ret = ftrace_process_regex(iter->buffer,
                                           iter->buffer_idx, enable);
@@ -2399,7 +2397,6 @@ ftrace_regex_release(struct inode *inode, struct file *file, int enable)
                iter = file->private_data;
 
        if (iter->buffer_idx) {
-               iter->filtered++;
                iter->buffer[iter->buffer_idx] = 0;
                ftrace_match_records(iter->buffer, iter->buffer_idx, enable);
        }

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 60a49488b791befc8bd6f7f3ee9875d4dcdc3251..e30e6b1dbd4ec4dbfdacc18b6a4f669149531762 100644 (file)
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -4265,7 +4265,6 @@ void ftrace_dump(void)
 
 __init static int tracer_alloc_buffers(void)
 {
-       struct trace_array_cpu *data;
        int ring_buf_size;
        int i;
        int ret = -ENOMEM;
@@ -4315,7 +4314,7 @@ __init static int tracer_alloc_buffers(void)
 
        /* Allocate the first page for all buffers */
        for_each_tracing_cpu(i) {
-               data = global_trace.data[i] = &per_cpu(global_trace_cpu, i);
+               global_trace.data[i] = &per_cpu(global_trace_cpu, i);
                max_tr.data[i] = &per_cpu(max_data, i);
        }