Date: Wed, 10 Dec 2008 16:20:49 +0000 (UTC) From: Doug Rabson <dfr@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r185865 - in user/dfr/gssapi/6: . bin/cp contrib/bind9 contrib/ntp contrib/openpam contrib/sendmail contrib/tcsh contrib/telnet crypto/heimdal etc etc/defaults etc/rc.d games/fortune/fo... Message-ID: <200812101620.mBAGKnAc036108@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dfr Date: Wed Dec 10 16:20:49 2008 New Revision: 185865 URL: http://svn.freebsd.org/changeset/base/185865 Log: MF6: 184967:185863 Added: user/dfr/gssapi/6/share/man/man4/nfe.4 - copied unchanged from r185863, stable/6/share/man/man4/nfe.4 user/dfr/gssapi/6/sys/dev/nfe/ - copied from r185863, stable/6/sys/dev/nfe/ user/dfr/gssapi/6/sys/modules/nfe/ - copied from r185863, stable/6/sys/modules/nfe/ Modified: user/dfr/gssapi/6/ (props changed) user/dfr/gssapi/6/Makefile.inc1 (props changed) user/dfr/gssapi/6/bin/cp/ (props changed) user/dfr/gssapi/6/contrib/bind9/ (props changed) user/dfr/gssapi/6/contrib/ntp/ (props changed) user/dfr/gssapi/6/contrib/openpam/ (props changed) user/dfr/gssapi/6/contrib/sendmail/ (props changed) user/dfr/gssapi/6/contrib/tcsh/ (props changed) user/dfr/gssapi/6/contrib/telnet/ (props changed) user/dfr/gssapi/6/crypto/heimdal/ (props changed) user/dfr/gssapi/6/etc/ (props changed) user/dfr/gssapi/6/etc/defaults/ (props changed) user/dfr/gssapi/6/etc/rc.d/ (props changed) user/dfr/gssapi/6/games/fortune/fortune/ (props changed) user/dfr/gssapi/6/include/ (props changed) user/dfr/gssapi/6/lib/libarchive/ (props changed) user/dfr/gssapi/6/lib/libbluetooth/ (props changed) user/dfr/gssapi/6/lib/libc/ (props changed) user/dfr/gssapi/6/lib/libc/gen/times.3 user/dfr/gssapi/6/lib/libc/sys/ (props changed) user/dfr/gssapi/6/lib/libcam/ (props changed) user/dfr/gssapi/6/lib/libcam/camlib.c user/dfr/gssapi/6/lib/libexpat/ (props changed) user/dfr/gssapi/6/lib/libfetch/ (props changed) user/dfr/gssapi/6/lib/libftpio/ (props changed) user/dfr/gssapi/6/lib/libgeom/ (props changed) user/dfr/gssapi/6/lib/libpam/ (props changed) user/dfr/gssapi/6/lib/libutil/ (props changed) user/dfr/gssapi/6/libexec/rpc.rstatd/ (props changed) user/dfr/gssapi/6/release/ (props changed) user/dfr/gssapi/6/release/doc/en_US.ISO8859-1/errata/article.sgml user/dfr/gssapi/6/release/doc/share/sgml/release.ent user/dfr/gssapi/6/release/scripts/src-install.sh (props changed) user/dfr/gssapi/6/sbin/devfs/ (props changed) user/dfr/gssapi/6/sbin/dhclient/ (props changed) user/dfr/gssapi/6/sbin/fdisk/ (props changed) user/dfr/gssapi/6/sbin/mount_nfs/ (props changed) user/dfr/gssapi/6/sbin/ping6/ (props changed) user/dfr/gssapi/6/sbin/routed/main.c (props changed) user/dfr/gssapi/6/share/colldef/ (props changed) user/dfr/gssapi/6/share/man/man4/ (props changed) user/dfr/gssapi/6/share/man/man4/Makefile user/dfr/gssapi/6/share/man/man4/polling.4 user/dfr/gssapi/6/share/man/man4/xl.4 (props changed) user/dfr/gssapi/6/share/man/man5/ (props changed) user/dfr/gssapi/6/share/man/man5/fstab.5 user/dfr/gssapi/6/share/man/man7/ports.7 (props changed) user/dfr/gssapi/6/share/man/man9/ (props changed) user/dfr/gssapi/6/share/mk/ (props changed) user/dfr/gssapi/6/share/sendmail/ (props changed) user/dfr/gssapi/6/share/syscons/keymaps/ (props changed) user/dfr/gssapi/6/share/timedef/ (props changed) user/dfr/gssapi/6/share/zoneinfo/ (props changed) user/dfr/gssapi/6/sys/ (props changed) user/dfr/gssapi/6/sys/alpha/alpha/uma_machdep.c user/dfr/gssapi/6/sys/amd64/amd64/uma_machdep.c user/dfr/gssapi/6/sys/amd64/conf/NOTES user/dfr/gssapi/6/sys/boot/forth/loader.conf.5 user/dfr/gssapi/6/sys/conf/files.amd64 user/dfr/gssapi/6/sys/conf/files.i386 user/dfr/gssapi/6/sys/conf/newvers.sh user/dfr/gssapi/6/sys/dev/mii/ciphy.c user/dfr/gssapi/6/sys/dev/mii/ciphyreg.h user/dfr/gssapi/6/sys/dev/mii/miidevs user/dfr/gssapi/6/sys/dev/mii/rlphy.c user/dfr/gssapi/6/sys/dev/puc/pucdata.c user/dfr/gssapi/6/sys/dev/random/randomdev.c user/dfr/gssapi/6/sys/dev/random/randomdev_soft.c user/dfr/gssapi/6/sys/i386/conf/NOTES user/dfr/gssapi/6/sys/i386/cpufreq/p4tcc.c user/dfr/gssapi/6/sys/ia64/ia64/uma_machdep.c user/dfr/gssapi/6/sys/kern/vfs_aio.c user/dfr/gssapi/6/sys/modules/Makefile user/dfr/gssapi/6/sys/pci/if_dc.c user/dfr/gssapi/6/sys/powerpc/powerpc/uma_machdep.c user/dfr/gssapi/6/sys/sparc64/sparc64/vm_machdep.c user/dfr/gssapi/6/tools/regression/file/flock/ (props changed) user/dfr/gssapi/6/tools/regression/usr.bin/ (props changed) user/dfr/gssapi/6/tools/regression/usr.bin/calendar/ (props changed) user/dfr/gssapi/6/usr.bin/calendar/ (props changed) user/dfr/gssapi/6/usr.bin/cksum/ (props changed) user/dfr/gssapi/6/usr.bin/fetch/ (props changed) user/dfr/gssapi/6/usr.bin/gzip/ (props changed) user/dfr/gssapi/6/usr.bin/ipcrm/ (props changed) user/dfr/gssapi/6/usr.bin/ipcs/ (props changed) user/dfr/gssapi/6/usr.bin/ldd/ (props changed) user/dfr/gssapi/6/usr.bin/lockf/ (props changed) user/dfr/gssapi/6/usr.bin/make/ (props changed) user/dfr/gssapi/6/usr.bin/netstat/ (props changed) user/dfr/gssapi/6/usr.bin/rpcgen/ (props changed) user/dfr/gssapi/6/usr.bin/shar/ (props changed) user/dfr/gssapi/6/usr.bin/su/ (props changed) user/dfr/gssapi/6/usr.bin/tar/ (props changed) user/dfr/gssapi/6/usr.bin/truncate/ (props changed) user/dfr/gssapi/6/usr.bin/units/ (props changed) user/dfr/gssapi/6/usr.bin/whereis/ (props changed) user/dfr/gssapi/6/usr.bin/window/ (props changed) user/dfr/gssapi/6/usr.bin/xargs/ (props changed) user/dfr/gssapi/6/usr.bin/xargs/xargs.1 user/dfr/gssapi/6/usr.sbin/ (props changed) user/dfr/gssapi/6/usr.sbin/adduser/ (props changed) user/dfr/gssapi/6/usr.sbin/cdcontrol/ (props changed) user/dfr/gssapi/6/usr.sbin/config/ (props changed) user/dfr/gssapi/6/usr.sbin/cron/ (props changed) user/dfr/gssapi/6/usr.sbin/freebsd-update/ (props changed) user/dfr/gssapi/6/usr.sbin/mergemaster/ (props changed) user/dfr/gssapi/6/usr.sbin/mergemaster/mergemaster.sh user/dfr/gssapi/6/usr.sbin/mountd/ (props changed) user/dfr/gssapi/6/usr.sbin/mtree/ (props changed) user/dfr/gssapi/6/usr.sbin/newsyslog/newsyslog.conf.5 (props changed) user/dfr/gssapi/6/usr.sbin/ntp/ (props changed) user/dfr/gssapi/6/usr.sbin/ntp/doc/ (props changed) user/dfr/gssapi/6/usr.sbin/pkg_install/ (props changed) user/dfr/gssapi/6/usr.sbin/portsnap/ (props changed) user/dfr/gssapi/6/usr.sbin/pw/ (props changed) user/dfr/gssapi/6/usr.sbin/rpc.lockd/ (props changed) user/dfr/gssapi/6/usr.sbin/rpc.statd/ (props changed) user/dfr/gssapi/6/usr.sbin/sysinstall/ (props changed) user/dfr/gssapi/6/usr.sbin/syslogd/ (props changed) user/dfr/gssapi/6/usr.sbin/tzsetup/ (props changed) Modified: user/dfr/gssapi/6/lib/libc/gen/times.3 ============================================================================== --- user/dfr/gssapi/6/lib/libc/gen/times.3 Wed Dec 10 16:11:09 2008 (r185864) +++ user/dfr/gssapi/6/lib/libc/gen/times.3 Wed Dec 10 16:20:49 2008 (r185865) @@ -32,7 +32,7 @@ .\" @(#)times.3 8.1 (Berkeley) 6/4/93 .\" $FreeBSD$ .\" -.Dd June 4, 1993 +.Dd December 1, 2008 .Dt TIMES 3 .Os .Sh NAME @@ -56,9 +56,13 @@ The .Fn times function returns the value of time in .Dv CLK_TCK Ns 's -of a second since -0 hours, 0 minutes, 0 seconds, January 1, 1970, Coordinated Universal -Time. +of a second since the system startup time. +The current value of +.Dv CLK_TCK , +the frequency of the statistics clock in ticks per second, may be +obtained through the +.Xr sysconf 3 +interface. .Pp It also fills in the structure pointed to by .Fa tp @@ -135,6 +139,7 @@ and .Xr getrusage 2 , .Xr gettimeofday 2 , .Xr wait 2 , +.Xr sysconf 3 , .Xr clocks 7 .Sh STANDARDS The Modified: user/dfr/gssapi/6/lib/libcam/camlib.c ============================================================================== --- user/dfr/gssapi/6/lib/libcam/camlib.c Wed Dec 10 16:11:09 2008 (r185864) +++ user/dfr/gssapi/6/lib/libcam/camlib.c Wed Dec 10 16:20:49 2008 (r185865) @@ -346,6 +346,9 @@ cam_open_btl(path_id_t path_id, target_i bzero(&ccb, sizeof(union ccb)); ccb.ccb_h.func_code = XPT_DEV_MATCH; + ccb.ccb_h.path_id = CAM_XPT_PATH_ID; + ccb.ccb_h.target_id = CAM_TARGET_WILDCARD; + ccb.ccb_h.target_lun = CAM_LUN_WILDCARD; /* Setup the result buffer */ bufsize = sizeof(struct dev_match_result); Modified: user/dfr/gssapi/6/release/doc/en_US.ISO8859-1/errata/article.sgml ============================================================================== --- user/dfr/gssapi/6/release/doc/en_US.ISO8859-1/errata/article.sgml Wed Dec 10 16:11:09 2008 (r185864) +++ user/dfr/gssapi/6/release/doc/en_US.ISO8859-1/errata/article.sgml Wed Dec 10 16:20:49 2008 (r185865) @@ -16,7 +16,7 @@ <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN"> %release; -<!ENTITY release.bugfix "6.3-RELEASE"> +<!ENTITY release.bugfix "6.4-RELEASE"> ]> <article> @@ -62,7 +62,8 @@ &os;.</para> <para>This errata document for &os; &release.bugfix; - will be maintained until the release of &os; &release.next;.</para> + will be maintained until the end of 6.4-STABLE development + line support.</para> </abstract> <sect1 id="intro"> @@ -96,21 +97,7 @@ <sect1 id="late-news"> <title>Late-Breaking News and Corrections</title> - <para>[20080204] The ISO images of &os; &release.bugfix; are sized - for 700MB CD-ROM media (ISO images of all prior versions assumed - 650MB media). This fact should have been mentioned in the - release notes.</para> - - <para>[20080204] Contrary to the release notes, ipfwpcap(8) - is <emphasis>not</emphasis> a feature included in &os; - &release.bugfix;. It was merged to the &release.branch; - codeline after the release branch was created. This utility - will be included in subsequent snapshots of &release.branch; and in - &release.next;.</para> - - <para>[20080229] The release notes gave an incorrect version - number for KDE. The correct version number is 3.5.8.</para> - + <para>No news.</para> </sect1> <sect1 id="security"> @@ -120,7 +107,9 @@ For more information, consult the individual advisories available from <ulink url="http://security.FreeBSD.org/"></ulink>.</para> + <para>No advisories.</para> + <!-- <informaltable frame="none" pgwide="0"> <tgroup cols="3"> <colspec colwidth="1*"> @@ -140,55 +129,16 @@ <entry>14 February 2008</entry> <entry><para>&man.sendfile.2; write-only file permission bypass</para></entry> </row> - <row> - <entry><ulink url="http://security.freebsd.org/advisories/FreeBSD-SA-08:05.openssh.asc" - >SA-08:05.openssh</ulink></entry> - <entry>17 April 2008</entry> - <entry><para>OpenSSH X11-forwarding privilege escalation</para></entry> - </row> - <row> - <entry><ulink url="http://security.freebsd.org/advisories/FreeBSD-SA-08:06.bind.asc" - >SA-08:06.bind</ulink></entry> - <entry>13 July 2008</entry> - <entry><para>DNS cache poisoning</para></entry> - </row> </tbody> </tgroup> </informaltable> - +--> </sect1> <sect1 id="known-problems"> <title>Known Problems and Solutions</title> - <para>[20080229] A bug in Linux emulation may cause segmentation - faults for some Linux programs using &man.mmap.2;. This issue - has been fixed on the HEAD and RELENG_6 branches.</para> - - <para>[20080229, updated 20080420] Multithreaded programs that perform a - &man.fork.2; operation may crash due to a race condition in the - threading library. This problem has been fixed on the HEAD, - RELENG_6, and RELENG_6_3 branches, and is addressed by errata - notice - <ulink url="http://security.FreeBSD.org/advisories/FreeBSD-EN-08:01.libpthread.asc">FreeBSD-EN-08:01.libpthread</ulink>. - </para> - - <para>[20080307] When using &man.sysinstall.8; to install the - X.org packages, selecting only specific components to be - installed may result in - the <filename role="package">x11/xorg-drivers</filename> package - not being installed, and a corresponding failure of X.org server - to configure itself correctly. The recommended way to a - functioning X.org installation is simply to - select <guimenuitem>All</guimenuitem> from the Distributions - menu.</para> - - <para>[20080420] A reference counting bug in the IP multicast code - could cause kernel panics under some circumstances. It has been - fixed on the RELENG_6 branch by - revision <literal>1.85.2.10</literal> - of <filename>sys/netinet/in.c</filename>.</para> - + <para>No news.</para> </sect1> </article> Modified: user/dfr/gssapi/6/release/doc/share/sgml/release.ent ============================================================================== --- user/dfr/gssapi/6/release/doc/share/sgml/release.ent Wed Dec 10 16:11:09 2008 (r185864) +++ user/dfr/gssapi/6/release/doc/share/sgml/release.ent Wed Dec 10 16:20:49 2008 (r185865) @@ -6,7 +6,7 @@ <!-- Version of the OS we're describing. This needs to be updated with each new release. --> -<!ENTITY release.current "6.3-STABLE"> +<!ENTITY release.current "6.4-STABLE"> <!-- The previous version used for comparison in the "What's New" section. For -CURRENT, we might point back to the last @@ -36,11 +36,10 @@ <!-- The manpaths for man page references --> <!ENTITY release.man.url "http://www.FreeBSD.org/cgi/man.cgi"> -<!ENTITY release.manpath.xfree86 "4.5.0"> -<!ENTITY release.manpath.xorg "7.2"> -<!ENTITY release.manpath.netbsd "3.0"> +<!ENTITY release.manpath.xorg "7.3"> +<!ENTITY release.manpath.netbsd "4.0.1"> <!ENTITY release.manpath.freebsd-ports "Ports"> -<!ENTITY release.manpath.freebsd "6.3-stable"> +<!ENTITY release.manpath.freebsd "6.4-stable"> <!-- Text constants which probably don't need to be changed.--> Modified: user/dfr/gssapi/6/share/man/man4/Makefile ============================================================================== --- user/dfr/gssapi/6/share/man/man4/Makefile Wed Dec 10 16:11:09 2008 (r185864) +++ user/dfr/gssapi/6/share/man/man4/Makefile Wed Dec 10 16:20:49 2008 (r185865) @@ -180,6 +180,7 @@ MAN= aac.4 \ ncv.4 \ netgraph.4 \ netintro.4 \ + ${_nfe.4} \ ${_nfsmb.4} \ ng_async.4 \ ng_atm.4 \ @@ -469,6 +470,7 @@ MLINKS+=mxge.4 if_mxge.4 MLINKS+=my.4 if_my.4 MLINKS+=netintro.4 net.4 \ netintro.4 networking.4 +MLINKS+=${_nfe.4} ${_if_nfe.4} MLINKS+=nge.4 if_nge.4 MLINKS+=${_nve.4} ${_if_nve.4} MLINKS+=oldcard.4 card.4 @@ -522,9 +524,11 @@ MLINKS+=watchdog.4 SW_WATCHDOG.4 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" _amdsmb.4= amdsmb.4 _coretemp.4= coretemp.4 +_if_nfe.4= if_nfe.4 _if_nve.4= if_nve.4 _ipmi.4= ipmi.4 _nfsmb.4= nfsmb.4 +_nfe.4= nfe.4 _nve.4= nve.4 _rr232x.4= rr232x.4 _spkr.4= spkr.4 Copied: user/dfr/gssapi/6/share/man/man4/nfe.4 (from r185863, stable/6/share/man/man4/nfe.4) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/dfr/gssapi/6/share/man/man4/nfe.4 Wed Dec 10 16:20:49 2008 (r185865, copy of r185863, stable/6/share/man/man4/nfe.4) @@ -0,0 +1,202 @@ +.\" $OpenBSD: nfe.4,v 1.7 2006/02/28 08:13:47 jsg Exp $ +.\" +.\" Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org> +.\" +.\" Permission to use, copy, modify, and distribute this software for any +.\" purpose with or without fee is hereby granted, provided that the above +.\" copyright notice and this permission notice appear in all copies. +.\" +.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +.\" +.\" $FreeBSD$ +.\" +.Dd October 2, 2008 +.Dt NFE 4 +.Os +.Sh NAME +.Nm nfe +.Nd "NVIDIA nForce MCP Ethernet driver" +.Sh SYNOPSIS +To compile this driver into the kernel, +place the following lines in your +kernel configuration file: +.Bd -ragged -offset indent +.Cd "device miibus" +.Cd "device nfe" +.Ed +.Pp +Alternatively, to load the driver as a +module at boot time, place the following line in +.Xr loader.conf 5 : +.Bd -literal -offset indent +if_nfe_load="YES" +.Ed +.Sh DESCRIPTION +The +.Nm +driver supports PCI Ethernet adapters based on the NVIDIA +nForce Media and Communications Processors (MCP), such as +the nForce, nForce 2, nForce 3, CK804, MCP04, MCP51, MCP55, +MCP61, MCP65, MCP67, MCP73, MCP77 and MCP79 Ethernet +controller chips. +.Pp +Supported features include (hardware support provided): +.Pp +.Bl -bullet -compact +.It +Receive/Transmit IP/TCP/UDP checksum offload +.It +Hardware VLAN tag insertion/stripping +.It +TCP segmentation offload (TSO) +.It +MSI/MSI-X +.It +Jumbo Frames +.El +.Pp +Support for Jumbo Frames is provided via the interface MTU setting. +Selecting an MTU larger than 1500 bytes with the +.Xr ifconfig 8 +utility configures the adapter to receive and transmit Jumbo Frames. +.Pp +The +.Nm +driver supports the following media types: +.Bl -tag -width "10baseT/UTP" +.It Cm autoselect +Enable autoselection of the media type and options. +.It Cm 10baseT/UTP +Set 10Mbps operation. +.It Cm 100baseTX +Set 100Mbps (Fast Ethernet) operation. +.It Cm 1000baseT +Set 1000Mbps (Gigabit Ethernet) operation (recent models only). +.El +.Pp +The +.Nm +driver supports the following media options: +.Bl -tag -width ".Cm 10baseT/UTP" +.It Cm half-duplex +Force half duplex operation. +.It Cm full-duplex +Force full duplex operation. +.El +.Pp +For more information on configuring this device, see +.Xr ifconfig 8 . +.Sh HARDWARE +The +.Nm +driver supports the following NVIDIA MCP onboard adapters: +.Pp +.Bl -bullet -compact +.It +NVIDIA nForce MCP Networking Adapter +.It +NVIDIA nForce MCP04 Networking Adapter +.It +NVIDIA nForce 430 MCP12 Networking Adapter +.It +NVIDIA nForce 430 MCP13 Networking Adapter +.It +NVIDIA nForce MCP51 Networking Adapter +.It +NVIDIA nForce MCP55 Networking Adapter +.It +NVIDIA nForce MCP61 Networking Adapter +.It +NVIDIA nForce MCP65 Networking Adapter +.It +NVIDIA nForce MCP67 Networking Adapter +.It +NVIDIA nForce MCP73 Networking Adapter +.It +NVIDIA nForce MCP77 Networking Adapter +.It +NVIDIA nForce MCP79 Networking Adapter +.It +NVIDIA nForce2 MCP2 Networking Adapter +.It +NVIDIA nForce2 400 MCP4 Networking Adapter +.It +NVIDIA nForce2 400 MCP5 Networking Adapter +.It +NVIDIA nForce3 MCP3 Networking Adapter +.It +NVIDIA nForce3 250 MCP6 Networking Adapter +.It +NVIDIA nForce3 MCP7 Networking Adapter +.It +NVIDIA nForce4 CK804 MCP8 Networking Adapter +.It +NVIDIA nForce4 CK804 MCP9 Networking Adapter +.El +.Sh LOADER TUNABLES +Tunables can be set at the +.Xr loader 8 +prompt before booting the kernel or stored in +.Xr loader.conf 5 . +.Bl -tag -width indent +.It Va hw.nfe.msi_disable +Whether or not MSI support is enabled in the driver. +The default value is 0. +.It Va hw.nfe.msix_disable +Whether or not MSI-X support is enabled in the driver. +The default value is 0. +.El +.Sh SYSCTL VARIABLES +The following +.Xr sysctl 8 +variables can be used to modify or monitor +.Nm +behavior. +.Bl -tag -width indent +.It Va dev.nfe.%d.process_limit +Maximum number of Rx events to be processed in the event loop +before rescheduling a taskqueue. +The accepted range is 50 to 255, the default value is 192. +The interface does not need to be brought down and up again +before a change takes effect. +.El +.Sh SEE ALSO +.Xr altq 4 , +.Xr arp 4 , +.Xr intro 4 , +.Xr miibus 4 , +.Xr netintro 4 , +.Xr pci 4 , +.Xr polling 4 , +.Xr sysctl 8 , +.Xr ifconfig 8 +.Sh HISTORY +The +.Nm +device driver first appeared in +.Ox 3.9 , +and then in +.Fx 7.0 . +.Sh AUTHORS +.An -nosplit +The +.Nm +driver was written by +.An Jonathan Gray +.Aq jsg@openbsd.org +and +.An Damien Bergamini +.Aq damien@openbsd.org . +The +.Nm +driver was ported to +.Fx +by +.An Shigeaki Tagashira +.Aq shigeaki@se.hiroshima-u.ac.jp . Modified: user/dfr/gssapi/6/share/man/man4/polling.4 ============================================================================== --- user/dfr/gssapi/6/share/man/man4/polling.4 Wed Dec 10 16:11:09 2008 (r185864) +++ user/dfr/gssapi/6/share/man/man4/polling.4 Wed Dec 10 16:20:49 2008 (r185865) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 2, 2006 +.Dd April 6, 2007 .Dt POLLING 4 .Os .Sh NAME @@ -184,6 +184,7 @@ As of this writing, the .Xr fwip 4 , .Xr fxp 4 , .Xr ixgb 4 , +.Xr nfe 4 , .Xr nge 4 , .Xr re 4 , .Xr rl 4 , Modified: user/dfr/gssapi/6/share/man/man5/fstab.5 ============================================================================== --- user/dfr/gssapi/6/share/man/man5/fstab.5 Wed Dec 10 16:11:09 2008 (r185864) +++ user/dfr/gssapi/6/share/man/man5/fstab.5 Wed Dec 10 16:20:49 2008 (r185865) @@ -32,7 +32,7 @@ .\" @(#)fstab.5 8.1 (Berkeley) 6/5/93 .\" $FreeBSD$ .\" -.Dd June 5, 1993 +.Dd November 23, 2008 .Dt FSTAB 5 .Os .Sh NAME @@ -64,15 +64,8 @@ doing their thing. .Pp The first field, .Pq Fa fs_spec , -describes the block special device or +describes the special device or remote file system to be mounted. -For file systems of type -.Em ufs , -the special file name is the block special file name, -and not the character special file name. -If a program needs the character special file name, -the program must create it by appending a ``r'' after the -last ``/'' in the special file name. .Pp The second field, .Pq Fa fs_file , @@ -98,8 +91,7 @@ describes the mount options associated w It is formatted as a comma separated list of options. It contains at least the type of mount (see .Fa fs_type -below) plus any additional options -appropriate to the file system type. +below) plus any additional options appropriate to the file system type. See the options flag .Pq Fl o in the @@ -107,6 +99,32 @@ in the page and the file system specific page, such as .Xr mount_nfs 8 , for additional options that may be specified. +All options that can be given to the file system specific mount commands +can be used in +.Nm +as well. +They just need to be formatted a bit differently. +The arguments of the +.Fl o +option can be used without the preceding +.Fl o +flag. +Other options need both the file system specific flag and its argument, +separated by an equal sign. +For example, mounting an +.Xr msdosfs 5 +filesystem, the options +.Bd -literal -offset indent +-o sync -o noatime -m 644 -M 755 -u foo -g bar +.Ed +.Pp +should be written as +.Bd -literal -offset indent +sync,noatime,-m=644,-M=755,-u=foo,-g=bar +.Ed +.Pp +in the option field of +.Nm . .Pp If the options ``userquota'' and/or ``groupquota'' are specified, the file system is automatically processed by the @@ -186,20 +204,72 @@ The sixth field, .Pq Fa fs_passno , is used by the .Xr fsck 8 -program to determine the order in which file system checks are done -at reboot time. +and +.Xr quotacheck 8 +programs to determine the order in which file system and quota +checks are done at reboot time. +The +.Fa fs_passno +field can be any value between 0 and +.Ql INT_MAX Ns -1 . +.Pp The root file system should be specified with a .Fa fs_passno of 1, and other file systems should have a .Fa fs_passno -of 2. -File systems within a drive will be checked sequentially, +of 2 or greater. +A file system with a +.Fa fs_passno +value of 1 is always checked sequentially and be completed before +another file system is processed, and it will be processed before +all file systems with a larger +.Fa fs_passno . +.Pp +For any given value of +.Fa fs_passno , +file systems within a drive will be checked sequentially, but file systems on different drives will be checked at the same time to utilize parallelism available in the hardware. +Once all file system checks are complete for the current +.Fa fs_passno , +the same process will start over for the next +.Fa fs_passno . +.Pp If the sixth field is not present or is zero, a value of zero is returned and .Xr fsck 8 +and +.Xr quotacheck 8 will assume that the file system does not need to be checked. +.Pp +The +.Fa fs_passno +field can be used to implement finer control when +the system utilities may determine that the file system resides +on a different physical device, when it actually does not, as with a +.Xr ccd 4 +device. +All file systems with a lower +.Fa fs_passno +value will be completed before starting on file systems with a +higher +.Fa fs_passno +value. +E.g. all file systems with a +.Fa fs_passno +of 2 will be completed before any file systems with a +.Fa fs_passno +of 3 or greater are started. +Gaps are allowed between the different +.Fa fs_passno +values. +E.g. file systems listed in +.Pa /etc/fstab +may have +.Fa fs_passno +values such as 0, 1, 2, 15, 100, 200, 300, and may appear in any order +within +.Pa /etc/fstab . .Bd -literal #define FSTAB_RW "rw" /* read/write device */ #define FSTAB_RQ "rq" /* read/write with quotas */ @@ -237,6 +307,7 @@ resides in .Sh SEE ALSO .Xr getfsent 3 , .Xr getvfsbyname 3 , +.Xr ccd 4 , .Xr dump 8 , .Xr fsck 8 , .Xr mount 8 , Modified: user/dfr/gssapi/6/sys/alpha/alpha/uma_machdep.c ============================================================================== --- user/dfr/gssapi/6/sys/alpha/alpha/uma_machdep.c Wed Dec 10 16:11:09 2008 (r185864) +++ user/dfr/gssapi/6/sys/alpha/alpha/uma_machdep.c Wed Dec 10 16:20:49 2008 (r185865) @@ -49,9 +49,9 @@ uma_small_alloc(uma_zone_t zone, int byt *flags = UMA_SLAB_PRIV; if ((wait & (M_NOWAIT | M_USE_RESERVE)) == M_NOWAIT) - pflags = VM_ALLOC_INTERRUPT; + pflags = VM_ALLOC_INTERRUPT | VM_ALLOC_WIRED; else - pflags = VM_ALLOC_SYSTEM; + pflags = VM_ALLOC_SYSTEM | VM_ALLOC_WIRED; if (wait & M_ZERO) pflags |= VM_ALLOC_ZERO; for (;;) { @@ -76,7 +76,9 @@ uma_small_free(void *mem, int size, u_in vm_page_t m; m = PHYS_TO_VM_PAGE(ALPHA_K0SEG_TO_PHYS((vm_offset_t)mem)); + m->wire_count--; vm_page_lock_queues(); vm_page_free(m); vm_page_unlock_queues(); + atomic_subtract_int(&cnt.v_wire_count, 1); } Modified: user/dfr/gssapi/6/sys/amd64/amd64/uma_machdep.c ============================================================================== --- user/dfr/gssapi/6/sys/amd64/amd64/uma_machdep.c Wed Dec 10 16:11:09 2008 (r185864) +++ user/dfr/gssapi/6/sys/amd64/amd64/uma_machdep.c Wed Dec 10 16:20:49 2008 (r185865) @@ -50,9 +50,9 @@ uma_small_alloc(uma_zone_t zone, int byt *flags = UMA_SLAB_PRIV; if ((wait & (M_NOWAIT|M_USE_RESERVE)) == M_NOWAIT) - pflags = VM_ALLOC_INTERRUPT; + pflags = VM_ALLOC_INTERRUPT | VM_ALLOC_WIRED; else - pflags = VM_ALLOC_SYSTEM; + pflags = VM_ALLOC_SYSTEM | VM_ALLOC_WIRED; if (wait & M_ZERO) pflags |= VM_ALLOC_ZERO; for (;;) { @@ -82,7 +82,9 @@ uma_small_free(void *mem, int size, u_in pa = DMAP_TO_PHYS((vm_offset_t)mem); dump_drop_page(pa); m = PHYS_TO_VM_PAGE(pa); + m->wire_count--; vm_page_lock_queues(); vm_page_free(m); vm_page_unlock_queues(); + atomic_subtract_int(&cnt.v_wire_count, 1); } Modified: user/dfr/gssapi/6/sys/amd64/conf/NOTES ============================================================================== --- user/dfr/gssapi/6/sys/amd64/conf/NOTES Wed Dec 10 16:11:09 2008 (r185864) +++ user/dfr/gssapi/6/sys/amd64/conf/NOTES Wed Dec 10 16:20:49 2008 (r185865) @@ -234,6 +234,7 @@ options DRM_DEBUG # Include debug print # lnc: Lance/PCnet cards (Isolan, Novell NE2100, NE32-VL, AMD Am7990 and # Am79C960) # mxge: Myricom Myri-10G 10GbE NIC +# nfe: nVidia nForce MCP on-board Ethernet Networking (BSD open source) # nve: nVidia nForce MCP on-board Ethernet Networking #XXX# still calls MD i386 kvtop function instead of vtophys etc @@ -243,6 +244,7 @@ options DRM_DEBUG # Include debug print #XXX#options ED_SIC #XXX#device lnc device mxge # Myricom Myri-10G 10GbE NIC +device nfe # nVidia nForce MCP on-board Ethernet Networking device nve # nVidia nForce MCP on-board Ethernet Networking device ath Modified: user/dfr/gssapi/6/sys/boot/forth/loader.conf.5 ============================================================================== --- user/dfr/gssapi/6/sys/boot/forth/loader.conf.5 Wed Dec 10 16:11:09 2008 (r185864) +++ user/dfr/gssapi/6/sys/boot/forth/loader.conf.5 Wed Dec 10 16:20:49 2008 (r185865) @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .\" $FreeBSD$ -.Dd November 15, 2005 +.Dd January 16, 2008 .Dt LOADER.CONF 5 .Os .Sh NAME @@ -238,6 +238,16 @@ contains the instructions to automatical .Xr boot 8 , .Xr loader 8 , .Xr loader.4th 8 +.Sh BUGS +The +.Xr loader 8 +stops reading +.Nm +when it encounters a syntax error, so any options which are vital for +booting a particular system (i.e.\& +.Dq Va hw.ata.ata_dma Ns "=0" ) +should precede any experimental additions to +.Nm . .Sh HISTORY The file .Nm Modified: user/dfr/gssapi/6/sys/conf/files.amd64 ============================================================================== --- user/dfr/gssapi/6/sys/conf/files.amd64 Wed Dec 10 16:11:09 2008 (r185864) +++ user/dfr/gssapi/6/sys/conf/files.amd64 Wed Dec 10 16:20:49 2008 (r185865) @@ -200,6 +200,7 @@ dev/mxge/mxge_ethp_z8e.c optional mxge p dev/mxge/mxge_rss_eth_z8e.c optional mxge pci dev/mxge/mxge_rss_ethp_z8e.c optional mxge pci net/zlib.c optional mxge +dev/nfe/if_nfe.c optional nfe pci dev/nve/if_nve.c optional nve pci dev/nvram/nvram.c optional nvram isa dev/rr232x/os_bsd.c optional rr232x Modified: user/dfr/gssapi/6/sys/conf/files.i386 ============================================================================== --- user/dfr/gssapi/6/sys/conf/files.i386 Wed Dec 10 16:11:09 2008 (r185864) +++ user/dfr/gssapi/6/sys/conf/files.i386 Wed Dec 10 16:20:49 2008 (r185865) @@ -234,6 +234,7 @@ dev/mxge/mxge_ethp_z8e.c optional mxge p dev/mxge/mxge_rss_eth_z8e.c optional mxge pci dev/mxge/mxge_rss_ethp_z8e.c optional mxge pci net/zlib.c optional mxge +dev/nfe/if_nfe.c optional nfe pci dev/nve/if_nve.c optional nve pci dev/nvram/nvram.c optional nvram isa dev/ppc/ppc.c optional ppc Modified: user/dfr/gssapi/6/sys/conf/newvers.sh ============================================================================== --- user/dfr/gssapi/6/sys/conf/newvers.sh Wed Dec 10 16:11:09 2008 (r185864) +++ user/dfr/gssapi/6/sys/conf/newvers.sh Wed Dec 10 16:20:49 2008 (r185865) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="6.4" -BRANCH="PRERELEASE" +BRANCH="STABLE" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi Modified: user/dfr/gssapi/6/sys/dev/mii/ciphy.c ============================================================================== --- user/dfr/gssapi/6/sys/dev/mii/ciphy.c Wed Dec 10 16:11:09 2008 (r185864) +++ user/dfr/gssapi/6/sys/dev/mii/ciphy.c Wed Dec 10 16:20:49 2008 (r185865) @@ -93,6 +93,7 @@ static const struct mii_phydesc ciphys[] MII_PHY_DESC(CICADA, CS8201), MII_PHY_DESC(CICADA, CS8201A), MII_PHY_DESC(CICADA, CS8201B), + MII_PHY_DESC(VITESSE, VSC8601), MII_PHY_END }; @@ -356,11 +357,28 @@ ciphy_fixup(struct mii_softc *sc) { uint16_t model; uint16_t status, speed; + uint16_t val; model = MII_MODEL(PHY_READ(sc, CIPHY_MII_PHYIDR2)); status = PHY_READ(sc, CIPHY_MII_AUXCSR); speed = status & CIPHY_AUXCSR_SPEED; + if (strcmp(device_get_name(device_get_parent(sc->mii_dev)), + "nfe") == 0) { + /* need to set for 2.5V RGMII for NVIDIA adapters */ + val = PHY_READ(sc, CIPHY_MII_ECTL1); + val &= ~(CIPHY_ECTL1_IOVOL | CIPHY_ECTL1_INTSEL); + val |= (CIPHY_IOVOL_2500MV | CIPHY_INTSEL_RGMII); + PHY_WRITE(sc, CIPHY_MII_ECTL1, val); + /* From Linux. */ + val = PHY_READ(sc, CIPHY_MII_AUXCSR); + val |= CIPHY_AUXCSR_MDPPS; + PHY_WRITE(sc, CIPHY_MII_AUXCSR, val); + val = PHY_READ(sc, CIPHY_MII_10BTCSR); + val |= CIPHY_10BTCSR_ECHO; + PHY_WRITE(sc, CIPHY_MII_10BTCSR, val); + } + switch (model) { case MII_MODEL_CICADA_CS8201: @@ -398,6 +416,8 @@ ciphy_fixup(struct mii_softc *sc) } break; + case MII_MODEL_VITESSE_VSC8601: + break; default: device_printf(sc->mii_dev, "unknown CICADA PHY model %x\n", model); Modified: user/dfr/gssapi/6/sys/dev/mii/ciphyreg.h ============================================================================== --- user/dfr/gssapi/6/sys/dev/mii/ciphyreg.h Wed Dec 10 16:11:09 2008 (r185864) +++ user/dfr/gssapi/6/sys/dev/mii/ciphyreg.h Wed Dec 10 16:20:49 2008 (r185865) @@ -251,6 +251,16 @@ /* Extended PHY control register #1 */ #define CIPHY_MII_ECTL1 0x17 #define CIPHY_ECTL1_ACTIPHY 0x0020 /* Enable ActiPHY power saving */ +#define CIPHY_ECTL1_IOVOL 0x0e00 /* MAC interface and I/O voltage select */ +#define CIPHY_ECTL1_INTSEL 0xf000 /* select MAC interface */ + +#define CIPHY_IOVOL_3300MV 0x0000 /* 3.3V for I/O pins */ +#define CIPHY_IOVOL_2500MV 0x0200 /* 2.5V for I/O pins */ + +#define CIPHY_INTSEL_GMII 0x0000 /* GMII/MII */ +#define CIPHY_INTSEL_RGMII 0x1000 +#define CIPHY_INTSEL_TBI 0x2000 +#define CIPHY_INTSEL_RTBI 0x3000 /* Extended PHY control register #2 */ #define CIPHY_MII_ECTL2 0x18 Modified: user/dfr/gssapi/6/sys/dev/mii/miidevs ============================================================================== --- user/dfr/gssapi/6/sys/dev/mii/miidevs Wed Dec 10 16:11:09 2008 (r185864) +++ user/dfr/gssapi/6/sys/dev/mii/miidevs Wed Dec 10 16:20:49 2008 (r185865) @@ -68,6 +68,7 @@ oui SEEQ 0x00a07d Seeq oui SIS 0x00e006 Silicon Integrated Systems oui TDK 0x00c039 TDK oui TI 0x080028 Texas Instruments +oui VITESSE 0x0001c1 Vitesse Semiconductor oui XAQTI 0x00e0ae XaQti Corp. oui MARVELL 0x005043 Marvell Semiconductor oui xxMARVELL 0x000ac2 Marvell Semiconductor @@ -143,6 +144,7 @@ model BROADCOM2 BCM5906 0x0004 BCM5906 model CICADA CS8201 0x0001 Cicada CS8201 10/100/1000TX PHY model CICADA CS8201A 0x0020 Cicada CS8201 10/100/1000TX PHY model CICADA CS8201B 0x0021 Cicada CS8201 10/100/1000TX PHY +model VITESSE VSC8601 0x0002 Vitesse VSC8601 10/100/1000TX PHY /* Davicom Semiconductor PHYs */ model DAVICOM DM9102 0x0004 DM9102 10/100 media interface @@ -155,6 +157,7 @@ model xxICS 1892 0x0003 ICS1892 10/100 model xxICS 1893 0x0004 ICS1893 10/100 media interface /* IC Plus Corp. PHYs */ +model ICPLUS IP101 0x0005 IC Plus 10/100 PHY model ICPLUS IP1000A 0x0008 IC Plus 10/100/1000 media interface model ICPLUS IP1001 0x0019 IC Plus IP1001 10/100/1000 media interface Modified: user/dfr/gssapi/6/sys/dev/mii/rlphy.c ============================================================================== --- user/dfr/gssapi/6/sys/dev/mii/rlphy.c Wed Dec 10 16:11:09 2008 (r185864) +++ user/dfr/gssapi/6/sys/dev/mii/rlphy.c Wed Dec 10 16:20:49 2008 (r185865) @@ -93,6 +93,7 @@ static const struct mii_phydesc rlintphy static const struct mii_phydesc rlphys[] = { MII_PHY_DESC(REALTEK, RTL8201L), + MII_PHY_DESC(ICPLUS, IP101), MII_PHY_END }; Modified: user/dfr/gssapi/6/sys/dev/puc/pucdata.c ============================================================================== --- user/dfr/gssapi/6/sys/dev/puc/pucdata.c Wed Dec 10 16:11:09 2008 (r185864) +++ user/dfr/gssapi/6/sys/dev/puc/pucdata.c Wed Dec 10 16:20:49 2008 (r185865) @@ -955,7 +955,7 @@ const struct puc_device_description puc_ /* NetMos 4S0P PCI: 4S, 0P */ { "NetMos NM9845 Quad UART", - { 0x9710, 0x9845, 0, 0x0014 }, + { 0x9710, 0x9845, 0, 0x0004 }, { 0xffff, 0xffff, 0, 0xffff }, { { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, Modified: user/dfr/gssapi/6/sys/dev/random/randomdev.c ============================================================================== --- user/dfr/gssapi/6/sys/dev/random/randomdev.c Wed Dec 10 16:11:09 2008 (r185864) +++ user/dfr/gssapi/6/sys/dev/random/randomdev.c Wed Dec 10 16:20:49 2008 (r185865) @@ -89,6 +89,7 @@ random_close(struct cdev *dev __unused, && (securelevel_gt(td->td_ucred, 0) == 0)) { (*random_systat.reseed)(); random_systat.seeded = 1; + arc4rand(NULL, 0, 1); /* Reseed arc4random as well. */ } return (0); Modified: user/dfr/gssapi/6/sys/dev/random/randomdev_soft.c ============================================================================== --- user/dfr/gssapi/6/sys/dev/random/randomdev_soft.c Wed Dec 10 16:11:09 2008 (r185864) +++ user/dfr/gssapi/6/sys/dev/random/randomdev_soft.c Wed Dec 10 16:20:49 2008 (r185865) @@ -61,6 +61,7 @@ random_harvest_internal(u_int64_t, const u_int, u_int, enum esource); static int random_yarrow_poll(int event,struct thread *td); static int random_yarrow_block(int flag); +static void random_yarrow_flush_reseed(void); struct random_systat random_yarrow = { .ident = "Software, Yarrow", @@ -70,7 +71,7 @@ struct random_systat random_yarrow = { .read = random_yarrow_read, .write = random_yarrow_write, .poll = random_yarrow_poll, - .reseed = random_yarrow_reseed, + .reseed = random_yarrow_flush_reseed, .seeded = 1, }; @@ -96,7 +97,7 @@ static struct entropyfifo emptyfifo; /* Harvested entropy */ static struct entropyfifo harvestfifo[ENTROPYSOURCE]; -/* <0 to end the kthread, 0 to let it run */ +/* <0 to end the kthread, 0 to let it run, 1 to flush the harvest queues */ static int random_kthread_control = 0; static struct proc *random_kthread_proc; @@ -247,7 +248,7 @@ random_kthread(void *arg __unused) local_count = 0; /* Process until told to stop */ - for (; random_kthread_control == 0;) { + for (; random_kthread_control >= 0;) { active = 0; @@ -282,6 +283,13 @@ random_kthread(void *arg __unused) KASSERT(local_count == 0, ("random_kthread: local_count %d", local_count)); + /* + * If a queue flush was commanded, it has now happened, + * and we can mark this by resetting the command. + */ + if (random_kthread_control == 1) + random_kthread_control = 0; + /* Found nothing, so don't belabour the issue */ if (!active) tsleep(&harvestfifo, 0, "-", hz / 10); @@ -406,3 +414,15 @@ random_yarrow_block(int flag) return error; } + +/* Helper routine to perform explicit reseeds */ +static void +random_yarrow_flush_reseed(void) +{ + /* Command a entropy queue flush and wait for it to finish */ + random_kthread_control = 1; + while (random_kthread_control) + tsleep(&harvestfifo, 0, "-", hz / 10); + + random_yarrow_reseed(); +} Modified: user/dfr/gssapi/6/sys/i386/conf/NOTES ============================================================================== --- user/dfr/gssapi/6/sys/i386/conf/NOTES Wed Dec 10 16:11:09 2008 (r185864) +++ user/dfr/gssapi/6/sys/i386/conf/NOTES Wed Dec 10 16:20:49 2008 (r185865) @@ -525,6 +525,7 @@ hint.mse.0.irq="5" # lnc: Lance/PCnet cards (Isolan, Novell NE2100, NE32-VL, AMD Am7990 and # Am79C960) # mxge: Myricom Myri-10G 10GbE NIC +# nfe: nVidia nForce MCP on-board Ethernet Networking (BSD open source) # nve: nVidia nForce MCP on-board Ethernet Networking # oltr: Olicom ISA token-ring adapters OC-3115, OC-3117, OC-3118 and OC-3133. # Olicom PCI token-ring adapters OC-3136, OC-3137, OC-3139, OC-3140, @@ -581,6 +582,7 @@ hint.lnc.0.port="0x280" hint.lnc.0.irq="10" hint.lnc.0.drq="0" device mxge # Myricom Myri-10G 10GbE NIC +device nfe # nVidia nForce MCP on-board Ethernet Networking device nve # nVidia nForce MCP on-board Ethernet Networking device sbni hint.sbni.0.at="isa" Modified: user/dfr/gssapi/6/sys/i386/cpufreq/p4tcc.c ============================================================================== --- user/dfr/gssapi/6/sys/i386/cpufreq/p4tcc.c Wed Dec 10 16:11:09 2008 (r185864) +++ user/dfr/gssapi/6/sys/i386/cpufreq/p4tcc.c Wed Dec 10 16:20:49 2008 (r185865) @@ -164,7 +164,7 @@ p4tcc_attach(device_t dev) */ sc->auto_mode = TRUE; - switch (cpu_id & 0xf) { + switch (cpu_id & 0xff) { case 0x22: case 0x24: case 0x25: @@ -180,9 +180,12 @@ p4tcc_attach(device_t dev) case 0x0a: case 0x12: case 0x13: + case 0x62: /* Pentium D B1: errata AA21 */ + case 0x64: /* Pentium D C1: errata AA21 */ + case 0x65: /* Pentium D D0: errata AA21 */ /* * These CPU models hang when set to 12.5% or 25%. - * See Errata N44 and P18l. + * See Errata N44, P18l and AA21. */ sc->set_count -= 2; break; Modified: user/dfr/gssapi/6/sys/ia64/ia64/uma_machdep.c ============================================================================== --- user/dfr/gssapi/6/sys/ia64/ia64/uma_machdep.c Wed Dec 10 16:11:09 2008 (r185864) +++ user/dfr/gssapi/6/sys/ia64/ia64/uma_machdep.c Wed Dec 10 16:20:49 2008 (r185865) @@ -48,9 +48,9 @@ uma_small_alloc(uma_zone_t zone, int byt *flags = UMA_SLAB_PRIV; if ((wait & (M_NOWAIT|M_USE_RESERVE)) == M_NOWAIT) - pflags = VM_ALLOC_INTERRUPT; + pflags = VM_ALLOC_INTERRUPT | VM_ALLOC_WIRED; else - pflags = VM_ALLOC_SYSTEM; + pflags = VM_ALLOC_SYSTEM | VM_ALLOC_WIRED; if (wait & M_ZERO) pflags |= VM_ALLOC_ZERO; @@ -76,7 +76,9 @@ uma_small_free(void *mem, int size, u_in vm_page_t m; m = PHYS_TO_VM_PAGE(IA64_RR_MASK((u_int64_t)mem)); + m->wire_count--; vm_page_lock_queues(); vm_page_free(m); vm_page_unlock_queues(); + atomic_subtract_int(&cnt.v_wire_count, 1); } Modified: user/dfr/gssapi/6/sys/kern/vfs_aio.c ============================================================================== --- user/dfr/gssapi/6/sys/kern/vfs_aio.c Wed Dec 10 16:11:09 2008 (r185864) +++ user/dfr/gssapi/6/sys/kern/vfs_aio.c Wed Dec 10 16:20:49 2008 (r185865) @@ -61,7 +61,6 @@ __FBSDID("$FreeBSD$"); #include "opt_vfs_aio.h" -NET_NEEDS_GIANT("aio"); /* * Counter for allocating reference ids to new jobs. Wrapped to 1 on @@ -504,8 +503,10 @@ aio_free_entry(struct aiocblist *aiocbe) splx(s); } else if (aiocbe->jobstate == JOBST_JOBQGLOBAL) { s = splnet(); + mtx_lock(&aio_freeproc_mtx); TAILQ_REMOVE(&aio_jobs, aiocbe, list); TAILQ_REMOVE(&ki->kaio_jobqueue, aiocbe, plist); + mtx_unlock(&aio_freeproc_mtx); splx(s); } else if (aiocbe->jobstate == JOBST_JOBFINISHED) TAILQ_REMOVE(&ki->kaio_jobdone, aiocbe, plist); *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200812101620.mBAGKnAc036108>