From 79da995c9ac7ee9f24bc6484f8bf22be31a43a89 Mon Sep 17 00:00:00 2001 From: Nick Alcock Date: Wed, 10 Oct 2012 19:37:49 +0100 Subject: [PATCH] DTrace-independent CTF. These largely cosmetic changes remove mention of DTrace from the CTF code, making it clear that it is freely usable by non-DTrace consumers. The changes are: - dtrace_ctf.ko is now named ctf.ko, and is stored in kernel/ctf rather than kernel/dtrace, controlled by a new CONFIG_CTF Kconfig option select'ed by CONFIG_DTRACE. (CONFIG_DT_DISABLE_CTF, being largely a DTrace debugging option, remains under DTrace configure control). The function used to trigger loading of ctf.ko has changed name similarly, from dtrace_ctf_forceload() to ctf_forceload(). - The CTF section names have changed, from .dtrace_ctf.* to .ctf.* (which as a bonus is more obviously related to the .ctf directory long used to store the CTF data during the build process). - The shared CTF repository is now stored in .ctf.shared_ctf instead of .dtrace_ctf.dtrace_ctf, making its intended use somewhat clearer. These changes depend on a suitably changed libdtrace-ctf: a suitably changed userspace is needed to take advantage of them. The dtrace-kernel-interface is bumped accordingly. Signed-off-by: Nick Alcock --- dtrace/dtrace-module.spec | 2 +- dtrace/dtrace.h | 2 +- dtrace/dtrace_dev.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dtrace/dtrace-module.spec b/dtrace/dtrace-module.spec index 06b37514e819..7a25b0a10467 100644 --- a/dtrace/dtrace-module.spec +++ b/dtrace/dtrace-module.spec @@ -11,7 +11,7 @@ Name: dtrace-modules-%{kver} Summary: dtrace module Version: 0.3.0 Release: 2.el6 -Provides: dtrace-kernel-interface = 1 +Provides: dtrace-kernel-interface = 2 License: CDDL Group: System Environment/Kernel Requires: kernel-uek-dtrace = %{kver} diff --git a/dtrace/dtrace.h b/dtrace/dtrace.h index 7cfe731804a9..c17bfdb72994 100644 --- a/dtrace/dtrace.h +++ b/dtrace/dtrace.h @@ -2137,7 +2137,7 @@ extern int dtrace_badattr(const dtrace_attribute_t *); extern int dtrace_badname(const char *); extern void dtrace_cred2priv(const cred_t *, uint32_t *, uid_t *); -extern void dtrace_ctf_forceload(void); +extern void ctf_forceload(void); #define DT_PROVIDER_POPS(name) \ static unsigned int name##_refc = 0; \ diff --git a/dtrace/dtrace_dev.c b/dtrace/dtrace_dev.c index e2293bbb9e74..11d5383e4111 100644 --- a/dtrace/dtrace_dev.c +++ b/dtrace/dtrace_dev.c @@ -1213,7 +1213,7 @@ int dtrace_dev_init(void) return rc; } - dtrace_ctf_forceload(); + ctf_forceload(); dtrace_modload = dtrace_module_loaded; dtrace_modunload = dtrace_module_unloaded; -- 2.50.1