From 6553988e8918acda016d165ad1a22f3252bf727d Mon Sep 17 00:00:00 2001
From: Witold Baryluk <baryluk@smp.if.uj.edu.pl>
Date: Tue, 17 Mar 2009 21:15:44 +0100
Subject: [PATCH] --- yaml --- r: 140977 b: refs/heads/master c:
 97e7e4f391cac2b00417b581b432533d245d4fd0 h: refs/heads/master i:   140975:
 1eb8039444521253e856773b65926bb2cb83af1e v: v3

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

diff --git a/[refs] b/[refs]
index a7a4c26e7474..83fdbab0ad02 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af4617bdba34aa556272b34c3986b0a4d588f568
+refs/heads/master: 97e7e4f391cac2b00417b581b432533d245d4fd0
diff --git a/trunk/include/linux/compiler.h b/trunk/include/linux/compiler.h
index d95da1020f1c..6faa7e549de4 100644
--- a/trunk/include/linux/compiler.h
+++ b/trunk/include/linux/compiler.h
@@ -68,6 +68,7 @@ struct ftrace_branch_data {
 			unsigned long miss;
 			unsigned long hit;
 		};
+		unsigned long miss_hit[2];
 	};
 };
 
@@ -125,10 +126,7 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
 				.line = __LINE__,			\
 			};						\
 		______r = !!(cond);					\
-		if (______r)						\
-			______f.hit++;					\
-		else							\
-			______f.miss++;					\
+		______f.miss_hit[______r]++;					\
 		______r;						\
 	}))
 #endif /* CONFIG_PROFILE_ALL_BRANCHES */