summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Graf <tgraf@suug.ch>2014-07-30 18:05:01 -0700
committerPravin B Shelar <pshelar@nicira.com>2014-07-30 18:13:02 -0700
commita6c2d4cb6de2739bdb251c23a83649bdb934f5f8 (patch)
treeb29bda60140c48b7e92f3ae0e6bd7d7149aa4c52
parent07ee9d1e01cd866608c112d312fd3c1861001b9f (diff)
downloadopenvswitch-a6c2d4cb6de2739bdb251c23a83649bdb934f5f8.tar.gz
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>
-rw-r--r--datapath/datapath.h2
1 files changed, 1 insertions, 1 deletions
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) \