Date: Mon, 14 Apr 2003 10:45:25 -0700 (PDT) From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 28937 for review Message-ID: <200304141745.h3EHjPlD059186@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=28937 Change 28937 by jhb@jhb_laptop on 2003/04/14 10:44:31 IFC @28936. Affected files ... .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#30 integrate .. //depot/projects/smpng/sys/kern/subr_mbuf.c#27 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf.c#17 integrate Differences ... ==== //depot/projects/smpng/sys/dev/fxp/if_fxp.c#30 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.169 2003/04/14 09:45:25 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.170 2003/04/14 15:50:04 sobomax Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -388,9 +388,9 @@ * Enable bus mastering. Enable memory/port space too, in case * BIOS/Prom forgot about it. */ - val = pci_read_config(dev, PCIR_COMMAND, 2); - val |= (PCIM_CMD_PORTEN|PCIM_CMD_MEMEN|PCIM_CMD_BUSMASTEREN); - pci_write_config(dev, PCIR_COMMAND, val, 2); + pci_enable_busmaster(dev); + pci_enable_io(dev, SYS_RES_IOPORT); + pci_enable_io(dev, SYS_RES_MEMORY); val = pci_read_config(dev, PCIR_COMMAND, 2); fxp_powerstate_d0(dev); ==== //depot/projects/smpng/sys/kern/subr_mbuf.c#27 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/subr_mbuf.c,v 1.43 2003/03/10 20:24:54 phk Exp $ + * $FreeBSD: src/sys/kern/subr_mbuf.c,v 1.44 2003/04/14 16:04:10 rwatson Exp $ */ #include "opt_mac.h" @@ -566,13 +566,12 @@ return (NULL); bucket = malloc(sizeof(struct mb_bucket) + - mb_list->ml_objbucks * sizeof(void *), M_MBUF, - how == M_TRYWAIT ? M_WAITOK : M_NOWAIT); + mb_list->ml_objbucks * sizeof(void *), M_MBUF, MBTOM(how)); if (bucket == NULL) return (NULL); p = (caddr_t)kmem_malloc(mb_list->ml_map, mb_list->ml_objsize * - mb_list->ml_objbucks, how == M_TRYWAIT ? M_WAITOK : M_NOWAIT); + mb_list->ml_objbucks, MBTOM(how)); if (p == NULL) { free(bucket, M_MBUF); if (how == M_TRYWAIT) ==== //depot/projects/smpng/sys/kern/uipc_mbuf.c#17 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)uipc_mbuf.c 8.2 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/kern/uipc_mbuf.c,v 1.113 2003/04/08 14:25:45 des Exp $ + * $FreeBSD: src/sys/kern/uipc_mbuf.c,v 1.114 2003/04/14 16:04:10 rwatson Exp $ */ #include "opt_mac.h" @@ -140,8 +140,7 @@ mac_create_mbuf_from_mbuf(from, to); #endif SLIST_INIT(&to->m_pkthdr.tags); - return (m_tag_copy_chain(to, from, (how & M_TRYWAIT) ? M_WAITOK : - M_NOWAIT)); + return (m_tag_copy_chain(to, from, MBTOM(how))); } /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200304141745.h3EHjPlD059186>