]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
branch tracer, intel-iommu: fix build with CONFIG_BRANCH_TRACER=y
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 7 Apr 2009 14:59:41 +0000 (07:59 -0700)
committerIngo Molnar <mingo@elte.hu>
Tue, 7 Apr 2009 15:07:41 +0000 (17:07 +0200)
Fix the branch tracer barfing on comma statements within if ()
statements.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
include/linux/compiler.h

index 8872ad6dd89b3a5246047c33f3bed948ae5d57d2..37bcb50a4d7c85b1ac203982cc71f11e75511cde 100644 (file)
@@ -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                        \