diff --git a/[refs] b/[refs]
index 1c887a8c389c..1c532c23380b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 985c0cd3f75b5a546ceab002e36b4263f2f7d2c3
+refs/heads/master: aeeae86859f4319de0a4946b44771d9926eeed54
diff --git a/trunk/include/linux/compiler.h b/trunk/include/linux/compiler.h
index 6faa7e549de4..cebfdcd3dbdd 100644
--- a/trunk/include/linux/compiler.h
+++ b/trunk/include/linux/compiler.h
@@ -114,7 +114,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			\