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/sctp/associola.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/sctp/associola.c')
-rw-r--r-- | net/sctp/associola.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sctp/associola.c b/net/sctp/associola.c index ec2a0a33fd78..8472b8b349c4 100644 --- a/net/sctp/associola.c +++ b/net/sctp/associola.c | |||
@@ -464,7 +464,7 @@ static void sctp_association_destroy(struct sctp_association *asoc) | |||
464 | spin_unlock_bh(&sctp_assocs_id_lock); | 464 | spin_unlock_bh(&sctp_assocs_id_lock); |
465 | } | 465 | } |
466 | 466 | ||
467 | BUG_TRAP(!atomic_read(&asoc->rmem_alloc)); | 467 | WARN_ON(atomic_read(&asoc->rmem_alloc)); |
468 | 468 | ||
469 | if (asoc->base.malloced) { | 469 | if (asoc->base.malloced) { |
470 | kfree(asoc); | 470 | kfree(asoc); |