Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / kernel / trace / trace.c

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index ae17453..4506826 100644 (file)
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -1949,7 +1949,7 @@ static int s_show(struct seq_file *m, void *v)
        return 0;
 }
 
        return 0;
 }
 

-static struct seq_operations tracer_seq_ops = {
+static const struct seq_operations tracer_seq_ops = {

        .start          = s_start,
        .next           = s_next,
        .stop           = s_stop,
        .start          = s_start,
        .next           = s_next,
        .stop           = s_stop,


@@ -1984,11 +1984,9 @@ __tracing_open(struct inode *inode, struct file *file)
        if (current_trace)
                *iter->trace = *current_trace;
 
        if (current_trace)
                *iter->trace = *current_trace;
 

-       if (!alloc_cpumask_var(&iter->started, GFP_KERNEL))
+       if (!zalloc_cpumask_var(&iter->started, GFP_KERNEL))

                goto fail;
 
                goto fail;
 

-       cpumask_clear(iter->started);
-

        if (current_trace && current_trace->print_max)
                iter->tr = &max_tr;
        else
        if (current_trace && current_trace->print_max)
                iter->tr = &max_tr;
        else


@@ -2163,7 +2161,7 @@ static int t_show(struct seq_file *m, void *v)
        return 0;
 }
 
        return 0;
 }
 

-static struct seq_operations show_traces_seq_ops = {
+static const struct seq_operations show_traces_seq_ops = {

        .start          = t_start,
        .next           = t_next,
        .stop           = t_stop,
        .start          = t_start,
        .next           = t_next,
        .stop           = t_stop,


@@ -4389,7 +4387,7 @@ __init static int tracer_alloc_buffers(void)
        if (!alloc_cpumask_var(&tracing_cpumask, GFP_KERNEL))
                goto out_free_buffer_mask;
 
        if (!alloc_cpumask_var(&tracing_cpumask, GFP_KERNEL))
                goto out_free_buffer_mask;
 

-       if (!alloc_cpumask_var(&tracing_reader_cpumask, GFP_KERNEL))
+       if (!zalloc_cpumask_var(&tracing_reader_cpumask, GFP_KERNEL))

                goto out_free_tracing_cpumask;
 
        /* To save memory, keep the ring buffer size to its minimum */
                goto out_free_tracing_cpumask;
 
        /* To save memory, keep the ring buffer size to its minimum */


@@ -4400,7 +4398,6 @@ __init static int tracer_alloc_buffers(void)
 
        cpumask_copy(tracing_buffer_mask, cpu_possible_mask);
        cpumask_copy(tracing_cpumask, cpu_all_mask);
 
        cpumask_copy(tracing_buffer_mask, cpu_possible_mask);
        cpumask_copy(tracing_cpumask, cpu_all_mask);

-       cpumask_clear(tracing_reader_cpumask);

 
        /* TODO: make the number of buffers hot pluggable with CPUS */
        global_trace.buffer = ring_buffer_alloc(ring_buf_size,
 
        /* TODO: make the number of buffers hot pluggable with CPUS */
        global_trace.buffer = ring_buffer_alloc(ring_buf_size,