tracing: Move tracing_max_latency into trace_array

[linux-block.git] / kernel / trace / trace_selftest.c

diff --git a/kernel/trace/trace_selftest.c b/kernel/trace/trace_selftest.c
index 519d04affe3863b692f284e5768a243816f4244d..ac3185892960632a03d0aba0dcd9c9e524ea0401 100644 (file)
--- a/kernel/trace/trace_selftest.c
+++ b/kernel/trace/trace_selftest.c
@@ -807,7 +807,7 @@ out:
 int
 trace_selftest_startup_irqsoff(struct tracer *trace, struct trace_array *tr)
 {
-       unsigned long save_max = tracing_max_latency;
+       unsigned long save_max = tr->max_latency;
        unsigned long count;
        int ret;
 
@@ -819,7 +819,7 @@ trace_selftest_startup_irqsoff(struct tracer *trace, struct trace_array *tr)
        }
 
        /* reset the max latency */
-       tracing_max_latency = 0;
+       tr->max_latency = 0;
        /* disable interrupts for a bit */
        local_irq_disable();
        udelay(100);
@@ -846,7 +846,7 @@ trace_selftest_startup_irqsoff(struct tracer *trace, struct trace_array *tr)
                ret = -1;
        }
 
-       tracing_max_latency = save_max;
+       tr->max_latency = save_max;
 
        return ret;
 }
@@ -856,7 +856,7 @@ trace_selftest_startup_irqsoff(struct tracer *trace, struct trace_array *tr)
 int
 trace_selftest_startup_preemptoff(struct tracer *trace, struct trace_array *tr)
 {
-       unsigned long save_max = tracing_max_latency;
+       unsigned long save_max = tr->max_latency;
        unsigned long count;
        int ret;
 
@@ -881,7 +881,7 @@ trace_selftest_startup_preemptoff(struct tracer *trace, struct trace_array *tr)
        }
 
        /* reset the max latency */
-       tracing_max_latency = 0;
+       tr->max_latency = 0;
        /* disable preemption for a bit */
        preempt_disable();
        udelay(100);
@@ -908,7 +908,7 @@ trace_selftest_startup_preemptoff(struct tracer *trace, struct trace_array *tr)
                ret = -1;
        }
 
-       tracing_max_latency = save_max;
+       tr->max_latency = save_max;
 
        return ret;
 }
@@ -918,7 +918,7 @@ trace_selftest_startup_preemptoff(struct tracer *trace, struct trace_array *tr)
 int
 trace_selftest_startup_preemptirqsoff(struct tracer *trace, struct trace_array *tr)
 {
-       unsigned long save_max = tracing_max_latency;
+       unsigned long save_max = tr->max_latency;
        unsigned long count;
        int ret;
 
@@ -943,7 +943,7 @@ trace_selftest_startup_preemptirqsoff(struct tracer *trace, struct trace_array *
        }
 
        /* reset the max latency */
-       tracing_max_latency = 0;
+       tr->max_latency = 0;
 
        /* disable preemption and interrupts for a bit */
        preempt_disable();
@@ -978,7 +978,7 @@ trace_selftest_startup_preemptirqsoff(struct tracer *trace, struct trace_array *
        }
 
        /* do the test by disabling interrupts first this time */
-       tracing_max_latency = 0;
+       tr->max_latency = 0;
        tracing_start();
        trace->start(tr);
 
@@ -1009,7 +1009,7 @@ out:
        tracing_start();
 out_no_start:
        trace->reset(tr);
-       tracing_max_latency = save_max;
+       tr->max_latency = save_max;
 
        return ret;
 }
@@ -1062,7 +1062,7 @@ static int trace_wakeup_test_thread(void *data)
 int
 trace_selftest_startup_wakeup(struct tracer *trace, struct trace_array *tr)
 {
-       unsigned long save_max = tracing_max_latency;
+       unsigned long save_max = tr->max_latency;
        struct task_struct *p;
        struct completion is_ready;
        unsigned long count;
@@ -1088,7 +1088,7 @@ trace_selftest_startup_wakeup(struct tracer *trace, struct trace_array *tr)
        }
 
        /* reset the max latency */
-       tracing_max_latency = 0;
+       tr->max_latency = 0;
 
        while (p->on_rq) {
                /*
@@ -1118,7 +1118,7 @@ trace_selftest_startup_wakeup(struct tracer *trace, struct trace_array *tr)
        trace->reset(tr);
        tracing_start();
 
-       tracing_max_latency = save_max;
+       tr->max_latency = save_max;
 
        /* kill the thread */
        kthread_stop(p);