From: Thomas Graf <tgraf@suug.ch>
Date: Thu, 31 Jul 2014 01:05:01 +0000 (-0700)
Subject: datapath: Remove unlikely() for WARN_ON() conditions
X-Git-Tag: v2.4.0~1717
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=a6c2d4cb6de2739bdb251c23a83649bdb934f5f8;p=cascardo%2Fovs.git

datapath: Remove unlikely() for WARN_ON() conditions

No need for the unlikely(), WARN_ON() and BUG_ON() internally use
unlikely() on the condition.

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
---

diff --git a/datapath/datapath.h b/datapath/datapath.h
index f2e8d6b7d..92ef19f45 100644
--- a/datapath/datapath.h
+++ b/datapath/datapath.h
@@ -147,7 +147,7 @@ int lockdep_ovsl_is_held(void);
 #define lockdep_ovsl_is_held()	1
 #endif
 
-#define ASSERT_OVSL()		WARN_ON(unlikely(!lockdep_ovsl_is_held()))
+#define ASSERT_OVSL()		WARN_ON(!lockdep_ovsl_is_held())
 #define ovsl_dereference(p)					\
 	rcu_dereference_protected(p, lockdep_ovsl_is_held())
 #define rcu_dereference_ovsl(p)					\