diff options
author | Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> | 2008-07-26 00:43:18 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-26 00:43:18 -0400 |
commit | 547b792cac0a038b9dbf958d3c120df3740b5572 (patch) | |
tree | 08554d083b0ca7d65739dc1ce12f9b12a9b8e1f8 /net/xfrm/xfrm_state.c | |
parent | 53e5e96ec18da6f65e89f05674711e1c93d8df67 (diff) |
net: convert BUG_TRAP to generic WARN_ON
Removes legacy reinvent-the-wheel type thing. The generic
machinery integrates much better to automated debugging aids
such as kerneloops.org (and others), and is unambiguous due to
better naming. Non-intuively BUG_TRAP() is actually equal to
WARN_ON() rather than BUG_ON() though some might actually be
promoted to BUG_ON() but I left that to future.
I could make at least one BUILD_BUG_ON conversion.
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/xfrm/xfrm_state.c')
-rw-r--r-- | net/xfrm/xfrm_state.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c index 72fddafd891a..4c6914ef7d92 100644 --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c | |||
@@ -538,7 +538,7 @@ EXPORT_SYMBOL(xfrm_state_alloc); | |||
538 | 538 | ||
539 | void __xfrm_state_destroy(struct xfrm_state *x) | 539 | void __xfrm_state_destroy(struct xfrm_state *x) |
540 | { | 540 | { |
541 | BUG_TRAP(x->km.state == XFRM_STATE_DEAD); | 541 | WARN_ON(x->km.state != XFRM_STATE_DEAD); |
542 | 542 | ||
543 | spin_lock_bh(&xfrm_state_lock); | 543 | spin_lock_bh(&xfrm_state_lock); |
544 | list_del(&x->all); | 544 | list_del(&x->all); |