[DTrace-devel] [PATCH 10/15] Change condition to bypass trampoline generation

[Kris Van Hees]

Signed-off-by: Kris Van Hees <kris.van.hees at oracle.com>
---
 libdtrace/dt_bpf.c         | 2 +-
 libdtrace/dt_prov_uprobe.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libdtrace/dt_bpf.c b/libdtrace/dt_bpf.c
index a4d5d664..23255a8d 100644
--- a/libdtrace/dt_bpf.c
+++ b/libdtrace/dt_bpf.c
@@ -1092,7 +1092,7 @@ dt_bpf_load_progs(dtrace_hdl_t *dtp, uint_t cflags)
 		 * Enabled probes with no trampoline act like they exist but
 		 * no code is generated for them.
 		 */
-		if (prp->prov->impl->trampoline == NULL)
+		if (prp->prov->impl->prog_type == BPF_PROG_TYPE_UNSPEC)
 			continue;
 
 		dp = dt_program_construct(dtp, prp, cflags, NULL);
diff --git a/libdtrace/dt_prov_uprobe.c b/libdtrace/dt_prov_uprobe.c
index 172efe94..2d77176f 100644
--- a/libdtrace/dt_prov_uprobe.c
+++ b/libdtrace/dt_prov_uprobe.c
@@ -534,7 +534,7 @@ dt_provimpl_t	dt_uprobe = {
  */
 dt_provimpl_t	dt_pid = {
 	.name		= "pid",
-	.prog_type	= BPF_PROG_TYPE_KPROBE,
+	.prog_type	= BPF_PROG_TYPE_UNSPEC,
 	.provide_probe	= &provide_pid_probe,
 	.enable		= &enable,
 	.probe_destroy	= &probe_destroy,
@@ -545,7 +545,7 @@ dt_provimpl_t	dt_pid = {
  */
 dt_provimpl_t	dt_usdt = {
 	.name		= "usdt",
-	.prog_type	= BPF_PROG_TYPE_KPROBE,
+	.prog_type	= BPF_PROG_TYPE_UNSPEC,
 	.provide_probe	= &provide_usdt_probe,
 	.enable		= &enable,
 	.probe_destroy	= &probe_destroy,
-- 
2.39.1