From owner-p4-projects@FreeBSD.ORG Mon Apr 14 10:45:26 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5BA9937B404; Mon, 14 Apr 2003 10:45:26 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0EB3C37B401 for ; Mon, 14 Apr 2003 10:45:26 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8C4EB43F75 for ; Mon, 14 Apr 2003 10:45:25 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h3EHjP0U059189 for ; Mon, 14 Apr 2003 10:45:25 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3EHjPlD059186 for perforce@freebsd.org; Mon, 14 Apr 2003 10:45:25 -0700 (PDT) Date: Mon, 14 Apr 2003 10:45:25 -0700 (PDT) Message-Id: <200304141745.h3EHjPlD059186@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 28937 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Apr 2003 17:45:27 -0000 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 -__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 #include @@ -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))); } /*