git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge mainline v2.6.27-rc2 tree into linux-omap tree
[pandora-kernel.git]
/
net
/
key
/
af_key.c
diff --git
a/net/key/af_key.c
b/net/key/af_key.c
index
f0fc46c
..
d628df9
100644
(file)
--- a/
net/key/af_key.c
+++ b/
net/key/af_key.c
@@
-96,8
+96,8
@@
static void pfkey_sock_destruct(struct sock *sk)
return;
}
-
BUG_TRAP(!
atomic_read(&sk->sk_rmem_alloc));
-
BUG_TRAP(!
atomic_read(&sk->sk_wmem_alloc));
+
WARN_ON(
atomic_read(&sk->sk_rmem_alloc));
+
WARN_ON(
atomic_read(&sk->sk_wmem_alloc));
atomic_dec(&pfkey_socks_nr);
}