diff --git a/[refs] b/[refs] index 3fe3b145b91f..b04305232a76 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1bbe2a83ab68e5cf8c66c372c7cb3b51910c2cfe +refs/heads/master: d9ad8bc0ca823705413f75b50c442a88cc518b35 diff --git a/trunk/include/linux/compiler.h b/trunk/include/linux/compiler.h index 6faa7e549de4..8872ad6dd89b 100644 --- a/trunk/include/linux/compiler.h +++ b/trunk/include/linux/compiler.h @@ -76,7 +76,8 @@ struct ftrace_branch_data { * 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) +#if defined(CONFIG_TRACE_BRANCH_PROFILING) \ + && !defined(DISABLE_BRANCH_PROFILING) && !defined(__CHECKER__) void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect); #define likely_notrace(x) __builtin_expect(!!(x), 1)