From e4768387fe2f2973d950ed9c7f07bb11ef5169d3 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 7 Apr 2009 07:59:41 -0700
Subject: [PATCH] --- yaml --- r: 142782 b: refs/heads/master c:
 ab3c9c686e22ab264269337ce7b75d9760211198 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/include/linux/compiler.h | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b04305232a76..e7abda316b75 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d9ad8bc0ca823705413f75b50c442a88cc518b35
+refs/heads/master: ab3c9c686e22ab264269337ce7b75d9760211198
diff --git a/trunk/include/linux/compiler.h b/trunk/include/linux/compiler.h
index 8872ad6dd89b..37bcb50a4d7c 100644
--- a/trunk/include/linux/compiler.h
+++ b/trunk/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			\