Skip to content

Commit 98629da

Browse files
Ross Zwislerrostedt
authored andcommitted
tracing: remove unnecessary trace_trigger ifdef
The trace_trigger command line option introduced by commit a01fdc8 ("tracing: Add trace_trigger kernel command line option") doesn't need to depend on the CONFIG_HIST_TRIGGERS kernel config option. This code doesn't depend on the histogram code, and the run-time selection of triggers is usable without CONFIG_HIST_TRIGGERS. Link: https://lore.kernel.org/linux-trace-kernel/[email protected] Cc: Masami Hiramatsu <[email protected]> Cc: Andrew Morton <[email protected]> Cc: Mathieu Desnoyers <[email protected]> Cc: Joel Fernandes <[email protected]> Cc: Tom Zanussi <[email protected]> Fixes: a01fdc8 ("tracing: Add trace_trigger kernel command line option") Signed-off-by: Ross Zwisler <[email protected]> Signed-off-by: Steven Rostedt (Google) <[email protected]>
1 parent 88ca6a7 commit 98629da

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

kernel/trace/trace_events.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2796,7 +2796,6 @@ trace_create_new_event(struct trace_event_call *call,
27962796
return file;
27972797
}
27982798

2799-
#ifdef CONFIG_HIST_TRIGGERS
28002799
#define MAX_BOOT_TRIGGERS 32
28012800

28022801
static struct boot_triggers {
@@ -2832,7 +2831,6 @@ static __init int setup_trace_triggers(char *str)
28322831
return 1;
28332832
}
28342833
__setup("trace_trigger=", setup_trace_triggers);
2835-
#endif
28362834

28372835
/* Add an event to a trace directory */
28382836
static int
@@ -2850,7 +2848,6 @@ __trace_add_new_event(struct trace_event_call *call, struct trace_array *tr)
28502848
return event_define_fields(call);
28512849
}
28522850

2853-
#ifdef CONFIG_HIST_TRIGGERS
28542851
static void trace_early_triggers(struct trace_event_file *file, const char *name)
28552852
{
28562853
int ret;
@@ -2868,9 +2865,6 @@ static void trace_early_triggers(struct trace_event_file *file, const char *name
28682865
bootup_triggers[i].event);
28692866
}
28702867
}
2871-
#else
2872-
static inline void trace_early_triggers(struct trace_event_file *file, const char *name) { }
2873-
#endif
28742868

28752869
/*
28762870
* Just create a descriptor for early init. A descriptor is required

0 commit comments

Comments
 (0)