From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754320Ab2DKIUf (ORCPT ); Wed, 11 Apr 2012 04:20:35 -0400 Received: from opensource.wolfsonmicro.com ([80.75.67.52]:44110 "EHLO opensource.wolfsonmicro.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751821Ab2DKIUc (ORCPT ); Wed, 11 Apr 2012 04:20:32 -0400 From: Mark Brown To: Steven Rostedt , Frederic Weisbecker , Ingo Molnar , Jiri Olsa Cc: linux-kernel@vger.kernel.org, Mark Brown Subject: [PATCH] trace: Fix build breakage without CONFIG_PERF_EVENTS Date: Wed, 11 Apr 2012 09:20:29 +0100 Message-Id: <1334132429-6091-1-git-send-email-broonie@opensource.wolfsonmicro.com> X-Mailer: git-send-email 1.7.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Today's -next fails to link for me: kernel/built-in.o:(.data+0x178e50): undefined reference to `perf_ftrace_event_register' It looks like multiple fixes have been merged for the issue fixed by commit fa73dc9 (tracing: Fix build breakage without CONFIG_PERF_EVENTS) though I can't identify the other changes that have gone in at the minute, it's possible that the changes which caused the breakage fixed by the previous commit got dropped but the fix made it in. Signed-off-by: Mark Brown --- kernel/trace/trace.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index 95059f0..ff639ca 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h @@ -836,11 +836,15 @@ extern const char *__stop___trace_bprintk_fmt[]; filter) #include "trace_entries.h" +#ifdef CONFIG_PERF_EVENTS #ifdef CONFIG_FUNCTION_TRACER int perf_ftrace_event_register(struct ftrace_event_call *call, enum trace_reg type, void *data); #else #define perf_ftrace_event_register NULL #endif /* CONFIG_FUNCTION_TRACER */ +#else +#define perf_ftrace_event_register NULL +#endif /* CONFIG_PERF_EVENTS */ #endif /* _LINUX_KERNEL_TRACE_H */ -- 1.7.9.1