nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

branch tracer, intel-iommu: fix build with CONFIG_BRANCH_TRACER=y

Browse source 
Fix the branch tracer barfing on comma statements within if ()
statements.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Linus Torvalds 2009-04-07 07:59:41 -07:00 committed by Ingo Molnar
parent d9ad8bc0ca
commit ab3c9c686e
1 changed files with 3 additions and 1 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

4
include/linux/compiler.h
View file

@ -115,7 +115,9 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
* "Define 'is'", Bill Clinton * "Define 'is'", Bill Clinton
* "Define 'if'", Steven Rostedt * "Define 'if'", Steven Rostedt
*/ */
#define if(cond) if (__builtin_constant_p((cond)) ? !!(cond) : \ #define if(cond, ...) __trace_if( (cond , ## __VA_ARGS__) )
#define __trace_if(cond) \
if (__builtin_constant_p((cond)) ? !!(cond) : \
({ \ ({ \
int ______r; \ int ______r; \
static struct ftrace_branch_data \ static struct ftrace_branch_data \