Merge git://www.linux-watchdog.org/linux-watchdog

[linux-2.6-block.git] / net / openvswitch / datapath.h

diff --git a/net/openvswitch/datapath.h b/net/openvswitch/datapath.h
index 7ede507500d7daa1cca3d352f9923122f5e63709..701b5738c38a634285f331e4e05288ed557e6332 100644 (file)
--- a/net/openvswitch/datapath.h
+++ b/net/openvswitch/datapath.h
@@ -144,7 +144,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)                                        \