From owner-p4-projects@FreeBSD.ORG Sun Sep 17 08:49:21 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9ED1516A415; Sun, 17 Sep 2006 08:49:21 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4856816A403 for ; Sun, 17 Sep 2006 08:49:21 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E2CEB43D53 for ; Sun, 17 Sep 2006 08:49:20 +0000 (GMT) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8H8nKAe094221 for ; Sun, 17 Sep 2006 08:49:20 GMT (envelope-from gabor@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8H8nFaN094217 for perforce@freebsd.org; Sun, 17 Sep 2006 08:49:15 GMT (envelope-from gabor@FreeBSD.org) Date: Sun, 17 Sep 2006 08:49:15 GMT Message-Id: <200609170849.k8H8nFaN094217@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@FreeBSD.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 106224 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Sep 2006 08:49:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=106224 Change 106224 by gabor@gabor_server on 2006/09/17 08:49:05 IFC Affected files ... .. //depot/projects/soc2006/gabor_ports/CHANGES#7 integrate .. //depot/projects/soc2006/gabor_ports/GIDs#3 integrate .. //depot/projects/soc2006/gabor_ports/KNOBS#4 integrate .. //depot/projects/soc2006/gabor_ports/LEGAL#5 integrate .. //depot/projects/soc2006/gabor_ports/MOVED#12 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.gnustep.mk#2 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.java.mk#2 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.kde.mk#3 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.lua.mk#1 branch .. //depot/projects/soc2006/gabor_ports/Mk/bsd.php.mk#4 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#84 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.python.mk#6 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.ruby.mk#5 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.scons.mk#7 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.sites.mk#9 integrate .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/buildscript#2 integrate .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/claim-chroot#2 integrate .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/clean-chroot#2 integrate .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/dopackages#2 integrate .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/makeworld#2 integrate .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/mkbindist#2 integrate .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/pdispatch#2 integrate .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/portbuild#2 integrate .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/processlogs#2 integrate .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/processonelog#5 integrate .. //depot/projects/soc2006/gabor_ports/Tools/scripts/rmport#3 integrate .. //depot/projects/soc2006/gabor_ports/UIDs#3 integrate .. //depot/projects/soc2006/gabor_ports/UPDATING#14 integrate Differences ... ==== //depot/projects/soc2006/gabor_ports/CHANGES#7 (text+ko) ==== @@ -10,6 +10,33 @@ All ports committers are allowed to commit to this file. +20060914: +AUTHOR: portmgr@FreeBSD.org +The following functional changes were made to bsd.port.mk: + + * PKGVERSION was introduced as an intermediate variable refactored out of + PKGNAME. + + * bsd.lua.mk was added to support lua-related ports. + + * DESTDIR was removed from bsd.scons.mk because it was problematic. + + * Some quotes were added to the 'missing' target to improve handling of + duplicate origins. + +20060903: +AUTHOR: sat@FreeBSD.org +The following functional changes were made to bsd.sites.mk: + + * MASTER_SITES variable can now look like MACRO1/subdir1 MACRO2/subdir2, and + be expanded in a way that you expect it to, that is apply different subdirs + to different sites. You can safely replace ${M_S_FOO:S/%SUBDIR%/bar/} with + FOO/bar. + + * If M_S_SUBDIR is unset, a macro in M_S won't set it anymore, but rather + substitute %SUBDIR% all by itself. Now it's possible to use macros with + different default subdirs and they will expand in a proper way. + 20060805: AUTHOR: sat@FreeBSD.org The following functional changes were made to bsd.sites.mk: @@ -1176,4 +1203,4 @@ Contact Erwin Lansing if you have any questions about your use of this document. -$FreeBSD: ports/CHANGES,v 1.58 2006/08/04 20:44:18 sat Exp $ +$FreeBSD: ports/CHANGES,v 1.60 2006/09/15 06:57:07 linimon Exp $ ==== //depot/projects/soc2006/gabor_ports/GIDs#3 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: ports/GIDs,v 1.9 2006/07/29 07:16:00 ume Exp $ +$FreeBSD: ports/GIDs,v 1.11 2006/08/28 20:15:56 pav Exp $ # Please keep this file sorted by GID! bind:*:53: rdfdb:*:55: @@ -46,8 +46,10 @@ dhis:*:114: _symon:*:115: smokeping:*:117: +ircproxyd:*:118: postfix:*:125: maildrop:*:126: +vchat:*:128: _bgpd:*:130: _ospfd:*:131: rbldns:*:153: ==== //depot/projects/soc2006/gabor_ports/KNOBS#4 (text+ko) ==== @@ -1,7 +1,7 @@ # # KNOBS - A list of popular knobs and descriptions # -# $FreeBSD: ports/KNOBS,v 1.13 2006/07/05 15:18:35 skv Exp $ +# $FreeBSD: ports/KNOBS,v 1.15 2006/09/04 11:10:04 sat Exp $ # # Rules to adding knobs: # @@ -46,6 +46,9 @@ FLAC Flac audio support GHC Prefer/use Glasgow Haskell Compiler GNOME Adds GNOME support +GNUTLS Adds GnuTLS support +GSASL Adds GSASL support +GSM GSM audio codec support GSTREAMER Gstreamer multimedia support GTK1 Adds Gtk+1 support GTK2 Adds Gtk+2 support ==== //depot/projects/soc2006/gabor_ports/LEGAL#5 (text+ko) ==== @@ -1,5 +1,5 @@ # Creator: Jordan Hubbard -# $FreeBSD: ports/LEGAL,v 1.490 2006/08/03 01:17:28 acm Exp $ +# $FreeBSD: ports/LEGAL,v 1.496 2006/09/11 18:06:11 vd Exp $ ********************************************************************** *** NOTE TO COMMITTERS *** @@ -67,7 +67,6 @@ atari800/* emulators/atari800 xf25 contains copyright ROMs and cannot be distributed autopano-sift graphics/autopano-sift May be covered by patents -antivir-milter-* security/antivir-milter No redistribution allowed bamg* math/bamg Contact author personally regarding commercial use baudline_* audio/baudline No redistribution allowed @@ -166,7 +165,7 @@ We currently ask for permission to put a package on the CD-ROM dns.tar.Z dns/h2n Never get an approval yet -doom3-linux-* games/linux-doom3-demo Redistribution limited +doom3-linux-* games/linux-doom3* Redistribution limited doomsrc.zip games/doom requested by id Software dr_freebsd_*.zip sysutils/megarc Must be downloaded manually drweb-qmail-*.tar.gz security/drweb-qmail Non-commercial or evaluation use @@ -383,7 +382,6 @@ linunace* archivers/linux-unace Distribution is permitted within the original package only Linux-ACU-Driver-v* sysutils/linux-acu Redistribution not allowed -linux_devtools devel/linux_devtools GPL binaries linux-gtk2 x11-toolkits/linux-gtk2 LGPL binary, no source linuxq3ademo-* games/linux-q3ademo Restrictive license by Loki Software l0phtcrack/* security/l0phtcrack Parts are under GPL, so @@ -507,6 +505,8 @@ rtplib-* devel/rtplib Limited use license ruby/ruby_cast_256.zip security/ruby-cast_256 Crypto; export-controlled runrev/linux.tgz devel/linux-runrev Do not sell for profit +savage/savage* games/linux-savage Savage is freeware, but i am + not sure of its license sdr-* mbone/sdr Crypto; export-controlled serialmail-* mail/serialmail No license -- see http://cr.yp.to/softwarelaw.html @@ -603,6 +603,7 @@ of a license agreement upsmon* sysutils/upsmon Redistribute only with original source code +ut_linux_mgr_ sysutils/linux-megamgr Redistribution prohibited urchin*.tar.gz www/urchin5 Commercial software, also comes bundled with Apache-SSL unreal.tournament*.run games/linux-ut Redistribution limited @@ -685,3 +686,4 @@ xGate/* japanese/xgate Requested by Orangesoft Inc tw_cli-* sysutils/tw_cli Redistribution forbidden by license. +lha-1.14i-ac* archivers/lha-ac No Redistribution ==== //depot/projects/soc2006/gabor_ports/MOVED#12 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1115 2006/08/14 03:04:49 acm Exp $ +# $FreeBSD: ports/MOVED,v 1.1134 2006/09/11 18:06:11 vd Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -1563,6 +1563,7 @@ editors/openoffice-1.1-devel|editors/openoffice.org-1.1-devel|2005-08-29|port should have a correct PORTNAME editors/openoffice-2.0-devel|editors/openoffice.org-2.0-devel|2005-08-29|port should have a correct PORTNAME shells/zsh-devel|shells/zsh|2005-08-29|Development version of Zsh is no longer being released +shells/zsh+euc_hack|shells/zsh|2006-09-01|Multibyte support has been added to the main stream russian/nagios||2005-08-30|Obsoleted; new version is not planned www/py-websvcs|net/py-soappy|2005-08-30|duplicate port x11-toolkits/wxgtk26-contrib-utils||2005-08-31|Deprecated @@ -2442,3 +2443,24 @@ russian/xpi-imagezoom|www/xpi-imagezoom|2006-08-09|Russian locale now comes bundled with official version security/linux-krb5-libs||2006-08-13|Integrated with emulators/linux_base-fc4 sysutils/linux-e2fsprogs||2006-08-13|Integrated with emulators/linux_base-fc4 +net/magictun||2006-08-17|Abandoned +lang/gcc41-withgcjawt|lang/gcc41-withgcjawt|2006-08-18|finished repocopy +net/lam7|net/lam|2006-08-21|Replace lam-6 which was deprecated +devel/py-ui||2006-08-25|Has expired: PyUI does not work with well with current versions of graphics/py-opengl and has not been developed in over two years. Python game development should be done with devel/py-game instead +net-im/jabber-msn||2006-08-25|Has expired: Depends on broken net-im/jabber, please use net-im/jabber-pymsn instead +net-im/gaim-devel|net-im/gaim|2006-08-26|Remove since gaim's maintainer don't want to add it now +graphics/GIFgraph|graphics/p5-GD-Graph|2006-08-27|broken, use graphics/p5-GD-Graph instead +www/p5-Apache-SizeLimit||2006-09-02|unresolvable conflict with www/mod_perl +www/firefox10|www/firefox|2006-09-02|Security vulnerabilities +net/samba|net/samba3|2006-09-02|Security vulnerabilities +security/antivir-milter||2006-09-02|Free license keys are no longer available since September 2005 +security/finger_mysql||2006-09-02|Project has closed +devel/bitkeeper||2006-09-02|Project was discontinued +net/asterisk-devel||2006-09-02|Port was not currently useful; may return later +devel/p5-Linux-Pid||2006-09-03|Was a p5-Apache-SizeLimit dependency, now removed +www/mozilla-devel|www/seamonkey|2006-09-03|Security vulnerabilities +textproc/p5-Text-SwiftTemplate||2006-09-04|unfetchable, removed +security/fpc-md5|security/fpc-hash|2006-09-07|Port was renamed +devel/linux_devtools||2006-09-11|Has expired: the dependcy is deprecated, please use a linux_dist port instead +graphics/pecl-imagick||2006-09-11|Has expired: Project is dead and does not work +korean/linux_locale||2006-09-11|Has expired: the dependency is scheduled for removal and a recent glib does not need this ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.gnustep.mk#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: ports/Mk/bsd.gnustep.mk,v 1.27 2006/04/04 19:22:25 dinoex Exp $ +# $FreeBSD: ports/Mk/bsd.gnustep.mk,v 1.29 2006/09/10 16:41:27 dinoex Exp $ # # This file contains some variable definitions that are supposed to # make your life easier when dealing with ports related to the GNUstep. @@ -63,6 +63,12 @@ # USE_GNUSTEP_INSTALL=yes # call install target with GNUstep.sh sourced in the current shell # +# USE_GNUSTEP_SYSTEM_LIBS= Renaissance:x11-toolkits/renaissance +# depends on a shared lib in System directrory +# +# USE_GNUSTEP_LOCAL_LIBS= pantomime:mail/pantomime +# depends on a shared lib in Local directrory +# # --------------------------------------------------------------------------- .if !defined(_POSTMKINCLUDED) @@ -80,6 +86,13 @@ .endif .endif +.if defined(USE_GNUSTEP_BUILD) +BUILD_DEPENDS+= ${SYSMAKEDIR}/GNUstep.sh:${PORTSDIR}/${GNUSTEP_MAKE_PORT} +.endif +.if defined(USE_GNUSTEP_INSTALL) +RUN_DEPENDS+= ${SYSMAKEDIR}/GNUstep.sh:${PORTSDIR}/${GNUSTEP_MAKE_PORT} +.endif + GNUSTEP_MAKE_PORT?= devel/gnustep-make GNUSTEP_OBJC_PORT?= lang/gnustep-objc GNUSTEP_BASE_PORT?= lang/gnustep-base @@ -174,7 +187,7 @@ # using any backend # .if defined(USE_GNUSTEP_BACK) -BACKSUFFIX?= -010 +BACKSUFFIX?= -011 .if defined(WITH_GNUSTEP_XDPS) GNUSTEP_WITH_XDPS=yes .elif defined(WITH_GNUSTEP_LIBART) @@ -234,6 +247,27 @@ .endif # --------------------------------------------------------------------------- +# source system liibs +# +.if defined(USE_GNUSTEP_SYSTEM_LIBS) +.for _GNUSTEP_DEP in ${USE_GNUSTEP_SYSTEM_LIBS} +BUILD_DEPENDS+= ${COMBOLIBDIR}/lib${_GNUSTEP_DEP:C/:.*//}.so:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://} +RUN_DEPENDS+= ${COMBOLIBDIR}/lib${_GNUSTEP_DEP:C/:.*//}.so:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://} +.endfor +.endif + +# --------------------------------------------------------------------------- +# source local liibs +# +:C/[.][0-9]*$//1 +.if defined(USE_GNUSTEP_LOCAL_LIBS) +.for _GNUSTEP_DEP in ${USE_GNUSTEP_LOCAL_LIBS} +BUILD_DEPENDS+= ${LOCALLIBDIR}/lib${_GNUSTEP_DEP:C/:.*//}.so:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://} +RUN_DEPENDS+= ${LOCALLIBDIR}/lib${_GNUSTEP_DEP:C/:.*//}.so:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://} +.endfor +.endif + +# --------------------------------------------------------------------------- # source GNUstep.sh # .if defined(USE_GNUSTEP_CONFIGURE) @@ -260,8 +294,6 @@ # source GNUstep.sh # .if defined(USE_GNUSTEP_BUILD) -BUILD_DEPENDS+= ${SYSMAKEDIR}/GNUstep.sh:${PORTSDIR}/${GNUSTEP_MAKE_PORT} - do-build: @(cd ${WRKSRC}; . ${SYSMAKEDIR}/GNUstep.sh; \ ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET}) @@ -272,8 +304,6 @@ # source GNUstep.sh # .if defined(USE_GNUSTEP_INSTALL) -RUN_DEPENDS+= ${SYSMAKEDIR}/GNUstep.sh:${PORTSDIR}/${GNUSTEP_MAKE_PORT} - do-install: @(cd ${WRKSRC}; . ${SYSMAKEDIR}/GNUstep.sh; \ ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET}) ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.java.mk#2 (text+ko) ==== @@ -9,7 +9,7 @@ # Please send all suggested changes to the maintainer instead of committing # them to CVS yourself. # -# $FreeBSD: ports/Mk/bsd.java.mk,v 1.71 2006/04/24 18:27:45 glewis Exp $ +# $FreeBSD: ports/Mk/bsd.java.mk,v 1.72 2006/09/14 19:54:46 glewis Exp $ # .if !defined(Java_Include) @@ -216,9 +216,8 @@ _JAVA_OS_linux= Linux # Enforce preferred Java ports according to OS -. if ${ARCH} == "amd64" -_JAVA_PREFERRED_PORTS+= JAVA_PORT_NATIVE_BSDJAVA_JDK_1_5 -. elif ${OSVERSION} >= 500000 +. if (${ARCH} == "amd64" && ${OSVERSION} >= 600000 && ${OSVERSION} < 700000) || \ + (${ARCH} == "i386" && ${OSVERSION} >= 500000 && ${OSVERSION} < 700000) _JAVA_PREFERRED_PORTS+= JAVA_PORT_NATIVE_FREEBSD_JDK_1_5 . else _JAVA_PREFERRED_PORTS+= JAVA_PORT_NATIVE_BSDJAVA_JDK_1_5 ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.kde.mk#3 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: Makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.kde.mk,v 1.62 2006/07/05 02:18:08 linimon Exp $ +# $FreeBSD: ports/Mk/bsd.kde.mk,v 1.63 2006/09/12 23:26:10 lofi Exp $ # # Please view me with 4 column tabs! @@ -97,7 +97,7 @@ # Yeah, it's namespace pollution, but this is really the best place for this # stuff. Arts does NOT use it anymore. -KDE_VERSION= 3.5.3 +KDE_VERSION= 3.5.4 KDE_ORIGVER= ${KDE_VERSION} KDE_PREFIX?= ${LOCALBASE} ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.php.mk#4 (text+ko) ==== @@ -7,7 +7,7 @@ # Please send all suggested changes to the maintainer instead of committing # them to CVS yourself. # -# $FreeBSD: ports/Mk/bsd.php.mk,v 1.32 2006/07/27 06:21:15 ale Exp $ +# $FreeBSD: ports/Mk/bsd.php.mk,v 1.33 2006/09/11 21:10:07 ale Exp $ # # Adding 'USE_PHP=yes' to a port includes this Makefile after bsd.ports.pre.mk. # If the port requires a predefined set of PHP extensions, they can be @@ -229,7 +229,7 @@ # non-version specific components _USE_PHP_ALL= bcmath bz2 calendar ctype curl dba dbase \ exif fileinfo filepro fribidi ftp gd gettext gmp \ - hash iconv imagick imap interbase ldap mbstring mcrypt \ + hash iconv imap interbase ldap mbstring mcrypt \ mhash ming mssql mysql ncurses odbc \ openssl panda pcntl pcre pdf pgsql posix \ pspell radius readline recode session shmop snmp \ @@ -263,7 +263,6 @@ gmp_DEPENDS= math/php${PHP_VER}-gmp hash_DEPENDS= security/pecl-hash iconv_DEPENDS= converters/php${PHP_VER}-iconv -imagick_DEPENDS=graphics/pecl-imagick imap_DEPENDS= mail/php${PHP_VER}-imap interbase_DEPENDS= databases/php${PHP_VER}-interbase ldap_DEPENDS= net/php${PHP_VER}-ldap ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#84 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.port.mk,v 1.540 2006/08/14 13:24:18 erwin Exp $ +# $FreeBSD: ports/Mk/bsd.port.mk,v 1.541 2006/09/15 06:57:07 linimon Exp $ # $NetBSD: $ # # bsd.port.mk - 940820 Jordan K. Hubbard. @@ -72,6 +72,9 @@ # PKGNAMEPREFIX - Prefix to specify that port is language-specific, etc. # Optional. # PKGNAMESUFFIX - Suffix to specify compilation options. Optional. +# PKGVERSION - Always defined as +# ${PORTVERSION}. +# Do not define this in your Makefile. # UNIQUENAME - A name for your port that is globally unique. By default, # this is set to ${LATEST_LINK} when LATEST_LINK is set, # and to ${PKGNAMEPREFIX}${PORTNAME} otherwise. @@ -434,6 +437,12 @@ # or http://www.FreeBSD.org/gnome/docs/porting.html # for more details. ## +# USE_LUA - If set, this port uses the Lua library and related +# components. See bsd.lua.mk for more details. +## +# USE_WX - If set, this port uses the WxWidgets library and related +# components. See bsd.wx.mk for more details. +## # USE_KDEBASE_VER # - Set to 3 to use the KDE windowing system. # Implies inclusion of bsd.kde.mk. @@ -1326,8 +1335,11 @@ # check for old, crufty, makefile types, part 2. The "else" case # should have been handled in part 1, above. +.if !defined(PKGVERSION) +PKGVERSION= ${PORTVERSION:C/[-_,]/./g}${_SUF1}${_SUF2} +.endif .if !defined(PKGNAME) -PKGNAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION:C/[-_,]/./g}${_SUF1}${_SUF2} +PKGNAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PKGVERSION} .endif DISTNAME?= ${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION:C/:(.)/\1/g}${DISTVERSIONSUFFIX} @@ -1520,6 +1532,10 @@ .include "${PORTSDIR}/Mk/bsd.gnome.mk" .endif +.if defined(WANT_LUA) || defined(USE_LUA) || defined(USE_LUA_NOT) +.include "${PORTSDIR}/Mk/bsd.lua.mk" +.endif + .if defined(WANT_WX) || defined(USE_WX) || defined(USE_WX_NOT) .include "${PORTSDIR}/Mk/bsd.wx.mk" .endif @@ -2030,6 +2046,10 @@ .include "${PORTSDIR}/Mk/bsd.tcl.mk" .endif +.if defined(USE_LUA) || defined(USE_LUA_NOT) +.include "${PORTSDIR}/Mk/bsd.lua.mk" +.endif + .if defined(USE_WX) || defined(USE_WX_NOT) .include "${PORTSDIR}/Mk/bsd.wx.mk" .endif @@ -4761,7 +4781,7 @@ @for dir in $$(${ALL-DEPENDS-LIST}); do \ THISORIGIN=$$(${ECHO_CMD} $$dir | ${SED} 's,${PORTSDIR}/,,'); \ installed=$$(${PKG_INFO} -qO $${THISORIGIN}); \ - if [ -z $$installed ]; then \ + if [ -z "$$installed" ]; then \ ${ECHO_CMD} $$THISORIGIN; \ fi \ done ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.python.mk#6 (text+ko) ==== @@ -1,7 +1,7 @@ # -*- mode: Makefile; tab-width: 4; -*- # ex: ts=4 # -# $FreeBSD: ports/Mk/bsd.python.mk,v 1.81 2006/08/04 12:34:41 erwin Exp $ +# $FreeBSD: ports/Mk/bsd.python.mk,v 1.82 2006/09/13 16:26:49 perky Exp $ # .if !defined(_POSTMKINCLUDED) && !defined(Python_Pre_Include) @@ -298,7 +298,7 @@ # Python-2.5 .if ${PYTHON_VERSION} == "python2.5" -PYTHON_PORTVERSION?=2.5.b3 +PYTHON_PORTVERSION?=2.5.c2 PYTHON_PORTSDIR= ${PORTSDIR}/lang/python-devel PYTHON_REL= 250 PYTHON_SUFFIX= 25 @@ -355,8 +355,8 @@ .if defined(PYTHON_REL) && ${PYTHON_REL} == 250 PYTHON_MASTER_SITES= ${MASTER_SITE_PYTHON} PYTHON_MASTER_SITE_SUBDIR= ftp/python/2.5 -PYTHON_DISTFILE= Python-${PYTHON_PORTVERSION:S/5.b/5b/}.tgz -PYTHON_WRKSRC= ${WRKDIR}/Python-${PYTHON_PORTVERSION:S/5.b/5b/} +PYTHON_DISTFILE= Python-${PYTHON_PORTVERSION:S/5.c/5c/}.tgz +PYTHON_WRKSRC= ${WRKDIR}/Python-${PYTHON_PORTVERSION:S/5.c/5c/} .else PYTHON_MASTER_SITES= ${MASTER_SITE_PYTHON} PYTHON_MASTER_SITE_SUBDIR= ftp/python/${PYTHON_PORTVERSION} ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.ruby.mk#5 (text+ko) ==== @@ -3,7 +3,7 @@ # # Created by: Akinori MUSHA # -# $FreeBSD: ports/Mk/bsd.ruby.mk,v 1.153 2006/08/04 12:34:41 erwin Exp $ +# $FreeBSD: ports/Mk/bsd.ruby.mk,v 1.154 2006/08/27 09:53:27 sem Exp $ # .if !defined(Ruby_Include) @@ -136,7 +136,7 @@ RUBY?= ${LOCALBASE}/bin/${RUBY_NAME} .if defined(RUBY_VER) && ${RUBY_VER} == 1.8 -RUBY_VERSION?= 1.8.4 +RUBY_VERSION?= 1.8.5 #RUBY_DISTVERSION?= ${RUBY_VERSION} #RUBY_PATCHFILES?= ruby-${RUBY_DISTVERSION}-yyyy.mm.dd.diff.bz2 ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.scons.mk#7 (text+ko) ==== @@ -1,15 +1,15 @@ #-*- mode: Makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.scons.mk,v 1.6 2006/08/04 12:34:41 erwin Exp $ +# $FreeBSD: ports/Mk/bsd.scons.mk,v 1.8 2006/09/15 08:06:12 linimon Exp $ # # bsd.scons.mk - Python-based SCons build system interface. -# Author: Alexander Botero-Lowry +# Author: Alexander Botero-Lowry # # Please view me with 4 column tabs! # Please make sure all changes to this file are passed through the maintainer. -SCONS_MAINTAINER= alex@foxybanana.com +SCONS_MAINTAINER= alexbl@FreeBSD.org # # SCONS_BIN is the location where the scons port installs the scons @@ -57,7 +57,7 @@ SCONS_ENV?= CCFLAGS="${CCFLAGS}" CXXFLAGS="${CXXFLAGS}" \ LINKFLAGS="${LINKFLAGS}" PKGCONFIGDIR="${PKGCONFIGDIR}" \ CPPPATH="${CPPPATH}" LIBPATH="${LIBPATH}" PREFIX="${PREFIX}" \ - DESTDIR="${DESTDIR}" CC="${CC}" CXX="${CXX}" + CC="${CC}" CXX="${CXX}" SCONS_ARGS?= SCONS_BUILDENV?= SCONS_TARGET?= ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.sites.mk#9 (text+ko) ==== @@ -20,7 +20,7 @@ # # Note: all entries should terminate with a slash. # -# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.396 2006/08/09 11:45:43 sat Exp $ +# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.398 2006/09/12 14:23:12 kuriyama Exp $ # # Where to put distfiles that don't have any other master site @@ -981,7 +981,7 @@ .endif .if !defined(IGNORE_MASTER_SITE_SOURCEFORGE_JP) -.for mirror in keihanna +.for mirror in keihanna osdn qgpop MASTER_SITE_SOURCEFORGE_JP+= \ http://${mirror}.dl.sourceforge.jp/%SUBDIR%/ .endfor @@ -1294,15 +1294,22 @@ SOURCEFORGE:${PORTNAME:L} \ SOURCEFORGE_EXTENDED:${PORTNAME:L} -.if defined(MASTER_SITES) && ${MASTER_SITES:N*/*} +.if defined(MASTER_SITES) && ${MASTER_SITES:N*\:/*} .for _site__ in ${MASTER_SITES} _site_=${_site__} -. if ${_site_:M*/*} +. if ${_site_:M*\:/*} MASTER_SITES_EXP+= ${_site_} MASTER_SITES_EXP:= ${MASTER_SITES_EXP} . else -_site_url_= ${_site_:C@^(.*):[^/:]+$@\1@} +_site_urlpath_= ${_site_:C@^(.*):[^/:]+$@\1@} +. if ${_site_urlpath_:M*/*} +_site_url_= ${_site_urlpath_:C@^([^/]+)/.*$@\1@} +_site_subdir_= ${_site_urlpath_:S/^${_site_urlpath_:C@^([^/]+)/.*$@\1@}//:S!^/!!:S!/$!!} +. else +_site_url_= ${_site_urlpath_} +.undef _site_subdir_ +. endif _site_group_= ${_site_:S/^${_site_:C@^(.*):[^/:]+$@\1@}//:S/^://} . for _abbrev_ in ${MASTER_SITES_ABBREVS} . if ${_site_url_} == ${_abbrev_:C/:.*//} @@ -1310,12 +1317,16 @@ . endif . endfor . for _subdir_ in ${MASTER_SITES_SUBDIRS} -. if ${_site_url_} == ${_subdir_:C/:.*//} -MASTER_SITE_SUBDIR?= ${_subdir_:C/.*://} +. if ${_site_url_} == ${_subdir_:C/:.*//} && !defined(MASTER_SITE_SUBDIR) +_site_subdir_?= ${_subdir_:C/.*://} . endif . endfor . ifdef MASTER_SITE_${_site_url_} +. ifdef _site_subdir_ +MASTER_SITES_EXP+= ${MASTER_SITE_${_site_url_}:S^%SUBDIR%^${_site_subdir_}^:S/$/:${_site_group_}/:S/:$//} +. else MASTER_SITES_EXP+= ${MASTER_SITE_${_site_url_}:S/$/:${_site_group_}/:S/:$//} +. endif MASTER_SITES_EXP:= ${MASTER_SITES_EXP} . endif . endif ==== //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/buildscript#2 (text+ko) ==== @@ -61,7 +61,6 @@ export PKG_PATH=/tmp/depends if [ ! -z "${pkgs}" ]; then arch=$(uname -m) - umountprocfs ${arch} echo "adding dependencies" for i in $pkgs; do echo "pkg_add $i" @@ -76,7 +75,6 @@ fi fi done - mountprocfs ${arch} fi } @@ -141,6 +139,7 @@ if [ $phase = 1 ]; then cd $dir || exit 1 + echo "building for: $(uname -mr)" echo "maintained by: $(make maintainer)" echo "port directory: ${dir}" echo "build started at $(date)" @@ -170,6 +169,7 @@ ./usr/local/etc/apache2 ./usr/local/news ./usr/local/share/xml +./usr/X11R6/etc/gconf EOF # Record a "pristine" mtree. mtree -X /tmp/mtree.preexclude -xcn -k uid,gid,mode -p / > /tmp/mtree.pristine @@ -234,6 +234,7 @@ ./usr/local/etc/apache2 ./usr/local/news ./usr/local/share/xml +./usr/X11R6/etc/gconf EOF # Record a "pristine" mtree. mtree -X /tmp/mtree.buildexclude -xcn -k uid,gid,mode -p / > /tmp/mtree.prebuild @@ -258,7 +259,7 @@ /pnohang $TIMEOUT /tmp/make.log5 ${pkgname} make -k regression-test cat /tmp/make.log5 - mtree -X /tmp/mtree.buildexclude -x -f /tmp/mtree.prebuild -p / | egrep -v "^(${L}/var|${X}/lib/X11/xserver/SecurityPolicy|${L}/share/nls/POSIX|${L}/share/nls/en_US.US-ASCII|etc/services|compat |${X} |etc/manpath.config|etc/.*.bak|${L}/info/dir|${X}/lib/X11/fonts/.*/fonts\.|usr/(X11R6|local)/man/..( |/man. )|${X}/lib/X11/fonts/TrueType )" > /tmp/list.preinstall + mtree -X /tmp/mtree.buildexclude -x -f /tmp/mtree.prebuild -p / | egrep -v "^(${L}/var|${X}/lib/X11/xserver/SecurityPolicy|${L}/share/nls/POSIX|${L}/share/nls/en_US.US-ASCII|etc/services|compat |${X} |etc/manpath.config|etc/.*.bak|${L}/info/dir|${X}/lib/X11/fonts/.*/fonts\.|usr/(X11R6|local)/man/..( |/man. )|${X}/lib/X11/fonts/TrueType|${X}/etc/gconf/gconf.xml.defaults/%gconf-tree.*.xml )" > /tmp/list.preinstall if [ -s /tmp/list.preinstall ]; then echo "================================================================" @@ -304,7 +305,7 @@ cleanup 7 fi - mtree -X /tmp/mtree.exclude -x -f /tmp/mtree -p / | egrep -v "^(${L}/var|${X}/lib/X11/xserver/SecurityPolicy|${L}/share/nls/POSIX|${L}/share/nls/en_US.US-ASCII|etc/services|compat |${X} |etc/manpath.config|etc/.*.bak|${L}/info/dir|${X}/lib/X11/fonts/.*/fonts\.|usr/(X11R6|local)/man/..( |/man. )|${X}/lib/X11/fonts/TrueType )" > /tmp/list3 + mtree -X /tmp/mtree.exclude -x -f /tmp/mtree -p / | egrep -v "^(${L}/var|${X}/lib/X11/xserver/SecurityPolicy|${L}/share/nls/POSIX|${L}/share/nls/en_US.US-ASCII|etc/services|compat |${X} |etc/manpath.config|etc/.*.bak|${L}/info/dir|${X}/lib/X11/fonts/.*/fonts\.|usr/(X11R6|local)/man/..( |/man. )|${X}/lib/X11/fonts/TrueType|${X}/etc/gconf/gconf.xml.defaults/%gconf-tree.*.xml )" > /tmp/list3 # Compare the state of the filesystem now to before the 'make install' phase dirty=0 ==== //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/claim-chroot#2 (text+ko) ==== @@ -61,7 +61,7 @@ mkdir ${dir}/used 2>/dev/null || continue touch ${dir}/used/${pkgname} if [ -f ${dir}/.dirty ]; then - ${pb}/scripts/clean-chroot ${arch} ${branch} ${dir} 2 & + ${pb}/scripts/clean-chroot ${arch} ${branch} ${dir} 2 >/dev/null 2>/dev/null & continue fi found=1 ==== //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/clean-chroot#2 (text+ko) ==== @@ -24,11 +24,11 @@ if [ -d ${chroot}${mount} ]; then mdir=$(fstat -f ${chroot}${mount} | head -2 | tail -1 | awk '{print $5}') if [ "${mdir}" = "MOUNT" ]; then - umount ${chroot}${mount} || echo "Cleanup of ${chroot}${mount} failed!" + umount -f ${chroot}${mount} || echo "Cleanup of ${chroot}${mount} failed!" fi if [ "${mdir}" = "${chroot}${mount}" ]; then kill_procs ${chroot} ${mount} - umount ${chroot}${mount} || echo "Cleanup of ${chroot}${mount} failed!" + umount -f ${chroot}${mount} || echo "Cleanup of ${chroot}${mount} failed!" fi fi } ==== //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/dopackages#2 (text+ko) ==== @@ -70,6 +70,7 @@ echo "generating duds" echo "================================================" echo "duds generation started at $(date)" + cp -p ${pb}/${arch}/${branch}/duds ${pb}/${arch}/${branch}/duds.old if ! ${scripts}/makeduds ${arch} ${branch}; then echo "error(s) detected, exiting script at $(date). Failed duds list was:" cat ${pb}/${arch}/${branch}/duds @@ -79,7 +80,6 @@ echo $(wc -l < ${pb}/${arch}/${branch}/duds) "items in duds" echo "duds diff:" diff ${pb}/${arch}/${branch}/duds.old ${pb}/${arch}/${branch}/duds - cp -p ${pb}/${arch}/${branch}/duds ${pb}/${arch}/${branch}/duds.old cp -p ${pb}/${arch}/${branch}/duds ${pb}/${arch}/${branch}/duds.orig } @@ -132,6 +132,8 @@ echo "ended archive of ${pb}/${arch}/${branch}/ports at $(date)" } +# XXX Should use SHA256 instead, but I'm not sure what consumes this file (if anything) +# XXX Should generate these as the packages are copied in, instead of all at once at the end # usage: generatemd5 pb branch generatemd5 () { pb=$1 @@ -293,8 +295,8 @@ cd ${PORTSDIR} cvs -qR update -PAd # XXX Check for conflicts + date > ${pb}/${arch}/${branch}/cvsdone fi - date > ${pb}/${arch}/${branch}/cvsdone if [ "$nocvs" = 0 ]; then echo "================================================" @@ -312,15 +314,18 @@ make checksubdirs # this one not run in background to check return status + # XXX Return status not checked! if [ "$noduds" = 0 ]; then makeduds ${pb} ${arch} ${scripts} ${branch} fi - echo "================================================" - echo "pruning stale entries from the failed ports list" - echo "================================================" - # Adding BROKEN ports to duds causes this to remove everything from failure list - #lockf -k ${pb}/${arch}/${branch}/failure.lock ${scripts}/prunefailure ${arch} ${branch} + if [ "$trybroken" = 1 ]; then + echo "================================================" + echo "pruning stale entries from the failed ports list" + echo "================================================" + cp ${pb}/${arch}/${branch}/failure ${pb}/${arch}/${branch}/newfailure ${pb}/${arch}/${branch}/bak + lockf -k ${pb}/${arch}/${branch}/failure.lock ${scripts}/prunefailure ${arch} ${branch} + fi if [ "$noindex" = 0 ]; then makeindex ${pb} ${arch} ${scripts} ${branch} @@ -346,27 +351,58 @@ cdromlist ${pb} ${arch} ${scripts} ${branch} & fi - ${scripts}/makeparallel ${arch} ${branch} + ${scripts}/makeparallel ${arch} ${branch} & - cd ${pb}/${arch} - mkdir -p ${pb}/${arch}/${branch}/bak - cd ${pb}/${arch}/${branch}/bak - rm -rf errors logs packages old-errors cd ${pb}/${arch}/${branch} - mv make.* tarballs/ports.tar.gz bak + mkdir -p bak + rm -rf bak/packages bak/old-errors + mv make.* bak + + olderrors=$(readlink ${pb}/${arch}/${branch}/errors) + oldlogs=$(readlink ${pb}/${arch}/${branch}/logs) + + newerrors=${pb}/${arch}/archive/errorlogs/e.${branch}.${date} + newlogs=${pb}/${arch}/archive/errorlogs/a.${branch}.${date} - cd ${pb}/${arch}/${branch} - cp -rp errors logs old-errors bak + # Cycle out the previous symlinks + # For now the bak/errors may be a directory, so fall back to removing it if we fail to + # remove it as a symlink + rm -f bak/errors || rm -rf bak/errors + rm -f bak/logs || rm -rf bak/logs + mv errors logs bak - shortdate=$(echo ${date} | sed -e 's/..$//') + # Create new log directories for archival + rm -rf ${newerrors} + mkdir -p ${newerrors}/old-errors + ln -sf ${newerrors} ${pb}/${arch}/${branch}/errors + rm -rf ${newlogs} + mkdir -p ${newlogs} + ln -sf ${newlogs} ${pb}/${arch}/${branch}/logs + + echo "error logs in ${newerrors}" + cp -p ${pb}/${arch}/${branch}/cvsdone ${newerrors}/cvsdone + cp -p ${pb}/${arch}/${branch}/cvsdone ${newlogs}/cvsdone + cp -p ${pb}/${arch}/${branch}/ports/${INDEXFILE} ${newerrors}/INDEX + cp -p ${pb}/${arch}/${branch}/ports/${INDEXFILE} ${newlogs}/INDEX if [ "$incremental" = 1 ]; then - # need to preserve symlinks for packages + # XXX Don't do this for space reasons + # XXX Could be replaced by hardlinks? #tar cf - packages | tar xfC - bak - cd ${PORTSDIR} + # Copy back in the restricted ports that were saved after the previous build + cd ${pb}/${arch}/${branch} + if [ -d bak/restricted/ ]; then + tar cfC - bak/restricted/ packages/ | tar xfpP - + fi + + # Create hardlinks to previous set of logs + cd ${oldlogs} && find . | cpio -dumpl ${newlogs} + cd ${olderrors} && find . | cpio -dumpl ${newerrors} # Identify the ports that have changed and need to be removed before rebuilding + # XXX Need to also remove stale distfiles + cd ${PORTSDIR} cut -f 1,2,3,8,9,11,12,13 -d \| ${INDEXFILE}.old | sort > ${INDEXFILE}.old1 cut -f 1,2,3,8,9,11,12,13 -d \| ${INDEXFILE} | sort > ${INDEXFILE}.1 comm -2 -3 ${INDEXFILE}.old1 ${INDEXFILE}.1 | cut -f 1 -d \| > ${pb}/${arch}/${branch}/.oldports @@ -381,42 +417,20 @@ cd ${pb}/${arch}/${branch}/errors/ sed "s,\$,.log," ${pb}/${arch}/${branch}/.oldports | xargs rm -f sed "s,\$,.log.bz2," ${pb}/${arch}/${branch}/.oldports | xargs rm -f - find . -name \*.log.bz2 | xargs bunzip2 -f cd ${pb}/${arch}/${branch}/logs/ sed 's,$,.log,' ${pb}/${arch}/${branch}/.oldports | xargs rm -f sed 's,$,.log.bz2,' ${pb}/${arch}/${branch}/.oldports | xargs rm -f - find . -name \*.log.bz2 | xargs bunzip2 -f else - # need to preserve symlinks for packages + cd ${pb}/${arch}/${branch} + + # XXX Don't do this for space reasons #mv -f packages bak - - # Already copied the logs above - rm -rf errors logs old-errors - - cd ${pb}/${arch}/${branch} + rm -rf packages mkdir -p packages/All rm -rf distfiles/ mkdir -p distfiles/ - - mkdir -p ${pb}/${arch}/archive/errorlogs - rm -rf ${pb}/${arch}/archive/errorlogs/e.${branch}.${date} ${pb}/${arch}/archive/errorlogs/e.${branch}.${shortdate} - mkdir -p ${pb}/${arch}/archive/errorlogs/e.${branch}.${date} - ln -sf ${pb}/${arch}/archive/errorlogs/e.${branch}.${date} ${pb}/${arch}/${branch}/errors - ln -sf e.${branch}.${date} ${pb}/${arch}/archive/errorlogs/e.${branch}.${shortdate} - mkdir -p ${pb}/${arch}/${branch}/errors/old-errors - rm -rf ${pb}/${arch}/archive/errorlogs/a.${branch}.${date} ${pb}/${arch}/archive/errorlogs/a.${branch}.${shortdate} - mkdir -p ${pb}/${arch}/archive/errorlogs/a.${branch}.${date} - ln -sf ${pb}/${arch}/archive/errorlogs/a.${branch}.${date} ${pb}/${arch}/${branch}/logs - ln -sf a.${branch}.${date} ${pb}/${arch}/archive/errorlogs/a.${branch}.${shortdate} - - echo "error logs in ${pb}/${arch}/archive/errorlogs/e.${branch}.${date}" - cp -p ${pb}/${arch}/${branch}/cvsdone ${pb}/${arch}/archive/errorlogs/e.${branch}.${date}/cvsdone - cp -p ${pb}/${arch}/${branch}/cvsdone ${pb}/${arch}/archive/errorlogs/a.${branch}.${date}/cvsdone - cp -p ${pb}/${arch}/${branch}/ports/${INDEXFILE} ${pb}/${arch}/archive/errorlogs/e.${branch}.${date}/INDEX - cp -p ${pb}/${arch}/${branch}/ports/${INDEXFILE} ${pb}/${arch}/archive/errorlogs/a.${branch}.${date}/INDEX - fi fi @@ -461,10 +475,15 @@ grep -E '(ptimeout|pnohang): killing' make.0 | sed -e 's/^.*ptimeout:/ptimeout:/' -e 's/^.*pnohang:/pnohang:/' fi - ls -asFlrt ${pb}/${arch}/${branch}/packages/All > ${pb}/${arch}/${branch}/logs/ls-lrt-1 - cp -rp errors old-errors - cd ${pb}/${arch}/${branch}/old-errors - ${scripts}/processlogs + ls -asFlrt ${pb}/${arch}/${branch}/packages/All > ${pb}/${arch}/${branch}/logs/ls-lrt + + # XXX Is there any point in keeping a second copy of the phase 1 errors? + cd ${pb}/${arch}/${branch}/errors/ + find . -name '*.log' | cpio -dumpl ${pb}/${arch}/${branch}/errors/old-errors + +# XXX What is the point of the old-errors/ directory (not errors/old-errors/)? +# cd ${pb}/${arch}/${branch}/old-errors +# ${scripts}/processlogs echo "================================================" echo "setting up nodes" @@ -516,6 +535,13 @@ if [ "$nofinish" = 0 ]; then rm -f Makefile + if [ "$norestr" = 0 ]; then + # Before deleting restricted packages, save a copy so we don't have to rebuild them next time + ${pb}/scripts/keeprestr ${arch} ${branch} + else + rm -rf ${pb}/${arch}/${branch}/bak/restricted/ + fi + # Always delete restricted packages/distfiles since they're published on the # website echo "deleting restricted ports" @@ -530,6 +556,7 @@ ${scripts}/prunepkgs ${pb}/${arch}/${branch}/ports/${INDEXFILE} ${pb}/${arch}/${branch}/packages fi +# XXX Checking for bad packages should be done after the package is uploaded #rm -rf ${pb}/${arch}/${branch}/bad #mkdir -p ${pb}/${arch}/${branch}/bad #echo "checking packages" @@ -543,18 +570,11 @@ #done if [ "$nofinish" = 0 ]; then + generatemd5 ${pb} ${arch} ${branch} & + # Remove INDEX entries for packages that do not exist ${scripts}/chopindex ${pb}/${arch}/${branch}/ports/${INDEXFILE} ${pb}/${arch}/${branch}/packages > ${pb}/${arch}/${branch}/packages/INDEX - cd ${pb}/${arch}/${branch}/old-errors - for i in *.log; do - cp -p ${i} ${pb}/${arch}/${branch}/errors/old-errors; - done - - #archiveports ${pb} ${arch} ${branch} & - generatemd5 ${pb} ${arch} ${branch} & - wait - ls -asFlrt ${pb}/${arch}/${branch}/packages/All > ${pb}/${arch}/${branch}/logs/ls-lrt cp -p ${pb}/${arch}/${branch}/make.[01] ${pb}/${arch}/${branch}/logs @@ -576,6 +596,8 @@ sh ${pb}/${arch}/${branch}/cdrom.sh fi + wait + if [ "$branch" != "4-exp" ]; then # Currently broken - kk #su ${user} -c "${scripts}/cpdistfiles ${branch} > ${pb}/${arch}/${branch}/cpdistfiles.log 2>&1 Updating source tree" @@ -76,10 +77,15 @@ fi echo "==> Starting make distribute" - cd etc - make obj - make all - make distribute DISTRIBUTION=/var/chroot/ + if [ "$branch" = "5" ]; then + cd etc + make obj + make all + make distribute DISTRIBUTION=/var/chroot/ + else + make DESTDIR=/var/chroot distrib-dirs && \ + make DESTDIR=/var/chroot distribution + fi error=$? if [ "$error" != "0" ]; then exit $error ==== //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/mkbindist#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Sep 17 09:28:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C567216A415; Sun, 17 Sep 2006 09:28:11 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 823B416A403 for ; Sun, 17 Sep 2006 09:28:11 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2E70443D49 for ; Sun, 17 Sep 2006 09:28:11 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8H9S9Ys097237 for ; Sun, 17 Sep 2006 09:28:09 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8H9S9s8097234 for perforce@freebsd.org; Sun, 17 Sep 2006 09:28:09 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 17 Sep 2006 09:28:09 GMT Message-Id: <200609170928.k8H9S9s8097234@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 106225 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Sep 2006 09:28:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=106225 Change 106225 by rwatson@rwatson_peppercorn on 2006/09/17 09:27:39 Minor white space revisions to previous submit. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#33 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#23 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_worker.c#16 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#33 (text+ko) ==== @@ -98,6 +98,7 @@ #define AR_PRESELECT_USER_TRAIL 0x00004000U #define AR_PRESELECT_USER_PIPE 0x00008000U + /* * Audit data is generated as a stream of struct audit_record structures, * linked by struct kaudit_record, and contain storage for possible audit so ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#23 (text+ko) ==== @@ -139,10 +139,11 @@ ar->k_udata = rec; ar->k_ulen = uap->length; ar->k_ar_commit |= AR_COMMIT_USER; + /* * Currently we assume that all preselection has been performed in - * userspace. We unconditionally set these masks so that the records - * get committed both to the trail and pipe. In the future we will + * userspace. We unconditionally set these masks so that the records + * get committed both to the trail and pipe. In the future we will * want to setup kernel based preselection. */ ar->k_ar_commit |= (AR_PRESELECT_USER_TRAIL | AR_PRESELECT_USER_PIPE); ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_worker.c#16 (text+ko) ==== @@ -322,7 +322,7 @@ au_id_t auid; int sorf; - if ((ar->k_ar_commit & AR_COMMIT_USER) != 0 && + if ((ar->k_ar_commit & AR_COMMIT_USER) && (ar->k_ar_commit & AR_PRESELECT_USER_TRAIL)) { error = audit_record_write(audit_vp, audit_cred, audit_td, ar->k_udata, ar->k_ulen); @@ -331,10 +331,10 @@ else if (error) printf("audit_worker: write error %d\n", error); } - if ((ar->k_ar_commit & AR_COMMIT_USER) != 0 && - (ar->k_ar_commit & AR_PRESELECT_USER_PIPE)) { + + if ((ar->k_ar_commit & AR_COMMIT_USER) && + (ar->k_ar_commit & AR_PRESELECT_USER_PIPE)) audit_pipe_submit_user(ar->k_udata, ar->k_ulen); - } if (!(ar->k_ar_commit & AR_COMMIT_KERNEL) || ((ar->k_ar_commit & AR_PRESELECT_PIPE) == 0 && @@ -375,6 +375,7 @@ printf("audit_worker: write error %d\n", error); } + if (ar->k_ar_commit & AR_PRESELECT_PIPE) audit_pipe_submit(auid, event, class, sorf, ar->k_ar_commit & AR_PRESELECT_TRAIL, bsm->data, From owner-p4-projects@FreeBSD.ORG Sun Sep 17 09:37:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A8E2216A412; Sun, 17 Sep 2006 09:37:25 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8589916A407 for ; Sun, 17 Sep 2006 09:37:25 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0374B43D66 for ; Sun, 17 Sep 2006 09:37:22 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8H9bLWw097751 for ; Sun, 17 Sep 2006 09:37:21 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8H9bLEO097748 for perforce@freebsd.org; Sun, 17 Sep 2006 09:37:21 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 17 Sep 2006 09:37:21 GMT Message-Id: <200609170937.k8H9bLEO097748@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 106226 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Sep 2006 09:37:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=106226 Change 106226 by hselasky@hselasky_mini_itx on 2006/09/17 09:37:10 Create "usbhid.h" so that old USB HID software can compile. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usbhid.h#3 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Sep 17 09:39:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B5CA916A4F6; Sun, 17 Sep 2006 09:39:25 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 784B716A40F for ; Sun, 17 Sep 2006 09:39:25 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 23F0A43D49 for ; Sun, 17 Sep 2006 09:39:25 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8H9dPvS097853 for ; Sun, 17 Sep 2006 09:39:25 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8H9dORn097850 for perforce@freebsd.org; Sun, 17 Sep 2006 09:39:24 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 17 Sep 2006 09:39:24 GMT Message-Id: <200609170939.k8H9dORn097850@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 106227 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Sep 2006 09:39:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=106227 Change 106227 by hselasky@hselasky_mini_itx on 2006/09/17 09:38:36 Finished reworking "ubtbcmfw". Please test! Affected files ... .. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#2 edit Differences ... ==== //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#2 (text+ko) ==== @@ -33,20 +33,14 @@ #include #include -#include -#include -#include +#include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include #include -#include -#include +#include #include "usbdevs.h" @@ -56,81 +50,141 @@ #define UBTBCMFW_CONFIG_NO 1 /* Config number */ #define UBTBCMFW_IFACE_IDX 0 /* Control interface */ -#define UBTBCMFW_INTR_IN_EP 0x81 /* Fixed endpoint */ -#define UBTBCMFW_BULK_OUT_EP 0x02 /* Fixed endpoint */ -#define UBTBCMFW_INTR_IN UE_GET_ADDR(UBTBCMFW_INTR_IN_EP) -#define UBTBCMFW_BULK_OUT UE_GET_ADDR(UBTBCMFW_BULK_OUT_EP) +#define UBTBCMFW_T_MAX 4 /* units */ struct ubtbcmfw_softc { - USBBASEDEVICE sc_dev; /* base device */ - usbd_device_handle sc_udev; /* USB device handle */ - struct cdev *sc_ctrl_dev; /* control device */ - struct cdev *sc_intr_in_dev; /* interrupt device */ - struct cdev *sc_bulk_out_dev; /* bulk device */ - usbd_pipe_handle sc_intr_in_pipe; /* interrupt pipe */ - usbd_pipe_handle sc_bulk_out_pipe; /* bulk out pipe */ - int sc_flags; -#define UBTBCMFW_CTRL_DEV (1 << 0) -#define UBTBCMFW_INTR_IN_DEV (1 << 1) -#define UBTBCMFW_BULK_OUT_DEV (1 << 2) - int sc_refcnt; - int sc_dying; + struct usb_cdev sc_cdev; + struct mtx sc_mtx; + struct usbd_memory_wait sc_mem_wait; + + device_t sc_dev; + struct usbd_device *sc_udev; + struct usbd_xfer *sc_xfer[UBTBCMFW_T_MAX]; + + u_int8_t sc_flags; +#define UBTBCMFW_FLAG_WRITE_STALL 0x01 +#define UBTBCMFW_FLAG_READ_STALL 0x02 }; -typedef struct ubtbcmfw_softc *ubtbcmfw_softc_p; +#define UBTBCMFW_BSIZE 1024 +#define UBTBCMFW_IFQ_MAXLEN 2 + +/* prototypes */ + +static device_probe_t ubtbcmfw_probe; +static device_attach_t ubtbcmfw_attach; +static device_detach_t ubtbcmfw_detach; + +static void +ubtbcmfw_write_callback(struct usbd_xfer *xfer); + +static void +ubtbcmfw_write_clear_stall_callback(struct usbd_xfer *xfer); + +static void +ubtbcmfw_read_callback(struct usbd_xfer *xfer); + +static void +ubtbcmfw_read_clear_stall_callback(struct usbd_xfer *xfer); + +static void +ubtbcmfw_start_read(struct usb_cdev *cdev); + +static void +ubtbcmfw_stop_read(struct usb_cdev *cdev); + +static void +ubtbcmfw_start_write(struct usb_cdev *cdev); + +static void +ubtbcmfw_stop_write(struct usb_cdev *cdev); + +static int32_t +ubtbcmfw_open(struct usb_cdev *cdev, int32_t fflags, + int32_t devtype, struct thread *td); +static int32_t +ubtbcmfw_ioctl(struct usb_cdev *cdev, u_long cmd, caddr_t data, + int32_t fflags, struct thread *td); + +static const struct usbd_config ubtbcmfw_config[UBTBCMFW_T_MAX] = { -/* - * Device methods - */ + [0] = { + .type = UE_BULK, + .endpoint = 0x02, /* fixed */ + .direction = UE_DIR_OUT, + .bufsize = UBTBCMFW_BSIZE, + .flags = 0, + .callback = &ubtbcmfw_write_callback, + }, -#define UBTBCMFW_UNIT(n) ((minor(n) >> 4) & 0xf) -#define UBTBCMFW_ENDPOINT(n) (minor(n) & 0xf) -#define UBTBCMFW_MINOR(u, e) (((u) << 4) | (e)) -#define UBTBCMFW_BSIZE 1024 + [1] = { + .type = UE_INTERRUPT, + .endpoint = 0x01, /* fixed */ + .direction = UE_DIR_IN, + .bufsize = UBTBCMFW_BSIZE, + .flags = USBD_SHORT_XFER_OK, + .callback = &ubtbcmfw_read_callback, + }, -Static d_open_t ubtbcmfw_open; -Static d_close_t ubtbcmfw_close; -Static d_read_t ubtbcmfw_read; -Static d_write_t ubtbcmfw_write; -Static d_ioctl_t ubtbcmfw_ioctl; -Static d_poll_t ubtbcmfw_poll; + [2] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t), + .flags = USBD_USE_DMA, + .callback = &ubtbcmfw_write_clear_stall_callback, + .timeout = 1000, /* 1 second */ + }, -Static struct cdevsw ubtbcmfw_cdevsw = { - .d_version = D_VERSION, - .d_flags = D_NEEDGIANT, - .d_open = ubtbcmfw_open, - .d_close = ubtbcmfw_close, - .d_read = ubtbcmfw_read, - .d_write = ubtbcmfw_write, - .d_ioctl = ubtbcmfw_ioctl, - .d_poll = ubtbcmfw_poll, - .d_name = "ubtbcmfw", + [3] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t), + .flags = USBD_USE_DMA, + .callback = &ubtbcmfw_read_clear_stall_callback, + .timeout = 1000, /* 1 second */ + }, }; /* * Module */ -USB_DECLARE_DRIVER(ubtbcmfw); -DRIVER_MODULE(ubtbcmfw, uhub, ubtbcmfw_driver, ubtbcmfw_devclass, +static devclass_t ubtbcmfw_devclass; + +static device_method_t ubtbcmfw_methods[] = { + DEVMETHOD(device_probe, ubtbcmfw_probe), + DEVMETHOD(device_attach, ubtbcmfw_attach), + DEVMETHOD(device_detach, ubtbcmfw_detach), + { 0, 0 } +}; + +static driver_t ubtbcmfw_driver = { + .name = "ubtbcmfw", + .methods = ubtbcmfw_methods, + .size = sizeof(struct ubtbcmfw_softc), +}; + +DRIVER_MODULE(ubtbcmfw, uhub, ubtbcmfw_driver, ubtbcmfw_devclass, usbd_driver_load, 0); +MODULE_DEPEND(ubtbcmfw, usb, 1, 1, 1); /* * Probe for a USB Bluetooth device */ -USB_MATCH(ubtbcmfw) +static int +ubtbcmfw_probe(device_t dev) { -#define USB_PRODUCT_BROADCOM_BCM2033NF 0x2033 + struct usb_attach_arg *uaa = device_get_ivars(dev); - USB_MATCH_START(ubtbcmfw, uaa); - if (uaa->iface != NULL) return (UMATCH_NONE); /* Match the boot device. */ if (uaa->vendor == USB_VENDOR_BROADCOM && - uaa->product == USB_PRODUCT_BROADCOM_BCM2033NF) + uaa->product == USB_PRODUCT_BROADCOM_BCM2033) return (UMATCH_VENDOR_PRODUCT); return (UMATCH_NONE); @@ -140,364 +194,273 @@ * Attach the device */ -USB_ATTACH(ubtbcmfw) +static int +ubtbcmfw_attach(device_t dev) { - USB_ATTACH_START(ubtbcmfw, sc, uaa); - usbd_interface_handle iface; - usbd_status err; - char devinfo[1024]; + struct usb_attach_arg *uaa = device_get_ivars(dev); + struct ubtbcmfw_softc *sc = device_get_softc(dev); + int32_t err; + const char *p_buf[4]; + char buf_1[32]; + char buf_2[32]; + char buf_3[32]; + + if (sc == NULL) { + return ENOMEM; + } + sc->sc_dev = dev; sc->sc_udev = uaa->device; - usbd_devinfo(sc->sc_udev, 0, devinfo); - USB_ATTACH_SETUP; - printf("%s: %s\n", USBDEVNAME(sc->sc_dev), devinfo); + + usbd_set_desc(dev, uaa->device); - sc->sc_ctrl_dev = sc->sc_intr_in_dev = sc->sc_bulk_out_dev = NULL; - sc->sc_intr_in_pipe = sc->sc_bulk_out_pipe = NULL; - sc->sc_flags = sc->sc_refcnt = sc->sc_dying = 0; + mtx_init(&(sc->sc_mtx), "ubtbcmfw lock", NULL, MTX_DEF|MTX_RECURSE); err = usbd_set_config_no(sc->sc_udev, UBTBCMFW_CONFIG_NO, 1); if (err) { - printf("%s: setting config no failed. %s\n", - USBDEVNAME(sc->sc_dev), usbd_errstr(err)); - goto bad; + device_printf(dev, "setting config no failed, err=%s\n", + usbd_errstr(err)); + goto detach;; } - err = usbd_device2interface_handle(sc->sc_udev, UBTBCMFW_IFACE_IDX, - &iface); + err = usbd_transfer_setup(uaa->device, UBTBCMFW_IFACE_IDX, + sc->sc_xfer, ubtbcmfw_config, UBTBCMFW_T_MAX, + sc, &(sc->sc_mtx), &(sc->sc_mem_wait)); if (err) { - printf("%s: getting interface handle failed. %s\n", - USBDEVNAME(sc->sc_dev), usbd_errstr(err)); - goto bad; + device_printf(dev, "allocating USB transfers " + "failed, err=%s\n", usbd_errstr(err)); + goto detach; } - /* Will be used as a bulk pipe */ - err = usbd_open_pipe(iface, UBTBCMFW_INTR_IN_EP, 0, - &sc->sc_intr_in_pipe); - if (err) { - printf("%s: open intr in failed. %s\n", - USBDEVNAME(sc->sc_dev), usbd_errstr(err)); - goto bad; - } + snprintf(buf_1, sizeof(buf_1), "%s", + device_get_nameunit(dev)); + + snprintf(buf_2, sizeof(buf_2), "%s.1", + device_get_nameunit(dev)); + + snprintf(buf_3, sizeof(buf_3), "%s.2", + device_get_nameunit(dev)); + + p_buf[0] = buf_1; + p_buf[1] = buf_2; + p_buf[2] = buf_3; + p_buf[3] = NULL; + + sc->sc_cdev.sc_start_read = &ubtbcmfw_start_read; + sc->sc_cdev.sc_start_write = &ubtbcmfw_start_write; + sc->sc_cdev.sc_stop_read = &ubtbcmfw_stop_read; + sc->sc_cdev.sc_stop_write = &ubtbcmfw_stop_write; + sc->sc_cdev.sc_open = &ubtbcmfw_open; + sc->sc_cdev.sc_ioctl = &ubtbcmfw_ioctl; + sc->sc_cdev.sc_flags |= (USB_CDEV_FLAG_FWD_SHORT| + USB_CDEV_FLAG_WAKEUP_RD_IMMED| + USB_CDEV_FLAG_WAKEUP_WR_IMMED); - err = usbd_open_pipe(iface, UBTBCMFW_BULK_OUT_EP, 0, - &sc->sc_bulk_out_pipe); + err = usb_cdev_attach(&(sc->sc_cdev), sc, &(sc->sc_mtx), p_buf, + UID_ROOT, GID_OPERATOR, 0644, + UBTBCMFW_BSIZE, UBTBCMFW_IFQ_MAXLEN, + UBTBCMFW_BSIZE, UBTBCMFW_IFQ_MAXLEN); if (err) { - printf("%s: open bulk out failed. %s\n", - USBDEVNAME(sc->sc_dev), usbd_errstr(err)); - goto bad; + goto detach; } - /* Create device nodes */ - sc->sc_ctrl_dev = make_dev(&ubtbcmfw_cdevsw, - UBTBCMFW_MINOR(USBDEVUNIT(sc->sc_dev), 0), - UID_ROOT, GID_OPERATOR, 0644, - "%s", USBDEVNAME(sc->sc_dev)); + return 0; /* success */ - sc->sc_intr_in_dev = make_dev(&ubtbcmfw_cdevsw, - UBTBCMFW_MINOR(USBDEVUNIT(sc->sc_dev), UBTBCMFW_INTR_IN), - UID_ROOT, GID_OPERATOR, 0644, - "%s.%d", USBDEVNAME(sc->sc_dev), UBTBCMFW_INTR_IN); - - sc->sc_bulk_out_dev = make_dev(&ubtbcmfw_cdevsw, - UBTBCMFW_MINOR(USBDEVUNIT(sc->sc_dev), UBTBCMFW_BULK_OUT), - UID_ROOT, GID_OPERATOR, 0644, - "%s.%d", USBDEVNAME(sc->sc_dev), UBTBCMFW_BULK_OUT); - - USB_ATTACH_SUCCESS_RETURN; -bad: - ubtbcmfw_detach(self); - - USB_ATTACH_ERROR_RETURN; + detach: + ubtbcmfw_detach(dev); + return ENOMEM; /* failure */ } /* * Detach the device */ -USB_DETACH(ubtbcmfw) +static int +ubtbcmfw_detach(device_t dev) { - USB_DETACH_START(ubtbcmfw, sc); + struct ubtbcmfw_softc *sc = device_get_softc(dev); + + usb_cdev_detach(&(sc->sc_cdev)); - sc->sc_dying = 1; + usbd_transfer_unsetup(sc->sc_xfer, UBTBCMFW_T_MAX); - if (-- sc->sc_refcnt >= 0) { - if (sc->sc_intr_in_pipe != NULL) - usbd_abort_pipe(sc->sc_intr_in_pipe); + usbd_transfer_drain(&(sc->sc_mem_wait), &(sc->sc_mtx)); - if (sc->sc_bulk_out_pipe != NULL) - usbd_abort_pipe(sc->sc_bulk_out_pipe); + mtx_destroy(&(sc->sc_mtx)); - usb_detach_wait(USBDEV(sc->sc_dev)); - } + return (0); +} - /* Destroy device nodes */ - if (sc->sc_bulk_out_dev != NULL) { - destroy_dev(sc->sc_bulk_out_dev); - sc->sc_bulk_out_dev = NULL; - } +static void +ubtbcmfw_write_callback(struct usbd_xfer *xfer) +{ + struct ubtbcmfw_softc *sc = xfer->priv_sc; + u_int32_t actlen; - if (sc->sc_intr_in_dev != NULL) { - destroy_dev(sc->sc_intr_in_dev); - sc->sc_intr_in_dev = NULL; - } + USBD_CHECK_STATUS(xfer); - if (sc->sc_ctrl_dev != NULL) { - destroy_dev(sc->sc_ctrl_dev); - sc->sc_ctrl_dev = NULL; + tr_transferred: + tr_setup: + if (sc->sc_flags & UBTBCMFW_FLAG_WRITE_STALL) { + usbd_transfer_start(sc->sc_xfer[2]); + return; } + if (usb_cdev_get_data(&(sc->sc_cdev), xfer->buffer, + UBTBCMFW_BSIZE, &actlen, 0)) { - /* Close pipes */ - if (sc->sc_intr_in_pipe != NULL) { - usbd_close_pipe(sc->sc_intr_in_pipe); - sc->sc_intr_in_pipe = NULL; + xfer->length = actlen; + usbd_start_hardware(xfer); } + return; - if (sc->sc_bulk_out_pipe != NULL) { - usbd_close_pipe(sc->sc_bulk_out_pipe); - sc->sc_intr_in_pipe = NULL; + tr_error: + if (xfer->error != USBD_CANCELLED) { + /* try to clear stall first */ + sc->sc_flags |= UBTBCMFW_FLAG_WRITE_STALL; + usbd_transfer_start(sc->sc_xfer[2]); } - - return (0); + return; } -/* - * Open endpoint device - * XXX FIXME softc locking - */ - -Static int -ubtbcmfw_open(struct cdev *dev, int flag, int mode, usb_proc_ptr p) +static void +ubtbcmfw_write_clear_stall_callback(struct usbd_xfer *xfer) { - ubtbcmfw_softc_p sc = NULL; - int error = 0; + struct ubtbcmfw_softc *sc = xfer->priv_sc; + struct usbd_xfer *xfer_other = sc->sc_xfer[0]; - /* checks for sc != NULL */ - USB_GET_SC_OPEN(ubtbcmfw, UBTBCMFW_UNIT(dev), sc); - if (sc->sc_dying) - return (ENXIO); + USBD_CHECK_STATUS(xfer); - switch (UBTBCMFW_ENDPOINT(dev)) { - case USB_CONTROL_ENDPOINT: - if (!(sc->sc_flags & UBTBCMFW_CTRL_DEV)) - sc->sc_flags |= UBTBCMFW_CTRL_DEV; - else - error = EBUSY; - break; + tr_setup: + /* start clear stall */ + usbd_clear_stall_tr_setup(xfer, xfer_other); + return; - case UBTBCMFW_INTR_IN: - if (!(sc->sc_flags & UBTBCMFW_INTR_IN_DEV)) { - if (sc->sc_intr_in_pipe != NULL) - sc->sc_flags |= UBTBCMFW_INTR_IN_DEV; - else - error = ENXIO; - } else - error = EBUSY; - break; + tr_transferred: + usbd_clear_stall_tr_transferred(xfer, xfer_other); - case UBTBCMFW_BULK_OUT: - if (!(sc->sc_flags & UBTBCMFW_BULK_OUT_DEV)) { - if (sc->sc_bulk_out_pipe != NULL) - sc->sc_flags |= UBTBCMFW_BULK_OUT_DEV; - else - error = ENXIO; - } else - error = EBUSY; - break; + sc->sc_flags &= ~UBTBCMFW_FLAG_WRITE_STALL; + usbd_transfer_start(xfer_other); + return; - default: - error = ENXIO; - break; - } - - return (error); + tr_error: + /* bomb out */ + sc->sc_flags &= ~UBTBCMFW_FLAG_WRITE_STALL; + usb_cdev_get_data_error(&(sc->sc_cdev)); + return; } -/* - * Close endpoint device - * XXX FIXME softc locking - */ - -Static int -ubtbcmfw_close(struct cdev *dev, int flag, int mode, usb_proc_ptr p) +static void +ubtbcmfw_read_callback(struct usbd_xfer *xfer) { - ubtbcmfw_softc_p sc = NULL; + struct ubtbcmfw_softc *sc = xfer->priv_sc; + struct usbd_mbuf *m; - USB_GET_SC(ubtbcmfw, UBTBCMFW_UNIT(dev), sc); - if (sc == NULL) - return (ENXIO); + USBD_CHECK_STATUS(xfer); - switch (UBTBCMFW_ENDPOINT(dev)) { - case USB_CONTROL_ENDPOINT: - sc->sc_flags &= ~UBTBCMFW_CTRL_DEV; - break; + tr_transferred: + usb_cdev_put_data(&(sc->sc_cdev), xfer->buffer, xfer->actlen, 1); - case UBTBCMFW_INTR_IN: - if (sc->sc_intr_in_pipe != NULL) - usbd_abort_pipe(sc->sc_intr_in_pipe); + tr_setup: + if (sc->sc_flags & UBTBCMFW_FLAG_READ_STALL) { + usbd_transfer_start(sc->sc_xfer[3]); + return; + } - sc->sc_flags &= ~UBTBCMFW_INTR_IN_DEV; - break; + USBD_IF_POLL(&sc->sc_cdev.sc_rdq_free, m); - case UBTBCMFW_BULK_OUT: - if (sc->sc_bulk_out_pipe != NULL) - usbd_abort_pipe(sc->sc_bulk_out_pipe); + if (m) { + usbd_start_hardware(xfer); + } + return; - sc->sc_flags &= ~UBTBCMFW_BULK_OUT_DEV; - break; + tr_error: + if (xfer->error != USBD_CANCELLED) { + /* try to clear stall first */ + sc->sc_flags |= UBTBCMFW_FLAG_READ_STALL; + usbd_transfer_start(sc->sc_xfer[3]); } - - return (0); + return; } -/* - * Read from the endpoint device - * XXX FIXME softc locking - */ - -Static int -ubtbcmfw_read(struct cdev *dev, struct uio *uio, int flag) +static void +ubtbcmfw_read_clear_stall_callback(struct usbd_xfer *xfer) { - ubtbcmfw_softc_p sc = NULL; - u_int8_t buf[UBTBCMFW_BSIZE]; - usbd_xfer_handle xfer; - usbd_status err; - int n, tn, error = 0; + struct ubtbcmfw_softc *sc = xfer->priv_sc; + struct usbd_xfer *xfer_other = sc->sc_xfer[1]; - USB_GET_SC(ubtbcmfw, UBTBCMFW_UNIT(dev), sc); - if (sc == NULL || sc->sc_dying) - return (ENXIO); + USBD_CHECK_STATUS(xfer); - if (UBTBCMFW_ENDPOINT(dev) != UBTBCMFW_INTR_IN) - return (EOPNOTSUPP); - if (sc->sc_intr_in_pipe == NULL) - return (ENXIO); + tr_setup: + /* start clear stall */ + usbd_clear_stall_tr_setup(xfer, xfer_other); + return; - xfer = usbd_alloc_xfer(sc->sc_udev); - if (xfer == NULL) - return (ENOMEM); + tr_transferred: + usbd_clear_stall_tr_transferred(xfer, xfer_other); - sc->sc_refcnt ++; + sc->sc_flags &= ~UBTBCMFW_FLAG_READ_STALL; + usbd_transfer_start(xfer_other); + return; - while ((n = min(sizeof(buf), uio->uio_resid)) != 0) { - tn = n; - err = usbd_bulk_transfer(xfer, sc->sc_intr_in_pipe, - USBD_SHORT_XFER_OK, USBD_DEFAULT_TIMEOUT, - buf, &tn, "bcmrd"); - switch (err) { - case USBD_NORMAL_COMPLETION: - error = uiomove(buf, tn, uio); - break; + tr_error: + /* bomb out */ + sc->sc_flags &= ~UBTBCMFW_FLAG_READ_STALL; + usb_cdev_put_data_error(&(sc->sc_cdev)); + return; +} - case USBD_INTERRUPTED: - error = EINTR; - break; +static void +ubtbcmfw_start_read(struct usb_cdev *cdev) +{ + struct ubtbcmfw_softc *sc = cdev->sc_priv_ptr; + usbd_transfer_start(sc->sc_xfer[1]); + return; +} - case USBD_TIMEOUT: - error = ETIMEDOUT; - break; +static void +ubtbcmfw_stop_read(struct usb_cdev *cdev) +{ + struct ubtbcmfw_softc *sc = cdev->sc_priv_ptr; + usbd_transfer_stop(sc->sc_xfer[3]); + usbd_transfer_stop(sc->sc_xfer[1]); + return; +} - default: - error = EIO; - break; - } +static void +ubtbcmfw_start_write(struct usb_cdev *cdev) +{ + struct ubtbcmfw_softc *sc = cdev->sc_priv_ptr; + usbd_transfer_start(sc->sc_xfer[0]); + return; +} - if (error != 0 || tn < n) - break; - } - - usbd_free_xfer(xfer); - - if (-- sc->sc_refcnt < 0) - usb_detach_wakeup(USBDEV(sc->sc_dev)); - - return (error); +static void +ubtbcmfw_stop_write(struct usb_cdev *cdev) +{ + struct ubtbcmfw_softc *sc = cdev->sc_priv_ptr; + usbd_transfer_stop(sc->sc_xfer[2]); + usbd_transfer_stop(sc->sc_xfer[0]); + return; } -/* - * Write into the endpoint device - * XXX FIXME softc locking - */ - -Static int -ubtbcmfw_write(struct cdev *dev, struct uio *uio, int flag) +static int32_t +ubtbcmfw_open(struct usb_cdev *cdev, int32_t fflags, + int32_t devtype, struct thread *td) { - ubtbcmfw_softc_p sc = NULL; - u_int8_t buf[UBTBCMFW_BSIZE]; - usbd_xfer_handle xfer; - usbd_status err; - int n, error = 0; + struct ubtbcmfw_softc *sc = cdev->sc_priv_ptr; - USB_GET_SC(ubtbcmfw, UBTBCMFW_UNIT(dev), sc); - if (sc == NULL || sc->sc_dying) - return (ENXIO); - - if (UBTBCMFW_ENDPOINT(dev) != UBTBCMFW_BULK_OUT) - return (EOPNOTSUPP); - if (sc->sc_bulk_out_pipe == NULL) - return (ENXIO); - - xfer = usbd_alloc_xfer(sc->sc_udev); - if (xfer == NULL) - return (ENOMEM); - - sc->sc_refcnt ++; - - while ((n = min(sizeof(buf), uio->uio_resid)) != 0) { - error = uiomove(buf, n, uio); - if (error != 0) - break; - - err = usbd_bulk_transfer(xfer, sc->sc_bulk_out_pipe, - 0, USBD_DEFAULT_TIMEOUT, buf, &n, "bcmwr"); - switch (err) { - case USBD_NORMAL_COMPLETION: - break; - - case USBD_INTERRUPTED: - error = EINTR; - break; - - case USBD_TIMEOUT: - error = ETIMEDOUT; - break; - - default: - error = EIO; - break; - } - - if (error != 0) - break; + if (fflags & FWRITE) { + sc->sc_flags |= UBTBCMFW_FLAG_WRITE_STALL; } - - usbd_free_xfer(xfer); - - if (-- sc->sc_refcnt < 0) - usb_detach_wakeup(USBDEV(sc->sc_dev)); - - return (error); + return 0; } -/* - * Process ioctl on the endpoint device - * XXX FIXME softc locking - */ - -Static int -ubtbcmfw_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, usb_proc_ptr p) +static int32_t +ubtbcmfw_ioctl(struct usb_cdev *cdev, u_long cmd, caddr_t data, + int32_t fflags, struct thread *td) { - ubtbcmfw_softc_p sc = NULL; - int error = 0; - - USB_GET_SC(ubtbcmfw, UBTBCMFW_UNIT(dev), sc); - if (sc == NULL || sc->sc_dying) - return (ENXIO); - - if (UBTBCMFW_ENDPOINT(dev) != USB_CONTROL_ENDPOINT) - return (EOPNOTSUPP); - - sc->sc_refcnt ++; + struct ubtbcmfw_softc *sc = cdev->sc_priv_ptr; + int32_t error = 0; switch (cmd) { case USB_GET_DEVICE_DESC: @@ -510,47 +473,5 @@ break; } - if (-- sc->sc_refcnt < 0) - usb_detach_wakeup(USBDEV(sc->sc_dev)); - return (error); } - -/* - * Poll the endpoint device - * XXX FIXME softc locking - */ - -Static int -ubtbcmfw_poll(struct cdev *dev, int events, usb_proc_ptr p) -{ - ubtbcmfw_softc_p sc = NULL; - int revents = 0; - - USB_GET_SC(ubtbcmfw, UBTBCMFW_UNIT(dev), sc); - if (sc == NULL) - return (ENXIO); - - switch (UBTBCMFW_ENDPOINT(dev)) { - case UBTBCMFW_INTR_IN: - if (sc->sc_intr_in_pipe != NULL) - revents |= events & (POLLIN | POLLRDNORM); - else - revents = ENXIO; - break; - - case UBTBCMFW_BULK_OUT: - if (sc->sc_bulk_out_pipe != NULL) - revents |= events & (POLLOUT | POLLWRNORM); - else - revents = ENXIO; - break; - - default: - revents = EOPNOTSUPP; - break; - } - - return (revents); -} - From owner-p4-projects@FreeBSD.ORG Sun Sep 17 10:35:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D5C316A415; Sun, 17 Sep 2006 10:35:39 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D0DDF16A403 for ; Sun, 17 Sep 2006 10:35:38 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7F43B43D49 for ; Sun, 17 Sep 2006 10:35:38 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8HAZcVk006203 for ; Sun, 17 Sep 2006 10:35:38 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8HAZcGu006200 for perforce@freebsd.org; Sun, 17 Sep 2006 10:35:38 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 17 Sep 2006 10:35:38 GMT Message-Id: <200609171035.k8HAZcGu006200@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 106232 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Sep 2006 10:35:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=106232 Change 106232 by hselasky@hselasky_mini_itx on 2006/09/17 10:35:02 Diff reduction against FreeBSD-7-current. Affected files ... .. //depot/projects/usb/src/sys/conf/files#7 edit Differences ... ==== //depot/projects/usb/src/sys/conf/files#7 (text+ko) ==== @@ -974,25 +974,8 @@ dev/ubsec/ubsec.c optional ubsec # # USB support -dev/usb/uhci.c optional uhci -dev/usb/uhci_pci.c optional uhci -dev/usb/ohci.c optional ohci -dev/usb/ohci_pci.c optional ohci dev/usb/ehci.c optional ehci -dev/usb/ehci_pci.c optional ehci -dev/usb/uhub.c optional usb -dev/usb/usb.c optional usb -dev/usb/usb_requests.c optional usb -dev/usb/usb_subr.c optional usb -dev/usb/usb_transfer.c optional usb -dev/usb/usb_if.m optional usb -dev/usb/usb_quirks.c optional usb -dev/usb/usb_hid.c optional usb -dev/usb/usb_cdev.c optional usb -dev/usb/ugen.c optional ugen -dev/usb/ulpt.c optional ulpt -dev/usb/ums.c optional ums -dev/usb/ukbd.c optional ukbd +dev/usb/ehci_pci.c optional ehci pci dev/usb/if_aue.c optional aue dev/usb/if_axe.c optional axe dev/usb/if_cdce.c optional cdce @@ -1001,9 +984,8 @@ dev/usb/if_ural.c optional ural dev/usb/if_rue.c optional rue dev/usb/if_udav.c optional udav -dev/usb/ufm.c optional ufm -# -# USB support (not merged) +dev/usb/ohci.c optional ohci +dev/usb/ohci_pci.c optional ohci pci dev/usb/sl811hs.c optional slhci dev/usb/slhci_pccard.c optional slhci pccard dev/usb/ubsa.c optional ubsa ucom @@ -1012,13 +994,29 @@ dev/usb/ucycom.c optional ucycom ucom dev/usb/udbp.c optional udbp dev/usb/ufoma.c optional ufoma ucom +dev/usb/ufm.c optional ufm dev/usb/uftdi.c optional uftdi ucom +dev/usb/ugen.c optional ugen +dev/usb/uhci.c optional uhci +dev/usb/uhci_pci.c optional uhci pci dev/usb/uhid.c optional uhid +dev/usb/uhub.c optional usb +dev/usb/ukbd.c optional ukbd +dev/usb/ulpt.c optional ulpt dev/usb/umass.c optional umass dev/usb/umct.c optional umct dev/usb/umodem.c optional umodem +dev/usb/ums.c optional ums dev/usb/uplcom.c optional uplcom ucom dev/usb/urio.c optional urio +dev/usb/usb.c optional usb +dev/usb/usb_cdev.c optional usb +dev/usb/usb_hid.c optional usb +dev/usb/usb_if.m optional usb +dev/usb/usb_quirks.c optional usb +dev/usb/usb_requests.c optional usb +dev/usb/usb_subr.c optional usb +dev/usb/usb_transfer.c optional usb dev/usb/uscanner.c optional uscanner dev/usb/uvisor.c optional uvisor ucom dev/usb/uvscom.c optional uvscom ucom From owner-p4-projects@FreeBSD.ORG Sun Sep 17 11:02:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A488416A416; Sun, 17 Sep 2006 11:02:15 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 64A4816A47B for ; Sun, 17 Sep 2006 11:02:15 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 58F4543D6D for ; Sun, 17 Sep 2006 11:02:13 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8HB2Dmm008756 for ; Sun, 17 Sep 2006 11:02:13 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8HB2Dql008753 for perforce@freebsd.org; Sun, 17 Sep 2006 11:02:13 GMT (envelope-from piso@freebsd.org) Date: Sun, 17 Sep 2006 11:02:13 GMT Message-Id: <200609171102.k8HB2Dql008753@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 106234 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Sep 2006 11:02:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=106234 Change 106234 by piso@piso_newluxor on 2006/09/17 11:01:13 Update a stale comment. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_dummy.c#12 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_dummy.c#12 (text+ko) ==== @@ -93,11 +93,11 @@ } /* - * NOTA BENE: these 2 variables MUST NOT be renamed in any case if you want - * your module to work in userland, cause they are used to find and use all + * NOTA BENE: the next variable MUST NOT be renamed in any case if you want + * your module to work in userland, cause it's used to find and use all * the protocol handlers present in every module. - * So WATCH OUT, your module needs these 2 variables, and it needs them with - * THEIR EXACT NAMES: handlers and entries. + * So WATCH OUT, your module needs this variables and it needs it with + * ITS EXACT NAME: handlers. */ struct proto_handler handlers [] = { From owner-p4-projects@FreeBSD.ORG Sun Sep 17 11:09:23 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B263616A415; Sun, 17 Sep 2006 11:09:23 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8DA8616A412 for ; Sun, 17 Sep 2006 11:09:23 +0000 (UTC) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 592DF43D49 for ; Sun, 17 Sep 2006 11:09:23 +0000 (GMT) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8HB9N5G010238 for ; Sun, 17 Sep 2006 11:09:23 GMT (envelope-from netchild@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8HB9MC4010235 for perforce@freebsd.org; Sun, 17 Sep 2006 11:09:22 GMT (envelope-from netchild@freebsd.org) Date: Sun, 17 Sep 2006 11:09:22 GMT Message-Id: <200609171109.k8HB9MC4010235@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to netchild@freebsd.org using -f From: Alexander Leidinger To: Perforce Change Reviews Cc: Subject: PERFORCE change 106236 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Sep 2006 11:09:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=106236 Change 106236 by netchild@netchild_magellan on 2006/09/17 11:08:35 Include the right files on amd64. Noticed by: bsam Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_aio.c#3 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_aio.c#3 (text+ko) ==== @@ -44,8 +44,13 @@ #include #include +#ifdef COMPAT_LINUX32 +#include +#include +#else #include #include +#endif #define LINUX_AIO_DEBUG From owner-p4-projects@FreeBSD.ORG Sun Sep 17 11:59:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CA40016A412; Sun, 17 Sep 2006 11:59:35 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4E09C16A403 for ; Sun, 17 Sep 2006 11:59:35 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DB1E843D62 for ; Sun, 17 Sep 2006 11:59:34 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8HBxYM4012856 for ; Sun, 17 Sep 2006 11:59:34 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8HBxQoh012850 for perforce@freebsd.org; Sun, 17 Sep 2006 11:59:26 GMT (envelope-from piso@freebsd.org) Date: Sun, 17 Sep 2006 11:59:26 GMT Message-Id: <200609171159.k8HBxQoh012850@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 106238 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Sep 2006 11:59:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=106238 Change 106238 by piso@piso_newluxor on 2006/09/17 11:58:54 IFC@106237 Affected files ... .. //depot/projects/soc2005/libalias/MAINTAINERS#4 integrate .. //depot/projects/soc2005/libalias/Makefile#7 integrate .. //depot/projects/soc2005/libalias/Makefile.inc1#5 integrate .. //depot/projects/soc2005/libalias/ObsoleteFiles.inc#5 integrate .. //depot/projects/soc2005/libalias/UPDATING#6 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/CHANGES#2 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/query.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/resolver.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/version#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/CHANGES#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/CREDITS#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/FREEBSD-upgrade#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/README.dag#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/VERSION#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/config.h.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/configure#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/configure.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/doc/pcap.html#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/doc/pcap.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/doc/pcap.xml#1 branch .. //depot/projects/soc2005/libalias/contrib/libpcap/ethertype.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/fad-win32.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/gencode.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/gencode.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/grammar.y#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-bpf.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-bpf.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-dag.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-dag.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-dlpi.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-int.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-linux.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-stdinc.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-win32.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap.3#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/pcap.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/savefile.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/libpcap/scanner.l#2 integrate .. //depot/projects/soc2005/libalias/contrib/tar/ABOUT-NLS#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/AUTHORS#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/COPYING#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/ChangeLog#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/ChangeLog.1#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/FREEBSD-Xlist#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/FREEBSD-upgrade#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/INSTALL#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/NEWS#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/PORTS#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/README#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/README-alpha#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/THANKS#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/TODO#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/doc/fdl.texi#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/doc/freemanuals.texi#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/doc/getdate.texi#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/doc/header.texi#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/doc/tar.texi#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/doc/version.texi#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/addext.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/alloca.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/argmatch.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/argmatch.h#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/backupfile.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/backupfile.h#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/basename.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/dirname.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/dirname.h#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/error.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/error.h#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/exclude.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/exclude.h#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/fileblocks.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/fnmatch.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/fnmatch.hin#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/ftruncate.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/full-write.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/full-write.h#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/getdate.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/getdate.h#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/getline.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/getline.h#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/getstr.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/getstr.h#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/hash.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/hash.h#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/human.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/human.h#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/lchown.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/lchown.h#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/malloc.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/memset.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/mktime.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/modechange.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/modechange.h#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/msleep.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/prepargs.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/prepargs.h#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/print-copyr.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/print-copyr.h#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/quote.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/quote.h#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/quotearg.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/quotearg.h#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/readutmp.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/realloc.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/rename.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/rmdir.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/safe-read.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/safe-read.h#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/save-cwd.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/save-cwd.h#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/savedir.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/savedir.h#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/stpcpy.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/strcasecmp.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/strncasecmp.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/strstr.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/strtoimax.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/strtol.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/strtoll.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/strtoul.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/strtoull.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/strtoumax.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/unicodeio.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/unicodeio.h#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/utime.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/waitpid.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/xalloc.h#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/xgetcwd.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/xmalloc.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/xstrdup.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/xstrtoimax.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/xstrtol.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/xstrtol.h#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/xstrtoul.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/lib/xstrtoumax.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/src/arith.h#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/src/buffer.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/src/common.h#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/src/compare.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/src/create.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/src/delete.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/src/extract.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/src/incremen.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/src/list.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/src/mangle.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/src/misc.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/src/names.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/src/rmt.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/src/rmt.h#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/src/rtapelib.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/src/system.h#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/src/tar.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/src/tar.h#2 delete .. //depot/projects/soc2005/libalias/contrib/tar/src/update.c#2 delete .. //depot/projects/soc2005/libalias/contrib/tcpdump/CHANGES#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/CREDITS#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/FILES#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/INSTALL#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/Makefile.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/VERSION#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/addrtoname.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/configure#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/configure.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/dccp.h#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/ethertype.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/icmp6.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/interface.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/ipproto.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/ipproto.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/llc.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/netdissect.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/ospf.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/ppp.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-802_11.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-ap1394.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-ascii.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-atm.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-chdlc.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-cip.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-dccp.c#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-ether.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-fddi.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-fr.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-icmp6.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-ip.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-ip6.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-ipfc.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-ipx.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-isoclns.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-juniper.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-lane.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-ldp.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-llc.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-null.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-ospf.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-pflog.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-pim.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-radius.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-rsvp.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-sctp.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-sll.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-slow.c#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-symantec.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-tcp.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/print-token.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/tcpdump-stdinc.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/tcpdump.1#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/tcpdump.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/.cvsignore#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/02-sunrise-sunset-esp.puu#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/08-sunrise-sunset-aes.puu#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/08-sunrise-sunset-esp2.puu#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/alltests.sh#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/bgp_vpn_attrset.out#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/bgp_vpn_attrset.sh#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/eapon1.gdbinit#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/eapon1.out#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/eapon1.puu#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/eapon1.sh#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/eapon2.puu#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/esp-secrets.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/esp0.out#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/esp0.sh#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/esp1.gdbinit#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/esp1.out#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/esp1.sh#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/esp2.gdbinit#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/esp2.out#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/esp2.sh#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/esp3.gdbinit#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/esp3.sh#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/esp4.gdbinit#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/esp4.sh#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/esp5.gdbinit#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/esp5.out#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/esp5.sh#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/espudp1.out#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/espudp1.puu#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/espudp1.sh#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/isakmp-delete-segfault.puu#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/isakmp-identification-segfault.puu#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/isakmp-pointer-loop.puu#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/isakmp1.out#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/isakmp1.sh#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/isakmp2.out#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/isakmp2.sh#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/isakmp3.out#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/isakmp3.sh#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/isakmp4.out#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/isakmp4.sh#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/isakmp4500.puu#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/lmp.out#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/lmp.puu#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/lmp.sh#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/mpls-ldp-hello.out#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/mpls-ldp-hello.puu#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/mpls-ldp-hello.sh#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/ospf-gmpls.out#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/ospf-gmpls.puu#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/ospf-gmpls.sh#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/print-A.out#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/print-AA.out#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/print-X.out#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/print-XX.out#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/print-capX.out#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/print-capXX.out#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/print-flags.puu#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/print-flags.sh#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/print-x.out#1 branch .. //depot/projects/soc2005/libalias/contrib/tcpdump/tests/print-xx.out#1 branch .. //depot/projects/soc2005/libalias/crypto/openssh/monitor.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rsa/rsa_sign.c#3 integrate .. //depot/projects/soc2005/libalias/etc/defaults/rc.conf#5 integrate .. //depot/projects/soc2005/libalias/etc/mtree/BSD.include.dist#3 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/Makefile#4 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/bthidd#1 branch .. //depot/projects/soc2005/libalias/gnu/usr.bin/binutils/Makefile.inc#2 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/binutils/as/Makefile#2 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/binutils/as/arm-freebsd/targ-cpu.h#1 branch .. //depot/projects/soc2005/libalias/gnu/usr.bin/binutils/ld/Makefile.arm#2 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/binutils/ld/armelf_fbsd.sh#1 branch .. //depot/projects/soc2005/libalias/gnu/usr.bin/binutils/ld/armelfb_fbsd.sh#1 branch .. //depot/projects/soc2005/libalias/gnu/usr.bin/binutils/ld/genscripts.sh#2 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/binutils/libbfd/Makefile.arm#3 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/binutils/libiberty/config.h#2 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/cc/Makefile.tgt#2 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/cc/cc_int/Makefile#2 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/cc/cc_int/amd64.patch#2 delete .. //depot/projects/soc2005/libalias/gnu/usr.bin/cc/cc_tools/Makefile#2 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/cc/cpp/Makefile#2 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/gdb/arch/arm/Makefile#1 branch .. //depot/projects/soc2005/libalias/gnu/usr.bin/gdb/arch/arm/armfbsd-nat.c#1 branch .. //depot/projects/soc2005/libalias/gnu/usr.bin/gdb/arch/arm/armfbsd-tdep.c#1 branch .. //depot/projects/soc2005/libalias/gnu/usr.bin/gdb/arch/arm/config.h#1 branch .. //depot/projects/soc2005/libalias/gnu/usr.bin/gdb/arch/arm/init.c#1 branch .. //depot/projects/soc2005/libalias/gnu/usr.bin/gdb/arch/arm/nm-fbsd.h#1 branch .. //depot/projects/soc2005/libalias/gnu/usr.bin/gdb/arch/arm/tm-fbsd.h#1 branch .. //depot/projects/soc2005/libalias/gnu/usr.bin/gdb/arch/arm/xm-fbsd.h#1 branch .. //depot/projects/soc2005/libalias/gnu/usr.bin/gdb/kgdb/trgt_arm.c#2 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/tar/Makefile#2 delete .. //depot/projects/soc2005/libalias/gnu/usr.bin/tar/config.h#2 delete .. //depot/projects/soc2005/libalias/gnu/usr.bin/tar/doc/Makefile#2 delete .. //depot/projects/soc2005/libalias/gnu/usr.bin/tar/localedir.h#2 delete .. //depot/projects/soc2005/libalias/gnu/usr.bin/tar/tar.1#2 delete .. //depot/projects/soc2005/libalias/include/Makefile#3 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/Makefile#2 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive.h.in#3 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_private.h#3 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_read.3#2 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_read.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_read_extract.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_read_open_file.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_read_support_format_tar.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_write.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/i386/gen/Makefile.inc#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/i386/gen/alloca.S#2 delete .. //depot/projects/soc2005/libalias/lib/libc/rpc/clnt_bcast.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/rpc/clnt_vc.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/rpc/getnetconfig.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/rpc/getnetpath.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/rpc/rpcb_clnt.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/rpc/rpcb_prot.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/rpc/svc_simple.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/rpc/svc_vc.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdlib/alloca.3#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdlib/malloc.c#7 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/recv.2#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/send.2#2 integrate .. //depot/projects/soc2005/libalias/lib/libpam/modules/pam_login_access/login.access.5#2 integrate .. //depot/projects/soc2005/libalias/lib/libpam/modules/pam_opie/pam_opie.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_atfork.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_barrier.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_cond.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_event.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_fork.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_init.c#5 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_list.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_mutex.c#5 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_private.h#5 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_pspinlock.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_sem.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_setprio.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_setschedparam.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_sig.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_spinlock.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_umtx.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_umtx.h#3 integrate .. //depot/projects/soc2005/libalias/lib/libutil/pw_util.c#3 integrate .. //depot/projects/soc2005/libalias/libexec/rtld-elf/rtld.c#4 integrate .. //depot/projects/soc2005/libalias/release/Makefile#3 integrate .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#9 integrate .. //depot/projects/soc2005/libalias/release/scripts/kernels-install.sh#3 integrate .. //depot/projects/soc2005/libalias/release/scripts/package-split.py#2 integrate .. //depot/projects/soc2005/libalias/sbin/geom/class/eli/geli.8#3 integrate .. //depot/projects/soc2005/libalias/sbin/geom/class/eli/geom_eli.c#3 integrate .. //depot/projects/soc2005/libalias/sbin/geom/class/nop/geom_nop.c#2 integrate .. //depot/projects/soc2005/libalias/sbin/geom/class/nop/gnop.8#2 integrate .. //depot/projects/soc2005/libalias/sbin/ifconfig/ifconfig.8#3 integrate .. //depot/projects/soc2005/libalias/sbin/ifconfig/ifconfig.c#3 integrate .. //depot/projects/soc2005/libalias/sbin/ipf/ipf/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sbin/ipf/ipftest/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sbin/ipf/ipmon/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sbin/ipf/ipnat/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sbin/ipf/ippool/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sbin/ipfw/ipfw2.c#9 integrate .. //depot/projects/soc2005/libalias/sbin/mount/mount.8#3 integrate .. //depot/projects/soc2005/libalias/sbin/mount_std/mount_std.c#2 integrate .. //depot/projects/soc2005/libalias/sbin/sconfig/sconfig.c#2 integrate .. //depot/projects/soc2005/libalias/sbin/sysctl/sysctl.c#5 integrate .. //depot/projects/soc2005/libalias/share/examples/etc/make.conf#3 integrate .. //depot/projects/soc2005/libalias/share/man/man4/ddb.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/em.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/iic.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/ipmi.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/mxge.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/tcp.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man5/make.conf.5#2 integrate .. //depot/projects/soc2005/libalias/share/man/man5/src.conf.5#3 integrate .. //depot/projects/soc2005/libalias/share/man/man7/hier.7#4 integrate .. //depot/projects/soc2005/libalias/share/man/man7/security.7#3 integrate .. //depot/projects/soc2005/libalias/share/man/man9/device_add_child.9#2 integrate .. //depot/projects/soc2005/libalias/share/man/man9/printf.9#2 integrate .. //depot/projects/soc2005/libalias/share/mk/bsd.lib.mk#3 integrate .. //depot/projects/soc2005/libalias/share/mk/bsd.own.mk#2 integrate .. //depot/projects/soc2005/libalias/share/mk/bsd.prog.mk#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/local_apic.c#3 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/machdep.c#3 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/mp_machdep.c#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/nexus.c#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux32_sysvec.c#4 integrate .. //depot/projects/soc2005/libalias/sys/arm/at91/at91_twi.c#3 integrate .. //depot/projects/soc2005/libalias/sys/arm/at91/if_atereg.h#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/i386/pxeldr/pxeldr.S#2 integrate .. //depot/projects/soc2005/libalias/sys/cam/cam_xpt.c#3 integrate .. //depot/projects/soc2005/libalias/sys/cam/scsi/scsi_da.c#3 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_proto.h#6 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_syscall.h#6 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_syscalls.c#6 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_sysent.c#6 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/syscalls.master#6 integrate .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_emul.c#4 integrate .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_file.c#3 integrate .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_futex.c#4 integrate .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_misc.c#6 integrate .. //depot/projects/soc2005/libalias/sys/conf/files.amd64#5 integrate .. //depot/projects/soc2005/libalias/sys/contrib/pf/net/pf.c#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/pf/net/pf_ioctl.c#3 integrate .. //depot/projects/soc2005/libalias/sys/crypto/via/padlock_cipher.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/acpica/acpi.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/aic7xxx/aic7xxx_osm.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-all.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-chipset.c#7 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-disk.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-pci.h#5 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-raid.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-usb.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/bge/if_bge.c#7 integrate .. //depot/projects/soc2005/libalias/sys/dev/bge/if_bgereg.h#6 integrate .. //depot/projects/soc2005/libalias/sys/dev/bktr/bktr_i2c.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/cs/if_cs.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/cs/if_csvar.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/dc/if_dc.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/dc/if_dcreg.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/de/if_de.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/de/if_devar.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/drm/drmP.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/drm/drm_drv.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/drm/drm_pciids.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/drm/i915_dma.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/drm/i915_drm.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/drm/i915_drv.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/drm/i915_irq.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/drm/mach64_drm.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/drm/radeon_cp.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/drm/radeon_drm.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/drm/radeon_drv.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/drm/radeon_state.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/if_em.c#8 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/if_em.h#5 integrate .. //depot/projects/soc2005/libalias/sys/dev/en/if_en_pci.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/en/midway.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/fdc/fdc.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/ic/nec765.h#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/ichsmb/ichsmb.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/if_ndis/if_ndis_usb.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/iicbus/iic.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/iicbus/iicsmb.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/lge/if_lge.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/lge/if_lgereg.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mfi/mfi.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/mfi/mfireg.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mpt/mpt.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/mpt/mpt.h#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/mpt/mpt_cam.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/mpt/mpt_pci.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/mxge/eth_z8e.dat.gz.uu#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mxge/ethp_z8e.dat.gz.uu#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mxge/if_mxge.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/mxge/if_mxge_var.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mxge/mxge_mcp.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/my/if_my.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/my/if_myreg.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/nfe/if_nfe.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/nfe/if_nfereg.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/nge/if_nge.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/nge/if_ngereg.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/re/if_re.c#5 integrate .. //depot/projects/soc2005/libalias/sys/dev/sio/sio_pccard.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/smbus/smb.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/smbus/smb.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/smbus/smbconf.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/smbus/smbconf.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/smbus/smbus.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/smbus/smbus.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/smbus/smbus_if.m#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/usb/uaudio.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/syscons/scmouse.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/syscons/syscons.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/syscons/syscons.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ti/if_ti.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/ehci.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/ehcivar.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/hid.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/if_aue.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/if_axe.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/if_cdce.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/if_cue.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/if_kue.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/if_rue.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/if_udav.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/if_udavreg.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/if_ural.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/if_uralvar.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/kue_fw.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/ohci.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/ohcivar.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/sl811hs.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/sl811hsvar.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/ubsa.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/ubser.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/ucom.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/ucomvar.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/udbp.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/ufm.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/ufoma.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/uftdi.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/ugen.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/uhci.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/uhcivar.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/uhid.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/uhub.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/ukbd.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/ulpt.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/umass.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/umct.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/umodem.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/ums.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/uplcom.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/urio.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/usb.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/usb.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/usb_ethersubr.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/usb_mem.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/usb_port.h#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/usb_quirks.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/usb_subr.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/usbdi.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/usbdi.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/usbdi_util.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/usbdi_util.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/usbdivar.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/uscanner.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/uvisor.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/uvscom.c#2 integrate .. //depot/projects/soc2005/libalias/sys/fs/udf/osta.h#2 integrate .. //depot/projects/soc2005/libalias/sys/geom/eli/g_eli.h#3 integrate .. //depot/projects/soc2005/libalias/sys/geom/eli/g_eli_ctl.c#3 integrate .. //depot/projects/soc2005/libalias/sys/geom/gate/g_gate.c#2 integrate .. //depot/projects/soc2005/libalias/sys/geom/gate/g_gate.h#2 integrate .. //depot/projects/soc2005/libalias/sys/geom/geom.h#3 integrate .. //depot/projects/soc2005/libalias/sys/geom/geom_event.c#2 integrate .. //depot/projects/soc2005/libalias/sys/geom/geom_subr.c#2 integrate .. //depot/projects/soc2005/libalias/sys/geom/label/g_label_ufs.c#2 integrate .. //depot/projects/soc2005/libalias/sys/geom/mirror/g_mirror.c#4 integrate .. //depot/projects/soc2005/libalias/sys/geom/nop/g_nop.c#2 integrate .. //depot/projects/soc2005/libalias/sys/geom/nop/g_nop.h#2 integrate .. //depot/projects/soc2005/libalias/sys/geom/raid3/g_raid3.c#4 integrate .. //depot/projects/soc2005/libalias/sys/geom/raid3/g_raid3_ctl.c#3 integrate .. //depot/projects/soc2005/libalias/sys/i386/acpica/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/conf/NOTES#4 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/busdma_machdep.c#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/local_apic.c#3 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/machdep.c#5 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/mp_machdep.c#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/nexus.c#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/sys_machdep.c#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/linux_sysvec.c#4 integrate .. //depot/projects/soc2005/libalias/sys/ia64/ia32/ia32_trap.c#3 integrate .. //depot/projects/soc2005/libalias/sys/ia64/ia64/trap.c#4 integrate .. //depot/projects/soc2005/libalias/sys/kern/bus_if.m#4 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_acct.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_exit.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_ktr.c#3 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_umtx.c#5 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_bus.c#5 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_rman.c#3 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_witness.c#3 integrate .. //depot/projects/soc2005/libalias/sys/kern/tty.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/uipc_sockbuf.c#3 integrate .. //depot/projects/soc2005/libalias/sys/kern/uipc_socket.c#5 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_aio.c#3 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_lookup.c#3 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_subr.c#4 integrate .. //depot/projects/soc2005/libalias/sys/modules/Makefile#8 integrate .. //depot/projects/soc2005/libalias/sys/modules/agp/Makefile#3 integrate .. //depot/projects/soc2005/libalias/sys/modules/ipfw/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/modules/pf/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/net/if.c#3 integrate .. //depot/projects/soc2005/libalias/sys/net/if.h#2 integrate .. //depot/projects/soc2005/libalias/sys/net/if_bridge.c#8 integrate .. //depot/projects/soc2005/libalias/sys/net/if_var.h#3 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#2 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/ng_eiface.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/ng_fec.c#3 integrate .. //depot/projects/soc2005/libalias/sys/netinet/in_pcb.c#3 integrate .. //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#14 integrate .. //depot/projects/soc2005/libalias/sys/netinet/ip_output.c#4 integrate .. //depot/projects/soc2005/libalias/sys/netinet/raw_ip.c#4 integrate .. //depot/projects/soc2005/libalias/sys/netinet/tcp_input.c#4 integrate .. //depot/projects/soc2005/libalias/sys/netinet/tcp_output.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet/tcp_subr.c#5 integrate .. //depot/projects/soc2005/libalias/sys/netinet/tcp_syncache.c#3 integrate .. //depot/projects/soc2005/libalias/sys/netinet/tcp_timer.c#3 integrate .. //depot/projects/soc2005/libalias/sys/netinet/tcp_timer.h#3 integrate .. //depot/projects/soc2005/libalias/sys/netinet/tcp_var.h#3 integrate .. //depot/projects/soc2005/libalias/sys/netinet/udp_usrreq.c#4 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/icmp6.c#4 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/ip6_forward.c#3 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/nd6.c#3 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/udp6_usrreq.c#3 integrate .. //depot/projects/soc2005/libalias/sys/nfs4client/nfs4_vfsops.c#2 integrate .. //depot/projects/soc2005/libalias/sys/nfs4client/nfs4_vnops.c#3 integrate .. //depot/projects/soc2005/libalias/sys/nfsclient/nfs_node.c#2 integrate .. //depot/projects/soc2005/libalias/sys/nfsclient/nfs_subs.c#2 integrate .. //depot/projects/soc2005/libalias/sys/nfsclient/nfs_vfsops.c#3 integrate .. //depot/projects/soc2005/libalias/sys/nfsclient/nfs_vnops.c#3 integrate .. //depot/projects/soc2005/libalias/sys/nfsclient/nfsnode.h#2 integrate .. //depot/projects/soc2005/libalias/sys/pc98/cbus/fdc.c#2 integrate .. //depot/projects/soc2005/libalias/sys/pci/alpm.c#2 integrate .. //depot/projects/soc2005/libalias/sys/pci/amdpm.c#2 integrate .. //depot/projects/soc2005/libalias/sys/pci/amdsmb.c#2 integrate .. //depot/projects/soc2005/libalias/sys/pci/if_rl.c#2 integrate .. //depot/projects/soc2005/libalias/sys/pci/if_sf.c#2 integrate .. //depot/projects/soc2005/libalias/sys/pci/if_sfreg.h#2 integrate .. //depot/projects/soc2005/libalias/sys/pci/if_sis.c#2 integrate .. //depot/projects/soc2005/libalias/sys/pci/if_sisreg.h#2 integrate .. //depot/projects/soc2005/libalias/sys/pci/if_ste.c#2 integrate .. //depot/projects/soc2005/libalias/sys/pci/if_tl.c#2 integrate .. //depot/projects/soc2005/libalias/sys/pci/if_tlreg.h#2 integrate .. //depot/projects/soc2005/libalias/sys/pci/if_vr.c#2 integrate .. //depot/projects/soc2005/libalias/sys/pci/if_vrreg.h#2 integrate .. //depot/projects/soc2005/libalias/sys/pci/if_wb.c#2 integrate .. //depot/projects/soc2005/libalias/sys/pci/if_wbreg.h#2 integrate .. //depot/projects/soc2005/libalias/sys/pci/if_xl.c#3 integrate .. //depot/projects/soc2005/libalias/sys/pci/if_xlreg.h#2 integrate .. //depot/projects/soc2005/libalias/sys/pci/intpm.c#2 integrate .. //depot/projects/soc2005/libalias/sys/pci/intpmreg.h#2 integrate .. //depot/projects/soc2005/libalias/sys/pci/nfsmb.c#3 integrate .. //depot/projects/soc2005/libalias/sys/pci/viapm.c#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/powerpc/trap.c#3 integrate .. //depot/projects/soc2005/libalias/sys/security/audit/audit.c#3 integrate .. //depot/projects/soc2005/libalias/sys/security/audit/audit_bsm.c#5 integrate .. //depot/projects/soc2005/libalias/sys/security/mac/mac_inet.c#2 integrate .. //depot/projects/soc2005/libalias/sys/security/mac_biba/mac_biba.c#4 integrate .. //depot/projects/soc2005/libalias/sys/security/mac_lomac/mac_lomac.c#2 integrate .. //depot/projects/soc2005/libalias/sys/security/mac_mls/mac_mls.c#3 integrate .. //depot/projects/soc2005/libalias/sys/sys/bus.h#4 integrate .. //depot/projects/soc2005/libalias/sys/sys/mac.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/mac_policy.h#3 integrate .. //depot/projects/soc2005/libalias/sys/sys/mbuf.h#3 integrate .. //depot/projects/soc2005/libalias/sys/sys/mount.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/param.h#6 integrate .. //depot/projects/soc2005/libalias/tools/build/options/WITHOUT_ASSERT_DEBUG#1 branch .. //depot/projects/soc2005/libalias/tools/build/options/makeman#3 integrate .. //depot/projects/soc2005/libalias/tools/regression/geom_eli/configure-b-B.t#1 branch .. //depot/projects/soc2005/libalias/tools/regression/priv/Makefile#1 branch .. //depot/projects/soc2005/libalias/tools/regression/priv/main.c#1 branch .. //depot/projects/soc2005/libalias/tools/regression/priv/main.h#1 branch .. //depot/projects/soc2005/libalias/tools/regression/priv/priv_acct.c#1 branch .. //depot/projects/soc2005/libalias/tools/regression/priv/priv_adjtime.c#1 branch .. //depot/projects/soc2005/libalias/tools/regression/priv/priv_clock_settime.c#1 branch .. //depot/projects/soc2005/libalias/tools/regression/priv/priv_io.c#1 branch .. //depot/projects/soc2005/libalias/tools/regression/priv/priv_kenv_set.c#1 branch .. //depot/projects/soc2005/libalias/tools/regression/priv/priv_kenv_unset.c#1 branch .. //depot/projects/soc2005/libalias/tools/regression/priv/priv_proc_setlogin.c#1 branch .. //depot/projects/soc2005/libalias/tools/regression/priv/priv_proc_setrlimit.c#1 branch .. //depot/projects/soc2005/libalias/tools/regression/priv/priv_sched_rtprio.c#1 branch .. //depot/projects/soc2005/libalias/tools/regression/priv/priv_sched_setpriority.c#1 branch .. //depot/projects/soc2005/libalias/tools/regression/priv/priv_settimeofday.c#1 branch .. //depot/projects/soc2005/libalias/tools/regression/priv/priv_sysctl_write.c#1 branch .. //depot/projects/soc2005/libalias/tools/regression/priv/priv_vfs_admin.c#1 branch .. //depot/projects/soc2005/libalias/tools/regression/priv/priv_vfs_chown.c#1 branch .. //depot/projects/soc2005/libalias/tools/regression/priv/priv_vfs_chroot.c#1 branch .. //depot/projects/soc2005/libalias/tools/regression/priv/priv_vfs_clearsugid.c#1 branch .. //depot/projects/soc2005/libalias/tools/regression/priv/priv_vfs_extattr_system.c#1 branch .. //depot/projects/soc2005/libalias/tools/regression/priv/priv_vfs_fhopen.c#1 branch .. //depot/projects/soc2005/libalias/tools/regression/priv/priv_vfs_fhstat.c#1 branch .. //depot/projects/soc2005/libalias/tools/regression/priv/priv_vfs_fhstatfs.c#1 branch .. //depot/projects/soc2005/libalias/tools/regression/priv/priv_vfs_generation.c#1 branch .. //depot/projects/soc2005/libalias/tools/regression/priv/priv_vfs_getfh.c#1 branch .. //depot/projects/soc2005/libalias/tools/regression/priv/priv_vfs_read_write.c#1 branch .. //depot/projects/soc2005/libalias/tools/regression/priv/priv_vfs_setgid.c#1 branch .. //depot/projects/soc2005/libalias/tools/regression/priv/priv_vfs_stickyfile.c#1 branch .. //depot/projects/soc2005/libalias/tools/regression/priv/priv_vm_madv_protect.c#1 branch .. //depot/projects/soc2005/libalias/tools/regression/priv/priv_vm_mlock.c#1 branch .. //depot/projects/soc2005/libalias/tools/regression/priv/priv_vm_munlock.c#1 branch .. //depot/projects/soc2005/libalias/tools/regression/priv/test_utimes.c#1 branch .. //depot/projects/soc2005/libalias/tools/regression/readonly.t#1 branch .. //depot/projects/soc2005/libalias/usr.bin/awk/Makefile#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/awk/lib.c.diff#1 branch .. //depot/projects/soc2005/libalias/usr.bin/awk/main.c.diff#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/calendar/calendars/calendar.freebsd#4 integrate .. //depot/projects/soc2005/libalias/usr.bin/calendar/calendars/calendar.holiday#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/indent/indent.c#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/login/login.1#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/paste/paste.c#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/su/su.1#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/tip/tip/cu.c#3 integrate .. //depot/projects/soc2005/libalias/usr.bin/truncate/truncate.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bluetooth/Makefile#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bluetooth/bthidd/Makefile#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bluetooth/bthidd/bthid_config.h#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bluetooth/bthidd/bthidd.8#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/bluetooth/bthidd/bthidd.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bluetooth/bthidd/bthidd.conf.sample#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bluetooth/bthidd/bthidd.h#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bluetooth/bthidd/client.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bluetooth/bthidd/hid.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bluetooth/bthidd/kbd.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bluetooth/bthidd/kbd.h#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bluetooth/bthidd/lexer.l#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bluetooth/bthidd/parser.y#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bluetooth/bthidd/server.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bluetooth/bthidd/session.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/edquota/edquota.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/inetd/inetd.8#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/inetd/inetd.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/inetd/inetd.h#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/kbdcontrol/kbdcontrol.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/ppp/command.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/ppp/lcp.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/ppp/ppp.8.m4#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/rpc.statd/procs.c#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/rpc.statd/statd.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/tcpdump/tcpdump/Makefile#2 integrate Differences ... ==== //depot/projects/soc2005/libalias/MAINTAINERS#4 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.140 2006/08/31 09:51:33 cperciva Exp $ +$FreeBSD: src/MAINTAINERS,v 1.141 2006/09/11 19:39:46 simon Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -119,6 +119,7 @@ bs{diff,patch} cperciva Pre-commit review requested. portsnap cperciva Pre-commit review requested. freebsd-update cperciva Pre-commit review requested. +openssl simon Pre-commit review requested. sys/netgraph/bluetooth emax Pre-commit review preferred. lib/libbluetooth emax Pre-commit review preferred. lib/libsdp emax Pre-commit review preferred. ==== //depot/projects/soc2005/libalias/Makefile#7 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.334 2006/06/22 16:52:53 imp Exp $ +# $FreeBSD: src/Makefile,v 1.335 2006/09/08 10:13:15 ru Exp $ # # The user-driven targets are: # @@ -58,8 +58,8 @@ # # See src/UPDATING `COMMON ITEMS' for more complete information. # -# If TARGET_ARCH=arch (e.g. ia64, sparc64, ...) is specified you can -# cross build world for other architectures using the buildworld target, +# If TARGET=machine (e.g. ia64, sparc64, ...) is specified you can +# cross build world for other machine types using the buildworld target, # and once the world is built you can cross build a kernel using the # buildkernel target. # @@ -266,36 +266,32 @@ @echo "--------------------------------------------------------------" @echo ">>> make universe started on ${STARTTIME}" @echo "--------------------------------------------------------------" -.for target in i386 i386:pc98 sparc64 ia64 amd64 -.for arch in ${target:C/:.*$//} -.for mach in ${target:C/^.*://} -KERNCONFS!= cd ${.CURDIR}/sys/${mach}/conf && \ +.for target in amd64 i386 ia64 pc98 sparc64 +KERNCONFS!= cd ${.CURDIR}/sys/${target}/conf && \ find [A-Z]*[A-Z] -type f -maxdepth 0 \ ! -name DEFAULTS ! -name LINT KERNCONFS:= ${KERNCONFS:S/^NOTES$/LINT/} -universe: universe_${mach} -.ORDER: universe_prologue universe_${mach} universe_epilogue -universe_${mach}: - @echo ">> ${mach} started on `LC_ALL=C date`" +universe: universe_${target} +.ORDER: universe_prologue universe_${target} universe_epilogue +universe_${target}: + @echo ">> ${target} started on `LC_ALL=C date`" -cd ${.CURDIR} && ${MAKE} ${JFLAG} buildworld \ - TARGET_ARCH=${arch} TARGET=${mach} \ + TARGET=${target} \ __MAKE_CONF=/dev/null \ - > _.${mach}.buildworld 2>&1 - @echo ">> ${mach} buildworld completed on `LC_ALL=C date`" -.if exists(${.CURDIR}/sys/${mach}/conf/NOTES) - -cd ${.CURDIR}/sys/${mach}/conf && ${MAKE} LINT \ - > ${.CURDIR}/_.${mach}.makeLINT 2>&1 + > _.${target}.buildworld 2>&1 + @echo ">> ${target} buildworld completed on `LC_ALL=C date`" +.if exists(${.CURDIR}/sys/${target}/conf/NOTES) + -cd ${.CURDIR}/sys/${target}/conf && ${MAKE} LINT \ + > ${.CURDIR}/_.${target}.makeLINT 2>&1 .endif .for kernel in ${KERNCONFS} -cd ${.CURDIR} && ${MAKE} ${JFLAG} buildkernel \ - TARGET_ARCH=${arch} TARGET=${mach} \ + TARGET=${target} \ KERNCONF=${kernel} \ __MAKE_CONF=/dev/null \ - > _.${mach}.${kernel} 2>&1 + > _.${target}.${kernel} 2>&1 .endfor - @echo ">> ${mach} completed on `LC_ALL=C date`" -.endfor -.endfor + @echo ">> ${target} completed on `LC_ALL=C date`" .endfor universe: universe_epilogue universe_epilogue: ==== //depot/projects/soc2005/libalias/Makefile.inc1#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.554 2006/08/24 17:02:26 imp Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.559 2006/09/08 10:09:02 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -11,7 +11,7 @@ # -DNO_PORTSUPDATE do not update ports in ${MAKE} update # -DNO_DOCUPDATE do not update doc in ${MAKE} update # LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list -# TARGET_ARCH="arch" to crossbuild world to a different arch +# TARGET="machine" to crossbuild world for a different machine type # # The intended user-driven targets are: @@ -95,14 +95,36 @@ OSRELDATE= 0 .endif .endif + +# Guess machine architecture from machine type, and vice versa. +.if !defined(TARGET_ARCH) && defined(TARGET) +TARGET_ARCH= ${TARGET:S/pc98/i386/} +.elif !defined(TARGET) && defined(TARGET_ARCH) && \ + ${TARGET_ARCH} != ${MACHINE_ARCH} +TARGET= ${TARGET_ARCH} +.endif +# Otherwise, default to current machine type and architecture. +TARGET?= ${MACHINE} TARGET_ARCH?= ${MACHINE_ARCH} -.if ${TARGET_ARCH} == ${MACHINE_ARCH} -TARGET?= ${MACHINE} + +KNOWN_ARCHES?= amd64 arm i386 i386/pc98 ia64 powerpc sparc64 +.if ${TARGET} == ${TARGET_ARCH} +_t= ${TARGET} +.else +_t= ${TARGET_ARCH}/${TARGET} +.endif +.for _t in ${_t} +.if empty(KNOWN_ARCHES:M${_t}) +.error Unknown target ${TARGET_ARCH}:${TARGET}. +.endif +.endfor + +.if ${TARGET} == ${MACHINE} TARGET_CPUTYPE?=${CPUTYPE} .else -TARGET?= ${TARGET_ARCH} TARGET_CPUTYPE?= .endif + .if !empty(TARGET_CPUTYPE) _TARGET_CPUTYPE=${TARGET_CPUTYPE} .else @@ -185,11 +207,13 @@ # build-tools stage TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \ ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ + TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ DESTDIR= \ BOOTSTRAPPING=${OSRELDATE} -DNO_LINT -DNO_CPU_CFLAGS -DNO_WARNS # cross-tools stage XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \ + TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ -DWITHOUT_FORTRAN -DWITHOUT_GDB # world stage @@ -465,9 +489,19 @@ WMAKE_TGTS+= build32 .endif -buildworld: ${WMAKE_TGTS} -.ORDER: ${WMAKE_TGTS} +buildworld: buildworld_prologue ${WMAKE_TGTS} buildworld_epilogue +.ORDER: buildworld_prologue ${WMAKE_TGTS} buildworld_epilogue + +buildworld_prologue: + @echo "--------------------------------------------------------------" + @echo ">>> World build started on `LC_ALL=C date`" + @echo "--------------------------------------------------------------" +buildworld_epilogue: + @echo + @echo "--------------------------------------------------------------" + @echo ">>> World build completed on `LC_ALL=C date`" + @echo "--------------------------------------------------------------" # # We need to have this as a target because the indirection between Makefile ==== //depot/projects/soc2005/libalias/ObsoleteFiles.inc#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.49 2006/08/22 11:12:09 flz Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.50 2006/09/05 01:17:51 matusita Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -97,6 +97,10 @@ OLD_FILES+=etc/rc.d/ppp-user # 20051012: setkey(8) moved to /sbin/ OLD_FILES+=usr/sbin/setkey +# 20050930: pccardd(8) removed +OLD_FILES+=usr/sbin/pccardd +OLD_FILES+=usr/share/man/man5/pccard.conf.5.gz +OLD_FILES+=usr/share/man/man8/pccardd.8.gz # 20050927: bridge(4) replaced by if_bridge(4) OLD_FILES+=usr/include/net/bridge.h # 20050831: not implemented ==== //depot/projects/soc2005/libalias/UPDATING#6 (text+ko) ==== @@ -21,6 +21,9 @@ developers choose to disable these features on build machines to maximize performance. +20060903: + libpcap updated to v0.9.4 and tcpdump to v3.9.4 + 20060816: The IPFIREWALL_FORWARD_EXTENDED option is gone and the behaviour for IP_FIREWALL_FORWARD is now as it was before when it was first @@ -610,4 +613,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.454 2006/09/02 22:17:15 marius Exp $ +$FreeBSD: src/UPDATING,v 1.455 2006/09/04 21:49:31 sam Exp $ ==== //depot/projects/soc2005/libalias/contrib/bind9/CHANGES#2 (text+ko) ==== @@ -1,4 +1,11 @@ + --- 9.3.2-P1 released --- + +2066. [security] Handle SIG queries gracefully. [RT #16300] + +1941. [bug] ncache_adderesult() should set eresult even if no + rdataset is passed to it. [RT #15642] + --- 9.3.2 released --- --- 9.3.2rc1 released --- ==== //depot/projects/soc2005/libalias/contrib/bind9/bin/named/query.c#2 (text+ko) ==== @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: query.c,v 1.198.2.13.4.36 2005/08/11 05:25:20 marka Exp $ */ +/* $Id: query.c,v 1.198.2.13.4.36.6.1 2006/08/17 07:12:31 marka Exp $ */ #include @@ -2393,7 +2393,7 @@ is_zone = ISC_FALSE; qtype = event->qtype; - if (qtype == dns_rdatatype_rrsig) + if (qtype == dns_rdatatype_rrsig || qtype == dns_rdatatype_sig) type = dns_rdatatype_any; else type = qtype; @@ -2434,7 +2434,7 @@ /* * If it's a SIG query, we'll iterate the node. */ - if (qtype == dns_rdatatype_rrsig) + if (qtype == dns_rdatatype_rrsig || qtype == dns_rdatatype_sig) type = dns_rdatatype_any; else type = qtype; ==== //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/resolver.c#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Sep 17 14:22:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F76216A412; Sun, 17 Sep 2006 14:22:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4136C16A407 for ; Sun, 17 Sep 2006 14:22:37 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A945843D46 for ; Sun, 17 Sep 2006 14:22:36 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8HEMaJw033348 for ; Sun, 17 Sep 2006 14:22:36 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8HEMa3u033345 for perforce@freebsd.org; Sun, 17 Sep 2006 14:22:36 GMT (envelope-from piso@freebsd.org) Date: Sun, 17 Sep 2006 14:22:36 GMT Message-Id: <200609171422.k8HEMa3u033345@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 106243 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Sep 2006 14:22:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=106243 Change 106243 by piso@piso_newluxor on 2006/09/17 14:21:45 Cosmetic and whitespace reduction. Affected files ... .. //depot/projects/soc2005/libalias/sbin/natd/natd.c#5 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.h#4 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_db.c#11 edit Differences ... ==== //depot/projects/soc2005/libalias/sbin/natd/natd.c#5 (text+ko) ==== @@ -349,7 +349,6 @@ siginterrupt(SIGHUP, 1); signal (SIGTERM, InitiateShutdown); signal (SIGHUP, RefreshAddr); - /* * Set alias address if it has been given. */ ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.h#4 (text+ko) ==== @@ -193,6 +193,7 @@ * Mode flags and other constants. */ + /* Mode flags, set using PacketAliasSetMode() */ /* ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_db.c#11 (text+ko) ==== @@ -160,7 +160,7 @@ #include #include -#ifdef _KERNEL +#ifdef _KERNEL #include #include #include @@ -173,6 +173,7 @@ static LIST_HEAD(, libalias) instancehead = LIST_HEAD_INITIALIZER(instancehead); + /* Constants (note: constants are also defined near relevant functions or structs) @@ -338,6 +339,7 @@ /* Kernel module definition. */ #ifdef _KERNEL MALLOC_DEFINE(M_ALIAS, "libalias", "packet aliasing"); + MODULE_VERSION(libalias, 1); static int @@ -359,6 +361,7 @@ default: error = EINVAL; } + return (error); } @@ -479,7 +482,6 @@ static void ShowAliasStats(struct libalias *la) { - /* Used for debugging */ if (la->logDesc) { int tot = la->icmpLinkCount + la->udpLinkCount + @@ -2220,10 +2222,11 @@ fprintf(la->logDesc, "PacketAlias/InitPacketAliasLog: Packet alias logging enabled.\n"); #endif else - return(ENOMEM); /* log initialization failed */ + return (ENOMEM); /* log initialization failed */ la->packetAliasMode |= PKT_ALIAS_LOG; } - return(1); + + return (1); } /* Close the log-file and disable logging. */ @@ -2535,7 +2538,7 @@ if (flags & mask & PKT_ALIAS_LOG) { /* Do the enable */ if (InitPacketAliasLog(la) == ENOMEM) - return(-1); + return (-1); } else /* _Disable_ logging? */ if (~flags & mask & PKT_ALIAS_LOG) { @@ -2574,7 +2577,6 @@ /* Firewall include files */ #include - #include #include #include From owner-p4-projects@FreeBSD.ORG Sun Sep 17 15:19:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7DC4916A416; Sun, 17 Sep 2006 15:19:05 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 408D416A407 for ; Sun, 17 Sep 2006 15:19:05 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C4AAD43D73 for ; Sun, 17 Sep 2006 15:18:48 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8HFImLl037026 for ; Sun, 17 Sep 2006 15:18:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8HFImFS037023 for perforce@freebsd.org; Sun, 17 Sep 2006 15:18:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 17 Sep 2006 15:18:48 GMT Message-Id: <200609171518.k8HFImFS037023@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 106245 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Sep 2006 15:19:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=106245 Change 106245 by rwatson@rwatson_peppercorn on 2006/09/17 15:18:07 Don't audit individual file write operations, directory reads as part of the file read/file write event classes. In general, we audit intent at time of open as part of those classes. Affected files ... .. //depot/projects/trustedbsd/openbsm/etc/audit_event#15 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/etc/audit_event#15 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#14 $ +# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#15 $ # 0:AUE_NULL:indir system call:no 1:AUE_EXIT:exit(2):pc @@ -117,8 +117,8 @@ 113:AUE_SYSTEMBOOT:system booted:na 114:AUE_ASYNC_DAEMON_EXIT:async_daemon(2) exited:ad 115:AUE_NFSSVC_EXIT:nfssvc(2) exited:ad -128:AUE_WRITEL:writel(2):fw -129:AUE_WRITEVL:writevl(2):fw +128:AUE_WRITEL:writel(2):no +129:AUE_WRITEVL:writevl(2):no 130:AUE_GETAUID:getauid(2):ad 131:AUE_SETAUID:setauid(2):ad 132:AUE_GETAUDIT:getaudit(2):ad @@ -265,7 +265,7 @@ 325:AUE_DARWIN_KDEBUGTRACE:system call:pc 326:AUE_DARWIN_FSTAT:fstat(2):fa 327:AUE_DARWIN_FPATHCONF:fpathconf(2):fa -328:AUE_DARWIN_GETDIRENTRIES:getdirentries(2):fr +328:AUE_DARWIN_GETDIRENTRIES:getdirentries(2):no 329:AUE_DARWIN_TRUNCATE:truncate(2):fw 330:AUE_DARWIN_FTRUNCATE:ftruncate(2):fw 331:AUE_DARWIN_SYSCTL:sysctl(3):ad @@ -321,7 +321,7 @@ 43017:AUE_KDEBUGTRACE:system call:pc 43018:AUE_FSTAT:fstat(2):fa 43019:AUE_FPATHCONF:fpathconf(2):fa -43020:AUE_GETDIRENTRIES:getdirentries(2):fr +43020:AUE_GETDIRENTRIES:getdirentries(2):no 43021:AUE_SYSCTL:sysctl(3):ot 43022:AUE_MLOCK:mlock(2):pc 43023:AUE_MUNLOCK:munlock(2):pc From owner-p4-projects@FreeBSD.ORG Sun Sep 17 15:36:12 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C7A816A49E; Sun, 17 Sep 2006 15:36:12 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E95FA16A47B for ; Sun, 17 Sep 2006 15:36:11 +0000 (UTC) (envelope-from howardsu@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AC92B43D45 for ; Sun, 17 Sep 2006 15:36:11 +0000 (GMT) (envelope-from howardsu@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8HFaBD9037918 for ; Sun, 17 Sep 2006 15:36:11 GMT (envelope-from howardsu@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8HFaBTh037913 for perforce@freebsd.org; Sun, 17 Sep 2006 15:36:11 GMT (envelope-from howardsu@FreeBSD.org) Date: Sun, 17 Sep 2006 15:36:11 GMT Message-Id: <200609171536.k8HFaBTh037913@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to howardsu@FreeBSD.org using -f From: Howard Su To: Perforce Change Reviews Cc: Subject: PERFORCE change 106246 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Sep 2006 15:36:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=106246 Change 106246 by howardsu@su_laptop on 2006/09/17 15:35:20 Reimplement vmem with a full featured idenitity management. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/kern/vmem.c#3 edit .. //depot/projects/dtrace/src/sys/contrib/opensolaris/compat/sys/vmem.h#3 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/kern/vmem.c#3 (text+ko) ==== @@ -24,46 +24,84 @@ * */ +#include #include -#include -#include +#include #include -#include #include +#include + +MALLOC_DEFINE(M_VMEM, "identiy pool", "idpool"); -MALLOC_DECLARE(M_VMEM); -MALLOC_DEFINE(M_VMEM, "vmem", "vmem hack"); +LIST_HEAD(vmem, entry); -/* XXX Hacks */ +struct entry { + char *start; + char *end; + LIST_ENTRY(entry) entries; +}; vmem_t * vmem_create(const char *name, void *base, size_t size, size_t quantum, - vmem_alloc_t *afunc, vmem_free_t *ffunc, vmem_t *source, - size_t qcache_max, int vmflag) + vmem_alloc_t *afunc, vmem_free_t *ffunc, vmem_t *source, + size_t qcache_max, int vmflag) { - return (malloc(sizeof(vmem_t), M_VMEM, M_WAITOK | M_ZERO)); + vmem_t *idpool; + struct entry *e; + e = malloc(sizeof(struct entry), M_VMEM, M_WAITOK); + idpool = malloc(sizeof(vmem_t), M_VMEM, M_WAITOK); + + e->start = base; + e->end = (char*)~0; + + LIST_INSERT_HEAD(idpool, e, entries); + return idpool; } void * vmem_alloc(vmem_t *vmp, size_t size, int vmflag) { - /* - * Hope like hell that the caller only uses the value - * returned as a long integer, not a pointer! - */ - return ((void *) ++(*vmp)); + void *ret; + struct entry *np; + np = LIST_FIRST(vmp); + ret = np->start; + if (np->start == np->end) { + LIST_REMOVE(np, entries); + free(np, M_VMEM); + } + else { + np->start++; + } + return ret; } void vmem_free(vmem_t *vmp, void *vaddr, size_t size) { - /* - * Nothing to do here. We didn't really allocate memory - * in the first place. 8-) - */ + struct entry *np, *np_temp, *newnp; + LIST_FOREACH_SAFE(np, vmp, entries, np_temp) { + if ((void*)np->end < p) continue; + + if (np->start == (char*)p + 1) { + np->start--; + return; + } + else { + newnp = malloc(sizeof(vmem_t), M_VMEM, M_WAITOK); + newnp->start = newnp->end = p; + LIST_INSERT_BEFORE(np, newnp, entries); + return; + } + } } + void vmem_destroy(vmem_t *vmp) { + struct entry *np, *np_temp; + LIST_FOREACH_SAFE(np, vmp, entries, np_temp) { + LIST_REMOVE(np, entries); + free(np, M_VMEM); + } free(vmp, M_VMEM); } ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/compat/sys/vmem.h#3 (text+ko) ==== @@ -28,7 +28,8 @@ #define VM_BESTFIT 0x00000100 #define VMC_IDENTIFIER 0x00040000 /* not backed by memory */ -typedef uintptr_t vmem_t; +struct vmem; +typedef struct vmem vmem_t; typedef void *(vmem_alloc_t)(vmem_t *, size_t, int); typedef void (vmem_free_t)(vmem_t *, void *, size_t); From owner-p4-projects@FreeBSD.ORG Sun Sep 17 16:05:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 51C3116A47E; Sun, 17 Sep 2006 16:05:49 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1587816A416 for ; Sun, 17 Sep 2006 16:05:49 +0000 (UTC) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BE59243D46 for ; Sun, 17 Sep 2006 16:05:48 +0000 (GMT) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8HG5mW4040550 for ; Sun, 17 Sep 2006 16:05:48 GMT (envelope-from netchild@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8HG5mKP040547 for perforce@freebsd.org; Sun, 17 Sep 2006 16:05:48 GMT (envelope-from netchild@freebsd.org) Date: Sun, 17 Sep 2006 16:05:48 GMT Message-Id: <200609171605.k8HG5mKP040547@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to netchild@freebsd.org using -f From: Alexander Leidinger To: Perforce Change Reviews Cc: Subject: PERFORCE change 106247 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Sep 2006 16:05:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=106247 Change 106247 by netchild@netchild_magellan on 2006/09/17 16:05:19 Include opt_compat.h, it helps to detect if we are on amd64 or not. This is needed for the previous commit to work as intendet. Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_aio.c#4 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_aio.c#4 (text+ko) ==== @@ -25,6 +25,8 @@ #include __FBSDID("$FreeBSD$"); +#include "opt_compat.h" + #include #include #include From owner-p4-projects@FreeBSD.ORG Sun Sep 17 17:22:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 739F016A40F; Sun, 17 Sep 2006 17:22:25 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 389E616A403 for ; Sun, 17 Sep 2006 17:22:25 +0000 (UTC) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E4AA843D46 for ; Sun, 17 Sep 2006 17:22:24 +0000 (GMT) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8HHMOOd053224 for ; Sun, 17 Sep 2006 17:22:24 GMT (envelope-from trhodes@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8HHMO4V053221 for perforce@freebsd.org; Sun, 17 Sep 2006 17:22:24 GMT (envelope-from trhodes@freebsd.org) Date: Sun, 17 Sep 2006 17:22:24 GMT Message-Id: <200609171722.k8HHMO4V053221@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trhodes@freebsd.org using -f From: Tom Rhodes To: Perforce Change Reviews Cc: Subject: PERFORCE change 106249 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Sep 2006 17:22:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=106249 Change 106249 by trhodes@trhodes_local on 2006/09/17 17:22:04 Submit this file after integration. Affected files ... .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis_usb.c#3 integrate Differences ... ==== //depot/projects/usb/src/sys/dev/if_ndis/if_ndis_usb.c#3 (text+ko) ==== @@ -31,6 +31,8 @@ */ #include +__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_usb.c,v 1.7 2006/09/07 06:00:03 mjacob Exp $"); + #include #include #include From owner-p4-projects@FreeBSD.ORG Sun Sep 17 17:27:32 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 543F616A417; Sun, 17 Sep 2006 17:27:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 17B2E16A40F for ; Sun, 17 Sep 2006 17:27:32 +0000 (UTC) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B8BBE43D49 for ; Sun, 17 Sep 2006 17:27:31 +0000 (GMT) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8HHRV30053384 for ; Sun, 17 Sep 2006 17:27:31 GMT (envelope-from trhodes@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8HHRVgQ053381 for perforce@freebsd.org; Sun, 17 Sep 2006 17:27:31 GMT (envelope-from trhodes@freebsd.org) Date: Sun, 17 Sep 2006 17:27:31 GMT Message-Id: <200609171727.k8HHRVgQ053381@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trhodes@freebsd.org using -f From: Tom Rhodes To: Perforce Change Reviews Cc: Subject: PERFORCE change 106250 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Sep 2006 17:27:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=106250 Change 106250 by trhodes@trhodes_local on 2006/09/17 17:27:04 Integrate these files with head, minor modifications of whitespace, remove unneeded code, etc. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ehci_pci.c#8 integrate .. //depot/projects/usb/src/sys/dev/usb/if_axereg.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb/if_kue.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb/if_udavreg.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb/if_uralvar.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb/ohci_pci.c#7 edit .. //depot/projects/usb/src/sys/dev/usb/ucomvar.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb/ufm.c#7 integrate .. //depot/projects/usb/src/sys/dev/usb/uhci_pci.c#7 integrate .. //depot/projects/usb/src/sys/dev/usb/usb.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_quirks.c#5 integrate Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ehci_pci.c#8 (text+ko) ==== @@ -35,6 +35,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD: src/sys/dev/usb/ehci_pci.c,v 1.23 2006/09/07 00:06:41 imp Exp $"); + /* * USB Enhanced Host Controller Driver, a.k.a. USB 2.0 controller. * @@ -60,6 +63,7 @@ #include #include /* LIST_XXX() */ #include +#include #include #define INCLUDE_PCIXXX_H @@ -389,7 +393,7 @@ } legsup = eec; pci_write_config(self, eecp, legsup | EHCI_LEGSUP_OSOWNED, 4); - if(legsup & EHCI_LEGSUP_BIOSOWNED) + if (legsup & EHCI_LEGSUP_BIOSOWNED) { device_printf(sc->sc_bus.bdev, "waiting for BIOS " "to give up control\n"); ==== //depot/projects/usb/src/sys/dev/usb/if_axereg.h#6 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/usb/if_axereg.h,v 1.8 2005/06/10 16:49:15 brooks Exp $ + * $FreeBSD: src/sys/dev/usb/if_axereg.h,v 1.10 2006/06/04 14:42:38 iedowse Exp $ */ /* ==== //depot/projects/usb/src/sys/dev/usb/if_kue.c#11 (text+ko) ==== @@ -281,7 +281,6 @@ data, 0, NULL, 60000); if (err) { - DPRINTF(sc, 0, "device request failed, err=%s " "(ignored)\n", usbd_errstr(err)); ==== //depot/projects/usb/src/sys/dev/usb/if_udavreg.h#5 (text+ko) ==== @@ -1,6 +1,6 @@ /* $NetBSD: if_udavreg.h,v 1.2 2003/09/04 15:17:39 tsutsui Exp $ */ /* $nabe: if_udavreg.h,v 1.2 2003/08/21 16:26:40 nabe Exp $ */ -/* $FreeBSD: src/sys/dev/usb/if_udavreg.h,v 1.6 2005/12/04 10:06:04 ru Exp $ */ +/* $FreeBSD: src/sys/dev/usb/if_udavreg.h,v 1.7 2006/09/07 00:06:41 imp Exp $ */ /*- * Copyright (c) 2003 * Shingo WATANABE . All rights reserved. @@ -142,9 +142,9 @@ struct __callout sc_watchdog; struct mtx sc_mtx; - struct ifnet * sc_ifp; - struct usbd_device * sc_udev; - struct usbd_xfer * sc_xfer[UDAV_ENDPT_MAX]; + struct ifnet *sc_ifp; + struct usbd_device *sc_udev; + struct usbd_xfer *sc_xfer[UDAV_ENDPT_MAX]; device_t sc_miibus; device_t sc_dev; ==== //depot/projects/usb/src/sys/dev/usb/if_uralvar.h#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/if_uralvar.h,v 1.6 2005/11/29 20:55:53 damien Exp $ */ +/* $FreeBSD: src/sys/dev/usb/if_uralvar.h,v 1.7 2006/09/07 00:06:41 imp Exp $ */ /*- * Copyright (c) 2005 @@ -119,14 +119,14 @@ struct usbd_memory_wait sc_mem_wait; struct __callout sc_watchdog; struct ural_bbp_prom sc_bbp_prom[16]; - struct usbd_xfer * sc_xfer[URAL_N_TRANSFER]; + struct usbd_xfer * *sc_xfer[URAL_N_TRANSFER]; union ural_rxtap sc_rxtap; union ural_txtap sc_txtap; - struct mbuf * sc_bcn_mbuf; - struct ifnet * sc_ifp; - struct bpf_if * sc_drvbpf; - struct usbd_device * sc_udev; + struct mbuf *sc_bcn_mbuf; + struct ifnet *sc_ifp; + struct bpf_if *sc_drvbpf; + struct usbd_device *sc_udev; int (*sc_newstate) (struct ieee80211com *, enum ieee80211_state, int); ==== //depot/projects/usb/src/sys/dev/usb/ohci_pci.c#7 (text+ko) ==== @@ -35,6 +35,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD: src/sys/dev/usb/ohci_pci.c,v 1.48 2006/09/03 00:27:42 jmg Exp $"); + /* * USB Open Host Controller driver. * @@ -55,6 +58,7 @@ #include #include /* LIST_XXX() */ #include +#include #include #define INCLUDE_PCIXXX_H @@ -317,6 +321,11 @@ sc->sc_bus.bdev = NULL; } + if (sc->sc_bus.parent_dmatag != NULL) + bus_dma_tag_destroy(sc->sc_bus.parent_dmatag); + if (sc->sc_bus.buffer_dmatag != NULL) + bus_dma_tag_destroy(sc->sc_bus.buffer_dmatag); + pci_disable_busmaster(self); if(sc->irq_res && sc->ih) @@ -344,7 +353,7 @@ if(sc->io_res) { bus_release_resource(self, SYS_RES_MEMORY, PCI_CBMEM, - sc->io_res); + sc->io_res); sc->io_res = NULL; } ==== //depot/projects/usb/src/sys/dev/usb/ucomvar.h#6 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: ucomvar.h,v 1.9 2001/01/23 21:56:17 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/ucomvar.h,v 1.7 2005/01/06 01:43:28 imp Exp $ */ +/* $FreeBSD: src/sys/dev/usb/ucomvar.h,v 1.8 2006/09/07 00:06:41 imp Exp $ */ /*- * Copyright (c) 2001-2002, Shunsuke Akiyama . @@ -103,9 +103,9 @@ struct ucom_softc { struct task sc_task; - const struct ucom_callback * sc_callback; - struct tty * sc_tty; - void * sc_parent; + const struct ucom_callback *sc_callback; + struct tty *sc_tty; + void *sc_parent; u_int16_t sc_portno; ==== //depot/projects/usb/src/sys/dev/usb/ufm.c#7 (text+ko) ==== @@ -29,6 +29,9 @@ */ #include +__FBSDID("$FreeBSD: src/sys/dev/usb/ufm.c,v 1.25 2006/09/07 00:06:41 imp Exp $"); + + #include #include #include @@ -73,8 +76,8 @@ struct mtx sc_mtx; struct usbd_memory_wait sc_mem_wait; - struct usbd_device * sc_udev; - struct usbd_xfer * sc_xfer[UFM_N_TRANSFER]; + struct usbd_device *sc_udev; + struct usbd_xfer *sc_xfer[UFM_N_TRANSFER]; u_int32_t sc_unit; u_int32_t sc_freq; ==== //depot/projects/usb/src/sys/dev/usb/uhci_pci.c#7 (text+ko) ==== @@ -35,6 +35,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD: src/sys/dev/usb/uhci_pci.c,v 1.58 2006/05/28 05:27:08 iedowse Exp $"); + /* Universal Host Controller Interface * * UHCI spec: http://www.intel.com/ @@ -54,6 +57,7 @@ #include #include /* LIST_XXX() */ #include +#include #include #define INCLUDE_PCIXXX_H @@ -305,6 +309,29 @@ #endif pci_write_config(self, PCI_LEGSUP, PCI_LEGSUP_USBPIRQDEN, 2); + /* Allocate a parent dma tag for DMA maps */ + err = bus_dma_tag_create(NULL, 1, 0, BUS_SPACE_MAXADDR_32BIT, + BUS_SPACE_MAXADDR, NULL, NULL, BUS_SPACE_MAXSIZE_32BIT, + USB_DMA_NSEG, BUS_SPACE_MAXSIZE_32BIT, 0, NULL, NULL, + &sc->sc_bus.parent_dmatag); + if (err) { + device_printf(self, "Could not allocate parent DMA tag (%d)\n", + err); + uhci_pci_detach(self); + return ENXIO; + } + /* Allocate a dma tag for transfer buffers */ + err = bus_dma_tag_create(sc->sc_bus.parent_dmatag, 1, 0, + BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, + BUS_SPACE_MAXSIZE_32BIT, USB_DMA_NSEG, BUS_SPACE_MAXSIZE_32BIT, 0, + busdma_lock_mutex, &Giant, &sc->sc_bus.buffer_dmatag); + if (err) { + device_printf(self, "Could not allocate transfer tag (%d)\n", + err); + uhci_pci_detach(self); + return ENXIO; + } + err = uhci_init(sc); if(!err) { ==== //depot/projects/usb/src/sys/dev/usb/usb.h#6 (text+ko) ==== @@ -1,3 +1,6 @@ +/* $NetBSD: usb.h,v 1.69 2002/09/22 23:20:50 augustss Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usb.h,v 1.41 2006/09/06 23:44:24 imp Exp $ */ + /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. @@ -46,7 +49,15 @@ #endif #if defined(_KERNEL) +#if 1 #include +#else +#include + +MALLOC_DECLARE(M_USB); +MALLOC_DECLARE(M_USBDEV); +MALLOC_DECLARE(M_USBHC); +#endif #endif /* _KERNEL */ /* These two defines are used by usbd to autoload the usb kld */ ==== //depot/projects/usb/src/sys/dev/usb/usb_quirks.c#5 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.49 2006/02/26 22:20:45 iedowse Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.50 2006/09/06 23:44:24 imp Exp $"); #include #include @@ -50,7 +50,7 @@ #define ANY 0xffff -Static const struct usbd_quirk_entry { +static const struct usbd_quirk_entry { u_int16_t idVendor; u_int16_t idProduct; u_int16_t bcdDevice; From owner-p4-projects@FreeBSD.ORG Sun Sep 17 17:31:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ACCCF16A416; Sun, 17 Sep 2006 17:31:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 88E8B16A40F for ; Sun, 17 Sep 2006 17:31:37 +0000 (UTC) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 55D5B43D55 for ; Sun, 17 Sep 2006 17:31:37 +0000 (GMT) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8HHVbux053646 for ; Sun, 17 Sep 2006 17:31:37 GMT (envelope-from trhodes@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8HHVbmp053643 for perforce@freebsd.org; Sun, 17 Sep 2006 17:31:37 GMT (envelope-from trhodes@freebsd.org) Date: Sun, 17 Sep 2006 17:31:37 GMT Message-Id: <200609171731.k8HHVbmp053643@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trhodes@freebsd.org using -f From: Tom Rhodes To: Perforce Change Reviews Cc: Subject: PERFORCE change 106251 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Sep 2006 17:31:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=106251 Change 106251 by trhodes@trhodes_local on 2006/09/17 17:31:03 Remove code block for allocating a dma tag for transfer buffers. This is now handled by usb_subr.c's usbd_dma_tag_alloc() function. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uhci_pci.c#8 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uhci_pci.c#8 (text+ko) ==== @@ -309,29 +309,6 @@ #endif pci_write_config(self, PCI_LEGSUP, PCI_LEGSUP_USBPIRQDEN, 2); - /* Allocate a parent dma tag for DMA maps */ - err = bus_dma_tag_create(NULL, 1, 0, BUS_SPACE_MAXADDR_32BIT, - BUS_SPACE_MAXADDR, NULL, NULL, BUS_SPACE_MAXSIZE_32BIT, - USB_DMA_NSEG, BUS_SPACE_MAXSIZE_32BIT, 0, NULL, NULL, - &sc->sc_bus.parent_dmatag); - if (err) { - device_printf(self, "Could not allocate parent DMA tag (%d)\n", - err); - uhci_pci_detach(self); - return ENXIO; - } - /* Allocate a dma tag for transfer buffers */ - err = bus_dma_tag_create(sc->sc_bus.parent_dmatag, 1, 0, - BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, - BUS_SPACE_MAXSIZE_32BIT, USB_DMA_NSEG, BUS_SPACE_MAXSIZE_32BIT, 0, - busdma_lock_mutex, &Giant, &sc->sc_bus.buffer_dmatag); - if (err) { - device_printf(self, "Could not allocate transfer tag (%d)\n", - err); - uhci_pci_detach(self); - return ENXIO; - } - err = uhci_init(sc); if(!err) { From owner-p4-projects@FreeBSD.ORG Sun Sep 17 17:40:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 002EE16A4C2; Sun, 17 Sep 2006 17:40:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BA66616A4A7 for ; Sun, 17 Sep 2006 17:40:50 +0000 (UTC) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C64F043D49 for ; Sun, 17 Sep 2006 17:40:49 +0000 (GMT) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8HHen87054284 for ; Sun, 17 Sep 2006 17:40:49 GMT (envelope-from trhodes@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8HHencm054281 for perforce@freebsd.org; Sun, 17 Sep 2006 17:40:49 GMT (envelope-from trhodes@freebsd.org) Date: Sun, 17 Sep 2006 17:40:49 GMT Message-Id: <200609171740.k8HHencm054281@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trhodes@freebsd.org using -f From: Tom Rhodes To: Perforce Change Reviews Cc: Subject: PERFORCE change 106253 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Sep 2006 17:40:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=106253 Change 106253 by trhodes@trhodes_local on 2006/09/17 17:39:59 Remove extra "*" char. Noticed by: Pawel Worach Affected files ... .. //depot/projects/usb/src/sys/dev/usb/if_uralvar.h#7 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/if_uralvar.h#7 (text+ko) ==== @@ -119,7 +119,7 @@ struct usbd_memory_wait sc_mem_wait; struct __callout sc_watchdog; struct ural_bbp_prom sc_bbp_prom[16]; - struct usbd_xfer * *sc_xfer[URAL_N_TRANSFER]; + struct usbd_xfer *sc_xfer[URAL_N_TRANSFER]; union ural_rxtap sc_rxtap; union ural_txtap sc_txtap; From owner-p4-projects@FreeBSD.ORG Sun Sep 17 19:45:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D2DB16A47E; Sun, 17 Sep 2006 19:45:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 668C216A416 for ; Sun, 17 Sep 2006 19:45:29 +0000 (UTC) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1C9E143D53 for ; Sun, 17 Sep 2006 19:45:29 +0000 (GMT) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8HJjSFf064944 for ; Sun, 17 Sep 2006 19:45:28 GMT (envelope-from trhodes@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8HJjStP064941 for perforce@freebsd.org; Sun, 17 Sep 2006 19:45:28 GMT (envelope-from trhodes@freebsd.org) Date: Sun, 17 Sep 2006 19:45:28 GMT Message-Id: <200609171945.k8HJjStP064941@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trhodes@freebsd.org using -f From: Tom Rhodes To: Perforce Change Reviews Cc: Subject: PERFORCE change 106257 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Sep 2006 19:45:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=106257 Change 106257 by trhodes@trhodes_local on 2006/09/17 19:44:54 Fix build, we do not need to call bus_dma_tag_destroy() here. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ohci_pci.c#8 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ohci_pci.c#8 (text+ko) ==== @@ -321,11 +321,6 @@ sc->sc_bus.bdev = NULL; } - if (sc->sc_bus.parent_dmatag != NULL) - bus_dma_tag_destroy(sc->sc_bus.parent_dmatag); - if (sc->sc_bus.buffer_dmatag != NULL) - bus_dma_tag_destroy(sc->sc_bus.buffer_dmatag); - pci_disable_busmaster(self); if(sc->irq_res && sc->ih) From owner-p4-projects@FreeBSD.ORG Sun Sep 17 21:24:34 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF90A16A47C; Sun, 17 Sep 2006 21:24:34 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6868E16A416 for ; Sun, 17 Sep 2006 21:24:34 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8B37643DB4 for ; Sun, 17 Sep 2006 21:24:33 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8HLOXgN088374 for ; Sun, 17 Sep 2006 21:24:33 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8HLOXrX088371 for perforce@freebsd.org; Sun, 17 Sep 2006 21:24:33 GMT (envelope-from mjacob@freebsd.org) Date: Sun, 17 Sep 2006 21:24:33 GMT Message-Id: <200609172124.k8HLOXrX088371@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 106261 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Sep 2006 21:24:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=106261 Change 106261 by mjacob@newisp on 2006/09/17 21:23:35 A variety of 24XX structure changes/additions for target mode. Affected files ... .. //depot/projects/newisp/dev/isp/isp.c#11 edit .. //depot/projects/newisp/dev/isp/isp_library.c#7 edit .. //depot/projects/newisp/dev/isp/isp_library.h#6 edit .. //depot/projects/newisp/dev/isp/isp_stds.h#2 edit .. //depot/projects/newisp/dev/isp/isp_target.c#4 edit .. //depot/projects/newisp/dev/isp/isp_target.h#6 edit .. //depot/projects/newisp/dev/isp/ispmbox.h#4 edit Differences ... ==== //depot/projects/newisp/dev/isp/isp.c#11 (text+ko) ==== @@ -4474,10 +4474,6 @@ } MEMZERO(hp, QENTRY_LEN); /* PERF */ continue; - } else if (etype == RQSTYPE_MARKER) { - isp_prt(isp, ISP_LOGDEBUG0, "MARKER"); - MEMZERO(hp, QENTRY_LEN); /* PERF */ - continue; } else { /* * Somebody reachable via isp_handle_other_response @@ -5137,7 +5133,10 @@ { switch (type) { case RQSTYPE_STATUS_CONT: - isp_prt(isp, ISP_LOGINFO, "Ignored Continuation Response"); + isp_prt(isp, ISP_LOGDEBUG0, "Ignored Continuation Response"); + return (1); + case RQSTYPE_MARKER: + isp_prt(isp, ISP_LOGDEBUG0, "Marker Response"); return (1); case RQSTYPE_ATIO: case RQSTYPE_CTIO: ==== //depot/projects/newisp/dev/isp/isp_library.c#7 (text) ==== @@ -1131,41 +1131,17 @@ */ void -isp_get_ct_hdr(ispsoftc_t *isp, ct_hdr_t *src, ct_hdr_t *dst) +isp_get_fc_hdr(ispsoftc_t *isp, fc_hdr_t *src, fc_hdr_t *dst) { - ISP_IOZGET_8(isp, &src->ct_revision, dst->ct_revision); - ISP_IOZGET_8(isp, &src->ct_in_id[0], dst->ct_in_id[0]); - ISP_IOZGET_8(isp, &src->ct_in_id[1], dst->ct_in_id[1]); - ISP_IOZGET_8(isp, &src->ct_in_id[2], dst->ct_in_id[2]); - ISP_IOZGET_8(isp, &src->ct_fcs_type, dst->ct_fcs_type); - ISP_IOZGET_8(isp, &src->ct_fcs_subtype, dst->ct_fcs_subtype); - ISP_IOZGET_8(isp, &src->ct_options, dst->ct_options); - ISP_IOZGET_8(isp, &src->ct_reserved0, dst->ct_reserved0); - ISP_IOZGET_16(isp, &src->ct_cmd_resp, dst->ct_cmd_resp); - ISP_IOZGET_16(isp, &src->ct_bcnt_resid, dst->ct_bcnt_resid); - ISP_IOZGET_8(isp, &src->ct_reserved1, dst->ct_reserved1); - ISP_IOZGET_8(isp, &src->ct_reason, dst->ct_reason); - ISP_IOZGET_8(isp, &src->ct_explanation, dst->ct_explanation); - ISP_IOZGET_8(isp, &src->ct_vunique, dst->ct_vunique); -} + int i, amt; + uint32_t *a, *b; -void -isp_put_ct_hdr(ispsoftc_t *isp, ct_hdr_t *src, ct_hdr_t *dst) -{ - ISP_IOZPUT_8(isp, src->ct_revision, &dst->ct_revision); - ISP_IOZPUT_8(isp, src->ct_in_id[0], &dst->ct_in_id[0]); - ISP_IOZPUT_8(isp, src->ct_in_id[1], &dst->ct_in_id[1]); - ISP_IOZPUT_8(isp, src->ct_in_id[2], &dst->ct_in_id[2]); - ISP_IOZPUT_8(isp, src->ct_fcs_type, &dst->ct_fcs_type); - ISP_IOZPUT_8(isp, src->ct_fcs_subtype, &dst->ct_fcs_subtype); - ISP_IOZPUT_8(isp, src->ct_options, &dst->ct_options); - ISP_IOZPUT_8(isp, src->ct_reserved0, &dst->ct_reserved0); - ISP_IOZPUT_16(isp, src->ct_cmd_resp, &dst->ct_cmd_resp); - ISP_IOZPUT_16(isp, src->ct_bcnt_resid, &dst->ct_bcnt_resid); - ISP_IOZPUT_8(isp, src->ct_reserved1, &dst->ct_reserved1); - ISP_IOZPUT_8(isp, src->ct_reason, &dst->ct_reason); - ISP_IOZPUT_8(isp, src->ct_explanation, &dst->ct_explanation); - ISP_IOZPUT_8(isp, src->ct_vunique, &dst->ct_vunique); + a = (uint32_t *) src; + b = (uint32_t *) dst; + amt = (sizeof (fc_hdr_t)) >> 2; + for (i = 0; i < amt; i++) { + ISP_IOZGET_32(isp, a++, *b++); + } } void @@ -1211,6 +1187,44 @@ } } +void +isp_get_ct_hdr(ispsoftc_t *isp, ct_hdr_t *src, ct_hdr_t *dst) +{ + ISP_IOZGET_8(isp, &src->ct_revision, dst->ct_revision); + ISP_IOZGET_8(isp, &src->ct_in_id[0], dst->ct_in_id[0]); + ISP_IOZGET_8(isp, &src->ct_in_id[1], dst->ct_in_id[1]); + ISP_IOZGET_8(isp, &src->ct_in_id[2], dst->ct_in_id[2]); + ISP_IOZGET_8(isp, &src->ct_fcs_type, dst->ct_fcs_type); + ISP_IOZGET_8(isp, &src->ct_fcs_subtype, dst->ct_fcs_subtype); + ISP_IOZGET_8(isp, &src->ct_options, dst->ct_options); + ISP_IOZGET_8(isp, &src->ct_reserved0, dst->ct_reserved0); + ISP_IOZGET_16(isp, &src->ct_cmd_resp, dst->ct_cmd_resp); + ISP_IOZGET_16(isp, &src->ct_bcnt_resid, dst->ct_bcnt_resid); + ISP_IOZGET_8(isp, &src->ct_reserved1, dst->ct_reserved1); + ISP_IOZGET_8(isp, &src->ct_reason, dst->ct_reason); + ISP_IOZGET_8(isp, &src->ct_explanation, dst->ct_explanation); + ISP_IOZGET_8(isp, &src->ct_vunique, dst->ct_vunique); +} + +void +isp_put_ct_hdr(ispsoftc_t *isp, ct_hdr_t *src, ct_hdr_t *dst) +{ + ISP_IOZPUT_8(isp, src->ct_revision, &dst->ct_revision); + ISP_IOZPUT_8(isp, src->ct_in_id[0], &dst->ct_in_id[0]); + ISP_IOZPUT_8(isp, src->ct_in_id[1], &dst->ct_in_id[1]); + ISP_IOZPUT_8(isp, src->ct_in_id[2], &dst->ct_in_id[2]); + ISP_IOZPUT_8(isp, src->ct_fcs_type, &dst->ct_fcs_type); + ISP_IOZPUT_8(isp, src->ct_fcs_subtype, &dst->ct_fcs_subtype); + ISP_IOZPUT_8(isp, src->ct_options, &dst->ct_options); + ISP_IOZPUT_8(isp, src->ct_reserved0, &dst->ct_reserved0); + ISP_IOZPUT_16(isp, src->ct_cmd_resp, &dst->ct_cmd_resp); + ISP_IOZPUT_16(isp, src->ct_bcnt_resid, &dst->ct_bcnt_resid); + ISP_IOZPUT_8(isp, src->ct_reserved1, &dst->ct_reserved1); + ISP_IOZPUT_8(isp, src->ct_reason, &dst->ct_reason); + ISP_IOZPUT_8(isp, src->ct_explanation, &dst->ct_explanation); + ISP_IOZPUT_8(isp, src->ct_vunique, &dst->ct_vunique); +} + #ifdef ISP_TARGET_MODE int isp_save_xs_tgt(ispsoftc_t *isp, void *xs, uint32_t *handlep) @@ -1269,608 +1283,738 @@ } void -isp_put_atio(ispsoftc_t *isp, at_entry_t *atsrc, at_entry_t *atdst) +isp_put_atio(ispsoftc_t *isp, at_entry_t *src, at_entry_t *dst) { int i; - isp_put_hdr(isp, &atsrc->at_header, &atdst->at_header); - ISP_IOXPUT_16(isp, atsrc->at_reserved, &atdst->at_reserved); - ISP_IOXPUT_16(isp, atsrc->at_handle, &atdst->at_handle); + isp_put_hdr(isp, &src->at_header, &dst->at_header); + ISP_IOXPUT_16(isp, src->at_reserved, &dst->at_reserved); + ISP_IOXPUT_16(isp, src->at_handle, &dst->at_handle); if (ISP_IS_SBUS(isp)) { - ISP_IOXPUT_8(isp, atsrc->at_lun, &atdst->at_iid); - ISP_IOXPUT_8(isp, atsrc->at_iid, &atdst->at_lun); - ISP_IOXPUT_8(isp, atsrc->at_cdblen, &atdst->at_tgt); - ISP_IOXPUT_8(isp, atsrc->at_tgt, &atdst->at_cdblen); - ISP_IOXPUT_8(isp, atsrc->at_status, &atdst->at_scsi_status); - ISP_IOXPUT_8(isp, atsrc->at_scsi_status, &atdst->at_status); - ISP_IOXPUT_8(isp, atsrc->at_tag_val, &atdst->at_tag_type); - ISP_IOXPUT_8(isp, atsrc->at_tag_type, &atdst->at_tag_val); + ISP_IOXPUT_8(isp, src->at_lun, &dst->at_iid); + ISP_IOXPUT_8(isp, src->at_iid, &dst->at_lun); + ISP_IOXPUT_8(isp, src->at_cdblen, &dst->at_tgt); + ISP_IOXPUT_8(isp, src->at_tgt, &dst->at_cdblen); + ISP_IOXPUT_8(isp, src->at_status, &dst->at_scsi_status); + ISP_IOXPUT_8(isp, src->at_scsi_status, &dst->at_status); + ISP_IOXPUT_8(isp, src->at_tag_val, &dst->at_tag_type); + ISP_IOXPUT_8(isp, src->at_tag_type, &dst->at_tag_val); } else { - ISP_IOXPUT_8(isp, atsrc->at_lun, &atdst->at_lun); - ISP_IOXPUT_8(isp, atsrc->at_iid, &atdst->at_iid); - ISP_IOXPUT_8(isp, atsrc->at_cdblen, &atdst->at_cdblen); - ISP_IOXPUT_8(isp, atsrc->at_tgt, &atdst->at_tgt); - ISP_IOXPUT_8(isp, atsrc->at_status, &atdst->at_status); - ISP_IOXPUT_8(isp, atsrc->at_scsi_status, - &atdst->at_scsi_status); - ISP_IOXPUT_8(isp, atsrc->at_tag_val, &atdst->at_tag_val); - ISP_IOXPUT_8(isp, atsrc->at_tag_type, &atdst->at_tag_type); + ISP_IOXPUT_8(isp, src->at_lun, &dst->at_lun); + ISP_IOXPUT_8(isp, src->at_iid, &dst->at_iid); + ISP_IOXPUT_8(isp, src->at_cdblen, &dst->at_cdblen); + ISP_IOXPUT_8(isp, src->at_tgt, &dst->at_tgt); + ISP_IOXPUT_8(isp, src->at_status, &dst->at_status); + ISP_IOXPUT_8(isp, src->at_scsi_status, + &dst->at_scsi_status); + ISP_IOXPUT_8(isp, src->at_tag_val, &dst->at_tag_val); + ISP_IOXPUT_8(isp, src->at_tag_type, &dst->at_tag_type); } - ISP_IOXPUT_32(isp, atsrc->at_flags, &atdst->at_flags); + ISP_IOXPUT_32(isp, src->at_flags, &dst->at_flags); for (i = 0; i < ATIO_CDBLEN; i++) { - ISP_IOXPUT_8(isp, atsrc->at_cdb[i], &atdst->at_cdb[i]); + ISP_IOXPUT_8(isp, src->at_cdb[i], &dst->at_cdb[i]); } for (i = 0; i < QLTM_SENSELEN; i++) { - ISP_IOXPUT_8(isp, atsrc->at_sense[i], &atdst->at_sense[i]); + ISP_IOXPUT_8(isp, src->at_sense[i], &dst->at_sense[i]); } } void -isp_get_atio(ispsoftc_t *isp, at_entry_t *atsrc, at_entry_t *atdst) +isp_get_atio(ispsoftc_t *isp, at_entry_t *src, at_entry_t *dst) { int i; - isp_get_hdr(isp, &atsrc->at_header, &atdst->at_header); - ISP_IOXGET_16(isp, &atsrc->at_reserved, atdst->at_reserved); - ISP_IOXGET_16(isp, &atsrc->at_handle, atdst->at_handle); + isp_get_hdr(isp, &src->at_header, &dst->at_header); + ISP_IOXGET_16(isp, &src->at_reserved, dst->at_reserved); + ISP_IOXGET_16(isp, &src->at_handle, dst->at_handle); if (ISP_IS_SBUS(isp)) { - ISP_IOXGET_8(isp, &atsrc->at_lun, atdst->at_iid); - ISP_IOXGET_8(isp, &atsrc->at_iid, atdst->at_lun); - ISP_IOXGET_8(isp, &atsrc->at_cdblen, atdst->at_tgt); - ISP_IOXGET_8(isp, &atsrc->at_tgt, atdst->at_cdblen); - ISP_IOXGET_8(isp, &atsrc->at_status, atdst->at_scsi_status); - ISP_IOXGET_8(isp, &atsrc->at_scsi_status, atdst->at_status); - ISP_IOXGET_8(isp, &atsrc->at_tag_val, atdst->at_tag_type); - ISP_IOXGET_8(isp, &atsrc->at_tag_type, atdst->at_tag_val); + ISP_IOXGET_8(isp, &src->at_lun, dst->at_iid); + ISP_IOXGET_8(isp, &src->at_iid, dst->at_lun); + ISP_IOXGET_8(isp, &src->at_cdblen, dst->at_tgt); + ISP_IOXGET_8(isp, &src->at_tgt, dst->at_cdblen); + ISP_IOXGET_8(isp, &src->at_status, dst->at_scsi_status); + ISP_IOXGET_8(isp, &src->at_scsi_status, dst->at_status); + ISP_IOXGET_8(isp, &src->at_tag_val, dst->at_tag_type); + ISP_IOXGET_8(isp, &src->at_tag_type, dst->at_tag_val); } else { - ISP_IOXGET_8(isp, &atsrc->at_lun, atdst->at_lun); - ISP_IOXGET_8(isp, &atsrc->at_iid, atdst->at_iid); - ISP_IOXGET_8(isp, &atsrc->at_cdblen, atdst->at_cdblen); - ISP_IOXGET_8(isp, &atsrc->at_tgt, atdst->at_tgt); - ISP_IOXGET_8(isp, &atsrc->at_status, atdst->at_status); - ISP_IOXGET_8(isp, &atsrc->at_scsi_status, - atdst->at_scsi_status); - ISP_IOXGET_8(isp, &atsrc->at_tag_val, atdst->at_tag_val); - ISP_IOXGET_8(isp, &atsrc->at_tag_type, atdst->at_tag_type); + ISP_IOXGET_8(isp, &src->at_lun, dst->at_lun); + ISP_IOXGET_8(isp, &src->at_iid, dst->at_iid); + ISP_IOXGET_8(isp, &src->at_cdblen, dst->at_cdblen); + ISP_IOXGET_8(isp, &src->at_tgt, dst->at_tgt); + ISP_IOXGET_8(isp, &src->at_status, dst->at_status); + ISP_IOXGET_8(isp, &src->at_scsi_status, + dst->at_scsi_status); + ISP_IOXGET_8(isp, &src->at_tag_val, dst->at_tag_val); + ISP_IOXGET_8(isp, &src->at_tag_type, dst->at_tag_type); } - ISP_IOXGET_32(isp, &atsrc->at_flags, atdst->at_flags); + ISP_IOXGET_32(isp, &src->at_flags, dst->at_flags); for (i = 0; i < ATIO_CDBLEN; i++) { - ISP_IOXGET_8(isp, &atsrc->at_cdb[i], atdst->at_cdb[i]); + ISP_IOXGET_8(isp, &src->at_cdb[i], dst->at_cdb[i]); } for (i = 0; i < QLTM_SENSELEN; i++) { - ISP_IOXGET_8(isp, &atsrc->at_sense[i], atdst->at_sense[i]); + ISP_IOXGET_8(isp, &src->at_sense[i], dst->at_sense[i]); } } void -isp_put_atio2(ispsoftc_t *isp, at2_entry_t *atsrc, at2_entry_t *atdst) +isp_put_atio2(ispsoftc_t *isp, at2_entry_t *src, at2_entry_t *dst) { int i; - isp_put_hdr(isp, &atsrc->at_header, &atdst->at_header); - ISP_IOXPUT_32(isp, atsrc->at_reserved, &atdst->at_reserved); - ISP_IOXPUT_8(isp, atsrc->at_lun, &atdst->at_lun); - ISP_IOXPUT_8(isp, atsrc->at_iid, &atdst->at_iid); - ISP_IOXPUT_16(isp, atsrc->at_rxid, &atdst->at_rxid); - ISP_IOXPUT_16(isp, atsrc->at_flags, &atdst->at_flags); - ISP_IOXPUT_16(isp, atsrc->at_status, &atdst->at_status); - ISP_IOXPUT_8(isp, atsrc->at_crn, &atdst->at_crn); - ISP_IOXPUT_8(isp, atsrc->at_taskcodes, &atdst->at_taskcodes); - ISP_IOXPUT_8(isp, atsrc->at_taskflags, &atdst->at_taskflags); - ISP_IOXPUT_8(isp, atsrc->at_execodes, &atdst->at_execodes); + isp_put_hdr(isp, &src->at_header, &dst->at_header); + ISP_IOXPUT_32(isp, src->at_reserved, &dst->at_reserved); + ISP_IOXPUT_8(isp, src->at_lun, &dst->at_lun); + ISP_IOXPUT_8(isp, src->at_iid, &dst->at_iid); + ISP_IOXPUT_16(isp, src->at_rxid, &dst->at_rxid); + ISP_IOXPUT_16(isp, src->at_flags, &dst->at_flags); + ISP_IOXPUT_16(isp, src->at_status, &dst->at_status); + ISP_IOXPUT_8(isp, src->at_crn, &dst->at_crn); + ISP_IOXPUT_8(isp, src->at_taskcodes, &dst->at_taskcodes); + ISP_IOXPUT_8(isp, src->at_taskflags, &dst->at_taskflags); + ISP_IOXPUT_8(isp, src->at_execodes, &dst->at_execodes); for (i = 0; i < ATIO2_CDBLEN; i++) { - ISP_IOXPUT_8(isp, atsrc->at_cdb[i], &atdst->at_cdb[i]); + ISP_IOXPUT_8(isp, src->at_cdb[i], &dst->at_cdb[i]); } - ISP_IOXPUT_32(isp, atsrc->at_datalen, &atdst->at_datalen); - ISP_IOXPUT_16(isp, atsrc->at_scclun, &atdst->at_scclun); + ISP_IOXPUT_32(isp, src->at_datalen, &dst->at_datalen); + ISP_IOXPUT_16(isp, src->at_scclun, &dst->at_scclun); for (i = 0; i < 4; i++) { - ISP_IOXPUT_16(isp, atsrc->at_wwpn[i], &atdst->at_wwpn[i]); + ISP_IOXPUT_16(isp, src->at_wwpn[i], &dst->at_wwpn[i]); } for (i = 0; i < 6; i++) { - ISP_IOXPUT_16(isp, atsrc->at_reserved2[i], - &atdst->at_reserved2[i]); + ISP_IOXPUT_16(isp, src->at_reserved2[i], + &dst->at_reserved2[i]); } - ISP_IOXPUT_16(isp, atsrc->at_oxid, &atdst->at_oxid); + ISP_IOXPUT_16(isp, src->at_oxid, &dst->at_oxid); } void -isp_put_atio2e(ispsoftc_t *isp, at2e_entry_t *atsrc, at2e_entry_t *atdst) +isp_put_atio2e(ispsoftc_t *isp, at2e_entry_t *src, at2e_entry_t *dst) { int i; - isp_put_hdr(isp, &atsrc->at_header, &atdst->at_header); - ISP_IOXPUT_32(isp, atsrc->at_reserved, &atdst->at_reserved); - ISP_IOXPUT_16(isp, atsrc->at_iid, &atdst->at_iid); - ISP_IOXPUT_16(isp, atsrc->at_rxid, &atdst->at_rxid); - ISP_IOXPUT_16(isp, atsrc->at_flags, &atdst->at_flags); - ISP_IOXPUT_16(isp, atsrc->at_status, &atdst->at_status); - ISP_IOXPUT_8(isp, atsrc->at_crn, &atdst->at_crn); - ISP_IOXPUT_8(isp, atsrc->at_taskcodes, &atdst->at_taskcodes); - ISP_IOXPUT_8(isp, atsrc->at_taskflags, &atdst->at_taskflags); - ISP_IOXPUT_8(isp, atsrc->at_execodes, &atdst->at_execodes); + isp_put_hdr(isp, &src->at_header, &dst->at_header); + ISP_IOXPUT_32(isp, src->at_reserved, &dst->at_reserved); + ISP_IOXPUT_16(isp, src->at_iid, &dst->at_iid); + ISP_IOXPUT_16(isp, src->at_rxid, &dst->at_rxid); + ISP_IOXPUT_16(isp, src->at_flags, &dst->at_flags); + ISP_IOXPUT_16(isp, src->at_status, &dst->at_status); + ISP_IOXPUT_8(isp, src->at_crn, &dst->at_crn); + ISP_IOXPUT_8(isp, src->at_taskcodes, &dst->at_taskcodes); + ISP_IOXPUT_8(isp, src->at_taskflags, &dst->at_taskflags); + ISP_IOXPUT_8(isp, src->at_execodes, &dst->at_execodes); for (i = 0; i < ATIO2_CDBLEN; i++) { - ISP_IOXPUT_8(isp, atsrc->at_cdb[i], &atdst->at_cdb[i]); + ISP_IOXPUT_8(isp, src->at_cdb[i], &dst->at_cdb[i]); } - ISP_IOXPUT_32(isp, atsrc->at_datalen, &atdst->at_datalen); - ISP_IOXPUT_16(isp, atsrc->at_scclun, &atdst->at_scclun); + ISP_IOXPUT_32(isp, src->at_datalen, &dst->at_datalen); + ISP_IOXPUT_16(isp, src->at_scclun, &dst->at_scclun); for (i = 0; i < 4; i++) { - ISP_IOXPUT_16(isp, atsrc->at_wwpn[i], &atdst->at_wwpn[i]); + ISP_IOXPUT_16(isp, src->at_wwpn[i], &dst->at_wwpn[i]); } for (i = 0; i < 6; i++) { - ISP_IOXPUT_16(isp, atsrc->at_reserved2[i], - &atdst->at_reserved2[i]); + ISP_IOXPUT_16(isp, src->at_reserved2[i], + &dst->at_reserved2[i]); } - ISP_IOXPUT_16(isp, atsrc->at_oxid, &atdst->at_oxid); + ISP_IOXPUT_16(isp, src->at_oxid, &dst->at_oxid); } void -isp_get_atio2(ispsoftc_t *isp, at2_entry_t *atsrc, at2_entry_t *atdst) +isp_get_atio2(ispsoftc_t *isp, at2_entry_t *src, at2_entry_t *dst) { int i; - isp_get_hdr(isp, &atsrc->at_header, &atdst->at_header); - ISP_IOXGET_32(isp, &atsrc->at_reserved, atdst->at_reserved); - ISP_IOXGET_8(isp, &atsrc->at_lun, atdst->at_lun); - ISP_IOXGET_8(isp, &atsrc->at_iid, atdst->at_iid); - ISP_IOXGET_16(isp, &atsrc->at_rxid, atdst->at_rxid); - ISP_IOXGET_16(isp, &atsrc->at_flags, atdst->at_flags); - ISP_IOXGET_16(isp, &atsrc->at_status, atdst->at_status); - ISP_IOXGET_8(isp, &atsrc->at_crn, atdst->at_crn); - ISP_IOXGET_8(isp, &atsrc->at_taskcodes, atdst->at_taskcodes); - ISP_IOXGET_8(isp, &atsrc->at_taskflags, atdst->at_taskflags); - ISP_IOXGET_8(isp, &atsrc->at_execodes, atdst->at_execodes); + isp_get_hdr(isp, &src->at_header, &dst->at_header); + ISP_IOXGET_32(isp, &src->at_reserved, dst->at_reserved); + ISP_IOXGET_8(isp, &src->at_lun, dst->at_lun); + ISP_IOXGET_8(isp, &src->at_iid, dst->at_iid); + ISP_IOXGET_16(isp, &src->at_rxid, dst->at_rxid); + ISP_IOXGET_16(isp, &src->at_flags, dst->at_flags); + ISP_IOXGET_16(isp, &src->at_status, dst->at_status); + ISP_IOXGET_8(isp, &src->at_crn, dst->at_crn); + ISP_IOXGET_8(isp, &src->at_taskcodes, dst->at_taskcodes); + ISP_IOXGET_8(isp, &src->at_taskflags, dst->at_taskflags); + ISP_IOXGET_8(isp, &src->at_execodes, dst->at_execodes); for (i = 0; i < ATIO2_CDBLEN; i++) { - ISP_IOXGET_8(isp, &atsrc->at_cdb[i], atdst->at_cdb[i]); + ISP_IOXGET_8(isp, &src->at_cdb[i], dst->at_cdb[i]); } - ISP_IOXGET_32(isp, &atsrc->at_datalen, atdst->at_datalen); - ISP_IOXGET_16(isp, &atsrc->at_scclun, atdst->at_scclun); + ISP_IOXGET_32(isp, &src->at_datalen, dst->at_datalen); + ISP_IOXGET_16(isp, &src->at_scclun, dst->at_scclun); for (i = 0; i < 4; i++) { - ISP_IOXGET_16(isp, &atsrc->at_wwpn[i], atdst->at_wwpn[i]); + ISP_IOXGET_16(isp, &src->at_wwpn[i], dst->at_wwpn[i]); } for (i = 0; i < 6; i++) { - ISP_IOXGET_16(isp, &atsrc->at_reserved2[i], - atdst->at_reserved2[i]); + ISP_IOXGET_16(isp, &src->at_reserved2[i], + dst->at_reserved2[i]); } - ISP_IOXGET_16(isp, &atsrc->at_oxid, atdst->at_oxid); + ISP_IOXGET_16(isp, &src->at_oxid, dst->at_oxid); } void -isp_get_atio2e(ispsoftc_t *isp, at2e_entry_t *atsrc, at2e_entry_t *atdst) +isp_get_atio2e(ispsoftc_t *isp, at2e_entry_t *src, at2e_entry_t *dst) { int i; - isp_get_hdr(isp, &atsrc->at_header, &atdst->at_header); - ISP_IOXGET_32(isp, &atsrc->at_reserved, atdst->at_reserved); - ISP_IOXGET_16(isp, &atsrc->at_iid, atdst->at_iid); - ISP_IOXGET_16(isp, &atsrc->at_rxid, atdst->at_rxid); - ISP_IOXGET_16(isp, &atsrc->at_flags, atdst->at_flags); - ISP_IOXGET_16(isp, &atsrc->at_status, atdst->at_status); - ISP_IOXGET_8(isp, &atsrc->at_crn, atdst->at_crn); - ISP_IOXGET_8(isp, &atsrc->at_taskcodes, atdst->at_taskcodes); - ISP_IOXGET_8(isp, &atsrc->at_taskflags, atdst->at_taskflags); - ISP_IOXGET_8(isp, &atsrc->at_execodes, atdst->at_execodes); + isp_get_hdr(isp, &src->at_header, &dst->at_header); + ISP_IOXGET_32(isp, &src->at_reserved, dst->at_reserved); + ISP_IOXGET_16(isp, &src->at_iid, dst->at_iid); + ISP_IOXGET_16(isp, &src->at_rxid, dst->at_rxid); + ISP_IOXGET_16(isp, &src->at_flags, dst->at_flags); + ISP_IOXGET_16(isp, &src->at_status, dst->at_status); + ISP_IOXGET_8(isp, &src->at_crn, dst->at_crn); + ISP_IOXGET_8(isp, &src->at_taskcodes, dst->at_taskcodes); + ISP_IOXGET_8(isp, &src->at_taskflags, dst->at_taskflags); + ISP_IOXGET_8(isp, &src->at_execodes, dst->at_execodes); for (i = 0; i < ATIO2_CDBLEN; i++) { - ISP_IOXGET_8(isp, &atsrc->at_cdb[i], atdst->at_cdb[i]); + ISP_IOXGET_8(isp, &src->at_cdb[i], dst->at_cdb[i]); } - ISP_IOXGET_32(isp, &atsrc->at_datalen, atdst->at_datalen); - ISP_IOXGET_16(isp, &atsrc->at_scclun, atdst->at_scclun); + ISP_IOXGET_32(isp, &src->at_datalen, dst->at_datalen); + ISP_IOXGET_16(isp, &src->at_scclun, dst->at_scclun); for (i = 0; i < 4; i++) { - ISP_IOXGET_16(isp, &atsrc->at_wwpn[i], atdst->at_wwpn[i]); + ISP_IOXGET_16(isp, &src->at_wwpn[i], dst->at_wwpn[i]); } for (i = 0; i < 6; i++) { - ISP_IOXGET_16(isp, &atsrc->at_reserved2[i], - atdst->at_reserved2[i]); + ISP_IOXGET_16(isp, &src->at_reserved2[i], + dst->at_reserved2[i]); } - ISP_IOXGET_16(isp, &atsrc->at_oxid, atdst->at_oxid); + ISP_IOXGET_16(isp, &src->at_oxid, dst->at_oxid); +} + +void +isp_get_atio7(ispsoftc_t *isp, at7_entry_t *src, at7_entry_t *dst) +{ + ISP_IOXGET_8(isp, &src->at_type, dst->at_type); + ISP_IOXGET_8(isp, &src->at_count, dst->at_count); + ISP_IOXGET_16(isp, &src->at_ta_len, dst->at_ta_len); + ISP_IOXGET_32(isp, &src->at_rxid, dst->at_rxid); + isp_get_fc_hdr(isp, &src->at_hdr, &dst->at_hdr); + isp_get_fcp_cmnd_iu(isp, &src->at_cmnd, &dst->at_cmnd); } void -isp_put_ctio(ispsoftc_t *isp, ct_entry_t *ctsrc, ct_entry_t *ctdst) +isp_put_ctio(ispsoftc_t *isp, ct_entry_t *src, ct_entry_t *dst) { int i; - isp_put_hdr(isp, &ctsrc->ct_header, &ctdst->ct_header); - ISP_IOXPUT_16(isp, ctsrc->ct_syshandle, &ctdst->ct_syshandle); - ISP_IOXPUT_16(isp, ctsrc->ct_fwhandle, &ctdst->ct_fwhandle); + isp_put_hdr(isp, &src->ct_header, &dst->ct_header); + ISP_IOXPUT_16(isp, src->ct_syshandle, &dst->ct_syshandle); + ISP_IOXPUT_16(isp, src->ct_fwhandle, &dst->ct_fwhandle); if (ISP_IS_SBUS(isp)) { - ISP_IOXPUT_8(isp, ctsrc->ct_iid, &ctdst->ct_lun); - ISP_IOXPUT_8(isp, ctsrc->ct_lun, &ctdst->ct_iid); - ISP_IOXPUT_8(isp, ctsrc->ct_tgt, &ctdst->ct_reserved2); - ISP_IOXPUT_8(isp, ctsrc->ct_reserved2, &ctdst->ct_tgt); - ISP_IOXPUT_8(isp, ctsrc->ct_status, &ctdst->ct_scsi_status); - ISP_IOXPUT_8(isp, ctsrc->ct_scsi_status, &ctdst->ct_status); - ISP_IOXPUT_8(isp, ctsrc->ct_tag_type, &ctdst->ct_tag_val); - ISP_IOXPUT_8(isp, ctsrc->ct_tag_val, &ctdst->ct_tag_type); + ISP_IOXPUT_8(isp, src->ct_iid, &dst->ct_lun); + ISP_IOXPUT_8(isp, src->ct_lun, &dst->ct_iid); + ISP_IOXPUT_8(isp, src->ct_tgt, &dst->ct_reserved2); + ISP_IOXPUT_8(isp, src->ct_reserved2, &dst->ct_tgt); + ISP_IOXPUT_8(isp, src->ct_status, &dst->ct_scsi_status); + ISP_IOXPUT_8(isp, src->ct_scsi_status, &dst->ct_status); + ISP_IOXPUT_8(isp, src->ct_tag_type, &dst->ct_tag_val); + ISP_IOXPUT_8(isp, src->ct_tag_val, &dst->ct_tag_type); } else { - ISP_IOXPUT_8(isp, ctsrc->ct_iid, &ctdst->ct_iid); - ISP_IOXPUT_8(isp, ctsrc->ct_lun, &ctdst->ct_lun); - ISP_IOXPUT_8(isp, ctsrc->ct_tgt, &ctdst->ct_tgt); - ISP_IOXPUT_8(isp, ctsrc->ct_reserved2, &ctdst->ct_reserved2); - ISP_IOXPUT_8(isp, ctsrc->ct_scsi_status, - &ctdst->ct_scsi_status); - ISP_IOXPUT_8(isp, ctsrc->ct_status, &ctdst->ct_status); - ISP_IOXPUT_8(isp, ctsrc->ct_tag_type, &ctdst->ct_tag_type); - ISP_IOXPUT_8(isp, ctsrc->ct_tag_val, &ctdst->ct_tag_val); + ISP_IOXPUT_8(isp, src->ct_iid, &dst->ct_iid); + ISP_IOXPUT_8(isp, src->ct_lun, &dst->ct_lun); + ISP_IOXPUT_8(isp, src->ct_tgt, &dst->ct_tgt); + ISP_IOXPUT_8(isp, src->ct_reserved2, &dst->ct_reserved2); + ISP_IOXPUT_8(isp, src->ct_scsi_status, + &dst->ct_scsi_status); + ISP_IOXPUT_8(isp, src->ct_status, &dst->ct_status); + ISP_IOXPUT_8(isp, src->ct_tag_type, &dst->ct_tag_type); + ISP_IOXPUT_8(isp, src->ct_tag_val, &dst->ct_tag_val); } - ISP_IOXPUT_32(isp, ctsrc->ct_flags, &ctdst->ct_flags); - ISP_IOXPUT_32(isp, ctsrc->ct_xfrlen, &ctdst->ct_xfrlen); - ISP_IOXPUT_32(isp, ctsrc->ct_resid, &ctdst->ct_resid); - ISP_IOXPUT_16(isp, ctsrc->ct_timeout, &ctdst->ct_timeout); - ISP_IOXPUT_16(isp, ctsrc->ct_seg_count, &ctdst->ct_seg_count); + ISP_IOXPUT_32(isp, src->ct_flags, &dst->ct_flags); + ISP_IOXPUT_32(isp, src->ct_xfrlen, &dst->ct_xfrlen); + ISP_IOXPUT_32(isp, src->ct_resid, &dst->ct_resid); + ISP_IOXPUT_16(isp, src->ct_timeout, &dst->ct_timeout); + ISP_IOXPUT_16(isp, src->ct_seg_count, &dst->ct_seg_count); for (i = 0; i < ISP_RQDSEG; i++) { - ISP_IOXPUT_32(isp, ctsrc->ct_dataseg[i].ds_base, - &ctdst->ct_dataseg[i].ds_base); - ISP_IOXPUT_32(isp, ctsrc->ct_dataseg[i].ds_count, - &ctdst->ct_dataseg[i].ds_count); + ISP_IOXPUT_32(isp, src->ct_dataseg[i].ds_base, + &dst->ct_dataseg[i].ds_base); + ISP_IOXPUT_32(isp, src->ct_dataseg[i].ds_count, + &dst->ct_dataseg[i].ds_count); } } void -isp_get_ctio(ispsoftc_t *isp, ct_entry_t *ctsrc, ct_entry_t *ctdst) +isp_get_ctio(ispsoftc_t *isp, ct_entry_t *src, ct_entry_t *dst) { int i; - isp_get_hdr(isp, &ctsrc->ct_header, &ctdst->ct_header); - ISP_IOXGET_16(isp, &ctsrc->ct_syshandle, ctdst->ct_syshandle); - ISP_IOXGET_16(isp, &ctsrc->ct_fwhandle, ctdst->ct_fwhandle); + isp_get_hdr(isp, &src->ct_header, &dst->ct_header); + ISP_IOXGET_16(isp, &src->ct_syshandle, dst->ct_syshandle); + ISP_IOXGET_16(isp, &src->ct_fwhandle, dst->ct_fwhandle); if (ISP_IS_SBUS(isp)) { - ISP_IOXGET_8(isp, &ctsrc->ct_lun, ctdst->ct_iid); - ISP_IOXGET_8(isp, &ctsrc->ct_iid, ctdst->ct_lun); - ISP_IOXGET_8(isp, &ctsrc->ct_reserved2, ctdst->ct_tgt); - ISP_IOXGET_8(isp, &ctsrc->ct_tgt, ctdst->ct_reserved2); - ISP_IOXGET_8(isp, &ctsrc->ct_status, ctdst->ct_scsi_status); - ISP_IOXGET_8(isp, &ctsrc->ct_scsi_status, ctdst->ct_status); - ISP_IOXGET_8(isp, &ctsrc->ct_tag_val, ctdst->ct_tag_type); - ISP_IOXGET_8(isp, &ctsrc->ct_tag_type, ctdst->ct_tag_val); + ISP_IOXGET_8(isp, &src->ct_lun, dst->ct_iid); + ISP_IOXGET_8(isp, &src->ct_iid, dst->ct_lun); + ISP_IOXGET_8(isp, &src->ct_reserved2, dst->ct_tgt); + ISP_IOXGET_8(isp, &src->ct_tgt, dst->ct_reserved2); + ISP_IOXGET_8(isp, &src->ct_status, dst->ct_scsi_status); + ISP_IOXGET_8(isp, &src->ct_scsi_status, dst->ct_status); + ISP_IOXGET_8(isp, &src->ct_tag_val, dst->ct_tag_type); + ISP_IOXGET_8(isp, &src->ct_tag_type, dst->ct_tag_val); } else { - ISP_IOXGET_8(isp, &ctsrc->ct_lun, ctdst->ct_lun); - ISP_IOXGET_8(isp, &ctsrc->ct_iid, ctdst->ct_iid); - ISP_IOXGET_8(isp, &ctsrc->ct_reserved2, ctdst->ct_reserved2); - ISP_IOXGET_8(isp, &ctsrc->ct_tgt, ctdst->ct_tgt); - ISP_IOXGET_8(isp, &ctsrc->ct_status, ctdst->ct_status); - ISP_IOXGET_8(isp, &ctsrc->ct_scsi_status, - ctdst->ct_scsi_status); - ISP_IOXGET_8(isp, &ctsrc->ct_tag_val, ctdst->ct_tag_val); - ISP_IOXGET_8(isp, &ctsrc->ct_tag_type, ctdst->ct_tag_type); + ISP_IOXGET_8(isp, &src->ct_lun, dst->ct_lun); + ISP_IOXGET_8(isp, &src->ct_iid, dst->ct_iid); + ISP_IOXGET_8(isp, &src->ct_reserved2, dst->ct_reserved2); + ISP_IOXGET_8(isp, &src->ct_tgt, dst->ct_tgt); + ISP_IOXGET_8(isp, &src->ct_status, dst->ct_status); + ISP_IOXGET_8(isp, &src->ct_scsi_status, + dst->ct_scsi_status); + ISP_IOXGET_8(isp, &src->ct_tag_val, dst->ct_tag_val); + ISP_IOXGET_8(isp, &src->ct_tag_type, dst->ct_tag_type); } - ISP_IOXGET_32(isp, &ctsrc->ct_flags, ctdst->ct_flags); - ISP_IOXGET_32(isp, &ctsrc->ct_xfrlen, ctdst->ct_xfrlen); - ISP_IOXGET_32(isp, &ctsrc->ct_resid, ctdst->ct_resid); - ISP_IOXGET_16(isp, &ctsrc->ct_timeout, ctdst->ct_timeout); - ISP_IOXGET_16(isp, &ctsrc->ct_seg_count, ctdst->ct_seg_count); + ISP_IOXGET_32(isp, &src->ct_flags, dst->ct_flags); + ISP_IOXGET_32(isp, &src->ct_xfrlen, dst->ct_xfrlen); + ISP_IOXGET_32(isp, &src->ct_resid, dst->ct_resid); + ISP_IOXGET_16(isp, &src->ct_timeout, dst->ct_timeout); + ISP_IOXGET_16(isp, &src->ct_seg_count, dst->ct_seg_count); for (i = 0; i < ISP_RQDSEG; i++) { ISP_IOXGET_32(isp, - &ctsrc->ct_dataseg[i].ds_base, - ctdst->ct_dataseg[i].ds_base); + &src->ct_dataseg[i].ds_base, + dst->ct_dataseg[i].ds_base); ISP_IOXGET_32(isp, - &ctsrc->ct_dataseg[i].ds_count, - ctdst->ct_dataseg[i].ds_count); + &src->ct_dataseg[i].ds_count, + dst->ct_dataseg[i].ds_count); } } void -isp_put_ctio2(ispsoftc_t *isp, ct2_entry_t *ctsrc, ct2_entry_t *ctdst) +isp_put_ctio2(ispsoftc_t *isp, ct2_entry_t *src, ct2_entry_t *dst) { int i; - isp_put_hdr(isp, &ctsrc->ct_header, &ctdst->ct_header); - ISP_IOXPUT_32(isp, ctsrc->ct_syshandle, &ctdst->ct_syshandle); - ISP_IOXPUT_8(isp, ctsrc->ct_lun, &ctdst->ct_lun); - ISP_IOXPUT_8(isp, ctsrc->ct_iid, &ctdst->ct_iid); - ISP_IOXPUT_16(isp, ctsrc->ct_rxid, &ctdst->ct_rxid); - ISP_IOXPUT_16(isp, ctsrc->ct_flags, &ctdst->ct_flags); - ISP_IOXPUT_16(isp, ctsrc->ct_timeout, &ctdst->ct_timeout); - ISP_IOXPUT_16(isp, ctsrc->ct_seg_count, &ctdst->ct_seg_count); - ISP_IOXPUT_32(isp, ctsrc->ct_resid, &ctdst->ct_resid); - ISP_IOXPUT_32(isp, ctsrc->ct_reloff, &ctdst->ct_reloff); - if ((ctsrc->ct_flags & CT2_FLAG_MMASK) == CT2_FLAG_MODE0) { - ISP_IOXPUT_32(isp, ctsrc->rsp.m0._reserved, - &ctdst->rsp.m0._reserved); - ISP_IOXPUT_16(isp, ctsrc->rsp.m0._reserved2, - &ctdst->rsp.m0._reserved2); - ISP_IOXPUT_16(isp, ctsrc->rsp.m0.ct_scsi_status, - &ctdst->rsp.m0.ct_scsi_status); - ISP_IOXPUT_32(isp, ctsrc->rsp.m0.ct_xfrlen, - &ctdst->rsp.m0.ct_xfrlen); - if (ctsrc->ct_header.rqs_entry_type == RQSTYPE_CTIO2) { + isp_put_hdr(isp, &src->ct_header, &dst->ct_header); + ISP_IOXPUT_32(isp, src->ct_syshandle, &dst->ct_syshandle); + ISP_IOXPUT_8(isp, src->ct_lun, &dst->ct_lun); + ISP_IOXPUT_8(isp, src->ct_iid, &dst->ct_iid); + ISP_IOXPUT_16(isp, src->ct_rxid, &dst->ct_rxid); + ISP_IOXPUT_16(isp, src->ct_flags, &dst->ct_flags); + ISP_IOXPUT_16(isp, src->ct_timeout, &dst->ct_timeout); + ISP_IOXPUT_16(isp, src->ct_seg_count, &dst->ct_seg_count); + ISP_IOXPUT_32(isp, src->ct_resid, &dst->ct_resid); + ISP_IOXPUT_32(isp, src->ct_reloff, &dst->ct_reloff); + if ((src->ct_flags & CT2_FLAG_MMASK) == CT2_FLAG_MODE0) { + ISP_IOXPUT_32(isp, src->rsp.m0._reserved, + &dst->rsp.m0._reserved); + ISP_IOXPUT_16(isp, src->rsp.m0._reserved2, + &dst->rsp.m0._reserved2); + ISP_IOXPUT_16(isp, src->rsp.m0.ct_scsi_status, + &dst->rsp.m0.ct_scsi_status); + ISP_IOXPUT_32(isp, src->rsp.m0.ct_xfrlen, + &dst->rsp.m0.ct_xfrlen); + if (src->ct_header.rqs_entry_type == RQSTYPE_CTIO2) { for (i = 0; i < ISP_RQDSEG_T2; i++) { ISP_IOXPUT_32(isp, - ctsrc->rsp.m0.ct_dataseg[i].ds_base, - &ctdst->rsp.m0.ct_dataseg[i].ds_base); + src->rsp.m0.ct_dataseg[i].ds_base, + &dst->rsp.m0.ct_dataseg[i].ds_base); ISP_IOXPUT_32(isp, - ctsrc->rsp.m0.ct_dataseg[i].ds_count, - &ctdst->rsp.m0.ct_dataseg[i].ds_count); + src->rsp.m0.ct_dataseg[i].ds_count, + &dst->rsp.m0.ct_dataseg[i].ds_count); } - } else if (ctsrc->ct_header.rqs_entry_type == RQSTYPE_CTIO3) { + } else if (src->ct_header.rqs_entry_type == RQSTYPE_CTIO3) { for (i = 0; i < ISP_RQDSEG_T3; i++) { ISP_IOXPUT_32(isp, - ctsrc->rsp.m0.ct_dataseg64[i].ds_base, - &ctdst->rsp.m0.ct_dataseg64[i].ds_base); + src->rsp.m0.ct_dataseg64[i].ds_base, + &dst->rsp.m0.ct_dataseg64[i].ds_base); ISP_IOXPUT_32(isp, - ctsrc->rsp.m0.ct_dataseg64[i].ds_basehi, - &ctdst->rsp.m0.ct_dataseg64[i].ds_basehi); + src->rsp.m0.ct_dataseg64[i].ds_basehi, + &dst->rsp.m0.ct_dataseg64[i].ds_basehi); ISP_IOXPUT_32(isp, - ctsrc->rsp.m0.ct_dataseg64[i].ds_count, - &ctdst->rsp.m0.ct_dataseg64[i].ds_count); + src->rsp.m0.ct_dataseg64[i].ds_count, + &dst->rsp.m0.ct_dataseg64[i].ds_count); } - } else if (ctsrc->ct_header.rqs_entry_type == RQSTYPE_CTIO4) { - ISP_IOXPUT_16(isp, ctsrc->rsp.m0.ct_dslist.ds_type, - &ctdst->rsp.m0.ct_dslist.ds_type); - ISP_IOXPUT_32(isp, ctsrc->rsp.m0.ct_dslist.ds_segment, - &ctdst->rsp.m0.ct_dslist.ds_segment); - ISP_IOXPUT_32(isp, ctsrc->rsp.m0.ct_dslist.ds_base, - &ctdst->rsp.m0.ct_dslist.ds_base); + } else if (src->ct_header.rqs_entry_type == RQSTYPE_CTIO4) { + ISP_IOXPUT_16(isp, src->rsp.m0.ct_dslist.ds_type, + &dst->rsp.m0.ct_dslist.ds_type); + ISP_IOXPUT_32(isp, src->rsp.m0.ct_dslist.ds_segment, + &dst->rsp.m0.ct_dslist.ds_segment); + ISP_IOXPUT_32(isp, src->rsp.m0.ct_dslist.ds_base, + &dst->rsp.m0.ct_dslist.ds_base); } - } else if ((ctsrc->ct_flags & CT2_FLAG_MMASK) == CT2_FLAG_MODE1) { - ISP_IOXPUT_16(isp, ctsrc->rsp.m1._reserved, - &ctdst->rsp.m1._reserved); - ISP_IOXPUT_16(isp, ctsrc->rsp.m1._reserved2, - &ctdst->rsp.m1._reserved2); - ISP_IOXPUT_16(isp, ctsrc->rsp.m1.ct_senselen, - &ctdst->rsp.m1.ct_senselen); - ISP_IOXPUT_16(isp, ctsrc->rsp.m1.ct_scsi_status, - &ctdst->rsp.m1.ct_scsi_status); - ISP_IOXPUT_16(isp, ctsrc->rsp.m1.ct_resplen, - &ctdst->rsp.m1.ct_resplen); + } else if ((src->ct_flags & CT2_FLAG_MMASK) == CT2_FLAG_MODE1) { + ISP_IOXPUT_16(isp, src->rsp.m1._reserved, + &dst->rsp.m1._reserved); + ISP_IOXPUT_16(isp, src->rsp.m1._reserved2, + &dst->rsp.m1._reserved2); + ISP_IOXPUT_16(isp, src->rsp.m1.ct_senselen, + &dst->rsp.m1.ct_senselen); + ISP_IOXPUT_16(isp, src->rsp.m1.ct_scsi_status, + &dst->rsp.m1.ct_scsi_status); + ISP_IOXPUT_16(isp, src->rsp.m1.ct_resplen, + &dst->rsp.m1.ct_resplen); for (i = 0; i < MAXRESPLEN; i++) { - ISP_IOXPUT_8(isp, ctsrc->rsp.m1.ct_resp[i], - &ctdst->rsp.m1.ct_resp[i]); + ISP_IOXPUT_8(isp, src->rsp.m1.ct_resp[i], + &dst->rsp.m1.ct_resp[i]); } } else { - ISP_IOXPUT_32(isp, ctsrc->rsp.m2._reserved, - &ctdst->rsp.m2._reserved); - ISP_IOXPUT_16(isp, ctsrc->rsp.m2._reserved2, - &ctdst->rsp.m2._reserved2); - ISP_IOXPUT_16(isp, ctsrc->rsp.m2._reserved3, - &ctdst->rsp.m2._reserved3); - ISP_IOXPUT_32(isp, ctsrc->rsp.m2.ct_datalen, - &ctdst->rsp.m2.ct_datalen); - ISP_IOXPUT_32(isp, ctsrc->rsp.m2.ct_fcp_rsp_iudata.ds_base, - &ctdst->rsp.m2.ct_fcp_rsp_iudata.ds_base); - ISP_IOXPUT_32(isp, ctsrc->rsp.m2.ct_fcp_rsp_iudata.ds_count, - &ctdst->rsp.m2.ct_fcp_rsp_iudata.ds_count); + ISP_IOXPUT_32(isp, src->rsp.m2._reserved, + &dst->rsp.m2._reserved); + ISP_IOXPUT_16(isp, src->rsp.m2._reserved2, + &dst->rsp.m2._reserved2); + ISP_IOXPUT_16(isp, src->rsp.m2._reserved3, + &dst->rsp.m2._reserved3); + ISP_IOXPUT_32(isp, src->rsp.m2.ct_datalen, + &dst->rsp.m2.ct_datalen); + ISP_IOXPUT_32(isp, src->rsp.m2.ct_fcp_rsp_iudata.ds_base, + &dst->rsp.m2.ct_fcp_rsp_iudata.ds_base); + ISP_IOXPUT_32(isp, src->rsp.m2.ct_fcp_rsp_iudata.ds_count, + &dst->rsp.m2.ct_fcp_rsp_iudata.ds_count); } } void -isp_put_ctio2e(ispsoftc_t *isp, ct2e_entry_t *ctsrc, ct2e_entry_t *ctdst) +isp_put_ctio2e(ispsoftc_t *isp, ct2e_entry_t *src, ct2e_entry_t *dst) { int i; - isp_put_hdr(isp, &ctsrc->ct_header, &ctdst->ct_header); - ISP_IOXPUT_32(isp, ctsrc->ct_syshandle, &ctdst->ct_syshandle); - ISP_IOXPUT_16(isp, ctsrc->ct_iid, &ctdst->ct_iid); - ISP_IOXPUT_16(isp, ctsrc->ct_rxid, &ctdst->ct_rxid); - ISP_IOXPUT_16(isp, ctsrc->ct_flags, &ctdst->ct_flags); - ISP_IOXPUT_16(isp, ctsrc->ct_timeout, &ctdst->ct_timeout); - ISP_IOXPUT_16(isp, ctsrc->ct_seg_count, &ctdst->ct_seg_count); - ISP_IOXPUT_32(isp, ctsrc->ct_resid, &ctdst->ct_resid); - ISP_IOXPUT_32(isp, ctsrc->ct_reloff, &ctdst->ct_reloff); - if ((ctsrc->ct_flags & CT2_FLAG_MMASK) == CT2_FLAG_MODE0) { - ISP_IOXPUT_32(isp, ctsrc->rsp.m0._reserved, - &ctdst->rsp.m0._reserved); - ISP_IOXPUT_16(isp, ctsrc->rsp.m0._reserved2, - &ctdst->rsp.m0._reserved2); - ISP_IOXPUT_16(isp, ctsrc->rsp.m0.ct_scsi_status, - &ctdst->rsp.m0.ct_scsi_status); - ISP_IOXPUT_32(isp, ctsrc->rsp.m0.ct_xfrlen, - &ctdst->rsp.m0.ct_xfrlen); - if (ctsrc->ct_header.rqs_entry_type == RQSTYPE_CTIO2) { + isp_put_hdr(isp, &src->ct_header, &dst->ct_header); + ISP_IOXPUT_32(isp, src->ct_syshandle, &dst->ct_syshandle); + ISP_IOXPUT_16(isp, src->ct_iid, &dst->ct_iid); + ISP_IOXPUT_16(isp, src->ct_rxid, &dst->ct_rxid); + ISP_IOXPUT_16(isp, src->ct_flags, &dst->ct_flags); + ISP_IOXPUT_16(isp, src->ct_timeout, &dst->ct_timeout); + ISP_IOXPUT_16(isp, src->ct_seg_count, &dst->ct_seg_count); + ISP_IOXPUT_32(isp, src->ct_resid, &dst->ct_resid); + ISP_IOXPUT_32(isp, src->ct_reloff, &dst->ct_reloff); + if ((src->ct_flags & CT2_FLAG_MMASK) == CT2_FLAG_MODE0) { + ISP_IOXPUT_32(isp, src->rsp.m0._reserved, + &dst->rsp.m0._reserved); + ISP_IOXPUT_16(isp, src->rsp.m0._reserved2, + &dst->rsp.m0._reserved2); + ISP_IOXPUT_16(isp, src->rsp.m0.ct_scsi_status, + &dst->rsp.m0.ct_scsi_status); + ISP_IOXPUT_32(isp, src->rsp.m0.ct_xfrlen, + &dst->rsp.m0.ct_xfrlen); + if (src->ct_header.rqs_entry_type == RQSTYPE_CTIO2) { for (i = 0; i < ISP_RQDSEG_T2; i++) { ISP_IOXPUT_32(isp, - ctsrc->rsp.m0.ct_dataseg[i].ds_base, - &ctdst->rsp.m0.ct_dataseg[i].ds_base); + src->rsp.m0.ct_dataseg[i].ds_base, + &dst->rsp.m0.ct_dataseg[i].ds_base); ISP_IOXPUT_32(isp, - ctsrc->rsp.m0.ct_dataseg[i].ds_count, - &ctdst->rsp.m0.ct_dataseg[i].ds_count); + src->rsp.m0.ct_dataseg[i].ds_count, + &dst->rsp.m0.ct_dataseg[i].ds_count); } - } else if (ctsrc->ct_header.rqs_entry_type == RQSTYPE_CTIO3) { + } else if (src->ct_header.rqs_entry_type == RQSTYPE_CTIO3) { for (i = 0; i < ISP_RQDSEG_T3; i++) { ISP_IOXPUT_32(isp, - ctsrc->rsp.m0.ct_dataseg64[i].ds_base, - &ctdst->rsp.m0.ct_dataseg64[i].ds_base); + src->rsp.m0.ct_dataseg64[i].ds_base, + &dst->rsp.m0.ct_dataseg64[i].ds_base); ISP_IOXPUT_32(isp, - ctsrc->rsp.m0.ct_dataseg64[i].ds_basehi, - &ctdst->rsp.m0.ct_dataseg64[i].ds_basehi); + src->rsp.m0.ct_dataseg64[i].ds_basehi, + &dst->rsp.m0.ct_dataseg64[i].ds_basehi); ISP_IOXPUT_32(isp, - ctsrc->rsp.m0.ct_dataseg64[i].ds_count, - &ctdst->rsp.m0.ct_dataseg64[i].ds_count); + src->rsp.m0.ct_dataseg64[i].ds_count, + &dst->rsp.m0.ct_dataseg64[i].ds_count); } - } else if (ctsrc->ct_header.rqs_entry_type == RQSTYPE_CTIO4) { - ISP_IOXPUT_16(isp, ctsrc->rsp.m0.ct_dslist.ds_type, - &ctdst->rsp.m0.ct_dslist.ds_type); - ISP_IOXPUT_32(isp, ctsrc->rsp.m0.ct_dslist.ds_segment, - &ctdst->rsp.m0.ct_dslist.ds_segment); - ISP_IOXPUT_32(isp, ctsrc->rsp.m0.ct_dslist.ds_base, - &ctdst->rsp.m0.ct_dslist.ds_base); + } else if (src->ct_header.rqs_entry_type == RQSTYPE_CTIO4) { + ISP_IOXPUT_16(isp, src->rsp.m0.ct_dslist.ds_type, + &dst->rsp.m0.ct_dslist.ds_type); + ISP_IOXPUT_32(isp, src->rsp.m0.ct_dslist.ds_segment, + &dst->rsp.m0.ct_dslist.ds_segment); + ISP_IOXPUT_32(isp, src->rsp.m0.ct_dslist.ds_base, + &dst->rsp.m0.ct_dslist.ds_base); } - } else if ((ctsrc->ct_flags & CT2_FLAG_MMASK) == CT2_FLAG_MODE1) { - ISP_IOXPUT_16(isp, ctsrc->rsp.m1._reserved, - &ctdst->rsp.m1._reserved); - ISP_IOXPUT_16(isp, ctsrc->rsp.m1._reserved2, - &ctdst->rsp.m1._reserved2); - ISP_IOXPUT_16(isp, ctsrc->rsp.m1.ct_senselen, - &ctdst->rsp.m1.ct_senselen); - ISP_IOXPUT_16(isp, ctsrc->rsp.m1.ct_scsi_status, - &ctdst->rsp.m1.ct_scsi_status); - ISP_IOXPUT_16(isp, ctsrc->rsp.m1.ct_resplen, - &ctdst->rsp.m1.ct_resplen); + } else if ((src->ct_flags & CT2_FLAG_MMASK) == CT2_FLAG_MODE1) { + ISP_IOXPUT_16(isp, src->rsp.m1._reserved, + &dst->rsp.m1._reserved); + ISP_IOXPUT_16(isp, src->rsp.m1._reserved2, + &dst->rsp.m1._reserved2); + ISP_IOXPUT_16(isp, src->rsp.m1.ct_senselen, + &dst->rsp.m1.ct_senselen); + ISP_IOXPUT_16(isp, src->rsp.m1.ct_scsi_status, + &dst->rsp.m1.ct_scsi_status); + ISP_IOXPUT_16(isp, src->rsp.m1.ct_resplen, + &dst->rsp.m1.ct_resplen); for (i = 0; i < MAXRESPLEN; i++) { - ISP_IOXPUT_8(isp, ctsrc->rsp.m1.ct_resp[i], - &ctdst->rsp.m1.ct_resp[i]); + ISP_IOXPUT_8(isp, src->rsp.m1.ct_resp[i], + &dst->rsp.m1.ct_resp[i]); + } + } else { + ISP_IOXPUT_32(isp, src->rsp.m2._reserved, + &dst->rsp.m2._reserved); + ISP_IOXPUT_16(isp, src->rsp.m2._reserved2, + &dst->rsp.m2._reserved2); + ISP_IOXPUT_16(isp, src->rsp.m2._reserved3, + &dst->rsp.m2._reserved3); + ISP_IOXPUT_32(isp, src->rsp.m2.ct_datalen, + &dst->rsp.m2.ct_datalen); + ISP_IOXPUT_32(isp, src->rsp.m2.ct_fcp_rsp_iudata.ds_base, + &dst->rsp.m2.ct_fcp_rsp_iudata.ds_base); + ISP_IOXPUT_32(isp, src->rsp.m2.ct_fcp_rsp_iudata.ds_count, + &dst->rsp.m2.ct_fcp_rsp_iudata.ds_count); + } +} + +void +isp_put_ctio7(ispsoftc_t *isp, ct7_entry_t *src, ct7_entry_t *dst) +{ + int i; + + isp_put_hdr(isp, &src->ct_header, &dst->ct_header); + ISP_IOXPUT_32(isp, src->ct_syshandle, &dst->ct_syshandle); + ISP_IOXPUT_16(isp, src->ct_nphdl, &dst->ct_nphdl); + ISP_IOXPUT_16(isp, src->ct_timeout, &dst->ct_timeout); + ISP_IOXPUT_16(isp, src->ct_seg_count, &dst->ct_seg_count); + ISP_IOXPUT_8(isp, src->ct_vpindex, &dst->ct_vpindex); + ISP_IOXPUT_8(isp, src->ct_xflags, &dst->ct_xflags); + ISP_IOXPUT_16(isp, src->ct_iid_lo, &dst->ct_iid_lo); + ISP_IOXPUT_8(isp, src->ct_iid_hi, &dst->ct_iid_hi); + ISP_IOXPUT_8(isp, src->ct_reserved, &dst->ct_reserved); + ISP_IOXPUT_32(isp, src->ct_rxid, &dst->ct_rxid); + ISP_IOXPUT_16(isp, src->ct_senselen, &dst->ct_senselen); + ISP_IOXPUT_16(isp, src->ct_flags, &dst->ct_flags); + ISP_IOXPUT_32(isp, src->ct_resid, &dst->ct_resid); + ISP_IOXPUT_16(isp, src->ct_oxid, &dst->ct_oxid); + ISP_IOXPUT_16(isp, src->ct_scsi_status, &dst->ct_scsi_status); + if ((dst->ct_flags & CT7_FLAG_MMASK) == CT7_FLAG_MODE0) { + ISP_IOXPUT_32(isp, src->rsp.m0.reloff, &dst->rsp.m0.reloff); + ISP_IOXPUT_32(isp, src->rsp.m0.reserved0, + &dst->rsp.m0.reserved0); + ISP_IOXPUT_32(isp, src->rsp.m0.ct_xfrlen, + &dst->rsp.m0.ct_xfrlen); + ISP_IOXPUT_32(isp, src->rsp.m0.reserved1, + &dst->rsp.m0.reserved1); + ISP_IOXPUT_32(isp, src->rsp.m0.ct.ds_base, + &dst->rsp.m0.ct.ds_base); + ISP_IOXPUT_32(isp, src->rsp.m0.ct.ds_basehi, + &dst->rsp.m0.ct.ds_basehi); + ISP_IOXPUT_32(isp, src->rsp.m0.ct.ds_count, + &dst->rsp.m0.ct.ds_count); + } else if ((dst->ct_flags & CT7_FLAG_MMASK) == CT7_FLAG_MODE1) { + ISP_IOXPUT_16(isp, src->rsp.m1.ct_resplen, + &dst->rsp.m1.ct_resplen); + ISP_IOXPUT_16(isp, src->rsp.m1.reserved, &dst->rsp.m1.reserved); + for (i = 0; i < MAXRESPLEN_24XX; i++) { + ISP_IOXPUT_8(isp, src->rsp.m1.ct_resp[i], + &dst->rsp.m1.ct_resp[i]); } } else { - ISP_IOXPUT_32(isp, ctsrc->rsp.m2._reserved, - &ctdst->rsp.m2._reserved); - ISP_IOXPUT_16(isp, ctsrc->rsp.m2._reserved2, - &ctdst->rsp.m2._reserved2); - ISP_IOXPUT_16(isp, ctsrc->rsp.m2._reserved3, - &ctdst->rsp.m2._reserved3); - ISP_IOXPUT_32(isp, ctsrc->rsp.m2.ct_datalen, - &ctdst->rsp.m2.ct_datalen); - ISP_IOXPUT_32(isp, ctsrc->rsp.m2.ct_fcp_rsp_iudata.ds_base, - &ctdst->rsp.m2.ct_fcp_rsp_iudata.ds_base); - ISP_IOXPUT_32(isp, ctsrc->rsp.m2.ct_fcp_rsp_iudata.ds_count, - &ctdst->rsp.m2.ct_fcp_rsp_iudata.ds_count); + ISP_IOXPUT_32(isp, src->rsp.m2.reserved0, + &dst->rsp.m2.reserved0); + ISP_IOXPUT_32(isp, src->rsp.m2.ct_datalen, + &dst->rsp.m2.ct_datalen); + ISP_IOXPUT_32(isp, src->rsp.m2.reserved1, + &dst->rsp.m2.reserved1); + ISP_IOXPUT_32(isp, src->rsp.m2.ct_fcp_rsp_iudata.ds_base, + &dst->rsp.m2.ct_fcp_rsp_iudata.ds_base); + ISP_IOXPUT_32(isp, src->rsp.m2.ct_fcp_rsp_iudata.ds_basehi, + &dst->rsp.m2.ct_fcp_rsp_iudata.ds_basehi); + ISP_IOXPUT_32(isp, src->rsp.m2.ct_fcp_rsp_iudata.ds_count, + &dst->rsp.m2.ct_fcp_rsp_iudata.ds_count); } } + void -isp_get_ctio2(ispsoftc_t *isp, ct2_entry_t *ctsrc, ct2_entry_t *ctdst) +isp_get_ctio2(ispsoftc_t *isp, ct2_entry_t *src, ct2_entry_t *dst) { int i; - isp_get_hdr(isp, &ctsrc->ct_header, &ctdst->ct_header); - ISP_IOXGET_32(isp, &ctsrc->ct_syshandle, ctdst->ct_syshandle); - ISP_IOXGET_8(isp, &ctsrc->ct_lun, ctdst->ct_lun); - ISP_IOXGET_8(isp, &ctsrc->ct_iid, ctdst->ct_iid); - ISP_IOXGET_16(isp, &ctsrc->ct_rxid, ctdst->ct_rxid); - ISP_IOXGET_16(isp, &ctsrc->ct_flags, ctdst->ct_flags); - ISP_IOXGET_16(isp, &ctsrc->ct_status, ctdst->ct_status); - ISP_IOXGET_16(isp, &ctsrc->ct_timeout, ctdst->ct_timeout); - ISP_IOXGET_16(isp, &ctsrc->ct_seg_count, ctdst->ct_seg_count); - ISP_IOXGET_32(isp, &ctsrc->ct_reloff, ctdst->ct_reloff); - ISP_IOXGET_32(isp, &ctsrc->ct_resid, ctdst->ct_resid); - if ((ctdst->ct_flags & CT2_FLAG_MMASK) == CT2_FLAG_MODE0) { - ISP_IOXGET_32(isp, &ctsrc->rsp.m0._reserved, - ctdst->rsp.m0._reserved); - ISP_IOXGET_16(isp, &ctsrc->rsp.m0._reserved2, - ctdst->rsp.m0._reserved2); - ISP_IOXGET_16(isp, &ctsrc->rsp.m0.ct_scsi_status, - ctdst->rsp.m0.ct_scsi_status); - ISP_IOXGET_32(isp, &ctsrc->rsp.m0.ct_xfrlen, - ctdst->rsp.m0.ct_xfrlen); - if (ctdst->ct_header.rqs_entry_type == RQSTYPE_CTIO2) { + isp_get_hdr(isp, &src->ct_header, &dst->ct_header); + ISP_IOXGET_32(isp, &src->ct_syshandle, dst->ct_syshandle); + ISP_IOXGET_8(isp, &src->ct_lun, dst->ct_lun); + ISP_IOXGET_8(isp, &src->ct_iid, dst->ct_iid); + ISP_IOXGET_16(isp, &src->ct_rxid, dst->ct_rxid); + ISP_IOXGET_16(isp, &src->ct_flags, dst->ct_flags); + ISP_IOXGET_16(isp, &src->ct_status, dst->ct_status); + ISP_IOXGET_16(isp, &src->ct_timeout, dst->ct_timeout); + ISP_IOXGET_16(isp, &src->ct_seg_count, dst->ct_seg_count); + ISP_IOXGET_32(isp, &src->ct_reloff, dst->ct_reloff); + ISP_IOXGET_32(isp, &src->ct_resid, dst->ct_resid); + if ((dst->ct_flags & CT2_FLAG_MMASK) == CT2_FLAG_MODE0) { + ISP_IOXGET_32(isp, &src->rsp.m0._reserved, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Sep 17 22:15:41 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5AA1816A412; Sun, 17 Sep 2006 22:15:41 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 350A116A407 for ; Sun, 17 Sep 2006 22:15:41 +0000 (UTC) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E29D943D49 for ; Sun, 17 Sep 2006 22:15:40 +0000 (GMT) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8HMFeVF093810 for ; Sun, 17 Sep 2006 22:15:40 GMT (envelope-from als@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8HMFe9e093807 for perforce@freebsd.org; Sun, 17 Sep 2006 22:15:40 GMT (envelope-from als@FreeBSD.org) Date: Sun, 17 Sep 2006 22:15:40 GMT Message-Id: <200609172215.k8HMFe9e093807@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to als@FreeBSD.org using -f From: Alex Lyashkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 106267 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Sep 2006 22:15:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=106267 Change 106267 by als@als_head on 2006/09/17 22:14:44 fix ommited mtx_lock(&allprison_mtx) for find_prison. founded by Kris Kennaway Affected files ... .. //depot/projects/jail2/sys/kern/kern_jail.c#5 edit Differences ... ==== //depot/projects/jail2/sys/kern/kern_jail.c#5 (text+ko) ==== @@ -316,6 +316,7 @@ if (error) return (error); + mtx_lock(&allprison_mtx); pr = prison_find(uap->jid); if (pr == NULL) { return (ESRCH); From owner-p4-projects@FreeBSD.ORG Mon Sep 18 05:13:12 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B61C616A416; Mon, 18 Sep 2006 05:13:12 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5D58916A403 for ; Mon, 18 Sep 2006 05:13:12 +0000 (UTC) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EAFFF43D5C for ; Mon, 18 Sep 2006 05:13:11 +0000 (GMT) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8I5DBA1038130 for ; Mon, 18 Sep 2006 05:13:11 GMT (envelope-from als@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8I5D65Z038119 for perforce@freebsd.org; Mon, 18 Sep 2006 05:13:06 GMT (envelope-from als@FreeBSD.org) Date: Mon, 18 Sep 2006 05:13:06 GMT Message-Id: <200609180513.k8I5D65Z038119@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to als@FreeBSD.org using -f From: Alex Lyashkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 106279 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Sep 2006 05:13:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=106279 Change 106279 by als@als_head on 2006/09/18 05:12:22 integrate with HEAD. Affected files ... .. //depot/projects/jail2/sys/amd64/amd64/local_apic.c#3 integrate .. //depot/projects/jail2/sys/amd64/amd64/machdep.c#4 integrate .. //depot/projects/jail2/sys/amd64/amd64/mp_machdep.c#2 integrate .. //depot/projects/jail2/sys/amd64/amd64/nexus.c#2 integrate .. //depot/projects/jail2/sys/amd64/amd64/vm_machdep.c#3 integrate .. //depot/projects/jail2/sys/amd64/linux32/linux32_machdep.c#4 integrate .. //depot/projects/jail2/sys/amd64/linux32/linux32_sysvec.c#3 integrate .. //depot/projects/jail2/sys/arm/arm/fusu.S#3 integrate .. //depot/projects/jail2/sys/arm/arm/pmap.c#3 integrate .. //depot/projects/jail2/sys/arm/at91/at91.c#2 integrate .. //depot/projects/jail2/sys/arm/at91/at91_twi.c#3 integrate .. //depot/projects/jail2/sys/arm/at91/at91rm92reg.h#3 integrate .. //depot/projects/jail2/sys/arm/at91/if_atereg.h#2 integrate .. //depot/projects/jail2/sys/arm/at91/kb920x_machdep.c#4 integrate .. //depot/projects/jail2/sys/arm/include/asm.h#2 integrate .. //depot/projects/jail2/sys/boot/i386/pxeldr/pxeldr.S#2 integrate .. //depot/projects/jail2/sys/bsm/audit_internal.h#3 integrate .. //depot/projects/jail2/sys/bsm/audit_record.h#4 integrate .. //depot/projects/jail2/sys/cam/cam_xpt.c#3 integrate .. //depot/projects/jail2/sys/cam/scsi/scsi_da.c#3 integrate .. //depot/projects/jail2/sys/compat/freebsd32/freebsd32_proto.h#4 integrate .. //depot/projects/jail2/sys/compat/freebsd32/freebsd32_syscall.h#4 integrate .. //depot/projects/jail2/sys/compat/freebsd32/freebsd32_syscalls.c#4 integrate .. //depot/projects/jail2/sys/compat/freebsd32/freebsd32_sysent.c#4 integrate .. //depot/projects/jail2/sys/compat/freebsd32/syscalls.master#4 integrate .. //depot/projects/jail2/sys/compat/linux/linux_emul.c#2 integrate .. //depot/projects/jail2/sys/compat/linux/linux_file.c#3 integrate .. //depot/projects/jail2/sys/compat/linux/linux_futex.c#3 integrate .. //depot/projects/jail2/sys/compat/linux/linux_misc.c#6 integrate .. //depot/projects/jail2/sys/compat/svr4/svr4_stat.c#3 integrate .. //depot/projects/jail2/sys/conf/files.amd64#4 integrate .. //depot/projects/jail2/sys/contrib/pf/net/pf.c#2 integrate .. //depot/projects/jail2/sys/contrib/pf/net/pf_ioctl.c#3 integrate .. //depot/projects/jail2/sys/crypto/via/padlock_cipher.c#2 integrate .. //depot/projects/jail2/sys/dev/acpica/acpi.c#3 integrate .. //depot/projects/jail2/sys/dev/acpica/acpi_thermal.c#3 integrate .. //depot/projects/jail2/sys/dev/aic7xxx/ahc_eisa.c#2 integrate .. //depot/projects/jail2/sys/dev/aic7xxx/ahc_isa.c#2 integrate .. //depot/projects/jail2/sys/dev/aic7xxx/ahc_pci.c#2 integrate .. //depot/projects/jail2/sys/dev/aic7xxx/ahd_pci.c#2 integrate .. //depot/projects/jail2/sys/dev/aic7xxx/aic7xxx_osm.c#2 integrate .. //depot/projects/jail2/sys/dev/arcmsr/arcmsr.c#2 integrate .. //depot/projects/jail2/sys/dev/ata/ata-all.c#2 integrate .. //depot/projects/jail2/sys/dev/ata/ata-chipset.c#4 integrate .. //depot/projects/jail2/sys/dev/ata/ata-disk.c#3 integrate .. //depot/projects/jail2/sys/dev/ata/ata-dma.c#2 integrate .. //depot/projects/jail2/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/jail2/sys/dev/ata/ata-raid.h#2 integrate .. //depot/projects/jail2/sys/dev/ata/ata-usb.c#2 integrate .. //depot/projects/jail2/sys/dev/atkbdc/atkbdc.c#2 integrate .. //depot/projects/jail2/sys/dev/bce/if_bce.c#3 integrate .. //depot/projects/jail2/sys/dev/bge/if_bge.c#4 integrate .. //depot/projects/jail2/sys/dev/bge/if_bgereg.h#4 integrate .. //depot/projects/jail2/sys/dev/bktr/bktr_i2c.c#2 integrate .. //depot/projects/jail2/sys/dev/cs/if_cs.c#2 integrate .. //depot/projects/jail2/sys/dev/cs/if_csvar.h#2 integrate .. //depot/projects/jail2/sys/dev/dc/if_dc.c#2 integrate .. //depot/projects/jail2/sys/dev/dc/if_dcreg.h#2 integrate .. //depot/projects/jail2/sys/dev/de/if_de.c#2 integrate .. //depot/projects/jail2/sys/dev/de/if_devar.h#2 integrate .. //depot/projects/jail2/sys/dev/drm/drmP.h#2 integrate .. //depot/projects/jail2/sys/dev/drm/drm_drv.c#2 integrate .. //depot/projects/jail2/sys/dev/drm/drm_pciids.h#2 integrate .. //depot/projects/jail2/sys/dev/drm/i915_dma.c#2 integrate .. //depot/projects/jail2/sys/dev/drm/i915_drm.h#2 integrate .. //depot/projects/jail2/sys/dev/drm/i915_drv.h#2 integrate .. //depot/projects/jail2/sys/dev/drm/i915_irq.c#2 integrate .. //depot/projects/jail2/sys/dev/drm/mach64_drm.h#2 integrate .. //depot/projects/jail2/sys/dev/drm/radeon_cp.c#2 integrate .. //depot/projects/jail2/sys/dev/drm/radeon_drm.h#2 integrate .. //depot/projects/jail2/sys/dev/drm/radeon_drv.h#2 integrate .. //depot/projects/jail2/sys/dev/drm/radeon_state.c#2 integrate .. //depot/projects/jail2/sys/dev/em/if_em.c#4 integrate .. //depot/projects/jail2/sys/dev/em/if_em.h#3 integrate .. //depot/projects/jail2/sys/dev/en/if_en_pci.c#2 integrate .. //depot/projects/jail2/sys/dev/en/midway.c#2 integrate .. //depot/projects/jail2/sys/dev/fdc/fdc.c#3 integrate .. //depot/projects/jail2/sys/dev/gem/if_gem.c#2 integrate .. //depot/projects/jail2/sys/dev/hwpmc/hwpmc_mod.c#3 integrate .. //depot/projects/jail2/sys/dev/ic/nec765.h#3 integrate .. //depot/projects/jail2/sys/dev/ichsmb/ichsmb.c#2 integrate .. //depot/projects/jail2/sys/dev/if_ndis/if_ndis_usb.c#2 integrate .. //depot/projects/jail2/sys/dev/iicbus/iic.c#3 integrate .. //depot/projects/jail2/sys/dev/iicbus/iicsmb.c#2 integrate .. //depot/projects/jail2/sys/dev/isp/isp.c#3 integrate .. //depot/projects/jail2/sys/dev/isp/isp_freebsd.c#3 integrate .. //depot/projects/jail2/sys/dev/isp/isp_freebsd.h#3 integrate .. //depot/projects/jail2/sys/dev/isp/isp_pci.c#4 integrate .. //depot/projects/jail2/sys/dev/isp/isp_sbus.c#3 integrate .. //depot/projects/jail2/sys/dev/ixgb/if_ixgb.c#3 integrate .. //depot/projects/jail2/sys/dev/lge/if_lge.c#2 integrate .. //depot/projects/jail2/sys/dev/lge/if_lgereg.h#2 integrate .. //depot/projects/jail2/sys/dev/mfi/mfi.c#4 integrate .. //depot/projects/jail2/sys/dev/mfi/mfireg.h#3 integrate .. //depot/projects/jail2/sys/dev/mii/brgphy.c#4 integrate .. //depot/projects/jail2/sys/dev/mii/miidevs#3 integrate .. //depot/projects/jail2/sys/dev/mk48txx/mk48txx.c#2 integrate .. //depot/projects/jail2/sys/dev/mpt/mpt.c#4 integrate .. //depot/projects/jail2/sys/dev/mpt/mpt.h#4 integrate .. //depot/projects/jail2/sys/dev/mpt/mpt_cam.c#4 integrate .. //depot/projects/jail2/sys/dev/mpt/mpt_pci.c#4 integrate .. //depot/projects/jail2/sys/dev/mxge/eth_z8e.dat.gz.uu#2 integrate .. //depot/projects/jail2/sys/dev/mxge/ethp_z8e.dat.gz.uu#2 integrate .. //depot/projects/jail2/sys/dev/mxge/if_mxge.c#3 integrate .. //depot/projects/jail2/sys/dev/mxge/if_mxge_var.h#2 integrate .. //depot/projects/jail2/sys/dev/mxge/mxge_mcp.h#2 integrate .. //depot/projects/jail2/sys/dev/my/if_my.c#2 integrate .. //depot/projects/jail2/sys/dev/my/if_myreg.h#2 integrate .. //depot/projects/jail2/sys/dev/nfe/if_nfe.c#3 integrate .. //depot/projects/jail2/sys/dev/nfe/if_nfereg.h#2 integrate .. //depot/projects/jail2/sys/dev/nge/if_nge.c#2 integrate .. //depot/projects/jail2/sys/dev/nge/if_ngereg.h#2 integrate .. //depot/projects/jail2/sys/dev/ofw/openfirmio.c#2 integrate .. //depot/projects/jail2/sys/dev/puc/pucdata.c#3 integrate .. //depot/projects/jail2/sys/dev/re/if_re.c#4 integrate .. //depot/projects/jail2/sys/dev/sio/sio_pccard.c#2 integrate .. //depot/projects/jail2/sys/dev/smbus/smb.c#2 integrate .. //depot/projects/jail2/sys/dev/smbus/smb.h#2 integrate .. //depot/projects/jail2/sys/dev/smbus/smbconf.c#2 integrate .. //depot/projects/jail2/sys/dev/smbus/smbconf.h#2 integrate .. //depot/projects/jail2/sys/dev/smbus/smbus.c#2 integrate .. //depot/projects/jail2/sys/dev/smbus/smbus.h#2 integrate .. //depot/projects/jail2/sys/dev/smbus/smbus_if.m#2 integrate .. //depot/projects/jail2/sys/dev/sound/usb/uaudio.c#2 integrate .. //depot/projects/jail2/sys/dev/stge/if_stge.c#2 integrate .. //depot/projects/jail2/sys/dev/syscons/scmouse.c#2 integrate .. //depot/projects/jail2/sys/dev/syscons/syscons.c#2 integrate .. //depot/projects/jail2/sys/dev/syscons/syscons.h#2 integrate .. //depot/projects/jail2/sys/dev/ti/if_ti.c#3 integrate .. //depot/projects/jail2/sys/dev/txp/if_txp.c#2 integrate .. //depot/projects/jail2/sys/dev/usb/ehci.c#2 integrate .. //depot/projects/jail2/sys/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/jail2/sys/dev/usb/ehcivar.h#2 integrate .. //depot/projects/jail2/sys/dev/usb/hid.c#2 integrate .. //depot/projects/jail2/sys/dev/usb/if_aue.c#3 integrate .. //depot/projects/jail2/sys/dev/usb/if_axe.c#2 integrate .. //depot/projects/jail2/sys/dev/usb/if_cdce.c#2 integrate .. //depot/projects/jail2/sys/dev/usb/if_cue.c#2 integrate .. //depot/projects/jail2/sys/dev/usb/if_kue.c#2 integrate .. //depot/projects/jail2/sys/dev/usb/if_rue.c#2 integrate .. //depot/projects/jail2/sys/dev/usb/if_udav.c#2 integrate .. //depot/projects/jail2/sys/dev/usb/if_udavreg.h#2 integrate .. //depot/projects/jail2/sys/dev/usb/if_ural.c#3 integrate .. //depot/projects/jail2/sys/dev/usb/if_uralvar.h#2 integrate .. //depot/projects/jail2/sys/dev/usb/kue_fw.h#2 integrate .. //depot/projects/jail2/sys/dev/usb/ohci.c#2 integrate .. //depot/projects/jail2/sys/dev/usb/ohci_pci.c#2 integrate .. //depot/projects/jail2/sys/dev/usb/ohcivar.h#2 integrate .. //depot/projects/jail2/sys/dev/usb/sl811hs.c#2 integrate .. //depot/projects/jail2/sys/dev/usb/sl811hsvar.h#2 integrate .. //depot/projects/jail2/sys/dev/usb/ubsa.c#2 integrate .. //depot/projects/jail2/sys/dev/usb/ubser.c#2 integrate .. //depot/projects/jail2/sys/dev/usb/ucom.c#2 integrate .. //depot/projects/jail2/sys/dev/usb/ucomvar.h#2 integrate .. //depot/projects/jail2/sys/dev/usb/udbp.c#2 integrate .. //depot/projects/jail2/sys/dev/usb/ufm.c#2 integrate .. //depot/projects/jail2/sys/dev/usb/ufoma.c#2 integrate .. //depot/projects/jail2/sys/dev/usb/uftdi.c#2 integrate .. //depot/projects/jail2/sys/dev/usb/ugen.c#2 integrate .. //depot/projects/jail2/sys/dev/usb/uhci.c#2 integrate .. //depot/projects/jail2/sys/dev/usb/uhcivar.h#2 integrate .. //depot/projects/jail2/sys/dev/usb/uhid.c#3 integrate .. //depot/projects/jail2/sys/dev/usb/uhub.c#2 integrate .. //depot/projects/jail2/sys/dev/usb/ukbd.c#2 integrate .. //depot/projects/jail2/sys/dev/usb/ulpt.c#2 integrate .. //depot/projects/jail2/sys/dev/usb/umass.c#2 integrate .. //depot/projects/jail2/sys/dev/usb/umct.c#2 integrate .. //depot/projects/jail2/sys/dev/usb/umodem.c#3 integrate .. //depot/projects/jail2/sys/dev/usb/ums.c#2 integrate .. //depot/projects/jail2/sys/dev/usb/uplcom.c#4 integrate .. //depot/projects/jail2/sys/dev/usb/urio.c#2 integrate .. //depot/projects/jail2/sys/dev/usb/usb.c#2 integrate .. //depot/projects/jail2/sys/dev/usb/usb.h#2 integrate .. //depot/projects/jail2/sys/dev/usb/usb_ethersubr.c#2 integrate .. //depot/projects/jail2/sys/dev/usb/usb_mem.c#2 integrate .. //depot/projects/jail2/sys/dev/usb/usb_port.h#3 integrate .. //depot/projects/jail2/sys/dev/usb/usb_quirks.c#2 integrate .. //depot/projects/jail2/sys/dev/usb/usb_subr.c#2 integrate .. //depot/projects/jail2/sys/dev/usb/usbdi.c#2 integrate .. //depot/projects/jail2/sys/dev/usb/usbdi.h#2 integrate .. //depot/projects/jail2/sys/dev/usb/usbdi_util.c#2 integrate .. //depot/projects/jail2/sys/dev/usb/usbdi_util.h#2 integrate .. //depot/projects/jail2/sys/dev/usb/usbdivar.h#2 integrate .. //depot/projects/jail2/sys/dev/usb/uscanner.c#4 integrate .. //depot/projects/jail2/sys/dev/usb/uvisor.c#3 integrate .. //depot/projects/jail2/sys/dev/usb/uvscom.c#2 integrate .. //depot/projects/jail2/sys/dev/vge/if_vge.c#2 integrate .. //depot/projects/jail2/sys/fs/udf/osta.h#2 integrate .. //depot/projects/jail2/sys/geom/eli/g_eli.h#3 integrate .. //depot/projects/jail2/sys/geom/eli/g_eli_ctl.c#3 integrate .. //depot/projects/jail2/sys/geom/gate/g_gate.c#2 integrate .. //depot/projects/jail2/sys/geom/gate/g_gate.h#2 integrate .. //depot/projects/jail2/sys/geom/geom.h#3 integrate .. //depot/projects/jail2/sys/geom/geom_event.c#2 integrate .. //depot/projects/jail2/sys/geom/geom_subr.c#2 integrate .. //depot/projects/jail2/sys/geom/label/g_label_ufs.c#2 integrate .. //depot/projects/jail2/sys/geom/mirror/g_mirror.c#3 integrate .. //depot/projects/jail2/sys/geom/nop/g_nop.c#2 integrate .. //depot/projects/jail2/sys/geom/nop/g_nop.h#2 integrate .. //depot/projects/jail2/sys/geom/raid3/g_raid3.c#3 integrate .. //depot/projects/jail2/sys/geom/raid3/g_raid3_ctl.c#3 integrate .. //depot/projects/jail2/sys/i386/acpica/Makefile#2 integrate .. //depot/projects/jail2/sys/i386/conf/NOTES#4 integrate .. //depot/projects/jail2/sys/i386/i386/busdma_machdep.c#2 integrate .. //depot/projects/jail2/sys/i386/i386/local_apic.c#3 integrate .. //depot/projects/jail2/sys/i386/i386/machdep.c#3 integrate .. //depot/projects/jail2/sys/i386/i386/mp_machdep.c#2 integrate .. //depot/projects/jail2/sys/i386/i386/nexus.c#2 integrate .. //depot/projects/jail2/sys/i386/i386/sys_machdep.c#2 integrate .. //depot/projects/jail2/sys/i386/linux/linux_sysvec.c#3 integrate .. //depot/projects/jail2/sys/ia64/ia32/ia32_trap.c#3 integrate .. //depot/projects/jail2/sys/ia64/ia64/trap.c#3 integrate .. //depot/projects/jail2/sys/kern/bus_if.m#3 integrate .. //depot/projects/jail2/sys/kern/init_sysent.c#4 integrate .. //depot/projects/jail2/sys/kern/kern_acct.c#2 integrate .. //depot/projects/jail2/sys/kern/kern_exec.c#4 integrate .. //depot/projects/jail2/sys/kern/kern_exit.c#3 integrate .. //depot/projects/jail2/sys/kern/kern_jail.c#6 integrate .. //depot/projects/jail2/sys/kern/kern_ktr.c#3 integrate .. //depot/projects/jail2/sys/kern/kern_mbuf.c#2 integrate .. //depot/projects/jail2/sys/kern/kern_prot.c#4 integrate .. //depot/projects/jail2/sys/kern/kern_umtx.c#3 integrate .. //depot/projects/jail2/sys/kern/subr_bus.c#4 integrate .. //depot/projects/jail2/sys/kern/subr_prf.c#3 integrate .. //depot/projects/jail2/sys/kern/subr_rman.c#3 integrate .. //depot/projects/jail2/sys/kern/subr_witness.c#3 integrate .. //depot/projects/jail2/sys/kern/syscalls.c#4 integrate .. //depot/projects/jail2/sys/kern/syscalls.master#4 integrate .. //depot/projects/jail2/sys/kern/systrace_args.c#3 integrate .. //depot/projects/jail2/sys/kern/tty.c#2 integrate .. //depot/projects/jail2/sys/kern/uipc_sockbuf.c#2 integrate .. //depot/projects/jail2/sys/kern/uipc_socket.c#5 integrate .. //depot/projects/jail2/sys/kern/vfs_aio.c#3 integrate .. //depot/projects/jail2/sys/kern/vfs_lookup.c#3 integrate .. //depot/projects/jail2/sys/kern/vfs_subr.c#4 integrate .. //depot/projects/jail2/sys/kern/vfs_syscalls.c#4 integrate .. //depot/projects/jail2/sys/modules/Makefile#5 integrate .. //depot/projects/jail2/sys/modules/agp/Makefile#3 integrate .. //depot/projects/jail2/sys/modules/ipfw/Makefile#2 integrate .. //depot/projects/jail2/sys/modules/pf/Makefile#2 integrate .. //depot/projects/jail2/sys/modules/sound/sound/Makefile#3 integrate .. //depot/projects/jail2/sys/net/bpf.h#2 integrate .. //depot/projects/jail2/sys/net/if.c#5 integrate .. //depot/projects/jail2/sys/net/if.h#3 integrate .. //depot/projects/jail2/sys/net/if_bridge.c#5 integrate .. //depot/projects/jail2/sys/net/if_var.h#4 integrate .. //depot/projects/jail2/sys/net/if_vlan.c#5 integrate .. //depot/projects/jail2/sys/net/if_vlan_var.h#2 integrate .. //depot/projects/jail2/sys/net80211/ieee80211_input.c#3 integrate .. //depot/projects/jail2/sys/net80211/ieee80211_output.c#3 integrate .. //depot/projects/jail2/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#2 integrate .. //depot/projects/jail2/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#2 integrate .. //depot/projects/jail2/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#2 integrate .. //depot/projects/jail2/sys/netgraph/ng_eiface.c#2 integrate .. //depot/projects/jail2/sys/netgraph/ng_fec.c#3 integrate .. //depot/projects/jail2/sys/netgraph/ng_vlan.c#2 integrate .. //depot/projects/jail2/sys/netinet/in_pcb.c#4 integrate .. //depot/projects/jail2/sys/netinet/ip_fw2.c#5 integrate .. //depot/projects/jail2/sys/netinet/ip_output.c#3 integrate .. //depot/projects/jail2/sys/netinet/raw_ip.c#4 integrate .. //depot/projects/jail2/sys/netinet/tcp_input.c#4 integrate .. //depot/projects/jail2/sys/netinet/tcp_output.c#2 integrate .. //depot/projects/jail2/sys/netinet/tcp_subr.c#4 integrate .. //depot/projects/jail2/sys/netinet/tcp_syncache.c#3 integrate .. //depot/projects/jail2/sys/netinet/tcp_timer.c#3 integrate .. //depot/projects/jail2/sys/netinet/tcp_timer.h#3 integrate .. //depot/projects/jail2/sys/netinet/tcp_usrreq.c#5 integrate .. //depot/projects/jail2/sys/netinet/tcp_var.h#3 integrate .. //depot/projects/jail2/sys/netinet/udp_usrreq.c#4 integrate .. //depot/projects/jail2/sys/netinet6/icmp6.c#4 integrate .. //depot/projects/jail2/sys/netinet6/ip6_forward.c#3 integrate .. //depot/projects/jail2/sys/netinet6/nd6.c#3 integrate .. //depot/projects/jail2/sys/netinet6/udp6_usrreq.c#3 integrate .. //depot/projects/jail2/sys/nfs4client/nfs4_vfsops.c#2 integrate .. //depot/projects/jail2/sys/nfs4client/nfs4_vnops.c#3 integrate .. //depot/projects/jail2/sys/nfsclient/nfs_node.c#2 integrate .. //depot/projects/jail2/sys/nfsclient/nfs_socket.c#3 integrate .. //depot/projects/jail2/sys/nfsclient/nfs_subs.c#2 integrate .. //depot/projects/jail2/sys/nfsclient/nfs_vfsops.c#4 integrate .. //depot/projects/jail2/sys/nfsclient/nfs_vnops.c#3 integrate .. //depot/projects/jail2/sys/nfsclient/nfsnode.h#2 integrate .. //depot/projects/jail2/sys/pc98/cbus/fdc.c#2 integrate .. //depot/projects/jail2/sys/pci/agp_ati.c#2 integrate .. //depot/projects/jail2/sys/pci/alpm.c#2 integrate .. //depot/projects/jail2/sys/pci/amdpm.c#2 integrate .. //depot/projects/jail2/sys/pci/amdsmb.c#2 integrate .. //depot/projects/jail2/sys/pci/if_rl.c#2 integrate .. //depot/projects/jail2/sys/pci/if_sf.c#2 integrate .. //depot/projects/jail2/sys/pci/if_sfreg.h#2 integrate .. //depot/projects/jail2/sys/pci/if_sis.c#2 integrate .. //depot/projects/jail2/sys/pci/if_sisreg.h#2 integrate .. //depot/projects/jail2/sys/pci/if_ste.c#2 integrate .. //depot/projects/jail2/sys/pci/if_tl.c#2 integrate .. //depot/projects/jail2/sys/pci/if_tlreg.h#2 integrate .. //depot/projects/jail2/sys/pci/if_vr.c#2 integrate .. //depot/projects/jail2/sys/pci/if_vrreg.h#2 integrate .. //depot/projects/jail2/sys/pci/if_wb.c#2 integrate .. //depot/projects/jail2/sys/pci/if_wbreg.h#2 integrate .. //depot/projects/jail2/sys/pci/if_xl.c#3 integrate .. //depot/projects/jail2/sys/pci/if_xlreg.h#2 integrate .. //depot/projects/jail2/sys/pci/intpm.c#2 integrate .. //depot/projects/jail2/sys/pci/intpmreg.h#2 integrate .. //depot/projects/jail2/sys/pci/nfsmb.c#3 integrate .. //depot/projects/jail2/sys/pci/viapm.c#2 integrate .. //depot/projects/jail2/sys/powerpc/powerpc/trap.c#3 integrate .. //depot/projects/jail2/sys/powerpc/powerpc/vm_machdep.c#2 integrate .. //depot/projects/jail2/sys/security/audit/audit.c#2 integrate .. //depot/projects/jail2/sys/security/audit/audit.h#3 integrate .. //depot/projects/jail2/sys/security/audit/audit_arg.c#3 integrate .. //depot/projects/jail2/sys/security/audit/audit_bsm.c#4 integrate .. //depot/projects/jail2/sys/security/audit/audit_bsm_token.c#4 integrate .. //depot/projects/jail2/sys/security/audit/audit_private.h#2 integrate .. //depot/projects/jail2/sys/security/audit/audit_syscalls.c#2 integrate .. //depot/projects/jail2/sys/security/audit/audit_worker.c#2 integrate .. //depot/projects/jail2/sys/security/mac/mac_inet.c#2 integrate .. //depot/projects/jail2/sys/security/mac/mac_internal.h#2 integrate .. //depot/projects/jail2/sys/security/mac_biba/mac_biba.c#3 integrate .. //depot/projects/jail2/sys/security/mac_lomac/mac_lomac.c#2 integrate .. //depot/projects/jail2/sys/security/mac_mls/mac_mls.c#3 integrate .. //depot/projects/jail2/sys/sparc64/sparc64/mp_machdep.c#2 integrate .. //depot/projects/jail2/sys/sys/_bus_dma.h#1 branch .. //depot/projects/jail2/sys/sys/bus.h#3 integrate .. //depot/projects/jail2/sys/sys/bus_dma.h#2 integrate .. //depot/projects/jail2/sys/sys/mac.h#2 integrate .. //depot/projects/jail2/sys/sys/mac_policy.h#3 integrate .. //depot/projects/jail2/sys/sys/mbuf.h#3 integrate .. //depot/projects/jail2/sys/sys/mount.h#2 integrate .. //depot/projects/jail2/sys/sys/msgbuf.h#2 integrate .. //depot/projects/jail2/sys/sys/param.h#3 integrate .. //depot/projects/jail2/sys/sys/sx.h#4 integrate .. //depot/projects/jail2/sys/sys/syscall.h#4 integrate .. //depot/projects/jail2/sys/sys/syscall.mk#4 integrate .. //depot/projects/jail2/sys/sys/sysctl.h#4 integrate .. //depot/projects/jail2/sys/sys/sysproto.h#4 integrate .. //depot/projects/jail2/sys/ufs/ufs/ufs_quota.c#2 integrate .. //depot/projects/jail2/sys/vm/vm_contig.c#3 integrate .. //depot/projects/jail2/sys/vm/vm_page.h#4 integrate Differences ... ==== //depot/projects/jail2/sys/amd64/amd64/local_apic.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.26 2006/07/12 21:22:42 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.29 2006/09/11 20:12:42 jhb Exp $"); #include "opt_hwpmc_hooks.h" @@ -613,6 +613,18 @@ /* Send EOI first thing. */ lapic_eoi(); +#ifdef SMP + /* + * Don't do any accounting for the disabled HTT cores, since it + * will provide misleading numbers for the userland. + * + * No locking is necessary here, since even if we loose the race + * when hlt_cpus_mask changes it is not a big deal, really. + */ + if ((hlt_cpus_mask & (1 << PCPU_GET(cpuid))) != 0) + return; +#endif + /* Look up our local APIC structure for the tick counters. */ la = &lapics[PCPU_GET(apic_id)]; (*la->la_timer_count)++; @@ -782,6 +794,76 @@ } } } + +static void +dump_mask(const char *prefix, uint32_t v, int base) +{ + int i, first; + + first = 1; + for (i = 0; i < 32; i++) + if (v & (1 << i)) { + if (first) { + db_printf("%s:", prefix); + first = 0; + } + db_printf(" %02x", base + i); + } + if (!first) + db_printf("\n"); +} + +/* Show info from the lapic regs for this CPU. */ +DB_SHOW_COMMAND(lapic, db_show_lapic) +{ + uint32_t v; + + db_printf("lapic ID = %d\n", lapic_id()); + v = lapic->version; + db_printf("version = %d.%d\n", (v & APIC_VER_VERSION) >> 4, + v & 0xf); + db_printf("max LVT = %d\n", (v & APIC_VER_MAXLVT) >> MAXLVTSHIFT); + v = lapic->svr; + db_printf("SVR = %02x (%s)\n", v & APIC_SVR_VECTOR, + v & APIC_SVR_ENABLE ? "enabled" : "disabled"); + db_printf("TPR = %02x\n", lapic->tpr); + +#define dump_field(prefix, index) \ + dump_mask(__XSTRING(prefix ## index), lapic->prefix ## index, \ + index * 32) + + db_printf("In-service Interrupts:\n"); + dump_field(isr, 0); + dump_field(isr, 1); + dump_field(isr, 2); + dump_field(isr, 3); + dump_field(isr, 4); + dump_field(isr, 5); + dump_field(isr, 6); + dump_field(isr, 7); + + db_printf("TMR Interrupts:\n"); + dump_field(tmr, 0); + dump_field(tmr, 1); + dump_field(tmr, 2); + dump_field(tmr, 3); + dump_field(tmr, 4); + dump_field(tmr, 5); + dump_field(tmr, 6); + dump_field(tmr, 7); + + db_printf("IRR Interrupts:\n"); + dump_field(irr, 0); + dump_field(irr, 1); + dump_field(irr, 2); + dump_field(irr, 3); + dump_field(irr, 4); + dump_field(irr, 5); + dump_field(irr, 6); + dump_field(irr, 7); + +#undef dump_field +} #endif /* ==== //depot/projects/jail2/sys/amd64/amd64/machdep.c#4 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.651 2006/07/27 19:47:22 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.652 2006/09/07 15:03:02 jhb Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -160,8 +160,10 @@ long Maxmem = 0; long realmem = 0; -vm_paddr_t phys_avail[20]; -vm_paddr_t dump_avail[20]; +#define PHYSMAP_SIZE (2 * 30) + +vm_paddr_t phys_avail[PHYSMAP_SIZE + 2]; +vm_paddr_t dump_avail[PHYSMAP_SIZE + 2]; /* must be 2 less so 0 0 can signal end of chunks */ #define PHYS_AVAIL_ARRAY_END ((sizeof(phys_avail) / sizeof(phys_avail[0])) - 2) @@ -832,8 +834,6 @@ } #endif -#define PHYSMAP_SIZE (2 * 20) - u_int basemem; /* ==== //depot/projects/jail2/sys/amd64/amd64/mp_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.276 2006/05/16 14:32:16 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.277 2006/09/11 20:10:42 jhb Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -342,7 +342,10 @@ setidt(IPI_INVLTLB, IDTVEC(invltlb), SDT_SYSIGT, SEL_KPL, 0); setidt(IPI_INVLPG, IDTVEC(invlpg), SDT_SYSIGT, SEL_KPL, 0); setidt(IPI_INVLRNG, IDTVEC(invlrng), SDT_SYSIGT, SEL_KPL, 0); - + + /* Install an inter-CPU IPI for cache invalidation. */ + setidt(IPI_INVLCACHE, IDTVEC(invlcache), SDT_SYSIGT, SEL_KPL, 0); + /* Install an inter-CPU IPI for all-CPU rendezvous */ setidt(IPI_RENDEZVOUS, IDTVEC(rendezvous), SDT_SYSIGT, SEL_KPL, 0); ==== //depot/projects/jail2/sys/amd64/amd64/nexus.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.68 2006/04/20 04:16:34 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.69 2006/09/11 19:31:51 jhb Exp $"); /* * This code implements a `root nexus' for Intel Architecture @@ -140,7 +140,7 @@ static int nexus_probe(device_t dev) { - int irq, last; + int irq; device_quiet(dev); /* suppress attach message for neatness */ @@ -173,18 +173,10 @@ * We search for regions of existing IRQs and add those to the IRQ * resource manager. */ - last = -1; for (irq = 0; irq < NUM_IO_INTS; irq++) - if (intr_lookup_source(irq) != NULL) { - if (last == -1) - last = irq; - } else if (last != -1) { - if (rman_manage_region(&irq_rman, last, irq - 1) != 0) + if (intr_lookup_source(irq) != NULL) + if (rman_manage_region(&irq_rman, irq, irq) != 0) panic("nexus_probe irq_rman add"); - last = -1; - } - if (last != -1 && rman_manage_region(&irq_rman, last, irq - 1) != 0) - panic("nexus_probe irq_rman add"); /* * ISA DMA on PCI systems is implemented in the ISA part of each ==== //depot/projects/jail2/sys/amd64/amd64/vm_machdep.c#3 (text+ko) ==== @@ -41,10 +41,11 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.251 2006/07/24 12:24:56 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.252 2006/09/17 14:54:14 davidxu Exp $"); #include "opt_isa.h" #include "opt_cpu.h" +#include "opt_compat.h" #include #include @@ -69,6 +70,7 @@ #include #include #include +#include #include #include @@ -79,6 +81,12 @@ #include +#ifdef COMPAT_IA32 + +extern struct sysentvec ia32_freebsd_sysvec; + +#endif + static void cpu_reset_real(void); #ifdef SMP static void cpu_reset_proxy(void); @@ -320,6 +328,28 @@ */ cpu_thread_clean(td); +#ifdef COMPAT_IA32 + if (td->td_proc->p_sysent == &ia32_freebsd_sysvec) { + /* + * Set the trap frame to point at the beginning of the uts + * function. + */ + td->td_frame->tf_rbp = 0; + td->td_frame->tf_rsp = + (((uintptr_t)stack->ss_sp + stack->ss_size - 4) & ~0x0f) - 4; + td->td_frame->tf_rip = (uintptr_t)entry; + + /* + * Pass the address of the mailbox for this kse to the uts + * function as a parameter on the stack. + */ + suword32((void *)(td->td_frame->tf_rsp + sizeof(int32_t)), + (uint32_t)(uintptr_t)arg); + + return; + } +#endif + /* * Set the trap frame to point at the beginning of the uts * function. @@ -344,6 +374,19 @@ if ((u_int64_t)tls_base >= VM_MAXUSER_ADDRESS) return (EINVAL); +#ifdef COMPAT_IA32 + if (td->td_proc->p_sysent == &ia32_freebsd_sysvec) { + if (td == curthread) { + critical_enter(); + td->td_pcb->pcb_gsbase = (register_t)tls_base; + wrmsr(MSR_KGSBASE, td->td_pcb->pcb_gsbase); + critical_exit(); + } else { + td->td_pcb->pcb_gsbase = (register_t)tls_base; + } + return (0); + } +#endif if (td == curthread) { critical_enter(); td->td_pcb->pcb_fsbase = (register_t)tls_base; ==== //depot/projects/jail2/sys/amd64/linux32/linux32_machdep.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.16 2006/08/25 11:59:56 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.17 2006/08/28 13:09:24 netchild Exp $"); #include #include @@ -570,24 +570,24 @@ } } - if (args->flags & CLONE_PARENT) { -#ifdef DEBUG - printf("linux_clone: CLONE_PARENT\n"); -#endif + if (args->flags & (CLONE_PARENT|CLONE_THREAD)) { + sx_xlock(&proctree_lock); + PROC_LOCK(p2); + proc_reparent(p2, td->td_proc->p_pptr); + PROC_UNLOCK(p2); + sx_xunlock(&proctree_lock); } - + if (args->flags & CLONE_THREAD) { /* XXX: linux mangles pgrp and pptr somehow * I think it might be this but I am not sure. */ #ifdef notyet + PROC_LOCK(p2); p2->p_pgrp = td->td_proc->p_pgrp; - p2->p_pptr = td->td_proc->p_pptr; + PROC_UNLOCK(p2); #endif exit_signal = 0; -#ifdef DEBUG - printf("linux_clone: CLONE_THREADS\n"); -#endif } if (args->flags & CLONE_CHILD_SETTID) @@ -599,6 +599,7 @@ em->child_clear_tid = args->child_tidptr; else em->child_clear_tid = NULL; + EMUL_UNLOCK(&emul_lock); PROC_LOCK(p2); ==== //depot/projects/jail2/sys/amd64/linux32/linux32_sysvec.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.23 2006/08/17 21:06:48 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.24 2006/09/09 16:25:25 netchild Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 @@ -124,7 +124,7 @@ static void linux32_fixlimits(struct proc *p); extern LIST_HEAD(futex_list, futex) futex_list; -extern struct mtx futex_mtx; +extern struct sx futex_sx; static eventhandler_tag linux_exit_tag; static eventhandler_tag linux_schedtail_tag; @@ -1080,7 +1080,7 @@ sx_init(&emul_lock, "emuldata lock"); sx_init(&emul_shared_lock, "emuldata->shared lock"); LIST_INIT(&futex_list); - mtx_init(&futex_mtx, "futex protection lock", NULL, MTX_DEF); + sx_init(&futex_sx, "futex protection lock"); linux_exit_tag = EVENTHANDLER_REGISTER(process_exit, linux_proc_exit, NULL, 1000); linux_schedtail_tag = EVENTHANDLER_REGISTER(schedtail, linux_schedtail, @@ -1110,7 +1110,7 @@ linux_device_unregister_handler(*ldhp); sx_destroy(&emul_lock); sx_destroy(&emul_shared_lock); - mtx_destroy(&futex_mtx); + sx_destroy(&futex_sx); EVENTHANDLER_DEREGISTER(process_exit, linux_exit_tag); EVENTHANDLER_DEREGISTER(schedtail, linux_schedtail_tag); EVENTHANDLER_DEREGISTER(process_exec, linux_exec_tag); ==== //depot/projects/jail2/sys/arm/arm/fusu.S#3 (text+ko) ==== @@ -37,7 +37,7 @@ #include #include #include "assym.s" -__FBSDID("$FreeBSD: src/sys/arm/arm/fusu.S,v 1.8 2006/08/28 02:28:14 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/fusu.S,v 1.10 2006/08/30 11:44:37 cognet Exp $"); #ifdef MULTIPROCESSOR .Lcpu_info: @@ -52,7 +52,7 @@ * Fetch an int from the user's address space. */ -ALTENTRY(casuword32) +ENTRY_NP(casuword32) ENTRY(casuptr) #ifdef MULTIPROCESSOR /* XXX Probably not appropriate for non-Hydra SMPs */ @@ -99,7 +99,7 @@ * Fetch an int from the user's address space. */ -ENTRY(fuword32) +ENTRY_NP(fuword32) ENTRY(fuword) #ifdef MULTIPROCESSOR /* XXX Probably not appropriate for non-Hydra SMPs */ @@ -301,7 +301,7 @@ * Store an int in the user's address space. */ -ENTRY(suword32) +ENTRY_NP(suword32) ENTRY(suword) #ifdef MULTIPROCESSOR /* XXX Probably not appropriate for non-Hydra SMPs */ ==== //depot/projects/jail2/sys/arm/arm/pmap.c#3 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.68 2006/08/08 20:59:38 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.69 2006/08/28 21:43:34 cognet Exp $"); #include #include #include @@ -4469,11 +4469,8 @@ pmap_remove_write(vm_page_t m) { - if (m->md.pvh_attrs & PVF_WRITE) + if (m->flags & PG_WRITEABLE) pmap_clearbit(m, PVF_WRITE); - else - KASSERT((m->flags & PG_WRITEABLE) == 0, - ("pmap_clear_write: page %p has PG_WRITEABLE set", m)); } ==== //depot/projects/jail2/sys/arm/at91/at91.c#2 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.7 2006/05/19 11:27:02 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.8 2006/08/28 20:05:00 cognet Exp $"); #include #include @@ -54,7 +54,11 @@ vm_paddr_t pa, endpa; pa = trunc_page(bpa); - if (pa >= 0xfff00000) + if (pa >= 0xfff00000) { + *bshp = pa - 0xf0000000 + 0xd0000000; + return (0); + } + if (pa >= 0xdff00000) return (0); endpa = round_page(bpa + size); @@ -417,8 +421,8 @@ rman_manage_region(&sc->sc_irq_rman, 1, 31) != 0) panic("at91_attach: failed to set up IRQ rman"); if (rman_init(&sc->sc_mem_rman) != 0 || - rman_manage_region(&sc->sc_mem_rman, 0xfff00000ul, - 0xfffffffful) != 0) + rman_manage_region(&sc->sc_mem_rman, 0xdff00000ul, + 0xdffffffful) != 0) panic("at91_attach: failed to set up memory rman"); if (rman_manage_region(&sc->sc_mem_rman, AT91RM92_OHCI_BASE, AT91RM92_OHCI_BASE + AT91RM92_OHCI_SIZE - 1) != 0) @@ -543,7 +547,7 @@ void **cookiep) { struct at91_softc *sc = device_get_softc(dev); - + if (rman_get_start(ires) == AT91RM92_IRQ_SYSTEM && !(flags & INTR_FAST)) panic("All system interrupt ISRs must be type INTR_FAST"); BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, intr, arg, ==== //depot/projects/jail2/sys/arm/at91/at91_twi.c#3 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.3 2006/07/14 22:40:24 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.4 2006/09/07 21:53:28 imp Exp $"); #include #include @@ -128,20 +128,16 @@ sc->cwgr = TWI_CWGR_CKDIV(8 * AT91C_MASTER_CLOCK / 90000) | TWI_CWGR_CHDIV(TWI_CWGR_DIV(TWI_DEF_CLK)) | TWI_CWGR_CLDIV(TWI_CWGR_DIV(TWI_DEF_CLK)); - WR4(sc, TWI_CR, TWI_CR_SWRST); WR4(sc, TWI_CR, TWI_CR_MSEN | TWI_CR_SVDIS); WR4(sc, TWI_CWGR, sc->cwgr); - WR4(sc, TWI_IER, TWI_SR_RXRDY | TWI_SR_OVRE | TWI_SR_UNRE | TWI_SR_NACK); if ((sc->iicbus = device_add_child(dev, "iicbus", -1)) == NULL) device_printf(dev, "could not allocate iicbus instance\n"); - /* probe and attach the iicbus */ bus_generic_attach(dev); - out:; if (err) at91_twi_deactivate(dev); @@ -228,12 +224,15 @@ } static int -at91_twi_wait_stop_done(struct at91_twi_softc *sc) +at91_twi_wait(struct at91_twi_softc *sc, uint32_t bit) { int err = 0; + int counter = 10000; - while (!(RD4(sc, TWI_SR) & TWI_SR_TXCOMP)) + while (!(RD4(sc, TWI_SR) & bit) && counter-- != 0) continue; + if (counter == 0) + err = EIO; return (err); } @@ -252,7 +251,7 @@ sc = device_get_softc(dev); if (sc->sc_started) { WR4(sc, TWI_CR, TWI_CR_STOP); - err = at91_twi_wait_stop_done(sc); + err = at91_twi_wait(sc, TWI_SR_TXCOMP); } return (err); } @@ -345,7 +344,7 @@ if (!last) goto errout; WR4(sc, TWI_CR, TWI_CR_STOP); - err = at91_twi_wait_stop_done(sc); + err = at91_twi_wait(sc, TWI_SR_TXCOMP); *walker = RD4(sc, TWI_RHR) & 0xff; if (read) *read = walker - buf; @@ -419,6 +418,53 @@ return (error); } +static int +at91_twi_transfer(device_t dev, struct iic_msg *msgs, uint32_t nmsgs) +{ + struct at91_twi_softc *sc; + int i, len; + uint32_t rdwr; + uint8_t *buf; + + sc = device_get_softc(dev); + for (i = 0; i < nmsgs; i++) { + /* + * The linux atmel driver doesn't use the internal device + * address feature of twi. A separate i2c message needs to + * be written to use this. + * See http://lists.arm.linux.org.uk/pipermail/linux-arm-kernel/2004-September/024411.html + * for details. + */ + rdwr = (msgs[i].flags & IIC_M_RD) ? TWI_MMR_MREAD : 0; + WR4(sc, TWI_MMR, TWI_MMR_DADR(msgs[i].slave) | rdwr); + len = msgs[i].len; + buf = msgs[i].buf; + if (len != 0 || buf == NULL) + return EINVAL; + WR4(sc, TWI_CR, TWI_CR_START); + if (msgs[i].flags & IIC_M_RD) { + while (len--) { + if (len == 0) + WR4(sc, TWI_CR, TWI_CR_STOP); + if (!at91_twi_wait(sc, TWI_SR_RXRDY)) + return EIO; + *buf++ = RD4(sc, TWI_RHR) & 0xff; + } + } else { + while (len--) { + WR4(sc, TWI_THR, *buf++); + if (len == 0) + WR4(sc, TWI_CR, TWI_CR_STOP); + if (!at91_twi_wait(sc, TWI_SR_TXRDY)) + return EIO; + } + } + if (!at91_twi_wait(sc, TWI_SR_TXCOMP)) + return EIO; + } + return 0; +} + static device_method_t at91_twi_methods[] = { /* Device interface */ DEVMETHOD(device_probe, at91_twi_probe), @@ -433,6 +479,7 @@ DEVMETHOD(iicbus_write, at91_twi_write), DEVMETHOD(iicbus_read, at91_twi_read), DEVMETHOD(iicbus_reset, at91_twi_rst_card), + DEVMETHOD(iicbus_transfer, at91_twi_transfer), { 0, 0 } }; ==== //depot/projects/jail2/sys/arm/at91/at91rm92reg.h#3 (text) ==== @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $FreeBSD: src/sys/arm/at91/at91rm92reg.h,v 1.3 2006/06/20 20:13:40 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91rm92reg.h,v 1.4 2006/08/28 20:05:00 cognet Exp $ */ #ifndef AT91RM92REG_H_ #define AT91RM92REG_H_ @@ -41,7 +41,7 @@ * 0xf0000000 - 0xfffffffff : Peripherals */ -#define AT91RM92_BASE 0xf0000000 +#define AT91RM92_BASE 0xd0000000 /* Usart */ #define AT91RM92_USART0_BASE 0xffc0000 ==== //depot/projects/jail2/sys/arm/at91/if_atereg.h#2 (text) ==== @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Sep 18 08:38:54 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1553516A416; Mon, 18 Sep 2006 08:38:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B151116A40F for ; Mon, 18 Sep 2006 08:38:53 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ED42A43D70 for ; Mon, 18 Sep 2006 08:38:44 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8I8ciV6051964 for ; Mon, 18 Sep 2006 08:38:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8I8cTiv051947 for perforce@freebsd.org; Mon, 18 Sep 2006 08:38:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 18 Sep 2006 08:38:29 GMT Message-Id: <200609180838.k8I8cTiv051947@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 106282 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Sep 2006 08:38:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=106282 Change 106282 by rwatson@rwatson_zoo on 2006/09/18 08:37:28 Integrate TrustedBSD base from FreeBSD CVS: - DDB show lapic. - VLAN tag now an mbuf header field. - if_mxge update. - t_session workaround. - socket timeouts inheritted on inbound connection - syncache/syncookie enhancements. - Lots of device_printf(). - Etc. TrustedBSD-related: - Fix event number for sigaltstack(). - security/security.bsd sysctl hierarchies centrally declared. - System call auditing for ia64, ppc. - Accounting kern.acct_configured sysctl for priv regression test. - ipfw tcp packet generation fix for MAC: allow labeling of generated packets. - Add preselection flags for user records, and for now, always mark user records as selected for pipes and trails. - AUE_SYSARCH in audit_bsm.c. Affected files ... .. //depot/projects/trustedbsd/base/MAINTAINERS#43 integrate .. //depot/projects/trustedbsd/base/bin/getfacl/getfacl.1#9 integrate .. //depot/projects/trustedbsd/base/bin/ls/ls.1#32 integrate .. //depot/projects/trustedbsd/base/bin/pax/pax.1#12 integrate .. //depot/projects/trustedbsd/base/bin/ps/ps.1#25 integrate .. //depot/projects/trustedbsd/base/bin/setfacl/setfacl.1#9 integrate .. //depot/projects/trustedbsd/base/bin/sh/sh.1#26 integrate .. //depot/projects/trustedbsd/base/contrib/com_err/compile_et.1#3 integrate .. //depot/projects/trustedbsd/base/contrib/pnpinfo/pnpinfo.8#3 integrate .. //depot/projects/trustedbsd/base/contrib/tar/ABOUT-NLS#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/AUTHORS#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/COPYING#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/ChangeLog#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/ChangeLog.1#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/FREEBSD-Xlist#3 delete .. //depot/projects/trustedbsd/base/contrib/tar/FREEBSD-upgrade#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/INSTALL#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/NEWS#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/PORTS#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/README#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/README-alpha#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/THANKS#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/TODO#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/doc/fdl.texi#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/doc/freemanuals.texi#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/doc/getdate.texi#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/doc/header.texi#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/doc/tar.texi#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/doc/version.texi#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/addext.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/alloca.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/argmatch.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/argmatch.h#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/backupfile.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/backupfile.h#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/basename.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/dirname.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/dirname.h#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/error.c#4 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/error.h#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/exclude.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/exclude.h#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/fileblocks.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/fnmatch.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/fnmatch.hin#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/ftruncate.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/full-write.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/full-write.h#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/getdate.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/getdate.h#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/getline.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/getline.h#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/getstr.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/getstr.h#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/hash.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/hash.h#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/human.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/human.h#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/lchown.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/lchown.h#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/malloc.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/memset.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/mktime.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/modechange.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/modechange.h#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/msleep.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/prepargs.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/prepargs.h#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/print-copyr.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/print-copyr.h#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/quote.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/quote.h#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/quotearg.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/quotearg.h#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/readutmp.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/realloc.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/rename.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/rmdir.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/safe-read.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/safe-read.h#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/save-cwd.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/save-cwd.h#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/savedir.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/savedir.h#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/stpcpy.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/strcasecmp.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/strncasecmp.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/strstr.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/strtoimax.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/strtol.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/strtoll.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/strtoul.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/strtoull.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/strtoumax.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/unicodeio.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/unicodeio.h#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/utime.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/waitpid.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/xalloc.h#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/xgetcwd.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/xmalloc.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/xstrdup.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/xstrtoimax.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/xstrtol.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/xstrtol.h#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/xstrtoul.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/lib/xstrtoumax.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/src/arith.h#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/src/buffer.c#6 delete .. //depot/projects/trustedbsd/base/contrib/tar/src/common.h#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/src/compare.c#3 delete .. //depot/projects/trustedbsd/base/contrib/tar/src/create.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/src/delete.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/src/extract.c#5 delete .. //depot/projects/trustedbsd/base/contrib/tar/src/incremen.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/src/list.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/src/mangle.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/src/misc.c#3 delete .. //depot/projects/trustedbsd/base/contrib/tar/src/names.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/src/rmt.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/src/rmt.h#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/src/rtapelib.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/src/system.h#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/src/tar.c#3 delete .. //depot/projects/trustedbsd/base/contrib/tar/src/tar.h#2 delete .. //depot/projects/trustedbsd/base/contrib/tar/src/update.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh/monitor.c#15 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa_sign.c#5 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes#54 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/Makefile.inc#6 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/as/Makefile#6 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/as/arm-freebsd/targ-cpu.h#1 branch .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/ld/Makefile.arm#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/ld/armelf_fbsd.sh#1 branch .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/ld/armelfb_fbsd.sh#1 branch .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/ld/genscripts.sh#5 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/libbfd/Makefile.arm#3 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/libiberty/config.h#5 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/Makefile.tgt#7 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc_int/Makefile#15 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc_int/amd64.patch#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc_tools/Makefile#15 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cpp/Makefile#5 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/arch/arm/Makefile#1 branch .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/arch/arm/armfbsd-nat.c#1 branch .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/arch/arm/armfbsd-tdep.c#1 branch .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/arch/arm/config.h#1 branch .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/arch/arm/init.c#1 branch .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/arch/arm/nm-fbsd.h#1 branch .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/arch/arm/tm-fbsd.h#1 branch .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/arch/arm/xm-fbsd.h#1 branch .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/kgdb/trgt_arm.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/tar/Makefile#7 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/tar/config.h#4 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/tar/doc/Makefile#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/tar/localedir.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/tar/tar.1#7 delete .. //depot/projects/trustedbsd/base/lib/libarchive/tar.5#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/pwcache.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/vis.3#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/sys/i386_set_watch.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/gai_strerror.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/gethostbyname.3#11 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/clnt_bcast.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/clnt_vc.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/getnetconfig.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/getnetpath.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/rpc_clnt_create.3#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/rpcb_clnt.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/rpcb_prot.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/svc_simple.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/svc_vc.c#13 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/fclose.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/malloc.3#14 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/chflags.2#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/clock_gettime.2#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/connect.2#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/getsockopt.2#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/gettimeofday.2#10 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/kldnext.2#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/kqueue.2#15 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/listen.2#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/mmap.2#15 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/open.2#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/recv.2#12 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/send.2#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/sigqueue.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/timer_create.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/timer_delete.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/timer_settime.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/utimes.2#7 integrate .. //depot/projects/trustedbsd/base/lib/libdevinfo/devinfo.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libipsec/ipsec_set_policy.3#11 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_login_access/login.access.5#4 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_opie/pam_opie.c#11 integrate .. //depot/projects/trustedbsd/base/lib/libpmc/pmclog.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libutil/humanize_number.3#5 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/rtld.1#14 integrate .. //depot/projects/trustedbsd/base/libexec/tftpd/tftpd.8#5 integrate .. //depot/projects/trustedbsd/base/release/Makefile#79 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#111 integrate .. //depot/projects/trustedbsd/base/sbin/devd/devd.8#13 integrate .. //depot/projects/trustedbsd/base/sbin/devd/devd.cc#18 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/eli/geli.8#8 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/eli/geom_eli.c#9 integrate .. //depot/projects/trustedbsd/base/sbin/ipf/ipf/Makefile#6 integrate .. //depot/projects/trustedbsd/base/sbin/ipf/ipftest/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sbin/ipf/ipmon/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sbin/ipf/ipnat/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sbin/ipf/ippool/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw2.c#43 integrate .. //depot/projects/trustedbsd/base/sbin/mount/mount.8#25 integrate .. //depot/projects/trustedbsd/base/sbin/mount_std/mount_std.c#12 integrate .. //depot/projects/trustedbsd/base/sbin/sconfig/sconfig.c#3 integrate .. //depot/projects/trustedbsd/base/share/examples/etc/make.conf#45 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ddb.4#11 integrate .. //depot/projects/trustedbsd/base/share/man/man4/em.4#18 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ipmi.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/mxge.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/tcp.4#20 integrate .. //depot/projects/trustedbsd/base/share/man/man5/src.conf.5#4 integrate .. //depot/projects/trustedbsd/base/share/man/man7/hier.7#29 integrate .. //depot/projects/trustedbsd/base/share/man/man9/device_add_child.9#7 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.lib.mk#31 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.own.mk#15 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.prog.mk#25 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/local_apic.c#16 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/mp_machdep.c#21 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/nexus.c#15 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/vm_machdep.c#25 integrate .. //depot/projects/trustedbsd/base/sys/cam/cam_xpt.c#27 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_da.c#56 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_proto.h#25 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscall.h#25 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscalls.c#25 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_sysent.c#25 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/syscalls.master#25 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_emul.c#4 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_file.c#26 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_misc.c#46 integrate .. //depot/projects/trustedbsd/base/sys/contrib/pf/net/pf.c#17 integrate .. //depot/projects/trustedbsd/base/sys/crypto/via/padlock_cipher.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi.c#51 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-all.c#54 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-chipset.c#43 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-disk.c#44 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-pci.h#32 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-raid.h#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-usb.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/bce/if_bce.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bge.c#60 integrate .. //depot/projects/trustedbsd/base/sys/dev/bktr/bktr_i2c.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/cs/if_cs.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/cs/if_csvar.h#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/dc/if_dc.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/dc/if_dcreg.h#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/de/if_de.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/de/if_devar.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em.c#58 integrate .. //depot/projects/trustedbsd/base/sys/dev/en/if_en_pci.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/en/midway.c#27 integrate .. //depot/projects/trustedbsd/base/sys/dev/hwpmc/hwpmc_mod.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/ichsmb/ichsmb.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/iicbus/iicsmb.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/ixgb/if_ixgb.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/lge/if_lge.c#28 integrate .. //depot/projects/trustedbsd/base/sys/dev/lge/if_lgereg.h#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/mxge/eth_z8e.dat.gz.uu#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/mxge/ethp_z8e.dat.gz.uu#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/mxge/if_mxge.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/mxge/if_mxge_var.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/mxge/mxge_mcp.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/my/if_my.c#25 integrate .. //depot/projects/trustedbsd/base/sys/dev/my/if_myreg.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/nfe/if_nfe.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/nfe/if_nfereg.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/nge/if_nge.c#39 integrate .. //depot/projects/trustedbsd/base/sys/dev/nge/if_ngereg.h#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/re/if_re.c#27 integrate .. //depot/projects/trustedbsd/base/sys/dev/sio/sio_pccard.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/smbus/smb.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/smbus/smb.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/smbus/smbconf.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/smbus/smbconf.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/smbus/smbus.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/smbus/smbus.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/smbus/smbus_if.m#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/stge/if_stge.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/syscons/scmouse.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/syscons/syscons.c#33 integrate .. //depot/projects/trustedbsd/base/sys/dev/syscons/syscons.h#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/ti/if_ti.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/txp/if_txp.c#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usb_subr.c#25 integrate .. //depot/projects/trustedbsd/base/sys/dev/vge/if_vge.c#12 integrate .. //depot/projects/trustedbsd/base/sys/fs/udf/osta.h#3 integrate .. //depot/projects/trustedbsd/base/sys/geom/eli/g_eli.h#7 integrate .. //depot/projects/trustedbsd/base/sys/geom/eli/g_eli_ctl.c#7 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom.h#42 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_event.c#22 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_subr.c#36 integrate .. //depot/projects/trustedbsd/base/sys/geom/label/g_label_ufs.c#8 integrate .. //depot/projects/trustedbsd/base/sys/geom/mirror/g_mirror.c#18 integrate .. //depot/projects/trustedbsd/base/sys/geom/raid3/g_raid3.c#17 integrate .. //depot/projects/trustedbsd/base/sys/geom/raid3/g_raid3_ctl.c#9 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/NOTES#69 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/busdma_machdep.c#27 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/local_apic.c#17 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/mp_machdep.c#51 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/nexus.c#17 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia32/ia32_trap.c#7 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/trap.c#42 integrate .. //depot/projects/trustedbsd/base/sys/kern/bus_if.m#14 integrate .. //depot/projects/trustedbsd/base/sys/kern/init_sysent.c#58 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_acct.c#30 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_exit.c#54 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_jail.c#23 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mbuf.c#14 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_prot.c#38 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_bus.c#44 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_prf.c#38 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_rman.c#24 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_witness.c#59 integrate .. //depot/projects/trustedbsd/base/sys/kern/syscalls.c#58 integrate .. //depot/projects/trustedbsd/base/sys/kern/syscalls.master#59 integrate .. //depot/projects/trustedbsd/base/sys/kern/systrace_args.c#4 integrate .. //depot/projects/trustedbsd/base/sys/kern/tty.c#35 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_socket.c#60 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_lookup.c#25 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_syscalls.c#71 integrate .. //depot/projects/trustedbsd/base/sys/modules/Makefile#82 integrate .. //depot/projects/trustedbsd/base/sys/modules/ipfw/Makefile#8 integrate .. //depot/projects/trustedbsd/base/sys/modules/pf/Makefile#11 integrate .. //depot/projects/trustedbsd/base/sys/net/if_bridge.c#16 integrate .. //depot/projects/trustedbsd/base/sys/net/if_vlan.c#40 integrate .. //depot/projects/trustedbsd/base/sys/net/if_vlan_var.h#13 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_input.c#21 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_output.c#22 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_eiface.c#21 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_fec.c#17 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_vlan.c#4 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_fw2.c#52 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_output.c#49 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_input.c#66 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_output.c#33 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_syncache.c#41 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_usrreq.c#37 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_var.h#34 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/nd6.c#26 integrate .. //depot/projects/trustedbsd/base/sys/nfs4client/nfs4_vfsops.c#14 integrate .. //depot/projects/trustedbsd/base/sys/nfs4client/nfs4_vnops.c#14 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_node.c#22 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_subs.c#24 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_vfsops.c#48 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_vnops.c#39 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfsnode.h#15 integrate .. //depot/projects/trustedbsd/base/sys/pci/alpm.c#11 integrate .. //depot/projects/trustedbsd/base/sys/pci/amdpm.c#17 integrate .. //depot/projects/trustedbsd/base/sys/pci/amdsmb.c#3 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_rl.c#46 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_sf.c#28 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_sfreg.h#8 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_sis.c#47 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_sisreg.h#18 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_ste.c#35 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_tl.c#25 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_tlreg.h#8 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_vr.c#36 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_vrreg.h#14 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_wb.c#28 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_wbreg.h#8 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_xl.c#45 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_xlreg.h#18 integrate .. //depot/projects/trustedbsd/base/sys/pci/intpm.c#12 integrate .. //depot/projects/trustedbsd/base/sys/pci/intpmreg.h#2 integrate .. //depot/projects/trustedbsd/base/sys/pci/nfsmb.c#4 integrate .. //depot/projects/trustedbsd/base/sys/pci/viapm.c#13 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/trap.c#24 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit.c#11 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_bsm.c#10 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_private.h#7 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_syscalls.c#5 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_worker.c#4 integrate .. //depot/projects/trustedbsd/base/sys/security/mac/mac_inet.c#2 integrate .. //depot/projects/trustedbsd/base/sys/security/mac/mac_internal.h#7 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_biba/mac_biba.c#51 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_lomac/mac_lomac.c#27 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_mls/mac_mls.c#45 integrate .. //depot/projects/trustedbsd/base/sys/sys/bus.h#21 integrate .. //depot/projects/trustedbsd/base/sys/sys/mac.h#48 integrate .. //depot/projects/trustedbsd/base/sys/sys/mac_policy.h#48 integrate .. //depot/projects/trustedbsd/base/sys/sys/mbuf.h#49 integrate .. //depot/projects/trustedbsd/base/sys/sys/mount.h#40 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscall.h#58 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscall.mk#58 integrate .. //depot/projects/trustedbsd/base/sys/sys/sysctl.h#33 integrate .. //depot/projects/trustedbsd/base/sys/sys/sysproto.h#59 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_quota.c#28 integrate .. //depot/projects/trustedbsd/base/tools/build/options/WITHOUT_ASSERT_DEBUG#1 branch .. //depot/projects/trustedbsd/base/tools/build/options/makeman#4 integrate .. //depot/projects/trustedbsd/base/tools/regression/geom_eli/configure-b-B.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/priv/Makefile#1 branch .. //depot/projects/trustedbsd/base/tools/regression/priv/main.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/priv/main.h#1 branch .. //depot/projects/trustedbsd/base/tools/regression/priv/priv_acct.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/priv/priv_adjtime.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/priv/priv_clock_settime.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/priv/priv_io.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/priv/priv_kenv_set.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/priv/priv_kenv_unset.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/priv/priv_proc_setlogin.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/priv/priv_proc_setrlimit.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/priv/priv_sched_rtprio.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/priv/priv_sched_setpriority.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/priv/priv_settimeofday.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/priv/priv_sysctl_write.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/priv/priv_vfs_admin.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/priv/priv_vfs_chown.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/priv/priv_vfs_chroot.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/priv/priv_vfs_clearsugid.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/priv/priv_vfs_extattr_system.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/priv/priv_vfs_fhopen.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/priv/priv_vfs_fhstat.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/priv/priv_vfs_fhstatfs.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/priv/priv_vfs_generation.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/priv/priv_vfs_getfh.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/priv/priv_vfs_read_write.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/priv/priv_vfs_setgid.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/priv/priv_vfs_stickyfile.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/priv/priv_vm_madv_protect.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/priv/priv_vm_mlock.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/priv/priv_vm_munlock.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/priv/test_utimes.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/readonly.t#1 branch .. //depot/projects/trustedbsd/base/usr.bin/awk/Makefile#8 integrate .. //depot/projects/trustedbsd/base/usr.bin/awk/lib.c.diff#1 branch .. //depot/projects/trustedbsd/base/usr.bin/awk/main.c.diff#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/calendar.freebsd#52 integrate .. //depot/projects/trustedbsd/base/usr.bin/file/file.1#10 integrate .. //depot/projects/trustedbsd/base/usr.bin/file/magic.5#8 integrate .. //depot/projects/trustedbsd/base/usr.bin/indent/indent.c#11 integrate .. //depot/projects/trustedbsd/base/usr.bin/login/login.1#9 integrate .. //depot/projects/trustedbsd/base/usr.bin/paste/paste.c#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/su/su.1#12 integrate .. //depot/projects/trustedbsd/base/usr.sbin/edquota/edquota.c#9 integrate .. //depot/projects/trustedbsd/base/usr.sbin/inetd/inetd.8#14 integrate .. //depot/projects/trustedbsd/base/usr.sbin/inetd/inetd.c#20 integrate .. //depot/projects/trustedbsd/base/usr.sbin/inetd/inetd.h#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/kbdcontrol/kbdcontrol.c#8 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ppp/server.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rpc.statd/procs.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rpc.statd/statd.c#6 integrate Differences ... ==== //depot/projects/trustedbsd/base/MAINTAINERS#43 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.140 2006/08/31 09:51:33 cperciva Exp $ +$FreeBSD: src/MAINTAINERS,v 1.141 2006/09/11 19:39:46 simon Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -119,6 +119,7 @@ bs{diff,patch} cperciva Pre-commit review requested. portsnap cperciva Pre-commit review requested. freebsd-update cperciva Pre-commit review requested. +openssl simon Pre-commit review requested. sys/netgraph/bluetooth emax Pre-commit review preferred. lib/libbluetooth emax Pre-commit review preferred. lib/libsdp emax Pre-commit review preferred. ==== //depot/projects/trustedbsd/base/bin/getfacl/getfacl.1#9 (text+ko) ==== @@ -25,12 +25,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/bin/getfacl/getfacl.1,v 1.10 2006/03/13 11:45:29 rwatson Exp $ +.\" $FreeBSD: src/bin/getfacl/getfacl.1,v 1.11 2006/09/17 17:40:06 ru Exp $ .\" .\" Developed by the TrustedBSD Project. .\" Support for POSIX.1e access control lists. .\" -.Dd December 30, 2002 +.Dd March 13, 2006 .Dt GETFACL 1 .Os .Sh NAME @@ -65,7 +65,8 @@ If the target of the operation is a symbolic link, return the ACL from the symbolic link itself rather than following the link. .It Fl q -Don't write commented information about file name and ownership. This is +Do not write commented information about file name and ownership. +This is useful when dealing with filenames with unprintable characters. .El .Pp ==== //depot/projects/trustedbsd/base/bin/ls/ls.1#32 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.98 2006/03/24 17:09:02 jhb Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.99 2006/09/17 17:40:06 ru Exp $ .\" -.Dd November 16, 2005 +.Dd March 24, 2006 .Dt LS 1 .Os .Sh NAME ==== //depot/projects/trustedbsd/base/bin/pax/pax.1#12 (text+ko) ==== @@ -31,7 +31,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)pax.1 8.4 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/pax/pax.1,v 1.36 2006/05/10 20:32:57 cokane Exp $ +.\" $FreeBSD: src/bin/pax/pax.1,v 1.37 2006/09/17 17:40:06 ru Exp $ .\" .Dd July 3, 2004 .Dt PAX 1 @@ -394,7 +394,8 @@ bytes per write to the archive file. The .Ar blocksize -must be a multiple of 512 bytes with a maximum of 64512 bytes. A +must be a multiple of 512 bytes with a maximum of 64512 bytes. +A .Ar blocksize larger than 32256 bytes violates the .Tn POSIX ==== //depot/projects/trustedbsd/base/bin/ps/ps.1#25 (text+ko) ==== @@ -27,7 +27,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.88 2006/08/21 03:09:12 yar Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.89 2006/09/17 17:40:06 ru Exp $ .\" .Dd August 21, 2006 .Dt PS 1 @@ -181,7 +181,7 @@ list of keywords specified. The last keyword in the list may be appended with an equals .Pq Ql = -sign and a string that spans the rest of the argument and can contain +sign and a string that spans the rest of the argument, and can contain space and comma characters. This causes the printed header to use the specified string instead of the standard header. ==== //depot/projects/trustedbsd/base/bin/setfacl/setfacl.1#9 (text+ko) ==== @@ -23,7 +23,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/bin/setfacl/setfacl.1,v 1.16 2006/06/09 17:03:24 maxim Exp $ +.\" $FreeBSD: src/bin/setfacl/setfacl.1,v 1.17 2006/09/17 17:40:07 ru Exp $ .\" .Dd January 7, 2001 .Dt SETFACL 1 @@ -44,8 +44,9 @@ .Nm utility sets discretionary access control information on the specified file(s). -If no files are specified, or the list consists of the -only "-", the file names are taken from the standard input. +If no files are specified, or the list consists of the only +.Sq Fl , +the file names are taken from the standard input. .Pp The following options are available: .Bl -tag -width indent ==== //depot/projects/trustedbsd/base/bin/sh/sh.1#26 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.122 2006/07/29 09:56:29 yar Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.123 2006/09/17 17:40:07 ru Exp $ .\" .Dd July 29, 2006 .Dt SH 1 @@ -305,7 +305,7 @@ Useful for debugging. .It Fl x Li xtrace Write each command -(preceded by the value of the +(preceded by the value of the .Ev PS4 variable) to standard error before it is executed. @@ -1985,7 +1985,7 @@ The .Ar action may be an empty string or a dash -.Pq Ar - ; +.Pq Ql - ; the former causes the specified signal to be ignored and the latter causes the default action to be taken. Omitting the @@ -2260,7 +2260,8 @@ .Sh AUTHORS This version of .Nm -was originally written by Kenneth Almquist. +was originally written by +.An Kenneth Almquist . .Sh BUGS The .Nm ==== //depot/projects/trustedbsd/base/contrib/com_err/compile_et.1#3 (text+ko) ==== @@ -1,7 +1,7 @@ .\" Copyright (c) 1988 Massachusetts Institute of Technology, .\" Student Information Processing Board. All rights reserved. .\" -.\" $FreeBSD: src/contrib/com_err/compile_et.1,v 1.4 2005/06/16 20:51:10 ru Exp $ +.\" $FreeBSD: src/contrib/com_err/compile_et.1,v 1.5 2006/09/17 18:52:27 ru Exp $ .\" .Dd November 22, 1988 .Os @@ -61,12 +61,6 @@ .Pp A ``#'' in the source file is treated as a comment character, and all remaining text to the end of the source line will be ignored. -.Sh BUGS -Since -.Nm compile_et -uses a very simple parser based on -.Xr yacc 1 , -its error recovery leaves much to be desired. .Sh SEE ALSO .Xr yacc 1 , .Xr com_err 3 @@ -74,3 +68,9 @@ .%A Ken Raeburn .%T "A Common Error Description Library for UNIX" .Re +.Sh BUGS +Since +.Nm compile_et +uses a very simple parser based on +.Xr yacc 1 , +its error recovery leaves much to be desired. ==== //depot/projects/trustedbsd/base/contrib/pnpinfo/pnpinfo.8#3 (text+ko) ==== @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/contrib/pnpinfo/pnpinfo.8,v 1.6 2005/06/16 20:51:10 ru Exp $ +.\" $FreeBSD: src/contrib/pnpinfo/pnpinfo.8,v 1.7 2006/09/17 18:52:28 ru Exp $ .\" .Dd January 7, 1996 .Dt PNPINFO 8 @@ -44,8 +44,6 @@ Some of the information, such as the vendor ID, serial number, I/O ports, IRQ, etc.\& are useful when configuring a kernel with ISA PnP devices. -.Sh BUGS -A few of the tags are unimplemented (Enough exist for 99% of PnP cards). .Sh SEE ALSO .Xr pnp 4 .Sh HISTORY @@ -55,3 +53,5 @@ .Fx 2.2 . .Sh AUTHORS .An Sujal M. Patel Aq smpatel@umiacs.umd.edu +.Sh BUGS +A few of the tags are unimplemented (Enough exist for 99% of PnP cards). ==== //depot/projects/trustedbsd/base/crypto/openssh/monitor.c#15 (text+ko) ==== @@ -26,7 +26,7 @@ #include "includes.h" RCSID("$OpenBSD: monitor.c,v 1.64 2005/10/13 22:24:31 stevesk Exp $"); -RCSID("$FreeBSD: src/crypto/openssh/monitor.c,v 1.19 2006/03/22 20:41:36 des Exp $"); +RCSID("$FreeBSD: src/crypto/openssh/monitor.c,v 1.20 2006/09/16 15:12:58 des Exp $"); #include @@ -272,7 +272,7 @@ {MONITOR_REQ_TERM, 0, mm_answer_term}, #ifdef SSH_AUDIT_EVENTS {MONITOR_REQ_AUDIT_EVENT, MON_PERMIT, mm_answer_audit_event}, - {MONITOR_REQ_AUDIT_COMMAND, MON_ONCE, mm_answer_audit_command}, + {MONITOR_REQ_AUDIT_COMMAND, MON_PERMIT|MON_ONCE, mm_answer_audit_command}, #endif {0, 0, NULL} }; @@ -639,9 +639,6 @@ if (options.use_pam) monitor_permit(mon_dispatch, MONITOR_REQ_PAM_START, 1); #endif -#ifdef SSH_AUDIT_EVENTS - monitor_permit(mon_dispatch, MONITOR_REQ_AUDIT_COMMAND, 1); -#endif return (0); } ==== //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa_sign.c#5 (text+ko) ==== @@ -185,6 +185,23 @@ sig=d2i_X509_SIG(NULL,&p,(long)i); if (sig == NULL) goto err; + + /* Excess data can be used to create forgeries */ + if(p != s+i) + { + RSAerr(RSA_F_RSA_VERIFY,RSA_R_BAD_SIGNATURE); + goto err; + } + + /* Parameters to the signature algorithm can also be used to + create forgeries */ + if(sig->algor->parameter + && sig->algor->parameter->type != V_ASN1_NULL) + { + RSAerr(RSA_F_RSA_VERIFY,RSA_R_BAD_SIGNATURE); + goto err; + } + sigtype=OBJ_obj2nid(sig->algor->algorithm); ==== //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes#54 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.225 2006/08/27 14:29:10 wilko Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.226 2006/09/17 21:36:16 phk Exp $ % ======================================================================= @@ -11086,6 +11086,9 @@ Anyone who considers protocol unimportant has never dealt with a cat. -- R. Heinlein % +Anyone who describes Islam as a religion as intolerant encourages violence. + -- Tasnim Aslam, Spokesman for Pakistani Foreign Ministry. +% Anyone who goes to a psychiatrist ought to have his head examined. -- Samuel Goldwyn % @@ -35522,6 +35525,10 @@ Never make anything simple and efficient when a way can be found to make it complex and wonderful. % +Never negotiate with the United States unless you have a nuclear +weapon. + -- Former deputy defense minister of India. +% Never offend people with style when you can offend them with substance. -- Sam Brown, "The Washington Post", January 26, 1977 % @@ -44439,6 +44446,10 @@ Swipple's Rule of Order: He who shouts the loudest has the floor. % +Symbolic representation of quantitative entities is doomed to its rightful +place of minor importance in a world where flowers and beautiful women abound. + -- Albert Einstein +% Symptom: Drinking fails to give taste and satisfaction, beer is unusually pale and clear. Problem: Glass empty. @@ -50450,6 +50461,10 @@ and there are few mistakes they have ever avoided. -- Winston Churchill, Parliament, August, 1945 % +There are four boxes to be used in defense of liberty: soap, ballot, +jury, and ammo. Please use in that order. + -- Ed Howdershelt +% There are four kinds of homicide: felonious, excusable, justifiable, and praiseworthy ... -- Ambrose Bierce, "The Devil's Dictionary" @@ -50876,6 +50891,11 @@ There is brutality and there is honesty. There is no such thing as brutal honesty. % +There is Good Information and there is Bad Information and the +Internet is generally pretty neutral about the difference. If you're +a computer, it's all just 0s and 1s. + -- Joel Achenbach +% There is grandeur in this view of life, with its several powers, having been originally breathed into a few forms or into one; and that, whilst this planet has gone cycling on according to the fixed law of ==== //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/Makefile.inc#6 (text+ko) ==== @@ -1,6 +1,4 @@ -# -# $FreeBSD: src/gnu/usr.bin/binutils/Makefile.inc,v 1.8 2004/02/24 19:23:28 johan Exp $ -# +# $FreeBSD: src/gnu/usr.bin/binutils/Makefile.inc,v 1.9 2006/09/12 19:24:01 obrien Exp $ .if (${TARGET_ARCH} == "alpha") WARNS?= 2 ==== //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/as/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/as/Makefile,v 1.16 2004/12/21 09:59:40 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/as/Makefile,v 1.17 2006/09/11 18:07:09 obrien Exp $ # BINDIR @@ -35,6 +35,9 @@ .else CFLAGS+= -DDEFAULT_ARCH=\"${BINUTILS_ARCH}\" .endif +.if defined(TARGET_BIG_ENDIAN) +CFLAGS+= -DTARGET_BYTES_BIG_ENDIAN=1 +.endif CFLAGS+= -DTARGET_CPU=\"${BINUTILS_ARCH}\" CFLAGS+= -DTARGET_CANONICAL=\"${TARGET_TUPLE}\" CFLAGS+= -DTARGET_ALIAS=\"${TARGET_TUPLE}\" ==== //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/ld/Makefile.arm#2 (text+ko) ==== @@ -1,12 +1,17 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile.arm,v 1.1 2006/07/22 14:36:15 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile.arm,v 1.3 2006/09/14 07:44:05 imp Exp $ -NATIVE_EMULATION= armelf_fbsd +.if defined(TARGET_BIG_ENDIAN) +NATIVE_EMULATION= armelfb_fbsd +.else +NATIVE_EMULATION= armelf_fbsd +.endif SRCS+= e${NATIVE_EMULATION}.c CLEANFILES+= e${NATIVE_EMULATION}.c -e${NATIVE_EMULATION}.c: emulparams/${NATIVE_EMULATION}.sh emultempl/elf32.em \ +e${NATIVE_EMULATION}.c: ${.CURDIR}/${NATIVE_EMULATION}.sh emultempl/elf32.em \ scripttempl/elf.sc genscripts.sh stringify.sed sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${LIBSERACHPATH} \ ${TOOLS_PREFIX}/usr \ ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \ - ${NATIVE_EMULATION} "" no ${NATIVE_EMULATION} ${TARGET_TUPLE} + ${NATIVE_EMULATION} "" no ${NATIVE_EMULATION} ${TARGET_TUPLE} \ + ${.CURDIR}/${NATIVE_EMULATION}.sh ==== //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/ld/genscripts.sh#5 (text+ko) ==== @@ -9,7 +9,7 @@ # sparc-sun-sunos4.1.3 sparc-sun-sunos4.1.3 sun4 "" sun3 sparc-sun-sunos4.1.3 # produces sun3.x sun3.xbn sun3.xn sun3.xr sun3.xu em_sun3.c # -# $FreeBSD: src/gnu/usr.bin/binutils/ld/genscripts.sh,v 1.6 2004/06/16 07:09:37 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/ld/genscripts.sh,v 1.7 2006/09/14 07:46:32 imp Exp $ # # This is a cut-down version of the GNU script. Instead of jumping through # hoops for all possible combinations of paths, just use the libdir @@ -37,7 +37,12 @@ # FSF BU ver 2.15 which allows for a more generic emulparams processing. # To reduce the diff, I also include the ${EMULATION_NAME} parameter in uses # of 'CUSTOMIZER_SCRIPT'. + +# XXX: arm hack : until those file are merged back into the FSF repo, just +# use the version in this directory. +if !(test -f ${CUSTOMIZER_SCRIPT}"";) then CUSTOMIZER_SCRIPT="${srcdir}/emulparams/${EMULATION_NAME}.sh" +fi # Include the emulation-specific parameters: . ${CUSTOMIZER_SCRIPT} ${EMULATION_NAME} ==== //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/libbfd/Makefile.arm#3 (text+ko) ==== @@ -1,14 +1,45 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.arm,v 1.3 2006/08/10 16:39:55 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.arm,v 1.8 2006/09/14 08:21:20 imp Exp $ +.if defined(TARGET_BIG_ENDIAN) +DEFAULT_VECTOR= bfd_elf32_bigarm_vec +.else DEFAULT_VECTOR= bfd_elf32_littlearm_vec +.endif SRCS+= cpu-arm.c \ - elf32.c \ + elf32.c \ elf32-arm-fbsd.c \ elf32-gen.c \ elf32-target.h \ - elfarm-nabi.c \ elflink.c -VECS= ${DEFAULT_VECTOR} \ - bfd_elf32_bigarm_vec +VECS+= ${DEFAULT_VECTOR} +.if defined(TARGET_BIG_ENDIAN) +VECS+= bfd_elf32_littlearm_vec +.else +VECS+= bfd_elf32_bigarm_vec +.endif + +CLEANFILES+= elf32-arm-fbsd.c + +# XXX: We should really add the FreeBSD case in elf32_arm_nabi_grok_prstatus +# instead of defining our own elf32_fbsd_arm_grok_prstatus. +# +elf32-arm-fbsd.c: elfarm-nabi.c + cat ${.ALLSRC} | sed \ + -e s/ELFOSABI_ARM/ELFOSABI_FREEBSD/g \ + -e "s/\(.*#define.*\)elf32_arm_nabi_grok_prstatus/\1elf32_fbsd_arm_grok_prstatus/" \ + -e s/"#include.*elf32-arm.h.*//" >${.TARGET} + echo ' \ + static bfd_boolean \ + elf32_fbsd_arm_grok_prstatus(bfd *abfd, Elf_Internal_Note *note) \ + { size_t raw_size =68 ; int offset = 28; \ + if (note->descsz != 96) return (FALSE); \ + if (elf_tdata(abfd)->core_signal == 0) \ + elf_tdata (abfd)->core_signal = ((int *)(note->descdata))[5]; \ + elf_tdata (abfd)->core_pid = ((int *)(note->descdata))[6]; \ + /* Make a ".reg/999" section. */ \ + return _bfd_elfcore_make_pseudosection (abfd, ".reg",raw_size, \ + note->descpos + offset); \ + }' >> ${.TARGET} + echo '#include "elf32-arm.h"' >> ${.TARGET} ==== //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/libiberty/config.h#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/binutils/libiberty/config.h,v 1.6 2004/06/16 07:09:41 obrien Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/binutils/libiberty/config.h,v 1.8 2006/09/14 06:36:13 imp Exp $ */ /* config.h. Generated by configure. */ /* config.in. Generated from configure.ac by autoheader. */ @@ -7,7 +7,7 @@ /* 1234 = LIL_ENDIAN, 4321 = BIGENDIAN */ -#ifdef __sparc64__ +#if defined(__sparc64__) || defined(__ARMEB__) #define BYTEORDER 4321 #else #define BYTEORDER 1234 @@ -325,7 +325,7 @@ /* Define if the host machine stores words of multi-word integers in big-endian order. */ -#ifdef __sparc64__ +#if defined(__sparc64__) || defined(__ARMEB__) #define HOST_WORDS_BIG_ENDIAN 1 #endif ==== //depot/projects/trustedbsd/base/gnu/usr.bin/cc/Makefile.tgt#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/Makefile.tgt,v 1.8 2004/07/28 05:27:19 kan Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/Makefile.tgt,v 1.10 2006/09/15 05:21:06 imp Exp $ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Sep 18 09:08:46 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D7A3D16A51C; Mon, 18 Sep 2006 09:08:45 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7F40916A519 for ; Mon, 18 Sep 2006 09:08:45 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C573343D76 for ; Mon, 18 Sep 2006 09:08:35 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8I98ZJQ066079 for ; Mon, 18 Sep 2006 09:08:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8I98QkG066074 for perforce@freebsd.org; Mon, 18 Sep 2006 09:08:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 18 Sep 2006 09:08:26 GMT Message-Id: <200609180908.k8I98QkG066074@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 106284 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Sep 2006 09:08:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=106284 Change 106284 by rwatson@rwatson_zoo on 2006/09/18 09:08:19 Integrate TrustedBSD audit branch from TrustedBSD base branch; see @106282 for a detailed description of changes brought in from FreeBSD CVS. Affected files ... .. //depot/projects/trustedbsd/audit3/MAINTAINERS#13 integrate .. //depot/projects/trustedbsd/audit3/Makefile#9 integrate .. //depot/projects/trustedbsd/audit3/Makefile.inc1#15 integrate .. //depot/projects/trustedbsd/audit3/ObsoleteFiles.inc#9 integrate .. //depot/projects/trustedbsd/audit3/UPDATING#15 integrate .. //depot/projects/trustedbsd/audit3/bin/getfacl/getfacl.1#5 integrate .. //depot/projects/trustedbsd/audit3/bin/ls/ls.1#7 integrate .. //depot/projects/trustedbsd/audit3/bin/pax/pax.1#5 integrate .. //depot/projects/trustedbsd/audit3/bin/ps/ps.1#5 integrate .. //depot/projects/trustedbsd/audit3/bin/setfacl/setfacl.1#6 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/sh.1#9 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/CHANGES#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/query.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/resolver.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/version#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/com_err/compile_et.1#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libpcap/CHANGES#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libpcap/CREDITS#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libpcap/FREEBSD-upgrade#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/libpcap/README.dag#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/libpcap/VERSION#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libpcap/config.h.in#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libpcap/configure#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libpcap/configure.in#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libpcap/doc/pcap.html#1 branch .. //depot/projects/trustedbsd/audit3/contrib/libpcap/doc/pcap.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/libpcap/doc/pcap.xml#1 branch .. //depot/projects/trustedbsd/audit3/contrib/libpcap/ethertype.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libpcap/fad-win32.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libpcap/gencode.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libpcap/gencode.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libpcap/grammar.y#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libpcap/pcap-bpf.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/libpcap/pcap-bpf.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libpcap/pcap-dag.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libpcap/pcap-dag.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/libpcap/pcap-dlpi.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libpcap/pcap-int.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libpcap/pcap-linux.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libpcap/pcap-stdinc.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/libpcap/pcap-win32.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libpcap/pcap.3#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libpcap/pcap.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libpcap/pcap.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libpcap/savefile.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libpcap/scanner.l#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/pnpinfo/pnpinfo.8#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/tar/ABOUT-NLS#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/AUTHORS#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/COPYING#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/ChangeLog#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/ChangeLog.1#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/FREEBSD-Xlist#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/FREEBSD-upgrade#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/INSTALL#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/NEWS#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/PORTS#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/README#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/README-alpha#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/THANKS#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/TODO#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/doc/fdl.texi#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/doc/freemanuals.texi#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/doc/getdate.texi#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/doc/header.texi#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/doc/tar.texi#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/doc/version.texi#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/addext.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/alloca.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/argmatch.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/argmatch.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/backupfile.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/backupfile.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/basename.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/dirname.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/dirname.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/error.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/error.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/exclude.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/exclude.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/fileblocks.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/fnmatch.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/fnmatch.hin#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/ftruncate.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/full-write.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/full-write.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/getdate.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/getdate.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/getline.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/getline.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/getstr.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/getstr.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/hash.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/hash.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/human.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/human.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/lchown.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/lchown.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/malloc.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/memset.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/mktime.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/modechange.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/modechange.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/msleep.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/prepargs.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/prepargs.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/print-copyr.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/print-copyr.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/quote.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/quote.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/quotearg.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/quotearg.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/readutmp.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/realloc.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/rename.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/rmdir.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/safe-read.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/safe-read.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/save-cwd.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/save-cwd.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/savedir.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/savedir.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/stpcpy.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/strcasecmp.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/strncasecmp.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/strstr.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/strtoimax.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/strtol.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/strtoll.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/strtoul.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/strtoull.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/strtoumax.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/unicodeio.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/unicodeio.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/utime.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/waitpid.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/xalloc.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/xgetcwd.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/xmalloc.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/xstrdup.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/xstrtoimax.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/xstrtol.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/xstrtol.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/xstrtoul.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/lib/xstrtoumax.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/src/arith.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/src/buffer.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/src/common.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/src/compare.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/src/create.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/src/delete.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/src/extract.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/src/incremen.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/src/list.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/src/mangle.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/src/misc.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/src/names.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/src/rmt.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/src/rmt.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/src/rtapelib.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/src/system.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/src/tar.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/src/tar.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tar/src/update.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/CHANGES#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/CREDITS#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/FILES#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/INSTALL#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/Makefile.in#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/VERSION#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/addrtoname.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/configure#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/configure.in#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/dccp.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/ethertype.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/icmp6.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/interface.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/ipproto.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/ipproto.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/llc.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/netdissect.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/ospf.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/ppp.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/print-802_11.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/print-ap1394.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/print-ascii.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/print-atm.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/print-chdlc.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/print-cip.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/print-dccp.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/print-ether.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/print-fddi.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/print-fr.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/print-icmp6.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/print-ip.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/print-ip6.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/print-ipfc.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/print-ipx.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/print-isoclns.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/print-juniper.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/print-lane.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/print-ldp.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/print-llc.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/print-null.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/print-ospf.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/print-pflog.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/print-pim.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/print-radius.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/print-rsvp.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/print-sctp.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/print-sll.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/print-slow.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/print-symantec.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/print-tcp.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/print-token.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tcpdump-stdinc.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tcpdump.1#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tcpdump.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/.cvsignore#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/02-sunrise-sunset-esp.puu#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/08-sunrise-sunset-aes.puu#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/08-sunrise-sunset-esp2.puu#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/alltests.sh#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/bgp_vpn_attrset.out#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/bgp_vpn_attrset.sh#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/eapon1.gdbinit#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/eapon1.out#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/eapon1.puu#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/eapon1.sh#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/eapon2.puu#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/esp-secrets.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/esp0.out#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/esp0.sh#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/esp1.gdbinit#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/esp1.out#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/esp1.sh#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/esp2.gdbinit#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/esp2.out#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/esp2.sh#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/esp3.gdbinit#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/esp3.sh#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/esp4.gdbinit#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/esp4.sh#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/esp5.gdbinit#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/esp5.out#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/esp5.sh#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/espudp1.out#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/espudp1.puu#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/espudp1.sh#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/isakmp-delete-segfault.puu#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/isakmp-identification-segfault.puu#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/isakmp-pointer-loop.puu#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/isakmp1.out#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/isakmp1.sh#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/isakmp2.out#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/isakmp2.sh#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/isakmp3.out#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/isakmp3.sh#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/isakmp4.out#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/isakmp4.sh#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/isakmp4500.puu#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/lmp.out#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/lmp.puu#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/lmp.sh#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/mpls-ldp-hello.out#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/mpls-ldp-hello.puu#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/mpls-ldp-hello.sh#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/ospf-gmpls.out#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/ospf-gmpls.puu#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/ospf-gmpls.sh#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/print-A.out#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/print-AA.out#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/print-X.out#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/print-XX.out#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/print-capX.out#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/print-capXX.out#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/print-flags.puu#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/print-flags.sh#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/print-x.out#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tests/print-xx.out#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssh/monitor.c#5 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rsa/rsa_sign.c#3 integrate .. //depot/projects/trustedbsd/audit3/etc/defaults/rc.conf#17 integrate .. //depot/projects/trustedbsd/audit3/etc/mtree/BSD.include.dist#10 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/Makefile#15 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/bthidd#1 branch .. //depot/projects/trustedbsd/audit3/games/fortune/datfiles/fortunes#15 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/binutils/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/binutils/as/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/binutils/as/arm-freebsd/targ-cpu.h#1 branch .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/binutils/ld/Makefile.arm#2 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/binutils/ld/armelf_fbsd.sh#1 branch .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/binutils/ld/armelfb_fbsd.sh#1 branch .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/binutils/ld/genscripts.sh#3 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/binutils/libbfd/Makefile.arm#3 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/binutils/libiberty/config.h#3 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/cc/Makefile.tgt#3 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/cc/cc_int/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/cc/cc_int/amd64.patch#2 delete .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/cc/cc_tools/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/cc/cpp/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/gdb/arch/arm/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/gdb/arch/arm/armfbsd-nat.c#1 branch .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/gdb/arch/arm/armfbsd-tdep.c#1 branch .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/gdb/arch/arm/config.h#1 branch .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/gdb/arch/arm/init.c#1 branch .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/gdb/arch/arm/nm-fbsd.h#1 branch .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/gdb/arch/arm/tm-fbsd.h#1 branch .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/gdb/arch/arm/xm-fbsd.h#1 branch .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/gdb/kgdb/trgt_arm.c#2 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/tar/Makefile#4 delete .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/tar/config.h#2 delete .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/tar/doc/Makefile#2 delete .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/tar/localedir.h#2 delete .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/tar/tar.1#4 delete .. //depot/projects/trustedbsd/audit3/include/Makefile#10 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/Makefile#8 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive.h.in#8 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_private.h#8 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read.3#7 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read.c#8 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_extract.c#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_open_file.c#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_support_format_tar.c#10 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_write.c#7 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/tar.5#8 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gen/pwcache.3#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gen/vis.3#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/i386/gen/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/i386/gen/alloca.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/i386/sys/i386_set_watch.3#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/gai_strerror.3#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/gethostbyname.3#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/clnt_bcast.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/clnt_vc.c#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/getnetconfig.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/getnetpath.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/rpc_clnt_create.3#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/rpcb_clnt.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/rpcb_prot.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/svc_simple.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/svc_vc.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdio/fclose.3#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdlib/alloca.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdlib/malloc.3#7 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdlib/malloc.c#13 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/chflags.2#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/clock_gettime.2#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/connect.2#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/getsockopt.2#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/gettimeofday.2#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/kldnext.2#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/kqueue.2#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/listen.2#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/mmap.2#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/open.2#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/recv.2#8 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/send.2#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/sigqueue.2#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/timer_create.2#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/timer_delete.2#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/timer_settime.2#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/utimes.2#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libdevinfo/devinfo.3#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libipsec/ipsec_set_policy.3#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libpam/modules/pam_login_access/login.access.5#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libpam/modules/pam_opie/pam_opie.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libpmc/pmclog.3#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_atfork.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_barrier.c#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_cond.c#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_event.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_fork.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_init.c#11 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_list.c#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_mutex.c#12 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_private.h#13 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_pspinlock.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_sem.c#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_setprio.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_setschedparam.c#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_sig.c#7 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_spinlock.c#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_umtx.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_umtx.h#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libutil/humanize_number.3#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libutil/pw_util.c#3 integrate .. //depot/projects/trustedbsd/audit3/libexec/rtld-elf/rtld.1#5 integrate .. //depot/projects/trustedbsd/audit3/libexec/rtld-elf/rtld.c#9 integrate .. //depot/projects/trustedbsd/audit3/libexec/tftpd/tftpd.8#4 integrate .. //depot/projects/trustedbsd/audit3/release/Makefile#12 integrate .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#19 integrate .. //depot/projects/trustedbsd/audit3/release/scripts/kernels-install.sh#3 integrate .. //depot/projects/trustedbsd/audit3/release/scripts/package-split.py#4 integrate .. //depot/projects/trustedbsd/audit3/sbin/devd/devd.8#5 integrate .. //depot/projects/trustedbsd/audit3/sbin/devd/devd.cc#8 integrate .. //depot/projects/trustedbsd/audit3/sbin/geom/class/eli/geli.8#7 integrate .. //depot/projects/trustedbsd/audit3/sbin/geom/class/eli/geom_eli.c#8 integrate .. //depot/projects/trustedbsd/audit3/sbin/geom/class/nop/geom_nop.c#5 integrate .. //depot/projects/trustedbsd/audit3/sbin/geom/class/nop/gnop.8#4 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/ifconfig.8#13 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/ifconfig.c#9 integrate .. //depot/projects/trustedbsd/audit3/sbin/ipf/ipf/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/ipf/ipftest/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sbin/ipf/ipmon/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sbin/ipf/ipnat/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sbin/ipf/ippool/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sbin/ipfw/ipfw2.c#12 integrate .. //depot/projects/trustedbsd/audit3/sbin/mount/mount.8#9 integrate .. //depot/projects/trustedbsd/audit3/sbin/mount_std/mount_std.c#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/sconfig/sconfig.c#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/sysctl/sysctl.c#9 integrate .. //depot/projects/trustedbsd/audit3/share/examples/etc/make.conf#14 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ddb.4#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/em.4#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/iic.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ipmi.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/le.4#2 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/mxge.4#2 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/tcp.4#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man5/make.conf.5#12 integrate .. //depot/projects/trustedbsd/audit3/share/man/man5/periodic.conf.5#10 integrate .. //depot/projects/trustedbsd/audit3/share/man/man5/src.conf.5#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man7/hier.7#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man7/security.7#8 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/device_add_child.9#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/printf.9#5 integrate .. //depot/projects/trustedbsd/audit3/share/mk/bsd.lib.mk#9 integrate .. //depot/projects/trustedbsd/audit3/share/mk/bsd.own.mk#4 integrate .. //depot/projects/trustedbsd/audit3/share/mk/bsd.prog.mk#7 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/local_apic.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/machdep.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/mp_machdep.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/nexus.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/vm_machdep.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux32_sysvec.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/at91/at91_twi.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/at91/if_atereg.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/i386/pxeldr/pxeldr.S#4 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/cam_xpt.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/scsi/scsi_da.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_proto.h#21 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_syscall.h#21 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_syscalls.c#21 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_sysent.c#22 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/syscalls.master#23 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_emul.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_file.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_futex.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_misc.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files.amd64#11 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/pf/net/pf.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/pf/net/pf_ioctl.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/crypto/via/padlock_cipher.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/aic7xxx/aic7xxx_osm.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-all.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-chipset.c#17 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-disk.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-pci.h#12 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-raid.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-usb.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/bce/if_bce.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/bge/if_bge.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/bge/if_bgereg.h#14 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/bktr/bktr_i2c.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cs/if_cs.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cs/if_csvar.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/dc/if_dc.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/dc/if_dcreg.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/de/if_de.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/de/if_devar.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/drmP.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/drm_drv.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/drm_pciids.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/i915_dma.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/i915_drm.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/i915_drv.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/i915_irq.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/mach64_drm.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/radeon_cp.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/radeon_drm.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/radeon_drv.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/radeon_state.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/em/if_em.c#17 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/em/if_em.h#11 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/en/if_en_pci.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/en/midway.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/fdc/fdc.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/hwpmc/hwpmc_mod.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ic/nec765.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ichsmb/ichsmb.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/if_ndis/if_ndis_usb.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/iicbus/iic.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/iicbus/iicsmb.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ixgb/if_ixgb.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/lge/if_lge.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/lge/if_lgereg.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mfi/mfi.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mfi/mfireg.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt.h#11 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt_cam.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt_pci.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mxge/eth_z8e.dat.gz.uu#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mxge/ethp_z8e.dat.gz.uu#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mxge/if_mxge.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mxge/if_mxge_var.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mxge/mxge_mcp.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/my/if_my.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/my/if_myreg.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nfe/if_nfe.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nfe/if_nfereg.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nge/if_nge.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nge/if_ngereg.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/puc/pucdata.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/re/if_re.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sio/sio_pccard.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/smbus/smb.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/smbus/smb.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/smbus/smbconf.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/smbus/smbconf.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/smbus/smbus.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/smbus/smbus.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/smbus/smbus_if.m#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/usb/uaudio.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/stge/if_stge.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/syscons/scmouse.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/syscons/syscons.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/syscons/syscons.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ti/if_ti.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/txp/if_txp.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/ehci.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/ehci_pci.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/ehcivar.h#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/hid.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/if_aue.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/if_axe.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/if_cdce.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/if_cue.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/if_kue.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/if_rue.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/if_udav.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/if_udavreg.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/if_ural.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/if_uralvar.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/kue_fw.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/ohci.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/ohcivar.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/sl811hs.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/sl811hsvar.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/ubsa.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/ubser.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/ucom.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/ucomvar.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/udbp.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/ufm.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/ufoma.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/uftdi.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/ugen.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/uhci.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/uhcivar.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/uhid.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/uhub.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/ukbd.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/ulpt.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/umass.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/umct.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/umodem.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/ums.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/uplcom.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/urio.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/usb.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/usb.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/usb_ethersubr.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/usb_mem.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/usb_port.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/usb_quirks.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/usb_subr.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/usbdi.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/usbdi.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/usbdi_util.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/usbdi_util.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/usbdivar.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/uscanner.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/uvisor.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/uvscom.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/vge/if_vge.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/udf/osta.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/eli/g_eli.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/eli/g_eli_ctl.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/gate/g_gate.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/gate/g_gate.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/geom.h#9 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/geom_event.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/geom_subr.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/label/g_label_ufs.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/mirror/g_mirror.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/nop/g_nop.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/nop/g_nop.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/raid3/g_raid3.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/raid3/g_raid3_ctl.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/acpica/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/conf/NOTES#12 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/busdma_machdep.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/local_apic.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/machdep.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/mp_machdep.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/nexus.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/sys_machdep.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_sysvec.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/ia32/ia32_trap.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/ia64/trap.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/bus_if.m#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/init_sysent.c#35 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_acct.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_exit.c#18 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_jail.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_ktr.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_mbuf.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_prot.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_umtx.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/subr_bus.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/subr_prf.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/subr_rman.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/subr_witness.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.c#26 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#41 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/systrace_args.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/tty.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_sockbuf.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_socket.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_aio.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_lookup.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_subr.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#35 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/Makefile#15 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/agp/Makefile#7 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/ipfw/Makefile#6 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/pf/Makefile#8 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/sound/sound/Makefile#6 integrate .. //depot/projects/trustedbsd/audit3/sys/net/bpf.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if.h#9 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_bridge.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_var.h#10 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_vlan.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_vlan_var.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211_input.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211_output.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/netgraph/ng_eiface.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/netgraph/ng_fec.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/netgraph/ng_vlan.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/in_pcb.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/ip_fw2.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/ip_output.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/raw_ip.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_input.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_output.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_subr.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_syncache.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_timer.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_timer.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_usrreq.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_var.h#10 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/udp_usrreq.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet6/icmp6.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet6/ip6_forward.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet6/nd6.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet6/udp6_usrreq.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/nfs4client/nfs4_vfsops.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/nfs4client/nfs4_vnops.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/nfsclient/nfs_node.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/nfsclient/nfs_subs.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/nfsclient/nfs_vfsops.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/nfsclient/nfs_vnops.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/nfsclient/nfsnode.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/pc98/cbus/fdc.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/alpm.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/amdpm.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/amdsmb.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/if_rl.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/if_sf.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/if_sfreg.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/if_sis.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/if_sisreg.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/if_ste.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/if_tl.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/if_tlreg.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/if_vr.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/if_vrreg.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/if_wb.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/if_wbreg.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/if_xl.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/if_xlreg.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/intpm.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/intpmreg.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/nfsmb.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/viapm.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/powerpc/powerpc/trap.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#37 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.h#20 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#23 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#34 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#24 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_worker.c#17 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_inet.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_internal.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac_biba/mac_biba.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac_lomac/mac_lomac.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac_mls/mac_mls.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/bus.h#9 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/mac.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/mac_policy.h#9 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/mbuf.h#10 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/mount.h#10 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/param.h#11 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/syscall.h#25 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/syscall.mk#26 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/sysctl.h#10 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/sysproto.h#29 integrate .. //depot/projects/trustedbsd/audit3/sys/ufs/ufs/ufs_quota.c#8 integrate .. //depot/projects/trustedbsd/audit3/tools/build/options/WITHOUT_ASSERT_DEBUG#1 branch .. //depot/projects/trustedbsd/audit3/tools/build/options/makeman#3 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/geom_eli/configure-b-B.t#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/priv/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/priv/main.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/priv/main.h#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/priv/priv_acct.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/priv/priv_adjtime.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/priv/priv_clock_settime.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/priv/priv_io.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/priv/priv_kenv_set.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/priv/priv_kenv_unset.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/priv/priv_proc_setlogin.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/priv/priv_proc_setrlimit.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/priv/priv_sched_rtprio.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/priv/priv_sched_setpriority.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/priv/priv_settimeofday.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/priv/priv_sysctl_write.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/priv/priv_vfs_admin.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/priv/priv_vfs_chown.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/priv/priv_vfs_chroot.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/priv/priv_vfs_clearsugid.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/priv/priv_vfs_extattr_system.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/priv/priv_vfs_fhopen.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/priv/priv_vfs_fhstat.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/priv/priv_vfs_fhstatfs.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/priv/priv_vfs_generation.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/priv/priv_vfs_getfh.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/priv/priv_vfs_read_write.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/priv/priv_vfs_setgid.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/priv/priv_vfs_stickyfile.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/priv/priv_vm_madv_protect.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/priv/priv_vm_mlock.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/priv/priv_vm_munlock.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/priv/test_utimes.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/readonly.t#1 branch .. //depot/projects/trustedbsd/audit3/usr.bin/awk/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/awk/lib.c.diff#1 branch .. //depot/projects/trustedbsd/audit3/usr.bin/awk/main.c.diff#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/calendar/calendars/calendar.freebsd#14 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/calendar/calendars/calendar.holiday#4 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/file/file.1#4 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/file/magic.5#6 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/indent/indent.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/login/login.1#7 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/paste/paste.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/su/su.1#5 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tip/tip/cu.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/truncate/truncate.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/bluetooth/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/bluetooth/bthidd/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/bluetooth/bthidd/bthid_config.h#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/bluetooth/bthidd/bthidd.8#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/bluetooth/bthidd/bthidd.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/bluetooth/bthidd/bthidd.conf.sample#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/bluetooth/bthidd/bthidd.h#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/bluetooth/bthidd/client.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/bluetooth/bthidd/hid.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/bluetooth/bthidd/kbd.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/bluetooth/bthidd/kbd.h#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/bluetooth/bthidd/lexer.l#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/bluetooth/bthidd/parser.y#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/bluetooth/bthidd/server.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/bluetooth/bthidd/session.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/edquota/edquota.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/inetd/inetd.8#6 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/inetd/inetd.c#6 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/inetd/inetd.h#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ipfwpcap/ipfwpcap.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/kbdcontrol/kbdcontrol.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ppp/command.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ppp/lcp.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ppp/ppp.8.m4#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ppp/server.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/rpc.statd/procs.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/rpc.statd/statd.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/tcpdump/tcpdump/Makefile#6 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/MAINTAINERS#13 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.140 2006/08/31 09:51:33 cperciva Exp $ +$FreeBSD: src/MAINTAINERS,v 1.141 2006/09/11 19:39:46 simon Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -119,6 +119,7 @@ bs{diff,patch} cperciva Pre-commit review requested. portsnap cperciva Pre-commit review requested. freebsd-update cperciva Pre-commit review requested. +openssl simon Pre-commit review requested. sys/netgraph/bluetooth emax Pre-commit review preferred. lib/libbluetooth emax Pre-commit review preferred. lib/libsdp emax Pre-commit review preferred. ==== //depot/projects/trustedbsd/audit3/Makefile#9 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.334 2006/06/22 16:52:53 imp Exp $ +# $FreeBSD: src/Makefile,v 1.335 2006/09/08 10:13:15 ru Exp $ # # The user-driven targets are: # @@ -58,8 +58,8 @@ # # See src/UPDATING `COMMON ITEMS' for more complete information. # -# If TARGET_ARCH=arch (e.g. ia64, sparc64, ...) is specified you can -# cross build world for other architectures using the buildworld target, +# If TARGET=machine (e.g. ia64, sparc64, ...) is specified you can +# cross build world for other machine types using the buildworld target, # and once the world is built you can cross build a kernel using the # buildkernel target. # @@ -266,36 +266,32 @@ @echo "--------------------------------------------------------------" @echo ">>> make universe started on ${STARTTIME}" @echo "--------------------------------------------------------------" -.for target in i386 i386:pc98 sparc64 ia64 amd64 -.for arch in ${target:C/:.*$//} -.for mach in ${target:C/^.*://} -KERNCONFS!= cd ${.CURDIR}/sys/${mach}/conf && \ +.for target in amd64 i386 ia64 pc98 sparc64 +KERNCONFS!= cd ${.CURDIR}/sys/${target}/conf && \ find [A-Z]*[A-Z] -type f -maxdepth 0 \ ! -name DEFAULTS ! -name LINT KERNCONFS:= ${KERNCONFS:S/^NOTES$/LINT/} -universe: universe_${mach} -.ORDER: universe_prologue universe_${mach} universe_epilogue -universe_${mach}: - @echo ">> ${mach} started on `LC_ALL=C date`" +universe: universe_${target} +.ORDER: universe_prologue universe_${target} universe_epilogue +universe_${target}: + @echo ">> ${target} started on `LC_ALL=C date`" -cd ${.CURDIR} && ${MAKE} ${JFLAG} buildworld \ - TARGET_ARCH=${arch} TARGET=${mach} \ + TARGET=${target} \ __MAKE_CONF=/dev/null \ - > _.${mach}.buildworld 2>&1 - @echo ">> ${mach} buildworld completed on `LC_ALL=C date`" -.if exists(${.CURDIR}/sys/${mach}/conf/NOTES) - -cd ${.CURDIR}/sys/${mach}/conf && ${MAKE} LINT \ - > ${.CURDIR}/_.${mach}.makeLINT 2>&1 + > _.${target}.buildworld 2>&1 + @echo ">> ${target} buildworld completed on `LC_ALL=C date`" +.if exists(${.CURDIR}/sys/${target}/conf/NOTES) + -cd ${.CURDIR}/sys/${target}/conf && ${MAKE} LINT \ + > ${.CURDIR}/_.${target}.makeLINT 2>&1 .endif .for kernel in ${KERNCONFS} -cd ${.CURDIR} && ${MAKE} ${JFLAG} buildkernel \ - TARGET_ARCH=${arch} TARGET=${mach} \ + TARGET=${target} \ KERNCONF=${kernel} \ __MAKE_CONF=/dev/null \ - > _.${mach}.${kernel} 2>&1 + > _.${target}.${kernel} 2>&1 .endfor - @echo ">> ${mach} completed on `LC_ALL=C date`" -.endfor -.endfor + @echo ">> ${target} completed on `LC_ALL=C date`" .endfor universe: universe_epilogue universe_epilogue: ==== //depot/projects/trustedbsd/audit3/Makefile.inc1#15 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.554 2006/08/24 17:02:26 imp Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.559 2006/09/08 10:09:02 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -11,7 +11,7 @@ # -DNO_PORTSUPDATE do not update ports in ${MAKE} update # -DNO_DOCUPDATE do not update doc in ${MAKE} update # LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list -# TARGET_ARCH="arch" to crossbuild world to a different arch +# TARGET="machine" to crossbuild world for a different machine type # # The intended user-driven targets are: @@ -95,14 +95,36 @@ OSRELDATE= 0 .endif .endif + +# Guess machine architecture from machine type, and vice versa. +.if !defined(TARGET_ARCH) && defined(TARGET) +TARGET_ARCH= ${TARGET:S/pc98/i386/} +.elif !defined(TARGET) && defined(TARGET_ARCH) && \ + ${TARGET_ARCH} != ${MACHINE_ARCH} +TARGET= ${TARGET_ARCH} +.endif +# Otherwise, default to current machine type and architecture. +TARGET?= ${MACHINE} TARGET_ARCH?= ${MACHINE_ARCH} -.if ${TARGET_ARCH} == ${MACHINE_ARCH} -TARGET?= ${MACHINE} + +KNOWN_ARCHES?= amd64 arm i386 i386/pc98 ia64 powerpc sparc64 +.if ${TARGET} == ${TARGET_ARCH} +_t= ${TARGET} +.else +_t= ${TARGET_ARCH}/${TARGET} +.endif +.for _t in ${_t} +.if empty(KNOWN_ARCHES:M${_t}) +.error Unknown target ${TARGET_ARCH}:${TARGET}. +.endif +.endfor + +.if ${TARGET} == ${MACHINE} TARGET_CPUTYPE?=${CPUTYPE} .else -TARGET?= ${TARGET_ARCH} TARGET_CPUTYPE?= .endif + .if !empty(TARGET_CPUTYPE) _TARGET_CPUTYPE=${TARGET_CPUTYPE} .else @@ -185,11 +207,13 @@ # build-tools stage TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \ ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ + TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ DESTDIR= \ BOOTSTRAPPING=${OSRELDATE} -DNO_LINT -DNO_CPU_CFLAGS -DNO_WARNS # cross-tools stage XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \ + TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ -DWITHOUT_FORTRAN -DWITHOUT_GDB # world stage @@ -465,9 +489,19 @@ WMAKE_TGTS+= build32 .endif -buildworld: ${WMAKE_TGTS} -.ORDER: ${WMAKE_TGTS} +buildworld: buildworld_prologue ${WMAKE_TGTS} buildworld_epilogue +.ORDER: buildworld_prologue ${WMAKE_TGTS} buildworld_epilogue + +buildworld_prologue: + @echo "--------------------------------------------------------------" + @echo ">>> World build started on `LC_ALL=C date`" + @echo "--------------------------------------------------------------" +buildworld_epilogue: + @echo + @echo "--------------------------------------------------------------" + @echo ">>> World build completed on `LC_ALL=C date`" + @echo "--------------------------------------------------------------" # # We need to have this as a target because the indirection between Makefile ==== //depot/projects/trustedbsd/audit3/ObsoleteFiles.inc#9 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Sep 18 09:17:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 714E116A49E; Mon, 18 Sep 2006 09:17:49 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3382816A47E for ; Mon, 18 Sep 2006 09:17:49 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 73FE543D5A for ; Mon, 18 Sep 2006 09:17:48 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8I9HmIi071987 for ; Mon, 18 Sep 2006 09:17:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8I9Hmf6071984 for perforce@freebsd.org; Mon, 18 Sep 2006 09:17:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 18 Sep 2006 09:17:48 GMT Message-Id: <200609180917.k8I9Hmf6071984@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 106285 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Sep 2006 09:17:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=106285 Change 106285 by rwatson@rwatson_peppercorn on 2006/09/18 09:16:49 Remove commented out privileges (in most cases) for jail, and annotate which privileges are allowed and why in comments. Affected files ... .. //depot/projects/trustedbsd/priv/sys/kern/kern_jail.c#4 edit Differences ... ==== //depot/projects/trustedbsd/priv/sys/kern/kern_jail.c#4 (text+ko) ==== @@ -535,32 +535,26 @@ return (0); switch (priv) { - /* case PRIV_ROOT: */ - /* case PRIV_ACCT: */ - /* case PRIV_MAXFILES: */ - /* case PRIV_MAXPROC: */ + + /* + * Allow ktrace privileges for root in jail. + */ case PRIV_KTRACE: - /* case PRIV_SETDUMPER: */ - /* case PRIV_NFSD: */ - /* case PRIV_REBOOT: */ - /* case PRIV_SWAPON: */ - /* case PRIV_SWAPOFF: */ - /* case PRIV_MSGBUF: */ - /* case PRIV_WITNESS: */ - /* case PRIV_IO: */ - /* case PRIV_KEYBOARD: */ - /* case PRIV_DRIVER: */ - /* case PRIV_ADJTIME: */ - /* case PRIV_NTP_ADJTIME: */ - /* case PRIV_CLOCK_SETTIME: */ - /* case PRIV_SETTIMEOFDAY: */ - /* case PRIV_SETHOSTID: */ - /* case PRIV_SETDOMAINNAME: */ - /* case PRIV_AUDIT_CONTROL: */ - /* case PRIV_AUDIT_FAILSTOP: */ + + /* + * Allow jailed processes to configure audit identity and + * submit audit records (login, etc). In the future we may + * want to further refine the relationship between audit and + * jail. + */ case PRIV_AUDIT_GETAUDIT: case PRIV_AUDIT_SETAUDIT: case PRIV_AUDIT_SUBMIT: + + /* + * Allow jailed processes to manipulate process UNIX + * credentials in any way they sees fit. + */ case PRIV_CRED_SETUID: case PRIV_CRED_SETEUID: case PRIV_CRED_SETGID: @@ -570,57 +564,73 @@ case PRIV_CRED_SETREGID: case PRIV_CRED_SETRESUID: case PRIV_CRED_SETRESGID: + + /* + * Jail implements visibility constraints already, so allow + * jailed root to override uid/gid-based constraints. + */ case PRIV_SEEOTHERGIDS: case PRIV_SEEOTHERUIDS: + + /* + * Jail implements inter-process debugging limits already, so + * allow jailed root various debugging privileges. + */ case PRIV_DEBUG_DIFFCRED: case PRIV_DEBUG_SUGID: case PRIV_DEBUG_UNPRIV: - /* case PRIV_FIRMWARE_LOAD: */ - /* case PRIV_JAIL_ATTACH: */ - /* case PRIV_KENV_SET: */ - /* case PRIV_KENV_UNSET: */ - /* case PRIV_KLD_LOAD: */ - /* case PRIV_KLD_UNLOAD: */ - /* case PRIV_MAC_PARTITION: */ + + /* + * Allow jail to set various resource limits and login + * properties, and for now, exceed process resource limits. + */ case PRIV_PROC_LIMIT: case PRIV_PROC_SETLOGIN: case PRIV_PROC_SETRLIMIT: - /* XXXRW: Not yet. */ + /* + * The following privileges should be granted to jail once + * implemented. + */ /* case PRIV_IPC_READ: */ /* case PRIV_IPC_WRITE: */ /* case PRIV_IPC_EXEC: */ /* case PRIV_IPC_ADMIN: */ /* case PRIV_IPC_MSGSIZE: */ /* case PRIV_MQ_ADMIN: */ - /* case PRIV_PMC_MANAGE: */ - /* case PRIV_PMC_SYSTEM: */ + + /* + * Jail implements its own inter-process limits, so allow + * root processes in jail to change scheduling on other + * processes in the same jail. Likewise for signalling. + */ case PRIV_SCHED_DIFFCRED: - /* case PRIV_SCHED_SETPRIORITY: */ - /* case PRIV_SCHED_RTPRIO: */ - /* case PRIV_SCHED_SETPOLICY: */ - /* case PRIV_SCHED_SET: */ - /* case PRIV_SCHED_SETPARAM: */ - /* case PRIV_SEM_WRITE: */ case PRIV_SIGNAL_DIFFCRED: case PRIV_SIGNAL_SUGID: - /* case PRIV_SYSCTL_DEBUG: */ - /* case PRIV_SYSCTL_WRITE: */ + + /* + * Allow jailed processes to write to sysctls marked as jail + * writable. + */ case PRIV_SYSCTL_WRITEJAIL: - /* case PRIV_TTY_CONSOLE: */ - /* case PRIV_TTY_DRAINWAIT: */ - /* case PRIV_TTY_DTRWAIT: */ - /* case PRIV_TTY_EXCLUSIVE: */ - /* case PRIV_TTY_PRISON: */ - /* case PRIV_TTY_STI: */ - /* case PRIV_TTY_SETA: */ - /* case PRIV_UFS_EXTATTRCTL: */ + + /* + * Allow root in jail to manage a variety of quota + * properties. Some are a bit surprising and should be + * reconsidered. + */ case PRIV_UFS_GETQUOTA: case PRIV_UFS_QUOTAOFF: /* XXXRW: Slightly surprising. */ case PRIV_UFS_QUOTAON: /* XXXRW: Slightly surprising. */ case PRIV_UFS_SETQUOTA: case PRIV_UFS_SETUSE: /* XXXRW: Slightly surprising. */ - /* case PRIV_UFS_EXCEEDQUOTA: */ + + /* + * Since Jail relies on chroot() to implement file system + * protections, grant many VFS privileges to root in jail. + * Be careful to exclude mount-related and NFS-related + * privileges. + */ case PRIV_VFS_READ: case PRIV_VFS_WRITE: case PRIV_VFS_ADMIN: @@ -631,97 +641,49 @@ case PRIV_VFS_CHOWN: case PRIV_VFS_CHROOT: case PRIV_VFS_CLEARSUGID: - /* case PRIV_VFS_EXTATTR_SYSTEM: */ case PRIV_VFS_FCHROOT: - /* case PRIV_VFS_FHOPEN: */ - /* case PRIV_VFS_FHSTAT: */ - /* case PRIV_VFS_FHSTATFS: */ - /* case PRIV_VFS_GENERATION: */ - /* case PRIV_VFS_GETFH: */ case PRIV_VFS_LINK: - /* case PRIV_VFS_MKNOD_DEV: */ - /* case PRIV_VFS_MOUNT: */ - /* case PRIV_VFS_MOUNT_OWNER: */ - /* case PRIV_VFS_MOUNT_EXPORTED: */ - /* case PRIV_VFS_MOUNT_PERM: */ - /* case PRIV_VFS_MOUNT_SUIDDIR: */ case PRIV_VFS_SETGID: case PRIV_VFS_STICKYFILE: return (0); + /* + * Depending on the global setting, allow privilege of + * setting system flags. + */ case PRIV_VFS_SYSFLAGS: if (jail_chflags_allowed) return (0); else return (EPERM); - /* case PRIV_VFS_UNMOUNT: */ - /* case PRIV_VM_MADV_PROTECT: */ - /* case PRIV_VM_MLOCK: */ - /* case PRIV_VM_MUNLOCK: */ - /* case PRIV_DEVFS_RULE: */ - /* case PRIV_DEVFS_SYMLINK: */ - /* case PRIV_RANDOM_RESEED: */ - /* case PRIV_NET_BRIDGE: */ - /* case PRIV_NET_GRE: */ - /* case PRIV_NET_PPP: */ - /* case PRIV_NET_SLIP: */ - /* case PRIV_NET_BPF: */ - /* case PRIV_NET_RAW: */ - /* case PRIV_NET_ROUTE: */ - /* case PRIV_NET_TAP: */ - /* case PRIV_NET_SETIFMTU: */ - /* case PRIV_NET_SETIFFLAGS: */ - /* case PRIV_NET_SETIFCAP: */ - /* case PRIV_NET_SETIFNAME: */ - /* case PRIV_NET_SETIFMETRIC: */ - /* case PRIV_NET_SETIFPHYS: */ - /* case PRIV_NET_SETIFMAC: */ - /* case PRIV_NET_ADDMULTI: */ - /* case PRIV_NET_DELMULTI: */ - /* case PRIV_NET_HWIOCTL: */ - /* case PRIV_NET_SETLLADDR: */ - /* case PRIV_NET_ADDIFGROUP: */ - /* case PRIV_NET_DELIFGROUP: */ - /* case PRIV_NET_IFCREATE: */ - /* case PRIV_NET_IFDESTROY: */ - /* case PRIV_NET80211_GETKEY: */ - /* case PRIV_NET80211_MANAGE: */ - /* case PRIV_NETATALK_RESERVEDPORT: */ - /* case PRIV_NETATM_CFG: */ - /* case PRIV_NETATM_ADD: */ - /* case PRIV_NETATM_DEL: */ - /* case PRIV_NETATM_SET: */ - /* case PRIV_NETGRAPH_CONTROL: */ - /* case PRIV_NETGRAPH_TTY: */ + /* + * Allow jailed root to bind reserved ports. + */ case PRIV_NETINET_RESERVEDPORT: return (0); - /* case PRIV_NETINET_IPFW: */ - /* case PRIV_NETINET_DIVERT: */ - /* case PRIV_NETINET_PF: */ - /* case PRIV_NETINET_DUMMYNET: */ - /* case PRIV_NETINET_CARP: */ - /* case PRIV_NETINET_MROUTE: */ + + /* + * Conditionally allow creating raw sockets in jail. + */ case PRIV_NETINET_RAW: if (jail_allow_raw_sockets) return (0); else return (EPERM); + + /* + * Since jail implements its own visibility limits on netstat + * sysctls, allow getcred. This allows identd to work in + * jail. + */ case PRIV_NETINET_GETCRED: - /* case PRIV_NETINET_ADDRCTRL6: */ - /* case PRIV_NETINET_ND6: */ - /* case PRIV_NETINET_SCOPE6: */ - /* case PRIV_NETINET_ALIFETIME6: */ - /* case PRIV_NETINET_IPSEC: */ - /* case PRIV_NETIPX_RESERVEDPORT: */ - /* case PRIV_NETIPX_RAW: */ - /* case PRIV_NETNCP: */ - /* case PRIV_NETSMB: */ - /* case PRIV_VM86_INTCALL: */ default: /* - * In all remaining cases, deny the privilege request. + * In all remaining cases, deny the privilege request. This + * includes almost all network privileges, many system + * configuration privileges. */ return (EPERM); } From owner-p4-projects@FreeBSD.ORG Mon Sep 18 10:37:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7BE7F16A412; Mon, 18 Sep 2006 10:37:29 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3FE9616A407 for ; Mon, 18 Sep 2006 10:37:29 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AC87643D60 for ; Mon, 18 Sep 2006 10:37:28 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8IAbSu1076826 for ; Mon, 18 Sep 2006 10:37:28 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8IAbSoL076823 for perforce@freebsd.org; Mon, 18 Sep 2006 10:37:28 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 18 Sep 2006 10:37:28 GMT Message-Id: <200609181037.k8IAbSoL076823@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 106286 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Sep 2006 10:37:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=106286 Change 106286 by hselasky@hselasky_mini_itx on 2006/09/18 10:37:03 Remove duplicate macro definition. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_port.h#10 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_port.h#10 (text+ko) ==== @@ -310,7 +310,6 @@ #define USBBASEDEVICE device_t #define USBDEV(bdev) (bdev) #define USBDEVNAME(bdev) device_get_nameunit(bdev) -#define USBDEVUNIT(bdev) device_get_unit(bdev) #define USBDEVPTRNAME(bdev) device_get_nameunit(bdev) #define USBDEVUNIT(bdev) device_get_unit(bdev) #define USBGETSOFTC(bdev) device_get_softc(bdev) From owner-p4-projects@FreeBSD.ORG Mon Sep 18 10:43:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 59B7616A417; Mon, 18 Sep 2006 10:43:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 275AE16A412 for ; Mon, 18 Sep 2006 10:43:37 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E290F43D5D for ; Mon, 18 Sep 2006 10:43:36 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8IAhan1077093 for ; Mon, 18 Sep 2006 10:43:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8IAhaUe077090 for perforce@freebsd.org; Mon, 18 Sep 2006 10:43:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 18 Sep 2006 10:43:36 GMT Message-Id: <200609181043.k8IAhaUe077090@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 106287 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Sep 2006 10:43:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=106287 Change 106287 by rwatson@rwatson_zoo on 2006/09/18 10:42:48 Update HISTORY for things done recently towards OpenBSM 1.0 alpha 11. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#28 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#28 (text+ko) ==== @@ -1,5 +1,23 @@ OpenBSM 1.0 alpha 11 +- Reclassify certain read/write operations as having no class rather than the + fr/fw class; our default classes audit intent (open) not operations (read, + write). + +- Introduce AUE_SYSCTL_WRITE event so that BSD/Darwin systems can audit reads + and writes of sysctls as separate events. Add additional kernel + environment and jail events for FreeBSD. + +- Break AUDIT_TRIGGER_OPEN_NEW into two events, AUDIT_TRIGGER_ROTATE_USER + (issued by the user audit(8) tool) and AUDIT_TRIGGER_ROTATE_KERNEL (issued + by the kernel audit implementation) so that they can be distinguished. + +- Disable rate limiting of rotate requests; as the kernel doesn't retransmit + a dropped request, the log file will otherwise grow indefinitely if the + trigger is dropped. + +- Improve auditd debugging output. + OpenBSM 1.0 alpha 10 - auditd now generates complete audit records for its events, as required for @@ -211,4 +229,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#27 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#28 $ From owner-p4-projects@FreeBSD.ORG Mon Sep 18 11:56:53 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA44B16A4E0; Mon, 18 Sep 2006 11:56:53 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9576116A4D4 for ; Mon, 18 Sep 2006 11:56:53 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0CF4643D6E for ; Mon, 18 Sep 2006 11:53:04 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8IBr3D8081531 for ; Mon, 18 Sep 2006 11:53:03 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8IBr3UQ081528 for perforce@freebsd.org; Mon, 18 Sep 2006 11:53:03 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 18 Sep 2006 11:53:03 GMT Message-Id: <200609181153.k8IBr3UQ081528@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 106288 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Sep 2006 11:56:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=106288 Change 106288 by hselasky@hselasky_mini_itx on 2006/09/18 11:52:16 Compile fix. The new ubser.c will be without the ubser.h header file. Affected files ... .. //depot/projects/usb/src/sys/modules/ubser/Makefile#2 edit Differences ... ==== //depot/projects/usb/src/sys/modules/ubser/Makefile#2 (text+ko) ==== @@ -4,6 +4,6 @@ .PATH: $S/dev/usb KMOD= ubser -SRCS= ubser.c ubser.h opt_usb.h device_if.h bus_if.h usbdevs.h +SRCS= ubser.c opt_usb.h device_if.h bus_if.h usbdevs.h .include From owner-p4-projects@FreeBSD.ORG Mon Sep 18 13:18:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8771616A494; Mon, 18 Sep 2006 13:18:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2A05916A47C for ; Mon, 18 Sep 2006 13:18:51 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E145743D53 for ; Mon, 18 Sep 2006 13:18:50 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8IDIo3J097288 for ; Mon, 18 Sep 2006 13:18:50 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8IDIoia097285 for perforce@freebsd.org; Mon, 18 Sep 2006 13:18:50 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 18 Sep 2006 13:18:50 GMT Message-Id: <200609181318.k8IDIoia097285@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 106289 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Sep 2006 13:18:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=106289 Change 106289 by rwatson@rwatson_sesame on 2006/09/18 13:18:22 Add two new todo items. Affected files ... .. //depot/projects/trustedbsd/openbsm/TODO#7 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/TODO#7 (text+ko) ==== @@ -17,5 +17,10 @@ just at the beginning of a record. This will make it easier to use praudit in test suites processing single-token files without header and trailer context. +- Teach auditd how to notify a script when it is done with trail files so + that the script can archive them, compress them, delete them, whatever. + It should walk any trail files found at startup also, assuming it + successfully registers. +- Put hostname in trail file name. -$P4: //depot/projects/trustedbsd/openbsm/TODO#6 $ +$P4: //depot/projects/trustedbsd/openbsm/TODO#7 $ From owner-p4-projects@FreeBSD.ORG Mon Sep 18 14:33:50 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CB33316A4A7; Mon, 18 Sep 2006 14:33:49 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7310A16A492 for ; Mon, 18 Sep 2006 14:33:49 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 386FF43D62 for ; Mon, 18 Sep 2006 14:33:25 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8IEXPUJ002578 for ; Mon, 18 Sep 2006 14:33:25 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8IEXOS7002575 for perforce@freebsd.org; Mon, 18 Sep 2006 14:33:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 18 Sep 2006 14:33:24 GMT Message-Id: <200609181433.k8IEXOS7002575@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 106292 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Sep 2006 14:33:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=106292 Change 106292 by rwatson@rwatson_sesame on 2006/09/18 14:32:34 - Fix a number of thread related bugs in the reading of the audit_control configuration file. - Add new APIs getacpol(), au_poltostr() and au_strtopol() which are used to retrieve global audit policy flags from the audit_control configuration file. - Modify auditd(8) to read and set audit policy flags. Remove the -s and -h flags, they are replaced by the policy field in audit_control. - Update audump to read, parse, and print policy flags. - Update history, documentation. It's now possible to set flags like argv, arge, cnt, etc, in the /etc configuration file. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#29 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#9 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#20 edit .. //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#28 edit .. //depot/projects/trustedbsd/openbsm/etc/audit_control#4 edit .. //depot/projects/trustedbsd/openbsm/libbsm/au_control.3#4 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#14 edit .. //depot/projects/trustedbsd/openbsm/man/audit_control.5#10 edit .. //depot/projects/trustedbsd/openbsm/tools/audump.c#6 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#29 (text+ko) ==== @@ -3,20 +3,28 @@ - Reclassify certain read/write operations as having no class rather than the fr/fw class; our default classes audit intent (open) not operations (read, write). - - Introduce AUE_SYSCTL_WRITE event so that BSD/Darwin systems can audit reads and writes of sysctls as separate events. Add additional kernel environment and jail events for FreeBSD. - - Break AUDIT_TRIGGER_OPEN_NEW into two events, AUDIT_TRIGGER_ROTATE_USER (issued by the user audit(8) tool) and AUDIT_TRIGGER_ROTATE_KERNEL (issued by the kernel audit implementation) so that they can be distinguished. - - Disable rate limiting of rotate requests; as the kernel doesn't retransmit a dropped request, the log file will otherwise grow indefinitely if the trigger is dropped. - - Improve auditd debugging output. +- Fix a number of threading related bugs in audit_control file reading + routines. +- Add APIs au_poltostr() and au_strtopol() to convert between text + representations of audit_control policy flags and the flags passed to + auditon(A_SETPOLICY) and retrieved from auditon(A_GETPOLICY). +- Add API getacpol() to return the 'policy:' entry from audit_control, an + extension to the Solaris file format to allow specification of policy + persistent flags. +- Update audump to print the audit_control policy field. +- Update auditd to read the audit_control policy field and set the kernel + policy to match it when configuring/reconfiguring. Remove the -s and -h + arguments as these policies are now set via the configuration file. OpenBSM 1.0 alpha 10 @@ -229,4 +237,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#28 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#29 $ ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#9 (text+ko) ==== @@ -29,7 +29,7 @@ .\" .\" @APPLE_BSD_LICENSE_HEADER_END@ .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#8 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#9 $ .\" .Dd January 24, 2004 .Dt AUDITD 8 @@ -51,14 +51,20 @@ .Bl -tag -width Ds .It Fl d Starts the daemon in debug mode - it will not daemonize. -.It Fl h -Specifies that if auditing cannot be performed as specified, the system should -halt (panic). Normally, the system will attempt to proceed - although individual -processes may be stopped (see the -s option). -.It Fl s -Specifies that individual processes should stop rather than perform operations -that may cause audit records to be lost due to log file full conditions .El +.Pp +The historical +.Fl h +and +.Fl s +flags are now configured using +.Xr audit_control 5 +policy flags +.Dv ahlt +and +.Dv cnt , +and are no longer available as arguments to +.Xr auditd 8 . .Sh NOTE .Pp To assure uninterrupted audit support, the ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#20 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#19 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#20 $ */ #include @@ -59,6 +59,7 @@ #include "auditd.h" #define NA_EVENT_STR_SIZE 25 +#define POL_STR_SIZE 128 static int ret, minval; static char *lastfile = NULL; @@ -67,7 +68,6 @@ static int sigchlds, sigchlds_handled; static int sighups, sighups_handled; static int sigterms, sigterms_handled; -static long global_flags; static TAILQ_HEAD(, dir_ent) dir_q; @@ -725,6 +725,8 @@ au_mask_t aumask; int ctr = 0; char naeventstr[NA_EVENT_STR_SIZE]; + char polstr[POL_STR_SIZE]; + long policy; /* * Process the audit event file, obtaining a class mapping for each @@ -787,15 +789,12 @@ syslog(LOG_ERR, "Failed to obtain non-attributable event mask."); - /* - * Set the audit policy flags based on passed in parameter values. - * - * XXXRW: This removes existing policy flags not related to cnt/ahlt. - * We need a way to merge configuration policy and command line - * argument policy. - */ - if (auditon(A_SETPOLICY, &global_flags, sizeof(global_flags))) - syslog(LOG_ERR, "Failed to set audit policy."); + if ((getacpol(polstr, POL_STR_SIZE) == 0) && + (au_strtopol(polstr, &policy) == 0)) { + if (auditon(A_SETPOLICY, &policy, sizeof(policy))) + syslog(LOG_ERR, "Failed to set audit policy."); + } else + syslog(LOG_ERR, "Failed to obtain policy flags."); return (0); } @@ -872,7 +871,6 @@ int debug = 0; int rc; - global_flags |= AUDIT_CNT; while ((ch = getopt(argc, argv, "dhs")) != -1) { switch(ch) { case 'd': @@ -880,20 +878,10 @@ debug = 1; break; - case 's': - /* Fail-stop option. */ - global_flags &= ~(AUDIT_CNT); - break; - - case 'h': - /* Halt-stop option. */ - global_flags |= AUDIT_AHLT; - break; - case '?': default: (void)fprintf(stderr, - "usage: auditd [-h | -s] [-d] \n"); + "usage: auditd [-d] \n"); exit(1); } } ==== //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#28 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#27 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#28 $ */ #ifndef _LIBBSM_H_ @@ -71,6 +71,7 @@ #define MINFREE_CONTROL_ENTRY "minfree" #define FLAGS_CONTROL_ENTRY "flags" #define NA_CONTROL_ENTRY "naflags" +#define POLICY_CONTROL_ENTRY "policy" #define AU_CLASS_NAME_MAX 8 #define AU_CLASS_DESC_MAX 72 @@ -711,11 +712,14 @@ int getacmin(int *min_val); int getacflg(char *auditstr, int len); int getacna(char *auditstr, int len); +int getacpol(char *auditstr, size_t len); int getauditflagsbin(char *auditstr, au_mask_t *masks); int getauditflagschar(char *auditstr, au_mask_t *masks, int verbose); int au_preselect(au_event_t event, au_mask_t *mask_p, int sorf, int flag); +ssize_t au_poltostr(long policy, size_t maxsize, char *buf); +int au_strtopol(const char *polstr, long *policy); /* * Functions relating to querying audit event information. ==== //depot/projects/trustedbsd/openbsm/etc/audit_control#4 (text+ko) ==== @@ -1,7 +1,8 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_control#3 $ +# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_control#4 $ # dir:/var/audit flags:lo minfree:20 naflags:lo +policy:cnt ==== //depot/projects/trustedbsd/openbsm/libbsm/au_control.3#4 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_control.3#3 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_control.3#4 $ .\" .Dd April 19, 2005 .Dt AU_CONTROL 3 @@ -34,7 +34,10 @@ .Nm getacdir , .Nm getacmin , .Nm getacflg , -.Nm getacna +.Nm getacna , +.Nm getacpol , +.Nm au_poltostr +.Nm au_strtopol .Nd "Look up information from the audit_control database" .Sh LIBRARY .Lb libbsm @@ -52,6 +55,12 @@ .Fn getacflg "char *auditstr" "int len" .Ft int .Fn getacna "char *auditstr" "int len" +.Ft int +.Fn getacpol "char *auditstr" "size_t len" +.Ft ssize_t +.Fn au_poltostr "long policy" "size_t maxsize" "char *buf" +.Ft int +.Fn au_strtopol "const char *polstr" "long *policy" .Sh DESCRIPTION These interfaces may be used to look up information from the .Xr audit_control 5 @@ -90,15 +99,42 @@ .Va auditstr of length .Va len . +.Pp +.Fn getacpol +returns the audit policy flags via the passed character buffer +.Va auditstr +of length +.Va len . +.Pp +.Fn au_poltostr +converts a numeric audit policy mask, +.Va policy , +value to a string in the passed character buffer +.Va buf +of lenth +.Va maxsize . +.Pp +.Fn au_strtopol +converts an audit policy flags string, +.Va polstr , +to a numeric audit policy mask returned via +.Va policy . .Sh RETURN VALULES .Fn getacdir , .Fn getacmin , .Fn getacflg , +.Fn getacna , +.Fn getacpol , and -.Fn getacna +.Fn au_strtopol return 0 on success, or a negative value on failure, along with error information in .Va errno . +.Pp +.Fn au_poltostr +returns a string length of 0 or more on success, or a negative value on +if there is a failure. +.Pp Functions that return a string value will return a failure if there is insufficient room in the passed character buffer for the full string. .Sh SEE ALSO ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#14 (text+ko) ==== @@ -1,5 +1,6 @@ /* * Copyright (c) 2004 Apple Computer, Inc. + * Copyright (c) 2006 Robert N. M. Watson * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#13 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#14 $ */ #include @@ -39,7 +40,7 @@ /* * Parse the contents of the audit_control file to return the audit control - * parameters. + * parameters. These static fields are protected by 'mutex'. */ static FILE *fp = NULL; static char linestr[AU_LINE_MAX]; @@ -98,21 +99,223 @@ } /* + * Convert a policy to a string. Return -1 on failure, or >= 0 representing + * the actual size of the string placed in the buffer (excluding terminating + * nul). + */ +ssize_t +au_poltostr(long policy, size_t maxsize, char *buf) +{ + int first; + + if (maxsize < 1) + return (-1); + first = 1; + buf[0] = '\0'; + + if (policy & AUDIT_CNT) { + if (strlcat(buf, "cnt", maxsize) >= maxsize) + return (-1); + first = 0; + } + if (policy & AUDIT_AHLT) { + if (!first) { + if (strlcat(buf, ",", maxsize) >= maxsize) + return (-1); + } + if (strlcat(buf, "ahlt", maxsize) >= maxsize) + return (-1); + first = 0; + } + if (policy & AUDIT_ARGV) { + if (!first) { + if (strlcat(buf, ",", maxsize) >= maxsize) + return (-1); + } + if (strlcat(buf, "argv", maxsize) >= maxsize) + return (-1); + first = 0; + } + if (policy & AUDIT_ARGE) { + if (!first) { + if (strlcat(buf, ",", maxsize) >= maxsize) + return (-1); + } + if (strlcat(buf, "arge", maxsize) >= maxsize) + return (-1); + first = 0; + } + if (policy & AUDIT_SEQ) { + if (!first) { + if (strlcat(buf, ",", maxsize) >= maxsize) + return (-1); + } + if (strlcat(buf, "seq", maxsize) >= maxsize) + return (-1); + first = 0; + } + if (policy & AUDIT_WINDATA) { + if (!first) { + if (strlcat(buf, ",", maxsize) >= maxsize) + return (-1); + } + if (strlcat(buf, "windata", maxsize) >= maxsize) + return (-1); + first = 0; + } + if (policy & AUDIT_USER) { + if (!first) { + if (strlcat(buf, ",", maxsize) >= maxsize) + return (-1); + } + if (strlcat(buf, "user", maxsize) >= maxsize) + return (-1); + first = 0; + } + if (policy & AUDIT_GROUP) { + if (!first) { + if (strlcat(buf, ",", maxsize) >= maxsize) + return (-1); + } + if (strlcat(buf, "group", maxsize) >= maxsize) + return (-1); + first = 0; + } + if (policy & AUDIT_TRAIL) { + if (!first) { + if (strlcat(buf, ",", maxsize) >= maxsize) + return (-1); + } + if (strlcat(buf, "trail", maxsize) >= maxsize) + return (-1); + first = 0; + } + if (policy & AUDIT_PATH) { + if (!first) { + if (strlcat(buf, ",", maxsize) >= maxsize) + return (-1); + } + if (strlcat(buf, "path", maxsize) >= maxsize) + return (-1); + first = 0; + } + if (policy & AUDIT_SCNT) { + if (!first) { + if (strlcat(buf, ",", maxsize) >= maxsize) + return (-1); + } + if (strlcat(buf, "scnt", maxsize) >= maxsize) + return (-1); + first = 0; + } + if (policy & AUDIT_PUBLIC) { + if (!first) { + if (strlcat(buf, ",", maxsize) >= maxsize) + return (-1); + } + if (strlcat(buf, "public", maxsize) >= maxsize) + return (-1); + first = 0; + } + if (policy & AUDIT_ZONENAME) { + if (!first) { + if (strlcat(buf, ",", maxsize) >= maxsize) + return (-1); + } + if (strlcat(buf, "zonename", maxsize) >= maxsize) + return (-1); + first = 0; + } + if (policy & AUDIT_PERZONE) { + if (!first) { + if (strlcat(buf, ",", maxsize) >= maxsize) + return (-1); + } + if (strlcat(buf, "perzone", maxsize) >= maxsize) + return (-1); + first = 0; + } + return (strlen(buf)); +} + +/* + * Convert a string to a policy. Return -1 on failure (with errno EINVAL, + * ENOMEM) or 0 on success. + */ +int +au_strtopol(const char *polstr, long *policy) +{ + char *bufp, *string; + char *buffer; + + *policy = 0; + buffer = strdup(polstr); + if (buffer == NULL) + return (-1); + + bufp = buffer; + while ((string = strsep(&bufp, ",")) != NULL) { + if (strcmp(string, "cnt") == 0) + *policy |= AUDIT_CNT; + else if (strcmp(string, "ahlt") == 0) + *policy |= AUDIT_AHLT; + else if (strcmp(string, "argv") == 0) + *policy |= AUDIT_ARGV; + else if (strcmp(string, "arge") == 0) + *policy |= AUDIT_ARGE; + else if (strcmp(string, "seq") == 0) + *policy |= AUDIT_SEQ; + else if (strcmp(string, "winau_fstat") == 0) + *policy |= AUDIT_WINDATA; + else if (strcmp(string, "user") == 0) + *policy |= AUDIT_USER; + else if (strcmp(string, "group") == 0) + *policy |= AUDIT_GROUP; + else if (strcmp(string, "trail") == 0) + *policy |= AUDIT_TRAIL; + else if (strcmp(string, "path") == 0) + *policy |= AUDIT_PATH; + else if (strcmp(string, "scnt") == 0) + *policy |= AUDIT_SCNT; + else if (strcmp(string, "public") == 0) + *policy |= AUDIT_PUBLIC; + else if (strcmp(string, "zonename") == 0) + *policy |= AUDIT_ZONENAME; + else if (strcmp(string, "perzone") == 0) + *policy |= AUDIT_PERZONE; + else { + free(buffer); + errno = EINVAL; + return (-1); + } + } + free(buffer); + return (0); +} + +/* * Rewind the file pointer to beginning. */ +static void +setac_locked(void) +{ + + ptrmoved = 1; + if (fp != NULL) + fseek(fp, 0, SEEK_SET); +} + void setac(void) { pthread_mutex_lock(&mutex); - ptrmoved = 1; - if (fp != NULL) - fseek(fp, 0, SEEK_SET); + setac_locked(); pthread_mutex_unlock(&mutex); } /* - * Close the audit_control file + * Close the audit_control file. */ void endac(void) @@ -136,72 +339,54 @@ char *dir; int ret = 0; - if (name == NULL) { - errno = EINVAL; - return (-2); - } - - pthread_mutex_lock(&mutex); - /* - * Check if another function was called between - * successive calls to getacdir + * Check if another function was called between successive calls to + * getacdir. */ + pthread_mutex_lock(&mutex); if (inacdir && ptrmoved) { ptrmoved = 0; if (fp != NULL) fseek(fp, 0, SEEK_SET); ret = 2; } - - if (getstrfromtype_locked(DIR_CONTROL_ENTRY, &dir) < 0) { pthread_mutex_unlock(&mutex); return (-2); } - - pthread_mutex_unlock(&mutex); - - if (dir == NULL) + if (dir == NULL) { + pthread_mutex_unlock(&mutex); return (-1); - - if (strlen(dir) >= len) + } + if (strlen(dir) >= len) { + pthread_mutex_unlock(&mutex); return (-3); - + } strcpy(name, dir); - + pthread_mutex_unlock(&mutex); return (ret); } /* - * Return the minimum free diskspace value from the audit control file + * Return the minimum free diskspace value from the audit control file. */ int getacmin(int *min_val) { char *min; - setac(); - - if (min_val == NULL) { - errno = EINVAL; - return (-2); - } - pthread_mutex_lock(&mutex); - + setac_locked(); if (getstrfromtype_locked(MINFREE_CONTROL_ENTRY, &min) < 0) { pthread_mutex_unlock(&mutex); return (-2); } - - pthread_mutex_unlock(&mutex); - - if (min == NULL) + if (min == NULL) { + pthread_mutex_unlock(&mutex); return (1); - + } *min_val = atoi(min); - + pthread_mutex_unlock(&mutex); return (0); } @@ -213,30 +398,22 @@ { char *str; - setac(); - - if (auditstr == NULL) { - errno = EINVAL; - return (-2); - } - pthread_mutex_lock(&mutex); - + setac_locked(); if (getstrfromtype_locked(FLAGS_CONTROL_ENTRY, &str) < 0) { pthread_mutex_unlock(&mutex); return (-2); } - - pthread_mutex_unlock(&mutex); - - if (str == NULL) + if (str == NULL) { + pthread_mutex_unlock(&mutex); return (1); - - if (strlen(str) >= len) + } + if (strlen(str) >= len) { + pthread_mutex_unlock(&mutex); return (-3); - + } strcpy(auditstr, str); - + pthread_mutex_unlock(&mutex); return (0); } @@ -248,28 +425,47 @@ { char *str; - setac(); - - if (auditstr == NULL) { - errno = EINVAL; + pthread_mutex_lock(&mutex); + setac_locked(); + if (getstrfromtype_locked(NA_CONTROL_ENTRY, &str) < 0) { + pthread_mutex_unlock(&mutex); return (-2); } + if (str == NULL) { + pthread_mutex_unlock(&mutex); + return (1); + } + if (strlen(str) >= len) { + pthread_mutex_unlock(&mutex); + return (-3); + } + strcpy(auditstr, str); + return (0); +} + +/* + * Return the policy field from the audit control file. + */ +int +getacpol(char *auditstr, size_t len) +{ + char *str; pthread_mutex_lock(&mutex); - - if (getstrfromtype_locked(NA_CONTROL_ENTRY, &str) < 0) { + setac_locked(); + if (getstrfromtype_locked(POLICY_CONTROL_ENTRY, &str) < 0) { pthread_mutex_unlock(&mutex); return (-2); } - pthread_mutex_unlock(&mutex); - - if (str == NULL) - return (1); - - if (strlen(str) >= len) + if (str == NULL) { + pthread_mutex_unlock(&mutex); + return (-1); + } + if (strlen(str) >= len) { + pthread_mutex_unlock(&mutex); return (-3); - + } strcpy(auditstr, str); - + pthread_mutex_unlock(&mutex); return (0); } ==== //depot/projects/trustedbsd/openbsm/man/audit_control.5#10 (text+ko) ==== @@ -25,7 +25,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_control.5#9 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_control.5#10 $ .\" .Dd January 4, 2006 .Dt AUDIT_CONTROL 5 @@ -63,6 +63,9 @@ The minimum free space required on the file system audit logs are being written to. When the free space falls below this limit a warning will be issued. Not currently used as the value of 20 percent is chosen by the kernel. +.It Va policy +A list of global audit policy flags specifying various behaviors, such as +fail stop, auditing of paths and arguments, etc. .El .Sh AUDIT FLAGS Audit flags are a comma-delimited list of audit classes as defined in the @@ -86,6 +89,53 @@ .It ^- Do not record failed events .El +.Sh AUDIT POLICY FLAGS +The policy flags field is a comma-delimited list of policy flags from the +following list: +.Pp +.Bl -tag -width zonename -compact -offset indent +.It cnt +Allow processes to continue running even though events are not being audited. +If not set, processes will be suspended when the audit store space is +exhausted. +Currently, this is not a recoverable state. +.It ahlt +Fail stop the system if unable to audit an event--this consists of first +draining pending records to disk, and then halting the operating system. +.It argv +Audit command line arguments to +.Xr execve 2 . +.It arge +Audit environmental variable arguments to +.Xr execve 2 . +.It seq +Include a unique audit sequence number token in generated audit records (not +implemented on FreeBSD or Darwin). +.It group +Include supplementary groups list in generated audit records (not implemented +on FreeBSD or Darwin; supplementary groupsi are never included in records on +these systems). +.It trail +Append a trailer token to each audit record (not implemented on FreeBSD or +Darwin; trailers are always included in records on these systems). +.It path +Include secondary file paths in audit records (not implemented on FreeBSD or +Darwin; secondary paths are never included in records on these systems). +.It zonename +Include a zone ID token with each audit record (not implemented on FreeBSD or +Darwin; FreeBSD audit records do not currently include the jail ID or name.) +.It perzone +Enable auditing for each local zone (not implemented on FreeBSD or Darwin; on +FreeBSD, audit records are collected from all jails and placed in a single +global trail, and only limited audit controls are permitted within a jail.) +.El +.Pp +It is recommended that installations set the +.Dv cnt +flag but not +.Dv ahlt +flag unless it is intended that audit logs exceeding available disk space +halt the system. .Sh DEFAULT The following settings appear in the default .Nm @@ -95,12 +145,18 @@ flags:lo minfree:20 naflags:lo +policy:cnt .Ed .Pp The .Va flags parameter above specifies the system-wide mask corresponding to login/logout events. +The +.Va policy +parameter specifies that the system should neither fail stop nor suspend +processes when the audit store fills. +will be audited. .Sh FILES .Bl -tag -width "/etc/security/audit_control" -compact .It Pa /etc/security/audit_control ==== //depot/projects/trustedbsd/openbsm/tools/audump.c#6 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2005 Robert N. M. Watson + * Copyright (c) 2005-2006 Robert N. M. Watson * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/tools/audump.c#5 $ + * $P4: //depot/projects/trustedbsd/openbsm/tools/audump.c#6 $ */ #include @@ -77,8 +77,9 @@ static void audump_control(void) { - char string[PATH_MAX]; + char string[PATH_MAX], string2[PATH_MAX]; int ret, val; + long policy; ret = getacflg(string, PATH_MAX); if (ret == -2) @@ -116,6 +117,15 @@ printf("dir:%s\n", string); } while (ret == 0); + + ret = getacpol(string, PATH_MAX); + if (ret != 0) + err(-1, "getacpol"); + if (au_strtopol(string, &policy) < 0) + err(-1, "au_strtopol"); + if (au_poltostr(policy, string2, PATH_MAX) < 0) + err(-1, "au_poltostr"); + printf("policy:%s\n", string2); } static void From owner-p4-projects@FreeBSD.ORG Mon Sep 18 14:55:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D69C216A415; Mon, 18 Sep 2006 14:55:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 957CE16A403 for ; Mon, 18 Sep 2006 14:55:54 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E65A143D5A for ; Mon, 18 Sep 2006 14:55:53 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8IEtrrN005687 for ; Mon, 18 Sep 2006 14:55:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8IEtqUF005669 for perforce@freebsd.org; Mon, 18 Sep 2006 14:55:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 18 Sep 2006 14:55:52 GMT Message-Id: <200609181455.k8IEtqUF005669@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 106293 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Sep 2006 14:55:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=106293 Change 106293 by rwatson@rwatson_zoo on 2006/09/18 14:55:17 Integrate TrustedBSD audit3 branch from TrustedBSD OpenBSM branch to bring in OpenBSM 1.0alpha11 changes of various sorts -- especially as relates to audit policy flags. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#13 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/TODO#10 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/VERSION#13 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.c#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.8#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#14 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#17 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_internal.h#12 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#27 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#17 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/configure#12 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#13 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_control#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_event#16 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_control.3#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_control.c#9 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_control.5#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/auditon.2#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/audump.c#8 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#13 (text+ko) ==== @@ -1,3 +1,31 @@ +OpenBSM 1.0 alpha 11 + +- Reclassify certain read/write operations as having no class rather than the + fr/fw class; our default classes audit intent (open) not operations (read, + write). +- Introduce AUE_SYSCTL_WRITE event so that BSD/Darwin systems can audit reads + and writes of sysctls as separate events. Add additional kernel + environment and jail events for FreeBSD. +- Break AUDIT_TRIGGER_OPEN_NEW into two events, AUDIT_TRIGGER_ROTATE_USER + (issued by the user audit(8) tool) and AUDIT_TRIGGER_ROTATE_KERNEL (issued + by the kernel audit implementation) so that they can be distinguished. +- Disable rate limiting of rotate requests; as the kernel doesn't retransmit + a dropped request, the log file will otherwise grow indefinitely if the + trigger is dropped. +- Improve auditd debugging output. +- Fix a number of threading related bugs in audit_control file reading + routines. +- Add APIs au_poltostr() and au_strtopol() to convert between text + representations of audit_control policy flags and the flags passed to + auditon(A_SETPOLICY) and retrieved from auditon(A_GETPOLICY). +- Add API getacpol() to return the 'policy:' entry from audit_control, an + extension to the Solaris file format to allow specification of policy + persistent flags. +- Update audump to print the audit_control policy field. +- Update auditd to read the audit_control policy field and set the kernel + policy to match it when configuring/reconfiguring. Remove the -s and -h + arguments as these policies are now set via the configuration file. + OpenBSM 1.0 alpha 10 - auditd now generates complete audit records for its events, as required for @@ -209,4 +237,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#12 $ +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#13 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/TODO#10 (text+ko) ==== @@ -17,5 +17,10 @@ just at the beginning of a record. This will make it easier to use praudit in test suites processing single-token files without header and trailer context. +- Teach auditd how to notify a script when it is done with trail files so + that the script can archive them, compress them, delete them, whatever. + It should walk any trail files found at startup also, assuming it + successfully registers. +- Put hostname in trail file name. -$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/TODO#9 $ +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/TODO#10 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/VERSION#13 (text+ko) ==== @@ -1,1 +1,1 @@ -OPENBSM_1_0_ALPHA_9 +OPENBSM_1_0_ALPHA_11 ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.c#8 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.c#7 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.c#8 $ */ /* * Program to trigger the audit daemon with a message that is either: @@ -75,7 +75,7 @@ switch(ch) { case 'n': - trigger = AUDIT_TRIGGER_OPEN_NEW; + trigger = AUDIT_TRIGGER_ROTATE_USER; break; case 's': ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.8#4 (text+ko) ==== @@ -29,7 +29,7 @@ .\" .\" @APPLE_BSD_LICENSE_HEADER_END@ .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.8#3 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.8#4 $ .\" .Dd January 24, 2004 .Dt AUDITD 8 @@ -51,14 +51,20 @@ .Bl -tag -width Ds .It Fl d Starts the daemon in debug mode - it will not daemonize. -.It Fl h -Specifies that if auditing cannot be performed as specified, the system should -halt (panic). Normally, the system will attempt to proceed - although individual -processes may be stopped (see the -s option). -.It Fl s -Specifies that individual processes should stop rather than perform operations -that may cause audit records to be lost due to log file full conditions .El +.Pp +The historical +.Fl h +and +.Fl s +flags are now configured using +.Xr audit_control 5 +policy flags +.Dv ahlt +and +.Dv cnt , +and are no longer available as arguments to +.Xr auditd 8 . .Sh NOTE .Pp To assure uninterrupted audit support, the ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#14 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#13 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#14 $ */ #include @@ -59,6 +59,7 @@ #include "auditd.h" #define NA_EVENT_STR_SIZE 25 +#define POL_STR_SIZE 128 static int ret, minval; static char *lastfile = NULL; @@ -67,7 +68,6 @@ static int sigchlds, sigchlds_handled; static int sighups, sighups_handled; static int sigterms, sigterms_handled; -static long global_flags; static TAILQ_HEAD(, dir_ent) dir_q; @@ -160,8 +160,9 @@ *ptr = '.'; strcpy(ptr+1, TS); if (rename(oldname, lastfile) != 0) - syslog(LOG_ERR, "Could not rename %s to %s", - oldname, lastfile); + syslog(LOG_ERR, + "Could not rename %s to %s: %m", oldname, + lastfile); else syslog(LOG_INFO, "renamed %s to %s", oldname, lastfile); @@ -286,7 +287,7 @@ free(dirent->dirname); free(dirent); } - syslog(LOG_ERR, "Log directories exhausted\n"); + syslog(LOG_ERR, "Log directories exhausted"); return (-1); } @@ -343,7 +344,7 @@ * XXX is generated here? */ if (0 == (ret = getacmin(&minval))) { - syslog(LOG_DEBUG, "min free = %d\n", minval); + syslog(LOG_DEBUG, "min free = %d", minval); if (auditon(A_GETQCTRL, &qctrl, sizeof(qctrl)) != 0) { syslog(LOG_ERR, "could not get audit queue settings"); @@ -494,31 +495,65 @@ } /* - * Suppress duplicate messages within a 30 second interval. This should be - * enough to time to rotate log files without thrashing from soft warnings - * generated before the log is actually rotated. + * Handle the audit trigger event. + * + * We suppress (ignore) duplicated triggers in close succession in order to + * try to avoid thrashing-like behavior. However, not all triggers can be + * ignored, as triggers generally represent edge triggers, not level + * triggers, and won't be retransmitted if the condition persists. Of + * specific concern is the rotate trigger -- if one is dropped, then it will + * not be retransmitted, and the log file will grow in an unbounded fashion. */ #define DUPLICATE_INTERVAL 30 static void handle_audit_trigger(int trigger) { - static int last_trigger; + static int last_trigger, last_warning; static time_t last_time; struct dir_ent *dirent; + struct timeval ts; + struct timezone tzp; + time_t tt; /* - * Suppres duplicate messages from the kernel within the specified + * Suppress duplicate messages from the kernel within the specified * interval. */ - struct timeval ts; - struct timezone tzp; - time_t tt; - if (gettimeofday(&ts, &tzp) == 0) { tt = (time_t)ts.tv_sec; - if ((trigger == last_trigger) && - (tt < (last_time + DUPLICATE_INTERVAL))) - return; + switch (trigger) { + case AUDIT_TRIGGER_LOW_SPACE: + case AUDIT_TRIGGER_NO_SPACE: + /* + * Triggers we can suppress. Of course, we also need + * to rate limit the warnings, so apply the same + * interval limit on syslog messages. + */ + if ((trigger == last_trigger) && + (tt < (last_time + DUPLICATE_INTERVAL))) { + if (tt >= (last_warning + DUPLICATE_INTERVAL)) + syslog(LOG_INFO, + "Suppressing duplicate trigger %d", + trigger); + return; + } + last_warning = tt; + break; + + case AUDIT_TRIGGER_ROTATE_KERNEL: + case AUDIT_TRIGGER_ROTATE_USER: + case AUDIT_TRIGGER_READ_FILE: + /* + * Triggers that we cannot suppress. + */ + break; + } + + /* + * Only update last_trigger after aborting due to a duplicate + * trigger, not before, or we will never allow that trigger + * again. + */ last_trigger = trigger; last_time = tt; } @@ -528,7 +563,6 @@ */ dirent = TAILQ_FIRST(&dir_q); switch(trigger) { - case AUDIT_TRIGGER_LOW_SPACE: syslog(LOG_INFO, "Got low space trigger"); if (dirent && (dirent->softlim != 1)) { @@ -554,7 +588,8 @@ } else { /* * Continue auditing to the current file. Also - * generate an allsoft warning. + * generate an allsoft warning. + * * XXX do we want to do this ? */ audit_warn_allsoft(); @@ -577,12 +612,14 @@ audit_warn_allhard(++allhardcount); break; - case AUDIT_TRIGGER_OPEN_NEW: + case AUDIT_TRIGGER_ROTATE_KERNEL: + case AUDIT_TRIGGER_ROTATE_USER: /* * Create a new file and swap with the one being used in * kernel */ - syslog(LOG_INFO, "Got open new trigger"); + syslog(LOG_INFO, "Got open new trigger from %s", trigger == + AUDIT_TRIGGER_ROTATE_KERNEL ? "kernel" : "user"); if (swap_audit_file() == -1) syslog(LOG_ERR, "Error swapping audit file"); break; @@ -656,10 +693,8 @@ syslog(LOG_DEBUG, "%s: SIGTERM", __FUNCTION__); break; } - if (sigchlds != sigchlds_handled) { - syslog(LOG_DEBUG, "%s: SIGCHLD", __FUNCTION__); + if (sigchlds != sigchlds_handled) handle_sigchld(); - } if (sighups != sighups_handled) { syslog(LOG_DEBUG, "%s: SIGHUP", __FUNCTION__); handle_sighup(); @@ -670,7 +705,6 @@ syslog(LOG_ERR, "%s: read EOF", __FUNCTION__); return (-1); } - syslog(LOG_DEBUG, "%s: read %d", __FUNCTION__, trigger); if (trigger == AUDIT_TRIGGER_CLOSE_AND_DIE) break; else @@ -691,10 +725,13 @@ au_mask_t aumask; int ctr = 0; char naeventstr[NA_EVENT_STR_SIZE]; + char polstr[POL_STR_SIZE]; + long policy; /* * Process the audit event file, obtaining a class mapping for each * event, and send that mapping into the kernel. + * * XXX There's a risk here that the BSM library will return NULL * for an event when it can't properly map it to a class. In that * case, we will not process any events beyond the one that failed, @@ -703,10 +740,17 @@ ev.ae_name = (char *)malloc(AU_EVENT_NAME_MAX); ev.ae_desc = (char *)malloc(AU_EVENT_DESC_MAX); if ((ev.ae_name == NULL) || (ev.ae_desc == NULL)) { + if (ev.ae_name != NULL) + free(ev.ae_name); syslog(LOG_ERR, "Memory allocation error when configuring audit controls."); return (-1); } + + /* + * XXXRW: Currently we have no way to remove mappings from the kernel + * when they are removed from the file-based mappings. + */ evp = &ev; setauevent(); while ((evp = getauevent_r(evp)) != NULL) { @@ -745,11 +789,12 @@ syslog(LOG_ERR, "Failed to obtain non-attributable event mask."); - /* - * Set the audit policy flags based on passed in parameter values. - */ - if (auditon(A_SETPOLICY, &global_flags, sizeof(global_flags))) - syslog(LOG_ERR, "Failed to set audit policy."); + if ((getacpol(polstr, POL_STR_SIZE) == 0) && + (au_strtopol(polstr, &policy) == 0)) { + if (auditon(A_SETPOLICY, &policy, sizeof(policy))) + syslog(LOG_ERR, "Failed to set audit policy."); + } else + syslog(LOG_ERR, "Failed to obtain policy flags."); return (0); } @@ -826,7 +871,6 @@ int debug = 0; int rc; - global_flags |= AUDIT_CNT; while ((ch = getopt(argc, argv, "dhs")) != -1) { switch(ch) { case 'd': @@ -834,20 +878,10 @@ debug = 1; break; - case 's': - /* Fail-stop option. */ - global_flags &= ~(AUDIT_CNT); - break; - - case 'h': - /* Halt-stop option. */ - global_flags |= AUDIT_AHLT; - break; - case '?': default: (void)fprintf(stderr, - "usage: auditd [-h | -s] [-d] \n"); + "usage: auditd [-d] \n"); exit(1); } } ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.h#4 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.h#3 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.h#4 $ */ #ifndef _AUDITD_H_ @@ -61,7 +61,7 @@ #define HARDLIM_ALL_WARN "allhard" #define SOFTLIM_ALL_WARN "allsoft" -#define AUDITOFF_WARN "aditoff" +#define AUDITOFF_WARN "auditoff" #define EBUSY_WARN "ebusy" #define GETACDIR_WARN "getacdir" #define HARDLIM_WARN "hard" ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#17 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#16 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#17 $ */ #ifndef _LIBBSM_H_ @@ -71,6 +71,7 @@ #define MINFREE_CONTROL_ENTRY "minfree" #define FLAGS_CONTROL_ENTRY "flags" #define NA_CONTROL_ENTRY "naflags" +#define POLICY_CONTROL_ENTRY "policy" #define AU_CLASS_NAME_MAX 8 #define AU_CLASS_DESC_MAX 72 @@ -711,11 +712,14 @@ int getacmin(int *min_val); int getacflg(char *auditstr, int len); int getacna(char *auditstr, int len); +int getacpol(char *auditstr, size_t len); int getauditflagsbin(char *auditstr, au_mask_t *masks); int getauditflagschar(char *auditstr, au_mask_t *masks, int verbose); int au_preselect(au_event_t event, au_mask_t *mask_p, int sorf, int flag); +ssize_t au_poltostr(long policy, size_t maxsize, char *buf); +int au_strtopol(const char *polstr, long *policy); /* * Functions relating to querying audit event information. ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/configure#12 (xtext) ==== @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#28 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#29 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for OpenBSM 1.0a10. +# Generated by GNU Autoconf 2.59 for OpenBSM 1.0a11. # # Report bugs to . # @@ -424,8 +424,8 @@ # Identity of this package. PACKAGE_NAME='OpenBSM' PACKAGE_TARNAME='openbsm' -PACKAGE_VERSION='1.0a10' -PACKAGE_STRING='OpenBSM 1.0a10' +PACKAGE_VERSION='1.0a11' +PACKAGE_STRING='OpenBSM 1.0a11' PACKAGE_BUGREPORT='trustedbsd-audit@TrustesdBSD.org' ac_unique_file="bin/auditreduce/auditreduce.c" @@ -955,7 +955,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures OpenBSM 1.0a10 to adapt to many kinds of systems. +\`configure' configures OpenBSM 1.0a11 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1021,7 +1021,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenBSM 1.0a10:";; + short | recursive ) echo "Configuration of OpenBSM 1.0a11:";; esac cat <<\_ACEOF @@ -1162,7 +1162,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -OpenBSM configure 1.0a10 +OpenBSM configure 1.0a11 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1176,7 +1176,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by OpenBSM $as_me 1.0a10, which was +It was created by OpenBSM $as_me 1.0a11, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -19278,7 +19278,7 @@ # Define the identity of the package. PACKAGE=OpenBSM - VERSION=1.0a10 + VERSION=1.0a11 cat >>confdefs.h <<_ACEOF @@ -23478,7 +23478,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by OpenBSM $as_me 1.0a10, which was +This file was extended by OpenBSM $as_me 1.0a11, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23541,7 +23541,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -OpenBSM config.status 1.0a10 +OpenBSM config.status 1.0a11 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#13 (text+ko) ==== @@ -2,8 +2,8 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([OpenBSM], [1.0a10], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#12 $]) +AC_INIT([OpenBSM], [1.0a11], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) +AC_REVISION([$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#13 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_control#6 (text+ko) ==== @@ -1,8 +1,9 @@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_control#5 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_control#6 $ # $FreeBSD: src/contrib/openbsm/etc/audit_control,v 1.2 2006/03/26 01:44:35 rwatson Exp $ # dir:/var/audit flags:lo minfree:20 naflags:lo +policy:cnt ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_event#16 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_event#15 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_event#16 $ # $FreeBSD: src/contrib/openbsm/etc/audit_event,v 1.3 2006/06/27 18:09:54 rwatson Exp $ # 0:AUE_NULL:indir system call:no @@ -118,8 +118,8 @@ 113:AUE_SYSTEMBOOT:system booted:na 114:AUE_ASYNC_DAEMON_EXIT:async_daemon(2) exited:ad 115:AUE_NFSSVC_EXIT:nfssvc(2) exited:ad -128:AUE_WRITEL:writel(2):fw -129:AUE_WRITEVL:writevl(2):fw +128:AUE_WRITEL:writel(2):no +129:AUE_WRITEVL:writevl(2):no 130:AUE_GETAUID:getauid(2):ad 131:AUE_SETAUID:setauid(2):ad 132:AUE_GETAUDIT:getaudit(2):ad @@ -266,7 +266,7 @@ 325:AUE_DARWIN_KDEBUGTRACE:system call:pc 326:AUE_DARWIN_FSTAT:fstat(2):fa 327:AUE_DARWIN_FPATHCONF:fpathconf(2):fa -328:AUE_DARWIN_GETDIRENTRIES:getdirentries(2):fr +328:AUE_DARWIN_GETDIRENTRIES:getdirentries(2):no 329:AUE_DARWIN_TRUNCATE:truncate(2):fw 330:AUE_DARWIN_FTRUNCATE:ftruncate(2):fw 331:AUE_DARWIN_SYSCTL:sysctl(3):ad @@ -322,8 +322,8 @@ 43017:AUE_KDEBUGTRACE:system call:pc 43018:AUE_FSTAT:fstat(2):fa 43019:AUE_FPATHCONF:fpathconf(2):fa -43020:AUE_GETDIRENTRIES:getdirentries(2):fr -43021:AUE_SYSCTL:sysctl(3):ad +43020:AUE_GETDIRENTRIES:getdirentries(2):no +43021:AUE_SYSCTL:sysctl(3):ot 43022:AUE_MLOCK:mlock(2):pc 43023:AUE_MUNLOCK:munlock(2):pc 43024:AUE_UNDELETE:undelete(2):fm @@ -416,6 +416,9 @@ 43111:AUE_EXTATTR_SET_LINK:extattr_set_link(2):fm 43112:AUE_EXTATTR_LIST_LINK:extattr_list_link(2):fa 43113:AUE_EXTATTR_DELETE_LINK:extattr_delete_link(2):fm +43114:AUE_KENV:kenv(8):ad +43115:AUE_JAIL_ATTACH:jail_attach(2):ad +43116:AUE_SYSCTL_WRITE:sysctl(3):ad # # User space system events. # ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_control.3#5 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_control.3#4 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_control.3#5 $ .\" .Dd April 19, 2005 .Dt AU_CONTROL 3 @@ -34,7 +34,10 @@ .Nm getacdir , .Nm getacmin , .Nm getacflg , -.Nm getacna +.Nm getacna , +.Nm getacpol , +.Nm au_poltostr +.Nm au_strtopol .Nd "Look up information from the audit_control database" .Sh LIBRARY .Lb libbsm @@ -52,6 +55,12 @@ .Fn getacflg "char *auditstr" "int len" .Ft int .Fn getacna "char *auditstr" "int len" +.Ft int +.Fn getacpol "char *auditstr" "size_t len" +.Ft ssize_t +.Fn au_poltostr "long policy" "size_t maxsize" "char *buf" +.Ft int +.Fn au_strtopol "const char *polstr" "long *policy" .Sh DESCRIPTION These interfaces may be used to look up information from the .Xr audit_control 5 @@ -90,15 +99,42 @@ .Va auditstr of length .Va len . +.Pp +.Fn getacpol +returns the audit policy flags via the passed character buffer +.Va auditstr +of length +.Va len . +.Pp +.Fn au_poltostr +converts a numeric audit policy mask, +.Va policy , +value to a string in the passed character buffer +.Va buf +of lenth +.Va maxsize . +.Pp +.Fn au_strtopol +converts an audit policy flags string, +.Va polstr , +to a numeric audit policy mask returned via +.Va policy . .Sh RETURN VALULES .Fn getacdir , .Fn getacmin , .Fn getacflg , +.Fn getacna , +.Fn getacpol , and -.Fn getacna +.Fn au_strtopol return 0 on success, or a negative value on failure, along with error information in .Va errno . +.Pp +.Fn au_poltostr +returns a string length of 0 or more on success, or a negative value on +if there is a failure. +.Pp Functions that return a string value will return a failure if there is insufficient room in the passed character buffer for the full string. .Sh SEE ALSO ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_control.c#9 (text+ko) ==== @@ -1,5 +1,6 @@ /* * Copyright (c) 2004 Apple Computer, Inc. + * Copyright (c) 2006 Robert N. M. Watson * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_control.c#8 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_control.c#9 $ */ #include @@ -39,7 +40,7 @@ /* * Parse the contents of the audit_control file to return the audit control - * parameters. + * parameters. These static fields are protected by 'mutex'. */ static FILE *fp = NULL; static char linestr[AU_LINE_MAX]; @@ -98,21 +99,223 @@ } /* + * Convert a policy to a string. Return -1 on failure, or >= 0 representing + * the actual size of the string placed in the buffer (excluding terminating + * nul). + */ +ssize_t +au_poltostr(long policy, size_t maxsize, char *buf) +{ + int first; + + if (maxsize < 1) + return (-1); + first = 1; + buf[0] = '\0'; + + if (policy & AUDIT_CNT) { + if (strlcat(buf, "cnt", maxsize) >= maxsize) + return (-1); + first = 0; + } + if (policy & AUDIT_AHLT) { + if (!first) { + if (strlcat(buf, ",", maxsize) >= maxsize) + return (-1); + } + if (strlcat(buf, "ahlt", maxsize) >= maxsize) + return (-1); + first = 0; + } + if (policy & AUDIT_ARGV) { + if (!first) { + if (strlcat(buf, ",", maxsize) >= maxsize) + return (-1); + } + if (strlcat(buf, "argv", maxsize) >= maxsize) + return (-1); + first = 0; + } + if (policy & AUDIT_ARGE) { + if (!first) { + if (strlcat(buf, ",", maxsize) >= maxsize) + return (-1); + } + if (strlcat(buf, "arge", maxsize) >= maxsize) + return (-1); + first = 0; + } + if (policy & AUDIT_SEQ) { + if (!first) { + if (strlcat(buf, ",", maxsize) >= maxsize) + return (-1); + } + if (strlcat(buf, "seq", maxsize) >= maxsize) + return (-1); + first = 0; + } + if (policy & AUDIT_WINDATA) { + if (!first) { + if (strlcat(buf, ",", maxsize) >= maxsize) + return (-1); + } + if (strlcat(buf, "windata", maxsize) >= maxsize) + return (-1); + first = 0; + } + if (policy & AUDIT_USER) { + if (!first) { + if (strlcat(buf, ",", maxsize) >= maxsize) + return (-1); + } + if (strlcat(buf, "user", maxsize) >= maxsize) + return (-1); + first = 0; + } + if (policy & AUDIT_GROUP) { + if (!first) { + if (strlcat(buf, ",", maxsize) >= maxsize) + return (-1); + } + if (strlcat(buf, "group", maxsize) >= maxsize) + return (-1); + first = 0; + } + if (policy & AUDIT_TRAIL) { + if (!first) { + if (strlcat(buf, ",", maxsize) >= maxsize) + return (-1); + } + if (strlcat(buf, "trail", maxsize) >= maxsize) + return (-1); + first = 0; + } + if (policy & AUDIT_PATH) { + if (!first) { + if (strlcat(buf, ",", maxsize) >= maxsize) + return (-1); + } + if (strlcat(buf, "path", maxsize) >= maxsize) + return (-1); + first = 0; + } + if (policy & AUDIT_SCNT) { + if (!first) { + if (strlcat(buf, ",", maxsize) >= maxsize) + return (-1); + } + if (strlcat(buf, "scnt", maxsize) >= maxsize) + return (-1); + first = 0; + } + if (policy & AUDIT_PUBLIC) { + if (!first) { + if (strlcat(buf, ",", maxsize) >= maxsize) + return (-1); + } + if (strlcat(buf, "public", maxsize) >= maxsize) + return (-1); + first = 0; + } + if (policy & AUDIT_ZONENAME) { + if (!first) { + if (strlcat(buf, ",", maxsize) >= maxsize) + return (-1); + } + if (strlcat(buf, "zonename", maxsize) >= maxsize) + return (-1); + first = 0; + } + if (policy & AUDIT_PERZONE) { + if (!first) { + if (strlcat(buf, ",", maxsize) >= maxsize) + return (-1); + } + if (strlcat(buf, "perzone", maxsize) >= maxsize) + return (-1); + first = 0; + } + return (strlen(buf)); +} + +/* + * Convert a string to a policy. Return -1 on failure (with errno EINVAL, + * ENOMEM) or 0 on success. + */ +int +au_strtopol(const char *polstr, long *policy) +{ + char *bufp, *string; + char *buffer; + + *policy = 0; + buffer = strdup(polstr); + if (buffer == NULL) + return (-1); + + bufp = buffer; + while ((string = strsep(&bufp, ",")) != NULL) { + if (strcmp(string, "cnt") == 0) + *policy |= AUDIT_CNT; + else if (strcmp(string, "ahlt") == 0) + *policy |= AUDIT_AHLT; + else if (strcmp(string, "argv") == 0) + *policy |= AUDIT_ARGV; + else if (strcmp(string, "arge") == 0) + *policy |= AUDIT_ARGE; + else if (strcmp(string, "seq") == 0) + *policy |= AUDIT_SEQ; + else if (strcmp(string, "winau_fstat") == 0) + *policy |= AUDIT_WINDATA; + else if (strcmp(string, "user") == 0) + *policy |= AUDIT_USER; + else if (strcmp(string, "group") == 0) + *policy |= AUDIT_GROUP; + else if (strcmp(string, "trail") == 0) + *policy |= AUDIT_TRAIL; + else if (strcmp(string, "path") == 0) + *policy |= AUDIT_PATH; + else if (strcmp(string, "scnt") == 0) + *policy |= AUDIT_SCNT; + else if (strcmp(string, "public") == 0) + *policy |= AUDIT_PUBLIC; + else if (strcmp(string, "zonename") == 0) + *policy |= AUDIT_ZONENAME; + else if (strcmp(string, "perzone") == 0) + *policy |= AUDIT_PERZONE; + else { + free(buffer); + errno = EINVAL; + return (-1); + } + } + free(buffer); + return (0); +} + +/* * Rewind the file pointer to beginning. */ +static void +setac_locked(void) +{ + + ptrmoved = 1; + if (fp != NULL) + fseek(fp, 0, SEEK_SET); +} + void setac(void) { pthread_mutex_lock(&mutex); - ptrmoved = 1; - if (fp != NULL) - fseek(fp, 0, SEEK_SET); + setac_locked(); pthread_mutex_unlock(&mutex); } /* - * Close the audit_control file + * Close the audit_control file. */ void endac(void) @@ -136,72 +339,54 @@ char *dir; int ret = 0; - if (name == NULL) { - errno = EINVAL; - return (-2); - } - - pthread_mutex_lock(&mutex); - /* - * Check if another function was called between - * successive calls to getacdir + * Check if another function was called between successive calls to + * getacdir. */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Sep 18 15:00:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6321216A417; Mon, 18 Sep 2006 15:00:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2434616A412 for ; Mon, 18 Sep 2006 15:00:00 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C631743D69 for ; Mon, 18 Sep 2006 14:59:59 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8IExxr9005916 for ; Mon, 18 Sep 2006 14:59:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8IExx4K005913 for perforce@freebsd.org; Mon, 18 Sep 2006 14:59:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 18 Sep 2006 14:59:59 GMT Message-Id: <200609181459.k8IExx4K005913@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 106294 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Sep 2006 15:00:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=106294 Change 106294 by rwatson@rwatson_zoo on 2006/09/18 14:59:12 Integrate from TrustedBSD OpenBSM branch to TrustedBSD audit3 sys tree. This changes the integration base from the contrib tree to to the OpenBSM tree, in order to avoid merging base tree changes to contrib layout into the kernel (such as the deletion of audit_record.h). Affected files ... .. //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#33 integrate .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#14 integrate .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#28 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#33 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#32 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#33 $ * $FreeBSD: src/sys/bsm/audit.h,v 1.5 2006/08/26 08:17:58 rwatson Exp $ */ @@ -59,12 +59,13 @@ * Triggers for the audit daemon. */ #define AUDIT_TRIGGER_MIN 1 -#define AUDIT_TRIGGER_LOW_SPACE 1 -#define AUDIT_TRIGGER_OPEN_NEW 2 -#define AUDIT_TRIGGER_READ_FILE 3 -#define AUDIT_TRIGGER_CLOSE_AND_DIE 4 -#define AUDIT_TRIGGER_NO_SPACE 5 -#define AUDIT_TRIGGER_MAX 5 +#define AUDIT_TRIGGER_LOW_SPACE 1 /* Below low watermark. */ +#define AUDIT_TRIGGER_ROTATE_KERNEL 2 /* Kernel requests rotate. */ +#define AUDIT_TRIGGER_READ_FILE 3 /* Re-read config file. */ +#define AUDIT_TRIGGER_CLOSE_AND_DIE 4 /* Terminate audit. */ +#define AUDIT_TRIGGER_NO_SPACE 5 /* Below min free space. */ +#define AUDIT_TRIGGER_ROTATE_USER 6 /* User requests roate. */ +#define AUDIT_TRIGGER_MAX 6 /* * Special file that will be read for trigger events from the kernel @@ -182,12 +183,12 @@ #define AUDIT_PERZONE 0x2000 /* - * Audit queue control parameters. + * Default audit queue control parameters. */ #define AQ_HIWATER 100 #define AQ_MAXHIGH 10000 #define AQ_LOWATER 10 -#define AQ_BUFSZ 1024 +#define AQ_BUFSZ MAXAUDITDATA #define AQ_MAXBUFSZ 1048576 /* ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#14 (text+ko) ==== @@ -34,7 +34,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#13 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#14 $ * $FreeBSD: src/sys/bsm/audit_internal.h,v 1.4 2006/09/02 10:49:44 rwatson Exp $ */ ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#28 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#27 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#28 $ * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.7 2006/08/26 08:17:58 rwatson Exp $ */ @@ -468,6 +468,9 @@ #define AUE_EXTATTR_SET_LINK 43111 /* FreeBSD. */ #define AUE_EXTATTR_LIST_LINK 43112 /* FreeBSD. */ #define AUE_EXTATTR_DELETE_LINK 43113 /* FreeBSD. */ +#define AUE_KENV 43114 /* FreeBSD. */ +#define AUE_JAIL_ATTACH 43115 /* FreeBSD. */ +#define AUE_SYSCTL_WRITE 43116 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the From owner-p4-projects@FreeBSD.ORG Mon Sep 18 15:03:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CC31416A47B; Mon, 18 Sep 2006 15:03:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A4D1E16A403 for ; Mon, 18 Sep 2006 15:03:04 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2C18443D67 for ; Mon, 18 Sep 2006 15:03:04 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8IF34fm007362 for ; Mon, 18 Sep 2006 15:03:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8IF33nX007359 for perforce@freebsd.org; Mon, 18 Sep 2006 15:03:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 18 Sep 2006 15:03:03 GMT Message-Id: <200609181503.k8IF33nX007359@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 106295 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Sep 2006 15:03:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=106295 Change 106295 by rwatson@rwatson_zoo on 2006/09/18 15:02:27 Provide AUDITDEV_FILENAME definition, and redefine AUDIT_TRIGGER_FILE in terms of the device filename. This reduces FreeBSD-specific diffs against audit.h. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit.h#21 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit.h#21 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit.h#20 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit.h#21 $ */ #ifndef _BSM_AUDIT_H @@ -55,10 +55,10 @@ #define AUDIT_TRIGGER_MAX 6 /* - * Special file that will be read for trigger events from the kernel - * (FreeBSD). + * The special device filename (FreeBSD). */ -#define AUDIT_TRIGGER_FILE "/dev/audit" +#define AUDITDEV_FILENAME "audit" +#define AUDIT_TRIGGER_FILE ("/dev/" AUDITDEV_FILENAME) /* * Pre-defined audit IDs From owner-p4-projects@FreeBSD.ORG Mon Sep 18 15:04:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F1E6C16A670; Mon, 18 Sep 2006 15:04:06 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CCACE16A668 for ; Mon, 18 Sep 2006 15:04:06 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D285743D67 for ; Mon, 18 Sep 2006 15:04:05 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8IF45WL007483 for ; Mon, 18 Sep 2006 15:04:05 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8IF45oT007480 for perforce@freebsd.org; Mon, 18 Sep 2006 15:04:05 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 18 Sep 2006 15:04:05 GMT Message-Id: <200609181504.k8IF45oT007480@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 106296 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Sep 2006 15:04:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=106296 Change 106296 by rwatson@rwatson_zoo on 2006/09/18 15:03:38 Integrate OpenBSM change in constant names in order to reduce OpenBSM/FreeBSD diffs. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#34 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#34 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#33 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#34 $ * $FreeBSD: src/sys/bsm/audit.h,v 1.5 2006/08/26 08:17:58 rwatson Exp $ */ @@ -68,15 +68,10 @@ #define AUDIT_TRIGGER_MAX 6 /* - * Special file that will be read for trigger events from the kernel - * (FreeBSD). + * The special device filename (FreeBSD). */ -#define AUDIT_TRIGGER_FILE "/dev/audit" - -/* - * The special device filename. - */ #define AUDITDEV_FILENAME "audit" +#define AUDIT_TRIGGER_FILE ("/dev/" AUDITDEV_FILENAME) /* * Pre-defined audit IDs From owner-p4-projects@FreeBSD.ORG Mon Sep 18 15:05:09 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2270116A4B3; Mon, 18 Sep 2006 15:05:09 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D076116A47C for ; Mon, 18 Sep 2006 15:05:08 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9CCE043D60 for ; Mon, 18 Sep 2006 15:05:07 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8IF57ku007554 for ; Mon, 18 Sep 2006 15:05:07 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8IF570I007551 for perforce@freebsd.org; Mon, 18 Sep 2006 15:05:07 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 18 Sep 2006 15:05:07 GMT Message-Id: <200609181505.k8IF570I007551@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 106297 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Sep 2006 15:05:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=106297 Change 106297 by rwatson@rwatson_zoo on 2006/09/18 15:04:22 Integrate further audit.h changes from OpenBSM: reduce FreeBSD diffs from OpenBSM. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#18 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#18 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#17 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#18 $ */ #ifndef _BSM_AUDIT_H @@ -55,10 +55,10 @@ #define AUDIT_TRIGGER_MAX 6 /* - * Special file that will be read for trigger events from the kernel - * (FreeBSD). + * The special device filename (FreeBSD). */ -#define AUDIT_TRIGGER_FILE "/dev/audit" +#define AUDITDEV_FILENAME "audit" +#define AUDIT_TRIGGER_FILE ("/dev/" AUDITDEV_FILENAME) /* * Pre-defined audit IDs From owner-p4-projects@FreeBSD.ORG Mon Sep 18 15:07:12 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9C0B916A47B; Mon, 18 Sep 2006 15:07:12 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 752C816A415 for ; Mon, 18 Sep 2006 15:07:12 +0000 (UTC) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B929D43D7B for ; Mon, 18 Sep 2006 15:07:10 +0000 (GMT) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8IF7Aib007716 for ; Mon, 18 Sep 2006 15:07:10 GMT (envelope-from trhodes@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8IF7AvE007713 for perforce@freebsd.org; Mon, 18 Sep 2006 15:07:10 GMT (envelope-from trhodes@freebsd.org) Date: Mon, 18 Sep 2006 15:07:10 GMT Message-Id: <200609181507.k8IF7AvE007713@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trhodes@freebsd.org using -f From: Tom Rhodes To: Perforce Change Reviews Cc: Subject: PERFORCE change 106298 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Sep 2006 15:07:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=106298 Change 106298 by trhodes@trhodes_local on 2006/09/18 15:06:35 IFC. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/sl811hs.c#5 integrate Differences ... ==== //depot/projects/usb/src/sys/dev/usb/sl811hs.c#5 (text+ko) ==== @@ -1,0 +1,1654 @@ +/* $NetBSD: sl811hs.c,v 1.5 2005/02/27 00:27:02 perry Exp $ */ + +/* + * Copyright (c) 2001 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Tetsuya Isaki. + * + * 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. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the NetBSD + * Foundation, Inc. and its contributors. + * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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. + */ + + +/* + * ScanLogic SL811HS/T USB Host Controller + */ +/* + * !! HIGHLY EXPERIMENTAL CODE !! + */ + +#include +//_RCSID(0, "$NetBSD: sl811hs.c,v 1.5 2005/02/27 00:27:02 perry Exp $"); + +#include "opt_slhci.h" + +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include +#include +#include +#include +#include "usbdevs.h" + +#include +#include + +__FBSDID("$FreeBSD: src/sys/dev/usb/sl811hs.c,v 1.4 2006/09/07 00:06:41 imp Exp $"); + +static inline u_int8_t sl11read(struct slhci_softc *, int); +static inline void sl11write(struct slhci_softc *, int, u_int8_t); +static inline void sl11read_region(struct slhci_softc *, u_char *, int, int); +static inline void sl11write_region(struct slhci_softc *, int, u_char *, int); + +static void sl11_reset(struct slhci_softc *); +static void sl11_speed(struct slhci_softc *); + +static usbd_status slhci_open(usbd_pipe_handle); +static void slhci_softintr(void *); +static void slhci_poll(struct usbd_bus *); +static void slhci_poll_hub(void *); +static void slhci_poll_device(void *arg); +static usbd_status slhci_allocm(struct usbd_bus *, usb_dma_t *, u_int32_t); +static void slhci_freem(struct usbd_bus *, usb_dma_t *); +static usbd_xfer_handle slhci_allocx(struct usbd_bus *); +static void slhci_freex(struct usbd_bus *, usbd_xfer_handle); + +static int slhci_str(usb_string_descriptor_t *, int, const char *); + +static usbd_status slhci_root_ctrl_transfer(usbd_xfer_handle); +static usbd_status slhci_root_ctrl_start(usbd_xfer_handle); +static void slhci_root_ctrl_abort(usbd_xfer_handle); +static void slhci_root_ctrl_close(usbd_pipe_handle); +static void slhci_root_ctrl_done(usbd_xfer_handle); + +static usbd_status slhci_root_intr_transfer(usbd_xfer_handle); +static usbd_status slhci_root_intr_start(usbd_xfer_handle); +static void slhci_root_intr_abort(usbd_xfer_handle); +static void slhci_root_intr_close(usbd_pipe_handle); +static void slhci_root_intr_done(usbd_xfer_handle); + +static usbd_status slhci_device_ctrl_transfer(usbd_xfer_handle); +static usbd_status slhci_device_ctrl_start(usbd_xfer_handle); +static void slhci_device_ctrl_abort(usbd_xfer_handle); +static void slhci_device_ctrl_close(usbd_pipe_handle); +static void slhci_device_ctrl_done(usbd_xfer_handle); + +static usbd_status slhci_device_intr_transfer(usbd_xfer_handle); +static usbd_status slhci_device_intr_start(usbd_xfer_handle); +static void slhci_device_intr_abort(usbd_xfer_handle); +static void slhci_device_intr_close(usbd_pipe_handle); +static void slhci_device_intr_done(usbd_xfer_handle); + +static usbd_status slhci_device_isoc_transfer(usbd_xfer_handle); +static usbd_status slhci_device_isoc_start(usbd_xfer_handle); +static void slhci_device_isoc_abort(usbd_xfer_handle); +static void slhci_device_isoc_close(usbd_pipe_handle); +static void slhci_device_isoc_done(usbd_xfer_handle); + +static usbd_status slhci_device_bulk_transfer(usbd_xfer_handle); +static usbd_status slhci_device_bulk_start(usbd_xfer_handle); +static void slhci_device_bulk_abort(usbd_xfer_handle); +static void slhci_device_bulk_close(usbd_pipe_handle); +static void slhci_device_bulk_done(usbd_xfer_handle); + +static int slhci_transaction(struct slhci_softc *, + usbd_pipe_handle, u_int8_t, int, u_char *, u_int8_t); +static void slhci_noop(usbd_pipe_handle); +static void slhci_abort_xfer(usbd_xfer_handle, usbd_status); +static void slhci_device_clear_toggle(usbd_pipe_handle); + +extern int usbdebug; +int slhci_dummy; + +/* For root hub */ +#define SLHCI_INTR_ENDPT (1) + +#ifdef SLHCI_DEBUG +#define D_TRACE (0x0001) /* function trace */ +#define D_MSG (0x0002) /* debug messages */ +#define D_XFER (0x0004) /* transfer messages (noisy!) */ +#define D_MEM (0x0008) /* memory allocation */ + +int slhci_debug = D_MSG | D_XFER; +#define DPRINTF(z,x) if((slhci_debug&(z))!=0)printf x +void print_req(usb_device_request_t *); +void print_req_hub(usb_device_request_t *); +void print_dumpreg(struct slhci_softc *); +void print_xfer(usbd_xfer_handle); +#else +#define DPRINTF(z,x) +#endif + + +/* XXX: sync with argument */ +static const char *sltypestr [] = { + "SL11H/T", + "SL811HS/T", +}; + + +struct usbd_bus_methods slhci_bus_methods = { + slhci_open, + slhci_softintr, + slhci_poll, + slhci_allocm, + slhci_freem, + slhci_allocx, + slhci_freex, +}; + +struct usbd_pipe_methods slhci_root_ctrl_methods = { + slhci_root_ctrl_transfer, + slhci_root_ctrl_start, + slhci_root_ctrl_abort, + slhci_root_ctrl_close, + slhci_noop, + slhci_root_ctrl_done, +}; + +struct usbd_pipe_methods slhci_root_intr_methods = { + slhci_root_intr_transfer, + slhci_root_intr_start, + slhci_root_intr_abort, + slhci_root_intr_close, + slhci_noop, + slhci_root_intr_done, +}; + +struct usbd_pipe_methods slhci_device_ctrl_methods = { + slhci_device_ctrl_transfer, + slhci_device_ctrl_start, + slhci_device_ctrl_abort, + slhci_device_ctrl_close, + slhci_noop, + slhci_device_ctrl_done, +}; + +struct usbd_pipe_methods slhci_device_intr_methods = { + slhci_device_intr_transfer, + slhci_device_intr_start, + slhci_device_intr_abort, + slhci_device_intr_close, + slhci_device_clear_toggle, + slhci_device_intr_done, +}; + +struct usbd_pipe_methods slhci_device_isoc_methods = { + slhci_device_isoc_transfer, + slhci_device_isoc_start, + slhci_device_isoc_abort, + slhci_device_isoc_close, + slhci_noop, + slhci_device_isoc_done, +}; + +struct usbd_pipe_methods slhci_device_bulk_methods = { + slhci_device_bulk_transfer, + slhci_device_bulk_start, + slhci_device_bulk_abort, + slhci_device_bulk_close, + slhci_noop, + slhci_device_bulk_done, +}; + +struct slhci_pipe { + struct usbd_pipe pipe; +}; + + +/* + * SL811HS Register read/write routine + */ +static inline u_int8_t +sl11read(struct slhci_softc *sc, int reg) +{ +#if 1 + int b; + DELAY(80); + bus_space_write_1(sc->sc_iot, sc->sc_ioh, SL11_IDX_ADDR, reg); + b = bus_space_read_1(sc->sc_iot, sc->sc_ioh, SL11_IDX_DATA); + return b; +#else + outb(0x4000, reg&0xff); + return (inb(0x4001)&0xff); +#endif +} + +static inline void +sl11write(struct slhci_softc *sc, int reg, u_int8_t data) +{ +#if 1 + DELAY(80); + bus_space_write_1(sc->sc_iot, sc->sc_ioh, SL11_IDX_ADDR, reg); + bus_space_write_1(sc->sc_iot, sc->sc_ioh, SL11_IDX_DATA, data); +#else + outb(0x4000, reg&0xff); + outb(0x4000, data&0xff); +#endif +} + +static inline void +sl11read_region(struct slhci_softc *sc, u_char *buf, int reg, int len) +{ + int i; + bus_space_write_1(sc->sc_iot, sc->sc_ioh, SL11_IDX_ADDR, reg); + for (i = 0; i < len; i++) + buf[i] = bus_space_read_1(sc->sc_iot, sc->sc_ioh, SL11_IDX_DATA); +} + +static inline void +sl11write_region(struct slhci_softc *sc, int reg, u_char *buf, int len) +{ + int i; + bus_space_write_1(sc->sc_iot, sc->sc_ioh, SL11_IDX_ADDR, reg); + for (i = 0; i < len; i++) + bus_space_write_1(sc->sc_iot, sc->sc_ioh, SL11_IDX_DATA, buf[i]); +} + +/* + * USB bus reset. From sl811hs_appnote.pdf, p22 + */ +static void +sl11_reset(struct slhci_softc *sc) +{ + u_int8_t r; + + DPRINTF(D_TRACE, ("%s() ", __FUNCTION__)); + // r = sl11read(sc, SL11_CTRL); + r = 0; + sl11write(sc, SL11_CTRL, r | SL11_CTRL_RESETENGINE); + delay_ms(250); + sl11write(sc, SL11_CTRL, r | SL11_CTRL_JKSTATE | SL11_CTRL_RESETENGINE); delay_ms(150); + sl11write(sc, SL11_CTRL, r | SL11_CTRL_RESETENGINE); + delay_ms(10); + sl11write(sc, SL11_CTRL, r); +} + +/* + * Detect the speed of attached device. + */ +static void +sl11_speed(struct slhci_softc *sc) +{ + u_int8_t r; + + sl11write(sc, SL11_ISR, 0xff); + r = sl11read(sc, SL11_ISR); + if ((r & SL11_ISR_RESET)) { + DPRINTF(D_MSG, ("NC ")); + sl11write(sc, SL11_ISR, SL11_ISR_RESET); + sc->sc_connect = 0; + } + + if ((sl11read(sc, SL11_ISR) & SL11_ISR_RESET)) { + sl11write(sc, SL11_ISR, 0xff); + } else { + u_int8_t pol = 0, ctrl = 0; + + sc->sc_connect = 1; + if (r & SL11_ISR_DATA) { + DPRINTF(D_MSG, ("FS ")); + pol = 0; + ctrl = SL11_CTRL_EOF2; + sc->sc_fullspeed = 1; + } else { + DPRINTF(D_MSG, ("LS ")); + pol = SL811_CSOF_POLARITY; + ctrl = SL11_CTRL_LOWSPEED; + sc->sc_fullspeed = 0; + } + sl11write(sc, SL811_CSOF, pol | SL811_CSOF_MASTER | 0x2e); + sl11write(sc, SL11_DATA, 0xe0); + sl11write(sc, SL11_CTRL, ctrl | SL11_CTRL_ENABLESOF); + } + + sl11write(sc, SL11_E0PID, (SL11_PID_SOF << 4) + 0); + sl11write(sc, SL11_E0DEV, 0); + sl11write(sc, SL11_E0CTRL, SL11_EPCTRL_ARM); + delay_ms(30); +} + +/* + * If detect some known controller, return the type. + * If does not, return -1. + */ +int +sl811hs_find(struct slhci_softc *sc) +{ + int rev; + sc->sc_sltype = -1; + + rev = sl11read(sc, SL11_REV) >> 4; + if (rev >= SLTYPE_SL11H && rev <= SLTYPE_SL811HS_R14) + sc->sc_sltype = rev; + return sc->sc_sltype; +} + +/* + * Attach SL11H/SL811HS. Return 0 if success. + */ +int +slhci_attach(struct slhci_softc *sc) +{ + int rev; + /* Detect and check the controller type */ + + rev = sl811hs_find(sc); + if (rev == -1) + return -1; + + printf("%s: ScanLogic %s USB Host Controller", + device_get_nameunit(sc->sc_bus.bdev), sltypestr[(rev > 0)]); + switch (rev) { + case SLTYPE_SL11H: + break; + case SLTYPE_SL811HS_R12: + printf(" (rev 1.2)"); + break; + case SLTYPE_SL811HS_R14: + printf(" (rev 1.4)"); + break; + default: + printf(" (unknown revision)"); + break; + } + printf("\n"); + + + /* Initialize sc */ + sc->sc_bus.usbrev = USBREV_1_1; + sc->sc_bus.methods = &slhci_bus_methods; + sc->sc_bus.pipe_size = sizeof(struct slhci_pipe); + sc->sc_bus.parent_dmatag = NULL; /* XXX */ + sc->sc_bus.buffer_dmatag = NULL; /* XXX */ + STAILQ_INIT(&sc->sc_free_xfers); + + usb_callout_init(sc->sc_poll_handle); + + /* Disable interrupt, then wait 40msec */ + sl11write(sc, SL11_IER, 0x00); + delay_ms(40); + + /* Initialize controller */ + sl11write(sc, SL811_CSOF, SL811_CSOF_MASTER | 0x2e); + delay_ms(40); + + sl11write(sc, SL11_ISR, 0xff); + + /* Disable interrupt, then wait 40msec */ + sl11write(sc, SL11_IER, 0x00); + + /* Reset USB engine */ + sl11write(sc, SL11_CTRL, SL11_CTRL_JKSTATE| SL11_CTRL_RESETENGINE); + delay_ms(40); + sl11write(sc, SL11_CTRL, 0x00); + delay_ms(10); + + /* USB Bus reset for GET_PORT_STATUS */ + sl11_reset(sc); + sc->sc_flags = SLF_ATTACHED; + + /* Enable interrupt */ + sl11write(sc, SL11_IER, SL11_IER_INSERT); + /* x68k Nereid USB controller needs it */ + if (sc->sc_enable_intr) + sc->sc_enable_intr(sc->sc_arg, INTR_ON); +#ifdef USB_DEBUG + usbdebug = 0; +#endif + + return 0; +} + +int +slhci_intr(void *arg) +{ + struct slhci_softc *sc = arg; + u_int8_t r; +#ifdef SLHCI_DEBUG + char bitbuf[256]; +#endif + + + if((sc->sc_flags & SLF_ATTACHED) == 0) + return 0; + + r = sl11read(sc, SL11_ISR); + + + + sl11write(sc, SL11_ISR, SL11_ISR_DATA | SL11_ISR_SOFTIMER); + + if ((r & SL11_ISR_RESET)) { + sc->sc_flags |= SLF_RESET; + sl11write(sc, SL11_ISR, SL11_ISR_RESET); + } + if ((r & SL11_ISR_INSERT)) { + sc->sc_flags |= SLF_INSERT; + sl11write(sc, SL11_ISR, SL11_ISR_INSERT); + } + +#ifdef SLHCI_DEBUG + bitmask_snprintf(r, + (sl11read(sc, SL11_CTRL) & SL11_CTRL_SUSPEND) + ? "\20\x8""D+\7RESUME\6INSERT\5SOF\4res\3""BABBLE\2USBB\1USBA" + : "\20\x8""D+\7RESET\6INSERT\5SOF\4res\3""BABBLE\2USBB\1USBA", + bitbuf, sizeof(bitbuf)); + DPRINTF(D_XFER, ("I=%s ", bitbuf)); +#endif /* SLHCI_DEBUG */ + + return 0; +} + +usbd_status +slhci_open(usbd_pipe_handle pipe) +{ + usbd_device_handle dev = pipe->device; + struct slhci_softc *sc = (struct slhci_softc *)dev->bus; + usb_endpoint_descriptor_t *ed = pipe->endpoint->edesc; + + DPRINTF(D_TRACE, ("slhci_open(addr=%d,ep=%d,scaddr=%d)", + dev->address, ed->bEndpointAddress, sc->sc_addr)); + + if (dev->address == sc->sc_addr) { + switch (ed->bEndpointAddress) { + case USB_CONTROL_ENDPOINT: + pipe->methods = &slhci_root_ctrl_methods; + break; + case UE_DIR_IN | SLHCI_INTR_ENDPT: + pipe->methods = &slhci_root_intr_methods; + break; + default: + printf("open:endpointErr!\n"); + return USBD_INVAL; + } + } else { + switch (ed->bmAttributes & UE_XFERTYPE) { + case UE_CONTROL: + DPRINTF(D_MSG, ("control ")); + pipe->methods = &slhci_device_ctrl_methods; + break; + case UE_INTERRUPT: + DPRINTF(D_MSG, ("interrupt ")); + pipe->methods = &slhci_device_intr_methods; + break; + case UE_ISOCHRONOUS: + DPRINTF(D_MSG, ("isochronous ")); + pipe->methods = &slhci_device_isoc_methods; + break; + case UE_BULK: + DPRINTF(D_MSG, ("bluk ")); + pipe->methods = &slhci_device_bulk_methods; + break; + } + } + return USBD_NORMAL_COMPLETION; +} + +void +slhci_softintr(void *arg) +{ + DPRINTF(D_TRACE, ("%s()", __FUNCTION__)); +} + +void +slhci_poll(struct usbd_bus *bus) +{ + DPRINTF(D_TRACE, ("%s()", __FUNCTION__)); +} + +/* + * Emulation of interrupt transfer for status change endpoint + * of root hub. + */ +void +slhci_poll_hub(void *arg) +{ + usbd_xfer_handle xfer = arg; + usbd_pipe_handle pipe = xfer->pipe; + struct slhci_softc *sc = (struct slhci_softc *)pipe->device->bus; + int s; + u_char *p; + + usb_callout(sc->sc_poll_handle, sc->sc_interval, slhci_poll_hub, xfer); + + /* USB spec 11.13.3 (p.260) */ + p = xfer->buffer; + p[0] = 0; + if ((sc->sc_flags & (SLF_INSERT | SLF_RESET))) { + p[0] = 2; + DPRINTF(D_TRACE, ("!")); + } + + /* no change, return NAK */ + if (p[0] == 0) + return; + + xfer->actlen = 1; + xfer->status = USBD_NORMAL_COMPLETION; + s = splusb(); + xfer->device->bus->intr_context++; + usb_transfer_complete(xfer); + xfer->device->bus->intr_context--; + splx(s); +} + +usbd_status +slhci_allocm(struct usbd_bus *bus, usb_dma_t *dma, u_int32_t size) +{ + struct slhci_softc *sc = (struct slhci_softc *)bus; + + DPRINTF(D_MEM, ("SLallocm")); + return usb_allocmem(&sc->sc_bus, size, 0, dma); +} + +void +slhci_freem(struct usbd_bus *bus, usb_dma_t *dma) +{ + struct slhci_softc *sc = (struct slhci_softc *)bus; + + DPRINTF(D_MEM, ("SLfreem")); + usb_freemem(&sc->sc_bus, dma); +} + +usbd_xfer_handle +slhci_allocx(struct usbd_bus *bus) +{ + struct slhci_softc *sc = (struct slhci_softc *)bus; + usbd_xfer_handle xfer; + + DPRINTF(D_MEM, ("SLallocx")); + + xfer = STAILQ_FIRST(&sc->sc_free_xfers); + if (xfer) { + STAILQ_REMOVE_HEAD(&sc->sc_free_xfers, next); +#ifdef DIAGNOSTIC + if (xfer->busy_free != XFER_FREE) { + printf("slhci_allocx: xfer=%p not free, 0x%08x\n", + xfer, xfer->busy_free); + } +#endif + } else { + xfer = malloc(sizeof(*xfer), M_USB, M_NOWAIT); + } + + if (xfer) { + memset(xfer, 0, sizeof(*xfer)); +#ifdef DIAGNOSTIC + xfer->busy_free = XFER_BUSY; +#endif + } + + return xfer; +} + +void +slhci_freex(struct usbd_bus *bus, usbd_xfer_handle xfer) +{ + struct slhci_softc *sc = (struct slhci_softc *)bus; + + DPRINTF(D_MEM, ("SLfreex")); + +#ifdef DIAGNOSTIC + if (xfer->busy_free != XFER_BUSY) { + printf("slhci_freex: xfer=%p not busy, 0x%08x\n", + xfer, xfer->busy_free); + return; + } + xfer->busy_free = XFER_FREE; +#endif + STAILQ_INSERT_HEAD(&sc->sc_free_xfers, xfer, next); +} + +void +slhci_noop(usbd_pipe_handle pipe) +{ + DPRINTF(D_TRACE, ("%s()", __FUNCTION__)); +} + +/* + * Data structures and routines to emulate the root hub. + */ +usb_device_descriptor_t slhci_devd = { + USB_DEVICE_DESCRIPTOR_SIZE, + UDESC_DEVICE, /* type */ + {0x01, 0x01}, /* USB version */ + UDCLASS_HUB, /* class */ + UDSUBCLASS_HUB, /* subclass */ + 0, /* protocol */ + 64, /* max packet */ + {USB_VENDOR_SCANLOGIC & 0xff, /* vendor ID (low) */ + USB_VENDOR_SCANLOGIC >> 8 }, /* vendor ID (high) */ + {0} /* ? */, /* product ID */ + {0}, /* device */ + 1, /* index to manufacturer */ + 2, /* index to product */ + 0, /* index to serial number */ + 1 /* number of configurations */ +}; + +usb_config_descriptor_t slhci_confd = { + USB_CONFIG_DESCRIPTOR_SIZE, + UDESC_CONFIG, + {USB_CONFIG_DESCRIPTOR_SIZE + + USB_INTERFACE_DESCRIPTOR_SIZE + + USB_ENDPOINT_DESCRIPTOR_SIZE}, + 1, /* number of interfaces */ + 1, /* configuration value */ + 0, /* index to configuration */ + UC_SELF_POWERED, /* attributes */ + 15 /* max current is 30mA... */ +}; + +usb_interface_descriptor_t slhci_ifcd = { + USB_INTERFACE_DESCRIPTOR_SIZE, + UDESC_INTERFACE, + 0, /* interface number */ + 0, /* alternate setting */ + 1, /* number of endpoint */ + UICLASS_HUB, /* class */ + UISUBCLASS_HUB, /* subclass */ + 0, /* protocol */ + 0 /* index to interface */ +}; + +usb_endpoint_descriptor_t slhci_endpd = { + USB_ENDPOINT_DESCRIPTOR_SIZE, + UDESC_ENDPOINT, + UE_DIR_IN | SLHCI_INTR_ENDPT, /* endpoint address */ + UE_INTERRUPT, /* attributes */ + {8}, /* max packet size */ + 255 /* interval */ +}; + +usb_hub_descriptor_t slhci_hubd = { + USB_HUB_DESCRIPTOR_SIZE, + UDESC_HUB, + 1, /* number of ports */ + {UHD_PWR_INDIVIDUAL | UHD_OC_NONE, 0}, /* hub characteristics */ + 20 /* ? */, /* 5:power on to power good */ + 50, /* 6:maximum current */ + { 0x00 }, /* both ports are removable */ + { 0x00 } /* port power control mask */ +}; + +static int +slhci_str(usb_string_descriptor_t *p, int l, const char *s) +{ + int i; + + if (l == 0) + return 0; + p->bLength = 2 * strlen(s) + 2; + if (l == 1) + return 1; + p->bDescriptorType = UDESC_STRING; + l -= 2; + for (i = 0; s[i] && l > 1; i++, l -= 2) + USETW2(p->bString[i], 0, s[i]); + return 2 * i + 2; +} + +usbd_status +slhci_root_ctrl_transfer(usbd_xfer_handle xfer) +{ + usbd_status error; + + DPRINTF(D_TRACE, ("SLRCtrans ")); + + /* Insert last in queue */ + error = usb_insert_transfer(xfer); + if (error) { + DPRINTF(D_MSG, ("usb_insert_transfer returns err! ")); + return error; + } + + /* + * Pipe isn't running (otherwise error would be USBD_INPROG), + * so start it first. + */ + return slhci_root_ctrl_start(STAILQ_FIRST(&xfer->pipe->queue)); +} + +usbd_status +slhci_root_ctrl_start(usbd_xfer_handle xfer) +{ + struct slhci_softc *sc = (struct slhci_softc *)xfer->pipe->device->bus; + usb_device_request_t *req; + int len, value, index, l, s, status; + int totlen = 0; + void *buf = NULL; + usb_port_status_t ps; + usbd_status error; + char slbuf[50]; + u_int8_t r; + + DPRINTF(D_TRACE, ("SLRCstart ")); + + req = &xfer->request; + + len = UGETW(req->wLength); + value = UGETW(req->wValue); + index = UGETW(req->wIndex); + + if (len) + buf = xfer->buffer; + +#ifdef SLHCI_DEBUG + if ((slhci_debug & D_TRACE)) + print_req_hub(req); +#endif + +#define C(x,y) ((x) | ((y) << 8)) + switch (C(req->bRequest, req->bmRequestType)) { + case C(UR_CLEAR_FEATURE, UT_WRITE_DEVICE): + case C(UR_CLEAR_FEATURE, UT_WRITE_INTERFACE): + case C(UR_CLEAR_FEATURE, UT_WRITE_ENDPOINT): + DPRINTF(D_MSG, ("UR_CLEAR_FEATURE ")); + break; + case C(UR_GET_CONFIG, UT_READ_DEVICE): + DPRINTF(D_MSG, ("UR_GET_CONFIG ")); + if (len > 0) { + *(u_int8_t *)buf = sc->sc_conf; + totlen = 1; + } + break; + case C(UR_GET_DESCRIPTOR, UT_READ_DEVICE): + switch (value >> 8) { + case UDESC_DEVICE: + DPRINTF(D_MSG, ("UDESC_DEVICE ")); + if ((value & 0xff) != 0) { + error = USBD_IOERROR; + goto ret; + } + totlen = l = min(len, USB_DEVICE_DESCRIPTOR_SIZE); + memcpy(buf, &slhci_devd, l); + break; + case UDESC_CONFIG: + DPRINTF(D_MSG, ("UDESC_CONFIG ")); + if ((value & 0xff) != 0) { + error = USBD_IOERROR; + goto ret; + } + totlen = l = min(len, USB_CONFIG_DESCRIPTOR_SIZE); + memcpy(buf, &slhci_confd, l); + buf = (char *)buf + l; + len -= l; + + l = min(len, USB_INTERFACE_DESCRIPTOR_SIZE); + totlen += l; + memcpy(buf, &slhci_ifcd, l); + buf = (char *)buf + l; + len -= l; + + l = min(len, USB_ENDPOINT_DESCRIPTOR_SIZE); + totlen += l; + memcpy(buf, &slhci_endpd, l); + break; + case UDESC_STRING: + DPRINTF(D_MSG, ("UDESC_STR ")); + if (len == 0) + break; + *(u_int8_t *)buf = 0; + totlen = 1; + switch (value & 0xff) { + case 0: + break; + case 1: /* Vendor */ + totlen = slhci_str(buf, len, "ScanLogic"); + break; + case 2: /* Product */ + snprintf(slbuf, sizeof(slbuf), "%s root hub", + sltypestr[sc->sc_sltype>0]); + totlen = slhci_str(buf, len, slbuf); + break; + default: + printf("strerr%d ", value & 0xff); + break; + } + break; + default: + printf("unknownGetDescriptor=%x", value); + error = USBD_IOERROR; + break; + } + break; + case C(UR_GET_INTERFACE, UT_READ_INTERFACE): + /* Get Interface, 9.4.4 */ + if (len > 0) { + *(u_int8_t *)buf = 0; + totlen = 1; + } + break; + case C(UR_GET_STATUS, UT_READ_DEVICE): + /* Get Status from device, 9.4.5 */ + if (len > 1) { + USETW(((usb_status_t *)buf)->wStatus, UDS_SELF_POWERED); + totlen = 2; + } + break; + case C(UR_GET_STATUS, UT_READ_INTERFACE): + case C(UR_GET_STATUS, UT_READ_ENDPOINT): + /* Get Status from interface, endpoint, 9.4.5 */ + if (len > 1) { + USETW(((usb_status_t *)buf)->wStatus, 0); + totlen = 2; + } + break; + case C(UR_SET_ADDRESS, UT_WRITE_DEVICE): + /* Set Address, 9.4.6 */ + DPRINTF(D_MSG, ("UR_SET_ADDRESS ")); + if (value >= USB_MAX_DEVICES) { + error = USBD_IOERROR; + goto ret; + } + sc->sc_addr = value; + break; + case C(UR_SET_CONFIG, UT_WRITE_DEVICE): + /* Set Configuration, 9.4.7 */ + DPRINTF(D_MSG, ("UR_SET_CONFIG ")); + if (value != 0 && value != 1) { + error = USBD_IOERROR; + goto ret; + } + sc->sc_conf = value; + break; + case C(UR_SET_DESCRIPTOR, UT_WRITE_DEVICE): + /* Set Descriptor, 9.4.8, not supported */ + DPRINTF(D_MSG, ("UR_SET_DESCRIPTOR,WRITE_DEVICE not supported\n")); + break; + case C(UR_SET_FEATURE, UT_WRITE_DEVICE): + case C(UR_SET_FEATURE, UT_WRITE_INTERFACE): + case C(UR_SET_FEATURE, UT_WRITE_ENDPOINT): + /* Set Feature, 9.4.9, not supported */ + DPRINTF(D_MSG, ("UR_SET_FEATURE not supported\n")); + error = USBD_IOERROR; + break; + case C(UR_SET_INTERFACE, UT_WRITE_INTERFACE): + /* Set Interface, 9.4.10, not supported */ + break; + case C(UR_SYNCH_FRAME, UT_WRITE_ENDPOINT): + /* Synch Frame, 9.4.11, not supported */ + break; + + /* + * Hub specific requests + */ + case C(UR_CLEAR_FEATURE, UT_WRITE_CLASS_DEVICE): + /* Clear Hub Feature, 11.16.2.1, not supported */ + DPRINTF(D_MSG, ("ClearHubFeature not supported\n")); + break; + case C(UR_CLEAR_FEATURE, UT_WRITE_CLASS_OTHER): + /* Clear Port Feature, 11.16.2.2 */ + if (index != 1) { + error = USBD_IOERROR; + goto ret; + } + switch (value) { + case UHF_PORT_POWER: + DPRINTF(D_MSG, ("POWER_OFF ")); + sc->sc_powerstat = POWER_OFF; + /* x68k Nereid USB controller needs it */ + if (sc->sc_enable_power) + sc->sc_enable_power(sc, sc->sc_powerstat); + break; + case UHF_PORT_SUSPEND: + DPRINTF(D_MSG, ("SUSPEND ")); + sl11write(sc, SL11_CTRL, + sl11read(sc, SL11_CTRL) & ~SL11_CTRL_SUSPEND); + break; + case UHF_C_PORT_CONNECTION: + sc->sc_change &= ~UPS_C_CONNECT_STATUS; + break; + case UHF_C_PORT_RESET: + sc->sc_change &= ~UPS_C_PORT_RESET; + break; + case UHF_PORT_ENABLE: + break; + case UHF_C_PORT_SUSPEND: + case UHF_C_PORT_ENABLE: + case UHF_C_PORT_OVER_CURRENT: + default: + printf("ClrPortFeatERR:value=0x%x ", value); + error = USBD_IOERROR; + break; + } + //DPRINTF(D_XFER, ("CH=%04x ", sc->sc_change)); + break; + case C(UR_GET_BUS_STATE, UT_READ_CLASS_OTHER): + /* Get Bus State, 11.16.2.3, not supported */ + /* shall return a STALL... */ + break; + case C(UR_GET_DESCRIPTOR, UT_READ_CLASS_DEVICE): + /* Get Hub Descriptor, 11.16.2.4 */ + if (value != 0) { + error = USBD_IOERROR; + goto ret; + } + l = min(len, USB_HUB_DESCRIPTOR_SIZE); + totlen = l; + memcpy(buf, &slhci_hubd, l); + break; + case C(UR_GET_STATUS, UT_READ_CLASS_DEVICE): + /* Get Hub Status, 11.16.2.5 */ + DPRINTF(D_MSG, ("UR_GET_STATUS RCD")); + if (len != 4) { + error = USBD_IOERROR; + goto ret; + } + memset(buf, 0, len); + totlen = len; + break; + case C(UR_GET_STATUS, UT_READ_CLASS_OTHER): + /* Get Port Status, 11.16.2.6 */ + if (index != 1 || len != 4) { + printf("index=%d,len=%d ", index, len); + error = USBD_IOERROR; + goto ret; + } + /* + * change + * o port is always enabled. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Sep 18 15:14:32 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 63F7A16A500; Mon, 18 Sep 2006 15:14:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1339716A4B3 for ; Mon, 18 Sep 2006 15:14:32 +0000 (UTC) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 00D3C43D9A for ; Mon, 18 Sep 2006 15:14:20 +0000 (GMT) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8IFEJ50008119 for ; Mon, 18 Sep 2006 15:14:19 GMT (envelope-from trhodes@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8IFEJmN008116 for perforce@freebsd.org; Mon, 18 Sep 2006 15:14:19 GMT (envelope-from trhodes@freebsd.org) Date: Mon, 18 Sep 2006 15:14:19 GMT Message-Id: <200609181514.k8IFEJmN008116@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trhodes@freebsd.org using -f From: Tom Rhodes To: Perforce Change Reviews Cc: Subject: PERFORCE change 106299 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Sep 2006 15:14:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=106299 Change 106299 by trhodes@trhodes_local on 2006/09/18 15:13:20 IFC, most changes here were s/Static/static. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ums.c#13 integrate Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ums.c#13 (text+ko) ==== @@ -35,6 +35,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD: src/sys/dev/usb/ums.c,v 1.82 2006/09/07 00:06:42 imp Exp $"); + /* * HID spec: http://www.usb.org/developers/devclass_docs/HID1_11.pdf */ @@ -130,6 +133,7 @@ static void ums_stop_read(struct usb_cdev *cdev); +static void ums_add_to_queue_timeout(void *priv); static int32_t ums_open(struct usb_cdev *cdev, int32_t fflags, int32_t devtype, struct thread *td); From owner-p4-projects@FreeBSD.ORG Mon Sep 18 15:57:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 235D316A4C2; Mon, 18 Sep 2006 15:57:24 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F320216A494 for ; Mon, 18 Sep 2006 15:57:23 +0000 (UTC) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 66FA143D4C for ; Mon, 18 Sep 2006 15:57:14 +0000 (GMT) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8IFvE3c011768 for ; Mon, 18 Sep 2006 15:57:14 GMT (envelope-from brueffer@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8IFvEE2011765 for perforce@freebsd.org; Mon, 18 Sep 2006 15:57:14 GMT (envelope-from brueffer@freebsd.org) Date: Mon, 18 Sep 2006 15:57:14 GMT Message-Id: <200609181557.k8IFvEE2011765@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brueffer@freebsd.org using -f From: Christian Brueffer To: Perforce Change Reviews Cc: Subject: PERFORCE change 106302 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Sep 2006 15:57:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=106302 Change 106302 by brueffer@brueffer_haakonia on 2006/09/18 15:56:31 Fix typo introduced in previous revision. Affected files ... .. //depot/projects/trustedbsd/openbsm/man/audit_control.5#11 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/man/audit_control.5#11 (text+ko) ==== @@ -25,7 +25,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_control.5#10 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_control.5#11 $ .\" .Dd January 4, 2006 .Dt AUDIT_CONTROL 5 @@ -113,7 +113,7 @@ implemented on FreeBSD or Darwin). .It group Include supplementary groups list in generated audit records (not implemented -on FreeBSD or Darwin; supplementary groupsi are never included in records on +on FreeBSD or Darwin; supplementary groups are never included in records on these systems). .It trail Append a trailer token to each audit record (not implemented on FreeBSD or From owner-p4-projects@FreeBSD.ORG Mon Sep 18 19:33:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 29D2216A543; Mon, 18 Sep 2006 19:33:02 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F3CA816A540 for ; Mon, 18 Sep 2006 19:33:01 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5B23C43D64 for ; Mon, 18 Sep 2006 19:32:54 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8IJWsiY039580 for ; Mon, 18 Sep 2006 19:32:54 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8IJWrwQ039577 for perforce@freebsd.org; Mon, 18 Sep 2006 19:32:53 GMT (envelope-from imp@freebsd.org) Date: Mon, 18 Sep 2006 19:32:53 GMT Message-Id: <200609181932.k8IJWrwQ039577@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 106316 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Sep 2006 19:33:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=106316 Change 106316 by imp@imp_lighthouse on 2006/09/18 19:32:35 Remove useless useless useless lame ass stupid dumbass test. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/mci_device.c#15 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/mci_device.c#15 (text+ko) ==== @@ -111,10 +111,6 @@ if (((AT91C_BASE_MCI->MCI_SR) & AT91C_MCI_SR_ERROR) != 0 ) return ((AT91C_BASE_MCI->MCI_SR) & AT91C_MCI_SR_ERROR); - // check if it is a specific command and then send the command - if ( (Cmd_App & SDCARD_APP_ALL_CMD) == 0) - return AT91C_CMD_SEND_ERROR; - return(AT91F_MCI_SendCommand(Cmd_App,Arg)); } From owner-p4-projects@FreeBSD.ORG Mon Sep 18 22:05:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BAE1616A415; Mon, 18 Sep 2006 22:05:24 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 91F4816A407; Mon, 18 Sep 2006 22:05:24 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id 743EE43D45; Mon, 18 Sep 2006 22:05:19 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from localhost.corp.yahoo.com (john@localhost [127.0.0.1]) (authenticated bits=0) by server.baldwin.cx (8.13.6/8.13.6) with ESMTP id k8IM5Gdj079022; Mon, 18 Sep 2006 18:05:16 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: Robert Watson Date: Mon, 18 Sep 2006 16:55:23 -0400 User-Agent: KMail/1.9.1 References: <200609180917.k8I9Hmf6071984@repoman.freebsd.org> In-Reply-To: <200609180917.k8I9Hmf6071984@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200609181655.23372.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [127.0.0.1]); Mon, 18 Sep 2006 18:05:16 -0400 (EDT) X-Virus-Scanned: ClamAV 0.88.3/1893/Mon Sep 18 14:37:26 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.3 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 106285 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Sep 2006 22:05:25 -0000 On Monday 18 September 2006 05:17, Robert Watson wrote: > http://perforce.freebsd.org/chv.cgi?CH=106285 > > Change 106285 by rwatson@rwatson_peppercorn on 2006/09/18 09:16:49 > > Remove commented out privileges (in most cases) for jail, and > annotate which privileges are allowed and why in comments. > > Affected files ... > > .. //depot/projects/trustedbsd/priv/sys/kern/kern_jail.c#4 edit > > Differences ... > > ==== //depot/projects/trustedbsd/priv/sys/kern/kern_jail.c#4 (text+ko) ==== > > + > + /* > + * Allow jailed processes to manipulate process UNIX > + * credentials in any way they sees fit. > + */ s/sees/see/, possibly s/in any/any/ -- John Baldwin From owner-p4-projects@FreeBSD.ORG Tue Sep 19 08:04:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BD5B516A415; Tue, 19 Sep 2006 08:04:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8197616A407 for ; Tue, 19 Sep 2006 08:04:04 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 359B643D45 for ; Tue, 19 Sep 2006 08:04:04 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8J8442Q014295 for ; Tue, 19 Sep 2006 08:04:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8J841Vc014292 for perforce@freebsd.org; Tue, 19 Sep 2006 08:04:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 19 Sep 2006 08:04:01 GMT Message-Id: <200609190804.k8J841Vc014292@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 106330 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Sep 2006 08:04:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=106330 Change 106330 by rwatson@rwatson_peppercorn on 2006/09/19 08:03:32 Grammatical fix. Submitted by: jhb Affected files ... .. //depot/projects/trustedbsd/priv/sys/kern/kern_jail.c#5 edit Differences ... ==== //depot/projects/trustedbsd/priv/sys/kern/kern_jail.c#5 (text+ko) ==== @@ -553,7 +553,7 @@ /* * Allow jailed processes to manipulate process UNIX - * credentials in any way they sees fit. + * credentials in any way they see fit. */ case PRIV_CRED_SETUID: case PRIV_CRED_SETEUID: From owner-p4-projects@FreeBSD.ORG Tue Sep 19 09:01:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B7FB16A4E9; Tue, 19 Sep 2006 09:01:15 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CDA8616A4D8 for ; Tue, 19 Sep 2006 09:01:14 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 77B1E44115 for ; Tue, 19 Sep 2006 08:28:35 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8J8SZWc015740 for ; Tue, 19 Sep 2006 08:28:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8J8SYWF015737 for perforce@freebsd.org; Tue, 19 Sep 2006 08:28:34 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 19 Sep 2006 08:28:34 GMT Message-Id: <200609190828.k8J8SYWF015737@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 106331 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Sep 2006 09:01:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=106331 Change 106331 by rwatson@rwatson_fledge on 2006/09/19 08:27:50 Fix bugs in execve(2) argument and environmental variable parsing for tokens containing large numbers of entries. Bump default maximum (changes ABI of token structure). Comment. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#30 edit .. //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#29 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#41 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#30 (text+ko) ==== @@ -25,6 +25,8 @@ - Update auditd to read the audit_control policy field and set the kernel policy to match it when configuring/reconfiguring. Remove the -s and -h arguments as these policies are now set via the configuration file. +- Fix bugs in the parsing of large execve(2) arguments and environmental + variable tokens; increase maximum parsed argument and variable count. OpenBSM 1.0 alpha 10 @@ -237,4 +239,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#29 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#30 $ ==== //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#29 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#28 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#29 $ */ #ifndef _LIBBSM_H_ @@ -37,9 +37,6 @@ * solely to allow OpenSSH to compile; Darwin/Apple code should not use them. */ -#define AUDIT_MAX_ARGS 10 -#define AUDIT_MAX_ENV 10 - #include #include @@ -55,13 +52,25 @@ #include /* audit_token_t */ #endif +/* + * Size parsed token vectors for execve(2) arguments and environmental + * variables. Note: changing these sizes affects the ABI of the token + * structure, and as the token structure is often placed in the caller stack, + * this is undesirable. + */ +#define AUDIT_MAX_ARGS 128 +#define AUDIT_MAX_ENV 128 + +/* + * Arguments to au_preselect(3). + */ +#define AU_PRS_USECACHE 0 +#define AU_PRS_REREAD 1 + #define AU_PRS_SUCCESS 1 #define AU_PRS_FAILURE 2 #define AU_PRS_BOTH (AU_PRS_SUCCESS|AU_PRS_FAILURE) -#define AU_PRS_USECACHE 0 -#define AU_PRS_REREAD 1 - #define AUDIT_EVENT_FILE "/etc/security/audit_event" #define AUDIT_CLASS_FILE "/etc/security/audit_class" #define AUDIT_CONTROL_FILE "/etc/security/audit_control" ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#41 (text+ko) ==== @@ -31,7 +31,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#40 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#41 $ */ #include @@ -1190,7 +1190,8 @@ for (i = 0; i < tok->tt.execarg.count; i++) { bptr = buf + tok->len; - tok->tt.execarg.text[i] = bptr; + if (i < AUDIT_MAX_ARGS) + tok->tt.execarg.text[i] = bptr; /* Look for a null terminated string. */ while (bptr && (*bptr != '\0')) { @@ -1202,6 +1203,8 @@ return (-1); tok->len++; /* \0 character */ } + if (tok->tt.execarg.count > AUDIT_MAX_ARGS) + tok->tt.execarg.count = AUDIT_MAX_ARGS; return (0); } @@ -1235,9 +1238,10 @@ if (err) return (-1); - for (i = 0; i< tok->tt.execenv.count; i++) { + for (i = 0; i < tok->tt.execenv.count; i++) { bptr = buf + tok->len; - tok->tt.execenv.text[i] = bptr; + if (i < AUDIT_MAX_ENV) + tok->tt.execenv.text[i] = bptr; /* Look for a null terminated string. */ while (bptr && (*bptr != '\0')) { @@ -1249,6 +1253,8 @@ return (-1); tok->len++; /* \0 character */ } + if (tok->tt.execenv.count > AUDIT_MAX_ENV) + tok->tt.execenv.count = AUDIT_MAX_ENV; return (0); } From owner-p4-projects@FreeBSD.ORG Tue Sep 19 10:04:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0717A16A416; Tue, 19 Sep 2006 10:04:45 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BC28516A40F for ; Tue, 19 Sep 2006 10:04:44 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 65F5143D58 for ; Tue, 19 Sep 2006 10:04:44 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8JA4i4O030577 for ; Tue, 19 Sep 2006 10:04:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8JA4gCA030574 for perforce@freebsd.org; Tue, 19 Sep 2006 10:04:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 19 Sep 2006 10:04:42 GMT Message-Id: <200609191004.k8JA4gCA030574@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 106335 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Sep 2006 10:04:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=106335 Change 106335 by rwatson@rwatson_fledge on 2006/09/19 10:04:36 Increase cross-referencing of various audit library routines, patch up a few missing entries in various places. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/au_open.3#5 edit .. //depot/projects/trustedbsd/openbsm/libbsm/libbsm.3#6 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/au_open.3#5 (text+ko) ==== @@ -23,16 +23,17 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_open.3#4 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_open.3#5 $ .\" .Dd March 4, 2006 .Dt AU_OPEN 3 .Os .Sh NAME +.Nm au_close , +.Nm au_close_buffer , +.Nm au_close_token , .Nm au_open , -.Nm au_write , -.Nm au_close , -.Nm au_close_buffer +.Nm au_write .Nd "Create and commit audit records" .Sh LIBRARY .Lb libbsm @@ -120,6 +121,7 @@ information in .Va errno . .Sh SEE ALSO +.Xr audit_submit 3 , .Xr libbsm 3 .Sh AUTHORS This software was created by Robert Watson, Wayne Salamon, and Suresh ==== //depot/projects/trustedbsd/openbsm/libbsm/libbsm.3#6 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/libbsm.3#5 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/libbsm.3#6 $ .\" .Dd April 19, 2005 .Dt LIBBSM 3 @@ -55,15 +55,17 @@ .Xr au_notify 3 , .Xr au_stream 3 , .Xr au_token 3 , -.Xr au_user 3 +.Xr au_user 3 . man pages. .Ss Audit Event Stream Interfaces Audit event stream interfaces support interaction with file-backed audit event streams: -.Xr au_close 3 . +.Xr au_close 3 , +.Xr au_close_buffer 3 , .Xr au_free_token 3 , .Xr au_open 3 , .Xr au_write 3 , +.Xr audit_submit 3 . .Ss Audit Class Interfaces Audit class interfaces support the look up of information from the .Xr audit_class 5 @@ -83,7 +85,10 @@ .Xr getacdir 3 , .Xr getacflg 3 , .Xr getacmin 3 , -.Xr getacna 3 . +.Xr getacna 3 , +.Xr getacpol 3 , +.Xr au_poltostr 3 , +.Xr au_strtopol 3 . .Ss Audit Event Interfaces Audit event interfaces support the look up of information from the .Xr audit_event 5 @@ -188,6 +193,7 @@ .Xr au_stream 3 , .Xr au_token 3 , .Xr au_user 3 , +.Xr audit_submit 3 , .Xr audit_class 5 , .Xr audit_control 5 .Sh AUTHORS From owner-p4-projects@FreeBSD.ORG Tue Sep 19 10:18:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A3D7216A417; Tue, 19 Sep 2006 10:18:02 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7D13F16A40F for ; Tue, 19 Sep 2006 10:18:02 +0000 (UTC) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 49C4143D72 for ; Tue, 19 Sep 2006 10:18:02 +0000 (GMT) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8JAI2tt031271 for ; Tue, 19 Sep 2006 10:18:02 GMT (envelope-from brueffer@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8JAI1VO031268 for perforce@freebsd.org; Tue, 19 Sep 2006 10:18:01 GMT (envelope-from brueffer@freebsd.org) Date: Tue, 19 Sep 2006 10:18:01 GMT Message-Id: <200609191018.k8JAI1VO031268@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brueffer@freebsd.org using -f From: Christian Brueffer To: Perforce Change Reviews Cc: Subject: PERFORCE change 106336 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Sep 2006 10:18:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=106336 Change 106336 by brueffer@brueffer_haakonia on 2006/09/19 10:17:44 Minor correction for the previous revision. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/libbsm.3#7 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/libbsm.3#7 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/libbsm.3#6 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/libbsm.3#7 $ .\" .Dd April 19, 2005 .Dt LIBBSM 3 @@ -55,8 +55,9 @@ .Xr au_notify 3 , .Xr au_stream 3 , .Xr au_token 3 , -.Xr au_user 3 . -man pages. +and +.Xr au_user 3 +manual pages. .Ss Audit Event Stream Interfaces Audit event stream interfaces support interaction with file-backed audit event streams: From owner-p4-projects@FreeBSD.ORG Tue Sep 19 12:59:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 50EB216A415; Tue, 19 Sep 2006 12:59:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 152BC16A40F for ; Tue, 19 Sep 2006 12:59:26 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BF11D43D4C for ; Tue, 19 Sep 2006 12:59:25 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8JCxP22049279 for ; Tue, 19 Sep 2006 12:59:25 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8JCxPtG049276 for perforce@freebsd.org; Tue, 19 Sep 2006 12:59:25 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 19 Sep 2006 12:59:25 GMT Message-Id: <200609191259.k8JCxPtG049276@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 106338 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Sep 2006 12:59:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=106338 Change 106338 by rwatson@rwatson_zoo on 2006/09/19 12:59:20 Provide a little backward compatibility safety for old audit_control files that don't contain a policy statement: set the policy to AUDIT_CNT if we can't load or parse the policy from the file. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#21 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#21 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#20 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#21 $ */ #include @@ -789,12 +789,22 @@ syslog(LOG_ERR, "Failed to obtain non-attributable event mask."); + /* + * If a policy is configured in audit_control(5), implement the + * policy. However, if one isn't defined, set AUDIT_CNT to avoid + * leaving the system in a fragile state. + */ if ((getacpol(polstr, POL_STR_SIZE) == 0) && (au_strtopol(polstr, &policy) == 0)) { if (auditon(A_SETPOLICY, &policy, sizeof(policy))) - syslog(LOG_ERR, "Failed to set audit policy."); - } else - syslog(LOG_ERR, "Failed to obtain policy flags."); + syslog(LOG_ERR, "Failed to set audit policy: %m"); + } else { + syslog(LOG_ERR, "Failed to obtain policy flags: %m"); + policy = AUDIT_CNT; + if (auditon(A_SETPOLICY, &policy, sizeof(policy))) + syslog(LOG_ERR, + "Failed to set default audit policy: %m"); + } return (0); } From owner-p4-projects@FreeBSD.ORG Tue Sep 19 13:00:35 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF3E416A4B3; Tue, 19 Sep 2006 13:00:34 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9FB7816A47E for ; Tue, 19 Sep 2006 13:00:34 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CF74243D66 for ; Tue, 19 Sep 2006 13:00:27 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8JD0Rb0049327 for ; Tue, 19 Sep 2006 13:00:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8JD0REi049324 for perforce@freebsd.org; Tue, 19 Sep 2006 13:00:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 19 Sep 2006 13:00:27 GMT Message-Id: <200609191300.k8JD0REi049324@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 106339 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Sep 2006 13:00:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=106339 Change 106339 by rwatson@rwatson_zoo on 2006/09/19 13:00:17 Update history. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#31 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#31 (text+ko) ==== @@ -24,7 +24,9 @@ - Update audump to print the audit_control policy field. - Update auditd to read the audit_control policy field and set the kernel policy to match it when configuring/reconfiguring. Remove the -s and -h - arguments as these policies are now set via the configuration file. + arguments as these policies are now set via the configuration file. If a + policy line is not found in the configuration file, continue with the + current default of setting AUDIT_CNT. - Fix bugs in the parsing of large execve(2) arguments and environmental variable tokens; increase maximum parsed argument and variable count. @@ -239,4 +241,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#30 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#31 $ From owner-p4-projects@FreeBSD.ORG Tue Sep 19 13:20:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F063516A47B; Tue, 19 Sep 2006 13:20:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AF44F16A416 for ; Tue, 19 Sep 2006 13:20:56 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2BB9143D5D for ; Tue, 19 Sep 2006 13:20:55 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8JDKtbf051794 for ; Tue, 19 Sep 2006 13:20:55 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8JDKsrx051791 for perforce@freebsd.org; Tue, 19 Sep 2006 13:20:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 19 Sep 2006 13:20:54 GMT Message-Id: <200609191320.k8JDKsrx051791@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 106342 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Sep 2006 13:20:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=106342 Change 106342 by rwatson@rwatson_fledge on 2006/09/19 13:19:56 Stick a sample BSM fragment involving an execve argument token with many arguments into the test tree. This crashes praudit prior to 1.0 alpha 11. Affected files ... .. //depot/projects/trustedbsd/openbsm/test/samples/execve-long-args.trail#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Sep 19 13:22:59 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A183316A47B; Tue, 19 Sep 2006 13:22:59 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7BD2916A416 for ; Tue, 19 Sep 2006 13:22:59 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1A5C143D49 for ; Tue, 19 Sep 2006 13:22:59 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8JDMwPE052012 for ; Tue, 19 Sep 2006 13:22:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8JDMwKR052009 for perforce@freebsd.org; Tue, 19 Sep 2006 13:22:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 19 Sep 2006 13:22:58 GMT Message-Id: <200609191322.k8JDMwKR052009@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 106344 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Sep 2006 13:22:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=106344 Change 106344 by rwatson@rwatson_zoo on 2006/09/19 13:22:42 Integrate TrustedBSD OpenBSM branch to audit3 user space -- primarily addition of audit_control(5) policy field and fixes to exec argument token processing. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#14 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#15 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#18 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_open.3#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#19 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/libbsm.3#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_control.5#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/samples/execve-long-args.trail#1 branch Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#14 (text+ko) ==== @@ -24,7 +24,11 @@ - Update audump to print the audit_control policy field. - Update auditd to read the audit_control policy field and set the kernel policy to match it when configuring/reconfiguring. Remove the -s and -h - arguments as these policies are now set via the configuration file. + arguments as these policies are now set via the configuration file. If a + policy line is not found in the configuration file, continue with the + current default of setting AUDIT_CNT. +- Fix bugs in the parsing of large execve(2) arguments and environmental + variable tokens; increase maximum parsed argument and variable count. OpenBSM 1.0 alpha 10 @@ -237,4 +241,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#13 $ +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#14 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#15 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#14 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#15 $ */ #include @@ -789,12 +789,22 @@ syslog(LOG_ERR, "Failed to obtain non-attributable event mask."); + /* + * If a policy is configured in audit_control(5), implement the + * policy. However, if one isn't defined, set AUDIT_CNT to avoid + * leaving the system in a fragile state. + */ if ((getacpol(polstr, POL_STR_SIZE) == 0) && (au_strtopol(polstr, &policy) == 0)) { if (auditon(A_SETPOLICY, &policy, sizeof(policy))) - syslog(LOG_ERR, "Failed to set audit policy."); - } else - syslog(LOG_ERR, "Failed to obtain policy flags."); + syslog(LOG_ERR, "Failed to set audit policy: %m"); + } else { + syslog(LOG_ERR, "Failed to obtain policy flags: %m"); + policy = AUDIT_CNT; + if (auditon(A_SETPOLICY, &policy, sizeof(policy))) + syslog(LOG_ERR, + "Failed to set default audit policy: %m"); + } return (0); } ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#18 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#17 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#18 $ */ #ifndef _LIBBSM_H_ @@ -37,9 +37,6 @@ * solely to allow OpenSSH to compile; Darwin/Apple code should not use them. */ -#define AUDIT_MAX_ARGS 10 -#define AUDIT_MAX_ENV 10 - #include #include @@ -55,13 +52,25 @@ #include /* audit_token_t */ #endif +/* + * Size parsed token vectors for execve(2) arguments and environmental + * variables. Note: changing these sizes affects the ABI of the token + * structure, and as the token structure is often placed in the caller stack, + * this is undesirable. + */ +#define AUDIT_MAX_ARGS 128 +#define AUDIT_MAX_ENV 128 + +/* + * Arguments to au_preselect(3). + */ +#define AU_PRS_USECACHE 0 +#define AU_PRS_REREAD 1 + #define AU_PRS_SUCCESS 1 #define AU_PRS_FAILURE 2 #define AU_PRS_BOTH (AU_PRS_SUCCESS|AU_PRS_FAILURE) -#define AU_PRS_USECACHE 0 -#define AU_PRS_REREAD 1 - #define AUDIT_EVENT_FILE "/etc/security/audit_event" #define AUDIT_CLASS_FILE "/etc/security/audit_class" #define AUDIT_CONTROL_FILE "/etc/security/audit_control" ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_open.3#3 (text+ko) ==== @@ -23,16 +23,17 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_open.3#2 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_open.3#3 $ .\" .Dd March 4, 2006 .Dt AU_OPEN 3 .Os .Sh NAME +.Nm au_close , +.Nm au_close_buffer , +.Nm au_close_token , .Nm au_open , -.Nm au_write , -.Nm au_close , -.Nm au_close_buffer +.Nm au_write .Nd "Create and commit audit records" .Sh LIBRARY .Lb libbsm @@ -120,6 +121,7 @@ information in .Va errno . .Sh SEE ALSO +.Xr audit_submit 3 , .Xr libbsm 3 .Sh AUTHORS This software was created by Robert Watson, Wayne Salamon, and Suresh ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#19 (text+ko) ==== @@ -31,7 +31,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#18 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#19 $ */ #include @@ -1190,7 +1190,8 @@ for (i = 0; i < tok->tt.execarg.count; i++) { bptr = buf + tok->len; - tok->tt.execarg.text[i] = bptr; + if (i < AUDIT_MAX_ARGS) + tok->tt.execarg.text[i] = bptr; /* Look for a null terminated string. */ while (bptr && (*bptr != '\0')) { @@ -1202,6 +1203,8 @@ return (-1); tok->len++; /* \0 character */ } + if (tok->tt.execarg.count > AUDIT_MAX_ARGS) + tok->tt.execarg.count = AUDIT_MAX_ARGS; return (0); } @@ -1235,9 +1238,10 @@ if (err) return (-1); - for (i = 0; i< tok->tt.execenv.count; i++) { + for (i = 0; i < tok->tt.execenv.count; i++) { bptr = buf + tok->len; - tok->tt.execenv.text[i] = bptr; + if (i < AUDIT_MAX_ENV) + tok->tt.execenv.text[i] = bptr; /* Look for a null terminated string. */ while (bptr && (*bptr != '\0')) { @@ -1249,6 +1253,8 @@ return (-1); tok->len++; /* \0 character */ } + if (tok->tt.execenv.count > AUDIT_MAX_ENV) + tok->tt.execenv.count = AUDIT_MAX_ENV; return (0); } ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/libbsm.3#8 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/libbsm.3#7 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/libbsm.3#8 $ .\" .Dd April 19, 2005 .Dt LIBBSM 3 @@ -55,15 +55,18 @@ .Xr au_notify 3 , .Xr au_stream 3 , .Xr au_token 3 , +and .Xr au_user 3 -man pages. +manual pages. .Ss Audit Event Stream Interfaces Audit event stream interfaces support interaction with file-backed audit event streams: -.Xr au_close 3 . +.Xr au_close 3 , +.Xr au_close_buffer 3 , .Xr au_free_token 3 , .Xr au_open 3 , .Xr au_write 3 , +.Xr audit_submit 3 . .Ss Audit Class Interfaces Audit class interfaces support the look up of information from the .Xr audit_class 5 @@ -83,7 +86,10 @@ .Xr getacdir 3 , .Xr getacflg 3 , .Xr getacmin 3 , -.Xr getacna 3 . +.Xr getacna 3 , +.Xr getacpol 3 , +.Xr au_poltostr 3 , +.Xr au_strtopol 3 . .Ss Audit Event Interfaces Audit event interfaces support the look up of information from the .Xr audit_event 5 @@ -188,6 +194,7 @@ .Xr au_stream 3 , .Xr au_token 3 , .Xr au_user 3 , +.Xr audit_submit 3 , .Xr audit_class 5 , .Xr audit_control 5 .Sh AUTHORS ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_control.5#8 (text+ko) ==== @@ -25,7 +25,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_control.5#7 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_control.5#8 $ .\" .Dd January 4, 2006 .Dt AUDIT_CONTROL 5 @@ -113,7 +113,7 @@ implemented on FreeBSD or Darwin). .It group Include supplementary groups list in generated audit records (not implemented -on FreeBSD or Darwin; supplementary groupsi are never included in records on +on FreeBSD or Darwin; supplementary groups are never included in records on these systems). .It trail Append a trailer token to each audit record (not implemented on FreeBSD or From owner-p4-projects@FreeBSD.ORG Tue Sep 19 18:17:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EDAF116A416; Tue, 19 Sep 2006 18:17:28 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7F9C816A412 for ; Tue, 19 Sep 2006 18:17:28 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AC3C143D68 for ; Tue, 19 Sep 2006 18:17:14 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8JIHEcI086777 for ; Tue, 19 Sep 2006 18:17:14 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8JIHCNS086774 for perforce@freebsd.org; Tue, 19 Sep 2006 18:17:12 GMT (envelope-from piso@freebsd.org) Date: Tue, 19 Sep 2006 18:17:12 GMT Message-Id: <200609191817.k8JIHCNS086774@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 106353 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Sep 2006 18:17:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=106353 Change 106353 by piso@piso_newluxor on 2006/09/19 18:16:54 IFC@106352 Affected files ... .. //depot/projects/soc2005/libalias/UPDATING#7 integrate .. //depot/projects/soc2005/libalias/bin/getfacl/getfacl.1#2 integrate .. //depot/projects/soc2005/libalias/bin/ls/ls.1#2 integrate .. //depot/projects/soc2005/libalias/bin/pax/pax.1#2 integrate .. //depot/projects/soc2005/libalias/bin/ps/ps.1#3 integrate .. //depot/projects/soc2005/libalias/bin/setfacl/setfacl.1#2 integrate .. //depot/projects/soc2005/libalias/bin/sh/sh.1#4 integrate .. //depot/projects/soc2005/libalias/contrib/com_err/compile_et.1#2 integrate .. //depot/projects/soc2005/libalias/contrib/pnpinfo/pnpinfo.8#2 integrate .. //depot/projects/soc2005/libalias/contrib/telnet/telnet/telnet.1#2 integrate .. //depot/projects/soc2005/libalias/games/fortune/datfiles/fortunes#5 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/cc/Makefile.inc#2 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/cc/cc_int/Makefile#3 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/cc/cc_tools/Makefile#3 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/cc/cc_tools/arm-freebsd.h.diff#1 branch .. //depot/projects/soc2005/libalias/gnu/usr.bin/cc/cc_tools/arm.md.diff#1 branch .. //depot/projects/soc2005/libalias/gnu/usr.bin/gzip/gzip.h#2 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/gzip/inflate.c#2 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/gzip/unlzh.c#2 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/gzip/unpack.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/tar.5#3 integrate .. //depot/projects/soc2005/libalias/lib/libbsm/Makefile#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/gen/getgrent.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/gen/pwcache.3#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/gen/vis.3#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/i386/sys/i386_set_watch.3#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/net/gai_strerror.3#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/net/gethostbyname.3#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/rpc/rpc_clnt_create.3#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdio/fclose.3#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdlib/malloc.3#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/chflags.2#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/clock_gettime.2#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/connect.2#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/getsockopt.2#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/gettimeofday.2#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/kldnext.2#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/kqueue.2#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/listen.2#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/mmap.2#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/open.2#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/sigqueue.2#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/timer_create.2#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/timer_delete.2#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/timer_settime.2#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/utimes.2#2 integrate .. //depot/projects/soc2005/libalias/lib/libdevinfo/devinfo.3#2 integrate .. //depot/projects/soc2005/libalias/lib/libipsec/ipsec_set_policy.3#2 integrate .. //depot/projects/soc2005/libalias/lib/libpmc/pmclog.3#2 integrate .. //depot/projects/soc2005/libalias/lib/libutil/humanize_number.3#3 integrate .. //depot/projects/soc2005/libalias/libexec/rtld-elf/rtld.1#2 integrate .. //depot/projects/soc2005/libalias/libexec/rtld-elf/rtld.c#5 integrate .. //depot/projects/soc2005/libalias/libexec/tftpd/tftpd.8#3 integrate .. //depot/projects/soc2005/libalias/release/picobsd/bridge/PICOBSD#2 integrate .. //depot/projects/soc2005/libalias/sbin/bsdlabel/bsdlabel.8#2 integrate .. //depot/projects/soc2005/libalias/sbin/camcontrol/camcontrol.8#3 integrate .. //depot/projects/soc2005/libalias/sbin/devd/devd.8#2 integrate .. //depot/projects/soc2005/libalias/sbin/devd/devd.cc#2 integrate .. //depot/projects/soc2005/libalias/sbin/dump/dump.8#3 integrate .. //depot/projects/soc2005/libalias/sbin/fdisk_pc98/fdisk.8#2 integrate .. //depot/projects/soc2005/libalias/sbin/fsdb/fsdb.8#3 integrate .. //depot/projects/soc2005/libalias/sbin/gbde/gbde.8#2 integrate .. //depot/projects/soc2005/libalias/sbin/geom/class/eli/geli.8#4 integrate .. //depot/projects/soc2005/libalias/sbin/geom/class/mirror/gmirror.8#2 integrate .. //depot/projects/soc2005/libalias/sbin/geom/class/nop/gnop.8#3 integrate .. //depot/projects/soc2005/libalias/sbin/ggate/ggatec/ggatec.8#2 integrate .. //depot/projects/soc2005/libalias/sbin/ifconfig/ifconfig.8#4 integrate .. //depot/projects/soc2005/libalias/sbin/ipfw/ipfw.8#5 integrate .. //depot/projects/soc2005/libalias/sbin/mdmfs/mdmfs.8#2 integrate .. //depot/projects/soc2005/libalias/sbin/mount/mount.8#4 integrate .. //depot/projects/soc2005/libalias/sbin/setkey/setkey.8#2 integrate .. //depot/projects/soc2005/libalias/share/examples/mdoc/example.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/Makefile#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_mutex_lock.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_yield.3#1 branch .. //depot/projects/soc2005/libalias/share/man/man3/queue.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/acpi.4#4 integrate .. //depot/projects/soc2005/libalias/share/man/man4/adw.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/ataraid.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/atkbd.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/cpufreq.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/da.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/ddb.4#3 integrate .. //depot/projects/soc2005/libalias/share/man/man4/fast_ipsec.4#4 integrate .. //depot/projects/soc2005/libalias/share/man/man4/hptmv.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/if_bridge.4#3 integrate .. //depot/projects/soc2005/libalias/share/man/man4/iic.4#3 integrate .. //depot/projects/soc2005/libalias/share/man/man4/ipsec.4#3 integrate .. //depot/projects/soc2005/libalias/share/man/man4/isp.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/man4.i386/linux.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/man4.sparc64/machfb.4#3 integrate .. //depot/projects/soc2005/libalias/share/man/man4/mpt.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/ng_pppoe.4#3 integrate .. //depot/projects/soc2005/libalias/share/man/man4/pty.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/ral.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/random.4#3 integrate .. //depot/projects/soc2005/libalias/share/man/man4/smp.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/syscons.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/uart.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/umass.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man5/devfs.5#2 integrate .. //depot/projects/soc2005/libalias/share/man/man5/devfs.conf.5#2 integrate .. //depot/projects/soc2005/libalias/share/man/man5/devfs.rules.5#2 integrate .. //depot/projects/soc2005/libalias/share/man/man5/linprocfs.5#2 integrate .. //depot/projects/soc2005/libalias/share/man/man5/mailer.conf.5#2 integrate .. //depot/projects/soc2005/libalias/share/man/man5/make.conf.5#3 integrate .. //depot/projects/soc2005/libalias/share/man/man5/portsnap.conf.5#2 integrate .. //depot/projects/soc2005/libalias/share/man/man5/rc.conf.5#4 integrate .. //depot/projects/soc2005/libalias/share/man/man7/ports.7#3 integrate .. //depot/projects/soc2005/libalias/share/man/man8/picobsd.8#3 integrate .. //depot/projects/soc2005/libalias/share/man/man8/rc.8#2 integrate .. //depot/projects/soc2005/libalias/share/man/man9/VFS_ROOT.9#3 integrate .. //depot/projects/soc2005/libalias/share/man/man9/bus_dma.9#4 integrate .. //depot/projects/soc2005/libalias/share/man/man9/bus_space.9#2 integrate .. //depot/projects/soc2005/libalias/share/man/man9/crypto.9#2 integrate .. //depot/projects/soc2005/libalias/share/man/man9/ktr.9#2 integrate .. //depot/projects/soc2005/libalias/share/man/man9/memguard.9#2 integrate .. //depot/projects/soc2005/libalias/share/man/man9/pfil.9#2 integrate .. //depot/projects/soc2005/libalias/share/man/man9/sbuf.9#2 integrate .. //depot/projects/soc2005/libalias/share/man/man9/sleep.9#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/vm_machdep.c#3 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_proto.h#7 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_syscall.h#7 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_syscalls.c#7 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_sysent.c#7 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/syscalls.master#7 integrate .. //depot/projects/soc2005/libalias/sys/conf/files#7 integrate .. //depot/projects/soc2005/libalias/sys/conf/kern.pre.mk#3 integrate .. //depot/projects/soc2005/libalias/sys/contrib/dev/ath/freebsd/ah_if.m#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/dev/ath/freebsd/ah_osdep.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/dev/ath/freebsd/ah_osdep.h#2 delete .. //depot/projects/soc2005/libalias/sys/dev/ath/ah_osdep.c#1 branch .. //depot/projects/soc2005/libalias/sys/dev/ath/ah_osdep.h#1 branch .. //depot/projects/soc2005/libalias/sys/dev/ath/if_ath.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/ath/if_athvar.h#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/bce/if_bce.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/bge/if_bge.c#8 integrate .. //depot/projects/soc2005/libalias/sys/dev/bktr/bktr_i2c.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/if_em.c#9 integrate .. //depot/projects/soc2005/libalias/sys/dev/hwpmc/hwpmc_mod.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ixgb/if_ixgb.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/kbdmux/kbdmux.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/nfe/if_nfe.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/nge/if_nge.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/re/if_re.c#6 integrate .. //depot/projects/soc2005/libalias/sys/dev/stge/if_stge.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/ti/if_ti.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/txp/if_txp.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/uart/uart_kbd_sun.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/vge/if_vge.c#3 integrate .. //depot/projects/soc2005/libalias/sys/fs/devfs/devfs.h#2 integrate .. //depot/projects/soc2005/libalias/sys/fs/devfs/devfs_devs.c#3 integrate .. //depot/projects/soc2005/libalias/sys/fs/devfs/devfs_vfsops.c#3 integrate .. //depot/projects/soc2005/libalias/sys/fs/devfs/devfs_vnops.c#3 integrate .. //depot/projects/soc2005/libalias/sys/kern/init_sysent.c#7 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_jail.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_mbuf.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_prot.c#3 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_prf.c#3 integrate .. //depot/projects/soc2005/libalias/sys/kern/syscalls.c#7 integrate .. //depot/projects/soc2005/libalias/sys/kern/syscalls.master#8 integrate .. //depot/projects/soc2005/libalias/sys/kern/systrace_args.c#4 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_mount.c#4 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_syscalls.c#5 integrate .. //depot/projects/soc2005/libalias/sys/modules/ath/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/modules/ath_hal/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/modules/ath_rate_amrr/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/modules/ath_rate_onoe/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/modules/ath_rate_sample/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/net/if_vlan.c#5 integrate .. //depot/projects/soc2005/libalias/sys/net/if_vlan_var.h#2 integrate .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_input.c#4 integrate .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_output.c#4 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/ng_vlan.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet/tcp_usrreq.c#3 integrate .. //depot/projects/soc2005/libalias/sys/security/audit/audit.c#4 integrate .. //depot/projects/soc2005/libalias/sys/security/audit/audit_bsm.c#6 integrate .. //depot/projects/soc2005/libalias/sys/security/audit/audit_private.h#3 integrate .. //depot/projects/soc2005/libalias/sys/security/audit/audit_syscalls.c#3 integrate .. //depot/projects/soc2005/libalias/sys/security/audit/audit_worker.c#2 integrate .. //depot/projects/soc2005/libalias/sys/security/mac/mac_internal.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/mbuf.h#4 integrate .. //depot/projects/soc2005/libalias/sys/sys/syscall.h#7 integrate .. //depot/projects/soc2005/libalias/sys/sys/syscall.mk#7 integrate .. //depot/projects/soc2005/libalias/sys/sys/sysctl.h#5 integrate .. //depot/projects/soc2005/libalias/sys/sys/sysproto.h#7 integrate .. //depot/projects/soc2005/libalias/sys/ufs/ufs/ufs_quota.c#2 integrate .. //depot/projects/soc2005/libalias/tools/regression/geom_eli/readonly.t#1 branch .. //depot/projects/soc2005/libalias/tools/regression/readonly.t#2 delete .. //depot/projects/soc2005/libalias/usr.bin/file/file.1#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/file/magic.5#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/kdump/mksubr#3 integrate .. //depot/projects/soc2005/libalias/usr.bin/truncate/truncate.c#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/ppp/server.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/pw/pw.c#2 integrate Differences ... ==== //depot/projects/soc2005/libalias/UPDATING#7 (text+ko) ==== @@ -26,7 +26,7 @@ 20060816: The IPFIREWALL_FORWARD_EXTENDED option is gone and the behaviour - for IP_FIREWALL_FORWARD is now as it was before when it was first + for IPFIREWALL_FORWARD is now as it was before when it was first committed and for years after. The behaviour is now ON. 20060725: @@ -613,4 +613,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.455 2006/09/04 21:49:31 sam Exp $ +$FreeBSD: src/UPDATING,v 1.456 2006/09/18 11:24:25 maxim Exp $ ==== //depot/projects/soc2005/libalias/bin/getfacl/getfacl.1#2 (text+ko) ==== @@ -25,12 +25,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/bin/getfacl/getfacl.1,v 1.10 2006/03/13 11:45:29 rwatson Exp $ +.\" $FreeBSD: src/bin/getfacl/getfacl.1,v 1.11 2006/09/17 17:40:06 ru Exp $ .\" .\" Developed by the TrustedBSD Project. .\" Support for POSIX.1e access control lists. .\" -.Dd December 30, 2002 +.Dd March 13, 2006 .Dt GETFACL 1 .Os .Sh NAME @@ -65,7 +65,8 @@ If the target of the operation is a symbolic link, return the ACL from the symbolic link itself rather than following the link. .It Fl q -Don't write commented information about file name and ownership. This is +Do not write commented information about file name and ownership. +This is useful when dealing with filenames with unprintable characters. .El .Pp ==== //depot/projects/soc2005/libalias/bin/ls/ls.1#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.98 2006/03/24 17:09:02 jhb Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.99 2006/09/17 17:40:06 ru Exp $ .\" -.Dd November 16, 2005 +.Dd March 24, 2006 .Dt LS 1 .Os .Sh NAME ==== //depot/projects/soc2005/libalias/bin/pax/pax.1#2 (text+ko) ==== @@ -31,7 +31,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)pax.1 8.4 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/pax/pax.1,v 1.36 2006/05/10 20:32:57 cokane Exp $ +.\" $FreeBSD: src/bin/pax/pax.1,v 1.37 2006/09/17 17:40:06 ru Exp $ .\" .Dd July 3, 2004 .Dt PAX 1 @@ -394,7 +394,8 @@ bytes per write to the archive file. The .Ar blocksize -must be a multiple of 512 bytes with a maximum of 64512 bytes. A +must be a multiple of 512 bytes with a maximum of 64512 bytes. +A .Ar blocksize larger than 32256 bytes violates the .Tn POSIX ==== //depot/projects/soc2005/libalias/bin/ps/ps.1#3 (text+ko) ==== @@ -27,7 +27,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.88 2006/08/21 03:09:12 yar Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.89 2006/09/17 17:40:06 ru Exp $ .\" .Dd August 21, 2006 .Dt PS 1 @@ -181,7 +181,7 @@ list of keywords specified. The last keyword in the list may be appended with an equals .Pq Ql = -sign and a string that spans the rest of the argument and can contain +sign and a string that spans the rest of the argument, and can contain space and comma characters. This causes the printed header to use the specified string instead of the standard header. ==== //depot/projects/soc2005/libalias/bin/setfacl/setfacl.1#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/bin/setfacl/setfacl.1,v 1.16 2006/06/09 17:03:24 maxim Exp $ +.\" $FreeBSD: src/bin/setfacl/setfacl.1,v 1.17 2006/09/17 17:40:07 ru Exp $ .\" .Dd January 7, 2001 .Dt SETFACL 1 @@ -44,8 +44,9 @@ .Nm utility sets discretionary access control information on the specified file(s). -If no files are specified, or the list consists of the -only "-", the file names are taken from the standard input. +If no files are specified, or the list consists of the only +.Sq Fl , +the file names are taken from the standard input. .Pp The following options are available: .Bl -tag -width indent ==== //depot/projects/soc2005/libalias/bin/sh/sh.1#4 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.122 2006/07/29 09:56:29 yar Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.123 2006/09/17 17:40:07 ru Exp $ .\" .Dd July 29, 2006 .Dt SH 1 @@ -305,7 +305,7 @@ Useful for debugging. .It Fl x Li xtrace Write each command -(preceded by the value of the +(preceded by the value of the .Ev PS4 variable) to standard error before it is executed. @@ -1985,7 +1985,7 @@ The .Ar action may be an empty string or a dash -.Pq Ar - ; +.Pq Ql - ; the former causes the specified signal to be ignored and the latter causes the default action to be taken. Omitting the @@ -2260,7 +2260,8 @@ .Sh AUTHORS This version of .Nm -was originally written by Kenneth Almquist. +was originally written by +.An Kenneth Almquist . .Sh BUGS The .Nm ==== //depot/projects/soc2005/libalias/contrib/com_err/compile_et.1#2 (text+ko) ==== @@ -1,7 +1,7 @@ .\" Copyright (c) 1988 Massachusetts Institute of Technology, .\" Student Information Processing Board. All rights reserved. .\" -.\" $FreeBSD: src/contrib/com_err/compile_et.1,v 1.4 2005/06/16 20:51:10 ru Exp $ +.\" $FreeBSD: src/contrib/com_err/compile_et.1,v 1.5 2006/09/17 18:52:27 ru Exp $ .\" .Dd November 22, 1988 .Os @@ -61,12 +61,6 @@ .Pp A ``#'' in the source file is treated as a comment character, and all remaining text to the end of the source line will be ignored. -.Sh BUGS -Since -.Nm compile_et -uses a very simple parser based on -.Xr yacc 1 , -its error recovery leaves much to be desired. .Sh SEE ALSO .Xr yacc 1 , .Xr com_err 3 @@ -74,3 +68,9 @@ .%A Ken Raeburn .%T "A Common Error Description Library for UNIX" .Re +.Sh BUGS +Since +.Nm compile_et +uses a very simple parser based on +.Xr yacc 1 , +its error recovery leaves much to be desired. ==== //depot/projects/soc2005/libalias/contrib/pnpinfo/pnpinfo.8#2 (text+ko) ==== @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/contrib/pnpinfo/pnpinfo.8,v 1.6 2005/06/16 20:51:10 ru Exp $ +.\" $FreeBSD: src/contrib/pnpinfo/pnpinfo.8,v 1.7 2006/09/17 18:52:28 ru Exp $ .\" .Dd January 7, 1996 .Dt PNPINFO 8 @@ -44,8 +44,6 @@ Some of the information, such as the vendor ID, serial number, I/O ports, IRQ, etc.\& are useful when configuring a kernel with ISA PnP devices. -.Sh BUGS -A few of the tags are unimplemented (Enough exist for 99% of PnP cards). .Sh SEE ALSO .Xr pnp 4 .Sh HISTORY @@ -55,3 +53,5 @@ .Fx 2.2 . .Sh AUTHORS .An Sujal M. Patel Aq smpatel@umiacs.umd.edu +.Sh BUGS +A few of the tags are unimplemented (Enough exist for 99% of PnP cards). ==== //depot/projects/soc2005/libalias/contrib/telnet/telnet/telnet.1#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)telnet.1 8.6 (Berkeley) 6/1/94 -.\" $FreeBSD: src/contrib/telnet/telnet/telnet.1,v 1.18 2005/02/28 12:46:52 tobez Exp $ +.\" $FreeBSD: src/contrib/telnet/telnet/telnet.1,v 1.19 2006/09/18 15:03:18 maxim Exp $ .\" -.Dd January 27, 2000 +.Dd September 18, 2006 .Dt TELNET 1 .Os .Sh NAME @@ -640,6 +640,13 @@ The first thing on the line is the name of the machine that is being connected to. +It may be the hostname or numeric address specified as the argument +.Ar host , +the canonical name of that string as determined by +.Xr getaddrinfo 3 , +or the string +.Dq DEFAULT +indicating all hosts. The rest of the line, and successive lines that begin with white space are assumed to be .Nm ==== //depot/projects/soc2005/libalias/games/fortune/datfiles/fortunes#5 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.225 2006/08/27 14:29:10 wilko Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.226 2006/09/17 21:36:16 phk Exp $ % ======================================================================= @@ -11086,6 +11086,9 @@ Anyone who considers protocol unimportant has never dealt with a cat. -- R. Heinlein % +Anyone who describes Islam as a religion as intolerant encourages violence. + -- Tasnim Aslam, Spokesman for Pakistani Foreign Ministry. +% Anyone who goes to a psychiatrist ought to have his head examined. -- Samuel Goldwyn % @@ -35522,6 +35525,10 @@ Never make anything simple and efficient when a way can be found to make it complex and wonderful. % +Never negotiate with the United States unless you have a nuclear +weapon. + -- Former deputy defense minister of India. +% Never offend people with style when you can offend them with substance. -- Sam Brown, "The Washington Post", January 26, 1977 % @@ -44439,6 +44446,10 @@ Swipple's Rule of Order: He who shouts the loudest has the floor. % +Symbolic representation of quantitative entities is doomed to its rightful +place of minor importance in a world where flowers and beautiful women abound. + -- Albert Einstein +% Symptom: Drinking fails to give taste and satisfaction, beer is unusually pale and clear. Problem: Glass empty. @@ -50450,6 +50461,10 @@ and there are few mistakes they have ever avoided. -- Winston Churchill, Parliament, August, 1945 % +There are four boxes to be used in defense of liberty: soap, ballot, +jury, and ammo. Please use in that order. + -- Ed Howdershelt +% There are four kinds of homicide: felonious, excusable, justifiable, and praiseworthy ... -- Ambrose Bierce, "The Devil's Dictionary" @@ -50876,6 +50891,11 @@ There is brutality and there is honesty. There is no such thing as brutal honesty. % +There is Good Information and there is Bad Information and the +Internet is generally pretty neutral about the difference. If you're +a computer, it's all just 0s and 1s. + -- Joel Achenbach +% There is grandeur in this view of life, with its several powers, having been originally breathed into a few forms or into one; and that, whilst this planet has gone cycling on according to the fixed law of ==== //depot/projects/soc2005/libalias/gnu/usr.bin/cc/Makefile.inc#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/Makefile.inc,v 1.63 2002/06/04 19:45:08 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/Makefile.inc,v 1.64 2006/09/18 17:08:31 imp Exp $ .include "../Makefile.inc" @@ -11,7 +11,11 @@ .include "Makefile.tgt" # Machine description. +.if ${TARGET_ARCH} == "arm" +MD_FILE= ../cc_tools/arm-diked.md +.else MD_FILE= ${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}.md +.endif target= ${TARGET_ARCH}-undermydesk-freebsd CFLAGS+= -DIN_GCC -DHAVE_CONFIG_H ==== //depot/projects/soc2005/libalias/gnu/usr.bin/cc/cc_int/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/cc_int/Makefile,v 1.48 2006/09/12 07:37:44 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/cc_int/Makefile,v 1.49 2006/09/18 17:08:32 imp Exp $ .include "../Makefile.inc" @@ -80,6 +80,10 @@ CFLAGS+= -DHAVE_CONFIG_H CFLAGS+= -DTARGET_NAME=\"${target}\" -DIN_GCC +.if ${TARGET_ARCH} == "arm" && defined(TARGET_BIG_ENDIAN) +CFLAGS += -DTARGET_ENDIAN_DEFAULT=ARM_FLAG_BIG_END +.endif + # c-pch.o needs extra defines. Replicate the rule here rather than # pollute compiler command line for all other files. c-pch.o: c-pch.c ==== //depot/projects/soc2005/libalias/gnu/usr.bin/cc/cc_tools/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.83 2006/09/11 05:12:12 imp Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.84 2006/09/18 17:08:32 imp Exp $ .include @@ -215,7 +215,9 @@ .if ${TARGET_ARCH} == "amd64" TARGET_INC= i386/biarch64.h .endif +.if ${TARGET_ARCH} != "arm" TARGET_INC+= ${GCC_CPU}/${GCC_CPU}.h +.endif .if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64" TARGET_INC+= ${GCC_CPU}/unix.h TARGET_INC+= ${GCC_CPU}/att.h @@ -235,7 +237,19 @@ TARGET_INC+= ${GCC_CPU}/sysv4.h .endif .endif +.if ${TARGET_ARCH} == "arm" +TARGET_INC+= ${GCC_CPU}/elf.h +TARGET_INC+= ${GCC_CPU}/aout.h +TARGET_INC+= ${GCC_CPU}/${GCC_CPU}.h +. if defined(TARGET_BIG_ENDIAN) +CFLAGS+= -DTARGET_ENDIAN_DEFAULT=ARM_FLAG_BIG_END +. endif +.endif +.if ${TARGET_ARCH} == "arm" +TARGET_INC+= freebsd-diked.h +.else TARGET_INC+= ${GCC_CPU}/freebsd.h +.endif .if ${TARGET_ARCH} == "amd64" TARGET_INC+= ${GCC_CPU}/x86-64.h TARGET_INC+= ${GCC_CPU}/freebsd64.h @@ -457,6 +471,26 @@ gcov-iov.h: echo "#define GCOV_VERSION ((gcov_unsigned_t)0x33303470)" >> ${.TARGET} +.if ${TARGET_ARCH} == "arm" +freebsd-diked.h: ${GCCDIR}/../../gnu/usr.bin/cc/cc_tools/arm-freebsd.h.diff + cp ${GCCDIR}/config/arm/freebsd.h freebsd.h + patch freebsd.h ${.ALLSRC} + mv freebsd.h ${.TARGET} +COMMONHDRS+= freebsd-diked.h +CLEANFILES+= freebsd.h.orig + +# Make sure freebsd-diked.h is built when tm.h is built for csu's sake +tm.h: freebsd-diked.h + +${MD_FILE}: ${MFILE} + cp ${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}.md . + ln -sf ${GCCDIR}/config/${GCC_CPU}/fpa.md . + ln -sf ${GCCDIR}/config/${GCC_CPU}/cirrus.md . + ln -sf ${GCCDIR}/config/${GCC_CPU}/iwmmxt.md . + patch ${GCC_CPU}.md ${.CURDIR}/arm.md.diff + mv ${GCC_CPU}.md ${.TARGET} +CLEANFILES+= arm-diked.md ${GCC_CPU}.md.orig fpa.md cirrus.md iwmmxt.md +.endif #----------------------------------------------------------------------- # General things. ==== //depot/projects/soc2005/libalias/gnu/usr.bin/gzip/gzip.h#2 (text+ko) ==== @@ -3,7 +3,7 @@ * This is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License, see the file COPYING. * - * $FreeBSD: src/gnu/usr.bin/gzip/gzip.h,v 1.4 2004/05/02 23:07:49 obrien Exp $ + * $FreeBSD: src/gnu/usr.bin/gzip/gzip.h,v 1.5 2006/09/19 14:01:47 simon Exp $ */ #if defined(__STDC__) || defined(PROTO) @@ -202,6 +202,8 @@ extern int to_stdout; /* output to stdout (-c) */ extern int save_orig_name; /* set if original name must be saved */ +#define MIN(a,b) ((a) <= (b) ? (a) : (b)) + #define get_byte() (inptr < insize ? inbuf[inptr++] : fill_inbuf(0)) #define try_byte() (inptr < insize ? inbuf[inptr++] : fill_inbuf(1)) ==== //depot/projects/soc2005/libalias/gnu/usr.bin/gzip/inflate.c#2 (text+ko) ==== @@ -97,7 +97,7 @@ */ #ifdef RCSID -static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/gzip/inflate.c,v 1.9 2004/08/13 05:38:44 tjr Exp $"; +static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/gzip/inflate.c,v 1.10 2006/09/19 14:01:47 simon Exp $"; #endif #include @@ -316,7 +316,7 @@ { *t = (struct huft *)NULL; *m = 0; - return 0; + return 2; } ==== //depot/projects/soc2005/libalias/gnu/usr.bin/gzip/unlzh.c#2 (text+ko) ==== @@ -4,7 +4,7 @@ */ #ifdef RCSID -static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/gzip/unlzh.c,v 1.5 1999/08/27 23:35:53 peter Exp $"; +static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/gzip/unlzh.c,v 1.6 2006/09/19 14:01:47 simon Exp $"; #endif #include @@ -148,13 +148,17 @@ unsigned i, k, len, ch, jutbits, avail, nextcode, mask; for (i = 1; i <= 16; i++) count[i] = 0; - for (i = 0; i < (unsigned)nchar; i++) count[bitlen[i]]++; + for (i = 0; i < (unsigned)nchar; i++) { + if (bitlen[i] > 16) + error("Bad table (case a)\n"); + else count[bitlen[i]]++; + } start[1] = 0; for (i = 1; i <= 16; i++) start[i + 1] = start[i] + (count[i] << (16 - i)); - if ((start[17] & 0xffff) != 0) - error("Bad table\n"); + if ((start[17] & 0xffff) != 0 || tablebits > 16) /* 16 for weight below */ + error("Bad table (case b)\n"); jutbits = 16 - tablebits; for (i = 1; i <= (unsigned)tablebits; i++) { @@ -168,15 +172,15 @@ i = start[tablebits + 1] >> jutbits; if (i != 0) { - k = 1 << tablebits; - while (i != k) table[i++] = 0; + k = MIN(1 << tablebits, DIST_BUFSIZE); + while (i < k) table[i++] = 0; } avail = nchar; mask = (unsigned) 1 << (15 - tablebits); for (ch = 0; ch < (unsigned)nchar; ch++) { if ((len = bitlen[ch]) == 0) continue; - nextcode = start[len] + weight[len]; + nextcode = MIN(start[len] + weight[len], DIST_BUFSIZE); if (len <= (unsigned)tablebits) { for (i = start[len]; i < nextcode; i++) table[i] = ch; } else { @@ -217,7 +221,7 @@ for (i = 0; i < 256; i++) pt_table[i] = c; } else { i = 0; - while (i < n) { + while (i < MIN(n,NPT)) { c = bitbuf >> (BITBUFSIZ - 3); if (c == 7) { mask = (unsigned) 1 << (BITBUFSIZ - 1 - 3); @@ -227,7 +231,7 @@ pt_len[i++] = c; if (i == i_special) { c = getbits(2); - while (--c >= 0) pt_len[i++] = 0; + while (--c >= 0 && i < NPT) pt_len[i++] = 0; } } while (i < nn) pt_len[i++] = 0; @@ -247,7 +251,7 @@ for (i = 0; i < 4096; i++) c_table[i] = c; } else { i = 0; - while (i < n) { + while (i < MIN(n,NC)) { c = pt_table[bitbuf >> (BITBUFSIZ - 8)]; if (c >= NT) { mask = (unsigned) 1 << (BITBUFSIZ - 1 - 8); @@ -255,14 +259,14 @@ if (bitbuf & mask) c = right[c]; else c = left [c]; mask >>= 1; - } while (c >= NT); + } while (c >= NT && (mask || c != left[c])); } fillbuf((int) pt_len[c]); if (c <= 2) { if (c == 0) c = 1; else if (c == 1) c = getbits(4) + 3; else c = getbits(CBIT) + 20; - while (--c >= 0) c_len[i++] = 0; + while (--c >= 0 && i < NC) c_len[i++] = 0; } else c_len[i++] = c - 2; } while (i < NC) c_len[i++] = 0; @@ -291,7 +295,7 @@ if (bitbuf & mask) j = right[j]; else j = left [j]; mask >>= 1; - } while (j >= NC); + } while (j >= NC && (mask || j != left[j])); } fillbuf((int) c_len[j]); return j; @@ -308,7 +312,7 @@ if (bitbuf & mask) j = right[j]; else j = left [j]; mask >>= 1; - } while (j >= NP); + } while (j >= NP && (mask || j != left[j])); } fillbuf((int) pt_len[j]); if (j != 0) j = ((unsigned) 1 << (j - 1)) + getbits((int) (j - 1)); @@ -355,7 +359,7 @@ while (--j >= 0) { buffer[r] = buffer[i]; i = (i + 1) & (DICSIZ - 1); - if (++r == count) return r; + if (++r >= count) return r; } for ( ; ; ) { c = decode_c(); @@ -365,14 +369,14 @@ } if (c <= UCHAR_MAX) { buffer[r] = c; - if (++r == count) return r; + if (++r >= count) return r; } else { j = c - (UCHAR_MAX + 1 - THRESHOLD); i = (r - decode_p() - 1) & (DICSIZ - 1); while (--j >= 0) { buffer[r] = buffer[i]; i = (i + 1) & (DICSIZ - 1); - if (++r == count) return r; + if (++r >= count) return r; } } } ==== //depot/projects/soc2005/libalias/gnu/usr.bin/gzip/unpack.c#2 (text+ko) ==== @@ -5,14 +5,13 @@ */ #ifdef RCSID -static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/gzip/unpack.c,v 1.6 1999/08/27 23:35:54 peter Exp $"; +static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/gzip/unpack.c,v 1.7 2006/09/19 14:01:47 simon Exp $"; #endif #include "tailor.h" #include "gzip.h" #include "crypt.h" -#define MIN(a,b) ((a) <= (b) ? (a) : (b)) /* The arguments must not have side effects. */ #define MAX_BITLEN 25 @@ -132,7 +131,7 @@ /* Remember where the literals of this length start in literal[] : */ lit_base[len] = base; /* And read the literals: */ - for (n = leaves[len]; n > 0; n--) { + for (n = leaves[len]; n > 0 && base < LITERALS; n--) { literal[base++] = (uch)get_byte(); } } @@ -168,7 +167,7 @@ prefixp = &prefix_len[1< prefix_len) *--prefixp = (uch)len; } /* The length of all other codes is unknown: */ while (prefixp > prefix_len) *--prefixp = 0; ==== //depot/projects/soc2005/libalias/lib/libarchive/tar.5#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libarchive/tar.5,v 1.15 2006/07/29 23:51:10 kientzle Exp $ +.\" $FreeBSD: src/lib/libarchive/tar.5,v 1.16 2006/09/17 21:27:33 ru Exp $ .\" .Dd May 20, 2004 .Dt TAR 5 @@ -399,7 +399,8 @@ .Va struct stat . .It Cm LIBARCHIVE.xattr. Ns Ar namespace Ns . Ns Ar key Libarchive stores POSIX.1e-style extended attributes using -keys of this form. The +keys of this form. +The .Ar key value is URL-encoded: All non-ASCII characters and the two special characters ==== //depot/projects/soc2005/libalias/lib/libbsm/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/lib/libbsm/Makefile,v 1.3 2006/09/01 05:21:45 rwatson Exp $ +# $FreeBSD: src/lib/libbsm/Makefile,v 1.4 2006/09/19 08:30:34 rwatson Exp $ # OPENBSMDIR= ${.CURDIR}/../../contrib/openbsm @@ -39,6 +39,7 @@ au_free_token.3 \ au_io.3 \ au_mask.3 \ + au_open.3 \ au_token.3 \ au_user.3 \ audit_submit.3 @@ -84,6 +85,10 @@ au_mask.3 au_preselect.3 \ au_mask.3 getauditflagsbin.3 \ au_mask.3 getauditflagschar.3 \ + au_open.3 au_write.3 \ + au_open.3 au_close.3 \ + au_open.3 au_close_buffer.3 \ + au_open.3 au_close_token.3 \ au_user.3 setauuser.3 \ au_user.3 endauuser.3 \ au_user.3 getauuserent.3 \ ==== //depot/projects/soc2005/libalias/lib/libc/gen/getgrent.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ * */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/getgrent.c,v 1.35 2006/07/14 17:45:33 maxim Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getgrent.c,v 1.36 2006/09/18 09:34:48 maxim Exp $"); #include "namespace.h" #include @@ -788,7 +788,7 @@ } if (rv == NS_SUCCESS && retval != NULL) *(struct group **)retval = grp; - else if (*errnop == ERANGE) + else if (rv == NS_RETURN && *errnop == ERANGE && st->fp != NULL) fseeko(st->fp, pos, SEEK_SET); return (rv); } @@ -1342,7 +1342,7 @@ } if (rv == NS_SUCCESS && retval != NULL) *(struct group **)retval = grp; - else if (*errnop == ERANGE) + else if (rv == NS_RETURN && *errnop == ERANGE && st->fp != NULL) fseeko(st->fp, pos, SEEK_SET); return (rv); #undef set_lookup_type ==== //depot/projects/soc2005/libalias/lib/libc/gen/pwcache.3#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)pwcache.3 8.1 (Berkeley) 6/9/93 -.\" $FreeBSD: src/lib/libc/gen/pwcache.3,v 1.13 2005/11/23 15:44:42 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/pwcache.3,v 1.14 2006/09/17 21:27:33 ru Exp $ .\" -.Dd Dd March 22, 2002 +.Dd March 22, 2002 .Dt PWCACHE 3 .Os .Sh NAME ==== //depot/projects/soc2005/libalias/lib/libc/gen/vis.3#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)vis.3 8.1 (Berkeley) 6/9/93 -.\" $FreeBSD: src/lib/libc/gen/vis.3,v 1.28 2006/04/09 16:39:43 brueffer Exp $ +.\" $FreeBSD: src/lib/libc/gen/vis.3,v 1.29 2006/09/17 21:27:33 ru Exp $ .\" .Dd April 9, 2006 .Dt VIS 3 @@ -243,7 +243,7 @@ .Dv NL No (012) .It Li \er .Dv CR No (015) -.It Li \es +.It Li \es .Dv SP No (040) .It Li \et .Dv HT No (011) ==== //depot/projects/soc2005/libalias/lib/libc/i386/sys/i386_set_watch.3#2 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/i386/sys/i386_set_watch.3,v 1.8 2006/05/03 17:33:29 bsd Exp $ +.\" $FreeBSD: src/lib/libc/i386/sys/i386_set_watch.3,v 1.9 2006/09/17 21:27:33 ru Exp $ .\" .Dd August 24, 2000 .Os @@ -57,12 +57,12 @@ arguments. The .Fa watchnum -argument specifies which watch register is used, 0, 1, 2, 3, or -1. +argument specifies which watch register is used, 0, 1, 2, 3, or \-1. If .Fa watchnum -is -1, a free watch register is found and used. +is \-1, a free watch register is found and used. If there are no free -watch registers, an error code of -1 is returned. +watch registers, an error code of \-1 is returned. The .Fa watchaddr argument @@ -89,7 +89,7 @@ On success, the >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Sep 19 20:07:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0798316A494; Tue, 19 Sep 2006 20:07:45 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 91BF416A47C for ; Tue, 19 Sep 2006 20:07:44 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E15A743D6B for ; Tue, 19 Sep 2006 20:07:35 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8JK7ZME094942 for ; Tue, 19 Sep 2006 20:07:35 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8JK7Xxx094939 for perforce@freebsd.org; Tue, 19 Sep 2006 20:07:33 GMT (envelope-from mjacob@freebsd.org) Date: Tue, 19 Sep 2006 20:07:33 GMT Message-Id: <200609192007.k8JK7Xxx094939@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 106356 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Sep 2006 20:07:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=106356 Change 106356 by mjacob@newisp on 2006/09/19 20:06:34 IFC Affected files ... .. //depot/projects/newisp/amd64/amd64/vm_machdep.c#2 integrate .. //depot/projects/newisp/cam/cam_xpt.c#3 integrate .. //depot/projects/newisp/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/newisp/compat/freebsd32/freebsd32_proto.h#4 integrate .. //depot/projects/newisp/compat/freebsd32/freebsd32_syscall.h#4 integrate .. //depot/projects/newisp/compat/freebsd32/freebsd32_syscalls.c#4 integrate .. //depot/projects/newisp/compat/freebsd32/freebsd32_sysent.c#4 integrate .. //depot/projects/newisp/compat/freebsd32/syscalls.master#4 integrate .. //depot/projects/newisp/conf/files#2 integrate .. //depot/projects/newisp/conf/kern.pre.mk#2 integrate .. //depot/projects/newisp/contrib/dev/ath/freebsd/ah_if.m#2 delete .. //depot/projects/newisp/contrib/dev/ath/freebsd/ah_osdep.c#2 delete .. //depot/projects/newisp/contrib/dev/ath/freebsd/ah_osdep.h#2 delete .. //depot/projects/newisp/dev/ath/ah_osdep.c#1 branch .. //depot/projects/newisp/dev/ath/ah_osdep.h#1 branch .. //depot/projects/newisp/dev/ath/if_ath.c#2 integrate .. //depot/projects/newisp/dev/ath/if_athvar.h#2 integrate .. //depot/projects/newisp/dev/bce/if_bce.c#2 integrate .. //depot/projects/newisp/dev/bge/if_bge.c#5 integrate .. //depot/projects/newisp/dev/bktr/bktr_i2c.h#2 integrate .. //depot/projects/newisp/dev/em/if_em.c#7 integrate .. //depot/projects/newisp/dev/hwpmc/hwpmc_mod.c#2 integrate .. //depot/projects/newisp/dev/ixgb/if_ixgb.c#2 integrate .. //depot/projects/newisp/dev/kbdmux/kbdmux.c#2 integrate .. //depot/projects/newisp/dev/nfe/if_nfe.c#3 integrate .. //depot/projects/newisp/dev/nge/if_nge.c#3 integrate .. //depot/projects/newisp/dev/re/if_re.c#4 integrate .. //depot/projects/newisp/dev/stge/if_stge.c#2 integrate .. //depot/projects/newisp/dev/ti/if_ti.c#3 integrate .. //depot/projects/newisp/dev/txp/if_txp.c#2 integrate .. //depot/projects/newisp/dev/uart/uart_kbd_sun.c#2 integrate .. //depot/projects/newisp/dev/vge/if_vge.c#3 integrate .. //depot/projects/newisp/fs/devfs/devfs.h#2 integrate .. //depot/projects/newisp/fs/devfs/devfs_devs.c#2 integrate .. //depot/projects/newisp/fs/devfs/devfs_vfsops.c#2 integrate .. //depot/projects/newisp/fs/devfs/devfs_vnops.c#2 integrate .. //depot/projects/newisp/kern/init_sysent.c#4 integrate .. //depot/projects/newisp/kern/kern_acct.c#2 integrate .. //depot/projects/newisp/kern/kern_jail.c#2 integrate .. //depot/projects/newisp/kern/kern_mbuf.c#2 integrate .. //depot/projects/newisp/kern/kern_proc.c#2 integrate .. //depot/projects/newisp/kern/kern_prot.c#2 integrate .. //depot/projects/newisp/kern/subr_prf.c#2 integrate .. //depot/projects/newisp/kern/syscalls.c#4 integrate .. //depot/projects/newisp/kern/syscalls.master#4 integrate .. //depot/projects/newisp/kern/systrace_args.c#4 integrate .. //depot/projects/newisp/kern/vfs_mount.c#2 integrate .. //depot/projects/newisp/kern/vfs_syscalls.c#2 integrate .. //depot/projects/newisp/modules/ath/Makefile#2 integrate .. //depot/projects/newisp/modules/ath_hal/Makefile#2 integrate .. //depot/projects/newisp/modules/ath_rate_amrr/Makefile#2 integrate .. //depot/projects/newisp/modules/ath_rate_onoe/Makefile#2 integrate .. //depot/projects/newisp/modules/ath_rate_sample/Makefile#2 integrate .. //depot/projects/newisp/net/if_bridge.c#2 integrate .. //depot/projects/newisp/net/if_vlan.c#2 integrate .. //depot/projects/newisp/net/if_vlan_var.h#2 integrate .. //depot/projects/newisp/net80211/ieee80211_input.c#2 integrate .. //depot/projects/newisp/net80211/ieee80211_output.c#2 integrate .. //depot/projects/newisp/netgraph/ng_vlan.c#2 integrate .. //depot/projects/newisp/netinet/tcp_usrreq.c#2 integrate .. //depot/projects/newisp/security/audit/audit.c#4 integrate .. //depot/projects/newisp/security/audit/audit_bsm.c#4 integrate .. //depot/projects/newisp/security/audit/audit_private.h#3 integrate .. //depot/projects/newisp/security/audit/audit_syscalls.c#3 integrate .. //depot/projects/newisp/security/audit/audit_worker.c#2 integrate .. //depot/projects/newisp/security/mac/mac_internal.h#2 integrate .. //depot/projects/newisp/sys/mbuf.h#4 integrate .. //depot/projects/newisp/sys/syscall.h#4 integrate .. //depot/projects/newisp/sys/syscall.mk#4 integrate .. //depot/projects/newisp/sys/sysctl.h#2 integrate .. //depot/projects/newisp/sys/sysproto.h#4 integrate .. //depot/projects/newisp/ufs/ufs/ufs_quota.c#2 integrate Differences ... ==== //depot/projects/newisp/amd64/amd64/vm_machdep.c#2 (text+ko) ==== @@ -41,10 +41,11 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.251 2006/07/24 12:24:56 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.252 2006/09/17 14:54:14 davidxu Exp $"); #include "opt_isa.h" #include "opt_cpu.h" +#include "opt_compat.h" #include #include @@ -69,6 +70,7 @@ #include #include #include +#include #include #include @@ -79,6 +81,12 @@ #include +#ifdef COMPAT_IA32 + +extern struct sysentvec ia32_freebsd_sysvec; + +#endif + static void cpu_reset_real(void); #ifdef SMP static void cpu_reset_proxy(void); @@ -320,6 +328,28 @@ */ cpu_thread_clean(td); +#ifdef COMPAT_IA32 + if (td->td_proc->p_sysent == &ia32_freebsd_sysvec) { + /* + * Set the trap frame to point at the beginning of the uts + * function. + */ + td->td_frame->tf_rbp = 0; + td->td_frame->tf_rsp = + (((uintptr_t)stack->ss_sp + stack->ss_size - 4) & ~0x0f) - 4; + td->td_frame->tf_rip = (uintptr_t)entry; + + /* + * Pass the address of the mailbox for this kse to the uts + * function as a parameter on the stack. + */ + suword32((void *)(td->td_frame->tf_rsp + sizeof(int32_t)), + (uint32_t)(uintptr_t)arg); + + return; + } +#endif + /* * Set the trap frame to point at the beginning of the uts * function. @@ -344,6 +374,19 @@ if ((u_int64_t)tls_base >= VM_MAXUSER_ADDRESS) return (EINVAL); +#ifdef COMPAT_IA32 + if (td->td_proc->p_sysent == &ia32_freebsd_sysvec) { + if (td == curthread) { + critical_enter(); + td->td_pcb->pcb_gsbase = (register_t)tls_base; + wrmsr(MSR_KGSBASE, td->td_pcb->pcb_gsbase); + critical_exit(); + } else { + td->td_pcb->pcb_gsbase = (register_t)tls_base; + } + return (0); + } +#endif if (td == curthread) { critical_enter(); td->td_pcb->pcb_fsbase = (register_t)tls_base; ==== //depot/projects/newisp/cam/cam_xpt.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.164 2006/09/11 17:57:23 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.165 2006/09/16 17:35:47 mjacob Exp $"); #include #include @@ -592,6 +592,10 @@ CAM_QUIRK_NOHILUNS, /*mintags*/2, /*maxtags*/255 }, { + { T_ENCLOSURE, SIP_MEDIA_FIXED, "DP", "BACKPLANE", "*" }, + CAM_QUIRK_NOLUNS, /*mintags*/0, /*maxtags*/0 + }, + { /* Default tagged queuing parameters for all devices */ { T_ANY, SIP_MEDIA_REMOVABLE|SIP_MEDIA_FIXED, ==== //depot/projects/newisp/cam/scsi/scsi_da.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.191 2006/07/14 13:58:32 delphij Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.192 2006/09/16 21:21:07 mjacob Exp $"); #include @@ -1519,15 +1519,30 @@ block_size = scsi_4btoul(rcaplong->length); maxsector = scsi_8btou64(rcaplong->addr); } - dasetgeom(periph, block_size, maxsector); - dp = &softc->params; - snprintf(announce_buf, sizeof(announce_buf), - "%juMB (%ju %u byte sectors: %dH %dS/T %dC)", - (uintmax_t) (((uintmax_t)dp->secsize * - dp->sectors) / (1024*1024)), - (uintmax_t)dp->sectors, - dp->secsize, dp->heads, dp->secs_per_track, - dp->cylinders); + + /* + * Because GEOM code just will panic us if we + * give them an 'illegal' value we'll avoid that + * here. + */ + if (block_size >= MAXPHYS || block_size == 0) { + xpt_print_path(periph->path); + printf("unsupportable block size %ju\n", + (uintmax_t) block_size); + announce_buf[0] = '\0'; + cam_periph_invalidate(periph); + } else { + dasetgeom(periph, block_size, maxsector); + dp = &softc->params; + snprintf(announce_buf, sizeof(announce_buf), + "%juMB (%ju %u byte sectors: %dH %dS/T " + "%dC)", (uintmax_t) + (((uintmax_t)dp->secsize * + dp->sectors) / (1024*1024)), + (uintmax_t)dp->sectors, + dp->secsize, dp->heads, + dp->secs_per_track, dp->cylinders); + } } else { int error; ==== //depot/projects/newisp/compat/freebsd32/freebsd32_proto.h#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.61 2006/09/09 01:22:13 davidxu Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.73 2006/09/03 16:17:49 rwatson Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.62 2006/09/17 13:29:35 rwatson Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.75 2006/09/17 13:28:11 rwatson Exp */ #ifndef _FREEBSD32_SYSPROTO_H_ @@ -419,7 +419,7 @@ #define FREEBSD32_SYS_AUE_freebsd32_recvmsg AUE_RECVMSG #define FREEBSD32_SYS_AUE_freebsd32_sendmsg AUE_SENDMSG #define FREEBSD32_SYS_AUE_freebsd32_recvfrom AUE_RECVFROM -#define FREEBSD32_SYS_AUE_freebsd32_sigaltstack AUE_SIGPENDING +#define FREEBSD32_SYS_AUE_freebsd32_sigaltstack AUE_SIGALTSTACK #define FREEBSD32_SYS_AUE_freebsd32_execve AUE_EXECVE #define FREEBSD32_SYS_AUE_freebsd32_setitimer AUE_SETITIMER #define FREEBSD32_SYS_AUE_freebsd32_getitimer AUE_GETITIMER ==== //depot/projects/newisp/compat/freebsd32/freebsd32_syscall.h#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.59 2006/09/09 01:22:13 davidxu Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.73 2006/09/03 16:17:49 rwatson Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.60 2006/09/17 13:29:35 rwatson Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.75 2006/09/17 13:28:11 rwatson Exp */ #define FREEBSD32_SYS_syscall 0 ==== //depot/projects/newisp/compat/freebsd32/freebsd32_syscalls.c#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.50 2006/09/09 01:22:13 davidxu Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.73 2006/09/03 16:17:49 rwatson Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.51 2006/09/17 13:29:35 rwatson Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.75 2006/09/17 13:28:11 rwatson Exp */ const char *freebsd32_syscallnames[] = { ==== //depot/projects/newisp/compat/freebsd32/freebsd32_sysent.c#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.60 2006/09/09 01:22:13 davidxu Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.73 2006/09/03 16:17:49 rwatson Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.61 2006/09/17 13:29:35 rwatson Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.75 2006/09/17 13:28:11 rwatson Exp */ #include "opt_compat.h" @@ -85,7 +85,7 @@ { AS(setlogin_args), (sy_call_t *)setlogin, AUE_SETLOGIN, NULL, 0, 0 }, /* 50 = setlogin */ { AS(acct_args), (sy_call_t *)acct, AUE_ACCT, NULL, 0, 0 }, /* 51 = acct */ { compat(0,freebsd32_sigpending), AUE_SIGPENDING, NULL, 0, 0 }, /* 52 = old freebsd32_sigpending */ - { AS(freebsd32_sigaltstack_args), (sy_call_t *)freebsd32_sigaltstack, AUE_SIGPENDING, NULL, 0, 0 }, /* 53 = freebsd32_sigaltstack */ + { AS(freebsd32_sigaltstack_args), (sy_call_t *)freebsd32_sigaltstack, AUE_SIGALTSTACK, NULL, 0, 0 }, /* 53 = freebsd32_sigaltstack */ { AS(ioctl_args), (sy_call_t *)ioctl, AUE_IOCTL, NULL, 0, 0 }, /* 54 = ioctl */ { AS(reboot_args), (sy_call_t *)reboot, AUE_REBOOT, NULL, 0, 0 }, /* 55 = reboot */ { AS(revoke_args), (sy_call_t *)revoke, AUE_REVOKE, NULL, 0, 0 }, /* 56 = revoke */ ==== //depot/projects/newisp/compat/freebsd32/syscalls.master#4 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.74 2006/09/09 01:22:13 davidxu Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.75 2006/09/17 13:28:11 rwatson Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -124,7 +124,7 @@ 50 AUE_SETLOGIN NOPROTO { int setlogin(char *namebuf); } 51 AUE_ACCT NOPROTO { int acct(char *path); } 52 AUE_SIGPENDING COMPAT { int freebsd32_sigpending(void); } -53 AUE_SIGPENDING STD { int freebsd32_sigaltstack( \ +53 AUE_SIGALTSTACK STD { int freebsd32_sigaltstack( \ struct sigaltstack32 *ss, \ struct sigaltstack32 *oss); } 54 AUE_IOCTL NOPROTO { int ioctl(int fd, u_long com, \ ==== //depot/projects/newisp/conf/files#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1140 2006/08/14 21:09:37 imp Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1142 2006/09/18 17:23:35 sam Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -255,8 +255,6 @@ contrib/dev/acpica/utobject.c optional acpi contrib/dev/acpica/utstate.c optional acpi contrib/dev/acpica/utxface.c optional acpi -contrib/dev/ath/freebsd/ah_osdep.c optional ath_hal \ - compile-with "${NORMAL_C} -I$S/contrib/dev/ath/freebsd" contrib/ipfilter/netinet/fil.c optional ipfilter inet \ compile-with "${NORMAL_C} -I$S/contrib/ipfilter" contrib/ipfilter/netinet/ip_auth.c optional ipfilter inet \ @@ -478,15 +476,17 @@ dev/ata/atapi-cd.c optional atapicd dev/ata/atapi-fd.c optional atapifd dev/ata/atapi-tape.c optional atapist +dev/ath/ah_osdep.c optional ath_hal \ + compile-with "${NORMAL_C} -I$S/dev/ath" dev/ath/ath_rate/amrr/amrr.c optional ath_rate_amrr dev/ath/ath_rate/onoe/onoe.c optional ath_rate_onoe \ - compile-with "${NORMAL_C} -I$S/contrib/dev/ath/freebsd" + compile-with "${NORMAL_C} -I$S/dev/ath" dev/ath/ath_rate/sample/sample.c optional ath_rate_sample \ - compile-with "${NORMAL_C} -I$S/contrib/dev/ath/freebsd" + compile-with "${NORMAL_C} -I$S/dev/ath" dev/ath/if_ath.c optional ath \ - compile-with "${NORMAL_C} -I$S/contrib/dev/ath/freebsd" + compile-with "${NORMAL_C} -I$S/dev/ath" dev/ath/if_ath_pci.c optional ath pci \ - compile-with "${NORMAL_C} -I$S/contrib/dev/ath/freebsd" + compile-with "${NORMAL_C} -I$S/dev/ath" dev/awi/am79c930.c optional awi dev/awi/awi.c optional awi dev/awi/if_awi_pccard.c optional awi pccard ==== //depot/projects/newisp/conf/kern.pre.mk#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.76 2006/07/17 18:43:16 obrien Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.78 2006/09/18 16:49:14 sam Exp $ # Part of a unified Makefile for building kernels. This part contains all # of the definitions that need to be before %BEFORE_DEPEND. @@ -58,12 +58,6 @@ # include path into contrib'ed source files. INCLUDES+= -I$S/contrib/altq -# ... and the same for Atheros HAL when the author builds it from -# non-distributable sources. -.if defined(ATH_BUILDING_FROM_SOURCE) -INCLUDES+= -I$S/contrib/dev/ath -.endif - .if make(depend) || make(kernel-depend) # ... and the same for ipfilter @@ -73,7 +67,7 @@ INCLUDES+= -I$S/contrib/pf # ... and the same for Atheros HAL -INCLUDES+= -I$S/contrib/dev/ath/freebsd +INCLUDES+= -I$S/dev/ath # ... and the same for the NgATM stuff INCLUDES+= -I$S/contrib/ngatm ==== //depot/projects/newisp/dev/ath/if_ath.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.153 2006/08/10 16:31:37 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.155 2006/09/18 16:26:19 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -117,7 +117,6 @@ static void ath_fatal_proc(void *, int); static void ath_rxorn_proc(void *, int); static void ath_bmiss_proc(void *, int); -static void ath_radar_proc(void *, int); static int ath_key_alloc(struct ieee80211com *, const struct ieee80211_key *, ieee80211_keyix *, ieee80211_keyix *); @@ -257,7 +256,7 @@ } while (0) #define KEYPRINTF(sc, ix, hk, mac) do { \ if (sc->sc_debug & ATH_DEBUG_KEYCACHE) \ - ath_keyprint(__func__, ix, hk, mac); \ + ath_keyprint(sc, __func__, ix, hk, mac); \ } while (0) static void ath_printrxbuf(struct ath_buf *bf, u_int ix, int); static void ath_printtxbuf(struct ath_buf *bf, u_int qnum, u_int ix, int done); @@ -345,18 +344,6 @@ */ for (i = 0; i < sc->sc_keymax; i++) ath_hal_keyreset(ah, i); - /* - * Mark key cache slots associated with global keys - * as in use. If we knew TKIP was not to be used we - * could leave the +32, +64, and +32+64 slots free. - * XXX only for splitmic. - */ - for (i = 0; i < IEEE80211_WEP_NKID; i++) { - setbit(sc->sc_keymap, i); - setbit(sc->sc_keymap, i+32); - setbit(sc->sc_keymap, i+64); - setbit(sc->sc_keymap, i+32+64); - } /* * Collect the channel list using the default country @@ -403,7 +390,6 @@ TASK_INIT(&sc->sc_rxorntask, 0, ath_rxorn_proc, sc); TASK_INIT(&sc->sc_bmisstask, 0, ath_bmiss_proc, sc); TASK_INIT(&sc->sc_bstucktask,0, ath_bstuck_proc, sc); - TASK_INIT(&sc->sc_radartask, 0, ath_radar_proc, sc); /* * Allocate hardware transmit queues: one queue for @@ -545,12 +531,30 @@ */ if (ath_hal_ciphersupported(ah, HAL_CIPHER_MIC)) ic->ic_caps |= IEEE80211_C_TKIPMIC; - if (ath_hal_tkipsplit(ah)) + /* + * If the h/w supports storing tx+rx MIC keys + * in one cache slot automatically enable use. + */ + if (ath_hal_hastkipsplit(ah) || + !ath_hal_settkipsplit(ah, AH_FALSE)) sc->sc_splitmic = 1; } sc->sc_hasclrkey = ath_hal_ciphersupported(ah, HAL_CIPHER_CLR); sc->sc_mcastkey = ath_hal_getmcastkeysearch(ah); /* + * Mark key cache slots associated with global keys + * as in use. If we knew TKIP was not to be used we + * could leave the +32, +64, and +32+64 slots free. + */ + for (i = 0; i < IEEE80211_WEP_NKID; i++) { + setbit(sc->sc_keymap, i); + setbit(sc->sc_keymap, i+64); + if (sc->sc_splitmic) { + setbit(sc->sc_keymap, i+32); + setbit(sc->sc_keymap, i+32+64); + } + } + /* * TPC support can be done either with a global cap or * per-packet support. The latter is not available on * all parts. We're a bit pedantic here as all parts @@ -878,24 +882,6 @@ } } -static void -ath_radar_proc(void *arg, int pending) -{ - struct ath_softc *sc = arg; - struct ifnet *ifp = sc->sc_ifp; - struct ath_hal *ah = sc->sc_ah; - HAL_CHANNEL hchan; - - if (ath_hal_procdfs(ah, &hchan)) { - if_printf(ifp, "radar detected on channel %u/0x%x/0x%x\n", - hchan.channel, hchan.channelFlags, hchan.privFlags); - /* - * Initiate channel change. - */ - /* XXX not yet */ - } -} - static u_int ath_chan2flags(struct ieee80211com *ic, struct ieee80211_channel *chan) { @@ -1323,7 +1309,7 @@ #ifdef ATH_DEBUG static void -ath_keyprint(const char *tag, u_int ix, +ath_keyprint(struct ath_softc *sc, const char *tag, u_int ix, const HAL_KEYVAL *hk, const u_int8_t mac[IEEE80211_ADDR_LEN]) { static const char *ciphers[] = { @@ -1341,9 +1327,16 @@ printf("%02x", hk->kv_val[i]); printf(" mac %s", ether_sprintf(mac)); if (hk->kv_type == HAL_CIPHER_TKIP) { - printf(" mic "); + printf(" %s ", sc->sc_splitmic ? "mic" : "rxmic"); for (i = 0; i < sizeof(hk->kv_mic); i++) printf("%02x", hk->kv_mic[i]); +#if HAL_ABI_VERSION > 0x06052200 + if (!sc->sc_splitmic) { + printf(" txmic "); + for (i = 0; i < sizeof(hk->kv_txmic); i++) + printf("%02x", hk->kv_txmic[i]); + } +#endif } printf("\n"); } @@ -1364,21 +1357,34 @@ KASSERT(k->wk_cipher->ic_cipher == IEEE80211_CIPHER_TKIP, ("got a non-TKIP key, cipher %u", k->wk_cipher->ic_cipher)); - KASSERT(sc->sc_splitmic, ("key cache !split")); if ((k->wk_flags & IEEE80211_KEY_XR) == IEEE80211_KEY_XR) { - /* - * TX key goes at first index, RX key at the rx index. - * The hal handles the MIC keys at index+64. - */ - memcpy(hk->kv_mic, k->wk_txmic, sizeof(hk->kv_mic)); - KEYPRINTF(sc, k->wk_keyix, hk, zerobssid); - if (!ath_hal_keyset(ah, k->wk_keyix, hk, zerobssid)) - return 0; + if (sc->sc_splitmic) { + /* + * TX key goes at first index, RX key at the rx index. + * The hal handles the MIC keys at index+64. + */ + memcpy(hk->kv_mic, k->wk_txmic, sizeof(hk->kv_mic)); + KEYPRINTF(sc, k->wk_keyix, hk, zerobssid); + if (!ath_hal_keyset(ah, k->wk_keyix, hk, zerobssid)) + return 0; - memcpy(hk->kv_mic, k->wk_rxmic, sizeof(hk->kv_mic)); - KEYPRINTF(sc, k->wk_keyix+32, hk, mac); - /* XXX delete tx key on failure? */ - return ath_hal_keyset(ah, k->wk_keyix+32, hk, mac); + memcpy(hk->kv_mic, k->wk_rxmic, sizeof(hk->kv_mic)); + KEYPRINTF(sc, k->wk_keyix+32, hk, mac); + /* XXX delete tx key on failure? */ + return ath_hal_keyset(ah, k->wk_keyix+32, hk, mac); + } else { + /* + * Room for both TX+RX MIC keys in one key cache + * slot, just set key at the first index; the hal + * will handle the reset. + */ + memcpy(hk->kv_mic, k->wk_rxmic, sizeof(hk->kv_mic)); +#if HAL_ABI_VERSION > 0x06052200 + memcpy(hk->kv_txmic, k->wk_txmic, sizeof(hk->kv_txmic)); +#endif + KEYPRINTF(sc, k->wk_keyix, hk, mac); + return ath_hal_keyset(ah, k->wk_keyix, hk, mac); + } } else if (k->wk_flags & IEEE80211_KEY_XR) { /* * TX/RX key goes at first index. @@ -1447,8 +1453,7 @@ mac = mac0; if (hk.kv_type == HAL_CIPHER_TKIP && - (k->wk_flags & IEEE80211_KEY_SWMIC) == 0 && - sc->sc_splitmic) { + (k->wk_flags & IEEE80211_KEY_SWMIC) == 0) { return ath_keyset_tkip(sc, k, &hk, mac); } else { KEYPRINTF(sc, k->wk_keyix, &hk, mac); @@ -1513,6 +1518,54 @@ } /* + * Allocate tx/rx key slots for TKIP. We allocate two slots for + * each key, one for decrypt/encrypt and the other for the MIC. + */ +static u_int16_t +key_alloc_pair(struct ath_softc *sc, + ieee80211_keyix *txkeyix, ieee80211_keyix *rxkeyix) +{ +#define N(a) (sizeof(a)/sizeof(a[0])) + u_int i, keyix; + + KASSERT(!sc->sc_splitmic, ("key cache split")); + /* XXX could optimize */ + for (i = 0; i < N(sc->sc_keymap)/4; i++) { + u_int8_t b = sc->sc_keymap[i]; + if (b != 0xff) { + /* + * One or more slots in this byte are free. + */ + keyix = i*NBBY; + while (b & 1) { + again: + keyix++; + b >>= 1; + } + if (isset(sc->sc_keymap, keyix+64)) { + /* full pair unavailable */ + /* XXX statistic */ + if (keyix == (i+1)*NBBY) { + /* no slots were appropriate, advance */ + continue; + } + goto again; + } + setbit(sc->sc_keymap, keyix); + setbit(sc->sc_keymap, keyix+64); + DPRINTF(sc, ATH_DEBUG_KEYCACHE, + "%s: key pair %u,%u\n", + __func__, keyix, keyix+64); + *txkeyix = *rxkeyix = keyix; + return 1; + } + } + DPRINTF(sc, ATH_DEBUG_KEYCACHE, "%s: out of pair space\n", __func__); + return 0; +#undef N +} + +/* * Allocate a single key cache slot. */ static int @@ -1597,8 +1650,11 @@ if (k->wk_flags & IEEE80211_KEY_SWCRYPT) { return key_alloc_single(sc, keyix, rxkeyix); } else if (k->wk_cipher->ic_cipher == IEEE80211_CIPHER_TKIP && - (k->wk_flags & IEEE80211_KEY_SWMIC) == 0 && sc->sc_splitmic) { - return key_alloc_2pair(sc, keyix, rxkeyix); + (k->wk_flags & IEEE80211_KEY_SWMIC) == 0) { + if (sc->sc_splitmic) + return key_alloc_2pair(sc, keyix, rxkeyix); + else + return key_alloc_pair(sc, keyix, rxkeyix); } else { return key_alloc_single(sc, keyix, rxkeyix); } @@ -1631,11 +1687,13 @@ */ clrbit(sc->sc_keymap, keyix); if (cip->ic_cipher == IEEE80211_CIPHER_TKIP && - (k->wk_flags & IEEE80211_KEY_SWMIC) == 0 && - sc->sc_splitmic) { + (k->wk_flags & IEEE80211_KEY_SWMIC) == 0) { clrbit(sc->sc_keymap, keyix+64); /* TX key MIC */ - clrbit(sc->sc_keymap, keyix+32); /* RX key */ - clrbit(sc->sc_keymap, keyix+32+64); /* RX key MIC */ + if (sc->sc_splitmic) { + /* +32 for RX key, +32+64 for RX key MIC */ + clrbit(sc->sc_keymap, keyix+32); + clrbit(sc->sc_keymap, keyix+32+64); + } } } return 1; @@ -3082,8 +3140,6 @@ /* rx signal state monitoring */ ath_hal_rxmonitor(ah, &sc->sc_halstats, &sc->sc_curchan); - if (ath_hal_radar_event(ah)) - taskqueue_enqueue(sc->sc_tq, &sc->sc_radartask); if (ngood) sc->sc_lastrx = tsf; ==== //depot/projects/newisp/dev/ath/if_athvar.h#2 (text+ko) ==== @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.51 2006/08/17 22:50:32 imp Exp $ + * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.53 2006/09/18 16:26:19 sam Exp $ */ /* @@ -256,7 +256,6 @@ u_int32_t *sc_rxlink; /* link ptr in last RX desc */ struct task sc_rxtask; /* rx int processing */ struct task sc_rxorntask; /* rxorn int processing */ - struct task sc_radartask; /* radar processing */ u_int8_t sc_defant; /* current default antenna */ u_int8_t sc_rxotherant; /* rx's on non-default antenna*/ u_int64_t sc_lastrx; /* tsf at last rx'd frame */ @@ -464,8 +463,12 @@ ((*(_ah)->ah_setRegulatoryDomain)((_ah), (_rd), NULL)) #define ath_hal_getcountrycode(_ah, _pcc) \ (*(_pcc) = (_ah)->ah_countryCode) -#define ath_hal_tkipsplit(_ah) \ +#define ath_hal_hastkipsplit(_ah) \ (ath_hal_getcapability(_ah, HAL_CAP_TKIP_SPLIT, 0, NULL) == HAL_OK) +#define ath_hal_gettkipsplit(_ah) \ + (ath_hal_getcapability(_ah, HAL_CAP_TKIP_SPLIT, 1, NULL) == HAL_OK) +#define ath_hal_settkipsplit(_ah, _v) \ + ath_hal_setcapability(_ah, HAL_CAP_TKIP_SPLIT, 1, _v, NULL) #define ath_hal_hwphycounters(_ah) \ (ath_hal_getcapability(_ah, HAL_CAP_PHYCOUNTERS, 0, NULL) == HAL_OK) #define ath_hal_hasdiversity(_ah) \ @@ -575,12 +578,6 @@ #define ath_hal_gpiosetintr(_ah, _gpio, _b) \ ((*(_ah)->ah_gpioSetIntr)((_ah), (_gpio), (_b))) -#define ath_hal_radar_event(_ah) \ - ((*(_ah)->ah_radarHaveEvent)((_ah))) -#define ath_hal_procdfs(_ah, _chan) \ - ((*(_ah)->ah_processDfs)((_ah), (_chan))) -#define ath_hal_checknol(_ah, _chan, _nchans) \ - ((*(_ah)->ah_dfsNolCheck)((_ah), (_chan), (_nchans))) #define ath_hal_radar_wait(_ah, _chan) \ ((*(_ah)->ah_radarWait)((_ah), (_chan))) ==== //depot/projects/newisp/dev/bce/if_bce.c#2 (text) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.7 2006/08/15 04:56:29 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.8 2006/09/17 13:33:27 andre Exp $"); /* * The following controllers are supported by this driver: @@ -4251,9 +4251,8 @@ #if __FreeBSD_version < 700000 VLAN_INPUT_TAG(ifp, m, l2fhdr->l2_fhdr_vlan_tag, continue); #else - VLAN_INPUT_TAG(ifp, m, l2fhdr->l2_fhdr_vlan_tag); - if (m == NULL) - continue; + m->m_pkthdr.ether_vtag = l2fhdr->l2_fhdr_vlan_tag; + m->m_flags |= M_VLANTAG; #endif } @@ -4600,7 +4599,6 @@ u16 *chain_prod, u32 *prod_bseq) { u32 vlan_tag_flags = 0; - struct m_tag *mtag; struct bce_dmamap_arg map_arg; bus_dmamap_t map; int i, error, rc = 0; @@ -4614,10 +4612,9 @@ } /* Transfer any VLAN tags to the bd. */ - mtag = VLAN_OUTPUT_TAG(sc->bce_ifp, m_head); - if (mtag != NULL) + if (m_head->m_flags & M_VLANTAG) vlan_tag_flags |= (TX_BD_FLAGS_VLAN_TAG | - (VLAN_TAG_VALUE(mtag) << 16)); + (m_head->m_pkthdr.ether_vtag << 16)); /* Map the mbuf into DMAable memory. */ map = sc->tx_mbuf_map[*chain_prod]; ==== //depot/projects/newisp/dev/bge/if_bge.c#5 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.145 2006/09/15 15:16:10 glebius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.148 2006/09/18 22:18:21 jkim Exp $"); /* * Broadcom BCM570x family gigabit ethernet driver for FreeBSD. @@ -349,6 +349,7 @@ static uint8_t bge_eeprom_getbyte(struct bge_softc *, int, uint8_t *); static int bge_read_eeprom(struct bge_softc *, caddr_t, int, int); +static void bge_setpromisc(struct bge_softc *); static void bge_setmulti(struct bge_softc *); static int bge_newbuf_std(struct bge_softc *, int, struct mbuf *); @@ -937,6 +938,27 @@ } static void +bge_setpromisc(struct bge_softc *sc) +{ + struct ifnet *ifp; + + BGE_LOCK_ASSERT(sc); + + ifp = sc->bge_ifp; + + /* + * Enable or disable promiscuous mode as needed. + * Do not strip VLAN tag when promiscuous mode is enabled. + */ + if (ifp->if_flags & IFF_PROMISC) + BGE_SETBIT(sc, BGE_RX_MODE, BGE_RXMODE_RX_PROMISC | + BGE_RXMODE_RX_KEEP_VLAN_DIAG); + else + BGE_CLRBIT(sc, BGE_RX_MODE, BGE_RXMODE_RX_PROMISC | + BGE_RXMODE_RX_KEEP_VLAN_DIAG); +} + +static void bge_setmulti(struct bge_softc *sc) { struct ifnet *ifp; @@ -2632,7 +2654,8 @@ rxidx = cur_rx->bge_idx; BGE_INC(sc->bge_rx_saved_considx, sc->bge_return_ring_cnt); - if (cur_rx->bge_flags & BGE_RXBDFLAG_VLAN_TAG) { + if (!(ifp->if_flags & IFF_PROMISC) && + (cur_rx->bge_flags & BGE_RXBDFLAG_VLAN_TAG)) { have_tag = 1; vlan_tag = cur_rx->bge_vlan_tag; } @@ -2716,9 +2739,8 @@ * attach that information to the packet. */ if (have_tag) { - VLAN_INPUT_TAG(ifp, m, vlan_tag); - if (m == NULL) - continue; + m->m_pkthdr.ether_vtag = vlan_tag; + m->m_flags |= M_VLANTAG; } BGE_UNLOCK(sc); @@ -3078,7 +3100,6 @@ bus_dmamap_t map; struct bge_tx_bd *d; struct mbuf *m = *m_head; - struct m_tag *mtag; uint32_t idx = *txidx; uint16_t csum_flags; int nsegs, i, error; @@ -3150,9 +3171,9 @@ /* ... and put VLAN tag into first segment. */ d = &sc->bge_ldata.bge_tx_ring[*txidx]; - if ((mtag = VLAN_OUTPUT_TAG(sc->bge_ifp, m)) != NULL) { + if (m->m_flags & M_VLANTAG) { d->bge_flags |= BGE_TXBDFLAG_VLAN_TAG; - d->bge_vlan_tag = VLAN_TAG_VALUE(mtag); + d->bge_vlan_tag = m->m_pkthdr.ether_vtag; } else d->bge_vlan_tag = 0; @@ -3317,12 +3338,8 @@ CSR_WRITE_4(sc, BGE_MAC_ADDR1_LO, htons(m[0])); CSR_WRITE_4(sc, BGE_MAC_ADDR1_HI, (htons(m[1]) << 16) | htons(m[2])); - /* Enable or disable promiscuous mode as needed. */ - if (ifp->if_flags & IFF_PROMISC) { - BGE_SETBIT(sc, BGE_RX_MODE, BGE_RXMODE_RX_PROMISC); - } else { - BGE_CLRBIT(sc, BGE_RX_MODE, BGE_RXMODE_RX_PROMISC); - } + /* Program promiscuous mode. */ + bge_setpromisc(sc); /* Program multicast filter. */ bge_setmulti(sc); @@ -3528,7 +3545,7 @@ struct bge_softc *sc = ifp->if_softc; struct ifreq *ifr = (struct ifreq *) data; struct mii_data *mii; - int mask, error = 0; + int flags, mask, error = 0; switch (command) { case SIOCSIFMTU: @@ -3555,19 +3572,12 @@ * waiting for it to start up, which may take a * second or two. Similarly for ALLMULTI. */ - if (ifp->if_drv_flags & IFF_DRV_RUNNING && - ifp->if_flags & IFF_PROMISC && - !(sc->bge_if_flags & IFF_PROMISC)) { - BGE_SETBIT(sc, BGE_RX_MODE, - BGE_RXMODE_RX_PROMISC); - } else if (ifp->if_drv_flags & IFF_DRV_RUNNING && - !(ifp->if_flags & IFF_PROMISC) && - sc->bge_if_flags & IFF_PROMISC) { - BGE_CLRBIT(sc, BGE_RX_MODE, - BGE_RXMODE_RX_PROMISC); - } else if (ifp->if_drv_flags & IFF_DRV_RUNNING && - (ifp->if_flags ^ sc->bge_if_flags) & IFF_ALLMULTI) { - bge_setmulti(sc); + if (ifp->if_drv_flags & IFF_DRV_RUNNING) { + flags = ifp->if_flags ^ sc->bge_if_flags; + if (flags & IFF_PROMISC) + bge_setpromisc(sc); + if (flags & IFF_ALLMULTI) + bge_setmulti(sc); } else bge_init_locked(sc); } else { ==== //depot/projects/newisp/dev/bktr/bktr_i2c.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/bktr/bktr_i2c.h,v 1.4 2002/03/23 15:47:08 nsouch Exp $ + * $FreeBSD: src/sys/dev/bktr/bktr_i2c.h,v 1.5 2006/09/18 20:17:42 jhb Exp $ * */ #ifndef _BT848_I2C_H @@ -39,7 +39,7 @@ extern int bti2c_iic_getscl(device_t); extern int bti2c_iic_reset(device_t, u_char, u_char, u_char *); -extern int bti2c_smb_callback(device_t, int, caddr_t *); +extern int bti2c_smb_callback(device_t, int, void *); extern int bti2c_smb_writeb(device_t dev, u_char slave, char cmd, char byte); extern int bti2c_smb_writew(device_t dev, u_char slave, char cmd, short word); extern int bti2c_smb_readb(device_t dev, u_char slave, char cmd, char *byte); ==== //depot/projects/newisp/dev/em/if_em.c#7 (text+ko) ==== @@ -31,7 +31,7 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.144 2006/09/11 20:59:01 pdeuskar Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.146 2006/09/18 23:44:12 andre Exp $*/ #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" @@ -1447,7 +1447,6 @@ struct em_buffer *tx_buffer, *tx_buffer_last; struct em_tx_desc *current_tx_desc; struct mbuf *m_head; - struct m_tag *mtag; uint32_t txd_upper, txd_lower, txd_used, txd_saved; int nsegs, i, j; int error, do_tso, tso_desc = 0; @@ -1470,16 +1469,13 @@ } } - /* Find out if we are in vlan mode. */ - mtag = VLAN_OUTPUT_TAG(ifp, m_head); - /* * When operating in promiscuous mode, hardware encapsulation for * packets is disabled. This means we have to add the vlan * encapsulation in the driver, since it will have come down from the * VLAN layer with a tag instead of a VLAN header. */ - if (mtag != NULL && adapter->em_insert_vlan_header) { + if ((m_head->m_flags & M_VLANTAG) && adapter->em_insert_vlan_header) { struct ether_vlan_header *evl; struct ether_header eh; @@ -1503,9 +1499,7 @@ bcopy(&eh, evl, sizeof(*evl)); evl->evl_proto = evl->evl_encap_proto; evl->evl_encap_proto = htons(ETHERTYPE_VLAN); - evl->evl_tag = htons(VLAN_TAG_VALUE(mtag)); - m_tag_delete(m_head, mtag); - mtag = NULL; + evl->evl_tag = htons(m_head->m_pkthdr.ether_vtag); *m_headp = m_head; } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Sep 19 20:21:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4028D16A4A0; Tue, 19 Sep 2006 20:21:02 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1877816A47E for ; Tue, 19 Sep 2006 20:21:02 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 84F1643D9B for ; Tue, 19 Sep 2006 20:20:52 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8JKKqoh095685 for ; Tue, 19 Sep 2006 20:20:52 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8JKKqiP095682 for perforce@freebsd.org; Tue, 19 Sep 2006 20:20:52 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 19 Sep 2006 20:20:52 GMT Message-Id: <200609192020.k8JKKqiP095682@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 106357 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Sep 2006 20:21:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=106357 Change 106357 by hselasky@hselasky_mini_itx on 2006/09/19 20:19:55 USB-cdev bugfix. Prevent devices with no start_write function from waiting forever at close, if there is queued data. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_cdev.c#9 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_cdev.c#9 (text+ko) ==== @@ -951,6 +951,13 @@ return; } +static void +usb_cdev_dummy_start_write(struct usb_cdev *sc) +{ + sc->sc_flags &= ~USB_CDEV_FLAG_FLUSHING_WRITE; + return; +} + static u_int8_t minor_table[(1<<16) / 8]; static u_int32_t @@ -1036,7 +1043,7 @@ } if (sc->sc_start_write == NULL) { - sc->sc_start_write = &usb_cdev_dummy_cmd; + sc->sc_start_write = &usb_cdev_dummy_start_write; } if (sc->sc_stop_write == NULL) { From owner-p4-projects@FreeBSD.ORG Tue Sep 19 21:15:03 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C9AEE16A47E; Tue, 19 Sep 2006 21:15:03 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9FA0616A407 for ; Tue, 19 Sep 2006 21:15:03 +0000 (UTC) (envelope-from ssouhlal@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5563643D99 for ; Tue, 19 Sep 2006 21:15:00 +0000 (GMT) (envelope-from ssouhlal@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8JLF0rj012706 for ; Tue, 19 Sep 2006 21:15:00 GMT (envelope-from ssouhlal@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8JLF0Yc012703 for perforce@freebsd.org; Tue, 19 Sep 2006 21:15:00 GMT (envelope-from ssouhlal@freebsd.org) Date: Tue, 19 Sep 2006 21:15:00 GMT Message-Id: <200609192115.k8JLF0Yc012703@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ssouhlal@freebsd.org using -f From: Suleiman Souhlal To: Perforce Change Reviews Cc: Subject: PERFORCE change 106360 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Sep 2006 21:15:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=106360 Change 106360 by ssouhlal@ssouhlal-maho on 2006/09/19 21:14:52 Implement the sf_buf functions on mips. Affected files ... .. //depot/projects/mips2/src/sys/mips/include/sf_buf.h#3 edit .. //depot/projects/mips2/src/sys/mips/mips/vm_machdep.c#8 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/include/sf_buf.h#3 (text+ko) ==== @@ -28,30 +28,26 @@ #ifndef _MACHINE_SF_BUF_H_ #define _MACHINE_SF_BUF_H_ -#include +#include +#include +#include struct vm_page; -struct sf_buf { - LIST_ENTRY(sf_buf) list_entry; /* list of buffers */ - TAILQ_ENTRY(sf_buf) free_entry; /* list of buffers */ - struct vm_page *m; /* currently mapped page */ - vm_offset_t kva; /* va of mapping */ - int ref_count; /* usage of this mapping */ -}; +struct sf_buf; static __inline vm_offset_t sf_buf_kva(struct sf_buf *sf) { - return (sf->kva); + return (MIPS_PHYS_TO_KSEG0(VM_PAGE_TO_PHYS((vm_page_t)sf))); } static __inline struct vm_page * sf_buf_page(struct sf_buf *sf) { - return (sf->m); + return ((vm_page_t)sf); } #endif /* !_MACHINE_SF_BUF_H_ */ ==== //depot/projects/mips2/src/sys/mips/mips/vm_machdep.c#8 (text+ko) ==== @@ -118,7 +118,7 @@ panic("%s: should not be reached", __func__); } } - + void cpu_thread_swapin(struct thread *td) { @@ -134,7 +134,6 @@ void sf_buf_free(struct sf_buf *sf) { - panic("%s", __func__); } #if 0 static void @@ -147,8 +146,7 @@ struct sf_buf * sf_buf_alloc(struct vm_page *m, int flags) { - panic("%s", __func__); - return (NULL); + return ((struct sf_buf *)m); } void From owner-p4-projects@FreeBSD.ORG Tue Sep 19 21:25:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9FA5C16A492; Tue, 19 Sep 2006 21:25:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 68E7916A47C for ; Tue, 19 Sep 2006 21:25:29 +0000 (UTC) (envelope-from ssouhlal@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 382CE43D5E for ; Tue, 19 Sep 2006 21:25:14 +0000 (GMT) (envelope-from ssouhlal@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8JLPEMJ013293 for ; Tue, 19 Sep 2006 21:25:14 GMT (envelope-from ssouhlal@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8JLPDXC013290 for perforce@freebsd.org; Tue, 19 Sep 2006 21:25:13 GMT (envelope-from ssouhlal@freebsd.org) Date: Tue, 19 Sep 2006 21:25:13 GMT Message-Id: <200609192125.k8JLPDXC013290@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ssouhlal@freebsd.org using -f From: Suleiman Souhlal To: Perforce Change Reviews Cc: Subject: PERFORCE change 106362 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Sep 2006 21:25:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=106362 Change 106362 by ssouhlal@ssouhlal-maho on 2006/09/19 21:24:24 Add ELF sysvec/brands for mips. Affected files ... .. //depot/projects/mips2/src/sys/mips/include/md_var.h#3 edit .. //depot/projects/mips2/src/sys/mips/mips/elf_machdep.c#3 edit .. //depot/projects/mips2/src/sys/mips/mips/locore.S#14 edit .. //depot/projects/mips2/src/sys/mips/mips/machdep.c#20 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/include/md_var.h#3 (text+ko) ==== @@ -28,6 +28,9 @@ #ifndef _MACHINE_MD_VAR_H_ #define _MACHINE_MD_VAR_H_ +extern char sigcode[]; +extern int szsigcode; + extern vm_offset_t kstack0; extern vm_paddr_t kstack0_phys; ==== //depot/projects/mips2/src/sys/mips/mips/elf_machdep.c#3 (text+ko) ==== @@ -26,10 +26,82 @@ */ #include +#include #include +#include +#include #include -#include +#include #include +#include +#include + +#include +#include +#include + +#include +#include + +struct sysentvec elf32_freebsd_sysvec = { + SYS_MAXSYSCALL, + sysent, + 0, + 0, + NULL, + 0, + NULL, + NULL, + __elfN(freebsd_fixup), + sendsig, + sigcode, + &szsigcode, + NULL, + "FreeBSD ELF32", + __elfN(coredump), + NULL, + MINSIGSTKSZ, + PAGE_SIZE, + VM_MIN_ADDRESS, + VM_MAXUSER_ADDRESS, + USRSTACK, + PS_STRINGS, + VM_PROT_ALL, + exec_copyout_strings, + exec_setregs, + NULL +}; + +static Elf32_Brandinfo freebsd_brand_info = { + ELFOSABI_FREEBSD, + EM_MIPS, + "FreeBSD", + NULL, + "/libexec/ld-elf.so.1", + &elf32_freebsd_sysvec, + NULL, + 0, + }; + +SYSINIT(elf32, SI_SUB_EXEC, SI_ORDER_ANY, + (sysinit_cfunc_t) elf32_insert_brand_entry, + &freebsd_brand_info); + +static Elf32_Brandinfo freebsd_brand_oinfo = { + ELFOSABI_FREEBSD, + EM_MIPS, + "FreeBSD", + NULL, + "/usr/libexec/ld-elf.so.1", + &elf32_freebsd_sysvec, + NULL, + 0, + }; + +SYSINIT(oelf32, SI_SUB_EXEC, SI_ORDER_ANY, + (sysinit_cfunc_t) elf32_insert_brand_entry, + &freebsd_brand_oinfo); + void elf32_dump_thread(struct thread *td, void *dst, size_t *off) ==== //depot/projects/mips2/src/sys/mips/mips/locore.S#14 (text+ko) ==== @@ -114,3 +114,12 @@ nop /* NOTREACHED */ + +ASM_ENTRY(sigcode) + break + +esigcode: + .data + .global szsigcode +szsigcode: + .long esigcode-sigcode ==== //depot/projects/mips2/src/sys/mips/mips/machdep.c#20 (text+ko) ==== @@ -87,6 +87,12 @@ SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL); void +sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) +{ + __asm __volatile("break"); +} + +void mips_init(void) { int i; From owner-p4-projects@FreeBSD.ORG Tue Sep 19 21:44:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 841B316A4E1; Tue, 19 Sep 2006 21:44:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 55B7816A4D2 for ; Tue, 19 Sep 2006 21:44:00 +0000 (UTC) (envelope-from ssouhlal@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1A51C43D96 for ; Tue, 19 Sep 2006 21:42:36 +0000 (GMT) (envelope-from ssouhlal@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8JLgaow014152 for ; Tue, 19 Sep 2006 21:42:36 GMT (envelope-from ssouhlal@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8JLgZVW014149 for perforce@freebsd.org; Tue, 19 Sep 2006 21:42:35 GMT (envelope-from ssouhlal@freebsd.org) Date: Tue, 19 Sep 2006 21:42:35 GMT Message-Id: <200609192142.k8JLgZVW014149@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ssouhlal@freebsd.org using -f From: Suleiman Souhlal To: Perforce Change Reviews Cc: Subject: PERFORCE change 106363 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Sep 2006 21:44:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=106363 Change 106363 by ssouhlal@ssouhlal-maho on 2006/09/19 21:41:44 Don't switch to 64bit mode when we're done handling a generic exception. Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/exception.S#9 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/exception.S#9 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips2/src/sys/mips/mips/exception.S#8 $ + * $P4: //depot/projects/mips2/src/sys/mips/mips/exception.S#9 $ */ #include "opt_ddb.h" @@ -167,8 +167,6 @@ * having a clean go at restoring. */ mtc0 zero, MIPS_COP_0_CAUSE - li t0, MIPS_SR_KX - mtc0 t0, MIPS_COP_0_STATUS move k1, sp jal exception_restore_registers From owner-p4-projects@FreeBSD.ORG Tue Sep 19 22:09:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E9CEA16A47B; Tue, 19 Sep 2006 22:09:17 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AB05616A403 for ; Tue, 19 Sep 2006 22:09:17 +0000 (UTC) (envelope-from ssouhlal@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1D09D43D7E for ; Tue, 19 Sep 2006 22:09:09 +0000 (GMT) (envelope-from ssouhlal@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8JM997R016485 for ; Tue, 19 Sep 2006 22:09:09 GMT (envelope-from ssouhlal@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8JM99Lw016482 for perforce@freebsd.org; Tue, 19 Sep 2006 22:09:09 GMT (envelope-from ssouhlal@freebsd.org) Date: Tue, 19 Sep 2006 22:09:09 GMT Message-Id: <200609192209.k8JM99Lw016482@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ssouhlal@freebsd.org using -f From: Suleiman Souhlal To: Perforce Change Reviews Cc: Subject: PERFORCE change 106364 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Sep 2006 22:09:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=106364 Change 106364 by ssouhlal@ssouhlal-maho on 2006/09/19 22:08:40 Make TLB Refill and TLB Invalid exceptions work for userland and when the PTE hasn't been filled in yet. Needs more work (exceptions in general do). Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/exception.S#10 edit .. //depot/projects/mips2/src/sys/mips/mips/trap.c#6 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/exception.S#10 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips2/src/sys/mips/mips/exception.S#9 $ + * $P4: //depot/projects/mips2/src/sys/mips/mips/exception.S#10 $ */ #include "opt_ddb.h" @@ -202,6 +202,45 @@ .set noat mfc0 k0, MIPS_COP_0_BAD_VADDR + nop + bltz k0, 5f + nop + + /* Userland */ +6: + /* XXX We should switch stack elsewhere. */ + subu sp, sp, TF_SIZE + lw k1, PC_CURTHREAD(t2) + lw k1, TD_KSTACK(k1) + subu k1, k1, TF_SIZE + + la k0, 4f + j exception_save_registers + nop + + move sp, k1 + +4: mfc0 a1, MIPS_COP_0_CAUSE + mfc0 a2, MIPS_COP_0_BAD_VADDR + jal trap + move a0, k1 + + move k1, sp + jal exception_restore_registers + nop + + addu sp, sp, TF_SIZE + eret +5: + j kernfault + +VEND(TLBMissVector) + .data +2: .asciiz "TLBMissVector" + .text + + +kernfault: /* * Shift right logical to get a page index, but leaving * enough bits to index an array of 64 bit values, plus @@ -241,9 +280,36 @@ nop tlbp - + + mfc0 k1, MIPS_COP_0_BAD_VADDR + srl k1, PAGE_SHIFT + andi k1, k1, 1 + bne k1, zero, 2f + nop + + mfc0 k1, MIPS_COP_0_TLB_LO0 + b 3f + nop +2: + mfc0 k1, MIPS_COP_0_TLB_LO1 + nop +3: + andi k1, 2 + bne k1, zero, 4f + nop + /* + * The PTE that triggered the fault is not valid. We need to do a + * "real" page fault. + * + * XXX Maybe we should just ignore the fact that it's not valid here + * and just let the TLB Invalid Exception (vector 0x80000180) handler + * deal with it. + */ + j 6b + nop + +4: mfc0 k0, MIPS_COP_0_TLB_INDEX - nop bltz k0, 1f nop @@ -253,14 +319,9 @@ 1: tlbwr + eret - .set at -VEND(TLBMissVector) - .data -2: .asciiz "TLBMissVector" - .text - LEAF(XTLBMissVector) ==== //depot/projects/mips2/src/sys/mips/mips/trap.c#6 (text+ko) ==== @@ -36,6 +36,9 @@ #include #include #include +#include +#include +#include #include #include @@ -95,9 +98,13 @@ void trap(struct trapframe *retf, u_int cause, void *badvaddr) { + vm_offset_t va; + vm_map_t map; + struct thread *td; struct trapframe *tf; struct trap_identifier *tid; int code, kernelmode; + int ftype, error; platform_trap_enter(); @@ -118,6 +125,41 @@ /* XXX Kernel only. */ tlb_modified(badvaddr); goto done; + case TrTLBL: + case TrTLBS: + va = trunc_page(badvaddr); + td = curthread; + + if (va >= KERNBASE) { + pt_entry_t *pte; + pte = tlb_pte_find(kernel_pmap->pm_lev1, va); + + if (!pte_valid(pte)) { + map = kernel_map; + goto heavy; + } + + if ((va >> PAGE_SHIFT) & 1) + tlb_update(va, pte[-1], pte[0]); + else + tlb_update(va, pte[0], pte[1]); + goto done; + } else + map = &td->td_proc->p_vmspace->vm_map; + +heavy: + if (code == TrTLBL) + ftype = VM_PROT_READ; + else + ftype = VM_PROT_WRITE; + error = vm_fault(map, va, ftype, + (ftype & VM_PROT_WRITE) ? VM_FAULT_DIRTY : VM_FAULT_NORMAL); + + if (error == KERN_SUCCESS) + goto done; + if (kernelmode) + break; + /* XXX send signal */ case TrAdEL: case TrDBE: if (trap_error == -1/* && trap_addr == badvaddr*/) { From owner-p4-projects@FreeBSD.ORG Tue Sep 19 23:04:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F3BB16A412; Tue, 19 Sep 2006 23:04:19 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 02B9416A40F for ; Tue, 19 Sep 2006 23:04:19 +0000 (UTC) (envelope-from ssouhlal@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AA82C43D46 for ; Tue, 19 Sep 2006 23:04:18 +0000 (GMT) (envelope-from ssouhlal@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8JN4IPg020332 for ; Tue, 19 Sep 2006 23:04:18 GMT (envelope-from ssouhlal@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8JN4IGs020329 for perforce@freebsd.org; Tue, 19 Sep 2006 23:04:18 GMT (envelope-from ssouhlal@freebsd.org) Date: Tue, 19 Sep 2006 23:04:18 GMT Message-Id: <200609192304.k8JN4IGs020329@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ssouhlal@freebsd.org using -f From: Suleiman Souhlal To: Perforce Change Reviews Cc: Subject: PERFORCE change 106366 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Sep 2006 23:04:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=106366 Change 106366 by ssouhlal@ssouhlal-maho on 2006/09/19 23:03:24 Various pmap fixes: - The MIPS_PA_TO_PFN(), MIPS_PFN_TO_PA() and MIPS_PTE_TO_PFN() macros were wrong. - Make pmap_pte work for arbitrary pmaps, not just for the kernel. - Make pmap_pinit actually allocate a 2M virtually contiguous page table for new pmaps This is obviously temporary: We will eventually have two-level page tables. - Remove unreached statement in pmap_remove_pte() - pmap_remove() needs to remove the corresponding PV entry. - Add a breakpoint in pmap_mapdev(). - Make tlb_enter() and tlb_remove() use pmap_pte(). - Fix tlb_enter()'s usage of MIPS_PA_TO_PFN() - Make tlb_enter() actually enter the PTE in the TLB, instead of only adding it to the page table. - Fix tlb_remove_range()'s usage of tlb_remove_pages(): the third argument is supposed to be a number of pages, not a number bytes. :-( - Make tlb_invalidate_one() use better bogus virtual addresses. Affected files ... .. //depot/projects/mips2/src/sys/mips/include/pmap.h#4 edit .. //depot/projects/mips2/src/sys/mips/include/pte.h#3 edit .. //depot/projects/mips2/src/sys/mips/mips/pmap.c#9 edit .. //depot/projects/mips2/src/sys/mips/mips/tlb.c#7 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/include/pmap.h#4 (text+ko) ==== @@ -84,6 +84,7 @@ void *pmap_mapdev(vm_offset_t, vm_size_t); void pmap_unmapdev(vm_offset_t, vm_size_t); void pmap_deactivate(struct thread *); +pt_entry_t* pmap_pte(pmap_t pmap, vm_offset_t va); #define pmap_resident_count(pm) ((pm)->pm_stats.resident_count) #define vtophys(va) pmap_kextract((vm_offset_t)(va)) ==== //depot/projects/mips2/src/sys/mips/include/pte.h#3 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips2/src/sys/mips/include/pte.h#2 $ + * $P4: //depot/projects/mips2/src/sys/mips/include/pte.h#3 $ */ #ifndef _MACHINE_PTE_H_ @@ -54,9 +54,9 @@ #define MIPS_TLB_SWSHIFT 30 #define MIPS_PFN_SHIFT 6 #define MIPS_PFN_MASK 0xFFFFFF -#define MIPS_PA_TO_PFN(pa) (((pa) >> MIPS_PFN_SHIFT) & MIPS_PFN_MASK) -#define MIPS_PFN_TO_PA(pfn) ((pfn) << MIPS_PFN_SHIFT) -#define MIPS_PTE_TO_PFN(pte) ((pte) & MIPS_PFN_MASK) +#define MIPS_PA_TO_PFN(pa) (((pa) >> PAGE_SHIFT)) +#define MIPS_PFN_TO_PA(pfn) ((pfn) << PAGE_SHIFT) +#define MIPS_PTE_TO_PFN(pte) (((pte) >> MIPS_PFN_SHIFT) & MIPS_PFN_MASK) #define MIPS_PTE_TO_PA(pte) (MIPS_PFN_TO_PA(MIPS_PTE_TO_PFN((pte)))) /* ==== //depot/projects/mips2/src/sys/mips/mips/pmap.c#9 (text+ko) ==== @@ -205,14 +205,23 @@ * Extract the page table entry associated with * the given map/virtual addresss pair. */ -static pt_entry_t* +pt_entry_t* pmap_pte(pmap_t pmap, vm_offset_t va) { - if (pmap != kernel_pmap) - panic("non kernel pmap unsupported"); - if (pmap == NULL || pmap->pm_lev1 == NULL) - return NULL; - return tlb_pte_find(pmap->pm_lev1, va); + pt_entry_t *pte = NULL; + unsigned long lev1; + + if (pmap != kernel_pmap && pmap) { + /* XXX Try to avoid TLB refills */ + lev1 = (unsigned long)pmap->pm_lev1; + lev1 = (unsigned long)tlb_pte_find(kptmap, lev1); + lev1 = (unsigned long)MIPS_PTE_TO_PA(*(pt_entry_t *)lev1); + + pte = tlb_pte_find( + pt_entry_t *)MIPS_PHYS_TO_KSEG0((pt_entry_t *)lev1), va); + } else + pte = tlb_pte_find(kptmap, va); + return pte; } @@ -708,7 +717,7 @@ pmap_pinit(pmap) register struct pmap *pmap; { -#ifdef notyet +#if notyet vm_page_t lev1pg; int i; @@ -737,8 +746,16 @@ pmap->pm_lev1[PTLEV1I] = pmap_phys_to_pte(VM_PAGE_TO_PHYS(lev1pg)) | PG_V | PG_KRE | PG_KWE; #else - pmap->pm_lev1 = NULL; + char *lev1pg; + + /* XXX */ + lev1pg = malloc(2097152, M_TEMP, M_WAITOK); + if (lev1pg == NULL) + panic("no lev1pg\n"); + + pmap->pm_lev1 = (pt_entry_t*) lev1pg; #endif + pmap->pm_ptphint = NULL; pmap->pm_active = 0; pmap->pm_asid = 0; @@ -961,8 +978,6 @@ if ((oldpte & PG_D) == 0) vm_page_flag_set(m, PG_REFERENCED); return pmap_remove_entry(pmap, m, va); - - return 0; } /* @@ -974,6 +989,9 @@ void pmap_remove(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) { + int count; + vm_offset_t va; + pt_entry_t *pte; if (pmap == NULL) return; @@ -981,7 +999,14 @@ if (pmap->pm_stats.resident_count == 0) return; - tlb_remove_range(pmap, sva, eva); + count = (eva - sva) >> PAGE_SHIFT; + va = sva; + while (count--) { + pte = pmap_pte(pmap, va); + pmap_remove_pte(pmap, pte, va); + tlb_remove(pmap, va); + va += PAGE_SIZE; + } } /* @@ -1148,7 +1173,6 @@ * resident, we are creating it here. */ if (va < VM_MAXUSER_ADDRESS) { - panic("need to allocate mpte\n"); } pte = pmap_pte(pmap, va); @@ -1652,6 +1676,7 @@ pmap_mapdev(vm_offset_t pa, vm_size_t size) { /* XXXMIPS: return (void *)MIPS_PHYS_TO_KSEG1(pa); */ + __asm __volatile("break"); return 0; } ==== //depot/projects/mips2/src/sys/mips/mips/tlb.c#7 (text+ko) ==== @@ -56,6 +56,7 @@ #include #include #include +#include pt_entry_t *kptmap; vm_size_t kptsize; @@ -133,7 +134,7 @@ pa &= ~PAGE_MASK; va &= ~PAGE_MASK; - pte = tlb_pte_find(pmap->pm_lev1, va); + pte = pmap_pte(pmap, va); if (pte_valid(pte)) tlb_invalidate_page(va); else @@ -142,8 +143,13 @@ panic("pmap %p entering invalid mapping for va %lx to pa %lx [%lx]", pmap, (u_long)va, (u_long)pa, (u_long)bits); *pte &= PG_G; - *pte |= MIPS_PA_TO_PFN(pa) | bits; + *pte |= (MIPS_PA_TO_PFN(pa) << MIPS_PFN_SHIFT) | bits; *pte |= PG_C_UNCACHED; + + if ((va >> PAGE_SHIFT) & 1) + tlb_update(va, pte[-1], pte[0]); + else + tlb_update(va, pte[0], pte[1]); } void @@ -153,7 +159,7 @@ va &= ~PAGE_MASK; - pte = tlb_pte_find(pmap->pm_lev1, va); + pte = pmap_pte(pmap, va); pte_clear(pte, PG_V); tlb_invalidate_page(va); } @@ -171,7 +177,7 @@ void tlb_remove_range(pmap_t pmap, vm_offset_t va, vm_offset_t eva) { - tlb_remove_pages(pmap, va, eva - va); + tlb_remove_pages(pmap, va, (eva - va) >> PAGE_SHIFT); } void @@ -212,7 +218,7 @@ u_long ehi; /* Bogus VPN2. */ - ehi = MIPS_KSEG1_END + 2 * i * PAGE_SIZE; + ehi = MIPS_KSEG2_START + 0x0fff0000 + 2 * i * PAGE_SIZE; mips_wr_index(i); mips_wr_entrylo0(0); mips_wr_entrylo1(0); From owner-p4-projects@FreeBSD.ORG Tue Sep 19 23:16:35 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4C44816A47C; Tue, 19 Sep 2006 23:16:35 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0630E16A407 for ; Tue, 19 Sep 2006 23:16:35 +0000 (UTC) (envelope-from ssouhlal@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C2CDA43D53 for ; Tue, 19 Sep 2006 23:16:34 +0000 (GMT) (envelope-from ssouhlal@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8JNGYqI020863 for ; Tue, 19 Sep 2006 23:16:34 GMT (envelope-from ssouhlal@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8JNGYZ7020860 for perforce@freebsd.org; Tue, 19 Sep 2006 23:16:34 GMT (envelope-from ssouhlal@freebsd.org) Date: Tue, 19 Sep 2006 23:16:34 GMT Message-Id: <200609192316.k8JNGYZ7020860@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ssouhlal@freebsd.org using -f From: Suleiman Souhlal To: Perforce Change Reviews Cc: Subject: PERFORCE change 106367 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Sep 2006 23:16:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=106367 Change 106367 by ssouhlal@ssouhlal-maho on 2006/09/19 23:15:45 Make the TLB Modified exception handler work for !kernel. Affected files ... .. //depot/projects/mips2/src/sys/mips/include/tlb.h#4 edit .. //depot/projects/mips2/src/sys/mips/mips/tlb.c#8 edit .. //depot/projects/mips2/src/sys/mips/mips/trap.c#7 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/include/tlb.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips2/src/sys/mips/include/tlb.h#3 $ + * $P4: //depot/projects/mips2/src/sys/mips/include/tlb.h#4 $ */ #ifndef _MACHINE_TLB_H_ @@ -40,7 +40,7 @@ void tlb_invalidate_all(void); void tlb_invalidate_one(int); void tlb_invalidate_page(vm_offset_t); -void tlb_modified(void *); +void tlb_modified(pmap_t, void *); void tlb_remove(pmap_t, vm_offset_t); void tlb_remove_pages(pmap_t, vm_offset_t, int); void tlb_remove_range(pmap_t, vm_offset_t, vm_offset_t); ==== //depot/projects/mips2/src/sys/mips/mips/tlb.c#8 (text+ko) ==== @@ -246,13 +246,13 @@ * PTE was not dirty and is being written to. XXX kernel only for now. */ void -tlb_modified(void *badvaddr) +tlb_modified(pmap_t pmap, void *badvaddr) { pt_entry_t *pte; vm_offset_t va; va = (vm_offset_t) badvaddr; - pte = tlb_pte_find(kernel_pmap->pm_lev1, va); + pte = pmap_pte(pmap, va); /* * Do we really want to dirty this page? ==== //depot/projects/mips2/src/sys/mips/mips/trap.c#7 (text+ko) ==== @@ -122,8 +122,12 @@ */ switch (code) { case TrMod: - /* XXX Kernel only. */ - tlb_modified(badvaddr); + va = trunc_page(badvaddr); + if (va >= KERNBASE) + tlb_modified(kernel_pmap, (void *)va); + else + tlb_modified(&curthread->td_proc->p_vmspace->vm_pmap, + (void *)va); goto done; case TrTLBL: case TrTLBS: From owner-p4-projects@FreeBSD.ORG Tue Sep 19 23:29:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 82FF216A407; Tue, 19 Sep 2006 23:29:58 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0FEA016A49E for ; Tue, 19 Sep 2006 23:29:58 +0000 (UTC) (envelope-from ssouhlal@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B1B1D43D5D for ; Tue, 19 Sep 2006 23:29:51 +0000 (GMT) (envelope-from ssouhlal@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8JNTp6i021451 for ; Tue, 19 Sep 2006 23:29:51 GMT (envelope-from ssouhlal@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8JNTpb7021448 for perforce@freebsd.org; Tue, 19 Sep 2006 23:29:51 GMT (envelope-from ssouhlal@freebsd.org) Date: Tue, 19 Sep 2006 23:29:51 GMT Message-Id: <200609192329.k8JNTpb7021448@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ssouhlal@freebsd.org using -f From: Suleiman Souhlal To: Perforce Change Reviews Cc: Subject: PERFORCE change 106368 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Sep 2006 23:29:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=106368 Change 106368 by ssouhlal@ssouhlal-maho on 2006/09/19 23:29:38 - Implement exec_setregs(). - Make fork_trampoline() return to userland. Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/machdep.c#21 edit .. //depot/projects/mips2/src/sys/mips/mips/swtch.S#4 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/machdep.c#21 (text+ko) ==== @@ -279,7 +279,11 @@ void exec_setregs(struct thread *td, u_long entry, u_long stack, u_long ps_strings) { + struct trapframe *tf = td->td_frame; + tf->tf_regs[TF_EPC] = (register_t)entry; + tf->tf_regs[TF_SP] = (register_t)stack; + /* XXX tf->tf_regs[TF_SR] |= MIPS_SR_KSU_USER; ? */ } intptr_t ==== //depot/projects/mips2/src/sys/mips/mips/swtch.S#4 (text+ko) ==== @@ -72,7 +72,6 @@ li v0, 1 jr ra nop - END(cpu_throw) /* @@ -109,7 +108,21 @@ move a0, s0 move a1, s1 move a2, s2 - j fork_exit + jal fork_exit + nop + + /* XXX AST */ + + .set at + lw t2, pcpup + .set noat + lw t3, PC_CURTHREAD(t2) + lw t0, TD_FRAME(t3) + + move k1, t0 + jal exception_restore_registers nop + addu sp, sp, TF_SIZE + eret END(fork_trampoline) From owner-p4-projects@FreeBSD.ORG Wed Sep 20 09:09:14 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1122E16A47B; Wed, 20 Sep 2006 09:09:14 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DF4A016A407 for ; Wed, 20 Sep 2006 09:09:13 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4589343DB0 for ; Wed, 20 Sep 2006 09:09:01 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8K991lX087517 for ; Wed, 20 Sep 2006 09:09:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8K98xjB087510 for perforce@freebsd.org; Wed, 20 Sep 2006 09:08:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 20 Sep 2006 09:08:59 GMT Message-Id: <200609200908.k8K98xjB087510@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 106382 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Sep 2006 09:09:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=106382 Change 106382 by rwatson@rwatson_zoo on 2006/09/20 09:07:58 Update for OpenBSM 1.0 alpha 11. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_worker.c#18 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_worker.c#18 (text+ko) ==== @@ -194,7 +194,7 @@ (audit_file_rotate_wait == 0) && (vattr.va_size >= audit_fstat.af_filesz)) { audit_file_rotate_wait = 1; - (void)send_trigger(AUDIT_TRIGGER_OPEN_NEW); + (void)send_trigger(AUDIT_TRIGGER_ROTATE_KERNEL); } /* From owner-p4-projects@FreeBSD.ORG Wed Sep 20 10:02:09 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 328AB16A415; Wed, 20 Sep 2006 10:02:09 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0E0CB16A40F for ; Wed, 20 Sep 2006 10:02:09 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4C31043D77 for ; Wed, 20 Sep 2006 10:02:08 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8KA28NH090209 for ; Wed, 20 Sep 2006 10:02:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8KA28P2090206 for perforce@freebsd.org; Wed, 20 Sep 2006 10:02:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 20 Sep 2006 10:02:08 GMT Message-Id: <200609201002.k8KA28P2090206@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 106385 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Sep 2006 10:02:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=106385 Change 106385 by rwatson@rwatson_zoo on 2006/09/20 10:01:37 Remove now-redundant sysctl declaration. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#25 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#25 (text+ko) ==== @@ -53,7 +53,6 @@ #include #include -SYSCTL_DECL(_security); SYSCTL_NODE(_security, OID_AUTO, audit, CTLFLAG_RW, 0, "TrustedBSD audit controls"); From owner-p4-projects@FreeBSD.ORG Wed Sep 20 11:16:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D3D7216A47B; Wed, 20 Sep 2006 11:16:41 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 95E1916A416 for ; Wed, 20 Sep 2006 11:16:41 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 51C9D43D49 for ; Wed, 20 Sep 2006 11:16:41 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8KBGf6w099011 for ; Wed, 20 Sep 2006 11:16:41 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8KBGelD099005 for perforce@freebsd.org; Wed, 20 Sep 2006 11:16:40 GMT (envelope-from rdivacky@FreeBSD.org) Date: Wed, 20 Sep 2006 11:16:40 GMT Message-Id: <200609201116.k8KBGelD099005@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 106386 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Sep 2006 11:16:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=106386 Change 106386 by rdivacky@rdivacky_witten on 2006/09/20 11:16:38 Futex patch by kib@ - implement futex_op for amd64 - remove critical section - make orl/andl/xorl MI and remove its implementations from i386 Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/amd64/support.S#2 edit .. //depot/projects/linuxolator/src/sys/compat/linux/linux_futex.c#2 edit .. //depot/projects/linuxolator/src/sys/i386/i386/support.s#2 edit Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/amd64/support.S#2 (text+ko) ==== @@ -689,3 +689,48 @@ movq %rax,32(%rdi) movq %rdi,bbhead NON_GPROF_RET + +#if defined(SMP) || !defined(_KERNEL) +#define MPLOCKED lock ; +#else +#define MPLOCKED +#endif + + .text + +futex_fault: + movq PCPU(CURPCB), %rdx + movq $0, PCB_ONFAULT(%rdx) + movq $-EFAULT, %rax + ret + +/* int futex_xchgl(int oparg, caddr_t uaddr, int *oldval); */ +ENTRY(futex_xchgl) + movq PCPU(CURPCB), %r11 + movq $futex_fault, PCB_ONFAULT(%r11) + + movq $VM_MAXUSER_ADDRESS-4, %rax + cmpq %rax, %rsi + ja futex_fault + + MPLOCKED xchgl %edi, (%rsi) + movl %edi, (%rdx) + xorl %eax, %eax + movq %rax, PCB_ONFAULT(%r11) + ret + +/* int futex_addl(int oparg, caddr_t uaddr, int *oldval); */ +ENTRY(futex_addl) + movq PCPU(CURPCB), %r11 + movq $futex_fault, PCB_ONFAULT(%r11) + + movq $VM_MAXUSER_ADDRESS-4, %rax + cmpq %rax, %rsi + ja futex_fault + + MPLOCKED xaddl %edi, (%rsi) + movl %edi, (%rdx) + xorl %eax, %eax + movq %rax, PCB_ONFAULT(%r11) + ret + ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_futex.c#2 (text+ko) ==== @@ -89,16 +89,14 @@ static void futex_put(struct futex *); static int futex_sleep(struct futex *, struct thread *, unsigned long); static int futex_wake(struct futex *, int, struct futex *); -#ifdef __i386__ static int futex_atomic_op(struct thread *td, int encoded_op, caddr_t uaddr); -#endif +static int futex_orl(int oparg, caddr_t uaddr, int *oldval); +static int futex_andl(int oparg, caddr_t uaddr, int *oldval); +static int futex_xorl(int oparg, caddr_t uaddr, int *oldval); /* support.s */ int futex_xchgl(int oparg, caddr_t uaddr, int *oldval); int futex_addl(int oparg, caddr_t uaddr, int *oldval); -int futex_orl(int oparg, caddr_t uaddr, int *oldval); -int futex_andnl(int oparg, caddr_t uaddr, int *oldval); -int futex_xorl(int oparg, caddr_t uaddr, int *oldval); int linux_sys_futex(struct thread *td, struct linux_sys_futex_args *args) @@ -429,7 +427,6 @@ return count; } -#ifdef __i386__ static int futex_atomic_op(struct thread *td, int encoded_op, caddr_t uaddr) { @@ -448,8 +445,6 @@ #endif /* XXX: linux verifies access here and returns EFAULT */ - critical_enter(); - switch (op) { case FUTEX_OP_SET: ret = futex_xchgl(oparg, uaddr, &oldval); @@ -461,7 +456,7 @@ ret = futex_orl(oparg, uaddr, &oldval); break; case FUTEX_OP_ANDN: - ret = futex_andnl(oparg, uaddr, &oldval); + ret = futex_andl(~oparg, uaddr, &oldval); break; case FUTEX_OP_XOR: ret = futex_xorl(oparg, uaddr, &oldval); @@ -470,8 +465,6 @@ ret = -ENOSYS; } - critical_exit(); - if (!ret) switch (cmp) { case FUTEX_OP_CMP_EQ: @@ -497,4 +490,42 @@ return (ret); } -#endif + +static int +futex_orl(int oparg, caddr_t uaddr, int *oldval) +{ + uint32_t ua, ua_old; + + for (;;) { + ua = ua_old = fuword32(uaddr); + ua |= oparg; + if (casuptr((intptr_t *)uaddr, ua_old, ua) == ua_old) + return ua_old; + } +} + +static int +futex_andl(int oparg, caddr_t uaddr, int *oldval) +{ + uint32_t ua, ua_old; + + for (;;) { + ua = ua_old = fuword32(uaddr); + ua &= oparg; + if (casuptr((intptr_t *)uaddr, ua_old, ua) == ua_old) + return ua_old; + } +} + +static int +futex_xorl(int oparg, caddr_t uaddr, int *oldval) +{ + uint32_t ua, ua_old; + + for (;;) { + ua = ua_old = fuword32(uaddr); + ua ^= oparg; + if (casuptr((intptr_t *)uaddr, ua_old, ua) == ua_old) + return ua_old; + } +} ==== //depot/projects/linuxolator/src/sys/i386/i386/support.s#2 (text+ko) ==== @@ -1549,8 +1549,7 @@ ret /* int futex_xchgl(int oparg, caddr_t uaddr, int *oldval); */ - .globl futex_xchgl -futex_xchgl: +ENTRY(futex_xchgl) movl PCPU(CURPCB), %eax movl $futex_fault, PCB_ONFAULT(%eax) movl 4(%esp), %eax @@ -1568,8 +1567,7 @@ ret /* int futex_addl(int oparg, caddr_t uaddr, int *oldval); */ - .globl futex_addl -futex_addl: +ENTRY(futex_addl) movl PCPU(CURPCB), %eax movl $futex_fault, PCB_ONFAULT(%eax) movl 4(%esp), %eax @@ -1586,60 +1584,3 @@ movl $0, PCB_ONFAULT(%edx) ret -/* int futex_orl(int oparg, caddr_t uaddr, int *oldval); */ - .globl futex_orl -futex_orl: - movl PCPU(CURPCB), %eax - movl $futex_fault, PCB_ONFAULT(%eax) - movl 4(%esp), %eax - movl 8(%esp), %edx - cmpl $VM_MAXUSER_ADDRESS,%edx - ja futex_fault - - MPLOCKED orl %eax, (%edx) - movl 0xc(%esp), %edx - movl %eax, (%edx) - xorl %eax, %eax - - movl PCPU(CURPCB), %edx - movl $0, PCB_ONFAULT(%edx) - ret - -/* int futex_andnl(int oparg, caddr_t uaddr, int *oldval); */ - .globl futex_andnl -futex_andnl: - movl PCPU(CURPCB), %eax - movl $futex_fault, PCB_ONFAULT(%eax) - movl 4(%esp), %eax - movl 8(%esp), %edx - cmpl $VM_MAXUSER_ADDRESS,%edx - ja futex_fault - - notl (%edx) - MPLOCKED andl %eax, (%edx) - movl 0xc(%esp), %edx - movl %eax, (%edx) - xorl %eax, %eax - - movl PCPU(CURPCB), %edx - movl $0, PCB_ONFAULT(%edx) - ret - -/* int futex_xorl(int oparg, caddr_t uaddr, int *oldval); */ - .globl futex_xorl -futex_xorl: - movl PCPU(CURPCB), %eax - movl $futex_fault, PCB_ONFAULT(%eax) - movl 4(%esp), %eax - movl 8(%esp), %edx - cmpl $VM_MAXUSER_ADDRESS,%edx - ja futex_fault - - MPLOCKED xorl %eax, (%edx) - movl 0xc(%esp), %edx - movl %eax, (%edx) - xorl %eax, %eax - - movl PCPU(CURPCB), %edx - movl $0, PCB_ONFAULT(%edx) - ret From owner-p4-projects@FreeBSD.ORG Wed Sep 20 11:25:59 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4652D16A407; Wed, 20 Sep 2006 11:25:59 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0C3D816A47C for ; Wed, 20 Sep 2006 11:25:59 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0282343D60 for ; Wed, 20 Sep 2006 11:25:53 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8KBPqmm008077 for ; Wed, 20 Sep 2006 11:25:52 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8KBPq4W008074 for perforce@freebsd.org; Wed, 20 Sep 2006 11:25:52 GMT (envelope-from rdivacky@FreeBSD.org) Date: Wed, 20 Sep 2006 11:25:52 GMT Message-Id: <200609201125.k8KBPq4W008074@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 106387 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Sep 2006 11:25:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=106387 Change 106387 by rdivacky@rdivacky_witten on 2006/09/20 11:25:14 Add set_thread_area syscall. Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/syscalls.master#3 edit Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/syscalls.master#3 (text+ko) ==== @@ -404,7 +404,7 @@ struct l_timespec *timeout, void *uaddr2, int val3); } 241 AUE_NULL UNIMPL linux_sched_setaffinity 242 AUE_NULL UNIMPL linux_sched_getaffinity -243 AUE_NULL UNIMPL linux_set_thread_area +243 AUE_NULL STD { int linux_set_thread_area(struct l_user_desc *desc); } 244 AUE_NULL UNIMPL linux_get_thread_area 245 AUE_NULL STD { int linux_io_setup(l_uint nr_reqs, linux_aio_context_t *ctxp); } 246 AUE_NULL STD { int linux_io_destroy(linux_aio_context_t ctx); } From owner-p4-projects@FreeBSD.ORG Wed Sep 20 11:26:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 457F416A561; Wed, 20 Sep 2006 11:26:00 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2063D16A560 for ; Wed, 20 Sep 2006 11:26:00 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5CA3143D70 for ; Wed, 20 Sep 2006 11:25:53 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8KBPrij008083 for ; Wed, 20 Sep 2006 11:25:53 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8KBPqFg008080 for perforce@freebsd.org; Wed, 20 Sep 2006 11:25:52 GMT (envelope-from rdivacky@FreeBSD.org) Date: Wed, 20 Sep 2006 11:25:52 GMT Message-Id: <200609201125.k8KBPqFg008080@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 106388 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Sep 2006 11:26:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=106388 Change 106388 by rdivacky@rdivacky_witten on 2006/09/20 11:25:50 Regen after syscalls.master update. Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_proto.h#3 edit .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_syscall.h#3 edit .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysent.c#3 edit Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_proto.h#3 (text+ko) ==== @@ -748,6 +748,9 @@ char iocb_l_[PADL_(struct linux_iocb *)]; struct linux_iocb * iocb; char iocb_r_[PADR_(struct linux_iocb *)]; char result_l_[PADL_(struct linux_io_event *)]; struct linux_io_event * result; char result_r_[PADR_(struct linux_io_event *)]; }; +struct linux_set_thread_area_args { + char desc_l_[PADL_(struct l_user_desc *)]; struct l_user_desc * desc; char desc_r_[PADR_(struct l_user_desc *)]; +}; struct linux_fadvise64_args { register_t dummy; }; ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_syscall.h#3 (text+ko) ==== ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysent.c#3 (text+ko) ==== @@ -263,7 +263,7 @@ { AS(linux_sys_futex_args), (sy_call_t *)linux_sys_futex, AUE_NULL, NULL, 0, 0 }, /* 240 = linux_sys_futex */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 241 = linux_sched_setaffinity */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 242 = linux_sched_getaffinity */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 243 = linux_set_thread_area */ + { AS(linux_set_thread_area_args), (sy_call_t *)linux_set_thread_area, AUE_NULL, NULL, 0, 0 }, /* 243 = linux_set_thread_area */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 244 = linux_get_thread_area */ { AS(linux_io_setup_args), (sy_call_t *)linux_io_setup, AUE_NULL, NULL, 0, 0 }, /* 245 = linux_io_setup */ { AS(linux_io_destroy_args), (sy_call_t *)linux_io_destroy, AUE_NULL, NULL, 0, 0 }, /* 246 = linux_io_destroy */ From owner-p4-projects@FreeBSD.ORG Wed Sep 20 11:28:03 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B883B16A622; Wed, 20 Sep 2006 11:28:03 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 83ADF16A61B for ; Wed, 20 Sep 2006 11:28:03 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9477B43D8B for ; Wed, 20 Sep 2006 11:27:56 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8KBRuAY008200 for ; Wed, 20 Sep 2006 11:27:56 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8KBRu1N008197 for perforce@freebsd.org; Wed, 20 Sep 2006 11:27:56 GMT (envelope-from rdivacky@FreeBSD.org) Date: Wed, 20 Sep 2006 11:27:56 GMT Message-Id: <200609201127.k8KBRu1N008197@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 106389 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Sep 2006 11:28:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=106389 Change 106389 by rdivacky@rdivacky_witten on 2006/09/20 11:27:29 - Implement tls in amd64 version - change l_desc_struct members from long to int ie. from 64bit to 32bit on amd64 [1] Found by: ssouhlal [1] Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#4 edit .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#2 edit Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#4 (text+ko) ==== @@ -757,7 +757,7 @@ }; struct l_desc_struct { - unsigned long a,b; + unsigned int a,b; }; ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#2 (text+ko) ==== @@ -62,6 +62,24 @@ #include #include +#include /* needed for pcb definition in linux_set_thread_area */ + +/* + * Memory and System segment descriptors + */ +struct segment_descriptor { + unsigned sd_lolimit:16 ; /* segment extent (lsb) */ + unsigned sd_lobase:24 __packed; /* segment base address (lsb) */ + unsigned sd_type:5 ; /* segment type */ + unsigned sd_dpl:2 ; /* segment descriptor priority level */ + unsigned sd_p:1 ; /* segment descriptor present */ + unsigned sd_hilimit:4 ; /* segment extent (msb) */ + unsigned sd_xx:2 ; /* unused */ + unsigned sd_def32:1 ; /* default 32 vs 16 bit size */ + unsigned sd_gran:1 ; /* limit granularity (byte/page units)*/ + unsigned sd_hibase:8 ; /* segment base address (msb) */ +} ; + struct l_old_select_argv { l_int nfds; l_uintptr_t readfds; @@ -614,7 +632,57 @@ td2->td_frame->tf_rsp = PTROUT(args->stack); if (args->flags & CLONE_SETTLS) { - /* XXX: todo */ + struct l_user_desc info; + int idx; + int a[2]; + struct segment_descriptor sd; + + error = copyin((void *)td->td_frame->tf_rsi, &info, sizeof(struct l_user_desc)); + if (error) + return (error); + + idx = info.entry_number; + + /* + * looks like we're getting the idx we returned + * in the set_thread_area() syscall + */ + if (idx != 6 && idx != 3) + return (EINVAL); + + /* this doesnt happen in practice */ + if (idx == 6) { + /* we might copy out the entry_number as 3 */ + info.entry_number = 3; + error = copyout(&info, (void *) td->td_frame->tf_rsi, sizeof(struct l_user_desc)); + if (error) + return (error); + } + + a[0] = LDT_entry_a(&info); + a[1] = LDT_entry_b(&info); + + memcpy(&sd, &a, sizeof(a)); +#ifdef DEBUG + if (ldebug(clone)) + printf("Segment created in clone with CLONE_SETTLS: lobase: %x, hibase: %x, lolimit: %x, hilimit: %x, type: %i, dpl: %i, p: %i, xx: %i, def32: %i, gran: %i\n", sd.sd_lobase, + sd.sd_hibase, + sd.sd_lolimit, + sd.sd_hilimit, + sd.sd_type, + sd.sd_dpl, + sd.sd_p, + sd.sd_xx, + sd.sd_def32, + sd.sd_gran); +#endif + + /* this is taken from amd64 version of cpu_set_user_tls() */ + critical_enter(); + /* set %fs */ + td->td_pcb->pcb_fsbase = (register_t)((register_t)sd.sd_hibase << 24 | sd.sd_lobase); + wrmsr(MSR_FSBASE, td->td_pcb->pcb_fsbase); + critical_exit(); } #ifdef DEBUG @@ -1115,3 +1183,100 @@ bsd_args.prot |= PROT_EXEC; return (mprotect(td, &bsd_args)); } + +int +linux_set_thread_area(struct thread *td, struct linux_set_thread_area_args *args) +{ + struct l_user_desc info; + int error; + int idx; + int a[2]; + struct segment_descriptor sd; + + error = copyin(args->desc, &info, sizeof(struct l_user_desc)); + if (error) + return (error); + +#ifdef DEBUG + if (ldebug(set_thread_area)) + printf(ARGS(set_thread_area, "%i, %x, %x, %i, %i, %i, %i, %i, %i\n"), + info.entry_number, + info.base_addr, + info.limit, + info.seg_32bit, + info.contents, + info.read_exec_only, + info.limit_in_pages, + info.seg_not_present, + info.useable); +#endif + + idx = info.entry_number; + /* + * Semantics of linux version: every thread in the system has array + * of 3 tls descriptors. 1st is GLIBC TLS, 2nd is WINE, 3rd unknown. This + * syscall loads one of the selected tls decriptors with a value + * and also loads GDT descriptors 6, 7 and 8 with the content of the per-thread + * descriptors. + * + * Semantics of fbsd version: I think we can ignore that linux has 3 per-thread + * descriptors and use just the 1st one. The tls_array[] is used only in + * set/get-thread_area() syscalls and for loading the GDT descriptors. In fbsd + * we use just one GDT descriptor for TLS so we will load just one. + * XXX: this doesnt work when user-space process tries to use more then 1 TLS segment + * comment in the linux sources says wine might do that. + */ + + /* + * we support just GLIBC TLS now + * we should let 3 proceed as well because we use this segment so + * if code does two subsequent calls it should succeed + */ + if (idx != 6 && idx != -1 && idx != 3) + return (EINVAL); + + /* + * we have to copy out the GDT entry we use + * FreeBSD uses GDT entry #3 for storing %gs so load that + * XXX: what if userspace program doesnt check this value and tries + * to use 6, 7 or 8? + */ + idx = info.entry_number = 3; + error = copyout(&info, args->desc, sizeof(struct l_user_desc)); + if (error) + return (error); + + if (LDT_empty(&info)) { + a[0] = 0; + a[1] = 0; + } else { + a[0] = LDT_entry_a(&info); + a[1] = LDT_entry_b(&info); + } + + memcpy(&sd, &a, sizeof(a)); +#ifdef DEBUG + if (ldebug(set_thread_area)) + printf("Segment created in set_thread_area: lobase: %x, hibase: %x, lolimit: %x, hilimit: %x, type: %i, dpl: %i, p: %i, xx: %i, def32: %i, gran: %i\n", sd.sd_lobase, + sd.sd_hibase, + sd.sd_lolimit, + sd.sd_hilimit, + sd.sd_type, + sd.sd_dpl, + sd.sd_p, + sd.sd_xx, + sd.sd_def32, + sd.sd_gran); +#endif + + /* this is taken from amd64 version of cpu_set_user_tls() */ + critical_enter(); + /* set %fs */ + td->td_pcb->pcb_fsbase = (register_t)((register_t)sd.sd_hibase << 24 | sd.sd_lobase); + wrmsr(MSR_FSBASE, td->td_pcb->pcb_fsbase); + + critical_exit(); + + return (0); +} + From owner-p4-projects@FreeBSD.ORG Wed Sep 20 11:44:35 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B2F916A4DA; Wed, 20 Sep 2006 11:44:35 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B766716A4A0 for ; Wed, 20 Sep 2006 11:44:34 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F3EF943D9D for ; Wed, 20 Sep 2006 11:44:29 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8KBiTF2009142 for ; Wed, 20 Sep 2006 11:44:29 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8KBiIIB009139 for perforce@freebsd.org; Wed, 20 Sep 2006 11:44:18 GMT (envelope-from rdivacky@FreeBSD.org) Date: Wed, 20 Sep 2006 11:44:18 GMT Message-Id: <200609201144.k8KBiIIB009139@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 106392 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Sep 2006 11:44:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=106392 Change 106392 by rdivacky@rdivacky_witten on 2006/09/20 11:43:19 IFC Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/mp_machdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/nexus.c#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/vm_machdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/cam/cam_xpt.c#2 integrate .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_file.c#2 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#2 integrate .. //depot/projects/linuxolator/src/sys/conf/files#2 integrate .. //depot/projects/linuxolator/src/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/ath/freebsd/ah_if.m#2 delete .. //depot/projects/linuxolator/src/sys/contrib/dev/ath/freebsd/ah_osdep.c#2 delete .. //depot/projects/linuxolator/src/sys/contrib/dev/ath/freebsd/ah_osdep.h#2 delete .. //depot/projects/linuxolator/src/sys/contrib/pf/net/pf.c#2 integrate .. //depot/projects/linuxolator/src/sys/crypto/via/padlock_cipher.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/acpi.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-all.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-disk.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-pci.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-raid.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-usb.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ath/ah_osdep.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/ath/ah_osdep.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ath/if_athvar.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/bce/if_bce.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/bge/if_bge.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/bktr/bktr_i2c.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/bktr/bktr_i2c.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/cs/if_cs.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/cs/if_csvar.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/dc/if_dc.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/dc/if_dcreg.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/de/if_de.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/de/if_devar.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/em/if_em.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/en/if_en_pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/en/midway.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/hwpmc/hwpmc_mod.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ichsmb/ichsmb.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/iicbus/iicsmb.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ixgb/if_ixgb.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/kbdmux/kbdmux.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/lge/if_lge.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/lge/if_lgereg.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mfi/mfi.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mfi/mfivar.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mxge/eth_z8e.dat.gz.uu#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mxge/ethp_z8e.dat.gz.uu#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mxge/if_mxge.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mxge/if_mxge_var.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mxge/mxge_mcp.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/my/if_my.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/my/if_myreg.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/nfe/if_nfe.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/nfe/if_nfereg.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/nge/if_nge.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/nge/if_ngereg.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/re/if_re.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sio/sio_pccard.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/smbus/smb.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/smbus/smb.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/smbus/smbconf.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/smbus/smbconf.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/smbus/smbus.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/smbus/smbus.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/smbus/smbus_if.m#2 integrate .. //depot/projects/linuxolator/src/sys/dev/stge/if_stge.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/syscons/scmouse.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/syscons/syscons.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/syscons/syscons.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ti/if_ti.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/txp/if_txp.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/uart/uart_kbd_sun.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/usb_subr.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/vge/if_vge.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/devfs/devfs.h#2 integrate .. //depot/projects/linuxolator/src/sys/fs/devfs/devfs_devs.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/devfs/devfs_vfsops.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/devfs/devfs_vnops.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/udf/osta.h#2 integrate .. //depot/projects/linuxolator/src/sys/geom/eli/g_eli.h#2 integrate .. //depot/projects/linuxolator/src/sys/geom/eli/g_eli_ctl.c#2 integrate .. //depot/projects/linuxolator/src/sys/geom/geom.h#2 integrate .. //depot/projects/linuxolator/src/sys/geom/geom_event.c#2 integrate .. //depot/projects/linuxolator/src/sys/geom/geom_subr.c#2 integrate .. //depot/projects/linuxolator/src/sys/geom/label/g_label_ufs.c#2 integrate .. //depot/projects/linuxolator/src/sys/geom/mirror/g_mirror.c#2 integrate .. //depot/projects/linuxolator/src/sys/geom/raid3/g_raid3.c#2 integrate .. //depot/projects/linuxolator/src/sys/geom/raid3/g_raid3_ctl.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/conf/NOTES#2 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/busdma_machdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/local_apic.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/mp_machdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/nexus.c#2 integrate .. //depot/projects/linuxolator/src/sys/ia64/ia32/ia32_trap.c#2 integrate .. //depot/projects/linuxolator/src/sys/ia64/ia64/trap.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/bus_if.m#2 integrate .. //depot/projects/linuxolator/src/sys/kern/init_sysent.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_acct.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_exit.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_jail.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_mbuf.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_proc.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_prot.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_bus.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_prf.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_rman.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_witness.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/syscalls.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/syscalls.master#2 integrate .. //depot/projects/linuxolator/src/sys/kern/systrace_args.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/tty.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_socket.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_default.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_lookup.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_mount.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_syscalls.c#2 integrate .. //depot/projects/linuxolator/src/sys/modules/ath/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/modules/ath_hal/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/modules/ath_rate_amrr/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/modules/ath_rate_onoe/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/modules/ath_rate_sample/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/modules/ipfw/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/modules/pf/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/net/if_bridge.c#2 integrate .. //depot/projects/linuxolator/src/sys/net/if_vlan.c#2 integrate .. //depot/projects/linuxolator/src/sys/net/if_vlan_var.h#2 integrate .. //depot/projects/linuxolator/src/sys/net80211/ieee80211_input.c#2 integrate .. //depot/projects/linuxolator/src/sys/net80211/ieee80211_output.c#2 integrate .. //depot/projects/linuxolator/src/sys/netgraph/ng_eiface.c#2 integrate .. //depot/projects/linuxolator/src/sys/netgraph/ng_fec.c#2 integrate .. //depot/projects/linuxolator/src/sys/netgraph/ng_vlan.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_fw2.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_output.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_input.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_output.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_syncache.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_usrreq.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_var.h#2 integrate .. //depot/projects/linuxolator/src/sys/netinet6/nd6.c#2 integrate .. //depot/projects/linuxolator/src/sys/nfs4client/nfs4_vfsops.c#2 integrate .. //depot/projects/linuxolator/src/sys/nfs4client/nfs4_vnops.c#2 integrate .. //depot/projects/linuxolator/src/sys/nfsclient/nfs_node.c#2 integrate .. //depot/projects/linuxolator/src/sys/nfsclient/nfs_subs.c#2 integrate .. //depot/projects/linuxolator/src/sys/nfsclient/nfs_vfsops.c#2 integrate .. //depot/projects/linuxolator/src/sys/nfsclient/nfs_vnops.c#2 integrate .. //depot/projects/linuxolator/src/sys/nfsclient/nfsnode.h#2 integrate .. //depot/projects/linuxolator/src/sys/pci/alpm.c#2 integrate .. //depot/projects/linuxolator/src/sys/pci/amdpm.c#2 integrate .. //depot/projects/linuxolator/src/sys/pci/amdsmb.c#2 integrate .. //depot/projects/linuxolator/src/sys/pci/if_rl.c#2 integrate .. //depot/projects/linuxolator/src/sys/pci/if_sf.c#2 integrate .. //depot/projects/linuxolator/src/sys/pci/if_sfreg.h#2 integrate .. //depot/projects/linuxolator/src/sys/pci/if_sis.c#2 integrate .. //depot/projects/linuxolator/src/sys/pci/if_sisreg.h#2 integrate .. //depot/projects/linuxolator/src/sys/pci/if_ste.c#2 integrate .. //depot/projects/linuxolator/src/sys/pci/if_tl.c#2 integrate .. //depot/projects/linuxolator/src/sys/pci/if_tlreg.h#2 integrate .. //depot/projects/linuxolator/src/sys/pci/if_vr.c#2 integrate .. //depot/projects/linuxolator/src/sys/pci/if_vrreg.h#2 integrate .. //depot/projects/linuxolator/src/sys/pci/if_wb.c#2 integrate .. //depot/projects/linuxolator/src/sys/pci/if_wbreg.h#2 integrate .. //depot/projects/linuxolator/src/sys/pci/if_xl.c#2 integrate .. //depot/projects/linuxolator/src/sys/pci/if_xlreg.h#2 integrate .. //depot/projects/linuxolator/src/sys/pci/intpm.c#2 integrate .. //depot/projects/linuxolator/src/sys/pci/intpmreg.h#2 integrate .. //depot/projects/linuxolator/src/sys/pci/nfsmb.c#2 integrate .. //depot/projects/linuxolator/src/sys/pci/viapm.c#2 integrate .. //depot/projects/linuxolator/src/sys/powerpc/powerpc/trap.c#2 integrate .. //depot/projects/linuxolator/src/sys/security/audit/audit.c#2 integrate .. //depot/projects/linuxolator/src/sys/security/audit/audit_bsm.c#2 integrate .. //depot/projects/linuxolator/src/sys/security/audit/audit_private.h#2 integrate .. //depot/projects/linuxolator/src/sys/security/audit/audit_syscalls.c#2 integrate .. //depot/projects/linuxolator/src/sys/security/audit/audit_worker.c#2 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_inet.c#2 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_internal.h#2 integrate .. //depot/projects/linuxolator/src/sys/security/mac_biba/mac_biba.c#2 integrate .. //depot/projects/linuxolator/src/sys/security/mac_lomac/mac_lomac.c#2 integrate .. //depot/projects/linuxolator/src/sys/security/mac_mls/mac_mls.c#2 integrate .. //depot/projects/linuxolator/src/sys/sys/bus.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/mac.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/mac_policy.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/mbuf.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/mount.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/syscall.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/syscall.mk#2 integrate .. //depot/projects/linuxolator/src/sys/sys/sysctl.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/sysproto.h#2 integrate .. //depot/projects/linuxolator/src/sys/ufs/ffs/ffs_softdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/ufs/ufs/ufs_quota.c#2 integrate Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/amd64/local_apic.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.28 2006/09/06 22:05:34 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.29 2006/09/11 20:12:42 jhb Exp $"); #include "opt_hwpmc_hooks.h" @@ -794,6 +794,76 @@ } } } + +static void +dump_mask(const char *prefix, uint32_t v, int base) +{ + int i, first; + + first = 1; + for (i = 0; i < 32; i++) + if (v & (1 << i)) { + if (first) { + db_printf("%s:", prefix); + first = 0; + } + db_printf(" %02x", base + i); + } + if (!first) + db_printf("\n"); +} + +/* Show info from the lapic regs for this CPU. */ +DB_SHOW_COMMAND(lapic, db_show_lapic) +{ + uint32_t v; + + db_printf("lapic ID = %d\n", lapic_id()); + v = lapic->version; + db_printf("version = %d.%d\n", (v & APIC_VER_VERSION) >> 4, + v & 0xf); + db_printf("max LVT = %d\n", (v & APIC_VER_MAXLVT) >> MAXLVTSHIFT); + v = lapic->svr; + db_printf("SVR = %02x (%s)\n", v & APIC_SVR_VECTOR, + v & APIC_SVR_ENABLE ? "enabled" : "disabled"); + db_printf("TPR = %02x\n", lapic->tpr); + +#define dump_field(prefix, index) \ + dump_mask(__XSTRING(prefix ## index), lapic->prefix ## index, \ + index * 32) + + db_printf("In-service Interrupts:\n"); + dump_field(isr, 0); + dump_field(isr, 1); + dump_field(isr, 2); + dump_field(isr, 3); + dump_field(isr, 4); + dump_field(isr, 5); + dump_field(isr, 6); + dump_field(isr, 7); + + db_printf("TMR Interrupts:\n"); + dump_field(tmr, 0); + dump_field(tmr, 1); + dump_field(tmr, 2); + dump_field(tmr, 3); + dump_field(tmr, 4); + dump_field(tmr, 5); + dump_field(tmr, 6); + dump_field(tmr, 7); + + db_printf("IRR Interrupts:\n"); + dump_field(irr, 0); + dump_field(irr, 1); + dump_field(irr, 2); + dump_field(irr, 3); + dump_field(irr, 4); + dump_field(irr, 5); + dump_field(irr, 6); + dump_field(irr, 7); + +#undef dump_field +} #endif /* ==== //depot/projects/linuxolator/src/sys/amd64/amd64/mp_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.276 2006/05/16 14:32:16 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.277 2006/09/11 20:10:42 jhb Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -342,7 +342,10 @@ setidt(IPI_INVLTLB, IDTVEC(invltlb), SDT_SYSIGT, SEL_KPL, 0); setidt(IPI_INVLPG, IDTVEC(invlpg), SDT_SYSIGT, SEL_KPL, 0); setidt(IPI_INVLRNG, IDTVEC(invlrng), SDT_SYSIGT, SEL_KPL, 0); - + + /* Install an inter-CPU IPI for cache invalidation. */ + setidt(IPI_INVLCACHE, IDTVEC(invlcache), SDT_SYSIGT, SEL_KPL, 0); + /* Install an inter-CPU IPI for all-CPU rendezvous */ setidt(IPI_RENDEZVOUS, IDTVEC(rendezvous), SDT_SYSIGT, SEL_KPL, 0); ==== //depot/projects/linuxolator/src/sys/amd64/amd64/nexus.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.68 2006/04/20 04:16:34 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.69 2006/09/11 19:31:51 jhb Exp $"); /* * This code implements a `root nexus' for Intel Architecture @@ -140,7 +140,7 @@ static int nexus_probe(device_t dev) { - int irq, last; + int irq; device_quiet(dev); /* suppress attach message for neatness */ @@ -173,18 +173,10 @@ * We search for regions of existing IRQs and add those to the IRQ * resource manager. */ - last = -1; for (irq = 0; irq < NUM_IO_INTS; irq++) - if (intr_lookup_source(irq) != NULL) { - if (last == -1) - last = irq; - } else if (last != -1) { - if (rman_manage_region(&irq_rman, last, irq - 1) != 0) + if (intr_lookup_source(irq) != NULL) + if (rman_manage_region(&irq_rman, irq, irq) != 0) panic("nexus_probe irq_rman add"); - last = -1; - } - if (last != -1 && rman_manage_region(&irq_rman, last, irq - 1) != 0) - panic("nexus_probe irq_rman add"); /* * ISA DMA on PCI systems is implemented in the ISA part of each ==== //depot/projects/linuxolator/src/sys/amd64/amd64/vm_machdep.c#2 (text+ko) ==== @@ -41,10 +41,11 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.251 2006/07/24 12:24:56 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.252 2006/09/17 14:54:14 davidxu Exp $"); #include "opt_isa.h" #include "opt_cpu.h" +#include "opt_compat.h" #include #include @@ -69,6 +70,7 @@ #include #include #include +#include #include #include @@ -79,6 +81,12 @@ #include +#ifdef COMPAT_IA32 + +extern struct sysentvec ia32_freebsd_sysvec; + +#endif + static void cpu_reset_real(void); #ifdef SMP static void cpu_reset_proxy(void); @@ -320,6 +328,28 @@ */ cpu_thread_clean(td); +#ifdef COMPAT_IA32 + if (td->td_proc->p_sysent == &ia32_freebsd_sysvec) { + /* + * Set the trap frame to point at the beginning of the uts + * function. + */ + td->td_frame->tf_rbp = 0; + td->td_frame->tf_rsp = + (((uintptr_t)stack->ss_sp + stack->ss_size - 4) & ~0x0f) - 4; + td->td_frame->tf_rip = (uintptr_t)entry; + + /* + * Pass the address of the mailbox for this kse to the uts + * function as a parameter on the stack. + */ + suword32((void *)(td->td_frame->tf_rsp + sizeof(int32_t)), + (uint32_t)(uintptr_t)arg); + + return; + } +#endif + /* * Set the trap frame to point at the beginning of the uts * function. @@ -344,6 +374,19 @@ if ((u_int64_t)tls_base >= VM_MAXUSER_ADDRESS) return (EINVAL); +#ifdef COMPAT_IA32 + if (td->td_proc->p_sysent == &ia32_freebsd_sysvec) { + if (td == curthread) { + critical_enter(); + td->td_pcb->pcb_gsbase = (register_t)tls_base; + wrmsr(MSR_KGSBASE, td->td_pcb->pcb_gsbase); + critical_exit(); + } else { + td->td_pcb->pcb_gsbase = (register_t)tls_base; + } + return (0); + } +#endif if (td == curthread) { critical_enter(); td->td_pcb->pcb_fsbase = (register_t)tls_base; ==== //depot/projects/linuxolator/src/sys/cam/cam_xpt.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.162 2006/06/26 05:41:11 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.165 2006/09/16 17:35:47 mjacob Exp $"); #include #include @@ -387,9 +387,9 @@ /*quirks*/0, /*mintags*/0, /*maxtags*/0 }, { - /* Does not support other than LUN 0 */ + /* This does not support other than LUN 0 */ { T_DIRECT, SIP_MEDIA_FIXED, "VMware*", "*", "*" }, - CAM_QUIRK_NOLUNS, /*mintags*/0, /*maxtags*/0 + CAM_QUIRK_NOLUNS, /*mintags*/2, /*maxtags*/255 }, { /* @@ -592,6 +592,10 @@ CAM_QUIRK_NOHILUNS, /*mintags*/2, /*maxtags*/255 }, { + { T_ENCLOSURE, SIP_MEDIA_FIXED, "DP", "BACKPLANE", "*" }, + CAM_QUIRK_NOLUNS, /*mintags*/0, /*maxtags*/0 + }, + { /* Default tagged queuing parameters for all devices */ { T_ANY, SIP_MEDIA_REMOVABLE|SIP_MEDIA_FIXED, ==== //depot/projects/linuxolator/src/sys/cam/scsi/scsi_da.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.191 2006/07/14 13:58:32 delphij Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.192 2006/09/16 21:21:07 mjacob Exp $"); #include @@ -1519,15 +1519,30 @@ block_size = scsi_4btoul(rcaplong->length); maxsector = scsi_8btou64(rcaplong->addr); } - dasetgeom(periph, block_size, maxsector); - dp = &softc->params; - snprintf(announce_buf, sizeof(announce_buf), - "%juMB (%ju %u byte sectors: %dH %dS/T %dC)", - (uintmax_t) (((uintmax_t)dp->secsize * - dp->sectors) / (1024*1024)), - (uintmax_t)dp->sectors, - dp->secsize, dp->heads, dp->secs_per_track, - dp->cylinders); + + /* + * Because GEOM code just will panic us if we + * give them an 'illegal' value we'll avoid that + * here. + */ + if (block_size >= MAXPHYS || block_size == 0) { + xpt_print_path(periph->path); + printf("unsupportable block size %ju\n", + (uintmax_t) block_size); + announce_buf[0] = '\0'; + cam_periph_invalidate(periph); + } else { + dasetgeom(periph, block_size, maxsector); + dp = &softc->params; + snprintf(announce_buf, sizeof(announce_buf), + "%juMB (%ju %u byte sectors: %dH %dS/T " + "%dC)", (uintmax_t) + (((uintmax_t)dp->secsize * + dp->sectors) / (1024*1024)), + (uintmax_t)dp->sectors, + dp->secsize, dp->heads, + dp->secs_per_track, dp->cylinders); + } } else { int error; ==== //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_proto.h#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.61 2006/09/09 01:22:13 davidxu Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.73 2006/09/03 16:17:49 rwatson Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.62 2006/09/17 13:29:35 rwatson Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.75 2006/09/17 13:28:11 rwatson Exp */ #ifndef _FREEBSD32_SYSPROTO_H_ @@ -419,7 +419,7 @@ #define FREEBSD32_SYS_AUE_freebsd32_recvmsg AUE_RECVMSG #define FREEBSD32_SYS_AUE_freebsd32_sendmsg AUE_SENDMSG #define FREEBSD32_SYS_AUE_freebsd32_recvfrom AUE_RECVFROM -#define FREEBSD32_SYS_AUE_freebsd32_sigaltstack AUE_SIGPENDING +#define FREEBSD32_SYS_AUE_freebsd32_sigaltstack AUE_SIGALTSTACK #define FREEBSD32_SYS_AUE_freebsd32_execve AUE_EXECVE #define FREEBSD32_SYS_AUE_freebsd32_setitimer AUE_SETITIMER #define FREEBSD32_SYS_AUE_freebsd32_getitimer AUE_GETITIMER ==== //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_syscall.h#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.59 2006/09/09 01:22:13 davidxu Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.73 2006/09/03 16:17:49 rwatson Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.60 2006/09/17 13:29:35 rwatson Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.75 2006/09/17 13:28:11 rwatson Exp */ #define FREEBSD32_SYS_syscall 0 ==== //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_syscalls.c#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.50 2006/09/09 01:22:13 davidxu Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.73 2006/09/03 16:17:49 rwatson Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.51 2006/09/17 13:29:35 rwatson Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.75 2006/09/17 13:28:11 rwatson Exp */ const char *freebsd32_syscallnames[] = { ==== //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_sysent.c#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.60 2006/09/09 01:22:13 davidxu Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.73 2006/09/03 16:17:49 rwatson Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.61 2006/09/17 13:29:35 rwatson Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.75 2006/09/17 13:28:11 rwatson Exp */ #include "opt_compat.h" @@ -85,7 +85,7 @@ { AS(setlogin_args), (sy_call_t *)setlogin, AUE_SETLOGIN, NULL, 0, 0 }, /* 50 = setlogin */ { AS(acct_args), (sy_call_t *)acct, AUE_ACCT, NULL, 0, 0 }, /* 51 = acct */ { compat(0,freebsd32_sigpending), AUE_SIGPENDING, NULL, 0, 0 }, /* 52 = old freebsd32_sigpending */ - { AS(freebsd32_sigaltstack_args), (sy_call_t *)freebsd32_sigaltstack, AUE_SIGPENDING, NULL, 0, 0 }, /* 53 = freebsd32_sigaltstack */ + { AS(freebsd32_sigaltstack_args), (sy_call_t *)freebsd32_sigaltstack, AUE_SIGALTSTACK, NULL, 0, 0 }, /* 53 = freebsd32_sigaltstack */ { AS(ioctl_args), (sy_call_t *)ioctl, AUE_IOCTL, NULL, 0, 0 }, /* 54 = ioctl */ { AS(reboot_args), (sy_call_t *)reboot, AUE_REBOOT, NULL, 0, 0 }, /* 55 = reboot */ { AS(revoke_args), (sy_call_t *)revoke, AUE_REVOKE, NULL, 0, 0 }, /* 56 = revoke */ ==== //depot/projects/linuxolator/src/sys/compat/freebsd32/syscalls.master#2 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.74 2006/09/09 01:22:13 davidxu Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.75 2006/09/17 13:28:11 rwatson Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -124,7 +124,7 @@ 50 AUE_SETLOGIN NOPROTO { int setlogin(char *namebuf); } 51 AUE_ACCT NOPROTO { int acct(char *path); } 52 AUE_SIGPENDING COMPAT { int freebsd32_sigpending(void); } -53 AUE_SIGPENDING STD { int freebsd32_sigaltstack( \ +53 AUE_SIGALTSTACK STD { int freebsd32_sigaltstack( \ struct sigaltstack32 *ss, \ struct sigaltstack32 *oss); } 54 AUE_IOCTL NOPROTO { int ioctl(int fd, u_long com, \ ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_file.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.96 2006/07/11 20:52:07 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.97 2006/09/10 13:47:56 netchild Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include @@ -495,6 +496,7 @@ { char *path; int error; + struct stat st; LCONVPATHEXIST(td, args->path, &path); @@ -504,6 +506,11 @@ #endif error = kern_unlink(td, path, UIO_SYSSPACE); + if (error == EPERM) + /* Introduce POSIX noncompliant behaviour of Linux */ + if (kern_stat(td, path, UIO_SYSSPACE, &st) == 0) + if (S_ISDIR(st.st_mode)) + error = EISDIR; LFREEPATH(path); return (error); } ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.186 2006/08/25 11:02:42 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.187 2006/09/16 14:12:04 netchild Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -1299,6 +1299,13 @@ #define REBOOT_CAD_ON 0x89abcdef #define REBOOT_CAD_OFF 0 #define REBOOT_HALT 0xcdef0123 +#define REBOOT_RESTART 0x01234567 +#define REBOOT_RESTART2 0xA1B2C3D4 +#define REBOOT_POWEROFF 0x4321FEDC +#define REBOOT_MAGIC1 0xfee1dead +#define REBOOT_MAGIC2 0x28121969 +#define REBOOT_MAGIC2A 0x05121996 +#define REBOOT_MAGIC2B 0x16041998 int linux_reboot(struct thread *td, struct linux_reboot_args *args) @@ -1309,10 +1316,37 @@ if (ldebug(reboot)) printf(ARGS(reboot, "0x%x"), args->cmd); #endif - if (args->cmd == REBOOT_CAD_ON || args->cmd == REBOOT_CAD_OFF) - return (0); - bsd_args.opt = (args->cmd == REBOOT_HALT) ? RB_HALT : 0; - return (reboot(td, &bsd_args)); + + if (args->magic1 != REBOOT_MAGIC1) + return EINVAL; + + switch (args->magic2) { + case REBOOT_MAGIC2: + case REBOOT_MAGIC2A: + case REBOOT_MAGIC2B: + break; + default: + return EINVAL; + } + + switch (args->cmd) { + case REBOOT_CAD_ON: + case REBOOT_CAD_OFF: + return suser(td); + case REBOOT_HALT: + bsd_args.opt = RB_HALT; + break; + case REBOOT_RESTART: + case REBOOT_RESTART2: + bsd_args.opt = 0; + break; + case REBOOT_POWEROFF: + bsd_args.opt = RB_POWEROFF; + break; + default: + return EINVAL; + } + return reboot(td, &bsd_args); } ==== //depot/projects/linuxolator/src/sys/conf/files#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1140 2006/08/14 21:09:37 imp Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1142 2006/09/18 17:23:35 sam Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -255,8 +255,6 @@ contrib/dev/acpica/utobject.c optional acpi contrib/dev/acpica/utstate.c optional acpi contrib/dev/acpica/utxface.c optional acpi -contrib/dev/ath/freebsd/ah_osdep.c optional ath_hal \ - compile-with "${NORMAL_C} -I$S/contrib/dev/ath/freebsd" contrib/ipfilter/netinet/fil.c optional ipfilter inet \ compile-with "${NORMAL_C} -I$S/contrib/ipfilter" contrib/ipfilter/netinet/ip_auth.c optional ipfilter inet \ @@ -478,15 +476,17 @@ dev/ata/atapi-cd.c optional atapicd dev/ata/atapi-fd.c optional atapifd dev/ata/atapi-tape.c optional atapist +dev/ath/ah_osdep.c optional ath_hal \ + compile-with "${NORMAL_C} -I$S/dev/ath" dev/ath/ath_rate/amrr/amrr.c optional ath_rate_amrr dev/ath/ath_rate/onoe/onoe.c optional ath_rate_onoe \ - compile-with "${NORMAL_C} -I$S/contrib/dev/ath/freebsd" + compile-with "${NORMAL_C} -I$S/dev/ath" dev/ath/ath_rate/sample/sample.c optional ath_rate_sample \ - compile-with "${NORMAL_C} -I$S/contrib/dev/ath/freebsd" + compile-with "${NORMAL_C} -I$S/dev/ath" dev/ath/if_ath.c optional ath \ - compile-with "${NORMAL_C} -I$S/contrib/dev/ath/freebsd" + compile-with "${NORMAL_C} -I$S/dev/ath" dev/ath/if_ath_pci.c optional ath pci \ - compile-with "${NORMAL_C} -I$S/contrib/dev/ath/freebsd" + compile-with "${NORMAL_C} -I$S/dev/ath" dev/awi/am79c930.c optional awi dev/awi/awi.c optional awi dev/awi/if_awi_pccard.c optional awi pccard ==== //depot/projects/linuxolator/src/sys/conf/kern.pre.mk#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.76 2006/07/17 18:43:16 obrien Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.78 2006/09/18 16:49:14 sam Exp $ # Part of a unified Makefile for building kernels. This part contains all # of the definitions that need to be before %BEFORE_DEPEND. @@ -58,12 +58,6 @@ # include path into contrib'ed source files. INCLUDES+= -I$S/contrib/altq -# ... and the same for Atheros HAL when the author builds it from -# non-distributable sources. -.if defined(ATH_BUILDING_FROM_SOURCE) -INCLUDES+= -I$S/contrib/dev/ath -.endif - .if make(depend) || make(kernel-depend) # ... and the same for ipfilter @@ -73,7 +67,7 @@ INCLUDES+= -I$S/contrib/pf # ... and the same for Atheros HAL -INCLUDES+= -I$S/contrib/dev/ath/freebsd +INCLUDES+= -I$S/dev/ath # ... and the same for the NgATM stuff INCLUDES+= -I$S/contrib/ngatm ==== //depot/projects/linuxolator/src/sys/contrib/pf/net/pf.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.40 2005/12/25 23:52:00 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.41 2006/09/12 04:25:11 csjp Exp $ */ /* $OpenBSD: pf.c,v 1.483 2005/03/15 17:38:43 dhartmei Exp $ */ /* @@ -42,6 +42,7 @@ #endif #ifdef __FreeBSD__ +#include "opt_mac.h" #include "opt_bpf.h" #include "opt_pf.h" @@ -78,6 +79,7 @@ #include #include #ifdef __FreeBSD__ +#include #include #include #else @@ -192,7 +194,12 @@ struct pf_addr *, struct pf_addr *, u_int16_t, u_int16_t *, u_int16_t *, u_int16_t *, u_int16_t *, u_int8_t, sa_family_t); +#ifdef __FreeBSD__ +void pf_send_tcp(struct mbuf *, + const struct pf_rule *, sa_family_t, +#else void pf_send_tcp(const struct pf_rule *, sa_family_t, +#endif const struct pf_addr *, const struct pf_addr *, u_int16_t, u_int16_t, u_int32_t, u_int32_t, u_int8_t, u_int16_t, u_int16_t, u_int8_t, int, @@ -1114,7 +1121,11 @@ cur->local_flags |= PFSTATE_EXPIRING; #endif if (cur->src.state == PF_TCPS_PROXY_DST) +#ifdef __FreeBSD__ + pf_send_tcp(NULL, cur->rule.ptr, cur->af, +#else pf_send_tcp(cur->rule.ptr, cur->af, +#endif &cur->ext.addr, &cur->lan.addr, cur->ext.port, cur->lan.port, cur->src.seqhi, cur->src.seqlo + 1, @@ -1574,7 +1585,11 @@ } void +#ifdef __FreeBSD__ +pf_send_tcp(struct mbuf *replyto, const struct pf_rule *r, sa_family_t af, +#else pf_send_tcp(const struct pf_rule *r, sa_family_t af, +#endif const struct pf_addr *saddr, const struct pf_addr *daddr, u_int16_t sport, u_int16_t dport, u_int32_t seq, u_int32_t ack, u_int8_t flags, u_int16_t win, u_int16_t mss, u_int8_t ttl, int tag, @@ -1613,6 +1628,16 @@ m = m_gethdr(M_DONTWAIT, MT_HEADER); if (m == NULL) return; +#ifdef __FreeBSD__ +#ifdef MAC + if (replyto) + mac_create_mbuf_netlayer(replyto, m); + else + mac_create_mbuf_from_firewall(m); +#else + (void)replyto; +#endif +#endif if (tag) { #ifdef __FreeBSD__ m->m_flags |= M_SKIP_FIREWALL; @@ -3146,7 +3171,11 @@ ack++; if (th->th_flags & TH_FIN) ack++; +#ifdef __FreeBSD__ + pf_send_tcp(m, r, af, pd->dst, +#else pf_send_tcp(r, af, pd->dst, +#endif pd->src, th->th_dport, th->th_sport, ntohl(th->th_ack), ack, TH_RST|TH_ACK, 0, 0, r->return_ttl, 1, pd->eh, kif->pfik_ifp); @@ -3347,7 +3376,11 @@ mss = pf_calc_mss(saddr, af, mss); mss = pf_calc_mss(daddr, af, mss); s->src.mss = mss; +#ifdef __FreeBSD__ + pf_send_tcp(NULL, r, af, daddr, saddr, th->th_dport, +#else pf_send_tcp(r, af, daddr, saddr, th->th_dport, +#endif th->th_sport, s->src.seqhi, ntohl(th->th_seq) + 1, TH_SYN|TH_ACK, 0, s->src.mss, 0, 1, NULL, NULL); REASON_SET(&reason, PFRES_SYNPROXY); @@ -4348,7 +4381,11 @@ REASON_SET(reason, PFRES_SYNPROXY); return (PF_DROP); } +#ifdef __FreeBSD__ + pf_send_tcp(NULL, (*state)->rule.ptr, pd->af, pd->dst, +#else pf_send_tcp((*state)->rule.ptr, pd->af, pd->dst, +#endif pd->src, th->th_dport, th->th_sport, (*state)->src.seqhi, ntohl(th->th_seq) + 1, TH_SYN|TH_ACK, 0, (*state)->src.mss, 0, 1, @@ -4387,7 +4424,12 @@ (*state)->src.max_win = MAX(ntohs(th->th_win), 1); if ((*state)->dst.seqhi == 1) (*state)->dst.seqhi = htonl(arc4random()); +#ifdef __FreeBSD__ + pf_send_tcp(NULL, (*state)->rule.ptr, pd->af, + &src->addr, +#else pf_send_tcp((*state)->rule.ptr, pd->af, &src->addr, +#endif &dst->addr, src->port, dst->port, (*state)->dst.seqhi, 0, TH_SYN, 0, (*state)->src.mss, 0, 0, NULL, NULL); @@ -4401,12 +4443,21 @@ } else { (*state)->dst.max_win = MAX(ntohs(th->th_win), 1); (*state)->dst.seqlo = ntohl(th->th_seq); +#ifdef __FreeBSD__ + pf_send_tcp(NULL, (*state)->rule.ptr, pd->af, pd->dst, +#else pf_send_tcp((*state)->rule.ptr, pd->af, pd->dst, +#endif pd->src, th->th_dport, th->th_sport, ntohl(th->th_ack), ntohl(th->th_seq) + 1, TH_ACK, (*state)->src.max_win, 0, 0, 0, NULL, NULL); +#ifdef __FreeBSD__ + pf_send_tcp(NULL, (*state)->rule.ptr, pd->af, + &src->addr, +#else pf_send_tcp((*state)->rule.ptr, pd->af, &src->addr, +#endif &dst->addr, src->port, dst->port, (*state)->src.seqhi + 1, (*state)->src.seqlo + 1, TH_ACK, (*state)->dst.max_win, 0, 0, 1, @@ -4685,7 +4736,11 @@ (*state)->src.state == TCPS_SYN_SENT) { /* Send RST for state mismatches during handshake */ if (!(th->th_flags & TH_RST)) +#ifdef __FreeBSD__ + pf_send_tcp(m, (*state)->rule.ptr, pd->af, +#else pf_send_tcp((*state)->rule.ptr, pd->af, +#endif pd->dst, pd->src, th->th_dport, th->th_sport, ntohl(th->th_ack), 0, TH_RST, 0, 0, ==== //depot/projects/linuxolator/src/sys/crypto/via/padlock_cipher.c#2 (text+ko) ==== @@ -45,7 +45,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/crypto/via/padlock_cipher.c,v 1.4 2006/07/25 20:00:55 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/crypto/via/padlock_cipher.c,v 1.5 2006/09/15 10:44:55 pjd Exp $"); #include #include @@ -225,7 +225,7 @@ cw->cw_direction = PADLOCK_DIRECTION_ENCRYPT; key = ses->ses_ekey; if ((enccrd->crd_flags & CRD_F_IV_EXPLICIT) != 0) - bcopy(enccrd->crd_iv, ses->ses_iv, 16); + bcopy(enccrd->crd_iv, ses->ses_iv, AES_BLOCK_LEN); if ((enccrd->crd_flags & CRD_F_IV_PRESENT) == 0) { crypto_copyback(crp->crp_flags, crp->crp_buf, @@ -247,7 +247,8 @@ enccrd->crd_len, abuf); } - padlock_cbc(abuf, abuf, enccrd->crd_len / 16, key, cw, ses->ses_iv); + padlock_cbc(abuf, abuf, enccrd->crd_len / AES_BLOCK_LEN, key, cw, + ses->ses_iv); if (allocated) { crypto_copyback(crp->crp_flags, crp->crp_buf, enccrd->crd_skip, ==== //depot/projects/linuxolator/src/sys/dev/acpica/acpi.c#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Sep 20 12:34:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 456BB16A412; Wed, 20 Sep 2006 12:34:33 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0867616A403 for ; Wed, 20 Sep 2006 12:34:33 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A7B7D43D45 for ; Wed, 20 Sep 2006 12:34:32 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8KCYWbi012870 for ; Wed, 20 Sep 2006 12:34:32 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8KCYWva012867 for perforce@freebsd.org; Wed, 20 Sep 2006 12:34:32 GMT (envelope-from rdivacky@FreeBSD.org) Date: Wed, 20 Sep 2006 12:34:32 GMT Message-Id: <200609201234.k8KCYWva012867@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 106395 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Sep 2006 12:34:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=106395 Change 106395 by rdivacky@rdivacky_witten on 2006/09/20 12:34:27 Somehow I managed to screw make sysent ;( this should fix it. Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_proto.h#4 edit .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_syscall.h#4 edit Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_proto.h#4 (text+ko) ==== @@ -724,6 +724,9 @@ char uaddr2_l_[PADL_(void *)]; void * uaddr2; char uaddr2_r_[PADR_(void *)]; char val3_l_[PADL_(int)]; int val3; char val3_r_[PADR_(int)]; }; +struct linux_set_thread_area_args { + char desc_l_[PADL_(struct l_user_desc *)]; struct l_user_desc * desc; char desc_r_[PADR_(struct l_user_desc *)]; +}; struct linux_io_setup_args { char nr_reqs_l_[PADL_(l_uint)]; l_uint nr_reqs; char nr_reqs_r_[PADR_(l_uint)]; char ctxp_l_[PADL_(linux_aio_context_t *)]; linux_aio_context_t * ctxp; char ctxp_r_[PADR_(linux_aio_context_t *)]; @@ -748,9 +751,6 @@ char iocb_l_[PADL_(struct linux_iocb *)]; struct linux_iocb * iocb; char iocb_r_[PADR_(struct linux_iocb *)]; char result_l_[PADL_(struct linux_io_event *)]; struct linux_io_event * result; char result_r_[PADR_(struct linux_io_event *)]; }; -struct linux_set_thread_area_args { - char desc_l_[PADL_(struct l_user_desc *)]; struct l_user_desc * desc; char desc_r_[PADR_(struct l_user_desc *)]; -}; struct linux_fadvise64_args { register_t dummy; }; @@ -1108,6 +1108,7 @@ int linux_fremovexattr(struct thread *, struct linux_fremovexattr_args *); int linux_tkill(struct thread *, struct linux_tkill_args *); int linux_sys_futex(struct thread *, struct linux_sys_futex_args *); +int linux_set_thread_area(struct thread *, struct linux_set_thread_area_args *); int linux_io_setup(struct thread *, struct linux_io_setup_args *); int linux_io_destroy(struct thread *, struct linux_io_destroy_args *); int linux_io_getevents(struct thread *, struct linux_io_getevents_args *); @@ -1358,6 +1359,7 @@ #define LINUX_SYS_AUE_linux_fremovexattr AUE_NULL #define LINUX_SYS_AUE_linux_tkill AUE_NULL #define LINUX_SYS_AUE_linux_sys_futex AUE_NULL +#define LINUX_SYS_AUE_linux_set_thread_area AUE_NULL #define LINUX_SYS_AUE_linux_io_setup AUE_NULL #define LINUX_SYS_AUE_linux_io_destroy AUE_NULL #define LINUX_SYS_AUE_linux_io_getevents AUE_NULL ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_syscall.h#4 (text+ko) ==== @@ -221,6 +221,7 @@ #define LINUX_SYS_linux_fremovexattr 237 #define LINUX_SYS_linux_tkill 238 #define LINUX_SYS_linux_sys_futex 240 +#define LINUX_SYS_linux_set_thread_area 243 #define LINUX_SYS_linux_io_setup 245 #define LINUX_SYS_linux_io_destroy 246 #define LINUX_SYS_linux_io_getevents 247 From owner-p4-projects@FreeBSD.ORG Wed Sep 20 13:00:46 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 574C116A5E3; Wed, 20 Sep 2006 13:00:46 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2613416A5D6 for ; Wed, 20 Sep 2006 13:00:46 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4541D43DBD for ; Wed, 20 Sep 2006 13:00:05 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8KD05Kj021987 for ; Wed, 20 Sep 2006 13:00:05 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8KD05rN021984 for perforce@freebsd.org; Wed, 20 Sep 2006 13:00:05 GMT (envelope-from rdivacky@FreeBSD.org) Date: Wed, 20 Sep 2006 13:00:05 GMT Message-Id: <200609201300.k8KD05rN021984@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 106396 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Sep 2006 13:00:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=106396 Change 106396 by rdivacky@rdivacky_witten on 2006/09/20 12:59:27 Remove ifdef __i386__ thus enabling this to compile on amd64. Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_futex.c#3 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_futex.c#3 (text+ko) ==== @@ -109,10 +109,8 @@ struct futex *newf; int timeout_hz; struct timeval tv = {0, 0}; -#ifdef __i386__ struct futex *f2; int op_ret; -#endif #ifdef DEBUG if (ldebug(sys_futex)) @@ -266,7 +264,6 @@ break; case LINUX_FUTEX_WAKE_OP: -#ifdef __i386__ FUTEX_SYSTEM_LOCK; #ifdef DEBUG if (ldebug(sys_futex)) @@ -314,9 +311,6 @@ td->td_retval[0] = ret; FUTEX_SYSTEM_UNLOCK; -#else - printf("linux_sys_futex: wake_op not implemented"); -#endif break; default: From owner-p4-projects@FreeBSD.ORG Wed Sep 20 14:14:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E68616A492; Wed, 20 Sep 2006 14:14:58 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2C87C16A417 for ; Wed, 20 Sep 2006 14:14:58 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7DC6F43D86 for ; Wed, 20 Sep 2006 14:14:44 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8KEEhhD029183 for ; Wed, 20 Sep 2006 14:14:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8KEEfcE029180 for perforce@freebsd.org; Wed, 20 Sep 2006 14:14:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 20 Sep 2006 14:14:41 GMT Message-Id: <200609201414.k8KEEfcE029180@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 106401 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Sep 2006 14:14:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=106401 Change 106401 by rwatson@rwatson_zoo on 2006/09/20 14:14:10 Check for strlcat(), now used by bsm_control.c. Affected files ... .. //depot/projects/trustedbsd/openbsm/configure.ac#31 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/configure.ac#31 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0a11], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#30 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#31 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) @@ -56,7 +56,7 @@ AC_TYPE_SIGNAL AC_FUNC_STAT AC_FUNC_STRFTIME -AC_CHECK_FUNCS([bzero clock_gettime ftruncate gettimeofday inet_ntoa memset strchr strerror strrchr strstr strtol strtoul]) +AC_CHECK_FUNCS([bzero clock_gettime ftruncate gettimeofday inet_ntoa memset strchr strerror strlcat strrchr strstr strtol strtoul]) # sys/queue.h exists on most systems, but its capabilities vary a great deal. # test for LIST_FIRST and TAILQ_FOREACH_SAFE, which appears to not exist in From owner-p4-projects@FreeBSD.ORG Wed Sep 20 14:27:03 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1943116A47C; Wed, 20 Sep 2006 14:27:03 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E8BBF16A417 for ; Wed, 20 Sep 2006 14:27:02 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3DA6D43D7E for ; Wed, 20 Sep 2006 14:27:00 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8KER0lX030872 for ; Wed, 20 Sep 2006 14:27:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8KEQxKc030869 for perforce@freebsd.org; Wed, 20 Sep 2006 14:26:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 20 Sep 2006 14:26:59 GMT Message-Id: <200609201426.k8KEQxKc030869@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 106402 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Sep 2006 14:27:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=106402 Change 106402 by rwatson@rwatson_sesame on 2006/09/20 14:26:06 Regenerate with strlcat() test. Affected files ... .. //depot/projects/trustedbsd/openbsm/config/config.h.in#9 edit .. //depot/projects/trustedbsd/openbsm/configure#28 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/config/config.h.in#9 (text+ko) ==== @@ -86,6 +86,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STRING_H +/* Define to 1 if you have the `strlcat' function. */ +#undef HAVE_STRLCAT + /* Define to 1 if you have the `strrchr' function. */ #undef HAVE_STRRCHR ==== //depot/projects/trustedbsd/openbsm/configure#28 (xtext) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#29 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#31 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for OpenBSM 1.0a11. # @@ -22834,7 +22834,8 @@ -for ac_func in bzero clock_gettime ftruncate gettimeofday inet_ntoa memset strchr strerror strrchr strstr strtol strtoul + +for ac_func in bzero clock_gettime ftruncate gettimeofday inet_ntoa memset strchr strerror strlcat strrchr strstr strtol strtoul do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_func" >&5 From owner-p4-projects@FreeBSD.ORG Wed Sep 20 14:33:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B09A16A47B; Wed, 20 Sep 2006 14:33:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 371CC16A415 for ; Wed, 20 Sep 2006 14:33:10 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D5E2E43D69 for ; Wed, 20 Sep 2006 14:33:09 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8KEX9WV031168 for ; Wed, 20 Sep 2006 14:33:09 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8KEX99U031165 for perforce@freebsd.org; Wed, 20 Sep 2006 14:33:09 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 20 Sep 2006 14:33:09 GMT Message-Id: <200609201433.k8KEX99U031165@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 106403 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Sep 2006 14:33:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=106403 Change 106403 by rwatson@rwatson_lethe on 2006/09/20 14:32:54 Add strlcat() compat code. Include as a static function rather than compile in order to avoid exposing symbols to applications that may link against libbsm. This gets OpenBSM 1.0 alpha 11 building on Linux again. Affected files ... .. //depot/projects/trustedbsd/openbsm/compat/strlcat.h#1 add .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#15 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#15 (text+ko) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#14 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#15 $ */ #include @@ -38,6 +38,11 @@ #include #include +#include +#ifndef HAVE_STRLCAT +#include +#endif + /* * Parse the contents of the audit_control file to return the audit control * parameters. These static fields are protected by 'mutex'. From owner-p4-projects@FreeBSD.ORG Wed Sep 20 14:50:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D9D9B16A417; Wed, 20 Sep 2006 14:50:01 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 457C216A415 for ; Wed, 20 Sep 2006 14:50:01 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3F83C43DAC for ; Wed, 20 Sep 2006 14:49:39 +0000 (GMT) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8KEnTrQ040048 for ; Wed, 20 Sep 2006 14:49:29 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8KEnTgp040032 for perforce@freebsd.org; Wed, 20 Sep 2006 14:49:29 GMT (envelope-from gonzo@FreeBSD.org) Date: Wed, 20 Sep 2006 14:49:29 GMT Message-Id: <200609201449.k8KEnTgp040032@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 106404 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Sep 2006 14:50:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=106404 Change 106404 by gonzo@gonzo_hq on 2006/09/20 14:49:07 o Add missing bracket. o change #if to #ifdef for undefined "notyet". Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/pmap.c#10 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/pmap.c#10 (text+ko) ==== @@ -218,7 +218,7 @@ lev1 = (unsigned long)MIPS_PTE_TO_PA(*(pt_entry_t *)lev1); pte = tlb_pte_find( - pt_entry_t *)MIPS_PHYS_TO_KSEG0((pt_entry_t *)lev1), va); + (pt_entry_t *)MIPS_PHYS_TO_KSEG0((pt_entry_t *)lev1), va); } else pte = tlb_pte_find(kptmap, va); return pte; @@ -717,7 +717,7 @@ pmap_pinit(pmap) register struct pmap *pmap; { -#if notyet +#ifdef notyet vm_page_t lev1pg; int i; From owner-p4-projects@FreeBSD.ORG Wed Sep 20 15:08:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 59E2716A416; Wed, 20 Sep 2006 15:08:55 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 34B0A16A403 for ; Wed, 20 Sep 2006 15:08:55 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D6C9443DB6 for ; Wed, 20 Sep 2006 15:08:54 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8KF8sPk045035 for ; Wed, 20 Sep 2006 15:08:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8KF8s4u045032 for perforce@freebsd.org; Wed, 20 Sep 2006 15:08:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 20 Sep 2006 15:08:54 GMT Message-Id: <200609201508.k8KF8s4u045032@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 106405 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Sep 2006 15:08:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=106405 Change 106405 by rwatson@rwatson_fledge on 2006/09/20 15:08:20 Remove socketvar include, it is not needed in user space. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#52 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#52 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#51 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#52 $ */ #include @@ -71,7 +71,6 @@ #include #include #include -#include #include #include From owner-p4-projects@FreeBSD.ORG Wed Sep 20 15:13:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CCD3916A559; Wed, 20 Sep 2006 15:13:24 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A12EE16A53E for ; Wed, 20 Sep 2006 15:13:24 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B11AF43D91 for ; Wed, 20 Sep 2006 15:13:00 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8KFCxxY045276 for ; Wed, 20 Sep 2006 15:12:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8KFCxlD045273 for perforce@freebsd.org; Wed, 20 Sep 2006 15:12:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 20 Sep 2006 15:12:59 GMT Message-Id: <200609201512.k8KFCxlD045273@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 106406 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Sep 2006 15:13:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=106406 Change 106406 by rwatson@rwatson_fledge on 2006/09/20 15:12:50 Document strlcat configure check. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#32 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#32 (text+ko) ==== @@ -29,6 +29,7 @@ current default of setting AUDIT_CNT. - Fix bugs in the parsing of large execve(2) arguments and environmental variable tokens; increase maximum parsed argument and variable count. +- configure now detects strlcat(), used by policy-related functions. OpenBSM 1.0 alpha 10 @@ -241,4 +242,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#31 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#32 $ From owner-p4-projects@FreeBSD.ORG Wed Sep 20 15:19:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 00B2016A524; Wed, 20 Sep 2006 15:19:15 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B6F8B16A519 for ; Wed, 20 Sep 2006 15:19:14 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7930343D9D for ; Wed, 20 Sep 2006 15:17:06 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8KFH6cY045679 for ; Wed, 20 Sep 2006 15:17:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8KFH5Yr045676 for perforce@freebsd.org; Wed, 20 Sep 2006 15:17:05 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 20 Sep 2006 15:17:05 GMT Message-Id: <200609201517.k8KFH5Yr045676@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 106407 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Sep 2006 15:19:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=106407 Change 106407 by rwatson@rwatson_fledge on 2006/09/20 15:16:19 Add reference record and token files for regression testing. These were built using test/bsm/generate on FreeBSD 6.2. Affected files ... .. //depot/projects/trustedbsd/openbsm/test/reference/arg32_record#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/arg32_token#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/data_record#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/data_token#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/file_record#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/file_token#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/header32_token#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/in_addr_record#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/in_addr_token#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/ip_record#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/ip_token#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/ipc_record#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/ipc_token#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/iport_record#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/iport_token#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/opaque_record#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/opaque_token#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/path_record#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/path_token#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/process32_record#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/process32_token#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/process32ex_record#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/process32ex_token#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/return32_record#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/return32_token#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/seq_record#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/seq_token#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/subject32_record#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/subject32_token#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/subject32ex_record#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/subject32ex_token-IPv4#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/subject32ex_token-IPv6#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/text_record#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/text_token#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/trailer_token#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Sep 20 15:19:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D79AB16A416; Wed, 20 Sep 2006 15:19:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B606316A407 for ; Wed, 20 Sep 2006 15:19:51 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 602AF43DF8 for ; Wed, 20 Sep 2006 15:18:08 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8KFI8Vd045730 for ; Wed, 20 Sep 2006 15:18:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8KFI8UB045727 for perforce@freebsd.org; Wed, 20 Sep 2006 15:18:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 20 Sep 2006 15:18:08 GMT Message-Id: <200609201518.k8KFI8UB045727@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 106408 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Sep 2006 15:19:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=106408 Change 106408 by rwatson@rwatson_fledge on 2006/09/20 15:17:42 Mention reference tokens/record samples. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#33 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#33 (text+ko) ==== @@ -30,6 +30,7 @@ - Fix bugs in the parsing of large execve(2) arguments and environmental variable tokens; increase maximum parsed argument and variable count. - configure now detects strlcat(), used by policy-related functions. +- Reference token and record sample files added to test tree. OpenBSM 1.0 alpha 10 @@ -242,4 +243,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#32 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#33 $ From owner-p4-projects@FreeBSD.ORG Wed Sep 20 15:48:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5BFE016A416; Wed, 20 Sep 2006 15:48:49 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 37FD316A40F for ; Wed, 20 Sep 2006 15:48:49 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 587B143D77 for ; Wed, 20 Sep 2006 15:48:48 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8KFmmK4047872 for ; Wed, 20 Sep 2006 15:48:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8KFmm6e047869 for perforce@freebsd.org; Wed, 20 Sep 2006 15:48:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 20 Sep 2006 15:48:48 GMT Message-Id: <200609201548.k8KFmm6e047869@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 106411 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Sep 2006 15:48:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=106411 Change 106411 by rwatson@rwatson_fledge on 2006/09/20 15:47:48 Add OpenBSM 1.0-alpha11 to TrustedBSD.org web page. Affected files ... .. //depot/projects/trustedbsd/www/downloads/openbsm-1.0-alpha11.tgz#1 add .. //depot/projects/trustedbsd/www/openbsm.page#16 edit Differences ... ==== //depot/projects/trustedbsd/www/openbsm.page#16 (text+ko) ==== @@ -29,7 +29,7 @@ - $P4: //depot/projects/trustedbsd/www/openbsm.page#15 $ + $P4: //depot/projects/trustedbsd/www/openbsm.page#16 $ @@ -120,6 +120,14 @@ Please see the file README present in the OpenBSM distribution for build and installation instructions.

+

2006-09-20 - OpenBSM 1.0 alpha 11 release is a test release of the + OpenBSM code base, and matches what is present in FreeBSD CVS at + this date. + In this revision, audit_control(5) control of audit policy is + introduced, as well as a significant number of bug fixes relating + to execve(2) argument auditing and log rotation. + Download (480K).

+

2006-09-02 - OpenBSM 1.0 alpha 10 release is a test release of the OpenBSM code base, and matches what is present in FreeBSD CVS at this date. From owner-p4-projects@FreeBSD.ORG Wed Sep 20 16:44:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 85FA716A4B3; Wed, 20 Sep 2006 16:44:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1079B16A417 for ; Wed, 20 Sep 2006 16:44:10 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EC24843D69 for ; Wed, 20 Sep 2006 16:43:58 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8KGhwZP054354 for ; Wed, 20 Sep 2006 16:43:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8KGhw8c054351 for perforce@freebsd.org; Wed, 20 Sep 2006 16:43:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 20 Sep 2006 16:43:58 GMT Message-Id: <200609201643.k8KGhw8c054351@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 106413 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Sep 2006 16:44:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=106413 Change 106413 by rwatson@rwatson_zoo on 2006/09/20 16:43:50 Integrate remaining OpenBSM 1.0 alpha 11 changes to audit3 branch. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#15 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/compat/strlcat.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/config.h.in#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/configure#13 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#14 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_control.c#10 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/arg32_record#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/arg32_token#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/data_record#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/data_token#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/file_record#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/file_token#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/header32_token#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/in_addr_record#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/in_addr_token#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/ip_record#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/ip_token#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/ipc_record#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/ipc_token#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/iport_record#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/iport_token#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/opaque_record#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/opaque_token#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/path_record#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/path_token#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process32_record#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process32_token#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process32ex_record#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/process32ex_token#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/return32_record#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/return32_token#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/seq_record#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/seq_token#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/subject32_record#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/subject32_token#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/subject32ex_record#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/subject32ex_token-IPv4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/subject32ex_token-IPv6#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/text_record#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/text_token#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/reference/trailer_token#1 branch .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#26 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#15 (text+ko) ==== @@ -29,6 +29,8 @@ current default of setting AUDIT_CNT. - Fix bugs in the parsing of large execve(2) arguments and environmental variable tokens; increase maximum parsed argument and variable count. +- configure now detects strlcat(), used by policy-related functions. +- Reference token and record sample files added to test tree. OpenBSM 1.0 alpha 10 @@ -241,4 +243,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#14 $ +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#15 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/config/config.h.in#7 (text+ko) ==== @@ -86,6 +86,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STRING_H +/* Define to 1 if you have the `strlcat' function. */ +#undef HAVE_STRLCAT + /* Define to 1 if you have the `strrchr' function. */ #undef HAVE_STRRCHR ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/configure#13 (xtext) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#29 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#31 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for OpenBSM 1.0a11. # @@ -22834,7 +22834,8 @@ -for ac_func in bzero clock_gettime ftruncate gettimeofday inet_ntoa memset strchr strerror strrchr strstr strtol strtoul + +for ac_func in bzero clock_gettime ftruncate gettimeofday inet_ntoa memset strchr strerror strlcat strrchr strstr strtol strtoul do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_func" >&5 ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#14 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0a11], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#13 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#14 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) @@ -56,7 +56,7 @@ AC_TYPE_SIGNAL AC_FUNC_STAT AC_FUNC_STRFTIME -AC_CHECK_FUNCS([bzero clock_gettime ftruncate gettimeofday inet_ntoa memset strchr strerror strrchr strstr strtol strtoul]) +AC_CHECK_FUNCS([bzero clock_gettime ftruncate gettimeofday inet_ntoa memset strchr strerror strlcat strrchr strstr strtol strtoul]) # sys/queue.h exists on most systems, but its capabilities vary a great deal. # test for LIST_FIRST and TAILQ_FOREACH_SAFE, which appears to not exist in ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_control.c#10 (text+ko) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_control.c#9 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_control.c#10 $ */ #include @@ -38,6 +38,11 @@ #include #include +#include +#ifndef HAVE_STRLCAT +#include +#endif + /* * Parse the contents of the audit_control file to return the audit control * parameters. These static fields are protected by 'mutex'. ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#26 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#25 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#26 $ * $FreeBSD: src/sys/security/audit/audit_bsm_token.c,v 1.7 2006/09/01 11:45:40 wsalamon Exp $ */ @@ -49,7 +49,6 @@ #include #include -#include #include #include From owner-p4-projects@FreeBSD.ORG Wed Sep 20 22:06:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 607D516A417; Wed, 20 Sep 2006 22:06:48 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3C7CD16A40F for ; Wed, 20 Sep 2006 22:06:48 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0555343D49 for ; Wed, 20 Sep 2006 22:06:48 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8KM6ld3093570 for ; Wed, 20 Sep 2006 22:06:47 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8KM6lPC093567 for perforce@freebsd.org; Wed, 20 Sep 2006 22:06:47 GMT (envelope-from piso@freebsd.org) Date: Wed, 20 Sep 2006 22:06:47 GMT Message-Id: <200609202206.k8KM6lPC093567@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 106424 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Sep 2006 22:06:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=106424 Change 106424 by piso@piso_newluxor on 2006/09/20 22:06:42 Fix the 'link_elf: symbol PunchFWHole undefined' msg: in alias.h there's the definition of NO_FW_PUNCH that skips compiling in 'punch holes' support for libalias kernel modules. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_cuseeme.c#13 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_ftp.c#12 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_irc.c#13 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_smedia.c#12 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_cuseeme.c#13 (text+ko) ==== @@ -45,6 +45,7 @@ #include #ifdef _KERNEL +#include #include #include #else ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_ftp.c#12 (text+ko) ==== @@ -87,6 +87,7 @@ #include #ifdef _KERNEL +#include #include #include #else ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_irc.c#13 (text+ko) ==== @@ -68,6 +68,7 @@ #include #ifdef _KERNEL +#include #include #include #else ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_smedia.c#12 (text+ko) ==== @@ -116,6 +116,7 @@ #include #ifdef _KERNEL +#include #include #include #else From owner-p4-projects@FreeBSD.ORG Wed Sep 20 22:29:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6526916A40F; Wed, 20 Sep 2006 22:29:16 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 406DB16A47E for ; Wed, 20 Sep 2006 22:29:16 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EB7E943D46 for ; Wed, 20 Sep 2006 22:29:15 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8KMTFYV095610 for ; Wed, 20 Sep 2006 22:29:15 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8KMTFdD095607 for perforce@freebsd.org; Wed, 20 Sep 2006 22:29:15 GMT (envelope-from piso@freebsd.org) Date: Wed, 20 Sep 2006 22:29:15 GMT Message-Id: <200609202229.k8KMTFdD095607@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 106425 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Sep 2006 22:29:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=106425 Change 106425 by piso@piso_newluxor on 2006/09/20 22:28:58 Axe a debug printf. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#15 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#15 (text+ko) ==== @@ -4658,7 +4658,6 @@ int sof_spool = sizeof(struct cfg_spool); int nat_cnt = 0, off = sizeof(nat_cnt); - printf("NAT_GET_CONFIG\n"); data = malloc(NAT_BUF_LEN, M_IPFW, M_NOWAIT | M_ZERO); if (data == NULL) return (ENOSPC); From owner-p4-projects@FreeBSD.ORG Wed Sep 20 23:27:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 62D6316A416; Wed, 20 Sep 2006 23:27:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3E8D016A407 for ; Wed, 20 Sep 2006 23:27:29 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7720243D49 for ; Wed, 20 Sep 2006 23:27:28 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8KNRSXY099521 for ; Wed, 20 Sep 2006 23:27:28 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8KNRSoi099518 for perforce@freebsd.org; Wed, 20 Sep 2006 23:27:28 GMT (envelope-from imp@freebsd.org) Date: Wed, 20 Sep 2006 23:27:28 GMT Message-Id: <200609202327.k8KNRSoi099518@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 106426 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Sep 2006 23:27:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=106426 Change 106426 by imp@imp_lighthouse on 2006/09/20 23:27:19 checkpoint Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_qdmmc.c#11 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/mci_device.c#16 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/sd-card.c#10 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_qdmmc.c#11 (text+ko) ==== @@ -135,7 +135,8 @@ WR4(sc, MCI_CMDR, cmd); // wait until completed - while (!(RD4(sc, MCI_SR) & MCI_SR_CMDRDY)); + while (!(RD4(sc, MCI_SR) & MCI_SR_CMDRDY)) + continue; error = RD4(sc, MCI_SR) & MCI_SR_ERROR; if (error) { @@ -712,13 +713,28 @@ #endif } -static void at91_qdmmc_task(void *arg) { +static void +at91_qdmmc_wait_ready(struct at91_qdmmc_softc *sc) +{ + int timeout = 100000; + + // Why doesn't this bit ever clear? It does in the boot loader. + printf("Waiting status %#x\n", RD4(sc, MCI_SR)); + while (!(RD4(sc, MCI_SR) & MCI_SR_NOTBUSY) && --timeout) + continue; + printf("Waited status %#x\n", RD4(sc, MCI_SR)); +} + +static void +at91_qdmmc_task(void *arg) +{ struct at91_qdmmc_softc *sc = (struct at91_qdmmc_softc*)arg; struct bio *bp; int status; bus_addr_t addr; int map = 0; uint32_t *tmpbuf; + int sz; tmpbuf = malloc(sc->cards[0].sector_size, M_DEVBUF, M_WAITOK); AT91_QDMMC_LOCK(sc); @@ -732,22 +748,16 @@ bioq_remove(&sc->cards[0].bio_queue, bp); printf("at91_qdmmc_task: request %p\n", bp); if (bp->bio_cmd == BIO_READ) { - status = at91_qdmmc_SendCommand(sc->dev, - SEL_DESEL_CARD_CMD, sc->cards[0].addr << 16); - printf("at91_qdmmc_task: select_card-status(%x) = 0x%x\n", sc->cards[0].addr, status); - status = at91_qdmmc_SendCommand(sc->dev, - SET_BLOCKLEN_CMD, sc->cards[0].sector_size); - printf("at91_qdmmc_task: set_blocklen-status = 0x%x\n", status); printf("at91_qdmmc_task: read block %lld, bcount %ld\n", bp->bio_pblkno, bp->bio_bcount); uint32_t block; // Init Mode Register - WR4(sc, MCI_MR, sc->cards[0].mode | (sc->cards[0].sector_size << 16)); + WR4(sc, MCI_MR, sc->cards[0].mode | MCI_MR_PDCMODE | + (sc->cards[0].sector_size << 16)); printf("mode 0x%x\n", RD4(sc, MCI_MR)); - for (block = bp->bio_pblkno; block < bp->bio_pblkno + (bp->bio_bcount / sc->cards[0].sector_size); block++) { + sz = sc->cards[0].sector_size; + for (block = bp->bio_pblkno; block < bp->bio_pblkno + (bp->bio_bcount / sz); block++) { - WR4(sc, PDC_PTCR, PDC_PTCR_TXTDIS | PDC_PTCR_RXTDIS); - - char *paddr = bp->bio_data + (block - bp->bio_pblkno) * sc->cards[0].sector_size; + char *paddr = bp->bio_data + (block - bp->bio_pblkno) * sz; if (bus_dmamap_load(sc->dmatag, sc->map, paddr, sc->cards[0].sector_size, at91_getaddr, &addr, 0) != 0) @@ -755,23 +765,30 @@ map = 1; bus_dmamap_sync(sc->dmatag, sc->map, BUS_DMASYNC_PREREAD); + at91_qdmmc_wait_ready(sc); + WR4(sc, PDC_PTCR, PDC_PTCR_TXTDIS | PDC_PTCR_RXTDIS); WR4(sc, PDC_RPR, addr); - WR4(sc, PDC_RCR, sc->cards[0].sector_size / 4); - WR4(sc, PDC_PTCR, PDC_PTCR_RXTEN); - WR4(sc, MCI_IER, MCI_SR_RXBUFF | MCI_SR_ENDRX); + WR4(sc, PDC_RCR, sz / 4); - printf("status = 0x%x, paddr = %p, RPR = 0x%x, RCR = 0x%x\n", status, paddr, + printf("block = %#x paddr = %p, RPR = 0x%x, RCR = 0x%x\n", block, paddr, RD4(sc, PDC_RPR), RD4(sc, PDC_RCR)); status = at91_qdmmc_SendCommand(sc->dev, - READ_SINGLE_BLOCK_CMD, block * sc->cards[0].sector_size); + READ_SINGLE_BLOCK_CMD, block * sz); + WR4(sc, MCI_IER, MCI_SR_RXBUFF | MCI_SR_ENDRX); + WR4(sc, PDC_PTCR, PDC_PTCR_RXTEN); + printf("at91_qdmmc_task: read-status = 0x%x\n", status); // wait for completion printf("TO SLEEP, PURCHANCE TO DREAM\n"); +#if 0 msleep(sc, &sc->sc_mtx, PRIBIO, "endrx", 0); printf("DONE SLEEPING\n"); +#endif + at91_qdmmc_wait_ready(sc); + // safety check - while ((RD4(sc, MCI_SR) & MCI_SR_ENDRX) == 0) + while ((RD4(sc, MCI_SR) & MCI_SR_RXBUFF) == 0) DELAY(700); printf("DONE WAITING\n"); @@ -779,6 +796,7 @@ bus_dmamap_unload(sc->dmatag, sc->map); map = 0; + WR4(sc, PDC_PTCR, PDC_PTCR_RXTDIS); /* Fix Byteorder (Atmel Errata) */ uint32_t* base = (uint32_t*)paddr; for (int i = 0; i < sc->cards[0].sector_size / 4; i++) { ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/mci_device.c#16 (text+ko) ==== @@ -166,53 +166,13 @@ unsigned sectorLength = 1 << log2sl; /////////////////////////////////////////////////////////////////////// - if (pMCI_Device->pMCI_DeviceDesc->state != AT91C_MCI_IDLE) { -#if IMP_DEBUG - printf("1 state is 0x%x\n", pMCI_Device->pMCI_DeviceDesc->state); -#endif - return AT91C_READ_ERROR; - } - + if (pMCI_Device->pMCI_DeviceDesc->state != AT91C_MCI_IDLE) + return AT91C_READ_ERROR; if ((AT91F_MCI_GetStatus( - pMCI_Device->pMCI_DeviceFeatures->Relative_Card_Address) & AT91C_SR_READY_FOR_DATA) == 0) { -#if IMP_DEBUG - printf("2\n"); -#endif - return AT91C_READ_ERROR; - } - - if ( (src + sizeToRead) > pMCI_Device->pMCI_DeviceFeatures->Memory_Capacity ) { -#if IMP_DEBUG - printf("3\n"); -#endif - return AT91C_READ_ERROR; - } + pMCI_Device->pMCI_DeviceFeatures->Relative_Card_Address) & AT91C_SR_READY_FOR_DATA) == 0) + return AT91C_READ_ERROR; - // If source does not fit a begin of a block - if ((src & (sectorLength - 1)) != 0) { -#if IMP_DEBUG - printf("4\n"); -#endif - return AT91C_READ_ERROR; - } - - // Test if the MMC supports Partial Read Block - // ALWAYS SUPPORTED IN SD Memory Card - if( (sizeToRead < sectorLength) - && (pMCI_Device->pMCI_DeviceFeatures->Read_Partial == 0x00) ) { -#if IMP_DEBUG - printf("5\n"); -#endif - return AT91C_READ_ERROR; - } - - if( sizeToRead > sectorLength) { -#if IMP_DEBUG - printf("6\n"); -#endif - return AT91C_READ_ERROR; - } /////////////////////////////////////////////////////////////////////// // Init Mode Register @@ -308,7 +268,7 @@ AT91S_MCIDeviceStatus AT91F_MCI_MMC_SelectCard(AT91PS_MciDevice pMCI_Device, unsigned int relative_card_address) { - int status; + int status; //* Check if the MMC card chosen is already the selected one status = AT91F_MCI_GetStatus(relative_card_address); @@ -319,19 +279,20 @@ if ((status & AT91C_SR_CARD_SELECTED) == AT91C_SR_CARD_SELECTED) return AT91C_CARD_SELECTED_OK; - //* Search for the MMC Card to be selected, status = the Corresponding Device Number + //* Search for the MMC Card to be selected, + // status = the Corresponding Device Number status = 0; while( (pMCI_Device->pMCI_DeviceFeatures[status].Relative_Card_Address != relative_card_address) && (status < AT91C_MAX_MCI_CARDS) ) status++; if (status > AT91C_MAX_MCI_CARDS) - return AT91C_CARD_SELECTED_ERROR; + return AT91C_CARD_SELECTED_ERROR; - if (AT91F_MCI_SendCommand(SEL_DESEL_CARD_CMD, - pMCI_Device->pMCI_DeviceFeatures[status].Relative_Card_Address << 16) == AT91C_CMD_SEND_OK) - return AT91C_CARD_SELECTED_OK; - return AT91C_CARD_SELECTED_ERROR; + if (AT91F_MCI_SendCommand(SEL_DESEL_CARD_CMD, + pMCI_Device->pMCI_DeviceFeatures[status].Relative_Card_Address << 16) == AT91C_CMD_SEND_OK) + return AT91C_CARD_SELECTED_OK; + return AT91C_CARD_SELECTED_ERROR; } #endif ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/sd-card.c#10 (text+ko) ==== @@ -47,8 +47,6 @@ #include "lib.h" #include "sd-card.h" -//#define IMP_DEBUG 1 - #define AT91C_MCI_TIMEOUT 1000000 /* For AT91F_MCIDeviceWaitReady */ #define BUFFER_SIZE_MCI_DEVICE 512 #define MASTER_CLOCK 60000000 @@ -85,11 +83,6 @@ } while( !(status & AT91C_MCI_NOTBUSY) && (timeout>0) ); -#if IMP_DEBUG - if (timeout == 0) - printf("Timeout, status is 0x%x\n", status); -#endif - //TODO: Make interrupts work! AT91F_MCI_Handler(); } @@ -103,10 +96,6 @@ AT91S_MCIDeviceStatus status; int sizeToWrite; -#if IMP_DEBUG - printf("\n"); -#endif - //See if we are requested to write partial sectors, and have the capability to do so if ((length % sectorLength) && !(MCI_Device_Features.Write_Partial)) //Return error if appropriat @@ -173,85 +162,26 @@ { unsigned log2sl = MCI_Device.pMCI_DeviceFeatures->READ_BL_LEN; unsigned sectorLength = 1 << log2sl; - unsigned slmask = sectorLength - 1; -// unsigned sector = (unsigned)source >> log2sl; - unsigned offset = (unsigned)source & slmask; AT91S_MCIDeviceStatus status; int sizeToRead; unsigned int *walker; -#if IMP_DEBUG - printf("Reading 0x%x bytes into ARM Addr 0x%x from card offset 0x%x\n", - length, dest, source); -#endif - - - //See if we are requested to read partial sectors, and have the capability to do so - if ((length & slmask) && !(MCI_Device_Features.Read_Partial)) - //Return error if appropriat - return MCI_UNSUPP_SIZE_ERROR; - - //See if we are requested to read from anywhere but a sectors' boundary - //and have the capability to do so - if ((offset) && !(MCI_Device_Features.Read_Partial)) - //Return error if appropriat - return MCI_UNSUPP_OFFSET_ERROR; - - //If the address we're trying to read != sector boundary - if (offset) { - //* Wait MCI Device Ready - AT91F_MCIDeviceWaitReady(AT91C_MCI_TIMEOUT); - - //Calculate the nr of bytes to read - sizeToRead = sectorLength - offset; - //Do the writing - status = AT91F_MCI_ReadBlock(&MCI_Device, source, (unsigned int*)dest, sizeToRead); - //TODO:Status checking - if (status != AT91C_READ_OK) { -#if IMP_DEBUG - printf("STATUS is 0x%x\n", status); -#endif - return -1; - } - - //* Wait MCI Device Ready - AT91F_MCIDeviceWaitReady(AT91C_MCI_TIMEOUT); - // Fix erratum in MCI part - for (walker = (unsigned int *)dest; - walker < (unsigned int *)(dest + sizeToRead); walker++) - *walker = swap(*walker); - - //Update counters & pointers - length -= sizeToRead; - dest += sizeToRead; - source += sizeToRead; - } - //As long as there is data to read while (length) { - //See if we've got at least a sector to read if (length > sectorLength) sizeToRead = sectorLength; - //Else just write the remainder else sizeToRead = length; AT91F_MCIDeviceWaitReady(AT91C_MCI_TIMEOUT); - //Do the writing - status = AT91F_MCI_ReadBlock(&MCI_Device, source, (unsigned int*)dest, sizeToRead); -#if IMP_DEBUG - printf("Reading 0x%x Addr 0x%x card 0x%x\n", - sizeToRead, dest, source); -#endif + //Do the reading + status = AT91F_MCI_ReadBlock(&MCI_Device, source, + (unsigned int*)dest, sizeToRead); //TODO:Status checking - if (status != AT91C_READ_OK) { -#if IMP_DEBUG - printf("STATUS is 0x%x\n", status); -#endif + if (status != AT91C_READ_OK) return -1; - } //* Wait MCI Device Ready AT91F_MCIDeviceWaitReady(AT91C_MCI_TIMEOUT); @@ -301,7 +231,7 @@ // status = ( AT91C_BASE_MCI->MCI_SR & AT91C_BASE_MCI->MCI_IMR ); status = AT91C_BASE_MCI->MCI_SR; - AT91F_MCI_Device_Handler(&MCI_Device,status); + AT91F_MCI_Device_Handler(&MCI_Device, status); } //*---------------------------------------------------------------------------- From owner-p4-projects@FreeBSD.ORG Thu Sep 21 01:09:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 399ED16A4C8; Thu, 21 Sep 2006 01:09:36 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DEBB516A4AB for ; Thu, 21 Sep 2006 01:09:35 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D83D743D55 for ; Thu, 21 Sep 2006 01:09:34 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8L19YLC014779 for ; Thu, 21 Sep 2006 01:09:34 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8L19YEa014776 for perforce@freebsd.org; Thu, 21 Sep 2006 01:09:34 GMT (envelope-from mjacob@freebsd.org) Date: Thu, 21 Sep 2006 01:09:34 GMT Message-Id: <200609210109.k8L19YEa014776@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 106428 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Sep 2006 01:09:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=106428 Change 106428 by mjacob@newisp on 2006/09/21 01:09:09 Checkpoint some 24XX changes. Affected files ... .. //depot/projects/newisp/dev/isp/isp.c#12 edit .. //depot/projects/newisp/dev/isp/isp_target.c#5 edit .. //depot/projects/newisp/dev/isp/isp_target.h#7 edit .. //depot/projects/newisp/dev/isp/ispmbox.h#5 edit .. //depot/projects/newisp/dev/isp/ispvar.h#4 edit Differences ... ==== //depot/projects/newisp/dev/isp/isp.c#12 (text+ko) ==== @@ -4303,7 +4303,7 @@ * We can't be getting this now. */ if (isp->isp_state != ISP_RUNSTATE) { - isp_prt(isp, ISP_LOGWARN, + isp_prt(isp, ISP_LOGINFO, "interrupt (ISR=%x SEMA=%x) when not ready", isr, sema); /* * Thank you very much! *Burrrp*! @@ -4332,7 +4332,8 @@ * Debug: to be taken out eventually */ if (isp->isp_residx != optr) { - isp_prt(isp, ISP_LOGWARN, "optr %x soft optr %x", + isp_prt(isp, ISP_LOGINFO, + "isp_intr: hard optr=%x, soft optr %x", optr, isp->isp_residx); } } else { @@ -5148,6 +5149,7 @@ case RQSTYPE_ATIO2: case RQSTYPE_CTIO2: case RQSTYPE_CTIO3: + case RQSTYPE_CTIO7: isp->isp_rsltccmplt++; /* count as a response completion */ #ifdef ISP_TARGET_MODE if (isp_target_notify(isp, (ispstatusreq_t *) hp, optrp)) { ==== //depot/projects/newisp/dev/isp/isp_target.c#5 (text+ko) ==== @@ -62,6 +62,7 @@ static void isp_handle_atio2(ispsoftc_t *, at2_entry_t *); static void isp_handle_ctio(ispsoftc_t *, ct_entry_t *); static void isp_handle_ctio2(ispsoftc_t *, ct2_entry_t *); +static void isp_handle_ctio7(ispsoftc_t *, ct7_entry_t *); /* * The Qlogic driver gets an interrupt to look at response queue entries. @@ -117,9 +118,11 @@ at_entry_t *atiop; at2_entry_t *at2iop; at2e_entry_t *at2eiop; + at7_entry_t *at7iop; ct_entry_t *ctiop; ct2_entry_t *ct2iop; ct2e_entry_t *ct2eiop; + ct7_entry_t *ct7iop; lun_entry_t *lunenp; in_entry_t *inotp; in_fcentry_t *inot_fcp; @@ -132,9 +135,11 @@ #define atiop unp.atiop #define at2iop unp.at2iop #define at2eiop unp.at2eiop +#define at7iop unp.at7iop #define ctiop unp.ctiop #define ct2iop unp.ct2iop #define ct2eiop unp.ct2eiop +#define ct7iop unp.ct7iop #define lunenp unp.lunenp #define inotp unp.inotp #define inot_fcp unp.inot_fcp @@ -154,8 +159,14 @@ switch(type) { case RQSTYPE_ATIO: - isp_get_atio(isp, atiop, (at_entry_t *) local); - isp_handle_atio(isp, (at_entry_t *) local); + if (IS_24XX(isp)) { + isp_get_atio7(isp, at7iop, (at7_entry_t *) local); + /* Punt directly to platform specific layer. */ + (void) isp_async(isp, ISPASYNC_TARGET_ACTION, local); + } else { + isp_get_atio(isp, atiop, (at_entry_t *) local); + isp_handle_atio(isp, (at_entry_t *) local); + } break; case RQSTYPE_CTIO: isp_get_ctio(isp, ctiop, (ct_entry_t *) local); @@ -178,6 +189,10 @@ } isp_handle_ctio2(isp, (ct2_entry_t *) local); break; + case RQSTYPE_CTIO7: + isp_get_ctio7(isp, ct7iop, (ct7_entry_t *) local); + isp_handle_ctio7(isp, (ct7_entry_t *) local); + break; case RQSTYPE_ENABLE_LUN: case RQSTYPE_MODIFY_LUN: isp_get_enable_lun(isp, lunenp, (lun_entry_t *) local); @@ -283,9 +298,11 @@ #undef atiop #undef at2iop #undef at2eiop +#undef at7iop #undef ctiop #undef ct2iop #undef ct2eiop +#undef ct7iop #undef lunenp #undef inotp #undef inot_fcp @@ -1319,4 +1336,149 @@ */ } } + +static void +isp_handle_ctio7(ispsoftc_t *isp, ct7_entry_t *ct) +{ + void *xs; + int pl = ISP_LOGTDEBUG2; + char *fmsg = NULL; + + if (ct->ct_syshandle) { + xs = isp_find_xs_tgt(isp, ct->ct_syshandle); + if (xs == NULL) { + pl = ISP_LOGALL; + } + } else { + xs = NULL; + } + + switch(ct->ct_nphdl) { + case CT7_BUS_ERROR: + isp_prt(isp, ISP_LOGERR, "PCI DMA Bus Error"); + /* FALL Through */ + case CT7_DATA_OVER: + case CT7_DATA_UNDER: + case CT7_OK: + /* + * There are generally 2 possibilities as to why we'd get + * this condition: + * We sent or received data. + * We sent status & command complete. + */ + + break; + + case CT7_RESET: + if (fmsg == NULL) + fmsg = "LIP Reset"; + /*FALLTHROUGH*/ + case CT7_ABORTED: + /* + * When an Abort message is received the firmware goes to + * Bus Free and returns all outstanding CTIOs with the status + * set, then sends us an Immediate Notify entry. + */ + if (fmsg == NULL) { + fmsg = "ABORT"; + } + + isp_prt(isp, ISP_LOGTDEBUG0, + "CTIO2 destroyed by %s: RX_ID=0x%x", fmsg, ct->ct_rxid); + break; + + case CT7_TIMEOUT: + if (fmsg == NULL) + fmsg = "command"; + isp_prt(isp, ISP_LOGERR, "Firmware timed out on %s", fmsg); + break; + + case CT7_ERR: + fmsg = "Completed with Error"; + /*FALLTHROUGH*/ + case CT7_LOGOUT: + if (fmsg == NULL) + fmsg = "Port Logout"; + /*FALLTHROUGH*/ + case CT7_PORTUNAVAIL: + if (fmsg == NULL) + fmsg = "Port not available"; + /*FALLTHROUGH*/ + case CT7_PORTCHANGED: + if (fmsg == NULL) + fmsg = "Port Changed"; + isp_prt(isp, ISP_LOGWARN, "CTIO returned by f/w- %s", fmsg); + break; + + case CT7_INVRXID: + /* + * CTIO rejected by the firmware because an invalid RX_ID. + * Just print a message. + */ + isp_prt(isp, ISP_LOGWARN, + "CTIO2 completed with Invalid RX_ID 0x%x", ct->ct_rxid); + break; + + case CT7_REASSY_ERR: + isp_prt(isp, ISP_LOGWARN, "reassembly error"); + break; + + case CT7_SRR: + isp_prt(isp, ISP_LOGWARN, "SRR received"); + break; + + default: + isp_prt(isp, ISP_LOGERR, "Unknown CTIO2 status 0x%x", + ct->ct_nphdl); + break; + } + + if (xs == NULL) { + /* + * There may be more than one CTIO for a data transfer, + * or this may be a status CTIO we're not monitoring. + * + * The assumption is that they'll all be returned in the + * order we got them. + */ + if (ct->ct_syshandle == 0) { + if ((ct->ct_flags & CT7_SENDSTATUS) == 0) { + isp_prt(isp, pl, + "intermediate CTIO completed ok"); + } else { + isp_prt(isp, pl, + "unmonitored CTIO completed ok"); + } + } else { + isp_prt(isp, pl, + "NO xs for CTIO (handle 0x%x) status 0x%x", + ct->ct_syshandle, ct->ct_nphdl); + } + } else { + if ((ct->ct_flags & CT2_DATAMASK) != CT2_NO_DATA) { + ISP_DMAFREE(isp, xs, ct->ct_syshandle); + } + if (ct->ct_flags & CT2_SENDSTATUS) { + /* + * Sent status and command complete. + * + * We're now really done with this command, so we + * punt to the platform dependent layers because + * only there can we do the appropriate command + * complete thread synchronization. + */ + isp_prt(isp, pl, "status CTIO complete"); + } else { + /* + * Final CTIO completed. Release DMA resources and + * notify platform dependent layers. + */ + isp_prt(isp, pl, "data CTIO complete"); + } + (void) isp_async(isp, ISPASYNC_TARGET_ACTION, ct); + /* + * The platform layer will destroy the handle if appropriate. + */ + } +} #endif ==== //depot/projects/newisp/dev/isp/isp_target.h#7 (text+ko) ==== @@ -723,7 +723,7 @@ typedef struct { isphdr_t ct_header; uint32_t ct_syshandle; - uint16_t ct_nphdl; + uint16_t ct_nphdl; /* status on returned CTIOs */ uint16_t ct_timeout; uint16_t ct_seg_count; uint8_t ct_vpindex; @@ -782,21 +782,21 @@ /* * Type 7 CTIO status codes */ -#define CY7_OK 0x01 /* completed without error */ -#define CY7_ABORTED 0x02 /* aborted by host */ -#define CY7_ERR 0x04 /* see sense data for error */ -#define CY7_INVAL 0x06 /* request for disabled lun */ -#define CY7_INVRXID 0x08 /* (FC only) Invalid RX_ID */ -#define CY7_DATA_OVER 0x09 /* (FC only) Data Overrun */ -#define CY7_TIMEOUT 0x0B /* timed out */ -#define CY7_RESET 0x0E /* LIP Rset Received */ -#define CY7_BUS_ERROR 0x10 /* DMA PCI Error */ +#define CT7_OK 0x01 /* completed without error */ +#define CT7_ABORTED 0x02 /* aborted by host */ +#define CT7_ERR 0x04 /* see sense data for error */ +#define CT7_INVAL 0x06 /* request for disabled lun */ +#define CT7_INVRXID 0x08 /* (FC only) Invalid RX_ID */ +#define CT7_DATA_OVER 0x09 /* (FC only) Data Overrun */ +#define CT7_TIMEOUT 0x0B /* timed out */ +#define CT7_RESET 0x0E /* LIP Rset Received */ +#define CT7_BUS_ERROR 0x10 /* DMA PCI Error */ #define CT7_REASSY_ERR 0x11 /* DMA reassembly error */ -#define CY7_DATA_UNDER 0x15 /* (FC only) Data Underrun */ -#define CY7_PORTUNAVAIL 0x28 /* port not available */ -#define CY7_LOGOUT 0x29 /* port logout */ -#define CY7_PORTCHANGED 0x2A /* port changed */ -#define CY7_SRR 0x45 /* SRR Received */ +#define CT7_DATA_UNDER 0x15 /* (FC only) Data Underrun */ +#define CT7_PORTUNAVAIL 0x28 /* port not available */ +#define CT7_LOGOUT 0x29 /* port logout */ +#define CT7_PORTCHANGED 0x2A /* port changed */ +#define CT7_SRR 0x45 /* SRR Received */ /* * Debug macros ==== //depot/projects/newisp/dev/isp/ispmbox.h#5 (text+ko) ==== @@ -315,6 +315,7 @@ #define RQSTYPE_CTIO1 0x0f /* Target Mode */ #define RQSTYPE_STATUS_CONT 0x10 #define RQSTYPE_T2RQS 0x11 +#define RQSTYPE_CTIO7 0x12 #define RQSTYPE_IP_XMIT 0x13 #define RQSTYPE_TSK_MGMT 0x14 #define RQSTYPE_T4RQS 0x15 ==== //depot/projects/newisp/dev/isp/ispvar.h#4 (text+ko) ==== @@ -495,6 +495,11 @@ void * isp_result; XS_DMA_ADDR_T isp_rquest_dma; XS_DMA_ADDR_T isp_result_dma; +#ifdef ISP_TARGET_MODE + /* for 24XX only */ + void * isp_atioq; + XS_DMA_ADDR_T isp_atioq_dma; +#endif }; #define SDPARAM(isp) ((sdparam *) (isp)->isp_param) From owner-p4-projects@FreeBSD.ORG Thu Sep 21 07:37:34 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 43A7216A494; Thu, 21 Sep 2006 07:37:34 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0682D16A403 for ; Thu, 21 Sep 2006 07:37:34 +0000 (UTC) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9A50A43D46 for ; Thu, 21 Sep 2006 07:37:33 +0000 (GMT) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8L7bX8D049608 for ; Thu, 21 Sep 2006 07:37:33 GMT (envelope-from trhodes@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8L7bXsY049605 for perforce@freebsd.org; Thu, 21 Sep 2006 07:37:33 GMT (envelope-from trhodes@freebsd.org) Date: Thu, 21 Sep 2006 07:37:33 GMT Message-Id: <200609210737.k8L7bXsY049605@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trhodes@freebsd.org using -f From: Tom Rhodes To: Perforce Change Reviews Cc: Subject: PERFORCE change 106437 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Sep 2006 07:37:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=106437 Change 106437 by trhodes@trhodes_local on 2006/09/21 07:36:54 IFC. Affected files ... .. //depot/projects/usb/src/sys/arm/arm/gdb_machdep.c#1 branch .. //depot/projects/usb/src/sys/arm/at91/at91_pio_rm9200.h#1 branch .. //depot/projects/usb/src/sys/arm/at91/at91_piovar.h#1 branch .. //depot/projects/usb/src/sys/arm/conf/EP80219#1 branch .. //depot/projects/usb/src/sys/arm/include/gdb_machdep.h#1 branch .. //depot/projects/usb/src/sys/arm/xscale/i80321/ep80219_machdep.c#1 branch .. //depot/projects/usb/src/sys/arm/xscale/i80321/files.ep80219#1 branch .. //depot/projects/usb/src/sys/arm/xscale/i80321/files.i80219#1 branch .. //depot/projects/usb/src/sys/arm/xscale/i80321/std.ep80219#1 branch .. //depot/projects/usb/src/sys/arm/xscale/i80321/std.i80219#1 branch .. //depot/projects/usb/src/sys/boot/arm/Makefile#1 branch .. //depot/projects/usb/src/sys/boot/arm/at91/bootiic/env_vars.c#1 branch .. //depot/projects/usb/src/sys/boot/arm/at91/bootiic/env_vars.h#1 branch .. //depot/projects/usb/src/sys/boot/arm/at91/bootiic/loader_prompt.c#1 branch .. //depot/projects/usb/src/sys/boot/arm/at91/bootiic/loader_prompt.h#1 branch .. //depot/projects/usb/src/sys/boot/arm/at91/bootspi/arm_init.S#1 branch .. //depot/projects/usb/src/sys/boot/arm/at91/bootspi/env_vars.c#1 branch .. //depot/projects/usb/src/sys/boot/arm/at91/bootspi/env_vars.h#1 branch .. //depot/projects/usb/src/sys/boot/arm/at91/bootspi/loader_prompt.c#1 branch .. //depot/projects/usb/src/sys/boot/arm/at91/bootspi/loader_prompt.h#1 branch .. //depot/projects/usb/src/sys/boot/arm/at91/libat91/delay.c#1 branch .. //depot/projects/usb/src/sys/boot/arm/at91/libat91/emac_init.c#1 branch .. //depot/projects/usb/src/sys/boot/arm/at91/libat91/lib_AT91RM9200.h#1 branch .. //depot/projects/usb/src/sys/boot/arm/at91/libat91/mci_device.c#1 branch .. //depot/projects/usb/src/sys/boot/arm/at91/libat91/mci_device.h#1 branch .. //depot/projects/usb/src/sys/boot/arm/at91/libat91/reset.c#1 branch .. //depot/projects/usb/src/sys/boot/arm/at91/libat91/sd-card.c#1 branch .. //depot/projects/usb/src/sys/boot/arm/at91/libat91/sd-card.h#1 branch .. //depot/projects/usb/src/sys/boot/arm/at91/libat91/spi_flash.c#1 branch .. //depot/projects/usb/src/sys/boot/arm/at91/libat91/spi_flash.h#1 branch .. //depot/projects/usb/src/sys/boot/ficl/arm/sysdep.c#1 branch .. //depot/projects/usb/src/sys/boot/ficl/arm/sysdep.h#1 branch .. //depot/projects/usb/src/sys/compat/linux/linux_emul.c#1 branch .. //depot/projects/usb/src/sys/compat/linux/linux_emul.h#1 branch .. //depot/projects/usb/src/sys/compat/linux/linux_futex.c#1 branch .. //depot/projects/usb/src/sys/compat/linux/linux_futex.h#1 branch .. //depot/projects/usb/src/sys/compat/linux/linux_time.c#1 branch .. //depot/projects/usb/src/sys/contrib/dev/ath/ah_soc.h#1 branch .. //depot/projects/usb/src/sys/contrib/dev/ath/public/ap30.hal.o.uu#1 branch .. //depot/projects/usb/src/sys/contrib/dev/ath/public/ap30.inc#1 branch .. //depot/projects/usb/src/sys/contrib/dev/ath/public/ap30.opt_ah.h#1 branch .. //depot/projects/usb/src/sys/contrib/dev/ath/public/ap43.hal.o.uu#1 branch .. //depot/projects/usb/src/sys/contrib/dev/ath/public/ap43.inc#1 branch .. //depot/projects/usb/src/sys/contrib/dev/ath/public/ap43.opt_ah.h#1 branch .. //depot/projects/usb/src/sys/contrib/dev/ath/public/ap51.hal.o.uu#1 branch .. //depot/projects/usb/src/sys/contrib/dev/ath/public/ap51.inc#1 branch .. //depot/projects/usb/src/sys/contrib/dev/ath/public/ap51.opt_ah.h#1 branch .. //depot/projects/usb/src/sys/contrib/dev/ath/public/ap61.hal.o.uu#1 branch .. //depot/projects/usb/src/sys/contrib/dev/ath/public/ap61.inc#1 branch .. //depot/projects/usb/src/sys/contrib/dev/ath/public/ap61.opt_ah.h#1 branch .. //depot/projects/usb/src/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#1 branch .. //depot/projects/usb/src/sys/contrib/dev/ath/public/sparc-be-elf.inc#1 branch .. //depot/projects/usb/src/sys/contrib/dev/ath/public/sparc-be-elf.opt_ah.h#1 branch .. //depot/projects/usb/src/sys/contrib/ia64/libuwx/src/uwx_self_info.h#1 branch .. //depot/projects/usb/src/sys/contrib/ia64/libuwx/src/uwx_symbols.c#1 branch .. //depot/projects/usb/src/sys/contrib/ia64/libuwx/src/uwx_symbols.h#1 branch .. //depot/projects/usb/src/sys/crypto/via/padlock.h#1 branch .. //depot/projects/usb/src/sys/crypto/via/padlock_cipher.c#1 branch .. //depot/projects/usb/src/sys/crypto/via/padlock_hash.c#1 branch .. //depot/projects/usb/src/sys/dev/ispfw/asm_2322.h#1 branch .. //depot/projects/usb/src/sys/dev/ispfw/asm_2400.h#1 branch .. //depot/projects/usb/src/sys/dev/mii/gentbi.c#1 branch .. //depot/projects/usb/src/sys/dev/mii/ip1000phy.c#1 branch .. //depot/projects/usb/src/sys/dev/mii/ip1000phyreg.h#1 branch .. //depot/projects/usb/src/sys/dev/mxge/eth_z8e.dat.gz.uu#1 branch .. //depot/projects/usb/src/sys/dev/mxge/ethp_z8e.dat.gz.uu#1 branch .. //depot/projects/usb/src/sys/dev/mxge/if_mxge.c#1 branch .. //depot/projects/usb/src/sys/dev/mxge/if_mxge_var.h#1 branch .. //depot/projects/usb/src/sys/dev/mxge/mcp_gen_header.h#1 branch .. //depot/projects/usb/src/sys/dev/mxge/mxge_mcp.h#1 branch .. //depot/projects/usb/src/sys/dev/nfe/if_nfe.c#1 branch .. //depot/projects/usb/src/sys/dev/nfe/if_nfereg.h#1 branch .. //depot/projects/usb/src/sys/dev/nfe/if_nfevar.h#1 branch .. //depot/projects/usb/src/sys/dev/powermac_nvram/powermac_nvram.c#1 branch .. //depot/projects/usb/src/sys/dev/powermac_nvram/powermac_nvramvar.h#1 branch .. //depot/projects/usb/src/sys/dev/sound/pci/ak452x.c#1 branch .. //depot/projects/usb/src/sys/dev/sound/pci/ak452x.h#1 branch .. //depot/projects/usb/src/sys/dev/sound/pci/emu10kx-midi.c#1 branch .. //depot/projects/usb/src/sys/dev/sound/pci/emu10kx-pcm.c#1 branch .. //depot/projects/usb/src/sys/dev/sound/pci/emu10kx.c#1 branch .. //depot/projects/usb/src/sys/dev/sound/pci/emu10kx.h#1 branch .. //depot/projects/usb/src/sys/dev/sound/pci/envy24.c#1 branch .. //depot/projects/usb/src/sys/dev/sound/pci/envy24.h#1 branch .. //depot/projects/usb/src/sys/dev/spibus/spi.h#1 branch .. //depot/projects/usb/src/sys/dev/spibus/spibus.c#1 branch .. //depot/projects/usb/src/sys/dev/spibus/spibus_if.m#1 branch .. //depot/projects/usb/src/sys/dev/spibus/spibusvar.h#1 branch .. //depot/projects/usb/src/sys/dev/stge/if_stge.c#1 branch .. //depot/projects/usb/src/sys/dev/stge/if_stgereg.h#1 branch .. //depot/projects/usb/src/sys/geom/eli/g_eli_integrity.c#1 branch .. //depot/projects/usb/src/sys/geom/eli/g_eli_privacy.c#1 branch .. //depot/projects/usb/src/sys/geom/label/g_label_msdosfs.h#1 branch .. //depot/projects/usb/src/sys/gnu/dev/sound/pci/p16v-alsa.h#1 branch .. //depot/projects/usb/src/sys/gnu/dev/sound/pci/p17v-alsa.h#1 branch .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#1 branch .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_iget.c#1 branch .. //depot/projects/usb/src/sys/ia64/ia64/emulate.c#1 branch .. //depot/projects/usb/src/sys/kern/sched_core.c#1 branch .. //depot/projects/usb/src/sys/kern/subr_acl_posix1e.c#1 branch .. //depot/projects/usb/src/sys/kern/systrace_args.c#1 branch .. //depot/projects/usb/src/sys/kern/uipc_sockbuf.c#1 branch .. //depot/projects/usb/src/sys/libkern/strstr.c#1 branch .. //depot/projects/usb/src/sys/modules/bridgestp/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/ispfw/isp_1000/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/ispfw/isp_1040/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/ispfw/isp_1040_it/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/ispfw/isp_1080/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/ispfw/isp_1080_it/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/ispfw/isp_12160/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/ispfw/isp_12160_it/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/ispfw/isp_2100/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/ispfw/isp_2200/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/ispfw/isp_2300/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/ispfw/isp_2322/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/ispfw/isp_2400/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/ispfw/ispfw/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/mxge/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/mxge/mxge/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/mxge/mxge_eth_z8e/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/mxge/mxge_ethp_z8e/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/netgraph/tag/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/nfe/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/powermac_nvram/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/ppc/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/sound/driver/ak452x/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/sound/driver/emu10kx/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/sound/driver/envy24/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/stge/Makefile#1 branch .. //depot/projects/usb/src/sys/net/bridgestp.h#1 branch .. //depot/projects/usb/src/sys/net/if_enc.c#1 branch .. //depot/projects/usb/src/sys/netgraph/ng_tag.c#1 branch .. //depot/projects/usb/src/sys/netgraph/ng_tag.h#1 branch .. //depot/projects/usb/src/sys/powerpc/include/gdb_machdep.h#1 branch .. //depot/projects/usb/src/sys/powerpc/powerpc/gdb_machdep.c#1 branch .. //depot/projects/usb/src/sys/powerpc/psim/uart_iobus.c#1 branch .. //depot/projects/usb/src/sys/sys/_bus_dma.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Thu Sep 21 07:38:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E822C16A584; Thu, 21 Sep 2006 07:38:35 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 96A5E16A582 for ; Thu, 21 Sep 2006 07:38:35 +0000 (UTC) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 637EF43D46 for ; Thu, 21 Sep 2006 07:38:35 +0000 (GMT) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8L7cZtE049655 for ; Thu, 21 Sep 2006 07:38:35 GMT (envelope-from trhodes@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8L7cZol049652 for perforce@freebsd.org; Thu, 21 Sep 2006 07:38:35 GMT (envelope-from trhodes@freebsd.org) Date: Thu, 21 Sep 2006 07:38:35 GMT Message-Id: <200609210738.k8L7cZol049652@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trhodes@freebsd.org using -f From: Tom Rhodes To: Perforce Change Reviews Cc: Subject: PERFORCE change 106438 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Sep 2006 07:38:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=106438 Change 106438 by trhodes@trhodes_local on 2006/09/21 07:37:59 Integrate this file. Affected files ... .. //depot/projects/usb/src/sys/dev/ata/ata-usb.c#8 integrate Differences ... ==== //depot/projects/usb/src/sys/dev/ata/ata-usb.c#8 (text) ==== @@ -27,9 +27,10 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-usb.c,v 1.5 2006/09/11 19:47:53 sos Exp $"); + #include "opt_ata.h" - -#include #include #include #include @@ -84,6 +85,10 @@ /* USB-ATA 'controller' softc */ struct atausb_softc { + device_t dev; /* base device */ + int maxlun; + struct ata_request *ata_request; + usb_device_request_t usb_request; struct bbb_cbw cbw; struct bbb_csw csw; struct mtx locked_mtx; From owner-p4-projects@FreeBSD.ORG Thu Sep 21 09:08:03 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3F17116A4F0; Thu, 21 Sep 2006 09:08:03 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 126AE16A4EC for ; Thu, 21 Sep 2006 09:08:03 +0000 (UTC) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 124D043D4C for ; Thu, 21 Sep 2006 09:08:00 +0000 (GMT) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8L980EQ064703 for ; Thu, 21 Sep 2006 09:08:00 GMT (envelope-from trhodes@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8L96uSD064664 for perforce@freebsd.org; Thu, 21 Sep 2006 09:06:56 GMT (envelope-from trhodes@freebsd.org) Date: Thu, 21 Sep 2006 09:06:56 GMT Message-Id: <200609210906.k8L96uSD064664@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trhodes@freebsd.org using -f From: Tom Rhodes To: Perforce Change Reviews Cc: Subject: PERFORCE change 106440 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Sep 2006 09:08:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=106440 Change 106440 by trhodes@trhodes_local on 2006/09/21 09:06:24 IFC, including several USB files I caught up with. Just a few more to do. Discussed with: Hans Petter Selasky Affected files ... .. //depot/projects/usb/src/sys/Makefile#2 integrate .. //depot/projects/usb/src/sys/amd64/acpica/madt.c#2 integrate .. //depot/projects/usb/src/sys/amd64/amd64/busdma_machdep.c#2 integrate .. //depot/projects/usb/src/sys/amd64/amd64/db_trace.c#2 integrate .. //depot/projects/usb/src/sys/amd64/amd64/fpu.c#2 integrate .. //depot/projects/usb/src/sys/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/usb/src/sys/amd64/amd64/initcpu.c#2 integrate .. //depot/projects/usb/src/sys/amd64/amd64/intr_machdep.c#2 integrate .. //depot/projects/usb/src/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/usb/src/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/usb/src/sys/amd64/amd64/mp_machdep.c#2 integrate .. //depot/projects/usb/src/sys/amd64/amd64/nexus.c#2 integrate .. //depot/projects/usb/src/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/usb/src/sys/amd64/amd64/support.S#2 integrate .. //depot/projects/usb/src/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/usb/src/sys/amd64/amd64/vm_machdep.c#2 integrate .. //depot/projects/usb/src/sys/amd64/conf/DEFAULTS#2 integrate .. //depot/projects/usb/src/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/usb/src/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/usb/src/sys/amd64/ia32/ia32_syscall.c#2 integrate .. //depot/projects/usb/src/sys/amd64/include/md_var.h#2 integrate .. //depot/projects/usb/src/sys/amd64/include/pmap.h#2 integrate .. //depot/projects/usb/src/sys/amd64/include/specialreg.h#2 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux.h#2 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_dummy.c#2 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_machdep.c#2 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_proto.h#2 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_syscall.h#2 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_sysent.c#2 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_sysvec.c#2 integrate .. //depot/projects/usb/src/sys/amd64/linux32/syscalls.conf#2 integrate .. //depot/projects/usb/src/sys/amd64/linux32/syscalls.master#2 integrate .. //depot/projects/usb/src/sys/arm/arm/busdma_machdep.c#2 integrate .. //depot/projects/usb/src/sys/arm/arm/cpufunc.c#2 integrate .. //depot/projects/usb/src/sys/arm/arm/db_trace.c#2 integrate .. //depot/projects/usb/src/sys/arm/arm/elf_trampoline.c#2 integrate .. //depot/projects/usb/src/sys/arm/arm/fusu.S#2 integrate .. //depot/projects/usb/src/sys/arm/arm/identcpu.c#2 integrate .. //depot/projects/usb/src/sys/arm/arm/in_cksum.c#2 integrate .. //depot/projects/usb/src/sys/arm/arm/inckern.S#2 integrate .. //depot/projects/usb/src/sys/arm/arm/locore.S#2 integrate .. //depot/projects/usb/src/sys/arm/arm/mem.c#2 integrate .. //depot/projects/usb/src/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/usb/src/sys/arm/arm/trap.c#2 integrate .. //depot/projects/usb/src/sys/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/usb/src/sys/arm/at91/at91.c#2 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_pio.c#2 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_pmc.c#2 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_rtc.c#2 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_rtcreg.h#2 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_spi.c#2 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_spiio.h#2 delete .. //depot/projects/usb/src/sys/arm/at91/at91_spireg.h#2 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_ssc.c#2 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_st.c#2 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_twi.c#2 integrate .. //depot/projects/usb/src/sys/arm/at91/at91rm92reg.h#2 integrate .. //depot/projects/usb/src/sys/arm/at91/files.at91#2 integrate .. //depot/projects/usb/src/sys/arm/at91/if_ate.c#2 integrate .. //depot/projects/usb/src/sys/arm/at91/if_atereg.h#2 integrate .. //depot/projects/usb/src/sys/arm/at91/kb920x_machdep.c#2 integrate .. //depot/projects/usb/src/sys/arm/at91/std.at91#2 integrate .. //depot/projects/usb/src/sys/arm/at91/std.kb920x#2 integrate .. //depot/projects/usb/src/sys/arm/at91/uart_dev_at91usart.c#2 integrate .. //depot/projects/usb/src/sys/arm/conf/IQ31244#2 integrate .. //depot/projects/usb/src/sys/arm/conf/KB920X#2 integrate .. //depot/projects/usb/src/sys/arm/conf/SIMICS#2 integrate .. //depot/projects/usb/src/sys/arm/conf/SKYEYE#2 integrate .. //depot/projects/usb/src/sys/arm/include/armreg.h#2 integrate .. //depot/projects/usb/src/sys/arm/include/asm.h#2 integrate .. //depot/projects/usb/src/sys/arm/include/cpuconf.h#2 integrate .. //depot/projects/usb/src/sys/arm/include/cpufunc.h#2 integrate .. //depot/projects/usb/src/sys/arm/include/db_machdep.h#2 integrate .. //depot/projects/usb/src/sys/arm/include/elf.h#2 integrate .. //depot/projects/usb/src/sys/arm/include/pmap.h#2 integrate .. //depot/projects/usb/src/sys/arm/include/sf_buf.h#2 integrate .. //depot/projects/usb/src/sys/arm/include/vmparam.h#2 integrate .. //depot/projects/usb/src/sys/arm/sa11x0/assabet_machdep.c#2 integrate .. //depot/projects/usb/src/sys/arm/sa11x0/sa11x0_var.h#2 integrate .. //depot/projects/usb/src/sys/arm/sa11x0/uart_cpu_sa1110.c#2 integrate .. //depot/projects/usb/src/sys/arm/sa11x0/uart_dev_sa1110.c#2 integrate .. //depot/projects/usb/src/sys/arm/xscale/i80321/i80321.c#2 integrate .. //depot/projects/usb/src/sys/arm/xscale/i80321/i80321_intr.h#2 integrate .. //depot/projects/usb/src/sys/arm/xscale/i80321/i80321_pci.c#2 integrate .. //depot/projects/usb/src/sys/arm/xscale/i80321/i80321_timer.c#2 integrate .. //depot/projects/usb/src/sys/arm/xscale/i80321/i80321reg.h#2 integrate .. //depot/projects/usb/src/sys/arm/xscale/i80321/i80321var.h#2 integrate .. //depot/projects/usb/src/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate .. //depot/projects/usb/src/sys/arm/xscale/i80321/iq80321.c#2 integrate .. //depot/projects/usb/src/sys/arm/xscale/i80321/iq80321reg.h#2 integrate .. //depot/projects/usb/src/sys/boot/Makefile#2 integrate .. //depot/projects/usb/src/sys/boot/arm/at91/Makefile.inc#2 integrate .. //depot/projects/usb/src/sys/boot/arm/at91/boot0/Makefile#2 integrate .. //depot/projects/usb/src/sys/boot/arm/at91/boot0iic/Makefile#2 integrate .. //depot/projects/usb/src/sys/boot/arm/at91/boot0iic/doit.c#2 delete .. //depot/projects/usb/src/sys/boot/arm/at91/boot0iic/main.c#2 integrate .. //depot/projects/usb/src/sys/boot/arm/at91/boot0spi/Makefile#2 integrate .. //depot/projects/usb/src/sys/boot/arm/at91/boot0spi/doit.c#2 delete .. //depot/projects/usb/src/sys/boot/arm/at91/boot0spi/main.c#2 integrate .. //depot/projects/usb/src/sys/boot/arm/at91/bootiic/Makefile#2 integrate .. //depot/projects/usb/src/sys/boot/arm/at91/bootiic/arm_init.S#2 integrate .. //depot/projects/usb/src/sys/boot/arm/at91/bootiic/main.c#2 integrate .. //depot/projects/usb/src/sys/boot/arm/at91/bootspi/Makefile#2 integrate .. //depot/projects/usb/src/sys/boot/arm/at91/bootspi/arm_init.s#2 delete .. //depot/projects/usb/src/sys/boot/arm/at91/bootspi/main.c#2 integrate .. //depot/projects/usb/src/sys/boot/arm/at91/libat91/Makefile#2 integrate .. //depot/projects/usb/src/sys/boot/arm/at91/libat91/at91rm9200.h#2 integrate .. //depot/projects/usb/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#2 integrate .. //depot/projects/usb/src/sys/boot/arm/at91/libat91/eeprom.c#2 integrate .. //depot/projects/usb/src/sys/boot/arm/at91/libat91/eeprom.h#2 delete .. //depot/projects/usb/src/sys/boot/arm/at91/libat91/emac.c#2 integrate .. //depot/projects/usb/src/sys/boot/arm/at91/libat91/emac.h#2 integrate .. //depot/projects/usb/src/sys/boot/arm/at91/libat91/env_vars.c#2 delete .. //depot/projects/usb/src/sys/boot/arm/at91/libat91/env_vars.h#2 delete .. //depot/projects/usb/src/sys/boot/arm/at91/libat91/lib.h#2 integrate .. //depot/projects/usb/src/sys/boot/arm/at91/libat91/loader_prompt.c#2 delete .. //depot/projects/usb/src/sys/boot/arm/at91/libat91/loader_prompt.h#2 delete .. //depot/projects/usb/src/sys/boot/arm/at91/libat91/p_string.c#2 integrate .. //depot/projects/usb/src/sys/boot/arm/at91/libat91/p_string.h#2 delete .. //depot/projects/usb/src/sys/boot/arm/at91/libat91/xmodem.c#2 integrate .. //depot/projects/usb/src/sys/boot/common/help.common#2 integrate .. //depot/projects/usb/src/sys/boot/common/loader.8#2 integrate .. //depot/projects/usb/src/sys/boot/forth/loader.conf#2 integrate .. //depot/projects/usb/src/sys/boot/i386/libi386/biosdisk.c#2 integrate .. //depot/projects/usb/src/sys/boot/i386/loader/main.c#2 integrate .. //depot/projects/usb/src/sys/boot/i386/pxeldr/pxeldr.S#2 integrate .. //depot/projects/usb/src/sys/boot/pc98/loader/main.c#2 integrate .. //depot/projects/usb/src/sys/bsm/audit.h#2 integrate .. //depot/projects/usb/src/sys/bsm/audit_internal.h#2 integrate .. //depot/projects/usb/src/sys/bsm/audit_kevents.h#2 integrate .. //depot/projects/usb/src/sys/bsm/audit_record.h#2 integrate .. //depot/projects/usb/src/sys/cam/cam_ccb.h#2 integrate .. //depot/projects/usb/src/sys/cam/cam_xpt.c#2 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_all.c#2 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_all.h#2 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_cd.c#2 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_pass.c#2 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32.h#2 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/syscalls.conf#2 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/usb/src/sys/compat/linprocfs/linprocfs.c#2 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_file.c#2 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_ipc.c#2 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_misc.c#2 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_signal.c#2 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_socket.c#2 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_stats.c#2 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_util.c#2 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_util.h#2 integrate .. //depot/projects/usb/src/sys/compat/ndis/kern_ndis.c#2 integrate .. //depot/projects/usb/src/sys/compat/ndis/ntoskrnl_var.h#2 integrate .. //depot/projects/usb/src/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/usb/src/sys/compat/ndis/winx32_wrap.S#2 integrate .. //depot/projects/usb/src/sys/compat/svr4/Makefile#2 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_ipc.c#2 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_proto.h#2 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_socket.c#2 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_socket.h#2 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_sockio.c#2 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_stat.c#2 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_stream.c#2 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_stropts.h#2 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_syscall.h#2 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_syscallnames.c#2 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_sysent.c#2 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_sysvec.c#2 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_util.h#2 integrate .. //depot/projects/usb/src/sys/compat/svr4/syscalls.conf#2 integrate .. //depot/projects/usb/src/sys/compat/svr4/syscalls.master#2 integrate .. //depot/projects/usb/src/sys/conf/Makefile.arm#2 integrate .. //depot/projects/usb/src/sys/conf/NOTES#2 integrate .. //depot/projects/usb/src/sys/conf/files#8 integrate .. //depot/projects/usb/src/sys/conf/files.amd64#2 integrate .. //depot/projects/usb/src/sys/conf/files.arm#2 integrate .. //depot/projects/usb/src/sys/conf/files.i386#2 integrate .. //depot/projects/usb/src/sys/conf/files.ia64#2 integrate .. //depot/projects/usb/src/sys/conf/files.pc98#2 integrate .. //depot/projects/usb/src/sys/conf/files.powerpc#2 integrate .. //depot/projects/usb/src/sys/conf/kern.mk#2 integrate .. //depot/projects/usb/src/sys/conf/kern.post.mk#2 integrate .. //depot/projects/usb/src/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/usb/src/sys/conf/kmod.mk#2 integrate .. //depot/projects/usb/src/sys/conf/options#2 integrate .. //depot/projects/usb/src/sys/conf/options.amd64#2 integrate .. //depot/projects/usb/src/sys/conf/options.arm#2 integrate .. //depot/projects/usb/src/sys/conf/options.i386#2 integrate .. //depot/projects/usb/src/sys/conf/options.pc98#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/acfreebsd.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/COPYRIGHT#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/README#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/ah.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/ah_desc.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/ah_devid.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/freebsd/ah_if.m#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/freebsd/ah_osdep.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/freebsd/ah_osdep.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/armv4-be-elf.inc#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/armv4-le-elf.inc#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/i386-elf.inc#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mips-be-elf.inc#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mips-le-elf.inc#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mips1-be-elf.inc#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mips1-le-elf.inc#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/powerpc-be-elf.inc#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/sh4-le-elf.inc#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/sparc64-be-elf.inc#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/x86_64-elf.inc#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/xscale-be-elf.inc#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/xscale-le-elf.inc#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/version.h#2 integrate .. //depot/projects/usb/src/sys/contrib/ia64/libuwx/src.diff#2 delete .. //depot/projects/usb/src/sys/contrib/ia64/libuwx/src/Makefile#2 integrate .. //depot/projects/usb/src/sys/contrib/ia64/libuwx/src/uwx.h#2 integrate .. //depot/projects/usb/src/sys/contrib/ia64/libuwx/src/uwx_bstream.c#2 integrate .. //depot/projects/usb/src/sys/contrib/ia64/libuwx/src/uwx_bstream.h#2 integrate .. //depot/projects/usb/src/sys/contrib/ia64/libuwx/src/uwx_context.c#2 integrate .. //depot/projects/usb/src/sys/contrib/ia64/libuwx/src/uwx_context.h#2 integrate .. //depot/projects/usb/src/sys/contrib/ia64/libuwx/src/uwx_env.c#2 integrate .. //depot/projects/usb/src/sys/contrib/ia64/libuwx/src/uwx_env.h#2 integrate .. //depot/projects/usb/src/sys/contrib/ia64/libuwx/src/uwx_scoreboard.c#2 integrate .. //depot/projects/usb/src/sys/contrib/ia64/libuwx/src/uwx_scoreboard.h#2 integrate .. //depot/projects/usb/src/sys/contrib/ia64/libuwx/src/uwx_self-new.c#2 delete .. //depot/projects/usb/src/sys/contrib/ia64/libuwx/src/uwx_self.c#2 integrate .. //depot/projects/usb/src/sys/contrib/ia64/libuwx/src/uwx_self.h#2 integrate .. //depot/projects/usb/src/sys/contrib/ia64/libuwx/src/uwx_self_context.s#2 integrate .. //depot/projects/usb/src/sys/contrib/ia64/libuwx/src/uwx_step.c#2 integrate .. //depot/projects/usb/src/sys/contrib/ia64/libuwx/src/uwx_step.h#2 integrate .. //depot/projects/usb/src/sys/contrib/ia64/libuwx/src/uwx_str.c#2 integrate .. //depot/projects/usb/src/sys/contrib/ia64/libuwx/src/uwx_str.h#2 integrate .. //depot/projects/usb/src/sys/contrib/ia64/libuwx/src/uwx_swap.c#2 integrate .. //depot/projects/usb/src/sys/contrib/ia64/libuwx/src/uwx_swap.h#2 integrate .. //depot/projects/usb/src/sys/contrib/ia64/libuwx/src/uwx_trace.c#2 integrate .. //depot/projects/usb/src/sys/contrib/ia64/libuwx/src/uwx_trace.h#2 integrate .. //depot/projects/usb/src/sys/contrib/ia64/libuwx/src/uwx_ttrace.c#2 delete .. //depot/projects/usb/src/sys/contrib/ia64/libuwx/src/uwx_ttrace.h#2 delete .. //depot/projects/usb/src/sys/contrib/ia64/libuwx/src/uwx_uinfo.c#2 integrate .. //depot/projects/usb/src/sys/contrib/ia64/libuwx/src/uwx_uinfo.h#2 integrate .. //depot/projects/usb/src/sys/contrib/ia64/libuwx/src/uwx_utable.c#2 integrate .. //depot/projects/usb/src/sys/contrib/ia64/libuwx/src/uwx_utable.h#2 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/fil.c#2 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_auth.c#2 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_auth.h#2 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_fil.h#2 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_frag.c#2 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#2 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_log.c#2 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_nat.c#2 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c#2 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_proxy.c#2 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#2 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_scan.c#2 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_state.c#2 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_sync.c#2 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_sync.h#2 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ipl.h#2 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate .. //depot/projects/usb/src/sys/contrib/pf/net/if_pflog.c#2 integrate .. //depot/projects/usb/src/sys/contrib/pf/net/if_pfsync.c#2 integrate .. //depot/projects/usb/src/sys/contrib/pf/net/pf.c#2 integrate .. //depot/projects/usb/src/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/usb/src/sys/crypto/sha2/sha2.c#2 integrate .. //depot/projects/usb/src/sys/crypto/via/padlock.c#2 integrate .. //depot/projects/usb/src/sys/ddb/db_command.c#2 integrate .. //depot/projects/usb/src/sys/ddb/db_output.c#2 integrate .. //depot/projects/usb/src/sys/ddb/db_output.h#2 integrate .. //depot/projects/usb/src/sys/ddb/db_ps.c#2 integrate .. //depot/projects/usb/src/sys/ddb/db_sym.c#2 integrate .. //depot/projects/usb/src/sys/ddb/db_thread.c#2 integrate .. //depot/projects/usb/src/sys/ddb/ddb.h#2 integrate .. //depot/projects/usb/src/sys/dev/aac/aac_cam.c#2 integrate .. //depot/projects/usb/src/sys/dev/aac/aac_pci.c#2 integrate .. //depot/projects/usb/src/sys/dev/acpi_support/acpi_ibm.c#2 integrate .. //depot/projects/usb/src/sys/dev/acpi_support/acpi_panasonic.c#2 integrate .. //depot/projects/usb/src/sys/dev/acpica/Osd/OsdMemory.c#2 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi.c#2 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_battery.c#2 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_dock.c#2 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_hpet.c#2 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_pci_link.c#2 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_perf.c#2 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_thermal.c#2 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_video.c#2 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpivar.h#2 integrate .. //depot/projects/usb/src/sys/dev/ahb/ahb.c#2 integrate .. //depot/projects/usb/src/sys/dev/aic7xxx/ahc_eisa.c#2 integrate .. //depot/projects/usb/src/sys/dev/aic7xxx/ahc_isa.c#2 integrate .. //depot/projects/usb/src/sys/dev/aic7xxx/ahc_pci.c#2 integrate .. //depot/projects/usb/src/sys/dev/aic7xxx/ahd_pci.c#2 integrate .. //depot/projects/usb/src/sys/dev/aic7xxx/aic7xxx_osm.c#2 integrate .. //depot/projects/usb/src/sys/dev/amr/amr.c#2 integrate .. //depot/projects/usb/src/sys/dev/arcmsr/arcmsr.c#2 integrate .. //depot/projects/usb/src/sys/dev/arl/if_arlreg.h#2 integrate .. //depot/projects/usb/src/sys/dev/asr/MAINTAINER#2 delete .. //depot/projects/usb/src/sys/dev/ata/ata-all.c#2 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-all.h#2 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-disk.c#2 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-dma.c#2 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-lowlevel.c#2 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-pci.h#2 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-queue.c#2 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-raid.c#2 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-raid.h#2 integrate .. //depot/projects/usb/src/sys/dev/ata/atapi-cd.c#2 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_rate/sample/sample.h#2 integrate .. //depot/projects/usb/src/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/usb/src/sys/dev/ath/if_ath_pci.c#2 integrate .. //depot/projects/usb/src/sys/dev/ath/if_athioctl.h#2 integrate .. //depot/projects/usb/src/sys/dev/ath/if_athvar.h#2 integrate .. //depot/projects/usb/src/sys/dev/atkbdc/atkbdc.c#2 integrate .. //depot/projects/usb/src/sys/dev/atkbdc/atkbdc_isa.c#2 integrate .. //depot/projects/usb/src/sys/dev/awi/awi.c#2 integrate .. //depot/projects/usb/src/sys/dev/bce/if_bce.c#2 integrate .. //depot/projects/usb/src/sys/dev/bfe/if_bfe.c#2 integrate .. //depot/projects/usb/src/sys/dev/bfe/if_bfereg.h#2 integrate .. //depot/projects/usb/src/sys/dev/bge/if_bge.c#2 integrate .. //depot/projects/usb/src/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/usb/src/sys/dev/bktr/CHANGELOG.TXT#2 integrate .. //depot/projects/usb/src/sys/dev/bktr/bktr_i2c.c#2 integrate .. //depot/projects/usb/src/sys/dev/cardbus/cardbus.c#2 integrate .. //depot/projects/usb/src/sys/dev/cardbus/cardbus_cis.c#2 integrate .. //depot/projects/usb/src/sys/dev/ciss/ciss.c#2 integrate .. //depot/projects/usb/src/sys/dev/cm/if_cm_isa.c#2 integrate .. //depot/projects/usb/src/sys/dev/cm/smc90cx6.c#2 integrate .. //depot/projects/usb/src/sys/dev/cm/smc90cx6reg.h#2 integrate .. //depot/projects/usb/src/sys/dev/cm/smc90cx6var.h#2 integrate .. //depot/projects/usb/src/sys/dev/cs/if_cs.c#2 integrate .. //depot/projects/usb/src/sys/dev/cs/if_csvar.h#2 integrate .. //depot/projects/usb/src/sys/dev/dc/dcphy.c#2 integrate .. //depot/projects/usb/src/sys/dev/dc/if_dc.c#2 integrate .. //depot/projects/usb/src/sys/dev/dc/if_dcreg.h#2 integrate .. //depot/projects/usb/src/sys/dev/dc/pnphy.c#2 integrate .. //depot/projects/usb/src/sys/dev/de/if_de.c#2 integrate .. //depot/projects/usb/src/sys/dev/de/if_devar.h#2 integrate .. //depot/projects/usb/src/sys/dev/digi/digi.c#2 integrate .. //depot/projects/usb/src/sys/dev/dpt/dpt_scsi.c#2 integrate .. //depot/projects/usb/src/sys/dev/drm/drmP.h#2 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_drv.c#2 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_pciids.h#2 integrate .. //depot/projects/usb/src/sys/dev/drm/i915_dma.c#2 integrate .. //depot/projects/usb/src/sys/dev/drm/i915_drm.h#2 integrate .. //depot/projects/usb/src/sys/dev/drm/i915_drv.h#2 integrate .. //depot/projects/usb/src/sys/dev/drm/i915_irq.c#2 integrate .. //depot/projects/usb/src/sys/dev/drm/mach64_drm.h#2 integrate .. //depot/projects/usb/src/sys/dev/drm/radeon_cp.c#2 integrate .. //depot/projects/usb/src/sys/dev/drm/radeon_drm.h#2 integrate .. //depot/projects/usb/src/sys/dev/drm/radeon_drv.h#2 integrate .. //depot/projects/usb/src/sys/dev/drm/radeon_state.c#2 integrate .. //depot/projects/usb/src/sys/dev/ed/if_ed.c#2 integrate .. //depot/projects/usb/src/sys/dev/ed/if_ed_novell.c#2 integrate .. //depot/projects/usb/src/sys/dev/ed/if_edvar.h#2 integrate .. //depot/projects/usb/src/sys/dev/em/README#2 integrate .. //depot/projects/usb/src/sys/dev/em/if_em.c#2 integrate .. //depot/projects/usb/src/sys/dev/em/if_em.h#2 integrate .. //depot/projects/usb/src/sys/dev/em/if_em_hw.c#2 integrate .. //depot/projects/usb/src/sys/dev/em/if_em_hw.h#2 integrate .. //depot/projects/usb/src/sys/dev/em/if_em_osdep.h#2 integrate .. //depot/projects/usb/src/sys/dev/en/if_en_pci.c#2 integrate .. //depot/projects/usb/src/sys/dev/en/midway.c#2 integrate .. //depot/projects/usb/src/sys/dev/exca/excareg.h#2 integrate .. //depot/projects/usb/src/sys/dev/fb/creator.c#2 integrate .. //depot/projects/usb/src/sys/dev/fdc/fdc.c#2 integrate .. //depot/projects/usb/src/sys/dev/fe/if_fe.c#2 integrate .. //depot/projects/usb/src/sys/dev/firewire/fwohci_pci.c#2 integrate .. //depot/projects/usb/src/sys/dev/gem/if_gem.c#2 integrate .. //depot/projects/usb/src/sys/dev/hifn/hifn7751.c#2 integrate .. //depot/projects/usb/src/sys/dev/hme/if_hme.c#2 integrate .. //depot/projects/usb/src/sys/dev/ic/nec765.h#2 integrate .. //depot/projects/usb/src/sys/dev/ichsmb/ichsmb.c#2 integrate .. //depot/projects/usb/src/sys/dev/iicbus/if_ic.c#2 integrate .. //depot/projects/usb/src/sys/dev/iicbus/iic.c#2 integrate .. //depot/projects/usb/src/sys/dev/iicbus/iic.h#2 integrate .. //depot/projects/usb/src/sys/dev/iicbus/iicbb.c#2 integrate .. //depot/projects/usb/src/sys/dev/iicbus/iicbus.c#2 integrate .. //depot/projects/usb/src/sys/dev/iicbus/iicbus.h#2 integrate .. //depot/projects/usb/src/sys/dev/iicbus/iicbus_if.m#2 integrate .. //depot/projects/usb/src/sys/dev/iicbus/iiconf.c#2 integrate .. //depot/projects/usb/src/sys/dev/iicbus/iiconf.h#2 integrate .. //depot/projects/usb/src/sys/dev/iicbus/iicsmb.c#2 integrate .. //depot/projects/usb/src/sys/dev/ips/ips.h#2 integrate .. //depot/projects/usb/src/sys/dev/ipw/if_ipw.c#2 integrate .. //depot/projects/usb/src/sys/dev/ipw/if_ipwvar.h#2 integrate .. //depot/projects/usb/src/sys/dev/isp/isp.c#2 integrate .. //depot/projects/usb/src/sys/dev/isp/isp_freebsd.c#2 integrate .. //depot/projects/usb/src/sys/dev/isp/isp_freebsd.h#2 integrate .. //depot/projects/usb/src/sys/dev/isp/isp_ioctl.h#2 integrate .. //depot/projects/usb/src/sys/dev/isp/isp_library.c#2 integrate .. //depot/projects/usb/src/sys/dev/isp/isp_pci.c#2 integrate .. //depot/projects/usb/src/sys/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/usb/src/sys/dev/isp/isp_target.c#2 integrate .. //depot/projects/usb/src/sys/dev/isp/isp_target.h#2 integrate .. //depot/projects/usb/src/sys/dev/isp/isp_tpublic.h#2 integrate .. //depot/projects/usb/src/sys/dev/isp/ispmbox.h#2 integrate .. //depot/projects/usb/src/sys/dev/isp/ispreg.h#2 integrate .. //depot/projects/usb/src/sys/dev/isp/ispvar.h#2 integrate .. //depot/projects/usb/src/sys/dev/ispfw/asm_1040.h#2 integrate .. //depot/projects/usb/src/sys/dev/ispfw/asm_1080.h#2 integrate .. //depot/projects/usb/src/sys/dev/ispfw/asm_12160.h#2 integrate .. //depot/projects/usb/src/sys/dev/ispfw/ispfw.c#2 integrate .. //depot/projects/usb/src/sys/dev/iwi/if_iwi.c#2 integrate .. //depot/projects/usb/src/sys/dev/ixgb/if_ixgb.c#2 integrate .. //depot/projects/usb/src/sys/dev/kbdmux/kbdmux.c#2 integrate .. //depot/projects/usb/src/sys/dev/le/if_le_pci.c#2 integrate .. //depot/projects/usb/src/sys/dev/lge/if_lge.c#2 integrate .. //depot/projects/usb/src/sys/dev/lge/if_lgereg.h#2 integrate .. //depot/projects/usb/src/sys/dev/lmc/if_lmc.c#2 integrate .. //depot/projects/usb/src/sys/dev/lmc/if_lmc.h#2 integrate .. //depot/projects/usb/src/sys/dev/mfi/mfi.c#2 integrate .. //depot/projects/usb/src/sys/dev/mfi/mfi_disk.c#2 integrate .. //depot/projects/usb/src/sys/dev/mfi/mfi_pci.c#2 integrate .. //depot/projects/usb/src/sys/dev/mfi/mfireg.h#2 integrate .. //depot/projects/usb/src/sys/dev/mfi/mfivar.h#2 integrate .. //depot/projects/usb/src/sys/dev/mii/acphy.c#2 integrate .. //depot/projects/usb/src/sys/dev/mii/amphy.c#2 integrate .. //depot/projects/usb/src/sys/dev/mii/bmtphy.c#2 integrate .. //depot/projects/usb/src/sys/dev/mii/brgphy.c#2 integrate .. //depot/projects/usb/src/sys/dev/mii/ciphy.c#2 integrate .. //depot/projects/usb/src/sys/dev/mii/e1000phy.c#2 integrate .. //depot/projects/usb/src/sys/dev/mii/exphy.c#2 integrate .. //depot/projects/usb/src/sys/dev/mii/inphy.c#2 integrate .. //depot/projects/usb/src/sys/dev/mii/lxtphy.c#2 integrate .. //depot/projects/usb/src/sys/dev/mii/mii_physubr.c#2 integrate .. //depot/projects/usb/src/sys/dev/mii/miidevs#2 integrate .. //depot/projects/usb/src/sys/dev/mii/mlphy.c#2 integrate .. //depot/projects/usb/src/sys/dev/mii/nsgphy.c#2 integrate .. //depot/projects/usb/src/sys/dev/mii/nsphy.c#2 integrate .. //depot/projects/usb/src/sys/dev/mii/pnaphy.c#2 integrate .. //depot/projects/usb/src/sys/dev/mii/qsphy.c#2 integrate .. //depot/projects/usb/src/sys/dev/mii/rgephy.c#2 integrate .. //depot/projects/usb/src/sys/dev/mii/rlphy.c#2 integrate .. //depot/projects/usb/src/sys/dev/mii/ruephy.c#2 integrate .. //depot/projects/usb/src/sys/dev/mii/tdkphy.c#2 integrate .. //depot/projects/usb/src/sys/dev/mii/tlphy.c#2 integrate .. //depot/projects/usb/src/sys/dev/mii/ukphy.c#2 integrate .. //depot/projects/usb/src/sys/dev/mii/xmphy.c#2 integrate .. //depot/projects/usb/src/sys/dev/mk48txx/mk48txx.c#2 integrate .. //depot/projects/usb/src/sys/dev/mpt/mpt.c#2 integrate .. //depot/projects/usb/src/sys/dev/mpt/mpt.h#2 integrate .. //depot/projects/usb/src/sys/dev/mpt/mpt_cam.c#2 integrate .. //depot/projects/usb/src/sys/dev/mpt/mpt_cam.h#2 integrate .. //depot/projects/usb/src/sys/dev/mpt/mpt_debug.c#2 integrate .. //depot/projects/usb/src/sys/dev/mpt/mpt_pci.c#2 integrate .. //depot/projects/usb/src/sys/dev/mpt/mpt_raid.c#2 integrate .. //depot/projects/usb/src/sys/dev/mpt/mpt_raid.h#2 integrate .. //depot/projects/usb/src/sys/dev/mpt/mpt_reg.h#2 integrate .. //depot/projects/usb/src/sys/dev/my/if_my.c#2 integrate .. //depot/projects/usb/src/sys/dev/my/if_myreg.h#2 integrate .. //depot/projects/usb/src/sys/dev/myri10ge/eth_z8e.dat.gz.uu#2 delete .. //depot/projects/usb/src/sys/dev/myri10ge/ethp_z8e.dat.gz.uu#2 delete .. //depot/projects/usb/src/sys/dev/myri10ge/if_myri10ge.c#2 delete .. //depot/projects/usb/src/sys/dev/myri10ge/if_myri10ge_var.h#2 delete .. //depot/projects/usb/src/sys/dev/myri10ge/mcp_gen_header.h#2 delete .. //depot/projects/usb/src/sys/dev/myri10ge/myri10ge_mcp.h#2 delete .. //depot/projects/usb/src/sys/dev/ncv/ncr53c500_pccard.c#2 integrate .. //depot/projects/usb/src/sys/dev/nge/if_nge.c#2 integrate .. //depot/projects/usb/src/sys/dev/nge/if_ngereg.h#2 integrate .. //depot/projects/usb/src/sys/dev/ofw/ofw_console.c#2 integrate .. //depot/projects/usb/src/sys/dev/ofw/openfirmio.c#2 integrate .. //depot/projects/usb/src/sys/dev/patm/if_patm_intr.c#2 integrate .. //depot/projects/usb/src/sys/dev/pccard/pccard_cis.c#2 integrate .. //depot/projects/usb/src/sys/dev/pccard/pccarddevs#2 integrate .. //depot/projects/usb/src/sys/dev/pccbb/pccbb.c#2 integrate .. //depot/projects/usb/src/sys/dev/pccbb/pccbb_isa.c#2 integrate .. //depot/projects/usb/src/sys/dev/pccbb/pccbb_pci.c#2 integrate .. //depot/projects/usb/src/sys/dev/pccbb/pccbbreg.h#2 integrate .. //depot/projects/usb/src/sys/dev/pccbb/pccbbvar.h#2 integrate .. //depot/projects/usb/src/sys/dev/pci/pci.c#2 integrate .. //depot/projects/usb/src/sys/dev/pci/pcireg.h#2 integrate .. //depot/projects/usb/src/sys/dev/pci/pcivar.h#2 integrate .. //depot/projects/usb/src/sys/dev/puc/puc.c#2 integrate .. //depot/projects/usb/src/sys/dev/puc/puc_cfg.c#2 integrate .. //depot/projects/usb/src/sys/dev/puc/puc_pccard.c#2 integrate .. //depot/projects/usb/src/sys/dev/puc/puc_pci.c#2 integrate .. //depot/projects/usb/src/sys/dev/puc/pucdata.c#2 integrate .. //depot/projects/usb/src/sys/dev/ral/rt2560.c#2 integrate .. //depot/projects/usb/src/sys/dev/ral/rt2661.c#2 integrate .. //depot/projects/usb/src/sys/dev/random/probe.c#2 integrate .. //depot/projects/usb/src/sys/dev/re/if_re.c#2 integrate .. //depot/projects/usb/src/sys/dev/safe/safe.c#2 integrate .. //depot/projects/usb/src/sys/dev/scc/scc_core.c#2 integrate .. //depot/projects/usb/src/sys/dev/scc/scc_dev_z8530.c#2 integrate .. //depot/projects/usb/src/sys/dev/sio/sio.c#2 integrate .. //depot/projects/usb/src/sys/dev/sio/sio_pccard.c#2 integrate .. //depot/projects/usb/src/sys/dev/sk/if_sk.c#2 integrate .. //depot/projects/usb/src/sys/dev/sk/if_skreg.h#2 integrate .. //depot/projects/usb/src/sys/dev/smbus/smb.c#2 integrate .. //depot/projects/usb/src/sys/dev/smbus/smb.h#2 integrate .. //depot/projects/usb/src/sys/dev/smbus/smbconf.c#2 integrate .. //depot/projects/usb/src/sys/dev/smbus/smbconf.h#2 integrate .. //depot/projects/usb/src/sys/dev/smbus/smbus.c#2 integrate .. //depot/projects/usb/src/sys/dev/smbus/smbus.h#2 integrate .. //depot/projects/usb/src/sys/dev/smbus/smbus_if.m#2 integrate .. //depot/projects/usb/src/sys/dev/sound/driver.c#2 integrate .. //depot/projects/usb/src/sys/dev/sound/midi/midi.c#2 integrate .. //depot/projects/usb/src/sys/dev/sound/midi/sequencer.c#2 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/cmi.c#2 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/emu10k1.c#2 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/es137x.c#2 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/ich.c#2 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/maestro.c#2 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/solo.c#2 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/via8233.c#2 integrate .. //depot/projects/usb/src/sys/dev/sound/pcm/buffer.c#2 integrate .. //depot/projects/usb/src/sys/dev/sound/pcm/buffer.h#2 integrate .. //depot/projects/usb/src/sys/dev/sound/pcm/feeder_rate.c#2 integrate .. //depot/projects/usb/src/sys/dev/sound/pcm/mixer.h#3 integrate .. //depot/projects/usb/src/sys/dev/sound/pcm/sound.c#2 integrate .. //depot/projects/usb/src/sys/dev/sound/pcm/sound.h#2 integrate .. //depot/projects/usb/src/sys/dev/sound/pcm/vchan.c#2 integrate .. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#4 integrate .. //depot/projects/usb/src/sys/dev/stg/tmc18c30_subr.c#2 integrate .. //depot/projects/usb/src/sys/dev/streams/streams.c#2 integrate .. //depot/projects/usb/src/sys/dev/sym/sym_fw1.h#2 integrate .. //depot/projects/usb/src/sys/dev/sym/sym_fw2.h#2 integrate .. //depot/projects/usb/src/sys/dev/syscons/scmouse.c#2 integrate .. //depot/projects/usb/src/sys/dev/syscons/syscons.c#2 integrate .. //depot/projects/usb/src/sys/dev/syscons/syscons.h#2 integrate .. //depot/projects/usb/src/sys/dev/ti/if_ti.c#2 integrate .. //depot/projects/usb/src/sys/dev/uart/uart_cpu_powerpc.c#2 integrate .. //depot/projects/usb/src/sys/dev/uart/uart_dev_z8530.c#2 integrate .. //depot/projects/usb/src/sys/dev/uart/uart_tty.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/ehci.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb/if_aue.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb/if_axe.c#10 integrate .. //depot/projects/usb/src/sys/dev/usb/if_rue.c#9 integrate .. //depot/projects/usb/src/sys/dev/usb/if_udav.c#9 integrate .. //depot/projects/usb/src/sys/dev/usb/if_ural.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb/ohci.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb/ubsa.c#9 integrate .. //depot/projects/usb/src/sys/dev/usb/ubser.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb/ucom.c#9 integrate .. //depot/projects/usb/src/sys/dev/usb/udbp.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb/ufoma.c#7 integrate .. //depot/projects/usb/src/sys/dev/usb/uftdi.c#8 integrate .. //depot/projects/usb/src/sys/dev/usb/ugen.c#7 integrate .. //depot/projects/usb/src/sys/dev/usb/uhci.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb/uhid.c#10 integrate .. //depot/projects/usb/src/sys/dev/vge/if_vge.c#2 integrate .. //depot/projects/usb/src/sys/dev/wi/if_wavelan_ieee.h#2 integrate .. //depot/projects/usb/src/sys/dev/wi/if_wi.c#2 integrate .. //depot/projects/usb/src/sys/dev/wi/if_wireg.h#2 integrate .. //depot/projects/usb/src/sys/dev/wl/if_wl.c#2 integrate .. //depot/projects/usb/src/sys/doc/Doxyfile#2 delete .. //depot/projects/usb/src/sys/doc/Makefile#2 delete .. //depot/projects/usb/src/sys/doc/subsys/Dependencies#2 delete .. //depot/projects/usb/src/sys/doc/subsys/Doxyfile-cam#2 delete .. //depot/projects/usb/src/sys/doc/subsys/Doxyfile-crypto#2 delete .. //depot/projects/usb/src/sys/doc/subsys/Doxyfile-dev_pci#2 delete .. //depot/projects/usb/src/sys/doc/subsys/Doxyfile-dev_sound#2 delete .. //depot/projects/usb/src/sys/doc/subsys/Doxyfile-dev_usb#2 delete .. //depot/projects/usb/src/sys/doc/subsys/Doxyfile-geom#2 delete .. //depot/projects/usb/src/sys/doc/subsys/Doxyfile-i4b#2 delete .. //depot/projects/usb/src/sys/doc/subsys/Doxyfile-kern#2 delete .. //depot/projects/usb/src/sys/doc/subsys/Doxyfile-libkern#2 delete .. //depot/projects/usb/src/sys/doc/subsys/Doxyfile-linux#2 delete .. //depot/projects/usb/src/sys/doc/subsys/Doxyfile-net80211#2 delete .. //depot/projects/usb/src/sys/doc/subsys/Doxyfile-netgraph#2 delete .. //depot/projects/usb/src/sys/doc/subsys/Doxyfile-netinet#2 delete .. //depot/projects/usb/src/sys/doc/subsys/Doxyfile-netinet6#2 delete .. //depot/projects/usb/src/sys/doc/subsys/Doxyfile-netipsec#2 delete .. //depot/projects/usb/src/sys/doc/subsys/Doxyfile-opencrypto#2 delete .. //depot/projects/usb/src/sys/doc/subsys/Doxyfile-vm#2 delete .. //depot/projects/usb/src/sys/doc/subsys/Makefile#2 delete .. //depot/projects/usb/src/sys/doc/subsys/README#2 delete .. //depot/projects/usb/src/sys/doc/subsys/common-Doxyfile#2 delete .. //depot/projects/usb/src/sys/fs/devfs/devfs_devs.c#2 integrate .. //depot/projects/usb/src/sys/fs/devfs/devfs_rule.c#2 integrate .. //depot/projects/usb/src/sys/fs/devfs/devfs_vfsops.c#2 integrate .. //depot/projects/usb/src/sys/fs/devfs/devfs_vnops.c#2 integrate .. //depot/projects/usb/src/sys/fs/hpfs/hpfs.h#2 integrate .. //depot/projects/usb/src/sys/fs/msdosfs/denode.h#2 integrate .. //depot/projects/usb/src/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate .. //depot/projects/usb/src/sys/fs/nullfs/null_vfsops.c#2 integrate .. //depot/projects/usb/src/sys/fs/nwfs/nwfs_io.c#2 integrate .. //depot/projects/usb/src/sys/fs/portalfs/portal_vnops.c#2 integrate .. //depot/projects/usb/src/sys/fs/procfs/procfs.c#2 integrate .. //depot/projects/usb/src/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate .. //depot/projects/usb/src/sys/fs/smbfs/smbfs_io.c#2 integrate .. //depot/projects/usb/src/sys/fs/smbfs/smbfs_vfsops.c#2 integrate .. //depot/projects/usb/src/sys/fs/smbfs/smbfs_vnops.c#2 integrate .. //depot/projects/usb/src/sys/fs/udf/ecma167-udf.h#2 integrate .. //depot/projects/usb/src/sys/fs/udf/osta.h#2 integrate .. //depot/projects/usb/src/sys/fs/udf/udf_vfsops.c#2 integrate .. //depot/projects/usb/src/sys/fs/unionfs/union_vnops.c#2 integrate .. //depot/projects/usb/src/sys/geom/bde/g_bde_work.c#2 integrate .. //depot/projects/usb/src/sys/geom/eli/g_eli.c#2 integrate .. //depot/projects/usb/src/sys/geom/eli/g_eli.h#2 integrate .. //depot/projects/usb/src/sys/geom/eli/g_eli_ctl.c#2 integrate .. //depot/projects/usb/src/sys/geom/eli/g_eli_key.c#2 integrate .. //depot/projects/usb/src/sys/geom/gate/g_gate.c#2 integrate .. //depot/projects/usb/src/sys/geom/gate/g_gate.h#2 integrate .. //depot/projects/usb/src/sys/geom/geom.h#2 integrate .. //depot/projects/usb/src/sys/geom/geom_dev.c#2 integrate .. //depot/projects/usb/src/sys/geom/geom_event.c#2 integrate .. //depot/projects/usb/src/sys/geom/geom_gpt.c#2 integrate .. //depot/projects/usb/src/sys/geom/geom_io.c#2 integrate .. //depot/projects/usb/src/sys/geom/geom_subr.c#2 integrate .. //depot/projects/usb/src/sys/geom/label/g_label.c#2 integrate .. //depot/projects/usb/src/sys/geom/label/g_label_msdosfs.c#2 integrate .. //depot/projects/usb/src/sys/geom/mirror/g_mirror.c#2 integrate .. //depot/projects/usb/src/sys/geom/mirror/g_mirror_ctl.c#2 integrate .. //depot/projects/usb/src/sys/geom/nop/g_nop.c#2 integrate .. //depot/projects/usb/src/sys/geom/nop/g_nop.h#2 integrate .. //depot/projects/usb/src/sys/geom/raid3/g_raid3.c#2 integrate .. //depot/projects/usb/src/sys/geom/raid3/g_raid3_ctl.c#2 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_raid5.h#2 integrate .. //depot/projects/usb/src/sys/gnu/dev/sound/pci/emu10k1-ac97.h#2 delete .. //depot/projects/usb/src/sys/gnu/dev/sound/pci/emu10k1-alsa.h#2 integrate .. //depot/projects/usb/src/sys/gnu/dev/sound/pci/emu10k1.h#2 delete .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/support/atomic.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/support/debug.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/support/kmem.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/support/ktrace.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/support/rwlock.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/support/spin.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/support/sv.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/xfs_buf.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/xfs_compat.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/xfs_dmistubs.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/xfs_frw.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/xfs_frw.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/xfs_fs_subr.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/xfs_globals.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/xfs_iget.c#2 delete .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/xfs_iops.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/xfs_super.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/xfs_sysctl.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_acl.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_acl.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_ag.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_alloc.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_alloc.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_alloc_btree.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_alloc_btree.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_arch.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_attr.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_attr.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_attr_leaf.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_attr_leaf.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_attr_sf.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_behavior.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_behavior.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_bit.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_bit.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_bmap.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_bmap.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_bmap_btree.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_bmap_btree.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_btree.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_btree.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_buf_item.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_buf_item.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_cap.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_clnt.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_da_btree.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_da_btree.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_dfrag.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_dfrag.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_dinode.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_dir.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_dir.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_dir2.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_dir2.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_dir2_block.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_dir2_block.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_dir2_data.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_dir2_data.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_dir2_leaf.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_dir2_leaf.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_dir2_node.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_dir2_node.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_dir2_sf.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_dir2_sf.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_dir2_trace.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_dir2_trace.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_dir_leaf.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_dir_leaf.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_dir_sf.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_dmapi.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_dmops.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_error.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_error.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_extfree_item.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_extfree_item.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_fs.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_fsops.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_fsops.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_ialloc.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_ialloc.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_ialloc_btree.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_ialloc_btree.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_imap.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_inode.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_inode.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_inode_item.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_inode_item.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_inum.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_iocore.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_iomap.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_iomap.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_itable.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_itable.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_log.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_log.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_log_priv.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_log_recover.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_log_recover.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_mac.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_macros.c#2 delete .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_macros.h#2 delete .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_mount.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_mount.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_qmops.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_quota.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_refcache.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_refcache.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_rename.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_rtalloc.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_rtalloc.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_rw.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_rw.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_sb.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_trans.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_trans.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_trans_ail.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_trans_buf.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_trans_extfree.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_trans_inode.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_trans_item.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_trans_priv.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_trans_space.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_types.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_utils.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_utils.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_vfsops.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_vnodeops.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfsidbg.c#2 integrate .. //depot/projects/usb/src/sys/i386/acpica/Makefile#2 integrate .. //depot/projects/usb/src/sys/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/usb/src/sys/i386/acpica/acpi_wakecode.S#2 integrate .. //depot/projects/usb/src/sys/i386/acpica/acpi_wakeup.c#2 integrate .. //depot/projects/usb/src/sys/i386/acpica/madt.c#2 integrate .. //depot/projects/usb/src/sys/i386/conf/DEFAULTS#2 integrate .. //depot/projects/usb/src/sys/i386/conf/NOTES#2 integrate .. //depot/projects/usb/src/sys/i386/conf/PAE#2 integrate .. //depot/projects/usb/src/sys/i386/conf/XBOX#2 integrate .. //depot/projects/usb/src/sys/i386/i386/busdma_machdep.c#2 integrate .. //depot/projects/usb/src/sys/i386/i386/db_trace.c#2 integrate .. //depot/projects/usb/src/sys/i386/i386/identcpu.c#2 integrate .. //depot/projects/usb/src/sys/i386/i386/initcpu.c#2 integrate .. //depot/projects/usb/src/sys/i386/i386/intr_machdep.c#2 integrate .. //depot/projects/usb/src/sys/i386/i386/local_apic.c#2 integrate .. //depot/projects/usb/src/sys/i386/i386/machdep.c#2 integrate .. //depot/projects/usb/src/sys/i386/i386/minidump_machdep.c#2 integrate .. //depot/projects/usb/src/sys/i386/i386/mp_machdep.c#2 integrate .. //depot/projects/usb/src/sys/i386/i386/nexus.c#2 integrate .. //depot/projects/usb/src/sys/i386/i386/pmap.c#2 integrate .. //depot/projects/usb/src/sys/i386/i386/ptrace_machdep.c#2 integrate .. //depot/projects/usb/src/sys/i386/i386/support.s#2 integrate .. //depot/projects/usb/src/sys/i386/i386/sys_machdep.c#2 integrate .. //depot/projects/usb/src/sys/i386/i386/trap.c#2 integrate .. //depot/projects/usb/src/sys/i386/i386/tsc.c#2 integrate .. //depot/projects/usb/src/sys/i386/i386/vm_machdep.c#2 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_ipc.c#2 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_ipc.h#2 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_isc.c#2 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_isc_syscall.h#2 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_isc_sysent.c#2 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_misc.c#2 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_msg.c#2 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_other.c#2 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_poll.h#2 delete .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_proto.h#2 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_syscall.h#2 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_sysent.c#2 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_util.h#2 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_xenix.c#2 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_xenix.h#2 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_xenix_syscall.h#2 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_xenix_sysent.c#2 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/imgact_coff.c#2 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/syscalls.conf#2 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/syscalls.isc#2 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/syscalls.isc.conf#2 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/syscalls.master#2 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/syscalls.xenix#2 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/syscalls.xenix.conf#2 integrate .. //depot/projects/usb/src/sys/i386/include/i4b_ioctl.h#2 integrate .. //depot/projects/usb/src/sys/i386/include/md_var.h#2 integrate .. //depot/projects/usb/src/sys/i386/include/npx.h#2 integrate .. //depot/projects/usb/src/sys/i386/include/pmap.h#2 integrate .. //depot/projects/usb/src/sys/i386/include/specialreg.h#2 integrate .. //depot/projects/usb/src/sys/i386/isa/clock.c#2 integrate .. //depot/projects/usb/src/sys/i386/isa/npx.c#2 integrate .. //depot/projects/usb/src/sys/i386/linux/linux.h#2 integrate .. //depot/projects/usb/src/sys/i386/linux/linux_dummy.c#2 integrate .. //depot/projects/usb/src/sys/i386/linux/linux_machdep.c#2 integrate .. //depot/projects/usb/src/sys/i386/linux/linux_proto.h#2 integrate .. //depot/projects/usb/src/sys/i386/linux/linux_syscall.h#2 integrate .. //depot/projects/usb/src/sys/i386/linux/linux_sysent.c#2 integrate .. //depot/projects/usb/src/sys/i386/linux/linux_sysvec.c#2 integrate .. //depot/projects/usb/src/sys/i386/linux/syscalls.conf#2 integrate .. //depot/projects/usb/src/sys/i386/linux/syscalls.master#2 integrate .. //depot/projects/usb/src/sys/i386/xbox/xbox.c#2 integrate .. //depot/projects/usb/src/sys/i4b/layer4/i4b_l4mgmt.c#2 integrate .. //depot/projects/usb/src/sys/ia64/conf/DEFAULTS#2 integrate .. //depot/projects/usb/src/sys/ia64/conf/GENERIC#2 integrate .. //depot/projects/usb/src/sys/ia64/conf/NOTES#2 integrate .. //depot/projects/usb/src/sys/ia64/conf/SKI#2 integrate .. //depot/projects/usb/src/sys/ia64/disasm/disasm.h#2 integrate .. //depot/projects/usb/src/sys/ia64/disasm/disasm_decode.c#2 integrate .. //depot/projects/usb/src/sys/ia64/disasm/disasm_extract.c#2 integrate .. //depot/projects/usb/src/sys/ia64/disasm/disasm_format.c#2 integrate .. //depot/projects/usb/src/sys/ia64/disasm/disasm_int.h#2 integrate .. //depot/projects/usb/src/sys/ia64/ia32/ia32_trap.c#2 integrate .. //depot/projects/usb/src/sys/ia64/ia64/busdma_machdep.c#2 integrate .. //depot/projects/usb/src/sys/ia64/ia64/db_machdep.c#2 integrate .. //depot/projects/usb/src/sys/ia64/ia64/machdep.c#2 integrate .. //depot/projects/usb/src/sys/ia64/ia64/pmap.c#2 integrate .. //depot/projects/usb/src/sys/ia64/ia64/ssc.c#2 integrate .. //depot/projects/usb/src/sys/ia64/ia64/support.S#2 integrate .. //depot/projects/usb/src/sys/ia64/ia64/trap.c#2 integrate .. //depot/projects/usb/src/sys/ia64/include/ieeefp.h#2 integrate .. //depot/projects/usb/src/sys/ia64/include/md_var.h#2 integrate .. //depot/projects/usb/src/sys/ia64/include/pmap.h#2 integrate .. //depot/projects/usb/src/sys/ia64/include/vmparam.h#2 integrate .. //depot/projects/usb/src/sys/isa/isa_common.c#2 integrate .. //depot/projects/usb/src/sys/isa/isahint.c#2 integrate .. //depot/projects/usb/src/sys/kern/Makefile#2 integrate .. //depot/projects/usb/src/sys/kern/bus_if.m#2 integrate .. //depot/projects/usb/src/sys/kern/init_main.c#2 integrate .. //depot/projects/usb/src/sys/kern/init_sysent.c#2 integrate .. //depot/projects/usb/src/sys/kern/kern_acct.c#2 integrate .. //depot/projects/usb/src/sys/kern/kern_acl.c#2 integrate .. //depot/projects/usb/src/sys/kern/kern_clock.c#2 integrate .. //depot/projects/usb/src/sys/kern/kern_descrip.c#2 integrate .. //depot/projects/usb/src/sys/kern/kern_environment.c#2 integrate .. //depot/projects/usb/src/sys/kern/kern_event.c#2 integrate .. //depot/projects/usb/src/sys/kern/kern_exec.c#2 integrate .. //depot/projects/usb/src/sys/kern/kern_exit.c#2 integrate .. //depot/projects/usb/src/sys/kern/kern_fork.c#2 integrate .. //depot/projects/usb/src/sys/kern/kern_intr.c#2 integrate .. //depot/projects/usb/src/sys/kern/kern_ktr.c#2 integrate .. //depot/projects/usb/src/sys/kern/kern_ktrace.c#2 integrate .. //depot/projects/usb/src/sys/kern/kern_linker.c#2 integrate .. //depot/projects/usb/src/sys/kern/kern_lock.c#2 integrate .. //depot/projects/usb/src/sys/kern/kern_mac.c#2 integrate .. //depot/projects/usb/src/sys/kern/kern_malloc.c#2 integrate .. //depot/projects/usb/src/sys/kern/kern_mbuf.c#2 integrate .. //depot/projects/usb/src/sys/kern/kern_module.c#2 integrate .. //depot/projects/usb/src/sys/kern/kern_mutex.c#2 integrate .. //depot/projects/usb/src/sys/kern/kern_prot.c#2 integrate .. //depot/projects/usb/src/sys/kern/kern_resource.c#2 integrate .. //depot/projects/usb/src/sys/kern/kern_rwlock.c#2 integrate .. //depot/projects/usb/src/sys/kern/kern_subr.c#2 integrate .. //depot/projects/usb/src/sys/kern/kern_switch.c#2 integrate .. //depot/projects/usb/src/sys/kern/kern_sx.c#2 integrate .. //depot/projects/usb/src/sys/kern/kern_synch.c#2 integrate .. //depot/projects/usb/src/sys/kern/kern_syscalls.c#2 integrate .. //depot/projects/usb/src/sys/kern/kern_sysctl.c#2 integrate .. //depot/projects/usb/src/sys/kern/kern_tc.c#2 integrate .. //depot/projects/usb/src/sys/kern/kern_thr.c#2 integrate .. //depot/projects/usb/src/sys/kern/kern_thread.c#2 integrate .. //depot/projects/usb/src/sys/kern/kern_time.c#2 integrate .. //depot/projects/usb/src/sys/kern/kern_umtx.c#2 integrate .. //depot/projects/usb/src/sys/kern/kern_uuid.c#2 integrate .. //depot/projects/usb/src/sys/kern/link_elf.c#2 integrate .. //depot/projects/usb/src/sys/kern/link_elf_obj.c#2 integrate .. //depot/projects/usb/src/sys/kern/makesyscalls.sh#2 integrate .. //depot/projects/usb/src/sys/kern/sched_4bsd.c#2 integrate .. //depot/projects/usb/src/sys/kern/sched_ule.c#2 integrate .. //depot/projects/usb/src/sys/kern/subr_autoconf.c#2 integrate .. //depot/projects/usb/src/sys/kern/subr_bus.c#2 integrate .. //depot/projects/usb/src/sys/kern/subr_disk.c#2 integrate .. //depot/projects/usb/src/sys/kern/subr_firmware.c#2 integrate .. //depot/projects/usb/src/sys/kern/subr_hints.c#2 integrate .. //depot/projects/usb/src/sys/kern/subr_kdb.c#2 integrate .. //depot/projects/usb/src/sys/kern/subr_prf.c#2 integrate .. //depot/projects/usb/src/sys/kern/subr_rman.c#2 integrate .. //depot/projects/usb/src/sys/kern/subr_stack.c#2 integrate .. //depot/projects/usb/src/sys/kern/subr_turnstile.c#2 integrate .. //depot/projects/usb/src/sys/kern/subr_witness.c#2 integrate .. //depot/projects/usb/src/sys/kern/sys_generic.c#2 integrate .. //depot/projects/usb/src/sys/kern/sys_pipe.c#2 integrate .. //depot/projects/usb/src/sys/kern/sys_process.c#2 integrate .. //depot/projects/usb/src/sys/kern/sys_socket.c#2 integrate .. //depot/projects/usb/src/sys/kern/syscalls.c#2 integrate .. //depot/projects/usb/src/sys/kern/syscalls.master#2 integrate .. //depot/projects/usb/src/sys/kern/sysv_msg.c#2 integrate .. //depot/projects/usb/src/sys/kern/sysv_sem.c#2 integrate .. //depot/projects/usb/src/sys/kern/sysv_shm.c#2 integrate .. //depot/projects/usb/src/sys/kern/tty.c#2 integrate .. //depot/projects/usb/src/sys/kern/uipc_domain.c#2 integrate .. //depot/projects/usb/src/sys/kern/uipc_mbuf.c#2 integrate .. //depot/projects/usb/src/sys/kern/uipc_proto.c#2 delete .. //depot/projects/usb/src/sys/kern/uipc_sem.c#2 integrate .. //depot/projects/usb/src/sys/kern/uipc_socket.c#2 integrate .. //depot/projects/usb/src/sys/kern/uipc_socket2.c#2 integrate .. //depot/projects/usb/src/sys/kern/uipc_syscalls.c#2 integrate .. //depot/projects/usb/src/sys/kern/uipc_usrreq.c#2 integrate .. //depot/projects/usb/src/sys/kern/vfs_aio.c#2 integrate .. //depot/projects/usb/src/sys/kern/vfs_bio.c#2 integrate .. //depot/projects/usb/src/sys/kern/vfs_cache.c#2 integrate .. //depot/projects/usb/src/sys/kern/vfs_init.c#2 integrate .. //depot/projects/usb/src/sys/kern/vfs_lookup.c#2 integrate .. //depot/projects/usb/src/sys/kern/vfs_mount.c#2 integrate .. //depot/projects/usb/src/sys/kern/vfs_subr.c#2 integrate .. //depot/projects/usb/src/sys/kern/vfs_syscalls.c#2 integrate .. //depot/projects/usb/src/sys/kern/vfs_vnops.c#2 integrate .. //depot/projects/usb/src/sys/kern/vnode_if.src#2 integrate .. //depot/projects/usb/src/sys/modules/acpi/acpi/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/acpi/acpi_asus/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/acpi/acpi_panasonic/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/acpi/acpi_toshiba/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/acpi/acpi_video/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/agp/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/asr/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/ath_hal/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/bktr/bktr_mem/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/cpufreq/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/fdc/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/geom/geom_bde/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/geom/geom_eli/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/hwpmc/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/if_bridge/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/if_ef/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/if_ppp/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/ipfw/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/ispfw/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/linprocfs/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/linsysfs/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/linux/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/mfi/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/mii/Makefile#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Sep 21 10:03:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EE91916A4DA; Thu, 21 Sep 2006 10:03:12 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AAEC616A4C9 for ; Thu, 21 Sep 2006 10:03:12 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5D4BF43D58 for ; Thu, 21 Sep 2006 10:03:12 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8LA3CPG071278 for ; Thu, 21 Sep 2006 10:03:12 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8LA3C9H071275 for perforce@freebsd.org; Thu, 21 Sep 2006 10:03:12 GMT (envelope-from piso@freebsd.org) Date: Thu, 21 Sep 2006 10:03:12 GMT Message-Id: <200609211003.k8LA3C9H071275@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 106445 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Sep 2006 10:03:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=106445 Change 106445 by piso@piso_newluxor on 2006/09/21 10:02:31 Add a list of converted drivers. Affected files ... .. //depot/projects/soc2006/intr_filter/notes#10 edit Differences ... ==== //depot/projects/soc2006/intr_filter/notes#10 (text+ko) ==== @@ -79,3 +79,6 @@ with one kse per CPU and threads that spawn new threads when blocking to execute tasks from a interrupt taskqueue +Converted drivers: + +-bfe, em, re, aac, xl From owner-p4-projects@FreeBSD.ORG Thu Sep 21 11:26:59 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B55516A417; Thu, 21 Sep 2006 11:26:59 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0896916A40F for ; Thu, 21 Sep 2006 11:26:59 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3FB3743D6A for ; Thu, 21 Sep 2006 11:26:58 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8LBQwTH076817 for ; Thu, 21 Sep 2006 11:26:58 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8LBQv82076805 for perforce@freebsd.org; Thu, 21 Sep 2006 11:26:57 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 21 Sep 2006 11:26:57 GMT Message-Id: <200609211126.k8LBQv82076805@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 106449 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Sep 2006 11:26:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=106449 Change 106449 by hselasky@hselasky_mini_itx on 2006/09/21 11:26:24 IFC post cleanup: ================= o Remove duplicate __FBSDID. o Remove extra header files, that are included by "usb_port.h". Else the code will not compile on NetBSD. o Remove extra code that has already been integrated. o Add some missing files. o Remove undefined function prototypes. o Compile fix. o Compile fix for FreeBSD 6.x. Affected files ... .. //depot/projects/usb/src/sys/dev/ata/ata-usb.c#9 edit .. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#5 edit .. //depot/projects/usb/src/sys/dev/usb/ehci.c#13 edit .. //depot/projects/usb/src/sys/dev/usb/ehci_pci.c#9 edit .. //depot/projects/usb/src/sys/dev/usb/if_aue.c#12 edit .. //depot/projects/usb/src/sys/dev/usb/if_axe.c#11 edit .. //depot/projects/usb/src/sys/dev/usb/if_rue.c#10 edit .. //depot/projects/usb/src/sys/dev/usb/if_udav.c#10 edit .. //depot/projects/usb/src/sys/dev/usb/if_ural.c#12 edit .. //depot/projects/usb/src/sys/dev/usb/ohci.c#12 edit .. //depot/projects/usb/src/sys/dev/usb/ohci_pci.c#9 edit .. //depot/projects/usb/src/sys/dev/usb/sl811hsreg.h#3 add .. //depot/projects/usb/src/sys/dev/usb/sl811hsvar.h#3 add .. //depot/projects/usb/src/sys/dev/usb/ubsa.c#10 edit .. //depot/projects/usb/src/sys/dev/usb/ubser.c#6 edit .. //depot/projects/usb/src/sys/dev/usb/ucom.c#10 edit .. //depot/projects/usb/src/sys/dev/usb/ufm.c#8 edit .. //depot/projects/usb/src/sys/dev/usb/ufoma.c#8 edit .. //depot/projects/usb/src/sys/dev/usb/uftdi.c#9 edit .. //depot/projects/usb/src/sys/dev/usb/ugen.c#8 edit .. //depot/projects/usb/src/sys/dev/usb/uhci.c#12 edit .. //depot/projects/usb/src/sys/dev/usb/uhci_pci.c#9 edit .. //depot/projects/usb/src/sys/dev/usb/uhid.c#11 edit .. //depot/projects/usb/src/sys/dev/usb/ums.c#14 edit Differences ... ==== //depot/projects/usb/src/sys/dev/ata/ata-usb.c#9 (text) ==== @@ -48,8 +48,6 @@ #include #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-usb.c,v 1.4 2006/03/31 08:09:05 sos Exp $"); - #define ATAUSB_BULK_SIZE (1<<17) /* don't set this lower than (1 << 16) */ /* Command Block Wrapper */ @@ -85,10 +83,6 @@ /* USB-ATA 'controller' softc */ struct atausb_softc { - device_t dev; /* base device */ - int maxlun; - struct ata_request *ata_request; - usb_device_request_t usb_request; struct bbb_cbw cbw; struct bbb_csw csw; struct mtx locked_mtx; ==== //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#5 (text+ko) ==== @@ -2079,7 +2079,6 @@ const struct usb_audio_extension_unit_1 *e1; const struct usb_audio_processing_unit_1 *u1; -} union { const usb_descriptor_t *desc; const struct usb_audio_input_terminal *it; ==== //depot/projects/usb/src/sys/dev/usb/ehci.c#13 (text+ko) ==== @@ -69,8 +69,6 @@ #include #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ehci.c,v 1.18 2004/11/09 20:51:32 iedowse Exp $"); - #define MS_TO_TICKS(ms) (((ms) * hz) / 1000) #define EHCI_BUS2SC(bus) ((ehci_softc_t *)(((u_int8_t *)(bus)) - \ POINTER_TO_UNSIGNED(&(((ehci_softc_t *)0)->sc_bus)))) ==== //depot/projects/usb/src/sys/dev/usb/ehci_pci.c#9 (text+ko) ==== @@ -52,9 +52,6 @@ * sharing of code between *BSD's */ -#include -__FBSDID("$FreeBSD: src/sys/dev/usb/ehci_pci.c,v 1.23 2006/09/07 00:06:41 imp Exp $"); - #include "opt_bus.h" #include @@ -63,7 +60,6 @@ #include #include /* LIST_XXX() */ #include -#include #include #define INCLUDE_PCIXXX_H ==== //depot/projects/usb/src/sys/dev/usb/if_aue.c#12 (text+ko) ==== @@ -682,7 +682,6 @@ struct aue_config_copy *cc, u_int16_t refcount) { u_int16_t i; - u_int8_t hashtbl[8] = { 0, 0, 0, 0, 0, 0, 0, 0 }; if (cc == NULL) { /* nothing to do */ @@ -706,10 +705,6 @@ for (i = 0; i < 8; i++) { aue_cfg_csr_write_1(sc, AUE_MAR0 + i, cc->if_hash[i]); } - /* write the hashtable */ - for (i = 0; i < 8; i++) - aue_csr_write_1(sc, AUE_MAR0 + i, hashtbl[i]); - return; } ==== //depot/projects/usb/src/sys/dev/usb/if_axe.c#11 (text+ko) ==== @@ -325,7 +325,6 @@ usbd_status err; u_int16_t length = AXE_CMD_LEN(cmd); - AXE_SLEEPLOCKASSERT(sc); req.bmRequestType = (AXE_CMD_IS_WRITE(cmd) ? UT_WRITE_VENDOR_DEVICE : UT_READ_VENDOR_DEVICE); @@ -363,7 +362,6 @@ mtx_lock(&(sc->sc_mtx)); /* XXX */ - AXE_SLEEPLOCKASSERT(sc); #if 0 /* * The chip tells us the MII address of any supported @@ -410,7 +408,6 @@ mtx_lock(&(sc->sc_mtx)); /* XXX */ - AXE_SLEEPLOCKASSERT(sc); axe_cfg_cmd(sc, AXE_CMD_MII_OPMODE_SW, 0, 0, NULL); axe_cfg_cmd(sc, AXE_CMD_MII_WRITE_REG, reg, phy, &val); axe_cfg_cmd(sc, AXE_CMD_MII_OPMODE_HW, 0, 0, NULL); @@ -653,8 +650,6 @@ goto detach; } - usb_init_task(&sc->axe_tick_task, axe_tick_task, sc); - error = usbd_config_td_setup(&(sc->sc_config_td), sc, &(sc->sc_mtx), &axe_config_copy, NULL, sizeof(struct axe_config_copy), 16); @@ -807,7 +802,6 @@ __callout_drain(&(sc->sc_watchdog)); mtx_destroy(&(sc->sc_mtx)); - AXE_SLEEPUNLOCK(sc); return 0; } @@ -1032,7 +1026,6 @@ usbd_m_copy_in(&(xfer->buf_data), 0, m, 0, m->m_pkthdr.len); - AXE_SLEEPLOCK(sc); /* * if there's a BPF listener, bounce a copy * of this frame to him: @@ -1146,7 +1139,6 @@ sc->sc_flags |= AXE_FLAG_HL_READY; - AXE_SLEEPLOCK(sc); return; } @@ -1218,7 +1210,6 @@ axe_cfg_cmd(sc, AXE_CMD_RXCTL_WRITE, 0, rxmode, NULL); axe_cfg_setmulti(sc, cc, 0); - AXE_SLEEPUNLOCK(sc); return; } @@ -1247,22 +1238,18 @@ if (ifp->if_drv_flags & IFF_DRV_RUNNING) { usbd_config_td_queue_command (&(sc->sc_config_td), &axe_cfg_stop, 0); - AXE_SLEEPUNLOCK(sc); - } } } break; case SIOCADDMULTI: case SIOCDELMULTI: - AXE_SLEEPLOCK(sc); usbd_config_td_queue_command (&(sc->sc_config_td), &axe_cfg_setmulti, 0); break; case SIOCGIFMEDIA: case SIOCSIFMEDIA: - AXE_SLEEPLOCK(sc); mii = GET_MII(sc); if (mii == NULL) { error = EINVAL; @@ -1308,7 +1295,6 @@ { if (cc == NULL) { - AXE_SLEEPLOCKASSERT(sc); /* immediate configuration */ struct ifnet *ifp = sc->sc_ifp; @@ -1366,9 +1352,7 @@ usbd_config_td_queue_command (&(sc->sc_config_td), &axe_cfg_stop, 0); - AXE_SLEEPLOCK(sc); mtx_unlock(&(sc->sc_mtx)); - AXE_SLEEPUNLOCK(sc); return 0; } ==== //depot/projects/usb/src/sys/dev/usb/if_rue.c#10 (text+ko) ==== @@ -107,8 +107,6 @@ /* "device miibus" required. See GENERIC if you get errors here. */ #include "miibus_if.h" -__FBSDID("$FreeBSD: src/sys/dev/usb/if_rue.c,v 1.28 2006/02/14 12:44:55 glebius Exp $"); - #ifdef USB_DEBUG #define DPRINTF(sc,n,fmt,...) \ do { if (rue_debug > (n)) { \ ==== //depot/projects/usb/src/sys/dev/usb/if_udav.c#10 (text+ko) ==== @@ -89,8 +89,6 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_udav.c,v 1.21 2006/02/14 12:44:55 glebius Exp $"); - /* prototypes */ static device_probe_t udav_probe; ==== //depot/projects/usb/src/sys/dev/usb/if_ural.c#12 (text+ko) ==== @@ -22,6 +22,9 @@ * * NOTE: all function names beginning like "ural_cfg_" can only * be called from within the config thread function ! + * + * TODO: add support for raw transmit trough BPF. See: + * http://www.freebsd.org/cgi/cvsweb.cgi/src/sys/dev/usb/if_ural.c.diff?r1=1.41&r2=1.42 */ #include @@ -70,8 +73,6 @@ #include #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_ural.c,v 1.38 2006/05/16 14:36:32 phk Exp $"); - #ifdef USB_DEBUG #define DPRINTF(sc,n,fmt,...) \ do { if (ural_debug > (n)) { \ @@ -2726,52 +2727,6 @@ return; } -static int -ural_raw_xmit(struct ieee80211_node *ni, struct mbuf *m, - const struct ieee80211_bpf_params *params) -{ - struct ieee80211com *ic = ni->ni_ic; - struct ifnet *ifp = ic->ic_ifp; - struct ural_softc *sc = ifp->if_softc; - - /* prevent management frames from being sent if we're not ready */ - if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) - return ENETDOWN; - if (sc->tx_queued >= RAL_TX_LIST_COUNT) { - ifp->if_drv_flags |= IFF_DRV_OACTIVE; - return EIO; - } - - if (bpf_peers_present(ic->ic_rawbpf)) - bpf_mtap(ic->ic_rawbpf, m); - - ifp->if_opackets++; - - if (params == NULL) { - /* - * Legacy path; interpret frame contents to decide - * precisely how to send the frame. - */ - if (ural_tx_mgt(sc, m, ni) != 0) - goto bad; - } else { - /* - * Caller supplied explicit parameters to use in - * sending the frame. - */ - if (ural_tx_raw(sc, m, ni, params) != 0) - goto bad; - } - sc->sc_tx_timer = 5; - ifp->if_timer = 1; - - return 0; -bad: - ifp->if_oerrors++; - ieee80211_free_node(ni); - return EIO; /* XXX */ -} - #define URAL_AMRR_MIN_SUCCESS_THRESHOLD 1 #define URAL_AMRR_MAX_SUCCESS_THRESHOLD 10 ==== //depot/projects/usb/src/sys/dev/usb/ohci.c#12 (text+ko) ==== @@ -59,7 +59,6 @@ * USB spec: http://www.usb.org/developers/docs/usbspec.zip */ -#include #include #include #include @@ -75,8 +74,6 @@ #include #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ohci.c,v 1.145 2004/11/09 20:51:32 iedowse Exp $"); - #define MS_TO_TICKS(ms) (((ms) * hz) / 1000) #define OHCI_BUS2SC(bus) ((ohci_softc_t *)(((u_int8_t *)(bus)) - \ POINTER_TO_UNSIGNED(&(((ohci_softc_t *)0)->sc_bus)))) @@ -258,7 +255,6 @@ ohci_init(ohci_softc_t *sc) { u_int i; - u_int32_t rev; u_int16_t bit; u_int16_t x; u_int16_t y; @@ -362,7 +358,6 @@ if(ohci_controller_init(sc)) { - error: mtx_unlock(&sc->sc_bus.mtx); return (USBD_INVAL); } @@ -1051,12 +1046,6 @@ ptr->xfer = xfer; ptr->refcount = xfer->usb_refcount; ptr++; - for (sitd = xfer->hcpriv; sitd->xfer == xfer; - sitd = next) { - next = sitd->nextitd; - ohci_free_sitd(sc, sitd); - } - xfer->usb_root->memory_refcount++; } @@ -1804,7 +1793,6 @@ /* data underflow */ xfer->pipe->isoc_next = (nframes + 5) & ((1<<16)-1); DPRINTFN(2,("start next=%d\n", xfer->pipe->isoc_next)); - return; } nframes = xfer->nframes; @@ -2704,7 +2692,6 @@ /* align data to 8 byte boundary */ size[0] += ((-size[0]) & (USB_HOST_ALIGN-1)); - xfer->actlen = 0; xfer->buffer = ADD_BYTES(buf,size[0]); @@ -2814,15 +2801,6 @@ /* store offset temporarily */ n = size[0]; - } else { - sitd->itd.itd_flags = htole32( - OHCI_ITD_NOCC | - OHCI_ITD_SET_SF(iso->next) | - OHCI_ITD_SET_DI(0) | - OHCI_ITD_SET_FC(ncur)); - sitd->flags = OHCI_CALL_DONE | OHCI_ITD_ACTIVE; - } - iso->next += ncur; size[0] += (sizeof(*page_ptr) * total_size[1]); ==== //depot/projects/usb/src/sys/dev/usb/ohci_pci.c#9 (text+ko) ==== @@ -51,14 +51,12 @@ #include "opt_bus.h" -#include #include #include #include #include #include /* LIST_XXX() */ #include -#include #include #define INCLUDE_PCIXXX_H @@ -68,8 +66,6 @@ #include #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ohci_pci.c,v 1.40 2004/08/02 15:37:35 iedowse Exp $"); - #define PCI_OHCI_VENDORID_ACERLABS 0x10b9 #define PCI_OHCI_VENDORID_AMD 0x1022 #define PCI_OHCI_VENDORID_APPLE 0x106b ==== //depot/projects/usb/src/sys/dev/usb/ubsa.c#10 (text+ko) ==== @@ -79,8 +79,6 @@ #include "usbdevs.h" -__FBSDID("$FreeBSD: src/sys/dev/usb/ubsa.c $"); - #ifdef USB_DEBUG #define DPRINTF(n,fmt,...) \ do { if (ubsa_debug > (n)) { \ ==== //depot/projects/usb/src/sys/dev/usb/ubser.c#6 (text+ko) ==== @@ -72,6 +72,8 @@ #include __FBSDID("$FreeBSD: src/sys/dev/usb/ubser.c,v 1.20 2006/09/07 00:06:41 imp Exp $"); +#if 0 + /* * BWCT serial adapter driver */ @@ -870,3 +872,5 @@ } DRIVER_MODULE(ubser, uhub, ubser_driver, ubser_devclass, usbd_driver_load, 0); +#endif + ==== //depot/projects/usb/src/sys/dev/usb/ucom.c#10 (text+ko) ==== @@ -185,6 +185,9 @@ DPRINTF(0, "tp = %p\n", tp); +#ifndef TS_CALLOUT +#define TS_CALLOUT NULL, unit, MINOR_CALLOUT /* compile fix for FreeBSD 6.x */ +#endif error = ttycreate(tp, TS_CALLOUT, "U%d", unit); if (error) { ttyfree(tp); @@ -286,27 +289,6 @@ ucom_modem(tp, SER_DTR | SER_RTS, 0); - /* Open the bulk pipes */ - /* Bulk-in pipe */ - err = usbd_open_pipe(sc->sc_iface, sc->sc_bulkin_no, 0, - &sc->sc_bulkin_pipe); - if (err) { - printf("%s: open bulk in error (addr %d): %s\n", - device_get_nameunit(sc->sc_dev), sc->sc_bulkin_no, - usbd_errstr(err)); - error = EIO; - goto fail; - } - /* Bulk-out pipe */ - err = usbd_open_pipe(sc->sc_iface, sc->sc_bulkout_no, - USBD_EXCLUSIVE_USE, &sc->sc_bulkout_pipe); - if (err) { - printf("%s: open bulk out error (addr %d): %s\n", - device_get_nameunit(sc->sc_dev), sc->sc_bulkout_no, - usbd_errstr(err)); - error = EIO; - goto fail; - } if (sc->sc_callback->ucom_open) { error = (sc->sc_callback->ucom_open)(sc); ==== //depot/projects/usb/src/sys/dev/usb/ufm.c#8 (text+ko) ==== @@ -49,8 +49,6 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ufm.c,v 1.23 2005/01/06 01:43:28 imp Exp $"); - #ifdef USB_DEBUG #define DPRINTF(sc,n,fmt,...) \ do { if (ufm_debug > (n)) { \ ==== //depot/projects/usb/src/sys/dev/usb/ufoma.c#8 (text+ko) ==== @@ -102,8 +102,6 @@ #include "usbdevs.h" -__FBSDID("$FreeBSD: src/sys/dev/usb/ufoma.c,v 1.1 2006/01/09 17:46:36 takawata Exp $"); - typedef struct ufoma_mobile_acm_descriptor{ u_int8_t bFunctionLength; u_int8_t bDescriptorType; ==== //depot/projects/usb/src/sys/dev/usb/uftdi.c#9 (text+ko) ==== @@ -69,8 +69,6 @@ #include "usbdevs.h" -__FBSDID("$FreeBSD: src/sys/dev/usb/uftdi.c,v 1.22 2005/04/05 22:09:18 ticso Exp $"); - #ifdef USB_DEBUG #define DPRINTF(sc,n,fmt,...) \ do { if (uftdi_debug > (n)) { \ ==== //depot/projects/usb/src/sys/dev/usb/ugen.c#8 (text+ko) ==== @@ -47,13 +47,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include #include -#include -#include #include #include #include @@ -65,8 +62,6 @@ #include #include -__FBSDID("$FreeBSD: src/sys/dev/usb2/ugen.c $"); - #define UGEN_BULK_BUFFER_SIZE (1024*64) /* bytes */ #define UGEN_HW_FRAMES 50 /* number of milliseconds per transfer */ @@ -82,6 +77,7 @@ void *buf; }; +struct ugen_endpoint { struct ugen_softc * sc; struct cdev * dev; struct usbd_pipe * pipe_in; /* pipe for reading data from USB */ @@ -321,8 +317,6 @@ (ufr->buf, ufr->frame_size*ufr->output_index); - prev_sc_dying = sc->sc_dying; - sc->sc_dying = 1; *len = ufr->frlengths[ufr->output_index]; } return; @@ -777,11 +771,6 @@ sce->xfer_in[1]; break; - switch (sce->edesc->bmAttributes & UE_XFERTYPE) { - case UE_INTERRUPT: - ndflush(&sce->q, sce->q.c_cc); - clist_free_cblocks(&sce->q); - break; case UE_ISOCHRONOUS: isize = UGETW(ed->wMaxPacketSize); @@ -1054,6 +1043,7 @@ * for sake of synchronization! */ len = uio->uio_resid; + } PRINTFN(10, ("transferring %d bytes\n", len)); @@ -1111,6 +1101,7 @@ error = (xfer->error == USBD_CANCELLED) ? EINTR : EIO; break; + } PRINTFN(1, ("got %d of %d bytes\n", xfer->actlen, n)); error = __uiomove @@ -1357,20 +1348,6 @@ tr_error: usbd_start_hardware(xfer); return; - if (sce->state & UGEN_ASLP) { - DPRINTFN(5, ("ugenpurge: waking %p\n", sce)); - wakeup(sce); - } - selwakeuppri(&sce->rsel, PZERO); - - sce = &sc->sc_endpoints[endpt][OUT]; - if (sce->pipeh) - usbd_abort_pipe(sce->pipeh); - if (sce->state & UGEN_ASLP) { - DPRINTFN(5, ("ugenpurge: waking %p\n", sce)); - wakeup(sce); - } - selwakeuppri(&sce->rsel, PZERO); } static void ==== //depot/projects/usb/src/sys/dev/usb/uhci.c#12 (text+ko) ==== @@ -76,8 +76,6 @@ #include #include -__FBSDID("$FreeBSD: src/sys/dev/usb/uhci.c $"); - #define MS_TO_TICKS(ms) (((ms) * hz) / 1000) #define UHCI_BUS2SC(bus) ((uhci_softc_t *)(((u_int8_t *)(bus)) - \ POINTER_TO_UNSIGNED(&(((uhci_softc_t *)0)->sc_bus)))) @@ -1086,13 +1084,6 @@ uhci_dumpregs(sc); } #endif - if (std->aux_dma.block != NULL) { - usb_freemem(&sc->sc_bus, &std->aux_dma); - std->aux_dma.block = NULL; - std->aux_data = NULL; - std->aux_len = 0; - } - status = UREAD2(sc, UHCI_STS) & UHCI_STS_ALLINTRS; if(status == 0) { @@ -1127,59 +1118,6 @@ #endif } -/* - * Allocate a physically contiguous buffer to handle cases where UHCI - * cannot handle a packet because it is not physically contiguous. - * If the usb_dma_t was already allocated this just ensures it is - * large enough for the specified size. - */ -static usbd_status -uhci_aux_dma_alloc(uhci_softc_t *sc, uhci_soft_td_t *std, void *data, int len) -{ - int err, align; - - if (std->aux_dma.block == NULL || std->aux_dma.block->size < len) { - /* Align to avoid crossing a page boundary. */ - if (powerof2(len)) - align = len; - else - align = 1 << fls(len); - - if (std->aux_dma.block != NULL) - usb_freemem(&sc->sc_bus, &std->aux_dma); - std->aux_dma.block = NULL; - err = usb_allocmem(&sc->sc_bus, len, align, &std->aux_dma); - if (err) - return (err); - } - std->aux_data = data; - std->aux_len = len; - - return (USBD_NORMAL_COMPLETION); -} - -static uhci_physaddr_t -uhci_aux_dma_prepare(uhci_soft_td_t *std, int isread) -{ - if (!isread) { - bcopy(std->aux_data, KERNADDR(&std->aux_dma, 0), std->aux_len); - bus_dmamap_sync(std->aux_dma.block->tag, - std->aux_dma.block->map, BUS_DMASYNC_PREWRITE); - } - - return (DMAADDR(&std->aux_dma, 0)); -} - -static void -uhci_aux_dma_complete(uhci_soft_td_t *std, int isread) -{ - if (isread) { - bus_dmamap_sync(std->aux_dma.block->tag, - std->aux_dma.block->map, BUS_DMASYNC_POSTREAD); - bcopy(KERNADDR(&std->aux_dma, 0), std->aux_data, std->aux_len); - } -} - /* get acknowledge bits */ status &= (UHCI_STS_USBINT| UHCI_STS_USBEI| @@ -1965,8 +1903,6 @@ /* store starting position */ xfer->qh_pos = xfer->pipe->isoc_next; - ii->stdstart = NULL; - ii->stdend = NULL; while(nframes--) { @@ -2005,8 +1941,6 @@ /* need to do a fixup */ td->td_buffer = htole32(fix_res.physaddr); - ii->stdstart = NULL; - ii->stdend = NULL; if (!isread) { ==== //depot/projects/usb/src/sys/dev/usb/uhci_pci.c#9 (text+ko) ==== @@ -57,7 +57,6 @@ #include #include /* LIST_XXX() */ #include -#include #include #define INCLUDE_PCIXXX_H @@ -67,8 +66,6 @@ #include #include -__FBSDID("$FreeBSD: src/sys/dev/usb/uhci_pci.c $"); - #define PCI_UHCI_VENDORID_INTEL 0x8086 #define PCI_UHCI_VENDORID_VIA 0x1106 ==== //depot/projects/usb/src/sys/dev/usb/uhid.c#11 (text+ko) ==== @@ -68,8 +68,6 @@ #include "usbdevs.h" -__FBSDID("$FreeBSD: src/sys/dev/usb/uhid.c $"); - #ifdef USB_DEBUG #define DPRINTF(n,fmt,...) \ do { if (uhid_debug > (n)) { \ ==== //depot/projects/usb/src/sys/dev/usb/ums.c#14 (text+ko) ==== @@ -42,7 +42,6 @@ * HID spec: http://www.usb.org/developers/devclass_docs/HID1_11.pdf */ -#include #include #include #include @@ -60,8 +59,6 @@ #include #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ums.c,v 1.80 2005/12/29 18:35:28 netchild Exp $"); - #ifdef USB_DEBUG #define DPRINTF(n,fmt,...) \ do { if (ums_debug > (n)) { \ @@ -133,7 +130,6 @@ static void ums_stop_read(struct usb_cdev *cdev); -static void ums_add_to_queue_timeout(void *priv); static int32_t ums_open(struct usb_cdev *cdev, int32_t fflags, int32_t devtype, struct thread *td); From owner-p4-projects@FreeBSD.ORG Thu Sep 21 11:36:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 79A3316A4C8; Thu, 21 Sep 2006 11:36:10 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 38AFC16A4AB for ; Thu, 21 Sep 2006 11:36:10 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DD22043D4C for ; Thu, 21 Sep 2006 11:36:09 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8LBa9sN078833 for ; Thu, 21 Sep 2006 11:36:09 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8LBa9aA078830 for perforce@freebsd.org; Thu, 21 Sep 2006 11:36:09 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 21 Sep 2006 11:36:09 GMT Message-Id: <200609211136.k8LBa9aA078830@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 106450 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Sep 2006 11:36:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=106450 Change 106450 by hselasky@hselasky_mini_itx on 2006/09/21 11:35:52 Re-add "ufm" to sys/conf/files. Affected files ... .. //depot/projects/usb/src/sys/conf/files#9 edit Differences ... ==== //depot/projects/usb/src/sys/conf/files#9 (text+ko) ==== @@ -1029,6 +1029,7 @@ dev/usb/ucom.c optional ucom dev/usb/ucycom.c optional ucycom dev/usb/udbp.c optional udbp +dev/usb/ufm.c optional ufm dev/usb/ufoma.c optional ufoma dev/usb/uftdi.c optional uftdi dev/usb/ugen.c optional ugen From owner-p4-projects@FreeBSD.ORG Thu Sep 21 12:53:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B387C16A415; Thu, 21 Sep 2006 12:53:48 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8F61216A40F for ; Thu, 21 Sep 2006 12:53:48 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4460343D53 for ; Thu, 21 Sep 2006 12:53:48 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8LCrmCn001833 for ; Thu, 21 Sep 2006 12:53:48 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8LCrlTo001830 for perforce@freebsd.org; Thu, 21 Sep 2006 12:53:47 GMT (envelope-from rdivacky@FreeBSD.org) Date: Thu, 21 Sep 2006 12:53:47 GMT Message-Id: <200609211253.k8LCrlTo001830@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 106453 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Sep 2006 12:53:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=106453 Change 106453 by rdivacky@rdivacky_witten on 2006/09/21 12:53:10 Linux returns ENOPROTOOPT in a case of not supported opt to setsockopt. Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_socket.c#5 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_socket.c#5 (text+ko) ==== @@ -1139,7 +1139,7 @@ break; } if (name == -1) - return (EINVAL); + return (ENOPROTOOPT); bsd_args.name = name; bsd_args.val = PTRIN(linux_args.optval); From owner-p4-projects@FreeBSD.ORG Thu Sep 21 16:47:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5829316A4CA; Thu, 21 Sep 2006 16:47:45 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1BCAA16A47E for ; Thu, 21 Sep 2006 16:47:45 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DB41343D49 for ; Thu, 21 Sep 2006 16:47:44 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8LGlikK025953 for ; Thu, 21 Sep 2006 16:47:44 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8LGliNH025950 for perforce@freebsd.org; Thu, 21 Sep 2006 16:47:44 GMT (envelope-from imp@freebsd.org) Date: Thu, 21 Sep 2006 16:47:44 GMT Message-Id: <200609211647.k8LGliNH025950@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 106459 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Sep 2006 16:47:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=106459 Change 106459 by imp@imp_lighthouse on 2006/09/21 16:47:29 No need to round to 4 byte boundary, because we only support reading on a block boundary. saves 16 bytes :-) Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/mci_device.c#17 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/mci_device.c#17 (text+ko) ==== @@ -178,8 +178,6 @@ // Init Mode Register AT91C_BASE_MCI->MCI_MR |= ((sectorLength << 16) | AT91C_MCI_PDCMODE); - sizeToRead = (sizeToRead + 3) / 4; - AT91C_BASE_PDC_MCI->PDC_PTCR = (AT91C_PDC_TXTDIS | AT91C_PDC_RXTDIS); AT91C_BASE_PDC_MCI->PDC_RPR = (unsigned int)dataBuffer; AT91C_BASE_PDC_MCI->PDC_RCR = sizeToRead; @@ -239,8 +237,6 @@ // Init Mode Register AT91C_BASE_MCI->MCI_MR |= ((1 << pMCI_Device->pMCI_DeviceFeatures->WRITE_BL_LEN) << 16) | AT91C_MCI_PDCMODE; - sizeToWrite = (sizeToWrite + 3) / 4; - // Init PDC for write sequence AT91C_BASE_PDC_MCI->PDC_PTCR = (AT91C_PDC_TXTDIS | AT91C_PDC_RXTDIS); AT91C_BASE_PDC_MCI->PDC_TPR = (unsigned int) dataBuffer; From owner-p4-projects@FreeBSD.ORG Thu Sep 21 18:33:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B8BD16A47C; Thu, 21 Sep 2006 18:33:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 309F616A417 for ; Thu, 21 Sep 2006 18:33:00 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 566C943D73 for ; Thu, 21 Sep 2006 18:32:56 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8LIWuiV034390 for ; Thu, 21 Sep 2006 18:32:56 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8LIWuSj034387 for perforce@freebsd.org; Thu, 21 Sep 2006 18:32:56 GMT (envelope-from csjp@freebsd.org) Date: Thu, 21 Sep 2006 18:32:56 GMT Message-Id: <200609211832.k8LIWuSj034387@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 106460 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Sep 2006 18:33:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=106460 Change 106460 by csjp@csjp_xor on 2006/09/21 18:32:38 Fixup handling of -c option. Currently, the preselection happens when we are looking at the header, since we do not know what the return status of for the record, we use AU_PRS_BOTH which negates the effect of the return status specified in flags. Instead, copy the header and perform another preselection phase when we process the return32 token. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#15 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#15 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#14 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#15 $ */ /* @@ -328,6 +328,24 @@ return (1); } +static int +select_return32(tokenstr_t tok_ret32, tokenstr_t tok_hdr32, uint32_t *optchkd) +{ + int sorf; + + SETOPT((*optchkd), (OPT_c)); + if (tok_ret32.tt.ret32.status == 0) + sorf = AU_PRS_SUCCESS; + else + sorf = AU_PRS_FAILURE; + if (ISOPTSET(opttochk, OPT_c)) { + if (au_preselect(tok_hdr32.tt.hdr32.e_type, &maskp, sorf, + AU_PRS_USECACHE) != 1) + return (0); + } + return (1); +} + /* * Return 1 if checks for the the following succeed * auid, @@ -395,6 +413,7 @@ static int select_records(FILE *fp) { + tokenstr_t tok_hdr32_copy; u_char *buf; tokenstr_t tok; int reclen; @@ -423,6 +442,8 @@ case AU_HEADER_32_TOKEN: selected = select_hdr32(tok, &optchkd); + bcopy(&tok, &tok_hdr32_copy, + sizeof(tok)); break; case AU_PROCESS_32_TOKEN: @@ -451,6 +472,11 @@ tok.tt.path.path, &optchkd); break; + case AU_RETURN_32_TOKEN: + selected = select_return32(tok, + tok_hdr32_copy, &optchkd); + break; + /* * The following tokens dont have any relevant * attributes that we can select upon. @@ -465,7 +491,6 @@ case AU_IPCPERM_TOKEN: case AU_IPORT_TOKEN: case AU_OPAQUE_TOKEN: - case AU_RETURN_32_TOKEN: case AU_SEQ_TOKEN: case AU_TEXT_TOKEN: case AU_ARB_TOKEN: From owner-p4-projects@FreeBSD.ORG Thu Sep 21 22:38:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 594FF16A417; Thu, 21 Sep 2006 22:38:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 32D8C16A403 for ; Thu, 21 Sep 2006 22:38:10 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ED30143D55 for ; Thu, 21 Sep 2006 22:38:09 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8LMc9JF000735 for ; Thu, 21 Sep 2006 22:38:09 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8LMc9gF000732 for perforce@freebsd.org; Thu, 21 Sep 2006 22:38:09 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 21 Sep 2006 22:38:09 GMT Message-Id: <200609212238.k8LMc9gF000732@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 106475 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Sep 2006 22:38:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=106475 Change 106475 by rwatson@rwatson_sesame on 2006/09/21 22:37:23 OpenBSM 1.0 alpha 12 is our current version. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#34 edit .. //depot/projects/trustedbsd/openbsm/VERSION#13 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#32 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#34 (text+ko) ==== @@ -1,3 +1,5 @@ +OpenBSM 1.0 alpha 12 + OpenBSM 1.0 alpha 11 - Reclassify certain read/write operations as having no class rather than the @@ -243,4 +245,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#33 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#34 $ ==== //depot/projects/trustedbsd/openbsm/VERSION#13 (text+ko) ==== @@ -1,1 +1,1 @@ -OPENBSM_1_0_ALPHA_11 +OPENBSM_1_0_ALPHA_12 ==== //depot/projects/trustedbsd/openbsm/configure.ac#32 (text+ko) ==== @@ -2,8 +2,8 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([OpenBSM], [1.0a11], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#31 $]) +AC_INIT([OpenBSM], [1.0a12], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#32 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) From owner-p4-projects@FreeBSD.ORG Thu Sep 21 22:39:12 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6AF0A16A415; Thu, 21 Sep 2006 22:39:12 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1673416A403 for ; Thu, 21 Sep 2006 22:39:12 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CA3B143D49 for ; Thu, 21 Sep 2006 22:39:11 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8LMdBXG000844 for ; Thu, 21 Sep 2006 22:39:11 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8LMdBwc000841 for perforce@freebsd.org; Thu, 21 Sep 2006 22:39:11 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 21 Sep 2006 22:39:11 GMT Message-Id: <200609212239.k8LMdBwc000841@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 106476 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Sep 2006 22:39:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=106476 Change 106476 by rwatson@rwatson_sesame on 2006/09/21 22:38:19 Regenerate. Affected files ... .. //depot/projects/trustedbsd/openbsm/configure#29 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/configure#29 (xtext) ==== @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#31 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#32 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for OpenBSM 1.0a11. +# Generated by GNU Autoconf 2.59 for OpenBSM 1.0a12. # # Report bugs to . # @@ -424,8 +424,8 @@ # Identity of this package. PACKAGE_NAME='OpenBSM' PACKAGE_TARNAME='openbsm' -PACKAGE_VERSION='1.0a11' -PACKAGE_STRING='OpenBSM 1.0a11' +PACKAGE_VERSION='1.0a12' +PACKAGE_STRING='OpenBSM 1.0a12' PACKAGE_BUGREPORT='trustedbsd-audit@TrustesdBSD.org' ac_unique_file="bin/auditreduce/auditreduce.c" @@ -955,7 +955,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures OpenBSM 1.0a11 to adapt to many kinds of systems. +\`configure' configures OpenBSM 1.0a12 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1021,7 +1021,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenBSM 1.0a11:";; + short | recursive ) echo "Configuration of OpenBSM 1.0a12:";; esac cat <<\_ACEOF @@ -1162,7 +1162,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -OpenBSM configure 1.0a11 +OpenBSM configure 1.0a12 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1176,7 +1176,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by OpenBSM $as_me 1.0a11, which was +It was created by OpenBSM $as_me 1.0a12, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -19278,7 +19278,7 @@ # Define the identity of the package. PACKAGE=OpenBSM - VERSION=1.0a11 + VERSION=1.0a12 cat >>confdefs.h <<_ACEOF @@ -23479,7 +23479,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by OpenBSM $as_me 1.0a11, which was +This file was extended by OpenBSM $as_me 1.0a12, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23542,7 +23542,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -OpenBSM config.status 1.0a11 +OpenBSM config.status 1.0a12 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" From owner-p4-projects@FreeBSD.ORG Thu Sep 21 23:30:21 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E31E16A417; Thu, 21 Sep 2006 23:30:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C0FF716A40F for ; Thu, 21 Sep 2006 23:30:20 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8D84D43D46 for ; Thu, 21 Sep 2006 23:30:20 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8LNUKsx004350 for ; Thu, 21 Sep 2006 23:30:20 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8LNUKAd004337 for perforce@freebsd.org; Thu, 21 Sep 2006 23:30:20 GMT (envelope-from csjp@freebsd.org) Date: Thu, 21 Sep 2006 23:30:20 GMT Message-Id: <200609212330.k8LNUKAd004337@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 106479 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Sep 2006 23:30:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=106479 Change 106479 by csjp@csjp_xor on 2006/09/21 23:30:04 Add a log entry for the auditreduce bug fix. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#35 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#35 (text+ko) ==== @@ -1,5 +1,11 @@ OpenBSM 1.0 alpha 12 +- Correct bug in auditreduce which prevented the -c option from working + correctly when the user specifies to process successful or failed events. + The problem stemmed from not having access to the return token at the time + the initial preselection occurred, but now a second preselection process + occurs while processing the return token. + OpenBSM 1.0 alpha 11 - Reclassify certain read/write operations as having no class rather than the @@ -245,4 +251,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#34 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#35 $ From owner-p4-projects@FreeBSD.ORG Fri Sep 22 00:20:23 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7035A16A416; Fri, 22 Sep 2006 00:20:23 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CCEF316A403 for ; Fri, 22 Sep 2006 00:20:22 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9165743D46 for ; Fri, 22 Sep 2006 00:20:22 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8M0KMu1011944 for ; Fri, 22 Sep 2006 00:20:22 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8M0KMM9011941 for perforce@freebsd.org; Fri, 22 Sep 2006 00:20:22 GMT (envelope-from imp@freebsd.org) Date: Fri, 22 Sep 2006 00:20:22 GMT Message-Id: <200609220020.k8M0KMM9011941@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 106480 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Sep 2006 00:20:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=106480 Change 106480 by imp@imp_lighthouse on 2006/09/22 00:19:32 Break out the board specific stuff from the more generic stuff. There's still a lot of assumptions about hardware, but this makes it easier to add new boards. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/boot2/Makefile#7 edit .. //depot/projects/arm/src/sys/boot/arm/at91/boot2/boot2.c#23 edit .. //depot/projects/arm/src/sys/boot/arm/at91/boot2/tsc_board.c#1 add Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/boot2/Makefile#7 (text+ko) ==== @@ -4,7 +4,7 @@ P=boot2 FILES=${P} -SRCS=arm_init.S boot2.c ee.c +SRCS=arm_init.S boot2.c tsc_board.c ee.c NO_MAN= LDFLAGS=-e 0 -T ${.CURDIR}/../linker.cfg OBJS+= ${SRCS:N*.h:R:S/$/.o/g} ==== //depot/projects/arm/src/sys/boot/arm/at91/boot2/boot2.c#23 (text+ko) ==== @@ -141,112 +141,16 @@ } } -#ifdef BOOT_TSC -#define TSC_FPGA -#endif - -#ifdef TSC_FPGA -#include "at91rm9200.h" -#include "spi_flash.h" -#include "fpga.h" - -#define FPGA_OFFSET (15 * FLASH_PAGE_SIZE) -#define FPGA_LEN (212608) - -char buffer[FPGA_LEN]; - -const struct fpga main_fpga = -{ - AT91C_BASE_PIOB, AT91C_PIO_PB0, - AT91C_BASE_PIOC, AT91C_PIO_PC11, - AT91C_BASE_PIOB, AT91C_PIO_PB2, - AT91C_BASE_PIOC, AT91C_PIO_PC12 -}; - -void -fpga_load(void) -{ - int len, off, i, offset; - char *addr = buffer; - - len = FPGA_LEN; - offset = FPGA_OFFSET; - for (i = 0; i < len; i+= FLASH_PAGE_SIZE) { - off = i + offset; - SPI_ReadFlash(off, addr + i, FLASH_PAGE_SIZE); - } - fpga_init(&main_fpga); - fpga_clear(&main_fpga); - fpga_write_bytes(&main_fpga, addr, len); - fpga_done(&main_fpga); -} -#endif - -#ifdef BOOT_TSC -static void -MacFromEE() -{ - uint32_t sig; -#if 0 - uint8_t euid64[8] = { 0x00, 0x30, 0x96, 0x20, - 0x00, 0x00, 0x00, 0x05 }; -#endif +// Each board has to provide one of these. +void board_init(void); -#if 0 - printf("writing...\n"); - sig = 0xaa55aa55; - EEWrite(0, (uint8_t *)&sig, sizeof(sig)); - EEWrite(48, euid64, sizeof(euid64)); -#endif - sig = 0; - EERead(0, (uint8_t *)&sig, sizeof(sig)); - if (sig != 0xaa55aa55) - return; - EERead(48, mac, 3); - EERead(48+5, mac+3, 3); - printf("MAC %x:%x:%x:%x:%x:%x\n", mac[0], - mac[1], mac[2], mac[3], mac[4], mac[5]); -} -#endif - -#define XMODEM_DL -#ifdef XMODEM_DL -#define FLASH_OFFSET (0 * FLASH_PAGE_SIZE) -#define FPGA_OFFSET (15 * FLASH_PAGE_SIZE) -#define FPGA_LEN (212608) -#define KERNEL_OFFSET (220 * FLASH_PAGE_SIZE) -#define KERNEL_LEN (6 * 1024 * FLASH_PAGE_SIZE) - -static void -UpdateFlash(int offset) -{ - char *addr = (char *)0x20000000 + (1 << 20); /* Load to base + 1MB */ - int len, i, off; - - while ((len = xmodem_rx(addr)) == -1) - continue; - printf("\nDownloaded %u bytes.\n", len); - for (i = 0; i < len; i+= FLASH_PAGE_SIZE) { - off = i + offset; - SPI_WriteFlash(off, addr + i, FLASH_PAGE_SIZE); - } -} -#endif - int main(void) { int autoboot, c = 0; ino_t ino; -#ifdef TSC_FPGA - SPI_InitFlash(); - fpga_load(); -#endif -#ifdef BOOT_TSC - EEInit(); - MacFromEE(); -#endif + board_init(); EMAC_Init(); sdcard_init(); EMAC_SetMACAddress(mac); @@ -282,7 +186,7 @@ xputchar('\a'); #ifdef XMODEM_DL else if (*cmd == '*') - UpdateFlash(FLASH_OFFSET); + Update(); else if (*cmd == '#') reset(); #endif From owner-p4-projects@FreeBSD.ORG Fri Sep 22 00:20:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C949616A553; Fri, 22 Sep 2006 00:20:23 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5D04E16A412 for ; Fri, 22 Sep 2006 00:20:23 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0A35F43D4C for ; Fri, 22 Sep 2006 00:20:23 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8M0KMUL011951 for ; Fri, 22 Sep 2006 00:20:22 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8M0KMeE011947 for perforce@freebsd.org; Fri, 22 Sep 2006 00:20:22 GMT (envelope-from imp@freebsd.org) Date: Fri, 22 Sep 2006 00:20:22 GMT Message-Id: <200609220020.k8M0KMeE011947@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 106481 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Sep 2006 00:20:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=106481 Change 106481 by imp@imp_lighthouse on 2006/09/22 00:19:47 checkpoint Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_qdmmc.c#12 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_qdmmc.c#12 (text+ko) ==== @@ -731,9 +731,10 @@ struct at91_qdmmc_softc *sc = (struct at91_qdmmc_softc*)arg; struct bio *bp; int status; - bus_addr_t addr; + bus_addr_t paddr; int map = 0; uint32_t *tmpbuf; + uint32_t rv; int sz; tmpbuf = malloc(sc->cards[0].sector_size, M_DEVBUF, M_WAITOK); @@ -757,24 +758,33 @@ sz = sc->cards[0].sector_size; for (block = bp->bio_pblkno; block < bp->bio_pblkno + (bp->bio_bcount / sz); block++) { - char *paddr = bp->bio_data + (block - bp->bio_pblkno) * sz; + printf("Waiting for not busy\n"); + // wait until completed + while (!(RD4(sc, MCI_SR) & MCI_SR_NOTBUSY)) + continue; + printf("Waiting for the card to become ready\n"); + do { + rv = at91_qdmmc_GetStatus(sc->dev, sc->cards[0].addr); + printf("."); + } while (rv != 0xffffffff && !(rv & AT91C_SR_READY_FOR_DATA)); + + char *vaddr = bp->bio_data + (block - bp->bio_pblkno) * sz; - if (bus_dmamap_load(sc->dmatag, sc->map, paddr, - sc->cards[0].sector_size, at91_getaddr, &addr, 0) != 0) + if (bus_dmamap_load(sc->dmatag, sc->map, vaddr, + sc->cards[0].sector_size, at91_getaddr, &paddr, 0) != 0) goto out; map = 1; bus_dmamap_sync(sc->dmatag, sc->map, BUS_DMASYNC_PREREAD); at91_qdmmc_wait_ready(sc); WR4(sc, PDC_PTCR, PDC_PTCR_TXTDIS | PDC_PTCR_RXTDIS); - WR4(sc, PDC_RPR, addr); - WR4(sc, PDC_RCR, sz / 4); + WR4(sc, PDC_RPR, paddr); + WR4(sc, PDC_RCR, sz); - printf("block = %#x paddr = %p, RPR = 0x%x, RCR = 0x%x\n", block, paddr, + printf("block = %#x vaddr = %p, RPR = 0x%x, RCR = 0x%x\n", block, vaddr, RD4(sc, PDC_RPR), RD4(sc, PDC_RCR)); - status = at91_qdmmc_SendCommand(sc->dev, - READ_SINGLE_BLOCK_CMD, block * sz); - WR4(sc, MCI_IER, MCI_SR_RXBUFF | MCI_SR_ENDRX); + status = at91_qdmmc_SendCommand(sc->dev, READ_SINGLE_BLOCK_CMD, block * sz); +// WR4(sc, MCI_IER, MCI_SR_RXBUFF | MCI_SR_ENDRX); WR4(sc, PDC_PTCR, PDC_PTCR_RXTEN); printf("at91_qdmmc_task: read-status = 0x%x\n", status); @@ -786,10 +796,13 @@ printf("DONE SLEEPING\n"); #endif at91_qdmmc_wait_ready(sc); + printf("SR is %x\n", RD4(sc, MCI_SR)); +#if 0 // safety check - while ((RD4(sc, MCI_SR) & MCI_SR_RXBUFF) == 0) + while ((RD4(sc, MCI_SR) & MCI_SR_ENDRX) == 0) DELAY(700); +#endif printf("DONE WAITING\n"); bus_dmamap_sync(sc->dmatag, sc->map, BUS_DMASYNC_POSTREAD); @@ -798,14 +811,16 @@ WR4(sc, PDC_PTCR, PDC_PTCR_RXTDIS); /* Fix Byteorder (Atmel Errata) */ - uint32_t* base = (uint32_t*)paddr; + uint32_t* base = (uint32_t*)vaddr; for (int i = 0; i < sc->cards[0].sector_size / 4; i++) { uint32_t tmp = base[i]; base[i] = (((tmp >> 24) & 0xff)) | (((tmp >> 16) & 0xff) << 8) | (((tmp >> 8) & 0xff) << 16) | ((tmp & 0xff) << 24); + printf("%08x", base[i]); } + printf("\n"); } printf("Delecting card!\n"); status = at91_qdmmc_SendCommand(sc->dev, @@ -835,10 +850,10 @@ tmpbuf = malloc(sc->cards[0].sector_size, M_DEVBUF, M_WAITOK); for (block = bp->bio_pblkno; block < bp->bio_pblkno + (bp->bio_bcount / sc->cards[0].sector_size); block++) { - char *paddr = bp->bio_data + (block - bp->bio_pblkno) * sc->cards[0].sector_size; + char *vaddr = bp->bio_data + (block - bp->bio_pblkno) * sc->cards[0].sector_size; /* Fix Byteorder (Atmel Errata) */ - uint32_t* base = (uint32_t*)paddr; + uint32_t* base = (uint32_t*)vaddr; for (int i = 0; i < sc->cards[0].sector_size / 4; i++) { uint32_t tmp = base[i]; tmpbuf[i] = (((tmp >> 24) & 0xff)) | @@ -850,12 +865,12 @@ WR4(sc, PDC_PTCR, PDC_PTCR_TXTDIS | PDC_PTCR_RXTDIS); if (bus_dmamap_load(sc->dmatag, sc->map, tmpbuf, - sc->cards[0].sector_size, at91_getaddr, &addr, 0) != 0) + sc->cards[0].sector_size, at91_getaddr, &paddr, 0) != 0) goto out; map = 1; bus_dmamap_sync(sc->dmatag, sc->map, BUS_DMASYNC_PREWRITE); - WR4(sc, PDC_TPR, addr); + WR4(sc, PDC_TPR, paddr); WR4(sc, PDC_TCR, sc->cards[0].sector_size / 4); printf("status = 0x%x, tmpbuf = %p, TPR = 0x%x, TCR = 0x%x\n", status, tmpbuf, From owner-p4-projects@FreeBSD.ORG Fri Sep 22 01:31:54 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A274116A688; Fri, 22 Sep 2006 01:31:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7EE7616A684 for ; Fri, 22 Sep 2006 01:31:54 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8CC8A43D69 for ; Fri, 22 Sep 2006 01:31:52 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8M1VqZh024626 for ; Fri, 22 Sep 2006 01:31:52 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8M1VqDS024623 for perforce@freebsd.org; Fri, 22 Sep 2006 01:31:52 GMT (envelope-from imp@freebsd.org) Date: Fri, 22 Sep 2006 01:31:52 GMT Message-Id: <200609220131.k8M1VqDS024623@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 106483 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Sep 2006 01:31:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=106483 Change 106483 by imp@imp_lighthouse on 2006/09/22 01:31:38 Put back in the scaling... Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/mci_device.c#18 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/mci_device.c#18 (text+ko) ==== @@ -178,6 +178,8 @@ // Init Mode Register AT91C_BASE_MCI->MCI_MR |= ((sectorLength << 16) | AT91C_MCI_PDCMODE); + sizeToRead = sizeToRead / 4; + AT91C_BASE_PDC_MCI->PDC_PTCR = (AT91C_PDC_TXTDIS | AT91C_PDC_RXTDIS); AT91C_BASE_PDC_MCI->PDC_RPR = (unsigned int)dataBuffer; AT91C_BASE_PDC_MCI->PDC_RCR = sizeToRead; @@ -237,6 +239,8 @@ // Init Mode Register AT91C_BASE_MCI->MCI_MR |= ((1 << pMCI_Device->pMCI_DeviceFeatures->WRITE_BL_LEN) << 16) | AT91C_MCI_PDCMODE; + sizeToWrite = sizeToWrite / 4; + // Init PDC for write sequence AT91C_BASE_PDC_MCI->PDC_PTCR = (AT91C_PDC_TXTDIS | AT91C_PDC_RXTDIS); AT91C_BASE_PDC_MCI->PDC_TPR = (unsigned int) dataBuffer; From owner-p4-projects@FreeBSD.ORG Fri Sep 22 11:13:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F134B16A543; Fri, 22 Sep 2006 11:13:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A68A916A522 for ; Fri, 22 Sep 2006 11:13:54 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0500C43D5A for ; Fri, 22 Sep 2006 11:13:54 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8MBDrR8086038 for ; Fri, 22 Sep 2006 11:13:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8MBDrO6086031 for perforce@freebsd.org; Fri, 22 Sep 2006 11:13:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 22 Sep 2006 11:13:53 GMT Message-Id: <200609221113.k8MBDrO6086031@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 106497 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Sep 2006 11:13:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=106497 Change 106497 by rwatson@rwatson_peppercorn on 2006/09/22 11:13:41 Add additional audit events. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#43 edit .. //depot/projects/trustedbsd/openbsm/etc/audit_event#16 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#43 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#42 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#43 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -470,6 +470,10 @@ #define AUE_KENV 43114 /* FreeBSD. */ #define AUE_JAIL_ATTACH 43115 /* FreeBSD. */ #define AUE_SYSCTL_WRITE 43116 /* FreeBSD. */ +#define AUE_IOPERM 43117 /* Linux. */ +#define AUE_READDIR 43118 /* Linux. */ +#define AUE_IOPL 43119 /* Linux. */ +#define AUE_VM86 43120 /* Linux. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the ==== //depot/projects/trustedbsd/openbsm/etc/audit_event#16 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#15 $ +# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#16 $ # 0:AUE_NULL:indir system call:no 1:AUE_EXIT:exit(2):pc @@ -418,6 +418,10 @@ 43114:AUE_KENV:kenv(8):ad 43115:AUE_JAIL_ATTACH:jail_attach(2):ad 43116:AUE_SYSCTL_WRITE:sysctl(3):ad +43117:AUE_IOPERM:linux ioperm:ad +43118:AUE_READDIR:readdir(3):no +43119:AUE_IOPL:linux iopl:ad +43120:AUE_VM86:linux vm86:pc # # User space system events. # From owner-p4-projects@FreeBSD.ORG Fri Sep 22 11:31:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B5E8C16A4A7; Fri, 22 Sep 2006 11:31:16 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7927F16A40F for ; Fri, 22 Sep 2006 11:31:16 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 252F943D5D for ; Fri, 22 Sep 2006 11:31:16 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8MBVG4K086970 for ; Fri, 22 Sep 2006 11:31:16 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8MBVFV6086967 for perforce@freebsd.org; Fri, 22 Sep 2006 11:31:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 22 Sep 2006 11:31:15 GMT Message-Id: <200609221131.k8MBVFV6086967@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 106498 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Sep 2006 11:31:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=106498 Change 106498 by rwatson@rwatson_peppercorn on 2006/09/22 11:30:25 Add getacfilesz(3) and audit_control(5) filesz setting, which allows the administrator to specify the desired maximum audit trail size before the audit trail file is rotated. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#22 edit .. //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#30 edit .. //depot/projects/trustedbsd/openbsm/etc/audit_control#5 edit .. //depot/projects/trustedbsd/openbsm/libbsm/au_control.3#5 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#16 edit .. //depot/projects/trustedbsd/openbsm/libbsm/libbsm.3#8 edit .. //depot/projects/trustedbsd/openbsm/man/audit_control.5#12 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#22 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#21 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#22 $ */ #include @@ -727,6 +727,8 @@ char naeventstr[NA_EVENT_STR_SIZE]; char polstr[POL_STR_SIZE]; long policy; + au_fstat_t au_fstat; + size_t filesz; /* * Process the audit event file, obtaining a class mapping for each @@ -806,6 +808,17 @@ "Failed to set default audit policy: %m"); } + /* + * Set trail rotation size. + */ + if (getacfilesz(&filesz) == 0) { + bzero(&au_fstat, sizeof(au_fstat)); + au_fstat.af_filesz = filesz; + if (auditon(A_SETFSIZE, &au_fstat, sizeof(au_fstat)) < 0) + syslog(LOG_ERR, "Failed to set filesz: %m"); + } else + syslog(LOG_ERR, "Failed to obtain filesz: %m"); + return (0); } ==== //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#30 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#29 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#30 $ */ #ifndef _LIBBSM_H_ @@ -78,6 +78,7 @@ #define DIR_CONTROL_ENTRY "dir" #define MINFREE_CONTROL_ENTRY "minfree" +#define FILESZ_CONTROL_ENTRY "filesz" #define FLAGS_CONTROL_ENTRY "flags" #define NA_CONTROL_ENTRY "naflags" #define POLICY_CONTROL_ENTRY "policy" @@ -719,6 +720,7 @@ void endac(void); int getacdir(char *name, int len); int getacmin(int *min_val); +int getacfilesz(size_t *size_val); int getacflg(char *auditstr, int len); int getacna(char *auditstr, int len); int getacpol(char *auditstr, size_t len); ==== //depot/projects/trustedbsd/openbsm/etc/audit_control#5 (text+ko) ==== @@ -1,8 +1,9 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_control#4 $ +# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_control#5 $ # dir:/var/audit flags:lo minfree:20 naflags:lo policy:cnt +filesz:0 ==== //depot/projects/trustedbsd/openbsm/libbsm/au_control.3#5 (text+ko) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2005 Robert N. M. Watson +.\" Copyright (c) 2005-2006 Robert N. M. Watson .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_control.3#4 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_control.3#5 $ .\" .Dd April 19, 2005 .Dt AU_CONTROL 3 @@ -33,6 +33,7 @@ .Nm endac , .Nm getacdir , .Nm getacmin , +.Nm getacfilesz , .Nm getacflg , .Nm getacna , .Nm getacpol , @@ -52,6 +53,8 @@ .Ft int .Fn getacmin "int *min_val" .Ft int +.Fn getacfilesz "size_t *size_val" +.Ft int .Fn getacflg "char *auditstr" "int len" .Ft int .Fn getacna "char *auditstr" "int len" @@ -88,6 +91,10 @@ .Va min_val variable. .Pp +.Fn getacfilesz +returns the audit trail rotation size in the passed size_t buffer +.Fa size_val . +.Pp .Fn getacflg returns the audit system flags via the the passed character buffer .Va auditstr ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#16 (text+ko) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#15 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#16 $ */ #include @@ -396,6 +396,46 @@ } /* + * Return the desired trail rotation size from the audit control file. + */ +int +getacfilesz(size_t *filesz_val) +{ + char *filesz, *dummy; + long long ll; + + pthread_mutex_lock(&mutex); + setac_locked(); + if (getstrfromtype_locked(FILESZ_CONTROL_ENTRY, &filesz) < 0) { + pthread_mutex_unlock(&mutex); + return (-2); + } + if (filesz == NULL) { + pthread_mutex_unlock(&mutex); + errno = EINVAL; + return (1); + } + ll = strtoll(filesz, &dummy, 10); + if (*dummy != '\0') { + pthread_mutex_unlock(&mutex); + errno = EINVAL; + return (-1); + } + /* + * The file size must either be 0 or >= MIN_AUDIT_FILE_SIZE. 0 + * indicates no rotation size. + */ + if (ll < 0 || (ll > 0 && ll < MIN_AUDIT_FILE_SIZE)) { + pthread_mutex_unlock(&mutex); + errno = EINVAL; + return (-1); + } + *filesz_val = ll; + pthread_mutex_unlock(&mutex); + return (0); +} + +/* * Return the system audit value from the audit contol file. */ int ==== //depot/projects/trustedbsd/openbsm/libbsm/libbsm.3#8 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/libbsm.3#7 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/libbsm.3#8 $ .\" .Dd April 19, 2005 .Dt LIBBSM 3 @@ -84,6 +84,7 @@ .Xr endac 3 , .Xr setac 3 , .Xr getacdir 3 , +.Xr getacfilesz 3 , .Xr getacflg 3 , .Xr getacmin 3 , .Xr getacna 3 , ==== //depot/projects/trustedbsd/openbsm/man/audit_control.5#12 (text+ko) ==== @@ -1,4 +1,5 @@ .\" Copyright (c) 2004 Apple Computer, Inc. +.\" Copyright (c) 2006 Robert N. M. Watson .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -25,7 +26,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_control.5#11 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_control.5#12 $ .\" .Dd January 4, 2006 .Dt AUDIT_CONTROL 5 @@ -66,6 +67,12 @@ .It Va policy A list of global audit policy flags specifying various behaviors, such as fail stop, auditing of paths and arguments, etc. +.It Va filesz +Maximum trail size in bytes; if set to a non-0 value, the audit daemon will +rotate the audit trail file at around this size. +Sizes less than the minimum trail size (default of 512K) will be rejected as +invalid. +If 0, trail files will not be automatically rotated based on file size. .El .Sh AUDIT FLAGS Audit flags are a comma-delimited list of audit classes as defined in the @@ -146,6 +153,7 @@ minfree:20 naflags:lo policy:cnt +filesz:0 .Ed .Pp The @@ -156,7 +164,8 @@ .Va policy parameter specifies that the system should neither fail stop nor suspend processes when the audit store fills. -will be audited. +The trail file will not be automatically rotated by the audit daemon based on +file size. .Sh FILES .Bl -tag -width "/etc/security/audit_control" -compact .It Pa /etc/security/audit_control From owner-p4-projects@FreeBSD.ORG Fri Sep 22 11:52:44 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AB25816A412; Fri, 22 Sep 2006 11:52:44 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6844416A403 for ; Fri, 22 Sep 2006 11:52:44 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3227343D5E for ; Fri, 22 Sep 2006 11:52:44 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8MBqicE088111 for ; Fri, 22 Sep 2006 11:52:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8MBqiYR088108 for perforce@freebsd.org; Fri, 22 Sep 2006 11:52:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 22 Sep 2006 11:52:44 GMT Message-Id: <200609221152.k8MBqiYR088108@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 106500 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Sep 2006 11:52:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=106500 Change 106500 by rwatson@rwatson_peppercorn on 2006/09/22 11:52:24 Add getacfilesz(3) to history. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#36 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#36 (text+ko) ==== @@ -5,6 +5,8 @@ The problem stemmed from not having access to the return token at the time the initial preselection occurred, but now a second preselection process occurs while processing the return token. +- getacfilesz(3) API added to read new audit_control(5) filesz setting, + which auditd(8) now sets the kernel audit trail rotation size to. OpenBSM 1.0 alpha 11 @@ -251,4 +253,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#35 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#36 $ From owner-p4-projects@FreeBSD.ORG Fri Sep 22 13:12:32 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 122AC16A47B; Fri, 22 Sep 2006 13:12:32 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E1AF616A407 for ; Fri, 22 Sep 2006 13:12:31 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AB64843D7F for ; Fri, 22 Sep 2006 13:12:24 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8MDCOdI008156 for ; Fri, 22 Sep 2006 13:12:24 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8MDCN4Z008153 for perforce@freebsd.org; Fri, 22 Sep 2006 13:12:23 GMT (envelope-from rdivacky@FreeBSD.org) Date: Fri, 22 Sep 2006 13:12:23 GMT Message-Id: <200609221312.k8MDCN4Z008153@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 106503 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Sep 2006 13:12:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=106503 Change 106503 by rdivacky@rdivacky_witten on 2006/09/22 13:11:28 Make this compilable on amd64. Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_aio.h#2 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_aio.h#2 (text+ko) ==== @@ -32,7 +32,7 @@ #ifndef _LINUX_AIO_H_ #define _LINUX_AIO_H_ -typedef l_ulong linux_aio_context_t; +typedef unsigned long linux_aio_context_t; enum { LINUX_IOCB_CMD_PREAD = 0, From owner-p4-projects@FreeBSD.ORG Fri Sep 22 13:16:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 517F516A494; Fri, 22 Sep 2006 13:16:31 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2A8AD16A47B for ; Fri, 22 Sep 2006 13:16:31 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0D9FA43D5F for ; Fri, 22 Sep 2006 13:16:30 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8MDGTXr008406 for ; Fri, 22 Sep 2006 13:16:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8MDGTC7008394 for perforce@freebsd.org; Fri, 22 Sep 2006 13:16:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 22 Sep 2006 13:16:29 GMT Message-Id: <200609221316.k8MDGTC7008394@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 106504 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Sep 2006 13:16:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=106504 Change 106504 by rwatson@rwatson_fledge on 2006/09/22 13:15:35 Add an audit_warn(5) event for the audit daemon closing a trail file. This could be used, for example, to hook the close event and compress the trail file. The event is never called for unterminated trail files left behind after, say, an improper shutdown. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditd/audit_warn.c#7 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#23 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.h#7 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditd/audit_warn.c#7 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/audit_warn.c#6 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/audit_warn.c#7 $ */ #include @@ -125,6 +125,21 @@ } /* + * Indicate that a trail file has been closed, so can now be post-processed. + */ +int +audit_warn_closefile(char *filename) +{ + char *args[3]; + + args[0] = CLOSEFILE_WARN; + args[1] = filename; + args[2] = NULL; + + return (auditwarnlog(args)); +} + +/* * Indicates that the audit deammn is already running */ int ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#23 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#22 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#23 $ */ #include @@ -163,9 +163,11 @@ syslog(LOG_ERR, "Could not rename %s to %s: %m", oldname, lastfile); - else + else { syslog(LOG_INFO, "renamed %s to %s", oldname, lastfile); + audit_warn_closefile(lastfile); + } } free(lastfile); free(oldname); ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.h#7 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.h#6 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.h#7 $ */ #ifndef _AUDITD_H_ @@ -62,6 +62,7 @@ #define HARDLIM_ALL_WARN "allhard" #define SOFTLIM_ALL_WARN "allsoft" #define AUDITOFF_WARN "auditoff" +#define CLOSEFILE_WARN "closefile" #define EBUSY_WARN "ebusy" #define GETACDIR_WARN "getacdir" #define HARDLIM_WARN "hard" @@ -76,6 +77,7 @@ int audit_warn_allhard(int count); int audit_warn_allsoft(void); int audit_warn_auditoff(void); +int audit_warn_closefile(char *filename); int audit_warn_ebusy(void); int audit_warn_getacdir(char *filename); int audit_warn_hard(char *filename); From owner-p4-projects@FreeBSD.ORG Fri Sep 22 17:09:12 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B43F916A416; Fri, 22 Sep 2006 17:09:12 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8FE5F16A407 for ; Fri, 22 Sep 2006 17:09:12 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 588E443D5A for ; Fri, 22 Sep 2006 17:09:12 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8MH9CYD038930 for ; Fri, 22 Sep 2006 17:09:12 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8MH9C4O038926 for perforce@freebsd.org; Fri, 22 Sep 2006 17:09:12 GMT (envelope-from mjacob@freebsd.org) Date: Fri, 22 Sep 2006 17:09:12 GMT Message-Id: <200609221709.k8MH9C4O038926@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 106510 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Sep 2006 17:09:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=106510 Change 106510 by mjacob@newisp on 2006/09/22 17:08:44 Add (bogus for now) 2CAM/FROMCAM locks. Affected files ... .. //depot/projects/newisp/dev/mpt/mpt_raid.c#2 edit Differences ... ==== //depot/projects/newisp/dev/mpt/mpt_raid.c#2 (text+ko) ==== @@ -1595,16 +1595,19 @@ mpt->raid_rescan = 0; + MPTLOCK_2_CAMLOCK(mpt); error = xpt_create_path(&path, xpt_periph, cam_sim_path(mpt->sim), mpt_vol->config_page->VolumeID, /*lun*/0); if (error != CAM_REQ_CMP) { + CAMLOCK_2_MPTLOCK(mpt); mpt_vol_prt(mpt, mpt_vol, "Unable to allocate path!\n"); continue; } mpt_adjust_queue_depth(mpt, mpt_vol, path); xpt_free_path(path); + CAMLOCK_2_MPTLOCK(mpt); } MPT_UNLOCK(mpt); return (0); From owner-p4-projects@FreeBSD.ORG Fri Sep 22 17:10:14 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A524916A416; Fri, 22 Sep 2006 17:10:14 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 83EA116A403 for ; Fri, 22 Sep 2006 17:10:14 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 21F9343D53 for ; Fri, 22 Sep 2006 17:10:14 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8MHAE2w038967 for ; Fri, 22 Sep 2006 17:10:14 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8MHADUK038964 for perforce@freebsd.org; Fri, 22 Sep 2006 17:10:13 GMT (envelope-from mjacob@freebsd.org) Date: Fri, 22 Sep 2006 17:10:13 GMT Message-Id: <200609221710.k8MHADUK038964@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 106511 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Sep 2006 17:10:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=106511 Change 106511 by mjacob@newisp on 2006/09/22 17:09:15 Incorporate QFULL EVENT stuff here, plus add a target mode derbug message. Affected files ... .. //depot/projects/newisp/dev/mpt/mpt_cam.c#4 edit Differences ... ==== //depot/projects/newisp/dev/mpt/mpt_cam.c#4 (text+ko) ==== @@ -2148,10 +2148,40 @@ break; case MPI_EVENT_QUEUE_FULL: { + struct cam_sim *sim; + struct cam_path *tmppath; + struct ccb_relsim crs; PTR_EVENT_DATA_QUEUE_FULL pqf = (PTR_EVENT_DATA_QUEUE_FULL) msg->Data; - mpt_prt(mpt, "QUEUE_FULL: Bus 0x%02x Target 0x%02x Depth %d\n", - pqf->Bus, pqf->TargetID, pqf->CurrentDepth); + lun_id_t lun_id; + + mpt_prt(mpt, "QUEUE FULL EVENT: Bus 0x%02x Target 0x%02x Depth " + "%d\n", pqf->Bus, pqf->TargetID, pqf->CurrentDepth); + if (mpt->phydisk_sim) { + sim = mpt->phydisk_sim; + } else { + sim = mpt->sim; + } + MPTLOCK_2_CAMLOCK(mpt); + for (lun_id = 0; lun_id < MPT_MAX_LUNS; lun_id++) { + if (xpt_create_path(&tmppath, NULL, cam_sim_path(sim), + pqf->TargetID, lun_id) != CAM_REQ_CMP) { + mpt_prt(mpt, "unable to create a path to send " + "XPT_REL_SIMQ"); + CAMLOCK_2_MPTLOCK(mpt); + break; + } + xpt_setup_ccb(&crs.ccb_h, tmppath, 5); + crs.ccb_h.func_code = XPT_REL_SIMQ; + crs.release_flags = RELSIM_ADJUST_OPENINGS; + crs.openings = pqf->CurrentDepth - 1; + xpt_action((union ccb *)&crs); + if (crs.ccb_h.status != CAM_REQ_CMP) { + mpt_prt(mpt, "XPT_REL_SIMQ failed\n"); + } + xpt_free_path(tmppath); + } + CAMLOCK_2_MPTLOCK(mpt); break; } case MPI_EVENT_SAS_DEVICE_STATUS_CHANGE: @@ -4556,7 +4586,12 @@ tgt->state = TGT_STATE_IN_CAM; tgt->reply_desc = reply_desc; ioindex = GET_IO_INDEX(reply_desc); - + if (mpt->verbose >= MPT_PRT_DEBUG) { + mpt_dump_data(mpt, "mpt_scsi_tgt_atio response", vbuf, + max(sizeof (MPI_TARGET_FCP_CMD_BUFFER), + max(sizeof (MPI_TARGET_SSP_CMD_BUFFER), + sizeof (MPI_TARGET_SCSI_SPI_CMD_BUFFER)))); + } if (mpt->is_fc) { PTR_MPI_TARGET_FCP_CMD_BUFFER fc; fc = (PTR_MPI_TARGET_FCP_CMD_BUFFER) vbuf; From owner-p4-projects@FreeBSD.ORG Fri Sep 22 17:13:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B4CC916A403; Fri, 22 Sep 2006 17:13:22 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6D44F16A415 for ; Fri, 22 Sep 2006 17:13:22 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2741543D58 for ; Fri, 22 Sep 2006 17:13:20 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8MHDJBw039219 for ; Fri, 22 Sep 2006 17:13:20 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8MHDIHP039216 for perforce@freebsd.org; Fri, 22 Sep 2006 17:13:18 GMT (envelope-from mjacob@freebsd.org) Date: Fri, 22 Sep 2006 17:13:18 GMT Message-Id: <200609221713.k8MHDIHP039216@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 106512 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Sep 2006 17:13:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=106512 Change 106512 by mjacob@newisp on 2006/09/22 17:12:22 IFC Affected files ... .. //depot/projects/newisp/amd64/include/stdarg.h#2 integrate .. //depot/projects/newisp/amd64/isa/atpic_vector.S#2 integrate .. //depot/projects/newisp/arm/include/stdarg.h#2 integrate .. //depot/projects/newisp/bsm/audit.h#2 integrate .. //depot/projects/newisp/bsm/audit_internal.h#3 integrate .. //depot/projects/newisp/bsm/audit_kevents.h#2 integrate .. //depot/projects/newisp/bsm/audit_record.h#3 integrate .. //depot/projects/newisp/compat/freebsd32/freebsd32.h#2 integrate .. //depot/projects/newisp/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/newisp/compat/freebsd32/freebsd32_proto.h#5 integrate .. //depot/projects/newisp/compat/freebsd32/freebsd32_syscall.h#5 integrate .. //depot/projects/newisp/compat/freebsd32/freebsd32_syscalls.c#5 integrate .. //depot/projects/newisp/compat/freebsd32/freebsd32_sysent.c#5 integrate .. //depot/projects/newisp/compat/freebsd32/syscalls.master#5 integrate .. //depot/projects/newisp/conf/NOTES#3 integrate .. //depot/projects/newisp/conf/options#2 integrate .. //depot/projects/newisp/dev/acpica/acpi.c#3 integrate .. //depot/projects/newisp/dev/bce/if_bce.c#3 integrate .. //depot/projects/newisp/dev/em/if_em.c#8 integrate .. //depot/projects/newisp/dev/kbdmux/kbdmux.c#3 integrate .. //depot/projects/newisp/dev/mfi/mfi.c#4 integrate .. //depot/projects/newisp/dev/mfi/mfivar.h#2 integrate .. //depot/projects/newisp/dev/mpt/mpt_cam.c#5 integrate .. //depot/projects/newisp/dev/pci/pci.c#2 integrate .. //depot/projects/newisp/dev/usb/if_cdce.c#3 integrate .. //depot/projects/newisp/i386/include/stdarg.h#2 integrate .. //depot/projects/newisp/i386/isa/atpic_vector.s#2 integrate .. //depot/projects/newisp/i386/linux/linux_machdep.c#3 integrate .. //depot/projects/newisp/i386/linux/linux_proto.h#3 integrate .. //depot/projects/newisp/i386/linux/linux_syscall.h#3 integrate .. //depot/projects/newisp/i386/linux/linux_sysent.c#3 integrate .. //depot/projects/newisp/i386/linux/syscalls.master#3 integrate .. //depot/projects/newisp/ia64/include/stdarg.h#2 integrate .. //depot/projects/newisp/kern/init_sysent.c#5 integrate .. //depot/projects/newisp/kern/kern_mac.c#2 integrate .. //depot/projects/newisp/kern/kern_resource.c#2 integrate .. //depot/projects/newisp/kern/kern_thr.c#2 integrate .. //depot/projects/newisp/kern/kern_umtx.c#6 integrate .. //depot/projects/newisp/kern/syscalls.c#5 integrate .. //depot/projects/newisp/kern/syscalls.master#5 integrate .. //depot/projects/newisp/kern/systrace_args.c#5 integrate .. //depot/projects/newisp/kern/sysv_msg.c#2 integrate .. //depot/projects/newisp/kern/sysv_sem.c#2 integrate .. //depot/projects/newisp/kern/sysv_shm.c#2 integrate .. //depot/projects/newisp/kern/tty.c#3 integrate .. //depot/projects/newisp/kern/uipc_mbuf.c#2 integrate .. //depot/projects/newisp/kern/uipc_socket.c#4 integrate .. //depot/projects/newisp/kern/vfs_default.c#2 integrate .. //depot/projects/newisp/kern/vfs_syscalls.c#3 integrate .. //depot/projects/newisp/net/if_loop.c#2 integrate .. //depot/projects/newisp/netinet6/in6.c#2 integrate .. //depot/projects/newisp/powerpc/include/stdarg.h#2 integrate .. //depot/projects/newisp/security/audit/audit_bsm.c#5 integrate .. //depot/projects/newisp/security/audit/audit_bsm_token.c#3 integrate .. //depot/projects/newisp/security/audit/audit_worker.c#3 integrate .. //depot/projects/newisp/security/mac/mac_inet.c#3 integrate .. //depot/projects/newisp/security/mac/mac_internal.h#3 integrate .. //depot/projects/newisp/security/mac/mac_net.c#2 integrate .. //depot/projects/newisp/security/mac/mac_pipe.c#2 integrate .. //depot/projects/newisp/security/mac/mac_posix_sem.c#2 integrate .. //depot/projects/newisp/security/mac/mac_process.c#2 integrate .. //depot/projects/newisp/security/mac/mac_socket.c#2 integrate .. //depot/projects/newisp/security/mac/mac_sysv_msg.c#2 integrate .. //depot/projects/newisp/security/mac/mac_sysv_sem.c#2 integrate .. //depot/projects/newisp/security/mac/mac_sysv_shm.c#2 integrate .. //depot/projects/newisp/security/mac/mac_vfs.c#2 integrate .. //depot/projects/newisp/sparc64/include/stdarg.h#2 integrate .. //depot/projects/newisp/sparc64/sparc64/pmap.c#2 integrate .. //depot/projects/newisp/sparc64/sparc64/tsb.c#2 integrate .. //depot/projects/newisp/sys/cdefs.h#2 integrate .. //depot/projects/newisp/sys/rtprio.h#2 integrate .. //depot/projects/newisp/sys/syscall.h#5 integrate .. //depot/projects/newisp/sys/syscall.mk#5 integrate .. //depot/projects/newisp/sys/sysproto.h#5 integrate .. //depot/projects/newisp/sys/thr.h#2 integrate .. //depot/projects/newisp/sys/umtx.h#3 integrate .. //depot/projects/newisp/ufs/ffs/ffs_softdep.c#2 integrate Differences ... ==== //depot/projects/newisp/amd64/include/stdarg.h#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/stdarg.h,v 1.8 2005/03/11 22:16:09 peter Exp $ + * $FreeBSD: src/sys/amd64/include/stdarg.h,v 1.9 2006/09/21 01:37:01 kan Exp $ */ #ifndef _MACHINE_STDARG_H_ @@ -42,7 +42,7 @@ #ifdef __GNUCLIKE_BUILTIN_STDARG #define va_start(ap, last) \ - __builtin_stdarg_start((ap), (last)) + __builtin_va_start((ap), (last)) #define va_arg(ap, type) \ __builtin_va_arg((ap), type) ==== //depot/projects/newisp/amd64/isa/atpic_vector.S#2 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/amd64/isa/atpic_vector.S,v 1.46 2005/12/08 18:33:30 jhb Exp $ + * $FreeBSD: src/sys/amd64/isa/atpic_vector.S,v 1.47 2006/09/20 20:52:11 wkoszek Exp $ */ /* @@ -41,7 +41,7 @@ #include "assym.s" /* - * Macros for interrupt interrupt entry, call to handler, and exit. + * Macros for interrupt entry, call to handler, and exit. */ #define INTR(irq_num, vec_name) \ .text ; \ ==== //depot/projects/newisp/arm/include/stdarg.h#2 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * @(#)stdarg.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/arm/include/stdarg.h,v 1.3 2005/03/02 21:33:22 joerg Exp $ + * $FreeBSD: src/sys/arm/include/stdarg.h,v 1.4 2006/09/21 01:37:02 kan Exp $ */ #ifndef _MACHINE_STDARG_H_ @@ -45,7 +45,7 @@ #ifdef __GNUCLIKE_BUILTIN_STDARG #define va_start(ap, last) \ - __builtin_stdarg_start((ap), (last)) + __builtin_va_start((ap), (last)) #define va_arg(ap, type) \ __builtin_va_arg((ap), type) ==== //depot/projects/newisp/bsm/audit.h#2 (text) ==== @@ -30,8 +30,8 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#31 $ - * $FreeBSD: src/sys/bsm/audit.h,v 1.5 2006/08/26 08:17:58 rwatson Exp $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#34 $ + * $FreeBSD: src/sys/bsm/audit.h,v 1.6 2006/09/21 07:27:02 rwatson Exp $ */ #ifndef _BSM_AUDIT_H @@ -59,23 +59,19 @@ * Triggers for the audit daemon. */ #define AUDIT_TRIGGER_MIN 1 -#define AUDIT_TRIGGER_LOW_SPACE 1 -#define AUDIT_TRIGGER_OPEN_NEW 2 -#define AUDIT_TRIGGER_READ_FILE 3 -#define AUDIT_TRIGGER_CLOSE_AND_DIE 4 -#define AUDIT_TRIGGER_NO_SPACE 5 -#define AUDIT_TRIGGER_MAX 5 +#define AUDIT_TRIGGER_LOW_SPACE 1 /* Below low watermark. */ +#define AUDIT_TRIGGER_ROTATE_KERNEL 2 /* Kernel requests rotate. */ +#define AUDIT_TRIGGER_READ_FILE 3 /* Re-read config file. */ +#define AUDIT_TRIGGER_CLOSE_AND_DIE 4 /* Terminate audit. */ +#define AUDIT_TRIGGER_NO_SPACE 5 /* Below min free space. */ +#define AUDIT_TRIGGER_ROTATE_USER 6 /* User requests roate. */ +#define AUDIT_TRIGGER_MAX 6 /* - * Special file that will be read for trigger events from the kernel - * (FreeBSD). + * The special device filename (FreeBSD). */ -#define AUDIT_TRIGGER_FILE "/dev/audit" - -/* - * The special device filename. - */ #define AUDITDEV_FILENAME "audit" +#define AUDIT_TRIGGER_FILE ("/dev/" AUDITDEV_FILENAME) /* * Pre-defined audit IDs @@ -182,12 +178,12 @@ #define AUDIT_PERZONE 0x2000 /* - * Audit queue control parameters. + * Default audit queue control parameters. */ #define AQ_HIWATER 100 #define AQ_MAXHIGH 10000 #define AQ_LOWATER 10 -#define AQ_BUFSZ 1024 +#define AQ_BUFSZ MAXAUDITDATA #define AQ_MAXBUFSZ 1048576 /* ==== //depot/projects/newisp/bsm/audit_internal.h#3 (text) ==== @@ -34,8 +34,8 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#11 $ - * $FreeBSD: src/sys/bsm/audit_internal.h,v 1.4 2006/09/02 10:49:44 rwatson Exp $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#14 $ + * $FreeBSD: src/sys/bsm/audit_internal.h,v 1.5 2006/09/21 07:27:02 rwatson Exp $ */ #ifndef _AUDIT_INTERNAL_H ==== //depot/projects/newisp/bsm/audit_kevents.h#2 (text) ==== @@ -30,8 +30,8 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#26 $ - * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.7 2006/08/26 08:17:58 rwatson Exp $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#28 $ + * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.8 2006/09/21 07:27:02 rwatson Exp $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -468,6 +468,9 @@ #define AUE_EXTATTR_SET_LINK 43111 /* FreeBSD. */ #define AUE_EXTATTR_LIST_LINK 43112 /* FreeBSD. */ #define AUE_EXTATTR_DELETE_LINK 43113 /* FreeBSD. */ +#define AUE_KENV 43114 /* FreeBSD. */ +#define AUE_JAIL_ATTACH 43115 /* FreeBSD. */ +#define AUE_SYSCTL_WRITE 43116 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the ==== //depot/projects/newisp/bsm/audit_record.h#3 (text) ==== @@ -30,8 +30,8 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#19 $ - * $FreeBSD: src/sys/bsm/audit_record.h,v 1.5 2006/09/01 11:45:39 wsalamon Exp $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#21 $ + * $FreeBSD: src/sys/bsm/audit_record.h,v 1.6 2006/09/21 07:27:02 rwatson Exp $ */ #ifndef _BSM_AUDIT_RECORD_H_ ==== //depot/projects/newisp/compat/freebsd32/freebsd32.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/freebsd32/freebsd32.h,v 1.5 2006/08/17 22:50:32 imp Exp $ + * $FreeBSD: src/sys/compat/freebsd32/freebsd32.h,v 1.6 2006/09/22 15:04:28 davidxu Exp $ */ #ifndef _COMPAT_FREEBSD32_FREEBSD32_H_ @@ -103,4 +103,18 @@ int32_t f_spare[2]; }; +struct thr_param32 { + uint32_t start_func; + uint32_t arg; + uint32_t stack_base; + uint32_t stack_size; + uint32_t tls_base; + uint32_t tls_size; + uint32_t child_tid; + uint32_t parent_tid; + int32_t flags; + uint32_t rtp; + uint32_t spare[3]; +}; + #endif /* !_COMPAT_FREEBSD32_FREEBSD32_H_ */ ==== //depot/projects/newisp/compat/freebsd32/freebsd32_misc.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.58 2006/08/16 00:02:36 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.59 2006/09/22 15:04:28 davidxu Exp $"); #include "opt_compat.h" @@ -67,7 +67,9 @@ #include #include #include +#include #include +#include #include #include #include @@ -2121,6 +2123,60 @@ return (error); } +int +freebsd32_thr_new(struct thread *td, + struct freebsd32_thr_new_args *uap) +{ + struct thr_param32 param32; + struct thr_param param; + int error; + + if (uap->param_size < 0 || + uap->param_size > sizeof(struct thr_param32)) + return (EINVAL); + bzero(¶m, sizeof(struct thr_param)); + bzero(¶m32, sizeof(struct thr_param32)); + error = copyin(uap->param, ¶m32, uap->param_size); + if (error != 0) + return (error); + param.start_func = PTRIN(param32.start_func); + param.arg = PTRIN(param32.arg); + param.stack_base = PTRIN(param32.stack_base); + param.stack_size = param32.stack_size; + param.tls_base = PTRIN(param32.tls_base); + param.tls_size = param32.tls_size; + param.child_tid = PTRIN(param32.child_tid); + param.parent_tid = PTRIN(param32.parent_tid); + param.flags = param32.flags; + param.rtp = PTRIN(param32.rtp); + param.spare[0] = PTRIN(param32.spare[0]); + param.spare[1] = PTRIN(param32.spare[1]); + param.spare[2] = PTRIN(param32.spare[2]); + + return (kern_thr_new(td, ¶m)); +} + +int +freebsd32_thr_suspend(struct thread *td, struct freebsd32_thr_suspend_args *uap) +{ + struct timespec32 ts32; + struct timespec ts, *tsp; + int error; + + error = 0; + tsp = NULL; + if (uap->timeout != NULL) { + error = copyin((const void *)uap->timeout, (void *)&ts32, + sizeof(struct timespec32)); + if (error != 0) + return (error); + ts.tv_sec = ts32.tv_sec; + ts.tv_nsec = ts32.tv_nsec; + tsp = &ts; + } + return (kern_thr_suspend(td, tsp)); +} + #if 0 int ==== //depot/projects/newisp/compat/freebsd32/freebsd32_proto.h#5 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.62 2006/09/17 13:29:35 rwatson Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.75 2006/09/17 13:28:11 rwatson Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.65 2006/09/22 15:05:33 davidxu Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.78 2006/09/22 15:04:28 davidxu Exp */ #ifndef _FREEBSD32_SYSPROTO_H_ @@ -280,6 +280,20 @@ char oucp_l_[PADL_(struct freebsd32_ucontext *)]; struct freebsd32_ucontext * oucp; char oucp_r_[PADR_(struct freebsd32_ucontext *)]; char ucp_l_[PADL_(const struct freebsd32_ucontext *)]; const struct freebsd32_ucontext * ucp; char ucp_r_[PADR_(const struct freebsd32_ucontext *)]; }; +struct freebsd32_thr_suspend_args { + char timeout_l_[PADL_(const struct timespec32 *)]; const struct timespec32 * timeout; char timeout_r_[PADR_(const struct timespec32 *)]; +}; +struct freebsd32_umtx_op_args { + char obj_l_[PADL_(void *)]; void * obj; char obj_r_[PADR_(void *)]; + char op_l_[PADL_(int)]; int op; char op_r_[PADR_(int)]; + char val_l_[PADL_(uintptr_t)]; uintptr_t val; char val_r_[PADR_(uintptr_t)]; + char uaddr_l_[PADL_(void *)]; void * uaddr; char uaddr_r_[PADR_(void *)]; + char uaddr2_l_[PADL_(void *)]; void * uaddr2; char uaddr2_r_[PADR_(void *)]; +}; +struct freebsd32_thr_new_args { + char param_l_[PADL_(struct thr_param32 *)]; struct thr_param32 * param; char param_r_[PADR_(struct thr_param32 *)]; + char param_size_l_[PADL_(int)]; int param_size; char param_size_r_[PADR_(int)]; +}; int freebsd32_wait4(struct thread *, struct freebsd32_wait4_args *); int freebsd32_recvmsg(struct thread *, struct freebsd32_recvmsg_args *); int freebsd32_sendmsg(struct thread *, struct freebsd32_sendmsg_args *); @@ -326,6 +340,9 @@ int freebsd32_getcontext(struct thread *, struct freebsd32_getcontext_args *); int freebsd32_setcontext(struct thread *, struct freebsd32_setcontext_args *); int freebsd32_swapcontext(struct thread *, struct freebsd32_swapcontext_args *); +int freebsd32_thr_suspend(struct thread *, struct freebsd32_thr_suspend_args *); +int freebsd32_umtx_op(struct thread *, struct freebsd32_umtx_op_args *); +int freebsd32_thr_new(struct thread *, struct freebsd32_thr_new_args *); #ifdef COMPAT_43 @@ -461,6 +478,9 @@ #define FREEBSD32_SYS_AUE_freebsd32_getcontext AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_setcontext AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_swapcontext AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_thr_suspend AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_umtx_op AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_thr_new AUE_NULL #undef PAD_ #undef PADL_ ==== //depot/projects/newisp/compat/freebsd32/freebsd32_syscall.h#5 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.60 2006/09/17 13:29:35 rwatson Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.75 2006/09/17 13:28:11 rwatson Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.63 2006/09/22 15:05:33 davidxu Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.78 2006/09/22 15:04:28 davidxu Exp */ #define FREEBSD32_SYS_syscall 0 @@ -300,20 +300,19 @@ #define FREEBSD32_SYS_freebsd32_getcontext 421 #define FREEBSD32_SYS_freebsd32_setcontext 422 #define FREEBSD32_SYS_freebsd32_swapcontext 423 -#define FREEBSD32_SYS_thr_create 430 #define FREEBSD32_SYS_thr_exit 431 #define FREEBSD32_SYS_thr_self 432 #define FREEBSD32_SYS_thr_kill 433 #define FREEBSD32_SYS__umtx_lock 434 #define FREEBSD32_SYS__umtx_unlock 435 #define FREEBSD32_SYS_jail_attach 436 -#define FREEBSD32_SYS_thr_suspend 442 +#define FREEBSD32_SYS_freebsd32_thr_suspend 442 #define FREEBSD32_SYS_thr_wake 443 #define FREEBSD32_SYS_kldunloadf 444 +#define FREEBSD32_SYS_freebsd32_umtx_op 454 +#define FREEBSD32_SYS_freebsd32_thr_new 455 #define FREEBSD32_SYS_sigqueue 456 #define FREEBSD32_SYS_abort2 463 #define FREEBSD32_SYS_thr_set_name 464 -#define FREEBSD32_SYS_thr_setscheduler 466 -#define FREEBSD32_SYS_thr_getscheduler 467 -#define FREEBSD32_SYS_thr_setschedparam 468 +#define FREEBSD32_SYS_rtprio_thread 466 #define FREEBSD32_SYS_MAXSYSCALL 471 ==== //depot/projects/newisp/compat/freebsd32/freebsd32_syscalls.c#5 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.51 2006/09/17 13:29:35 rwatson Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.75 2006/09/17 13:28:11 rwatson Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.54 2006/09/22 15:05:33 davidxu Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.78 2006/09/22 15:04:28 davidxu Exp */ const char *freebsd32_syscallnames[] = { @@ -437,7 +437,7 @@ "#427", /* 427 = __acl_delete_link */ "#428", /* 428 = __acl_aclcheck_link */ "#429", /* 429 = sigwait */ - "thr_create", /* 430 = thr_create */ + "#430", /* 430 = thr_create; */ "thr_exit", /* 431 = thr_exit */ "thr_self", /* 432 = thr_self */ "thr_kill", /* 433 = thr_kill */ @@ -449,7 +449,7 @@ "#439", /* 439 = extattr_list_link */ "#440", /* 440 = kse_switchin */ "#441", /* 441 = ksem_timedwait */ - "thr_suspend", /* 442 = thr_suspend */ + "freebsd32_thr_suspend", /* 442 = freebsd32_thr_suspend */ "thr_wake", /* 443 = thr_wake */ "kldunloadf", /* 444 = kldunloadf */ "#445", /* 445 = audit */ @@ -461,8 +461,8 @@ "#451", /* 451 = getaudit_addr */ "#452", /* 452 = setaudit_addr */ "#453", /* 453 = auditctl */ - "#454", /* 454 = _umtx_op */ - "#455", /* 455 = thr_new */ + "freebsd32_umtx_op", /* 454 = freebsd32_umtx_op */ + "freebsd32_thr_new", /* 455 = freebsd32_thr_new */ "sigqueue", /* 456 = sigqueue */ "#457", /* 457 = kmq_open */ "#458", /* 458 = kmq_setattr */ @@ -473,9 +473,9 @@ "abort2", /* 463 = abort2 */ "thr_set_name", /* 464 = thr_set_name */ "#465", /* 465 = aio_fsync */ - "thr_setscheduler", /* 466 = thr_setscheduler */ - "thr_getscheduler", /* 467 = thr_getscheduler */ - "thr_setschedparam", /* 468 = thr_setschedparam */ + "rtprio_thread", /* 466 = rtprio_thread */ + "#467", /* 467 = nosys */ + "#468", /* 468 = nosys */ "#469", /* 469 = __getpath_fromfd */ "#470", /* 470 = __getpath_fromaddr */ }; ==== //depot/projects/newisp/compat/freebsd32/freebsd32_sysent.c#5 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.61 2006/09/17 13:29:35 rwatson Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.75 2006/09/17 13:28:11 rwatson Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.64 2006/09/22 15:05:34 davidxu Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.78 2006/09/22 15:04:28 davidxu Exp */ #include "opt_compat.h" @@ -462,7 +462,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 427 = __acl_delete_link */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 428 = __acl_aclcheck_link */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 429 = sigwait */ - { AS(thr_create_args), (sy_call_t *)thr_create, AUE_NULL, NULL, 0, 0 }, /* 430 = thr_create */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 430 = thr_create; */ { AS(thr_exit_args), (sy_call_t *)thr_exit, AUE_NULL, NULL, 0, 0 }, /* 431 = thr_exit */ { AS(thr_self_args), (sy_call_t *)thr_self, AUE_NULL, NULL, 0, 0 }, /* 432 = thr_self */ { AS(thr_kill_args), (sy_call_t *)thr_kill, AUE_NULL, NULL, 0, 0 }, /* 433 = thr_kill */ @@ -474,7 +474,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 439 = extattr_list_link */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 440 = kse_switchin */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 441 = ksem_timedwait */ - { AS(thr_suspend_args), (sy_call_t *)thr_suspend, AUE_NULL, NULL, 0, 0 }, /* 442 = thr_suspend */ + { AS(freebsd32_thr_suspend_args), (sy_call_t *)freebsd32_thr_suspend, AUE_NULL, NULL, 0, 0 }, /* 442 = freebsd32_thr_suspend */ { AS(thr_wake_args), (sy_call_t *)thr_wake, AUE_NULL, NULL, 0, 0 }, /* 443 = thr_wake */ { AS(kldunloadf_args), (sy_call_t *)kldunloadf, AUE_MODUNLOAD, NULL, 0, 0 }, /* 444 = kldunloadf */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 445 = audit */ @@ -486,8 +486,8 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 451 = getaudit_addr */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 452 = setaudit_addr */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 453 = auditctl */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 454 = _umtx_op */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 455 = thr_new */ + { AS(freebsd32_umtx_op_args), (sy_call_t *)freebsd32_umtx_op, AUE_NULL, NULL, 0, 0 }, /* 454 = freebsd32_umtx_op */ + { AS(freebsd32_thr_new_args), (sy_call_t *)freebsd32_thr_new, AUE_NULL, NULL, 0, 0 }, /* 455 = freebsd32_thr_new */ { AS(sigqueue_args), (sy_call_t *)sigqueue, AUE_NULL, NULL, 0, 0 }, /* 456 = sigqueue */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 457 = kmq_open */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 458 = kmq_setattr */ @@ -498,9 +498,9 @@ { AS(abort2_args), (sy_call_t *)abort2, AUE_NULL, NULL, 0, 0 }, /* 463 = abort2 */ { AS(thr_set_name_args), (sy_call_t *)thr_set_name, AUE_NULL, NULL, 0, 0 }, /* 464 = thr_set_name */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 465 = aio_fsync */ - { AS(thr_setscheduler_args), (sy_call_t *)thr_setscheduler, AUE_NULL, NULL, 0, 0 }, /* 466 = thr_setscheduler */ - { AS(thr_getscheduler_args), (sy_call_t *)thr_getscheduler, AUE_NULL, NULL, 0, 0 }, /* 467 = thr_getscheduler */ - { AS(thr_setschedparam_args), (sy_call_t *)thr_setschedparam, AUE_NULL, NULL, 0, 0 }, /* 468 = thr_setschedparam */ + { AS(rtprio_thread_args), (sy_call_t *)rtprio_thread, AUE_RTPRIO, NULL, 0, 0 }, /* 466 = rtprio_thread */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 467 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 468 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 469 = __getpath_fromfd */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 470 = __getpath_fromaddr */ }; ==== //depot/projects/newisp/compat/freebsd32/syscalls.master#5 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.75 2006/09/17 13:28:11 rwatson Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.78 2006/09/22 15:04:28 davidxu Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -715,8 +715,7 @@ 428 AUE_NULL UNIMPL __acl_aclcheck_link ; XXX implement 429 AUE_SIGWAIT UNIMPL sigwait -430 AUE_NULL NOPROTO { int thr_create(ucontext_t *ctx, long *id, \ - int flag s); } +430 AUE_NULL UNIMPL thr_create; 431 AUE_NULL NOPROTO { void thr_exit(long *state); } 432 AUE_NULL NOPROTO { int thr_self(long *id); } 433 AUE_NULL NOPROTO { int thr_kill(long id, int sig); } @@ -728,8 +727,8 @@ 439 AUE_EXTATTR_LIST_LINK UNIMPL extattr_list_link 440 AUE_NULL UNIMPL kse_switchin 441 AUE_NULL UNIMPL ksem_timedwait -442 AUE_NULL NOPROTO { int thr_suspend( \ - const struct timespec *timeout); } +442 AUE_NULL STD { int freebsd32_thr_suspend( \ + const struct timespec32 *timeout); } 443 AUE_NULL NOPROTO { int thr_wake(long id); } 444 AUE_MODUNLOAD NOPROTO { int kldunloadf(int fileid, int flags); } 445 AUE_AUDIT UNIMPL audit @@ -741,8 +740,12 @@ 451 AUE_GETAUDIT_ADDR UNIMPL getaudit_addr 452 AUE_SETAUDIT_ADDR UNIMPL setaudit_addr 453 AUE_AUDITCTL UNIMPL auditctl -454 AUE_NULL UNIMPL _umtx_op -455 AUE_NULL UNIMPL thr_new +454 AUE_NULL STD { int freebsd32_umtx_op(void *obj, int op,\ + uintptr_t val, void *uaddr, \ + void *uaddr2); } +455 AUE_NULL STD { int freebsd32_thr_new( \ + struct thr_param32 *param, \ + int param_size); } 456 AUE_NULL NOPROTO { int sigqueue(pid_t pid, int signum, \ void *value); } 457 AUE_NULL UNIMPL kmq_open @@ -754,14 +757,9 @@ 463 AUE_NULL NOPROTO { int abort2(const char *why, int nargs, void **args); } 464 AUE_NULL NOPROTO { int thr_set_name(long id, const char *name); } 465 AUE_NULL UNIMPL aio_fsync -466 AUE_NULL NOPROTO { int thr_setscheduler(long id, int policy,\ - const struct sched_param *param, \ - int param_size); } -467 AUE_NULL NOPROTO { int thr_getscheduler(long id, int *policy,\ - struct sched_param *param, \ - int param_size); } -468 AUE_NULL NOPROTO { int thr_setschedparam(long id, \ - const struct sched_param *param, \ - int param_size); } +466 AUE_RTPRIO NOPROTO { int rtprio_thread(int function, \ + lwpid_t lwpid, struct rtprio *rtp); } +467 AUE_NULL UNIMPL nosys +468 AUE_NULL UNIMPL nosys 469 AUE_NULL UNIMPL __getpath_fromfd 470 AUE_NULL UNIMPL __getpath_fromaddr ==== //depot/projects/newisp/conf/NOTES#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1380 2006/08/27 12:57:37 marck Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1381 2006/09/20 13:33:40 rwatson Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -994,7 +994,6 @@ options MAC options MAC_BIBA options MAC_BSDEXTENDED -options MAC_DEBUG options MAC_IFOFF options MAC_LOMAC options MAC_MLS ==== //depot/projects/newisp/conf/options#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.557 2006/08/17 00:37:03 julian Exp $ +# $FreeBSD: src/sys/conf/options,v 1.558 2006/09/20 13:33:40 rwatson Exp $ # # On the handling of kernel options # @@ -103,7 +103,6 @@ MAC_ALWAYS_LABEL_MBUF opt_mac.h MAC_BIBA opt_dontuse.h MAC_BSDEXTENDED opt_dontuse.h -MAC_DEBUG opt_mac.h MAC_IFOFF opt_dontuse.h MAC_LOMAC opt_dontuse.h MAC_MLS opt_dontuse.h ==== //depot/projects/newisp/dev/acpica/acpi.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.228 2006/09/11 19:32:54 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.229 2006/09/21 18:56:03 jhb Exp $"); #include "opt_acpi.h" #include @@ -1083,7 +1083,7 @@ * If we know about this address, deactivate it and release it to the * local pool. If we don't, pass this request up to the parent. */ - if (acpi_sysres_find(bus, type, rman_get_start(r)) == NULL) { + if (acpi_sysres_find(bus, type, rman_get_start(r)) != NULL) { if (rman_get_flags(r) & RF_ACTIVE) { ret = bus_deactivate_resource(child, type, rid, r); if (ret != 0) ==== //depot/projects/newisp/dev/bce/if_bce.c#3 (text) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.8 2006/09/17 13:33:27 andre Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.9 2006/09/20 18:55:16 ambrisko Exp $"); /* * The following controllers are supported by this driver: @@ -309,6 +309,7 @@ static void bce_ifmedia_sts (struct ifnet *, struct ifmediareq *); static void bce_init_locked (struct bce_softc *); static void bce_init (void *); +static void bce_mgmt_init_locked(struct bce_softc *sc); static void bce_init_context (struct bce_softc *); static void bce_get_mac_addr (struct bce_softc *); @@ -781,6 +782,11 @@ /* Add the supported sysctls to the kernel. */ bce_add_sysctls(sc); + /* Get the firmware running so IPMI still works */ + BCE_LOCK(sc); + bce_mgmt_init_locked(sc); + BCE_UNLOCK(sc); + goto bce_attach_exit; bce_attach_fail: @@ -3241,6 +3247,7 @@ DBPRINT(sc, BCE_VERBOSE_RESET, "Exiting %s()\n", __FUNCTION__); + bce_mgmt_init_locked(sc); } @@ -4569,6 +4576,43 @@ return; } +static void +bce_mgmt_init_locked(struct bce_softc *sc) +{ + u32 val; + struct ifnet *ifp; + + DBPRINT(sc, BCE_VERBOSE_RESET, "Entering %s()\n", __FUNCTION__); + + BCE_LOCK_ASSERT(sc); + + ifp = sc->bce_ifp; + + /* Check if the driver is still running and bail out if it is. */ + if (ifp->if_drv_flags & IFF_DRV_RUNNING) + goto bce_mgmt_init_locked_exit; + + /* Initialize the on-boards CPUs */ + bce_init_cpus(sc); + + val = (BCM_PAGE_BITS - 8) << 24; + REG_WR(sc, BCE_RV2P_CONFIG, val); + + /* Enable all critical blocks in the MAC. */ + REG_WR(sc, BCE_MISC_ENABLE_SET_BITS, + BCE_MISC_ENABLE_SET_BITS_RX_V2P_ENABLE | + BCE_MISC_ENABLE_SET_BITS_RX_DMA_ENABLE | + BCE_MISC_ENABLE_SET_BITS_COMPLETION_ENABLE); + REG_RD(sc, BCE_MISC_ENABLE_SET_BITS); + DELAY(20); + + bce_ifmedia_upd(ifp); +bce_mgmt_init_locked_exit: + DBPRINT(sc, BCE_VERBOSE_RESET, "Exiting %s()\n", __FUNCTION__); + + return; +} + /****************************************************************************/ /* Handles controller initialization when called from an unlocked routine. */ ==== //depot/projects/newisp/dev/em/if_em.c#8 (text+ko) ==== @@ -31,7 +31,7 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.146 2006/09/18 23:44:12 andre Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.147 2006/09/21 19:14:51 andre Exp $*/ #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" @@ -1058,6 +1058,18 @@ if (ifp->if_capenable & IFCAP_VLAN_HWTAGGING) em_enable_vlans(adapter); + ifp->if_hwassist = 0; + if (adapter->hw.mac_type >= em_82543) { + if (ifp->if_capenable & IFCAP_TXCSUM) + ifp->if_hwassist = EM_CHECKSUM_FEATURES; + /* + * em_setup_transmit_structures() will behave differently + * based on the state of TSO. + */ + if (ifp->if_capenable & IFCAP_TSO) + ifp->if_hwassist |= EM_TCPSEG_FEATURES; + } + /* Prepare transmit descriptors and buffers */ if (em_setup_transmit_structures(adapter)) { device_printf(dev, "Could not setup transmit structures\n"); @@ -1083,14 +1095,6 @@ ifp->if_drv_flags |= IFF_DRV_RUNNING; ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; - ifp->if_hwassist = 0; - if (adapter->hw.mac_type >= em_82543) { - if (ifp->if_capenable & IFCAP_TXCSUM) - ifp->if_hwassist = EM_CHECKSUM_FEATURES; - if (ifp->if_capenable & IFCAP_TSO) - ifp->if_hwassist |= EM_TCPSEG_FEATURES; - } - callout_reset(&adapter->timer, hz, em_local_timer, adapter); em_clear_hw_cntrs(&adapter->hw); #ifdef DEVICE_POLLING ==== //depot/projects/newisp/dev/kbdmux/kbdmux.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $Id: kbdmux.c,v 1.4 2005/07/14 17:38:35 max Exp $ - * $FreeBSD: src/sys/dev/kbdmux/kbdmux.c,v 1.12 2006/09/19 13:03:09 ru Exp $ + * $FreeBSD: src/sys/dev/kbdmux/kbdmux.c,v 1.13 2006/09/20 11:43:36 ru Exp $ */ #include "opt_kbd.h" @@ -1051,7 +1051,7 @@ case KDSKBMODE: /* set keyboard mode */ KBDMUX_LOCK(state); - switch ((int)*(intptr_t *)arg) { + switch (*(int *)arg) { case K_XLATE: if (state->ks_mode != K_XLATE) { /* make lock key state and LED state match */ @@ -1062,9 +1062,9 @@ case K_RAW: case K_CODE: - if (state->ks_mode != (int)*(intptr_t *)arg) { + if (state->ks_mode != *(int *)arg) { kbdmux_clear_state_locked(state); - state->ks_mode = (int)*(intptr_t *)arg; + state->ks_mode = *(int *)arg; } break; @@ -1086,13 +1086,13 @@ KBDMUX_LOCK(state); /* NOTE: lock key state in ks_state won't be changed */ - if ((int)*(intptr_t *)arg & ~LOCK_MASK) { + if (*(int *)arg & ~LOCK_MASK) { KBDMUX_UNLOCK(state); return (EINVAL); } - KBD_LED_VAL(kbd) = (int)*(intptr_t *)arg; + KBD_LED_VAL(kbd) = *(int *)arg; /* KDSETLED on all slave keyboards */ SLIST_FOREACH(k, &state->ks_kbds, next) @@ -1110,14 +1110,14 @@ case KDSKBSTATE: /* set lock key state */ KBDMUX_LOCK(state); - if ((int)*(intptr_t *)arg & ~LOCK_MASK) { + if (*(int *)arg & ~LOCK_MASK) { KBDMUX_UNLOCK(state); return (EINVAL); } state->ks_state &= ~LOCK_MASK; - state->ks_state |= (int)*(intptr_t *)arg; + state->ks_state |= *(int *)arg; /* KDSKBSTATE on all slave keyboards */ SLIST_FOREACH(k, &state->ks_kbds, next) @@ -1147,7 +1147,7 @@ break; mode |= i; } else - mode = (int)*(intptr_t *)arg; + mode = *(int *)arg; if (mode & ~0x7f) { KBDMUX_UNLOCK(state); ==== //depot/projects/newisp/dev/mfi/mfi.c#4 (text) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mfi/mfi.c,v 1.15 2006/09/07 18:40:49 ambrisko Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mfi/mfi.c,v 1.17 2006/09/20 18:49:35 ambrisko Exp $"); #include "opt_mfi.h" @@ -85,9 +85,12 @@ SYSCTL_NODE(_hw, OID_AUTO, mfi, CTLFLAG_RD, 0, "MFI driver parameters"); static int mfi_event_locale = MFI_EVT_LOCALE_ALL; +TUNABLE_INT("hw.mfi.event_locale", &mfi_event_locale); SYSCTL_INT(_hw_mfi, OID_AUTO, event_locale, CTLFLAG_RW, &mfi_event_locale, 0, "event message locale"); + static int mfi_event_class = MFI_EVT_CLASS_DEBUG; +TUNABLE_INT("hw.mfi.event_class", &mfi_event_class); SYSCTL_INT(_hw_mfi, OID_AUTO, event_class, CTLFLAG_RW, &mfi_event_class, 0, "event message class"); @@ -179,7 +182,7 @@ { uint32_t status; int error, commsz, framessz, sensesz; - int frames, unit; + int frames, unit, max_fw_sge; mtx_init(&sc->mfi_io_lock, "MFI I/O lock", NULL, MTX_DEF); TAILQ_INIT(&sc->mfi_ld_tqh); @@ -206,8 +209,8 @@ */ status = MFI_READ4(sc, MFI_OMSG0); sc->mfi_max_fw_cmds = status & MFI_FWSTATE_MAXCMD_MASK; - sc->mfi_max_fw_sgl = (status & MFI_FWSTATE_MAXSGL_MASK) >> 16; - sc->mfi_total_sgl = min(sc->mfi_max_fw_sgl, ((MAXPHYS / PAGE_SIZE) +1)); + max_fw_sge = (status & MFI_FWSTATE_MAXSGL_MASK) >> 16; + sc->mfi_max_sge = min(max_fw_sge, ((MAXPHYS / PAGE_SIZE) + 1)); /* * Create the dma tag for data buffers. Used both for block I/O @@ -219,7 +222,7 @@ BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */ BUS_SPACE_MAXSIZE_32BIT,/* maxsize */ - sc->mfi_total_sgl, /* nsegments */ + sc->mfi_max_sge, /* nsegments */ BUS_SPACE_MAXSIZE_32BIT,/* maxsegsize */ BUS_DMA_ALLOCNOW, /* flags */ busdma_lock_mutex, /* lockfunc */ @@ -262,24 +265,23 @@ /* * Allocate DMA memory for the command frames. Keep them in the - * lower 4GB for efficiency. Calculate the size of the frames at - * the same time; the frame is 64 bytes plus space for the SG lists. + * lower 4GB for efficiency. Calculate the size of the commands at + * the same time; each command is one 64 byte frame plus a set of + * additional frames for holding sg lists or other data. * The assumption here is that the SG list will start at the second - * 64 byte segment of the frame and not use the unused bytes in the - * frame. While this might seem wasteful, apparently the frames must - * be 64 byte aligned, so any savings would be negated by the extra - * alignment padding. + * frame and not use the unused bytes in the first frame. While this + * isn't technically correct, it simplifies the calculation and allows + * for command frames that might be larger than an mfi_io_frame. */ if (sizeof(bus_addr_t) == 8) { - sc->mfi_sgsize = sizeof(struct mfi_sg64); + sc->mfi_sge_size = sizeof(struct mfi_sg64); sc->mfi_flags |= MFI_FLAGS_SG64; } else { - sc->mfi_sgsize = sizeof(struct mfi_sg32); + sc->mfi_sge_size = sizeof(struct mfi_sg32); } - frames = (sc->mfi_sgsize * sc->mfi_total_sgl + MFI_FRAME_SIZE - 1) / - MFI_FRAME_SIZE + 1; - sc->mfi_frame_size = frames * MFI_FRAME_SIZE; - framessz = sc->mfi_frame_size * sc->mfi_max_fw_cmds; + frames = (sc->mfi_sge_size * sc->mfi_max_sge - 1) / MFI_FRAME_SIZE + 2; + sc->mfi_cmd_size = frames * MFI_FRAME_SIZE; + framessz = sc->mfi_cmd_size * sc->mfi_max_fw_cmds; if (bus_dma_tag_create( sc->mfi_parent_dmat, /* parent */ 64, 0, /* algnmnt, boundary */ BUS_SPACE_MAXADDR_32BIT,/* lowaddr */ @@ -407,9 +409,9 @@ for (i = 0; i < ncmds; i++) { cm = &sc->mfi_commands[i]; cm->cm_frame = (union mfi_frame *)((uintptr_t)sc->mfi_frames + >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Sep 22 18:47:20 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 816C416A4E8; Fri, 22 Sep 2006 18:47:20 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2CC4716A40F for ; Fri, 22 Sep 2006 18:47:20 +0000 (UTC) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E268743D46 for ; Fri, 22 Sep 2006 18:47:19 +0000 (GMT) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8MIlJ59045863 for ; Fri, 22 Sep 2006 18:47:19 GMT (envelope-from als@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8MIlJ20045860 for perforce@freebsd.org; Fri, 22 Sep 2006 18:47:19 GMT (envelope-from als@FreeBSD.org) Date: Fri, 22 Sep 2006 18:47:19 GMT Message-Id: <200609221847.k8MIlJ20045860@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to als@FreeBSD.org using -f From: Alex Lyashkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 106514 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Sep 2006 18:47:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=106514 Change 106514 by als@als_head on 2006/09/22 18:46:51 reimplement all jail1 code via jail2 functions for avoid promlems with locking. Affected files ... .. //depot/projects/jail2/sys/kern/kern_jail.c#7 edit Differences ... ==== //depot/projects/jail2/sys/kern/kern_jail.c#7 (text+ko) ==== @@ -64,8 +64,9 @@ static void init_prison(void *); static void prison_complete(void *context, int pending); static int sysctl_jail_list(SYSCTL_HANDLER_ARGS); +static int find_empty_prid(void); -#define jprint(a...) +#define jprint(a...) /* printf(a) */ static void @@ -97,86 +98,34 @@ static int jail_1(struct thread *td, struct jail_args *uap) { - struct nameidata nd; - struct prison *pr, *tpr; struct jail j; - struct jail_attach_args jaa; - int vfslocked, error, tryprid; + struct prison *pr; + int error; error = copyin(uap->jail, &j, sizeof(j)); if (error) return (error); - MALLOC(pr, struct prison *, sizeof(*pr), M_PRISON, M_WAITOK | M_ZERO); - mtx_init(&pr->pr_mtx, "jail mutex", NULL, MTX_DEF); - refcount_init(&pr->pr_refcnt,1); - error = copyinstr(j.path, &pr->pr_disk.pr_path, sizeof(pr->pr_disk.pr_path), 0); - if (error) - goto e_killmtx; - NDINIT(&nd, LOOKUP, MPSAFE | FOLLOW | LOCKLEAF, UIO_SYSSPACE, - pr->pr_disk.pr_path, td); - error = namei(&nd); - if (error) - goto e_killmtx; - vfslocked = NDHASGIANT(&nd); - JAIL_VROOT(pr) = nd.ni_vp; - VOP_UNLOCK(nd.ni_vp, 0, td); - NDFREE(&nd, NDF_ONLY_PNBUF); - VFS_UNLOCK_GIANT(vfslocked); + pr = prison_alloc(0); + if (pr == NULL) + return (EAGAIN); + error = copyinstr(j.hostname, &pr->pr_host, sizeof(pr->pr_host), 0); if (error) - goto e_dropvnref; - pr->pr_network.pr_ip = htonl(j.ip_number); - pr->pr_linux = NULL; - pr->pr_securelevel = -1; - pr_uihashinit(pr); - JAIL_DISKS_INIT(pr); - JAIL_TASKS_INIT(pr); - JAIL_IPC_INIT(pr); - JAIL_LIMITS_INIT(pr); + goto e_dropref; - /* Determine next pr_id and add prison to allprison list. */ - mtx_lock(&allprison_mtx); - tryprid = lastprid + 1; - if (tryprid == JAIL_MAX) - tryprid = 1; -next: - LIST_FOREACH(tpr, &allprison, pr_list) { - if (tpr->pr_id == tryprid) { - tryprid++; - if (tryprid == JAIL_MAX) { - mtx_unlock(&allprison_mtx); - error = EAGAIN; - goto e_dropvnref; - } - goto next; - } - } + error = jail_setvroot(pr, td, j.path); + if (error) + goto e_dropref; - pr->pr_id = jaa.jid = lastprid = tryprid; - LIST_INSERT_HEAD(&allprison, pr, pr_list); - prisoncount++; - mtx_unlock(&allprison_mtx); - pr->pr_flags |= J_START_FL; - error = jail_attach(td, &jaa); + JAIL_SET_STARTED(pr); + error = jail_migrate(td, pr); if (error) - goto e_dropprref; + goto e_dropref; + td->td_retval[0] = pr->pr_id; +e_dropref: prison_free(pr); - td->td_retval[0] = jaa.jid; - return (0); -e_dropprref: - mtx_lock(&allprison_mtx); - LIST_REMOVE(pr, pr_list); - prisoncount--; - mtx_unlock(&allprison_mtx); -e_dropvnref: - vfslocked = VFS_LOCK_GIANT(JAIL_VROOT(pr)->v_mount); - vrele(JAIL_VROOT(pr)); - VFS_UNLOCK_GIANT(vfslocked); -e_killmtx: - mtx_destroy(&pr->pr_mtx); - FREE(pr, M_PRISON); return (error); } @@ -301,8 +250,7 @@ int jail_attach(struct thread *td, struct jail_attach_args *uap) { - struct prison *pr; - int error; + struct jail_2 j; /* * XXX: Note that there is a slight race here if two threads @@ -312,20 +260,36 @@ * a process root from one prison, but attached to the jail * of another. */ - error = suser(td); - if (error) - return (error); + j.cmd = JAIL2_COMMAND(J_COMMON,J_ENTER); + j.ctx_id = uap->jid; + return jail2_common(td,&j); +} - mtx_lock(&allprison_mtx); - pr = prison_find(uap->jid); - if (pr == NULL) { - return (ESRCH); - } +static +int find_empty_prid(void) +{ + int tryprid; + struct prison *tpr; - error = jail_migrate(td, pr); - prison_free(pr); + mtx_assert(&allprison_mtx, MA_OWNED); - return (error); + tryprid = lastprid + 1; + if (tryprid == JAIL_MAX) + tryprid = 1; +next: + LIST_FOREACH(tpr, &allprison, pr_list) { + if (tpr->pr_id != tryprid) { + break; + } + tryprid++; + if (tryprid == JAIL_MAX) { + tryprid = 0; + goto exit; + } + goto next; + } +exit: + return (tryprid); } struct prison * @@ -338,9 +302,15 @@ pr->pr_id = ctx_id; refcount_init(&pr->pr_refcnt,1); mtx_lock(&allprison_mtx); - if((old_pr=prison_find(ctx_id)) != NULL) { - jprint("Already have prisons"); - goto found; + if (ctx_id != 0) { + if ((old_pr=prison_find(ctx_id)) != NULL) { + jprint("Already have prisons"); + goto found; + } + } else { + pr->pr_id = find_empty_prid(); + if (pr->pr_id == 0) + goto err_exit; } LIST_INSERT_HEAD(&allprison, pr, pr_list); @@ -360,6 +330,7 @@ found: mtx_unlock(&allprison_mtx); prison_free(old_pr); +err_exit: FREE(pr, M_PRISON); return (NULL); } From owner-p4-projects@FreeBSD.ORG Fri Sep 22 18:55:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F2D9C16A416; Fri, 22 Sep 2006 18:55:36 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AE81116A407 for ; Fri, 22 Sep 2006 18:55:36 +0000 (UTC) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4CD8D43D5D for ; Fri, 22 Sep 2006 18:55:32 +0000 (GMT) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8MItW8w046299 for ; Fri, 22 Sep 2006 18:55:32 GMT (envelope-from als@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8MItUxJ046296 for perforce@freebsd.org; Fri, 22 Sep 2006 18:55:30 GMT (envelope-from als@FreeBSD.org) Date: Fri, 22 Sep 2006 18:55:30 GMT Message-Id: <200609221855.k8MItUxJ046296@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to als@FreeBSD.org using -f From: Alex Lyashkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 106515 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Sep 2006 18:55:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=106515 Change 106515 by als@als_head on 2006/09/22 18:55:07 update workdir to last head. Affected files ... .. //depot/projects/jail2/sys/amd64/include/stdarg.h#2 integrate .. //depot/projects/jail2/sys/amd64/isa/atpic_vector.S#2 integrate .. //depot/projects/jail2/sys/arm/include/stdarg.h#2 integrate .. //depot/projects/jail2/sys/bsm/audit.h#3 integrate .. //depot/projects/jail2/sys/bsm/audit_internal.h#4 integrate .. //depot/projects/jail2/sys/bsm/audit_kevents.h#4 integrate .. //depot/projects/jail2/sys/bsm/audit_record.h#5 integrate .. //depot/projects/jail2/sys/compat/freebsd32/freebsd32.h#3 integrate .. //depot/projects/jail2/sys/compat/freebsd32/freebsd32_misc.c#3 integrate .. //depot/projects/jail2/sys/compat/freebsd32/freebsd32_proto.h#5 integrate .. //depot/projects/jail2/sys/compat/freebsd32/freebsd32_syscall.h#5 integrate .. //depot/projects/jail2/sys/compat/freebsd32/freebsd32_syscalls.c#5 integrate .. //depot/projects/jail2/sys/compat/freebsd32/freebsd32_sysent.c#5 integrate .. //depot/projects/jail2/sys/compat/freebsd32/syscalls.master#5 integrate .. //depot/projects/jail2/sys/conf/NOTES#6 integrate .. //depot/projects/jail2/sys/conf/files#5 integrate .. //depot/projects/jail2/sys/conf/kern.pre.mk#3 integrate .. //depot/projects/jail2/sys/conf/options#5 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/freebsd/ah_if.m#2 delete .. //depot/projects/jail2/sys/contrib/dev/ath/freebsd/ah_osdep.c#2 delete .. //depot/projects/jail2/sys/contrib/dev/ath/freebsd/ah_osdep.h#2 delete .. //depot/projects/jail2/sys/dev/acpica/acpi.c#4 integrate .. //depot/projects/jail2/sys/dev/ath/ah_osdep.c#1 branch .. //depot/projects/jail2/sys/dev/ath/ah_osdep.h#1 branch .. //depot/projects/jail2/sys/dev/ath/if_ath.c#4 integrate .. //depot/projects/jail2/sys/dev/ath/if_athvar.h#4 integrate .. //depot/projects/jail2/sys/dev/bce/if_bce.c#4 integrate .. //depot/projects/jail2/sys/dev/bge/if_bge.c#5 integrate .. //depot/projects/jail2/sys/dev/bktr/bktr_i2c.h#2 integrate .. //depot/projects/jail2/sys/dev/em/if_em.c#5 integrate .. //depot/projects/jail2/sys/dev/kbdmux/kbdmux.c#3 integrate .. //depot/projects/jail2/sys/dev/mfi/mfi.c#5 integrate .. //depot/projects/jail2/sys/dev/mfi/mfivar.h#3 integrate .. //depot/projects/jail2/sys/dev/mpt/mpt_cam.c#5 integrate .. //depot/projects/jail2/sys/dev/pci/pci.c#3 integrate .. //depot/projects/jail2/sys/dev/uart/uart_kbd_sun.c#2 integrate .. //depot/projects/jail2/sys/dev/usb/if_cdce.c#3 integrate .. //depot/projects/jail2/sys/fs/devfs/devfs.h#2 integrate .. //depot/projects/jail2/sys/fs/devfs/devfs_devs.c#3 integrate .. //depot/projects/jail2/sys/fs/devfs/devfs_vfsops.c#3 integrate .. //depot/projects/jail2/sys/fs/devfs/devfs_vnops.c#3 integrate .. //depot/projects/jail2/sys/i386/include/stdarg.h#2 integrate .. //depot/projects/jail2/sys/i386/isa/atpic_vector.s#2 integrate .. //depot/projects/jail2/sys/i386/linux/linux_machdep.c#4 integrate .. //depot/projects/jail2/sys/i386/linux/linux_proto.h#5 integrate .. //depot/projects/jail2/sys/i386/linux/linux_syscall.h#5 integrate .. //depot/projects/jail2/sys/i386/linux/linux_sysent.c#5 integrate .. //depot/projects/jail2/sys/i386/linux/syscalls.master#5 integrate .. //depot/projects/jail2/sys/ia64/include/stdarg.h#2 integrate .. //depot/projects/jail2/sys/kern/init_sysent.c#5 integrate .. //depot/projects/jail2/sys/kern/kern_mac.c#3 integrate .. //depot/projects/jail2/sys/kern/kern_proc.c#3 integrate .. //depot/projects/jail2/sys/kern/kern_resource.c#4 integrate .. //depot/projects/jail2/sys/kern/kern_thr.c#4 integrate .. //depot/projects/jail2/sys/kern/kern_umtx.c#4 integrate .. //depot/projects/jail2/sys/kern/syscalls.c#5 integrate .. //depot/projects/jail2/sys/kern/syscalls.master#5 integrate .. //depot/projects/jail2/sys/kern/systrace_args.c#4 integrate .. //depot/projects/jail2/sys/kern/sysv_msg.c#3 integrate .. //depot/projects/jail2/sys/kern/sysv_sem.c#4 integrate .. //depot/projects/jail2/sys/kern/sysv_shm.c#3 integrate .. //depot/projects/jail2/sys/kern/tty.c#3 integrate .. //depot/projects/jail2/sys/kern/uipc_mbuf.c#2 integrate .. //depot/projects/jail2/sys/kern/uipc_socket.c#6 integrate .. //depot/projects/jail2/sys/kern/vfs_default.c#2 integrate .. //depot/projects/jail2/sys/kern/vfs_mount.c#5 integrate .. //depot/projects/jail2/sys/kern/vfs_syscalls.c#5 integrate .. //depot/projects/jail2/sys/modules/ath/Makefile#2 integrate .. //depot/projects/jail2/sys/modules/ath_hal/Makefile#2 integrate .. //depot/projects/jail2/sys/modules/ath_rate_amrr/Makefile#2 integrate .. //depot/projects/jail2/sys/modules/ath_rate_onoe/Makefile#2 integrate .. //depot/projects/jail2/sys/modules/ath_rate_sample/Makefile#2 integrate .. //depot/projects/jail2/sys/net/if_loop.c#3 integrate .. //depot/projects/jail2/sys/netinet6/in6.c#4 integrate .. //depot/projects/jail2/sys/powerpc/include/stdarg.h#2 integrate .. //depot/projects/jail2/sys/security/audit/audit_bsm.c#5 integrate .. //depot/projects/jail2/sys/security/audit/audit_bsm_token.c#5 integrate .. //depot/projects/jail2/sys/security/audit/audit_worker.c#3 integrate .. //depot/projects/jail2/sys/security/mac/mac_inet.c#3 integrate .. //depot/projects/jail2/sys/security/mac/mac_internal.h#3 integrate .. //depot/projects/jail2/sys/security/mac/mac_net.c#2 integrate .. //depot/projects/jail2/sys/security/mac/mac_pipe.c#2 integrate .. //depot/projects/jail2/sys/security/mac/mac_posix_sem.c#2 integrate .. //depot/projects/jail2/sys/security/mac/mac_process.c#2 integrate .. //depot/projects/jail2/sys/security/mac/mac_socket.c#2 integrate .. //depot/projects/jail2/sys/security/mac/mac_sysv_msg.c#2 integrate .. //depot/projects/jail2/sys/security/mac/mac_sysv_sem.c#2 integrate .. //depot/projects/jail2/sys/security/mac/mac_sysv_shm.c#2 integrate .. //depot/projects/jail2/sys/security/mac/mac_vfs.c#3 integrate .. //depot/projects/jail2/sys/sparc64/include/stdarg.h#2 integrate .. //depot/projects/jail2/sys/sparc64/sparc64/pmap.c#3 integrate .. //depot/projects/jail2/sys/sparc64/sparc64/tsb.c#2 integrate .. //depot/projects/jail2/sys/sys/cdefs.h#2 integrate .. //depot/projects/jail2/sys/sys/rtprio.h#2 integrate .. //depot/projects/jail2/sys/sys/syscall.h#5 integrate .. //depot/projects/jail2/sys/sys/syscall.mk#5 integrate .. //depot/projects/jail2/sys/sys/sysproto.h#5 integrate .. //depot/projects/jail2/sys/sys/thr.h#3 integrate .. //depot/projects/jail2/sys/sys/umtx.h#3 integrate .. //depot/projects/jail2/sys/ufs/ffs/ffs_softdep.c#2 integrate Differences ... ==== //depot/projects/jail2/sys/amd64/include/stdarg.h#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/stdarg.h,v 1.8 2005/03/11 22:16:09 peter Exp $ + * $FreeBSD: src/sys/amd64/include/stdarg.h,v 1.9 2006/09/21 01:37:01 kan Exp $ */ #ifndef _MACHINE_STDARG_H_ @@ -42,7 +42,7 @@ #ifdef __GNUCLIKE_BUILTIN_STDARG #define va_start(ap, last) \ - __builtin_stdarg_start((ap), (last)) + __builtin_va_start((ap), (last)) #define va_arg(ap, type) \ __builtin_va_arg((ap), type) ==== //depot/projects/jail2/sys/amd64/isa/atpic_vector.S#2 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/amd64/isa/atpic_vector.S,v 1.46 2005/12/08 18:33:30 jhb Exp $ + * $FreeBSD: src/sys/amd64/isa/atpic_vector.S,v 1.47 2006/09/20 20:52:11 wkoszek Exp $ */ /* @@ -41,7 +41,7 @@ #include "assym.s" /* - * Macros for interrupt interrupt entry, call to handler, and exit. + * Macros for interrupt entry, call to handler, and exit. */ #define INTR(irq_num, vec_name) \ .text ; \ ==== //depot/projects/jail2/sys/arm/include/stdarg.h#2 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * @(#)stdarg.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/arm/include/stdarg.h,v 1.3 2005/03/02 21:33:22 joerg Exp $ + * $FreeBSD: src/sys/arm/include/stdarg.h,v 1.4 2006/09/21 01:37:02 kan Exp $ */ #ifndef _MACHINE_STDARG_H_ @@ -45,7 +45,7 @@ #ifdef __GNUCLIKE_BUILTIN_STDARG #define va_start(ap, last) \ - __builtin_stdarg_start((ap), (last)) + __builtin_va_start((ap), (last)) #define va_arg(ap, type) \ __builtin_va_arg((ap), type) ==== //depot/projects/jail2/sys/bsm/audit.h#3 (text) ==== @@ -30,8 +30,8 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#31 $ - * $FreeBSD: src/sys/bsm/audit.h,v 1.5 2006/08/26 08:17:58 rwatson Exp $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#34 $ + * $FreeBSD: src/sys/bsm/audit.h,v 1.6 2006/09/21 07:27:02 rwatson Exp $ */ #ifndef _BSM_AUDIT_H @@ -59,23 +59,19 @@ * Triggers for the audit daemon. */ #define AUDIT_TRIGGER_MIN 1 -#define AUDIT_TRIGGER_LOW_SPACE 1 -#define AUDIT_TRIGGER_OPEN_NEW 2 -#define AUDIT_TRIGGER_READ_FILE 3 -#define AUDIT_TRIGGER_CLOSE_AND_DIE 4 -#define AUDIT_TRIGGER_NO_SPACE 5 -#define AUDIT_TRIGGER_MAX 5 +#define AUDIT_TRIGGER_LOW_SPACE 1 /* Below low watermark. */ +#define AUDIT_TRIGGER_ROTATE_KERNEL 2 /* Kernel requests rotate. */ +#define AUDIT_TRIGGER_READ_FILE 3 /* Re-read config file. */ +#define AUDIT_TRIGGER_CLOSE_AND_DIE 4 /* Terminate audit. */ +#define AUDIT_TRIGGER_NO_SPACE 5 /* Below min free space. */ +#define AUDIT_TRIGGER_ROTATE_USER 6 /* User requests roate. */ +#define AUDIT_TRIGGER_MAX 6 /* - * Special file that will be read for trigger events from the kernel - * (FreeBSD). + * The special device filename (FreeBSD). */ -#define AUDIT_TRIGGER_FILE "/dev/audit" - -/* - * The special device filename. - */ #define AUDITDEV_FILENAME "audit" +#define AUDIT_TRIGGER_FILE ("/dev/" AUDITDEV_FILENAME) /* * Pre-defined audit IDs @@ -182,12 +178,12 @@ #define AUDIT_PERZONE 0x2000 /* - * Audit queue control parameters. + * Default audit queue control parameters. */ #define AQ_HIWATER 100 #define AQ_MAXHIGH 10000 #define AQ_LOWATER 10 -#define AQ_BUFSZ 1024 +#define AQ_BUFSZ MAXAUDITDATA #define AQ_MAXBUFSZ 1048576 /* ==== //depot/projects/jail2/sys/bsm/audit_internal.h#4 (text) ==== @@ -34,8 +34,8 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#11 $ - * $FreeBSD: src/sys/bsm/audit_internal.h,v 1.4 2006/09/02 10:49:44 rwatson Exp $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#14 $ + * $FreeBSD: src/sys/bsm/audit_internal.h,v 1.5 2006/09/21 07:27:02 rwatson Exp $ */ #ifndef _AUDIT_INTERNAL_H ==== //depot/projects/jail2/sys/bsm/audit_kevents.h#4 (text) ==== @@ -30,8 +30,8 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#26 $ - * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.7 2006/08/26 08:17:58 rwatson Exp $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#28 $ + * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.8 2006/09/21 07:27:02 rwatson Exp $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -468,6 +468,9 @@ #define AUE_EXTATTR_SET_LINK 43111 /* FreeBSD. */ #define AUE_EXTATTR_LIST_LINK 43112 /* FreeBSD. */ #define AUE_EXTATTR_DELETE_LINK 43113 /* FreeBSD. */ +#define AUE_KENV 43114 /* FreeBSD. */ +#define AUE_JAIL_ATTACH 43115 /* FreeBSD. */ +#define AUE_SYSCTL_WRITE 43116 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the ==== //depot/projects/jail2/sys/bsm/audit_record.h#5 (text) ==== @@ -30,8 +30,8 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#19 $ - * $FreeBSD: src/sys/bsm/audit_record.h,v 1.5 2006/09/01 11:45:39 wsalamon Exp $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#21 $ + * $FreeBSD: src/sys/bsm/audit_record.h,v 1.6 2006/09/21 07:27:02 rwatson Exp $ */ #ifndef _BSM_AUDIT_RECORD_H_ ==== //depot/projects/jail2/sys/compat/freebsd32/freebsd32.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/freebsd32/freebsd32.h,v 1.5 2006/08/17 22:50:32 imp Exp $ + * $FreeBSD: src/sys/compat/freebsd32/freebsd32.h,v 1.6 2006/09/22 15:04:28 davidxu Exp $ */ #ifndef _COMPAT_FREEBSD32_FREEBSD32_H_ @@ -103,4 +103,18 @@ int32_t f_spare[2]; }; +struct thr_param32 { + uint32_t start_func; + uint32_t arg; + uint32_t stack_base; + uint32_t stack_size; + uint32_t tls_base; + uint32_t tls_size; + uint32_t child_tid; + uint32_t parent_tid; + int32_t flags; + uint32_t rtp; + uint32_t spare[3]; +}; + #endif /* !_COMPAT_FREEBSD32_FREEBSD32_H_ */ ==== //depot/projects/jail2/sys/compat/freebsd32/freebsd32_misc.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.58 2006/08/16 00:02:36 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.59 2006/09/22 15:04:28 davidxu Exp $"); #include "opt_compat.h" @@ -67,7 +67,9 @@ #include #include #include +#include #include +#include #include #include #include @@ -2121,6 +2123,60 @@ return (error); } +int +freebsd32_thr_new(struct thread *td, + struct freebsd32_thr_new_args *uap) +{ + struct thr_param32 param32; + struct thr_param param; + int error; + + if (uap->param_size < 0 || + uap->param_size > sizeof(struct thr_param32)) + return (EINVAL); + bzero(¶m, sizeof(struct thr_param)); + bzero(¶m32, sizeof(struct thr_param32)); + error = copyin(uap->param, ¶m32, uap->param_size); + if (error != 0) + return (error); + param.start_func = PTRIN(param32.start_func); + param.arg = PTRIN(param32.arg); + param.stack_base = PTRIN(param32.stack_base); + param.stack_size = param32.stack_size; + param.tls_base = PTRIN(param32.tls_base); + param.tls_size = param32.tls_size; + param.child_tid = PTRIN(param32.child_tid); + param.parent_tid = PTRIN(param32.parent_tid); + param.flags = param32.flags; + param.rtp = PTRIN(param32.rtp); + param.spare[0] = PTRIN(param32.spare[0]); + param.spare[1] = PTRIN(param32.spare[1]); + param.spare[2] = PTRIN(param32.spare[2]); + + return (kern_thr_new(td, ¶m)); +} + +int +freebsd32_thr_suspend(struct thread *td, struct freebsd32_thr_suspend_args *uap) +{ + struct timespec32 ts32; + struct timespec ts, *tsp; + int error; + + error = 0; + tsp = NULL; + if (uap->timeout != NULL) { + error = copyin((const void *)uap->timeout, (void *)&ts32, + sizeof(struct timespec32)); + if (error != 0) + return (error); + ts.tv_sec = ts32.tv_sec; + ts.tv_nsec = ts32.tv_nsec; + tsp = &ts; + } + return (kern_thr_suspend(td, tsp)); +} + #if 0 int ==== //depot/projects/jail2/sys/compat/freebsd32/freebsd32_proto.h#5 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.62 2006/09/17 13:29:35 rwatson Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.75 2006/09/17 13:28:11 rwatson Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.65 2006/09/22 15:05:33 davidxu Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.78 2006/09/22 15:04:28 davidxu Exp */ #ifndef _FREEBSD32_SYSPROTO_H_ @@ -280,6 +280,20 @@ char oucp_l_[PADL_(struct freebsd32_ucontext *)]; struct freebsd32_ucontext * oucp; char oucp_r_[PADR_(struct freebsd32_ucontext *)]; char ucp_l_[PADL_(const struct freebsd32_ucontext *)]; const struct freebsd32_ucontext * ucp; char ucp_r_[PADR_(const struct freebsd32_ucontext *)]; }; +struct freebsd32_thr_suspend_args { + char timeout_l_[PADL_(const struct timespec32 *)]; const struct timespec32 * timeout; char timeout_r_[PADR_(const struct timespec32 *)]; +}; +struct freebsd32_umtx_op_args { + char obj_l_[PADL_(void *)]; void * obj; char obj_r_[PADR_(void *)]; + char op_l_[PADL_(int)]; int op; char op_r_[PADR_(int)]; + char val_l_[PADL_(uintptr_t)]; uintptr_t val; char val_r_[PADR_(uintptr_t)]; + char uaddr_l_[PADL_(void *)]; void * uaddr; char uaddr_r_[PADR_(void *)]; + char uaddr2_l_[PADL_(void *)]; void * uaddr2; char uaddr2_r_[PADR_(void *)]; +}; +struct freebsd32_thr_new_args { + char param_l_[PADL_(struct thr_param32 *)]; struct thr_param32 * param; char param_r_[PADR_(struct thr_param32 *)]; + char param_size_l_[PADL_(int)]; int param_size; char param_size_r_[PADR_(int)]; +}; int freebsd32_wait4(struct thread *, struct freebsd32_wait4_args *); int freebsd32_recvmsg(struct thread *, struct freebsd32_recvmsg_args *); int freebsd32_sendmsg(struct thread *, struct freebsd32_sendmsg_args *); @@ -326,6 +340,9 @@ int freebsd32_getcontext(struct thread *, struct freebsd32_getcontext_args *); int freebsd32_setcontext(struct thread *, struct freebsd32_setcontext_args *); int freebsd32_swapcontext(struct thread *, struct freebsd32_swapcontext_args *); +int freebsd32_thr_suspend(struct thread *, struct freebsd32_thr_suspend_args *); +int freebsd32_umtx_op(struct thread *, struct freebsd32_umtx_op_args *); +int freebsd32_thr_new(struct thread *, struct freebsd32_thr_new_args *); #ifdef COMPAT_43 @@ -461,6 +478,9 @@ #define FREEBSD32_SYS_AUE_freebsd32_getcontext AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_setcontext AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_swapcontext AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_thr_suspend AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_umtx_op AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_thr_new AUE_NULL #undef PAD_ #undef PADL_ ==== //depot/projects/jail2/sys/compat/freebsd32/freebsd32_syscall.h#5 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.60 2006/09/17 13:29:35 rwatson Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.75 2006/09/17 13:28:11 rwatson Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.63 2006/09/22 15:05:33 davidxu Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.78 2006/09/22 15:04:28 davidxu Exp */ #define FREEBSD32_SYS_syscall 0 @@ -300,20 +300,19 @@ #define FREEBSD32_SYS_freebsd32_getcontext 421 #define FREEBSD32_SYS_freebsd32_setcontext 422 #define FREEBSD32_SYS_freebsd32_swapcontext 423 -#define FREEBSD32_SYS_thr_create 430 #define FREEBSD32_SYS_thr_exit 431 #define FREEBSD32_SYS_thr_self 432 #define FREEBSD32_SYS_thr_kill 433 #define FREEBSD32_SYS__umtx_lock 434 #define FREEBSD32_SYS__umtx_unlock 435 #define FREEBSD32_SYS_jail_attach 436 -#define FREEBSD32_SYS_thr_suspend 442 +#define FREEBSD32_SYS_freebsd32_thr_suspend 442 #define FREEBSD32_SYS_thr_wake 443 #define FREEBSD32_SYS_kldunloadf 444 +#define FREEBSD32_SYS_freebsd32_umtx_op 454 +#define FREEBSD32_SYS_freebsd32_thr_new 455 #define FREEBSD32_SYS_sigqueue 456 #define FREEBSD32_SYS_abort2 463 #define FREEBSD32_SYS_thr_set_name 464 -#define FREEBSD32_SYS_thr_setscheduler 466 -#define FREEBSD32_SYS_thr_getscheduler 467 -#define FREEBSD32_SYS_thr_setschedparam 468 +#define FREEBSD32_SYS_rtprio_thread 466 #define FREEBSD32_SYS_MAXSYSCALL 471 ==== //depot/projects/jail2/sys/compat/freebsd32/freebsd32_syscalls.c#5 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.51 2006/09/17 13:29:35 rwatson Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.75 2006/09/17 13:28:11 rwatson Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.54 2006/09/22 15:05:33 davidxu Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.78 2006/09/22 15:04:28 davidxu Exp */ const char *freebsd32_syscallnames[] = { @@ -437,7 +437,7 @@ "#427", /* 427 = __acl_delete_link */ "#428", /* 428 = __acl_aclcheck_link */ "#429", /* 429 = sigwait */ - "thr_create", /* 430 = thr_create */ + "#430", /* 430 = thr_create; */ "thr_exit", /* 431 = thr_exit */ "thr_self", /* 432 = thr_self */ "thr_kill", /* 433 = thr_kill */ @@ -449,7 +449,7 @@ "#439", /* 439 = extattr_list_link */ "#440", /* 440 = kse_switchin */ "#441", /* 441 = ksem_timedwait */ - "thr_suspend", /* 442 = thr_suspend */ + "freebsd32_thr_suspend", /* 442 = freebsd32_thr_suspend */ "thr_wake", /* 443 = thr_wake */ "kldunloadf", /* 444 = kldunloadf */ "#445", /* 445 = audit */ @@ -461,8 +461,8 @@ "#451", /* 451 = getaudit_addr */ "#452", /* 452 = setaudit_addr */ "#453", /* 453 = auditctl */ - "#454", /* 454 = _umtx_op */ - "#455", /* 455 = thr_new */ + "freebsd32_umtx_op", /* 454 = freebsd32_umtx_op */ + "freebsd32_thr_new", /* 455 = freebsd32_thr_new */ "sigqueue", /* 456 = sigqueue */ "#457", /* 457 = kmq_open */ "#458", /* 458 = kmq_setattr */ @@ -473,9 +473,9 @@ "abort2", /* 463 = abort2 */ "thr_set_name", /* 464 = thr_set_name */ "#465", /* 465 = aio_fsync */ - "thr_setscheduler", /* 466 = thr_setscheduler */ - "thr_getscheduler", /* 467 = thr_getscheduler */ - "thr_setschedparam", /* 468 = thr_setschedparam */ + "rtprio_thread", /* 466 = rtprio_thread */ + "#467", /* 467 = nosys */ + "#468", /* 468 = nosys */ "#469", /* 469 = __getpath_fromfd */ "#470", /* 470 = __getpath_fromaddr */ }; ==== //depot/projects/jail2/sys/compat/freebsd32/freebsd32_sysent.c#5 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.61 2006/09/17 13:29:35 rwatson Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.75 2006/09/17 13:28:11 rwatson Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.64 2006/09/22 15:05:34 davidxu Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.78 2006/09/22 15:04:28 davidxu Exp */ #include "opt_compat.h" @@ -462,7 +462,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 427 = __acl_delete_link */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 428 = __acl_aclcheck_link */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 429 = sigwait */ - { AS(thr_create_args), (sy_call_t *)thr_create, AUE_NULL, NULL, 0, 0 }, /* 430 = thr_create */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 430 = thr_create; */ { AS(thr_exit_args), (sy_call_t *)thr_exit, AUE_NULL, NULL, 0, 0 }, /* 431 = thr_exit */ { AS(thr_self_args), (sy_call_t *)thr_self, AUE_NULL, NULL, 0, 0 }, /* 432 = thr_self */ { AS(thr_kill_args), (sy_call_t *)thr_kill, AUE_NULL, NULL, 0, 0 }, /* 433 = thr_kill */ @@ -474,7 +474,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 439 = extattr_list_link */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 440 = kse_switchin */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 441 = ksem_timedwait */ - { AS(thr_suspend_args), (sy_call_t *)thr_suspend, AUE_NULL, NULL, 0, 0 }, /* 442 = thr_suspend */ + { AS(freebsd32_thr_suspend_args), (sy_call_t *)freebsd32_thr_suspend, AUE_NULL, NULL, 0, 0 }, /* 442 = freebsd32_thr_suspend */ { AS(thr_wake_args), (sy_call_t *)thr_wake, AUE_NULL, NULL, 0, 0 }, /* 443 = thr_wake */ { AS(kldunloadf_args), (sy_call_t *)kldunloadf, AUE_MODUNLOAD, NULL, 0, 0 }, /* 444 = kldunloadf */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 445 = audit */ @@ -486,8 +486,8 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 451 = getaudit_addr */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 452 = setaudit_addr */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 453 = auditctl */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 454 = _umtx_op */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 455 = thr_new */ + { AS(freebsd32_umtx_op_args), (sy_call_t *)freebsd32_umtx_op, AUE_NULL, NULL, 0, 0 }, /* 454 = freebsd32_umtx_op */ + { AS(freebsd32_thr_new_args), (sy_call_t *)freebsd32_thr_new, AUE_NULL, NULL, 0, 0 }, /* 455 = freebsd32_thr_new */ { AS(sigqueue_args), (sy_call_t *)sigqueue, AUE_NULL, NULL, 0, 0 }, /* 456 = sigqueue */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 457 = kmq_open */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 458 = kmq_setattr */ @@ -498,9 +498,9 @@ { AS(abort2_args), (sy_call_t *)abort2, AUE_NULL, NULL, 0, 0 }, /* 463 = abort2 */ { AS(thr_set_name_args), (sy_call_t *)thr_set_name, AUE_NULL, NULL, 0, 0 }, /* 464 = thr_set_name */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 465 = aio_fsync */ - { AS(thr_setscheduler_args), (sy_call_t *)thr_setscheduler, AUE_NULL, NULL, 0, 0 }, /* 466 = thr_setscheduler */ - { AS(thr_getscheduler_args), (sy_call_t *)thr_getscheduler, AUE_NULL, NULL, 0, 0 }, /* 467 = thr_getscheduler */ - { AS(thr_setschedparam_args), (sy_call_t *)thr_setschedparam, AUE_NULL, NULL, 0, 0 }, /* 468 = thr_setschedparam */ + { AS(rtprio_thread_args), (sy_call_t *)rtprio_thread, AUE_RTPRIO, NULL, 0, 0 }, /* 466 = rtprio_thread */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 467 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 468 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 469 = __getpath_fromfd */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 470 = __getpath_fromaddr */ }; ==== //depot/projects/jail2/sys/compat/freebsd32/syscalls.master#5 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.75 2006/09/17 13:28:11 rwatson Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.78 2006/09/22 15:04:28 davidxu Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -715,8 +715,7 @@ 428 AUE_NULL UNIMPL __acl_aclcheck_link ; XXX implement 429 AUE_SIGWAIT UNIMPL sigwait -430 AUE_NULL NOPROTO { int thr_create(ucontext_t *ctx, long *id, \ - int flag s); } +430 AUE_NULL UNIMPL thr_create; 431 AUE_NULL NOPROTO { void thr_exit(long *state); } 432 AUE_NULL NOPROTO { int thr_self(long *id); } 433 AUE_NULL NOPROTO { int thr_kill(long id, int sig); } @@ -728,8 +727,8 @@ 439 AUE_EXTATTR_LIST_LINK UNIMPL extattr_list_link 440 AUE_NULL UNIMPL kse_switchin 441 AUE_NULL UNIMPL ksem_timedwait -442 AUE_NULL NOPROTO { int thr_suspend( \ - const struct timespec *timeout); } +442 AUE_NULL STD { int freebsd32_thr_suspend( \ + const struct timespec32 *timeout); } 443 AUE_NULL NOPROTO { int thr_wake(long id); } 444 AUE_MODUNLOAD NOPROTO { int kldunloadf(int fileid, int flags); } 445 AUE_AUDIT UNIMPL audit @@ -741,8 +740,12 @@ 451 AUE_GETAUDIT_ADDR UNIMPL getaudit_addr 452 AUE_SETAUDIT_ADDR UNIMPL setaudit_addr 453 AUE_AUDITCTL UNIMPL auditctl -454 AUE_NULL UNIMPL _umtx_op -455 AUE_NULL UNIMPL thr_new +454 AUE_NULL STD { int freebsd32_umtx_op(void *obj, int op,\ + uintptr_t val, void *uaddr, \ + void *uaddr2); } +455 AUE_NULL STD { int freebsd32_thr_new( \ + struct thr_param32 *param, \ + int param_size); } 456 AUE_NULL NOPROTO { int sigqueue(pid_t pid, int signum, \ void *value); } 457 AUE_NULL UNIMPL kmq_open @@ -754,14 +757,9 @@ 463 AUE_NULL NOPROTO { int abort2(const char *why, int nargs, void **args); } 464 AUE_NULL NOPROTO { int thr_set_name(long id, const char *name); } 465 AUE_NULL UNIMPL aio_fsync -466 AUE_NULL NOPROTO { int thr_setscheduler(long id, int policy,\ - const struct sched_param *param, \ - int param_size); } -467 AUE_NULL NOPROTO { int thr_getscheduler(long id, int *policy,\ - struct sched_param *param, \ - int param_size); } -468 AUE_NULL NOPROTO { int thr_setschedparam(long id, \ - const struct sched_param *param, \ - int param_size); } +466 AUE_RTPRIO NOPROTO { int rtprio_thread(int function, \ + lwpid_t lwpid, struct rtprio *rtp); } +467 AUE_NULL UNIMPL nosys +468 AUE_NULL UNIMPL nosys 469 AUE_NULL UNIMPL __getpath_fromfd 470 AUE_NULL UNIMPL __getpath_fromaddr ==== //depot/projects/jail2/sys/conf/NOTES#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1380 2006/08/27 12:57:37 marck Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1381 2006/09/20 13:33:40 rwatson Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -996,7 +996,6 @@ options MAC options MAC_BIBA options MAC_BSDEXTENDED -options MAC_DEBUG options MAC_IFOFF options MAC_LOMAC options MAC_MLS ==== //depot/projects/jail2/sys/conf/files#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1140 2006/08/14 21:09:37 imp Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1142 2006/09/18 17:23:35 sam Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -255,8 +255,6 @@ contrib/dev/acpica/utobject.c optional acpi contrib/dev/acpica/utstate.c optional acpi contrib/dev/acpica/utxface.c optional acpi -contrib/dev/ath/freebsd/ah_osdep.c optional ath_hal \ - compile-with "${NORMAL_C} -I$S/contrib/dev/ath/freebsd" contrib/ipfilter/netinet/fil.c optional ipfilter inet \ compile-with "${NORMAL_C} -I$S/contrib/ipfilter" contrib/ipfilter/netinet/ip_auth.c optional ipfilter inet \ @@ -478,15 +476,17 @@ dev/ata/atapi-cd.c optional atapicd dev/ata/atapi-fd.c optional atapifd dev/ata/atapi-tape.c optional atapist +dev/ath/ah_osdep.c optional ath_hal \ + compile-with "${NORMAL_C} -I$S/dev/ath" dev/ath/ath_rate/amrr/amrr.c optional ath_rate_amrr dev/ath/ath_rate/onoe/onoe.c optional ath_rate_onoe \ - compile-with "${NORMAL_C} -I$S/contrib/dev/ath/freebsd" + compile-with "${NORMAL_C} -I$S/dev/ath" dev/ath/ath_rate/sample/sample.c optional ath_rate_sample \ - compile-with "${NORMAL_C} -I$S/contrib/dev/ath/freebsd" + compile-with "${NORMAL_C} -I$S/dev/ath" dev/ath/if_ath.c optional ath \ - compile-with "${NORMAL_C} -I$S/contrib/dev/ath/freebsd" + compile-with "${NORMAL_C} -I$S/dev/ath" dev/ath/if_ath_pci.c optional ath pci \ - compile-with "${NORMAL_C} -I$S/contrib/dev/ath/freebsd" + compile-with "${NORMAL_C} -I$S/dev/ath" dev/awi/am79c930.c optional awi dev/awi/awi.c optional awi dev/awi/if_awi_pccard.c optional awi pccard ==== //depot/projects/jail2/sys/conf/kern.pre.mk#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.76 2006/07/17 18:43:16 obrien Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.78 2006/09/18 16:49:14 sam Exp $ # Part of a unified Makefile for building kernels. This part contains all # of the definitions that need to be before %BEFORE_DEPEND. @@ -58,12 +58,6 @@ # include path into contrib'ed source files. INCLUDES+= -I$S/contrib/altq -# ... and the same for Atheros HAL when the author builds it from -# non-distributable sources. -.if defined(ATH_BUILDING_FROM_SOURCE) -INCLUDES+= -I$S/contrib/dev/ath -.endif - .if make(depend) || make(kernel-depend) # ... and the same for ipfilter @@ -73,7 +67,7 @@ INCLUDES+= -I$S/contrib/pf # ... and the same for Atheros HAL -INCLUDES+= -I$S/contrib/dev/ath/freebsd +INCLUDES+= -I$S/dev/ath # ... and the same for the NgATM stuff INCLUDES+= -I$S/contrib/ngatm ==== //depot/projects/jail2/sys/conf/options#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.557 2006/08/17 00:37:03 julian Exp $ +# $FreeBSD: src/sys/conf/options,v 1.558 2006/09/20 13:33:40 rwatson Exp $ # # On the handling of kernel options # @@ -103,7 +103,6 @@ MAC_ALWAYS_LABEL_MBUF opt_mac.h MAC_BIBA opt_dontuse.h MAC_BSDEXTENDED opt_dontuse.h -MAC_DEBUG opt_mac.h MAC_IFOFF opt_dontuse.h MAC_LOMAC opt_dontuse.h MAC_MLS opt_dontuse.h ==== //depot/projects/jail2/sys/dev/acpica/acpi.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.228 2006/09/11 19:32:54 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.229 2006/09/21 18:56:03 jhb Exp $"); #include "opt_acpi.h" #include @@ -1083,7 +1083,7 @@ * If we know about this address, deactivate it and release it to the * local pool. If we don't, pass this request up to the parent. */ - if (acpi_sysres_find(bus, type, rman_get_start(r)) == NULL) { + if (acpi_sysres_find(bus, type, rman_get_start(r)) != NULL) { if (rman_get_flags(r) & RF_ACTIVE) { ret = bus_deactivate_resource(child, type, rid, r); if (ret != 0) ==== //depot/projects/jail2/sys/dev/ath/if_ath.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.153 2006/08/10 16:31:37 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.155 2006/09/18 16:26:19 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -117,7 +117,6 @@ static void ath_fatal_proc(void *, int); static void ath_rxorn_proc(void *, int); static void ath_bmiss_proc(void *, int); -static void ath_radar_proc(void *, int); static int ath_key_alloc(struct ieee80211com *, const struct ieee80211_key *, ieee80211_keyix *, ieee80211_keyix *); @@ -257,7 +256,7 @@ } while (0) #define KEYPRINTF(sc, ix, hk, mac) do { \ if (sc->sc_debug & ATH_DEBUG_KEYCACHE) \ - ath_keyprint(__func__, ix, hk, mac); \ + ath_keyprint(sc, __func__, ix, hk, mac); \ } while (0) static void ath_printrxbuf(struct ath_buf *bf, u_int ix, int); static void ath_printtxbuf(struct ath_buf *bf, u_int qnum, u_int ix, int done); @@ -345,18 +344,6 @@ */ for (i = 0; i < sc->sc_keymax; i++) ath_hal_keyreset(ah, i); - /* - * Mark key cache slots associated with global keys - * as in use. If we knew TKIP was not to be used we - * could leave the +32, +64, and +32+64 slots free. - * XXX only for splitmic. - */ - for (i = 0; i < IEEE80211_WEP_NKID; i++) { - setbit(sc->sc_keymap, i); - setbit(sc->sc_keymap, i+32); - setbit(sc->sc_keymap, i+64); - setbit(sc->sc_keymap, i+32+64); - } /* * Collect the channel list using the default country @@ -403,7 +390,6 @@ TASK_INIT(&sc->sc_rxorntask, 0, ath_rxorn_proc, sc); TASK_INIT(&sc->sc_bmisstask, 0, ath_bmiss_proc, sc); TASK_INIT(&sc->sc_bstucktask,0, ath_bstuck_proc, sc); - TASK_INIT(&sc->sc_radartask, 0, ath_radar_proc, sc); /* * Allocate hardware transmit queues: one queue for @@ -545,12 +531,30 @@ */ if (ath_hal_ciphersupported(ah, HAL_CIPHER_MIC)) ic->ic_caps |= IEEE80211_C_TKIPMIC; - if (ath_hal_tkipsplit(ah)) + /* + * If the h/w supports storing tx+rx MIC keys + * in one cache slot automatically enable use. + */ + if (ath_hal_hastkipsplit(ah) || + !ath_hal_settkipsplit(ah, AH_FALSE)) sc->sc_splitmic = 1; } sc->sc_hasclrkey = ath_hal_ciphersupported(ah, HAL_CIPHER_CLR); sc->sc_mcastkey = ath_hal_getmcastkeysearch(ah); /* + * Mark key cache slots associated with global keys + * as in use. If we knew TKIP was not to be used we + * could leave the +32, +64, and +32+64 slots free. + */ + for (i = 0; i < IEEE80211_WEP_NKID; i++) { + setbit(sc->sc_keymap, i); + setbit(sc->sc_keymap, i+64); + if (sc->sc_splitmic) { + setbit(sc->sc_keymap, i+32); + setbit(sc->sc_keymap, i+32+64); + } + } + /* * TPC support can be done either with a global cap or * per-packet support. The latter is not available on * all parts. We're a bit pedantic here as all parts @@ -878,24 +882,6 @@ } } -static void -ath_radar_proc(void *arg, int pending) -{ - struct ath_softc *sc = arg; - struct ifnet *ifp = sc->sc_ifp; - struct ath_hal *ah = sc->sc_ah; - HAL_CHANNEL hchan; - - if (ath_hal_procdfs(ah, &hchan)) { - if_printf(ifp, "radar detected on channel %u/0x%x/0x%x\n", - hchan.channel, hchan.channelFlags, hchan.privFlags); - /* - * Initiate channel change. - */ - /* XXX not yet */ - } -} - static u_int ath_chan2flags(struct ieee80211com *ic, struct ieee80211_channel *chan) { @@ -1323,7 +1309,7 @@ #ifdef ATH_DEBUG static void -ath_keyprint(const char *tag, u_int ix, +ath_keyprint(struct ath_softc *sc, const char *tag, u_int ix, const HAL_KEYVAL *hk, const u_int8_t mac[IEEE80211_ADDR_LEN]) { static const char *ciphers[] = { @@ -1341,9 +1327,16 @@ printf("%02x", hk->kv_val[i]); printf(" mac %s", ether_sprintf(mac)); if (hk->kv_type == HAL_CIPHER_TKIP) { - printf(" mic "); + printf(" %s ", sc->sc_splitmic ? "mic" : "rxmic"); for (i = 0; i < sizeof(hk->kv_mic); i++) printf("%02x", hk->kv_mic[i]); +#if HAL_ABI_VERSION > 0x06052200 + if (!sc->sc_splitmic) { + printf(" txmic "); + for (i = 0; i < sizeof(hk->kv_txmic); i++) + printf("%02x", hk->kv_txmic[i]); + } +#endif } printf("\n"); } @@ -1364,21 +1357,34 @@ KASSERT(k->wk_cipher->ic_cipher == IEEE80211_CIPHER_TKIP, ("got a non-TKIP key, cipher %u", k->wk_cipher->ic_cipher)); - KASSERT(sc->sc_splitmic, ("key cache !split")); if ((k->wk_flags & IEEE80211_KEY_XR) == IEEE80211_KEY_XR) { - /* - * TX key goes at first index, RX key at the rx index. - * The hal handles the MIC keys at index+64. - */ - memcpy(hk->kv_mic, k->wk_txmic, sizeof(hk->kv_mic)); - KEYPRINTF(sc, k->wk_keyix, hk, zerobssid); - if (!ath_hal_keyset(ah, k->wk_keyix, hk, zerobssid)) - return 0; + if (sc->sc_splitmic) { + /* + * TX key goes at first index, RX key at the rx index. + * The hal handles the MIC keys at index+64. + */ + memcpy(hk->kv_mic, k->wk_txmic, sizeof(hk->kv_mic)); + KEYPRINTF(sc, k->wk_keyix, hk, zerobssid); + if (!ath_hal_keyset(ah, k->wk_keyix, hk, zerobssid)) + return 0; - memcpy(hk->kv_mic, k->wk_rxmic, sizeof(hk->kv_mic)); - KEYPRINTF(sc, k->wk_keyix+32, hk, mac); - /* XXX delete tx key on failure? */ - return ath_hal_keyset(ah, k->wk_keyix+32, hk, mac); + memcpy(hk->kv_mic, k->wk_rxmic, sizeof(hk->kv_mic)); + KEYPRINTF(sc, k->wk_keyix+32, hk, mac); + /* XXX delete tx key on failure? */ + return ath_hal_keyset(ah, k->wk_keyix+32, hk, mac); + } else { + /* + * Room for both TX+RX MIC keys in one key cache + * slot, just set key at the first index; the hal + * will handle the reset. + */ + memcpy(hk->kv_mic, k->wk_rxmic, sizeof(hk->kv_mic)); +#if HAL_ABI_VERSION > 0x06052200 + memcpy(hk->kv_txmic, k->wk_txmic, sizeof(hk->kv_txmic)); +#endif + KEYPRINTF(sc, k->wk_keyix, hk, mac); + return ath_hal_keyset(ah, k->wk_keyix, hk, mac); + } } else if (k->wk_flags & IEEE80211_KEY_XR) { /* * TX/RX key goes at first index. @@ -1447,8 +1453,7 @@ mac = mac0; if (hk.kv_type == HAL_CIPHER_TKIP && - (k->wk_flags & IEEE80211_KEY_SWMIC) == 0 && - sc->sc_splitmic) { + (k->wk_flags & IEEE80211_KEY_SWMIC) == 0) { return ath_keyset_tkip(sc, k, &hk, mac); } else { KEYPRINTF(sc, k->wk_keyix, &hk, mac); @@ -1513,6 +1518,54 @@ } /* + * Allocate tx/rx key slots for TKIP. We allocate two slots for + * each key, one for decrypt/encrypt and the other for the MIC. + */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Sep 22 19:10:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B0F5F16A47B; Fri, 22 Sep 2006 19:10:52 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6AD6F16A403 for ; Fri, 22 Sep 2006 19:10:52 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C170D43D4C for ; Fri, 22 Sep 2006 19:10:51 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8MJApmX048345 for ; Fri, 22 Sep 2006 19:10:51 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8MJApll048342 for perforce@freebsd.org; Fri, 22 Sep 2006 19:10:51 GMT (envelope-from piso@freebsd.org) Date: Fri, 22 Sep 2006 19:10:51 GMT Message-Id: <200609221910.k8MJApll048342@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 106516 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Sep 2006 19:10:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=106516 Change 106516 by piso@piso_newluxor on 2006/09/22 19:10:01 Add missing newlines... Affected files ... .. //depot/projects/soc2005/libalias/lib/libalias/Makefile#6 edit .. //depot/projects/soc2005/libalias/lib/libalias/modules/Makefile#5 edit .. //depot/projects/soc2005/libalias/sys/modules/libalias/modules/Makefile#4 edit .. //depot/projects/soc2005/libalias/sys/modules/libalias/modules/modules.inc#5 edit Differences ... ==== //depot/projects/soc2005/libalias/lib/libalias/Makefile#6 (text+ko) ==== @@ -26,4 +26,4 @@ SUBDIR= libalias modules -.include +.include ==== //depot/projects/soc2005/libalias/lib/libalias/modules/Makefile#5 (text+ko) ==== @@ -4,4 +4,4 @@ SUBDIR= ${MODULES} -.include +.include ==== //depot/projects/soc2005/libalias/sys/modules/libalias/modules/Makefile#4 (text+ko) ==== @@ -4,4 +4,4 @@ SUBDIR= ${MODULES} -.include +.include ==== //depot/projects/soc2005/libalias/sys/modules/libalias/modules/modules.inc#5 (text+ko) ==== @@ -8,4 +8,4 @@ MODULES += nbt MODULES += pptp MODULES += skinny -MODULES += smedia+MODULES += smedia From owner-p4-projects@FreeBSD.ORG Sat Sep 23 00:30:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C5B7D16A416; Sat, 23 Sep 2006 00:30:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9E34F16A403 for ; Sat, 23 Sep 2006 00:30:37 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 58B0943D45 for ; Sat, 23 Sep 2006 00:30:37 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8N0Ubui082908 for ; Sat, 23 Sep 2006 00:30:37 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8N0Ub5n082903 for perforce@freebsd.org; Sat, 23 Sep 2006 00:30:37 GMT (envelope-from imp@freebsd.org) Date: Sat, 23 Sep 2006 00:30:37 GMT Message-Id: <200609230030.k8N0Ub5n082903@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 106529 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Sep 2006 00:30:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=106529 Change 106529 by imp@imp_lighthouse on 2006/09/23 00:29:40 Don't touch MR, but that doesn't quite fix things. I'm almost certain that we need to go to an interrupt driven thing... Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_qdmmc.c#13 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_qdmmc.c#13 (text+ko) ==== @@ -134,7 +134,6 @@ WR4(sc, MCI_ARGR, arg); WR4(sc, MCI_CMDR, cmd); - // wait until completed while (!(RD4(sc, MCI_SR) & MCI_SR_CMDRDY)) continue; @@ -268,9 +267,9 @@ // Select Card at91_qdmmc_SendCommand(dev, SEL_DESEL_CARD_CMD, rca << 16); - // XXX hard code 4. - bus_width = AT91C_BUS_WIDTH_4BITS; - + // XXX hard code 1. + bus_width = AT91C_BUS_WIDTH_1BIT; + printf("Setting bus width to 1 bit\n"); if (at91_qdmmc_SDCard_SendAppCommand(dev, SDCARD_SET_BUS_WIDTH_CMD, bus_width) != 0) return EIO; @@ -332,10 +331,10 @@ int month = 0; month += ((cid[3] >> 12) & 0xf); printf("SD: Manufacturing Date = %i/%i\n", year, month); - sc->cards[0].mode = 5 * MCI_MR_CLKDIV | MCI_MR_PWSDIV | - (MCI_MR_PWSDIV << 1 | MCI_MR_PDCMODE); - sc->cards[0].mode = 75 * MCI_MR_CLKDIV | MCI_MR_PWSDIV | - (MCI_MR_PWSDIV << 1); + sc->cards[0].mode = 5 * MCI_MR_CLKDIV | /* MCI_MR_PWSDIV | + (MCI_MR_PWSDIV << 1) | */ MCI_MR_PDCMODE; +// sc->cards[0].mode = 75 * MCI_MR_CLKDIV | MCI_MR_PWSDIV | +// (MCI_MR_PWSDIV << 1); sc->cards[0].flags = 0; if (sc->cards[0].CSD[1] & CSD_1_RD_B_PAR_M) sc->cards[0].flags |= READ_PARTIAL; @@ -476,10 +475,10 @@ printf("MMC %i: Size = %lld Bytes\n", card, sc->cards[card].size); /* declare clockrate to 5MHz - XXX the card may allow more */ - sc->cards[card].mode = 5 * MCI_MR_CLKDIV | MCI_MR_PWSDIV | - (MCI_MR_PWSDIV << 1 | MCI_MR_PDCMODE); - sc->cards[card].mode = 75 * MCI_MR_CLKDIV | MCI_MR_PWSDIV | - (MCI_MR_PWSDIV << 1); + sc->cards[card].mode = 5 * MCI_MR_CLKDIV | /* MCI_MR_PWSDIV | + (MCI_MR_PWSDIV << 1) | */ MCI_MR_PDCMODE; +// sc->cards[card].mode = 75 * MCI_MR_CLKDIV | /* MCI_MR_PWSDIV | +// (MCI_MR_PWSDIV << 1); */ sc->cards[card].flags = 0; if (sc->cards[card].CSD[1] & CSD_1_RD_B_PAR_M) sc->cards[card].flags |= READ_PARTIAL; @@ -511,6 +510,7 @@ AT91_QDMMC_LOCK_INIT(sc); + printf("BEFORE I FUCK WITH IT == mode 0x%x\n", RD4(sc, MCI_MR)); /* * Allocate DMA tags and maps */ @@ -529,13 +529,14 @@ // disable all interrupt sources WR4(sc, MCI_IDR, 0xffffffff); // set timeout values - WR4(sc, MCI_DTOR, MCI_DTOR_DTOMUL_1048576); + WR4(sc, MCI_DTOR, MCI_DTOR_DTOMUL_1048576 | MCI_DTOR_DTOCYC); //WR4(sc, MCI_MR, AT91C_MCI_MR_PDCMODE); // set clockrate to just 400kHz needed to identify - WR4(sc, MCI_MR, 74 * MCI_MR_CLKDIV | MCI_MR_PWSDIV | (MCI_MR_PWSDIV << 1 | MCI_MR_PDCMODE)); +// WR4(sc, MCI_MR, 74 * MCI_MR_CLKDIV /* | MCI_MR_PWSDIV | (MCI_MR_PWSDIV << 1) */ +// | MCI_MR_PDCMODE); WR4(sc, MCI_SDCR, 0); // enable controller - WR4(sc, MCI_CR, MCI_CR_MCIEN | MCI_CR_PWSEN); + WR4(sc, MCI_CR, MCI_CR_MCIEN); //WR4(sc, PDC_PTCR, PDC_PTCR_TXTDIS); //WR4(sc, PDC_PTCR, PDC_PTCR_RXTDIS); @@ -594,7 +595,8 @@ } /* set clockrate to 5MHz - XXX the card may allow more */ - WR4(sc, MCI_MR, 5 * MCI_MR_CLKDIV | MCI_MR_PWSDIV | (MCI_MR_PWSDIV << 1) | MCI_MR_PDCMODE); +// WR4(sc, MCI_MR, 5 * MCI_MR_CLKDIV | +// /* MCI_MR_PWSDIV | (MCI_MR_PWSDIV << 1) | */ MCI_MR_PDCMODE); AT91_QDMMC_UNLOCK(sc); @@ -752,8 +754,9 @@ printf("at91_qdmmc_task: read block %lld, bcount %ld\n", bp->bio_pblkno, bp->bio_bcount); uint32_t block; // Init Mode Register - WR4(sc, MCI_MR, sc->cards[0].mode | MCI_MR_PDCMODE | - (sc->cards[0].sector_size << 16)); +// WR4(sc, MCI_MR, sc->cards[0].mode | MCI_MR_PDCMODE | +// (sc->cards[0].sector_size << 16)); + WR4(sc, MCI_MR, 0x8301 | (sc->cards[0].sector_size << 16)); printf("mode 0x%x\n", RD4(sc, MCI_MR)); sz = sc->cards[0].sector_size; for (block = bp->bio_pblkno; block < bp->bio_pblkno + (bp->bio_bcount / sz); block++) { @@ -783,21 +786,22 @@ printf("block = %#x vaddr = %p, RPR = 0x%x, RCR = 0x%x\n", block, vaddr, RD4(sc, PDC_RPR), RD4(sc, PDC_RCR)); + printf("SR is %x before we get going\n", RD4(sc, MCI_SR)); + WR4(sc, MCI_IER, MCI_SR_ENDRX | 0xffff0000); status = at91_qdmmc_SendCommand(sc->dev, READ_SINGLE_BLOCK_CMD, block * sz); -// WR4(sc, MCI_IER, MCI_SR_RXBUFF | MCI_SR_ENDRX); WR4(sc, PDC_PTCR, PDC_PTCR_RXTEN); printf("at91_qdmmc_task: read-status = 0x%x\n", status); // wait for completion printf("TO SLEEP, PURCHANCE TO DREAM\n"); -#if 0 +#if 1 msleep(sc, &sc->sc_mtx, PRIBIO, "endrx", 0); printf("DONE SLEEPING\n"); #endif at91_qdmmc_wait_ready(sc); printf("SR is %x\n", RD4(sc, MCI_SR)); -#if 0 +#if 1 // safety check while ((RD4(sc, MCI_SR) & MCI_SR_ENDRX) == 0) @@ -828,7 +832,7 @@ printf("at91_qdmmc_task: deselect_card-status = 0x%x\n", status); // Reset Mode Register - WR4(sc, MCI_MR, sc->cards[0].mode); +// WR4(sc, MCI_MR, sc->cards[0].mode); biodone(bp); continue; } @@ -838,7 +842,7 @@ uint32_t *tmpbuf; // Init Mode Register - WR4(sc, MCI_MR, sc->cards[0].mode | (sc->cards[0].sector_size << 16)); +// WR4(sc, MCI_MR, sc->cards[0].mode | (sc->cards[0].sector_size << 16)); printf("mode 0x%x\n", RD4(sc, MCI_MR)); status = at91_qdmmc_SendCommand(sc->dev, @@ -898,7 +902,7 @@ printf("at91_qdmmc_task: deselect_card-status = 0x%x\n", status); // Reset Mode Register - WR4(sc, MCI_MR, sc->cards[0].mode); +// WR4(sc, MCI_MR, sc->cards[0].mode); biodone(bp); continue; } From owner-p4-projects@FreeBSD.ORG Sat Sep 23 00:30:38 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 28ADE16A55F; Sat, 23 Sep 2006 00:30:38 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0680E16A557 for ; Sat, 23 Sep 2006 00:30:37 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A9ACB43D45 for ; Sat, 23 Sep 2006 00:30:37 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8N0UbBO082916 for ; Sat, 23 Sep 2006 00:30:37 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8N0UbdO082913 for perforce@freebsd.org; Sat, 23 Sep 2006 00:30:37 GMT (envelope-from imp@freebsd.org) Date: Sat, 23 Sep 2006 00:30:37 GMT Message-Id: <200609230030.k8N0UbdO082913@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 106530 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Sep 2006 00:30:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=106530 Change 106530 by imp@imp_lighthouse on 2006/09/23 00:30:21 Start here for mci controller bridge code. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_mci.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sat Sep 23 00:34:44 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 24D2E16A412; Sat, 23 Sep 2006 00:34:44 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0366D16A403 for ; Sat, 23 Sep 2006 00:34:44 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AF49443D45 for ; Sat, 23 Sep 2006 00:34:43 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8N0YhmQ083203 for ; Sat, 23 Sep 2006 00:34:43 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8N0Yhal083200 for perforce@freebsd.org; Sat, 23 Sep 2006 00:34:43 GMT (envelope-from imp@freebsd.org) Date: Sat, 23 Sep 2006 00:34:43 GMT Message-Id: <200609230034.k8N0Yhal083200@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 106532 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Sep 2006 00:34:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=106532 Change 106532 by imp@imp_lighthouse on 2006/09/23 00:34:01 copy Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_mcireg.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sat Sep 23 00:52:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F77416A415; Sat, 23 Sep 2006 00:52:08 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A6C3A16A407 for ; Sat, 23 Sep 2006 00:52:07 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 51D2843D49 for ; Sat, 23 Sep 2006 00:52:07 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8N0q7qf092001 for ; Sat, 23 Sep 2006 00:52:07 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8N0q6Dw091998 for perforce@freebsd.org; Sat, 23 Sep 2006 00:52:06 GMT (envelope-from imp@freebsd.org) Date: Sat, 23 Sep 2006 00:52:06 GMT Message-Id: <200609230052.k8N0q6Dw091998@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 106533 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Sep 2006 00:52:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=106533 Change 106533 by imp@imp_lighthouse on 2006/09/23 00:51:28 bridge driver, needs work. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_mci.c#2 edit .. //depot/projects/arm/src/sys/arm/at91/at91_mcireg.h#2 edit .. //depot/projects/arm/src/sys/arm/conf/TSC4370#8 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_mci.c#2 (text+ko) ==== @@ -1,5 +1,6 @@ /*- - * Copyright (c) 2005 Olivier Houchard. All rights reserved. + * Copyright (c) 2006 Berndt Walter. All rights reserved. + * Copyright (c) 2006 M. Warner Losh. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -50,13 +51,10 @@ #include #include #include -#include -#include +#include #include -#include - -struct at91_qdmmc_softc { +struct at91_mci_softc { void *intrhand; /* Interrupt handle */ device_t dev; struct resource *irq_res; /* IRQ resource */ @@ -67,450 +65,82 @@ struct disk *disk; /* XXX support only one card for */ int nb_cards; struct proc *p; - struct { - struct bio_queue_head bio_queue; - char name[7]; - uint32_t addr; - uint32_t CID[4]; - uint32_t CSD[4]; - uint32_t sector_size; - uint64_t size; - uint32_t mode; - uint32_t flags; -#define READ_PARTIAL 0x001 -#define WRITE_PARTIAL 0x002 -#define ERASE_BLOCK_EN 0x004 -#define READ_MISALIGN 0x008 -#define WRITE_MISALIGN 0x010 - uint32_t read_bl; - uint32_t write_bl; - } cards[MMC_MAX]; }; static inline uint32_t -RD4(struct at91_qdmmc_softc *sc, bus_size_t off) +RD4(struct at91_mci_softc *sc, bus_size_t off) { return bus_read_4(sc->mem_res, off); } static inline void -WR4(struct at91_qdmmc_softc *sc, bus_size_t off, uint32_t val) +WR4(struct at91_mci_softc *sc, bus_size_t off, uint32_t val) { bus_write_4(sc->mem_res, off, val); } /* bus entry points */ -static int at91_qdmmc_probe(device_t dev); -static int at91_qdmmc_attach(device_t dev); -static int at91_qdmmc_detach(device_t dev); -static void at91_qdmmc_intr(void *); +static int at91_mci_probe(device_t dev); +static int at91_mci_attach(device_t dev); +static int at91_mci_detach(device_t dev); +static void at91_mci_intr(void *); /* helper routines */ -static int at91_qdmmc_activate(device_t dev); -static void at91_qdmmc_deactivate(device_t dev); +static int at91_mci_activate(device_t dev); +static void at91_mci_deactivate(device_t dev); -/* disk routines */ -static int at91_qdmmc_open(struct disk *dp); -static int at91_qdmmc_close(struct disk *dp); -static void at91_qdmmc_strategy(struct bio *bp); -static void at91_qdmmc_task(void *arg); - -#define AT91_QDMMC_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx) -#define AT91_QDMMC_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx) -#define AT91_QDMMC_LOCK_INIT(_sc) \ +#define AT91_MCI_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx) +#define AT91_MCI_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx) +#define AT91_MCI_LOCK_INIT(_sc) \ mtx_init(&_sc->sc_mtx, device_get_nameunit(_sc->dev), \ - "qdmmc", MTX_DEF) -#define AT91_QDMMC_LOCK_DESTROY(_sc) mtx_destroy(&_sc->sc_mtx); -#define AT91_QDMMC_ASSERT_LOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_OWNED); -#define AT91_QDMMC_ASSERT_UNLOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_NOTOWNED); + "mci", MTX_DEF) +#define AT91_MCI_LOCK_DESTROY(_sc) mtx_destroy(&_sc->sc_mtx); +#define AT91_MCI_ASSERT_LOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_OWNED); +#define AT91_MCI_ASSERT_UNLOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_NOTOWNED); -static int -at91_qdmmc_SendCommand(device_t dev, uint32_t cmd, uint32_t arg) +static void +at91_mci_init(device_t dev) { - struct at91_qdmmc_softc *sc = device_get_softc(dev); - uint32_t error; + struct at91_mci_softc *sc = device_get_softc(dev); - device_printf(dev, "Sending command %x:%x\n", cmd, arg); - WR4(sc, MCI_ARGR, arg); - WR4(sc, MCI_CMDR, cmd); - - while (!(RD4(sc, MCI_SR) & MCI_SR_CMDRDY)) - continue; - - error = RD4(sc, MCI_SR) & MCI_SR_ERROR; - if (error) { - if ((cmd != SDCARD_APP_OP_COND_CMD) && - (cmd != MMC_SEND_OP_COND_CMD)) { - //printf("qdmmc: Error 0x%x\n", error); - return (error); - } - if (error != MCI_SR_RCRCE) { - //printf("qdmmc: Error 0x%x\n", error); - return (error); - } - } - return (0); + WR4(sc, MCI_CR, MCI_CR_MCIEN); /* Enable controller */ + WR4(sc, MCI_IDR, 0xffffffff); /* Turn off interrupts */ + WR4(sc, MCI_DTOR, MCI_DTOR_DTOMUL_1M | MCI_DTOR_DTOCYC); + WR4(sc, MCI_MR, 0x834a); // XXX GROSS HACK FROM LINUX + WR4(sc, MCI_SDCR, 0); /* SLOT A, 1 bit bus */ } -static int -at91_qdmmc_SDCard_SendAppCommand(device_t dev, uint32_t cmd, uint32_t arg) +static void +at91_mci_fini(device_t dev) { - uint32_t status; - struct at91_qdmmc_softc *sc = device_get_softc(dev); + struct at91_mci_softc *sc = device_get_softc(dev); - // Send the CMD55 for application specific command - WR4(sc, MCI_ARGR, sc->cards[0].addr << 16); - WR4(sc, MCI_CMDR, APP_CMD); - - printf("CMD55: %x\n", sc->cards[0].addr << 16); - - // wait for CMDRDY Status flag to read the response - do - { - status = RD4(sc, MCI_SR); - } while(!(status & MCI_SR_CMDRDY)); - - // if an error occurs - if ((status & MCI_SR_ERROR) != 0 ) - return (status & MCI_SR_ERROR); - - return (at91_qdmmc_SendCommand(dev, cmd, arg)); + WR4(sc, MCI_IDR, 0xffffffff); /* Turn off interrupts */ + WR4(sc, MCI_CR, MCI_CR_MCIDIS | MCI_CR_SWRST); /* Put the device into reset */ } static int -at91_qdmmc_probe(device_t dev) +at91_mci_probe(device_t dev) { - //printf("at91_qdmmc_probe: called\n"); - device_set_desc(dev, "MMC"); + device_set_desc(dev, "MCI mmc/sd host bridge"); return (0); } static int -at91_qdmmc_SDCard_GetOCR(device_t dev) -{ - struct at91_qdmmc_softc *sc = device_get_softc(dev); - uint32_t response = 0; - - // The RCA to be used for CMD55 in Idle state shall be the card's - // default RCA=0x0000. - sc->cards[0].addr = 0; - while(!(response & AT91C_CARD_POWER_UP_BUSY)) { - response = at91_qdmmc_SDCard_SendAppCommand(dev, - SDCARD_APP_OP_COND_CMD, AT91C_MMC_HOST_VOLTAGE_RANGE); - if (response != 0) - return (-1); - response = RD4(sc, MCI_RSPR); - printf("card's OCR is %#x\n", response); - } - - return (response); -} - -static int -at91_qdmmc_GetCID(device_t dev, uint32_t *response) -{ - struct at91_qdmmc_softc *sc = device_get_softc(dev); - - if (at91_qdmmc_SendCommand(dev, ALL_SEND_CID_CMD, 0)) - return EIO; - response[0] = RD4(sc, MCI_RSPR + 0 * sizeof(response[0])); - response[1] = RD4(sc, MCI_RSPR + 1 * sizeof(response[0])); - response[2] = RD4(sc, MCI_RSPR + 2 * sizeof(response[0])); - response[3] = RD4(sc, MCI_RSPR + 3 * sizeof(response[0])); - return 0; -} - -static int -at91_qdmmc_GetCSD(device_t dev, uint32_t rca, uint32_t *response) -{ - struct at91_qdmmc_softc *sc = device_get_softc(dev); - - if (at91_qdmmc_SendCommand(dev, SEND_CSD_CMD, rca << 16)) - return EIO; - response[0] = RD4(sc, MCI_RSPR + 0 * sizeof(response[0])); - response[1] = RD4(sc, MCI_RSPR + 1 * sizeof(response[0])); - response[2] = RD4(sc, MCI_RSPR + 2 * sizeof(response[0])); - response[3] = RD4(sc, MCI_RSPR + 3 * sizeof(response[0])); - return 0; -} - -static uint32_t -at91_qdmmc_GetStatus(device_t dev, uint32_t rca) -{ - struct at91_qdmmc_softc *sc = device_get_softc(dev); - - if (at91_qdmmc_SendCommand(dev, SEND_STATUS_CMD, rca << 16) == 0) - return (RD4(sc, MCI_RSPR)); - return 0xffffffff; -} - -static int -at91_qdmmc_SetBlocklength(device_t dev, uint32_t length) -{ - return (at91_qdmmc_SendCommand(dev, SET_BLOCKLEN_CMD, length) ); -} - -static int -at91_qdmmc_SDCard_SetBusWidth(device_t dev) -{ - struct at91_qdmmc_softc *sc = device_get_softc(dev); - uint32_t ret_value, rca; - char bus_width; - - rca = sc->cards[0].addr; - do { - ret_value = at91_qdmmc_GetStatus(dev, rca); - } while (ret_value != 0xffffffff && - !(ret_value & AT91C_SR_READY_FOR_DATA)); - - // Select Card - at91_qdmmc_SendCommand(dev, SEL_DESEL_CARD_CMD, rca << 16); - - // XXX hard code 1. - bus_width = AT91C_BUS_WIDTH_1BIT; - printf("Setting bus width to 1 bit\n"); - if (at91_qdmmc_SDCard_SendAppCommand(dev, SDCARD_SET_BUS_WIDTH_CMD, - bus_width) != 0) - return EIO; - - return 0; -} - -static int -at91_qdmmc_sdcard_init(device_t dev) -{ - struct at91_qdmmc_softc *sc = device_get_softc(dev); - uint32_t *csd, *cid; - - // CMD0 - at91_qdmmc_SendCommand(dev, GO_IDLE_STATE_CMD, 0); - - if (at91_qdmmc_SDCard_GetOCR(dev) == -1) { // ACMD41 - printf("SD: can't get OCR\n"); - return ENXIO; - } - cid = &sc->cards[0].CID[0]; - if (at91_qdmmc_GetCID(dev, cid) != 0) { // CMD2 - printf("SD: cant get cid\n"); - return ENXIO; - } - if (at91_qdmmc_SendCommand(dev, SET_RELATIVE_ADDR_CMD, 0) != 0) { - printf("SD: Can't set RCA to 0\n"); - return ENXIO; - } - sc->cards[0].addr = RD4(sc, MCI_RSPR) >> 16; - printf("SD Card at %#x\n", sc->cards[0].addr); - csd = &sc->cards[0].CSD[0]; - if (at91_qdmmc_GetCSD(dev, sc->cards[0].addr, csd) != 0) { - printf("SD: can't get csd\n"); - return ENXIO; - } - printf("SD Card - CID = 0x%08x%08x%08x%08x\n", - cid[0], - cid[1], - cid[2], - cid[3]); - printf("SD - CSD = 0x%08x%08x%08x%08x\n", csd[0], csd[1], csd[2], - csd[3]); - printf("SD: Vendor-ID = 0x%x\n", cid[0] >> 24); - printf("SD: OEM-ID = 0x%x\n", (cid[0] >> 8) & 0xffff); - sc->cards[0].name[0] = (cid[0] >> 0) & 0xff; - sc->cards[0].name[1] = (cid[1] >> 24) & 0xff; - sc->cards[0].name[2] = (cid[1] >> 16) & 0xff; - sc->cards[0].name[3] = (cid[1] >> 8) & 0xff; - sc->cards[0].name[4] = (cid[1] >> 0) & 0xff; - sc->cards[0].name[5] = (cid[2] >> 24) & 0xff; - sc->cards[0].name[6] = '\0'; - printf("SD: Productname = %s\n", sc->cards[0].name); - printf("SD: Revision = 0x%x\n", (cid[2] >> 16) & 0xff); - printf("SD: Serial = 0x%x\n", (cid[2] << 16) | - (cid[3] >> 16)); - int year = 2001; - year += ((cid[3] >> 8) & 0xf); - int month = 0; - month += ((cid[3] >> 12) & 0xf); - printf("SD: Manufacturing Date = %i/%i\n", year, month); - sc->cards[0].mode = 5 * MCI_MR_CLKDIV | /* MCI_MR_PWSDIV | - (MCI_MR_PWSDIV << 1) | */ MCI_MR_PDCMODE; -// sc->cards[0].mode = 75 * MCI_MR_CLKDIV | MCI_MR_PWSDIV | -// (MCI_MR_PWSDIV << 1); - sc->cards[0].flags = 0; - if (sc->cards[0].CSD[1] & CSD_1_RD_B_PAR_M) - sc->cards[0].flags |= READ_PARTIAL; - if (sc->cards[0].CSD[3] & CSD_3_WBLOCK_P_M) - sc->cards[0].flags |= WRITE_PARTIAL; - sc->cards[0].read_bl = (csd[1] >> CSD_1_RD_B_LEN_S) & - CSD_1_RD_B_LEN_M; - sc->cards[0].write_bl = (csd[3] >> CSD_3_WBLEN_S) & - CSD_3_WBLEN_M; - bioq_init(&sc->cards[0].bio_queue); - - sc->cards[0].sector_size = 1 << sc->cards[0].read_bl; - printf("SD: Blocksize = %i Bytes\n", sc->cards[0].sector_size); - uint64_t c_size; - uint64_t c_size_mult; - c_size = ((sc->cards[0].CSD[1] & CSD_1_CSIZE_H_M) << 2) | - ((sc->cards[0].CSD[2] >> CSD_2_CSIZE_L_S) & CSD_2_CSIZE_L_M); - printf("SD: c_size = %lld\n", c_size); - c_size_mult = (sc->cards[0].CSD[2] >> CSD_2_C_SIZE_M_S) & - CSD_2_C_SIZE_M_M; - c_size_mult = 1 << (c_size_mult + 2); - printf("SD: c_size_mult = %lld\n", c_size_mult); - sc->cards[0].size = sc->cards[0].sector_size * - (c_size + 1) * c_size_mult; - printf("SD: Size = %lld Bytes\n", sc->cards[0].size); - if (at91_qdmmc_SDCard_SetBusWidth(dev)) { - printf("Failed to set bus width"); - return EIO; - } - if (at91_qdmmc_SetBlocklength(dev, sc->cards[0].sector_size) != 0) { - printf("Failed to set block length!\n"); - return EIO; - } - sc->nb_cards++; - return 0; -} - -static int -at91_qdmmc_mmc_init(device_t dev) -{ - struct at91_qdmmc_softc *sc = device_get_softc(dev); - uint32_t cond; - int err; - - err = 0; - /* get all cards into idle state */ - at91_qdmmc_SendCommand(dev, MMC_GO_IDLE_STATE_CMD, 0); - - /* check operating conditions */ - do { /* loop on busy */ - err = at91_qdmmc_SendCommand(dev, MMC_SEND_OP_COND_CMD, - AT91C_MMC_HOST_VOLTAGE_RANGE); - if (err != 0) { - err = ENXIO; - printf("No MMC cards found\n"); - goto out; - } - cond = RD4(sc, MCI_RSPR); - } while ((cond & AT91C_CARD_POWER_UP_BUSY) == 0); - printf("at91_qdmmc_attach: operating conditions: 0x%x\n", - cond & ~(AT91C_CARD_POWER_UP_BUSY)); - - /* now find our cards */ - for(sc->nb_cards = 0; sc->nb_cards < MMC_MAX; sc->nb_cards++) { - int status; - int card = sc->nb_cards; - if (at91_qdmmc_GetCID(dev, sc->cards[card].CID)) - break; - printf("Found MMC %i - CID = 0x%x%x%x%x\n", card, - sc->cards[card].CID[0], - sc->cards[card].CID[1], - sc->cards[card].CID[2], - sc->cards[card].CID[3]); - printf("MMC %i: Vendor-ID = 0x%x\n", card, - sc->cards[card].CID[0] >> 24), - printf("MMC %i: OEM-ID = 0x%x\n", card, - (sc->cards[card].CID[0] >> 8) & 0xffff), - sc->cards[card].name[0] = (sc->cards[card].CID[0] >> 0) & 0xff; - sc->cards[card].name[1] = (sc->cards[card].CID[1] >> 24) & 0xff; - sc->cards[card].name[2] = (sc->cards[card].CID[1] >> 16) & 0xff; - sc->cards[card].name[3] = (sc->cards[card].CID[1] >> 8) & 0xff; - sc->cards[card].name[4] = (sc->cards[card].CID[1] >> 0) & 0xff; - sc->cards[card].name[5] = (sc->cards[card].CID[2] >> 24) & 0xff; - sc->cards[card].name[6] = '\0'; - printf("MMC %i: Productname = %s\n", card, - sc->cards[card].name); - printf("MMC %i: Revision = 0x%x\n", card, - (sc->cards[card].CID[2] >> 16) & 0xff), - printf("MMC %i: Serial = 0x%x\n", card, - (sc->cards[card].CID[2] << 16) | - (sc->cards[card].CID[3] >> 16)); - int year = 1997; - year += ((sc->cards[card].CID[3] >> 8) & 0xf); - int month = 0; - month += ((sc->cards[card].CID[3] >> 12) & 0xf); - printf("MMC %i: Manufacturing Date = %i/%i\n", card, year, - month); - - sc->cards[card].addr = card + MMC_FIRST_RCA; - status = at91_qdmmc_SendCommand(dev, MMC_SET_RELATIVE_ADDR_CMD, - (sc->cards[card].addr) << 16); - if (status != 0) { - printf("Failed to set address for MMC %i\n", card); - goto out; - } - printf("Set MMC %i address to 0x%x\n", card, - sc->cards[card].addr); - - status = at91_qdmmc_SendCommand(dev, SEND_CSD_CMD, - (sc->cards[card].addr) << 16); - if (status != 0) { - printf("Failed to get CSD for MMC %i\n", card); - goto out; - } - sc->cards[card].CSD[0] = RD4(sc, MCI_RSPR + 0); - sc->cards[card].CSD[1] = RD4(sc, MCI_RSPR + 4); - sc->cards[card].CSD[2] = RD4(sc, MCI_RSPR + 8); - sc->cards[card].CSD[3] = RD4(sc, MCI_RSPR + 12); - printf("MMC %i: CSD = 0x%x%x%x%x\n", card, - sc->cards[card].CSD[0], - sc->cards[card].CSD[1], - sc->cards[card].CSD[2], - sc->cards[card].CSD[3]); - uint64_t c_size; - uint64_t c_size_mult; - sc->cards[card].sector_size = - 1 << ((sc->cards[card].CSD[1] >> 16) & 0xf); - printf("MMC %i: Blocksize = %i Bytes\n", card, - sc->cards[card].sector_size); - c_size = ((sc->cards[card].CSD[1] & 0x3ff) << 2) | - ((sc->cards[card].CSD[2] >> 30) & 0x3); - printf("MMC %i: c_size = %lld\n", card, c_size); - c_size_mult = (sc->cards[card].CSD[2] >> 15) & 0x7; - c_size_mult = 1 << (c_size_mult + 2); - printf("MMC %i: c_size_mult = %lld\n", card, c_size_mult); - sc->cards[card].size = sc->cards[card].sector_size * - (c_size + 1) * c_size_mult; - printf("MMC %i: Size = %lld Bytes\n", card, - sc->cards[card].size); - /* declare clockrate to 5MHz - XXX the card may allow more */ - sc->cards[card].mode = 5 * MCI_MR_CLKDIV | /* MCI_MR_PWSDIV | - (MCI_MR_PWSDIV << 1) | */ MCI_MR_PDCMODE; -// sc->cards[card].mode = 75 * MCI_MR_CLKDIV | /* MCI_MR_PWSDIV | -// (MCI_MR_PWSDIV << 1); */ - sc->cards[card].flags = 0; - if (sc->cards[card].CSD[1] & CSD_1_RD_B_PAR_M) - sc->cards[card].flags |= READ_PARTIAL; - if (sc->cards[card].CSD[3] & CSD_3_WBLOCK_P_M) - sc->cards[card].flags |= WRITE_PARTIAL; - sc->cards[card].read_bl = 0; - sc->cards[card].write_bl = 0; - bioq_init(&sc->cards[0].bio_queue); - } - if (sc->nb_cards == 0) - err = ENXIO; -out:; - return (err); -} - -static int -at91_qdmmc_attach(device_t dev) +at91_mci_attach(device_t dev) { /* XXX: asumes MCK = 60MHz */ - struct at91_qdmmc_softc *sc = device_get_softc(dev); + struct at91_mci_softc *sc = device_get_softc(dev); int err; - //printf("at91_qdmmc_attach: called\n"); - sc->dev = dev; - err = at91_qdmmc_activate(dev); + err = at91_mci_activate(dev); if (err) goto out; - AT91_QDMMC_LOCK_INIT(sc); + AT91_MCI_LOCK_INIT(sc); - printf("BEFORE I FUCK WITH IT == mode 0x%x\n", RD4(sc, MCI_MR)); /* * Allocate DMA tags and maps */ @@ -524,99 +154,39 @@ if (err != 0) goto out; - // reset the MCI - WR4(sc, MCI_CR, MCI_CR_SWRST); - // disable all interrupt sources - WR4(sc, MCI_IDR, 0xffffffff); - // set timeout values - WR4(sc, MCI_DTOR, MCI_DTOR_DTOMUL_1048576 | MCI_DTOR_DTOCYC); - //WR4(sc, MCI_MR, AT91C_MCI_MR_PDCMODE); - // set clockrate to just 400kHz needed to identify -// WR4(sc, MCI_MR, 74 * MCI_MR_CLKDIV /* | MCI_MR_PWSDIV | (MCI_MR_PWSDIV << 1) */ -// | MCI_MR_PDCMODE); - WR4(sc, MCI_SDCR, 0); - // enable controller - WR4(sc, MCI_CR, MCI_CR_MCIEN); - - //WR4(sc, PDC_PTCR, PDC_PTCR_TXTDIS); - //WR4(sc, PDC_PTCR, PDC_PTCR_RXTDIS); - //WR4(sc, PDC_RNPR, 0); - //WR4(sc, PDC_RNCR, 0); - //WR4(sc, PDC_TNPR, 0); - //WR4(sc, PDC_TNCR, 0); - //WR4(sc, PDC_RPR, 0); - //WR4(sc, PDC_RCR, 0); - //WR4(sc, PDC_TPR, 0); - //WR4(sc, PDC_TCR, 0); - //WR4(sc, PDC_PTCR, PDC_PTCR_RXTEN); - //WR4(sc, PDC_PTCR, PDC_PTCR_TXTEN); + at91_mci_fini(dev); + at91_mci_init(dev); - RD4(sc, MCI_RDR); - RD4(sc, MCI_SR); - /* * Activate the interrupt */ err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC | INTR_MPSAFE, - at91_qdmmc_intr, sc, &sc->intrhand); + at91_mci_intr, sc, &sc->intrhand); if (err) { - AT91_QDMMC_LOCK_DESTROY(sc); + AT91_MCI_LOCK_DESTROY(sc); goto out; } - if (at91_qdmmc_mmc_init(dev) != 0) { - printf("MMC FAILED, LET'S TRY SDCARD\n"); - if (at91_qdmmc_sdcard_init(dev) != 0) { - printf("SD CARD FAILED, YOU LOSE\n"); - err = 0; - goto out; - } - } - - if (sc->nb_cards == 0) { - printf("No MMC cards found\n"); - goto out; - } else { - AT91_QDMMC_LOCK(sc); - /* - * Register the (XXX) first media as a disk - */ - sc->disk = disk_alloc(); - sc->disk->d_open = at91_qdmmc_open; - sc->disk->d_close = at91_qdmmc_close; - sc->disk->d_strategy = at91_qdmmc_strategy; - // sc->disk->d_dump = at91_qdmmc_dump; - sc->disk->d_name = "at91_qdmmc"; - sc->disk->d_drv1 = sc; - sc->disk->d_maxsize = DFLTPHYS; - sc->disk->d_unit = 0; - //sc->disk->d_flags = DISKFLAG_NEEDSGIANT; - disk_create(sc->disk, DISK_VERSION); - } - - /* set clockrate to 5MHz - XXX the card may allow more */ -// WR4(sc, MCI_MR, 5 * MCI_MR_CLKDIV | -// /* MCI_MR_PWSDIV | (MCI_MR_PWSDIV << 1) | */ MCI_MR_PDCMODE); - - AT91_QDMMC_UNLOCK(sc); + AT91_MCI_UNLOCK(sc); - kthread_create(&at91_qdmmc_task, sc, &sc->p, 0, 0, "task: at91_qdmmc"); out:; if (err) - at91_qdmmc_deactivate(dev); + at91_mci_deactivate(dev); return (err); } static int -at91_qdmmc_detach(device_t dev) +at91_mci_detach(device_t dev) { + at91_mci_fini(dev); + at91_mci_deactivate(dev); return (EBUSY); /* XXX */ } static int -at91_qdmmc_activate(device_t dev) +at91_mci_activate(device_t dev) { - struct at91_qdmmc_softc *sc; + struct at91_mci_softc *sc; int rid; sc = device_get_softc(dev); @@ -632,14 +202,14 @@ goto errout; return (0); errout: - at91_qdmmc_deactivate(dev); + at91_mci_deactivate(dev); return (ENOMEM); } static void -at91_qdmmc_deactivate(device_t dev) +at91_mci_deactivate(device_t dev) { - struct at91_qdmmc_softc *sc; + struct at91_mci_softc *sc; sc = device_get_softc(dev); if (sc->intrhand) @@ -657,291 +227,41 @@ return; } +#if 0 static void at91_getaddr(void *arg, bus_dma_segment_t *segs, int nsegs, int error) { if (error != 0) - return; + return; *(bus_addr_t *)arg = segs[0].ds_addr; } - -static int at91_qdmmc_open(struct disk *dp) -{ - struct at91_qdmmc_softc *sc; - - //printf("at91_qdmmc_open: called\n"); - sc = (struct at91_qdmmc_softc *)dp->d_drv1; - - AT91_QDMMC_LOCK(sc); - sc->disk->d_sectorsize = sc->cards[0].sector_size; - sc->disk->d_mediasize = sc->cards[0].size; - //softc->disk->d_fwsectors = softc->params.secs_per_track; - //softc->disk->d_fwheads = softc->params.heads; - //sc->disk->d_devstat->block_size = sc->cards[0].sector_size; - //softc->disk->d_devstat->flags &= ~DEVSTAT_BS_UNAVAILABLE; - AT91_QDMMC_UNLOCK(sc); - - return 0; -} - -static int at91_qdmmc_close(struct disk *dp) -{ - struct at91_qdmmc_softc *sc; - - //printf("at91_qdmmc_close: called\n"); - sc = (struct at91_qdmmc_softc *)dp->d_drv1; - - AT91_QDMMC_LOCK(sc); - AT91_QDMMC_UNLOCK(sc); - - // XXX do nothing since we don't lock for now - return 0; -} - -static void at91_qdmmc_strategy(struct bio *bp) -{ - struct at91_qdmmc_softc *sc; - - //printf("at91_qdmmc_strategy: called\n"); - sc = (struct at91_qdmmc_softc *)bp->bio_disk->d_drv1; - -#if 1 - AT91_QDMMC_LOCK(sc); - bioq_disksort(&sc->cards[0].bio_queue, bp); - wakeup(sc); - AT91_QDMMC_UNLOCK(sc); -#else - biofinish(bp, NULL, EIO); #endif -} -static void -at91_qdmmc_wait_ready(struct at91_qdmmc_softc *sc) -{ - int timeout = 100000; - - // Why doesn't this bit ever clear? It does in the boot loader. - printf("Waiting status %#x\n", RD4(sc, MCI_SR)); - while (!(RD4(sc, MCI_SR) & MCI_SR_NOTBUSY) && --timeout) - continue; - printf("Waited status %#x\n", RD4(sc, MCI_SR)); -} - -static void -at91_qdmmc_task(void *arg) -{ - struct at91_qdmmc_softc *sc = (struct at91_qdmmc_softc*)arg; - struct bio *bp; - int status; - bus_addr_t paddr; - int map = 0; - uint32_t *tmpbuf; - uint32_t rv; - int sz; - - tmpbuf = malloc(sc->cards[0].sector_size, M_DEVBUF, M_WAITOK); - AT91_QDMMC_LOCK(sc); - printf("at91_qdmmc_task: start\n"); - for (;;) { - do { - bp = bioq_first(&sc->cards[0].bio_queue); - if (bp == NULL) - msleep(sc, &sc->sc_mtx, PRIBIO, "jobqueue", 0); - } while (bp == NULL); - bioq_remove(&sc->cards[0].bio_queue, bp); - printf("at91_qdmmc_task: request %p\n", bp); - if (bp->bio_cmd == BIO_READ) { - printf("at91_qdmmc_task: read block %lld, bcount %ld\n", bp->bio_pblkno, bp->bio_bcount); - uint32_t block; - // Init Mode Register -// WR4(sc, MCI_MR, sc->cards[0].mode | MCI_MR_PDCMODE | -// (sc->cards[0].sector_size << 16)); - WR4(sc, MCI_MR, 0x8301 | (sc->cards[0].sector_size << 16)); - printf("mode 0x%x\n", RD4(sc, MCI_MR)); - sz = sc->cards[0].sector_size; - for (block = bp->bio_pblkno; block < bp->bio_pblkno + (bp->bio_bcount / sz); block++) { - - printf("Waiting for not busy\n"); - // wait until completed - while (!(RD4(sc, MCI_SR) & MCI_SR_NOTBUSY)) - continue; - printf("Waiting for the card to become ready\n"); - do { - rv = at91_qdmmc_GetStatus(sc->dev, sc->cards[0].addr); - printf("."); - } while (rv != 0xffffffff && !(rv & AT91C_SR_READY_FOR_DATA)); - - char *vaddr = bp->bio_data + (block - bp->bio_pblkno) * sz; - - if (bus_dmamap_load(sc->dmatag, sc->map, vaddr, - sc->cards[0].sector_size, at91_getaddr, &paddr, 0) != 0) - goto out; - map = 1; - - bus_dmamap_sync(sc->dmatag, sc->map, BUS_DMASYNC_PREREAD); - at91_qdmmc_wait_ready(sc); - WR4(sc, PDC_PTCR, PDC_PTCR_TXTDIS | PDC_PTCR_RXTDIS); - WR4(sc, PDC_RPR, paddr); - WR4(sc, PDC_RCR, sz); - - printf("block = %#x vaddr = %p, RPR = 0x%x, RCR = 0x%x\n", block, vaddr, - RD4(sc, PDC_RPR), RD4(sc, PDC_RCR)); - printf("SR is %x before we get going\n", RD4(sc, MCI_SR)); - WR4(sc, MCI_IER, MCI_SR_ENDRX | 0xffff0000); - status = at91_qdmmc_SendCommand(sc->dev, READ_SINGLE_BLOCK_CMD, block * sz); - WR4(sc, PDC_PTCR, PDC_PTCR_RXTEN); - - printf("at91_qdmmc_task: read-status = 0x%x\n", status); - - // wait for completion - printf("TO SLEEP, PURCHANCE TO DREAM\n"); -#if 1 - msleep(sc, &sc->sc_mtx, PRIBIO, "endrx", 0); - printf("DONE SLEEPING\n"); -#endif - at91_qdmmc_wait_ready(sc); - printf("SR is %x\n", RD4(sc, MCI_SR)); -#if 1 - - // safety check - while ((RD4(sc, MCI_SR) & MCI_SR_ENDRX) == 0) - DELAY(700); -#endif - - printf("DONE WAITING\n"); - bus_dmamap_sync(sc->dmatag, sc->map, BUS_DMASYNC_POSTREAD); - bus_dmamap_unload(sc->dmatag, sc->map); - map = 0; - - WR4(sc, PDC_PTCR, PDC_PTCR_RXTDIS); - /* Fix Byteorder (Atmel Errata) */ - uint32_t* base = (uint32_t*)vaddr; - for (int i = 0; i < sc->cards[0].sector_size / 4; i++) { - uint32_t tmp = base[i]; - base[i] = (((tmp >> 24) & 0xff)) | - (((tmp >> 16) & 0xff) << 8) | - (((tmp >> 8) & 0xff) << 16) | - ((tmp & 0xff) << 24); - printf("%08x", base[i]); - } - printf("\n"); - } - printf("Delecting card!\n"); - status = at91_qdmmc_SendCommand(sc->dev, - SEL_DESEL_CARD_CMD, 0); - printf("at91_qdmmc_task: deselect_card-status = 0x%x\n", status); - - // Reset Mode Register -// WR4(sc, MCI_MR, sc->cards[0].mode); - biodone(bp); - continue; - } - if (bp->bio_cmd == BIO_WRITE) { - printf("at91_qdmmc_task: write block %lld, bcount %ld\n", bp->bio_pblkno, bp->bio_bcount); - uint32_t block; - uint32_t *tmpbuf; - - // Init Mode Register -// WR4(sc, MCI_MR, sc->cards[0].mode | (sc->cards[0].sector_size << 16)); - printf("mode 0x%x\n", RD4(sc, MCI_MR)); - - status = at91_qdmmc_SendCommand(sc->dev, - SEL_DESEL_CARD_CMD, (sc->cards[0].addr) << 16); - printf("at91_qdmmc_task: select_card-status = 0x%x\n", status); - status = at91_qdmmc_SendCommand(sc->dev, - SET_BLOCKLEN_CMD, sc->cards[0].sector_size); - printf("at91_qdmmc_task: set_blocklen-status = 0x%x\n", status); - - tmpbuf = malloc(sc->cards[0].sector_size, M_DEVBUF, M_WAITOK); - for (block = bp->bio_pblkno; block < bp->bio_pblkno + (bp->bio_bcount / sc->cards[0].sector_size); block++) { - char *vaddr = bp->bio_data + (block - bp->bio_pblkno) * sc->cards[0].sector_size; - - /* Fix Byteorder (Atmel Errata) */ - uint32_t* base = (uint32_t*)vaddr; - for (int i = 0; i < sc->cards[0].sector_size / 4; i++) { - uint32_t tmp = base[i]; - tmpbuf[i] = (((tmp >> 24) & 0xff)) | - (((tmp >> 16) & 0xff) << 8) | - (((tmp >> 8) & 0xff) << 16) | - ((tmp & 0xff) << 24); - } - - WR4(sc, PDC_PTCR, PDC_PTCR_TXTDIS | PDC_PTCR_RXTDIS); - - if (bus_dmamap_load(sc->dmatag, sc->map, tmpbuf, - sc->cards[0].sector_size, at91_getaddr, &paddr, 0) != 0) - goto out; - map = 1; - - bus_dmamap_sync(sc->dmatag, sc->map, BUS_DMASYNC_PREWRITE); - WR4(sc, PDC_TPR, paddr); - WR4(sc, PDC_TCR, sc->cards[0].sector_size / 4); - - printf("status = 0x%x, tmpbuf = %p, TPR = 0x%x, TCR = 0x%x\n", status, tmpbuf, - RD4(sc, PDC_TPR), RD4(sc, PDC_TCR)); - status = at91_qdmmc_SendCommand(sc->dev, - WRITE_BLOCK_CMD, block * sc->cards[0].sector_size); - // printf("at91_qdmmc_task: write-status = 0x%x\n", status); - WR4(sc, MCI_IER, MCI_SR_NOTBUSY); - WR4(sc, PDC_PTCR, PDC_PTCR_TXTEN); - - // wait for completion - msleep(sc, &sc->sc_mtx, PRIBIO, "notbusy", 0); - // XXX don't know why this safety check is required - while ((RD4(sc, MCI_SR) & MCI_SR_NOTBUSY) == 0) - DELAY(700); - - bus_dmamap_sync(sc->dmatag, sc->map, BUS_DMASYNC_POSTWRITE); - bus_dmamap_unload(sc->dmatag, sc->map); - map = 0; - } - free(tmpbuf, M_DEVBUF); - - status = at91_qdmmc_SendCommand(sc->dev, - SEL_DESEL_CARD_CMD, 0); - printf("at91_qdmmc_task: deselect_card-status = 0x%x\n", status); - - // Reset Mode Register -// WR4(sc, MCI_MR, sc->cards[0].mode); - biodone(bp); - continue; - } - -out: - if (map) - bus_dmamap_unload(sc->dmatag, sc->map); - status = at91_qdmmc_SendCommand(sc->dev, SEL_DESEL_CARD_CMD, 0); - printf("at91_qdmmc_task: deselect_card-status = 0x%x\n", status); - AT91_QDMMC_UNLOCK(sc); - biofinish(bp, NULL, ENXIO); - } -} - -static device_method_t at91_qdmmc_methods[] = { - DEVMETHOD(device_probe, at91_qdmmc_probe), - DEVMETHOD(device_attach, at91_qdmmc_attach), - DEVMETHOD(device_detach, at91_qdmmc_detach), +static device_method_t at91_mci_methods[] = { + DEVMETHOD(device_probe, at91_mci_probe), + DEVMETHOD(device_attach, at91_mci_attach), + DEVMETHOD(device_detach, at91_mci_detach), {0, 0}, }; -static driver_t at91_qdmmc_driver = { - "at91_qdmmc", - at91_qdmmc_methods, - sizeof(struct at91_qdmmc_softc), +static driver_t at91_mci_driver = { + "at91_mci", + at91_mci_methods, + sizeof(struct at91_mci_softc), }; -static devclass_t at91_qdmmc_devclass; +static devclass_t at91_mci_devclass; -DRIVER_MODULE(at91_qdmmc, atmelarm, at91_qdmmc_driver, at91_qdmmc_devclass, 0, 0); +DRIVER_MODULE(at91_mci, atmelarm, at91_mci_driver, at91_mci_devclass, 0, 0); static void -at91_qdmmc_intr(void *arg) +at91_mci_intr(void *arg) { - struct at91_qdmmc_softc *sc = (struct at91_qdmmc_softc*)arg; + struct at91_mci_softc *sc = (struct at91_mci_softc*)arg; - AT91_QDMMC_LOCK(sc); + AT91_MCI_LOCK(sc); printf("i 0x%x\n", RD4(sc, MCI_SR)); wakeup(sc); WR4(sc, MCI_IDR, 0xffffffff); - AT91_QDMMC_UNLOCK(sc); + AT91_MCI_UNLOCK(sc); } ==== //depot/projects/arm/src/sys/arm/at91/at91_mcireg.h#2 (text+ko) ==== @@ -1,5 +1,6 @@ /*- - * Copyright (c) 2005 M. Warner Losh. All rights reserved. + * Copyright (c) 2006 Berndt Walter. All rights reserved. + * Copyright (c) 2006 M. Warner Losh. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -22,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $FreeBSD: src/sys/arm/at91/at91_streg.h,v 1.1 2006/02/04 23:32:13 imp Exp $ */ +/* $FreeBSD$ */ #ifndef ARM_AT91_AT91QDMMCREG_H #define ARM_AT91_AT91QDMMCREG_H @@ -65,7 +66,7 @@ #define MCI_DTOR_DTOMUL_1024 (0x4u << 4) /* (MCI) DTOCYC x 1024 */ #define MCI_DTOR_DTOMUL_4096 (0x5u << 4) /* (MCI) DTOCYC x 4096 */ #define MCI_DTOR_DTOMUL_65536 (0x6u << 4) /* (MCI) DTOCYC x 65536 */ -#define MCI_DTOR_DTOMUL_1048576 (0x7u << 4) /* (MCI) DTOCYC x 1048576 */ +#define MCI_DTOR_DTOMUL_1M (0x7u << 4) /* (MCI) DTOCYC x 1048576 */ /* -------- MCI_SDCR : (MCI Offset: 0xc) MCI SD Card Register -------- */ #define MCI_SDCR_SCDSEL (0x1u << 0) /* (MCI) SD Card Selector */ #define MCI_SDCR_SCDBUS (0x1u << 7) /* (MCI) SD Card Bus Width */ ==== //depot/projects/arm/src/sys/arm/conf/TSC4370#8 (text+ko) ==== @@ -94,7 +94,10 @@ device at91_spi # SPI bridge support device at91_ssc device at91_tc -device at91_qdmmc +device at91_mci +#device mmcsd # mmc/sd bus +#device mmc # mmc flash card >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Sep 23 08:55:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0FBAC16A412; Sat, 23 Sep 2006 08:55:18 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CC28716A407 for ; Sat, 23 Sep 2006 08:55:17 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5A4D043D45 for ; Sat, 23 Sep 2006 08:55:17 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8N8tHAJ039667 for ; Sat, 23 Sep 2006 08:55:17 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8N8tGjF039664 for perforce@freebsd.org; Sat, 23 Sep 2006 08:55:16 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 23 Sep 2006 08:55:16 GMT Message-Id: <200609230855.k8N8tGjF039664@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 106538 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Sep 2006 08:55:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=106538 Change 106538 by rdivacky@rdivacky_witten on 2006/09/23 08:54:44 Implement CLONE_VFORK semantics for clone(). Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#5 edit .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#3 edit .. //depot/projects/linuxolator/src/sys/i386/linux/linux.h#4 edit .. //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#2 edit Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#5 (text+ko) ==== @@ -831,6 +831,7 @@ #define CLONE_FILES 0x400 #define CLONE_SIGHAND 0x800 #define CLONE_PID 0x1000 /* this flag does not exist in linux anymore */ +#define CLONE_VFORK 0x4000 #define CLONE_PARENT 0x00008000 #define CLONE_THREAD 0x10000 #define CLONE_SETTLS 0x80000 ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#3 (text+ko) ==== @@ -701,6 +701,15 @@ td->td_retval[0] = p2->p_pid; td->td_retval[1] = 0; + + if (args->flags & CLONE_VFORK) { + /* wait for the children to exit, ie. emulate vfork */ + PROC_LOCK(p2); + while (p2->p_flag & P_PPWAIT) + msleep(td->td_proc, &p2->p_mtx, PWAIT, "ppwait", 0); + PROC_UNLOCK(p2); + } + return (0); } ==== //depot/projects/linuxolator/src/sys/i386/linux/linux.h#4 (text+ko) ==== @@ -794,6 +794,7 @@ #define CLONE_FILES 0x400 #define CLONE_SIGHAND 0x800 #define CLONE_PID 0x1000 /* this flag does not exist in linux anymore */ +#define CLONE_VFORK 0x4000 #define CLONE_PARENT 0x00008000 #define CLONE_THREAD 0x10000 #define CLONE_SETTLS 0x80000 ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#2 (text+ko) ==== @@ -524,6 +524,15 @@ td->td_retval[0] = p2->p_pid; td->td_retval[1] = 0; + + if (args->flags & CLONE_VFORK) { + /* wait for the children to exit, ie. emulate vfork */ + PROC_LOCK(p2); + while (p2->p_flag & P_PPWAIT) + msleep(td->td_proc, &p2->p_mtx, PWAIT, "ppwait", 0); + PROC_UNLOCK(p2); + } + return (0); } From owner-p4-projects@FreeBSD.ORG Sat Sep 23 09:15:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1D20A16A751; Sat, 23 Sep 2006 09:15:49 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C7E9016A721 for ; Sat, 23 Sep 2006 09:15:48 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2989743D66 for ; Sat, 23 Sep 2006 09:15:43 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8N9Fgwp041818 for ; Sat, 23 Sep 2006 09:15:43 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8N9Fg0C041815 for perforce@freebsd.org; Sat, 23 Sep 2006 09:15:42 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 23 Sep 2006 09:15:42 GMT Message-Id: <200609230915.k8N9Fg0C041815@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 106539 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Sep 2006 09:15:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=106539 Change 106539 by rdivacky@rdivacky_witten on 2006/09/23 09:14:44 Return EISDIR in pread() when arg is a directory. Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_file.c#3 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_file.c#3 (text+ko) ==== @@ -724,12 +724,28 @@ struct linux_pread_args *uap; { struct pread_args bsd; + struct vnode *vp; + int error; bsd.fd = uap->fd; bsd.buf = uap->buf; bsd.nbyte = uap->nbyte; bsd.offset = uap->offset; - return pread(td, &bsd); + + error = pread(td, &bsd); + + if (error == 0) { + /* This seems to violate POSIX but linux does it */ + if ((error = fgetvp(td, uap->fd, &vp)) != 0) + return (error); + if (vp->v_type == VDIR) { + vrele(vp); + return (EISDIR); + } + vrele(vp); + } + + return (error); } int From owner-p4-projects@FreeBSD.ORG Sat Sep 23 09:28:09 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE5FB16A416; Sat, 23 Sep 2006 09:28:09 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9A60916A412 for ; Sat, 23 Sep 2006 09:28:09 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3AACB43D62 for ; Sat, 23 Sep 2006 09:27:58 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8N9RwcG042424 for ; Sat, 23 Sep 2006 09:27:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8N9Rw9E042421 for perforce@freebsd.org; Sat, 23 Sep 2006 09:27:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 23 Sep 2006 09:27:58 GMT Message-Id: <200609230927.k8N9Rw9E042421@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 106540 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Sep 2006 09:28:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=106540 Change 106540 by rwatson@rwatson_fledge on 2006/09/23 09:26:58 White space cleanup. Add missing return(0). Affected files ... .. //depot/projects/trustedbsd/priv/sys/kern/kern_jail.c#6 edit Differences ... ==== //depot/projects/trustedbsd/priv/sys/kern/kern_jail.c#6 (text+ko) ==== @@ -591,7 +591,7 @@ /* * The following privileges should be granted to jail once * implemented. - */ + */ /* case PRIV_IPC_READ: */ /* case PRIV_IPC_WRITE: */ /* case PRIV_IPC_EXEC: */ @@ -678,6 +678,7 @@ * jail. */ case PRIV_NETINET_GETCRED: + return (0); default: /* From owner-p4-projects@FreeBSD.ORG Sat Sep 23 09:39:14 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DC74116A416; Sat, 23 Sep 2006 09:39:13 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9E49B16A403 for ; Sat, 23 Sep 2006 09:39:13 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4D01F43D66 for ; Sat, 23 Sep 2006 09:39:13 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8N9dDxo043315 for ; Sat, 23 Sep 2006 09:39:13 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8N9dCgk043312 for perforce@freebsd.org; Sat, 23 Sep 2006 09:39:12 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 23 Sep 2006 09:39:12 GMT Message-Id: <200609230939.k8N9dCgk043312@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 106541 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Sep 2006 09:39:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=106541 Change 106541 by rdivacky@rdivacky_witten on 2006/09/23 09:38:17 This fixes clone05 test from LTP. But I dont understand the logic much this will need someone to look at it because its possible that we are waiting and timeouting or something. Anyway - linux_vfork() doesnt seem to need this which is strange. Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#4 edit .. //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#3 edit Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#4 (text+ko) ==== @@ -705,6 +705,7 @@ if (args->flags & CLONE_VFORK) { /* wait for the children to exit, ie. emulate vfork */ PROC_LOCK(p2); + p2->p_flag |= P_PPWAIT; while (p2->p_flag & P_PPWAIT) msleep(td->td_proc, &p2->p_mtx, PWAIT, "ppwait", 0); PROC_UNLOCK(p2); ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#3 (text+ko) ==== @@ -528,6 +528,7 @@ if (args->flags & CLONE_VFORK) { /* wait for the children to exit, ie. emulate vfork */ PROC_LOCK(p2); + p2->p_flag |= P_PPWAIT; while (p2->p_flag & P_PPWAIT) msleep(td->td_proc, &p2->p_mtx, PWAIT, "ppwait", 0); PROC_UNLOCK(p2); From owner-p4-projects@FreeBSD.ORG Sat Sep 23 10:23:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B80416A415; Sat, 23 Sep 2006 10:23:13 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 42EEE16A40F for ; Sat, 23 Sep 2006 10:23:13 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C08FD43D82 for ; Sat, 23 Sep 2006 10:23:08 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8NAN8K4046899 for ; Sat, 23 Sep 2006 10:23:08 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8NAN876046896 for perforce@freebsd.org; Sat, 23 Sep 2006 10:23:08 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 23 Sep 2006 10:23:08 GMT Message-Id: <200609231023.k8NAN876046896@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 106543 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Sep 2006 10:23:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=106543 Change 106543 by rdivacky@rdivacky_witten on 2006/09/23 10:22:21 Return EINVAL instead of EFAULT when namelen is not correct. Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_socket.c#6 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_socket.c#6 (text+ko) ==== @@ -723,8 +723,11 @@ bsd_args.anamelen = PTRIN(linux_args.namelen);/* XXX */ error = accept(td, &bsd_args); bsd_to_linux_sockaddr((struct sockaddr *)bsd_args.name); - if (error) + if (error) { + if (error == EFAULT && linux_args.namelen != sizeof(struct sockaddr_in)) + return (EINVAL); return (error); + } if (linux_args.addr) { error = linux_sa_put(PTRIN(linux_args.addr)); if (error) { From owner-p4-projects@FreeBSD.ORG Sat Sep 23 10:36:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1029A16A415; Sat, 23 Sep 2006 10:36:27 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A0D7216A403 for ; Sat, 23 Sep 2006 10:36:26 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2242243D5A for ; Sat, 23 Sep 2006 10:36:26 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8NAaQGT047501 for ; Sat, 23 Sep 2006 10:36:26 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8NAaP5M047498 for perforce@freebsd.org; Sat, 23 Sep 2006 10:36:25 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 23 Sep 2006 10:36:25 GMT Message-Id: <200609231036.k8NAaP5M047498@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 106545 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Sep 2006 10:36:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=106545 Change 106545 by rdivacky@rdivacky_witten on 2006/09/23 10:35:33 Return EINVAL instead of EACCESS if invalid access mode is entered. Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_file.c#4 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_file.c#4 (text+ko) ==== @@ -49,6 +49,7 @@ #include #include #include +#include #include #include @@ -480,6 +481,10 @@ char *path; int error; + /* linux convention */ + if (args->flags & ~(F_OK | X_OK | W_OK | R_OK)) + return (EINVAL); + LCONVPATHEXIST(td, args->path, &path); #ifdef DEBUG @@ -488,6 +493,7 @@ #endif error = kern_access(td, path, UIO_SYSSPACE, args->flags); LFREEPATH(path); + return (error); } From owner-p4-projects@FreeBSD.ORG Sat Sep 23 12:09:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1696B16A416; Sat, 23 Sep 2006 12:09:22 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E6BC416A403 for ; Sat, 23 Sep 2006 12:09:21 +0000 (UTC) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9545A43D60 for ; Sat, 23 Sep 2006 12:09:21 +0000 (GMT) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8NC9LGm054039 for ; Sat, 23 Sep 2006 12:09:21 GMT (envelope-from netchild@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8NC9LKZ054036 for perforce@freebsd.org; Sat, 23 Sep 2006 12:09:21 GMT (envelope-from netchild@freebsd.org) Date: Sat, 23 Sep 2006 12:09:21 GMT Message-Id: <200609231209.k8NC9LKZ054036@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to netchild@freebsd.org using -f From: Alexander Leidinger To: Perforce Change Reviews Cc: Subject: PERFORCE change 106547 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Sep 2006 12:09:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=106547 Change 106547 by netchild@netchild_magellan on 2006/09/23 12:09:15 1. Flexible on-demand linking to FreeBSD native AIO module. Only when linux_io_xxx() is called will native AIO module be loaded. 2. Only two symbols "aio_init_aioinfo" and "aio_aqueue" of the native AIO module need to be exported. Submitted by: Intron Requested by: netchild (something similar to 1) Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_aio.c#5 edit .. //depot/projects/linuxolator/src/sys/kern/vfs_aio.c#3 edit .. //depot/projects/linuxolator/src/sys/modules/aio/Makefile#3 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_aio.c#5 (text+ko) ==== @@ -44,6 +44,9 @@ #include #include #include +#include +#include +#include #include #ifdef COMPAT_LINUX32 @@ -190,13 +193,13 @@ */ #define LINUX_AIO_LOCK(p) { \ if ((p)->p_aioinfo == NULL) \ - aio_init_aioinfo(p); \ + p_aio_init_aioinfo(p); \ mtx_lock((struct mtx *)((p)->p_aioinfo)); \ } #define LINUX_AIO_UNLOCK(p) { \ if ((p)->p_aioinfo == NULL) \ - aio_init_aioinfo(p); \ + p_aio_init_aioinfo(p); \ mtx_unlock((struct mtx *)((p)->p_aioinfo)); \ } @@ -211,18 +214,43 @@ * which is NOT a normal calling way and can cause kernel crash. */ -/* Variables in /sys/kern/vfs_aio.c, XXX defined with "static" */ -extern int max_aio_queue_per_proc; /* sysctl */ -extern int max_queue_count; /* sysctl */ +#define NATIVE_AIO_MODULE_NAME "aio" +static struct mod_depend native_aio_module_depend = {1, 1, 1}; +static linker_file_t native_aio_module_handle = NULL; + +/* Mirror of sysctls in /sys/kern/vfs_aio.c */ +#define NATIVE_AIO_SYSCTL_CAPACITY_PROC "vfs.aio.max_aio_queue_per_proc" +static int native_aio_capacity_proc; +#define NATIVE_AIO_SYSCTL_CAPACITY_SYS "vfs.aio.max_aio_queue" +static int native_aio_capacity_sys; /* For declaration of aio_aqueue(), defined in /sys/kern/vfs_aio.c */ struct aioliojob; /* Functions in /sys/kern/vfs_aio.c, XXX defined with "static" */ -extern void aio_init_aioinfo(struct proc *p); -extern int aio_aqueue(struct thread *td, struct aiocb *job, +#define GET_INTERNAL_FUNC_POINTER(s) { \ + * ((caddr_t *) & p_ ## s) = linker_file_lookup_symbol( \ + native_aio_module_handle, #s, FALSE); \ + if (p_ ## s == NULL) \ + break; \ +} +static void (*p_aio_init_aioinfo) (struct proc *p); +static int (*p_aio_aqueue) (struct thread *td, struct aiocb *job, struct aioliojob *lio, int type, int osigev); +/* System calls in /sys/kern/vfs_aio.c */ +#define DEFINE_SYSCALL_POINTER_VARIABLE(s) \ + static int (* p_ ## s) (struct thread *, struct s ## _args *) +#define GET_SYSCALL_POINTER(s) { \ + * ((sy_call_t **) & p_ ## s) = sysent[SYS_ ## s].sy_call; \ + if ((sy_call_t *) p_ ## s == (sy_call_t *)lkmressys) \ + break; \ +} +DEFINE_SYSCALL_POINTER_VARIABLE(aio_return); +DEFINE_SYSCALL_POINTER_VARIABLE(aio_suspend); +DEFINE_SYSCALL_POINTER_VARIABLE(aio_cancel); +DEFINE_SYSCALL_POINTER_VARIABLE(aio_error); + static int user_mem_rw_verify(void *p, size_t s) { char buf[256]; @@ -394,6 +422,87 @@ return nerr; } +static int link_to_native_aio_module(struct thread *td) +{ + int nerr; + + if (native_aio_module_handle != NULL) + { /* Linking has been done successfully. */ + + return 0; + } + + nerr = linker_reference_module(NATIVE_AIO_MODULE_NAME, + &native_aio_module_depend, &native_aio_module_handle); + if (nerr) + return nerr; + + do { + nerr = EINVAL; + + /* Kernel internal functions */ + GET_INTERNAL_FUNC_POINTER(aio_init_aioinfo); + GET_INTERNAL_FUNC_POINTER(aio_aqueue); + + /* System calls */ + GET_SYSCALL_POINTER(aio_return); + GET_SYSCALL_POINTER(aio_suspend); + GET_SYSCALL_POINTER(aio_cancel); + GET_SYSCALL_POINTER(aio_error); + + nerr = 0; + } while (0); + + if (nerr) + { + linker_release_module(NULL, NULL, native_aio_module_handle); + native_aio_module_handle = NULL; + + printf(LMSG("Unable to link to the native module \"" + NATIVE_AIO_MODULE_NAME "\" correctly.")); + + return nerr; + } + + return 0; +} + +#define LINK_TO_NATIVE_AIO_MODULE() \ + if (link_to_native_aio_module(td)) { \ + printf(LMSG("Please load the correct module \"" \ + NATIVE_AIO_MODULE_NAME "\" correctly " \ + "to provide FreeBSD " \ + "native Asynchronous I/O support.")); \ + return ENOSYS; \ +} + +static int mirror_native_aio_sysctl(struct thread *td) +{ + int nerr = 0; + int l; + + l = sizeof(native_aio_capacity_proc); + nerr = kernel_sysctlbyname(td, NATIVE_AIO_SYSCTL_CAPACITY_PROC, + &native_aio_capacity_proc, &l, NULL, 0, + NULL ,0); + if (nerr) + return nerr; + + l = sizeof(native_aio_capacity_sys); + nerr = kernel_sysctlbyname(td, NATIVE_AIO_SYSCTL_CAPACITY_SYS, + &native_aio_capacity_sys, &l, NULL, 0, + NULL ,0); + if (nerr) + return nerr; + + DPRINTF(NATIVE_AIO_SYSCTL_CAPACITY_PROC "=%d, " + NATIVE_AIO_SYSCTL_CAPACITY_SYS "=%d", + native_aio_capacity_proc, + native_aio_capacity_sys); + + return nerr; +} + /* Linux system call io_setup(2) */ int linux_io_setup(struct thread *td, struct linux_io_setup_args *args) { @@ -404,18 +513,29 @@ int nerr = 0, nr, nrall, nq, arg_nr_reqs; DARGPRINTF("%u, %p", args->nr_reqs, args->ctxp); + LINK_TO_NATIVE_AIO_MODULE(); + nerr = mirror_native_aio_sysctl(td); + if (nerr) + { + printf(LMSG("linux_io_setup(): Unable to query sysctls " + NATIVE_AIO_SYSCTL_CAPACITY_PROC + " and/or " NATIVE_AIO_SYSCTL_CAPACITY_SYS + " .")); + return nerr; + } /* Signed integer is a little safer than unsigned */ arg_nr_reqs = args->nr_reqs; if (arg_nr_reqs <= 0) return EINVAL; - if (arg_nr_reqs > max_aio_queue_per_proc - || arg_nr_reqs > max_queue_count) + if (arg_nr_reqs > native_aio_capacity_proc + || arg_nr_reqs > native_aio_capacity_sys) { printf(LMSG("linux_io_setup(): Please increase sysctls " - "vfs.aio.max_aio_queue_per_proc " - "and/or vfs.aio.max_aio_queue. ")); + NATIVE_AIO_SYSCTL_CAPACITY_PROC + " and/or " NATIVE_AIO_SYSCTL_CAPACITY_SYS + " .")); return ENOMEM; } @@ -455,12 +575,12 @@ nq, nr, nrall); /* Check whether there are enough resources for requested queue */ - if (arg_nr_reqs > max_aio_queue_per_proc - nr - || arg_nr_reqs > max_queue_count - nrall) { + if (arg_nr_reqs > native_aio_capacity_proc - nr + || arg_nr_reqs > native_aio_capacity_sys - nrall) { printf(LMSG("linux_io_setup(): " "Please increase sysctls " - "vfs.aio.max_aio_queue_per_proc " - "and/or vfs.aio.max_aio_queue. " + NATIVE_AIO_SYSCTL_CAPACITY_PROC + " and/or " NATIVE_AIO_SYSCTL_CAPACITY_SYS " ." "Besides %d queues of %d requests totally " "for this process, and %d requests' queues " "totally for the whole system, " @@ -519,6 +639,7 @@ struct aio_return_args aioretargs; DARGPRINTF("%lx", (unsigned long)args->ctx); + LINK_TO_NATIVE_AIO_MODULE(); p = td->td_proc; @@ -570,7 +691,7 @@ /* Cancel FreeBSD native clone */ cancelargs.fd = preq->req_linux.aio_fildes; cancelargs.aiocbp = preq->req_pbsd; - aio_cancel(td, &cancelargs); + p_aio_cancel(td, &cancelargs); DPRINTF("aio_cancel() returned %ld", (long)td->td_retval[0]); if (td->td_retval[0] == AIO_NOTCANCELED) printf(LMSG("linux_io_destroy(): Asynchronous IO " @@ -584,7 +705,7 @@ if (td->td_retval[0] == AIO_ALLDONE) { aioretargs.aiocbp = preq->req_pbsd; - aio_return(td, &aioretargs); + p_aio_return(td, &aioretargs); DPRINTF("aio_return(%p) returned %ld", aioretargs.aiocbp, (long)td->td_retval[0]); @@ -640,6 +761,7 @@ (unsigned long) args->ctx_id, (long)args->min_nr, (long)args->nr, args->events, args->timeout); + LINK_TO_NATIVE_AIO_MODULE(); if (args->nr <= 0) return EINVAL; @@ -731,7 +853,7 @@ break; aioerrargs.aiocbp = preq->req_pbsd; - aio_error(td, &aioerrargs); + p_aio_error(td, &aioerrargs); aio_ret = td->td_retval[0]; td->td_retval[0] = 0; @@ -750,7 +872,7 @@ LINUX_AIO_REQ_UNHOOK(pctx, preq); aioretargs.aiocbp = preq->req_pbsd; - aio_err = aio_return(td, &aioretargs); + aio_err = p_aio_return(td, &aioretargs); aio_ret = td->td_retval[0]; td->td_retval[0] = 0; @@ -846,7 +968,7 @@ aiosusargs.timeout = NULL; } - aio_err = aio_suspend(td, &aiosusargs); + aio_err = p_aio_suspend(td, &aiosusargs); DPRINTF("aio_suspend(%p, %d, %p) returned %ld", aiosusargs.aiocbp, aiosusargs.nent, aiosusargs.timeout, (long)aio_err); @@ -911,7 +1033,9 @@ struct linux_iocb *porig; struct aiocb iocb, *piocb; - DARGPRINTF("%lx, %ld, %p", (unsigned long)args->ctx_id, (long)args->nr, args->iocbpp); + DARGPRINTF("%lx, %ld, %p", (unsigned long)args->ctx_id, + (long)args->nr, args->iocbpp); + LINK_TO_NATIVE_AIO_MODULE(); if(args->nr <= 0) return EINVAL; @@ -977,7 +1101,7 @@ DUMP_FREEBSD_AIOCB(piocb, 1); /* Submit user space control block */ - nerr = aio_aqueue(td, piocb, NULL, iocb.aio_lio_opcode, 0); + nerr = p_aio_aqueue(td, piocb, NULL, iocb.aio_lio_opcode, 0); if (nerr != 0) { user_free(td, piocb, sizeof(*piocb)); break; @@ -1022,7 +1146,9 @@ struct linux_io_event evt; struct aio_cancel_args aiocnclargs; - DARGPRINTF("%lx, %p, %p", (unsigned long)args->ctx_id, args->iocb, args->result); + DARGPRINTF("%lx, %p, %p", (unsigned long)args->ctx_id, + args->iocb, args->result); + LINK_TO_NATIVE_AIO_MODULE(); nerr = copyin(args->iocb, &lcb, sizeof(lcb)); if (nerr != 0) @@ -1086,7 +1212,7 @@ /* Cancel FreeBSD native clone */ aiocnclargs.fd = preq->req_linux.aio_fildes; aiocnclargs.aiocbp = preq->req_pbsd; - aio_cancel(td, &aiocnclargs); + p_aio_cancel(td, &aiocnclargs); DPRINTF("aio_cancel() returned %ld", (long)td->td_retval[0]); if (td->td_retval[0] == AIO_CANCELED) { @@ -1204,6 +1330,16 @@ mtx_destroy(&linux_aio_context_list_mtx); uma_zdestroy(linux_aio_request_zone); uma_zdestroy(linux_aio_context_zone); + if (native_aio_module_handle != NULL) + { + /* + * linker_release_module() cannot be used here. + * It tries to hold "kld_sx", conflicting against + * module_unload(). + */ + linker_file_unload(native_aio_module_handle, + LINKER_UNLOAD_NORMAL); + } break; case MOD_SHUTDOWN: break; @@ -1221,4 +1357,3 @@ }; DECLARE_MODULE(linuxaio, linux_aio_mod, SI_SUB_VFS, SI_ORDER_ANY); -MODULE_DEPEND(linuxaio, aio, 1, 1, 1); ==== //depot/projects/linuxolator/src/sys/kern/vfs_aio.c#3 (text+ko) ==== @@ -139,7 +139,7 @@ SYSCTL_INT(_vfs_aio, OID_AUTO, target_aio_procs, CTLFLAG_RW, &target_aio_procs, 0, "Preferred number of ready kernel threads for async IO"); -int max_queue_count = MAX_AIO_QUEUE; +static int max_queue_count = MAX_AIO_QUEUE; SYSCTL_INT(_vfs_aio, OID_AUTO, max_aio_queue, CTLFLAG_RW, &max_queue_count, 0, "Maximum number of aio requests to queue, globally"); @@ -172,7 +172,7 @@ SYSCTL_INT(_vfs_aio, OID_AUTO, max_aio_per_proc, CTLFLAG_RW, &max_aio_per_proc, 0, "Maximum active aio requests per process (stored in the process)"); -int max_aio_queue_per_proc = MAX_AIO_QUEUE_PER_PROC; +static int max_aio_queue_per_proc = MAX_AIO_QUEUE_PER_PROC; SYSCTL_INT(_vfs_aio, OID_AUTO, max_aio_queue_per_proc, CTLFLAG_RW, &max_aio_queue_per_proc, 0, "Maximum queued aio requests per process (stored in the process)"); ==== //depot/projects/linuxolator/src/sys/modules/aio/Makefile#3 (text+ko) ==== @@ -5,8 +5,6 @@ KMOD= aio SRCS= vfs_aio.c opt_vfs_aio.h vnode_if.h -EXPORT_SYMS= max_aio_queue_per_proc max_queue_count \ - aio_init_aioinfo aio_aqueue aio_suspend \ - aio_cancel aio_return aio_error +EXPORT_SYMS= aio_init_aioinfo aio_aqueue .include From owner-p4-projects@FreeBSD.ORG Sat Sep 23 12:20:38 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D51FE16A4ED; Sat, 23 Sep 2006 12:20:37 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 95CD716A4D2 for ; Sat, 23 Sep 2006 12:20:37 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 466F243D46 for ; Sat, 23 Sep 2006 12:20:36 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8NCKa8i054536 for ; Sat, 23 Sep 2006 12:20:36 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8NCKaSn054531 for perforce@freebsd.org; Sat, 23 Sep 2006 12:20:36 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 23 Sep 2006 12:20:36 GMT Message-Id: <200609231220.k8NCKaSn054531@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 106548 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Sep 2006 12:20:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=106548 Change 106548 by rdivacky@rdivacky_witten on 2006/09/23 12:19:48 Return EINVAL instead of EADDRNOTAVAIL in a case of bad salen param to bind(). Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_socket.c#7 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_socket.c#7 (text+ko) ==== @@ -615,6 +615,8 @@ error = kern_bind(td, linux_args.s, sa); free(sa, M_SONAME); + if (error == EADDRNOTAVAIL && linux_args.namelen != sizeof(struct sockaddr_in)) + return (EINVAL); return (error); } From owner-p4-projects@FreeBSD.ORG Sat Sep 23 12:47:12 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E466D16A415; Sat, 23 Sep 2006 12:47:11 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A851616A40F for ; Sat, 23 Sep 2006 12:47:11 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6EC3D43D4C for ; Sat, 23 Sep 2006 12:47:11 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8NClBG2064242 for ; Sat, 23 Sep 2006 12:47:11 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8NCl9Q1062641 for perforce@freebsd.org; Sat, 23 Sep 2006 12:47:09 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 23 Sep 2006 12:47:09 GMT Message-Id: <200609231247.k8NCl9Q1062641@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 106549 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Sep 2006 12:47:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=106549 Change 106549 by rwatson@rwatson_peppercorn on 2006/09/23 12:46:23 Update audit page to note that as of FreeBSD 6.2, audit support is included in the base FreeBSD source tree, and so most development (other than OpenBSM) will move there. Note that OpenBSM is maintained external to CVS, with occasional CVS imports of OpenBSM releases. Affected files ... .. //depot/projects/trustedbsd/www/audit.page#3 edit Differences ... ==== //depot/projects/trustedbsd/www/audit.page#3 (text+ko) ==== @@ -29,7 +29,7 @@ - $P4: //depot/projects/trustedbsd/www/audit.page#2 $ + $P4: //depot/projects/trustedbsd/www/audit.page#3 $ @@ -64,12 +64,19 @@ "audit pipes" for live application monitoring of system events, and an audit support library.

+

As of FreeBSD 6.2-RELEASE, audit support is included in the base + FreeBSD distribution, and further development of the kernel + implementation will take place in the FreeBSD CVS repository rather + than Perforce.

+

The file format and API are based on Sun's published Basic Security Module (BSM), the de facto industry standard, and are provided via a BSD-licensed OpenBSM user space package. This package is portable to other operating systems, including Apple's Mac OS X, Solaris, and Linux, and permits the writing of - portable audit-related applications.

+ portable audit-related applications. + OpenBSM is maintained by the TrustedBSD Project, and new versions + are imported into the FreeBSD CVS repository intermittently.

Discussion of the TrustedBSD Audit implementation, as well as the OpenBSM package, takes place on the X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C0CF716A47C; Sat, 23 Sep 2006 14:07:58 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6BD6B16A403 for ; Sat, 23 Sep 2006 14:07:58 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 92FA743D82 for ; Sat, 23 Sep 2006 14:07:52 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8NE7qpC074498 for ; Sat, 23 Sep 2006 14:07:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8NE7q8n074489 for perforce@freebsd.org; Sat, 23 Sep 2006 14:07:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 23 Sep 2006 14:07:52 GMT Message-Id: <200609231407.k8NE7q8n074489@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 106552 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Sep 2006 14:07:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=106552 Change 106552 by rwatson@rwatson_peppercorn on 2006/09/23 14:07:43 If no command line argument is specified to auditreduce(1), use stdin. This was the documented behavior previously, but was not actually implemented. Be a bit more specific in the auditreduce(1) man page about what to do with auditreduce's output. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#37 edit .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.1#11 edit .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#16 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#37 (text+ko) ==== @@ -7,6 +7,10 @@ occurs while processing the return token. - getacfilesz(3) API added to read new audit_control(5) filesz setting, which auditd(8) now sets the kernel audit trail rotation size to. +- auditreduce(1) now uses stdin if no file names are specified on the command + line; this was the documented behavior previously, but it was not + implemented. Be more specific in auditreduce(1)'s examples section about + what might be done with the output of auditreduce. OpenBSM 1.0 alpha 11 @@ -253,4 +257,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#36 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#37 $ ==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.1#11 (text+ko) ==== @@ -25,7 +25,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.1#10 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.1#11 $ .\" .Dd January 24, 2004 .Dt AUDITREDUCE 1 @@ -136,6 +136,11 @@ .Pp .Nm -m AUE_SETLOGIN /var/audit/20031016184719.20031017122634 +.Pp +Output from the above command lines will typically be piped to a new trail +file, or via standard output to the +.Xr praudit 1 +command. .Sh SEE ALSO .Xr praudit 1 , .Xr audit_control 5 , ==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#16 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#15 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#16 $ */ /* @@ -84,7 +84,7 @@ usage(const char *msg) { fprintf(stderr, "%s\n", msg); - fprintf(stderr, "Usage: auditreduce [options] audit-trail-file [....] \n"); + fprintf(stderr, "Usage: auditreduce [options] [file ...]\n"); fprintf(stderr, "\tOptions are : \n"); fprintf(stderr, "\t-A : all records\n"); fprintf(stderr, "\t-a YYYYMMDD[HH[[MM[SS]]] : after date\n"); @@ -704,8 +704,12 @@ argv += optind; argc -= optind; - if (argc == 0) - usage("Filename needed"); + if (argc == 0) { + if (select_records(stdin) == -1) + errx(EXIT_FAILURE, + "Couldn't select records from stdin"); + exit(EXIT_SUCCESS); + } /* * XXX: We should actually be merging records here. From owner-p4-projects@FreeBSD.ORG Sat Sep 23 16:19:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DCE1E16A412; Sat, 23 Sep 2006 16:19:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B679516A407 for ; Sat, 23 Sep 2006 16:19:18 +0000 (UTC) (envelope-from kabaev@gmail.com) Received: from wx-out-0506.google.com (wx-out-0506.google.com [66.249.82.230]) by mx1.FreeBSD.org (Postfix) with ESMTP id CDC4643D5E for ; Sat, 23 Sep 2006 16:19:17 +0000 (GMT) (envelope-from kabaev@gmail.com) Received: by wx-out-0506.google.com with SMTP id i27so1348724wxd for ; Sat, 23 Sep 2006 09:19:17 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:date:from:to:cc:subject:message-id:in-reply-to:references:x-mailer:mime-version:content-type; b=l3ZHItQxoeXuJc8n7OjPLNfZTVVDi0cVNV1PMk2lRISt1bA9OJ1brxKdRHTfvniAloYFtmtgZg7aDVlhJSNAllYEjq3LIEV9/3nAc6Z1PRakRMrnB0aeybtBLblW8w1oXFZfS6koS9WQGoBzE0g5ooWNn0RwTZbts/Y6pZxKMpA= Received: by 10.70.68.11 with SMTP id q11mr2961703wxa; Sat, 23 Sep 2006 09:19:16 -0700 (PDT) Received: from kan.dnsalias.net ( [24.63.93.195]) by mx.gmail.com with ESMTP id 25sm556483wra.2006.09.23.09.19.16; Sat, 23 Sep 2006 09:19:16 -0700 (PDT) Date: Sat, 23 Sep 2006 12:19:12 -0400 From: Alexander Kabaev To: Alexander Leidinger Message-ID: <20060923121912.568e1d9a@kan.dnsalias.net> In-Reply-To: <200609231209.k8NC9LKZ054036@repoman.freebsd.org> References: <200609231209.k8NC9LKZ054036@repoman.freebsd.org> X-Mailer: Sylpheed-Claws 2.4.0 (GTK+ 2.8.20; i386-portbld-freebsd7.0) Mime-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_MFxb8lp624lVN8A3=sfGao6"; protocol="application/pgp-signature"; micalg=PGP-SHA1 Cc: Perforce Change Reviews Subject: Re: PERFORCE change 106547 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Sep 2006 16:19:19 -0000 --Sig_MFxb8lp624lVN8A3=sfGao6 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable On Sat, 23 Sep 2006 12:09:21 GMT Alexander Leidinger wrote: > http://perforce.freebsd.org/chv.cgi?CH=3D106547 >=20 > Change 106547 by netchild@netchild_magellan on 2006/09/23 12:09:15 >=20 > 1. Flexible on-demand linking to FreeBSD native AIO module. > Only when linux_io_xxx() is called will native AIO module be loaded. > 2. Only two symbols "aio_init_aioinfo" and "aio_aqueue" of > the native AIO module need to be exported. > Submitted by: Intron > Requested by: netchild (something similar to 1) >=20 Hi, I am worried about accepting anonymous contributions into our tree. Who is to answer if someday anonymous benefactor will send us proprietary or GPLed code? --=20 Alexander Kabaev --Sig_MFxb8lp624lVN8A3=sfGao6 Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (FreeBSD) iD8DBQFFFV6DQ6z1jMm+XZYRAvdYAKCWdyzL9MpAayM7f6ucr+bGeiBEZwCgrExy 6/t5SMMu0MsthRsM2gTd8KQ= =h64P -----END PGP SIGNATURE----- --Sig_MFxb8lp624lVN8A3=sfGao6-- From owner-p4-projects@FreeBSD.ORG Sat Sep 23 16:37:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A324616A416; Sat, 23 Sep 2006 16:37:52 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 630D216A40F for ; Sat, 23 Sep 2006 16:37:52 +0000 (UTC) (envelope-from netchild@FreeBSD.org) Received: from www.ebusiness-leidinger.de (jojo.ms-net.de [84.16.236.246]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9DAE943D68 for ; Sat, 23 Sep 2006 16:37:51 +0000 (GMT) (envelope-from netchild@FreeBSD.org) Received: from Andro-Beta.Leidinger.net (p54A5D9E7.dip.t-dialin.net [84.165.217.231]) (authenticated bits=0) by www.ebusiness-leidinger.de (8.13.6/8.13.6) with ESMTP id k8NGDiEc037982; Sat, 23 Sep 2006 18:13:44 +0200 (CEST) (envelope-from netchild@FreeBSD.org) Received: from Magellan.Leidinger.net (Magellan.Leidinger.net [192.168.1.1]) by Andro-Beta.Leidinger.net (8.13.4/8.13.3) with ESMTP id k8NGbhJR059575; Sat, 23 Sep 2006 18:37:44 +0200 (CEST) (envelope-from netchild@FreeBSD.org) Date: Sat, 23 Sep 2006 18:38:24 +0200 From: Alexander Leidinger To: Alexander Kabaev Message-ID: <20060923183824.203b8f11@Magellan.Leidinger.net> In-Reply-To: <20060923121912.568e1d9a@kan.dnsalias.net> References: <200609231209.k8NC9LKZ054036@repoman.freebsd.org> <20060923121912.568e1d9a@kan.dnsalias.net> Organization: FreeBSD X-Mailer: Sylpheed-Claws 2.4.0 (GTK+ 2.8.20; i386-portbld-freebsd7.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Virus-Scanned: by amavisd-new Cc: Perforce Change Reviews Subject: Re: PERFORCE change 106547 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Sep 2006 16:37:52 -0000 Quoting Alexander Kabaev (Sat, 23 Sep 2006 12:19:12 -0400): > On Sat, 23 Sep 2006 12:09:21 GMT > Alexander Leidinger wrote: > > > http://perforce.freebsd.org/chv.cgi?CH=106547 > > > > Change 106547 by netchild@netchild_magellan on 2006/09/23 12:09:15 > > > > 1. Flexible on-demand linking to FreeBSD native AIO module. > > Only when linux_io_xxx() is called will native AIO module be loaded. > > 2. Only two symbols "aio_init_aioinfo" and "aio_aqueue" of > > the native AIO module need to be exported. > > Submitted by: Intron > > Requested by: netchild (something similar to 1) > > > > Hi, > > I am worried about accepting anonymous contributions into our tree. Who > is to answer if someday anonymous benefactor will send us proprietary > or GPLed code? Who can guarantee that "Hugo Egon" is really Hugo Egon and developed the stuff on his own? What about "Ports Fury" (grep the commit logs for it)? What about "Alexander Leidinger" or "Alexander Kabaev" ? Bye, Alexander. -- ...and that is how we know the Earth to be banana-shaped. http://www.Leidinger.net Alexander @ Leidinger.net: PGP ID = B0063FE7 http://www.FreeBSD.org netchild @ FreeBSD.org : PGP ID = 72077137 From owner-p4-projects@FreeBSD.ORG Sat Sep 23 17:03:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2736F16A416; Sat, 23 Sep 2006 17:03:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DE3D216A407 for ; Sat, 23 Sep 2006 17:03:06 +0000 (UTC) (envelope-from kabaev@gmail.com) Received: from wx-out-0506.google.com (wx-out-0506.google.com [66.249.82.229]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3D5CA43D4C for ; Sat, 23 Sep 2006 17:03:05 +0000 (GMT) (envelope-from kabaev@gmail.com) Received: by wx-out-0506.google.com with SMTP id i27so1357445wxd for ; Sat, 23 Sep 2006 10:03:04 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:date:from:to:cc:subject:message-id:in-reply-to:references:x-mailer:mime-version:content-type; b=nIJWVQDFmsSucNNY5uAHgbXnKupk833+iu4ErH3w90eCzZJd5NBP0hWjC3qqOrTBHuqO5Vd1cwmENFoZLoEuVBLdZWTCI4l57uAEzUJrXMkc9r/jNp0sHFbB1rl7bq/Qym6y3SR7mcT5JEgmg+D0naoMUsbUMe/yjzIdCbkkSCg= Received: by 10.90.25.3 with SMTP id 3mr1018042agy; Sat, 23 Sep 2006 10:03:04 -0700 (PDT) Received: from kan.dnsalias.net ( [24.63.93.195]) by mx.gmail.com with ESMTP id 15sm1039520wrl.2006.09.23.10.03.04; Sat, 23 Sep 2006 10:03:04 -0700 (PDT) Date: Sat, 23 Sep 2006 13:02:59 -0400 From: Alexander Kabaev To: Alexander Leidinger Message-ID: <20060923130259.04d759ce@kan.dnsalias.net> In-Reply-To: <20060923183824.203b8f11@Magellan.Leidinger.net> References: <200609231209.k8NC9LKZ054036@repoman.freebsd.org> <20060923121912.568e1d9a@kan.dnsalias.net> <20060923183824.203b8f11@Magellan.Leidinger.net> X-Mailer: Sylpheed-Claws 2.4.0 (GTK+ 2.8.20; i386-portbld-freebsd7.0) Mime-Version: 1.0 Content-Type: multipart/signed; boundary=Sig_Ro1JQrxO3vOpsZlzehL8LgW; protocol="application/pgp-signature"; micalg=PGP-SHA1 Cc: Perforce Change Reviews Subject: Re: PERFORCE change 106547 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Sep 2006 17:03:07 -0000 --Sig_Ro1JQrxO3vOpsZlzehL8LgW Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable On Sat, 23 Sep 2006 18:38:24 +0200 Alexander Leidinger wrote: > Quoting Alexander Kabaev (Sat, 23 Sep 2006 > 12:19:12 -0400): >=20 > > On Sat, 23 Sep 2006 12:09:21 GMT > > Alexander Leidinger wrote: > >=20 > > > http://perforce.freebsd.org/chv.cgi?CH=3D106547 > > >=20 > > > Change 106547 by netchild@netchild_magellan on 2006/09/23 12:09:15 > > >=20 > > > 1. Flexible on-demand linking to FreeBSD native AIO > > > module. Only when linux_io_xxx() is called will native AIO module > > > be loaded. 2. Only two symbols "aio_init_aioinfo" and > > > "aio_aqueue" of the native AIO module need to be exported. > > > Submitted by: Intron > > > Requested by: netchild (something similar to 1) > > >=20 > >=20 > > Hi, > >=20 > > I am worried about accepting anonymous contributions into our tree. > > Who is to answer if someday anonymous benefactor will send us > > proprietary or GPLed code? >=20 > Who can guarantee that "Hugo Egon" is really > Hugo Egon and developed the stuff on his own? What about "Ports > Fury" (grep the commit logs for it)? What about "Alexander Leidinger" > or "Alexander Kabaev" ? >=20 > Bye, > Alexander. >=20 > --=20 > ...and that is how we know the Earth to be banana-shaped. > http://www.Leidinger.net Alexander @ Leidinger.net: PGP ID =3D B0063FE7 > http://www.FreeBSD.org netchild @ FreeBSD.org : PGP ID =3D 72077137 Last two are easy. You can be traced to people who recommended for a commit bit, at the very least. Ports Fufy has live witnesses of its existence. Some anonymous people on the lists, like LONE character, I forgot an exact spelling, uses uses his real name in PRs. I doubt you will find massive evidence of anonymous coders in src/. Ports are little more liberal, but not by much. --=20 Alexander Kabaev --Sig_Ro1JQrxO3vOpsZlzehL8LgW Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (FreeBSD) iD8DBQFFFWjHQ6z1jMm+XZYRAqalAKDMcrFrFK43DB+hDUl/VAwjlhIHqwCgkfFm syT1aeL0W+gM2mBirPotHao= =PHqF -----END PGP SIGNATURE----- --Sig_Ro1JQrxO3vOpsZlzehL8LgW-- From owner-p4-projects@FreeBSD.ORG Sat Sep 23 17:42:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1494516A4C9; Sat, 23 Sep 2006 17:42:11 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A1FA616A47C for ; Sat, 23 Sep 2006 17:42:10 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3015E43D62 for ; Sat, 23 Sep 2006 17:42:02 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8NHg2OA003457 for ; Sat, 23 Sep 2006 17:42:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8NHg2IN003454 for perforce@freebsd.org; Sat, 23 Sep 2006 17:42:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 23 Sep 2006 17:42:02 GMT Message-Id: <200609231742.k8NHg2IN003454@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 106564 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Sep 2006 17:42:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=106564 Change 106564 by rwatson@rwatson_peppercorn on 2006/09/23 17:41:51 Correct selection expression syntax documented in audit_control(5) man page -- '^' always means "don't record", and no prefix means to record both successful and failed events. Affected files ... .. //depot/projects/trustedbsd/openbsm/man/audit_control.5#13 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/man/audit_control.5#13 (text+ko) ==== @@ -26,7 +26,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_control.5#12 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_control.5#13 $ .\" .Dd January 4, 2006 .Dt AUDIT_CONTROL 5 @@ -85,12 +85,14 @@ The following prefixes may be used for each class: .Pp .Bl -tag -width Ds -compact -offset indent +.It (none) +Record both successful and failed events .It + Record successful events .It - Record failed events .It ^ -Record both successful and failed events +Record neither successful nor failed events .It ^+ Do not record successful events .It ^- From owner-p4-projects@FreeBSD.ORG Sat Sep 23 18:05:35 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D076816A5C4; Sat, 23 Sep 2006 18:05:34 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6C6D916A407 for ; Sat, 23 Sep 2006 18:05:34 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DB53843D6D for ; Sat, 23 Sep 2006 18:05:33 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8NI5XrT006029 for ; Sat, 23 Sep 2006 18:05:33 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8NI5XkF006026 for perforce@freebsd.org; Sat, 23 Sep 2006 18:05:33 GMT (envelope-from imp@freebsd.org) Date: Sat, 23 Sep 2006 18:05:33 GMT Message-Id: <200609231805.k8NI5XkF006026@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 106566 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Sep 2006 18:05:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=106566 Change 106566 by imp@imp_paco-paco on 2006/09/23 18:04:48 compile fix Affected files ... .. //depot/projects/usb/src/sys/dev/ubsec/ubsec.c#2 edit Differences ... ==== //depot/projects/usb/src/sys/dev/ubsec/ubsec.c#2 (text+ko) ==== @@ -937,7 +937,7 @@ MD5Update(&md5ctx, macini->cri_key, macini->cri_klen / 8); MD5Update(&md5ctx, hmac_ipad_buffer, - HMAC_BLOCK_LEN - (macini->cri_klen / 8)); + MD5_HMAC_BLOCK_LEN - (macini->cri_klen / 8)); bcopy(md5ctx.state, ses->ses_hminner, sizeof(md5ctx.state)); } else { @@ -945,7 +945,7 @@ SHA1Update(&sha1ctx, macini->cri_key, macini->cri_klen / 8); SHA1Update(&sha1ctx, hmac_ipad_buffer, - HMAC_BLOCK_LEN - (macini->cri_klen / 8)); + SHA1_HMAC_BLOCK_LEN - (macini->cri_klen / 8)); bcopy(sha1ctx.h.b32, ses->ses_hminner, sizeof(sha1ctx.h.b32)); } @@ -958,7 +958,7 @@ MD5Update(&md5ctx, macini->cri_key, macini->cri_klen / 8); MD5Update(&md5ctx, hmac_opad_buffer, - HMAC_BLOCK_LEN - (macini->cri_klen / 8)); + MD5_HMAC_BLOCK_LEN - (macini->cri_klen / 8)); bcopy(md5ctx.state, ses->ses_hmouter, sizeof(md5ctx.state)); } else { @@ -966,7 +966,7 @@ SHA1Update(&sha1ctx, macini->cri_key, macini->cri_klen / 8); SHA1Update(&sha1ctx, hmac_opad_buffer, - HMAC_BLOCK_LEN - (macini->cri_klen / 8)); + SHA1_HMAC_BLOCK_LEN - (macini->cri_klen / 8)); bcopy(sha1ctx.h.b32, ses->ses_hmouter, sizeof(sha1ctx.h.b32)); } From owner-p4-projects@FreeBSD.ORG Sat Sep 23 18:41:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D5DC616A412; Sat, 23 Sep 2006 18:41:54 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 985F416A403 for ; Sat, 23 Sep 2006 18:41:54 +0000 (UTC) (envelope-from netchild@FreeBSD.org) Received: from www.ebusiness-leidinger.de (jojo.ms-net.de [84.16.236.246]) by mx1.FreeBSD.org (Postfix) with ESMTP id E4FFF43D53 for ; Sat, 23 Sep 2006 18:41:53 +0000 (GMT) (envelope-from netchild@FreeBSD.org) Received: from Andro-Beta.Leidinger.net (p54A5D9E7.dip.t-dialin.net [84.165.217.231]) (authenticated bits=0) by www.ebusiness-leidinger.de (8.13.6/8.13.6) with ESMTP id k8NIHl7t039065; Sat, 23 Sep 2006 20:17:47 +0200 (CEST) (envelope-from netchild@FreeBSD.org) Received: from Magellan.Leidinger.net (Magellan.Leidinger.net [192.168.1.1]) by Andro-Beta.Leidinger.net (8.13.4/8.13.3) with ESMTP id k8NIflQe076908; Sat, 23 Sep 2006 20:41:47 +0200 (CEST) (envelope-from netchild@FreeBSD.org) Date: Sat, 23 Sep 2006 20:42:28 +0200 From: Alexander Leidinger To: Alexander Kabaev Message-ID: <20060923204228.02eeed4e@Magellan.Leidinger.net> In-Reply-To: <20060923130259.04d759ce@kan.dnsalias.net> References: <200609231209.k8NC9LKZ054036@repoman.freebsd.org> <20060923121912.568e1d9a@kan.dnsalias.net> <20060923183824.203b8f11@Magellan.Leidinger.net> <20060923130259.04d759ce@kan.dnsalias.net> Organization: FreeBSD X-Mailer: Sylpheed-Claws 2.4.0 (GTK+ 2.8.20; i386-portbld-freebsd7.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Virus-Scanned: by amavisd-new Cc: Perforce Change Reviews Subject: Re: PERFORCE change 106547 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Sep 2006 18:41:55 -0000 Quoting Alexander Kabaev (Sat, 23 Sep 2006 13:02:59 -0400): > > > I am worried about accepting anonymous contributions into our tree. > > > Who is to answer if someday anonymous benefactor will send us > > > proprietary or GPLed code? > > > > Who can guarantee that "Hugo Egon" is really > > Hugo Egon and developed the stuff on his own? What about "Ports > > Fury" (grep the commit logs for it)? What about "Alexander Leidinger" > > or "Alexander Kabaev" ? > Last two are easy. You can be traced to people who recommended for a > commit bit, at the very least. Ports Fufy has live witnesses of its > existence. Some anonymous people on the lists, like > LONE character, I forgot an exact spelling, uses uses his > real name in PRs. I doubt you will find massive evidence of anonymous > coders in src/. Ports are little more liberal, but not by much. I ask him if he is willing to provide his real name for the commit to CVS. We can discuss this further after I got an answer. Bye, Alexander. -- ...and that is how we know the Earth to be banana-shaped. http://www.Leidinger.net Alexander @ Leidinger.net: PGP ID = B0063FE7 http://www.FreeBSD.org netchild @ FreeBSD.org : PGP ID = 72077137 From owner-p4-projects@FreeBSD.ORG Sat Sep 23 21:01:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A3AD116A47B; Sat, 23 Sep 2006 21:01:28 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 51ED516A407 for ; Sat, 23 Sep 2006 21:01:28 +0000 (UTC) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9114043D77 for ; Sat, 23 Sep 2006 21:01:19 +0000 (GMT) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8NL1JAH025178 for ; Sat, 23 Sep 2006 21:01:19 GMT (envelope-from netchild@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8NL1HoO025165 for perforce@freebsd.org; Sat, 23 Sep 2006 21:01:17 GMT (envelope-from netchild@freebsd.org) Date: Sat, 23 Sep 2006 21:01:17 GMT Message-Id: <200609232101.k8NL1HoO025165@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to netchild@freebsd.org using -f From: Alexander Leidinger To: Perforce Change Reviews Cc: Subject: PERFORCE change 106573 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Sep 2006 21:01:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=106573 Change 106573 by netchild@netchild_magellan on 2006/09/23 21:00:33 IFC Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/ia32/ia32_sigtramp.S#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/include/stdarg.h#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/isa/atpic_vector.S#2 integrate .. //depot/projects/linuxolator/src/sys/arm/include/stdarg.h#2 integrate .. //depot/projects/linuxolator/src/sys/bsm/audit.h#2 integrate .. //depot/projects/linuxolator/src/sys/bsm/audit_internal.h#2 integrate .. //depot/projects/linuxolator/src/sys/bsm/audit_kevents.h#2 integrate .. //depot/projects/linuxolator/src/sys/bsm/audit_record.h#2 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32.h#2 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_proto.h#3 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/syscalls.master#3 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_file.c#5 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_socket.c#8 integrate .. //depot/projects/linuxolator/src/sys/conf/NOTES#2 integrate .. //depot/projects/linuxolator/src/sys/conf/files.amd64#3 integrate .. //depot/projects/linuxolator/src/sys/conf/files.i386#3 integrate .. //depot/projects/linuxolator/src/sys/conf/options#2 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/acpi.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/bce/if_bce.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/bge/if_bge.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/em/if_em.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ipmi/ipmi.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ipmi/ipmi_acpi.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/ipmi/ipmi_isa.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/ipmi/ipmi_kcs.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/ipmi/ipmi_pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ipmi/ipmi_smbios.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ipmi/ipmi_smbus.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/ipmi/ipmi_smic.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/ipmi/ipmi_ssif.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/ipmi/ipmivars.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/kbdmux/kbdmux.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/mfi/mfi.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/mpt/mpt_cam.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/buffer.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/buffer.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/channel.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/channel.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/channel_if.m#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/dsp.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/dsp.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/mixer.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/mixer.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/sound.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/sound.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/if_cdce.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/conf/NOTES#3 integrate .. //depot/projects/linuxolator/src/sys/i386/include/stdarg.h#2 integrate .. //depot/projects/linuxolator/src/sys/i386/isa/atpic_vector.s#2 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#4 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/linux_proto.h#3 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/linux_syscall.h#3 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/linux_sysent.c#3 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/syscalls.master#2 integrate .. //depot/projects/linuxolator/src/sys/ia64/include/stdarg.h#2 integrate .. //depot/projects/linuxolator/src/sys/kern/init_sysent.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_mac.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_proc.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_resource.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_thr.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_umtx.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/syscalls.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/syscalls.master#3 integrate .. //depot/projects/linuxolator/src/sys/kern/systrace_args.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/sysv_msg.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/sysv_sem.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/sysv_shm.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/tty.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/tty_pty.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/tty_tty.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_mbuf.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_socket.c#3 integrate .. //depot/projects/linuxolator/src/sys/modules/ipmi/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/net/if_bridge.c#3 integrate .. //depot/projects/linuxolator/src/sys/net/if_loop.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/if_ether.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_input.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet6/in6.c#2 integrate .. //depot/projects/linuxolator/src/sys/powerpc/include/stdarg.h#2 integrate .. //depot/projects/linuxolator/src/sys/security/audit/audit_bsm.c#3 integrate .. //depot/projects/linuxolator/src/sys/security/audit/audit_bsm_token.c#2 integrate .. //depot/projects/linuxolator/src/sys/security/audit/audit_worker.c#3 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_inet.c#3 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_internal.h#3 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_net.c#2 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_pipe.c#2 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_posix_sem.c#2 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_process.c#2 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_socket.c#2 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_sysv_msg.c#2 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_sysv_sem.c#2 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_sysv_shm.c#2 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_vfs.c#2 integrate .. //depot/projects/linuxolator/src/sys/sparc64/include/stdarg.h#2 integrate .. //depot/projects/linuxolator/src/sys/sparc64/sparc64/pmap.c#2 integrate .. //depot/projects/linuxolator/src/sys/sparc64/sparc64/tsb.c#2 integrate .. //depot/projects/linuxolator/src/sys/sys/cdefs.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/ipmi.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/mbuf.h#3 integrate .. //depot/projects/linuxolator/src/sys/sys/param.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/rtprio.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/soundcard.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/syscall.h#3 integrate .. //depot/projects/linuxolator/src/sys/sys/syscall.mk#3 integrate .. //depot/projects/linuxolator/src/sys/sys/sysproto.h#3 integrate .. //depot/projects/linuxolator/src/sys/sys/thr.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/umtx.h#2 integrate Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/conf/NOTES#2 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.58 2006/07/29 18:38:53 marcel Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.59 2006/09/22 22:11:28 jhb Exp $ # # @@ -346,6 +346,7 @@ # # Miscellaneous hardware: # +# ipmi: Intelligent Platform Management Interface # smbios: DMI/SMBIOS entry point # vpd: Vital Product Data kernel interface # cy: Cyclades serial driver @@ -368,6 +369,7 @@ device digi_Xe device digi_Xem device digi_Xr +device ipmi # Parallel (8255 PPI) basic I/O (mode 0) port (e.g. Advantech PCL-724) device pbio hint.pbio.0.at="isa" ==== //depot/projects/linuxolator/src/sys/amd64/ia32/ia32_sigtramp.S#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/ia32/ia32_sigtramp.S,v 1.2 2003/08/22 23:19:02 peter Exp $ + * $FreeBSD: src/sys/amd64/ia32/ia32_sigtramp.S,v 1.3 2006/09/23 13:42:09 davidxu Exp $ */ #include "opt_compat.h" @@ -45,8 +45,6 @@ calll *IA32_SIGF_HANDLER(%esp) leal IA32_SIGF_UC(%esp),%eax /* get ucontext */ pushl %eax - movl IA32_UC_GS(%eax),%gs /* restore %gs */ - movl IA32_UC_FS(%eax),%fs /* restore %fs */ movl IA32_UC_ES(%eax),%es /* restore %es */ movl IA32_UC_DS(%eax),%ds /* restore %ds */ movl $SYS_sigreturn,%eax @@ -62,8 +60,6 @@ calll *IA32_SIGF_HANDLER(%esp) leal IA32_SIGF_UC4(%esp),%eax/* get ucontext */ pushl %eax - movl IA32_UC4_GS(%eax),%gs /* restore %gs */ - movl IA32_UC4_FS(%eax),%fs /* restore %fs */ movl IA32_UC4_ES(%eax),%es /* restore %es */ movl IA32_UC4_DS(%eax),%ds /* restore %ds */ movl $344,%eax /* 4.x SYS_sigreturn */ ==== //depot/projects/linuxolator/src/sys/amd64/include/stdarg.h#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/stdarg.h,v 1.8 2005/03/11 22:16:09 peter Exp $ + * $FreeBSD: src/sys/amd64/include/stdarg.h,v 1.9 2006/09/21 01:37:01 kan Exp $ */ #ifndef _MACHINE_STDARG_H_ @@ -42,7 +42,7 @@ #ifdef __GNUCLIKE_BUILTIN_STDARG #define va_start(ap, last) \ - __builtin_stdarg_start((ap), (last)) + __builtin_va_start((ap), (last)) #define va_arg(ap, type) \ __builtin_va_arg((ap), type) ==== //depot/projects/linuxolator/src/sys/amd64/isa/atpic_vector.S#2 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/amd64/isa/atpic_vector.S,v 1.46 2005/12/08 18:33:30 jhb Exp $ + * $FreeBSD: src/sys/amd64/isa/atpic_vector.S,v 1.47 2006/09/20 20:52:11 wkoszek Exp $ */ /* @@ -41,7 +41,7 @@ #include "assym.s" /* - * Macros for interrupt interrupt entry, call to handler, and exit. + * Macros for interrupt entry, call to handler, and exit. */ #define INTR(irq_num, vec_name) \ .text ; \ ==== //depot/projects/linuxolator/src/sys/arm/include/stdarg.h#2 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * @(#)stdarg.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/arm/include/stdarg.h,v 1.3 2005/03/02 21:33:22 joerg Exp $ + * $FreeBSD: src/sys/arm/include/stdarg.h,v 1.4 2006/09/21 01:37:02 kan Exp $ */ #ifndef _MACHINE_STDARG_H_ @@ -45,7 +45,7 @@ #ifdef __GNUCLIKE_BUILTIN_STDARG #define va_start(ap, last) \ - __builtin_stdarg_start((ap), (last)) + __builtin_va_start((ap), (last)) #define va_arg(ap, type) \ __builtin_va_arg((ap), type) ==== //depot/projects/linuxolator/src/sys/bsm/audit.h#2 (text) ==== @@ -30,8 +30,8 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#31 $ - * $FreeBSD: src/sys/bsm/audit.h,v 1.5 2006/08/26 08:17:58 rwatson Exp $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#34 $ + * $FreeBSD: src/sys/bsm/audit.h,v 1.6 2006/09/21 07:27:02 rwatson Exp $ */ #ifndef _BSM_AUDIT_H @@ -59,23 +59,19 @@ * Triggers for the audit daemon. */ #define AUDIT_TRIGGER_MIN 1 -#define AUDIT_TRIGGER_LOW_SPACE 1 -#define AUDIT_TRIGGER_OPEN_NEW 2 -#define AUDIT_TRIGGER_READ_FILE 3 -#define AUDIT_TRIGGER_CLOSE_AND_DIE 4 -#define AUDIT_TRIGGER_NO_SPACE 5 -#define AUDIT_TRIGGER_MAX 5 +#define AUDIT_TRIGGER_LOW_SPACE 1 /* Below low watermark. */ +#define AUDIT_TRIGGER_ROTATE_KERNEL 2 /* Kernel requests rotate. */ +#define AUDIT_TRIGGER_READ_FILE 3 /* Re-read config file. */ +#define AUDIT_TRIGGER_CLOSE_AND_DIE 4 /* Terminate audit. */ +#define AUDIT_TRIGGER_NO_SPACE 5 /* Below min free space. */ +#define AUDIT_TRIGGER_ROTATE_USER 6 /* User requests roate. */ +#define AUDIT_TRIGGER_MAX 6 /* - * Special file that will be read for trigger events from the kernel - * (FreeBSD). + * The special device filename (FreeBSD). */ -#define AUDIT_TRIGGER_FILE "/dev/audit" - -/* - * The special device filename. - */ #define AUDITDEV_FILENAME "audit" +#define AUDIT_TRIGGER_FILE ("/dev/" AUDITDEV_FILENAME) /* * Pre-defined audit IDs @@ -182,12 +178,12 @@ #define AUDIT_PERZONE 0x2000 /* - * Audit queue control parameters. + * Default audit queue control parameters. */ #define AQ_HIWATER 100 #define AQ_MAXHIGH 10000 #define AQ_LOWATER 10 -#define AQ_BUFSZ 1024 +#define AQ_BUFSZ MAXAUDITDATA #define AQ_MAXBUFSZ 1048576 /* ==== //depot/projects/linuxolator/src/sys/bsm/audit_internal.h#2 (text) ==== @@ -34,8 +34,8 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#11 $ - * $FreeBSD: src/sys/bsm/audit_internal.h,v 1.4 2006/09/02 10:49:44 rwatson Exp $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#14 $ + * $FreeBSD: src/sys/bsm/audit_internal.h,v 1.5 2006/09/21 07:27:02 rwatson Exp $ */ #ifndef _AUDIT_INTERNAL_H ==== //depot/projects/linuxolator/src/sys/bsm/audit_kevents.h#2 (text) ==== @@ -30,8 +30,8 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#26 $ - * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.7 2006/08/26 08:17:58 rwatson Exp $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#28 $ + * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.8 2006/09/21 07:27:02 rwatson Exp $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -468,6 +468,9 @@ #define AUE_EXTATTR_SET_LINK 43111 /* FreeBSD. */ #define AUE_EXTATTR_LIST_LINK 43112 /* FreeBSD. */ #define AUE_EXTATTR_DELETE_LINK 43113 /* FreeBSD. */ +#define AUE_KENV 43114 /* FreeBSD. */ +#define AUE_JAIL_ATTACH 43115 /* FreeBSD. */ +#define AUE_SYSCTL_WRITE 43116 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the ==== //depot/projects/linuxolator/src/sys/bsm/audit_record.h#2 (text) ==== @@ -30,8 +30,8 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#19 $ - * $FreeBSD: src/sys/bsm/audit_record.h,v 1.5 2006/09/01 11:45:39 wsalamon Exp $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#21 $ + * $FreeBSD: src/sys/bsm/audit_record.h,v 1.6 2006/09/21 07:27:02 rwatson Exp $ */ #ifndef _BSM_AUDIT_RECORD_H_ ==== //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/freebsd32/freebsd32.h,v 1.5 2006/08/17 22:50:32 imp Exp $ + * $FreeBSD: src/sys/compat/freebsd32/freebsd32.h,v 1.6 2006/09/22 15:04:28 davidxu Exp $ */ #ifndef _COMPAT_FREEBSD32_FREEBSD32_H_ @@ -103,4 +103,18 @@ int32_t f_spare[2]; }; +struct thr_param32 { + uint32_t start_func; + uint32_t arg; + uint32_t stack_base; + uint32_t stack_size; + uint32_t tls_base; + uint32_t tls_size; + uint32_t child_tid; + uint32_t parent_tid; + int32_t flags; + uint32_t rtp; + uint32_t spare[3]; +}; + #endif /* !_COMPAT_FREEBSD32_FREEBSD32_H_ */ ==== //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_misc.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.58 2006/08/16 00:02:36 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.59 2006/09/22 15:04:28 davidxu Exp $"); #include "opt_compat.h" @@ -67,7 +67,9 @@ #include #include #include +#include #include +#include #include #include #include @@ -2121,6 +2123,60 @@ return (error); } +int +freebsd32_thr_new(struct thread *td, + struct freebsd32_thr_new_args *uap) +{ + struct thr_param32 param32; + struct thr_param param; + int error; + + if (uap->param_size < 0 || + uap->param_size > sizeof(struct thr_param32)) + return (EINVAL); + bzero(¶m, sizeof(struct thr_param)); + bzero(¶m32, sizeof(struct thr_param32)); + error = copyin(uap->param, ¶m32, uap->param_size); + if (error != 0) + return (error); + param.start_func = PTRIN(param32.start_func); + param.arg = PTRIN(param32.arg); + param.stack_base = PTRIN(param32.stack_base); + param.stack_size = param32.stack_size; + param.tls_base = PTRIN(param32.tls_base); + param.tls_size = param32.tls_size; + param.child_tid = PTRIN(param32.child_tid); + param.parent_tid = PTRIN(param32.parent_tid); + param.flags = param32.flags; + param.rtp = PTRIN(param32.rtp); + param.spare[0] = PTRIN(param32.spare[0]); + param.spare[1] = PTRIN(param32.spare[1]); + param.spare[2] = PTRIN(param32.spare[2]); + + return (kern_thr_new(td, ¶m)); +} + +int +freebsd32_thr_suspend(struct thread *td, struct freebsd32_thr_suspend_args *uap) +{ + struct timespec32 ts32; + struct timespec ts, *tsp; + int error; + + error = 0; + tsp = NULL; + if (uap->timeout != NULL) { + error = copyin((const void *)uap->timeout, (void *)&ts32, + sizeof(struct timespec32)); + if (error != 0) + return (error); + ts.tv_sec = ts32.tv_sec; + ts.tv_nsec = ts32.tv_nsec; + tsp = &ts; + } + return (kern_thr_suspend(td, tsp)); +} + #if 0 int ==== //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_proto.h#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.62 2006/09/17 13:29:35 rwatson Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.75 2006/09/17 13:28:11 rwatson Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.66 2006/09/23 00:27:53 davidxu Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.79 2006/09/23 00:27:11 davidxu Exp */ #ifndef _FREEBSD32_SYSPROTO_H_ @@ -280,6 +280,20 @@ char oucp_l_[PADL_(struct freebsd32_ucontext *)]; struct freebsd32_ucontext * oucp; char oucp_r_[PADR_(struct freebsd32_ucontext *)]; char ucp_l_[PADL_(const struct freebsd32_ucontext *)]; const struct freebsd32_ucontext * ucp; char ucp_r_[PADR_(const struct freebsd32_ucontext *)]; }; +struct freebsd32_thr_suspend_args { + char timeout_l_[PADL_(const struct timespec32 *)]; const struct timespec32 * timeout; char timeout_r_[PADR_(const struct timespec32 *)]; +}; +struct freebsd32_umtx_op_args { + char obj_l_[PADL_(void *)]; void * obj; char obj_r_[PADR_(void *)]; + char op_l_[PADL_(int)]; int op; char op_r_[PADR_(int)]; + char val_l_[PADL_(uintptr_t)]; uintptr_t val; char val_r_[PADR_(uintptr_t)]; + char uaddr_l_[PADL_(void *)]; void * uaddr; char uaddr_r_[PADR_(void *)]; + char uaddr2_l_[PADL_(void *)]; void * uaddr2; char uaddr2_r_[PADR_(void *)]; +}; +struct freebsd32_thr_new_args { + char param_l_[PADL_(struct thr_param32 *)]; struct thr_param32 * param; char param_r_[PADR_(struct thr_param32 *)]; + char param_size_l_[PADL_(int)]; int param_size; char param_size_r_[PADR_(int)]; +}; int freebsd32_wait4(struct thread *, struct freebsd32_wait4_args *); int freebsd32_recvmsg(struct thread *, struct freebsd32_recvmsg_args *); int freebsd32_sendmsg(struct thread *, struct freebsd32_sendmsg_args *); @@ -326,6 +340,9 @@ int freebsd32_getcontext(struct thread *, struct freebsd32_getcontext_args *); int freebsd32_setcontext(struct thread *, struct freebsd32_setcontext_args *); int freebsd32_swapcontext(struct thread *, struct freebsd32_swapcontext_args *); +int freebsd32_thr_suspend(struct thread *, struct freebsd32_thr_suspend_args *); +int freebsd32_umtx_op(struct thread *, struct freebsd32_umtx_op_args *); +int freebsd32_thr_new(struct thread *, struct freebsd32_thr_new_args *); #ifdef COMPAT_43 @@ -461,6 +478,9 @@ #define FREEBSD32_SYS_AUE_freebsd32_getcontext AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_setcontext AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_swapcontext AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_thr_suspend AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_umtx_op AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_thr_new AUE_NULL #undef PAD_ #undef PADL_ ==== //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_syscall.h#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.60 2006/09/17 13:29:35 rwatson Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.75 2006/09/17 13:28:11 rwatson Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.64 2006/09/23 00:27:53 davidxu Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.79 2006/09/23 00:27:11 davidxu Exp */ #define FREEBSD32_SYS_syscall 0 @@ -300,20 +300,20 @@ #define FREEBSD32_SYS_freebsd32_getcontext 421 #define FREEBSD32_SYS_freebsd32_setcontext 422 #define FREEBSD32_SYS_freebsd32_swapcontext 423 -#define FREEBSD32_SYS_thr_create 430 +#define FREEBSD32_SYS_sigwait 429 #define FREEBSD32_SYS_thr_exit 431 #define FREEBSD32_SYS_thr_self 432 #define FREEBSD32_SYS_thr_kill 433 #define FREEBSD32_SYS__umtx_lock 434 #define FREEBSD32_SYS__umtx_unlock 435 #define FREEBSD32_SYS_jail_attach 436 -#define FREEBSD32_SYS_thr_suspend 442 +#define FREEBSD32_SYS_freebsd32_thr_suspend 442 #define FREEBSD32_SYS_thr_wake 443 #define FREEBSD32_SYS_kldunloadf 444 +#define FREEBSD32_SYS_freebsd32_umtx_op 454 +#define FREEBSD32_SYS_freebsd32_thr_new 455 #define FREEBSD32_SYS_sigqueue 456 #define FREEBSD32_SYS_abort2 463 #define FREEBSD32_SYS_thr_set_name 464 -#define FREEBSD32_SYS_thr_setscheduler 466 -#define FREEBSD32_SYS_thr_getscheduler 467 -#define FREEBSD32_SYS_thr_setschedparam 468 +#define FREEBSD32_SYS_rtprio_thread 466 #define FREEBSD32_SYS_MAXSYSCALL 471 ==== //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_syscalls.c#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.51 2006/09/17 13:29:35 rwatson Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.75 2006/09/17 13:28:11 rwatson Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.55 2006/09/23 00:27:53 davidxu Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.79 2006/09/23 00:27:11 davidxu Exp */ const char *freebsd32_syscallnames[] = { @@ -436,8 +436,8 @@ "#426", /* 426 = __acl_set_link */ "#427", /* 427 = __acl_delete_link */ "#428", /* 428 = __acl_aclcheck_link */ - "#429", /* 429 = sigwait */ - "thr_create", /* 430 = thr_create */ + "sigwait", /* 429 = sigwait */ + "#430", /* 430 = thr_create; */ "thr_exit", /* 431 = thr_exit */ "thr_self", /* 432 = thr_self */ "thr_kill", /* 433 = thr_kill */ @@ -449,7 +449,7 @@ "#439", /* 439 = extattr_list_link */ "#440", /* 440 = kse_switchin */ "#441", /* 441 = ksem_timedwait */ - "thr_suspend", /* 442 = thr_suspend */ + "freebsd32_thr_suspend", /* 442 = freebsd32_thr_suspend */ "thr_wake", /* 443 = thr_wake */ "kldunloadf", /* 444 = kldunloadf */ "#445", /* 445 = audit */ @@ -461,8 +461,8 @@ "#451", /* 451 = getaudit_addr */ "#452", /* 452 = setaudit_addr */ "#453", /* 453 = auditctl */ - "#454", /* 454 = _umtx_op */ - "#455", /* 455 = thr_new */ + "freebsd32_umtx_op", /* 454 = freebsd32_umtx_op */ + "freebsd32_thr_new", /* 455 = freebsd32_thr_new */ "sigqueue", /* 456 = sigqueue */ "#457", /* 457 = kmq_open */ "#458", /* 458 = kmq_setattr */ @@ -473,9 +473,9 @@ "abort2", /* 463 = abort2 */ "thr_set_name", /* 464 = thr_set_name */ "#465", /* 465 = aio_fsync */ - "thr_setscheduler", /* 466 = thr_setscheduler */ - "thr_getscheduler", /* 467 = thr_getscheduler */ - "thr_setschedparam", /* 468 = thr_setschedparam */ + "rtprio_thread", /* 466 = rtprio_thread */ + "#467", /* 467 = nosys */ + "#468", /* 468 = nosys */ "#469", /* 469 = __getpath_fromfd */ "#470", /* 470 = __getpath_fromaddr */ }; ==== //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_sysent.c#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.61 2006/09/17 13:29:35 rwatson Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.75 2006/09/17 13:28:11 rwatson Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.65 2006/09/23 00:27:53 davidxu Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.79 2006/09/23 00:27:11 davidxu Exp */ #include "opt_compat.h" @@ -461,8 +461,8 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 426 = __acl_set_link */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 427 = __acl_delete_link */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 428 = __acl_aclcheck_link */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 429 = sigwait */ - { AS(thr_create_args), (sy_call_t *)thr_create, AUE_NULL, NULL, 0, 0 }, /* 430 = thr_create */ + { AS(sigwait_args), (sy_call_t *)sigwait, AUE_SIGWAIT, NULL, 0, 0 }, /* 429 = sigwait */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 430 = thr_create; */ { AS(thr_exit_args), (sy_call_t *)thr_exit, AUE_NULL, NULL, 0, 0 }, /* 431 = thr_exit */ { AS(thr_self_args), (sy_call_t *)thr_self, AUE_NULL, NULL, 0, 0 }, /* 432 = thr_self */ { AS(thr_kill_args), (sy_call_t *)thr_kill, AUE_NULL, NULL, 0, 0 }, /* 433 = thr_kill */ @@ -474,7 +474,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 439 = extattr_list_link */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 440 = kse_switchin */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 441 = ksem_timedwait */ - { AS(thr_suspend_args), (sy_call_t *)thr_suspend, AUE_NULL, NULL, 0, 0 }, /* 442 = thr_suspend */ + { AS(freebsd32_thr_suspend_args), (sy_call_t *)freebsd32_thr_suspend, AUE_NULL, NULL, 0, 0 }, /* 442 = freebsd32_thr_suspend */ { AS(thr_wake_args), (sy_call_t *)thr_wake, AUE_NULL, NULL, 0, 0 }, /* 443 = thr_wake */ { AS(kldunloadf_args), (sy_call_t *)kldunloadf, AUE_MODUNLOAD, NULL, 0, 0 }, /* 444 = kldunloadf */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 445 = audit */ @@ -486,8 +486,8 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 451 = getaudit_addr */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 452 = setaudit_addr */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 453 = auditctl */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 454 = _umtx_op */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 455 = thr_new */ + { AS(freebsd32_umtx_op_args), (sy_call_t *)freebsd32_umtx_op, AUE_NULL, NULL, 0, 0 }, /* 454 = freebsd32_umtx_op */ + { AS(freebsd32_thr_new_args), (sy_call_t *)freebsd32_thr_new, AUE_NULL, NULL, 0, 0 }, /* 455 = freebsd32_thr_new */ { AS(sigqueue_args), (sy_call_t *)sigqueue, AUE_NULL, NULL, 0, 0 }, /* 456 = sigqueue */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 457 = kmq_open */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 458 = kmq_setattr */ @@ -498,9 +498,9 @@ { AS(abort2_args), (sy_call_t *)abort2, AUE_NULL, NULL, 0, 0 }, /* 463 = abort2 */ { AS(thr_set_name_args), (sy_call_t *)thr_set_name, AUE_NULL, NULL, 0, 0 }, /* 464 = thr_set_name */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 465 = aio_fsync */ - { AS(thr_setscheduler_args), (sy_call_t *)thr_setscheduler, AUE_NULL, NULL, 0, 0 }, /* 466 = thr_setscheduler */ - { AS(thr_getscheduler_args), (sy_call_t *)thr_getscheduler, AUE_NULL, NULL, 0, 0 }, /* 467 = thr_getscheduler */ - { AS(thr_setschedparam_args), (sy_call_t *)thr_setschedparam, AUE_NULL, NULL, 0, 0 }, /* 468 = thr_setschedparam */ + { AS(rtprio_thread_args), (sy_call_t *)rtprio_thread, AUE_RTPRIO, NULL, 0, 0 }, /* 466 = rtprio_thread */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 467 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 468 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 469 = __getpath_fromfd */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 470 = __getpath_fromaddr */ }; ==== //depot/projects/linuxolator/src/sys/compat/freebsd32/syscalls.master#3 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.75 2006/09/17 13:28:11 rwatson Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.79 2006/09/23 00:27:11 davidxu Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -714,9 +714,9 @@ 427 AUE_NULL UNIMPL __acl_delete_link 428 AUE_NULL UNIMPL __acl_aclcheck_link ; XXX implement -429 AUE_SIGWAIT UNIMPL sigwait -430 AUE_NULL NOPROTO { int thr_create(ucontext_t *ctx, long *id, \ - int flag s); } +429 AUE_SIGWAIT NOPROTO { int sigwait(const sigset_t *set, \ + int *sig); } +430 AUE_NULL UNIMPL thr_create; 431 AUE_NULL NOPROTO { void thr_exit(long *state); } 432 AUE_NULL NOPROTO { int thr_self(long *id); } 433 AUE_NULL NOPROTO { int thr_kill(long id, int sig); } @@ -728,8 +728,8 @@ 439 AUE_EXTATTR_LIST_LINK UNIMPL extattr_list_link 440 AUE_NULL UNIMPL kse_switchin 441 AUE_NULL UNIMPL ksem_timedwait -442 AUE_NULL NOPROTO { int thr_suspend( \ - const struct timespec *timeout); } +442 AUE_NULL STD { int freebsd32_thr_suspend( \ + const struct timespec32 *timeout); } 443 AUE_NULL NOPROTO { int thr_wake(long id); } 444 AUE_MODUNLOAD NOPROTO { int kldunloadf(int fileid, int flags); } 445 AUE_AUDIT UNIMPL audit @@ -741,8 +741,12 @@ 451 AUE_GETAUDIT_ADDR UNIMPL getaudit_addr 452 AUE_SETAUDIT_ADDR UNIMPL setaudit_addr 453 AUE_AUDITCTL UNIMPL auditctl -454 AUE_NULL UNIMPL _umtx_op -455 AUE_NULL UNIMPL thr_new +454 AUE_NULL STD { int freebsd32_umtx_op(void *obj, int op,\ + uintptr_t val, void *uaddr, \ + void *uaddr2); } +455 AUE_NULL STD { int freebsd32_thr_new( \ + struct thr_param32 *param, \ + int param_size); } 456 AUE_NULL NOPROTO { int sigqueue(pid_t pid, int signum, \ void *value); } 457 AUE_NULL UNIMPL kmq_open @@ -754,14 +758,9 @@ 463 AUE_NULL NOPROTO { int abort2(const char *why, int nargs, void **args); } 464 AUE_NULL NOPROTO { int thr_set_name(long id, const char *name); } 465 AUE_NULL UNIMPL aio_fsync -466 AUE_NULL NOPROTO { int thr_setscheduler(long id, int policy,\ - const struct sched_param *param, \ - int param_size); } -467 AUE_NULL NOPROTO { int thr_getscheduler(long id, int *policy,\ - struct sched_param *param, \ - int param_size); } -468 AUE_NULL NOPROTO { int thr_setschedparam(long id, \ - const struct sched_param *param, \ - int param_size); } +466 AUE_RTPRIO NOPROTO { int rtprio_thread(int function, \ + lwpid_t lwpid, struct rtprio *rtp); } +467 AUE_NULL UNIMPL nosys +468 AUE_NULL UNIMPL nosys 469 AUE_NULL UNIMPL __getpath_fromfd 470 AUE_NULL UNIMPL __getpath_fromaddr ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_file.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.97 2006/09/10 13:47:56 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.98 2006/09/23 19:06:54 netchild Exp $"); #include "opt_compat.h" #include "opt_mac.h" ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_socket.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.70 2006/07/19 18:28:52 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.71 2006/09/23 19:06:54 netchild Exp $"); /* XXX we use functions that might not exist. */ #include "opt_compat.h" ==== //depot/projects/linuxolator/src/sys/conf/NOTES#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1380 2006/08/27 12:57:37 marck Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1381 2006/09/20 13:33:40 rwatson Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -994,7 +994,6 @@ options MAC options MAC_BIBA options MAC_BSDEXTENDED -options MAC_DEBUG options MAC_IFOFF options MAC_LOMAC options MAC_MLS ==== //depot/projects/linuxolator/src/sys/conf/files.amd64#3 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.93 2006/09/05 16:55:12 anholt Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.94 2006/09/22 22:11:28 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -161,7 +161,13 @@ dev/if_ndis/if_ndis_usb.c optional ndis usb dev/io/iodev.c optional io dev/ipmi/ipmi.c optional ipmi -dev/ipmi/ipmi_smbios.c optional ipmi isa +dev/ipmi/ipmi_acpi.c optional ipmi acpi +dev/ipmi/ipmi_isa.c optional ipmi isa +dev/ipmi/ipmi_kcs.c optional ipmi +dev/ipmi/ipmi_smic.c optional ipmi +dev/ipmi/ipmi_smbus.c optional ipmi smbus +dev/ipmi/ipmi_smbios.c optional ipmi +dev/ipmi/ipmi_ssif.c optional ipmi smbus dev/ipmi/ipmi_pci.c optional ipmi pci dev/fdc/fdc.c optional fdc dev/fdc/fdc_acpi.c optional fdc ==== //depot/projects/linuxolator/src/sys/conf/files.i386#3 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.565 2006/08/15 12:54:28 netchild Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.566 2006/09/22 22:11:28 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -197,7 +197,13 @@ dev/if_ndis/if_ndis_usb.c optional ndis usb dev/io/iodev.c optional io dev/ipmi/ipmi.c optional ipmi -dev/ipmi/ipmi_smbios.c optional ipmi isa +dev/ipmi/ipmi_acpi.c optional ipmi acpi +dev/ipmi/ipmi_isa.c optional ipmi isa +dev/ipmi/ipmi_kcs.c optional ipmi +dev/ipmi/ipmi_smic.c optional ipmi +dev/ipmi/ipmi_smbus.c optional ipmi smbus +dev/ipmi/ipmi_smbios.c optional ipmi +dev/ipmi/ipmi_ssif.c optional ipmi smbus dev/ipmi/ipmi_pci.c optional ipmi pci dev/kbd/kbd.c optional atkbd | sc | ukbd | vt dev/le/if_le_isa.c optional le isa ==== //depot/projects/linuxolator/src/sys/conf/options#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.557 2006/08/17 00:37:03 julian Exp $ +# $FreeBSD: src/sys/conf/options,v 1.558 2006/09/20 13:33:40 rwatson Exp $ # # On the handling of kernel options # @@ -103,7 +103,6 @@ MAC_ALWAYS_LABEL_MBUF opt_mac.h MAC_BIBA opt_dontuse.h MAC_BSDEXTENDED opt_dontuse.h -MAC_DEBUG opt_mac.h MAC_IFOFF opt_dontuse.h MAC_LOMAC opt_dontuse.h MAC_MLS opt_dontuse.h ==== //depot/projects/linuxolator/src/sys/dev/acpica/acpi.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.228 2006/09/11 19:32:54 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.229 2006/09/21 18:56:03 jhb Exp $"); #include "opt_acpi.h" #include @@ -1083,7 +1083,7 @@ * If we know about this address, deactivate it and release it to the * local pool. If we don't, pass this request up to the parent. */ - if (acpi_sysres_find(bus, type, rman_get_start(r)) == NULL) { + if (acpi_sysres_find(bus, type, rman_get_start(r)) != NULL) { if (rman_get_flags(r) & RF_ACTIVE) { ret = bus_deactivate_resource(child, type, rid, r); if (ret != 0) ==== //depot/projects/linuxolator/src/sys/dev/bce/if_bce.c#3 (text) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.8 2006/09/17 13:33:27 andre Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.9 2006/09/20 18:55:16 ambrisko Exp $"); /* * The following controllers are supported by this driver: @@ -309,6 +309,7 @@ static void bce_ifmedia_sts (struct ifnet *, struct ifmediareq *); static void bce_init_locked (struct bce_softc *); static void bce_init (void *); +static void bce_mgmt_init_locked(struct bce_softc *sc); static void bce_init_context (struct bce_softc *); static void bce_get_mac_addr (struct bce_softc *); @@ -781,6 +782,11 @@ /* Add the supported sysctls to the kernel. */ bce_add_sysctls(sc); + /* Get the firmware running so IPMI still works */ + BCE_LOCK(sc); + bce_mgmt_init_locked(sc); + BCE_UNLOCK(sc); + goto bce_attach_exit; bce_attach_fail: @@ -3241,6 +3247,7 @@ DBPRINT(sc, BCE_VERBOSE_RESET, "Exiting %s()\n", __FUNCTION__); + bce_mgmt_init_locked(sc); } @@ -4569,6 +4576,43 @@ return; } +static void +bce_mgmt_init_locked(struct bce_softc *sc) +{ + u32 val; + struct ifnet *ifp; + + DBPRINT(sc, BCE_VERBOSE_RESET, "Entering %s()\n", __FUNCTION__); + + BCE_LOCK_ASSERT(sc); + + ifp = sc->bce_ifp; + + /* Check if the driver is still running and bail out if it is. */ + if (ifp->if_drv_flags & IFF_DRV_RUNNING) + goto bce_mgmt_init_locked_exit; + + /* Initialize the on-boards CPUs */ + bce_init_cpus(sc); + + val = (BCM_PAGE_BITS - 8) << 24; + REG_WR(sc, BCE_RV2P_CONFIG, val); + + /* Enable all critical blocks in the MAC. */ + REG_WR(sc, BCE_MISC_ENABLE_SET_BITS, + BCE_MISC_ENABLE_SET_BITS_RX_V2P_ENABLE | + BCE_MISC_ENABLE_SET_BITS_RX_DMA_ENABLE | + BCE_MISC_ENABLE_SET_BITS_COMPLETION_ENABLE); + REG_RD(sc, BCE_MISC_ENABLE_SET_BITS); + DELAY(20); + + bce_ifmedia_upd(ifp); +bce_mgmt_init_locked_exit: + DBPRINT(sc, BCE_VERBOSE_RESET, "Exiting %s()\n", __FUNCTION__); + + return; +} + /****************************************************************************/ /* Handles controller initialization when called from an unlocked routine. */ ==== //depot/projects/linuxolator/src/sys/dev/bge/if_bge.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.148 2006/09/18 22:18:21 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.149 2006/09/23 18:55:49 scottl Exp $"); /* * Broadcom BCM570x family gigabit ethernet driver for FreeBSD. @@ -79,6 +79,7 @@ #include #include #include +#include #include #include @@ -419,7 +420,16 @@ DRIVER_MODULE(miibus, bge, miibus_driver, miibus_devclass, 0, 0); static int bge_fake_autoneg = 0; +static int bge_allow_asf = 1; + TUNABLE_INT("hw.bge.fake_autoneg", &bge_fake_autoneg); +TUNABLE_INT("hw.bge.allow_asf", &bge_allow_asf); + +SYSCTL_NODE(_hw, OID_AUTO, bge, CTLFLAG_RD, 0, "BGE driver parameters"); +SYSCTL_INT(_hw_bge, OID_AUTO, fake_autoneg, CTLFLAG_RD, &bge_fake_autoneg, 0, + "Enable fake autonegotiation for certain blade systems"); +SYSCTL_INT(_hw_bge, OID_AUTO, allow_asf, CTLFLAG_RD, &bge_allow_asf, 0, + "Allow ASF mode if available"); static uint32_t >>> TRUNCATED FOR MAIL (1000 lines) <<<