linux-kernel - Re: [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-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <1334263193.23924.353.camel@gandalf.stny.rr.com>
Date:	Thu, 12 Apr 2012 16:39:53 -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: Re: [PATCH][GIT PULL][v3.4] tracing: Fix build breakage without
 CONFIG_PERF_EVENTS (again)

On Thu, 2012-04-12 at 16:25 -0400, Steven Rostedt wrote:
> 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"
>  

Looking at this patch in more depth, it may be cleaner to do:

#if defined(CONFIG_PERF_EVENTS) && defined(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

Mark, would you like to make the above update?

Thanks,

-- Steve


> +#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/