Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/kern/uipc_socket.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/kern/uipc_socket.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.140.6.4 retrieving revision 1.141.2.1 diff -u -p -r1.140.6.4 -r1.141.2.1 --- src/sys/kern/uipc_socket.c 2007/11/11 16:48:17 1.140.6.4 +++ src/sys/kern/uipc_socket.c 2007/11/06 23:32:41 1.141.2.1 @@ -1,4 +1,4 @@ -/* $NetBSD: uipc_socket.c,v 1.140.6.4 2007/11/11 16:48:17 joerg Exp $ */ +/* $NetBSD: uipc_socket.c,v 1.141.2.1 2007/11/06 23:32:41 matt Exp $ */ /*- * Copyright (c) 2002, 2007 The NetBSD Foundation, Inc. @@ -68,7 +68,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.140.6.4 2007/11/11 16:48:17 joerg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.141.2.1 2007/11/06 23:32:41 matt Exp $"); #include "opt_sock_counters.h" #include "opt_sosend_loan.h" @@ -303,6 +303,7 @@ sodopendfreel() { struct mbuf *m, *next; size_t rv = 0; + int s; KASSERT(mutex_owned(&so_pendfree_lock)); @@ -318,7 +319,9 @@ sodopendfreel() sodoloanfree((m->m_flags & M_EXT_PAGES) ? m->m_ext.ext_pgs : NULL, m->m_ext.ext_buf, m->m_ext.ext_size); - pool_cache_put(mb_cache, m); + s = splvm(); + pool_cache_put(&mbpool_cache, m); + splx(s); } mutex_enter(&so_pendfree_lock);