diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-30 13:33:48 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-30 13:33:48 -0400 |
commit | 15dd859cacf312f606f54502d1f66537a1e5c78c (patch) | |
tree | e50e125eaa6da83fa715704e53c1bde013d1ef8e /net/key/af_key.c | |
parent | b2d9d33412b9d13a40cd314d93ab517950fc5950 (diff) | |
parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) |
Merge commit 'v2.6.27-rc1' into x86/core
Conflicts:
include/asm-x86/dma-mapping.h
include/asm-x86/namei.h
include/asm-x86/uaccess.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'net/key/af_key.c')
-rw-r--r-- | net/key/af_key.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/key/af_key.c b/net/key/af_key.c index f0fc46c8038d..d628df97e02e 100644 --- a/net/key/af_key.c +++ b/net/key/af_key.c | |||
@@ -96,8 +96,8 @@ static void pfkey_sock_destruct(struct sock *sk) | |||
96 | return; | 96 | return; |
97 | } | 97 | } |
98 | 98 | ||
99 | BUG_TRAP(!atomic_read(&sk->sk_rmem_alloc)); | 99 | WARN_ON(atomic_read(&sk->sk_rmem_alloc)); |
100 | BUG_TRAP(!atomic_read(&sk->sk_wmem_alloc)); | 100 | WARN_ON(atomic_read(&sk->sk_wmem_alloc)); |
101 | 101 | ||
102 | atomic_dec(&pfkey_socks_nr); | 102 | atomic_dec(&pfkey_socks_nr); |
103 | } | 103 | } |