diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 07:59:41 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-07 17:07:41 +0200 |
| commit | ab3c9c686e22ab264269337ce7b75d9760211198 (patch) | |
| tree | 613445ecfef2b6a0dc2e4300ff8b463f7968f84f /include/linux/compiler.h | |
| parent | d9ad8bc0ca823705413f75b50c442a88cc518b35 (diff) | |
| download | op-kernel-dev-ab3c9c686e22ab264269337ce7b75d9760211198.zip op-kernel-dev-ab3c9c686e22ab264269337ce7b75d9760211198.tar.gz | |
branch tracer, intel-iommu: fix build with CONFIG_BRANCH_TRACER=y
Fix the branch tracer barfing on comma statements within if ()
statements.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/compiler.h')
| -rw-r--r-- | include/linux/compiler.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/compiler.h b/include/linux/compiler.h index 8872ad6..37bcb50 100644 --- a/include/linux/compiler.h +++ b/include/linux/compiler.h @@ -115,7 +115,9 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect); * "Define 'is'", Bill Clinton * "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; \ static struct ftrace_branch_data \ |
