summaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-06-08 19:34:40 +0200
committerIngo Molnar <mingo@elte.hu>2010-06-08 19:34:40 +0200
commit6113e45f831616de98c54a005260223b21bcb6b9 (patch)
tree0d56dbfae392f89b33c2ae6a36a5cc1ea1c1c988 /kernel/trace/trace.c
parent84bb671dc46d77d665d2b5e74539e81b2129bb3e (diff)
parent5168ae50a66e3ff7184c2b16d661bd6d70367e50 (diff)
downloadblackbird-op-linux-6113e45f831616de98c54a005260223b21bcb6b9.tar.gz
blackbird-op-linux-6113e45f831616de98c54a005260223b21bcb6b9.zip
Merge branch 'tip/perf/core-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
Diffstat (limited to 'kernel/trace/trace.c')
-rw-r--r--kernel/trace/trace.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 086d36316805..644ab744e759 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -1404,7 +1404,6 @@ int trace_vbprintk(unsigned long ip, const char *fmt, va_list args)
struct bprint_entry *entry;
unsigned long flags;
int disable;
- int resched;
int cpu, len = 0, size, pc;
if (unlikely(tracing_selftest_running || tracing_disabled))
@@ -1414,7 +1413,7 @@ int trace_vbprintk(unsigned long ip, const char *fmt, va_list args)
pause_graph_tracing();
pc = preempt_count();
- resched = ftrace_preempt_disable();
+ preempt_disable_notrace();
cpu = raw_smp_processor_id();
data = tr->data[cpu];
@@ -1452,7 +1451,7 @@ out_unlock:
out:
atomic_dec_return(&data->disabled);
- ftrace_preempt_enable(resched);
+ preempt_enable_notrace();
unpause_graph_tracing();
return len;
OpenPOWER on IntegriCloud