diff mbox series

tracing: make PREEMPTIRQ_EVENTS depend on TRACING

Message ID 20171103104031.270375-1-arnd@arndb.de
State Superseded
Headers show
Series tracing: make PREEMPTIRQ_EVENTS depend on TRACING | expand

Commit Message

Arnd Bergmann Nov. 3, 2017, 10:39 a.m. UTC
When CONFIG_TRACING is disabled, the new preemptirq events tracer
produces a build failure:

In file included from kernel/trace/trace_irqsoff.c:17:0:
kernel/trace/trace.h: In function 'trace_test_and_set_recursion':
kernel/trace/trace.h:542:28: error: 'struct task_struct' has no member named 'trace_recursion'

Adding an explicit dependency avoids the broken configuration.

Fixes: d59158162e03 ("tracing: Add support for preempt and irq enable/disable events")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

---
No idea if this is the best solution, it just happened to fix the build
failure for me.
---
 kernel/trace/Kconfig | 1 +
 1 file changed, 1 insertion(+)

-- 
2.9.0

Comments

Masami Hiramatsu (Google) Nov. 3, 2017, 8:58 p.m. UTC | #1
On Fri,  3 Nov 2017 11:39:57 +0100
Arnd Bergmann <arnd@arndb.de> wrote:

> When CONFIG_TRACING is disabled, the new preemptirq events tracer

> produces a build failure:

> 

> In file included from kernel/trace/trace_irqsoff.c:17:0:

> kernel/trace/trace.h: In function 'trace_test_and_set_recursion':

> kernel/trace/trace.h:542:28: error: 'struct task_struct' has no member named 'trace_recursion'

> 

> Adding an explicit dependency avoids the broken configuration.

> 

> Fixes: d59158162e03 ("tracing: Add support for preempt and irq enable/disable events")

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

> ---

> No idea if this is the best solution, it just happened to fix the build

> failure for me.


OK, as same as other tracers, it should select GENERIC_TRACER and TRACER_MAX_TRACE,
and depends on TRACE_IRQFLAGS_SUPPORT, and maybe depends on !ARCH_USES_GETTIMEOFFSET.

Thank you,

> ---

>  kernel/trace/Kconfig | 1 +

>  1 file changed, 1 insertion(+)

> 

> diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig

> index 1ff10ca078d6..c8c18c793c86 100644

> --- a/kernel/trace/Kconfig

> +++ b/kernel/trace/Kconfig

> @@ -164,6 +164,7 @@ config PREEMPTIRQ_EVENTS

>  	bool "Enable trace events for preempt and irq disable/enable"

>  	select TRACE_IRQFLAGS

>  	depends on DEBUG_PREEMPT || !PROVE_LOCKING

> +	depends on TRACING

>  	default n

>  	help

>  	  Enable tracing of disable and enable events for preemption and irqs.

> -- 

> 2.9.0

> 



-- 
Masami Hiramatsu <mhiramat@kernel.org>
diff mbox series

Patch

diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
index 1ff10ca078d6..c8c18c793c86 100644
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@ -164,6 +164,7 @@  config PREEMPTIRQ_EVENTS
 	bool "Enable trace events for preempt and irq disable/enable"
 	select TRACE_IRQFLAGS
 	depends on DEBUG_PREEMPT || !PROVE_LOCKING
+	depends on TRACING
 	default n
 	help
 	  Enable tracing of disable and enable events for preemption and irqs.