From: Chuck Anderson <chuck.anderson@oracle.com>
Date: Sat, 28 May 2016 12:24:40 +0000 (-0700)
Subject: Revert "dtrace: put the SDT perf probes in the perf provider namespace"
X-Git-Tag: v4.1.12-92~154^2~4
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ce37e317f458b2439846aadbbe2955db264328db;p=users%2Fjedix%2Flinux-maple.git

Revert "dtrace: put the SDT perf probes in the perf provider namespace"

This reverts commit f357a87ee7bf5d6db96643734bea35db63f512cc.

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

diff --git a/include/linux/sdt.h b/include/linux/sdt.h
index d659caf2f996..1a745548e915 100644
--- a/include/linux/sdt.h
+++ b/include/linux/sdt.h
@@ -182,8 +182,8 @@ extern "C" {
 #define DTRACE_UINTPTR_EACH(x) uintptr_t
 
 #define DTRACE_PROBE_TRACEPOINT(name, args...) {			\
-	extern void __dtrace_probe___perf_##name(DTRACE_APPLY(DTRACE_UINTPTR_EACH, args)); \
-	__dtrace_probe___perf_##name(DTRACE_APPLY(DTRACE_UINTPTR_CAST_EACH, args));	\
+	extern void __dtrace_probe_##name(DTRACE_APPLY(DTRACE_UINTPTR_EACH, args)); \
+	__dtrace_probe_##name(DTRACE_APPLY(DTRACE_UINTPTR_CAST_EACH, args));	\
 }
 
 #else