From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932321AbdJZIhy (ORCPT ); Thu, 26 Oct 2017 04:37:54 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:44202 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932246AbdJZIhs (ORCPT ); Thu, 26 Oct 2017 04:37:48 -0400 From: Julien Thierry To: linux-kernel@vger.kernel.org Cc: Julien Thierry , Steven Rostedt , Ingo Molnar Subject: [PATCH] trace: fix undefined tracing functions build error Date: Thu, 26 Oct 2017 09:37:40 +0100 Message-Id: <1509007060-24191-1-git-send-email-julien.thierry@arm.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When selecting CONFIG_PREEMPTIRQ_EVENTS without CONFIG_DEBUG_PREEMPT, trace_preempt_(en|dis)able_* names do not get defined. This causes a build error in function trace_preempt_off (kernel/trace/trace_irqsoff.c) when CONFIG_PREEMPT_TRACER is enabled. Similarly, when selecting CONFIG_PREEMPTIRQ_EVENTS and CONFIG_PROVE_LOCKING, trace_irq_(en|dis)able_* names do not get defined, although it seems they do not get referenced in that configuration. Ensure trace_(irq|preempt)_* names are always defined, becoming empty macros in the cases where they were not defined previously. Signed-off-by: Julien Thierry Cc: Steven Rostedt Cc: Ingo Molnar --- include/trace/events/preemptirq.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/include/trace/events/preemptirq.h b/include/trace/events/preemptirq.h index f5024c5..9c4eb33 100644 --- a/include/trace/events/preemptirq.h +++ b/include/trace/events/preemptirq.h @@ -56,15 +56,18 @@ #include -#else /* !CONFIG_PREEMPTIRQ_EVENTS */ +#endif /* !CONFIG_PREEMPTIRQ_EVENTS */ +#if !defined(CONFIG_PREEMPTIRQ_EVENTS) || defined(CONFIG_PROVE_LOCKING) #define trace_irq_enable(...) #define trace_irq_disable(...) -#define trace_preempt_enable(...) -#define trace_preempt_disable(...) #define trace_irq_enable_rcuidle(...) #define trace_irq_disable_rcuidle(...) +#endif + +#if !defined(CONFIG_PREEMPTIRQ_EVENTS) || !defined(CONFIG_DEBUG_PREEMPT) +#define trace_preempt_enable(...) +#define trace_preempt_disable(...) #define trace_preempt_enable_rcuidle(...) #define trace_preempt_disable_rcuidle(...) - #endif -- 1.9.1