Merge branch 'for-2.6.27' of git://git.marvell.com/mv643xx_eth into upstream-fixes

[mv-sheeva.git] / kernel / trace / trace_irqsoff.c

diff --git a/kernel/trace/trace_irqsoff.c b/kernel/trace/trace_irqsoff.c
index 761f3ec66c501c857d67dcd305156c064518631f..ece6cfb649fa52823f33988fd6792dad2d0d1fae 100644 (file)
--- a/kernel/trace/trace_irqsoff.c
+++ b/kernel/trace/trace_irqsoff.c
@@ -165,22 +165,6 @@ check_critical_timing(struct trace_array *tr,
 
        update_max_tr_single(tr, current, cpu);
 
-       if (!runqueue_is_locked()) {
-               if (tracing_thresh) {
-                       printk(KERN_INFO "(%16s-%-5d|#%d): %lu us critical"
-                              " section violates %lu us threshold.\n",
-                              current->comm, current->pid,
-                              raw_smp_processor_id(),
-                              latency, nsecs_to_usecs(tracing_thresh));
-               } else {
-                       printk(KERN_INFO "(%16s-%-5d|#%d): new %lu us"
-                              " maximum-latency critical section.\n",
-                              current->comm, current->pid,
-                              raw_smp_processor_id(),
-                              latency);
-               }
-       }
-
        max_sequence++;
 
 out_unlock:
@@ -269,12 +253,14 @@ void start_critical_timings(void)
        if (preempt_trace() || irq_trace())
                start_critical_timing(CALLER_ADDR0, CALLER_ADDR1);
 }
+EXPORT_SYMBOL_GPL(start_critical_timings);
 
 void stop_critical_timings(void)
 {
        if (preempt_trace() || irq_trace())
                stop_critical_timing(CALLER_ADDR0, CALLER_ADDR1);
 }
+EXPORT_SYMBOL_GPL(stop_critical_timings);
 
 #ifdef CONFIG_IRQSOFF_TRACER
 #ifdef CONFIG_PROVE_LOCKING
@@ -353,12 +339,14 @@ EXPORT_SYMBOL(trace_hardirqs_off_caller);
 #ifdef CONFIG_PREEMPT_TRACER
 void trace_preempt_on(unsigned long a0, unsigned long a1)
 {
-       stop_critical_timing(a0, a1);
+       if (preempt_trace())
+               stop_critical_timing(a0, a1);
 }
 
 void trace_preempt_off(unsigned long a0, unsigned long a1)
 {
-       start_critical_timing(a0, a1);
+       if (preempt_trace())
+               start_critical_timing(a0, a1);
 }
 #endif /* CONFIG_PREEMPT_TRACER */