From: Tomas Jedlicka Date: Tue, 1 Aug 2017 14:38:44 +0000 (-0400) Subject: dtrace: dtrace.ko won't build when DT_DISABLE_CTF is set X-Git-Tag: v4.1.12-111.0.20170907_2225~3^2~1 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=78f67b8f5af15ea12ac44d7ce2ff63c2aba55a76;p=users%2Fjedix%2Flinux-maple.git dtrace: dtrace.ko won't build when DT_DISABLE_CTF is set Fix for build failure that can occur when CTF generation is disabled. Orabug: 26587631 Signed-off-by: Tomas Jedlicka Reviewed-by: Nick Alcock Reviewed-by: Kris Van Hees --- diff --git a/dtrace/dtrace_dev.c b/dtrace/dtrace_dev.c index e399888071e2e..fb0908c14dada 100644 --- a/dtrace/dtrace_dev.c +++ b/dtrace/dtrace_dev.c @@ -1407,7 +1407,9 @@ int dtrace_dev_init(void) return rc; } +#if defined(CONFIG_CTF) ctf_forceload(); +#endif mutex_lock(&cpu_lock); mutex_lock(&dtrace_provider_lock);