From 8459346bc63392fb7bac461c1fc8f40ed2bb98dc Mon Sep 17 00:00:00 2001 From: Hiraku Toyooka Date: Wed, 19 Dec 2012 16:02:34 +0900 Subject: [PATCH] --- yaml --- r: 349847 b: refs/heads/master c: a54164114b96b4693b42cdb553260eec41ea4393 h: refs/heads/master i: 349845: 5f110c02f1e966e68c6389dbfe2b5aee7fd59835 349843: cb17c00d4c75a9b0f8ad5134b02d22c9a7edb95a 349839: 0a82a0cc0798d7a182a9d8b6d47dda60922e0ebe v: v3 --- [refs] | 2 +- trunk/kernel/trace/trace.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a67f64df5739..8a5ad708c4ca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6aea49cb5f3001a8275bf9c9f586ec3eb39af194 +refs/heads/master: a54164114b96b4693b42cdb553260eec41ea4393 diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c index f8b7c626f3fd..72b171b90e55 100644 --- a/trunk/kernel/trace/trace.c +++ b/trunk/kernel/trace/trace.c @@ -922,6 +922,9 @@ void tracing_reset(struct trace_array *tr, int cpu) { struct ring_buffer *buffer = tr->buffer; + if (!buffer) + return; + ring_buffer_record_disable(buffer); /* Make sure all commits have finished */ @@ -936,6 +939,9 @@ void tracing_reset_online_cpus(struct trace_array *tr) struct ring_buffer *buffer = tr->buffer; int cpu; + if (!buffer) + return; + ring_buffer_record_disable(buffer); /* Make sure all commits have finished */