From owner-svn-src-user@FreeBSD.ORG Sun Mar 18 13:54:58 2012 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C87D71065673; Sun, 18 Mar 2012 13:54:58 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B5A7E8FC12; Sun, 18 Mar 2012 13:54:58 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2IDsw0f021830; Sun, 18 Mar 2012 13:54:58 GMT (envelope-from hrs@svn.freebsd.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2IDswQC021816; Sun, 18 Mar 2012 13:54:58 GMT (envelope-from hrs@svn.freebsd.org) Message-Id: <201203181354.q2IDswQC021816@svn.freebsd.org> From: Hiroki Sato Date: Sun, 18 Mar 2012 13:54:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233118 - in user/hrs/rc.d: . etc share share/man/man8 share/man/man8/man8.rc.d X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Mar 2012 13:54:58 -0000 Author: hrs Date: Sun Mar 18 13:54:57 2012 New Revision: 233118 URL: http://svn.freebsd.org/changeset/base/233118 Log: Add experimental rc.d script manual pages. This is an attempt to replace lengthy rc.conf(5). Added: user/hrs/rc.d/ user/hrs/rc.d/etc/ - copied from r230343, head/etc/ user/hrs/rc.d/share/ - copied from r230343, head/share/ user/hrs/rc.d/share/man/man8/man8.rc.d/ user/hrs/rc.d/share/man/man8/man8.rc.d/Makefile user/hrs/rc.d/share/man/man8/man8.rc.d/apm.8 user/hrs/rc.d/share/man/man8/man8.rc.d/apmd.8 user/hrs/rc.d/share/man/man8/man8.rc.d/auditd.8 user/hrs/rc.d/share/man/man8/man8.rc.d/bsnmpd.8 user/hrs/rc.d/share/man/man8/man8.rc.d/bthidd.8 user/hrs/rc.d/share/man/man8/man8.rc.d/cron.8 user/hrs/rc.d/share/man/man8/man8.rc.d/devd.8 user/hrs/rc.d/share/man/man8/man8.rc.d/ftpd.8 user/hrs/rc.d/share/man/man8/man8.rc.d/gssd.8 user/hrs/rc.d/share/man/man8/man8.rc.d/hastd.8 user/hrs/rc.d/share/man/man8/man8.rc.d/hcsecd.8 user/hrs/rc.d/share/man/man8/man8.rc.d/hostapd.8 user/hrs/rc.d/share/man/man8/man8.rc.d/hostname.8 user/hrs/rc.d/share/man/man8/man8.rc.d/inetd.8 user/hrs/rc.d/share/man/man8/man8.rc.d/ip6addrctl.8 user/hrs/rc.d/share/man/man8/man8.rc.d/ipxrouted.8 user/hrs/rc.d/share/man/man8/man8.rc.d/kadmind.8 user/hrs/rc.d/share/man/man8/man8.rc.d/keyserv.8 user/hrs/rc.d/share/man/man8/man8.rc.d/kpasswdd.8 user/hrs/rc.d/share/man/man8/man8.rc.d/lockd.8 user/hrs/rc.d/share/man/man8/man8.rc.d/lpd.8 user/hrs/rc.d/share/man/man8/man8.rc.d/mountd.8 user/hrs/rc.d/share/man/man8/man8.rc.d/moused.8 user/hrs/rc.d/share/man/man8/man8.rc.d/mroute6d.8 user/hrs/rc.d/share/man/man8/man8.rc.d/named.8 user/hrs/rc.d/share/man/man8/man8.rc.d/natd.8 user/hrs/rc.d/share/man/man8/man8.rc.d/nfscbd.8 user/hrs/rc.d/share/man/man8/man8.rc.d/nfsd.8 user/hrs/rc.d/share/man/man8/man8.rc.d/nfsuserd.8 user/hrs/rc.d/share/man/man8/man8.rc.d/nisdomain.8 user/hrs/rc.d/share/man/man8/man8.rc.d/nscd.8 user/hrs/rc.d/share/man/man8/man8.rc.d/ntpd.8 user/hrs/rc.d/share/man/man8/man8.rc.d/ntpdate.8 user/hrs/rc.d/share/man/man8/man8.rc.d/powerd.8 user/hrs/rc.d/share/man/man8/man8.rc.d/ppp.8 user/hrs/rc.d/share/man/man8/man8.rc.d/pppoed.8 user/hrs/rc.d/share/man/man8/man8.rc.d/rarpd.8 user/hrs/rc.d/share/man/man8/man8.rc.d/rfcomm_pppd.8 user/hrs/rc.d/share/man/man8/man8.rc.d/route6d.8 user/hrs/rc.d/share/man/man8/man8.rc.d/routed.8 user/hrs/rc.d/share/man/man8/man8.rc.d/rpcbind.8 user/hrs/rc.d/share/man/man8/man8.rc.d/rtadvd.8 user/hrs/rc.d/share/man/man8/man8.rc.d/rtsold.8 user/hrs/rc.d/share/man/man8/man8.rc.d/rwho.8 user/hrs/rc.d/share/man/man8/man8.rc.d/sdpd.8 user/hrs/rc.d/share/man/man8/man8.rc.d/sendmail.8 user/hrs/rc.d/share/man/man8/man8.rc.d/sshd.8 user/hrs/rc.d/share/man/man8/man8.rc.d/statd.8 user/hrs/rc.d/share/man/man8/man8.rc.d/syslogd.8 user/hrs/rc.d/share/man/man8/man8.rc.d/timed.8 user/hrs/rc.d/share/man/man8/man8.rc.d/watchdogd.8 user/hrs/rc.d/share/man/man8/man8.rc.d/ypbind.8 user/hrs/rc.d/share/man/man8/man8.rc.d/yppasswd.8 user/hrs/rc.d/share/man/man8/man8.rc.d/ypserv.8 user/hrs/rc.d/share/man/man8/man8.rc.d/ypupdated.8 user/hrs/rc.d/share/man/man8/man8.rc.d/ypxfrd.8 user/hrs/rc.d/share/man/man8/man8.rc.d/zfs.8 Modified: user/hrs/rc.d/share/man/man8/Makefile Modified: user/hrs/rc.d/share/man/man8/Makefile ============================================================================== --- head/share/man/man8/Makefile Fri Jan 20 00:20:00 2012 (r230343) +++ user/hrs/rc.d/share/man/man8/Makefile Sun Mar 18 13:54:57 2012 (r233118) @@ -24,4 +24,6 @@ MLINKS+=yp.8 NIS.8 \ yp.8 nis.8 \ yp.8 YP.8 +SUBDIR= man8.rc.d + .include Added: user/hrs/rc.d/share/man/man8/man8.rc.d/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/hrs/rc.d/share/man/man8/man8.rc.d/Makefile Sun Mar 18 13:54:57 2012 (r233118) @@ -0,0 +1,66 @@ +# $FreeBSD$ + +MAN= \ + apm.8 \ + apmd.8 \ + auditd.8 \ + bsnmpd.8 \ + bthidd.8 \ + cron.8 \ + devd.8 \ + ftpd.8 \ + gssd.8 \ + hastd.8 \ + hcsecd.8 \ + hostapd.8 \ + hostname.8 \ + inetd.8 \ + ip6addrctl.8 \ + ipxrouted.8 \ + kadmind.8 \ + keyserv.8 \ + kpasswdd.8 \ + lockd.8 \ + lpd.8 \ + mountd.8 \ + moused.8 \ + mroute6d.8 \ + named.8 \ + natd.8 \ + nfscbd.8 \ + nfsd.8 \ + nfsuserd.8 \ + nisdomain.8 \ + nscd.8 \ + ntpd.8 \ + ntpdate.8 \ + powerd.8 \ + ppp.8 \ + pppoed.8 \ + rarpd.8 \ + rfcomm_pppd.8 \ + route6d.8 \ + routed.8 \ + rpcbind.8 \ + rtadvd.8 \ + rtsold.8 \ + rwho.8 \ + sdpd.8 \ + sendmail.8 \ + sshd.8 \ + statd.8 \ + syslogd.8 \ + timed.8 \ + watchdogd.8 \ + ypbind.8 \ + ypserv.8 \ + ypupdated.8 \ + ypxfrd.8 \ + zfs.8 + +MLINKS= zfs.8 zvol.8 + +MANSUBDIR=/rc.d + + +.include Added: user/hrs/rc.d/share/man/man8/man8.rc.d/apm.8 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/hrs/rc.d/share/man/man8/man8.rc.d/apm.8 Sun Mar 18 13:54:57 2012 (r233118) @@ -0,0 +1,85 @@ +.\" Copyright (c) 2012 +.\" Hiroki Sato . All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd January 26, 2012 +.Dt RC.D/APM 8 +.Os +.Sh NAME +.Nm apm +.Nd rc.d script to enable Automatic Power Management by +.Xr apm 8 +utility. +.Sh SYNOPSIS +.Nm +.Oo fast|force|one Oc Ns Ar start|stop|restart|rcvar +.Sh DESCRIPTION +.Nm +is an +.Xr rc.d 8 +script to enable APM function in the BIOS by using +.Xr apm 8 +command. +.Sh COMMAND LINE ARGUMENTS +The standard +.Xr rc.d 8 +arguments are supported. +For more information, see the section of +.Fn run_rc_command +in the +.Xr rc 8 +manual page. +.Sh CONFIGURATION VARIABLES +The following +.Xr rc.conf 5 +variables are supported. +To show all of the supported variables and the default values, +use +.Li rcvar +argument: +.Pp +.Bl -tag -width "01234567890123456789" -compact +.It Va apm_enable +.Pq Vt bool +Set to +.Dq Li YES +to enable APM function by using +.Xr apm 8 +utility at boot time. +.El +.Pp +.Sh SEE ALSO +.Xr rc.conf 5 , +.Xr apm 8 , +.Xr apmd 8 , +.Xr rc 8 +.Sh HISTORY +The +.Nm +script appeared in +.Fx 8.0 . +.Sh AUTHORS +This manual page was written by +.An Hiroki Sato Aq hrs@FreeBSD.org . Added: user/hrs/rc.d/share/man/man8/man8.rc.d/apmd.8 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/hrs/rc.d/share/man/man8/man8.rc.d/apmd.8 Sun Mar 18 13:54:57 2012 (r233118) @@ -0,0 +1,90 @@ +.\" Copyright (c) 2012 +.\" Hiroki Sato . All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd January 26, 2012 +.Dt RC.D/APMD 8 +.Os +.Sh NAME +.Nm apmd +.Nd rc.d script for +.Xr apmd 8 +daemon +.Sh SYNOPSIS +.Nm +.Oo fast|force|one Oc Ns Ar start|stop|restart|rcvar|status|poll +.Sh DESCRIPTION +.Nm +is an +.Xr rc.d 8 +script to control +.Xr apmd 8 +daemon. +.Sh COMMAND LINE ARGUMENTS +The standard +.Xr rc.d 8 +arguments are supported. +For more information, see the section of +.Fn run_rc_command +in the +.Xr rc 8 +manual page. +.Sh CONFIGURATION VARIABLES +The following +.Xr rc.conf 5 +variables are supported. +To show all of the supported variables and the default values, +use +.Li rcvar +argument: +.Pp +.Bl -tag -width "01234567890123456789" -compact +.It Va apmd_enable +.Pq Vt bool +Set to +.Dq Li YES +to start the +.Xr apmd 8 +daemon at boot time. +.Pp +.It Va apmd_flags +.Pq Vt str +Specify command line flags to the +.Xr apmd 8 +daemon. +.El +.Pp +.Sh SEE ALSO +.Xr rc.conf 5 , +.Xr apmd 8 , +.Xr rc 8 +.Sh HISTORY +The +.Nm +script appeared in +.Fx 8.0 . +.Sh AUTHORS +This manual page was written by +.An Hiroki Sato Aq hrs@FreeBSD.org . Added: user/hrs/rc.d/share/man/man8/man8.rc.d/auditd.8 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/hrs/rc.d/share/man/man8/man8.rc.d/auditd.8 Sun Mar 18 13:54:57 2012 (r233118) @@ -0,0 +1,90 @@ +.\" Copyright (c) 2012 +.\" Hiroki Sato . All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd January 26, 2012 +.Dt RC.D/AUDITD 8 +.Os +.Sh NAME +.Nm auditd +.Nd rc.d script for +.Xr auditd 8 +daemon +.Sh SYNOPSIS +.Nm +.Oo fast|force|one Oc Ns Ar start|stop|restart|rcvar|status|poll +.Sh DESCRIPTION +.Nm +is an +.Xr rc.d 8 +script to control +.Xr auditd 8 +daemon. +.Sh COMMAND LINE ARGUMENTS +The standard +.Xr rc.d 8 +arguments are supported. +For more information, see the section of +.Fn run_rc_command +in the +.Xr rc 8 +manual page. +.Sh CONFIGURATION VARIABLES +The following +.Xr rc.conf 5 +variables are supported. +To show all of the supported variables and the default values, +use +.Li rcvar +argument: +.Pp +.Bl -tag -width "01234567890123456789" -compact +.It Va auditd_enable +.Pq Vt bool +Set to +.Dq Li YES +to start the +.Xr auditd 8 +daemon at boot time. +.Pp +.It Va auditd_flags +.Pq Vt str +Specify command line flags to the +.Xr auditd 8 +daemon. +.El +.Pp +.Sh SEE ALSO +.Xr rc.conf 5 , +.Xr auditd 8 , +.Xr rc 8 +.Sh HISTORY +The +.Nm +script appeared in +.Fx 8.0 . +.Sh AUTHORS +This manual page was written by +.An Hiroki Sato Aq hrs@FreeBSD.org . Added: user/hrs/rc.d/share/man/man8/man8.rc.d/bsnmpd.8 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/hrs/rc.d/share/man/man8/man8.rc.d/bsnmpd.8 Sun Mar 18 13:54:57 2012 (r233118) @@ -0,0 +1,90 @@ +.\" Copyright (c) 2012 +.\" Hiroki Sato . All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd January 26, 2012 +.Dt RC.D/BSNMPD 8 +.Os +.Sh NAME +.Nm bsnmpd +.Nd rc.d script for +.Xr bsnmpd 8 +daemon +.Sh SYNOPSIS +.Nm +.Oo fast|force|one Oc Ns Ar start|stop|restart|rcvar|status|poll +.Sh DESCRIPTION +.Nm +is an +.Xr rc.d 8 +script to control +.Xr bsnmpd 8 +daemon. +.Sh COMMAND LINE ARGUMENTS +The standard +.Xr rc.d 8 +arguments are supported. +For more information, see the section of +.Fn run_rc_command +in the +.Xr rc 8 +manual page. +.Sh CONFIGURATION VARIABLES +The following +.Xr rc.conf 5 +variables are supported. +To show all of the supported variables and the default values, +use +.Li rcvar +argument: +.Pp +.Bl -tag -width "01234567890123456789" -compact +.It Va bsnmpd_enable +.Pq Vt bool +Set to +.Dq Li YES +to start the +.Xr bsnmpd 8 +daemon at boot time. +.Pp +.It Va bsnmpd_flags +.Pq Vt str +Specify command line flags to the +.Xr bsnmpd 8 +daemon. +.El +.Pp +.Sh SEE ALSO +.Xr rc.conf 5 , +.Xr bsnmpd 8 , +.Xr rc 8 +.Sh HISTORY +The +.Nm +script appeared in +.Fx 8.0 . +.Sh AUTHORS +This manual page was written by +.An Hiroki Sato Aq hrs@FreeBSD.org . Added: user/hrs/rc.d/share/man/man8/man8.rc.d/bthidd.8 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/hrs/rc.d/share/man/man8/man8.rc.d/bthidd.8 Sun Mar 18 13:54:57 2012 (r233118) @@ -0,0 +1,90 @@ +.\" Copyright (c) 2012 +.\" Hiroki Sato . All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd January 26, 2012 +.Dt RC.D/BTHIDD 8 +.Os +.Sh NAME +.Nm bthidd +.Nd rc.d script for +.Xr bthidd 8 +daemon +.Sh SYNOPSIS +.Nm +.Oo fast|force|one Oc Ns Ar start|stop|restart|rcvar|status|poll +.Sh DESCRIPTION +.Nm +is an +.Xr rc.d 8 +script to control +.Xr bthidd 8 +daemon. +.Sh COMMAND LINE ARGUMENTS +The standard +.Xr rc.d 8 +arguments are supported. +For more information, see the section of +.Fn run_rc_command +in the +.Xr rc 8 +manual page. +.Sh CONFIGURATION VARIABLES +The following +.Xr rc.conf 5 +variables are supported. +To show all of the supported variables and the default values, +use +.Li rcvar +argument: +.Pp +.Bl -tag -width "01234567890123456789" -compact +.It Va bthidd_enable +.Pq Vt bool +Set to +.Dq Li YES +to start the +.Xr bthidd 8 +daemon at boot time. +.Pp +.It Va bthidd_flags +.Pq Vt str +Specify command line flags to the +.Xr bthidd 8 +daemon. +.El +.Pp +.Sh SEE ALSO +.Xr rc.conf 5 , +.Xr bthidd 8 , +.Xr rc 8 +.Sh HISTORY +The +.Nm +script appeared in +.Fx 8.0 . +.Sh AUTHORS +This manual page was written by +.An Hiroki Sato Aq hrs@FreeBSD.org . Added: user/hrs/rc.d/share/man/man8/man8.rc.d/cron.8 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/hrs/rc.d/share/man/man8/man8.rc.d/cron.8 Sun Mar 18 13:54:57 2012 (r233118) @@ -0,0 +1,97 @@ +.\" Copyright (c) 2012 +.\" Hiroki Sato . All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd January 26, 2012 +.Dt RC.D/CRON 8 +.Os +.Sh NAME +.Nm cron +.Nd rc.d script for +.Xr cron 8 +daemon +.Sh SYNOPSIS +.Nm +.Oo fast|force|one Oc Ns Ar start|stop|restart|rcvar|status|poll +.Sh DESCRIPTION +.Nm +is an +.Xr rc.d 8 +script to control +.Xr cron 8 +daemon. +.Sh COMMAND LINE ARGUMENTS +The standard +.Xr rc.d 8 +arguments are supported. +For more information, see the section of +.Fn run_rc_command +in the +.Xr rc 8 +manual page. +.Sh CONFIGURATION VARIABLES +The following +.Xr rc.conf 5 +variables are supported. +To show all of the supported variables and the default values, +use +.Li rcvar +argument: +.Pp +.Bl -tag -width "01234567890123456789" -compact +.It Va cron_enable +.Pq Vt bool +Set to +.Dq Li YES +to start the +.Xr cron 8 +daemon at boot time. +.Pp +.It Va cron_flags +.Pq Vt str +Specify command line flags to the +.Xr cron 8 +daemon. +.Pp +.It Va cron_dst +.Pq Vt bool +Set to +.Dq Li YES +to enable a special handling of transition between the standard +time and the daylight saving time. +.El +.Pp +.Sh SEE ALSO +.Xr rc.conf 5 , +.Xr cron 8 , +.Xr rc 8 +.Sh HISTORY +The +.Nm +script appeared in +.Fx 8.0 . +.Sh AUTHORS +This manual page was written by +.An Hiroki Sato Aq hrs@FreeBSD.org . Added: user/hrs/rc.d/share/man/man8/man8.rc.d/devd.8 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/hrs/rc.d/share/man/man8/man8.rc.d/devd.8 Sun Mar 18 13:54:57 2012 (r233118) @@ -0,0 +1,90 @@ +.\" Copyright (c) 2012 +.\" Hiroki Sato . All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd January 26, 2012 +.Dt RC.D/DEVD 8 +.Os +.Sh NAME +.Nm devd +.Nd rc.d script for +.Xr devd 8 +daemon +.Sh SYNOPSIS +.Nm +.Oo fast|force|one Oc Ns Ar start|stop|restart|rcvar|status|poll +.Sh DESCRIPTION +.Nm +is an +.Xr rc.d 8 +script to control +.Xr devd 8 +daemon. +.Sh COMMAND LINE ARGUMENTS +The standard +.Xr rc.d 8 +arguments are supported. +For more information, see the section of +.Fn run_rc_command +in the +.Xr rc 8 +manual page. +.Sh CONFIGURATION VARIABLES +The following +.Xr rc.conf 5 +variables are supported. +To show all of the supported variables and the default values, +use +.Li rcvar +argument: +.Pp +.Bl -tag -width "01234567890123456789" -compact +.It Va devd_enable +.Pq Vt bool +Set to +.Dq Li YES +to start the +.Xr devd 8 +daemon at boot time. +.Pp +.It Va devd_flags +.Pq Vt str +Specify command line flags to the +.Xr devd 8 +daemon. +.El +.Pp +.Sh SEE ALSO +.Xr rc.conf 5 , +.Xr devd 8 , +.Xr rc 8 , +.Sh HISTORY +The +.Nm +script appeared in +.Fx 8.0 . +.Sh AUTHORS +This manual page was written by +.An Hiroki Sato Aq hrs@FreeBSD.org . Added: user/hrs/rc.d/share/man/man8/man8.rc.d/ftpd.8 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/hrs/rc.d/share/man/man8/man8.rc.d/ftpd.8 Sun Mar 18 13:54:57 2012 (r233118) @@ -0,0 +1,90 @@ +.\" Copyright (c) 2012 +.\" Hiroki Sato . All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd January 26, 2012 +.Dt RC.D/FTPD 8 +.Os +.Sh NAME +.Nm ftpd +.Nd rc.d script for +.Xr ftpd 8 +daemon +.Sh SYNOPSIS +.Nm +.Oo fast|force|one Oc Ns Ar start|stop|restart|rcvar|status|poll +.Sh DESCRIPTION +.Nm +is an +.Xr rc.d 8 +script to control +.Xr ftpd 8 +daemon. +.Sh COMMAND LINE ARGUMENTS +The standard +.Xr rc.d 8 +arguments are supported. +For more information, see the section of +.Fn run_rc_command +in the +.Xr rc 8 +manual page. +.Sh CONFIGURATION VARIABLES +The following +.Xr rc.conf 5 +variables are supported. +To show all of the supported variables and the default values, +use +.Li rcvar +argument: +.Pp +.Bl -tag -width "01234567890123456789" -compact +.It Va ftpd_enable +.Pq Vt bool +Set to +.Dq Li YES +to start the +.Xr ftpd 8 +daemon at boot time. +.Pp +.It Va ftpd_flags +.Pq Vt str +Specify command line flags to the +.Xr ftpd 8 +daemon. +.El +.Pp +.Sh SEE ALSO +.Xr rc.conf 5 , +.Xr ftpd 8 , +.Xr rc 8 +.Sh HISTORY +The +.Nm +script appeared in +.Fx 8.0 . +.Sh AUTHORS +This manual page was written by +.An Hiroki Sato Aq hrs@FreeBSD.org . Added: user/hrs/rc.d/share/man/man8/man8.rc.d/gssd.8 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/hrs/rc.d/share/man/man8/man8.rc.d/gssd.8 Sun Mar 18 13:54:57 2012 (r233118) @@ -0,0 +1,90 @@ +.\" Copyright (c) 2012 +.\" Hiroki Sato . All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd January 26, 2012 +.Dt RC.D/GSSD 8 +.Os +.Sh NAME +.Nm gssd +.Nd rc.d script for +.Xr gssd 8 +daemon +.Sh SYNOPSIS +.Nm +.Oo fast|force|one Oc Ns Ar start|stop|restart|rcvar|status|poll +.Sh DESCRIPTION +.Nm +is an +.Xr rc.d 8 +script to control +.Xr gssd 8 +daemon. +.Sh COMMAND LINE ARGUMENTS +The standard +.Xr rc.d 8 +arguments are supported. +For more information, see the section of +.Fn run_rc_command +in the +.Xr rc 8 +manual page. +.Sh CONFIGURATION VARIABLES +The following +.Xr rc.conf 5 +variables are supported. +To show all of the supported variables and the default values, +use +.Li rcvar +argument: +.Pp +.Bl -tag -width "01234567890123456789" -compact +.It Va gssd_enable +.Pq Vt bool +Set to +.Dq Li YES +to start the +.Xr gssd 8 +daemon at boot time. +.Pp +.It Va gssd_flags +.Pq Vt str +Specify command line flags to the +.Xr gssd 8 +daemon. +.El +.Pp +.Sh SEE ALSO +.Xr rc.conf 5 , +.Xr gssd 8 , +.Xr rc 8 +.Sh HISTORY +The +.Nm +script appeared in +.Fx 8.0 . +.Sh AUTHORS +This manual page was written by +.An Hiroki Sato Aq hrs@FreeBSD.org . Added: user/hrs/rc.d/share/man/man8/man8.rc.d/hastd.8 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/hrs/rc.d/share/man/man8/man8.rc.d/hastd.8 Sun Mar 18 13:54:57 2012 (r233118) @@ -0,0 +1,90 @@ +.\" Copyright (c) 2012 +.\" Hiroki Sato . All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd January 26, 2012 +.Dt RC.D/HASTD 8 +.Os +.Sh NAME +.Nm hastd +.Nd rc.d script for +.Xr hastd 8 +daemon +.Sh SYNOPSIS +.Nm +.Oo fast|force|one Oc Ns Ar start|stop|restart|rcvar|status|poll +.Sh DESCRIPTION +.Nm +is an +.Xr rc.d 8 +script to control +.Xr hastd 8 +daemon. +.Sh COMMAND LINE ARGUMENTS +The standard +.Xr rc.d 8 +arguments are supported. +For more information, see the section of +.Fn run_rc_command +in the +.Xr rc 8 +manual page. +.Sh CONFIGURATION VARIABLES +The following +.Xr rc.conf 5 +variables are supported. +To show all of the supported variables and the default values, +use +.Li rcvar +argument: +.Pp +.Bl -tag -width "01234567890123456789" -compact +.It Va hastd_enable +.Pq Vt bool +Set to +.Dq Li YES +to start the +.Xr hastd 8 +daemon at boot time. +.Pp +.It Va hastd_flags +.Pq Vt str +Specify command line flags to the +.Xr hastd 8 +daemon. +.El +.Pp +.Sh SEE ALSO +.Xr rc.conf 5 , *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@FreeBSD.ORG Mon Mar 19 18:54:02 2012 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 74890106566C; Mon, 19 Mar 2012 18:54:02 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5A8CA8FC17; Mon, 19 Mar 2012 18:54:02 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2JIs2sr081597; Mon, 19 Mar 2012 18:54:02 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2JIs2M5081589; Mon, 19 Mar 2012 18:54:02 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201203191854.q2JIs2M5081589@svn.freebsd.org> From: Attilio Rao Date: Mon, 19 Mar 2012 18:54:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233192 - in user/attilio/vmcontention: . bin/expr contrib/bsnmp/snmpd contrib/gdb/gdb etc etc/defaults etc/devd lib/libc++ lib/libc/arm/gen lib/libc/gen lib/libc/locale lib/libc/net li... X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Mar 2012 18:54:02 -0000 Author: attilio Date: Mon Mar 19 18:54:01 2012 New Revision: 233192 URL: http://svn.freebsd.org/changeset/base/233192 Log: MFC Added: user/attilio/vmcontention/lib/libcxxrt/Version.map - copied unchanged from r233191, head/lib/libcxxrt/Version.map user/attilio/vmcontention/sys/amd64/include/npx.h - copied unchanged from r233191, head/sys/amd64/include/npx.h user/attilio/vmcontention/sys/geom/part/g_part_ldm.c - copied unchanged from r233191, head/sys/geom/part/g_part_ldm.c user/attilio/vmcontention/sys/modules/geom/geom_part/geom_part_ldm/ - copied from r233191, head/sys/modules/geom/geom_part/geom_part_ldm/ user/attilio/vmcontention/sys/x86/include/fpu.h - copied unchanged from r233191, head/sys/x86/include/fpu.h user/attilio/vmcontention/sys/x86/include/reg.h - copied unchanged from r233191, head/sys/x86/include/reg.h Deleted: user/attilio/vmcontention/sys/compat/ia32/ia32_reg.h Modified: user/attilio/vmcontention/Makefile.inc1 user/attilio/vmcontention/bin/expr/expr.y user/attilio/vmcontention/contrib/bsnmp/snmpd/main.c user/attilio/vmcontention/contrib/gdb/gdb/mips-tdep.c user/attilio/vmcontention/etc/defaults/devfs.rules user/attilio/vmcontention/etc/devd/usb.conf user/attilio/vmcontention/etc/newsyslog.conf user/attilio/vmcontention/lib/libc++/Makefile user/attilio/vmcontention/lib/libc/arm/gen/_set_tp.c user/attilio/vmcontention/lib/libc/gen/fts.3 user/attilio/vmcontention/lib/libc/locale/xlocale_private.h user/attilio/vmcontention/lib/libc/net/getnameinfo.3 user/attilio/vmcontention/lib/libc/sys/mmap.2 user/attilio/vmcontention/lib/libc/sys/msync.2 user/attilio/vmcontention/lib/libc/sys/setfib.2 user/attilio/vmcontention/lib/libcxxrt/Makefile user/attilio/vmcontention/lib/libthr/thread/thr_umtx.c user/attilio/vmcontention/libexec/rtld-elf/map_object.c user/attilio/vmcontention/sbin/geom/class/part/gpart.8 user/attilio/vmcontention/sbin/kldload/kldload.8 user/attilio/vmcontention/sbin/kldload/kldload.c user/attilio/vmcontention/secure/usr.bin/ssh/Makefile user/attilio/vmcontention/secure/usr.sbin/sshd/Makefile user/attilio/vmcontention/share/mk/bsd.sys.mk user/attilio/vmcontention/sys/amd64/amd64/pmap.c user/attilio/vmcontention/sys/amd64/ia32/ia32_reg.c user/attilio/vmcontention/sys/amd64/include/fpu.h user/attilio/vmcontention/sys/amd64/include/reg.h user/attilio/vmcontention/sys/boot/common/ufsread.c user/attilio/vmcontention/sys/compat/ia32/ia32_sysvec.c user/attilio/vmcontention/sys/conf/NOTES user/attilio/vmcontention/sys/conf/files user/attilio/vmcontention/sys/conf/options user/attilio/vmcontention/sys/dev/ath/if_ath.c user/attilio/vmcontention/sys/dev/fb/vesa.c user/attilio/vmcontention/sys/dev/fxp/if_fxp.c user/attilio/vmcontention/sys/dev/wtap/if_wtap.c user/attilio/vmcontention/sys/fs/nfsclient/nfs_clbio.c user/attilio/vmcontention/sys/fs/nfsclient/nfs_clvnops.c user/attilio/vmcontention/sys/geom/part/g_part.c user/attilio/vmcontention/sys/i386/i386/pmap.c user/attilio/vmcontention/sys/i386/include/npx.h user/attilio/vmcontention/sys/i386/include/reg.h user/attilio/vmcontention/sys/ia64/ia32/ia32_reg.c user/attilio/vmcontention/sys/ia64/include/reg.h user/attilio/vmcontention/sys/kern/kern_racct.c user/attilio/vmcontention/sys/kern/kern_umtx.c user/attilio/vmcontention/sys/kern/subr_msgbuf.c user/attilio/vmcontention/sys/mips/atheros/apb.c user/attilio/vmcontention/sys/mips/atheros/ar71xx_chip.c user/attilio/vmcontention/sys/mips/atheros/ar71xx_cpudef.h user/attilio/vmcontention/sys/mips/atheros/ar71xxreg.h user/attilio/vmcontention/sys/mips/atheros/ar724x_chip.c user/attilio/vmcontention/sys/mips/atheros/ar91xx_chip.c user/attilio/vmcontention/sys/modules/geom/geom_part/Makefile user/attilio/vmcontention/sys/modules/mps/Makefile user/attilio/vmcontention/sys/net/route.c user/attilio/vmcontention/sys/net/route.h user/attilio/vmcontention/sys/net80211/ieee80211_freebsd.c user/attilio/vmcontention/sys/netinet/in_pcb.h user/attilio/vmcontention/sys/ofed/drivers/infiniband/core/addr.c user/attilio/vmcontention/sys/ofed/drivers/infiniband/core/cma.c user/attilio/vmcontention/sys/pc98/include/reg.h user/attilio/vmcontention/sys/powerpc/aim/mmu_oea64.c user/attilio/vmcontention/sys/powerpc/powermac/uninorth.c user/attilio/vmcontention/sys/sys/msgbuf.h user/attilio/vmcontention/sys/vm/vm_contig.c user/attilio/vmcontention/sys/vm/vm_map.c user/attilio/vmcontention/sys/vm/vm_mmap.c user/attilio/vmcontention/sys/vm/vm_object.c user/attilio/vmcontention/sys/vm/vm_object.h user/attilio/vmcontention/sys/vm/vm_pageout.c user/attilio/vmcontention/sys/vm/vm_pageout.h user/attilio/vmcontention/sys/vm/vm_phys.c user/attilio/vmcontention/sys/x86/x86/busdma_machdep.c user/attilio/vmcontention/tools/tools/bus_autoconf/bus_usb.c user/attilio/vmcontention/usr.bin/bc/bc.library user/attilio/vmcontention/usr.bin/xargs/xargs.1 user/attilio/vmcontention/usr.bin/xargs/xargs.c user/attilio/vmcontention/usr.sbin/moused/moused.c user/attilio/vmcontention/usr.sbin/pc-sysinstall/backend-query/disk-list.sh user/attilio/vmcontention/usr.sbin/usbdump/usbdump.c Directory Properties: user/attilio/vmcontention/ (props changed) user/attilio/vmcontention/contrib/gdb/ (props changed) user/attilio/vmcontention/lib/libc/ (props changed) user/attilio/vmcontention/sbin/ (props changed) user/attilio/vmcontention/sys/ (props changed) user/attilio/vmcontention/sys/boot/ (props changed) user/attilio/vmcontention/sys/conf/ (props changed) Modified: user/attilio/vmcontention/Makefile.inc1 ============================================================================== --- user/attilio/vmcontention/Makefile.inc1 Mon Mar 19 18:47:34 2012 (r233191) +++ user/attilio/vmcontention/Makefile.inc1 Mon Mar 19 18:54:01 2012 (r233192) @@ -1243,6 +1243,9 @@ _startup_libs+= lib/libcxxrt .endif gnu/lib/libgcc__L: lib/libc__L +.if ${MK_LIBCPLUSPLUS} != "no" +lib/libcxxrt__L: gnu/lib/libgcc__L +.endif _prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libhdb} \ ${_kerberos5_lib_libheimntlm} \ Modified: user/attilio/vmcontention/bin/expr/expr.y ============================================================================== --- user/attilio/vmcontention/bin/expr/expr.y Mon Mar 19 18:47:34 2012 (r233191) +++ user/attilio/vmcontention/bin/expr/expr.y Mon Mar 19 18:54:01 2012 (r233192) @@ -540,7 +540,7 @@ op_colon(struct val *a, struct val *b) v = make_str(a->u.s + rm[1].rm_so); } else - v = make_integer((intmax_t)(rm[0].rm_eo - rm[0].rm_so)); + v = make_integer((intmax_t)(rm[0].rm_eo)); else if (rp.re_nsub == 0) v = make_integer((intmax_t)0); Modified: user/attilio/vmcontention/contrib/bsnmp/snmpd/main.c ============================================================================== --- user/attilio/vmcontention/contrib/bsnmp/snmpd/main.c Mon Mar 19 18:47:34 2012 (r233191) +++ user/attilio/vmcontention/contrib/bsnmp/snmpd/main.c Mon Mar 19 18:54:01 2012 (r233192) @@ -2703,7 +2703,7 @@ bsnmpd_get_usm_stats(void) void bsnmpd_reset_usm_stats(void) { - memset(&snmpd_usmstats, 0, sizeof(&snmpd_usmstats)); + memset(&snmpd_usmstats, 0, sizeof(snmpd_usmstats)); } struct usm_user * Modified: user/attilio/vmcontention/contrib/gdb/gdb/mips-tdep.c ============================================================================== --- user/attilio/vmcontention/contrib/gdb/gdb/mips-tdep.c Mon Mar 19 18:47:34 2012 (r233191) +++ user/attilio/vmcontention/contrib/gdb/gdb/mips-tdep.c Mon Mar 19 18:54:01 2012 (r233192) @@ -5437,6 +5437,13 @@ mips_gdbarch_init (struct gdbarch_info i } } + /* Default 64-bit objects to N64 instead of O32. */ + if (found_abi == MIPS_ABI_UNKNOWN + && info.abfd != NULL + && bfd_get_flavour (info.abfd) == bfd_target_elf_flavour + && elf_elfheader (info.abfd)->e_ident[EI_CLASS] == ELFCLASS64) + found_abi = MIPS_ABI_N64; + if (gdbarch_debug) fprintf_unfiltered (gdb_stdlog, "mips_gdbarch_init: found_abi = %d\n", found_abi); Modified: user/attilio/vmcontention/etc/defaults/devfs.rules ============================================================================== --- user/attilio/vmcontention/etc/defaults/devfs.rules Mon Mar 19 18:47:34 2012 (r233191) +++ user/attilio/vmcontention/etc/defaults/devfs.rules Mon Mar 19 18:54:01 2012 (r233192) @@ -84,3 +84,4 @@ add path stderr unhide add include $devfsrules_hide_all add include $devfsrules_unhide_basic add include $devfsrules_unhide_login +add path zfs unhide Modified: user/attilio/vmcontention/etc/devd/usb.conf ============================================================================== --- user/attilio/vmcontention/etc/devd/usb.conf Mon Mar 19 18:47:34 2012 (r233191) +++ user/attilio/vmcontention/etc/devd/usb.conf Mon Mar 19 18:54:01 2012 (r233192) @@ -13,7 +13,7 @@ nomatch 32 { match "intclass" "0xff"; match "intsubclass" "0xfd"; match "intprotocol" "0x01"; - action "kldload if_ipheth"; + action "kldload -n if_ipheth"; }; nomatch 32 { @@ -24,7 +24,7 @@ nomatch 32 { match "intclass" "0xff"; match "intsubclass" "0xfd"; match "intprotocol" "0x01"; - action "kldload if_ipheth"; + action "kldload -n if_ipheth"; }; nomatch 32 { @@ -35,7 +35,7 @@ nomatch 32 { match "intclass" "0xff"; match "intsubclass" "0xfd"; match "intprotocol" "0x01"; - action "kldload if_ipheth"; + action "kldload -n if_ipheth"; }; nomatch 32 { @@ -46,7 +46,7 @@ nomatch 32 { match "intclass" "0xff"; match "intsubclass" "0xfd"; match "intprotocol" "0x01"; - action "kldload if_ipheth"; + action "kldload -n if_ipheth"; }; nomatch 32 { @@ -54,7 +54,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0104"; match "product" "0x00be"; - action "kldload uipaq"; + action "kldload -n uipaq"; }; nomatch 32 { @@ -62,7 +62,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0123"; match "product" "0x0001"; - action "kldload uep"; + action "kldload -n uep"; }; nomatch 32 { @@ -70,7 +70,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x03e8"; match "product" "0x0008"; - action "kldload if_kue"; + action "kldload -n if_kue"; }; nomatch 32 { @@ -78,7 +78,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x03eb"; match "product" "0x2109"; - action "kldload uftdi"; + action "kldload -n uftdi"; }; nomatch 32 { @@ -86,7 +86,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x03f0"; match "product" "0x0121"; - action "kldload ugensa"; + action "kldload -n ugensa"; }; nomatch 32 { @@ -94,7 +94,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x03f0"; match "product" "(0x1016|0x1116|0x1216)"; - action "kldload uipaq"; + action "kldload -n uipaq"; }; nomatch 32 { @@ -102,7 +102,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x03f0"; match "product" "(0x1b1d|0x1e1d)"; - action "kldload u3g"; + action "kldload -n u3g"; }; nomatch 32 { @@ -110,7 +110,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x03f0"; match "product" "(0x2016|0x2116|0x2216|0x3016|0x3116|0x3216)"; - action "kldload uipaq"; + action "kldload -n uipaq"; }; nomatch 32 { @@ -118,7 +118,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x03f0"; match "product" "0x3524"; - action "kldload uplcom"; + action "kldload -n uplcom"; }; nomatch 32 { @@ -126,7 +126,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x03f0"; match "product" "(0x4016|0x4116|0x4216|0x5016|0x5116|0x5216)"; - action "kldload uipaq"; + action "kldload -n uipaq"; }; nomatch 32 { @@ -134,7 +134,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x03f0"; match "product" "0x811c"; - action "kldload if_aue"; + action "kldload -n if_aue"; }; nomatch 32 { @@ -142,7 +142,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x03f0"; match "product" "0xca02"; - action "kldload if_urtw"; + action "kldload -n if_urtw"; }; nomatch 32 { @@ -150,7 +150,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0402"; match "product" "0x5632"; - action "kldload if_cdce"; + action "kldload -n if_cdce"; }; nomatch 32 { @@ -158,7 +158,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0403"; match "product" "(0x6001|0x6004|0x6010|0x6011|0x8372|0x9e90|0xa6d0|0xa6d0|0xcc48|0xcc49|0xcc4a|0xd678|0xe6c8|0xe888|0xe889|0xe88a|0xe88b|0xe88c|0xee18|0xf608|0xf60b|0xf850|0xfa00|0xfa01|0xfa02|0xfa03|0xfa04|0xfc08|0xfc09|0xfc0b|0xfc0c|0xfc0d|0xfc82)"; - action "kldload uftdi"; + action "kldload -n uftdi"; }; nomatch 32 { @@ -166,7 +166,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0408"; match "product" "0x0304"; - action "kldload if_run"; + action "kldload -n if_run"; }; nomatch 32 { @@ -174,7 +174,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0408"; match "product" "(0x1000|0xea02|0xea03|0xea04|0xea05|0xea06)"; - action "kldload u3g"; + action "kldload -n u3g"; }; nomatch 32 { @@ -182,7 +182,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0409"; match "product" "(0x00d5|0x00d6|0x00d7|0x8024|0x8025)"; - action "kldload uipaq"; + action "kldload -n uipaq"; }; nomatch 32 { @@ -190,7 +190,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0411"; match "product" "(0x0001|0x0005|0x0009)"; - action "kldload if_aue"; + action "kldload -n if_aue"; }; nomatch 32 { @@ -198,7 +198,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0411"; match "product" "0x0012"; - action "kldload if_rue"; + action "kldload -n if_rue"; }; nomatch 32 { @@ -206,7 +206,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0411"; match "product" "0x003d"; - action "kldload if_axe"; + action "kldload -n if_axe"; }; nomatch 32 { @@ -214,7 +214,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0411"; match "product" "(0x005e|0x0066|0x0067)"; - action "kldload if_ural"; + action "kldload -n if_ural"; }; nomatch 32 { @@ -222,7 +222,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0411"; match "product" "0x006e"; - action "kldload if_axe"; + action "kldload -n if_axe"; }; nomatch 32 { @@ -230,7 +230,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0411"; match "product" "0x008b"; - action "kldload if_ural"; + action "kldload -n if_ural"; }; nomatch 32 { @@ -238,7 +238,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0411"; match "product" "0x00b3"; - action "kldload uftdi"; + action "kldload -n uftdi"; }; nomatch 32 { @@ -246,7 +246,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0411"; match "product" "(0x00d8|0x00d9)"; - action "kldload if_rum"; + action "kldload -n if_rum"; }; nomatch 32 { @@ -254,7 +254,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0411"; match "product" "0x00da"; - action "kldload if_zyd"; + action "kldload -n if_zyd"; }; nomatch 32 { @@ -262,7 +262,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0411"; match "product" "0x00e8"; - action "kldload if_run"; + action "kldload -n if_run"; }; nomatch 32 { @@ -270,7 +270,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0411"; match "product" "(0x0116|0x0119)"; - action "kldload if_rum"; + action "kldload -n if_rum"; }; nomatch 32 { @@ -278,7 +278,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0411"; match "product" "0x012e"; - action "kldload if_run"; + action "kldload -n if_run"; }; nomatch 32 { @@ -286,7 +286,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0411"; match "product" "0x0137"; - action "kldload if_rum"; + action "kldload -n if_rum"; }; nomatch 32 { @@ -294,7 +294,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0411"; match "product" "(0x0148|0x0150|0x015d|0x016f|0x01a2)"; - action "kldload if_run"; + action "kldload -n if_run"; }; nomatch 32 { @@ -302,7 +302,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0413"; match "product" "0x2101"; - action "kldload uplcom"; + action "kldload -n uplcom"; }; nomatch 32 { @@ -310,7 +310,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0423"; match "product" "(0x000a|0x000c)"; - action "kldload if_cue"; + action "kldload -n if_cue"; }; nomatch 32 { @@ -318,7 +318,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x043e"; match "product" "0x9c01"; - action "kldload uipaq"; + action "kldload -n uipaq"; }; nomatch 32 { @@ -326,7 +326,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x045a"; match "product" "(0x5001|0x5002)"; - action "kldload urio"; + action "kldload -n urio"; }; nomatch 32 { @@ -334,7 +334,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x045b"; match "product" "0x0053"; - action "kldload uslcom"; + action "kldload -n uslcom"; }; nomatch 32 { @@ -342,7 +342,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x045e"; match "product" "0x0079"; - action "kldload uplcom"; + action "kldload -n uplcom"; }; nomatch 32 { @@ -350,7 +350,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x045e"; match "product" "0x007a"; - action "kldload if_aue"; + action "kldload -n if_aue"; }; nomatch 32 { @@ -358,7 +358,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x045e"; match "product" "(0x00ce|0x0400|0x0401|0x0402|0x0403|0x0404|0x0405|0x0406|0x0407|0x0408|0x0409|0x040a|0x040b|0x040c|0x040d|0x040e|0x040f|0x0410|0x0411|0x0412|0x0413|0x0414|0x0415|0x0416|0x0417|0x0432|0x0433|0x0434|0x0435|0x0436|0x0437|0x0438|0x0439|0x043a|0x043b|0x043c|0x043d|0x043e|0x043f|0x0440|0x0441|0x0442|0x0443|0x0444|0x0445|0x0446|0x0447|0x0448|0x0449|0x044a|0x044b|0x044c|0x044d|0x044e|0x044f|0x0450|0x0451|0x0452|0x0453|0x0454|0x0455|0x0456|0x0457|0x0458|0x0459|0x045a|0x045b|0x045c|0x045d|0x045e|0x045f|0x0460|0x0461|0x0462|0x0463|0x0464|0x0465|0x0466|0x0467|0x0468|0x0469|0x046a|0x046b|0x046c|0x046d|0x046e|0x046f|0x0470|0x0471|0x0472|0x0473|0x0474|0x0475|0x0476|0x0477|0x0478|0x0479|0x047a|0x047b|0x04c8|0x04c9|0x04ca|0x04cb|0x04cc|0x04cd|0x04ce|0x04d7|0x04d8|0x04d9|0x04da|0x04db|0x04dc|0x04dd|0x04de|0x04df|0x04e0|0x04e1|0x04e2|0x04e3|0x04e4|0x04e5|0x04e6|0x04e7|0x04e8|0x04e9|0x04ea)"; - action "kldload uipaq"; + action "kldload -n uipaq"; }; nomatch 32 { @@ -366,7 +366,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0471"; match "product" "0x066a"; - action "kldload uslcom"; + action "kldload -n uslcom"; }; nomatch 32 { @@ -374,7 +374,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0471"; match "product" "0x1236"; - action "kldload if_zyd"; + action "kldload -n if_zyd"; }; nomatch 32 { @@ -382,7 +382,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0471"; match "product" "0x200f"; - action "kldload if_run"; + action "kldload -n if_run"; }; nomatch 32 { @@ -390,7 +390,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0482"; match "product" "0x0203"; - action "kldload umodem"; + action "kldload -n umodem"; }; nomatch 32 { @@ -398,7 +398,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0489"; match "product" "(0xe000|0xe003)"; - action "kldload uslcom"; + action "kldload -n uslcom"; }; nomatch 32 { @@ -406,7 +406,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x049f"; match "product" "(0x0003|0x0032)"; - action "kldload uipaq"; + action "kldload -n uipaq"; }; nomatch 32 { @@ -414,7 +414,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x049f"; match "product" "0x505a"; - action "kldload if_cdce"; + action "kldload -n if_cdce"; }; nomatch 32 { @@ -422,7 +422,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04a4"; match "product" "0x0014"; - action "kldload uipaq"; + action "kldload -n uipaq"; }; nomatch 32 { @@ -430,7 +430,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04a5"; match "product" "0x4027"; - action "kldload uplcom"; + action "kldload -n uplcom"; }; nomatch 32 { @@ -438,7 +438,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04a5"; match "product" "0x4068"; - action "kldload u3g"; + action "kldload -n u3g"; }; nomatch 32 { @@ -446,7 +446,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04ad"; match "product" "(0x0301|0x0302|0x0303|0x0306)"; - action "kldload uipaq"; + action "kldload -n uipaq"; }; nomatch 32 { @@ -454,7 +454,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04b4"; match "product" "0x1002"; - action "kldload ufm"; + action "kldload -n ufm"; }; nomatch 32 { @@ -462,7 +462,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04b7"; match "product" "0x0531"; - action "kldload uipaq"; + action "kldload -n uipaq"; }; nomatch 32 { @@ -470,7 +470,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04b8"; match "product" "(0x0521|0x0522)"; - action "kldload uplcom"; + action "kldload -n uplcom"; }; nomatch 32 { @@ -478,7 +478,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04bb"; match "product" "0x0901"; - action "kldload if_kue"; + action "kldload -n if_kue"; }; nomatch 32 { @@ -486,7 +486,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04bb"; match "product" "(0x0904|0x0913)"; - action "kldload if_aue"; + action "kldload -n if_aue"; }; nomatch 32 { @@ -494,7 +494,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04bb"; match "product" "0x0930"; - action "kldload if_axe"; + action "kldload -n if_axe"; }; nomatch 32 { @@ -502,7 +502,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04bb"; match "product" "(0x0944|0x0945|0x0947|0x0948)"; - action "kldload if_run"; + action "kldload -n if_run"; }; nomatch 32 { @@ -510,7 +510,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04bb"; match "product" "(0x0a03|0x0a0e)"; - action "kldload uplcom"; + action "kldload -n uplcom"; }; nomatch 32 { @@ -518,7 +518,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04bf"; match "product" "(0x0115|0x0117)"; - action "kldload uplcom"; + action "kldload -n uplcom"; }; nomatch 32 { @@ -526,7 +526,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04c5"; match "product" "(0x1058|0x1079)"; - action "kldload uipaq"; + action "kldload -n uipaq"; }; nomatch 32 { @@ -534,7 +534,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04da"; match "product" "0x2500"; - action "kldload uipaq"; + action "kldload -n uipaq"; }; nomatch 32 { @@ -542,7 +542,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04da"; match "product" "0x3900"; - action "kldload uplcom"; + action "kldload -n uplcom"; }; nomatch 32 { @@ -550,7 +550,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04dd"; match "product" "(0x8004|0x8005|0x8006|0x8007|0x9031)"; - action "kldload if_cdce"; + action "kldload -n if_cdce"; }; nomatch 32 { @@ -558,7 +558,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04dd"; match "product" "(0x9102|0x9121|0x9123|0x9151|0x91ac|0x9242)"; - action "kldload uipaq"; + action "kldload -n uipaq"; }; nomatch 32 { @@ -566,7 +566,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04e8"; match "product" "0x2018"; - action "kldload if_run"; + action "kldload -n if_run"; }; nomatch 32 { @@ -574,7 +574,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04e8"; match "product" "(0x5f00|0x5f01|0x5f02|0x5f03|0x5f04)"; - action "kldload uipaq"; + action "kldload -n uipaq"; }; nomatch 32 { @@ -582,7 +582,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04e8"; match "product" "0x6601"; - action "kldload uvisor"; + action "kldload -n uvisor"; }; nomatch 32 { @@ -590,7 +590,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04e8"; match "product" "(0x6611|0x6613|0x6615|0x6617|0x6619|0x661b|0x662e|0x6630|0x6632)"; - action "kldload uipaq"; + action "kldload -n uipaq"; }; nomatch 32 { @@ -598,7 +598,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04e8"; match "product" "0x8001"; - action "kldload uplcom"; + action "kldload -n uplcom"; }; nomatch 32 { @@ -606,7 +606,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04f1"; match "product" "0x3008"; - action "kldload if_axe"; + action "kldload -n if_axe"; }; nomatch 32 { @@ -614,7 +614,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04f1"; match "product" "(0x3011|0x3012)"; - action "kldload uipaq"; + action "kldload -n uipaq"; }; nomatch 32 { @@ -622,7 +622,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0502"; match "product" "(0x1631|0x1632|0x16e1|0x16e2|0x16e3)"; - action "kldload uipaq"; + action "kldload -n uipaq"; }; nomatch 32 { @@ -630,7 +630,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0506"; match "product" "(0x03e8|0x11f8)"; - action "kldload if_kue"; + action "kldload -n if_kue"; }; nomatch 32 { @@ -638,7 +638,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0506"; match "product" "0x4601"; - action "kldload if_aue"; + action "kldload -n if_aue"; }; nomatch 32 { @@ -646,7 +646,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x050d"; match "product" "0x0103"; - action "kldload ubsa"; + action "kldload -n ubsa"; }; nomatch 32 { @@ -654,7 +654,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x050d"; match "product" "0x0109"; - action "kldload umct"; + action "kldload -n umct"; }; nomatch 32 { @@ -662,7 +662,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x050d"; match "product" "0x0121"; - action "kldload if_aue"; + action "kldload -n if_aue"; }; nomatch 32 { @@ -670,7 +670,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x050d"; match "product" "0x0257"; - action "kldload uplcom"; + action "kldload -n uplcom"; }; nomatch 32 { @@ -678,7 +678,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x050d"; match "product" "0x0409"; - action "kldload umct"; + action "kldload -n umct"; }; nomatch 32 { @@ -686,7 +686,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x050d"; match "product" "0x1203"; - action "kldload ubsa"; + action "kldload -n ubsa"; }; nomatch 32 { @@ -694,7 +694,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x050d"; match "product" "0x4050"; - action "kldload if_zyd"; + action "kldload -n if_zyd"; }; nomatch 32 { @@ -702,7 +702,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x050d"; match "product" "0x5055"; - action "kldload if_axe"; + action "kldload -n if_axe"; }; nomatch 32 { @@ -710,7 +710,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x050d"; match "product" "0x7050"; - action "kldload if_upgt"; + action "kldload -n if_upgt"; }; nomatch 32 { @@ -718,7 +718,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x050d"; match "product" "(0x7050|0x7051)"; - action "kldload if_ural"; + action "kldload -n if_ural"; }; nomatch 32 { @@ -726,7 +726,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x050d"; match "product" "0x705a"; - action "kldload if_rum"; + action "kldload -n if_rum"; }; nomatch 32 { @@ -734,7 +734,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x050d"; match "product" "0x705c"; - action "kldload if_zyd"; + action "kldload -n if_zyd"; }; nomatch 32 { @@ -742,7 +742,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x050d"; match "product" "0x705e"; - action "kldload if_urtw"; + action "kldload -n if_urtw"; }; nomatch 32 { @@ -750,7 +750,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x050d"; match "product" "(0x8053|0x805c|0x815c|0x825a|0x825b)"; - action "kldload if_run"; + action "kldload -n if_run"; }; nomatch 32 { @@ -758,7 +758,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x050d"; match "product" "0x905b"; - action "kldload if_rum"; + action "kldload -n if_rum"; }; nomatch 32 { @@ -766,7 +766,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x050d"; match "product" "0x935a"; - action "kldload if_run"; + action "kldload -n if_run"; }; nomatch 32 { @@ -774,7 +774,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0525"; match "product" "0x1080"; - action "kldload udbp"; + action "kldload -n udbp"; }; nomatch 32 { @@ -782,7 +782,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0525"; match "product" "0xa4a2"; - action "kldload if_cdce"; + action "kldload -n if_cdce"; }; nomatch 32 { @@ -790,7 +790,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0536"; match "product" "0x01a0"; - action "kldload uipaq"; + action "kldload -n uipaq"; }; nomatch 32 { @@ -798,7 +798,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0543"; match "product" "(0x0ed9|0x1527|0x1529|0x152b|0x152e|0x1921|0x1922|0x1923)"; - action "kldload uipaq"; + action "kldload -n uipaq"; }; nomatch 32 { @@ -806,7 +806,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0547"; match "product" "0x2008"; - action "kldload uplcom"; + action "kldload -n uplcom"; }; nomatch 32 { @@ -814,7 +814,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0547"; match "product" "0x2720"; - action "kldload udbp"; + action "kldload -n udbp"; }; nomatch 32 { @@ -822,7 +822,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x054c"; match "product" "(0x0038|0x0066|0x0095|0x009a|0x00da|0x0169)"; - action "kldload uvisor"; + action "kldload -n uvisor"; }; nomatch 32 { @@ -830,7 +830,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x054c"; match "product" "0x0437"; - action "kldload uplcom"; + action "kldload -n uplcom"; }; nomatch 32 { @@ -838,7 +838,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0557"; match "product" "0x2002"; - action "kldload if_kue"; + action "kldload -n if_kue"; }; nomatch 32 { @@ -846,7 +846,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0557"; match "product" "0x2007"; - action "kldload if_aue"; + action "kldload -n if_aue"; }; nomatch 32 { @@ -854,7 +854,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0557"; match "product" "0x2008"; - action "kldload uplcom"; *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@FreeBSD.ORG Tue Mar 20 07:59:38 2012 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 403AE1065674; Tue, 20 Mar 2012 07:59:38 +0000 (UTC) (envelope-from andre@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 25C418FC18; Tue, 20 Mar 2012 07:59:38 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2K7xcMr008424; Tue, 20 Mar 2012 07:59:38 GMT (envelope-from andre@svn.freebsd.org) Received: (from andre@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2K7xb6N008409; Tue, 20 Mar 2012 07:59:37 GMT (envelope-from andre@svn.freebsd.org) Message-Id: <201203200759.q2K7xb6N008409@svn.freebsd.org> From: Andre Oppermann Date: Tue, 20 Mar 2012 07:59:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233228 - in user/andre/tcp_workqueue/sys: amd64/acpica amd64/amd64 amd64/conf amd64/ia32 amd64/include amd64/linux32 arm/conf arm/mv boot/common boot/forth boot/i386/boot2 boot/pc98/bo... X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Mar 2012 07:59:38 -0000 Author: andre Date: Tue Mar 20 07:59:36 2012 New Revision: 233228 URL: http://svn.freebsd.org/changeset/base/233228 Log: IFC @r233227. Added: user/andre/tcp_workqueue/sys/amd64/include/npx.h - copied unchanged from r233227, head/sys/amd64/include/npx.h user/andre/tcp_workqueue/sys/contrib/dev/ral/microcode.h - copied unchanged from r233227, head/sys/contrib/dev/ral/microcode.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-ciu2-defs.h - copied unchanged from r233227, head/sys/contrib/octeon-sdk/cvmx-ciu2-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-endor-defs.h - copied unchanged from r233227, head/sys/contrib/octeon-sdk/cvmx-endor-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-eoi-defs.h - copied unchanged from r233227, head/sys/contrib/octeon-sdk/cvmx-eoi-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-helper-cfg.c - copied unchanged from r233227, head/sys/contrib/octeon-sdk/cvmx-helper-cfg.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-helper-cfg.h - copied unchanged from r233227, head/sys/contrib/octeon-sdk/cvmx-helper-cfg.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-helper-ilk.c - copied unchanged from r233227, head/sys/contrib/octeon-sdk/cvmx-helper-ilk.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-helper-ilk.h - copied unchanged from r233227, head/sys/contrib/octeon-sdk/cvmx-helper-ilk.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-hfa.c - copied unchanged from r233227, head/sys/contrib/octeon-sdk/cvmx-hfa.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-hfa.h - copied unchanged from r233227, head/sys/contrib/octeon-sdk/cvmx-hfa.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-ilk-defs.h - copied unchanged from r233227, head/sys/contrib/octeon-sdk/cvmx-ilk-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-ilk.c - copied unchanged from r233227, head/sys/contrib/octeon-sdk/cvmx-ilk.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-ilk.h - copied unchanged from r233227, head/sys/contrib/octeon-sdk/cvmx-ilk.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-iob1-defs.h - copied unchanged from r233227, head/sys/contrib/octeon-sdk/cvmx-iob1-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-ipd.c - copied unchanged from r233227, head/sys/contrib/octeon-sdk/cvmx-ipd.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-malloc/ - copied from r233227, head/sys/contrib/octeon-sdk/cvmx-malloc/ user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-profiler.c - copied unchanged from r233227, head/sys/contrib/octeon-sdk/cvmx-profiler.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-profiler.h - copied unchanged from r233227, head/sys/contrib/octeon-sdk/cvmx-profiler.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-qlm-tables.c - copied unchanged from r233227, head/sys/contrib/octeon-sdk/cvmx-qlm-tables.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-qlm.c - copied unchanged from r233227, head/sys/contrib/octeon-sdk/cvmx-qlm.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-qlm.h - copied unchanged from r233227, head/sys/contrib/octeon-sdk/cvmx-qlm.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-resources.config - copied unchanged from r233227, head/sys/contrib/octeon-sdk/cvmx-resources.config user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-shared-linux-n32.ld - copied unchanged from r233227, head/sys/contrib/octeon-sdk/cvmx-shared-linux-n32.ld user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-shared-linux-o32.ld - copied unchanged from r233227, head/sys/contrib/octeon-sdk/cvmx-shared-linux-o32.ld user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-shared-linux.ld - copied unchanged from r233227, head/sys/contrib/octeon-sdk/cvmx-shared-linux.ld user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-sso-defs.h - copied unchanged from r233227, head/sys/contrib/octeon-sdk/cvmx-sso-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-trax-defs.h - copied unchanged from r233227, head/sys/contrib/octeon-sdk/cvmx-trax-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/octeon-feature.c - copied unchanged from r233227, head/sys/contrib/octeon-sdk/octeon-feature.c user/andre/tcp_workqueue/sys/dev/wbwd/ - copied from r233227, head/sys/dev/wbwd/ user/andre/tcp_workqueue/sys/geom/part/g_part_ldm.c - copied unchanged from r233227, head/sys/geom/part/g_part_ldm.c user/andre/tcp_workqueue/sys/mips/cavium/octeon_irq.h - copied unchanged from r233227, head/sys/mips/cavium/octeon_irq.h user/andre/tcp_workqueue/sys/mips/mips/libkern_machdep.c - copied unchanged from r233227, head/sys/mips/mips/libkern_machdep.c user/andre/tcp_workqueue/sys/modules/acl_nfs4/ - copied from r233227, head/sys/modules/acl_nfs4/ user/andre/tcp_workqueue/sys/modules/acl_posix1e/ - copied from r233227, head/sys/modules/acl_posix1e/ user/andre/tcp_workqueue/sys/modules/geom/geom_part/geom_part_ldm/ - copied from r233227, head/sys/modules/geom/geom_part/geom_part_ldm/ user/andre/tcp_workqueue/sys/modules/ralfw/rt2860/ - copied from r233227, head/sys/modules/ralfw/rt2860/ user/andre/tcp_workqueue/sys/modules/wbwd/ - copied from r233227, head/sys/modules/wbwd/ user/andre/tcp_workqueue/sys/x86/include/fpu.h - copied unchanged from r233227, head/sys/x86/include/fpu.h user/andre/tcp_workqueue/sys/x86/include/psl.h - copied unchanged from r233227, head/sys/x86/include/psl.h user/andre/tcp_workqueue/sys/x86/include/reg.h - copied unchanged from r233227, head/sys/x86/include/reg.h user/andre/tcp_workqueue/sys/x86/include/segments.h - copied unchanged from r233227, head/sys/x86/include/segments.h user/andre/tcp_workqueue/sys/x86/include/specialreg.h - copied unchanged from r233227, head/sys/x86/include/specialreg.h user/andre/tcp_workqueue/sys/x86/include/sysarch.h - copied unchanged from r233227, head/sys/x86/include/sysarch.h user/andre/tcp_workqueue/sys/x86/x86/intr_machdep.c - copied unchanged from r233227, head/sys/x86/x86/intr_machdep.c Deleted: user/andre/tcp_workqueue/sys/amd64/amd64/intr_machdep.c user/andre/tcp_workqueue/sys/compat/ia32/ia32_reg.h user/andre/tcp_workqueue/sys/contrib/dev/ral/rt2661_ucode.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-csr-db-support.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-csr-db.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-csr-db.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-error-custom.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-error-custom.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-error-init-cn30xx.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-error-init-cn31xx.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-error-init-cn38xx.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-error-init-cn38xxp2.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-error-init-cn50xx.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-error-init-cn52xx.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-error-init-cn52xxp1.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-error-init-cn56xx.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-error-init-cn56xxp1.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-error-init-cn58xx.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-error-init-cn58xxp1.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-error-init-cn63xx.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-error-init-cn63xxp1.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-error.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-error.h user/andre/tcp_workqueue/sys/fs/fifofs/fifo.h user/andre/tcp_workqueue/sys/i386/i386/intr_machdep.c user/andre/tcp_workqueue/sys/mips/include/bswap.h user/andre/tcp_workqueue/sys/mips/include/clockvar.h user/andre/tcp_workqueue/sys/mips/include/cputypes.h user/andre/tcp_workqueue/sys/mips/include/iodev.h user/andre/tcp_workqueue/sys/mips/include/mp_watchdog.h user/andre/tcp_workqueue/sys/mips/include/pci_cfgreg.h user/andre/tcp_workqueue/sys/mips/include/ppireg.h user/andre/tcp_workqueue/sys/mips/include/timerreg.h user/andre/tcp_workqueue/sys/mips/mips/elf64_machdep.c user/andre/tcp_workqueue/sys/mips/mips/mainbus.c Modified: user/andre/tcp_workqueue/sys/amd64/acpica/acpi_wakeup.c user/andre/tcp_workqueue/sys/amd64/amd64/pmap.c user/andre/tcp_workqueue/sys/amd64/amd64/trap.c user/andre/tcp_workqueue/sys/amd64/conf/DEFAULTS user/andre/tcp_workqueue/sys/amd64/conf/GENERIC.hints user/andre/tcp_workqueue/sys/amd64/conf/NOTES user/andre/tcp_workqueue/sys/amd64/ia32/ia32_reg.c user/andre/tcp_workqueue/sys/amd64/include/fpu.h user/andre/tcp_workqueue/sys/amd64/include/psl.h user/andre/tcp_workqueue/sys/amd64/include/reg.h user/andre/tcp_workqueue/sys/amd64/include/segments.h user/andre/tcp_workqueue/sys/amd64/include/specialreg.h user/andre/tcp_workqueue/sys/amd64/include/sysarch.h user/andre/tcp_workqueue/sys/amd64/linux32/linux32_dummy.c user/andre/tcp_workqueue/sys/amd64/linux32/linux32_proto.h user/andre/tcp_workqueue/sys/amd64/linux32/linux32_syscall.h user/andre/tcp_workqueue/sys/amd64/linux32/linux32_syscalls.c user/andre/tcp_workqueue/sys/amd64/linux32/linux32_sysent.c user/andre/tcp_workqueue/sys/amd64/linux32/linux32_systrace_args.c user/andre/tcp_workqueue/sys/amd64/linux32/syscalls.master user/andre/tcp_workqueue/sys/arm/conf/DEFAULTS user/andre/tcp_workqueue/sys/arm/mv/common.c user/andre/tcp_workqueue/sys/boot/common/ufsread.c user/andre/tcp_workqueue/sys/boot/forth/loader.conf user/andre/tcp_workqueue/sys/boot/i386/boot2/boot1.S user/andre/tcp_workqueue/sys/boot/i386/boot2/boot2.c user/andre/tcp_workqueue/sys/boot/pc98/boot2/boot2.c user/andre/tcp_workqueue/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c user/andre/tcp_workqueue/sys/compat/ia32/ia32_sysvec.c user/andre/tcp_workqueue/sys/conf/Makefile.mips user/andre/tcp_workqueue/sys/conf/NOTES user/andre/tcp_workqueue/sys/conf/files user/andre/tcp_workqueue/sys/conf/files.amd64 user/andre/tcp_workqueue/sys/conf/files.i386 user/andre/tcp_workqueue/sys/conf/files.mips user/andre/tcp_workqueue/sys/conf/files.pc98 user/andre/tcp_workqueue/sys/conf/kern.mk user/andre/tcp_workqueue/sys/conf/options user/andre/tcp_workqueue/sys/conf/options.mips user/andre/tcp_workqueue/sys/contrib/dev/ral/Makefile user/andre/tcp_workqueue/sys/contrib/dev/ral/rt2860.fw.uu user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmip.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-abi.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-access-native.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-access.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-address.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-agl-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-app-hotplug.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-app-hotplug.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-app-init-linux.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-app-init.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-app-init.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-asm.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-asx0-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-asxx-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-atomic.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-bootloader.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-bootmem.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-bootmem.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-ciu-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-clock.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-clock.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-cmd-queue.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-cmd-queue.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-cn3010-evb-hs5.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-cn3010-evb-hs5.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-compactflash.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-compactflash.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-core.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-core.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-coremask.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-coremask.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-crypto.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-crypto.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-csr-enums.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-csr-typedefs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-csr.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-dbg-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-debug-handler.S user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-debug-remote.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-debug-uart.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-debug.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-debug.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-dfa-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-dfa.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-dfa.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-dfm-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-dma-engine.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-dma-engine.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-dpi-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-ebt3000.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-ebt3000.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-fau.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-flash.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-flash.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-fpa-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-fpa.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-fpa.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-gmx.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-gmxx-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-gpio-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-gpio.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-helper-board.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-helper-board.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-helper-check-defines.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-helper-errata.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-helper-errata.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-helper-fpa.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-helper-fpa.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-helper-jtag.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-helper-jtag.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-helper-loop.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-helper-loop.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-helper-npi.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-helper-npi.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-helper-rgmii.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-helper-rgmii.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-helper-sgmii.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-helper-sgmii.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-helper-spi.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-helper-spi.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-helper-srio.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-helper-srio.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-helper-util.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-helper-util.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-helper-xaui.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-helper-xaui.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-helper.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-helper.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-higig.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-interrupt-handler.S user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-interrupt.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-interrupt.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-iob-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-ipd-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-ipd.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-ixf18201.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-ixf18201.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-key-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-key.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-l2c-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-l2c.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-l2c.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-l2d-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-l2t-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-led-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-llm.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-llm.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-lmcx-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-log-arc.S user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-log.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-log.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-malloc.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-mdio.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-mgmt-port.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-mgmt-port.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-mio-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-mixx-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-mpi-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-nand.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-nand.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-ndf-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-npei-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-npi-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-npi.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-packet.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-pci-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-pci.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-pcie.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-pcie.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-pcieepx-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-pciercx-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-pcm-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-pcmx-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-pcsx-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-pcsxx-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-pemx-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-pescx-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-pexp-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-pip-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-pip.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-pko-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-pko.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-pko.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-platform.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-pow-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-pow.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-pow.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-power-throttle.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-power-throttle.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-rad-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-raid.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-raid.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-rng.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-rnm-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-rtc.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-rwlock.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-scratch.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-shmem.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-shmem.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-sim-magic.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-sli-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-smi-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-smix-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-spi.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-spi.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-spi4000.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-spinlock.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-spx0-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-spxx-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-srio.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-srio.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-sriomaintx-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-sriox-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-srxx-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-stxx-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-swap.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-sysinfo.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-sysinfo.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-thunder.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-thunder.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-tim-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-tim.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-tim.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-tlb.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-tlb.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-tra-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-tra.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-tra.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-twsi.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-twsi.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-uahcx-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-uart.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-uart.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-uctlx-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-usb.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-usb.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-usbcx-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-usbd.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-usbd.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-usbnx-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-utils.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-version.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-warn.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-warn.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-wqe.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-zip-defs.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-zip.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-zip.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx-zone.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/cvmx.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/octeon-boot-info.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/octeon-feature.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/octeon-model.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/octeon-model.h user/andre/tcp_workqueue/sys/contrib/octeon-sdk/octeon-pci-console.c user/andre/tcp_workqueue/sys/contrib/octeon-sdk/octeon-pci-console.h user/andre/tcp_workqueue/sys/contrib/pf/net/if_pfsync.c user/andre/tcp_workqueue/sys/dev/aac/aac_pci.c user/andre/tcp_workqueue/sys/dev/acpica/acpi_hpet.c user/andre/tcp_workqueue/sys/dev/advansys/adv_eisa.c user/andre/tcp_workqueue/sys/dev/advansys/adv_isa.c user/andre/tcp_workqueue/sys/dev/advansys/adv_pci.c user/andre/tcp_workqueue/sys/dev/advansys/adw_pci.c user/andre/tcp_workqueue/sys/dev/ahb/ahb.c user/andre/tcp_workqueue/sys/dev/aic7xxx/ahc_eisa.c user/andre/tcp_workqueue/sys/dev/aic7xxx/ahc_isa.c user/andre/tcp_workqueue/sys/dev/aic7xxx/ahc_pci.c user/andre/tcp_workqueue/sys/dev/aic7xxx/ahd_pci.c user/andre/tcp_workqueue/sys/dev/amr/amr_pci.c user/andre/tcp_workqueue/sys/dev/an/if_an_pci.c user/andre/tcp_workqueue/sys/dev/arcmsr/arcmsr.c user/andre/tcp_workqueue/sys/dev/asr/asr.c user/andre/tcp_workqueue/sys/dev/ath/if_ath.c user/andre/tcp_workqueue/sys/dev/ath/if_ath_debug.c user/andre/tcp_workqueue/sys/dev/ath/if_ath_sysctl.c user/andre/tcp_workqueue/sys/dev/ath/if_ath_tx.c user/andre/tcp_workqueue/sys/dev/ath/if_ath_tx.h user/andre/tcp_workqueue/sys/dev/ath/if_ath_tx_ht.c user/andre/tcp_workqueue/sys/dev/ath/if_athioctl.h user/andre/tcp_workqueue/sys/dev/ath/if_athvar.h user/andre/tcp_workqueue/sys/dev/bge/if_bge.c user/andre/tcp_workqueue/sys/dev/bge/if_bgereg.h user/andre/tcp_workqueue/sys/dev/buslogic/bt_pci.c user/andre/tcp_workqueue/sys/dev/bxe/if_bxe.c user/andre/tcp_workqueue/sys/dev/cesa/cesa.c user/andre/tcp_workqueue/sys/dev/ciss/ciss.c user/andre/tcp_workqueue/sys/dev/cxgb/cxgb_sge.c user/andre/tcp_workqueue/sys/dev/de/if_de.c user/andre/tcp_workqueue/sys/dev/dpt/dpt_pci.c user/andre/tcp_workqueue/sys/dev/en/midway.c user/andre/tcp_workqueue/sys/dev/fb/vesa.c user/andre/tcp_workqueue/sys/dev/fxp/if_fxp.c user/andre/tcp_workqueue/sys/dev/glxsb/glxsb.c user/andre/tcp_workqueue/sys/dev/hatm/if_hatm.c user/andre/tcp_workqueue/sys/dev/hifn/hifn7751.c user/andre/tcp_workqueue/sys/dev/hptiop/hptiop.c user/andre/tcp_workqueue/sys/dev/hptmv/entry.c user/andre/tcp_workqueue/sys/dev/hwpmc/hwpmc_core.c user/andre/tcp_workqueue/sys/dev/hwpmc/hwpmc_mips.c user/andre/tcp_workqueue/sys/dev/hwpmc/hwpmc_mips24k.c user/andre/tcp_workqueue/sys/dev/ida/ida_pci.c user/andre/tcp_workqueue/sys/dev/if_ndis/if_ndis_pci.c user/andre/tcp_workqueue/sys/dev/iir/iir_pci.c user/andre/tcp_workqueue/sys/dev/ips/ips_pci.c user/andre/tcp_workqueue/sys/dev/ipw/if_ipw.c user/andre/tcp_workqueue/sys/dev/ipw/if_ipwvar.h user/andre/tcp_workqueue/sys/dev/iwi/if_iwi.c user/andre/tcp_workqueue/sys/dev/ixgb/if_ixgb.c user/andre/tcp_workqueue/sys/dev/ixgbe/ixgbe.c user/andre/tcp_workqueue/sys/dev/ixgbe/ixv.c user/andre/tcp_workqueue/sys/dev/lmc/if_lmc.c user/andre/tcp_workqueue/sys/dev/mfi/mfi_pci.c user/andre/tcp_workqueue/sys/dev/mge/if_mge.c user/andre/tcp_workqueue/sys/dev/mlx/mlx_pci.c user/andre/tcp_workqueue/sys/dev/mly/mly.c user/andre/tcp_workqueue/sys/dev/mps/mps_pci.c user/andre/tcp_workqueue/sys/dev/mxge/if_mxge.c user/andre/tcp_workqueue/sys/dev/nve/if_nve.c user/andre/tcp_workqueue/sys/dev/ofw/ofw_bus_if.m user/andre/tcp_workqueue/sys/dev/ofw/ofw_bus_subr.c user/andre/tcp_workqueue/sys/dev/ofw/ofw_iicbus.c user/andre/tcp_workqueue/sys/dev/patm/if_patm_attach.c user/andre/tcp_workqueue/sys/dev/pcf/pcf_ebus.c user/andre/tcp_workqueue/sys/dev/pci/pci.c user/andre/tcp_workqueue/sys/dev/pci/pci_private.h user/andre/tcp_workqueue/sys/dev/pci/pcireg.h user/andre/tcp_workqueue/sys/dev/pci/pcivar.h user/andre/tcp_workqueue/sys/dev/safe/safe.c user/andre/tcp_workqueue/sys/dev/trm/trm.c user/andre/tcp_workqueue/sys/dev/twa/tw_osl.h user/andre/tcp_workqueue/sys/dev/twa/tw_osl_freebsd.c user/andre/tcp_workqueue/sys/dev/twe/twe_freebsd.c user/andre/tcp_workqueue/sys/dev/tws/tws.c user/andre/tcp_workqueue/sys/dev/uart/uart_bus_pci.c user/andre/tcp_workqueue/sys/dev/ubsec/ubsec.c user/andre/tcp_workqueue/sys/dev/usb/serial/u3g.c user/andre/tcp_workqueue/sys/dev/usb/usbdevs user/andre/tcp_workqueue/sys/dev/wds/wd7000.c user/andre/tcp_workqueue/sys/dev/wtap/if_wtap.c user/andre/tcp_workqueue/sys/dev/xen/blkfront/blkfront.c user/andre/tcp_workqueue/sys/fs/cd9660/cd9660_vnops.c user/andre/tcp_workqueue/sys/fs/ext2fs/ext2_alloc.c user/andre/tcp_workqueue/sys/fs/ext2fs/ext2_dinode.h user/andre/tcp_workqueue/sys/fs/ext2fs/ext2_inode_cnv.c user/andre/tcp_workqueue/sys/fs/ext2fs/ext2_vfsops.c user/andre/tcp_workqueue/sys/fs/ext2fs/ext2_vnops.c user/andre/tcp_workqueue/sys/fs/ext2fs/ext2fs.h user/andre/tcp_workqueue/sys/fs/ext2fs/inode.h user/andre/tcp_workqueue/sys/fs/fdescfs/fdesc_vfsops.c user/andre/tcp_workqueue/sys/fs/fifofs/fifo_vnops.c user/andre/tcp_workqueue/sys/fs/nfs/nfsport.h user/andre/tcp_workqueue/sys/fs/nfsclient/nfs_clbio.c user/andre/tcp_workqueue/sys/fs/nfsclient/nfs_clvnops.c user/andre/tcp_workqueue/sys/fs/nullfs/null_vfsops.c user/andre/tcp_workqueue/sys/fs/portalfs/portal_vfsops.c user/andre/tcp_workqueue/sys/fs/tmpfs/tmpfs_subr.c user/andre/tcp_workqueue/sys/fs/tmpfs/tmpfs_vnops.c user/andre/tcp_workqueue/sys/fs/udf/udf_vnops.c user/andre/tcp_workqueue/sys/fs/unionfs/union_subr.c user/andre/tcp_workqueue/sys/fs/unionfs/union_vfsops.c user/andre/tcp_workqueue/sys/geom/part/g_part.c user/andre/tcp_workqueue/sys/geom/part/g_part.h user/andre/tcp_workqueue/sys/geom/part/g_part_bsd.c user/andre/tcp_workqueue/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c user/andre/tcp_workqueue/sys/i386/acpica/acpi_wakeup.c user/andre/tcp_workqueue/sys/i386/conf/DEFAULTS user/andre/tcp_workqueue/sys/i386/conf/GENERIC.hints user/andre/tcp_workqueue/sys/i386/conf/NOTES user/andre/tcp_workqueue/sys/i386/i386/exception.s user/andre/tcp_workqueue/sys/i386/i386/machdep.c user/andre/tcp_workqueue/sys/i386/i386/pmap.c user/andre/tcp_workqueue/sys/i386/i386/trap.c user/andre/tcp_workqueue/sys/i386/include/intr_machdep.h user/andre/tcp_workqueue/sys/i386/include/npx.h user/andre/tcp_workqueue/sys/i386/include/psl.h user/andre/tcp_workqueue/sys/i386/include/reg.h user/andre/tcp_workqueue/sys/i386/include/segments.h user/andre/tcp_workqueue/sys/i386/include/specialreg.h user/andre/tcp_workqueue/sys/i386/include/sysarch.h user/andre/tcp_workqueue/sys/i386/linux/linux_dummy.c user/andre/tcp_workqueue/sys/i386/linux/linux_proto.h user/andre/tcp_workqueue/sys/i386/linux/linux_syscall.h user/andre/tcp_workqueue/sys/i386/linux/linux_syscalls.c user/andre/tcp_workqueue/sys/i386/linux/linux_sysent.c user/andre/tcp_workqueue/sys/i386/linux/linux_systrace_args.c user/andre/tcp_workqueue/sys/i386/linux/syscalls.master user/andre/tcp_workqueue/sys/ia64/conf/DEFAULTS user/andre/tcp_workqueue/sys/ia64/ia32/ia32_reg.c user/andre/tcp_workqueue/sys/ia64/ia32/ia32_signal.c user/andre/tcp_workqueue/sys/ia64/ia32/ia32_trap.c user/andre/tcp_workqueue/sys/ia64/include/reg.h user/andre/tcp_workqueue/sys/kern/imgact_elf.c user/andre/tcp_workqueue/sys/kern/kern_clock.c user/andre/tcp_workqueue/sys/kern/kern_clocksource.c user/andre/tcp_workqueue/sys/kern/kern_cpu.c user/andre/tcp_workqueue/sys/kern/kern_descrip.c user/andre/tcp_workqueue/sys/kern/kern_exec.c user/andre/tcp_workqueue/sys/kern/kern_exit.c user/andre/tcp_workqueue/sys/kern/kern_intr.c user/andre/tcp_workqueue/sys/kern/kern_kthread.c user/andre/tcp_workqueue/sys/kern/kern_linker.c user/andre/tcp_workqueue/sys/kern/kern_racct.c user/andre/tcp_workqueue/sys/kern/kern_thr.c user/andre/tcp_workqueue/sys/kern/kern_umtx.c user/andre/tcp_workqueue/sys/kern/sched_4bsd.c user/andre/tcp_workqueue/sys/kern/sched_ule.c user/andre/tcp_workqueue/sys/kern/subr_acl_nfs4.c user/andre/tcp_workqueue/sys/kern/subr_acl_posix1e.c user/andre/tcp_workqueue/sys/kern/subr_msgbuf.c user/andre/tcp_workqueue/sys/kern/sys_capability.c user/andre/tcp_workqueue/sys/kern/sys_pipe.c user/andre/tcp_workqueue/sys/kern/uipc_syscalls.c user/andre/tcp_workqueue/sys/kern/vfs_mount.c user/andre/tcp_workqueue/sys/kern/vfs_subr.c user/andre/tcp_workqueue/sys/kern/vfs_syscalls.c user/andre/tcp_workqueue/sys/kern/vfs_vnops.c user/andre/tcp_workqueue/sys/mips/adm5120/adm5120_machdep.c user/andre/tcp_workqueue/sys/mips/adm5120/std.adm5120 user/andre/tcp_workqueue/sys/mips/alchemy/alchemy_machdep.c user/andre/tcp_workqueue/sys/mips/alchemy/std.alchemy user/andre/tcp_workqueue/sys/mips/atheros/apb.c user/andre/tcp_workqueue/sys/mips/atheros/ar71xx_chip.c user/andre/tcp_workqueue/sys/mips/atheros/ar71xx_cpudef.h user/andre/tcp_workqueue/sys/mips/atheros/ar71xx_machdep.c user/andre/tcp_workqueue/sys/mips/atheros/ar71xxreg.h user/andre/tcp_workqueue/sys/mips/atheros/ar724x_chip.c user/andre/tcp_workqueue/sys/mips/atheros/ar91xx_chip.c user/andre/tcp_workqueue/sys/mips/atheros/if_arge.c user/andre/tcp_workqueue/sys/mips/atheros/std.ar71xx user/andre/tcp_workqueue/sys/mips/cavium/ciu.c user/andre/tcp_workqueue/sys/mips/cavium/files.octeon1 user/andre/tcp_workqueue/sys/mips/cavium/if_octm.c user/andre/tcp_workqueue/sys/mips/cavium/obio.c user/andre/tcp_workqueue/sys/mips/cavium/octe/ethernet-rgmii.c user/andre/tcp_workqueue/sys/mips/cavium/octe/ethernet-rx.c user/andre/tcp_workqueue/sys/mips/cavium/octe/ethernet-spi.c user/andre/tcp_workqueue/sys/mips/cavium/octe/ethernet.c user/andre/tcp_workqueue/sys/mips/cavium/octe/wrapper-cvmx-includes.h user/andre/tcp_workqueue/sys/mips/cavium/octeon_gpio.c user/andre/tcp_workqueue/sys/mips/cavium/octeon_machdep.c user/andre/tcp_workqueue/sys/mips/cavium/octeon_mp.c user/andre/tcp_workqueue/sys/mips/cavium/octeon_wdog.c user/andre/tcp_workqueue/sys/mips/cavium/octopci.c user/andre/tcp_workqueue/sys/mips/cavium/uart_dev_oct16550.c user/andre/tcp_workqueue/sys/mips/cavium/usb/octusb_octeon.c user/andre/tcp_workqueue/sys/mips/conf/AR71XX_BASE user/andre/tcp_workqueue/sys/mips/conf/AR91XX_BASE user/andre/tcp_workqueue/sys/mips/conf/DEFAULTS user/andre/tcp_workqueue/sys/mips/conf/MALTA user/andre/tcp_workqueue/sys/mips/conf/MALTA64 user/andre/tcp_workqueue/sys/mips/conf/OCTEON1 user/andre/tcp_workqueue/sys/mips/conf/PB92 user/andre/tcp_workqueue/sys/mips/conf/SWARM user/andre/tcp_workqueue/sys/mips/conf/SWARM64 user/andre/tcp_workqueue/sys/mips/conf/SWARM64_SMP user/andre/tcp_workqueue/sys/mips/conf/SWARM_SMP user/andre/tcp_workqueue/sys/mips/conf/XLP user/andre/tcp_workqueue/sys/mips/conf/XLP64 user/andre/tcp_workqueue/sys/mips/conf/XLPN32 user/andre/tcp_workqueue/sys/mips/conf/XLR user/andre/tcp_workqueue/sys/mips/conf/XLR64 user/andre/tcp_workqueue/sys/mips/conf/XLRN32 user/andre/tcp_workqueue/sys/mips/idt/idt_machdep.c user/andre/tcp_workqueue/sys/mips/idt/std.idt user/andre/tcp_workqueue/sys/mips/include/_bus.h user/andre/tcp_workqueue/sys/mips/include/asm.h user/andre/tcp_workqueue/sys/mips/include/bus.h user/andre/tcp_workqueue/sys/mips/include/cache.h user/andre/tcp_workqueue/sys/mips/include/cpu.h user/andre/tcp_workqueue/sys/mips/include/cpufunc.h user/andre/tcp_workqueue/sys/mips/include/cpuregs.h user/andre/tcp_workqueue/sys/mips/include/frame.h user/andre/tcp_workqueue/sys/mips/include/hwfunc.h user/andre/tcp_workqueue/sys/mips/include/locore.h user/andre/tcp_workqueue/sys/mips/include/md_var.h user/andre/tcp_workqueue/sys/mips/include/pmap.h user/andre/tcp_workqueue/sys/mips/include/proc.h user/andre/tcp_workqueue/sys/mips/include/trap.h user/andre/tcp_workqueue/sys/mips/malta/malta_machdep.c user/andre/tcp_workqueue/sys/mips/malta/std.malta user/andre/tcp_workqueue/sys/mips/mips/bus_space_generic.c user/andre/tcp_workqueue/sys/mips/mips/cache.c user/andre/tcp_workqueue/sys/mips/mips/cache_mipsNN.c user/andre/tcp_workqueue/sys/mips/mips/cpu.c user/andre/tcp_workqueue/sys/mips/mips/exception.S user/andre/tcp_workqueue/sys/mips/mips/freebsd32_machdep.c user/andre/tcp_workqueue/sys/mips/mips/locore.S user/andre/tcp_workqueue/sys/mips/mips/machdep.c user/andre/tcp_workqueue/sys/mips/mips/mpboot.S user/andre/tcp_workqueue/sys/mips/mips/nexus.c user/andre/tcp_workqueue/sys/mips/mips/pm_machdep.c user/andre/tcp_workqueue/sys/mips/mips/support.S user/andre/tcp_workqueue/sys/mips/mips/swtch.S user/andre/tcp_workqueue/sys/mips/mips/sys_machdep.c user/andre/tcp_workqueue/sys/mips/mips/tick.c user/andre/tcp_workqueue/sys/mips/mips/trap.c user/andre/tcp_workqueue/sys/mips/mips/vm_machdep.c user/andre/tcp_workqueue/sys/mips/nlm/tick.c user/andre/tcp_workqueue/sys/mips/nlm/xlp_machdep.c user/andre/tcp_workqueue/sys/mips/rmi/tick.c user/andre/tcp_workqueue/sys/mips/rmi/xlr_machdep.c user/andre/tcp_workqueue/sys/mips/rt305x/rt305x_machdep.c user/andre/tcp_workqueue/sys/mips/rt305x/std.rt305x user/andre/tcp_workqueue/sys/mips/sentry5/s5_machdep.c user/andre/tcp_workqueue/sys/mips/sentry5/std.sentry5 user/andre/tcp_workqueue/sys/mips/sibyte/sb_machdep.c user/andre/tcp_workqueue/sys/modules/Makefile user/andre/tcp_workqueue/sys/modules/geom/geom_part/Makefile user/andre/tcp_workqueue/sys/modules/mps/Makefile user/andre/tcp_workqueue/sys/modules/netgraph/netflow/Makefile user/andre/tcp_workqueue/sys/modules/ralfw/Makefile user/andre/tcp_workqueue/sys/net/ieee8023ad_lacp.c user/andre/tcp_workqueue/sys/net/if_lagg.c user/andre/tcp_workqueue/sys/net/if_lagg.h user/andre/tcp_workqueue/sys/net/if_var.h user/andre/tcp_workqueue/sys/net/netmap_user.h user/andre/tcp_workqueue/sys/net/route.c user/andre/tcp_workqueue/sys/net/route.h user/andre/tcp_workqueue/sys/net80211/ieee80211_freebsd.c user/andre/tcp_workqueue/sys/net80211/ieee80211_hwmp.c user/andre/tcp_workqueue/sys/net80211/ieee80211_mesh.c user/andre/tcp_workqueue/sys/net80211/ieee80211_mesh.h user/andre/tcp_workqueue/sys/net80211/ieee80211_radiotap.c user/andre/tcp_workqueue/sys/netgraph/netflow/netflow.c user/andre/tcp_workqueue/sys/netgraph/netflow/ng_netflow.c user/andre/tcp_workqueue/sys/netgraph/netflow/ng_netflow.h user/andre/tcp_workqueue/sys/netgraph/ng_vlan.c user/andre/tcp_workqueue/sys/netgraph/ng_vlan.h user/andre/tcp_workqueue/sys/netinet/in_pcb.h user/andre/tcp_workqueue/sys/netinet/ip_fw.h user/andre/tcp_workqueue/sys/netinet/ipfw/ip_fw2.c user/andre/tcp_workqueue/sys/netinet/ipfw/ip_fw_private.h user/andre/tcp_workqueue/sys/netinet/ipfw/ip_fw_sockopt.c user/andre/tcp_workqueue/sys/netinet/ipfw/ip_fw_table.c user/andre/tcp_workqueue/sys/netinet/sctp_bsd_addr.c user/andre/tcp_workqueue/sys/netinet/sctp_peeloff.c user/andre/tcp_workqueue/sys/netinet/sctp_usrreq.c user/andre/tcp_workqueue/sys/netinet6/sctp6_usrreq.c user/andre/tcp_workqueue/sys/nfsclient/nfs_vnops.c user/andre/tcp_workqueue/sys/ofed/drivers/infiniband/core/addr.c user/andre/tcp_workqueue/sys/ofed/drivers/infiniband/core/cma.c user/andre/tcp_workqueue/sys/ofed/drivers/infiniband/core/fmr_pool.c user/andre/tcp_workqueue/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c user/andre/tcp_workqueue/sys/pc98/conf/DEFAULTS user/andre/tcp_workqueue/sys/pc98/include/psl.h user/andre/tcp_workqueue/sys/pc98/include/reg.h user/andre/tcp_workqueue/sys/pc98/include/specialreg.h user/andre/tcp_workqueue/sys/pc98/include/sysarch.h user/andre/tcp_workqueue/sys/pc98/pc98/machdep.c user/andre/tcp_workqueue/sys/powerpc/aim/mmu_oea.c user/andre/tcp_workqueue/sys/powerpc/aim/mmu_oea64.c user/andre/tcp_workqueue/sys/powerpc/conf/DEFAULTS user/andre/tcp_workqueue/sys/powerpc/include/endian.h user/andre/tcp_workqueue/sys/powerpc/ofw/ofw_pcib_pci.c user/andre/tcp_workqueue/sys/powerpc/ofw/ofw_pcibus.c user/andre/tcp_workqueue/sys/powerpc/powermac/uninorth.c user/andre/tcp_workqueue/sys/sparc64/conf/DEFAULTS user/andre/tcp_workqueue/sys/sparc64/include/endian.h user/andre/tcp_workqueue/sys/sparc64/pci/ofw_pcibus.c user/andre/tcp_workqueue/sys/sys/cpuset.h user/andre/tcp_workqueue/sys/sys/mount.h user/andre/tcp_workqueue/sys/sys/msgbuf.h user/andre/tcp_workqueue/sys/sys/pipe.h user/andre/tcp_workqueue/sys/sys/sched.h user/andre/tcp_workqueue/sys/sys/systm.h user/andre/tcp_workqueue/sys/sys/unistd.h user/andre/tcp_workqueue/sys/sys/vnode.h user/andre/tcp_workqueue/sys/ufs/ffs/ffs_inode.c user/andre/tcp_workqueue/sys/ufs/ffs/ffs_softdep.c user/andre/tcp_workqueue/sys/ufs/ffs/ffs_vnops.c user/andre/tcp_workqueue/sys/ufs/ufs/ufs_extattr.c user/andre/tcp_workqueue/sys/ufs/ufs/ufs_vnops.c user/andre/tcp_workqueue/sys/vm/vm_contig.c user/andre/tcp_workqueue/sys/vm/vm_map.c user/andre/tcp_workqueue/sys/vm/vm_mmap.c user/andre/tcp_workqueue/sys/vm/vm_object.c user/andre/tcp_workqueue/sys/vm/vm_object.h user/andre/tcp_workqueue/sys/vm/vm_pageout.c user/andre/tcp_workqueue/sys/vm/vm_pageout.h user/andre/tcp_workqueue/sys/vm/vnode_pager.c user/andre/tcp_workqueue/sys/x86/include/endian.h user/andre/tcp_workqueue/sys/x86/isa/atpic.c user/andre/tcp_workqueue/sys/x86/isa/icu.h user/andre/tcp_workqueue/sys/x86/x86/busdma_machdep.c Directory Properties: user/andre/tcp_workqueue/sys/ (props changed) user/andre/tcp_workqueue/sys/boot/ (props changed) user/andre/tcp_workqueue/sys/cddl/contrib/opensolaris/ (props changed) user/andre/tcp_workqueue/sys/conf/ (props changed) user/andre/tcp_workqueue/sys/contrib/octeon-sdk/ (props changed) user/andre/tcp_workqueue/sys/contrib/pf/ (props changed) Modified: user/andre/tcp_workqueue/sys/amd64/acpica/acpi_wakeup.c ============================================================================== --- user/andre/tcp_workqueue/sys/amd64/acpica/acpi_wakeup.c Tue Mar 20 04:50:25 2012 (r233227) +++ user/andre/tcp_workqueue/sys/amd64/acpica/acpi_wakeup.c Tue Mar 20 07:59:36 2012 (r233228) @@ -241,8 +241,8 @@ acpi_sleep_machdep(struct acpi_softc *sc AcpiSetFirmwareWakingVector(WAKECODE_PADDR(sc)); - spinlock_enter(); intr_suspend(); + spinlock_enter(); if (savectx(susppcbs[0])) { ctx_fpusave(suspfpusave[0]); @@ -299,8 +299,8 @@ out: #endif mca_resume(); - intr_resume(); spinlock_exit(); + intr_resume(); AcpiSetFirmwareWakingVector(0); Modified: user/andre/tcp_workqueue/sys/amd64/amd64/pmap.c ============================================================================== --- user/andre/tcp_workqueue/sys/amd64/amd64/pmap.c Tue Mar 20 04:50:25 2012 (r233227) +++ user/andre/tcp_workqueue/sys/amd64/amd64/pmap.c Tue Mar 20 07:59:36 2012 (r233228) @@ -2386,7 +2386,7 @@ pmap_remove_entry(pmap_t pmap, vm_page_t mtx_assert(&vm_page_queue_mtx, MA_OWNED); pmap_pvh_free(&m->md, pmap, va); - if (TAILQ_EMPTY(&m->md.pv_list)) { + if (TAILQ_EMPTY(&m->md.pv_list) && (m->flags & PG_FICTITIOUS) == 0) { pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m)); if (TAILQ_EMPTY(&pvh->pv_list)) vm_page_aflag_clear(m, PGA_WRITEABLE); @@ -2849,6 +2849,8 @@ pmap_remove_all(vm_page_t m) ("pmap_remove_all: page %p is not managed", m)); free = NULL; vm_page_lock_queues(); + if ((m->flags & PG_FICTITIOUS) != 0) + goto small_mappings; pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m)); while ((pv = TAILQ_FIRST(&pvh->pv_list)) != NULL) { pmap = PV_PMAP(pv); @@ -2858,6 +2860,7 @@ pmap_remove_all(vm_page_t m) (void)pmap_demote_pde(pmap, pde, va); PMAP_UNLOCK(pmap); } +small_mappings: while ((pv = TAILQ_FIRST(&m->md.pv_list)) != NULL) { pmap = PV_PMAP(pv); PMAP_LOCK(pmap); @@ -2939,7 +2942,7 @@ pmap_protect(pmap_t pmap, vm_offset_t sv pdp_entry_t *pdpe; pd_entry_t ptpaddr, *pde; pt_entry_t *pte; - int anychanged; + boolean_t anychanged, pv_lists_locked; if ((prot & VM_PROT_READ) == VM_PROT_NONE) { pmap_remove(pmap, sva, eva); @@ -2950,9 +2953,10 @@ pmap_protect(pmap_t pmap, vm_offset_t sv (VM_PROT_WRITE|VM_PROT_EXECUTE)) return; - anychanged = 0; + pv_lists_locked = FALSE; +resume: + anychanged = FALSE; - vm_page_lock_queues(); PMAP_LOCK(pmap); for (; sva < eva; sva = va_next) { @@ -2999,11 +3003,27 @@ pmap_protect(pmap_t pmap, vm_offset_t sv * invalidated by pmap_protect_pde(). */ if (pmap_protect_pde(pmap, pde, sva, prot)) - anychanged = 1; - continue; - } else if (!pmap_demote_pde(pmap, pde, sva)) { - /* The large page mapping was destroyed. */ + anychanged = TRUE; continue; + } else { + if (!pv_lists_locked) { + pv_lists_locked = TRUE; + if (!mtx_trylock(&vm_page_queue_mtx)) { + if (anychanged) + pmap_invalidate_all( + pmap); + PMAP_UNLOCK(pmap); + vm_page_lock_queues(); + goto resume; + } + } + if (!pmap_demote_pde(pmap, pde, sva)) { + /* + * The large page mapping was + * destroyed. + */ + continue; + } } } @@ -3037,13 +3057,14 @@ retry: if (obits & PG_G) pmap_invalidate_page(pmap, sva); else - anychanged = 1; + anychanged = TRUE; } } } if (anychanged) pmap_invalidate_all(pmap); - vm_page_unlock_queues(); + if (pv_lists_locked) + vm_page_unlock_queues(); PMAP_UNLOCK(pmap); } @@ -3336,7 +3357,8 @@ validate: } if ((origpte & PG_MANAGED) != 0 && TAILQ_EMPTY(&om->md.pv_list) && - TAILQ_EMPTY(&pa_to_pvh(opa)->pv_list)) + ((om->flags & PG_FICTITIOUS) != 0 || + TAILQ_EMPTY(&pa_to_pvh(opa)->pv_list))) vm_page_aflag_clear(om, PGA_WRITEABLE); if (invlva) pmap_invalidate_page(pmap, va); @@ -3349,7 +3371,8 @@ validate: * populated, then attempt promotion. */ if ((mpte == NULL || mpte->wire_count == NPTEPG) && - pg_ps_enabled && vm_reserv_level_iffullpop(m) == 0) + pg_ps_enabled && (m->flags & PG_FICTITIOUS) == 0 && + vm_reserv_level_iffullpop(m) == 0) pmap_promote_pde(pmap, pde, va); vm_page_unlock_queues(); @@ -3969,7 +3992,7 @@ pmap_page_exists_quick(pmap_t pmap, vm_p if (loops >= 16) break; } - if (!rv && loops < 16) { + if (!rv && loops < 16 && (m->flags & PG_FICTITIOUS) == 0) { pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m)); TAILQ_FOREACH(pv, &pvh->pv_list, pv_list) { if (PV_PMAP(pv) == pmap) { @@ -4001,7 +4024,10 @@ pmap_page_wired_mappings(vm_page_t m) return (count); vm_page_lock_queues(); count = pmap_pvh_wired_mappings(&m->md, count); - count = pmap_pvh_wired_mappings(pa_to_pvh(VM_PAGE_TO_PHYS(m)), count); + if ((m->flags & PG_FICTITIOUS) == 0) { + count = pmap_pvh_wired_mappings(pa_to_pvh(VM_PAGE_TO_PHYS(m)), + count); + } vm_page_unlock_queues(); return (count); } @@ -4043,7 +4069,8 @@ pmap_page_is_mapped(vm_page_t m) return (FALSE); vm_page_lock_queues(); rv = !TAILQ_EMPTY(&m->md.pv_list) || - !TAILQ_EMPTY(&pa_to_pvh(VM_PAGE_TO_PHYS(m))->pv_list); + ((m->flags & PG_FICTITIOUS) == 0 && + !TAILQ_EMPTY(&pa_to_pvh(VM_PAGE_TO_PHYS(m))->pv_list)); vm_page_unlock_queues(); return (rv); } @@ -4116,9 +4143,10 @@ pmap_remove_pages(pmap_t pmap) m, (uintmax_t)m->phys_addr, (uintmax_t)tpte)); - KASSERT(m < &vm_page_array[vm_page_array_size], - ("pmap_remove_pages: bad tpte %#jx", - (uintmax_t)tpte)); + KASSERT((m->flags & PG_FICTITIOUS) != 0 || + m < &vm_page_array[vm_page_array_size], + ("pmap_remove_pages: bad tpte %#jx", + (uintmax_t)tpte)); pte_clear(pte); @@ -4160,7 +4188,8 @@ pmap_remove_pages(pmap_t pmap) } else { pmap_resident_count_dec(pmap, 1); TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); - if (TAILQ_EMPTY(&m->md.pv_list)) { + if (TAILQ_EMPTY(&m->md.pv_list) && + (m->flags & PG_FICTITIOUS) == 0) { pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m)); if (TAILQ_EMPTY(&pvh->pv_list)) vm_page_aflag_clear(m, PGA_WRITEABLE); @@ -4211,7 +4240,8 @@ pmap_is_modified(vm_page_t m) return (FALSE); vm_page_lock_queues(); rv = pmap_is_modified_pvh(&m->md) || - pmap_is_modified_pvh(pa_to_pvh(VM_PAGE_TO_PHYS(m))); + ((m->flags & PG_FICTITIOUS) == 0 && + pmap_is_modified_pvh(pa_to_pvh(VM_PAGE_TO_PHYS(m)))); vm_page_unlock_queues(); return (rv); } @@ -4282,7 +4312,8 @@ pmap_is_referenced(vm_page_t m) ("pmap_is_referenced: page %p is not managed", m)); vm_page_lock_queues(); rv = pmap_is_referenced_pvh(&m->md) || - pmap_is_referenced_pvh(pa_to_pvh(VM_PAGE_TO_PHYS(m))); + ((m->flags & PG_FICTITIOUS) == 0 && + pmap_is_referenced_pvh(pa_to_pvh(VM_PAGE_TO_PHYS(m)))); vm_page_unlock_queues(); return (rv); } @@ -4339,6 +4370,8 @@ pmap_remove_write(vm_page_t m) (m->aflags & PGA_WRITEABLE) == 0) return; vm_page_lock_queues(); + if ((m->flags & PG_FICTITIOUS) != 0) + goto small_mappings; pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m)); TAILQ_FOREACH_SAFE(pv, &pvh->pv_list, pv_list, next_pv) { pmap = PV_PMAP(pv); @@ -4349,6 +4382,7 @@ pmap_remove_write(vm_page_t m) (void)pmap_demote_pde(pmap, pde, va); PMAP_UNLOCK(pmap); } +small_mappings: TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { pmap = PV_PMAP(pv); PMAP_LOCK(pmap); @@ -4397,8 +4431,10 @@ pmap_ts_referenced(vm_page_t m) KASSERT((m->oflags & VPO_UNMANAGED) == 0, ("pmap_ts_referenced: page %p is not managed", m)); - pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m)); vm_page_lock_queues(); + if ((m->flags & PG_FICTITIOUS) != 0) + goto small_mappings; + pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m)); TAILQ_FOREACH_SAFE(pv, &pvh->pv_list, pv_list, pvn) { pmap = PV_PMAP(pv); PMAP_LOCK(pmap); @@ -4429,6 +4465,7 @@ pmap_ts_referenced(vm_page_t m) } PMAP_UNLOCK(pmap); } +small_mappings: if ((pv = TAILQ_FIRST(&m->md.pv_list)) != NULL) { pvf = pv; do { @@ -4483,6 +4520,8 @@ pmap_clear_modify(vm_page_t m) if ((m->aflags & PGA_WRITEABLE) == 0) return; vm_page_lock_queues(); + if ((m->flags & PG_FICTITIOUS) != 0) + goto small_mappings; pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m)); TAILQ_FOREACH_SAFE(pv, &pvh->pv_list, pv_list, next_pv) { pmap = PV_PMAP(pv); @@ -4515,6 +4554,7 @@ pmap_clear_modify(vm_page_t m) } PMAP_UNLOCK(pmap); } +small_mappings: TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { pmap = PV_PMAP(pv); PMAP_LOCK(pmap); @@ -4549,6 +4589,8 @@ pmap_clear_reference(vm_page_t m) KASSERT((m->oflags & VPO_UNMANAGED) == 0, ("pmap_clear_reference: page %p is not managed", m)); vm_page_lock_queues(); + if ((m->flags & PG_FICTITIOUS) != 0) + goto small_mappings; pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m)); TAILQ_FOREACH_SAFE(pv, &pvh->pv_list, pv_list, next_pv) { pmap = PV_PMAP(pv); @@ -4572,6 +4614,7 @@ pmap_clear_reference(vm_page_t m) } PMAP_UNLOCK(pmap); } +small_mappings: TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { pmap = PV_PMAP(pv); PMAP_LOCK(pmap); Modified: user/andre/tcp_workqueue/sys/amd64/amd64/trap.c ============================================================================== --- user/andre/tcp_workqueue/sys/amd64/amd64/trap.c Tue Mar 20 04:50:25 2012 (r233227) +++ user/andre/tcp_workqueue/sys/amd64/amd64/trap.c Tue Mar 20 07:59:36 2012 (r233228) @@ -645,7 +645,7 @@ trap_pfault(frame, usermode) int usermode; { vm_offset_t va; - struct vmspace *vm = NULL; + struct vmspace *vm; vm_map_t map; int rv = 0; vm_prot_t ftype; @@ -664,14 +664,10 @@ trap_pfault(frame, usermode) map = kernel_map; } else { /* - * This is a fault on non-kernel virtual memory. - * vm is initialized above to NULL. If curproc is NULL - * or curproc->p_vmspace is NULL the fault is fatal. + * This is a fault on non-kernel virtual memory. If either + * p or p->p_vmspace is NULL, then the fault is fatal. */ - if (p != NULL) - vm = p->p_vmspace; - - if (vm == NULL) + if (p == NULL || (vm = p->p_vmspace) == NULL) goto nogo; map = &vm->vm_map; @@ -735,8 +731,7 @@ nogo: trap_fatal(frame, eva); return (-1); } - - return((rv == KERN_PROTECTION_FAILURE) ? SIGBUS : SIGSEGV); + return ((rv == KERN_PROTECTION_FAILURE) ? SIGBUS : SIGSEGV); } static void Modified: user/andre/tcp_workqueue/sys/amd64/conf/DEFAULTS ============================================================================== --- user/andre/tcp_workqueue/sys/amd64/conf/DEFAULTS Tue Mar 20 04:50:25 2012 (r233227) +++ user/andre/tcp_workqueue/sys/amd64/conf/DEFAULTS Tue Mar 20 07:59:36 2012 (r233228) @@ -22,6 +22,3 @@ options GEOM_PART_EBR_COMPAT options GEOM_PART_MBR options NEW_PCIB - -# Allow mounting non-MPSAFE filesystems -options VFS_ALLOW_NONMPSAFE Modified: user/andre/tcp_workqueue/sys/amd64/conf/GENERIC.hints ============================================================================== --- user/andre/tcp_workqueue/sys/amd64/conf/GENERIC.hints Tue Mar 20 04:50:25 2012 (r233227) +++ user/andre/tcp_workqueue/sys/amd64/conf/GENERIC.hints Tue Mar 20 07:59:36 2012 (r233228) @@ -30,3 +30,4 @@ hint.atrtc.0.irq="8" hint.attimer.0.at="isa" hint.attimer.0.port="0x40" hint.attimer.0.irq="0" +hint.wbwd.0.at="isa" Modified: user/andre/tcp_workqueue/sys/amd64/conf/NOTES ============================================================================== --- user/andre/tcp_workqueue/sys/amd64/conf/NOTES Tue Mar 20 04:50:25 2012 (r233227) +++ user/andre/tcp_workqueue/sys/amd64/conf/NOTES Tue Mar 20 07:59:36 2012 (r233228) @@ -465,10 +465,12 @@ device tpm # ichwd: Intel ICH watchdog timer # amdsbwd: AMD SB7xx watchdog timer # viawd: VIA south bridge watchdog timer +# wbwd: Winbond watchdog timer # device ichwd device amdsbwd device viawd +device wbwd # # Temperature sensors: Modified: user/andre/tcp_workqueue/sys/amd64/ia32/ia32_reg.c ============================================================================== --- user/andre/tcp_workqueue/sys/amd64/ia32/ia32_reg.c Tue Mar 20 04:50:25 2012 (r233227) +++ user/andre/tcp_workqueue/sys/amd64/ia32/ia32_reg.c Tue Mar 20 07:59:36 2012 (r233228) @@ -65,7 +65,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include Modified: user/andre/tcp_workqueue/sys/amd64/include/fpu.h ============================================================================== --- user/andre/tcp_workqueue/sys/amd64/include/fpu.h Tue Mar 20 04:50:25 2012 (r233227) +++ user/andre/tcp_workqueue/sys/amd64/include/fpu.h Tue Mar 20 07:59:36 2012 (r233228) @@ -41,64 +41,7 @@ #ifndef _MACHINE_FPU_H_ #define _MACHINE_FPU_H_ -/* Contents of each x87 floating point accumulator */ -struct fpacc87 { - uint8_t fp_bytes[10]; -}; - -/* Contents of each SSE extended accumulator */ -struct xmmacc { - uint8_t xmm_bytes[16]; -}; - -/* Contents of the upper 16 bytes of each AVX extended accumulator */ -struct ymmacc { - uint8_t ymm_bytes[16]; -}; - -struct envxmm { - uint16_t en_cw; /* control word (16bits) */ - uint16_t en_sw; /* status word (16bits) */ - uint8_t en_tw; /* tag word (8bits) */ - uint8_t en_zero; - uint16_t en_opcode; /* opcode last executed (11 bits ) */ - uint64_t en_rip; /* floating point instruction pointer */ - uint64_t en_rdp; /* floating operand pointer */ - uint32_t en_mxcsr; /* SSE sontorol/status register */ - uint32_t en_mxcsr_mask; /* valid bits in mxcsr */ -}; - -struct savefpu { - struct envxmm sv_env; - struct { - struct fpacc87 fp_acc; - uint8_t fp_pad[6]; /* padding */ - } sv_fp[8]; - struct xmmacc sv_xmm[16]; - uint8_t sv_pad[96]; -} __aligned(16); - -struct xstate_hdr { - uint64_t xstate_bv; - uint8_t xstate_rsrv0[16]; - uint8_t xstate_rsrv[40]; -}; - -struct savefpu_xstate { - struct xstate_hdr sx_hd; - struct ymmacc sx_ymm[16]; -}; - -struct savefpu_ymm { - struct envxmm sv_env; - struct { - struct fpacc87 fp_acc; - int8_t fp_pad[6]; /* padding */ - } sv_fp[8]; - struct xmmacc sv_xmm[16]; - uint8_t sv_pad[96]; - struct savefpu_xstate sv_xstate; -} __aligned(64); +#include #ifdef _KERNEL @@ -108,32 +51,6 @@ struct fpu_kern_ctx; #define XSAVE_AREA_ALIGN 64 -#endif - -/* - * The hardware default control word for i387's and later coprocessors is - * 0x37F, giving: - * - * round to nearest - * 64-bit precision - * all exceptions masked. - * - * FreeBSD/i386 uses 53 bit precision for things like fadd/fsub/fsqrt etc - * because of the difference between memory and fpu register stack arguments. - * If its using an intermediate fpu register, it has 80/64 bits to work - * with. If it uses memory, it has 64/53 bits to work with. However, - * gcc is aware of this and goes to a fair bit of trouble to make the - * best use of it. - * - * This is mostly academic for AMD64, because the ABI prefers the use - * SSE2 based math. For FreeBSD/amd64, we go with the default settings. - */ -#define __INITIAL_FPUCW__ 0x037F -#define __INITIAL_FPUCW_I386__ 0x127F -#define __INITIAL_MXCSR__ 0x1F80 -#define __INITIAL_MXCSR_MASK__ 0xFFBF - -#ifdef _KERNEL void fpudna(void); void fpudrop(void); void fpuexit(struct thread *td); Copied: user/andre/tcp_workqueue/sys/amd64/include/npx.h (from r233227, head/sys/amd64/include/npx.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/andre/tcp_workqueue/sys/amd64/include/npx.h Tue Mar 20 07:59:36 2012 (r233228, copy of r233227, head/sys/amd64/include/npx.h) @@ -0,0 +1,6 @@ +/*- + * This file is in the public domain. + */ +/* $FreeBSD$ */ + +#include Modified: user/andre/tcp_workqueue/sys/amd64/include/psl.h ============================================================================== --- user/andre/tcp_workqueue/sys/amd64/include/psl.h Tue Mar 20 04:50:25 2012 (r233227) +++ user/andre/tcp_workqueue/sys/amd64/include/psl.h Tue Mar 20 07:59:36 2012 (r233228) @@ -1,84 +1,6 @@ /*- - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * William Jolitz. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * from: @(#)psl.h 5.2 (Berkeley) 1/18/91 - * $FreeBSD$ + * This file is in the public domain. */ +/* $FreeBSD$ */ -#ifndef _MACHINE_PSL_H_ -#define _MACHINE_PSL_H_ - -/* - * 386 processor status longword. - */ -#define PSL_C 0x00000001 /* carry bit */ -#define PSL_PF 0x00000004 /* parity bit */ -#define PSL_AF 0x00000010 /* bcd carry bit */ -#define PSL_Z 0x00000040 /* zero bit */ -#define PSL_N 0x00000080 /* negative bit */ -#define PSL_T 0x00000100 /* trace enable bit */ -#define PSL_I 0x00000200 /* interrupt enable bit */ -#define PSL_D 0x00000400 /* string instruction direction bit */ -#define PSL_V 0x00000800 /* overflow bit */ -#define PSL_IOPL 0x00003000 /* i/o privilege level */ -#define PSL_NT 0x00004000 /* nested task bit */ -#define PSL_RF 0x00010000 /* resume flag bit */ -/* #define PSL_VM 0x00020000 */ /* virtual 8086 mode bit */ -#define PSL_AC 0x00040000 /* alignment checking */ -/* #define PSL_VIF 0x00080000 */ /* virtual interrupt enable */ -/* #define PSL_VIP 0x00100000 */ /* virtual interrupt pending */ -#define PSL_ID 0x00200000 /* identification bit */ - -/* - * The i486 manual says that we are not supposed to change reserved flags, - * but this is too much trouble since the reserved flags depend on the cpu - * and setting them to their historical values works in practice. - */ -#define PSL_RESERVED_DEFAULT 0x00000002 - -/* - * Initial flags for kernel and user mode. The kernel later inherits - * PSL_I and some other flags from user mode. - */ -#define PSL_KERNEL PSL_RESERVED_DEFAULT -#define PSL_USER (PSL_RESERVED_DEFAULT | PSL_I) - -/* - * Bits that can be changed in user mode on 486's. We allow these bits - * to be changed using ptrace(), sigreturn() and procfs. Setting PS_NT - * is undesirable but it may as well be allowed since users can inflict - * it on the kernel directly. Changes to PSL_AC are silently ignored on - * 386's. - */ -#define PSL_USERCHANGE (PSL_C | PSL_PF | PSL_AF | PSL_Z | PSL_N | PSL_T \ - | PSL_D | PSL_V | PSL_NT | PSL_AC | PSL_ID) - -#endif /* !_MACHINE_PSL_H_ */ +#include Modified: user/andre/tcp_workqueue/sys/amd64/include/reg.h ============================================================================== --- user/andre/tcp_workqueue/sys/amd64/include/reg.h Tue Mar 20 04:50:25 2012 (r233227) +++ user/andre/tcp_workqueue/sys/amd64/include/reg.h Tue Mar 20 07:59:36 2012 (r233228) @@ -1,141 +1,6 @@ /*- - * Copyright (c) 2003 Peter Wemm. - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * William Jolitz. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * from: @(#)reg.h 5.5 (Berkeley) 1/18/91 - * $FreeBSD$ + * This file is in the public domain. */ +/* $FreeBSD$ */ -#ifndef _MACHINE_REG_H_ -#define _MACHINE_REG_H_ - -#if defined(_KERNEL) && !defined(_STANDALONE) -#include "opt_compat.h" -#endif - -/* - * Register set accessible via /proc/$pid/regs and PT_{SET,GET}REGS. - */ -struct reg { - register_t r_r15; - register_t r_r14; - register_t r_r13; - register_t r_r12; - register_t r_r11; - register_t r_r10; - register_t r_r9; - register_t r_r8; - register_t r_rdi; - register_t r_rsi; - register_t r_rbp; - register_t r_rbx; - register_t r_rdx; - register_t r_rcx; - register_t r_rax; - uint32_t r_trapno; - uint16_t r_fs; - uint16_t r_gs; - uint32_t r_err; - uint16_t r_es; - uint16_t r_ds; - register_t r_rip; - register_t r_cs; - register_t r_rflags; - register_t r_rsp; - register_t r_ss; -}; - -/* - * Register set accessible via /proc/$pid/fpregs. - */ -struct fpreg { - /* - * XXX should get struct from fpu.h. Here we give a slightly - * simplified struct. This may be too much detail. Perhaps - * an array of unsigned longs is best. - */ - unsigned long fpr_env[4]; - unsigned char fpr_acc[8][16]; - unsigned char fpr_xacc[16][16]; - unsigned long fpr_spare[12]; -}; - -/* - * Register set accessible via /proc/$pid/dbregs. - */ -struct dbreg { - unsigned long dr[16]; /* debug registers */ - /* Index 0-3: debug address registers */ - /* Index 4-5: reserved */ - /* Index 6: debug status */ - /* Index 7: debug control */ - /* Index 8-15: reserved */ -}; - -#define DBREG_DR7_LOCAL_ENABLE 0x01 -#define DBREG_DR7_GLOBAL_ENABLE 0x02 -#define DBREG_DR7_LEN_1 0x00 /* 1 byte length */ -#define DBREG_DR7_LEN_2 0x01 -#define DBREG_DR7_LEN_4 0x03 -#define DBREG_DR7_LEN_8 0x02 -#define DBREG_DR7_EXEC 0x00 /* break on execute */ -#define DBREG_DR7_WRONLY 0x01 /* break on write */ -#define DBREG_DR7_RDWR 0x03 /* break on read or write */ -#define DBREG_DR7_MASK(i) (0xful << ((i) * 4 + 16) | 0x3 << (i) * 2) -#define DBREG_DR7_SET(i, len, access, enable) \ - ((u_long)((len) << 2 | (access)) << ((i) * 4 + 16) | (enable) << (i) * 2) -#define DBREG_DR7_GD 0x2000 -#define DBREG_DR7_ENABLED(d, i) (((d) & 0x3 << (i) * 2) != 0) -#define DBREG_DR7_ACCESS(d, i) ((d) >> ((i) * 4 + 16) & 0x3) -#define DBREG_DR7_LEN(d, i) ((d) >> ((i) * 4 + 18) & 0x3) - -#define DBREG_DRX(d,x) ((d)->dr[(x)]) /* reference dr0 - dr15 by - register number */ - -#ifdef COMPAT_FREEBSD32 -#include -#include -#endif - -#ifdef _KERNEL -/* - * XXX these interfaces are MI, so they should be declared in a MI place. - */ -int fill_regs(struct thread *, struct reg *); -int fill_frame_regs(struct trapframe *, struct reg *); -int set_regs(struct thread *, struct reg *); -int fill_fpregs(struct thread *, struct fpreg *); -int set_fpregs(struct thread *, struct fpreg *); -int fill_dbregs(struct thread *, struct dbreg *); -int set_dbregs(struct thread *, struct dbreg *); -#endif - -#endif /* !_MACHINE_REG_H_ */ +#include Modified: user/andre/tcp_workqueue/sys/amd64/include/segments.h ============================================================================== --- user/andre/tcp_workqueue/sys/amd64/include/segments.h Tue Mar 20 04:50:25 2012 (r233227) +++ user/andre/tcp_workqueue/sys/amd64/include/segments.h Tue Mar 20 07:59:36 2012 (r233228) @@ -41,45 +41,7 @@ * AMD64 Segmentation Data Structures and definitions */ -/* - * Selectors - */ - -#define SEL_RPL_MASK 3 /* requester priv level */ -#define ISPL(s) ((s)&3) /* what is the priority level of a selector */ -#define SEL_KPL 0 /* kernel priority level */ -#define SEL_UPL 3 /* user priority level */ -#define ISLDT(s) ((s)&SEL_LDT) /* is it local or global */ -#define SEL_LDT 4 /* local descriptor table */ -#define IDXSEL(s) (((s)>>3) & 0x1fff) /* index of selector */ -#define LSEL(s,r) (((s)<<3) | SEL_LDT | r) /* a local selector */ -#define GSEL(s,r) (((s)<<3) | r) /* a global selector */ - -/* - * User segment descriptors (%cs, %ds etc for compatability apps. 64 bit wide) - * For long-mode apps, %cs only has the conforming bit in sd_type, the sd_dpl, - * sd_p, sd_l and sd_def32 which must be zero). %ds only has sd_p. - */ -struct user_segment_descriptor { - u_int64_t sd_lolimit:16; /* segment extent (lsb) */ - u_int64_t sd_lobase:24; /* segment base address (lsb) */ - u_int64_t sd_type:5; /* segment type */ - u_int64_t sd_dpl:2; /* segment descriptor priority level */ - u_int64_t sd_p:1; /* segment descriptor present */ - u_int64_t sd_hilimit:4; /* segment extent (msb) */ - u_int64_t sd_xx:1; /* unused */ - u_int64_t sd_long:1; /* long mode (cs only) */ - u_int64_t sd_def32:1; /* default 32 vs 16 bit size */ - u_int64_t sd_gran:1; /* limit granularity (byte/page units)*/ - u_int64_t sd_hibase:8; /* segment base address (msb) */ -} __packed; - -#define USD_GETBASE(sd) (((sd)->sd_lobase) | (sd)->sd_hibase << 24) -#define USD_SETBASE(sd, b) (sd)->sd_lobase = (b); \ - (sd)->sd_hibase = ((b) >> 24); -#define USD_GETLIMIT(sd) (((sd)->sd_lolimit) | (sd)->sd_hilimit << 16) -#define USD_SETLIMIT(sd, l) (sd)->sd_lolimit = (l); \ - (sd)->sd_hilimit = ((l) >> 16); +#include /* * System segment descriptors (128 bit wide) @@ -100,66 +62,6 @@ struct system_segment_descriptor { } __packed; /* - * Gate descriptors (e.g. indirect descriptors, trap, interrupt etc. 128 bit) - * Only interrupt and trap gates have gd_ist. - */ -struct gate_descriptor { - u_int64_t gd_looffset:16; /* gate offset (lsb) */ - u_int64_t gd_selector:16; /* gate segment selector */ - u_int64_t gd_ist:3; /* IST table index */ - u_int64_t gd_xx:5; /* unused */ - u_int64_t gd_type:5; /* segment type */ - u_int64_t gd_dpl:2; /* segment descriptor priority level */ - u_int64_t gd_p:1; /* segment descriptor present */ - u_int64_t gd_hioffset:48 __packed; /* gate offset (msb) */ - u_int64_t sd_xx1:32; -} __packed; - -/* - * Generic descriptor - */ -union descriptor { - struct user_segment_descriptor sd; - struct gate_descriptor gd; -}; - - /* system segments and gate types */ -#define SDT_SYSNULL 0 /* system null */ -#define SDT_SYS286TSS 1 /* system 286 TSS available */ -#define SDT_SYSLDT 2 /* system 64 bit local descriptor table */ -#define SDT_SYS286BSY 3 /* system 286 TSS busy */ -#define SDT_SYS286CGT 4 /* system 286 call gate */ -#define SDT_SYSTASKGT 5 /* system task gate */ -#define SDT_SYS286IGT 6 /* system 286 interrupt gate */ -#define SDT_SYS286TGT 7 /* system 286 trap gate */ -#define SDT_SYSNULL2 8 /* system null again */ -#define SDT_SYSTSS 9 /* system available 64 bit TSS */ -#define SDT_SYSNULL3 10 /* system null again */ -#define SDT_SYSBSY 11 /* system busy 64 bit TSS */ -#define SDT_SYSCGT 12 /* system 64 bit call gate */ -#define SDT_SYSNULL4 13 /* system null again */ -#define SDT_SYSIGT 14 /* system 64 bit interrupt gate */ -#define SDT_SYSTGT 15 /* system 64 bit trap gate */ - - /* memory segment types */ -#define SDT_MEMRO 16 /* memory read only */ -#define SDT_MEMROA 17 /* memory read only accessed */ -#define SDT_MEMRW 18 /* memory read write */ -#define SDT_MEMRWA 19 /* memory read write accessed */ -#define SDT_MEMROD 20 /* memory read only expand dwn limit */ -#define SDT_MEMRODA 21 /* memory read only expand dwn limit accessed */ -#define SDT_MEMRWD 22 /* memory read write expand dwn limit */ -#define SDT_MEMRWDA 23 /* memory read write expand dwn limit accessed */ -#define SDT_MEME 24 /* memory execute only */ -#define SDT_MEMEA 25 /* memory execute only accessed */ -#define SDT_MEMER 26 /* memory execute read */ -#define SDT_MEMERA 27 /* memory execute read accessed */ -#define SDT_MEMEC 28 /* memory execute only conforming */ -#define SDT_MEMEAC 29 /* memory execute only accessed conforming */ -#define SDT_MEMERC 30 /* memory execute read conforming */ -#define SDT_MEMERAC 31 /* memory execute read accessed conforming */ - -/* * Software definitions are in this convenient format, * which are translated into inconvenient segment descriptors * when needed to be used by the 386 hardware @@ -184,56 +86,6 @@ struct region_descriptor { unsigned long rd_base:64 __packed; /* base address */ } __packed; -/* - * Size of IDT table - */ -#define NIDT 256 /* 32 reserved, 16 h/w, 0 s/w, linux's 0x80 */ -#define NRSVIDT 32 /* reserved entries for cpu exceptions */ - -/* - * Entries in the Interrupt Descriptor Table (IDT) - */ -#define IDT_DE 0 /* #DE: Divide Error */ -#define IDT_DB 1 /* #DB: Debug */ -#define IDT_NMI 2 /* Nonmaskable External Interrupt */ -#define IDT_BP 3 /* #BP: Breakpoint */ -#define IDT_OF 4 /* #OF: Overflow */ -#define IDT_BR 5 /* #BR: Bound Range Exceeded */ -#define IDT_UD 6 /* #UD: Undefined/Invalid Opcode */ -#define IDT_NM 7 /* #NM: No Math Coprocessor */ -#define IDT_DF 8 /* #DF: Double Fault */ -#define IDT_FPUGP 9 /* Coprocessor Segment Overrun */ -#define IDT_TS 10 /* #TS: Invalid TSS */ -#define IDT_NP 11 /* #NP: Segment Not Present */ -#define IDT_SS 12 /* #SS: Stack Segment Fault */ -#define IDT_GP 13 /* #GP: General Protection Fault */ -#define IDT_PF 14 /* #PF: Page Fault */ -#define IDT_MF 16 /* #MF: FPU Floating-Point Error */ -#define IDT_AC 17 /* #AC: Alignment Check */ -#define IDT_MC 18 /* #MC: Machine Check */ -#define IDT_XF 19 /* #XF: SIMD Floating-Point Exception */ -#define IDT_IO_INTS NRSVIDT /* Base of IDT entries for I/O interrupts. */ -#define IDT_DTRACE_RET 0x20 /* DTrace pid provider Interrupt Vector */ -#define IDT_SYSCALL 0x80 /* System Call Interrupt Vector */ - -/* - * Entries in the Global Descriptor Table (GDT) - */ -#define GNULL_SEL 0 /* Null Descriptor */ -#define GNULL2_SEL 1 /* Null Descriptor */ -#define GUFS32_SEL 2 /* User 32 bit %fs Descriptor */ -#define GUGS32_SEL 3 /* User 32 bit %gs Descriptor */ -#define GCODE_SEL 4 /* Kernel Code Descriptor */ -#define GDATA_SEL 5 /* Kernel Data Descriptor */ -#define GUCODE32_SEL 6 /* User 32 bit code Descriptor */ -#define GUDATA_SEL 7 /* User 32/64 bit Data Descriptor */ -#define GUCODE_SEL 8 /* User 64 bit Code Descriptor */ -#define GPROC0_SEL 9 /* TSS for entering kernel etc */ -/* slot 10 is second half of GPROC0_SEL */ -#define GUSERLDT_SEL 11 /* LDT */ -/* slot 11 is second half of GUSERLDT_SEL */ -#define NGDT 13 - #ifdef _KERNEL extern struct user_segment_descriptor gdt[]; extern struct soft_segment_descriptor gdt_segs[]; @@ -249,7 +101,6 @@ void ssdtosyssd(struct soft_segment_desc struct system_segment_descriptor *sdp); void update_gdt_gsbase(struct thread *td, uint32_t base); void update_gdt_fsbase(struct thread *td, uint32_t base); - #endif /* _KERNEL */ #endif /* !_MACHINE_SEGMENTS_H_ */ Modified: user/andre/tcp_workqueue/sys/amd64/include/specialreg.h ============================================================================== --- user/andre/tcp_workqueue/sys/amd64/include/specialreg.h Tue Mar 20 04:50:25 2012 (r233227) +++ user/andre/tcp_workqueue/sys/amd64/include/specialreg.h Tue Mar 20 07:59:36 2012 (r233228) @@ -1,597 +1,6 @@ /*- - * Copyright (c) 1991 The Regents of the University of California. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD$ + * This file is in the public domain. */ +/* $FreeBSD$ */ -#ifndef _MACHINE_SPECIALREG_H_ -#define _MACHINE_SPECIALREG_H_ - -/* - * Bits in 386 special registers: - */ -#define CR0_PE 0x00000001 /* Protected mode Enable */ -#define CR0_MP 0x00000002 /* "Math" (fpu) Present */ -#define CR0_EM 0x00000004 /* EMulate FPU instructions. (trap ESC only) */ -#define CR0_TS 0x00000008 /* Task Switched (if MP, trap ESC and WAIT) */ -#define CR0_PG 0x80000000 /* PaGing enable */ - -/* - * Bits in 486 special registers: - */ -#define CR0_NE 0x00000020 /* Numeric Error enable (EX16 vs IRQ13) */ -#define CR0_WP 0x00010000 /* Write Protect (honor page protect in - all modes) */ -#define CR0_AM 0x00040000 /* Alignment Mask (set to enable AC flag) */ -#define CR0_NW 0x20000000 /* Not Write-through */ -#define CR0_CD 0x40000000 /* Cache Disable */ - -/* - * Bits in PPro special registers - */ -#define CR4_VME 0x00000001 /* Virtual 8086 mode extensions */ -#define CR4_PVI 0x00000002 /* Protected-mode virtual interrupts */ -#define CR4_TSD 0x00000004 /* Time stamp disable */ -#define CR4_DE 0x00000008 /* Debugging extensions */ -#define CR4_PSE 0x00000010 /* Page size extensions */ -#define CR4_PAE 0x00000020 /* Physical address extension */ -#define CR4_MCE 0x00000040 /* Machine check enable */ -#define CR4_PGE 0x00000080 /* Page global enable */ -#define CR4_PCE 0x00000100 /* Performance monitoring counter enable */ -#define CR4_FXSR 0x00000200 /* Fast FPU save/restore used by OS */ -#define CR4_XMM 0x00000400 /* enable SIMD/MMX2 to use except 16 */ -#define CR4_XSAVE 0x00040000 /* XSETBV/XGETBV */ - -/* - * Bits in AMD64 special registers. EFER is 64 bits wide. - */ -#define EFER_SCE 0x000000001 /* System Call Extensions (R/W) */ -#define EFER_LME 0x000000100 /* Long mode enable (R/W) */ -#define EFER_LMA 0x000000400 /* Long mode active (R) */ -#define EFER_NXE 0x000000800 /* PTE No-Execute bit enable (R/W) */ - -/* - * Intel Extended Features registers - */ -#define XCR0 0 /* XFEATURE_ENABLED_MASK register */ - -#define XFEATURE_ENABLED_X87 0x00000001 -#define XFEATURE_ENABLED_SSE 0x00000002 -#define XFEATURE_ENABLED_AVX 0x00000004 - -#define XFEATURE_AVX \ - (XFEATURE_ENABLED_X87 | XFEATURE_ENABLED_SSE | XFEATURE_ENABLED_AVX) - -/* - * CPUID instruction features register - */ -#define CPUID_FPU 0x00000001 -#define CPUID_VME 0x00000002 -#define CPUID_DE 0x00000004 -#define CPUID_PSE 0x00000008 -#define CPUID_TSC 0x00000010 -#define CPUID_MSR 0x00000020 -#define CPUID_PAE 0x00000040 *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@FreeBSD.ORG Tue Mar 20 21:44:49 2012 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 52AFD1065673; Tue, 20 Mar 2012 21:44:49 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 244858FC08; Tue, 20 Mar 2012 21:44:49 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2KLimUx039307; Tue, 20 Mar 2012 21:44:49 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2KLimhn039305; Tue, 20 Mar 2012 21:44:48 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201203202144.q2KLimhn039305@svn.freebsd.org> From: Attilio Rao Date: Tue, 20 Mar 2012 21:44:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233251 - user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Mar 2012 21:44:49 -0000 Author: attilio Date: Tue Mar 20 21:44:48 2012 New Revision: 233251 URL: http://svn.freebsd.org/changeset/base/233251 Log: Restore the cleanup of cached pages in zfs_lookup(). Tested by: flo Modified: user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Modified: user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c ============================================================================== --- user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Tue Mar 20 21:37:52 2012 (r233250) +++ user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Tue Mar 20 21:44:48 2012 (r233251) @@ -323,20 +323,32 @@ page_lookup(vnode_t *vp, int64_t start, VM_OBJECT_LOCK_ASSERT(obj, MA_OWNED); for (;;) { - if ((pp = vm_page_lookup(obj, OFF_TO_IDX(start))) != NULL && - vm_page_is_valid(pp, (vm_offset_t)off, nbytes)) { - if ((pp->oflags & VPO_BUSY) != 0) { - /* - * Reference the page before unlocking and - * sleeping so that the page daemon is less - * likely to reclaim it. - */ - vm_page_reference(pp); - vm_page_sleep(pp, "zfsmwb"); - continue; + pp = vm_radix_lookup(&obj->rtree, OFF_TO_IDX(start), + VM_RADIX_ANY); + if (pp != NULL) { + if (vm_page_is_valid(pp, (vm_offset_t)off, nbytes)) { + if ((pp->oflags & VPO_BUSY) != 0) { + /* + * Reference the page before unlocking + * and sleeping so that the page + * daemon is less likely to reclaim it. + */ + vm_page_reference(pp); + vm_page_sleep(pp, "zfsmwb"); + continue; + } + vm_page_busy(pp); + vm_page_undirty(pp); + } else { + if (obj->cached_page_count != 0 && + (pp->flags & PG_CACHED) != 0) { + mtx_lock(&vm_page_queue_free_mtx); + if (pp->object == obj) + vm_page_cache_free(pp); + mtx_unlock(&vm_page_queue_free_mtx); + } + pp = NULL; } - vm_page_busy(pp); - vm_page_undirty(pp); } else pp = NULL; break; From owner-svn-src-user@FreeBSD.ORG Tue Mar 20 21:50:32 2012 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0887B1065670; Tue, 20 Mar 2012 21:50:32 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E84F58FC12; Tue, 20 Mar 2012 21:50:31 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2KLoVE9039540; Tue, 20 Mar 2012 21:50:31 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2KLoVqU039538; Tue, 20 Mar 2012 21:50:31 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201203202150.q2KLoVqU039538@svn.freebsd.org> From: Attilio Rao Date: Tue, 20 Mar 2012 21:50:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233252 - user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Mar 2012 21:50:32 -0000 Author: attilio Date: Tue Mar 20 21:50:31 2012 New Revision: 233252 URL: http://svn.freebsd.org/changeset/base/233252 Log: Remove an unuseful assignment. Modified: user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Modified: user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c ============================================================================== --- user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Tue Mar 20 21:44:48 2012 (r233251) +++ user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Tue Mar 20 21:50:31 2012 (r233252) @@ -349,8 +349,7 @@ page_lookup(vnode_t *vp, int64_t start, } pp = NULL; } - } else - pp = NULL; + } break; } return (pp); From owner-svn-src-user@FreeBSD.ORG Wed Mar 21 03:08:22 2012 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5E83E1065670; Wed, 21 Mar 2012 03:08:22 +0000 (UTC) (envelope-from davidxu@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2FE1E8FC0A; Wed, 21 Mar 2012 03:08:22 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2L38LU1050562; Wed, 21 Mar 2012 03:08:21 GMT (envelope-from davidxu@svn.freebsd.org) Received: (from davidxu@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2L38LeQ050560; Wed, 21 Mar 2012 03:08:21 GMT (envelope-from davidxu@svn.freebsd.org) Message-Id: <201203210308.q2L38LeQ050560@svn.freebsd.org> From: David Xu Date: Wed, 21 Mar 2012 03:08:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233253 - user/davidxu/pth_objdestroy X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Mar 2012 03:08:22 -0000 Author: davidxu Date: Wed Mar 21 03:08:21 2012 New Revision: 233253 URL: http://svn.freebsd.org/changeset/base/233253 Log: Project for properly destroying pthread synchronization objects. Added: - copied from r233252, head/ Directory Properties: user/davidxu/pth_objdestroy/ (props changed) From owner-svn-src-user@FreeBSD.ORG Wed Mar 21 03:13:26 2012 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 269BB1065670; Wed, 21 Mar 2012 03:13:26 +0000 (UTC) (envelope-from davidxu@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id ED74F8FC17; Wed, 21 Mar 2012 03:13:25 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2L3DPIX050932; Wed, 21 Mar 2012 03:13:25 GMT (envelope-from davidxu@svn.freebsd.org) Received: (from davidxu@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2L3DPPc050931; Wed, 21 Mar 2012 03:13:25 GMT (envelope-from davidxu@svn.freebsd.org) Message-Id: <201203210313.q2L3DPPc050931@svn.freebsd.org> From: David Xu Date: Wed, 21 Mar 2012 03:13:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233254 - user/davidxu/libthr X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Mar 2012 03:13:26 -0000 Author: davidxu Date: Wed Mar 21 03:13:25 2012 New Revision: 233254 URL: http://svn.freebsd.org/changeset/base/233254 Log: This private project is no longer needed. Deleted: user/davidxu/libthr/ From owner-svn-src-user@FreeBSD.ORG Wed Mar 21 07:07:00 2012 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DF34D106566C; Wed, 21 Mar 2012 07:07:00 +0000 (UTC) (envelope-from davidxu@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CACD48FC0A; Wed, 21 Mar 2012 07:07:00 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2L770kb058893; Wed, 21 Mar 2012 07:07:00 GMT (envelope-from davidxu@svn.freebsd.org) Received: (from davidxu@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2L770Zk058890; Wed, 21 Mar 2012 07:07:00 GMT (envelope-from davidxu@svn.freebsd.org) Message-Id: <201203210707.q2L770Zk058890@svn.freebsd.org> From: David Xu Date: Wed, 21 Mar 2012 07:07:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233260 - in user/davidxu/pth_objdestroy/sys: kern sys X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Mar 2012 07:07:01 -0000 Author: davidxu Date: Wed Mar 21 07:07:00 2012 New Revision: 233260 URL: http://svn.freebsd.org/changeset/base/233260 Log: Change semaphore to merge waiter bit and count in same word, this allows us gracefully to destroy semaphore, also remove rmb() ambiguity. Modified: user/davidxu/pth_objdestroy/sys/kern/kern_umtx.c user/davidxu/pth_objdestroy/sys/sys/umtx.h Modified: user/davidxu/pth_objdestroy/sys/kern/kern_umtx.c ============================================================================== --- user/davidxu/pth_objdestroy/sys/kern/kern_umtx.c Wed Mar 21 07:05:29 2012 (r233259) +++ user/davidxu/pth_objdestroy/sys/kern/kern_umtx.c Wed Mar 21 07:07:00 2012 (r233260) @@ -2870,16 +2870,38 @@ do_sem_wait(struct thread *td, struct _u umtxq_insert(uq); umtxq_unlock(&uq->uq_key); - casuword32(__DEVOLATILE(uint32_t *, &sem->_has_waiters), 0, 1); - rmb(); - count = fuword32(__DEVOLATILE(uint32_t *, &sem->_count)); - if (count != 0) { - umtxq_lock(&uq->uq_key); - umtxq_unbusy(&uq->uq_key); - umtxq_remove(uq); - umtxq_unlock(&uq->uq_key); - umtx_key_release(&uq->uq_key); - return (0); + if (__predict_false((flags & SEM_VER2) == 0)) { + casuword32(__DEVOLATILE(uint32_t *, &sem->_has_waiters), 0, 1); + rmb(); + count = fuword32(__DEVOLATILE(uint32_t *, &sem->_count)); + if (count != 0) { + umtxq_lock(&uq->uq_key); + umtxq_unbusy(&uq->uq_key); + umtxq_remove(uq); + umtxq_unlock(&uq->uq_key); + umtx_key_release(&uq->uq_key); + return (0); + } + } else { + count = fuword32(__DEVOLATILE(uint32_t *, &sem->_count)); + for (;;) { + if ((count & ~SEM_WAITERS) != 0) { + umtxq_lock(&uq->uq_key); + umtxq_unbusy(&uq->uq_key); + umtxq_remove(uq); + umtxq_unlock(&uq->uq_key); + umtx_key_release(&uq->uq_key); + return (0); + } + if ((count & SEM_WAITERS) == 0) { + int old = casuword32(__DEVOLATILE(uint32_t *, + &sem->_count), count, count | SEM_WAITERS); + if (old == count) + break; + count = old; + } else + break; + } } umtxq_lock(&uq->uq_key); @@ -2932,22 +2954,42 @@ static int do_sem_wake(struct thread *td, struct _usem *sem) { struct umtx_key key; - int error, cnt, nwake; - uint32_t flags; + int error, nwait; + uint32_t flags, count; flags = fuword32(&sem->_flags); if ((error = umtx_key_get(sem, TYPE_SEM, GET_SHARE(flags), &key)) != 0) return (error); umtxq_lock(&key); umtxq_busy(&key); - cnt = umtxq_count(&key); - nwake = umtxq_signal(&key, 1); - if (cnt <= nwake) { - umtxq_unlock(&key); - error = suword32( - __DEVOLATILE(uint32_t *, &sem->_has_waiters), 0); - umtxq_lock(&key); + nwait = umtxq_count(&key); + umtxq_unlock(&key); + if ((flags & SEM_VER2) != 0) { + error = 0; + count = fuword32(__DEVOLATILE(uint32_t *, &sem->_count)); + for (;;) { + if (__predict_false((count & ~SEM_WAITERS) == __INT_MAX)) { + umtxq_lock(&key); + umtxq_unbusy(&key); + umtxq_unlock(&key); + return (ERANGE); + } + int new = count + 1; + if (nwait <= 1) + new &= ~SEM_WAITERS; + int old = casuword32(__DEVOLATILE(uint32_t *, + &sem->_count), count, new); + if (old == count) + break; + count = old; + } + } else { + if (nwait <= 1) + error = suword32( + __DEVOLATILE(uint32_t *, &sem->_has_waiters), 0); } + umtxq_lock(&key); + umtxq_signal(&key, 1); umtxq_unbusy(&key); umtxq_unlock(&key); umtx_key_release(&key); Modified: user/davidxu/pth_objdestroy/sys/sys/umtx.h ============================================================================== --- user/davidxu/pth_objdestroy/sys/sys/umtx.h Wed Mar 21 07:05:29 2012 (r233259) +++ user/davidxu/pth_objdestroy/sys/sys/umtx.h Wed Mar 21 07:07:00 2012 (r233260) @@ -55,7 +55,9 @@ #define URWLOCK_READER_COUNT(c) ((c) & URWLOCK_MAX_READERS) /* _usem flags */ -#define SEM_NAMED 0x0002 +#define SEM_NAMED 0x00000002 +#define SEM_VER2 0x00000004 +#define SEM_WAITERS 0x80000000 /* op code for _umtx_op */ #define UMTX_OP_LOCK 0 From owner-svn-src-user@FreeBSD.ORG Wed Mar 21 07:21:06 2012 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 98D22106566C; Wed, 21 Mar 2012 07:21:06 +0000 (UTC) (envelope-from davidxu@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7A5438FC18; Wed, 21 Mar 2012 07:21:06 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2L7L6mb059541; Wed, 21 Mar 2012 07:21:06 GMT (envelope-from davidxu@svn.freebsd.org) Received: (from davidxu@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2L7L6Of059539; Wed, 21 Mar 2012 07:21:06 GMT (envelope-from davidxu@svn.freebsd.org) Message-Id: <201203210721.q2L7L6Of059539@svn.freebsd.org> From: David Xu Date: Wed, 21 Mar 2012 07:21:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233264 - user/davidxu/pth_objdestroy/lib/libc/gen X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Mar 2012 07:21:06 -0000 Author: davidxu Date: Wed Mar 21 07:21:05 2012 New Revision: 233264 URL: http://svn.freebsd.org/changeset/base/233264 Log: Use version 2 of semaphore provided by kernel umtx code, now if there is no waiters, we still increase and decrease count in user mode, once there is a waiter, sem_post will enter kernel to increase count and wake thread up, this is atomicy and allow us to gracefully destroy semaphore after sem_wait returned. Modified: user/davidxu/pth_objdestroy/lib/libc/gen/sem_new.c Modified: user/davidxu/pth_objdestroy/lib/libc/gen/sem_new.c ============================================================================== --- user/davidxu/pth_objdestroy/lib/libc/gen/sem_new.c Wed Mar 21 07:16:58 2012 (r233263) +++ user/davidxu/pth_objdestroy/lib/libc/gen/sem_new.c Wed Mar 21 07:21:05 2012 (r233264) @@ -61,7 +61,8 @@ __weak_reference(_sem_unlink, sem_unlink __weak_reference(_sem_wait, sem_wait); #define SEM_PREFIX "/tmp/SEMD" -#define SEM_MAGIC ((u_int32_t)0x73656d31) +#define SEM_MAGIC1 ((u_int32_t)0x73656d31) +#define SEM_MAGIC ((u_int32_t)0x73656d32) struct sem_nameinfo { int open_count; @@ -109,7 +110,7 @@ static inline int sem_check_validity(sem_t *sem) { - if (sem->_magic == SEM_MAGIC) + if (sem->_magic == SEM_MAGIC || sem->_magic == SEM_MAGIC1) return (0); else { errno = EINVAL; @@ -130,7 +131,7 @@ _sem_init(sem_t *sem, int pshared, unsig sem->_magic = SEM_MAGIC; sem->_kern._count = (u_int32_t)value; sem->_kern._has_waiters = 0; - sem->_kern._flags = pshared ? USYNC_PROCESS_SHARED : 0; + sem->_kern._flags = (pshared ? USYNC_PROCESS_SHARED : 0) | SEM_VER2; return (0); } @@ -207,7 +208,7 @@ _sem_open(const char *name, int flags, . tmp._magic = SEM_MAGIC; tmp._kern._has_waiters = 0; tmp._kern._count = value; - tmp._kern._flags = USYNC_PROCESS_SHARED | SEM_NAMED; + tmp._kern._flags = USYNC_PROCESS_SHARED | SEM_NAMED | SEM_VER2; if (_write(fd, &tmp, sizeof(tmp)) != sizeof(tmp)) { flock(fd, LOCK_UN); goto error; @@ -325,20 +326,11 @@ _sem_getvalue(sem_t * __restrict sem, in if (sem_check_validity(sem) != 0) return (-1); - *sval = (int)sem->_kern._count; + *sval = (int)sem->_kern._count & ~SEM_WAITERS; return (0); } static __inline int -usem_wake(struct _usem *sem) -{ - rmb(); - if (!sem->_has_waiters) - return (0); - return _umtx_op(sem, UMTX_OP_SEM_WAKE, 0, NULL, NULL); -} - -static __inline int usem_wait(struct _usem *sem, const struct timespec *abstime) { struct _umtx_time *tm_p, timeout; @@ -358,48 +350,56 @@ usem_wait(struct _usem *sem, const struc (void *)tm_size, __DECONST(void*, tm_p)); } +static inline int +_trywait(sem_t *sem, int spins) +{ + int count; + +loops: + if ((sem->_kern._flags & SEM_VER2) != 0) { + while (((count = sem->_kern._count) & ~SEM_WAITERS) > 0) { + if (atomic_cmpset_acq_int(&sem->_kern._count, count, count - 1)) + return (0); + } + } else { + while ((count = sem->_kern._count) > 0) { + if (atomic_cmpset_acq_int(&sem->_kern._count, count, count - 1)) + return (0); + } + } + if (spins-- > 0) + goto loops; + return (EAGAIN); +} + int _sem_trywait(sem_t *sem) { - int val; + int status; if (sem_check_validity(sem) != 0) return (-1); - - while ((val = sem->_kern._count) > 0) { - if (atomic_cmpset_acq_int(&sem->_kern._count, val, val - 1)) - return (0); - } - errno = EAGAIN; + if ((status = _trywait(sem, 0)) == 0) + return (0); + errno = status; return (-1); } -#define TIMESPEC_SUB(dst, src, val) \ - do { \ - (dst)->tv_sec = (src)->tv_sec - (val)->tv_sec; \ - (dst)->tv_nsec = (src)->tv_nsec - (val)->tv_nsec; \ - if ((dst)->tv_nsec < 0) { \ - (dst)->tv_sec--; \ - (dst)->tv_nsec += 1000000000; \ - } \ - } while (0) - +#define SPIN_LOOPS 200 int _sem_timedwait(sem_t * __restrict sem, const struct timespec * __restrict abstime) { - int val, retval; + int retval; if (sem_check_validity(sem) != 0) return (-1); retval = 0; for (;;) { - while ((val = sem->_kern._count) > 0) { - if (atomic_cmpset_acq_int(&sem->_kern._count, val, val - 1)) - return (0); - } + if (_trywait(sem, SPIN_LOOPS) == 0) + return (0); if (retval) { _pthread_testcancel(); @@ -438,10 +438,36 @@ _sem_wait(sem_t *sem) int _sem_post(sem_t *sem) { + int count; if (sem_check_validity(sem) != 0) return (-1); - atomic_add_rel_int(&sem->_kern._count, 1); - return usem_wake(&sem->_kern); + if ((sem->_kern._flags & SEM_VER2) != 0) { + for (;;) { + count = sem->_kern._count; + if ((count & SEM_WAITERS) == 0) { + if (__predict_false(count == SEM_VALUE_MAX)) { + errno = ERANGE; + return (-1); + } + if (atomic_cmpset_rel_int(&sem->_kern._count, count, count+1)) + return (0); + } else { + return _umtx_op(&sem->_kern, UMTX_OP_SEM_WAKE, 0, NULL, NULL); + } + } + } else { + do { + count = sem->_kern._count; + if (__predict_false(count == SEM_VALUE_MAX)) { + errno = ERANGE; + return (-1); + } + } while (!atomic_cmpset_rel_int(&sem->_kern._count, count, count+1)); + rmb(); + if (!sem->_kern._has_waiters) + return (0); + return _umtx_op(&sem->_kern, UMTX_OP_SEM_WAKE, 0, NULL, NULL); + } } From owner-svn-src-user@FreeBSD.ORG Wed Mar 21 07:33:42 2012 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 000991065673; Wed, 21 Mar 2012 07:33:41 +0000 (UTC) (envelope-from davidxu@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DFFAE8FC0C; Wed, 21 Mar 2012 07:33:41 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2L7XfuX060086; Wed, 21 Mar 2012 07:33:41 GMT (envelope-from davidxu@svn.freebsd.org) Received: (from davidxu@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2L7XfvT060084; Wed, 21 Mar 2012 07:33:41 GMT (envelope-from davidxu@svn.freebsd.org) Message-Id: <201203210733.q2L7XfvT060084@svn.freebsd.org> From: David Xu Date: Wed, 21 Mar 2012 07:33:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233267 - user/davidxu/pth_objdestroy/lib/libc/gen X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Mar 2012 07:33:42 -0000 Author: davidxu Date: Wed Mar 21 07:33:41 2012 New Revision: 233267 URL: http://svn.freebsd.org/changeset/base/233267 Log: Only spin on SMP machine. Modified: user/davidxu/pth_objdestroy/lib/libc/gen/sem_new.c Modified: user/davidxu/pth_objdestroy/lib/libc/gen/sem_new.c ============================================================================== --- user/davidxu/pth_objdestroy/lib/libc/gen/sem_new.c Wed Mar 21 07:29:47 2012 (r233266) +++ user/davidxu/pth_objdestroy/lib/libc/gen/sem_new.c Wed Mar 21 07:33:41 2012 (r233267) @@ -74,6 +74,14 @@ struct sem_nameinfo { static pthread_once_t once = PTHREAD_ONCE_INIT; static pthread_mutex_t sem_llock; static LIST_HEAD(,sem_nameinfo) sem_list = LIST_HEAD_INITIALIZER(sem_list); +static int ncpu; + +static void +check_mp(void) +{ + if (ncpu == 0) + ncpu = sysconf(_SC_NPROCESSORS_CONF); +} static void sem_prefork() @@ -99,6 +107,8 @@ sem_module_init(void) { pthread_mutexattr_t ma; + check_mp(); + _pthread_mutexattr_init(&ma); _pthread_mutexattr_settype(&ma, PTHREAD_MUTEX_RECURSIVE); _pthread_mutex_init(&sem_llock, &ma); @@ -121,6 +131,7 @@ sem_check_validity(sem_t *sem) int _sem_init(sem_t *sem, int pshared, unsigned int value) { + check_mp(); if (value > SEM_VALUE_MAX) { errno = EINVAL; @@ -367,7 +378,7 @@ loops: return (0); } } - if (spins-- > 0) + if (ncpu > 1 && spins-- > 0) goto loops; return (EAGAIN); } From owner-svn-src-user@FreeBSD.ORG Wed Mar 21 07:49:14 2012 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 621D2106566B; Wed, 21 Mar 2012 07:49:14 +0000 (UTC) (envelope-from davidxu@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4D9D88FC12; Wed, 21 Mar 2012 07:49:14 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2L7nE4K060580; Wed, 21 Mar 2012 07:49:14 GMT (envelope-from davidxu@svn.freebsd.org) Received: (from davidxu@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2L7nEA0060578; Wed, 21 Mar 2012 07:49:14 GMT (envelope-from davidxu@svn.freebsd.org) Message-Id: <201203210749.q2L7nEA0060578@svn.freebsd.org> From: David Xu Date: Wed, 21 Mar 2012 07:49:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233268 - user/davidxu/pth_objdestroy/lib/libc/gen X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Mar 2012 07:49:14 -0000 Author: davidxu Date: Wed Mar 21 07:49:13 2012 New Revision: 233268 URL: http://svn.freebsd.org/changeset/base/233268 Log: Use boolean expression. Modified: user/davidxu/pth_objdestroy/lib/libc/gen/sem_new.c Modified: user/davidxu/pth_objdestroy/lib/libc/gen/sem_new.c ============================================================================== --- user/davidxu/pth_objdestroy/lib/libc/gen/sem_new.c Wed Mar 21 07:33:41 2012 (r233267) +++ user/davidxu/pth_objdestroy/lib/libc/gen/sem_new.c Wed Mar 21 07:49:13 2012 (r233268) @@ -412,7 +412,7 @@ _sem_timedwait(sem_t * __restrict sem, if (_trywait(sem, SPIN_LOOPS) == 0) return (0); - if (retval) { + if (retval != 0) { _pthread_testcancel(); break; } From owner-svn-src-user@FreeBSD.ORG Sat Mar 24 10:19:41 2012 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 90BCE106566B; Sat, 24 Mar 2012 10:19:41 +0000 (UTC) (envelope-from jchandra@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7A3548FC08; Sat, 24 Mar 2012 10:19:41 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2OAJfSl025261; Sat, 24 Mar 2012 10:19:41 GMT (envelope-from jchandra@svn.freebsd.org) Received: (from jchandra@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2OAJf3N025251; Sat, 24 Mar 2012 10:19:41 GMT (envelope-from jchandra@svn.freebsd.org) Message-Id: <201203241019.q2OAJf3N025251@svn.freebsd.org> From: "Jayachandran C." Date: Sat, 24 Mar 2012 10:19:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233420 - in user/jchandra/xlp-merge/sys/mips/nlm: . hal X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Mar 2012 10:19:41 -0000 Author: jchandra Date: Sat Mar 24 10:19:40 2012 New Revision: 233420 URL: http://svn.freebsd.org/changeset/base/233420 Log: Update memory and resource allocation code for SoC devices The XLP on-chip devices have PCI headers, but some devices will need custom resource allocation code. - devices with no MEM/IO BARs with registers in PCIe extended reg space have to be handled in resource allocation - devices without INTPIN/INTLINE in PCI header can be supported by having these faked with a shadow register. - Some devices does not allow 8/16 bit access to the register space. Subclass pci and override attach and resource allocation methods to take care of this. Remove earlier code which did this partially. Deleted: user/jchandra/xlp-merge/sys/mips/nlm/intern_dev.c Modified: user/jchandra/xlp-merge/sys/mips/nlm/files.xlp user/jchandra/xlp-merge/sys/mips/nlm/hal/nlm_hal.c user/jchandra/xlp-merge/sys/mips/nlm/hal/pcibus.h user/jchandra/xlp-merge/sys/mips/nlm/hal/pic.h user/jchandra/xlp-merge/sys/mips/nlm/intr_machdep.c user/jchandra/xlp-merge/sys/mips/nlm/uart_cpu_xlp.c user/jchandra/xlp-merge/sys/mips/nlm/xlp.h user/jchandra/xlp-merge/sys/mips/nlm/xlp_machdep.c user/jchandra/xlp-merge/sys/mips/nlm/xlp_pci.c Modified: user/jchandra/xlp-merge/sys/mips/nlm/files.xlp ============================================================================== --- user/jchandra/xlp-merge/sys/mips/nlm/files.xlp Sat Mar 24 10:07:21 2012 (r233419) +++ user/jchandra/xlp-merge/sys/mips/nlm/files.xlp Sat Mar 24 10:19:40 2012 (r233420) @@ -12,7 +12,7 @@ mips/nlm/mpreset.S standard mips/nlm/board_eeprom.c standard mips/nlm/board_cpld.c standard mips/nlm/xlp_pci.c optional pci -mips/nlm/intern_dev.c optional pci +#mips/nlm/intern_dev.c optional pci mips/nlm/uart_cpu_xlp.c optional uart mips/nlm/usb_init.c optional usb # Modified: user/jchandra/xlp-merge/sys/mips/nlm/hal/nlm_hal.c ============================================================================== --- user/jchandra/xlp-merge/sys/mips/nlm/hal/nlm_hal.c Sat Mar 24 10:07:21 2012 (r233419) +++ user/jchandra/xlp-merge/sys/mips/nlm/hal/nlm_hal.c Sat Mar 24 10:19:40 2012 (r233420) @@ -37,23 +37,8 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include -#include -#include -#include -#include - -int pic_irt_ehci0; -int pic_irt_ehci1; -int pic_irt_uart0; -int pic_irt_uart1; -int pic_irt_pcie_lnk0; -int pic_irt_pcie_lnk1; -int pic_irt_pcie_lnk2; -int pic_irt_pcie_lnk3; - uint32_t xlp_get_cpu_frequency(int node, int core) { @@ -66,9 +51,9 @@ xlp_get_cpu_frequency(int node, int core pll_divf = ((rstval >> 10) & 0x7f) + 1; pll_divr = ((rstval >> 8) & 0x3) + 1; if (!nlm_is_xlp8xx_ax()) - ext_div = ((rstval >> 30) & 0x3) + 1; + ext_div = ((rstval >> 30) & 0x3) + 1; else - ext_div = 1; + ext_div = 1; dfs_div = ((dfsval >> (core << 2)) & 0xf) + 1; return ((800000000ULL * pll_divf)/(3 * pll_divr * ext_div * dfs_div)); @@ -122,98 +107,3 @@ nlm_set_device_frequency(int node, int d } return (nlm_get_device_frequency(sysbase, devtype)); } - -void -nlm_pic_irt_init(int node) -{ - pic_irt_ehci0 = nlm_irtstart(nlm_get_usb_pcibase(node, 0)); - pic_irt_ehci1 = nlm_irtstart(nlm_get_usb_pcibase(node, 3)); - pic_irt_uart0 = nlm_irtstart(nlm_get_uart_pcibase(node, 0)); - pic_irt_uart1 = nlm_irtstart(nlm_get_uart_pcibase(node, 1)); - - /* Hardcoding the PCIE IRT information as PIC doesn't - understand any value other than 78,79,80,81 for PCIE0/1/2/3 */ - pic_irt_pcie_lnk0 = 78; - pic_irt_pcie_lnk1 = 79; - pic_irt_pcie_lnk2 = 80; - pic_irt_pcie_lnk3 = 81; -} -/* - * Find the IRQ for the link, each link has a different interrupt - * at the XLP pic - */ -int xlp_pcie_link_irt(int link) -{ - - if( (link < 0) || (link > 3)) - return (-1); - - return (pic_irt_pcie_lnk0 + link); -} - -int -xlp_irt_to_irq(int irt) -{ - if (irt == pic_irt_ehci0) - return PIC_EHCI_0_IRQ; - else if (irt == pic_irt_ehci1) - return PIC_EHCI_1_IRQ; - else if (irt == pic_irt_uart0) - return PIC_UART_0_IRQ; - else if (irt == pic_irt_uart1) - return PIC_UART_1_IRQ; - else if (irt == pic_irt_pcie_lnk0) - return PIC_PCIE_0_IRQ; - else if (irt == pic_irt_pcie_lnk1) - return PIC_PCIE_1_IRQ; - else if (irt == pic_irt_pcie_lnk2) - return PIC_PCIE_2_IRQ; - else if (irt == pic_irt_pcie_lnk3) - return PIC_PCIE_3_IRQ; - else { - if (bootverbose) - printf("Cannot find irq for IRT %d\n", irt); - return 0; - } -} - -int -xlp_irq_to_irt(int irq) -{ - switch (irq) { - case PIC_EHCI_0_IRQ : - return pic_irt_ehci0; - case PIC_EHCI_1_IRQ : - return pic_irt_ehci1; - case PIC_UART_0_IRQ : - return pic_irt_uart0; - case PIC_UART_1_IRQ : - return pic_irt_uart1; - case PIC_PCIE_0_IRQ : - return pic_irt_pcie_lnk0; - case PIC_PCIE_1_IRQ : - return pic_irt_pcie_lnk1; - case PIC_PCIE_2_IRQ : - return pic_irt_pcie_lnk2; - case PIC_PCIE_3_IRQ : - return pic_irt_pcie_lnk3; - default: panic("Bad IRQ %d\n", irq); - } -} - -int -xlp_irq_is_picintr(int irq) -{ - switch (irq) { - case PIC_EHCI_0_IRQ : - case PIC_EHCI_1_IRQ : - case PIC_UART_0_IRQ : - case PIC_UART_1_IRQ : - case PIC_PCIE_0_IRQ : - case PIC_PCIE_1_IRQ : - case PIC_PCIE_2_IRQ : - case PIC_PCIE_3_IRQ : - return (1); - default: return (0); - } -} Modified: user/jchandra/xlp-merge/sys/mips/nlm/hal/pcibus.h ============================================================================== --- user/jchandra/xlp-merge/sys/mips/nlm/hal/pcibus.h Sat Mar 24 10:07:21 2012 (r233419) +++ user/jchandra/xlp-merge/sys/mips/nlm/hal/pcibus.h Sat Mar 24 10:19:40 2012 (r233420) @@ -84,6 +84,9 @@ /* PCIE_INT_EN0 */ #define PCIE_MSI_INT_EN (1 << 9) +/* XXXJC: Ax workaround */ +#define PCIE_LINK0_IRT 78 + #if !defined(LOCORE) && !defined(__ASSEMBLY__) #define nlm_read_pcie_reg(b, r) nlm_read_reg(b, r) @@ -93,6 +96,15 @@ #define nlm_get_pcie_regbase(node, inst) \ (nlm_get_pcie_base(node, inst) + XLP_IO_PCI_HDRSZ) +static __inline int +xlp_pcie_link_irt(int link) +{ + if ((link < 0) || (link > 3)) + return (-1); + + return (PCIE_LINK0_IRT + link); +} + /* * Build Intel MSI message and data values from a source. AMD64 systems * seem to be compatible, so we use the same function for both. @@ -106,8 +118,4 @@ MSI_MIPS_DATA_ASSERT | (irq)) #endif - -#ifndef LOCORE -int xlp_pcie_link_irt(int link); -#endif #endif /* __XLP_PCIBUS_H__ */ Modified: user/jchandra/xlp-merge/sys/mips/nlm/hal/pic.h ============================================================================== --- user/jchandra/xlp-merge/sys/mips/nlm/hal/pic.h Sat Mar 24 10:07:21 2012 (r233419) +++ user/jchandra/xlp-merge/sys/mips/nlm/hal/pic.h Sat Mar 24 10:19:40 2012 (r233420) @@ -174,7 +174,7 @@ #define PIC_IRT_FIRST_IRQ (PIC_IRQ_BASE) #define PIC_IRT_LAST_IRQ 63 -#define PIC_IRQ_IS_IRT(irq) ((irq) >= PIC_IRT_FIRST_IRQ) +#define XLP_IRQ_IS_PICINTR(irq) ((irq) >= PIC_IRT_FIRST_IRQ) /* * Misc Modified: user/jchandra/xlp-merge/sys/mips/nlm/intr_machdep.c ============================================================================== --- user/jchandra/xlp-merge/sys/mips/nlm/intr_machdep.c Sat Mar 24 10:07:21 2012 (r233419) +++ user/jchandra/xlp-merge/sys/mips/nlm/intr_machdep.c Sat Mar 24 10:19:40 2012 (r233420) @@ -141,13 +141,13 @@ xlp_establish_intr(const char *name, dri * PIC based interrupts need ack in PIC, and some SoC * components need additional acks (e.g. PCI) */ - if (xlp_irq_is_picintr(irq)) + if (XLP_IRQ_IS_PICINTR(irq)) errcode = intr_event_create(&ie, src, 0, irq, xlp_pre_ithread, xlp_post_ithread, xlp_post_filter, NULL, "hard intr%d:", irq); else { if (filt == NULL) - panic("Not supported - non filter percpu intr"); + panic("Unsupported non filter percpu intr %d", irq); errcode = intr_event_create(&ie, src, 0, irq, NULL, NULL, NULL, NULL, "hard intr%d:", irq); } Modified: user/jchandra/xlp-merge/sys/mips/nlm/uart_cpu_xlp.c ============================================================================== --- user/jchandra/xlp-merge/sys/mips/nlm/uart_cpu_xlp.c Sat Mar 24 10:07:21 2012 (r233419) +++ user/jchandra/xlp-merge/sys/mips/nlm/uart_cpu_xlp.c Sat Mar 24 10:19:40 2012 (r233420) @@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include @@ -66,7 +67,7 @@ bus_space_tag_t uart_bus_space_mem; int uart_cpu_eqres(struct uart_bas *b1, struct uart_bas *b2) { - return ((b1->bsh == b2->bsh && b1->bst == b2->bst) ? 1 : 0); + return (b1->bst == b2->bst && b1->bsh == b2->bsh); } int @@ -75,7 +76,8 @@ uart_cpu_getdev(int devtype, struct uart di->ops = uart_getops(&uart_ns8250_class); di->bas.chan = 0; di->bas.bst = rmi_uart_bus_space; - di->bas.bsh = nlm_get_uart_regbase(0, 0); + di->bas.bsh = MIPS_PHYS_TO_DIRECT_UNCACHED(XLP_DEFAULT_IO_BASE + + XLP_IO_UART_OFFSET(0, 0) + XLP_IO_PCI_HDRSZ); di->bas.regshft = 2; /* divisor = rclk / (baudrate * 16); */ Modified: user/jchandra/xlp-merge/sys/mips/nlm/xlp.h ============================================================================== --- user/jchandra/xlp-merge/sys/mips/nlm/xlp.h Sat Mar 24 10:07:21 2012 (r233419) +++ user/jchandra/xlp-merge/sys/mips/nlm/xlp.h Sat Mar 24 10:19:40 2012 (r233420) @@ -35,17 +35,15 @@ #include #define PIC_UART_0_IRQ 9 -#define PIC_UART_1_IRQ 10 #define PIC_PCIE_0_IRQ 11 #define PIC_PCIE_1_IRQ 12 #define PIC_PCIE_2_IRQ 13 #define PIC_PCIE_3_IRQ 14 -#define PIC_EHCI_0_IRQ 39 +#define PIC_EHCI_0_IRQ 16 +#define PIC_MMC_IRQ 21 /* 41 used by IRQ_SMP */ -#define PIC_EHCI_1_IRQ 42 -#define PIC_MMC_IRQ 43 /* XLP 8xx/4xx A0, A1, A2 CPU COP0 PRIDs */ @@ -75,10 +73,8 @@ extern void xlp_enable_threads(int code) #endif uint32_t xlp_get_cpu_frequency(int node, int core); int nlm_set_device_frequency(int node, int devtype, int frequency); -void nlm_pic_irt_init(int node); int xlp_irt_to_irq(int irt); int xlp_irq_to_irt(int irq); -int xlp_irq_is_picintr(int irq); static __inline int nlm_processor_id(void) { Modified: user/jchandra/xlp-merge/sys/mips/nlm/xlp_machdep.c ============================================================================== --- user/jchandra/xlp-merge/sys/mips/nlm/xlp_machdep.c Sat Mar 24 10:07:21 2012 (r233419) +++ user/jchandra/xlp-merge/sys/mips/nlm/xlp_machdep.c Sat Mar 24 10:19:40 2012 (r233420) @@ -98,7 +98,7 @@ __FBSDID("$FreeBSD$"); char boot1_env[4096]; uint64_t xlp_cpu_frequency; -uint64_t xlp_io_base = MIPS_PHYS_TO_KSEG1(XLP_DEFAULT_IO_BASE); +uint64_t xlp_io_base = MIPS_PHYS_TO_DIRECT_UNCACHED(XLP_DEFAULT_IO_BASE); int xlp_ncores; int xlp_threads_per_core; @@ -521,7 +521,6 @@ platform_start(__register_t a0 __unused, /* initialize console so that we have printf */ boothowto |= (RB_SERIAL | RB_MULTIPLE); /* Use multiple consoles */ - nlm_pic_irt_init(0); /* complete before interrupts or console init */ init_static_kenv(boot1_env, sizeof(boot1_env)); xlp_bootargs_init(a0); Modified: user/jchandra/xlp-merge/sys/mips/nlm/xlp_pci.c ============================================================================== --- user/jchandra/xlp-merge/sys/mips/nlm/xlp_pci.c Sat Mar 24 10:07:21 2012 (r233419) +++ user/jchandra/xlp-merge/sys/mips/nlm/xlp_pci.c Sat Mar 24 10:19:40 2012 (r233420) @@ -39,14 +39,16 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include -#include #include #include +#include + #include #include #include @@ -69,16 +71,260 @@ __FBSDID("$FreeBSD$"); #include #include "pcib_if.h" +#include "pci_if.h" + +#define EMUL_MEM_START 0x16000000UL +#define EMUL_MEM_END 0x18ffffffUL + +/* SoC device qurik handling */ +static int irt_irq_map[4 * 256]; +static int irq_irt_map[64]; + +static void +xlp_add_irq(int node, int irt, int irq) +{ + int nodeirt = node * 256 + irt; + + irt_irq_map[nodeirt] = irq; + irq_irt_map[irq] = nodeirt; +} + +int +xlp_irq_to_irt(int irq) +{ + return irq_irt_map[irq]; +} + +int +xlp_irt_to_irq(int nodeirt) +{ + return irt_irq_map[nodeirt]; +} + +/* Override PCI a bit for SoC devices */ + +enum { + INTERNAL_DEV = 0x1, /* internal device, skip on enumeration */ + MEM_RES_EMUL = 0x2, /* no MEM or IO bar, custom res alloc */ + SHARED_IRQ = 0x4, + DEV_MMIO32 = 0x8, /* byte access not allowed to mmio */ +}; + +struct soc_dev_desc { + u_int devid; /* device ID */ + int irqbase; /* start IRQ */ + u_int flags; /* flags */ + int ndevs; /* to keep track of number of devices */ +}; + +struct soc_dev_desc xlp_dev_desc[] = { + { PCI_DEVICE_ID_NLM_ICI, 0, INTERNAL_DEV }, + { PCI_DEVICE_ID_NLM_PIC, 0, INTERNAL_DEV }, + { PCI_DEVICE_ID_NLM_FMN, 0, INTERNAL_DEV }, + { PCI_DEVICE_ID_NLM_UART, PIC_UART_0_IRQ, MEM_RES_EMUL | DEV_MMIO32}, + { PCI_DEVICE_ID_NLM_I2C, 0, MEM_RES_EMUL | DEV_MMIO32 }, + { PCI_DEVICE_ID_NLM_NOR, 0, MEM_RES_EMUL }, + { PCI_DEVICE_ID_NLM_MMC, PIC_MMC_IRQ, MEM_RES_EMUL }, + { PCI_DEVICE_ID_NLM_EHCI, PIC_EHCI_0_IRQ, 0 } +}; + +struct xlp_devinfo { + struct pci_devinfo pcidev; + int irq; + int flags; + u_long mem_res_start; +}; + +static __inline struct soc_dev_desc * +xlp_find_soc_desc(int devid) +{ + struct soc_dev_desc *p; + int i, n; + + n = sizeof(xlp_dev_desc) / sizeof(xlp_dev_desc[0]); + for (i = 0, p = xlp_dev_desc; i < n; i++, p++) + if (p->devid == devid) + return (p); + return (NULL); +} + +static struct resource * +xlp_pci_alloc_resource(device_t bus, device_t child, int type, int *rid, + u_long start, u_long end, u_long count, u_int flags) +{ + struct resource *r; + struct xlp_devinfo *xlp_devinfo; + int busno; + + /* + * Do custom allocation for MEMORY resource for SoC device if + * MEM_RES_EMUL flag is set + */ + busno = pci_get_bus(child); + if ((type == SYS_RES_MEMORY || type == SYS_RES_IOPORT) && busno == 0) { + xlp_devinfo = (struct xlp_devinfo *)device_get_ivars(child); + if ((xlp_devinfo->flags & MEM_RES_EMUL) != 0) { + /* no emulation for IO ports */ + if (type == SYS_RES_IOPORT) + return (NULL); + start = xlp_devinfo->mem_res_start; + count = XLP_PCIE_CFG_SIZE - XLP_IO_PCI_HDRSZ; + end = start + count - 1; + r = BUS_ALLOC_RESOURCE(device_get_parent(bus), child, + type, rid, start, end, count, flags); + if (r == NULL) + return (NULL); + if ((xlp_devinfo->flags & DEV_MMIO32) != 0) + rman_set_bustag(r, rmi_uart_bus_space); + return (r); + } + } + + /* Not custom alloc, use PCI code */ + return (pci_alloc_resource(bus, child, type, rid, start, end, count, + flags)); +} + +static int +xlp_pci_release_resource(device_t bus, device_t child, int type, int rid, + struct resource *r) +{ + u_long start; + + /* If custom alloc, handle that */ + start = rman_get_start(r); + if (type == SYS_RES_MEMORY && pci_get_bus(child) == 0 && + start >= EMUL_MEM_START && start <= EMUL_MEM_END) + return (BUS_RELEASE_RESOURCE(device_get_parent(bus), child, + type, rid, r)); + + /* use default PCI function */ + return (bus_generic_rl_release_resource(bus, child, type, rid, r)); +} + +static void +xlp_add_soc_child(device_t pcib, device_t dev, int b, int s, int f) +{ + struct pci_devinfo *dinfo; + struct xlp_devinfo *xlp_dinfo; + struct soc_dev_desc *si; + uint64_t pcibase; + int domain, node, irt, irq, flags, devoffset, num; + uint16_t devid; + + domain = pcib_get_domain(dev); + node = s / 8; + devoffset = XLP_HDR_OFFSET(node, 0, s % 8, f); + if (!nlm_dev_exists(devoffset)) + return; + + /* Find if there is a desc for the SoC device */ + devid = PCIB_READ_CONFIG(pcib, b, s, f, PCIR_DEVICE, 2); + si = xlp_find_soc_desc(devid); + + /* update flags and irq from desc if available */ + irq = 0; + flags = 0; + if (si != NULL) { + if (si->irqbase != 0) + irq = si->irqbase + si->ndevs; + flags = si->flags; + si->ndevs++; + } + + /* skip internal devices */ + if ((flags & INTERNAL_DEV) != 0) + return; + + /* PCIe interfaces are special, bug in Ax */ + if (devid == PCI_DEVICE_ID_NLM_PCIE) { + xlp_add_irq(node, xlp_pcie_link_irt(f), PIC_PCIE_0_IRQ + f); + } else { + /* Stash intline and pin in shadow reg for devices */ + pcibase = nlm_pcicfg_base(devoffset); + irt = nlm_irtstart(pcibase); + num = nlm_irtnum(pcibase); + if (irq != 0 && num > 0) { + xlp_add_irq(node, irt, irq); + nlm_write_reg(pcibase, XLP_PCI_DEVSCRATCH_REG0, + (1 << 8) | irq); + } + } + dinfo = pci_read_device(pcib, domain, b, s, f, sizeof(*xlp_dinfo)); + if (dinfo == NULL) + return; + xlp_dinfo = (struct xlp_devinfo *)dinfo; + xlp_dinfo->irq = irq; + xlp_dinfo->flags = flags; + if ((flags & MEM_RES_EMUL) != 0) + xlp_dinfo->mem_res_start = XLP_DEFAULT_IO_BASE + devoffset + + XLP_IO_PCI_HDRSZ; + pci_add_child(dev, dinfo); +} + +static int +xlp_pci_attach(device_t dev) +{ + device_t pcib = device_get_parent(dev); + int maxslots, s, f, pcifunchigh; + int busno; + uint8_t hdrtype; + + /* + * The on-chip devices are on a bus that is almost, but not + * quite, completely like PCI. Add those things by hand. + */ + busno = pcib_get_bus(dev); + maxslots = PCIB_MAXSLOTS(pcib); + for (s = 0; s <= maxslots; s++) { + pcifunchigh = 0; + f = 0; + hdrtype = PCIB_READ_CONFIG(pcib, busno, s, f, PCIR_HDRTYPE, 1); + if ((hdrtype & PCIM_HDRTYPE) > PCI_MAXHDRTYPE) + continue; + if (hdrtype & PCIM_MFDEV) + pcifunchigh = PCI_FUNCMAX; + for (f = 0; f <= pcifunchigh; f++) + xlp_add_soc_child(pcib, dev, busno, s, f); + } + return (bus_generic_attach(dev)); +} + +static int +xlp_pci_probe(device_t dev) +{ + device_t pcib; -struct xlp_pcib_softc { - bus_dma_tag_t sc_pci_dmat; /* PCI DMA tag pointer */ + pcib = device_get_parent(dev); + /* + * Only the top level bus has SoC devices, leave the rest to + * Generic PCI code + */ + if (strcmp(device_get_nameunit(pcib), "pcib0") != 0) + return (ENXIO); + device_set_desc(dev, "XLP SoCbus"); + return (BUS_PROBE_DEFAULT); +} + +static devclass_t pci_devclass; +static device_method_t xlp_pci_methods[] = { + /* Device interface */ + DEVMETHOD(device_probe, xlp_pci_probe), + DEVMETHOD(device_attach, xlp_pci_attach), + DEVMETHOD(bus_alloc_resource, xlp_pci_alloc_resource), + DEVMETHOD(bus_release_resource, xlp_pci_release_resource), + + DEVMETHOD_END }; +DEFINE_CLASS_1(pci, xlp_pci_driver, xlp_pci_methods, 0, pci_driver); +DRIVER_MODULE(xlp_pci, pcib, xlp_pci_driver, pci_devclass, 0, 0); + static devclass_t pcib_devclass; static struct rman irq_rman, port_rman, mem_rman, emul_rman; static void -xlp_pci_init_resources(void) +xlp_pcib_init_resources(void) { irq_rman.rm_start = 0; irq_rman.rm_end = 255; @@ -113,7 +359,7 @@ xlp_pci_init_resources(void) emul_rman.rm_type = RMAN_ARRAY; emul_rman.rm_descr = "Emulated MEMIO"; if (rman_init(&emul_rman) - || rman_manage_region(&emul_rman, 0x16000000UL, 0x18ffffffUL)) + || rman_manage_region(&emul_rman, EMUL_MEM_START, EMUL_MEM_END)) panic("pci_init_resources emul_rman"); } @@ -122,7 +368,7 @@ xlp_pcib_probe(device_t dev) { device_set_desc(dev, "XLP PCI bus"); - xlp_pci_init_resources(); + xlp_pcib_init_resources(); return (0); } @@ -174,20 +420,15 @@ xlp_pcib_read_config(device_t dev, u_int else if ((width == 4) && (reg & 3)) return 0xFFFFFFFF; - data = nlm_read_pci_reg(cfgaddr, regindex); - /* - * Fix up read data in some SoC devices - * to emulate complete PCIe header + * The intline and int pin of SoC devices are DOA, except + * for bridges (slot %8 == 1). + * use the values we stashed in a writable PCI scratch reg. */ - if (b == 0) { - int dev = s % 8; + if (b == 0 && regindex == 0xf && s % 8 > 1) + regindex = XLP_PCI_DEVSCRATCH_REG0; - /* Fake intpin on config read for UART/I2C, USB, SD/Flash */ - if (regindex == 0xf && - (dev == 6 || dev == 2 || dev == 7)) - data |= 0x1 << 8; /* Fake int pin */ - } + data = nlm_read_pci_reg(cfgaddr, regindex); if (width == 1) return ((data >> ((reg & 3) << 3)) & 0xff); else if (width == 2) @@ -222,8 +463,12 @@ xlp_pcib_write_config(device_t dev, u_in data = val; } + /* + * use shadow reg for intpin/intline which are dead + */ + if (b == 0 && regindex == 0xf && s % 8 > 1) + regindex = XLP_PCI_DEVSCRATCH_REG0; nlm_write_pci_reg(cfgaddr, regindex, data); - return; } /* @@ -231,7 +476,7 @@ xlp_pcib_write_config(device_t dev, u_in * from the link's IO and MEM address ranges. */ static void -xlp_pci_hardware_swap_enable(int node, int link) +xlp_pcib_hardware_swap_enable(int node, int link) { uint64_t bbase, linkpcibase; uint32_t bar; @@ -264,7 +509,7 @@ xlp_pcib_attach(device_t dev) /* enable hardware swap on all nodes/links */ for (node = 0; node < XLP_MAX_NODES; node++) for (link = 0; link < 4; link++) - xlp_pci_hardware_swap_enable(node, link); + xlp_pcib_hardware_swap_enable(node, link); device_add_child(dev, "pci", 0); bus_generic_attach(dev); @@ -385,7 +630,7 @@ bridge_pcie_ack(int irq) } static int -mips_platform_pci_setup_intr(device_t dev, device_t child, +mips_platform_pcib_setup_intr(device_t dev, device_t child, struct resource *irq, int flags, driver_filter_t *filt, driver_intr_t *intr, void *arg, void **cookiep) { @@ -402,11 +647,11 @@ mips_platform_pci_setup_intr(device_t de return (EINVAL); } xlpirq = rman_get_start(irq); + if (xlpirq == 0) + return (0); - if (strcmp(device_get_name(dev), "pcib") != 0) { - device_printf(dev, "ret 0 on dev\n"); + if (strcmp(device_get_name(dev), "pcib") != 0) return (0); - } /* * temporary hack for MSI, we support just one device per @@ -466,7 +711,7 @@ mips_platform_pci_setup_intr(device_t de } static int -mips_platform_pci_teardown_intr(device_t dev, device_t child, +mips_platform_pcib_teardown_intr(device_t dev, device_t child, struct resource *irq, void *cookie) { if (strcmp(device_get_name(child), "pci") == 0) { @@ -476,114 +721,45 @@ mips_platform_pci_teardown_intr(device_t return (bus_generic_teardown_intr(dev, child, irq, cookie)); } -static void -assign_soc_resource(device_t child, int type, u_long *startp, u_long *endp, - u_long *countp, struct rman **rm, bus_space_tag_t *bst, vm_offset_t *va) -{ - int devid, inst, node, unit; - uint32_t val; - - devid = pci_get_device(child); - inst = pci_get_function(child); - node = pci_get_slot(child) / 8; - unit = device_get_unit(child); - - *rm = NULL; - *va = 0; - *bst = 0; - if (type == SYS_RES_MEMORY) { - switch (devid) { - case PCI_DEVICE_ID_NLM_UART: - *va = nlm_get_uart_regbase(node, inst); - *startp = MIPS_KSEG1_TO_PHYS(*va); - *countp = 0x100; - *rm = &emul_rman; - *bst = uart_bus_space_mem; - break; - - case PCI_DEVICE_ID_NLM_I2C: - *va = nlm_get_i2c_regbase(node, unit); - *startp = MIPS_KSEG1_TO_PHYS(*va); - *countp = 0x100; - *rm = &emul_rman; - *bst = uart_bus_space_mem; - break; - case PCI_DEVICE_ID_NLM_NOR: - /* XXXJC: support multiple chip selects */ - val = nlm_read_pci_reg(nlm_get_gbu_regbase(node), 0); - *startp = val << 8; - *va = MIPS_PHYS_TO_KSEG1(*startp); - /* XXXJC: count is not correct */ - *countp = 0x100; - *rm = &emul_rman; - break; - } - /* calculate end if allocated */ - if (*rm) - *endp = *startp + *countp - 1; - } else if (type != SYS_RES_IRQ) { - /* - * IRQ allocation is done by route_interrupt, - * for any other request print warning. - */ - printf("Unknown type %d in req for [%x%x]\n", - type, devid, inst); - } -} - static struct resource * -xlp_pci_alloc_resource(device_t bus, device_t child, int type, int *rid, +xlp_pcib_alloc_resource(device_t bus, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) { struct rman *rm = NULL; struct resource *rv; - vm_offset_t va = 0; + void *va; int needactivate = flags & RF_ACTIVE; - bus_space_tag_t bst = 0; - /* - * For SoC PCI devices, we have to assign resources correctly - * since the IRQ and MEM resources depend on the block. - * If the address is not from BAR0, then we use emul_rman - */ - if (pci_get_bus(child) == 0 && - pci_get_vendor(child) == PCI_VENDOR_NETLOGIC) - assign_soc_resource(child, type, &start, &end, - &count, &rm, &bst, &va); - if (rm == NULL) { - switch (type) { - case SYS_RES_IRQ: - rm = &irq_rman; - break; + switch (type) { + case SYS_RES_IRQ: + rm = &irq_rman; + break; - case SYS_RES_IOPORT: - rm = &port_rman; - break; - - case SYS_RES_MEMORY: + case SYS_RES_IOPORT: + rm = &port_rman; + break; + + case SYS_RES_MEMORY: + if (start >= EMUL_MEM_START && start <= EMUL_MEM_END) + rm = &emul_rman; + else rm = &mem_rman; break; - default: - return (0); - } + default: + return (0); } rv = rman_reserve_resource(rm, start, end, count, flags, child); - if (rv == 0) - return (0); + if (rv == NULL) + return (NULL); rman_set_rid(rv, *rid); if (type == SYS_RES_MEMORY || type == SYS_RES_IOPORT) { - if (va == 0) - va = (vm_offset_t)pmap_mapdev(start, count); - if (bst == 0) - bst = rmi_bus_space; - - rman_set_bushandle(rv, va); - rman_set_virtual(rv, (void *)va); - rman_set_bustag(rv, bst); + va = pmap_mapdev(start, count); + rman_set_bushandle(rv, (bus_space_handle_t)va); + rman_set_bustag(rv, rmi_bus_space); } if (needactivate) { @@ -597,24 +773,15 @@ xlp_pci_alloc_resource(device_t bus, dev } static int -xlp_pci_release_resource(device_t bus, device_t child, int type, int rid, +xlp_pcib_release_resource(device_t bus, device_t child, int type, int rid, struct resource *r) { return (rman_release_resource(r)); } -static bus_dma_tag_t -xlp_pci_get_dma_tag(device_t bus, device_t child) -{ - struct xlp_pcib_softc *sc; - - sc = device_get_softc(bus); - return (sc->sc_pci_dmat); -} - static int -xlp_pci_activate_resource(device_t bus, device_t child, int type, int rid, +xlp_pcib_activate_resource(device_t bus, device_t child, int type, int rid, struct resource *r) { @@ -622,7 +789,7 @@ xlp_pci_activate_resource(device_t bus, } static int -xlp_pci_deactivate_resource(device_t bus, device_t child, int type, int rid, +xlp_pcib_deactivate_resource(device_t bus, device_t child, int type, int rid, struct resource *r) { @@ -630,7 +797,7 @@ xlp_pci_deactivate_resource(device_t bus } static int -mips_pci_route_interrupt(device_t bus, device_t dev, int pin) +mips_pcib_route_interrupt(device_t bus, device_t dev, int pin) { int irt, link; @@ -685,19 +852,18 @@ static device_method_t xlp_pcib_methods[ /* Bus interface */ DEVMETHOD(bus_read_ivar, xlp_pcib_read_ivar), DEVMETHOD(bus_write_ivar, xlp_pcib_write_ivar), - DEVMETHOD(bus_alloc_resource, xlp_pci_alloc_resource), - DEVMETHOD(bus_release_resource, xlp_pci_release_resource), - DEVMETHOD(bus_get_dma_tag, xlp_pci_get_dma_tag), - DEVMETHOD(bus_activate_resource, xlp_pci_activate_resource), - DEVMETHOD(bus_deactivate_resource, xlp_pci_deactivate_resource), - DEVMETHOD(bus_setup_intr, mips_platform_pci_setup_intr), - DEVMETHOD(bus_teardown_intr, mips_platform_pci_teardown_intr), + DEVMETHOD(bus_alloc_resource, xlp_pcib_alloc_resource), + DEVMETHOD(bus_release_resource, xlp_pcib_release_resource), + DEVMETHOD(bus_activate_resource, xlp_pcib_activate_resource), + DEVMETHOD(bus_deactivate_resource, xlp_pcib_deactivate_resource), + DEVMETHOD(bus_setup_intr, mips_platform_pcib_setup_intr), + DEVMETHOD(bus_teardown_intr, mips_platform_pcib_teardown_intr), /* pcib interface */ DEVMETHOD(pcib_maxslots, xlp_pcib_maxslots), DEVMETHOD(pcib_read_config, xlp_pcib_read_config), DEVMETHOD(pcib_write_config, xlp_pcib_write_config), - DEVMETHOD(pcib_route_interrupt, mips_pci_route_interrupt), + DEVMETHOD(pcib_route_interrupt, mips_pcib_route_interrupt), DEVMETHOD(pcib_alloc_msi, xlp_alloc_msi), DEVMETHOD(pcib_release_msi, xlp_release_msi), @@ -709,7 +875,7 @@ static device_method_t xlp_pcib_methods[ static driver_t xlp_pcib_driver = { "pcib", xlp_pcib_methods, - sizeof(struct xlp_pcib_softc), + 1, /* no softc */ }; DRIVER_MODULE(pcib, nexus, xlp_pcib_driver, pcib_devclass, 0, 0);