Commit a18ef64f authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Linus Torvalds
Browse files

tracing: make ftrace_likely_update() declaration visible 



This function is only used when CONFIG_TRACE_BRANCH_PROFILING is set and
DISABLE_BRANCH_PROFILING is not set, and the declaration is hidden
behind this combination of tests.

But that causes a warning when building with CONFIG_TRACING_BRANCHES,
since that sets DISABLE_BRANCH_PROFILING for the tracing code, and the
declaration is thus hidden:

  kernel/trace/trace_branch.c:205:6: error: no previous prototype for 'ftrace_likely_update' [-Werror=missing-prototypes]

Move the declaration out of the #ifdef to avoid the warning.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f1fcbaa1

include/linux/compiler.h

+2 −3
Original line number Diff line number Diff line
@@ -12,11 +12,10 @@ 
 * Note: DISABLE_BRANCH_PROFILING can be used by special lowlevel code

 * to disable branch tracing on a per file basis.

 */

#if defined(CONFIG_TRACE_BRANCH_PROFILING) \

    && !defined(DISABLE_BRANCH_PROFILING) && !defined(__CHECKER__)

void ftrace_likely_update(struct ftrace_likely_data *f, int val,

			  int expect, int is_constant);



#if defined(CONFIG_TRACE_BRANCH_PROFILING) \

    && !defined(DISABLE_BRANCH_PROFILING) && !defined(__CHECKER__)

#define likely_notrace(x)	__builtin_expect(!!(x), 1)

#define unlikely_notrace(x)	__builtin_expect(!!(x), 0)