These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / kernel / trace / trace_kdb.c

diff --git a/kernel/kernel/trace/trace_kdb.c b/kernel/kernel/trace/trace_kdb.c
index 3ccf5c2..57149bc 100644 (file)
--- a/kernel/kernel/trace/trace_kdb.c
+++ b/kernel/kernel/trace/trace_kdb.c
@@ -21,20 +21,22 @@ static void ftrace_dump_buf(int skip_lines, long cpu_file)
        /* use static because iter can be a bit big for the stack */
        static struct trace_iterator iter;
        static struct ring_buffer_iter *buffer_iter[CONFIG_NR_CPUS];
+       struct trace_array *tr;
        unsigned int old_userobj;
        int cnt = 0, cpu;
 
        trace_init_global_iter(&iter);
        iter.buffer_iter = buffer_iter;
+       tr = iter.tr;
 
        for_each_tracing_cpu(cpu) {
                atomic_inc(&per_cpu_ptr(iter.trace_buffer->data, cpu)->disabled);
        }
 
-       old_userobj = trace_flags;
+       old_userobj = tr->trace_flags;
 
        /* don't look at user memory in panic mode */
-       trace_flags &= ~TRACE_ITER_SYM_USEROBJ;
+       tr->trace_flags &= ~TRACE_ITER_SYM_USEROBJ;
 
        kdb_printf("Dumping ftrace buffer:\n");
 
@@ -82,7 +84,7 @@ static void ftrace_dump_buf(int skip_lines, long cpu_file)
                kdb_printf("---------------------------------\n");
 
 out:
-       trace_flags = old_userobj;
+       tr->trace_flags = old_userobj;
 
        for_each_tracing_cpu(cpu) {
                atomic_dec(&per_cpu_ptr(iter.trace_buffer->data, cpu)->disabled);