diff options
| author | Thomas Graf <[email protected]> | 2014-07-30 00:31:08 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2014-07-31 00:41:47 +0000 |
| commit | 80019d310f9fb4f8c9eeda0a5d76144ad3132fdf (patch) | |
| tree | b3abca44d6bdaa3760099bc4be4f7140ca5db82f /net/openvswitch/datapath.h | |
| parent | dcbnl : Fix misleading dcb_app->priority explanation (diff) | |
| download | kernel-80019d310f9fb4f8c9eeda0a5d76144ad3132fdf.tar.gz kernel-80019d310f9fb4f8c9eeda0a5d76144ad3132fdf.zip | |
net: 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 <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'net/openvswitch/datapath.h')
| -rw-r--r-- | net/openvswitch/datapath.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/openvswitch/datapath.h b/net/openvswitch/datapath.h index 7ede507500d7..701b5738c38a 100644 --- 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) \ |