[PATCH 2/2] trace: Add missing tracer macros

From: Binoy Jayan
Date: Thu Jul 28 2016 - 00:52:56 EST


From: Yang Shi <yang.shi@xxxxxxxxxx>

When building rt kernel with IRQSOFF_TRACER enabled but INTERRUPT_OFF_HIST
or PREEMPT_OFF_HIST disabled, the below build failure will be triggered:

| kernel/trace/trace_irqsoff.c: In function 'time_hardirqs_on':
| kernel/trace/trace_irqsoff.c:453:2: error: implicit declaration of
| function 'trace_preemptirqsoff_hist_rcuidle'
| [-Werror=implicit-function-declaration]
| trace_preemptirqsoff_hist_rcuidle(IRQS_ON, 0);
| ^
| cc1: some warnings being treated as errors
| scripts/Makefile.build:258: recipe for target
| 'kernel/trace/trace_irqsoff.o' failed
| make[4]: *** [kernel/trace/trace_irqsoff.o] Error 1
| make[4]: *** Waiting for unfinished jobs....
| scripts/Makefile.build:403: recipe for target 'kernel/trace' failed

These macros are only defined when both PREEMPT_OFF_HIST and
PREEMPT_OFF_HIST are enabled, otherwise just trace_preemptirqsoff_hist
is defined as a preprocessor macro.

Signed-off-by: Yang Shi <yang.shi@xxxxxxxxxx>
Cc: linaro-kernel@xxxxxxxxxxxxxxxx
Cc: bigeasy@xxxxxxxxxxxxx
Cc: rostedt@xxxxxxxxxxx
Cc: stable-rt@xxxxxxxxxxxxxxx
Link: http://lkml.kernel.org/r/1445280008-8456-1-git-send-email-yang.shi@xxxxxxxxxx
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
---
include/trace/events/hist.h | 2 ++
1 file changed, 2 insertions(+)

diff --git a/include/trace/events/hist.h b/include/trace/events/hist.h
index 6122e42..37f6eb8 100644
--- a/include/trace/events/hist.h
+++ b/include/trace/events/hist.h
@@ -9,6 +9,7 @@

#if !defined(CONFIG_PREEMPT_OFF_HIST) && !defined(CONFIG_INTERRUPT_OFF_HIST)
#define trace_preemptirqsoff_hist(a, b)
+#define trace_preemptirqsoff_hist_rcuidle(a, b)
#else
TRACE_EVENT(preemptirqsoff_hist,

@@ -33,6 +34,7 @@ TRACE_EVENT(preemptirqsoff_hist,

#ifndef CONFIG_MISSED_TIMER_OFFSETS_HIST
#define trace_hrtimer_interrupt(a, b, c, d)
+#define trace_hrtimer_interrupt_rcuidle(a, b, c, d)
#else
TRACE_EVENT(hrtimer_interrupt,

--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project