Revert "dtrace: make perf-events probes separately configured"

This reverts commit a3b2e729cb05de0e870b5f1a1778a6ac4a233c6e.

Orabug: 23344927
Acked-by: Chuck Anderson <chuck.anderson@oracle.com>

diff --git a/include/linux/sdt.h b/include/linux/sdt.h
index 1a745548e9157eda15044db8b3b2d8840d618714..c44db3de6654954402c32c6fd8f5349c5be8f00e 100644 (file)
--- 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 b5747c77a2ddcb4147aa171f2e3494af7b1a114a..80a0262d3d94ed4fe3c15967aa3bb4dd1101b6a7 100644 (file)
--- 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