From 57b76240644b238b6ebd924fc096a67da7fc0e31 Mon Sep 17 00:00:00 2001 From: Chuck Anderson Date: Sat, 28 May 2016 05:25:29 -0700 Subject: [PATCH] Revert "dtrace: make perf-events probes separately configured" This reverts commit a3b2e729cb05de0e870b5f1a1778a6ac4a233c6e. Orabug: 23344927 Acked-by: Chuck Anderson --- include/linux/sdt.h | 8 -------- kernel/dtrace/Kconfig | 8 -------- 2 files changed, 16 deletions(-) diff --git a/include/linux/sdt.h b/include/linux/sdt.h index 1a745548e915..c44db3de6654 100644 --- a/include/linux/sdt.h +++ b/include/linux/sdt.h @@ -122,8 +122,6 @@ extern "C" { (uintptr_t)(arg6), (uintptr_t)(arg7), (uintptr_t)(arg8)); \ } -#ifdef CONFIG_DT_SDT_PERF - /* This counts the number of args */ #define DTRACE_NARGS_SEQ(_1,_2,_3,_4,_5,_6,_7,_8,_9,_10,_11,_12,_13,_14,_15,_16,_17,_18,N,...) N #define DTRACE_NARGS(...) DTRACE_NARGS_SEQ(__VA_ARGS__, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1) @@ -186,12 +184,6 @@ extern "C" { __dtrace_probe_##name(DTRACE_APPLY(DTRACE_UINTPTR_CAST_EACH, args)); \ } -#else - -#define DTRACE_PROBE_TRACEPOINT(name, args...) - -#endif - typedef struct sdt_probedesc { char *sdpd_name; /* probe name */ char *sdpd_func; /* probe function */ diff --git a/kernel/dtrace/Kconfig b/kernel/dtrace/Kconfig index b5747c77a2dd..80a0262d3d94 100644 --- a/kernel/dtrace/Kconfig +++ b/kernel/dtrace/Kconfig @@ -46,14 +46,6 @@ config DT_SDT help To be written. -config DT_SDT_PERF - bool "DTrace perf-events Probes" - default y - depends on DT_SDT - select TRACEPOINTS - help - To be written. - config DT_SYSTRACE tristate "System Call Tracing" default m -- 2.50.1