From 25d31924b754c7f0403f782cb1c2eefba1b3df32 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: 142735 b: refs/heads/master c:
 aeeae86859f4319de0a4946b44771d9926eeed54 h: refs/heads/master i:   142733:
 5186bc1f2d29213ef3332559b1f7f70949ff8efb   142731:
 86db23975b6faafdfb7219ed174d2a47a296dfa1   142727:
 352c57b5bb30f9db17b040fc94ea989def565d87   142719:
 ecf8c65aba2e406339dc379e7126cc0a7b80ee46 v: v3

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

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			\