From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933291AbbJAL4v (ORCPT ); Thu, 1 Oct 2015 07:56:51 -0400 Received: from mail.kernel.org ([198.145.29.136]:52103 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933134AbbJAL4n (ORCPT ); Thu, 1 Oct 2015 07:56:43 -0400 Message-Id: <20151001115638.281924237@goodmis.org> User-Agent: quilt/0.61-1 Date: Thu, 01 Oct 2015 07:55:38 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Ingo Molnar , Andrew Morton Subject: [for-next][PATCH 14/25] tracing: Only create branch tracer options when compiled in References: <20151001115524.066462793@goodmis.org> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Disposition: inline; filename=0014-tracing-Only-create-branch-tracer-options-when-compi.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Steven Rostedt (Red Hat)" When the branch tracer is not compiled in, do not create the option files associated to it. Signed-off-by: Steven Rostedt --- kernel/trace/trace.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index 33cd09799ceb..3f1cc45b7007 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h @@ -895,6 +895,13 @@ extern int trace_get_user(struct trace_parser *parser, const char __user *ubuf, # define FUNCTION_GRAPH_DEFAULT_FLAGS 0UL #endif +#ifdef CONFIG_BRANCH_TRACER +# define BRANCH_FLAGS \ + C(BRANCH, "branch"), +#else +# define BRANCH_FLAGS +#endif + /* * trace_iterator_flags is an enumeration that defines bit * positions into trace_flags that controls the output. @@ -913,7 +920,6 @@ extern int trace_get_user(struct trace_parser *parser, const char __user *ubuf, C(BLOCK, "block"), \ C(STACKTRACE, "stacktrace"), \ C(PRINTK, "trace_printk"), \ - C(BRANCH, "branch"), \ C(ANNOTATE, "annotate"), \ C(USERSTACKTRACE, "userstacktrace"), \ C(SYM_USEROBJ, "sym-userobj"), \ @@ -926,7 +932,8 @@ extern int trace_get_user(struct trace_parser *parser, const char __user *ubuf, C(IRQ_INFO, "irq-info"), \ C(MARKERS, "markers"), \ C(FUNCTION, "function-trace"), \ - FGRAPH_FLAGS + FGRAPH_FLAGS \ + BRANCH_FLAGS /* * By defining C, we can make TRACE_FLAGS a list of bit names -- 2.5.1