From: Nick Alcock <nick.alcock@oracle.com>
Date: Mon, 23 May 2016 09:59:41 +0000 (+0100)
Subject: dtrace: put the SDT perf probes in the perf provider namespace
X-Git-Tag: v4.1.12-92~155^2~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f357a87ee7bf5d6db96643734bea35db63f512cc;p=users%2Fjedix%2Flinux-maple.git

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

The perf probes, like most other sdt probes, belong in an appropriate
provider, not under the overarching sdt multiprovider.

Put them in a provider named 'perf'.

Orabug: 23004534
Signed-off-by: Nick Alcock <nick.alcock@oracle.com>
Acked-by: Kris Van Hees <kris.van.hees@oracle.com>
---

diff --git a/include/linux/sdt.h b/include/linux/sdt.h
index 1a745548e915..d659caf2f996 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_##name(DTRACE_APPLY(DTRACE_UINTPTR_EACH, args)); \
-	__dtrace_probe_##name(DTRACE_APPLY(DTRACE_UINTPTR_CAST_EACH, args));	\
+	extern void __dtrace_probe___perf_##name(DTRACE_APPLY(DTRACE_UINTPTR_EACH, args)); \
+	__dtrace_probe___perf_##name(DTRACE_APPLY(DTRACE_UINTPTR_CAST_EACH, args));	\
 }
 
 #else