From owner-p4-projects@FreeBSD.ORG Sat Dec 6 13:42:37 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C85B316A4D0; Sat, 6 Dec 2003 13:42:36 -0800 (PST) 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 A3E3816A4CE for ; Sat, 6 Dec 2003 13:42:36 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7CD4343FEA for ; Sat, 6 Dec 2003 13:42:29 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB6LgTXJ068986 for ; Sat, 6 Dec 2003 13:42:29 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB6LgSJK068983 for perforce@freebsd.org; Sat, 6 Dec 2003 13:42:28 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sat, 6 Dec 2003 13:42:28 -0800 (PST) Message-Id: <200312062142.hB6LgSJK068983@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 43502 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: Sat, 06 Dec 2003 21:42:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=43502 Change 43502 by peter@peter_daintree on 2003/12/06 13:41:59 IFC @43501 Affected files ... .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#42 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/i386/proc-i386.sgml#7 integrate .. //depot/projects/hammer/release/scripts/print-cdrom-packages.sh#14 integrate .. //depot/projects/hammer/share/man/man4/dc.4#8 integrate .. //depot/projects/hammer/sys/netinet/ip_dummynet.c#17 integrate .. //depot/projects/hammer/sys/pci/if_dc.c#28 integrate .. //depot/projects/hammer/sys/pci/if_dcreg.h#13 integrate .. //depot/projects/hammer/sys/vm/vm_mmap.c#14 integrate Differences ... ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#42 (text+ko) ==== @@ -29,7 +29,7 @@ - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.205 2003/12/05 21:04:51 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.206 2003/12/06 20:43:48 bmah Exp $ Supported Devices @@ -274,16 +274,6 @@ C, S, and A Series Host Adapters (&man.bt.4; driver) - - BusLogic/Mylex Flashpoint adapters are not yet - supported. - - - - AMI FastDisk controllers that are true BusLogic - MultiMaster clones are also supported. - - The Buslogic/Bustek BT-640 and Storage Dimensions SDC3211B and SDC3211F Microchannel (MCA) bus adapters are @@ -336,11 +326,6 @@ Mylex AcceleRAID/eXtremeRAID family PCI to SCSI RAID controllers with 6.x firmware (&man.mly.4; driver) - - - Compatible Mylex controllers not listed should work, but - have not been verified. - 3ware Escalade ATA RAID controllers (&man.twe.4; driver) @@ -793,7 +778,7 @@ (&man.ste.4; driver) - SysKonnect SK-984x PCI Gigabit Ethernet cards (&man.sk.4; drivers) + SysKonnect SK-984x PCI Gigabit Ethernet cards (&man.sk.4; driver) Texas Instruments ThunderLAN PCI NICs (&man.tl.4; driver) @@ -919,16 +904,6 @@ drivers), plus NICs supported by the Intel 82540EM, 82544, 82545EM, and 82546EB controller chips (&man.em.4; driver only) - - - Intel PRO/1000 Gigabit Ethernet - - - - - The &man.em.4; driver is officially supported by Intel, - but is only supported on the i386. - Sun HME and QFE Ethernet NICs (&man.hme.4; driver) @@ -1173,14 +1148,6 @@ STB 4 port card using shared IRQ DigiBoard intelligent serial cards (&man.dgb.4; driver) - - - DigiBoard PC/Xe series - - - DigiBoard PC/Xi series - - PCI-Based multi-port serial boards (&man.puc.4; @@ -1271,23 +1238,7 @@ Stallion Technologies multiport serial boards - - - EasyIO (&man.stl.4; driver) - - - EasyConnection 8/32 (&man.stl.4; driver) - - - EasyConnection 8/64 (&man.stli.4; driver) - - - ONboard 4/16 (&man.stli.4; driver) - - - Brumby (&man.stli.4; driver) - - + (&man.stl.4; and &man.stli.4; drivers) Specialix SI/XIO/SX multiport serial cards, with both the @@ -1807,44 +1758,7 @@ - Audio Devices (uaudio driver) - - - Audio-Technica USB Digital Headphone ATC-HA4USB - - - - Ergo Systems AUDIOTRAK OPTOPlay USB - - - - KENWOOD MD Personal Stereo System MDX-G7 - - - - KENWOOD/SOTEC VH-7PC - - - - I-O DATA Analog to Digital USB Audio Adapter DAVOX - - - - ONKYO PC Speaker GX-R5U(W) - - - - ONKYO USB Digital Audio Processor SE-U55X(S) - - - - Roland UA-5 USB Audio Interface Audio Capture - - - - Sony PC Active Speaker System SRS-T100PC - - + Audio Devices (&man.uaudio.4; driver) Handspring Visor and other PalmOS ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/i386/proc-i386.sgml#7 (text+ko) ==== @@ -1,5 +1,5 @@ Supported Processors and Motherboards @@ -42,8 +42,9 @@ additional physical processors; in other words, no attempt is made to optimize scheduling decisions given the shared resources between logical processors within the same CPU. Because this - naive scheduling can result in suboptimal performance, the logical - CPUs are halted by default at startup. They can be enabled with + naive scheduling can result in suboptimal performance, under + certain circumstances it may be useful to disable the logical + processors with the the machdep.hlt_logical_cpus sysctl variable. It is also possible to halt any CPU in the idle loop with the machdep.hlt_cpus sysctl variable. The ==== //depot/projects/hammer/release/scripts/print-cdrom-packages.sh#14 (text+ko) ==== @@ -2,7 +2,7 @@ # # Author: Jordan Hubbard # Date: Mon Jul 10 01:18:20 2000 -# Version: $FreeBSD: src/release/scripts/print-cdrom-packages.sh,v 1.51 2003/12/02 20:47:31 marcus Exp $ +# Version: $FreeBSD: src/release/scripts/print-cdrom-packages.sh,v 1.52 2003/12/06 04:15:13 scottl Exp $ # # MAINTAINER: re # @@ -79,7 +79,6 @@ CDROM_SET_1="${CDROM_SET_1} mail/exim" CDROM_SET_1="${CDROM_SET_1} mail/postfix" CDROM_SET_1="${CDROM_SET_1} net/pcnfsd" -CDROM_SET_1="${CDROM_SET_1} net/rsync" CDROM_SET_1="${CDROM_SET_1} x11-fonts/XFree86-4-font100dpi" CDROM_SET_1="${CDROM_SET_1} x11-fonts/XFree86-4-font75dpi" CDROM_SET_1="${CDROM_SET_1} x11-fonts/XFree86-4-fontCyrillic" @@ -110,13 +109,10 @@ CDROM_SET_1="${CDROM_SET_1} astro/xearth" CDROM_SET_1="${CDROM_SET_1} editors/emacs21" CDROM_SET_1="${CDROM_SET_1} editors/vim" +CDROM_SET_1="${CDROM_SET_1} editors/vim-lite" CDROM_SET_1="${CDROM_SET_1} emulators/mtools" -CDROM_SET_1="${CDROM_SET_1} ftp/ncftp" -CDROM_SET_1="${CDROM_SET_1} graphics/gimp1" -CDROM_SET_1="${CDROM_SET_1} graphics/xpdf" CDROM_SET_1="${CDROM_SET_1} graphics/xv" CDROM_SET_1="${CDROM_SET_1} irc/xchat2" -CDROM_SET_1="${CDROM_SET_1} mail/exim" CDROM_SET_1="${CDROM_SET_1} mail/fetchmail" CDROM_SET_1="${CDROM_SET_1} mail/mutt" CDROM_SET_1="${CDROM_SET_1} mail/pine4" @@ -125,6 +121,7 @@ CDROM_SET_1="${CDROM_SET_1} misc/bsdiff" CDROM_SET_1="${CDROM_SET_1} misc/screen" CDROM_SET_1="${CDROM_SET_1} net/cvsup" +CDROM_SET_1="${CDROM_SET_1} net/rsync" CDROM_SET_1="${CDROM_SET_1} net/samba" CDROM_SET_1="${CDROM_SET_1} news/slrn" CDROM_SET_1="${CDROM_SET_1} news/tin" @@ -137,7 +134,6 @@ fi CDROM_SET_1="${CDROM_SET_1} print/apsfilter" CDROM_SET_1="${CDROM_SET_1} print/ghostscript-gnu-nox11" -CDROM_SET_1="${CDROM_SET_1} print/ghostview" CDROM_SET_1="${CDROM_SET_1} print/gv" CDROM_SET_1="${CDROM_SET_1} print/psutils-letter" CDROM_SET_1="${CDROM_SET_1} security/sudo" @@ -147,10 +143,6 @@ CDROM_SET_1="${CDROM_SET_1} shells/zsh" CDROM_SET_1="${CDROM_SET_1} sysutils/portupgrade" CDROM_SET_1="${CDROM_SET_1} www/lynx" -CDROM_SET_1="${CDROM_SET_1} www/mozilla" -CDROM_SET_1="${CDROM_SET_1} www/netscape-remote" -CDROM_SET_1="${CDROM_SET_1} www/netscape-wrapper" -CDROM_SET_1="${CDROM_SET_1} www/netscape48-communicator" CDROM_SET_1="${CDROM_SET_1} www/opera" CDROM_SET_1="${CDROM_SET_1} x11/rxvt" ==== //depot/projects/hammer/share/man/man4/dc.4#8 (text+ko) ==== @@ -28,7 +28,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/dc.4,v 1.24 2003/11/13 17:01:08 simon Exp $ +.\" $FreeBSD: src/share/man/man4/dc.4,v 1.25 2003/12/06 02:29:31 sanpei Exp $ .\" .Dd November 20, 1999 .Dt DC 4 @@ -133,6 +133,8 @@ .It Digital DE500-BA 10/100 (21143, non-MII) .It +ELECOM Laneed LD-CBL/TXA (ADMtek AN985) +.It Hawking CB102 CardBus .It IBM EtherJet Cardbus Adapter ==== //depot/projects/hammer/sys/netinet/ip_dummynet.c#17 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/netinet/ip_dummynet.c,v 1.74 2003/11/23 18:13:41 sam Exp $ + * $FreeBSD: src/sys/netinet/ip_dummynet.c,v 1.75 2003/12/06 09:01:25 emax Exp $ */ #define DUMMYNET_DEBUG @@ -1386,7 +1386,6 @@ heap_free(&ready_heap); heap_free(&wfq_ready_heap); heap_free(&extract_heap); - DUMMYNET_UNLOCK(); /* * Now purge all queued pkts and delete all pipes @@ -1403,6 +1402,7 @@ p = p->next ; free(curr_p, M_DUMMYNET); } + DUMMYNET_UNLOCK(); } ==== //depot/projects/hammer/sys/pci/if_dc.c#28 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/pci/if_dc.c,v 1.136 2003/11/28 05:28:29 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/pci/if_dc.c,v 1.137 2003/12/06 02:29:31 sanpei Exp $"); /* * DEC "tulip" clone ethernet driver. Supports the DEC/Intel 21143 @@ -196,6 +196,8 @@ "Xircom X3201 10/100BaseTX" }, { DC_VENDORID_ABOCOM, DC_DEVICEID_FE2500, "Abocom FE2500 10/100BaseTX" }, + { DC_VENDORID_ABOCOM, DC_DEVICEID_FE2500MX, + "Abocom FE2500MX 10/100BaseTX" }, { DC_VENDORID_CONEXANT, DC_DEVICEID_RS7112, "Conexant LANfinity MiniPCI 10/100BaseTX" }, { DC_VENDORID_HAWKING, DC_DEVICEID_HAWKING_PN672TX, ==== //depot/projects/hammer/sys/pci/if_dcreg.h#13 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/pci/if_dcreg.h,v 1.39 2003/11/14 19:00:31 sam Exp $ + * $FreeBSD: src/sys/pci/if_dcreg.h,v 1.40 2003/12/06 02:29:31 sanpei Exp $ */ /* @@ -953,6 +953,7 @@ * Abocom device IDs. */ #define DC_DEVICEID_FE2500 0xAB02 +#define DC_DEVICEID_FE2500MX 0xab08 /* * Conexant vendor ID. ==== //depot/projects/hammer/sys/vm/vm_mmap.c#14 (text+ko) ==== @@ -45,7 +45,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_mmap.c,v 1.173 2003/11/14 08:22:38 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_mmap.c,v 1.174 2003/12/06 05:45:32 alc Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -433,7 +433,6 @@ goto done; } - mtx_unlock(&Giant); error = 0; #ifdef MAC if (handle != NULL && (flags & MAP_SHARED) != 0) { @@ -441,6 +440,11 @@ (struct vnode *)handle, prot); } #endif + if (vp != NULL) { + vput(vp); + vp = NULL; + } + mtx_unlock(&Giant); if (error == 0) error = vm_mmap(&vms->vm_map, &addr, size, prot, maxprot, flags, handle, pos); @@ -1164,7 +1168,7 @@ objtype_t type; int rv = KERN_SUCCESS; vm_ooffset_t objsize; - int docow; + int docow, error; struct thread *td = curthread; if (size == 0) @@ -1211,16 +1215,20 @@ } else { vp = (struct vnode *) handle; mtx_lock(&Giant); - ASSERT_VOP_LOCKED(vp, "vm_mmap"); + error = vget(vp, LK_EXCLUSIVE, td); + if (error) { + mtx_unlock(&Giant); + return (error); + } if (vp->v_type == VCHR) { type = OBJT_DEVICE; handle = vp->v_rdev; } else { struct vattr vat; - int error; error = VOP_GETATTR(vp, &vat, td->td_ucred, td); if (error) { + vput(vp); mtx_unlock(&Giant); return (error); } @@ -1234,6 +1242,7 @@ flags |= MAP_NOSYNC; } } + vput(vp); mtx_unlock(&Giant); }