linux-kernel - [PATCH][GIT PULL][v3.4] tracing: Fix build breakage without CONFIG_PERF

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <1334262300.23924.348.camel@gandalf.stny.rr.com>
Date:	Thu, 12 Apr 2012 16:25:00 -0400
From:	Steven Rostedt <rostedt@...dmis.org>
To:	LKML <linux-kernel@...r.kernel.org>
Cc:	Ingo Molnar <mingo@...e.hu>,
	Andrew Morton <akpm@...ux-foundation.org>,
	Mark Brown <broonie@...nsource.wolfsonmicro.com>,
	Frederic Weisbecker <fweisbec@...il.com>,
	Jiri Olsa <jolsa@...hat.com>
Subject: [PATCH][GIT PULL][v3.4] tracing: Fix build breakage without
 CONFIG_PERF_EVENTS (again)


Ingo,

Linux mainline compile is broken for archs that can disable CONFIG_PERF_EVENTS.
Without this patch, arm fails to build, but with it, it works fine.

The breakage went in during the 3.4 merge window.

-- Steve


Please pull the latest tip/perf/urgent tree, which can be found at:

  git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
tip/perf/urgent

Head SHA1: 12524b1bcf06b86bba3869772084a5fd7a0db61d


Mark Brown (1):
      tracing: Fix build breakage without CONFIG_PERF_EVENTS (again)

----
 kernel/trace/trace.h |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---------------------------
commit 12524b1bcf06b86bba3869772084a5fd7a0db61d
Author: Mark Brown <broonie@...nsource.wolfsonmicro.com>
Date:   Wed Apr 11 09:20:29 2012 +0100

    tracing: Fix build breakage without CONFIG_PERF_EVENTS (again)
    
    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.
    
    Link: http://lkml.kernel.org/r/1334132429-6091-1-git-send-email-broonie@opensource.wolfsonmicro.com
    
    Cc: Frederic Weisbecker <fweisbec@...il.com>
    Cc: Ingo Molnar <mingo@...hat.com>
    Cc: Jiri Olsa <jolsa@...hat.com>
    Signed-off-by: Mark Brown <broonie@...nsource.wolfsonmicro.com>
    Signed-off-by: Steven Rostedt <rostedt@...dmis.org>

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 */


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/