Skip to content

Commit 8ab83f5

Browse files
srikardIngo Molnar
authored andcommitted
tracing: Extract out common code for kprobes/uprobes trace events
Move parts of trace_kprobe.c that can be shared with upcoming trace_uprobe.c. Common code to kernel/trace/trace_probe.h and kernel/trace/trace_probe.c. There are no functional changes. Signed-off-by: Srikar Dronamraju <[email protected]> Acked-by: Steven Rostedt <[email protected]> Acked-by: Masami Hiramatsu <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Ananth N Mavinakayanahalli <[email protected]> Cc: Jim Keniston <[email protected]> Cc: Linux-mm <[email protected]> Cc: Oleg Nesterov <[email protected]> Cc: Andi Kleen <[email protected]> Cc: Christoph Hellwig <[email protected]> Cc: Arnaldo Carvalho de Melo <[email protected]> Cc: Anton Arapov <[email protected]> Cc: Peter Zijlstra <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
1 parent 3a6b766 commit 8ab83f5

File tree

5 files changed

+1016
-871
lines changed

5 files changed

+1016
-871
lines changed

kernel/trace/Kconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,7 @@ config KPROBE_EVENT
373373
depends on HAVE_REGS_AND_STACK_ACCESS_API
374374
bool "Enable kprobes-based dynamic events"
375375
select TRACING
376+
select PROBE_EVENTS
376377
default y
377378
help
378379
This allows the user to add tracing events (similar to tracepoints)
@@ -385,6 +386,9 @@ config KPROBE_EVENT
385386
This option is also required by perf-probe subcommand of perf tools.
386387
If you want to use perf tools, this option is strongly recommended.
387388

389+
config PROBE_EVENTS
390+
def_bool n
391+
388392
config DYNAMIC_FTRACE
389393
bool "enable/disable ftrace tracepoints dynamically"
390394
depends on FUNCTION_TRACER

kernel/trace/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,5 +61,6 @@ endif
6161
ifeq ($(CONFIG_TRACING),y)
6262
obj-$(CONFIG_KGDB_KDB) += trace_kdb.o
6363
endif
64+
obj-$(CONFIG_PROBE_EVENTS) += trace_probe.o
6465

6566
libftrace-y := ftrace.o

0 commit comments

Comments
 (0)