From owner-p4-projects@FreeBSD.ORG Sun Apr 12 07:45:45 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7A8671065672; Sun, 12 Apr 2009 07:45:44 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3A517106566C for ; Sun, 12 Apr 2009 07:45:44 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 27DE78FC0A for ; Sun, 12 Apr 2009 07:45:44 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3C7jiSf000760 for ; Sun, 12 Apr 2009 07:45:44 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3C7jihj000758 for perforce@freebsd.org; Sun, 12 Apr 2009 07:45:44 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 12 Apr 2009 07:45:44 GMT Message-Id: <200904120745.n3C7jihj000758@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 160520 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, 12 Apr 2009 07:45:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=160520 Change 160520 by pgj@petymeg on 2009/04/12 07:45:11 IFC Affected files ... .. //depot/projects/docproj_hu/www/en/gnome/docs/Makefile#3 integrate .. //depot/projects/docproj_hu/www/en/gnome/docs/faq2.sgml#4 integrate .. //depot/projects/docproj_hu/www/en/gnome/docs/faq226.sgml#1 branch .. //depot/projects/docproj_hu/www/en/gnome/docs/gnome2_porting.sgml#4 integrate .. //depot/projects/docproj_hu/www/en/gnome/index.xsl#5 integrate .. //depot/projects/docproj_hu/www/en/gnome/news.xml#3 integrate .. //depot/projects/docproj_hu/www/en/releases/7.2R/Makefile#2 integrate .. //depot/projects/docproj_hu/www/en/releases/7.2R/schedule.sgml#5 integrate .. //depot/projects/docproj_hu/www/en/releng/index.sgml#18 integrate .. //depot/projects/docproj_hu/www/share/sgml/navibar.ent#7 integrate .. //depot/projects/docproj_hu/www/share/sgml/release.ent#12 integrate Differences ... ==== //depot/projects/docproj_hu/www/en/gnome/docs/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: www/en/gnome/docs/Makefile,v 1.27 2009/01/11 22:11:15 marcus Exp $ +# $FreeBSD: www/en/gnome/docs/Makefile,v 1.28 2009/04/11 03:10:05 marcus Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" @@ -17,6 +17,7 @@ DOCS+= faq220.sgml DOCS+= faq222.sgml DOCS+= faq224.sgml +DOCS+= faq226.sgml DOCS+= gnome_porting.sgml DOCS+= gnome1_porting.sgml DOCS+= gnome2_porting.sgml ==== //depot/projects/docproj_hu/www/en/gnome/docs/faq2.sgml#4 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -46,8 +46,8 @@ GTK+ 2 applications when not in a GNOME environment?
  • How do I configure settings for GNOME 1.4 applications under GNOME &gnomever;? -
  • Nautilus-cd-burner does not let me burn CDs, - or Totem/Goobox/Sound-juicer cannot find my CD/DVD drive. +
  • Brasero does not let me burn CDs, + or Totem/Rhythmbox/Sound-juicer cannot find my CD/DVD drive. How can I fix this?
  • How do I add new GDM sessions?
  • How do I disable spatial Nautilus? @@ -252,7 +252,7 @@

    Starting with 2.16, GNOME now lives in LOCALBASE instead of X11BASE. This move can cause strange build problems if the proper + href="&base;/gnome/docs/faq226.html">the proper upgrade steps are not followed. However, if after following all the steps, you may still see errors like the following:

    @@ -374,7 +374,7 @@

    The &gnomeoldver; to &gnomever; may have a few caveats. You are strongly advised to read the - upgrade FAQ for detailed + upgrade FAQ for detailed instructions.

    • @@ -642,15 +642,15 @@
  • -

    Nautilus-cd-burner does not let me burn CDs or - Totem/Goobox/Sound-juicer cannot find my CD/DVD drive. How can I +

    Brasero does not let me burn CDs or + Totem/Rhythmbox/Sound-juicer cannot find my CD/DVD drive. How can I fix this?

    -

    Nautilus-cd-burner, totem, goobox, and sound-juicer cannot +

    Brasero, totem, rhythmbox, and sound-juicer cannot use CD/DVD drives unless support for those devices is enabled in the kernel, and the permissions on the device nodes allow write access. - Nautilus-cd-burner, totem, goobox, and sound-juicer talk to + Brasero, totem, rhythmbox, and sound-juicer talk to CD/DVD drives through the SCSI CAM subsystem. Therefore, you must make sure you have the following configured in your kernel:

    @@ -689,9 +689,9 @@

    The devices in parentheses at the end are important. You must make sure the /dev entries for those devices are writable by the users that will be using - nautilus-cd-burner, totem, goobox, or sound-juicer. In addition + brasero, totem, rhythmbox, or sound-juicer. In addition to those devices, /dev/xpt* must also be writable to - your nautilus-cd-burner, totem, goobox, and sound-juicer users. + your brasero, totem, rhythmbox, and sound-juicer users. The following /etc/devfs.conf configuration will achieve the desired results given the above devlist:

    @@ -700,18 +700,6 @@ perm xpt0 0666 perm pass0 0666 - -

    If you encounter problems burning to discs with - nautilus-cd-burner, set the following GConf - /apps/nautilus-cd-burner/debug to - true using - Applications > System Tools > Configuration Editor - (gconf-editor from the command line). Then - run nautilus-cd-burner from the command line, - reproduce the problem you are having, and capture - the output on the command line. Include this along - with the rest of your - bug report.

    • @@ -1107,7 +1095,7 @@ You can also use gconf-editor to edit it.

    If your card is supported by the "nvidia," "intel", - "i810", or "radeon" (see the radeon(4) man page to make + "openchrome", or "radeon" (see the radeon(4) man page to make sure your card is supported for 3D acceleration) drivers, then compositing should work for you.

    @@ -1127,11 +1115,15 @@ ~/.profile:

    -export GDM_LANG=<locale>
+export LANG=<locale>
+export LC_ALL=<locale>

    Here, <locale> is the desired locale (e.g. en_US.UTF-8, es_ES.ISO8859-15, fr_FR.ISO8859-1, etc.).

    + +

    To set the default locale for the GDM greeter, add the + same environment variables to /etc/profile.

    ==== //depot/projects/docproj_hu/www/en/gnome/docs/gnome2_porting.sgml#4 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -89,6 +89,12 @@ + gnomedesktopsharp20 + x11-toolkits/gnome-desktop-sharp20 + gnomesharp20 + + + gnomedocutils textproc/gnome-doc-utils libxslt @@ -327,14 +333,14 @@ nautilus2 x11-fm/nautilus - librsvg2 eel2 gnomedesktop + librsvg2 gnomedesktop desktopfileutils gvfs nautiluscdburner sysutils/nautilus-cd-burner - nautilus2 desktopfileutils + nautilus2 eel2 desktopfileutils @@ -360,7 +366,7 @@ x11-toolkits/py-gnome-desktop pygnome2 libgnomeprintui gtksourceview gnomepanel libwnck - nautiluscdburner metacity + nautilus2 metacity ==== //depot/projects/docproj_hu/www/en/gnome/index.xsl#5 (text+ko) ==== @@ -4,7 +4,7 @@ ]> - + devel/gnome2-hacker-tools (development tools) -

    Upgrading to GNOME 2.24?

    +

    Upgrading to GNOME 2.26?

    -

    If you are upgrading from GNOME 2.22 to GNOME 2.24, read the - Upgrade FAQ for upgrade +

    If you are upgrading from GNOME 2.22 to GNOME 2.26, read the + Upgrade FAQ for upgrade instructions.

    State of the port

    GNOME for FreeBSD is currently supported on - 6.4, 6-STABLE, 7.0, 7.1, 7-STABLE, and 8-CURRENT. + 6.4, 6-STABLE, 7.1, 7-STABLE, and 8-CURRENT. Most of GNOME has been ported to FreeBSD, but there is still plenty left to be done!

    ==== //depot/projects/docproj_hu/www/en/gnome/news.xml#3 (text+ko) ==== @@ -19,13 +19,44 @@ - $FreeBSD: www/en/gnome/news.xml,v 1.146 2009/01/11 22:10:55 marcus Exp $ + $FreeBSD: www/en/gnome/news.xml,v 1.147 2009/04/11 03:09:00 marcus Exp $ 2009 + April + + + 10 + + + Announcing GNOME 2.26.0 for FreeBSD! + +

    The FreeBSD GNOME tam is proud to announce the release of + GNOME 2.26.0 for FreeBSD. The official release notes can be + found at + + href="http://library.gnome.org/misc/release-notes/2.26/ + + . On the FreeBSD front, we introduced a port of libxul 1.9 as + an alternative for Firefox 2.0 as a Gecko provider. Almost + all of the Gecko consumers can make use of this provider by + setting: +
    + + WITH_GECKO=libxul +
    + + The GNOME 2.26 port was done by ahze, kwm, marcus, and mezz + with contributions by Joseph S. Atkinson, Peter Wemm, Eric L. + Chen, Martin Matuska, Craig Butler, and Pawel Worach.

    +     +     +     + + January @@ -48,10 +79,10 @@

    This release features commits by adamw, ahze, kwm, mezz, and myself. It would not have been possible without are contributors and testers: Alexander Loginov, Craig Butler, - Dmitry Marakasov, Eric L. Chen, Joseph S. Atkinson, Kris Moore, - Lapo Luchini, Nikos Ntarmos, Pawel Worach, Romain Tartiere, TAOKA - Fumiyoshi, Romain Tartiere, Yasuda Keisuke, Zyl - aZ, bf, Florent Thoumie, Peter Wemm, and pluknet.

    + Dmitry Marakasov, Eric L. Chen, Joseph S. Atkinson, Kris + Moore, Lapo Luchini, Nikos Ntarmos, Pawel Worach, Romain + Tartiere, TAOKA Fumiyoshi, Romain Tartiere, Yasuda Keisuke, + Zyl aZ, bf, Florent Thoumie, Peter Wemm, and pluknet.

         ==== //depot/projects/docproj_hu/www/en/releases/7.2R/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: www/en/releases/7.2R/Makefile,v 1.1 2009/03/17 13:39:34 rwatson Exp $ +# $FreeBSD: www/en/releases/7.2R/Makefile,v 1.3 2009/04/10 13:07:15 blackend Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" ==== //depot/projects/docproj_hu/www/en/releases/7.2R/schedule.sgml#5 (text+ko) ==== @@ -1,7 +1,7 @@ - + @@ -86,7 +86,7 @@ doc/ tree slush 10 April 2009 - -- + 10 April 2009 Non-essential commits to the en_US.ISO8859-1/ subtree should be delayed from this point until after the doc/ tree tagging, to give translation teams time to synchronize ==== //depot/projects/docproj_hu/www/en/releng/index.sgml#18 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -296,7 +296,7 @@ doc/ - Open + Slush &contact.doc; SGML/XML based documentation set. ==== //depot/projects/docproj_hu/www/share/sgml/navibar.ent#7 (text+ko) ==== @@ -1,4 +1,4 @@ - + FreeBSD/GNOME '> ==== //depot/projects/docproj_hu/www/share/sgml/release.ent#12 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -347,7 +347,7 @@ Telepítsük a www/nspluginwrapper portot. A port telepítése viszont maga után vonja a - emulators/linux_base + emulators/linux_base-fc4 telepítését is, amely viszont egy nagyobb port. ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/linuxemu/chapter.sgml#6 (text+ko) ==== @@ -7,7 +7,7 @@ The FreeBSD Hungarian Documentation Project Translated by: PALI, Gabor %SOURCE% en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml - %SRCID% 1.136 + %SRCID% 1.137 --> @@ -2131,7 +2131,7 @@ felraknunk (root felhasználóként): - &prompt.root; cd /usr/ports/emulators/linux_base + &prompt.root; cd /usr/ports/emulators/linux_base-fc4 &prompt.root; make install distclean From owner-p4-projects@FreeBSD.ORG Sun Apr 12 08:30:30 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 22A791065673; Sun, 12 Apr 2009 08:30:30 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D2655106564A for ; Sun, 12 Apr 2009 08:30:29 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A64EC8FC0A for ; Sun, 12 Apr 2009 08:30:29 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3C8UT5p006046 for ; Sun, 12 Apr 2009 08:30:29 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3C8UTYM006044 for perforce@freebsd.org; Sun, 12 Apr 2009 08:30:29 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 12 Apr 2009 08:30:29 GMT Message-Id: <200904120830.n3C8UTYM006044@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 160522 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, 12 Apr 2009 08:30:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=160522 Change 160522 by pgj@petymeg on 2009/04/12 08:30:29 MFen (www): 1.26 -> 1.27 hu/share/sgml/navibar.l10n.ent Affected files ... .. //depot/projects/docproj_hu/www/hu/share/sgml/navibar.l10n.ent#26 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/share/sgml/navibar.l10n.ent#26 (text+ko) ==== @@ -4,7 +4,7 @@ @@ -127,7 +127,7 @@
  • FreeBSD/GNOME '> From owner-p4-projects@FreeBSD.ORG Sun Apr 12 11:49:52 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EEB871065673; Sun, 12 Apr 2009 11:49:51 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AA8FB106566B for ; Sun, 12 Apr 2009 11:49:51 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 975178FC12 for ; Sun, 12 Apr 2009 11:49:51 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3CBnp30034875 for ; Sun, 12 Apr 2009 11:49:51 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3CBnp35034873 for perforce@freebsd.org; Sun, 12 Apr 2009 11:49:51 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 12 Apr 2009 11:49:51 GMT Message-Id: <200904121149.n3CBnp35034873@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 160524 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, 12 Apr 2009 11:49:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=160524 Change 160524 by rene@rene_self on 2009/04/12 11:49:13 Fix spelling errors in solid-state article (nl). Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/solid-state/article.sgml#12 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/solid-state/article.sgml#12 (text+ko) ==== @@ -69,7 +69,7 @@ Dit artikel behandelt het gebruik van solid state - disk-apparaten in &os; voor het maken van embeddded + disk-apparaten in &os; voor het maken van embedded systemen. Embedded systemen hebben het voordeel van verhoogde @@ -107,8 +107,8 @@ schijf voor schrijfbewerkingen, en veel sneller voor leesbewerkingen). Een heel belangrijk aspect van flash-geheugen, waarvan de ramnificaties later in dit artikel besproken zullen - worden, is dat elke sector een beperkte herschijfcapaciteit heeft. - Een sector flash-geheugen kan maar een bepald aantal keren + worden, is dat elke sector een beperkte herschrijfcapaciteit heeft. + Een sector flash-geheugen kan maar een bepaald aantal keren beschreven, gewist, en herschreven worden voordat de sector permanent onbruikbaar wordt. Hoewel veel flash-geheugenproducten automatisch slechte blokken in kaart brengen, en hoewel sommigen @@ -119,13 +119,13 @@ schrijfbewerkingen per sector in hun specificaties staan. Dit getal varieert vanwege de omgevingstemperatuur. - In het bijzonder worden ATA-compatibele compact-flash eenheden + In het bijzonder worden ATA-compatibele compact-flash-eenheden besproken, welke vrij populair zijn als opslagmedium voor digitale camera's. Bijzonder interessant is het feit dat de pinnen ervan precies met die van de IDE-bus overeenkomen en dat ze compatibel zijn met de ATA-commandoverzameling. Daarom kunnen deze apparaten direct aan een IDE-bus in een computer gekoppeld worden met een - zeer eenvoudige en goedkope adaptor. Eenmaal op deze wijze + zeer eenvoudige en goedkope adapter. Eenmaal op deze wijze geïmplementeerd zien besturingssystemen zoals &os; het apparaat als een normale harde schijf (doch klein). @@ -138,7 +138,7 @@ Kernelopties Enkele kernelopties zijn specifiek interessant voor degenen - die een embeddded &os;-systeem creëren. + die een embedded &os;-systeem creëren. Ten eerste zullen alle embedded &os;-systemen die flash-geheugen als systeemschijf gebruiken geïntereseerd zijn @@ -179,7 +179,7 @@ maakt een instelbare lijst van mappen in /var aan met het commando &man.mkdir.1;, verandert de modus van sommige van deze mappen, en pakt een lijst van apparaatingangen uit naar - een schijfbare (weer als een geheugenbestandsysteem) partitie + een schrijfbare (weer als een geheugenbestandssysteem) partitie /dev. Tijdens het uitvoeren van /etc/rc.diskless2 is er nog een rc.conf-variabele in het spel - @@ -216,7 +216,7 @@ flash-medium kunnen staan) als alleen-lezen aangekoppeld dienen te worden. In hebben we de beperkingen van flash-geheugen uiteen gelegd - in bijzonder de beperkte - schrijfcapaciteit. Het belang van het niet als lezen-schrijven + herschrijfcapaciteit. Het belang van het niet als lezen-schrijven aankoppelen van flash-media en het belang van het niet gebruiken van een wisselbestand kunnen niet genoeg benadrukt worden. Een wisselbestand op een druk systeem kan binnen een jaar een @@ -248,7 +248,7 @@ Een belangrijk ding om te onthouden is dat een bestandssysteem dat met /etc/fstab als alleen-lezen was - aangekoppeld ten alle tijde lezen-schrijven kan worden gemaakt + aangekoppeld ten alle tijden lezen-schrijven kan worden gemaakt door dit commando te geven: &prompt.root; /sbin/mount -uw partitie @@ -376,14 +376,14 @@ ftp> get tar-bestand.tar "| zcat | tar xvf -" Nadat de inhoud van uw ge-tar-de bestandssysteem op het - bestandsysteem van uw flash-geheugen staan, kunt u het + bestandssysteem van uw flash-geheugen staan, kunt u het flash-geheugen afkoppelen en opnieuw opstarten: &prompt.root; cd / &prompt.root; umount /flash &prompt.root; exit - Aangemomen dat u uw bestandssysteem correct heeft + Aangenomen dat u uw bestandssysteem correct heeft geconfigureerd toen het gebouwd werd op de normale harde schijf (met uw bestandssystemen als alleen-lezen aangekoppeld en met de nodige opties in de kernel gecompileerd) zou u nu @@ -464,7 +464,7 @@ ports-installatie Voordat de veranderingen die nodig zijn om succesvol de - portsboom te gebuiken besproken worden, is een herinnering ten + portsboom te gebruiken besproken worden, is een herinnering ten aanzien van de alleen-lezen-natuur van uw bestandssystemen op het flash-medium op zijn plaats. Aangezien ze alleen-lezen zijn, dient u ze tijdelijk als lezen-schrijven aan te koppelen waarbij From owner-p4-projects@FreeBSD.ORG Sun Apr 12 13:11:15 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D08681065672; Sun, 12 Apr 2009 13:11:14 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 91225106566B for ; Sun, 12 Apr 2009 13:11:14 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7E1008FC14 for ; Sun, 12 Apr 2009 13:11:14 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3CDBERC053225 for ; Sun, 12 Apr 2009 13:11:14 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3CDBEhx053223 for perforce@freebsd.org; Sun, 12 Apr 2009 13:11:14 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 12 Apr 2009 13:11:14 GMT Message-Id: <200904121311.n3CDBEhx053223@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 160527 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, 12 Apr 2009 13:11:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=160527 Change 160527 by rene@rene_self on 2009/04/12 13:10:35 IFC Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/Makefile#11 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/solid-state/Makefile#3 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/solid-state/article.sgml#13 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#17 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/linuxemu/chapter.sgml#6 integrate .. //depot/projects/docproj_nl/www/en/gnome/docs/Makefile#3 integrate .. //depot/projects/docproj_nl/www/en/gnome/docs/faq2.sgml#3 integrate .. //depot/projects/docproj_nl/www/en/gnome/docs/faq226.sgml#1 branch .. //depot/projects/docproj_nl/www/en/gnome/docs/gnome2_porting.sgml#4 integrate .. //depot/projects/docproj_nl/www/en/gnome/index.xsl#4 integrate .. //depot/projects/docproj_nl/www/en/gnome/news.xml#3 integrate .. //depot/projects/docproj_nl/www/share/sgml/navibar.ent#5 integrate .. //depot/projects/docproj_nl/www/share/sgml/release.ent#12 integrate Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/Makefile#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: doc/nl_NL.ISO8859-1/articles/Makefile,v 1.4 2008/12/27 20:34:02 rene Exp $ +# $FreeBSD: doc/nl_NL.ISO8859-1/articles/Makefile,v 1.5 2009/04/12 12:09:37 rene Exp $ # %SOURCE% en_US.ISO8859-1/articles/Makefile # %SRCID% 1.60 ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/solid-state/Makefile#3 (text+ko) ==== ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/solid-state/article.sgml#13 (text+ko) ==== ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#17 (text+ko) ==== @@ -1,7 +1,7 @@

    The &gnomeoldver; to &gnomever; may have a few caveats. You are strongly advised to read the - upgrade FAQ for detailed + upgrade FAQ for detailed instructions.

    • @@ -642,15 +642,15 @@
  • -

    Nautilus-cd-burner does not let me burn CDs or - Totem/Goobox/Sound-juicer cannot find my CD/DVD drive. How can I +

    Brasero does not let me burn CDs or + Totem/Rhythmbox/Sound-juicer cannot find my CD/DVD drive. How can I fix this?

    -

    Nautilus-cd-burner, totem, goobox, and sound-juicer cannot +

    Brasero, totem, rhythmbox, and sound-juicer cannot use CD/DVD drives unless support for those devices is enabled in the kernel, and the permissions on the device nodes allow write access. - Nautilus-cd-burner, totem, goobox, and sound-juicer talk to + Brasero, totem, rhythmbox, and sound-juicer talk to CD/DVD drives through the SCSI CAM subsystem. Therefore, you must make sure you have the following configured in your kernel:

    @@ -689,9 +689,9 @@

    The devices in parentheses at the end are important. You must make sure the /dev entries for those devices are writable by the users that will be using - nautilus-cd-burner, totem, goobox, or sound-juicer. In addition + brasero, totem, rhythmbox, or sound-juicer. In addition to those devices, /dev/xpt* must also be writable to - your nautilus-cd-burner, totem, goobox, and sound-juicer users. + your brasero, totem, rhythmbox, and sound-juicer users. The following /etc/devfs.conf configuration will achieve the desired results given the above devlist:

    @@ -700,18 +700,6 @@ perm xpt0 0666 perm pass0 0666 - -

    If you encounter problems burning to discs with - nautilus-cd-burner, set the following GConf - /apps/nautilus-cd-burner/debug to - true using - Applications > System Tools > Configuration Editor - (gconf-editor from the command line). Then - run nautilus-cd-burner from the command line, - reproduce the problem you are having, and capture - the output on the command line. Include this along - with the rest of your - bug report.

    • @@ -1107,7 +1095,7 @@ You can also use gconf-editor to edit it.

    If your card is supported by the "nvidia," "intel", - "i810", or "radeon" (see the radeon(4) man page to make + "openchrome", or "radeon" (see the radeon(4) man page to make sure your card is supported for 3D acceleration) drivers, then compositing should work for you.

    @@ -1127,11 +1115,15 @@ ~/.profile:

    -export GDM_LANG=<locale>
+export LANG=<locale>
+export LC_ALL=<locale>

    Here, <locale> is the desired locale (e.g. en_US.UTF-8, es_ES.ISO8859-15, fr_FR.ISO8859-1, etc.).

    + +

    To set the default locale for the GDM greeter, add the + same environment variables to /etc/profile.

    ==== //depot/projects/docproj_nl/www/en/gnome/docs/gnome2_porting.sgml#4 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -89,6 +89,12 @@ + gnomedesktopsharp20 + x11-toolkits/gnome-desktop-sharp20 + gnomesharp20 + + + gnomedocutils textproc/gnome-doc-utils libxslt @@ -327,14 +333,14 @@ nautilus2 x11-fm/nautilus - librsvg2 eel2 gnomedesktop + librsvg2 gnomedesktop desktopfileutils gvfs nautiluscdburner sysutils/nautilus-cd-burner - nautilus2 desktopfileutils + nautilus2 eel2 desktopfileutils @@ -360,7 +366,7 @@ x11-toolkits/py-gnome-desktop pygnome2 libgnomeprintui gtksourceview gnomepanel libwnck - nautiluscdburner metacity + nautilus2 metacity ==== //depot/projects/docproj_nl/www/en/gnome/index.xsl#4 (text+ko) ==== @@ -4,7 +4,7 @@ ]> - + devel/gnome2-hacker-tools (development tools) -

    Upgrading to GNOME 2.24?

    +

    Upgrading to GNOME 2.26?

    -

    If you are upgrading from GNOME 2.22 to GNOME 2.24, read the - Upgrade FAQ for upgrade +

    If you are upgrading from GNOME 2.22 to GNOME 2.26, read the + Upgrade FAQ for upgrade instructions.

    State of the port

    GNOME for FreeBSD is currently supported on - 6.4, 6-STABLE, 7.0, 7.1, 7-STABLE, and 8-CURRENT. + 6.4, 6-STABLE, 7.1, 7-STABLE, and 8-CURRENT. Most of GNOME has been ported to FreeBSD, but there is still plenty left to be done!

    ==== //depot/projects/docproj_nl/www/en/gnome/news.xml#3 (text+ko) ==== @@ -19,13 +19,44 @@ - $FreeBSD: www/en/gnome/news.xml,v 1.146 2009/01/11 22:10:55 marcus Exp $ + $FreeBSD: www/en/gnome/news.xml,v 1.147 2009/04/11 03:09:00 marcus Exp $ 2009 + April + + + 10 + + + Announcing GNOME 2.26.0 for FreeBSD! + +

    The FreeBSD GNOME tam is proud to announce the release of + GNOME 2.26.0 for FreeBSD. The official release notes can be + found at + + href="http://library.gnome.org/misc/release-notes/2.26/ + + . On the FreeBSD front, we introduced a port of libxul 1.9 as + an alternative for Firefox 2.0 as a Gecko provider. Almost + all of the Gecko consumers can make use of this provider by + setting: +
    + + WITH_GECKO=libxul +
    + + The GNOME 2.26 port was done by ahze, kwm, marcus, and mezz + with contributions by Joseph S. Atkinson, Peter Wemm, Eric L. + Chen, Martin Matuska, Craig Butler, and Pawel Worach.

    +     +     +     + + January @@ -48,10 +79,10 @@

    This release features commits by adamw, ahze, kwm, mezz, and myself. It would not have been possible without are contributors and testers: Alexander Loginov, Craig Butler, - Dmitry Marakasov, Eric L. Chen, Joseph S. Atkinson, Kris Moore, - Lapo Luchini, Nikos Ntarmos, Pawel Worach, Romain Tartiere, TAOKA - Fumiyoshi, Romain Tartiere, Yasuda Keisuke, Zyl - aZ, bf, Florent Thoumie, Peter Wemm, and pluknet.

    + Dmitry Marakasov, Eric L. Chen, Joseph S. Atkinson, Kris + Moore, Lapo Luchini, Nikos Ntarmos, Pawel Worach, Romain + Tartiere, TAOKA Fumiyoshi, Romain Tartiere, Yasuda Keisuke, + Zyl aZ, bf, Florent Thoumie, Peter Wemm, and pluknet.

         ==== //depot/projects/docproj_nl/www/share/sgml/navibar.ent#5 (text+ko) ==== @@ -1,4 +1,4 @@ - + FreeBSD/GNOME '> ==== //depot/projects/docproj_nl/www/share/sgml/release.ent#12 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -50,7 +50,7 @@ How to enable and utilize the features of CARP, the - Common Access Redundancy Protocol in &os; + Common Address Redundancy Protocol in &os; @@ -5480,12 +5480,12 @@ - Common Access Redundancy Protocol (CARP) + Common Address Redundancy Protocol (CARP) CARP - Common Access Redundancy Protocol + Common Address Redundancy Protocol - The Common Access Redundancy Protocol, or + The Common Address Redundancy Protocol, or CARP allows multiple hosts to share the same IP address. In some configurations, this may be used for availability or load balancing. Hosts may use separate ==== //depot/projects/docproj_nl/www/en/releases/7.2R/schedule.sgml#6 (text+ko) ==== @@ -1,7 +1,7 @@ - + @@ -77,7 +77,7 @@ Ports tree frozen 13 April 2009 - -- + 13 April 2009 Only approved commits will be permitted to the ports/ tree during the freeze. ==== //depot/projects/docproj_nl/www/share/sgml/news.xml#34 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.239 2009/04/06 16:57:09 pgj Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.240 2009/04/12 17:51:44 pgj Exp $ @@ -36,6 +36,16 @@ 4 + 12 + + +

    Enhanced commit privileges: Gábor Páli + (ports, doc)

    +     +     + + 6 From owner-p4-projects@FreeBSD.ORG Mon Apr 13 16:29:13 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B3C2B1065673; Mon, 13 Apr 2009 16:29:12 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 73AA91065670 for ; Mon, 13 Apr 2009 16:29:12 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 628C98FC1B for ; Mon, 13 Apr 2009 16:29:12 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3DGTCcT088859 for ; Mon, 13 Apr 2009 16:29:12 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3DGTCx3088857 for perforce@freebsd.org; Mon, 13 Apr 2009 16:29:12 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 13 Apr 2009 16:29:12 GMT Message-Id: <200904131629.n3DGTCx3088857@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 160570 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, 13 Apr 2009 16:29:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=160570 Change 160570 by rene@rene_self on 2009/04/13 16:28:43 MFen handbook/advanced-networking 1.422 -> 1.423 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#31 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#31 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.12 2009/03/30 18:59:03 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml - %SRCID% 1.422 + %SRCID% 1.423 --> @@ -65,7 +65,7 @@ - Hoe de mogelijkheden van CARP, het Common Access + Hoe de mogelijkheden van CARP, het Common Address Redundancy Protocol, aan te zetten en te benutten. @@ -6015,13 +6015,13 @@ - Common Access Redundancy Protocol (CARP) + Common Address Redundancy Protocol (CARP) CARP - Common Access Redundancy Protocol + Common Address Redundancy Protocol - Het Common Access Redundancy Protocol, of + Het Common Address Redundancy Protocol, of CARP, staat toe dat meerdere hosts hetzelfde IP-adres gebruiken. In sommige opstellingen wordt dit gebruikt voor beschikbaarheid of loadbalancing. Hosts From owner-p4-projects@FreeBSD.ORG Mon Apr 13 16:46:30 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 813011065678; Mon, 13 Apr 2009 16:46:30 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 394F9106564A for ; Mon, 13 Apr 2009 16:46:30 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 27E588FC14 for ; Mon, 13 Apr 2009 16:46:30 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3DGkUIv090239 for ; Mon, 13 Apr 2009 16:46:30 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3DGkUPU090237 for perforce@freebsd.org; Mon, 13 Apr 2009 16:46:30 GMT (envelope-from pgj@FreeBSD.org) Date: Mon, 13 Apr 2009 16:46:30 GMT Message-Id: <200904131646.n3DGkUPU090237@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 160572 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, 13 Apr 2009 16:46:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=160572 Change 160572 by pgj@petymeg on 2009/04/13 16:45:32 MFen (doc): 1.422 -> 1.423 hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#31 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#31 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -7613,7 +7613,7 @@ protokoll A Közös cím redundancia protokoll (Common - Access Redundancy Protocol, avagy CARP) + Address Redundancy Protocol, avagy CARP) segítségével több gép képes egyazon IP-címen osztozni. Bizonyos konfigurációkban ez a terhelés From owner-p4-projects@FreeBSD.ORG Mon Apr 13 19:28:16 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 02BC81065673; Mon, 13 Apr 2009 19:28:16 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B29D3106564A for ; Mon, 13 Apr 2009 19:28:15 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9EB498FC16 for ; Mon, 13 Apr 2009 19:28:15 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3DJSFIp015977 for ; Mon, 13 Apr 2009 19:28:15 GMT (envelope-from antab@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3DJSDVq015969 for perforce@freebsd.org; Mon, 13 Apr 2009 19:28:13 GMT (envelope-from antab@FreeBSD.org) Date: Mon, 13 Apr 2009 19:28:13 GMT Message-Id: <200904131928.n3DJSDVq015969@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to antab@FreeBSD.org using -f From: Arnar Mar Sig To: Perforce Change Reviews Cc: Subject: PERFORCE change 160575 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, 13 Apr 2009 19:28:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=160575 Change 160575 by antab@antab_farm on 2009/04/13 19:28:10 IFC @ 160573 Affected files ... .. //depot/projects/avr32/src/Makefile#3 integrate .. //depot/projects/avr32/src/Makefile.inc1#5 integrate .. //depot/projects/avr32/src/ObsoleteFiles.inc#5 integrate .. //depot/projects/avr32/src/UPDATING#5 integrate .. //depot/projects/avr32/src/bin/ls/ls.1#2 integrate .. //depot/projects/avr32/src/bin/sh/eval.c#2 integrate .. //depot/projects/avr32/src/contrib/gdb/FREEBSD-Xlist#2 integrate .. //depot/projects/avr32/src/contrib/libpcap/bpf/net/bpf_filter.c#3 integrate .. //depot/projects/avr32/src/contrib/libpcap/bpf_dump.c#3 integrate .. //depot/projects/avr32/src/contrib/libpcap/bpf_image.c#3 integrate .. //depot/projects/avr32/src/contrib/libpcap/pcap.h#3 integrate .. //depot/projects/avr32/src/contrib/libpcap/pcap/bpf.h#2 integrate .. //depot/projects/avr32/src/contrib/libpcap/pcap/pcap.h#2 integrate .. //depot/projects/avr32/src/include/signal.h#3 integrate .. //depot/projects/avr32/src/lib/libarchive/Makefile#3 integrate .. //depot/projects/avr32/src/lib/libarchive/archive.h#3 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_check_magic.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_entry.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_entry.h#2 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_read_disk.3#1 branch .. //depot/projects/avr32/src/lib/libarchive/archive_read_disk_set_standard_lookup.c#2 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_read_support_compression_program.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_read_support_format_empty.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_string.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_string.h#3 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_write_disk.c#4 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_write_disk_set_standard_lookup.c#2 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_write_set_compression_program.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_write_set_format_mtree.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/test/main.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/test/test.h#3 integrate .. //depot/projects/avr32/src/lib/libarchive/test/test_read_compress_program.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/test/test_read_disk.c#2 integrate .. //depot/projects/avr32/src/lib/libarchive/test/test_read_extract.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/test/test_tar_large.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/test/test_write_disk.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/test/test_write_disk_failures.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/test/test_write_disk_hardlink.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/test/test_write_disk_perms.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/test/test_write_disk_secure.c#3 integrate .. //depot/projects/avr32/src/lib/libc/gen/Makefile.inc#3 integrate .. //depot/projects/avr32/src/lib/libc/gen/Symbol.map#3 integrate .. //depot/projects/avr32/src/lib/libc/gen/dlfcn.c#2 integrate .. //depot/projects/avr32/src/lib/libc/gen/dlfunc.c#2 delete .. //depot/projects/avr32/src/lib/libc/gen/dlopen.3#2 integrate .. //depot/projects/avr32/src/lib/libc/gen/getcap.c#2 integrate .. //depot/projects/avr32/src/lib/libc/i386/sys/Makefile.inc#2 integrate .. //depot/projects/avr32/src/lib/libc/rpc/clnt_bcast.c#2 integrate .. //depot/projects/avr32/src/lib/libc/rpc/getnetconfig.c#2 integrate .. //depot/projects/avr32/src/lib/libc/stdio/getdelim.c#2 integrate .. //depot/projects/avr32/src/lib/libc/stdio/getline.3#2 integrate .. //depot/projects/avr32/src/lib/libc/string/memchr.3#2 integrate .. //depot/projects/avr32/src/lib/libc/string/memcmp.3#2 integrate .. //depot/projects/avr32/src/lib/libc/string/memcpy.3#2 integrate .. //depot/projects/avr32/src/lib/libc/string/memmove.3#2 integrate .. //depot/projects/avr32/src/lib/libc/string/memset.3#2 integrate .. //depot/projects/avr32/src/lib/libc/string/strcasecmp.3#2 integrate .. //depot/projects/avr32/src/lib/libc/string/strcat.3#2 integrate .. //depot/projects/avr32/src/lib/libc/string/strchr.3#2 integrate .. //depot/projects/avr32/src/lib/libc/string/strcmp.3#2 integrate .. //depot/projects/avr32/src/lib/libc/string/strcpy.3#3 integrate .. //depot/projects/avr32/src/lib/libc/string/strdup.3#3 integrate .. //depot/projects/avr32/src/lib/libc/string/strlcpy.3#3 integrate .. //depot/projects/avr32/src/lib/libc/string/strlen.3#3 integrate .. //depot/projects/avr32/src/lib/libc/string/strpbrk.3#2 integrate .. //depot/projects/avr32/src/lib/libc/string/strspn.3#2 integrate .. //depot/projects/avr32/src/lib/libc/string/strstr.3#2 integrate .. //depot/projects/avr32/src/lib/libc/sys/Symbol.map#2 integrate .. //depot/projects/avr32/src/lib/libc/sys/sctp_generic_recvmsg.2#2 integrate .. //depot/projects/avr32/src/lib/libc/sys/sctp_generic_sendmsg.2#2 integrate .. //depot/projects/avr32/src/lib/libc/sys/sctp_peeloff.2#2 integrate .. //depot/projects/avr32/src/lib/libkvm/kvm_powerpc.c#2 integrate .. //depot/projects/avr32/src/lib/libstand/gets.c#2 integrate .. //depot/projects/avr32/src/lib/libufs/block.c#2 integrate .. //depot/projects/avr32/src/lib/libusb/libusb.3#2 integrate .. //depot/projects/avr32/src/libexec/bootpd/rtmsg.c#2 integrate .. //depot/projects/avr32/src/libexec/ftpd/extern.h#2 integrate .. //depot/projects/avr32/src/libexec/ftpd/ftpcmd.y#2 integrate .. //depot/projects/avr32/src/libexec/ftpd/ftpd.c#2 integrate .. //depot/projects/avr32/src/libexec/rtld-elf/Symbol.map#2 integrate .. //depot/projects/avr32/src/libexec/rtld-elf/map_object.c#3 integrate .. //depot/projects/avr32/src/libexec/rtld-elf/rtld.1#3 integrate .. //depot/projects/avr32/src/libexec/rtld-elf/rtld.c#3 integrate .. //depot/projects/avr32/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#3 integrate .. //depot/projects/avr32/src/release/picobsd/bridge/PICOBSD#4 integrate .. //depot/projects/avr32/src/release/picobsd/mfs_tree/etc/rc#2 integrate .. //depot/projects/avr32/src/rescue/rescue/Makefile#3 integrate .. //depot/projects/avr32/src/sbin/Makefile#2 integrate .. //depot/projects/avr32/src/sbin/gvinum/gvinum.8#3 integrate .. //depot/projects/avr32/src/sbin/gvinum/gvinum.c#3 integrate .. //depot/projects/avr32/src/sbin/ipfw/dummynet.c#2 integrate .. //depot/projects/avr32/src/sbin/ipfw/ipfw.8#4 integrate .. //depot/projects/avr32/src/sbin/ipfw/ipfw2.c#3 integrate .. //depot/projects/avr32/src/sbin/ipfw/ipfw2.h#2 integrate .. //depot/projects/avr32/src/sbin/ipfw/main.c#3 integrate .. //depot/projects/avr32/src/sbin/newfs_msdos/newfs_msdos.8#2 integrate .. //depot/projects/avr32/src/sbin/newfs_msdos/newfs_msdos.c#3 integrate .. //depot/projects/avr32/src/sbin/route/route.c#2 integrate .. //depot/projects/avr32/src/sbin/routed/Makefile#2 integrate .. //depot/projects/avr32/src/sbin/routed/defs.h#2 integrate .. //depot/projects/avr32/src/sbin/routed/if.c#2 integrate .. //depot/projects/avr32/src/sbin/routed/input.c#2 integrate .. //depot/projects/avr32/src/sbin/routed/main.c#2 integrate .. //depot/projects/avr32/src/sbin/routed/output.c#2 integrate .. //depot/projects/avr32/src/sbin/routed/parms.c#2 integrate .. //depot/projects/avr32/src/sbin/routed/radix.c#2 integrate .. //depot/projects/avr32/src/sbin/routed/radix.h#2 integrate .. //depot/projects/avr32/src/sbin/routed/rdisc.c#2 integrate .. //depot/projects/avr32/src/sbin/routed/table.c#2 integrate .. //depot/projects/avr32/src/sbin/routed/trace.c#2 integrate .. //depot/projects/avr32/src/sbin/slattach/Makefile#2 delete .. //depot/projects/avr32/src/sbin/slattach/slattach.8#2 delete .. //depot/projects/avr32/src/sbin/slattach/slattach.c#2 delete .. //depot/projects/avr32/src/sbin/startslip/Makefile#2 delete .. //depot/projects/avr32/src/sbin/startslip/startslip.1#2 delete .. //depot/projects/avr32/src/sbin/startslip/startslip.c#2 delete .. //depot/projects/avr32/src/share/man/man3/pthread.3#2 integrate .. //depot/projects/avr32/src/share/man/man4/Makefile#4 integrate .. //depot/projects/avr32/src/share/man/man4/bce.4#2 integrate .. //depot/projects/avr32/src/share/man/man4/ed.4#3 integrate .. //depot/projects/avr32/src/share/man/man4/fla.4#2 delete .. //depot/projects/avr32/src/share/man/man4/man4.powerpc/pmu.4#2 integrate .. //depot/projects/avr32/src/share/man/man4/ppp.4#2 delete .. //depot/projects/avr32/src/share/man/man4/sl.4#2 delete .. //depot/projects/avr32/src/share/man/man4/textdump.4#2 integrate .. //depot/projects/avr32/src/share/man/man4/uath.4#1 branch .. //depot/projects/avr32/src/share/man/man4/wpi.4#2 integrate .. //depot/projects/avr32/src/share/man/man5/src.conf.5#3 integrate .. //depot/projects/avr32/src/share/man/man7/operator.7#2 integrate .. //depot/projects/avr32/src/share/man/man9/Makefile#4 integrate .. //depot/projects/avr32/src/share/man/man9/VOP_LEASE.9#2 delete .. //depot/projects/avr32/src/share/man/man9/acl.9#2 integrate .. //depot/projects/avr32/src/share/man/man9/vm_map_lock.9#2 integrate .. //depot/projects/avr32/src/share/misc/committers-ports.dot#3 integrate .. //depot/projects/avr32/src/share/misc/operator#2 integrate .. //depot/projects/avr32/src/share/mk/bsd.cpu.mk#4 integrate .. //depot/projects/avr32/src/share/mk/bsd.own.mk#2 integrate .. //depot/projects/avr32/src/share/timedef/Makefile#2 integrate .. //depot/projects/avr32/src/share/zoneinfo/asia#4 integrate .. //depot/projects/avr32/src/sys/amd64/acpica/acpi_switch.S#2 integrate .. //depot/projects/avr32/src/sys/amd64/acpica/acpi_wakecode.S#2 integrate .. //depot/projects/avr32/src/sys/amd64/acpica/acpi_wakeup.c#3 integrate .. //depot/projects/avr32/src/sys/amd64/amd64/apic_vector.S#3 integrate .. //depot/projects/avr32/src/sys/amd64/amd64/cpu_switch.S#4 integrate .. //depot/projects/avr32/src/sys/amd64/amd64/db_interface.c#2 integrate .. //depot/projects/avr32/src/sys/amd64/amd64/db_trace.c#3 integrate .. //depot/projects/avr32/src/sys/amd64/amd64/elf_machdep.c#3 integrate .. //depot/projects/avr32/src/sys/amd64/amd64/exception.S#3 integrate .. //depot/projects/avr32/src/sys/amd64/amd64/genassym.c#3 integrate .. //depot/projects/avr32/src/sys/amd64/amd64/machdep.c#4 integrate .. //depot/projects/avr32/src/sys/amd64/amd64/mp_machdep.c#5 integrate .. //depot/projects/avr32/src/sys/amd64/amd64/sys_machdep.c#2 integrate .. //depot/projects/avr32/src/sys/amd64/amd64/trap.c#3 integrate .. //depot/projects/avr32/src/sys/amd64/amd64/vm_machdep.c#3 integrate .. //depot/projects/avr32/src/sys/amd64/conf/GENERIC#4 integrate .. //depot/projects/avr32/src/sys/amd64/ia32/ia32_exception.S#2 integrate .. //depot/projects/avr32/src/sys/amd64/ia32/ia32_misc.c#1 branch .. //depot/projects/avr32/src/sys/amd64/ia32/ia32_reg.c#2 integrate .. //depot/projects/avr32/src/sys/amd64/ia32/ia32_signal.c#4 integrate .. //depot/projects/avr32/src/sys/amd64/ia32/ia32_sigtramp.S#3 integrate .. //depot/projects/avr32/src/sys/amd64/include/asmacros.h#2 integrate .. //depot/projects/avr32/src/sys/amd64/include/cpufunc.h#3 integrate .. //depot/projects/avr32/src/sys/amd64/include/endian.h#2 integrate .. //depot/projects/avr32/src/sys/amd64/include/frame.h#2 integrate .. //depot/projects/avr32/src/sys/amd64/include/md_var.h#2 integrate .. //depot/projects/avr32/src/sys/amd64/include/pcb.h#3 integrate .. //depot/projects/avr32/src/sys/amd64/include/pcpu.h#3 integrate .. //depot/projects/avr32/src/sys/amd64/include/proc.h#2 integrate .. //depot/projects/avr32/src/sys/amd64/include/reg.h#2 integrate .. //depot/projects/avr32/src/sys/amd64/include/segments.h#2 integrate .. //depot/projects/avr32/src/sys/amd64/include/signal.h#2 integrate .. //depot/projects/avr32/src/sys/amd64/include/sysarch.h#2 integrate .. //depot/projects/avr32/src/sys/amd64/include/ucontext.h#2 integrate .. //depot/projects/avr32/src/sys/amd64/linux32/linux32_locore.s#3 integrate .. //depot/projects/avr32/src/sys/amd64/linux32/linux32_machdep.c#3 integrate .. //depot/projects/avr32/src/sys/amd64/linux32/linux32_sysvec.c#4 integrate .. //depot/projects/avr32/src/sys/arm/arm/elf_machdep.c#3 integrate .. //depot/projects/avr32/src/sys/arm/arm/locore.S#2 integrate .. //depot/projects/avr32/src/sys/arm/arm/trap.c#2 integrate .. //depot/projects/avr32/src/sys/arm/at91/files.at91#3 integrate .. //depot/projects/avr32/src/sys/arm/include/atomic.h#3 integrate .. //depot/projects/avr32/src/sys/arm/include/vmparam.h#3 integrate .. //depot/projects/avr32/src/sys/boot/forth/loader.conf#4 integrate .. //depot/projects/avr32/src/sys/boot/i386/libi386/Makefile#3 integrate .. //depot/projects/avr32/src/sys/boot/i386/libi386/smbios.c#2 integrate .. //depot/projects/avr32/src/sys/cam/cam_xpt.c#3 integrate .. //depot/projects/avr32/src/sys/cddl/compat/opensolaris/sys/vnode.h#2 integrate .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 integrate .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 integrate .. //depot/projects/avr32/src/sys/compat/freebsd32/freebsd32.h#2 integrate .. //depot/projects/avr32/src/sys/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/avr32/src/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/avr32/src/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/avr32/src/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/avr32/src/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/avr32/src/sys/compat/ia32/ia32_signal.h#2 integrate .. //depot/projects/avr32/src/sys/compat/ia32/ia32_sysvec.c#3 integrate .. //depot/projects/avr32/src/sys/compat/ndis/subr_usbd.c#4 integrate .. //depot/projects/avr32/src/sys/conf/NOTES#4 integrate .. //depot/projects/avr32/src/sys/conf/files#7 integrate .. //depot/projects/avr32/src/sys/conf/files.amd64#5 integrate .. //depot/projects/avr32/src/sys/conf/files.ia64#4 integrate .. //depot/projects/avr32/src/sys/conf/files.powerpc#4 integrate .. //depot/projects/avr32/src/sys/contrib/dev/uath/ar5523.bin.uu#1 branch .. //depot/projects/avr32/src/sys/contrib/pf/net/pf.c#2 integrate .. //depot/projects/avr32/src/sys/dev/acpi_support/acpi_asus.c#2 integrate .. //depot/projects/avr32/src/sys/dev/ata/ata-queue.c#4 integrate .. //depot/projects/avr32/src/sys/dev/ata/chipsets/ata-serverworks.c#3 integrate .. //depot/projects/avr32/src/sys/dev/ath/ath_hal/ah_internal.h#3 integrate .. //depot/projects/avr32/src/sys/dev/ath/if_ath.c#4 integrate .. //depot/projects/avr32/src/sys/dev/ath/if_athvar.h#4 integrate .. //depot/projects/avr32/src/sys/dev/cxgb/cxgb_sge.c#3 integrate .. //depot/projects/avr32/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#2 integrate .. //depot/projects/avr32/src/sys/dev/dcons/dcons_os.c#3 integrate .. //depot/projects/avr32/src/sys/dev/drm/drm_pciids.h#3 integrate .. //depot/projects/avr32/src/sys/dev/drm/r300_cmdbuf.c#2 integrate .. //depot/projects/avr32/src/sys/dev/drm/r300_reg.h#2 integrate .. //depot/projects/avr32/src/sys/dev/drm/r600_cp.c#2 integrate .. //depot/projects/avr32/src/sys/dev/drm/radeon_cp.c#4 integrate .. //depot/projects/avr32/src/sys/dev/drm/radeon_drv.h#3 integrate .. //depot/projects/avr32/src/sys/dev/e1000/e1000_80003es2lan.c#2 integrate .. //depot/projects/avr32/src/sys/dev/e1000/e1000_82540.c#2 integrate .. //depot/projects/avr32/src/sys/dev/e1000/e1000_82541.c#2 integrate .. //depot/projects/avr32/src/sys/dev/e1000/e1000_82571.c#2 integrate .. //depot/projects/avr32/src/sys/dev/e1000/e1000_82575.c#2 integrate .. //depot/projects/avr32/src/sys/dev/e1000/e1000_82575.h#2 integrate .. //depot/projects/avr32/src/sys/dev/e1000/e1000_api.c#2 integrate .. //depot/projects/avr32/src/sys/dev/e1000/e1000_api.h#2 integrate .. //depot/projects/avr32/src/sys/dev/e1000/e1000_defines.h#2 integrate .. //depot/projects/avr32/src/sys/dev/e1000/e1000_hw.h#2 integrate .. //depot/projects/avr32/src/sys/dev/e1000/e1000_ich8lan.c#2 integrate .. //depot/projects/avr32/src/sys/dev/e1000/e1000_ich8lan.h#2 integrate .. //depot/projects/avr32/src/sys/dev/e1000/e1000_mac.c#2 integrate .. //depot/projects/avr32/src/sys/dev/e1000/e1000_mac.h#2 integrate .. //depot/projects/avr32/src/sys/dev/e1000/e1000_nvm.c#2 integrate .. //depot/projects/avr32/src/sys/dev/e1000/e1000_nvm.h#2 integrate .. //depot/projects/avr32/src/sys/dev/e1000/e1000_phy.c#2 integrate .. //depot/projects/avr32/src/sys/dev/e1000/e1000_phy.h#2 integrate .. //depot/projects/avr32/src/sys/dev/e1000/e1000_regs.h#2 integrate .. //depot/projects/avr32/src/sys/dev/e1000/if_em.c#2 integrate .. //depot/projects/avr32/src/sys/dev/e1000/if_igb.c#2 integrate .. //depot/projects/avr32/src/sys/dev/e1000/if_igb.h#2 integrate .. //depot/projects/avr32/src/sys/dev/ed/dl100xxreg.h#2 integrate .. //depot/projects/avr32/src/sys/dev/ed/if_ed.c#3 integrate .. //depot/projects/avr32/src/sys/dev/ed/if_ed_cbus.c#2 integrate .. //depot/projects/avr32/src/sys/dev/ed/if_ed_isa.c#2 integrate .. //depot/projects/avr32/src/sys/dev/ed/if_ed_pccard.c#3 integrate .. //depot/projects/avr32/src/sys/dev/ed/if_ed_pci.c#2 integrate .. //depot/projects/avr32/src/sys/dev/ed/if_edreg.h#3 integrate .. //depot/projects/avr32/src/sys/dev/ed/if_edvar.h#3 integrate .. //depot/projects/avr32/src/sys/dev/ep/if_ep.c#2 integrate .. //depot/projects/avr32/src/sys/dev/ep/if_ep_pccard.c#2 integrate .. //depot/projects/avr32/src/sys/dev/ep/if_epreg.h#2 integrate .. //depot/projects/avr32/src/sys/dev/ep/if_epvar.h#2 integrate .. //depot/projects/avr32/src/sys/dev/firewire/firewire.c#4 integrate .. //depot/projects/avr32/src/sys/dev/firewire/sbp.h#2 integrate .. //depot/projects/avr32/src/sys/dev/fxp/if_fxp.c#4 integrate .. //depot/projects/avr32/src/sys/dev/hptmv/access601.h#2 integrate .. //depot/projects/avr32/src/sys/dev/hptmv/amd64-elf.raid.o.uu#2 integrate .. //depot/projects/avr32/src/sys/dev/hptmv/array.h#2 integrate .. //depot/projects/avr32/src/sys/dev/hptmv/command.h#2 integrate .. //depot/projects/avr32/src/sys/dev/hptmv/entry.c#2 integrate .. //depot/projects/avr32/src/sys/dev/hptmv/global.h#2 integrate .. //depot/projects/avr32/src/sys/dev/hptmv/gui_lib.c#2 integrate .. //depot/projects/avr32/src/sys/dev/hptmv/hptintf.h#2 integrate .. //depot/projects/avr32/src/sys/dev/hptmv/hptproc.c#2 integrate .. //depot/projects/avr32/src/sys/dev/hptmv/i386-elf.raid.o.uu#2 integrate .. //depot/projects/avr32/src/sys/dev/hptmv/ioctl.c#2 integrate .. //depot/projects/avr32/src/sys/dev/hptmv/mvOs.h#2 integrate .. //depot/projects/avr32/src/sys/dev/hptmv/mvSata.h#2 integrate .. //depot/projects/avr32/src/sys/dev/hptmv/mvStorageDev.h#2 integrate .. //depot/projects/avr32/src/sys/dev/hptmv/osbsd.h#2 integrate .. //depot/projects/avr32/src/sys/dev/hptmv/raid5n.h#2 integrate .. //depot/projects/avr32/src/sys/dev/hptmv/readme.txt#2 integrate .. //depot/projects/avr32/src/sys/dev/hptmv/vdevice.h#2 integrate .. //depot/projects/avr32/src/sys/dev/if_ndis/if_ndis.c#4 integrate .. //depot/projects/avr32/src/sys/dev/ixgbe/LICENSE#2 integrate .. //depot/projects/avr32/src/sys/dev/ixgbe/README#2 integrate .. //depot/projects/avr32/src/sys/dev/ixgbe/ixgbe.c#2 integrate .. //depot/projects/avr32/src/sys/dev/ixgbe/ixgbe.h#2 integrate .. //depot/projects/avr32/src/sys/dev/ixgbe/ixgbe_82598.c#2 integrate .. //depot/projects/avr32/src/sys/dev/ixgbe/ixgbe_82599.c#1 branch .. //depot/projects/avr32/src/sys/dev/ixgbe/ixgbe_api.c#2 integrate .. //depot/projects/avr32/src/sys/dev/ixgbe/ixgbe_api.h#2 integrate .. //depot/projects/avr32/src/sys/dev/ixgbe/ixgbe_common.c#2 integrate .. //depot/projects/avr32/src/sys/dev/ixgbe/ixgbe_common.h#2 integrate .. //depot/projects/avr32/src/sys/dev/ixgbe/ixgbe_osdep.h#2 integrate .. //depot/projects/avr32/src/sys/dev/ixgbe/ixgbe_phy.c#2 integrate .. //depot/projects/avr32/src/sys/dev/ixgbe/ixgbe_phy.h#2 integrate .. //depot/projects/avr32/src/sys/dev/ixgbe/ixgbe_type.h#2 integrate .. //depot/projects/avr32/src/sys/dev/kbd/kbdreg.h#2 integrate .. //depot/projects/avr32/src/sys/dev/kbdmux/kbdmux.c#3 integrate .. //depot/projects/avr32/src/sys/dev/pccard/pccarddevs#3 integrate .. //depot/projects/avr32/src/sys/dev/pccbb/pccbb_pci.c#3 integrate .. //depot/projects/avr32/src/sys/dev/pci/pci.c#4 integrate .. //depot/projects/avr32/src/sys/dev/powermac_nvram/powermac_nvram.c#2 integrate .. //depot/projects/avr32/src/sys/dev/sound/pci/hda/hdac.c#5 integrate .. //depot/projects/avr32/src/sys/dev/syscons/syscons.c#3 integrate .. //depot/projects/avr32/src/sys/dev/uart/uart_cpu_powerpc.c#2 integrate .. //depot/projects/avr32/src/sys/dev/uart/uart_dev_ns8250.c#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/bluetooth/ng_ubt.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/bluetooth/ubtbcmfw.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/at91dci.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/at91dci.h#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/at91dci_atmelarm.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/atmegadci.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/atmegadci.h#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/atmegadci_atmelarm.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/ehci.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/ehci.h#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/ehci_ixp4xx.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/ehci_mbus.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/ehci_pci.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/musb_otg.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/musb_otg.h#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/musb_otg_atmelarm.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/ohci.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/ohci.h#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/ohci_atmelarm.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/ohci_pci.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/uhci.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/uhci.h#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/uhci_pci.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/usb_controller.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/uss820dci.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/uss820dci.h#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/uss820dci_atmelarm.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/input/uhid.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/input/ukbd.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/input/ums.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/misc/udbp.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/net/if_aue.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/net/if_axe.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/net/if_cdce.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/net/if_cdcereg.h#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/net/if_cue.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/net/if_kue.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/net/if_rue.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/net/if_udav.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/u3g.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/uark.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/ubsa.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/ubser.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/uchcom.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/ucycom.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/ufoma.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/uftdi.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/ugensa.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/uipaq.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/ulpt.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/umct.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/umodem.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/umoscom.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/uplcom.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/usb_serial.c#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/usb_serial.h#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/uslcom.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/uvisor.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/uvscom.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/storage/umass.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/storage/urio.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/storage/ustorage_fs.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_bus.h#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_compat_linux.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_controller.h#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_core.h#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_dev.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_device.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_device.h#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_endian.h#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_generic.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_handle_request.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_hid.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_hid.h#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_hub.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_hub.h#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_msctest.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_parse.c#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_parse.h#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_request.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_request.h#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_sw_transfer.c#3 delete .. //depot/projects/avr32/src/sys/dev/usb/usb_sw_transfer.h#2 delete .. //depot/projects/avr32/src/sys/dev/usb/usb_transfer.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_transfer.h#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/wlan/if_rum.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/wlan/if_uath.c#1 branch .. //depot/projects/avr32/src/sys/dev/usb/wlan/if_uathreg.h#1 branch .. //depot/projects/avr32/src/sys/dev/usb/wlan/if_uathvar.h#1 branch .. //depot/projects/avr32/src/sys/dev/usb/wlan/if_ural.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/wlan/if_zyd.c#4 integrate .. //depot/projects/avr32/src/sys/dev/xen/balloon/balloon.c#3 integrate .. //depot/projects/avr32/src/sys/dev/xen/console/console.c#3 integrate .. //depot/projects/avr32/src/sys/fs/devfs/devfs_vnops.c#4 integrate .. //depot/projects/avr32/src/sys/fs/fifofs/fifo_vnops.c#3 integrate .. //depot/projects/avr32/src/sys/fs/pseudofs/pseudofs_vnops.c#3 integrate .. //depot/projects/avr32/src/sys/fs/unionfs/union_subr.c#2 integrate .. //depot/projects/avr32/src/sys/fs/unionfs/union_vnops.c#2 integrate .. //depot/projects/avr32/src/sys/geom/geom.h#3 integrate .. //depot/projects/avr32/src/sys/geom/geom_disk.c#2 integrate .. //depot/projects/avr32/src/sys/geom/geom_disk.h#2 integrate .. //depot/projects/avr32/src/sys/geom/geom_subr.c#3 integrate .. //depot/projects/avr32/src/sys/geom/journal/g_journal.c#2 integrate .. //depot/projects/avr32/src/sys/geom/mirror/g_mirror.c#2 integrate .. //depot/projects/avr32/src/sys/geom/part/g_part.c#4 integrate .. //depot/projects/avr32/src/sys/geom/part/g_part_ebr.c#3 integrate .. //depot/projects/avr32/src/sys/geom/raid3/g_raid3.c#2 integrate .. //depot/projects/avr32/src/sys/geom/vinum/geom_vinum_share.c#3 integrate .. //depot/projects/avr32/src/sys/geom/vinum/geom_vinum_share.h#3 integrate .. //depot/projects/avr32/src/sys/i386/i386/elf_machdep.c#3 integrate .. //depot/projects/avr32/src/sys/i386/i386/machdep.c#3 integrate .. //depot/projects/avr32/src/sys/i386/include/cpufunc.h#3 integrate .. //depot/projects/avr32/src/sys/i386/include/endian.h#2 integrate .. //depot/projects/avr32/src/sys/i386/include/signal.h#2 integrate .. //depot/projects/avr32/src/sys/i386/include/ucontext.h#2 integrate .. //depot/projects/avr32/src/sys/i386/include/vmparam.h#2 integrate .. //depot/projects/avr32/src/sys/i386/include/xen/xenpmap.h#3 integrate .. //depot/projects/avr32/src/sys/i386/include/xen/xenvar.h#2 integrate .. //depot/projects/avr32/src/sys/i386/linux/linux_sysvec.c#3 integrate .. //depot/projects/avr32/src/sys/i386/xen/pmap.c#3 integrate .. //depot/projects/avr32/src/sys/i386/xen/xen_machdep.c#3 integrate .. //depot/projects/avr32/src/sys/ia64/ia32/ia32_misc.c#1 branch .. //depot/projects/avr32/src/sys/ia64/ia64/elf_machdep.c#3 integrate .. //depot/projects/avr32/src/sys/kern/imgact_elf.c#4 integrate .. //depot/projects/avr32/src/sys/kern/kern_acct.c#2 integrate .. //depot/projects/avr32/src/sys/kern/kern_alq.c#2 integrate .. //depot/projects/avr32/src/sys/kern/kern_ktrace.c#3 integrate .. //depot/projects/avr32/src/sys/kern/kern_shutdown.c#2 integrate .. //depot/projects/avr32/src/sys/kern/kern_sig.c#3 integrate .. //depot/projects/avr32/src/sys/kern/kern_tc.c#3 integrate .. //depot/projects/avr32/src/sys/kern/kern_time.c#4 integrate .. //depot/projects/avr32/src/sys/kern/kern_umtx.c#3 integrate .. //depot/projects/avr32/src/sys/kern/kern_vimage.c#2 integrate .. //depot/projects/avr32/src/sys/kern/tty.c#5 integrate .. //depot/projects/avr32/src/sys/kern/uipc_domain.c#2 integrate .. //depot/projects/avr32/src/sys/kern/uipc_syscalls.c#2 integrate .. //depot/projects/avr32/src/sys/kern/uipc_usrreq.c#3 integrate .. //depot/projects/avr32/src/sys/kern/vfs_acl.c#2 integrate .. //depot/projects/avr32/src/sys/kern/vfs_cache.c#4 integrate .. //depot/projects/avr32/src/sys/kern/vfs_default.c#3 integrate .. //depot/projects/avr32/src/sys/kern/vfs_extattr.c#3 integrate .. //depot/projects/avr32/src/sys/kern/vfs_lookup.c#3 integrate .. //depot/projects/avr32/src/sys/kern/vfs_mount.c#4 integrate .. //depot/projects/avr32/src/sys/kern/vfs_syscalls.c#3 integrate .. //depot/projects/avr32/src/sys/kern/vfs_vnops.c#3 integrate .. //depot/projects/avr32/src/sys/kern/vnode_if.src#3 integrate .. //depot/projects/avr32/src/sys/mips/mips/elf64_machdep.c#3 integrate .. //depot/projects/avr32/src/sys/mips/mips/elf_machdep.c#3 integrate .. //depot/projects/avr32/src/sys/modules/Makefile#4 integrate .. //depot/projects/avr32/src/sys/modules/ixgbe/Makefile#2 integrate .. //depot/projects/avr32/src/sys/modules/nfsclient/Makefile#2 integrate .. //depot/projects/avr32/src/sys/modules/nfssvc/Makefile#1 branch .. //depot/projects/avr32/src/sys/modules/usb/uath/Makefile#1 branch .. //depot/projects/avr32/src/sys/modules/usb/usb/Makefile#2 integrate .. //depot/projects/avr32/src/sys/net/bpf.h#2 integrate .. //depot/projects/avr32/src/sys/net/bsd_comp.c#2 delete .. //depot/projects/avr32/src/sys/net/if.c#5 integrate .. //depot/projects/avr32/src/sys/net/if_bridge.c#4 integrate .. //depot/projects/avr32/src/sys/net/if_gif.c#2 integrate .. //depot/projects/avr32/src/sys/net/if_loop.c#4 integrate .. //depot/projects/avr32/src/sys/net/if_ppp.c#2 delete .. //depot/projects/avr32/src/sys/net/if_ppp.h#2 delete .. //depot/projects/avr32/src/sys/net/if_pppvar.h#2 delete .. //depot/projects/avr32/src/sys/net/if_sl.c#2 delete .. //depot/projects/avr32/src/sys/net/if_slvar.h#2 delete .. //depot/projects/avr32/src/sys/net/if_spppsubr.c#3 integrate .. //depot/projects/avr32/src/sys/net/ppp_comp.h#2 delete .. //depot/projects/avr32/src/sys/net/ppp_deflate.c#2 delete .. //depot/projects/avr32/src/sys/net/ppp_tty.c#2 delete .. //depot/projects/avr32/src/sys/net/route.c#2 integrate .. //depot/projects/avr32/src/sys/net/slip.h#2 delete .. //depot/projects/avr32/src/sys/net/vnet.h#5 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_freebsd.h#5 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_output.c#4 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_var.h#4 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_wds.c#3 integrate .. //depot/projects/avr32/src/sys/netinet/icmp6.h#2 integrate .. //depot/projects/avr32/src/sys/netinet/icmp_var.h#2 integrate .. //depot/projects/avr32/src/sys/netinet/if_ether.c#4 integrate .. //depot/projects/avr32/src/sys/netinet/igmp.c#4 integrate .. //depot/projects/avr32/src/sys/netinet/igmp_var.h#3 integrate .. //depot/projects/avr32/src/sys/netinet/in_gif.c#3 integrate .. //depot/projects/avr32/src/sys/netinet/in_mcast.c#4 integrate .. //depot/projects/avr32/src/sys/netinet/in_pcb.h#3 integrate .. //depot/projects/avr32/src/sys/netinet/ip_carp.c#2 integrate .. //depot/projects/avr32/src/sys/netinet/ip_carp.h#2 integrate .. //depot/projects/avr32/src/sys/netinet/ip_divert.c#3 integrate .. //depot/projects/avr32/src/sys/netinet/ip_dummynet.c#4 integrate .. //depot/projects/avr32/src/sys/netinet/ip_dummynet.h#2 integrate .. //depot/projects/avr32/src/sys/netinet/ip_fastfwd.c#2 integrate .. //depot/projects/avr32/src/sys/netinet/ip_fw.h#4 integrate .. //depot/projects/avr32/src/sys/netinet/ip_fw2.c#5 integrate .. //depot/projects/avr32/src/sys/netinet/ip_fw_pfil.c#3 integrate .. //depot/projects/avr32/src/sys/netinet/ip_icmp.c#3 integrate .. //depot/projects/avr32/src/sys/netinet/ip_input.c#4 integrate .. //depot/projects/avr32/src/sys/netinet/ip_ipsec.c#3 integrate .. //depot/projects/avr32/src/sys/netinet/ip_mroute.c#3 integrate .. //depot/projects/avr32/src/sys/netinet/ip_mroute.h#3 integrate .. //depot/projects/avr32/src/sys/netinet/ip_options.c#4 integrate .. //depot/projects/avr32/src/sys/netinet/ip_output.c#5 integrate .. //depot/projects/avr32/src/sys/netinet/ip_var.h#3 integrate .. //depot/projects/avr32/src/sys/netinet/libalias/alias.c#3 integrate .. //depot/projects/avr32/src/sys/netinet/libalias/alias_cuseeme.c#2 integrate .. //depot/projects/avr32/src/sys/netinet/libalias/alias_dummy.c#2 integrate .. //depot/projects/avr32/src/sys/netinet/libalias/alias_ftp.c#2 integrate .. //depot/projects/avr32/src/sys/netinet/libalias/alias_irc.c#2 integrate .. //depot/projects/avr32/src/sys/netinet/libalias/alias_mod.c#2 integrate .. //depot/projects/avr32/src/sys/netinet/libalias/alias_mod.h#2 integrate .. //depot/projects/avr32/src/sys/netinet/libalias/alias_nbt.c#2 integrate .. //depot/projects/avr32/src/sys/netinet/libalias/alias_pptp.c#2 integrate .. //depot/projects/avr32/src/sys/netinet/libalias/alias_skinny.c#2 integrate .. //depot/projects/avr32/src/sys/netinet/libalias/alias_smedia.c#2 integrate .. //depot/projects/avr32/src/sys/netinet/pim_var.h#2 integrate .. //depot/projects/avr32/src/sys/netinet/raw_ip.c#5 integrate .. //depot/projects/avr32/src/sys/netinet/sctp_indata.c#3 integrate .. //depot/projects/avr32/src/sys/netinet/sctp_input.c#4 integrate .. //depot/projects/avr32/src/sys/netinet/sctp_output.c#5 integrate .. //depot/projects/avr32/src/sys/netinet/sctp_pcb.c#3 integrate .. //depot/projects/avr32/src/sys/netinet/sctp_structs.h#4 integrate .. //depot/projects/avr32/src/sys/netinet/sctp_sysctl.c#3 integrate .. //depot/projects/avr32/src/sys/netinet/sctp_sysctl.h#2 integrate .. //depot/projects/avr32/src/sys/netinet/sctp_uio.h#3 integrate .. //depot/projects/avr32/src/sys/netinet/sctp_usrreq.c#4 integrate .. //depot/projects/avr32/src/sys/netinet/sctputil.c#4 integrate .. //depot/projects/avr32/src/sys/netinet/tcp_hostcache.c#2 integrate .. //depot/projects/avr32/src/sys/netinet/tcp_input.c#3 integrate .. //depot/projects/avr32/src/sys/netinet/tcp_output.c#2 integrate .. //depot/projects/avr32/src/sys/netinet/tcp_reass.c#2 integrate .. //depot/projects/avr32/src/sys/netinet/tcp_sack.c#2 integrate .. //depot/projects/avr32/src/sys/netinet/tcp_subr.c#4 integrate .. //depot/projects/avr32/src/sys/netinet/tcp_syncache.c#2 integrate .. //depot/projects/avr32/src/sys/netinet/tcp_timer.c#3 integrate .. //depot/projects/avr32/src/sys/netinet/tcp_timewait.c#4 integrate .. //depot/projects/avr32/src/sys/netinet/tcp_usrreq.c#4 integrate .. //depot/projects/avr32/src/sys/netinet/tcp_var.h#3 integrate .. //depot/projects/avr32/src/sys/netinet/udp_usrreq.c#4 integrate .. //depot/projects/avr32/src/sys/netinet/udp_var.h#2 integrate .. //depot/projects/avr32/src/sys/netinet/vinet.h#4 integrate .. //depot/projects/avr32/src/sys/netinet6/frag6.c#3 integrate .. //depot/projects/avr32/src/sys/netinet6/icmp6.c#3 integrate .. //depot/projects/avr32/src/sys/netinet6/in6_src.c#3 integrate .. //depot/projects/avr32/src/sys/netinet6/ip6_input.c#4 integrate .. //depot/projects/avr32/src/sys/netinet6/mld6.c#3 integrate .. //depot/projects/avr32/src/sys/netinet6/nd6.c#4 integrate .. //depot/projects/avr32/src/sys/netinet6/nd6_nbr.c#3 integrate .. //depot/projects/avr32/src/sys/netinet6/nd6_rtr.c#4 integrate .. //depot/projects/avr32/src/sys/netinet6/raw_ip6.c#4 integrate .. //depot/projects/avr32/src/sys/netinet6/scope6.c#3 integrate .. //depot/projects/avr32/src/sys/netinet6/udp6_usrreq.c#3 integrate .. //depot/projects/avr32/src/sys/netipsec/ipsec.c#3 integrate .. //depot/projects/avr32/src/sys/netipsec/key.c#4 integrate .. //depot/projects/avr32/src/sys/netipsec/xform_ah.c#2 integrate .. //depot/projects/avr32/src/sys/netipsec/xform_esp.c#2 integrate .. //depot/projects/avr32/src/sys/netipsec/xform_ipcomp.c#2 integrate .. //depot/projects/avr32/src/sys/netipsec/xform_ipip.c#3 integrate .. //depot/projects/avr32/src/sys/nfs/nfs_nfssvc.c#1 branch .. //depot/projects/avr32/src/sys/nfs/nfssvc.h#1 branch .. //depot/projects/avr32/src/sys/nfs4client/nfs4_socket.c#2 integrate .. //depot/projects/avr32/src/sys/nfs4client/nfs4_vnops.c#3 integrate .. //depot/projects/avr32/src/sys/nfsclient/nfs.h#3 integrate .. //depot/projects/avr32/src/sys/nfsclient/nfs_krpc.c#3 integrate .. //depot/projects/avr32/src/sys/nfsclient/nfs_socket.c#2 integrate .. //depot/projects/avr32/src/sys/nfsclient/nfs_subs.c#3 integrate .. //depot/projects/avr32/src/sys/nfsclient/nfs_vnops.c#4 integrate .. //depot/projects/avr32/src/sys/nfsserver/nfs.h#2 integrate .. //depot/projects/avr32/src/sys/nfsserver/nfs_srvkrpc.c#3 integrate .. //depot/projects/avr32/src/sys/nfsserver/nfs_srvsubs.c#3 integrate .. //depot/projects/avr32/src/sys/nfsserver/nfs_syscalls.c#3 integrate .. //depot/projects/avr32/src/sys/pc98/pc98/machdep.c#3 integrate .. //depot/projects/avr32/src/sys/powerpc/aim/machdep.c#3 integrate .. //depot/projects/avr32/src/sys/powerpc/aim/mmu_oea.c#3 integrate .. //depot/projects/avr32/src/sys/powerpc/aim/mmu_oea64.c#1 branch .. //depot/projects/avr32/src/sys/powerpc/aim/mp_cpudep.c#2 integrate .. //depot/projects/avr32/src/sys/powerpc/aim/ofw_machdep.c#2 integrate .. //depot/projects/avr32/src/sys/powerpc/aim/swtch.S#3 integrate .. //depot/projects/avr32/src/sys/powerpc/aim/trap_subr.S#3 integrate .. //depot/projects/avr32/src/sys/powerpc/aim/uio_machdep.c#2 delete .. //depot/projects/avr32/src/sys/powerpc/aim/uma_machdep.c#2 integrate .. //depot/projects/avr32/src/sys/powerpc/aim/vm_machdep.c#2 integrate .. //depot/projects/avr32/src/sys/powerpc/booke/machdep.c#3 integrate .. //depot/projects/avr32/src/sys/powerpc/booke/pmap.c#3 integrate .. //depot/projects/avr32/src/sys/powerpc/booke/uio_machdep.c#2 delete .. //depot/projects/avr32/src/sys/powerpc/include/hid.h#2 integrate .. //depot/projects/avr32/src/sys/powerpc/include/intr.h#2 integrate .. //depot/projects/avr32/src/sys/powerpc/include/md_var.h#2 integrate .. //depot/projects/avr32/src/sys/powerpc/include/pmap.h#2 integrate .. //depot/projects/avr32/src/sys/powerpc/include/sf_buf.h#2 integrate .. //depot/projects/avr32/src/sys/powerpc/include/spr.h#3 integrate .. //depot/projects/avr32/src/sys/powerpc/include/sysarch.h#1 branch .. //depot/projects/avr32/src/sys/powerpc/include/vmparam.h#2 integrate .. //depot/projects/avr32/src/sys/powerpc/ofw/ofw_real.c#1 branch .. //depot/projects/avr32/src/sys/powerpc/ofw/ofw_syscons.c#2 integrate .. //depot/projects/avr32/src/sys/powerpc/powermac/cpcht.c#1 branch .. //depot/projects/avr32/src/sys/powerpc/powermac/cpchtvar.h#1 branch .. //depot/projects/avr32/src/sys/powerpc/powerpc/bus_machdep.c#2 integrate .. //depot/projects/avr32/src/sys/powerpc/powerpc/cpu.c#2 integrate .. //depot/projects/avr32/src/sys/powerpc/powerpc/dump_machdep.c#1 branch .. //depot/projects/avr32/src/sys/powerpc/powerpc/elf_machdep.c#3 integrate .. //depot/projects/avr32/src/sys/powerpc/powerpc/mem.c#2 integrate .. //depot/projects/avr32/src/sys/powerpc/powerpc/mmu_if.m#2 integrate .. //depot/projects/avr32/src/sys/powerpc/powerpc/pmap_dispatch.c#2 integrate .. //depot/projects/avr32/src/sys/powerpc/powerpc/uio_machdep.c#1 branch .. //depot/projects/avr32/src/sys/sparc64/sparc64/elf_machdep.c#3 integrate .. //depot/projects/avr32/src/sys/sys/elf_common.h#5 integrate .. //depot/projects/avr32/src/sys/sys/imgact_elf.h#3 integrate .. //depot/projects/avr32/src/sys/sys/kernel.h#2 integrate .. //depot/projects/avr32/src/sys/sys/kerneldump.h#2 integrate .. //depot/projects/avr32/src/sys/sys/mbuf.h#3 integrate .. //depot/projects/avr32/src/sys/sys/param.h#5 integrate .. //depot/projects/avr32/src/sys/sys/systm.h#4 integrate .. //depot/projects/avr32/src/sys/sys/vimage.h#4 integrate .. //depot/projects/avr32/src/sys/sys/vnode.h#4 integrate .. //depot/projects/avr32/src/sys/ufs/ffs/ffs_snapshot.c#3 integrate .. //depot/projects/avr32/src/sys/ufs/ffs/ffs_softdep.c#2 integrate .. //depot/projects/avr32/src/sys/vm/vm_extern.h#2 integrate .. //depot/projects/avr32/src/sys/vm/vm_map.c#3 integrate .. //depot/projects/avr32/src/sys/vm/vm_map.h#3 integrate .. //depot/projects/avr32/src/sys/vm/vm_mmap.c#3 integrate .. //depot/projects/avr32/src/sys/vm/vm_reserv.c#2 integrate .. //depot/projects/avr32/src/sys/vm/vm_unix.c#3 integrate .. //depot/projects/avr32/src/sys/xen/evtchn/evtchn.c#3 integrate .. //depot/projects/avr32/src/sys/xen/reboot.c#2 integrate .. //depot/projects/avr32/src/tools/build/options/WITHOUT_SLIP#2 delete .. //depot/projects/avr32/src/tools/regression/acltools/tools-posix.test#2 integrate .. //depot/projects/avr32/src/tools/regression/lib/libc/stdio/test-getdelim.c#2 integrate .. //depot/projects/avr32/src/tools/tools/sysbuild/sysbuild.sh#4 integrate .. //depot/projects/avr32/src/usr.bin/cut/cut.1#2 integrate .. //depot/projects/avr32/src/usr.bin/locate/locate/fastfind.c#2 integrate .. //depot/projects/avr32/src/usr.bin/locate/locate/util.c#2 integrate .. //depot/projects/avr32/src/usr.bin/make/globals.h#2 integrate .. //depot/projects/avr32/src/usr.bin/make/main.c#3 integrate .. //depot/projects/avr32/src/usr.bin/make/make.1#2 integrate .. //depot/projects/avr32/src/usr.bin/make/make.c#2 integrate .. //depot/projects/avr32/src/usr.bin/su/su.c#2 integrate .. //depot/projects/avr32/src/usr.bin/truss/main.c#3 integrate .. //depot/projects/avr32/src/usr.bin/truss/setup.c#2 integrate .. //depot/projects/avr32/src/usr.sbin/Makefile#3 integrate .. //depot/projects/avr32/src/usr.sbin/chown/chgrp.1#2 integrate .. //depot/projects/avr32/src/usr.sbin/fifolog/fifolog_create/fifolog.1#2 integrate .. //depot/projects/avr32/src/usr.sbin/jexec/jexec.c#2 integrate .. //depot/projects/avr32/src/usr.sbin/portsnap/phttpget/phttpget.c#2 integrate .. //depot/projects/avr32/src/usr.sbin/ppp/iface.c#2 integrate .. //depot/projects/avr32/src/usr.sbin/pppd/Makefile#2 delete .. //depot/projects/avr32/src/usr.sbin/pppd/RELNOTES#2 delete .. //depot/projects/avr32/src/usr.sbin/pppd/auth.c#2 delete .. //depot/projects/avr32/src/usr.sbin/pppd/cbcp.c#3 delete .. //depot/projects/avr32/src/usr.sbin/pppd/cbcp.h#2 delete .. //depot/projects/avr32/src/usr.sbin/pppd/ccp.c#2 delete .. //depot/projects/avr32/src/usr.sbin/pppd/ccp.h#2 delete .. //depot/projects/avr32/src/usr.sbin/pppd/chap.c#2 delete .. //depot/projects/avr32/src/usr.sbin/pppd/chap.h#2 delete .. //depot/projects/avr32/src/usr.sbin/pppd/chap_ms.c#2 delete .. //depot/projects/avr32/src/usr.sbin/pppd/chap_ms.h#2 delete .. //depot/projects/avr32/src/usr.sbin/pppd/demand.c#2 delete .. //depot/projects/avr32/src/usr.sbin/pppd/eui64.c#2 delete .. //depot/projects/avr32/src/usr.sbin/pppd/eui64.h#2 delete .. //depot/projects/avr32/src/usr.sbin/pppd/fsm.c#2 delete .. //depot/projects/avr32/src/usr.sbin/pppd/fsm.h#2 delete .. //depot/projects/avr32/src/usr.sbin/pppd/ipcp.c#2 delete .. //depot/projects/avr32/src/usr.sbin/pppd/ipcp.h#2 delete .. //depot/projects/avr32/src/usr.sbin/pppd/ipv6cp.c#2 delete .. //depot/projects/avr32/src/usr.sbin/pppd/ipv6cp.h#2 delete .. //depot/projects/avr32/src/usr.sbin/pppd/ipxcp.c#2 delete .. //depot/projects/avr32/src/usr.sbin/pppd/ipxcp.h#2 delete .. //depot/projects/avr32/src/usr.sbin/pppd/lcp.c#2 delete .. //depot/projects/avr32/src/usr.sbin/pppd/lcp.h#2 delete .. //depot/projects/avr32/src/usr.sbin/pppd/magic.c#2 delete .. //depot/projects/avr32/src/usr.sbin/pppd/magic.h#2 delete .. //depot/projects/avr32/src/usr.sbin/pppd/main.c#2 delete .. //depot/projects/avr32/src/usr.sbin/pppd/options.c#2 delete .. //depot/projects/avr32/src/usr.sbin/pppd/patchlevel.h#2 delete .. //depot/projects/avr32/src/usr.sbin/pppd/pathnames.h#2 delete .. //depot/projects/avr32/src/usr.sbin/pppd/pppd.8#2 delete .. //depot/projects/avr32/src/usr.sbin/pppd/pppd.h#2 delete .. //depot/projects/avr32/src/usr.sbin/pppd/sys-bsd.c#2 delete .. //depot/projects/avr32/src/usr.sbin/pppd/upap.c#2 delete .. //depot/projects/avr32/src/usr.sbin/pppd/upap.h#2 delete .. //depot/projects/avr32/src/usr.sbin/pppstats/Makefile#2 delete .. //depot/projects/avr32/src/usr.sbin/pppstats/pppstats.8#2 delete .. //depot/projects/avr32/src/usr.sbin/pppstats/pppstats.c#2 delete .. //depot/projects/avr32/src/usr.sbin/sliplogin/Makefile#2 delete .. //depot/projects/avr32/src/usr.sbin/sliplogin/pathnames.h#2 delete .. //depot/projects/avr32/src/usr.sbin/sliplogin/sliplogin.8#2 delete .. //depot/projects/avr32/src/usr.sbin/sliplogin/sliplogin.c#2 delete .. //depot/projects/avr32/src/usr.sbin/slstat/Makefile#2 delete .. //depot/projects/avr32/src/usr.sbin/slstat/slstat.8#2 delete .. //depot/projects/avr32/src/usr.sbin/slstat/slstat.c#2 delete .. //depot/projects/avr32/src/usr.sbin/sysinstall/devices.c#3 integrate .. //depot/projects/avr32/src/usr.sbin/uathload/Makefile#1 branch .. //depot/projects/avr32/src/usr.sbin/uathload/uathload.8#1 branch .. //depot/projects/avr32/src/usr.sbin/uathload/uathload.c#1 branch Differences ... ==== //depot/projects/avr32/src/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.357 2009/03/13 07:23:58 imp Exp $ +# $FreeBSD: src/Makefile,v 1.358 2009/04/01 17:11:50 bz Exp $ # # The user-driven targets are: # @@ -279,7 +279,7 @@ # existing system is. # .if make(universe) || make(tinderbox) -TARGETS?=amd64 arm i386 ia64 pc98 powerpc sparc64 sun4v +TARGETS?=amd64 arm i386 ia64 mips pc98 powerpc sparc64 sun4v .if defined(DOING_TINDERBOX) FAILFILE=tinderbox.failed ==== //depot/projects/avr32/src/Makefile.inc1#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.623 2009/03/19 00:44:22 imp Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.624 2009/04/05 00:24:49 imp Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -1017,7 +1017,6 @@ .for _tool in \ gnu/usr.bin/binutils \ gnu/usr.bin/cc \ - usr.bin/ar \ usr.bin/sed \ usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint \ ${_btxld} \ ==== //depot/projects/avr32/src/ObsoleteFiles.inc#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.178 2009/03/19 20:33:26 thompsa Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.185 2009/04/10 22:15:01 danger Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,36 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20090410: VOP_LEASE.9 removed +OLD_FILES+=usr/share/man/man9/VOP_LEASE.9.gz +# 20090405: removal of if_ppp(4) and if_sl(4) +OLD_FILES+=sbin/slattach rescue/slattach +OLD_FILES+=sbin/startslip rescue/startslip +OLD_FILES+=usr/include/net/if_ppp.h +OLD_FILES+=usr/include/net/if_pppvar.h +OLD_FILES+=usr/include/net/if_slvar.h +OLD_FILES+=usr/include/net/ppp_comp.h +OLD_FILES+=usr/include/net/slip.h +OLD_FILES+=usr/sbin/sliplogin +OLD_FILES+=usr/sbin/slstat +OLD_FILES+=usr/sbin/pppd +OLD_FILES+=usr/sbin/pppstats +OLD_FILES+=usr/share/man/man1/startslip.1.gz +OLD_FILES+=usr/share/man/man4/if_ppp.4.gz +OLD_FILES+=usr/share/man/man4/if_sl.4.gz +OLD_FILES+=usr/share/man/man4/ppp.4.gz +OLD_FILES+=usr/share/man/man4/sl.4.gz +OLD_FILES+=usr/share/man/man8/pppd.8.gz +OLD_FILES+=usr/share/man/man8/pppstats.8.gz +OLD_FILES+=usr/share/man/man8/slattach.8.gz +OLD_FILES+=usr/share/man/man8/slip.8.gz +OLD_FILES+=usr/share/man/man8/sliplogin.8.gz +OLD_FILES+=usr/share/man/man8/slstat.8.gz +# 20090321: libpcap upgraded to 1.0.0 +OLD_LIBS+=lib/libpcap.so.5 +.if ${TARGET_ARCH} == "amd64" +OLD_LIBS+=usr/lib32/libpcap.so.5 +.endif # 20090319: uscanner(4) has been removed OLD_FILES+=usr/share/man/man4/uscanner.4.gz # 20090313: k8temp(4) renamed to amdtemp(4) @@ -24,8 +54,17 @@ OLD_FILES+=usr/lib/libusb20.so OLD_FILES+=usr/lib/libusb20_p.a OLD_FILES+=usr/include/libusb20_compat01.h +.if ${TARGET_ARCH} == "amd64" +OLD_LIBS+=usr/lib32/libusb20.so.1 +OLD_FILES+=usr/lib32/libusb20.a +OLD_FILES+=usr/lib32/libusb20.so +OLD_FILES+=usr/lib32/libusb20_p.a +.endif # 20090226: libmp(3) functions renamed OLD_LIBS+=usr/lib/libmp.so.6 +.if ${TARGET_ARCH} == "amd64" +OLD_LIBS+=usr/lib32/libmp.so.6 +.endif # 20090223: changeover of USB stacks OLD_FILES+=usr/include/dev/usb2/include/ufm2_ioctl.h OLD_FILES+=usr/include/dev/usb2/include/urio2_ioctl.h @@ -1440,6 +1479,8 @@ OLD_FILES+=lib/geom/geom_label.so.1 OLD_FILES+=lib/geom/geom_nop.so.1 OLD_FILES+=lib/geom/geom_stripe.so.1 +# 20040713: fla(4) removed. +OLD_FILES+=usr/share/man/man4/fla.4.gz # 200407XX OLD_FILES+=usr/sbin/kernbb OLD_FILES+=usr/sbin/ntp-genkeys ==== //depot/projects/avr32/src/UPDATING#5 (text+ko) ==== @@ -22,6 +22,21 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20090408: + Do not use Giant for kbdmux(4) locking. This is wrong and + apparently causing more problems than it solves. This will + re-open the issue where interrupt handlers may race with + kbdmux(4) in polling mode. Typical symptoms include (but + not limited to) duplicated and/or missing characters when + low level console functions (such as gets) are used while + interrupts are enabled (for example geli password prompt, + mountroot prompt etc.). Disabling kbdmux(4) may help. + +20090407: + The size of structs vnet_net, vnet_inet and vnet_ipfw has changed; + kernel modules referencing any of the above need to be recompiled. + Bump __FreeBSD_version to 800075. + 20090320: GEOM_PART has become the default partition slicer for storage devices, replacing GEOM_MBR, GEOM_BSD, GEOM_PC98 and GEOM_GPT slicers. It @@ -1375,4 +1390,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.587 2009/03/20 23:13:32 ivoras Exp $ +$FreeBSD: src/UPDATING,v 1.589 2009/04/12 19:42:25 emax Exp $ ==== //depot/projects/avr32/src/bin/ls/ls.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.102 2008/04/04 05:55:42 ru Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.103 2009/04/13 15:29:14 trasz Exp $ .\" .Dd April 4, 2008 .Dt LS 1 @@ -680,6 +680,7 @@ .Xr sort 1 , .Xr xterm 1 , .Xr strftime 3 , +.Xr strmode 3 , .Xr termcap 5 , .Xr maclabel 7 , .Xr symlink 7 , ==== //depot/projects/avr32/src/bin/sh/eval.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.56 2008/11/23 20:23:57 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.57 2009/04/04 19:06:52 stefanf Exp $"); #include #include @@ -166,7 +166,8 @@ setstackmark(&smark); setinputstring(s, 1); while ((n = parsecmd(0)) != NEOF) { - evaltree(n, 0); + if (n != NULL) + evaltree(n, 0); popstackmark(&smark); } popfile(); ==== //depot/projects/avr32/src/contrib/gdb/FREEBSD-Xlist#2 (text+ko) ==== @@ -1,60 +1,69 @@ -$FreeBSD: src/contrib/gdb/FREEBSD-Xlist,v 1.7 2006/08/23 03:30:33 marcel Exp $ -gdb-6.1.1/bfd/* -gdb-6.1.1/config/* -gdb-6.1.1/etc/* -gdb-6.1.1/gdb/avr* -gdb-6.1.1/gdb/config/avr/* -gdb-6.1.1/gdb/config/cris/* -gdb-6.1.1/gdb/config/d10v/* -gdb-6.1.1/gdb/config/djgpp/* -gdb-6.1.1/gdb/config/frv/* -gdb-6.1.1/gdb/config/h8300/* -gdb-6.1.1/gdb/config/m32r/* -gdb-6.1.1/gdb/config/m68hc11/* -gdb-6.1.1/gdb/config/m68k/* -gdb-6.1.1/gdb/config/mcore/* -gdb-6.1.1/gdb/config/mn10300/* -gdb-6.1.1/gdb/config/ns32k/* -gdb-6.1.1/gdb/config/pa/* -gdb-6.1.1/gdb/config/sh/* -gdb-6.1.1/gdb/config/v850/* -gdb-6.1.1/gdb/config/vax/* -gdb-6.1.1/gdb/config/xstormy16/* -gdb-6.1.1/gdb/cris* -gdb-6.1.1/gdb/d10v* -gdb-6.1.1/gdb/frv* -gdb-6.1.1/gdb/h8300* -gdb-6.1.1/gdb/*m32r* -gdb-6.1.1/gdb/m68* -gdb-6.1.1/gdb/mcore* -gdb-6.1.1/gdb/mn10300* -gdb-6.1.1/gdb/nlm/* -gdb-6.1.1/gdb/ns32k* -gdb-6.1.1/gdb/osf-share/* -gdb-6.1.1/gdb/hppa* -gdb-6.1.1/gdb/rdi-share/* -gdb-6.1.1/gdb/sh* -gdb-6.1.1/gdb/testsuite/* -gdb-6.1.1/gdb/v850* -gdb-6.1.1/gdb/vax* -gdb-6.1.1/gdb/vx-share/* -gdb-6.1.1/gdb/xstormy16* -gdb-6.1.1/include/aout/* -gdb-6.1.1/include/coff/* -gdb-6.1.1/include/elf/* -gdb-6.1.1/include/mpw/* -gdb-6.1.1/include/nlm/* -gdb-6.1.1/include/opcode/* -gdb-6.1.1/intl/* -gdb-6.1.1/libiberty/* -gdb-6.1.1/mmalloc/* -gdb-6.1.1/opcodes/* -gdb-6.1.1/readline/* -gdb-6.1.1/sim/* -gdb-6.1.1/texinfo/* -gdb-6.1.1/utils/* +$FreeBSD: src/contrib/gdb/FREEBSD-Xlist,v 1.8 2009/04/07 20:15:51 emaste Exp $ +gdb-*/bfd/* +gdb-*/config/* +gdb-*/etc/* +gdb-*/gdb/avr* +gdb-*/gdb/config/avr/* +gdb-*/gdb/config/cris/* +gdb-*/gdb/config/d10v/* +gdb-*/gdb/config/djgpp/* +gdb-*/gdb/config/frv/* +gdb-*/gdb/config/h8300/* +gdb-*/gdb/config/m32r/* +gdb-*/gdb/config/m68hc11/* +gdb-*/gdb/config/m68k/* +gdb-*/gdb/config/mcore/* +gdb-*/gdb/config/mn10300/* +gdb-*/gdb/config/ns32k/* +gdb-*/gdb/config/pa/* +gdb-*/gdb/config/sh/* +gdb-*/gdb/config/v850/* +gdb-*/gdb/config/vax/* +gdb-*/gdb/config/xstormy16/* +gdb-*/gdb/cris* +gdb-*/gdb/d10v* +gdb-*/gdb/frv* +gdb-*/gdb/h8300* +gdb-*/gdb/iq2000* +gdb-*/gdb/i386nbsd* +gdb-*/gdb/m32c* +gdb-*/gdb/*m32r* +gdb-*/gdb/m68* +gdb-*/gdb/m88* +gdb-*/gdb/mcore* +gdb-*/gdb/mn10300* +gdb-*/gdb/mt-* +gdb-*/gdb/nlm/* +gdb-*/gdb/ns32k* +gdb-*/gdb/osf-share/* +gdb-*/gdb/ppcobsd* +gdb-*/gdb/hppa* +gdb-*/gdb/rdi-share/* +gdb-*/gdb/sh* +gdb-*/gdb/testsuite/* +gdb-*/gdb/v850* +gdb-*/gdb/vax* +gdb-*/gdb/vx-share/* +gdb-*/gdb/xstormy16* +gdb-*/gdb/xtensa* +gdb-*/include/aout/* +gdb-*/include/coff/* +gdb-*/include/elf/* +gdb-*/include/mpw/* +gdb-*/include/nlm/* +gdb-*/include/opcode/* +gdb-*/intl/* +gdb-*/libiberty/* +gdb-*/mmalloc/* +gdb-*/opcodes/* >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Apr 14 09:16:21 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8F34B1065673; Tue, 14 Apr 2009 09:16:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 40F781065670 for ; Tue, 14 Apr 2009 09:16:20 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2D3DF8FC1A for ; Tue, 14 Apr 2009 09:16:20 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3E9GKUu040587 for ; Tue, 14 Apr 2009 09:16:20 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3E9GJbg040585 for perforce@freebsd.org; Tue, 14 Apr 2009 09:16:19 GMT (envelope-from zec@fer.hr) Date: Tue, 14 Apr 2009 09:16:19 GMT Message-Id: <200904140916.n3E9GJbg040585@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 160603 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, 14 Apr 2009 09:16:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=160603 Change 160603 by zec@zec_amdx2 on 2009/04/14 09:15:27 Unbreak GENERIC build - more fixes follow... Affected files ... .. //depot/projects/vimage/src/sys/fs/cd9660/cd9660_rrip.c#12 edit .. //depot/projects/vimage/src/sys/kern/kern_vimage.c#78 edit .. //depot/projects/vimage/src/sys/kern/uipc_domain.c#20 edit .. //depot/projects/vimage/src/sys/net/if.c#75 edit .. //depot/projects/vimage/src/sys/net/if_gif.c#27 edit .. //depot/projects/vimage/src/sys/net/if_loop.c#43 edit .. //depot/projects/vimage/src/sys/net/route.c#45 edit .. //depot/projects/vimage/src/sys/net/vnet.h#23 edit .. //depot/projects/vimage/src/sys/netgraph/ng_base.c#52 edit .. //depot/projects/vimage/src/sys/netgraph/ng_eiface.c#24 edit .. //depot/projects/vimage/src/sys/netgraph/ng_ether.c#22 edit .. //depot/projects/vimage/src/sys/netgraph/ng_iface.c#20 edit .. //depot/projects/vimage/src/sys/netinet/accf_http.c#9 edit .. //depot/projects/vimage/src/sys/netinet/if_ether.c#41 edit .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#71 edit .. //depot/projects/vimage/src/sys/sys/kernel.h#17 edit .. //depot/projects/vimage/src/sys/sys/vimage.h#86 edit Differences ... ==== //depot/projects/vimage/src/sys/fs/cd9660/cd9660_rrip.c#12 (text+ko) ==== ==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#78 (text+ko) ==== @@ -72,11 +72,6 @@ MALLOC_DEFINE(M_VPROCG, "vprocg", "process group control block"); MALLOC_DEFINE(M_VCPU, "vcpu", "cpu resource control block"); -#ifndef VIMAGE_GLOBALS -static int vnet_mod_constructor(struct vnet_modlink *); -static int vnet_mod_destructor(struct vnet_modlink *); -#endif - #ifdef VIMAGE static struct vimage *vi_alloc(struct vimage *, char *); static int vi_destroy(struct vimage *); @@ -96,6 +91,7 @@ static TAILQ_HEAD(vnet_modpending_head, vnet_modlink) vnet_modpending_head; static void vnet_mod_complete_registration(struct vnet_modlink *); static int vnet_mod_constructor(struct vnet_modlink *); +static int vnet_mod_destructor(struct vnet_modlink *); int vi_symlookup(struct kld_sym_lookup *lookup, char *symstr) @@ -262,16 +258,16 @@ if (vml->vml_iarg) printf("/%s", vml->vml_iname); printf(": "); - if (vmi->vmi_struct_size) - printf("malloc(%zu); ", vmi->vmi_struct_size); + if (vmi->vmi_size) + printf("malloc(%zu); ", vmi->vmi_size); if (vmi->vmi_iattach != NULL) printf("iattach()"); printf("\n"); #endif #ifdef VIMAGE - if (vmi->vmi_struct_size) { - void *mem = malloc(vmi->vmi_struct_size, M_VNET, + if (vmi->vmi_size) { + void *mem = malloc(vmi->vmi_size, M_VNET, M_NOWAIT | M_ZERO); if (mem == NULL) /* XXX should return error, not panic. */ panic("vi_alloc: malloc for %s\n", vmi->vmi_name); @@ -297,7 +293,7 @@ printf(": "); if (vmi->vmi_idetach != NULL) printf("idetach(); "); - if (vmi->vmi_struct_size) + if (vmi->vmi_size) printf("free()"); printf("\n"); #endif @@ -306,7 +302,7 @@ vmi->vmi_idetach(vml->vml_iarg); #ifdef VIMAGE - if (vmi->vmi_struct_size) { + if (vmi->vmi_size) { if (curvnet->mod_data[vmi->vmi_id] == NULL) panic("vi_destroy: %s\n", vmi->vmi_name); vi_free(curvnet->mod_data[vmi->vmi_id], M_VNET); ==== //depot/projects/vimage/src/sys/kern/uipc_domain.c#20 (text+ko) ==== @@ -111,7 +111,9 @@ .vmi_id = VNET_MOD_DOMAIN, .vmi_name = "domain", .vmi_iattach = net_init_domain, +#ifdef VIMAGE .vmi_idetach = net_detach_domain, +#endif }; #endif ==== //depot/projects/vimage/src/sys/net/if.c#75 (text+ko) ==== @@ -192,7 +192,9 @@ .vmi_size = sizeof(struct vnet_net), .vmi_symmap = vnet_net_symmap, .vmi_iattach = vnet_net_iattach, - .vmi_idettach = vnet_net_idettach +#ifdef VIMAGE + .vmi_idetach = vnet_net_idetach +#endif }; #endif /* !VIMAGE_GLOBALS */ ==== //depot/projects/vimage/src/sys/net/if_gif.c#27 (text+ko) ==== @@ -167,7 +167,6 @@ SYSCTL_V_INT(V_NET, vnet_gif, _net_link_gif, OID_AUTO, parallel_tunnels, CTLFLAG_RW, parallel_tunnels, 0, "Allow parallel tunnels?"); -VNET_MOD_DECLARE(GIF, gif, vnet_gif_iattach, NULL, NET, NULL) /* copy from src/sys/net/if_ethersubr.c */ static const u_char etherbroadcastaddr[ETHER_ADDR_LEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; ==== //depot/projects/vimage/src/sys/net/if_loop.c#43 (text+ko) ==== @@ -126,7 +126,9 @@ .vmi_id = VNET_MOD_LOIF, .vmi_name = "loif", .vmi_iattach = vnet_loif_iattach, - .vmi_idettach = vnet_loif_idettach +#ifdef VIMAGE + .vmi_idetach = vnet_loif_idetach +#endif }; #endif /* !VIMAGE_GLOBALS */ ==== //depot/projects/vimage/src/sys/net/route.c#45 (text+ko) ==== @@ -107,13 +107,18 @@ static void rt_maskedcopy(struct sockaddr *, struct sockaddr *, struct sockaddr *); static int vnet_route_iattach(const void *); +#ifdef VIMAGE +static int vnet_route_idetach(const void *); +#endif #ifndef VIMAGE_GLOBALS static const vnet_modinfo_t vnet_rtable_modinfo = { .vmi_id = VNET_MOD_RTABLE, .vmi_name = "rtable", .vmi_iattach = vnet_route_iattach, - .vmi_idettach = vnet_route_idettach +#ifdef VIMAGE + .vmi_idetach = vnet_route_idetach +#endif }; #endif /* !VIMAGE_GLOBALS */ @@ -159,11 +164,11 @@ SYSCTL_PROC(_net, OID_AUTO, my_fibnum, CTLTYPE_INT|CTLFLAG_RD, NULL, 0, &sysctl_my_fibnum, "I", "default FIB of caller"); -static int -rtable_init(const void *unused) +static void +route_init(void) { - /* whack the tunable ints into line. */ + /* whack the tunable ints into line. */ if (rt_numfibs > RT_MAXFIBS) rt_numfibs = RT_MAXFIBS; if (rt_numfibs == 0) @@ -173,14 +178,14 @@ #ifndef VIMAGE_GLOBALS vnet_mod_register(&vnet_rtable_modinfo); #else - vnet_route_iattach(NULL); + rtable_init(NULL); #endif } static int vnet_route_iattach(const void *unused __unused) { - INIT_VNET_INET(curvnet); + INIT_VNET_NET(curvnet); int table; struct domain *dom; int fam; @@ -215,7 +220,7 @@ #ifdef VIMAGE static int -rtable_idetach(const void *unused) +vnet_route_idetach(const void *unused) { int table; int fam; @@ -241,26 +246,6 @@ } #endif -VNET_MOD_DECLARE_STATELESS(RTABLE, rtable, rtable_init, rtable_idetach, NET); - -static void -route_init(void) -{ - - /* whack the tunable ints into line. */ - if (rt_numfibs > RT_MAXFIBS) - rt_numfibs = RT_MAXFIBS; - if (rt_numfibs == 0) - rt_numfibs = 1; - rn_init(); /* initialize all zeroes, all ones, mask table */ - -#ifndef VIMAGE_GLOBALS - vnet_mod_register(&vnet_rtable_modinfo); -#else - rtable_init(NULL); -#endif -} - #ifndef _SYS_SYSPROTO_H_ struct setfib_args { int fibnum; ==== //depot/projects/vimage/src/sys/net/vnet.h#23 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netgraph/ng_base.c#52 (text+ko) ==== @@ -271,8 +271,17 @@ static vnet_detach_fn vnet_netgraph_idetach; #endif /* VIMAGE */ -VNET_MOD_DECLARE(NETGRAPH, netgraph, vnet_netgraph_iattach, - vnet_netgraph_idetach, LOIF, NULL) +#ifndef VIMAGE_GLOBALS +static vnet_modinfo_t vnet_netgraph_modinfo = { + .vmi_id = VNET_MOD_NETGRAPH, + .vmi_name = "netgraph", + .vmi_dependson = VNET_MOD_LOIF, + .vmi_iattach = vnet_netgraph_iattach, +#ifdef VIMAGE + .vmi_idetach = vnet_netgraph_idetach +#endif +}; +#endif #ifdef NETGRAPH_DEBUG /*----------------------------------------------*/ /* @@ -3125,7 +3134,7 @@ break; } } -#ifdef VIMAGE +#ifndef VIMAGE_GLOBALS vnet_mod_register(&vnet_netgraph_modinfo); #else vnet_netgraph_iattach(NULL); ==== //depot/projects/vimage/src/sys/netgraph/ng_eiface.c#24 (text+ko) ==== @@ -120,8 +120,15 @@ static struct unrhdr *ng_eiface_unit; #endif -VNET_MOD_DECLARE_STATELESS(NG_EIFACE, ng_eiface, ng_eiface_iattach, - ng_eiface_idetach, NETGRAPH) +#ifndef VIMAGE_GLOBALS +static vnet_modinfo_t vnet_ng_eiface_modinfo = { + .vmi_id = VNET_MOD_NG_EIFACE, + .vmi_name = "ng_eiface", + .vmi_dependson = VNET_MOD_NETGRAPH, + .vmi_iattach = ng_eiface_iattach, + .vmi_idetach = ng_eiface_idetach, +}; +#endif /************************************************************************ INTERFACE STUFF @@ -605,14 +612,14 @@ switch (event) { case MOD_LOAD: -#ifdef VIMAGE +#ifndef VIMAGE_GLOBALS vnet_mod_register(&vnet_ng_eiface_modinfo); #else ng_eiface_iattach(NULL); #endif break; case MOD_UNLOAD: -#ifdef VIMAGE +#ifndef VIMAGE_GLOBALS vnet_mod_deregister(&vnet_ng_eiface_modinfo); #else ng_eiface_idetach(NULL); ==== //depot/projects/vimage/src/sys/netgraph/ng_ether.c#22 (text+ko) ==== @@ -77,8 +77,14 @@ static vnet_attach_fn ng_ether_iattach; -VNET_MOD_DECLARE_STATELESS(NG_ETHER, ng_ether, ng_ether_iattach, - NULL, NETGRAPH) +#ifndef VIMAGE_GLOBALS +static vnet_modinfo_t vnet_ng_ether_modinfo = { + .vmi_id = VNET_MOD_NG_ETHER, + .vmi_name = "ng_ether", + .vmi_dependson = VNET_MOD_NETGRAPH, + .vmi_iattach = ng_ether_iattach, +}; +#endif /* Per-node private data */ struct private { @@ -775,7 +781,7 @@ ng_ether_input_p = ng_ether_input; ng_ether_input_orphan_p = ng_ether_input_orphan; ng_ether_link_state_p = ng_ether_link_state; -#ifdef VIMAGE +#ifndef VIMAGE_GLOBALS vnet_mod_register(&vnet_ng_ether_modinfo); #else error = ng_ether_iattach(NULL); ==== //depot/projects/vimage/src/sys/netgraph/ng_iface.c#20 (text+ko) ==== @@ -219,8 +219,15 @@ static struct unrhdr *ng_iface_unit; #endif -VNET_MOD_DECLARE_STATELESS(NG_IFACE, ng_iface, ng_iface_iattach, - ng_iface_idetach, NETGRAPH) +#ifndef VIMAGE_GLOBALS +static vnet_modinfo_t vnet_ng_iface_modinfo = { + .vmi_id = VNET_MOD_NG_IFACE, + .vmi_name = "ng_iface", + .vmi_dependson = VNET_MOD_NETGRAPH, + .vmi_iattach = ng_iface_iattach, + .vmi_idetach = ng_iface_idetach +}; +#endif /************************************************************************ HELPER STUFF @@ -878,14 +885,14 @@ switch (event) { case MOD_LOAD: -#ifdef VIMAGE +#ifndef VIMAGE_GLOBALS vnet_mod_register(&vnet_ng_iface_modinfo); #else ng_iface_iattach(NULL); #endif break; case MOD_UNLOAD: -#ifdef VIMAGE +#ifndef VIMAGE_GLOBALS vnet_mod_deregister(&vnet_ng_iface_modinfo); #else ng_iface_idetach(NULL); ==== //depot/projects/vimage/src/sys/netinet/accf_http.c#9 (text+ko) ==== @@ -95,8 +95,12 @@ static vnet_attach_fn vnet_accf_http_iattach; -VNET_MOD_DECLARE(ACCF_HTTP, accf_http, vnet_accf_http_iattach, - NULL, INET, NULL) +vnet_modinfo_t vnet_accf_http_modinfo = { + .vmi_id = VNET_MOD_ACCF_HTTP, + .vmi_name = "accf_http", + .vmi_dependson = VNET_MOD_INET, + .vmi_iattach = vnet_accf_http_iattach +}; SYSCTL_NODE(_net_inet_accf, OID_AUTO, http, CTLFLAG_RW, 0, "HTTP accept filter"); ==== //depot/projects/vimage/src/sys/netinet/if_ether.c#41 (text+ko) ==== @@ -114,7 +114,6 @@ static int arp_iattach(const void *); void arprequest(struct ifnet *, struct in_addr *, struct in_addr *, u_char *); -static int arp_iattach(const void *); static void arpintr(struct mbuf *); static void arptimer(void *); #ifdef INET @@ -132,7 +131,6 @@ #ifdef AF_INET void arp_ifscrub(struct ifnet *ifp, uint32_t addr); -VNET_MOD_DECLARE_STATELESS(ARP, arp, arp_iattach, NULL, INET) /* * called by in_ifscrub to remove entry from the table when ==== //depot/projects/vimage/src/sys/netinet/ip_fw2.c#71 (text+ko) ==== @@ -115,7 +115,18 @@ static int vnet_ipfw_iattach(const void *); static int vnet_ipfw_idetach(const void *); -VNET_MOD_DECLARE(IPFW, ipfw, vnet_ipfw_iattach, vnet_ipfw_idetach, INET, NULL) +#ifndef VIMAGE_GLOBALS +static vnet_modinfo_t vnet_ipfw_modinfo = { + .vmi_id = VNET_MOD_IPFW, + .vmi_name = "ipfw", + .vmi_size = sizeof(struct vnet_ipfw), + .vmi_dependson = VNET_MOD_INET, + .vmi_iattach = vnet_ipfw_iattach, +#ifdef VIMAGE + .vmi_idetach = vnet_ipfw_idetach +#endif +}; +#endif /* * set_disable contains one bit per set value (0..31). ==== //depot/projects/vimage/src/sys/sys/kernel.h#17 (text+ko) ==== @@ -172,7 +172,6 @@ SI_SUB_KTHREAD_BUF = 0xea00000, /* buffer daemon*/ SI_SUB_KTHREAD_UPDATE = 0xec00000, /* update daemon*/ SI_SUB_KTHREAD_IDLE = 0xee00000, /* idle procs*/ - SI_SUB_VIMAGE_DONE = 0xef00000, /* clear curvnet*/ SI_SUB_SMP = 0xf000000, /* start the APs*/ SI_SUB_RUN_SCHEDULER = 0xfffffff /* scheduler*/ }; ==== //depot/projects/vimage/src/sys/sys/vimage.h#86 (text+ko) ==== @@ -49,10 +49,6 @@ typedef int vnet_attach_fn(const void *); typedef int vnet_detach_fn(const void *); -#ifndef VIMAGE_GLOBALS - -#ifndef VIMAGE_GLOBALS - struct vimage; struct vprocg; struct vnet; @@ -77,72 +73,11 @@ #define curvnet NULL #endif -#define VNET_SYMMAP(mod, name) \ - { #name, offsetof(struct vnet_##mod, _##name), \ - sizeof(((struct vnet_##mod *) curthread)->_##name) } - -#define VNET_MOD_NONE_VERSION 2008122301 - #ifndef VIMAGE_GLOBALS -#ifdef VIMAGE -#define VNET_MOD_DECLARE(m_name_uc, m_name_lc, m_iattach, m_idetach, \ - m_dependson, m_symmap) \ - static const struct vnet_modinfo vnet_##m_name_lc##_modinfo = { \ - .vmi_id = VNET_MOD_##m_name_uc, \ - .vmi_dependson = VNET_MOD_##m_dependson, \ - .vmi_name = #m_name_lc, \ - .vmi_iattach = m_iattach, \ - .vmi_idetach = m_idetach, \ - .vmi_struct_size = \ - sizeof(struct vnet_##m_name_lc), \ - .vmi_symmap = m_symmap \ -}; -#define VNET_MOD_DECLARE_STATELESS(m_name_uc, m_name_lc, m_iattach, m_idetach, \ - m_dependson) \ - static const struct vnet_modinfo vnet_##m_name_lc##_modinfo = { \ - .vmi_id = VNET_MOD_##m_name_uc, \ - .vmi_dependson = VNET_MOD_##m_dependson, \ - .vmi_name = #m_name_lc, \ - .vmi_iattach = m_iattach, \ - .vmi_idetach = m_idetach \ -}; -#else /* !VIMAGE */ -#define VNET_MOD_DECLARE(m_name_uc, m_name_lc, m_iattach, m_idetach, \ - m_dependson, m_symmap) \ - static const struct vnet_modinfo vnet_##m_name_lc##_modinfo = { \ - .vmi_id = VNET_MOD_##m_name_uc, \ - .vmi_dependson = VNET_MOD_##m_dependson, \ - .vmi_name = #m_name_lc, \ - .vmi_iattach = m_iattach, \ - .vmi_struct_size = \ - sizeof(struct vnet_##m_name_lc), \ - .vmi_symmap = m_symmap \ -}; -#define VNET_MOD_DECLARE_STATELESS(m_name_uc, m_name_lc, m_iattach, m_idetach, \ - m_dependson) \ - static const struct vnet_modinfo vnet_##m_name_lc##_modinfo = { \ - .vmi_id = VNET_MOD_##m_name_uc, \ - .vmi_dependson = VNET_MOD_##m_dependson, \ - .vmi_name = #m_name_lc, \ - .vmi_iattach = m_iattach \ -}; -#endif -#else /* VIMAGE_GLOBALS */ -#define VNET_MOD_DECLARE(m_name_uc, m_name_lc, m_iattach, m_idetach, \ - m_dependson, m_symmap) -#define VNET_MOD_DECLARE_STATELESS(m_name_uc, m_name_lc, m_iattach, m_idetach, \ - m_dependson) -#endif - -typedef int vnet_attach_fn(const void *); -typedef int vnet_detach_fn(const void *); - -#ifndef VIMAGE_GLOBALS - struct vnet_symmap { char *name; - size_t offset; - size_t size; + size_t offset; + size_t size; }; typedef struct vnet_symmap vnet_symmap_t; @@ -152,7 +87,7 @@ char *vmi_name; vnet_attach_fn *vmi_iattach; vnet_detach_fn *vmi_idetach; - size_t vmi_struct_size; + size_t vmi_size; struct vnet_symmap *vmi_symmap; }; typedef struct vnet_modinfo vnet_modinfo_t; @@ -163,9 +98,16 @@ const void *vml_iarg; const char *vml_iname; }; + +#ifdef VIMAGE #define VNET_SYMMAP(mod, name) \ - { #name, &(vnet_ ## mod ## _0._ ## name), \ + { #name, offsetof(struct vnet_ ## mod, _ ## name), \ + sizeof(((struct vnet_ ## mod *) curthread)->_ ## name) } +#else +#define VNET_SYMMAP(mod, name) \ + { #name, (size_t) &(vnet_ ## mod ## _0._ ## name), \ sizeof(vnet_ ## mod ## _0._ ## name) } +#endif #define VNET_SYMMAP_END { NULL, 0 } @@ -210,16 +152,6 @@ #define V_MOD_vnet_gif VNET_MOD_GIF #define V_MOD_vnet_ipsec VNET_MOD_IPSEC -int vi_symlookup(struct kld_sym_lookup *, char *); -void vnet_mod_register(const struct vnet_modinfo *); -void vnet_mod_register_multi(const struct vnet_modinfo *, void *, char *); - -#define VNET_SYMMAP_END { NULL, 0 } - -#define VNET_SYMMAP(mod, name) \ - { #name, &(vnet_ ## mod ## _0._ ## name), \ - sizeof(vnet_ ## mod ## _0._ ## name) } - #define basevnet thread0.td_ucred->cr_vimage->v_net #define basevprocg thread0.td_ucred->cr_vimage->v_procg #define basevcpu thread0.td_ucred->cr_vimage->v_cpu @@ -229,56 +161,10 @@ #define V_PROCG 2 #define V_CPU 3 -/* statefull modules */ -#define VNET_MOD_NET 0 -#define VNET_MOD_NETGRAPH 1 -#define VNET_MOD_INET 2 -#define VNET_MOD_INET6 3 -#define VNET_MOD_IPSEC 4 -#define VNET_MOD_IPFW 5 -#define VNET_MOD_DUMMYNET 6 -#define VNET_MOD_PF 7 -#define VNET_MOD_ALTQ 8 -#define VNET_MOD_IPX 9 -#define VNET_MOD_ATALK 10 -#define VNET_MOD_ACCF_HTTP 11 -#define VNET_MOD_IGMP 12 - -/* stateless modules */ -#define VNET_MOD_NG_ETHER 20 -#define VNET_MOD_NG_IFACE 21 -#define VNET_MOD_NG_EIFACE 22 -#define VNET_MOD_ESP 23 -#define VNET_MOD_IPIP 24 -#define VNET_MOD_AH 25 -#define VNET_MOD_IPCOMP 26 -#define VNET_MOD_GIF 27 -#define VNET_MOD_ARP 28 -#define VNET_MOD_RTABLE 29 -#define VNET_MOD_LOIF 30 -#define VNET_MOD_DOMAIN 31 -#define VNET_MOD_DYNAMIC_START 32 -#define VNET_MOD_MAX 64 - -/* Sysctl virtualization macros need these name mappings bellow */ -#define V_MOD_vnet_net VNET_MOD_NET -#define V_MOD_vnet_netgraph VNET_MOD_NETGRAPH -#define V_MOD_vnet_inet VNET_MOD_INET -#define V_MOD_vnet_inet6 VNET_MOD_INET6 -#define V_MOD_vnet_ipfw VNET_MOD_IPFW -#define V_MOD_vnet_pf VNET_MOD_PF -#define V_MOD_vnet_gif VNET_MOD_GIF -#define V_MOD_vnet_ipsec VNET_MOD_IPSEC - -int vi_symlookup(struct kld_sym_lookup *, char *); -void vnet_mod_register(const struct vnet_modinfo *); -void vnet_mod_register_multi(const struct vnet_modinfo *, void *, char *); - #define V_MOD_vprocg 0 #define V_MOD_vcpu 0 #ifdef VIMAGE - struct vnet { void *mod_data[VNET_MOD_MAX]; @@ -291,13 +177,13 @@ u_int vnet_magic_n; }; - +#endif /* VIMAGE */ #endif /* !VIMAGE_GLOBALS */ #define VNET_MAGIC_N 0x3e0d8f29 +#ifdef VIMAGE #ifdef VNET_DEBUG - #define VNET_ASSERT(condition) \ if (!(condition)) { \ printf("VNET_ASSERT @ %s:%d %s():\n", \ @@ -333,9 +219,7 @@ __FILE__, __LINE__, __FUNCTION__, \ vnet, curvnet); \ modtype *sym = (vnet)->mod_data[modindex]; - #else /* !VNET_DEBUG */ - #define VNET_ASSERT(condition) #define CURVNET_SET(arg) \ @@ -350,7 +234,6 @@ #define INIT_FROM_VNET(vnet, modindex, modtype, sym) \ modtype *sym = (vnet)->mod_data[modindex]; - #endif /* !VNET_DEBUG */ #define VNET_ITERATOR_DECL(arg) struct vnet *arg; @@ -380,11 +263,11 @@ /* Non-VIMAGE null-macros */ #define IS_DEFAULT_VNET(arg) 1 +#define VNET_ASSERT(condition) +#define INIT_FROM_VNET(vnet, modindex, modtype, sym) #define CURVNET_SET(arg) #define CURVNET_SET_QUIET(arg) #define CURVNET_RESTORE() -#define VNET_ASSERT(condition) -#define INIT_FROM_VNET(vnet, modindex, modtype, sym) #define VNET_ITERATOR_DECL(arg) #define VNET_FOREACH(arg) #define VNET_LIST_RLOCK() @@ -426,7 +309,7 @@ void vnet_mod_deregister(const struct vnet_modinfo *); void vnet_mod_register_multi(const struct vnet_modinfo *, void *, char *); void vnet_mod_deregister_multi(const struct vnet_modinfo *, void *, char *); -int vi_symlookup(struct kld_sym_lookup *, char *); +int vi_symlookup(struct kld_sym_lookup *, char *); #endif #ifdef VIMAGE From owner-p4-projects@FreeBSD.ORG Tue Apr 14 11:21:27 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A6DB1065679; Tue, 14 Apr 2009 11:21:27 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 535801065674 for ; Tue, 14 Apr 2009 11:21:27 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 415718FC1A for ; Tue, 14 Apr 2009 11:21:27 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3EBLRp7052712 for ; Tue, 14 Apr 2009 11:21:27 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3EBLQsT052710 for perforce@freebsd.org; Tue, 14 Apr 2009 11:21:26 GMT (envelope-from zec@fer.hr) Date: Tue, 14 Apr 2009 11:21:26 GMT Message-Id: <200904141121.n3EBLQsT052710@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 160606 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, 14 Apr 2009 11:21:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=160606 Change 160606 by zec@zec_amdx2 on 2009/04/14 11:20:41 Unbreak LINT. Affected files ... .. //depot/projects/vimage/src/sys/netipsec/ipsec.c#43 edit .. //depot/projects/vimage/src/sys/netipsec/xform_ah.c#26 edit .. //depot/projects/vimage/src/sys/netipsec/xform_esp.c#25 edit .. //depot/projects/vimage/src/sys/netipsec/xform_ipcomp.c#21 edit .. //depot/projects/vimage/src/sys/netipsec/xform_ipip.c#29 edit Differences ... ==== //depot/projects/vimage/src/sys/netipsec/ipsec.c#43 (text+ko) ==== @@ -233,9 +233,6 @@ "IPsec IPv6 statistics."); #endif /* INET6 */ -VNET_MOD_DECLARE(IPSEC, ipsec, vnet_ipsec_iattach, vnet_ipsec_idetach, - INET, NULL) - static int ipsec_setspidx_inpcb __P((struct mbuf *, struct inpcb *)); static int ipsec_setspidx __P((struct mbuf *, struct secpolicyindex *, int)); static void ipsec4_get_ulp __P((struct mbuf *m, struct secpolicyindex *, int)); @@ -255,7 +252,10 @@ .vmi_id = VNET_MOD_IPSEC, .vmi_name = "ipsec", .vmi_dependson = VNET_MOD_INET, /* XXX revisit - INET6 ? */ - .vmi_iattach = ipsec_iattach + .vmi_iattach = ipsec_iattach, +#ifdef VIMAGE + .vmi_idetach = ipsec_idetach +#endif }; #endif /* !VIMAGE_GLOBALS */ ==== //depot/projects/vimage/src/sys/netipsec/xform_ah.c#26 (text+ko) ==== @@ -113,10 +113,6 @@ SYSCTL_V_STRUCT(V_NET, vnet_ipsec, _net_inet_ah, IPSECCTL_STATS, stats, CTLFLAG_RD, ahstat, ahstat, ""); -static int ah_iattach(const void *); - -VNET_MOD_DECLARE_STATELESS(AH, ah, ah_iattach, NULL, IPSEC) - static unsigned char ipseczeroes[256]; /* larger than an ip6 extension hdr */ static int ah_input_cb(struct cryptop*); @@ -1231,18 +1227,6 @@ ah_init, ah_zeroize, ah_input, ah_output, }; -static int -ah_iattach(unused) - const void *unused; -{ - INIT_VNET_IPSEC(curvnet); - - V_ah_enable = 1; /* control flow of packets with AH */ - V_ah_cleartos = 1; /* clear ip_tos when doing AH calc */ - - return 0; -} - static void ah_attach(void) { ==== //depot/projects/vimage/src/sys/netipsec/xform_esp.c#25 (text+ko) ==== @@ -999,19 +999,6 @@ }; static int -esp_iattach(unused) - const void *unused; -{ - - xform_register(&esp_xformsw); -#ifndef VIMAGE_GLOBALS - vnet_mod_register(&vnet_esp_modinfo); -#else - esp_iattach(NULL); -#endif -} - -static int esp_iattach(const void *unused __unused) { INIT_VNET_IPSEC(curvnet); ==== //depot/projects/vimage/src/sys/netipsec/xform_ipcomp.c#21 (text+ko) ==== @@ -78,10 +78,6 @@ SYSCTL_V_STRUCT(V_NET, vnet_ipsec, _net_inet_ipcomp, IPSECCTL_STATS, stats, CTLFLAG_RD, ipcompstat, ipcompstat, ""); -static int ipcomp_iattach(const void *); - -VNET_MOD_DECLARE_STATELESS(IPCOMP, ipcomp, ipcomp_iattach, NULL, IPSEC) - static int ipcomp_input_cb(struct cryptop *crp); static int ipcomp_output_cb(struct cryptop *crp); static int ipcomp_iattach(const void *); @@ -610,17 +606,6 @@ ipcomp_output }; -static int -ipcomp_iattach(unused) - const void *unused; -{ - INIT_VNET_IPSEC(curvnet); - - V_ipcomp_enable = 0; - - return 0; -} - static void ipcomp_attach(void) { ==== //depot/projects/vimage/src/sys/netipsec/xform_ipip.c#29 (text+ko) ==== @@ -119,10 +119,6 @@ }; #endif /* !VIMAGE_GLOBALS */ -static int ipip_iattach(const void *); - -VNET_MOD_DECLARE_STATELESS(IPIP, ipip, ipip_iattach, NULL, IPSEC) - #ifdef INET6 /* * Really only a wrapper for ipip_input(), for use with IPv6. From owner-p4-projects@FreeBSD.ORG Tue Apr 14 13:26:35 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 72E571065676; Tue, 14 Apr 2009 13:26:35 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 317A9106566C for ; Tue, 14 Apr 2009 13:26:35 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 05E118FC1C for ; Tue, 14 Apr 2009 13:26:35 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3EDQYtn073978 for ; Tue, 14 Apr 2009 13:26:34 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3EDQYjD073976 for perforce@freebsd.org; Tue, 14 Apr 2009 13:26:34 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 14 Apr 2009 13:26:34 GMT Message-Id: <200904141326.n3EDQYjD073976@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 160614 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, 14 Apr 2009 13:26:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=160614 Change 160614 by hselasky@hselasky_laptop001 on 2009/04/14 13:26:19 USB core: Fix errornous printout. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_device.c#24 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_device.c#24 (text+ko) ==== @@ -1111,7 +1111,8 @@ if (udev->flags.suspended) { err = DEVICE_SUSPEND(iface->subdev); - device_printf(iface->subdev, "Suspend failed\n"); + if (err) + device_printf(iface->subdev, "Suspend failed\n"); } return (0); /* success */ } else { From owner-p4-projects@FreeBSD.ORG Tue Apr 14 16:18:31 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 62E441065691; Tue, 14 Apr 2009 16:18:30 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0DE161065688 for ; Tue, 14 Apr 2009 16:18:30 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EE2698FC16 for ; Tue, 14 Apr 2009 16:18:29 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3EGITPE092926 for ; Tue, 14 Apr 2009 16:18:29 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3EGIT9e092922 for perforce@freebsd.org; Tue, 14 Apr 2009 16:18:29 GMT (envelope-from pgj@FreeBSD.org) Date: Tue, 14 Apr 2009 16:18:29 GMT Message-Id: <200904141618.n3EGIT9e092922@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 160617 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, 14 Apr 2009 16:18:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=160617 Change 160617 by pgj@petymeg on 2009/04/14 16:17:30 IFC Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#32 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/desktop/chapter.sgml#17 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/linuxemu/chapter.sgml#7 integrate .. //depot/projects/docproj_hu/www/en/gnome/news.xml#4 integrate .. //depot/projects/docproj_hu/www/en/releases/7.2R/schedule.sgml#6 integrate .. //depot/projects/docproj_hu/www/en/releng/index.sgml#19 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/navibar.l10n.ent#27 integrate .. //depot/projects/docproj_hu/www/share/sgml/events.xml#15 integrate .. //depot/projects/docproj_hu/www/share/sgml/news.xml#48 integrate .. //depot/projects/docproj_hu/www/share/sgml/press.xml#13 integrate Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#32 (text+ko) ==== @@ -1,7 +1,7 @@ + - $FreeBSD: www/share/sgml/events.xml,v 1.69 2009/03/06 11:58:35 blackend Exp $ + $FreeBSD: www/share/sgml/events.xml,v 1.71 2009/04/14 12:29:35 jkoshy Exp $ - - Network-related Bugathon #6 - http://wiki.freebsd.org/Bugathons/January2009 - - 2009 - 1 - 30 - - - 2009 - 2 - 1 - - - A bugathon is an event coordinated by the &os; - bugbusting team. Bugathons are held on IRC (in the - #freebsd-bugbusters channel of EFnet), and are attended by any - interested &os; developers and contributors during a week-end. - They focus on closing as many problem reports and fixing as many - bugs as possible. The plan for the sixth bugathon is to work - through the all network-related problem reports in &os;'s GNATS - database. - - - - FOSDEM '09 - http://fosdem.org/2009/ - - 2009 - 2 - 7 - - - 2009 - 2 - 8 - - - Belgium - Brussels - ULB Campus Solbosh - - - FOSDEM '09 is a free and non-commercial event organized - by the community, for the community. Its goal is to provide Free - and Open Source developers a place to meet. Several &os; - developers will be present, including Kris Kennaway who will be - giving a talk about system performance. - - EuroBSDCon 2009 http://2009.eurobsdcon.org/ @@ -88,6 +38,33 @@ track, tutorials, and FreeBSD developer summit. + + BSDday Argentina 2009 + http://www.bsdday.com.ar/ + + 2009 + 5 + 29 + + + 2009 + 5 + 30 + + + Argentina + Buenos Aires + + + BSDday Argentina is a conference for users and developers + on BSD based systems. The conference is for anyone developing, + deploying and using systems based on FreeBSD, NetBSD, OpenBSD, + DragonFlyBSD and others *BSD. BSDday Argentina is a technical conference + and aims to collect the best technical papers and presentations available + to ensure that the latest developments in our open source community are + shared with the widest possible audience. + + BSDCan 2009 http://www.bsdcan.org/2009/ @@ -113,31 +90,26 @@ from commercial vendors. - - BSDday Argentina 2009 - http://www.bsdday.com.ar/ + + ACM Talk on FreeBSD/PmcTools + http://acmbangalore.org/index.php?option=com_attend_events&task=view&id=3&Itemid=0 2009 - 5 - 29 + 4 + 18 2009 - 5 - 30 + 4 + 18 - Argentina - Buenos Aires + India + Bangalore +
    Honeywell, Bannerghatta Road
     - - BSDday Argentina is a conference for users and developers - on BSD based systems. The conference is for anyone developing, - deploying and using systems based on FreeBSD, NetBSD, OpenBSD, - DragonFlyBSD and others *BSD. BSDday Argentina is a technical conference - and aims to collect the best technical papers and presentations available - to ensure that the latest developments in our open source community are - shared with the widest possible audience. + A talk on FreeBSD/PmcTools, hosted by the Bangalore chapter + of the ACM.     @@ -228,6 +200,32 @@ the widest possible audience. + + FOSDEM '09 + http://fosdem.org/2009/ + + 2009 + 2 + 7 + + + 2009 + 2 + 8 + + + Belgium + Brussels + ULB Campus Solbosh + + + FOSDEM '09 is a free and non-commercial event organized + by the community, for the community. Its goal is to provide Free + and Open Source developers a place to meet. Several &os; + developers will be present, including Kris Kennaway who will be + giving a talk about system performance. + + DCBSDCon 2009 http://www.dcbsdcon.org/ @@ -252,6 +250,30 @@ security themes. + + Network-related Bugathon #6 + http://wiki.freebsd.org/Bugathons/January2009 + + 2009 + 1 + 30 + + + 2009 + 2 + 1 + + + A bugathon is an event coordinated by the &os; + bugbusting team. Bugathons are held on IRC (in the + #freebsd-bugbusters channel of EFnet), and are attended by any + interested &os; developers and contributors during a week-end. + They focus on closing as many problem reports and fixing as many + bugs as possible. The plan for the sixth bugathon is to work + through the all network-related problem reports in &os;'s GNATS + database. + + NLLGG-bijeenkomst december 2008 http://www.nllgg.nl/bijeenkomst_20081213 ==== //depot/projects/docproj_hu/www/share/sgml/news.xml#48 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.239 2009/04/06 16:57:09 pgj Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.241 2009/04/13 19:41:56 jkois Exp $ @@ -36,6 +36,35 @@ 4 + 12 + + +

    Enhanced commit privileges: Gábor Páli + (ports, doc)

    +     +     + + + 10 + + + PC-BSD 7.1 Released + +

    PC-BSD 7.1 has been released. PC-BSD is a + successful desktop operating system based on FreeBSD that + focuses on providing an easy to use desktop system for + casual computer users. A list of new features/updates + since the last version can be found here.

    + +

    The new release may be downloaded or purchased on DVD.

    +     +     + + 6 ==== //depot/projects/docproj_hu/www/share/sgml/press.xml#13 (text+ko) ==== @@ -9,7 +9,7 @@ - $FreeBSD: www/share/sgml/press.xml,v 1.76 2009/03/16 08:08:22 pgj Exp $ + $FreeBSD: www/share/sgml/press.xml,v 1.77 2009/04/14 11:00:40 jkoshy Exp $ @@ -17,6 +17,20 @@ 2009 + 4 + + Combining Debian and FreeBSD; Pushing the Envelope of FOSS + http://www.linux-mag.com/id/7295 + Linux Magazine + http://www.linux-mag.com/ + 9 April 2009 + Nathan Willis +

    Coverage of Debian GNU/kFreeBSD, a GNU operating system that + uses the FreeBSD kernel.

    +     +     + + 3 Tomahawk Desktop Switches to BSD from Linux From owner-p4-projects@FreeBSD.ORG Tue Apr 14 16:38:51 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C3C31065670; Tue, 14 Apr 2009 16:38:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EF8D8106564A for ; Tue, 14 Apr 2009 16:38:50 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C3E038FC16 for ; Tue, 14 Apr 2009 16:38:50 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3EGcoR3094454 for ; Tue, 14 Apr 2009 16:38:50 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3EGco1K094452 for perforce@freebsd.org; Tue, 14 Apr 2009 16:38:50 GMT (envelope-from zec@fer.hr) Date: Tue, 14 Apr 2009 16:38:50 GMT Message-Id: <200904141638.n3EGco1K094452@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 160618 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, 14 Apr 2009 16:38:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=160618 Change 160618 by zec@zec_amdx2 on 2009/04/14 16:38:05 Unbreak LINT + VIMAGE_GLOBALS build. Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_vimage.c#79 edit .. //depot/projects/vimage/src/sys/net/route.c#46 edit .. //depot/projects/vimage/src/sys/netinet/accf_http.c#10 edit .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#79 edit .. //depot/projects/vimage/src/sys/netipsec/xform_ipip.c#30 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#79 (text+ko) ==== @@ -848,6 +848,7 @@ } #endif /* VIMAGE */ +#ifndef VIMAGE_GLOBALS static void vi_init(void *unused) { @@ -897,6 +898,7 @@ SYSINIT(vimage, SI_SUB_VIMAGE, SI_ORDER_FIRST, vi_init, NULL); SYSINIT(vimage_done, SI_SUB_VIMAGE_DONE, SI_ORDER_FIRST, vi_init_done, NULL); +#endif /* !VIMAGE_GLOBALS */ #ifdef VIMAGE #ifdef DDB ==== //depot/projects/vimage/src/sys/net/route.c#46 (text+ko) ==== @@ -178,7 +178,7 @@ #ifndef VIMAGE_GLOBALS vnet_mod_register(&vnet_rtable_modinfo); #else - rtable_init(NULL); + vnet_route_iattach(NULL); #endif } ==== //depot/projects/vimage/src/sys/netinet/accf_http.c#10 (text+ko) ==== @@ -95,12 +95,14 @@ static vnet_attach_fn vnet_accf_http_iattach; +#ifndef VIMAGE_GLOBALS vnet_modinfo_t vnet_accf_http_modinfo = { .vmi_id = VNET_MOD_ACCF_HTTP, .vmi_name = "accf_http", .vmi_dependson = VNET_MOD_INET, .vmi_iattach = vnet_accf_http_iattach }; +#endif SYSCTL_NODE(_net_inet_accf, OID_AUTO, http, CTLFLAG_RW, 0, "HTTP accept filter"); ==== //depot/projects/vimage/src/sys/netinet/tcp_subr.c#79 (text+ko) ==== @@ -282,10 +282,6 @@ #define ISN_LOCK() mtx_lock(&isn_mtx) #define ISN_UNLOCK() mtx_unlock(&isn_mtx) -#ifdef VIMAGE_GLOBALS -static uma_zone_t tcpcb_zone; -#endif - /* * TCP initialization. */ ==== //depot/projects/vimage/src/sys/netipsec/xform_ipip.c#30 (text+ko) ==== @@ -732,7 +732,7 @@ #ifndef VIMAGE_GLOBALS vnet_mod_register(&vnet_ipip_modinfo); #else - ipip_iattach(NULL); + ipe4_iattach(NULL); #endif } SYSINIT(ipe4_xform_init, SI_SUB_PROTO_DOMAIN, SI_ORDER_MIDDLE, ipe4_attach, NULL); From owner-p4-projects@FreeBSD.ORG Tue Apr 14 17:41:58 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 93B51106567E; Tue, 14 Apr 2009 17:41:56 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 628C91065751 for ; Tue, 14 Apr 2009 17:41:55 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 497988FC1E for ; Tue, 14 Apr 2009 17:41:55 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3EHft1a010156 for ; Tue, 14 Apr 2009 17:41:55 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3EHft7r010154 for perforce@freebsd.org; Tue, 14 Apr 2009 17:41:55 GMT (envelope-from pgj@FreeBSD.org) Date: Tue, 14 Apr 2009 17:41:55 GMT Message-Id: <200904141741.n3EHft7r010154@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 160622 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, 14 Apr 2009 17:42:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=160622 Change 160622 by pgj@petymeg on 2009/04/14 17:41:53 MFen (www): 1.69 -> 1.71 hu/share/sgml/events.xml 1.239 -> 1.241 hu/share/sgml/news.xml 1.76 -> 1.77 hu/share/sgml/press.xml Affected files ... .. //depot/projects/docproj_hu/www/hu/share/sgml/events.xml#5 edit .. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#12 edit .. //depot/projects/docproj_hu/www/hu/share/sgml/press.xml#5 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/share/sgml/events.xml#5 (text+ko) ==== @@ -4,13 +4,14 @@ @@ -20,68 +21,6 @@ - - Hatodik Bugathon, hálózatok - http://wiki.freebsd.org/Bugathons/January2009 - - 2009 - 1 - 30 - - - 2009 - 2 - 1 - - - A bugathonokat a &os; hibairtó csapata - irányítja. Ezeket az eseményeket - általában valamelyik hétvégén - egy IRC csatornán (#freebsd-bugbusters az EFnet - hálózaton) keresztül szokták - megszervezni, ahol a téma iránt - érdeklõdõ fejlesztõk és - segítõik gyûlnek össze. Céljuk - minél több hibajelentés lezárás - és minél több hiba kijavítása. - Az immáron hatodik alkalommal megrendezett bugathon - célkitûzése a &os; GNATS - adatbázisában felbukkanó, - hálózati kódhoz tartozó - hibajelentések felszámolása. - - - - FOSDEM '09 - http://fosdem.org/2009/ - - 2009 - 2 - 7 - - - 2009 - 2 - 8 - - - Belgium - Brüsszel - Solbosh Campus, ULB - - - A FOSDEM '09 egy közösség a - közösségnek stílusú szabad - és nem kereskedelmi jellegû esemény, amely egy - találkozóhelyet kíván nyújtani - a szabad- és nyílt forráskódú - szoftverek fejlesztõinek. Ezen az eseményen - számos &os; fejlesztõ is résztvesz, többek - közt Kris Kennaway fog elõadást tartani a - rendszerek - teljesítményérõl. - - EuroBSDCon 2009 http://2009.eurobsdcon.org/ @@ -109,6 +48,39 @@ és egy fejlesztõi gyûlés. + + BSDday Argentina 2009 + http://www.bsdday.com.ar/ + + 2009 + 5 + 29 + + + 2009 + 5 + 30 + + + Argentína + Buenos Aires + + + A BSDday Argentina elnevezésû konferencia + elsõsorban a BSD alapú rendszerek fejlesztõinek + és felhasználóinak szól. Mindenkit + szeretettel vár, aki FreeBSD, NetBSD, OpenBSD, DragonFlyBSD + vagy másmilyen egyéb BSD rendszert fejleszt, + szállít vagy éppen használ. A BSDday + Argentina szakmai konferenciaként igyekszik a nyílt + forráskód témakörében a legjobb + friss szakmai témájú + publikációkat és elõadásokat + összegyûjteni, hogy azok minél szélesebb + körben találjanak + közönségre. + + BSDCan 2009 http://www.bsdcan.org/2009/ @@ -140,37 +112,28 @@ szoftveres és kereskedelmi fejlesztõket. - - BSDday Argentina 2009 - http://www.bsdday.com.ar/ + + ACM elõadás &os;/PmcTools + témában + http://acmbangalore.org/index.php?option=com_attend_events&task=view&id=3&Itemid=0 2009 - 5 - 29 + 4 + 18 2009 - 5 - 30 + 4 + 18 - Argentína - Buenos Aires + India + Bangalore +
    Honeywell, Bannerghatta Road
     - A BSDday Argentina elnevezésû konferencia - elsõsorban a BSD alapú rendszerek fejlesztõinek - és felhasználóinak szól. Mindenkit - szeretettel vár, aki FreeBSD, NetBSD, OpenBSD, DragonFlyBSD - vagy másmilyen egyéb BSD rendszert fejleszt, - szállít vagy éppen használ. A BSDday - Argentina szakmai konferenciaként igyekszik a nyílt - forráskód témakörében a legjobb - friss szakmai témájú - publikációkat és elõadásokat - összegyûjteni, hogy azok minél szélesebb - körben találjanak - közönségre. + Az ACM bangalore-i tagszervezete elõadást + hirdet &os;/PmcTools bemutatására.     @@ -246,7 +209,6 @@ 6:30-tól 10:00 óráig. - AsiaBSDCon 2009 http://2009.asiabsdcon.org/ @@ -280,6 +242,37 @@ körben bemutatni. + + FOSDEM '09 + http://fosdem.org/2009/ + + 2009 + 2 + 7 + + + 2009 + 2 + 8 + + + Belgium + Brüsszel + Solbosh Campus, ULB + + + A FOSDEM '09 egy közösség a + közösségnek stílusú szabad + és nem kereskedelmi jellegû esemény, amely egy + találkozóhelyet kíván nyújtani + a szabad- és nyílt forráskódú + szoftverek fejlesztõinek. Ezen az eseményen + számos &os; fejlesztõ is résztvesz, többek + közt Kris Kennaway fog elõadást tartani a + rendszerek + teljesítményérõl. + + DCBSDCon 2009 http://www.dcbsdcon.org/ @@ -305,6 +298,37 @@ állni. + + Hatodik Bugathon, hálózatok + http://wiki.freebsd.org/Bugathons/January2009 + + 2009 + 1 + 30 + + + 2009 + 2 + 1 + + + A bugathonokat a &os; hibairtó csapata + irányítja. Ezeket az eseményeket + általában valamelyik hétvégén + egy IRC csatornán (#freebsd-bugbusters az EFnet + hálózaton) keresztül szokták + megszervezni, ahol a téma iránt + érdeklõdõ fejlesztõk és + segítõik gyûlnek össze. Céljuk + minél több hibajelentés lezárás + és minél több hiba kijavítása. + Az immáron hatodik alkalommal megrendezett bugathon + célkitûzése a &os; GNATS + adatbázisában felbukkanó, + hálózati kódhoz tartozó + hibajelentések felszámolása. + + NLLGG-bijeenkomst december 2008 http://www.nllgg.nl/bijeenkomst_20081213 ==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#12 (text+ko) ==== @@ -5,7 +5,7 @@ @@ -22,6 +22,39 @@ 4 + 12 + + +

    Bõvebb commit jogosultság: Páli Gábor + (ports, doc)

    +     +     + + + 10 + + + Megjelent a PC-BSD 7.1! + +

    Örömmel értesítünk mindenkit, + hogy megjelent a PC-BSD 7.1 kiadása. A PC-BSD egy &os; + alapú operációs rendszer, amely az + egyszeri felhasználók számára + igyekszik egy könnyen használható asztali + rendszert kínálni. A legfrissebb + változat újításai és + javításai a megtalálhatóak a honlapon.

    + +

    A kiadás interneten keresztül letölthetõ vagy megrendelhetõ + DVD változatban.

    +     +     + + 6 ==== //depot/projects/docproj_hu/www/hu/share/sgml/press.xml#5 (text+ko) ==== @@ -5,7 +5,7 @@ @@ -19,6 +19,23 @@ 2009 + 4 + + + A &os; és a Debian ötvözése + — egy még szabadabb szoftver + http://www.linux-mag.com/id/7295 + Linux Magazine + http://www.linux-mag.com/ + 2009. április 9. + Nathan Willis +

    A &os; rendszermagját használó GNU + operációs rendszer, a Debian GNU/k&os; + bemutatása.

    +     +     + + 3 From owner-p4-projects@FreeBSD.ORG Tue Apr 14 17:52:06 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AB4E81065672; Tue, 14 Apr 2009 17:52:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 634C8106564A for ; Tue, 14 Apr 2009 17:52:06 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 461BA8FC1C for ; Tue, 14 Apr 2009 17:52:06 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3EHq5v0010898 for ; Tue, 14 Apr 2009 17:52:05 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3EHq57U010896 for perforce@freebsd.org; Tue, 14 Apr 2009 17:52:05 GMT (envelope-from zec@fer.hr) Date: Tue, 14 Apr 2009 17:52:05 GMT Message-Id: <200904141752.n3EHq57U010896@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 160623 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, 14 Apr 2009 17:52:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=160623 Change 160623 by zec@zec_amdx2 on 2009/04/14 17:51:50 Unbreak VIMAGE / VLINT builds. Affected files ... .. //depot/projects/vimage/src/sys/netinet/igmp.c#32 edit .. //depot/projects/vimage/src/sys/netipsec/ipsec.c#44 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/igmp.c#32 (text+ko) ==== @@ -141,13 +141,10 @@ static int sysctl_igmp_gsr(SYSCTL_HANDLER_ARGS); static int sysctl_igmp_ifinfo(SYSCTL_HANDLER_ARGS); +static vnet_attach_fn vnet_igmp_iattach; #ifdef VIMAGE -static vnet_attach_fn vnet_igmp_iattach; static vnet_detach_fn vnet_igmp_idetach; -#else -static int vnet_igmp_iattach(const void *); -static int vnet_igmp_idetach(const void *); -#endif /* VIMAGE */ +#endif /* * System-wide globals. @@ -3673,6 +3670,7 @@ return (0); } +#ifdef VIMAGE static int vnet_igmp_idetach(const void *unused __unused) { @@ -3685,6 +3683,7 @@ return (0); } +#endif struct vnet_igmp { int dummy; @@ -3700,15 +3699,23 @@ * put the extra fields into vnet_inet instead of a vnet_igmp. * yet it has module setup functions.. */ -#ifdef VIMAGE +#ifndef VIMAGE_GLOBALS static struct vnet_symmap vnet_igmp_symmap[] = { VNET_SYMMAP(inet, igi_head), VNET_SYMMAP(inet, igmpstat), VNET_SYMMAP_END }; -VNET_MOD_DECLARE(IGMP, igmp, vnet_igmp_iattach, vnet_igmp_idetach, - INET, vnet_igmp_symmap); -#endif /* VIMAGE */ +static vnet_modinfo_t vnet_igmp_modinfo = { + .vmi_id = VNET_MOD_IGMP, + .vmi_name = "igmp", + .vmi_dependson = VNET_MOD_INET, + .vmi_symmap = vnet_igmp_symmap, + .vmi_iattach = vnet_igmp_iattach, +#ifdef VIMAGE + .vmi_idetach = vnet_igmp_idetach +#endif +}; +#endif static int igmp_modevent(module_t mod, int type, void *unused __unused) @@ -3717,21 +3724,19 @@ switch (type) { case MOD_LOAD: igmp_sysinit(); -#ifdef VIMAGE +#ifndef VIMAGE_GLOBALS vnet_mod_register(&vnet_igmp_modinfo); #else - (void)vnet_igmp_iattach(NULL); -#endif /* VIMAGE */ + vnet_igmp_iattach(NULL); +#endif break; case MOD_UNLOAD: -#ifdef VIMAGE +#ifndef VIMAGE_GLOBALS /* * TODO: Allow module unload if any VIMAGE instances * are using this module. */ return (EBUSY); -#else - (void)vnet_igmp_idetach(NULL); #endif /* VIMAGE */ igmp_sysuninit(); break; ==== //depot/projects/vimage/src/sys/netipsec/ipsec.c#44 (text+ko) ==== @@ -105,7 +105,7 @@ static int ipsec_iattach(const void *); #ifdef VIMAGE -static int vnet_ipsec_idetach(const void *); +static int ipsec_idetach(const void *); #endif #ifdef VIMAGE_GLOBALS @@ -1774,19 +1774,16 @@ static void ipsec_attach(void) { - INIT_VNET_IPSEC(curvnet); #ifndef VIMAGE_GLOBALS vnet_mod_register(&vnet_ipsec_modinfo); #else ipsec_iattach(NULL); #endif - } static int -ipsec_iattach(unused) - const void *unused; +ipsec_iattach(const void *unused) { INIT_VNET_IPSEC(curvnet); @@ -1796,10 +1793,10 @@ return (0); } -/* XXX finish this! */ +/* XXX revisit this! */ #ifdef VIMAGE static int -vnet_ipsec_idetach(unused) +ipsec_idetach(unused) const void *unused; { return (0); From owner-p4-projects@FreeBSD.ORG Tue Apr 14 18:17:33 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 97A1C1065E20; Tue, 14 Apr 2009 18:17:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1945E1065E1E for ; Tue, 14 Apr 2009 18:17:32 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F07988FC12 for ; Tue, 14 Apr 2009 18:17:31 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3EIHV5G013830 for ; Tue, 14 Apr 2009 18:17:31 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3EIHVWV013828 for perforce@freebsd.org; Tue, 14 Apr 2009 18:17:31 GMT (envelope-from zec@fer.hr) Date: Tue, 14 Apr 2009 18:17:31 GMT Message-Id: <200904141817.n3EIHVWV013828@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 160624 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, 14 Apr 2009 18:17:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=160624 Change 160624 by zec@zec_amdx2 on 2009/04/14 18:16:50 IFC @ 160621 Affected files ... .. //depot/projects/vimage/src/sys/amd64/amd64/busdma_machdep.c#9 integrate .. //depot/projects/vimage/src/sys/arm/arm/busdma_machdep.c#14 integrate .. //depot/projects/vimage/src/sys/boot/i386/libi386/biosdisk.c#6 integrate .. //depot/projects/vimage/src/sys/boot/sparc64/loader/main.c#10 integrate .. //depot/projects/vimage/src/sys/dev/agp/agp.c#8 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah.c#7 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5210/ar5210_phy.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5211/ar5211_phy.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar5212_phy.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_rate/sample/sample.c#11 integrate .. //depot/projects/vimage/src/sys/dev/ath/if_ath.c#34 integrate .. //depot/projects/vimage/src/sys/dev/e1000/if_em.c#6 integrate .. //depot/projects/vimage/src/sys/dev/e1000/if_em.h#3 integrate .. //depot/projects/vimage/src/sys/dev/e1000/if_igb.c#7 integrate .. //depot/projects/vimage/src/sys/dev/joy/joy.c#3 integrate .. //depot/projects/vimage/src/sys/dev/pccard/pccarddevs#13 integrate .. //depot/projects/vimage/src/sys/dev/powermac_nvram/powermac_nvram.c#6 integrate .. //depot/projects/vimage/src/sys/dev/tdfx/tdfx_pci.c#4 integrate .. //depot/projects/vimage/src/sys/dev/twa/tw_osl_freebsd.c#9 integrate .. //depot/projects/vimage/src/sys/dev/twe/twe_freebsd.c#4 integrate .. //depot/projects/vimage/src/sys/i386/i386/busdma_machdep.c#11 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/busdma_machdep.c#7 integrate .. //depot/projects/vimage/src/sys/kern/vfs_vnops.c#22 integrate .. //depot/projects/vimage/src/sys/net/if.c#76 integrate .. //depot/projects/vimage/src/sys/net/if_var.h#31 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_node.c#21 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_tdma.c#6 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_indata.c#33 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_socket.c#16 integrate .. //depot/projects/vimage/src/sys/powerpc/aim/trap_subr.S#8 integrate Differences ... ==== //depot/projects/vimage/src/sys/amd64/amd64/busdma_machdep.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.88 2009/02/09 18:03:31 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.89 2009/04/13 19:20:32 kib Exp $"); #include #include @@ -606,7 +606,10 @@ vendaddr = (vm_offset_t)buf + buflen; while (vaddr < vendaddr) { - paddr = pmap_kextract(vaddr); + if (pmap) + paddr = pmap_extract(pmap, vaddr); + else + paddr = pmap_kextract(vaddr); if (run_filter(dmat, paddr) != 0) map->pagesneeded++; vaddr += (PAGE_SIZE - ((vm_offset_t)vaddr & PAGE_MASK)); ==== //depot/projects/vimage/src/sys/arm/arm/busdma_machdep.c#14 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.44 2009/02/09 18:03:31 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.45 2009/04/13 19:20:32 kib Exp $"); /* * ARM bus dma support routines @@ -669,8 +669,8 @@ } static int -_bus_dmamap_count_pages(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf, - bus_size_t buflen, int flags) +_bus_dmamap_count_pages(bus_dma_tag_t dmat, bus_dmamap_t map, pmap_t pmap, + void *buf, bus_size_t buflen, int flags) { vm_offset_t vaddr; vm_offset_t vendaddr; @@ -689,7 +689,10 @@ vendaddr = (vm_offset_t)buf + buflen; while (vaddr < vendaddr) { - paddr = pmap_kextract(vaddr); + if (pmap != NULL) + paddr = pmap_extract(pmap, vaddr); + else + paddr = pmap_kextract(vaddr); if (((dmat->flags & BUS_DMA_COULD_BOUNCE) != 0) && run_filter(dmat, paddr) != 0) map->pagesneeded++; @@ -745,7 +748,8 @@ bmask = ~(dmat->boundary - 1); if ((dmat->flags & BUS_DMA_COULD_BOUNCE) != 0) { - error = _bus_dmamap_count_pages(dmat, map, buf, buflen, flags); + error = _bus_dmamap_count_pages(dmat, map, pmap, buf, buflen, + flags); if (error) return (error); } ==== //depot/projects/vimage/src/sys/boot/i386/libi386/biosdisk.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosdisk.c,v 1.58 2009/03/12 20:41:52 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosdisk.c,v 1.59 2009/04/14 14:19:18 jhb Exp $"); /* * BIOS disk device handling. @@ -83,7 +83,7 @@ int od_cyl; /* BIOS geometry */ int od_hds; int od_sec; - int od_boff; /* block offset from beginning of BIOS disk */ + daddr_t od_boff; /* block offset from beginning of BIOS disk */ int od_flags; #define BD_MODEINT13 0x0000 #define BD_MODEEDD1 0x0001 ==== //depot/projects/vimage/src/sys/boot/sparc64/loader/main.c#10 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.40 2009/02/10 21:48:42 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.41 2009/04/13 19:43:37 marius Exp $"); /* * FreeBSD/sparc64 kernel loader - machine dependent part @@ -472,7 +472,7 @@ reg = rdpr(pstate); wrpr(pstate, reg & ~PSTATE_IE, 0); stxa(AA_DMMU_TAR, ASI_DMMU, - TLB_TAR_VA(vpn) | TLB_TAR_CTX(TLB_CTX_KERNEL)); + TLB_TAR_VA(vpn) | TLB_TAR_CTX(TLB_CTX_KERNEL)); stxa(0, ASI_DTLB_DATA_IN_REG, data); membar(Sync); wrpr(pstate, reg, 0); @@ -497,7 +497,7 @@ continue; stxa(AA_IMMU_TAR, ASI_IMMU, - TLB_TAR_VA(vpn) | TLB_TAR_CTX(TLB_CTX_KERNEL)); + TLB_TAR_VA(vpn) | TLB_TAR_CTX(TLB_CTX_KERNEL)); stxa(TLB_DAR_SLOT(i), ASI_ITLB_DATA_ACCESS_REG, data); flush(PROMBASE); break; @@ -509,7 +509,7 @@ } stxa(AA_IMMU_TAR, ASI_IMMU, - TLB_TAR_VA(vpn) | TLB_TAR_CTX(TLB_CTX_KERNEL)); + TLB_TAR_VA(vpn) | TLB_TAR_CTX(TLB_CTX_KERNEL)); stxa(0, ASI_ITLB_DATA_IN_REG, data); flush(PROMBASE); wrpr(pstate, reg, 0); ==== //depot/projects/vimage/src/sys/dev/agp/agp.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/agp/agp.c,v 1.64 2009/03/20 18:30:20 rnoland Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/agp/agp.c,v 1.65 2009/04/14 13:11:34 ed Exp $"); #include "opt_agp.h" #include "opt_bus.h" @@ -81,7 +81,6 @@ }; static devclass_t agp_devclass; -#define KDEV2DEV(kdev) devclass_get_device(agp_devclass, dev2unit(kdev)) /* Helper functions for implementing chipset mini drivers. */ @@ -254,11 +253,8 @@ sc->as_nextid = 1; sc->as_devnode = make_dev(&agp_cdevsw, - device_get_unit(dev), - UID_ROOT, - GID_WHEEL, - 0600, - "agpgart"); + 0, UID_ROOT, GID_WHEEL, 0600, "agpgart"); + sc->as_devnode->si_drv1 = dev; return 0; } @@ -802,7 +798,7 @@ static int agp_open(struct cdev *kdev, int oflags, int devtype, struct thread *td) { - device_t dev = KDEV2DEV(kdev); + device_t dev = kdev->si_drv1; struct agp_softc *sc = device_get_softc(dev); if (!sc->as_isopen) { @@ -816,7 +812,7 @@ static int agp_close(struct cdev *kdev, int fflag, int devtype, struct thread *td) { - device_t dev = KDEV2DEV(kdev); + device_t dev = kdev->si_drv1; struct agp_softc *sc = device_get_softc(dev); struct agp_memory *mem; @@ -839,7 +835,7 @@ static int agp_ioctl(struct cdev *kdev, u_long cmd, caddr_t data, int fflag, struct thread *td) { - device_t dev = KDEV2DEV(kdev); + device_t dev = kdev->si_drv1; switch (cmd) { case AGPIOC_INFO: @@ -874,7 +870,7 @@ static int agp_mmap(struct cdev *kdev, vm_offset_t offset, vm_paddr_t *paddr, int prot) { - device_t dev = KDEV2DEV(kdev); + device_t dev = kdev->si_drv1; struct agp_softc *sc = device_get_softc(dev); if (offset > AGP_GET_APERTURE(dev)) ==== //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah.c#7 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $FreeBSD: src/sys/dev/ath/ath_hal/ah.c,v 1.8 2009/03/12 00:09:29 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ah.c,v 1.9 2009/04/13 21:01:08 sam Exp $ */ #include "opt_ah.h" @@ -287,8 +287,7 @@ + (numSymbols * OFDM_QUARTER_SYMBOL_TIME); break; case IEEE80211_T_TURBO: - /* we still save OFDM rates in kbps - so double them */ - bitsPerSymbol = ((kbps << 1) * TURBO_SYMBOL_TIME) / 1000; + bitsPerSymbol = (kbps * TURBO_SYMBOL_TIME) / 1000; HALASSERT(bitsPerSymbol != 0); numBits = TURBO_PLCP_BITS + (frameLen << 3); ==== //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5210/ar5210_phy.c#2 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ar5210_phy.c,v 1.3 2008/11/10 01:19:37 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ar5210/ar5210_phy.c,v 1.2 2009/04/13 21:01:08 sam Exp $ */ #include "opt_ah.h" @@ -50,14 +50,14 @@ { /* short ctrl */ /* valid rateCode Preamble dot11Rate Rate */ -/* 6 Mb */ { AH_TRUE, TURBO, 6000, 0x0b, 0x00, (0x80|12), 0 }, -/* 9 Mb */ { AH_TRUE, TURBO, 9000, 0x0f, 0x00, 18, 0 }, -/* 12 Mb */ { AH_TRUE, TURBO, 12000, 0x0a, 0x00, (0x80|24), 2 }, -/* 18 Mb */ { AH_TRUE, TURBO, 18000, 0x0e, 0x00, 36, 2 }, -/* 24 Mb */ { AH_TRUE, TURBO, 24000, 0x09, 0x00, (0x80|48), 4 }, -/* 36 Mb */ { AH_TRUE, TURBO, 36000, 0x0d, 0x00, 72, 4 }, -/* 48 Mb */ { AH_TRUE, TURBO, 48000, 0x08, 0x00, 96, 4 }, -/* 54 Mb */ { AH_TRUE, TURBO, 54000, 0x0c, 0x00, 108, 4 } +/* 6 Mb */ { AH_TRUE, TURBO, 12000, 0x0b, 0x00, (0x80|12), 0 }, +/* 9 Mb */ { AH_TRUE, TURBO, 18000, 0x0f, 0x00, 18, 0 }, +/* 12 Mb */ { AH_TRUE, TURBO, 24000, 0x0a, 0x00, (0x80|24), 2 }, +/* 18 Mb */ { AH_TRUE, TURBO, 36000, 0x0e, 0x00, 36, 2 }, +/* 24 Mb */ { AH_TRUE, TURBO, 48000, 0x09, 0x00, (0x80|48), 4 }, +/* 36 Mb */ { AH_TRUE, TURBO, 72000, 0x0d, 0x00, 72, 4 }, +/* 48 Mb */ { AH_TRUE, TURBO, 96000, 0x08, 0x00, 96, 4 }, +/* 54 Mb */ { AH_TRUE, TURBO, 108000, 0x0c, 0x00, 108, 4 } }, }; ==== //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5211/ar5211_phy.c#2 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ar5211_phy.c,v 1.3 2008/11/10 01:19:37 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ar5211/ar5211_phy.c,v 1.2 2009/04/13 21:01:08 sam Exp $ */ #include "opt_ah.h" @@ -51,14 +51,14 @@ { /* short ctrl */ /* valid rateCode Preamble dot11Rate Rate */ -/* 6 Mb */ { AH_TRUE, TURBO, 6000, 0x0b, 0x00, (0x80|12), 0 }, -/* 9 Mb */ { AH_TRUE, TURBO, 9000, 0x0f, 0x00, 18, 0 }, -/* 12 Mb */ { AH_TRUE, TURBO, 12000, 0x0a, 0x00, (0x80|24), 2 }, -/* 18 Mb */ { AH_TRUE, TURBO, 18000, 0x0e, 0x00, 36, 2 }, -/* 24 Mb */ { AH_TRUE, TURBO, 24000, 0x09, 0x00, (0x80|48), 4 }, -/* 36 Mb */ { AH_TRUE, TURBO, 36000, 0x0d, 0x00, 72, 4 }, -/* 48 Mb */ { AH_TRUE, TURBO, 48000, 0x08, 0x00, 96, 4 }, -/* 54 Mb */ { AH_TRUE, TURBO, 54000, 0x0c, 0x00, 108, 4 } +/* 6 Mb */ { AH_TRUE, TURBO, 12000, 0x0b, 0x00, (0x80|12), 0 }, +/* 9 Mb */ { AH_TRUE, TURBO, 18000, 0x0f, 0x00, 18, 0 }, +/* 12 Mb */ { AH_TRUE, TURBO, 24000, 0x0a, 0x00, (0x80|24), 2 }, +/* 18 Mb */ { AH_TRUE, TURBO, 36000, 0x0e, 0x00, 36, 2 }, +/* 24 Mb */ { AH_TRUE, TURBO, 48000, 0x09, 0x00, (0x80|48), 4 }, +/* 36 Mb */ { AH_TRUE, TURBO, 72000, 0x0d, 0x00, 72, 4 }, +/* 48 Mb */ { AH_TRUE, TURBO, 96000, 0x08, 0x00, 96, 4 }, +/* 54 Mb */ { AH_TRUE, TURBO, 108000, 0x0c, 0x00, 108, 4 } }, }; ==== //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar5212_phy.c#3 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $FreeBSD: src/sys/dev/ath/ath_hal/ar5212/ar5212_phy.c,v 1.2 2009/02/19 04:24:22 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ar5212/ar5212_phy.c,v 1.3 2009/04/13 21:01:08 sam Exp $ */ #include "opt_ah.h" @@ -87,13 +87,13 @@ { /* short ctrl */ /* valid rateCode Preamble dot11Rate Rate */ -/* 6 Mb */ { AH_TRUE, TURBO, 6000, 0x0b, 0x00, (0x80|12), 0 }, -/* 12 Mb */ { AH_TRUE, TURBO, 12000, 0x0a, 0x00, (0x80|24), 2 }, -/* 18 Mb */ { AH_TRUE, TURBO, 18000, 0x0e, 0x00, 36, 2 }, -/* 24 Mb */ { AH_TRUE, TURBO, 24000, 0x09, 0x00, (0x80|48), 3 }, -/* 36 Mb */ { AH_TRUE, TURBO, 36000, 0x0d, 0x00, 72, 3 }, -/* 48 Mb */ { AH_TRUE, TURBO, 48000, 0x08, 0x00, 96, 3 }, -/* 54 Mb */ { AH_TRUE, TURBO, 54000, 0x0c, 0x00, 108, 3 } +/* 6 Mb */ { AH_TRUE, TURBO, 12000, 0x0b, 0x00, (0x80|12), 0 }, +/* 12 Mb */ { AH_TRUE, TURBO, 24000, 0x0a, 0x00, (0x80|24), 1 }, +/* 18 Mb */ { AH_TRUE, TURBO, 36000, 0x0e, 0x00, 36, 1 }, +/* 24 Mb */ { AH_TRUE, TURBO, 48000, 0x09, 0x00, (0x80|48), 2 }, +/* 36 Mb */ { AH_TRUE, TURBO, 72000, 0x0d, 0x00, 72, 2 }, +/* 48 Mb */ { AH_TRUE, TURBO, 96000, 0x08, 0x00, 96, 2 }, +/* 54 Mb */ { AH_TRUE, TURBO, 108000, 0x0c, 0x00, 108, 2 } }, }; @@ -103,14 +103,14 @@ { /* short ctrl */ /* valid rateCode Preamble dot11Rate Rate */ -/* 6 Mb */ { AH_TRUE, TURBO, 6000, 0x0b, 0x00, (0x80|12), 0 }, -/* 9 Mb */ { AH_TRUE, TURBO, 9000, 0x0f, 0x00, 18, 0 }, -/* 12 Mb */ { AH_TRUE, TURBO, 12000, 0x0a, 0x00, (0x80|24), 2 }, -/* 18 Mb */ { AH_TRUE, TURBO, 18000, 0x0e, 0x00, 36, 2 }, -/* 24 Mb */ { AH_TRUE, TURBO, 24000, 0x09, 0x00, (0x80|48), 4 }, -/* 36 Mb */ { AH_TRUE, TURBO, 36000, 0x0d, 0x00, 72, 4 }, -/* 48 Mb */ { AH_TRUE, TURBO, 48000, 0x08, 0x00, 96, 4 }, -/* 54 Mb */ { AH_TRUE, TURBO, 54000, 0x0c, 0x00, 108, 4 } +/* 6 Mb */ { AH_TRUE, TURBO, 12000, 0x0b, 0x00, (0x80|12), 0 }, +/* 9 Mb */ { AH_TRUE, TURBO, 18000, 0x0f, 0x00, 18, 0 }, +/* 12 Mb */ { AH_TRUE, TURBO, 24000, 0x0a, 0x00, (0x80|24), 2 }, +/* 18 Mb */ { AH_TRUE, TURBO, 36000, 0x0e, 0x00, 36, 2 }, +/* 24 Mb */ { AH_TRUE, TURBO, 48000, 0x09, 0x00, (0x80|48), 4 }, +/* 36 Mb */ { AH_TRUE, TURBO, 72000, 0x0d, 0x00, 72, 4 }, +/* 48 Mb */ { AH_TRUE, TURBO, 96000, 0x08, 0x00, 96, 4 }, +/* 54 Mb */ { AH_TRUE, TURBO, 108000, 0x0c, 0x00, 108, 4 } }, }; ==== //depot/projects/vimage/src/sys/dev/ath/ath_rate/sample/sample.c#11 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/sample/sample.c,v 1.29 2009/01/07 23:30:26 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/sample/sample.c,v 1.30 2009/04/13 20:54:08 sam Exp $"); /* * John Bicket's SampleRate control algorithm. @@ -766,6 +766,15 @@ sn->static_rix = sc->sc_rixmap[tp->ucastrate]; break; } +#ifdef IEEE80211_DEBUG + if (sn->static_rix == -1) { + IEEE80211_NOTE(ni->ni_vap, + IEEE80211_MSG_RATECTL, ni, + "%s: ucastrate %u not found, nrates %u", + __func__, tp->ucastrate, + ni->ni_rates.rs_nrates); + } +#endif } /* ==== //depot/projects/vimage/src/sys/dev/ath/if_ath.c#34 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.246 2009/04/13 03:20:21 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.248 2009/04/13 20:58:47 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -4773,8 +4773,8 @@ m0->m_nextpkt = NULL; if (IFF_DUMPPKTS(sc, ATH_DEBUG_XMIT)) - ieee80211_dump_pkt(ic, mtod(m0, caddr_t), m0->m_len, - sc->sc_hwmap[rix].ieeerate, -1); + ieee80211_dump_pkt(ic, mtod(m0, const uint8_t *), m0->m_len, + sc->sc_hwmap[rix].ieeerate, -1); if (bpf_peers_present(ifp->if_bpf)) { u_int64_t tsf = ath_hal_gettsf64(ah); @@ -5118,8 +5118,8 @@ ath_printtxbuf(sc, bf, txq->axq_qnum, ix, ath_hal_txprocdesc(ah, bf->bf_desc, &bf->bf_status.ds_txstat) == HAL_OK); - ieee80211_dump_pkt(ic, mtod(bf->bf_m, caddr_t), - bf->bf_m->m_len, 0, -1); + ieee80211_dump_pkt(ic, mtod(bf->bf_m, const uint8_t *), + bf->bf_m->m_len, 0, -1); } #endif /* ATH_DEBUG */ bus_dmamap_unload(sc->sc_dmat, bf->bf_dmamap); @@ -5187,8 +5187,9 @@ ath_printtxbuf(sc, bf, sc->sc_bhalq, 0, ath_hal_txprocdesc(ah, bf->bf_desc, &bf->bf_status.ds_txstat) == HAL_OK); - ieee80211_dump_pkt(ifp->if_l2com, mtod(bf->bf_m, caddr_t), - bf->bf_m->m_len, 0, -1); + ieee80211_dump_pkt(ifp->if_l2com, + mtod(bf->bf_m, const uint8_t *), bf->bf_m->m_len, + 0, -1); } } #endif /* ATH_DEBUG */ @@ -6783,7 +6784,7 @@ if (IFF_DUMPPKTS(sc, ATH_DEBUG_XMIT)) ieee80211_dump_pkt(ic, mtod(m0, caddr_t), m0->m_len, - sc->sc_hwmap[rix].ieeerate, -1); + sc->sc_hwmap[rix].ieeerate, -1); if (bpf_peers_present(ifp->if_bpf)) { u_int64_t tsf = ath_hal_gettsf64(ah); @@ -7120,6 +7121,8 @@ const struct ieee80211_tdma_state *ts = vap->iv_tdma; ath_tdma_bintvalsetup(sc, ts); + if (changed & TDMA_UPDATE_SLOTLEN) + ath_wme_update(ic); DPRINTF(sc, ATH_DEBUG_TDMA, "%s: adopt slot %u slotcnt %u slotlen %u us " @@ -7127,7 +7130,6 @@ ts->tdma_slot, ts->tdma_slotcnt, ts->tdma_slotlen, sc->sc_tdmabintval); - ath_beaconq_config(sc); /* XXX right? */ ath_hal_intrset(ah, sc->sc_imask); /* NB: beacon timers programmed below */ ==== //depot/projects/vimage/src/sys/dev/e1000/if_em.c#6 (text+ko) ==== @@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE. ******************************************************************************/ -/*$FreeBSD: src/sys/dev/e1000/if_em.c,v 1.5 2009/04/10 00:05:46 jfv Exp $*/ +/*$FreeBSD: src/sys/dev/e1000/if_em.c,v 1.6 2009/04/14 03:36:59 kmacy Exp $*/ #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" @@ -39,6 +39,7 @@ #include #include +#include #include #include #include @@ -897,6 +898,9 @@ bus_generic_detach(dev); if_free(ifp); +#ifdef IFNET_BUF_RING + drbr_free(adapter->br, M_DEVBUF); +#endif em_free_transmit_structures(adapter); em_free_receive_structures(adapter); @@ -991,6 +995,69 @@ * the packet is requeued. **********************************************************************/ +#ifdef IFNET_BUF_RING +static int +em_transmit_locked(struct ifnet *ifp, struct mbuf *m) +{ + struct adapter *adapter = ifp->if_softc; + int error; + + EM_TX_LOCK_ASSERT(adapter); + if (((ifp->if_drv_flags & (IFF_DRV_RUNNING|IFF_DRV_OACTIVE)) != + IFF_DRV_RUNNING) + || (!adapter->link_active)) { + error = drbr_enqueue(ifp, adapter->br, m); + return (error); + } + + if (ADAPTER_RING_EMPTY(adapter) && + (adapter->num_tx_desc_avail > EM_TX_OP_THRESHOLD)) { + if (em_xmit(adapter, &m)) { + if (m && (error = drbr_enqueue(ifp, adapter->br, m)) != 0) { + return (error); + } + } else{ + /* Send a copy of the frame to the BPF listener */ + ETHER_BPF_MTAP(ifp, m); + } + } else if ((error = drbr_enqueue(ifp, adapter->br, m)) != 0) + return (error); + + if (!ADAPTER_RING_EMPTY(adapter)) + em_start_locked(ifp); + + return (0); +} + +static int +em_transmit(struct ifnet *ifp, struct mbuf *m) +{ + + struct adapter *adapter = ifp->if_softc; + int error = 0; + + if(EM_TX_TRYLOCK(adapter)) { + if (ifp->if_drv_flags & IFF_DRV_RUNNING) + error = em_transmit_locked(ifp, m); + EM_TX_UNLOCK(adapter); + } else + error = drbr_enqueue(ifp, adapter->br, m); + + return (error); +} + +static void +em_qflush(struct ifnet *ifp) +{ + struct mbuf *m; + struct adapter *adapter = (struct adapter *)ifp->if_softc; + + EM_TX_LOCK(adapter); + while ((m = buf_ring_dequeue_sc(adapter->br)) != NULL) + m_freem(m); + EM_TX_UNLOCK(adapter); +} + static void em_start_locked(struct ifnet *ifp) { @@ -1005,6 +1072,47 @@ if (!adapter->link_active) return; + while ((adapter->num_tx_desc_avail > EM_TX_OP_THRESHOLD) + && (!ADAPTER_RING_EMPTY(adapter))) { + + m_head = buf_ring_dequeue_sc(adapter->br); + if (m_head == NULL) + break; + /* + * Encapsulation can modify our pointer, and or make it + * NULL on failure. In that event, we can't requeue. + */ + if (em_xmit(adapter, &m_head)) { + if (m_head == NULL) + break; + break; + } + + /* Send a copy of the frame to the BPF listener */ + ETHER_BPF_MTAP(ifp, m_head); + + /* Set timeout in case hardware has problems transmitting. */ + adapter->watchdog_timer = EM_TX_TIMEOUT; + } + if ((adapter->num_tx_desc_avail <= EM_TX_OP_THRESHOLD)) + ifp->if_drv_flags |= IFF_DRV_OACTIVE; + +} +#else +static void +em_start_locked(struct ifnet *ifp) +{ + struct adapter *adapter = ifp->if_softc; + struct mbuf *m_head; + + EM_TX_LOCK_ASSERT(adapter); + + if ((ifp->if_drv_flags & (IFF_DRV_RUNNING|IFF_DRV_OACTIVE)) != + IFF_DRV_RUNNING) + return; + if (!adapter->link_active) + return; + while (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) { IFQ_DRV_DEQUEUE(&ifp->if_snd, m_head); @@ -1030,6 +1138,8 @@ } } +#endif + static void em_start(struct ifnet *ifp) { @@ -1603,7 +1713,7 @@ EM_TX_LOCK(adapter); em_txeof(adapter); - if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) + if (!ADAPTER_RING_EMPTY(adapter)) em_start_locked(ifp); EM_TX_UNLOCK(adapter); } @@ -1658,7 +1768,7 @@ out: EM_CORE_UNLOCK(adapter); if (ifp->if_drv_flags & IFF_DRV_RUNNING && - !IFQ_DRV_IS_EMPTY(&ifp->if_snd)) + !ADAPTER_RING_EMPTY(adapter)) em_start(ifp); } @@ -1697,7 +1807,7 @@ EM_TX_LOCK(adapter); em_txeof(adapter); - if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) + if (!ADAPTER_RING_EMPTY(adapter)) em_start_locked(ifp); EM_TX_UNLOCK(adapter); } @@ -1853,9 +1963,15 @@ struct ifnet *ifp = adapter->ifp; if (ifp->if_drv_flags & IFF_DRV_RUNNING) { +#ifdef IFNET_BUF_RING + if (!EM_TX_TRYLOCK(adapter)) + return; +#else EM_TX_LOCK(adapter); +#endif + em_txeof(adapter); - if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) + if (!ADAPTER_RING_EMPTY(adapter)) em_start_locked(ifp); EM_TX_UNLOCK(adapter); } @@ -2075,22 +2191,14 @@ error = bus_dmamap_load_mbuf_sg(adapter->txtag, map, *m_headp, segs, &nsegs, BUS_DMA_NOWAIT); - if (error == ENOMEM) { - adapter->no_tx_dma_setup++; - return (error); - } else if (error != 0) { + if (error) { adapter->no_tx_dma_setup++; m_freem(*m_headp); *m_headp = NULL; return (error); } - } else if (error == ENOMEM) { - adapter->no_tx_dma_setup++; - return (error); } else if (error != 0) { adapter->no_tx_dma_setup++; - m_freem(*m_headp); - *m_headp = NULL; return (error); } @@ -2531,6 +2639,8 @@ EM_CORE_LOCK_ASSERT(adapter); + taskqueue_enqueue(adapter->tq, + &adapter->rxtx_task); em_update_link_status(adapter); em_update_stats_counters(adapter); @@ -3126,6 +3236,11 @@ ifp->if_capabilities = ifp->if_capenable = 0; +#ifdef IFNET_BUF_RING + ifp->if_transmit = em_transmit; + ifp->if_qflush = em_qflush; + adapter->br = buf_ring_alloc(2048, M_DEVBUF, M_WAITOK, &adapter->tx_mtx); +#endif if (adapter->hw.mac.type >= e1000_82543) { int version_cap; #if __FreeBSD_version < 700000 ==== //depot/projects/vimage/src/sys/dev/e1000/if_em.h#3 (text+ko) ==== @@ -30,12 +30,13 @@ POSSIBILITY OF SUCH DAMAGE. ******************************************************************************/ -/*$FreeBSD: src/sys/dev/e1000/if_em.h,v 1.2 2008/11/26 23:57:23 jfv Exp $*/ +/*$FreeBSD: src/sys/dev/e1000/if_em.h,v 1.3 2009/04/14 03:36:59 kmacy Exp $*/ #ifndef _EM_H_DEFINED_ #define _EM_H_DEFINED_ +#define IFNET_BUF_RING /* Tunables */ /* @@ -301,6 +302,9 @@ /* Our adapter structure */ struct adapter { struct ifnet *ifp; +#ifdef IFNET_BUF_RING + struct buf_ring *br; +#endif struct e1000_hw hw; /* FreeBSD operating-system-specific structures. */ @@ -482,6 +486,7 @@ #define EM_RX_LOCK_DESTROY(_sc) mtx_destroy(&(_sc)->rx_mtx) #define EM_CORE_LOCK(_sc) mtx_lock(&(_sc)->core_mtx) #define EM_TX_LOCK(_sc) mtx_lock(&(_sc)->tx_mtx) +#define EM_TX_TRYLOCK(_sc) mtx_trylock(&(_sc)->tx_mtx) #define EM_RX_LOCK(_sc) mtx_lock(&(_sc)->rx_mtx) #define EM_CORE_UNLOCK(_sc) mtx_unlock(&(_sc)->core_mtx) #define EM_TX_UNLOCK(_sc) mtx_unlock(&(_sc)->tx_mtx) @@ -489,4 +494,9 @@ #define EM_CORE_LOCK_ASSERT(_sc) mtx_assert(&(_sc)->core_mtx, MA_OWNED) #define EM_TX_LOCK_ASSERT(_sc) mtx_assert(&(_sc)->tx_mtx, MA_OWNED) +#ifdef IFNET_BUF_RING +#define ADAPTER_RING_EMPTY(adapter) drbr_empty((adapter)->ifp, (adapter)->br) +#else +#define ADAPTER_RING_EMPTY(adapter) IFQ_DRV_IS_EMPTY(&((adapter)->ifp->if_snd)) +#endif #endif /* _EM_H_DEFINED_ */ ==== //depot/projects/vimage/src/sys/dev/e1000/if_igb.c#7 (text+ko) ==== @@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE. ******************************************************************************/ -/*$FreeBSD: src/sys/dev/e1000/if_igb.c,v 1.10 2009/04/10 05:26:14 jfv Exp $*/ +/*$FreeBSD: src/sys/dev/e1000/if_igb.c,v 1.11 2009/04/14 17:14:35 jfv Exp $*/ #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" @@ -94,7 +94,7 @@ /********************************************************************* * Driver version: *********************************************************************/ -char igb_driver_version[] = "version - 1.5.2"; +char igb_driver_version[] = "version - 1.5.3"; /********************************************************************* @@ -4002,7 +4002,7 @@ accept_frame = 1; hlen = plen = len_adj = 0; sendmp = mh = mp = NULL; - ptype = (u16)cur->wb.lower.lo_dword.data; + ptype = (u16)(cur->wb.lower.lo_dword.data >> 4); /* Sync the buffers */ bus_dmamap_sync(rxr->rxtag, rxr->rx_buffers[i].map, @@ -4103,16 +4103,16 @@ rxr->lmp = mh->m_next; } } else { + /* Adjust for CRC frag */ + if (len_adj) { + rxr->lmp->m_len -= len_adj; + rxr->fmp->m_pkthdr.len -= len_adj; + } /* Chain mbuf's together */ mh->m_flags &= ~M_PKTHDR; rxr->lmp->m_next = mh; rxr->lmp = rxr->lmp->m_next; rxr->fmp->m_pkthdr.len += mh->m_len; - /* Adjust for CRC frag */ - if (len_adj) { - rxr->lmp->m_len -= len_adj; - rxr->fmp->m_pkthdr.len -= len_adj; - } } if (eop) { @@ -4256,7 +4256,7 @@ #endif /* Did it pass? */ if (!(errors & E1000_RXD_ERR_TCPE)) { - mp->m_pkthdr.csum_flags = type; + mp->m_pkthdr.csum_flags |= type; if (!sctp) mp->m_pkthdr.csum_data = htons(0xffff); } ==== //depot/projects/vimage/src/sys/dev/joy/joy.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/joy/joy.c,v 1.55 2008/09/27 08:51:18 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/joy/joy.c,v 1.56 2009/04/14 11:23:09 ed Exp $"); #include #include @@ -55,14 +55,10 @@ */ #define joypart(d) (dev2unit(d)&1) -#define UNIT(d) ((dev2unit(d)>>1)&3) #ifndef JOY_TIMEOUT #define JOY_TIMEOUT 2000 /* 2 milliseconds */ #endif -#define JOY_SOFTC(unit) (struct joy_softc *) \ - devclass_get_softc(joy_devclass,(unit)) - static d_open_t joyopen; static d_close_t joyclose; static d_read_t joyread; @@ -111,6 +107,7 @@ joy->port = rman_get_bushandle(joy->res); joy->timeout[0] = joy->timeout[1] = 0; joy->d = make_dev(&joy_cdevsw, unit, 0, 0, 0600, "joy%d", unit); + joy->d->si_drv1 = joy; return (0); } @@ -131,7 +128,7 @@ joyopen(struct cdev *dev, int flags, int fmt, struct thread *td) { int i = joypart (dev); - struct joy_softc *joy = JOY_SOFTC(UNIT(dev)); + struct joy_softc *joy = dev->si_drv1; if (joy->timeout[i]) return (EBUSY); @@ -144,7 +141,7 @@ joyclose(struct cdev *dev, int flags, int fmt, struct thread *td) { int i = joypart (dev); - struct joy_softc *joy = JOY_SOFTC(UNIT(dev)); + struct joy_softc *joy = dev->si_drv1; joy->timeout[i] = 0; return (0); @@ -153,7 +150,7 @@ static int joyread(struct cdev *dev, struct uio *uio, int flag) { - struct joy_softc *joy = JOY_SOFTC(UNIT(dev)); + struct joy_softc *joy = dev->si_drv1; bus_space_handle_t port = joy->port; bus_space_tag_t bt = joy->bt; struct timespec t, start, end; @@ -217,7 +214,7 @@ static int joyioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *td) { - struct joy_softc *joy = JOY_SOFTC(UNIT(dev)); + struct joy_softc *joy = dev->si_drv1; int i = joypart (dev); int x; ==== //depot/projects/vimage/src/sys/dev/pccard/pccarddevs#13 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.143 2009/04/07 05:57:56 imp Exp $ +$FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.144 2009/04/14 03:13:05 imp Exp $ /* $NetBSD: pcmciadevs,v 1.226 2008/06/19 18:20:33 imp Exp $ */ /* $OpenBSD: pcmciadevs,v 1.93 2002/06/21 08:31:10 henning Exp $ */ @@ -671,6 +671,7 @@ vendor FUTUREDOMAIN -1 FutureDomain vendor FREECOM -1 Freecom vendor GEMTEK -1 Gem Tek +vendor GVC -1 GVC vendor ICOM -1 ICOM Inc vendor INTERSIL2 -1 Intersil vendor IODATA3 -1 I-O DATA @@ -740,6 +741,7 @@ product FUJITSU2 ITCFJ182A { "FUJITSU", "LAN&spCard(ITCFJ182)", "Ver.01", NULL } FUJITSU ITCFJ182A CompactCard product FUTUREDOMAIN SCSI2GO { "Future&spDomain&spCorporation", "SCSI&spPCMCIA&spCredit&spCard&spController", NULL, NULL } Future Domain SCSI2GO product GEMTEK WLAN { "Intersil", "PRISM&sp2_5&spPCMCIA&spADAPTER", "ISL37300P", "Eval-RevA" } GEMTEK Prism2_5 WaveLAN Card +product GVC NIC_2000P { "GVC", "NIC-2000p", "ETHERNET", NULL } GVC PCMCIA Ethernet Adapeter product IBM SCSICARD { "IBM&spCorp.", "SCSI&spPCMCIA&spCard", NULL, NULL } IBM SCSI PCMCIA Card product ICOM SL200 { "Icom", "SL-200", NULL, NULL } Icom SL-200 product INTERSIL2 PRISM2 { "INTERSIL", "HFA384x/IEEE", "Version&sp01.02", NULL } Intersil Prism II ==== //depot/projects/vimage/src/sys/dev/powermac_nvram/powermac_nvram.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/powermac_nvram/powermac_nvram.c,v 1.5 2009/04/04 00:22:44 nwhitehorn Exp $ + * $FreeBSD: src/sys/dev/powermac_nvram/powermac_nvram.c,v 1.6 2009/04/14 13:18:39 ed Exp $ */ #include @@ -89,10 +89,6 @@ * Cdev methods. */ -#define NVRAM_UNIT(dev) dev2unit(dev) -#define NVRAM_SOFTC(unit) ((struct powermac_nvram_softc *) \ - devclass_get_softc(powermac_nvram_devclass, unit)) - static d_open_t powermac_nvram_open; static d_close_t powermac_nvram_close; static d_read_t powermac_nvram_read; @@ -169,6 +165,7 @@ sc->sc_cdev = make_dev(&powermac_nvram_cdevsw, 0, 0, 0, 0600, "powermac_nvram"); + sc->sc_cdev->si_drv1 = sc; return 0; } @@ -192,9 +189,8 @@ static int powermac_nvram_open(struct cdev *dev, int flags, int fmt, struct thread *td) { - struct powermac_nvram_softc *sc; + struct powermac_nvram_softc *sc = dev->si_drv1; - sc = NVRAM_SOFTC(NVRAM_UNIT(dev)); if (sc->sc_isopen) return EBUSY; sc->sc_isopen = 1; @@ -205,12 +201,10 @@ static int powermac_nvram_close(struct cdev *dev, int fflag, int devtype, struct thread *td) { - struct powermac_nvram_softc *sc; + struct powermac_nvram_softc *sc = dev->si_drv1; struct core99_header *header; vm_offset_t bank; - sc = NVRAM_SOFTC(NVRAM_UNIT(dev)); - if (sc->sc_wpos != sizeof(sc->sc_data)) { /* Short write, restore in-memory copy */ bcopy((void *)sc->sc_bank, (void *)sc->sc_data, NVRAM_SIZE); @@ -246,10 +240,8 @@ powermac_nvram_read(struct cdev *dev, struct uio *uio, int ioflag) { int rv, amnt, data_available; - struct powermac_nvram_softc *sc; + struct powermac_nvram_softc *sc = dev->si_drv1; - sc = NVRAM_SOFTC(NVRAM_UNIT(dev)); - rv = 0; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Apr 14 18:21:38 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 439C91065768; Tue, 14 Apr 2009 18:21:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C45E51065746 for ; Tue, 14 Apr 2009 18:21:36 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AE5B98FC1A for ; Tue, 14 Apr 2009 18:21:36 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3EILaC8014177 for ; Tue, 14 Apr 2009 18:21:36 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3EILaQJ014175 for perforce@freebsd.org; Tue, 14 Apr 2009 18:21:36 GMT (envelope-from zec@fer.hr) Date: Tue, 14 Apr 2009 18:21:36 GMT Message-Id: <200904141821.n3EILaQJ014175@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 160626 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, 14 Apr 2009 18:21:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=160626 Change 160626 by zec@zec_amdx2 on 2009/04/14 18:20:38 IFC @ 160621 Affected files ... .. //depot/projects/vimage-commit/src/sys/amd64/amd64/busdma_machdep.c#5 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/machdep.c#8 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/cpufunc.h#6 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/busdma_machdep.c#5 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/biosdisk.c#5 integrate .. //depot/projects/vimage-commit/src/sys/boot/sparc64/loader/main.c#7 integrate .. //depot/projects/vimage-commit/src/sys/conf/files#19 integrate .. //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf.c#8 integrate .. //depot/projects/vimage-commit/src/sys/dev/agp/agp.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ah.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5210/ar5210_phy.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5211/ar5211_phy.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5212_phy.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_rate/sample/sample.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/if_ath.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#11 integrate .. //depot/projects/vimage-commit/src/sys/dev/e1000/if_em.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/e1000/if_em.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/e1000/if_igb.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/fxp/if_fxp.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/joy/joy.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/pccard/pccarddevs#9 integrate .. //depot/projects/vimage-commit/src/sys/dev/powermac_nvram/powermac_nvram.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/tdfx/tdfx_pci.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/twa/tw_osl_freebsd.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/twe/twe_freebsd.c#4 integrate .. //depot/projects/vimage-commit/src/sys/i386/i386/busdma_machdep.c#6 integrate .. //depot/projects/vimage-commit/src/sys/i386/i386/machdep.c#9 integrate .. //depot/projects/vimage-commit/src/sys/i386/include/cpufunc.h#8 integrate .. //depot/projects/vimage-commit/src/sys/ia64/ia64/busdma_machdep.c#5 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_tc.c#4 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_umtx.c#5 integrate .. //depot/projects/vimage-commit/src/sys/kern/uipc_syscalls.c#6 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_cache.c#11 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_vnops.c#7 integrate .. //depot/projects/vimage-commit/src/sys/modules/Makefile#14 integrate .. //depot/projects/vimage-commit/src/sys/modules/nfssvc/Makefile#1 branch .. //depot/projects/vimage-commit/src/sys/net/if.c#17 integrate .. //depot/projects/vimage-commit/src/sys/net/if_bridge.c#8 integrate .. //depot/projects/vimage-commit/src/sys/net/if_var.h#10 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_node.c#7 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_tdma.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet/icmp6.h#4 integrate .. //depot/projects/vimage-commit/src/sys/netinet/icmp_var.h#5 integrate .. //depot/projects/vimage-commit/src/sys/netinet/igmp.c#12 integrate .. //depot/projects/vimage-commit/src/sys/netinet/igmp_var.h#4 integrate .. //depot/projects/vimage-commit/src/sys/netinet/in_gif.c#9 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_carp.c#9 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_carp.h#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_divert.c#9 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_fastfwd.c#9 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_icmp.c#9 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_input.c#14 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_ipsec.c#10 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_mroute.c#11 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_mroute.h#4 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_options.c#9 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_output.c#12 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_var.h#6 integrate .. //depot/projects/vimage-commit/src/sys/netinet/libalias/alias.c#5 integrate .. //depot/projects/vimage-commit/src/sys/netinet/libalias/alias_nbt.c#5 integrate .. //depot/projects/vimage-commit/src/sys/netinet/pim_var.h#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet/raw_ip.c#13 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_indata.c#9 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_hostcache.c#11 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_input.c#14 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_output.c#13 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_reass.c#11 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_sack.c#12 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_subr.c#16 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_syncache.c#17 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_timer.c#10 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_timewait.c#12 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_usrreq.c#12 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_var.h#9 integrate .. //depot/projects/vimage-commit/src/sys/netinet/udp_usrreq.c#12 integrate .. //depot/projects/vimage-commit/src/sys/netinet/udp_var.h#5 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/icmp6.c#13 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/mld6.c#9 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/nd6.c#11 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/nd6_nbr.c#10 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/nd6_rtr.c#10 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/raw_ip6.c#12 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/udp6_usrreq.c#11 integrate .. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_socket.c#9 integrate .. //depot/projects/vimage-commit/src/sys/nfsserver/nfs.h#4 integrate .. //depot/projects/vimage-commit/src/sys/nfsserver/nfs_srvkrpc.c#3 integrate .. //depot/projects/vimage-commit/src/sys/nfsserver/nfs_srvsubs.c#5 integrate .. //depot/projects/vimage-commit/src/sys/nfsserver/nfs_syscalls.c#6 integrate .. //depot/projects/vimage-commit/src/sys/pc98/pc98/machdep.c#6 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/aim/machdep.c#7 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/aim/trap_subr.S#6 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/include/hid.h#4 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/include/spr.h#6 integrate .. //depot/projects/vimage-commit/src/sys/sys/param.h#16 integrate .. //depot/projects/vimage-commit/src/sys/vm/vm_reserv.c#3 integrate .. //depot/projects/vimage-commit/src/sys/vm/vm_unix.c#4 integrate Differences ... ==== //depot/projects/vimage-commit/src/sys/amd64/amd64/busdma_machdep.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.88 2009/02/09 18:03:31 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.89 2009/04/13 19:20:32 kib Exp $"); #include #include @@ -606,7 +606,10 @@ vendaddr = (vm_offset_t)buf + buflen; while (vaddr < vendaddr) { - paddr = pmap_kextract(vaddr); + if (pmap) + paddr = pmap_extract(pmap, vaddr); + else + paddr = pmap_kextract(vaddr); if (run_filter(dmat, paddr) != 0) map->pagesneeded++; vaddr += (PAGE_SIZE - ((vm_offset_t)vaddr & PAGE_MASK)); ==== //depot/projects/vimage-commit/src/sys/amd64/amd64/machdep.c#8 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.698 2009/04/01 13:09:26 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.699 2009/04/11 14:01:01 ed Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -2178,45 +2178,24 @@ #ifdef KDB /* - * Provide inb() and outb() as functions. They are normally only - * available as macros calling inlined functions, thus cannot be - * called from the debugger. - * - * The actual code is stolen from , and de-inlined. + * Provide inb() and outb() as functions. They are normally only available as + * inline functions, thus cannot be called from the debugger. */ -#undef inb -#undef outb - /* silence compiler warnings */ -u_char inb(u_int); -void outb(u_int, u_char); +u_char inb_(u_short); +void outb_(u_short, u_char); u_char -inb(u_int port) +inb_(u_short port) { - u_char data; - /* - * We use %%dx and not %1 here because i/o is done at %dx and not at - * %edx, while gcc generates inferior code (movw instead of movl) - * if we tell it to load (u_short) port. - */ - __asm __volatile("inb %%dx,%0" : "=a" (data) : "d" (port)); - return (data); + return inb(port); } void -outb(u_int port, u_char data) +outb_(u_short port, u_char data) { - u_char al; - /* - * Use an unnecessary assignment to help gcc's register allocator. - * This make a large difference for gcc-1.40 and a tiny difference - * for gcc-2.6.0. For gcc-1.40, al had to be ``asm("ax")'' for - * best results. gcc-2.6.0 can't handle this. - */ - al = data; - __asm __volatile("outb %0,%%dx" : : "a" (al), "d" (port)); + outb(port, data); } #endif /* KDB */ ==== //depot/projects/vimage-commit/src/sys/amd64/include/cpufunc.h#6 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/cpufunc.h,v 1.152 2009/04/07 19:31:36 ed Exp $ + * $FreeBSD: src/sys/amd64/include/cpufunc.h,v 1.153 2009/04/11 14:01:01 ed Exp $ */ /* @@ -164,79 +164,21 @@ __asm __volatile("hlt"); } -#if !defined(__GNUCLIKE_BUILTIN_CONSTANT_P) || __GNUCLIKE_ASM < 3 - -#define inb(port) inbv(port) -#define outb(port, data) outbv(port, data) - -#else /* __GNUCLIKE_BUILTIN_CONSTANT_P && __GNUCLIKE_ASM >= 3 */ - -/* - * The following complications are to get around gcc not having a - * constraint letter for the range 0..255. We still put "d" in the - * constraint because "i" isn't a valid constraint when the port - * isn't constant. This only matters for -O0 because otherwise - * the non-working version gets optimized away. - * - * Use an expression-statement instead of a conditional expression - * because gcc-2.6.0 would promote the operands of the conditional - * and produce poor code for "if ((inb(var) & const1) == const2)". - * - * The unnecessary test `(port) < 0x10000' is to generate a warning if - * the `port' has type u_short or smaller. Such types are pessimal. - * This actually only works for signed types. The range check is - * careful to avoid generating warnings. - */ -#define inb(port) __extension__ ({ \ - u_char _data; \ - if (__builtin_constant_p(port) && ((port) & 0xffff) < 0x100 \ - && (port) < 0x10000) \ - _data = inbc(port); \ - else \ - _data = inbv(port); \ - _data; }) - -#define outb(port, data) ( \ - __builtin_constant_p(port) && ((port) & 0xffff) < 0x100 \ - && (port) < 0x10000 \ - ? outbc(port, data) : outbv(port, data)) - static __inline u_char -inbc(u_int port) +inb(u_int port) { u_char data; - __asm __volatile("inb %1,%0" : "=a" (data) : "id" ((u_short)(port))); + __asm volatile("inb %w1, %0" : "=a" (data) : "Nd" (port)); return (data); } -static __inline void -outbc(u_int port, u_char data) -{ - __asm __volatile("outb %0,%1" : : "a" (data), "id" ((u_short)(port))); -} - -#endif /* __GNUCLIKE_BUILTIN_CONSTANT_P && __GNUCLIKE_ASM >= 3*/ - -static __inline u_char -inbv(u_int port) -{ - u_char data; - /* - * We use %%dx and not %1 here because i/o is done at %dx and not at - * %edx, while gcc generates inferior code (movw instead of movl) - * if we tell it to load (u_short) port. - */ - __asm __volatile("inb %%dx,%0" : "=a" (data) : "d" (port)); - return (data); -} - static __inline u_int inl(u_int port) { u_int data; - __asm __volatile("inl %%dx,%0" : "=a" (data) : "d" (port)); + __asm volatile("inl %w1, %0" : "=a" (data) : "Nd" (port)); return (data); } @@ -278,33 +220,20 @@ { u_short data; - __asm __volatile("inw %%dx,%0" : "=a" (data) : "d" (port)); + __asm volatile("inw %w1, %0" : "=a" (data) : "Nd" (port)); return (data); } static __inline void -outbv(u_int port, u_char data) +outb(u_int port, u_char data) { - u_char al; - /* - * Use an unnecessary assignment to help gcc's register allocator. - * This make a large difference for gcc-1.40 and a tiny difference - * for gcc-2.6.0. For gcc-1.40, al had to be ``asm("ax")'' for - * best results. gcc-2.6.0 can't handle this. - */ - al = data; - __asm __volatile("outb %0,%%dx" : : "a" (al), "d" (port)); + __asm volatile("outb %0, %w1" : : "a" (data), "Nd" (port)); } static __inline void outl(u_int port, u_int data) { - /* - * outl() and outw() aren't used much so we haven't looked at - * possible micro-optimizations such as the unnecessary - * assignment for them. - */ - __asm __volatile("outl %0,%%dx" : : "a" (data), "d" (port)); + __asm volatile("outl %0, %w1" : : "a" (data), "Nd" (port)); } static __inline void @@ -334,7 +263,7 @@ static __inline void outw(u_int port, u_short data) { - __asm __volatile("outw %0,%%dx" : : "a" (data), "d" (port)); + __asm volatile("outw %0, %w1" : : "a" (data), "Nd" (port)); } static __inline void ==== //depot/projects/vimage-commit/src/sys/arm/arm/busdma_machdep.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.44 2009/02/09 18:03:31 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.45 2009/04/13 19:20:32 kib Exp $"); /* * ARM bus dma support routines @@ -669,8 +669,8 @@ } static int -_bus_dmamap_count_pages(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf, - bus_size_t buflen, int flags) +_bus_dmamap_count_pages(bus_dma_tag_t dmat, bus_dmamap_t map, pmap_t pmap, + void *buf, bus_size_t buflen, int flags) { vm_offset_t vaddr; vm_offset_t vendaddr; @@ -689,7 +689,10 @@ vendaddr = (vm_offset_t)buf + buflen; while (vaddr < vendaddr) { - paddr = pmap_kextract(vaddr); + if (pmap != NULL) + paddr = pmap_extract(pmap, vaddr); + else + paddr = pmap_kextract(vaddr); if (((dmat->flags & BUS_DMA_COULD_BOUNCE) != 0) && run_filter(dmat, paddr) != 0) map->pagesneeded++; @@ -745,7 +748,8 @@ bmask = ~(dmat->boundary - 1); if ((dmat->flags & BUS_DMA_COULD_BOUNCE) != 0) { - error = _bus_dmamap_count_pages(dmat, map, buf, buflen, flags); + error = _bus_dmamap_count_pages(dmat, map, pmap, buf, buflen, + flags); if (error) return (error); } ==== //depot/projects/vimage-commit/src/sys/boot/i386/libi386/biosdisk.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosdisk.c,v 1.58 2009/03/12 20:41:52 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosdisk.c,v 1.59 2009/04/14 14:19:18 jhb Exp $"); /* * BIOS disk device handling. @@ -83,7 +83,7 @@ int od_cyl; /* BIOS geometry */ int od_hds; int od_sec; - int od_boff; /* block offset from beginning of BIOS disk */ + daddr_t od_boff; /* block offset from beginning of BIOS disk */ int od_flags; #define BD_MODEINT13 0x0000 #define BD_MODEEDD1 0x0001 ==== //depot/projects/vimage-commit/src/sys/boot/sparc64/loader/main.c#7 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.40 2009/02/10 21:48:42 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.41 2009/04/13 19:43:37 marius Exp $"); /* * FreeBSD/sparc64 kernel loader - machine dependent part @@ -472,7 +472,7 @@ reg = rdpr(pstate); wrpr(pstate, reg & ~PSTATE_IE, 0); stxa(AA_DMMU_TAR, ASI_DMMU, - TLB_TAR_VA(vpn) | TLB_TAR_CTX(TLB_CTX_KERNEL)); + TLB_TAR_VA(vpn) | TLB_TAR_CTX(TLB_CTX_KERNEL)); stxa(0, ASI_DTLB_DATA_IN_REG, data); membar(Sync); wrpr(pstate, reg, 0); @@ -497,7 +497,7 @@ continue; stxa(AA_IMMU_TAR, ASI_IMMU, - TLB_TAR_VA(vpn) | TLB_TAR_CTX(TLB_CTX_KERNEL)); + TLB_TAR_VA(vpn) | TLB_TAR_CTX(TLB_CTX_KERNEL)); stxa(TLB_DAR_SLOT(i), ASI_ITLB_DATA_ACCESS_REG, data); flush(PROMBASE); break; @@ -509,7 +509,7 @@ } stxa(AA_IMMU_TAR, ASI_IMMU, - TLB_TAR_VA(vpn) | TLB_TAR_CTX(TLB_CTX_KERNEL)); + TLB_TAR_VA(vpn) | TLB_TAR_CTX(TLB_CTX_KERNEL)); stxa(0, ASI_ITLB_DATA_IN_REG, data); flush(PROMBASE); wrpr(pstate, reg, 0); ==== //depot/projects/vimage-commit/src/sys/conf/files#19 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1389 2009/04/10 00:34:55 jfv Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1390 2009/04/12 19:04:27 rmacklem Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -2469,6 +2469,7 @@ nfsserver/nfs_srvcache.c optional nfsserver nfsserver/nfs_srvsubs.c optional nfsserver nfsserver/nfs_syscalls.c optional nfsserver +nfs/nfs_nfssvc.c optional nfsserver nlm/nlm_advlock.c optional nfslockd nfsclient nlm/nlm_prot_clnt.c optional nfslockd nlm/nlm_prot_impl.c optional nfslockd ==== //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf.c#8 (text+ko) ==== @@ -41,7 +41,7 @@ #include "opt_inet6.h" #include -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.60 2008/12/15 06:10:57 qingli Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.64 2009/04/12 13:22:33 rwatson Exp $"); #endif #ifdef __FreeBSD__ @@ -6153,7 +6153,7 @@ if (r->rt == PF_FASTROUTE) { in_rtalloc(ro, 0); if (ro->ro_rt == 0) { - V_ipstat.ips_noroute++; + IPSTAT_INC(ips_noroute); goto bad; } @@ -6284,16 +6284,16 @@ if ((ifp->if_capabilities & IFCAP_CSUM_IPv4) && ifp->if_bridge == NULL) { m0->m_pkthdr.csum_flags |= M_IPV4_CSUM_OUT; - V_ipstat.ips_outhwcsum++; + IPSTAT_INC(ips_outhwcsum); } else { ip->ip_sum = 0; ip->ip_sum = in_cksum(m0, ip->ip_hl << 2); } /* Update relevant hardware checksum stats for TCP/UDP */ if (m0->m_pkthdr.csum_flags & M_TCPV4_CSUM_OUT) - V_tcpstat.tcps_outhwcsum++; + TCPSTAT_INC(tcpstat.tcps_outhwcsum); else if (m0->m_pkthdr.csum_flags & M_UDPV4_CSUM_OUT) - V_udpstat.udps_outhwcsum++; + UDPSTAT_INC(udps_outhwcsum); error = (*ifp->if_output)(ifp, m0, sintosa(dst), NULL); goto done; } @@ -6303,7 +6303,7 @@ * Must be able to put at least 8 bytes per fragment. */ if (ip->ip_off & htons(IP_DF)) { - V_ipstat.ips_cantfrag++; + IPSTAT_INC(ips_cantfrag); if (r->rt != PF_DUPTO) { #ifdef __FreeBSD__ /* icmp_error() expects host byte ordering */ @@ -6360,7 +6360,7 @@ } if (error == 0) - V_ipstat.ips_fragmented++; + IPSTAT_INC(ips_fragmented); done: if (r->rt != PF_DUPTO) @@ -6635,26 +6635,26 @@ case IPPROTO_TCP: { INIT_VNET_INET(curvnet); - V_tcpstat.tcps_rcvbadsum++; + TCPSTAT_INC(tcps_rcvbadsum); break; } case IPPROTO_UDP: { INIT_VNET_INET(curvnet); - V_udpstat.udps_badsum++; + UDPSTAT_INC(udps_badsum); break; } case IPPROTO_ICMP: { INIT_VNET_INET(curvnet); - V_icmpstat.icps_checksum++; + ICMPSTAT_INC(icps_checksum); break; } #ifdef INET6 case IPPROTO_ICMPV6: { INIT_VNET_INET6(curvnet); - V_icmp6stat.icp6s_checksum++; + ICMP6STAT_INC(icp6s_checksum); break; } #endif /* INET6 */ @@ -6741,17 +6741,17 @@ m->m_pkthdr.csum_flags |= flag_bad; switch (p) { case IPPROTO_TCP: - V_tcpstat.tcps_rcvbadsum++; + TCPSTAT_INC(tcps_rcvbadsum); break; case IPPROTO_UDP: - V_udpstat.udps_badsum++; + UDPSTAT_INC(udps_badsum); break; case IPPROTO_ICMP: - V_icmpstat.icps_checksum++; + ICMPSTAT_INC(icps_checksum); break; #ifdef INET6 case IPPROTO_ICMPV6: - V_icmp6stat.icp6s_checksum++; + ICMP6STAT_INC(icp6s_checksum); break; #endif /* INET6 */ } ==== //depot/projects/vimage-commit/src/sys/dev/agp/agp.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/agp/agp.c,v 1.64 2009/03/20 18:30:20 rnoland Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/agp/agp.c,v 1.65 2009/04/14 13:11:34 ed Exp $"); #include "opt_agp.h" #include "opt_bus.h" @@ -81,7 +81,6 @@ }; static devclass_t agp_devclass; -#define KDEV2DEV(kdev) devclass_get_device(agp_devclass, dev2unit(kdev)) /* Helper functions for implementing chipset mini drivers. */ @@ -254,11 +253,8 @@ sc->as_nextid = 1; sc->as_devnode = make_dev(&agp_cdevsw, - device_get_unit(dev), - UID_ROOT, - GID_WHEEL, - 0600, - "agpgart"); + 0, UID_ROOT, GID_WHEEL, 0600, "agpgart"); + sc->as_devnode->si_drv1 = dev; return 0; } @@ -802,7 +798,7 @@ static int agp_open(struct cdev *kdev, int oflags, int devtype, struct thread *td) { - device_t dev = KDEV2DEV(kdev); + device_t dev = kdev->si_drv1; struct agp_softc *sc = device_get_softc(dev); if (!sc->as_isopen) { @@ -816,7 +812,7 @@ static int agp_close(struct cdev *kdev, int fflag, int devtype, struct thread *td) { - device_t dev = KDEV2DEV(kdev); + device_t dev = kdev->si_drv1; struct agp_softc *sc = device_get_softc(dev); struct agp_memory *mem; @@ -839,7 +835,7 @@ static int agp_ioctl(struct cdev *kdev, u_long cmd, caddr_t data, int fflag, struct thread *td) { - device_t dev = KDEV2DEV(kdev); + device_t dev = kdev->si_drv1; switch (cmd) { case AGPIOC_INFO: @@ -874,7 +870,7 @@ static int agp_mmap(struct cdev *kdev, vm_offset_t offset, vm_paddr_t *paddr, int prot) { - device_t dev = KDEV2DEV(kdev); + device_t dev = kdev->si_drv1; struct agp_softc *sc = device_get_softc(dev); if (offset > AGP_GET_APERTURE(dev)) ==== //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ah.c#2 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $FreeBSD: src/sys/dev/ath/ath_hal/ah.c,v 1.8 2009/03/12 00:09:29 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ah.c,v 1.9 2009/04/13 21:01:08 sam Exp $ */ #include "opt_ah.h" @@ -287,8 +287,7 @@ + (numSymbols * OFDM_QUARTER_SYMBOL_TIME); break; case IEEE80211_T_TURBO: - /* we still save OFDM rates in kbps - so double them */ - bitsPerSymbol = ((kbps << 1) * TURBO_SYMBOL_TIME) / 1000; + bitsPerSymbol = (kbps * TURBO_SYMBOL_TIME) / 1000; HALASSERT(bitsPerSymbol != 0); numBits = TURBO_PLCP_BITS + (frameLen << 3); ==== //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5210/ar5210_phy.c#2 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ar5210_phy.c,v 1.3 2008/11/10 01:19:37 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ar5210/ar5210_phy.c,v 1.2 2009/04/13 21:01:08 sam Exp $ */ #include "opt_ah.h" @@ -50,14 +50,14 @@ { /* short ctrl */ /* valid rateCode Preamble dot11Rate Rate */ -/* 6 Mb */ { AH_TRUE, TURBO, 6000, 0x0b, 0x00, (0x80|12), 0 }, -/* 9 Mb */ { AH_TRUE, TURBO, 9000, 0x0f, 0x00, 18, 0 }, -/* 12 Mb */ { AH_TRUE, TURBO, 12000, 0x0a, 0x00, (0x80|24), 2 }, -/* 18 Mb */ { AH_TRUE, TURBO, 18000, 0x0e, 0x00, 36, 2 }, -/* 24 Mb */ { AH_TRUE, TURBO, 24000, 0x09, 0x00, (0x80|48), 4 }, -/* 36 Mb */ { AH_TRUE, TURBO, 36000, 0x0d, 0x00, 72, 4 }, -/* 48 Mb */ { AH_TRUE, TURBO, 48000, 0x08, 0x00, 96, 4 }, -/* 54 Mb */ { AH_TRUE, TURBO, 54000, 0x0c, 0x00, 108, 4 } +/* 6 Mb */ { AH_TRUE, TURBO, 12000, 0x0b, 0x00, (0x80|12), 0 }, +/* 9 Mb */ { AH_TRUE, TURBO, 18000, 0x0f, 0x00, 18, 0 }, +/* 12 Mb */ { AH_TRUE, TURBO, 24000, 0x0a, 0x00, (0x80|24), 2 }, +/* 18 Mb */ { AH_TRUE, TURBO, 36000, 0x0e, 0x00, 36, 2 }, +/* 24 Mb */ { AH_TRUE, TURBO, 48000, 0x09, 0x00, (0x80|48), 4 }, +/* 36 Mb */ { AH_TRUE, TURBO, 72000, 0x0d, 0x00, 72, 4 }, +/* 48 Mb */ { AH_TRUE, TURBO, 96000, 0x08, 0x00, 96, 4 }, +/* 54 Mb */ { AH_TRUE, TURBO, 108000, 0x0c, 0x00, 108, 4 } }, }; ==== //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5211/ar5211_phy.c#2 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ar5211_phy.c,v 1.3 2008/11/10 01:19:37 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ar5211/ar5211_phy.c,v 1.2 2009/04/13 21:01:08 sam Exp $ */ #include "opt_ah.h" @@ -51,14 +51,14 @@ { /* short ctrl */ /* valid rateCode Preamble dot11Rate Rate */ -/* 6 Mb */ { AH_TRUE, TURBO, 6000, 0x0b, 0x00, (0x80|12), 0 }, -/* 9 Mb */ { AH_TRUE, TURBO, 9000, 0x0f, 0x00, 18, 0 }, -/* 12 Mb */ { AH_TRUE, TURBO, 12000, 0x0a, 0x00, (0x80|24), 2 }, -/* 18 Mb */ { AH_TRUE, TURBO, 18000, 0x0e, 0x00, 36, 2 }, -/* 24 Mb */ { AH_TRUE, TURBO, 24000, 0x09, 0x00, (0x80|48), 4 }, -/* 36 Mb */ { AH_TRUE, TURBO, 36000, 0x0d, 0x00, 72, 4 }, -/* 48 Mb */ { AH_TRUE, TURBO, 48000, 0x08, 0x00, 96, 4 }, -/* 54 Mb */ { AH_TRUE, TURBO, 54000, 0x0c, 0x00, 108, 4 } +/* 6 Mb */ { AH_TRUE, TURBO, 12000, 0x0b, 0x00, (0x80|12), 0 }, +/* 9 Mb */ { AH_TRUE, TURBO, 18000, 0x0f, 0x00, 18, 0 }, +/* 12 Mb */ { AH_TRUE, TURBO, 24000, 0x0a, 0x00, (0x80|24), 2 }, +/* 18 Mb */ { AH_TRUE, TURBO, 36000, 0x0e, 0x00, 36, 2 }, +/* 24 Mb */ { AH_TRUE, TURBO, 48000, 0x09, 0x00, (0x80|48), 4 }, +/* 36 Mb */ { AH_TRUE, TURBO, 72000, 0x0d, 0x00, 72, 4 }, +/* 48 Mb */ { AH_TRUE, TURBO, 96000, 0x08, 0x00, 96, 4 }, +/* 54 Mb */ { AH_TRUE, TURBO, 108000, 0x0c, 0x00, 108, 4 } }, }; ==== //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5212_phy.c#2 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $FreeBSD: src/sys/dev/ath/ath_hal/ar5212/ar5212_phy.c,v 1.2 2009/02/19 04:24:22 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ar5212/ar5212_phy.c,v 1.3 2009/04/13 21:01:08 sam Exp $ */ #include "opt_ah.h" @@ -87,13 +87,13 @@ { /* short ctrl */ /* valid rateCode Preamble dot11Rate Rate */ -/* 6 Mb */ { AH_TRUE, TURBO, 6000, 0x0b, 0x00, (0x80|12), 0 }, -/* 12 Mb */ { AH_TRUE, TURBO, 12000, 0x0a, 0x00, (0x80|24), 2 }, -/* 18 Mb */ { AH_TRUE, TURBO, 18000, 0x0e, 0x00, 36, 2 }, -/* 24 Mb */ { AH_TRUE, TURBO, 24000, 0x09, 0x00, (0x80|48), 3 }, -/* 36 Mb */ { AH_TRUE, TURBO, 36000, 0x0d, 0x00, 72, 3 }, -/* 48 Mb */ { AH_TRUE, TURBO, 48000, 0x08, 0x00, 96, 3 }, -/* 54 Mb */ { AH_TRUE, TURBO, 54000, 0x0c, 0x00, 108, 3 } +/* 6 Mb */ { AH_TRUE, TURBO, 12000, 0x0b, 0x00, (0x80|12), 0 }, +/* 12 Mb */ { AH_TRUE, TURBO, 24000, 0x0a, 0x00, (0x80|24), 1 }, +/* 18 Mb */ { AH_TRUE, TURBO, 36000, 0x0e, 0x00, 36, 1 }, +/* 24 Mb */ { AH_TRUE, TURBO, 48000, 0x09, 0x00, (0x80|48), 2 }, +/* 36 Mb */ { AH_TRUE, TURBO, 72000, 0x0d, 0x00, 72, 2 }, +/* 48 Mb */ { AH_TRUE, TURBO, 96000, 0x08, 0x00, 96, 2 }, +/* 54 Mb */ { AH_TRUE, TURBO, 108000, 0x0c, 0x00, 108, 2 } }, }; @@ -103,14 +103,14 @@ { /* short ctrl */ /* valid rateCode Preamble dot11Rate Rate */ -/* 6 Mb */ { AH_TRUE, TURBO, 6000, 0x0b, 0x00, (0x80|12), 0 }, -/* 9 Mb */ { AH_TRUE, TURBO, 9000, 0x0f, 0x00, 18, 0 }, -/* 12 Mb */ { AH_TRUE, TURBO, 12000, 0x0a, 0x00, (0x80|24), 2 }, -/* 18 Mb */ { AH_TRUE, TURBO, 18000, 0x0e, 0x00, 36, 2 }, -/* 24 Mb */ { AH_TRUE, TURBO, 24000, 0x09, 0x00, (0x80|48), 4 }, -/* 36 Mb */ { AH_TRUE, TURBO, 36000, 0x0d, 0x00, 72, 4 }, -/* 48 Mb */ { AH_TRUE, TURBO, 48000, 0x08, 0x00, 96, 4 }, -/* 54 Mb */ { AH_TRUE, TURBO, 54000, 0x0c, 0x00, 108, 4 } +/* 6 Mb */ { AH_TRUE, TURBO, 12000, 0x0b, 0x00, (0x80|12), 0 }, +/* 9 Mb */ { AH_TRUE, TURBO, 18000, 0x0f, 0x00, 18, 0 }, +/* 12 Mb */ { AH_TRUE, TURBO, 24000, 0x0a, 0x00, (0x80|24), 2 }, +/* 18 Mb */ { AH_TRUE, TURBO, 36000, 0x0e, 0x00, 36, 2 }, +/* 24 Mb */ { AH_TRUE, TURBO, 48000, 0x09, 0x00, (0x80|48), 4 }, +/* 36 Mb */ { AH_TRUE, TURBO, 72000, 0x0d, 0x00, 72, 4 }, +/* 48 Mb */ { AH_TRUE, TURBO, 96000, 0x08, 0x00, 96, 4 }, +/* 54 Mb */ { AH_TRUE, TURBO, 108000, 0x0c, 0x00, 108, 4 } }, }; ==== //depot/projects/vimage-commit/src/sys/dev/ath/ath_rate/sample/sample.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/sample/sample.c,v 1.29 2009/01/07 23:30:26 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/sample/sample.c,v 1.30 2009/04/13 20:54:08 sam Exp $"); /* * John Bicket's SampleRate control algorithm. @@ -766,6 +766,15 @@ sn->static_rix = sc->sc_rixmap[tp->ucastrate]; break; } +#ifdef IEEE80211_DEBUG + if (sn->static_rix == -1) { + IEEE80211_NOTE(ni->ni_vap, + IEEE80211_MSG_RATECTL, ni, + "%s: ucastrate %u not found, nrates %u", + __func__, tp->ucastrate, + ni->ni_rates.rs_nrates); + } +#endif } /* ==== //depot/projects/vimage-commit/src/sys/dev/ath/if_ath.c#7 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.245 2009/03/30 21:53:27 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.248 2009/04/13 20:58:47 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -4773,8 +4773,8 @@ m0->m_nextpkt = NULL; if (IFF_DUMPPKTS(sc, ATH_DEBUG_XMIT)) - ieee80211_dump_pkt(ic, mtod(m0, caddr_t), m0->m_len, - sc->sc_hwmap[rix].ieeerate, -1); + ieee80211_dump_pkt(ic, mtod(m0, const uint8_t *), m0->m_len, + sc->sc_hwmap[rix].ieeerate, -1); if (bpf_peers_present(ifp->if_bpf)) { u_int64_t tsf = ath_hal_gettsf64(ah); @@ -5118,8 +5118,8 @@ ath_printtxbuf(sc, bf, txq->axq_qnum, ix, ath_hal_txprocdesc(ah, bf->bf_desc, &bf->bf_status.ds_txstat) == HAL_OK); - ieee80211_dump_pkt(ic, mtod(bf->bf_m, caddr_t), - bf->bf_m->m_len, 0, -1); + ieee80211_dump_pkt(ic, mtod(bf->bf_m, const uint8_t *), + bf->bf_m->m_len, 0, -1); } #endif /* ATH_DEBUG */ bus_dmamap_unload(sc->sc_dmat, bf->bf_dmamap); @@ -5187,8 +5187,9 @@ ath_printtxbuf(sc, bf, sc->sc_bhalq, 0, ath_hal_txprocdesc(ah, bf->bf_desc, &bf->bf_status.ds_txstat) == HAL_OK); - ieee80211_dump_pkt(ifp->if_l2com, mtod(bf->bf_m, caddr_t), - bf->bf_m->m_len, 0, -1); + ieee80211_dump_pkt(ifp->if_l2com, + mtod(bf->bf_m, const uint8_t *), bf->bf_m->m_len, + 0, -1); } } #endif /* ATH_DEBUG */ @@ -6783,7 +6784,7 @@ if (IFF_DUMPPKTS(sc, ATH_DEBUG_XMIT)) ieee80211_dump_pkt(ic, mtod(m0, caddr_t), m0->m_len, - sc->sc_hwmap[rix].ieeerate, -1); + sc->sc_hwmap[rix].ieeerate, -1); if (bpf_peers_present(ifp->if_bpf)) { u_int64_t tsf = ath_hal_gettsf64(ah); @@ -6987,7 +6988,6 @@ { /* copy from vap state (XXX check all vaps have same value?) */ sc->sc_tdmaslotlen = tdma->tdma_slotlen; - sc->sc_tdmabintcnt = tdma->tdma_bintval; sc->sc_tdmabintval = roundup((sc->sc_tdmaslotlen+sc->sc_tdmaguard) * tdma->tdma_slotcnt, 1024); @@ -7121,6 +7121,8 @@ const struct ieee80211_tdma_state *ts = vap->iv_tdma; ath_tdma_bintvalsetup(sc, ts); + if (changed & TDMA_UPDATE_SLOTLEN) + ath_wme_update(ic); DPRINTF(sc, ATH_DEBUG_TDMA, "%s: adopt slot %u slotcnt %u slotlen %u us " @@ -7128,7 +7130,6 @@ ts->tdma_slot, ts->tdma_slotcnt, ts->tdma_slotlen, sc->sc_tdmabintval); - ath_beaconq_config(sc); /* XXX right? */ ath_hal_intrset(ah, sc->sc_imask); /* NB: beacon timers programmed below */ ==== //depot/projects/vimage-commit/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#11 (text+ko) ==== @@ -28,7 +28,7 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c,v 1.29 2008/12/17 12:52:34 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c,v 1.30 2009/04/11 22:07:19 rwatson Exp $"); #include #include @@ -3829,7 +3829,7 @@ #endif toep->tp_state = tp->t_state; - V_tcpstat.tcps_connects++; + TCPSTAT_INC(tcps_connects); } ==== //depot/projects/vimage-commit/src/sys/dev/e1000/if_em.c#7 (text+ko) ==== @@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE. ******************************************************************************/ -/*$FreeBSD: src/sys/dev/e1000/if_em.c,v 1.5 2009/04/10 00:05:46 jfv Exp $*/ +/*$FreeBSD: src/sys/dev/e1000/if_em.c,v 1.6 2009/04/14 03:36:59 kmacy Exp $*/ #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" @@ -39,6 +39,7 @@ #include #include +#include #include #include #include @@ -897,6 +898,9 @@ bus_generic_detach(dev); if_free(ifp); +#ifdef IFNET_BUF_RING + drbr_free(adapter->br, M_DEVBUF); +#endif em_free_transmit_structures(adapter); em_free_receive_structures(adapter); @@ -991,6 +995,69 @@ * the packet is requeued. **********************************************************************/ +#ifdef IFNET_BUF_RING +static int +em_transmit_locked(struct ifnet *ifp, struct mbuf *m) +{ + struct adapter *adapter = ifp->if_softc; + int error; + + EM_TX_LOCK_ASSERT(adapter); + if (((ifp->if_drv_flags & (IFF_DRV_RUNNING|IFF_DRV_OACTIVE)) != + IFF_DRV_RUNNING) + || (!adapter->link_active)) { + error = drbr_enqueue(ifp, adapter->br, m); + return (error); + } + + if (ADAPTER_RING_EMPTY(adapter) && + (adapter->num_tx_desc_avail > EM_TX_OP_THRESHOLD)) { + if (em_xmit(adapter, &m)) { + if (m && (error = drbr_enqueue(ifp, adapter->br, m)) != 0) { + return (error); + } + } else{ + /* Send a copy of the frame to the BPF listener */ + ETHER_BPF_MTAP(ifp, m); + } + } else if ((error = drbr_enqueue(ifp, adapter->br, m)) != 0) + return (error); + + if (!ADAPTER_RING_EMPTY(adapter)) + em_start_locked(ifp); + + return (0); +} + +static int +em_transmit(struct ifnet *ifp, struct mbuf *m) +{ + + struct adapter *adapter = ifp->if_softc; + int error = 0; + + if(EM_TX_TRYLOCK(adapter)) { + if (ifp->if_drv_flags & IFF_DRV_RUNNING) + error = em_transmit_locked(ifp, m); + EM_TX_UNLOCK(adapter); + } else + error = drbr_enqueue(ifp, adapter->br, m); + >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Apr 14 18:23:40 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BBFF71065708; Tue, 14 Apr 2009 18:23:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 53A551065700 for ; Tue, 14 Apr 2009 18:23:39 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3B52B8FC1E for ; Tue, 14 Apr 2009 18:23:39 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3EINd69014316 for ; Tue, 14 Apr 2009 18:23:39 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3EINcAL014314 for perforce@freebsd.org; Tue, 14 Apr 2009 18:23:38 GMT (envelope-from zec@fer.hr) Date: Tue, 14 Apr 2009 18:23:38 GMT Message-Id: <200904141823.n3EINcAL014314@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 160627 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, 14 Apr 2009 18:23:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=160627 Change 160627 by zec@zec_amdx2 on 2009/04/14 18:23:20 IFC @ 160621 Affected files ... .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/busdma_machdep.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/machdep.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/cpufunc.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/arm/arm/busdma_machdep.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/boot/i386/libi386/biosdisk.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/boot/sparc64/loader/main.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files#28 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/dev/agp/agp.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ah.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5210/ar5210_phy.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5211/ar5211_phy.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5212/ar5212_phy.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_rate/sample/sample.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/if_ath.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#19 integrate .. //depot/projects/vimage-commit2/src/sys/dev/e1000/if_em.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/e1000/if_em.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/e1000/if_igb.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/fxp/if_fxp.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/joy/joy.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pccard/pccarddevs#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/powermac_nvram/powermac_nvram.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/tdfx/tdfx_pci.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/twa/tw_osl_freebsd.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/twe/twe_freebsd.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/busdma_machdep.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/machdep.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/cpufunc.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/ia64/ia64/busdma_machdep.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_tc.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_umtx.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/uipc_syscalls.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_cache.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_vnops.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/modules/Makefile#18 integrate .. //depot/projects/vimage-commit2/src/sys/modules/nfssvc/Makefile#1 branch .. //depot/projects/vimage-commit2/src/sys/net/if.c#42 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_bridge.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_var.h#15 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_node.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_tdma.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/icmp6.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/icmp_var.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#23 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/igmp_var.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_gif.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_carp.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_carp.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_divert.c#23 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fastfwd.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_icmp.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#33 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_ipsec.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_mroute.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_mroute.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_options.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_output.c#23 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_var.h#15 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/libalias/alias.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/libalias/alias_nbt.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/pim_var.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/raw_ip.c#25 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_indata.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_hostcache.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_input.c#34 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_output.c#21 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_reass.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_sack.c#20 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#45 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.c#32 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_timer.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_timewait.c#22 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_usrreq.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_var.h#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#32 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/udp_var.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/icmp6.c#24 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/mld6.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#24 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_nbr.c#22 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_rtr.c#22 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/raw_ip6.c#24 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/udp6_usrreq.c#19 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_socket.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/nfsserver/nfs.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/nfsserver/nfs_srvkrpc.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/nfsserver/nfs_srvsubs.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/nfsserver/nfs_syscalls.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/pc98/pc98/machdep.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/aim/machdep.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/aim/trap_subr.S#5 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/include/hid.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/include/spr.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/sys/param.h#32 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_reserv.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_unix.c#4 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/busdma_machdep.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.88 2009/02/09 18:03:31 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.89 2009/04/13 19:20:32 kib Exp $"); #include #include @@ -606,7 +606,10 @@ vendaddr = (vm_offset_t)buf + buflen; while (vaddr < vendaddr) { - paddr = pmap_kextract(vaddr); + if (pmap) + paddr = pmap_extract(pmap, vaddr); + else + paddr = pmap_kextract(vaddr); if (run_filter(dmat, paddr) != 0) map->pagesneeded++; vaddr += (PAGE_SIZE - ((vm_offset_t)vaddr & PAGE_MASK)); ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/machdep.c#9 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.698 2009/04/01 13:09:26 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.699 2009/04/11 14:01:01 ed Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -2178,45 +2178,24 @@ #ifdef KDB /* - * Provide inb() and outb() as functions. They are normally only - * available as macros calling inlined functions, thus cannot be - * called from the debugger. - * - * The actual code is stolen from , and de-inlined. + * Provide inb() and outb() as functions. They are normally only available as + * inline functions, thus cannot be called from the debugger. */ -#undef inb -#undef outb - /* silence compiler warnings */ -u_char inb(u_int); -void outb(u_int, u_char); +u_char inb_(u_short); +void outb_(u_short, u_char); u_char -inb(u_int port) +inb_(u_short port) { - u_char data; - /* - * We use %%dx and not %1 here because i/o is done at %dx and not at - * %edx, while gcc generates inferior code (movw instead of movl) - * if we tell it to load (u_short) port. - */ - __asm __volatile("inb %%dx,%0" : "=a" (data) : "d" (port)); - return (data); + return inb(port); } void -outb(u_int port, u_char data) +outb_(u_short port, u_char data) { - u_char al; - /* - * Use an unnecessary assignment to help gcc's register allocator. - * This make a large difference for gcc-1.40 and a tiny difference - * for gcc-2.6.0. For gcc-1.40, al had to be ``asm("ax")'' for - * best results. gcc-2.6.0 can't handle this. - */ - al = data; - __asm __volatile("outb %0,%%dx" : : "a" (al), "d" (port)); + outb(port, data); } #endif /* KDB */ ==== //depot/projects/vimage-commit2/src/sys/amd64/include/cpufunc.h#5 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/cpufunc.h,v 1.152 2009/04/07 19:31:36 ed Exp $ + * $FreeBSD: src/sys/amd64/include/cpufunc.h,v 1.153 2009/04/11 14:01:01 ed Exp $ */ /* @@ -164,79 +164,21 @@ __asm __volatile("hlt"); } -#if !defined(__GNUCLIKE_BUILTIN_CONSTANT_P) || __GNUCLIKE_ASM < 3 - -#define inb(port) inbv(port) -#define outb(port, data) outbv(port, data) - -#else /* __GNUCLIKE_BUILTIN_CONSTANT_P && __GNUCLIKE_ASM >= 3 */ - -/* - * The following complications are to get around gcc not having a - * constraint letter for the range 0..255. We still put "d" in the - * constraint because "i" isn't a valid constraint when the port - * isn't constant. This only matters for -O0 because otherwise - * the non-working version gets optimized away. - * - * Use an expression-statement instead of a conditional expression - * because gcc-2.6.0 would promote the operands of the conditional - * and produce poor code for "if ((inb(var) & const1) == const2)". - * - * The unnecessary test `(port) < 0x10000' is to generate a warning if - * the `port' has type u_short or smaller. Such types are pessimal. - * This actually only works for signed types. The range check is - * careful to avoid generating warnings. - */ -#define inb(port) __extension__ ({ \ - u_char _data; \ - if (__builtin_constant_p(port) && ((port) & 0xffff) < 0x100 \ - && (port) < 0x10000) \ - _data = inbc(port); \ - else \ - _data = inbv(port); \ - _data; }) - -#define outb(port, data) ( \ - __builtin_constant_p(port) && ((port) & 0xffff) < 0x100 \ - && (port) < 0x10000 \ - ? outbc(port, data) : outbv(port, data)) - static __inline u_char -inbc(u_int port) +inb(u_int port) { u_char data; - __asm __volatile("inb %1,%0" : "=a" (data) : "id" ((u_short)(port))); + __asm volatile("inb %w1, %0" : "=a" (data) : "Nd" (port)); return (data); } -static __inline void -outbc(u_int port, u_char data) -{ - __asm __volatile("outb %0,%1" : : "a" (data), "id" ((u_short)(port))); -} - -#endif /* __GNUCLIKE_BUILTIN_CONSTANT_P && __GNUCLIKE_ASM >= 3*/ - -static __inline u_char -inbv(u_int port) -{ - u_char data; - /* - * We use %%dx and not %1 here because i/o is done at %dx and not at - * %edx, while gcc generates inferior code (movw instead of movl) - * if we tell it to load (u_short) port. - */ - __asm __volatile("inb %%dx,%0" : "=a" (data) : "d" (port)); - return (data); -} - static __inline u_int inl(u_int port) { u_int data; - __asm __volatile("inl %%dx,%0" : "=a" (data) : "d" (port)); + __asm volatile("inl %w1, %0" : "=a" (data) : "Nd" (port)); return (data); } @@ -278,33 +220,20 @@ { u_short data; - __asm __volatile("inw %%dx,%0" : "=a" (data) : "d" (port)); + __asm volatile("inw %w1, %0" : "=a" (data) : "Nd" (port)); return (data); } static __inline void -outbv(u_int port, u_char data) +outb(u_int port, u_char data) { - u_char al; - /* - * Use an unnecessary assignment to help gcc's register allocator. - * This make a large difference for gcc-1.40 and a tiny difference - * for gcc-2.6.0. For gcc-1.40, al had to be ``asm("ax")'' for - * best results. gcc-2.6.0 can't handle this. - */ - al = data; - __asm __volatile("outb %0,%%dx" : : "a" (al), "d" (port)); + __asm volatile("outb %0, %w1" : : "a" (data), "Nd" (port)); } static __inline void outl(u_int port, u_int data) { - /* - * outl() and outw() aren't used much so we haven't looked at - * possible micro-optimizations such as the unnecessary - * assignment for them. - */ - __asm __volatile("outl %0,%%dx" : : "a" (data), "d" (port)); + __asm volatile("outl %0, %w1" : : "a" (data), "Nd" (port)); } static __inline void @@ -334,7 +263,7 @@ static __inline void outw(u_int port, u_short data) { - __asm __volatile("outw %0,%%dx" : : "a" (data), "d" (port)); + __asm volatile("outw %0, %w1" : : "a" (data), "Nd" (port)); } static __inline void ==== //depot/projects/vimage-commit2/src/sys/arm/arm/busdma_machdep.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.44 2009/02/09 18:03:31 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.45 2009/04/13 19:20:32 kib Exp $"); /* * ARM bus dma support routines @@ -669,8 +669,8 @@ } static int -_bus_dmamap_count_pages(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf, - bus_size_t buflen, int flags) +_bus_dmamap_count_pages(bus_dma_tag_t dmat, bus_dmamap_t map, pmap_t pmap, + void *buf, bus_size_t buflen, int flags) { vm_offset_t vaddr; vm_offset_t vendaddr; @@ -689,7 +689,10 @@ vendaddr = (vm_offset_t)buf + buflen; while (vaddr < vendaddr) { - paddr = pmap_kextract(vaddr); + if (pmap != NULL) + paddr = pmap_extract(pmap, vaddr); + else + paddr = pmap_kextract(vaddr); if (((dmat->flags & BUS_DMA_COULD_BOUNCE) != 0) && run_filter(dmat, paddr) != 0) map->pagesneeded++; @@ -745,7 +748,8 @@ bmask = ~(dmat->boundary - 1); if ((dmat->flags & BUS_DMA_COULD_BOUNCE) != 0) { - error = _bus_dmamap_count_pages(dmat, map, buf, buflen, flags); + error = _bus_dmamap_count_pages(dmat, map, pmap, buf, buflen, + flags); if (error) return (error); } ==== //depot/projects/vimage-commit2/src/sys/boot/i386/libi386/biosdisk.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosdisk.c,v 1.58 2009/03/12 20:41:52 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosdisk.c,v 1.59 2009/04/14 14:19:18 jhb Exp $"); /* * BIOS disk device handling. @@ -83,7 +83,7 @@ int od_cyl; /* BIOS geometry */ int od_hds; int od_sec; - int od_boff; /* block offset from beginning of BIOS disk */ + daddr_t od_boff; /* block offset from beginning of BIOS disk */ int od_flags; #define BD_MODEINT13 0x0000 #define BD_MODEEDD1 0x0001 ==== //depot/projects/vimage-commit2/src/sys/boot/sparc64/loader/main.c#9 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.40 2009/02/10 21:48:42 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.41 2009/04/13 19:43:37 marius Exp $"); /* * FreeBSD/sparc64 kernel loader - machine dependent part @@ -472,7 +472,7 @@ reg = rdpr(pstate); wrpr(pstate, reg & ~PSTATE_IE, 0); stxa(AA_DMMU_TAR, ASI_DMMU, - TLB_TAR_VA(vpn) | TLB_TAR_CTX(TLB_CTX_KERNEL)); + TLB_TAR_VA(vpn) | TLB_TAR_CTX(TLB_CTX_KERNEL)); stxa(0, ASI_DTLB_DATA_IN_REG, data); membar(Sync); wrpr(pstate, reg, 0); @@ -497,7 +497,7 @@ continue; stxa(AA_IMMU_TAR, ASI_IMMU, - TLB_TAR_VA(vpn) | TLB_TAR_CTX(TLB_CTX_KERNEL)); + TLB_TAR_VA(vpn) | TLB_TAR_CTX(TLB_CTX_KERNEL)); stxa(TLB_DAR_SLOT(i), ASI_ITLB_DATA_ACCESS_REG, data); flush(PROMBASE); break; @@ -509,7 +509,7 @@ } stxa(AA_IMMU_TAR, ASI_IMMU, - TLB_TAR_VA(vpn) | TLB_TAR_CTX(TLB_CTX_KERNEL)); + TLB_TAR_VA(vpn) | TLB_TAR_CTX(TLB_CTX_KERNEL)); stxa(0, ASI_ITLB_DATA_IN_REG, data); flush(PROMBASE); wrpr(pstate, reg, 0); ==== //depot/projects/vimage-commit2/src/sys/conf/files#28 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1389 2009/04/10 00:34:55 jfv Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1390 2009/04/12 19:04:27 rmacklem Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -2469,6 +2469,7 @@ nfsserver/nfs_srvcache.c optional nfsserver nfsserver/nfs_srvsubs.c optional nfsserver nfsserver/nfs_syscalls.c optional nfsserver +nfs/nfs_nfssvc.c optional nfsserver nlm/nlm_advlock.c optional nfslockd nfsclient nlm/nlm_prot_clnt.c optional nfslockd nlm/nlm_prot_impl.c optional nfslockd ==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf.c#13 (text+ko) ==== @@ -41,7 +41,7 @@ #include "opt_inet6.h" #include -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.60 2008/12/15 06:10:57 qingli Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.64 2009/04/12 13:22:33 rwatson Exp $"); #endif #ifdef __FreeBSD__ @@ -6153,7 +6153,7 @@ if (r->rt == PF_FASTROUTE) { in_rtalloc(ro, 0); if (ro->ro_rt == 0) { - V_ipstat.ips_noroute++; + IPSTAT_INC(ips_noroute); goto bad; } @@ -6284,16 +6284,16 @@ if ((ifp->if_capabilities & IFCAP_CSUM_IPv4) && ifp->if_bridge == NULL) { m0->m_pkthdr.csum_flags |= M_IPV4_CSUM_OUT; - V_ipstat.ips_outhwcsum++; + IPSTAT_INC(ips_outhwcsum); } else { ip->ip_sum = 0; ip->ip_sum = in_cksum(m0, ip->ip_hl << 2); } /* Update relevant hardware checksum stats for TCP/UDP */ if (m0->m_pkthdr.csum_flags & M_TCPV4_CSUM_OUT) - V_tcpstat.tcps_outhwcsum++; + TCPSTAT_INC(tcpstat.tcps_outhwcsum); else if (m0->m_pkthdr.csum_flags & M_UDPV4_CSUM_OUT) - V_udpstat.udps_outhwcsum++; + UDPSTAT_INC(udps_outhwcsum); error = (*ifp->if_output)(ifp, m0, sintosa(dst), NULL); goto done; } @@ -6303,7 +6303,7 @@ * Must be able to put at least 8 bytes per fragment. */ if (ip->ip_off & htons(IP_DF)) { - V_ipstat.ips_cantfrag++; + IPSTAT_INC(ips_cantfrag); if (r->rt != PF_DUPTO) { #ifdef __FreeBSD__ /* icmp_error() expects host byte ordering */ @@ -6360,7 +6360,7 @@ } if (error == 0) - V_ipstat.ips_fragmented++; + IPSTAT_INC(ips_fragmented); done: if (r->rt != PF_DUPTO) @@ -6635,26 +6635,26 @@ case IPPROTO_TCP: { INIT_VNET_INET(curvnet); - V_tcpstat.tcps_rcvbadsum++; + TCPSTAT_INC(tcps_rcvbadsum); break; } case IPPROTO_UDP: { INIT_VNET_INET(curvnet); - V_udpstat.udps_badsum++; + UDPSTAT_INC(udps_badsum); break; } case IPPROTO_ICMP: { INIT_VNET_INET(curvnet); - V_icmpstat.icps_checksum++; + ICMPSTAT_INC(icps_checksum); break; } #ifdef INET6 case IPPROTO_ICMPV6: { INIT_VNET_INET6(curvnet); - V_icmp6stat.icp6s_checksum++; + ICMP6STAT_INC(icp6s_checksum); break; } #endif /* INET6 */ @@ -6741,17 +6741,17 @@ m->m_pkthdr.csum_flags |= flag_bad; switch (p) { case IPPROTO_TCP: - V_tcpstat.tcps_rcvbadsum++; + TCPSTAT_INC(tcps_rcvbadsum); break; case IPPROTO_UDP: - V_udpstat.udps_badsum++; + UDPSTAT_INC(udps_badsum); break; case IPPROTO_ICMP: - V_icmpstat.icps_checksum++; + ICMPSTAT_INC(icps_checksum); break; #ifdef INET6 case IPPROTO_ICMPV6: - V_icmp6stat.icp6s_checksum++; + ICMP6STAT_INC(icp6s_checksum); break; #endif /* INET6 */ } ==== //depot/projects/vimage-commit2/src/sys/dev/agp/agp.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/agp/agp.c,v 1.64 2009/03/20 18:30:20 rnoland Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/agp/agp.c,v 1.65 2009/04/14 13:11:34 ed Exp $"); #include "opt_agp.h" #include "opt_bus.h" @@ -81,7 +81,6 @@ }; static devclass_t agp_devclass; -#define KDEV2DEV(kdev) devclass_get_device(agp_devclass, dev2unit(kdev)) /* Helper functions for implementing chipset mini drivers. */ @@ -254,11 +253,8 @@ sc->as_nextid = 1; sc->as_devnode = make_dev(&agp_cdevsw, - device_get_unit(dev), - UID_ROOT, - GID_WHEEL, - 0600, - "agpgart"); + 0, UID_ROOT, GID_WHEEL, 0600, "agpgart"); + sc->as_devnode->si_drv1 = dev; return 0; } @@ -802,7 +798,7 @@ static int agp_open(struct cdev *kdev, int oflags, int devtype, struct thread *td) { - device_t dev = KDEV2DEV(kdev); + device_t dev = kdev->si_drv1; struct agp_softc *sc = device_get_softc(dev); if (!sc->as_isopen) { @@ -816,7 +812,7 @@ static int agp_close(struct cdev *kdev, int fflag, int devtype, struct thread *td) { - device_t dev = KDEV2DEV(kdev); + device_t dev = kdev->si_drv1; struct agp_softc *sc = device_get_softc(dev); struct agp_memory *mem; @@ -839,7 +835,7 @@ static int agp_ioctl(struct cdev *kdev, u_long cmd, caddr_t data, int fflag, struct thread *td) { - device_t dev = KDEV2DEV(kdev); + device_t dev = kdev->si_drv1; switch (cmd) { case AGPIOC_INFO: @@ -874,7 +870,7 @@ static int agp_mmap(struct cdev *kdev, vm_offset_t offset, vm_paddr_t *paddr, int prot) { - device_t dev = KDEV2DEV(kdev); + device_t dev = kdev->si_drv1; struct agp_softc *sc = device_get_softc(dev); if (offset > AGP_GET_APERTURE(dev)) ==== //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ah.c#6 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $FreeBSD: src/sys/dev/ath/ath_hal/ah.c,v 1.8 2009/03/12 00:09:29 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ah.c,v 1.9 2009/04/13 21:01:08 sam Exp $ */ #include "opt_ah.h" @@ -287,8 +287,7 @@ + (numSymbols * OFDM_QUARTER_SYMBOL_TIME); break; case IEEE80211_T_TURBO: - /* we still save OFDM rates in kbps - so double them */ - bitsPerSymbol = ((kbps << 1) * TURBO_SYMBOL_TIME) / 1000; + bitsPerSymbol = (kbps * TURBO_SYMBOL_TIME) / 1000; HALASSERT(bitsPerSymbol != 0); numBits = TURBO_PLCP_BITS + (frameLen << 3); ==== //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5210/ar5210_phy.c#2 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ar5210_phy.c,v 1.3 2008/11/10 01:19:37 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ar5210/ar5210_phy.c,v 1.2 2009/04/13 21:01:08 sam Exp $ */ #include "opt_ah.h" @@ -50,14 +50,14 @@ { /* short ctrl */ /* valid rateCode Preamble dot11Rate Rate */ -/* 6 Mb */ { AH_TRUE, TURBO, 6000, 0x0b, 0x00, (0x80|12), 0 }, -/* 9 Mb */ { AH_TRUE, TURBO, 9000, 0x0f, 0x00, 18, 0 }, -/* 12 Mb */ { AH_TRUE, TURBO, 12000, 0x0a, 0x00, (0x80|24), 2 }, -/* 18 Mb */ { AH_TRUE, TURBO, 18000, 0x0e, 0x00, 36, 2 }, -/* 24 Mb */ { AH_TRUE, TURBO, 24000, 0x09, 0x00, (0x80|48), 4 }, -/* 36 Mb */ { AH_TRUE, TURBO, 36000, 0x0d, 0x00, 72, 4 }, -/* 48 Mb */ { AH_TRUE, TURBO, 48000, 0x08, 0x00, 96, 4 }, -/* 54 Mb */ { AH_TRUE, TURBO, 54000, 0x0c, 0x00, 108, 4 } +/* 6 Mb */ { AH_TRUE, TURBO, 12000, 0x0b, 0x00, (0x80|12), 0 }, +/* 9 Mb */ { AH_TRUE, TURBO, 18000, 0x0f, 0x00, 18, 0 }, +/* 12 Mb */ { AH_TRUE, TURBO, 24000, 0x0a, 0x00, (0x80|24), 2 }, +/* 18 Mb */ { AH_TRUE, TURBO, 36000, 0x0e, 0x00, 36, 2 }, +/* 24 Mb */ { AH_TRUE, TURBO, 48000, 0x09, 0x00, (0x80|48), 4 }, +/* 36 Mb */ { AH_TRUE, TURBO, 72000, 0x0d, 0x00, 72, 4 }, +/* 48 Mb */ { AH_TRUE, TURBO, 96000, 0x08, 0x00, 96, 4 }, +/* 54 Mb */ { AH_TRUE, TURBO, 108000, 0x0c, 0x00, 108, 4 } }, }; ==== //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5211/ar5211_phy.c#2 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ar5211_phy.c,v 1.3 2008/11/10 01:19:37 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ar5211/ar5211_phy.c,v 1.2 2009/04/13 21:01:08 sam Exp $ */ #include "opt_ah.h" @@ -51,14 +51,14 @@ { /* short ctrl */ /* valid rateCode Preamble dot11Rate Rate */ -/* 6 Mb */ { AH_TRUE, TURBO, 6000, 0x0b, 0x00, (0x80|12), 0 }, -/* 9 Mb */ { AH_TRUE, TURBO, 9000, 0x0f, 0x00, 18, 0 }, -/* 12 Mb */ { AH_TRUE, TURBO, 12000, 0x0a, 0x00, (0x80|24), 2 }, -/* 18 Mb */ { AH_TRUE, TURBO, 18000, 0x0e, 0x00, 36, 2 }, -/* 24 Mb */ { AH_TRUE, TURBO, 24000, 0x09, 0x00, (0x80|48), 4 }, -/* 36 Mb */ { AH_TRUE, TURBO, 36000, 0x0d, 0x00, 72, 4 }, -/* 48 Mb */ { AH_TRUE, TURBO, 48000, 0x08, 0x00, 96, 4 }, -/* 54 Mb */ { AH_TRUE, TURBO, 54000, 0x0c, 0x00, 108, 4 } +/* 6 Mb */ { AH_TRUE, TURBO, 12000, 0x0b, 0x00, (0x80|12), 0 }, +/* 9 Mb */ { AH_TRUE, TURBO, 18000, 0x0f, 0x00, 18, 0 }, +/* 12 Mb */ { AH_TRUE, TURBO, 24000, 0x0a, 0x00, (0x80|24), 2 }, +/* 18 Mb */ { AH_TRUE, TURBO, 36000, 0x0e, 0x00, 36, 2 }, +/* 24 Mb */ { AH_TRUE, TURBO, 48000, 0x09, 0x00, (0x80|48), 4 }, +/* 36 Mb */ { AH_TRUE, TURBO, 72000, 0x0d, 0x00, 72, 4 }, +/* 48 Mb */ { AH_TRUE, TURBO, 96000, 0x08, 0x00, 96, 4 }, +/* 54 Mb */ { AH_TRUE, TURBO, 108000, 0x0c, 0x00, 108, 4 } }, }; ==== //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5212/ar5212_phy.c#3 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $FreeBSD: src/sys/dev/ath/ath_hal/ar5212/ar5212_phy.c,v 1.2 2009/02/19 04:24:22 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ar5212/ar5212_phy.c,v 1.3 2009/04/13 21:01:08 sam Exp $ */ #include "opt_ah.h" @@ -87,13 +87,13 @@ { /* short ctrl */ /* valid rateCode Preamble dot11Rate Rate */ -/* 6 Mb */ { AH_TRUE, TURBO, 6000, 0x0b, 0x00, (0x80|12), 0 }, -/* 12 Mb */ { AH_TRUE, TURBO, 12000, 0x0a, 0x00, (0x80|24), 2 }, -/* 18 Mb */ { AH_TRUE, TURBO, 18000, 0x0e, 0x00, 36, 2 }, -/* 24 Mb */ { AH_TRUE, TURBO, 24000, 0x09, 0x00, (0x80|48), 3 }, -/* 36 Mb */ { AH_TRUE, TURBO, 36000, 0x0d, 0x00, 72, 3 }, -/* 48 Mb */ { AH_TRUE, TURBO, 48000, 0x08, 0x00, 96, 3 }, -/* 54 Mb */ { AH_TRUE, TURBO, 54000, 0x0c, 0x00, 108, 3 } +/* 6 Mb */ { AH_TRUE, TURBO, 12000, 0x0b, 0x00, (0x80|12), 0 }, +/* 12 Mb */ { AH_TRUE, TURBO, 24000, 0x0a, 0x00, (0x80|24), 1 }, +/* 18 Mb */ { AH_TRUE, TURBO, 36000, 0x0e, 0x00, 36, 1 }, +/* 24 Mb */ { AH_TRUE, TURBO, 48000, 0x09, 0x00, (0x80|48), 2 }, +/* 36 Mb */ { AH_TRUE, TURBO, 72000, 0x0d, 0x00, 72, 2 }, +/* 48 Mb */ { AH_TRUE, TURBO, 96000, 0x08, 0x00, 96, 2 }, +/* 54 Mb */ { AH_TRUE, TURBO, 108000, 0x0c, 0x00, 108, 2 } }, }; @@ -103,14 +103,14 @@ { /* short ctrl */ /* valid rateCode Preamble dot11Rate Rate */ -/* 6 Mb */ { AH_TRUE, TURBO, 6000, 0x0b, 0x00, (0x80|12), 0 }, -/* 9 Mb */ { AH_TRUE, TURBO, 9000, 0x0f, 0x00, 18, 0 }, -/* 12 Mb */ { AH_TRUE, TURBO, 12000, 0x0a, 0x00, (0x80|24), 2 }, -/* 18 Mb */ { AH_TRUE, TURBO, 18000, 0x0e, 0x00, 36, 2 }, -/* 24 Mb */ { AH_TRUE, TURBO, 24000, 0x09, 0x00, (0x80|48), 4 }, -/* 36 Mb */ { AH_TRUE, TURBO, 36000, 0x0d, 0x00, 72, 4 }, -/* 48 Mb */ { AH_TRUE, TURBO, 48000, 0x08, 0x00, 96, 4 }, -/* 54 Mb */ { AH_TRUE, TURBO, 54000, 0x0c, 0x00, 108, 4 } +/* 6 Mb */ { AH_TRUE, TURBO, 12000, 0x0b, 0x00, (0x80|12), 0 }, +/* 9 Mb */ { AH_TRUE, TURBO, 18000, 0x0f, 0x00, 18, 0 }, +/* 12 Mb */ { AH_TRUE, TURBO, 24000, 0x0a, 0x00, (0x80|24), 2 }, +/* 18 Mb */ { AH_TRUE, TURBO, 36000, 0x0e, 0x00, 36, 2 }, +/* 24 Mb */ { AH_TRUE, TURBO, 48000, 0x09, 0x00, (0x80|48), 4 }, +/* 36 Mb */ { AH_TRUE, TURBO, 72000, 0x0d, 0x00, 72, 4 }, +/* 48 Mb */ { AH_TRUE, TURBO, 96000, 0x08, 0x00, 96, 4 }, +/* 54 Mb */ { AH_TRUE, TURBO, 108000, 0x0c, 0x00, 108, 4 } }, }; ==== //depot/projects/vimage-commit2/src/sys/dev/ath/ath_rate/sample/sample.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/sample/sample.c,v 1.29 2009/01/07 23:30:26 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/sample/sample.c,v 1.30 2009/04/13 20:54:08 sam Exp $"); /* * John Bicket's SampleRate control algorithm. @@ -766,6 +766,15 @@ sn->static_rix = sc->sc_rixmap[tp->ucastrate]; break; } +#ifdef IEEE80211_DEBUG + if (sn->static_rix == -1) { + IEEE80211_NOTE(ni->ni_vap, + IEEE80211_MSG_RATECTL, ni, + "%s: ucastrate %u not found, nrates %u", + __func__, tp->ucastrate, + ni->ni_rates.rs_nrates); + } +#endif } /* ==== //depot/projects/vimage-commit2/src/sys/dev/ath/if_ath.c#12 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.245 2009/03/30 21:53:27 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.248 2009/04/13 20:58:47 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -4773,8 +4773,8 @@ m0->m_nextpkt = NULL; if (IFF_DUMPPKTS(sc, ATH_DEBUG_XMIT)) - ieee80211_dump_pkt(ic, mtod(m0, caddr_t), m0->m_len, - sc->sc_hwmap[rix].ieeerate, -1); + ieee80211_dump_pkt(ic, mtod(m0, const uint8_t *), m0->m_len, + sc->sc_hwmap[rix].ieeerate, -1); if (bpf_peers_present(ifp->if_bpf)) { u_int64_t tsf = ath_hal_gettsf64(ah); @@ -5118,8 +5118,8 @@ ath_printtxbuf(sc, bf, txq->axq_qnum, ix, ath_hal_txprocdesc(ah, bf->bf_desc, &bf->bf_status.ds_txstat) == HAL_OK); - ieee80211_dump_pkt(ic, mtod(bf->bf_m, caddr_t), - bf->bf_m->m_len, 0, -1); + ieee80211_dump_pkt(ic, mtod(bf->bf_m, const uint8_t *), + bf->bf_m->m_len, 0, -1); } #endif /* ATH_DEBUG */ bus_dmamap_unload(sc->sc_dmat, bf->bf_dmamap); @@ -5187,8 +5187,9 @@ ath_printtxbuf(sc, bf, sc->sc_bhalq, 0, ath_hal_txprocdesc(ah, bf->bf_desc, &bf->bf_status.ds_txstat) == HAL_OK); - ieee80211_dump_pkt(ifp->if_l2com, mtod(bf->bf_m, caddr_t), - bf->bf_m->m_len, 0, -1); + ieee80211_dump_pkt(ifp->if_l2com, + mtod(bf->bf_m, const uint8_t *), bf->bf_m->m_len, + 0, -1); } } #endif /* ATH_DEBUG */ @@ -6783,7 +6784,7 @@ if (IFF_DUMPPKTS(sc, ATH_DEBUG_XMIT)) ieee80211_dump_pkt(ic, mtod(m0, caddr_t), m0->m_len, - sc->sc_hwmap[rix].ieeerate, -1); + sc->sc_hwmap[rix].ieeerate, -1); if (bpf_peers_present(ifp->if_bpf)) { u_int64_t tsf = ath_hal_gettsf64(ah); @@ -6987,7 +6988,6 @@ { /* copy from vap state (XXX check all vaps have same value?) */ sc->sc_tdmaslotlen = tdma->tdma_slotlen; - sc->sc_tdmabintcnt = tdma->tdma_bintval; sc->sc_tdmabintval = roundup((sc->sc_tdmaslotlen+sc->sc_tdmaguard) * tdma->tdma_slotcnt, 1024); @@ -7121,6 +7121,8 @@ const struct ieee80211_tdma_state *ts = vap->iv_tdma; ath_tdma_bintvalsetup(sc, ts); + if (changed & TDMA_UPDATE_SLOTLEN) + ath_wme_update(ic); DPRINTF(sc, ATH_DEBUG_TDMA, "%s: adopt slot %u slotcnt %u slotlen %u us " @@ -7128,7 +7130,6 @@ ts->tdma_slot, ts->tdma_slotcnt, ts->tdma_slotlen, sc->sc_tdmabintval); - ath_beaconq_config(sc); /* XXX right? */ ath_hal_intrset(ah, sc->sc_imask); /* NB: beacon timers programmed below */ ==== //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#19 (text+ko) ==== @@ -28,7 +28,7 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c,v 1.29 2008/12/17 12:52:34 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c,v 1.30 2009/04/11 22:07:19 rwatson Exp $"); #include #include @@ -3829,7 +3829,7 @@ #endif toep->tp_state = tp->t_state; - V_tcpstat.tcps_connects++; + TCPSTAT_INC(tcps_connects); } ==== //depot/projects/vimage-commit2/src/sys/dev/e1000/if_em.c#6 (text+ko) ==== @@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE. ******************************************************************************/ -/*$FreeBSD: src/sys/dev/e1000/if_em.c,v 1.5 2009/04/10 00:05:46 jfv Exp $*/ +/*$FreeBSD: src/sys/dev/e1000/if_em.c,v 1.6 2009/04/14 03:36:59 kmacy Exp $*/ #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" @@ -39,6 +39,7 @@ #include #include +#include #include #include #include @@ -897,6 +898,9 @@ bus_generic_detach(dev); if_free(ifp); +#ifdef IFNET_BUF_RING + drbr_free(adapter->br, M_DEVBUF); +#endif em_free_transmit_structures(adapter); em_free_receive_structures(adapter); @@ -991,6 +995,69 @@ * the packet is requeued. **********************************************************************/ +#ifdef IFNET_BUF_RING +static int +em_transmit_locked(struct ifnet *ifp, struct mbuf *m) +{ + struct adapter *adapter = ifp->if_softc; + int error; + + EM_TX_LOCK_ASSERT(adapter); + if (((ifp->if_drv_flags & (IFF_DRV_RUNNING|IFF_DRV_OACTIVE)) != + IFF_DRV_RUNNING) + || (!adapter->link_active)) { + error = drbr_enqueue(ifp, adapter->br, m); + return (error); + } + + if (ADAPTER_RING_EMPTY(adapter) && + (adapter->num_tx_desc_avail > EM_TX_OP_THRESHOLD)) { + if (em_xmit(adapter, &m)) { + if (m && (error = drbr_enqueue(ifp, adapter->br, m)) != 0) { + return (error); + } + } else{ + /* Send a copy of the frame to the BPF listener */ + ETHER_BPF_MTAP(ifp, m); + } + } else if ((error = drbr_enqueue(ifp, adapter->br, m)) != 0) + return (error); + + if (!ADAPTER_RING_EMPTY(adapter)) + em_start_locked(ifp); + + return (0); +} + +static int +em_transmit(struct ifnet *ifp, struct mbuf *m) +{ + + struct adapter *adapter = ifp->if_softc; + int error = 0; + + if(EM_TX_TRYLOCK(adapter)) { + if (ifp->if_drv_flags & IFF_DRV_RUNNING) + error = em_transmit_locked(ifp, m); + EM_TX_UNLOCK(adapter); + } else + error = drbr_enqueue(ifp, adapter->br, m); + >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Apr 14 19:06:29 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CF3D11065672; Tue, 14 Apr 2009 19:06:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 89274106564A for ; Tue, 14 Apr 2009 19:06:28 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 74CB78FC1C for ; Tue, 14 Apr 2009 19:06:28 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3EJ6SP1018536 for ; Tue, 14 Apr 2009 19:06:28 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3EJ6RPD018534 for perforce@freebsd.org; Tue, 14 Apr 2009 19:06:27 GMT (envelope-from jhb@freebsd.org) Date: Tue, 14 Apr 2009 19:06:27 GMT Message-Id: <200904141906.n3EJ6RPD018534@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 160631 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, 14 Apr 2009 19:06:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=160631 Change 160631 by jhb@jhb_jhbbsd on 2009/04/14 19:06:19 IFC @160628 Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/busdma_machdep.c#31 integrate .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#78 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#75 integrate .. //depot/projects/smpng/sys/amd64/include/cpufunc.h#16 integrate .. //depot/projects/smpng/sys/amd64/include/endian.h#5 integrate .. //depot/projects/smpng/sys/arm/arm/busdma_machdep.c#29 integrate .. //depot/projects/smpng/sys/arm/arm/trap.c#30 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/Makefile#19 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/biosdisk.c#20 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/smbios.c#8 integrate .. //depot/projects/smpng/sys/boot/sparc64/loader/main.c#28 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.c#57 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/vnode.h#4 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#5 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#8 integrate .. //depot/projects/smpng/sys/conf/NOTES#165 integrate .. //depot/projects/smpng/sys/conf/files#236 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf.c#33 integrate .. //depot/projects/smpng/sys/dev/agp/agp.c#8 integrate .. //depot/projects/smpng/sys/dev/ata/ata-queue.c#48 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ah.c#8 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ah_internal.h#7 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5210/ar5210_phy.c#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5211/ar5211_phy.c#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5212/ar5212_phy.c#3 integrate .. //depot/projects/smpng/sys/dev/ath/ath_rate/sample/sample.c#15 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#74 integrate .. //depot/projects/smpng/sys/dev/ath/if_athvar.h#46 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_sge.c#16 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#15 integrate .. //depot/projects/smpng/sys/dev/drm/r300_cmdbuf.c#7 integrate .. //depot/projects/smpng/sys/dev/drm/r300_reg.h#5 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_cp.c#23 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_drv.h#20 integrate .. //depot/projects/smpng/sys/dev/e1000/e1000_80003es2lan.c#3 integrate .. //depot/projects/smpng/sys/dev/e1000/e1000_82540.c#3 integrate .. //depot/projects/smpng/sys/dev/e1000/e1000_82541.c#3 integrate .. //depot/projects/smpng/sys/dev/e1000/e1000_82571.c#3 integrate .. //depot/projects/smpng/sys/dev/e1000/e1000_82575.c#3 integrate .. //depot/projects/smpng/sys/dev/e1000/e1000_82575.h#3 integrate .. //depot/projects/smpng/sys/dev/e1000/e1000_api.c#3 integrate .. //depot/projects/smpng/sys/dev/e1000/e1000_api.h#3 integrate .. //depot/projects/smpng/sys/dev/e1000/e1000_defines.h#3 integrate .. //depot/projects/smpng/sys/dev/e1000/e1000_hw.h#3 integrate .. //depot/projects/smpng/sys/dev/e1000/e1000_ich8lan.c#3 integrate .. //depot/projects/smpng/sys/dev/e1000/e1000_ich8lan.h#3 integrate .. //depot/projects/smpng/sys/dev/e1000/e1000_mac.c#3 integrate .. //depot/projects/smpng/sys/dev/e1000/e1000_mac.h#3 integrate .. //depot/projects/smpng/sys/dev/e1000/e1000_nvm.c#3 integrate .. //depot/projects/smpng/sys/dev/e1000/e1000_nvm.h#2 integrate .. //depot/projects/smpng/sys/dev/e1000/e1000_phy.c#3 integrate .. //depot/projects/smpng/sys/dev/e1000/e1000_phy.h#3 integrate .. //depot/projects/smpng/sys/dev/e1000/e1000_regs.h#3 integrate .. //depot/projects/smpng/sys/dev/e1000/if_em.c#5 integrate .. //depot/projects/smpng/sys/dev/e1000/if_em.h#3 integrate .. //depot/projects/smpng/sys/dev/e1000/if_igb.c#6 integrate .. //depot/projects/smpng/sys/dev/e1000/if_igb.h#3 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_pccard.c#47 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep.c#29 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep_pccard.c#23 integrate .. //depot/projects/smpng/sys/dev/ep/if_epreg.h#8 integrate .. //depot/projects/smpng/sys/dev/ep/if_epvar.h#13 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#89 integrate .. //depot/projects/smpng/sys/dev/hptmv/entry.c#17 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#56 integrate .. //depot/projects/smpng/sys/dev/ixgbe/LICENSE#3 integrate .. //depot/projects/smpng/sys/dev/ixgbe/README#2 integrate .. //depot/projects/smpng/sys/dev/ixgbe/ixgbe.c#5 integrate .. //depot/projects/smpng/sys/dev/ixgbe/ixgbe.h#5 integrate .. //depot/projects/smpng/sys/dev/ixgbe/ixgbe_82598.c#5 integrate .. //depot/projects/smpng/sys/dev/ixgbe/ixgbe_82599.c#1 branch .. //depot/projects/smpng/sys/dev/ixgbe/ixgbe_api.c#5 integrate .. //depot/projects/smpng/sys/dev/ixgbe/ixgbe_api.h#5 integrate .. //depot/projects/smpng/sys/dev/ixgbe/ixgbe_common.c#5 integrate .. //depot/projects/smpng/sys/dev/ixgbe/ixgbe_common.h#5 integrate .. //depot/projects/smpng/sys/dev/ixgbe/ixgbe_osdep.h#4 integrate .. //depot/projects/smpng/sys/dev/ixgbe/ixgbe_phy.c#5 integrate .. //depot/projects/smpng/sys/dev/ixgbe/ixgbe_phy.h#5 integrate .. //depot/projects/smpng/sys/dev/ixgbe/ixgbe_type.h#5 integrate .. //depot/projects/smpng/sys/dev/joy/joy.c#12 integrate .. //depot/projects/smpng/sys/dev/kbd/kbdreg.h#7 integrate .. //depot/projects/smpng/sys/dev/kbdmux/kbdmux.c#13 integrate .. //depot/projects/smpng/sys/dev/pccard/pccarddevs#66 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb_pci.c#22 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#107 integrate .. //depot/projects/smpng/sys/dev/powermac_nvram/powermac_nvram.c#6 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.c#70 integrate .. //depot/projects/smpng/sys/dev/tdfx/tdfx_pci.c#23 integrate .. //depot/projects/smpng/sys/dev/twa/tw_osl_freebsd.c#12 integrate .. //depot/projects/smpng/sys/dev/twe/twe_freebsd.c#27 integrate .. //depot/projects/smpng/sys/dev/uart/uart_cpu_powerpc.c#7 integrate .. //depot/projects/smpng/sys/dev/uart/uart_dev_ns8250.c#20 integrate .. //depot/projects/smpng/sys/dev/usb/controller/usb_controller.c#5 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#78 integrate .. //depot/projects/smpng/sys/fs/fifofs/fifo_vnops.c#50 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vnops.c#56 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_subr.c#37 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_vnops.c#43 integrate .. //depot/projects/smpng/sys/geom/geom.h#54 integrate .. //depot/projects/smpng/sys/geom/geom_disk.c#56 integrate .. //depot/projects/smpng/sys/geom/geom_disk.h#9 integrate .. //depot/projects/smpng/sys/geom/geom_subr.c#58 integrate .. //depot/projects/smpng/sys/geom/journal/g_journal.c#12 integrate .. //depot/projects/smpng/sys/geom/mirror/g_mirror.c#39 integrate .. //depot/projects/smpng/sys/geom/part/g_part.c#19 integrate .. //depot/projects/smpng/sys/geom/part/g_part_ebr.c#7 integrate .. //depot/projects/smpng/sys/geom/raid3/g_raid3.c#40 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_share.c#8 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_share.h#4 integrate .. //depot/projects/smpng/sys/i386/i386/busdma_machdep.c#50 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#139 integrate .. //depot/projects/smpng/sys/i386/include/cpufunc.h#39 integrate .. //depot/projects/smpng/sys/i386/include/endian.h#17 integrate .. //depot/projects/smpng/sys/ia64/ia64/busdma_machdep.c#31 integrate .. //depot/projects/smpng/sys/kern/kern_acct.c#54 integrate .. //depot/projects/smpng/sys/kern/kern_alq.c#19 integrate .. //depot/projects/smpng/sys/kern/kern_ktrace.c#68 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#147 integrate .. //depot/projects/smpng/sys/kern/kern_tc.c#48 integrate .. //depot/projects/smpng/sys/kern/kern_time.c#57 integrate .. //depot/projects/smpng/sys/kern/kern_umtx.c#36 integrate .. //depot/projects/smpng/sys/kern/kern_vimage.c#2 integrate .. //depot/projects/smpng/sys/kern/tty.c#88 integrate .. //depot/projects/smpng/sys/kern/uipc_domain.c#23 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#113 integrate .. //depot/projects/smpng/sys/kern/uipc_usrreq.c#87 integrate .. //depot/projects/smpng/sys/kern/vfs_acl.c#6 integrate .. //depot/projects/smpng/sys/kern/vfs_cache.c#54 integrate .. //depot/projects/smpng/sys/kern/vfs_default.c#59 integrate .. //depot/projects/smpng/sys/kern/vfs_extattr.c#7 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#91 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#144 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#93 integrate .. //depot/projects/smpng/sys/kern/vnode_if.src#41 integrate .. //depot/projects/smpng/sys/modules/Makefile#159 integrate .. //depot/projects/smpng/sys/modules/ixgbe/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/nfssvc/Makefile#1 branch .. //depot/projects/smpng/sys/net/if.c#116 integrate .. //depot/projects/smpng/sys/net/if_bridge.c#56 integrate .. //depot/projects/smpng/sys/net/if_gif.c#49 integrate .. //depot/projects/smpng/sys/net/if_loop.c#54 integrate .. //depot/projects/smpng/sys/net/if_spppsubr.c#39 integrate .. //depot/projects/smpng/sys/net/if_var.h#60 integrate .. //depot/projects/smpng/sys/net/route.c#45 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_node.c#45 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_output.c#41 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_tdma.c#10 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_var.h#37 integrate .. //depot/projects/smpng/sys/netinet/icmp6.h#14 integrate .. //depot/projects/smpng/sys/netinet/icmp_var.h#11 integrate .. //depot/projects/smpng/sys/netinet/if_ether.c#68 integrate .. //depot/projects/smpng/sys/netinet/igmp.c#30 integrate .. //depot/projects/smpng/sys/netinet/igmp_var.h#8 integrate .. //depot/projects/smpng/sys/netinet/in_gif.c#27 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.h#61 integrate .. //depot/projects/smpng/sys/netinet/ip_carp.c#32 integrate .. //depot/projects/smpng/sys/netinet/ip_carp.h#4 integrate .. //depot/projects/smpng/sys/netinet/ip_divert.c#63 integrate .. //depot/projects/smpng/sys/netinet/ip_dummynet.c#54 integrate .. //depot/projects/smpng/sys/netinet/ip_dummynet.h#24 integrate .. //depot/projects/smpng/sys/netinet/ip_fastfwd.c#35 integrate .. //depot/projects/smpng/sys/netinet/ip_icmp.c#48 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#97 integrate .. //depot/projects/smpng/sys/netinet/ip_ipsec.c#13 integrate .. //depot/projects/smpng/sys/netinet/ip_mroute.c#65 integrate .. //depot/projects/smpng/sys/netinet/ip_mroute.h#14 integrate .. //depot/projects/smpng/sys/netinet/ip_options.c#13 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#105 integrate .. //depot/projects/smpng/sys/netinet/ip_var.h#40 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias.c#9 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_cuseeme.c#3 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_dummy.c#2 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_ftp.c#8 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_irc.c#9 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_mod.c#3 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_mod.h#2 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_nbt.c#4 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_pptp.c#3 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_skinny.c#5 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_smedia.c#6 integrate .. //depot/projects/smpng/sys/netinet/pim_var.h#4 integrate .. //depot/projects/smpng/sys/netinet/raw_ip.c#79 integrate .. //depot/projects/smpng/sys/netinet/sctp_indata.c#24 integrate .. //depot/projects/smpng/sys/netinet/sctp_sysctl.c#13 integrate .. //depot/projects/smpng/sys/netinet/sctp_uio.h#21 integrate .. //depot/projects/smpng/sys/netinet/tcp_hostcache.c#17 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#124 integrate .. //depot/projects/smpng/sys/netinet/tcp_output.c#60 integrate .. //depot/projects/smpng/sys/netinet/tcp_reass.c#8 integrate .. //depot/projects/smpng/sys/netinet/tcp_sack.c#30 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#111 integrate .. //depot/projects/smpng/sys/netinet/tcp_syncache.c#70 integrate .. //depot/projects/smpng/sys/netinet/tcp_timer.c#46 integrate .. //depot/projects/smpng/sys/netinet/tcp_timewait.c#12 integrate .. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#77 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#66 integrate .. //depot/projects/smpng/sys/netinet/udp_usrreq.c#90 integrate .. //depot/projects/smpng/sys/netinet/udp_var.h#12 integrate .. //depot/projects/smpng/sys/netinet6/icmp6.c#51 integrate .. //depot/projects/smpng/sys/netinet6/ip6_input.c#60 integrate .. //depot/projects/smpng/sys/netinet6/mld6.c#28 integrate .. //depot/projects/smpng/sys/netinet6/nd6.c#51 integrate .. //depot/projects/smpng/sys/netinet6/nd6_nbr.c#34 integrate .. //depot/projects/smpng/sys/netinet6/nd6_rtr.c#29 integrate .. //depot/projects/smpng/sys/netinet6/raw_ip6.c#59 integrate .. //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#55 integrate .. //depot/projects/smpng/sys/netipsec/ipsec.c#33 integrate .. //depot/projects/smpng/sys/netipsec/xform_ah.c#17 integrate .. //depot/projects/smpng/sys/netipsec/xform_esp.c#18 integrate .. //depot/projects/smpng/sys/netipsec/xform_ipcomp.c#15 integrate .. //depot/projects/smpng/sys/netipsec/xform_ipip.c#21 integrate .. //depot/projects/smpng/sys/nfs/nfs_nfssvc.c#1 branch .. //depot/projects/smpng/sys/nfs/nfssvc.h#1 branch .. //depot/projects/smpng/sys/nfs4client/nfs4_vnops.c#32 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_socket.c#59 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#86 integrate .. //depot/projects/smpng/sys/nfsserver/nfs.h#25 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvkrpc.c#4 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvsubs.c#48 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_syscalls.c#42 integrate .. //depot/projects/smpng/sys/pc98/pc98/machdep.c#31 integrate .. //depot/projects/smpng/sys/powerpc/aim/machdep.c#11 integrate .. //depot/projects/smpng/sys/powerpc/aim/trap_subr.S#8 integrate .. //depot/projects/smpng/sys/powerpc/include/hid.h#6 integrate .. //depot/projects/smpng/sys/powerpc/include/spr.h#13 integrate .. //depot/projects/smpng/sys/sys/elf_common.h#17 integrate .. //depot/projects/smpng/sys/sys/kernel.h#43 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#81 integrate .. //depot/projects/smpng/sys/sys/param.h#142 integrate .. //depot/projects/smpng/sys/sys/systm.h#93 integrate .. //depot/projects/smpng/sys/sys/vimage.h#7 integrate .. //depot/projects/smpng/sys/sys/vnode.h#98 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#73 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#95 integrate .. //depot/projects/smpng/sys/vm/vm_map.h#42 integrate .. //depot/projects/smpng/sys/vm/vm_reserv.c#3 integrate .. //depot/projects/smpng/sys/vm/vm_unix.c#14 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/busdma_machdep.c#31 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.88 2009/02/09 18:03:31 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.89 2009/04/13 19:20:32 kib Exp $"); #include #include @@ -606,7 +606,10 @@ vendaddr = (vm_offset_t)buf + buflen; while (vaddr < vendaddr) { - paddr = pmap_kextract(vaddr); + if (pmap) + paddr = pmap_extract(pmap, vaddr); + else + paddr = pmap_kextract(vaddr); if (run_filter(dmat, paddr) != 0) map->pagesneeded++; vaddr += (PAGE_SIZE - ((vm_offset_t)vaddr & PAGE_MASK)); ==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#78 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.698 2009/04/01 13:09:26 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.699 2009/04/11 14:01:01 ed Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -2178,45 +2178,24 @@ #ifdef KDB /* - * Provide inb() and outb() as functions. They are normally only - * available as macros calling inlined functions, thus cannot be - * called from the debugger. - * - * The actual code is stolen from , and de-inlined. + * Provide inb() and outb() as functions. They are normally only available as + * inline functions, thus cannot be called from the debugger. */ -#undef inb -#undef outb - /* silence compiler warnings */ -u_char inb(u_int); -void outb(u_int, u_char); +u_char inb_(u_short); +void outb_(u_short, u_char); u_char -inb(u_int port) +inb_(u_short port) { - u_char data; - /* - * We use %%dx and not %1 here because i/o is done at %dx and not at - * %edx, while gcc generates inferior code (movw instead of movl) - * if we tell it to load (u_short) port. - */ - __asm __volatile("inb %%dx,%0" : "=a" (data) : "d" (port)); - return (data); + return inb(port); } void -outb(u_int port, u_char data) +outb_(u_short port, u_char data) { - u_char al; - /* - * Use an unnecessary assignment to help gcc's register allocator. - * This make a large difference for gcc-1.40 and a tiny difference - * for gcc-2.6.0. For gcc-1.40, al had to be ``asm("ax")'' for - * best results. gcc-2.6.0 can't handle this. - */ - al = data; - __asm __volatile("outb %0,%%dx" : : "a" (al), "d" (port)); + outb(port, data); } #endif /* KDB */ ==== //depot/projects/smpng/sys/amd64/conf/GENERIC#75 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.522 2009/03/19 20:33:26 thompsa Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.523 2009/04/10 00:40:48 jfv Exp $ cpu HAMMER ident GENERIC @@ -200,7 +200,7 @@ device de # DEC/Intel DC21x4x (``Tulip'') device em # Intel PRO/1000 Gigabit Ethernet Family device igb # Intel PRO/1000 PCIE Server Gigabit Family -device ixgb # Intel PRO/10GbE Ethernet Card +device ixgbe # Intel PRO/10GbE PCIE Ethernet Family device le # AMD Am7900 LANCE and Am79C9xx PCnet device ti # Alteon Networks Tigon I/II gigabit Ethernet device txp # 3Com 3cR990 (``Typhoon'') ==== //depot/projects/smpng/sys/amd64/include/cpufunc.h#16 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/cpufunc.h,v 1.151 2009/01/31 11:37:21 obrien Exp $ + * $FreeBSD: src/sys/amd64/include/cpufunc.h,v 1.153 2009/04/11 14:01:01 ed Exp $ */ /* @@ -164,79 +164,21 @@ __asm __volatile("hlt"); } -#if !defined(__GNUCLIKE_BUILTIN_CONSTANT_P) || __GNUCLIKE_ASM < 3 - -#define inb(port) inbv(port) -#define outb(port, data) outbv(port, data) - -#else /* __GNUCLIKE_BUILTIN_CONSTANT_P && __GNUCLIKE_ASM >= 3 */ - -/* - * The following complications are to get around gcc not having a - * constraint letter for the range 0..255. We still put "d" in the - * constraint because "i" isn't a valid constraint when the port - * isn't constant. This only matters for -O0 because otherwise - * the non-working version gets optimized away. - * - * Use an expression-statement instead of a conditional expression - * because gcc-2.6.0 would promote the operands of the conditional - * and produce poor code for "if ((inb(var) & const1) == const2)". - * - * The unnecessary test `(port) < 0x10000' is to generate a warning if - * the `port' has type u_short or smaller. Such types are pessimal. - * This actually only works for signed types. The range check is - * careful to avoid generating warnings. - */ -#define inb(port) __extension__ ({ \ - u_char _data; \ - if (__builtin_constant_p(port) && ((port) & 0xffff) < 0x100 \ - && (port) < 0x10000) \ - _data = inbc(port); \ - else \ - _data = inbv(port); \ - _data; }) - -#define outb(port, data) ( \ - __builtin_constant_p(port) && ((port) & 0xffff) < 0x100 \ - && (port) < 0x10000 \ - ? outbc(port, data) : outbv(port, data)) - static __inline u_char -inbc(u_int port) +inb(u_int port) { u_char data; - __asm __volatile("inb %1,%0" : "=a" (data) : "id" ((u_short)(port))); + __asm volatile("inb %w1, %0" : "=a" (data) : "Nd" (port)); return (data); } -static __inline void -outbc(u_int port, u_char data) -{ - __asm __volatile("outb %0,%1" : : "a" (data), "id" ((u_short)(port))); -} - -#endif /* __GNUCLIKE_BUILTIN_CONSTANT_P && __GNUCLIKE_ASM >= 3*/ - -static __inline u_char -inbv(u_int port) -{ - u_char data; - /* - * We use %%dx and not %1 here because i/o is done at %dx and not at - * %edx, while gcc generates inferior code (movw instead of movl) - * if we tell it to load (u_short) port. - */ - __asm __volatile("inb %%dx,%0" : "=a" (data) : "d" (port)); - return (data); -} - static __inline u_int inl(u_int port) { u_int data; - __asm __volatile("inl %%dx,%0" : "=a" (data) : "d" (port)); + __asm volatile("inl %w1, %0" : "=a" (data) : "Nd" (port)); return (data); } @@ -278,33 +220,20 @@ { u_short data; - __asm __volatile("inw %%dx,%0" : "=a" (data) : "d" (port)); + __asm volatile("inw %w1, %0" : "=a" (data) : "Nd" (port)); return (data); } static __inline void -outbv(u_int port, u_char data) +outb(u_int port, u_char data) { - u_char al; - /* - * Use an unnecessary assignment to help gcc's register allocator. - * This make a large difference for gcc-1.40 and a tiny difference - * for gcc-2.6.0. For gcc-1.40, al had to be ``asm("ax")'' for - * best results. gcc-2.6.0 can't handle this. - */ - al = data; - __asm __volatile("outb %0,%%dx" : : "a" (al), "d" (port)); + __asm volatile("outb %0, %w1" : : "a" (data), "Nd" (port)); } static __inline void outl(u_int port, u_int data) { - /* - * outl() and outw() aren't used much so we haven't looked at - * possible micro-optimizations such as the unnecessary - * assignment for them. - */ - __asm __volatile("outl %0,%%dx" : : "a" (data), "d" (port)); + __asm volatile("outl %0, %w1" : : "a" (data), "Nd" (port)); } static __inline void @@ -334,7 +263,7 @@ static __inline void outw(u_int port, u_short data) { - __asm __volatile("outw %0,%%dx" : : "a" (data), "d" (port)); + __asm volatile("outw %0, %w1" : : "a" (data), "Nd" (port)); } static __inline void @@ -535,12 +464,9 @@ static __inline void load_fs(u_int sel) { - register u_int32_t fsbase __asm("ecx"); - /* Preserve the fsbase value across the selector load */ - fsbase = MSR_FSBASE; - __asm __volatile("rdmsr; mov %0,%%fs; wrmsr" - : : "rm" (sel), "c" (fsbase) : "eax", "edx"); + __asm __volatile("rdmsr; mov %0,%%fs; wrmsr" + : : "rm" (sel), "c" (MSR_FSBASE) : "eax", "edx"); } #ifndef MSR_GSBASE @@ -549,16 +475,13 @@ static __inline void load_gs(u_int sel) { - register u_int32_t gsbase __asm("ecx"); - /* * Preserve the gsbase value across the selector load. * Note that we have to disable interrupts because the gsbase * being trashed happens to be the kernel gsbase at the time. */ - gsbase = MSR_GSBASE; - __asm __volatile("pushfq; cli; rdmsr; mov %0,%%gs; wrmsr; popfq" - : : "rm" (sel), "c" (gsbase) : "eax", "edx"); + __asm __volatile("pushfq; cli; rdmsr; mov %0,%%gs; wrmsr; popfq" + : : "rm" (sel), "c" (MSR_GSBASE) : "eax", "edx"); } #else /* Usable by userland */ ==== //depot/projects/smpng/sys/amd64/include/endian.h#5 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)endian.h 7.8 (Berkeley) 4/3/91 - * $FreeBSD: src/sys/amd64/include/endian.h,v 1.8 2005/03/11 21:46:01 peter Exp $ + * $FreeBSD: src/sys/amd64/include/endian.h,v 1.10 2009/04/08 19:10:20 ed Exp $ */ #ifndef _MACHINE_ENDIAN_H_ @@ -69,25 +69,6 @@ #if defined(__GNUCLIKE_ASM) && defined(__GNUCLIKE_BUILTIN_CONSTANT_P) -#define __word_swap_int_var(x) \ -__extension__ ({ register __uint32_t __X = (x); \ - __asm ("rorl $16, %0" : "+r" (__X)); \ - __X; }) - -#ifdef __OPTIMIZE__ - -#define __word_swap_int_const(x) \ - ((((x) & 0xffff0000) >> 16) | \ - (((x) & 0x0000ffff) << 16)) -#define __word_swap_int(x) (__builtin_constant_p(x) ? \ - __word_swap_int_const(x) : __word_swap_int_var(x)) - -#else /* __OPTIMIZE__ */ - -#define __word_swap_int(x) __word_swap_int_var(x) - -#endif /* __OPTIMIZE__ */ - #define __byte_swap_int_var(x) \ __extension__ ({ register __uint32_t __X = (x); \ __asm ("bswap %0" : "+r" (__X)); \ @@ -135,26 +116,6 @@ #endif /* __OPTIMIZE__ */ -#define __byte_swap_word_var(x) \ -__extension__ ({ register __uint16_t __X = (x); \ - __asm ("xchgb %h0, %b0" : "+Q" (__X)); \ - __X; }) - -#ifdef __OPTIMIZE__ - -#define __byte_swap_word_const(x) \ - ((((x) & 0xff00) >> 8) | \ - (((x) & 0x00ff) << 8)) - -#define __byte_swap_word(x) (__builtin_constant_p(x) ? \ - __byte_swap_word_const(x) : __byte_swap_word_var(x)) - -#else /* __OPTIMIZE__ */ - -#define __byte_swap_word(x) __byte_swap_word_var(x) - -#endif /* __OPTIMIZE__ */ - static __inline __uint64_t __bswap64(__uint64_t _x) { @@ -172,8 +133,7 @@ static __inline __uint16_t __bswap16(__uint16_t _x) { - - return (__byte_swap_word(_x)); + return (_x << 8 | _x >> 8); } #define __htonl(x) __bswap32(x) ==== //depot/projects/smpng/sys/arm/arm/busdma_machdep.c#29 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.44 2009/02/09 18:03:31 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.45 2009/04/13 19:20:32 kib Exp $"); /* * ARM bus dma support routines @@ -669,8 +669,8 @@ } static int -_bus_dmamap_count_pages(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf, - bus_size_t buflen, int flags) +_bus_dmamap_count_pages(bus_dma_tag_t dmat, bus_dmamap_t map, pmap_t pmap, + void *buf, bus_size_t buflen, int flags) { vm_offset_t vaddr; vm_offset_t vendaddr; @@ -689,7 +689,10 @@ vendaddr = (vm_offset_t)buf + buflen; while (vaddr < vendaddr) { - paddr = pmap_kextract(vaddr); + if (pmap != NULL) + paddr = pmap_extract(pmap, vaddr); + else + paddr = pmap_kextract(vaddr); if (((dmat->flags & BUS_DMA_COULD_BOUNCE) != 0) && run_filter(dmat, paddr) != 0) map->pagesneeded++; @@ -745,7 +748,8 @@ bmask = ~(dmat->boundary - 1); if ((dmat->flags & BUS_DMA_COULD_BOUNCE) != 0) { - error = _bus_dmamap_count_pages(dmat, map, buf, buflen, flags); + error = _bus_dmamap_count_pages(dmat, map, pmap, buf, buflen, + flags); if (error) return (error); } ==== //depot/projects/smpng/sys/arm/arm/trap.c#30 (text+ko) ==== @@ -82,7 +82,7 @@ #include "opt_ktrace.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.37 2008/03/12 10:11:55 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.39 2009/04/08 13:01:18 raj Exp $"); #include #include @@ -520,7 +520,8 @@ printf(", pc =%08x\n\n", tf->tf_pc); #ifdef KDB - kdb_trap(fsr, 0, tf); + if (debugger_on_panic || kdb_active) + kdb_trap(fsr, 0, tf); #endif panic("Fatal abort"); /*NOTREACHED*/ @@ -530,7 +531,7 @@ * dab_align() handles the following data aborts: * * FAULT_ALIGN_0 - Alignment fault - * FAULT_ALIGN_0 - Alignment fault + * FAULT_ALIGN_1 - Alignment fault * * These faults are fatal if they happen in kernel mode. Otherwise, we * deliver a bus error to the process. ==== //depot/projects/smpng/sys/boot/i386/libi386/Makefile#19 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/libi386/Makefile,v 1.44 2009/03/09 17:16:29 jhb Exp $ +# $FreeBSD: src/sys/boot/i386/libi386/Makefile,v 1.45 2009/04/07 17:58:15 jkim Exp $ # LIB= i386 INTERNALLIB= @@ -31,6 +31,10 @@ .if !defined(BOOT_HIDE_SERIAL_NUMBERS) # Export serial numbers, UUID, and asset tag from loader. CFLAGS+= -DSMBIOS_SERIAL_NUMBERS +.if defined(BOOT_LITTLE_ENDIAN_UUID) +# Use little-endian UUID format as defined in SMBIOS 2.6. +CFLAGS+= -DSMBIOS_LITTLE_ENDIAN_UUID +.endif .endif .if !defined(LOADER_NO_GPT_SUPPORT) ==== //depot/projects/smpng/sys/boot/i386/libi386/biosdisk.c#20 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosdisk.c,v 1.58 2009/03/12 20:41:52 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosdisk.c,v 1.59 2009/04/14 14:19:18 jhb Exp $"); /* * BIOS disk device handling. @@ -83,7 +83,7 @@ int od_cyl; /* BIOS geometry */ int od_hds; int od_sec; - int od_boff; /* block offset from beginning of BIOS disk */ + daddr_t od_boff; /* block offset from beginning of BIOS disk */ int od_flags; #define BD_MODEINT13 0x0000 #define BD_MODEEDD1 0x0001 ==== //depot/projects/smpng/sys/boot/i386/libi386/smbios.c#8 (text+ko) ==== @@ -25,10 +25,11 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/smbios.c,v 1.9 2009/04/07 17:24:25 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/smbios.c,v 1.10 2009/04/07 17:58:15 jkim Exp $"); #include #include +#include #include "btxv86.h" #include "libi386.h" @@ -37,17 +38,18 @@ * Detect SMBIOS and export information about the SMBIOS into the * environment. * - * System Management BIOS Reference Specification, v2.4 Final - * http://www.dmtf.org/standards/published_documents/DSP0134.pdf + * System Management BIOS Reference Specification, v2.6 Final + * http://www.dmtf.org/standards/published_documents/DSP0134_2.6.0.pdf */ /* - * Spec. 2.1.1 SMBIOS Structure Table Entry Point + * 2.1.1 SMBIOS Structure Table Entry Point * - * 'The SMBIOS Entry Point structure, described below, can be located by - * application software by searching for the anchor-string on paragraph - * (16-byte) boundaries within the physical memory address range - * 000F0000h to 000FFFFFh.' + * "On non-EFI systems, the SMBIOS Entry Point structure, described below, can + * be located by application software by searching for the anchor-string on + * paragraph (16-byte) boundaries within the physical memory address range + * 000F0000h to 000FFFFFh. This entry point encapsulates an intermediate anchor + * string that is used by some existing DMI browsers." */ #define SMBIOS_START 0xf0000 #define SMBIOS_LENGTH 0x10000 @@ -55,100 +57,174 @@ #define SMBIOS_SIG "_SM_" #define SMBIOS_DMI_SIG "_DMI_" +#define SMBIOS_GET8(base, off) (*(uint8_t *)((base) + (off))) +#define SMBIOS_GET16(base, off) (*(uint16_t *)((base) + (off))) +#define SMBIOS_GET32(base, off) (*(uint32_t *)((base) + (off))) + +#define SMBIOS_GETLEN(base) SMBIOS_GET8(base, 0x01) +#define SMBIOS_GETSTR(base) ((base) + SMBIOS_GETLEN(base)) + static uint32_t smbios_enabled_memory = 0; static uint32_t smbios_old_enabled_memory = 0; static uint8_t smbios_enabled_sockets = 0; static uint8_t smbios_populated_sockets = 0; -static uint8_t *smbios_parse_table(const uint8_t *dmi); -static void smbios_setenv(const char *name, const uint8_t *dmi, - const int offset); -static uint8_t smbios_checksum(const caddr_t addr, const uint8_t len); -static uint8_t *smbios_sigsearch(const caddr_t addr, const uint32_t len); +static uint8_t +smbios_checksum(const caddr_t addr, const uint8_t len) +{ + uint8_t sum; + int i; -#ifdef SMBIOS_SERIAL_NUMBERS -static void smbios_setuuid(const char *name, const uint8_t *dmi, - const int offset); -#endif + for (sum = 0, i = 0; i < len; i++) + sum += SMBIOS_GET8(addr, i); + return (sum); +} -void -smbios_detect(void) +static caddr_t +smbios_sigsearch(const caddr_t addr, const uint32_t len) { - uint8_t *smbios, *dmi, *addr; - uint16_t i, length, count; - uint32_t paddr; - char buf[16]; + caddr_t cp; - /* locate and validate the SMBIOS */ - smbios = smbios_sigsearch(PTOV(SMBIOS_START), SMBIOS_LENGTH); - if (smbios == NULL) - return; + /* Search on 16-byte boundaries. */ + for (cp = addr; cp < addr + len; cp += SMBIOS_STEP) + if (strncmp(cp, SMBIOS_SIG, 4) == 0 && + smbios_checksum(cp, SMBIOS_GET8(cp, 0x05)) == 0 && + strncmp(cp + 0x10, SMBIOS_DMI_SIG, 5) == 0 && + smbios_checksum(cp + 0x10, 0x0f) == 0) + return (cp); + return (NULL); +} - length = *(uint16_t *)(smbios + 0x16); /* Structure Table Length */ - paddr = *(uint32_t *)(smbios + 0x18); /* Structure Table Address */ - count = *(uint16_t *)(smbios + 0x1c); /* No of SMBIOS Structures */ +static void +smbios_setenv(const char *name, caddr_t addr, const int offset) +{ + caddr_t cp; + int i, idx; - for (dmi = addr = PTOV(paddr), i = 0; - dmi - addr < length && i < count; i++) - dmi = smbios_parse_table(dmi); - if (smbios_enabled_memory > 0 || smbios_old_enabled_memory > 0) { - sprintf(buf, "%u", smbios_enabled_memory > 0 ? - smbios_enabled_memory : smbios_old_enabled_memory); - setenv("smbios.memory.enabled", buf, 1); + idx = SMBIOS_GET8(addr, offset); + if (idx != 0) { + cp = SMBIOS_GETSTR(addr); + for (i = 1; i < idx; i++) + cp += strlen(cp) + 1; + setenv(name, cp, 1); } - if (smbios_enabled_sockets > 0) { - sprintf(buf, "%u", smbios_enabled_sockets); - setenv("smbios.socket.enabled", buf, 1); +} + +#ifdef SMBIOS_SERIAL_NUMBERS + +#define UUID_SIZE 16 +#define UUID_TYPE uint32_t +#define UUID_STEP sizeof(UUID_TYPE) +#define UUID_ALL_BITS (UUID_SIZE / UUID_STEP) +#define UUID_GET(base, off) (*(UUID_TYPE *)((base) + (off))) + +static void +smbios_setuuid(const char *name, const caddr_t addr, const int ver) +{ + char uuid[37]; + int i, ones, zeros; + UUID_TYPE n; + uint32_t f1; + uint16_t f2, f3; + + for (i = 0, ones = 0, zeros = 0; i < UUID_SIZE; i += UUID_STEP) { + n = UUID_GET(addr, i) + 1; + if (zeros == 0 && n == 0) + ones++; + else if (ones == 0 && n == 1) + zeros++; + else + break; } - if (smbios_populated_sockets > 0) { - sprintf(buf, "%u", smbios_populated_sockets); - setenv("smbios.socket.populated", buf, 1); + + if (ones != UUID_ALL_BITS && zeros != UUID_ALL_BITS) { + /* + * 3.3.2.1 System UUID + * + * "Although RFC 4122 recommends network byte order for all + * fields, the PC industry (including the ACPI, UEFI, and + * Microsoft specifications) has consistently used + * little-endian byte encoding for the first three fields: + * time_low, time_mid, time_hi_and_version. The same encoding, + * also known as wire format, should also be used for the + * SMBIOS representation of the UUID." + * + * Note: We use network byte order for backward compatibility + * unless SMBIOS version is 2.6+ or little-endian is forced. + */ +#ifndef SMBIOS_LITTLE_ENDIAN_UUID + if (ver < 0x0206) { + f1 = ntohl(SMBIOS_GET32(addr, 0)); + f2 = ntohs(SMBIOS_GET16(addr, 4)); + f3 = ntohs(SMBIOS_GET16(addr, 6)); + } else +#endif + { + f1 = le32toh(SMBIOS_GET32(addr, 0)); + f2 = le16toh(SMBIOS_GET16(addr, 4)); + f3 = le16toh(SMBIOS_GET16(addr, 6)); + } + sprintf(uuid, + "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", + f1, f2, f3, SMBIOS_GET8(addr, 8), SMBIOS_GET8(addr, 9), + SMBIOS_GET8(addr, 10), SMBIOS_GET8(addr, 11), + SMBIOS_GET8(addr, 12), SMBIOS_GET8(addr, 13), + SMBIOS_GET8(addr, 14), SMBIOS_GET8(addr, 15)); + setenv(name, uuid, 1); } } -static uint8_t * -smbios_parse_table(const uint8_t *dmi) +#undef UUID_SIZE +#undef UUID_TYPE +#undef UUID_STEP +#undef UUID_ALL_BITS +#undef UUID_GET + +#endif + +static caddr_t +smbios_parse_table(const caddr_t addr, const int ver) { - uint8_t *dp; - uint16_t size; - uint8_t osize; + caddr_t cp; + int proc, size, osize, type; - switch(dmi[0]) { - case 0: /* Type 0: BIOS */ - smbios_setenv("smbios.bios.vendor", dmi, 0x04); - smbios_setenv("smbios.bios.version", dmi, 0x05); - smbios_setenv("smbios.bios.reldate", dmi, 0x08); + type = SMBIOS_GET8(addr, 0); /* 3.1.2 Structure Header Format */ + switch(type) { + case 0: /* 3.3.1 BIOS Information (Type 0) */ + smbios_setenv("smbios.bios.vendor", addr, 0x04); + smbios_setenv("smbios.bios.version", addr, 0x05); + smbios_setenv("smbios.bios.reldate", addr, 0x08); break; - case 1: /* Type 1: System */ - smbios_setenv("smbios.system.maker", dmi, 0x04); - smbios_setenv("smbios.system.product", dmi, 0x05); - smbios_setenv("smbios.system.version", dmi, 0x06); + case 1: /* 3.3.2 System Information (Type 1) */ + smbios_setenv("smbios.system.maker", addr, 0x04); + smbios_setenv("smbios.system.product", addr, 0x05); + smbios_setenv("smbios.system.version", addr, 0x06); #ifdef SMBIOS_SERIAL_NUMBERS - smbios_setenv("smbios.system.serial", dmi, 0x07); - smbios_setuuid("smbios.system.uuid", dmi, 0x08); + smbios_setenv("smbios.system.serial", addr, 0x07); + smbios_setuuid("smbios.system.uuid", addr + 0x08, ver); #endif break; - case 2: /* Type 2: Base Board (or Module) */ - smbios_setenv("smbios.planar.maker", dmi, 0x04); - smbios_setenv("smbios.planar.product", dmi, 0x05); - smbios_setenv("smbios.planar.version", dmi, 0x06); + case 2: /* 3.3.3 Base Board (or Module) Information (Type 2) */ + smbios_setenv("smbios.planar.maker", addr, 0x04); + smbios_setenv("smbios.planar.product", addr, 0x05); + smbios_setenv("smbios.planar.version", addr, 0x06); #ifdef SMBIOS_SERIAL_NUMBERS - smbios_setenv("smbios.planar.serial", dmi, 0x07); + smbios_setenv("smbios.planar.serial", addr, 0x07); #endif break; - case 3: /* Type 3: System Enclosure or Chassis */ - smbios_setenv("smbios.chassis.maker", dmi, 0x04); - smbios_setenv("smbios.chassis.version", dmi, 0x06); + case 3: /* 3.3.4 System Enclosure or Chassis (Type 3) */ + smbios_setenv("smbios.chassis.maker", addr, 0x04); + smbios_setenv("smbios.chassis.version", addr, 0x06); #ifdef SMBIOS_SERIAL_NUMBERS - smbios_setenv("smbios.chassis.serial", dmi, 0x07); - smbios_setenv("smbios.chassis.tag", dmi, 0x08); + smbios_setenv("smbios.chassis.serial", addr, 0x07); + smbios_setenv("smbios.chassis.tag", addr, 0x08); #endif break; - case 4: /* Type 4: Processor Information */ + case 4: /* 3.3.5 Processor Information (Type 4) */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Apr 14 19:07:30 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1C04110656C7; Tue, 14 Apr 2009 19:07:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B58FE1065690 for ; Tue, 14 Apr 2009 19:07:29 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9E8B68FC1D for ; Tue, 14 Apr 2009 19:07:29 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3EJ7Tt6018598 for ; Tue, 14 Apr 2009 19:07:29 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3EJ7TJF018596 for perforce@freebsd.org; Tue, 14 Apr 2009 19:07:29 GMT (envelope-from jhb@freebsd.org) Date: Tue, 14 Apr 2009 19:07:29 GMT Message-Id: <200904141907.n3EJ7TJF018596@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 160632 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, 14 Apr 2009 19:07:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=160632 Change 160632 by jhb@jhb_jhbbsd on 2009/04/14 19:07:03 IFC @160630 Affected files ... .. //depot/projects/smpng/sys/boot/sparc64/loader/main.c#29 integrate Differences ... ==== //depot/projects/smpng/sys/boot/sparc64/loader/main.c#29 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.41 2009/04/13 19:43:37 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.42 2009/04/14 19:02:34 marius Exp $"); /* * FreeBSD/sparc64 kernel loader - machine dependent part @@ -434,9 +434,10 @@ continue; reg = dtlb_get_data_sun4u(i); wrpr(pstate, pstate, 0); + reg >>= TD_PA_SHIFT; if (cpu_impl >= CPU_IMPL_ULTRASPARCIII) - return ((reg & TD_PA_CH_MASK) >> TD_PA_SHIFT); - return ((reg & TD_PA_SF_MASK) >> TD_PA_SHIFT); + return (reg & TD_PA_CH_MASK); + return (reg & TD_PA_SF_MASK); } wrpr(pstate, pstate, 0); return (-1); @@ -456,9 +457,10 @@ continue; reg = itlb_get_data_sun4u(i); wrpr(pstate, pstate, 0); + reg >>= TD_PA_SHIFT; if (cpu_impl >= CPU_IMPL_ULTRASPARCIII) - return ((reg & TD_PA_CH_MASK) >> TD_PA_SHIFT); - return ((reg & TD_PA_SF_MASK) >> TD_PA_SHIFT); + return (reg & TD_PA_CH_MASK); + return (reg & TD_PA_SF_MASK); } wrpr(pstate, pstate, 0); return (-1); @@ -846,7 +848,7 @@ { printf("%s %s ", - page_sizes[(tte & TD_SIZE_MASK) >> TD_SIZE_SHIFT], + page_sizes[(tte >> TD_SIZE_SHIFT) & TD_SIZE_MASK], tag & TD_G ? "G" : " "); printf(tte & TD_W ? "W " : " "); printf(tte & TD_P ? "\e[33mP\e[0m " : " "); From owner-p4-projects@FreeBSD.ORG Tue Apr 14 19:30:11 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 261B21065E2C; Tue, 14 Apr 2009 19:30:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4705D1065E17 for ; Tue, 14 Apr 2009 19:30:10 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0F55C8FC29 for ; Tue, 14 Apr 2009 19:30:10 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3EJUAEl020430 for ; Tue, 14 Apr 2009 19:30:10 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3EJTqoS020374 for perforce@freebsd.org; Tue, 14 Apr 2009 19:29:52 GMT (envelope-from jhb@freebsd.org) Date: Tue, 14 Apr 2009 19:29:52 GMT Message-Id: <200904141929.n3EJTqoS020374@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 160637 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, 14 Apr 2009 19:30:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=160637 Change 160637 by jhb@jhb_jhbbsd on 2009/04/14 19:29:23 IFC @160630 Affected files ... .. //depot/projects/multipass/sys/Makefile#2 integrate .. //depot/projects/multipass/sys/amd64/Makefile#2 integrate .. //depot/projects/multipass/sys/amd64/acpica/Makefile#1 branch .. //depot/projects/multipass/sys/amd64/acpica/acpi_machdep.c#3 integrate .. //depot/projects/multipass/sys/amd64/acpica/acpi_switch.S#1 branch .. //depot/projects/multipass/sys/amd64/acpica/acpi_wakecode.S#1 branch .. //depot/projects/multipass/sys/amd64/acpica/acpi_wakeup.c#2 integrate .. //depot/projects/multipass/sys/amd64/acpica/genwakecode.sh#1 branch .. //depot/projects/multipass/sys/amd64/acpica/genwakedata.sh#1 branch .. //depot/projects/multipass/sys/amd64/acpica/madt.c#2 integrate .. //depot/projects/multipass/sys/amd64/amd64/amd64_mem.c#2 integrate .. //depot/projects/multipass/sys/amd64/amd64/apic_vector.S#2 integrate .. //depot/projects/multipass/sys/amd64/amd64/busdma_machdep.c#2 integrate .. //depot/projects/multipass/sys/amd64/amd64/cpu_switch.S#2 integrate .. //depot/projects/multipass/sys/amd64/amd64/db_interface.c#2 integrate .. //depot/projects/multipass/sys/amd64/amd64/db_trace.c#2 integrate .. //depot/projects/multipass/sys/amd64/amd64/elf_machdep.c#2 integrate .. //depot/projects/multipass/sys/amd64/amd64/exception.S#2 integrate .. //depot/projects/multipass/sys/amd64/amd64/fpu.c#2 integrate .. //depot/projects/multipass/sys/amd64/amd64/genassym.c#2 integrate .. //depot/projects/multipass/sys/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/multipass/sys/amd64/amd64/initcpu.c#2 integrate .. //depot/projects/multipass/sys/amd64/amd64/intr_machdep.c#2 integrate .. //depot/projects/multipass/sys/amd64/amd64/io_apic.c#3 integrate .. //depot/projects/multipass/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/multipass/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/multipass/sys/amd64/amd64/mp_machdep.c#2 integrate .. //depot/projects/multipass/sys/amd64/amd64/msi.c#2 integrate .. //depot/projects/multipass/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/multipass/sys/amd64/amd64/sys_machdep.c#2 integrate .. //depot/projects/multipass/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/multipass/sys/amd64/amd64/vm_machdep.c#2 integrate .. //depot/projects/multipass/sys/amd64/conf/DEFAULTS#2 integrate .. //depot/projects/multipass/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/multipass/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/multipass/sys/amd64/conf/XENHVM#1 branch .. //depot/projects/multipass/sys/amd64/ia32/ia32_exception.S#2 integrate .. //depot/projects/multipass/sys/amd64/ia32/ia32_misc.c#1 branch .. //depot/projects/multipass/sys/amd64/ia32/ia32_reg.c#2 integrate .. //depot/projects/multipass/sys/amd64/ia32/ia32_signal.c#2 integrate .. //depot/projects/multipass/sys/amd64/ia32/ia32_sigtramp.S#2 integrate .. //depot/projects/multipass/sys/amd64/include/apicreg.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/apicvar.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/asmacros.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/atomic.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/cpufunc.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/cputypes.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/elf.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/endian.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/fpu.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/frame.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/intr_machdep.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/legacyvar.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/md_var.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/pcb.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/pcpu.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/pmap.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/pmc_mdep.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/proc.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/reg.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/segments.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/signal.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/smp.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/specialreg.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/sysarch.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/ucontext.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/xen/hypercall.h#1 branch .. //depot/projects/multipass/sys/amd64/include/xen/synch_bitops.h#1 branch .. //depot/projects/multipass/sys/amd64/include/xen/xen-os.h#1 branch .. //depot/projects/multipass/sys/amd64/include/xen/xenfunc.h#1 branch .. //depot/projects/multipass/sys/amd64/include/xen/xenpmap.h#1 branch .. //depot/projects/multipass/sys/amd64/include/xen/xenvar.h#1 branch .. //depot/projects/multipass/sys/amd64/linux32/linux.h#2 integrate .. //depot/projects/multipass/sys/amd64/linux32/linux32_locore.s#2 integrate .. //depot/projects/multipass/sys/amd64/linux32/linux32_machdep.c#2 integrate .. //depot/projects/multipass/sys/amd64/linux32/linux32_proto.h#2 integrate .. //depot/projects/multipass/sys/amd64/linux32/linux32_syscall.h#2 integrate .. //depot/projects/multipass/sys/amd64/linux32/linux32_sysent.c#2 integrate .. //depot/projects/multipass/sys/amd64/linux32/linux32_sysvec.c#2 integrate .. //depot/projects/multipass/sys/amd64/linux32/syscalls.master#2 integrate .. //depot/projects/multipass/sys/amd64/pci/pci_bus.c#3 integrate .. //depot/projects/multipass/sys/amd64/pci/pci_cfgreg.c#2 integrate .. //depot/projects/multipass/sys/arm/arm/busdma_machdep.c#2 integrate .. //depot/projects/multipass/sys/arm/arm/cpufunc.c#2 integrate .. //depot/projects/multipass/sys/arm/arm/cpufunc_asm_feroceon.S#2 delete .. //depot/projects/multipass/sys/arm/arm/cpufunc_asm_sheeva.S#1 branch .. //depot/projects/multipass/sys/arm/arm/dump_machdep.c#2 integrate .. //depot/projects/multipass/sys/arm/arm/elf_machdep.c#2 integrate .. //depot/projects/multipass/sys/arm/arm/elf_trampoline.c#2 integrate .. //depot/projects/multipass/sys/arm/arm/genassym.c#2 integrate .. //depot/projects/multipass/sys/arm/arm/identcpu.c#2 integrate .. //depot/projects/multipass/sys/arm/arm/locore.S#2 integrate .. //depot/projects/multipass/sys/arm/arm/machdep.c#2 integrate .. //depot/projects/multipass/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/multipass/sys/arm/arm/swtch.S#2 integrate .. //depot/projects/multipass/sys/arm/arm/trap.c#2 integrate .. //depot/projects/multipass/sys/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/multipass/sys/arm/at91/at91.c#2 integrate .. //depot/projects/multipass/sys/arm/at91/at91_machdep.c#1 branch .. //depot/projects/multipass/sys/arm/at91/at91_mci.c#2 integrate .. //depot/projects/multipass/sys/arm/at91/at91_mcireg.h#2 integrate .. //depot/projects/multipass/sys/arm/at91/at91_pdcreg.h#2 integrate .. //depot/projects/multipass/sys/arm/at91/at91_pio.c#2 integrate .. //depot/projects/multipass/sys/arm/at91/at91_pioreg.h#2 integrate .. //depot/projects/multipass/sys/arm/at91/at91_piovar.h#2 integrate .. //depot/projects/multipass/sys/arm/at91/at91_pmc.c#2 integrate .. //depot/projects/multipass/sys/arm/at91/at91_pmcreg.h#2 integrate .. //depot/projects/multipass/sys/arm/at91/at91_pmcvar.h#2 integrate .. //depot/projects/multipass/sys/arm/at91/at91_rtc.c#2 integrate .. //depot/projects/multipass/sys/arm/at91/at91_rtcreg.h#2 integrate .. //depot/projects/multipass/sys/arm/at91/at91_spi.c#2 integrate .. //depot/projects/multipass/sys/arm/at91/at91_spireg.h#2 integrate .. //depot/projects/multipass/sys/arm/at91/at91_ssc.c#2 integrate .. //depot/projects/multipass/sys/arm/at91/at91_sscreg.h#2 integrate .. //depot/projects/multipass/sys/arm/at91/at91_st.c#2 integrate .. //depot/projects/multipass/sys/arm/at91/at91_streg.h#2 integrate .. //depot/projects/multipass/sys/arm/at91/at91_twi.c#2 integrate .. //depot/projects/multipass/sys/arm/at91/at91_twiio.h#2 integrate .. //depot/projects/multipass/sys/arm/at91/at91_twireg.h#2 integrate .. //depot/projects/multipass/sys/arm/at91/at91_usartreg.h#2 integrate .. //depot/projects/multipass/sys/arm/at91/at91board.h#1 branch .. //depot/projects/multipass/sys/arm/at91/at91rm92reg.h#2 integrate .. //depot/projects/multipass/sys/arm/at91/at91var.h#2 integrate .. //depot/projects/multipass/sys/arm/at91/board_bwct.c#1 branch .. //depot/projects/multipass/sys/arm/at91/board_hl200.c#1 branch .. //depot/projects/multipass/sys/arm/at91/board_kb920x.c#1 branch .. //depot/projects/multipass/sys/arm/at91/board_tsc4370.c#1 branch .. //depot/projects/multipass/sys/arm/at91/files.at91#2 integrate .. //depot/projects/multipass/sys/arm/at91/files.kb920x#2 delete .. //depot/projects/multipass/sys/arm/at91/if_ate.c#2 integrate .. //depot/projects/multipass/sys/arm/at91/if_atereg.h#2 integrate .. //depot/projects/multipass/sys/arm/at91/kb920x_machdep.c#2 delete .. //depot/projects/multipass/sys/arm/at91/ohci_atmelarm.c#2 integrate .. //depot/projects/multipass/sys/arm/at91/std.at91#2 integrate .. //depot/projects/multipass/sys/arm/at91/std.bwct#1 branch .. //depot/projects/multipass/sys/arm/at91/std.hl200#1 branch .. //depot/projects/multipass/sys/arm/at91/std.kb920x#2 integrate .. //depot/projects/multipass/sys/arm/at91/std.tsc4370#1 branch .. //depot/projects/multipass/sys/arm/at91/uart_bus_at91usart.c#2 integrate .. //depot/projects/multipass/sys/arm/at91/uart_cpu_at91rm9200usart.c#2 integrate .. //depot/projects/multipass/sys/arm/at91/uart_dev_at91usart.c#2 integrate .. //depot/projects/multipass/sys/arm/conf/AVILA#2 integrate .. //depot/projects/multipass/sys/arm/conf/AVILA.hints#2 integrate .. //depot/projects/multipass/sys/arm/conf/BWCT#2 integrate .. //depot/projects/multipass/sys/arm/conf/CAMBRIA#1 branch .. //depot/projects/multipass/sys/arm/conf/CAMBRIA.hints#1 branch .. //depot/projects/multipass/sys/arm/conf/CRB#2 integrate .. //depot/projects/multipass/sys/arm/conf/DB-78XXX#2 integrate .. //depot/projects/multipass/sys/arm/conf/DB-88F5XXX#2 integrate .. //depot/projects/multipass/sys/arm/conf/DB-88F6XXX#2 integrate .. //depot/projects/multipass/sys/arm/conf/DEFAULTS#2 integrate .. //depot/projects/multipass/sys/arm/conf/EP80219#2 integrate .. //depot/projects/multipass/sys/arm/conf/GUMSTIX#2 integrate .. //depot/projects/multipass/sys/arm/conf/HL200#2 integrate .. //depot/projects/multipass/sys/arm/conf/IQ31244#2 integrate .. //depot/projects/multipass/sys/arm/conf/KB920X#2 integrate .. //depot/projects/multipass/sys/arm/conf/NSLU#2 integrate .. //depot/projects/multipass/sys/arm/conf/SIMICS#2 integrate .. //depot/projects/multipass/sys/arm/conf/SKYEYE#2 integrate .. //depot/projects/multipass/sys/arm/include/armreg.h#2 integrate .. //depot/projects/multipass/sys/arm/include/atomic.h#2 integrate .. //depot/projects/multipass/sys/arm/include/cpufunc.h#2 integrate .. //depot/projects/multipass/sys/arm/include/elf.h#2 integrate .. //depot/projects/multipass/sys/arm/include/ieee.h#2 integrate .. //depot/projects/multipass/sys/arm/include/intr.h#2 integrate .. //depot/projects/multipass/sys/arm/include/proc.h#2 integrate .. //depot/projects/multipass/sys/arm/include/sysarch.h#2 integrate .. //depot/projects/multipass/sys/arm/include/vmparam.h#2 integrate .. //depot/projects/multipass/sys/arm/mv/common.c#2 integrate .. //depot/projects/multipass/sys/arm/mv/discovery/db78xxx.c#2 integrate .. //depot/projects/multipass/sys/arm/mv/discovery/discovery.c#2 integrate .. //depot/projects/multipass/sys/arm/mv/files.mv#2 integrate .. //depot/projects/multipass/sys/arm/mv/gpio.c#2 integrate .. //depot/projects/multipass/sys/arm/mv/kirkwood/db88f6xxx.c#2 integrate .. //depot/projects/multipass/sys/arm/mv/kirkwood/kirkwood.c#2 integrate .. //depot/projects/multipass/sys/arm/mv/mv_machdep.c#2 integrate .. //depot/projects/multipass/sys/arm/mv/mv_pci.c#2 integrate .. //depot/projects/multipass/sys/arm/mv/mvreg.h#2 integrate .. //depot/projects/multipass/sys/arm/mv/mvvar.h#2 integrate .. //depot/projects/multipass/sys/arm/mv/obio.c#2 integrate .. //depot/projects/multipass/sys/arm/mv/orion/db88f5xxx.c#2 integrate .. //depot/projects/multipass/sys/arm/mv/orion/orion.c#2 integrate .. //depot/projects/multipass/sys/arm/mv/orion/std.db88f5xxx#2 integrate .. //depot/projects/multipass/sys/arm/sa11x0/assabet_machdep.c#2 integrate .. //depot/projects/multipass/sys/arm/xscale/i80321/ep80219_machdep.c#2 integrate .. //depot/projects/multipass/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate .. //depot/projects/multipass/sys/arm/xscale/i8134x/crb_machdep.c#2 integrate .. //depot/projects/multipass/sys/arm/xscale/i8134x/i81342_mcu.c#2 integrate .. //depot/projects/multipass/sys/arm/xscale/ixp425/avila_ata.c#2 integrate .. //depot/projects/multipass/sys/arm/xscale/ixp425/avila_led.c#2 integrate .. //depot/projects/multipass/sys/arm/xscale/ixp425/avila_machdep.c#2 integrate .. //depot/projects/multipass/sys/arm/xscale/ixp425/cambria_fled.c#1 branch .. //depot/projects/multipass/sys/arm/xscale/ixp425/cambria_led.c#1 branch .. //depot/projects/multipass/sys/arm/xscale/ixp425/files.avila#2 integrate .. //depot/projects/multipass/sys/arm/xscale/ixp425/files.ixp425#2 integrate .. //depot/projects/multipass/sys/arm/xscale/ixp425/if_npe.c#2 integrate .. //depot/projects/multipass/sys/arm/xscale/ixp425/if_npereg.h#2 integrate .. //depot/projects/multipass/sys/arm/xscale/ixp425/ixp425.c#2 integrate .. //depot/projects/multipass/sys/arm/xscale/ixp425/ixp425_iic.c#2 integrate .. //depot/projects/multipass/sys/arm/xscale/ixp425/ixp425_intr.h#2 integrate .. //depot/projects/multipass/sys/arm/xscale/ixp425/ixp425_mem.c#2 integrate .. //depot/projects/multipass/sys/arm/xscale/ixp425/ixp425_npe.c#2 integrate .. //depot/projects/multipass/sys/arm/xscale/ixp425/ixp425_npevar.h#2 integrate .. //depot/projects/multipass/sys/arm/xscale/ixp425/ixp425_pci.c#2 integrate .. //depot/projects/multipass/sys/arm/xscale/ixp425/ixp425_qmgr.c#2 integrate .. //depot/projects/multipass/sys/arm/xscale/ixp425/ixp425_timer.c#2 integrate .. //depot/projects/multipass/sys/arm/xscale/ixp425/ixp425_wdog.c#2 integrate .. //depot/projects/multipass/sys/arm/xscale/ixp425/ixp425reg.h#2 integrate .. //depot/projects/multipass/sys/arm/xscale/ixp425/ixp425var.h#2 integrate .. //depot/projects/multipass/sys/arm/xscale/ixp425/std.avila#2 integrate .. //depot/projects/multipass/sys/arm/xscale/ixp425/std.ixp435#1 branch .. //depot/projects/multipass/sys/arm/xscale/pxa/pxa_machdep.c#2 integrate .. //depot/projects/multipass/sys/boot/Makefile#2 integrate .. //depot/projects/multipass/sys/boot/Makefile.inc#2 integrate .. //depot/projects/multipass/sys/boot/arm/ixp425/boot2/arm_init.S#2 integrate .. //depot/projects/multipass/sys/boot/arm/ixp425/boot2/boot2.c#2 integrate .. //depot/projects/multipass/sys/boot/arm/ixp425/boot2/ixp425_board.c#2 integrate .. //depot/projects/multipass/sys/boot/arm/ixp425/boot2/lib.h#2 integrate .. //depot/projects/multipass/sys/boot/arm/uboot/Makefile#2 integrate .. //depot/projects/multipass/sys/boot/arm/uboot/conf.c#2 integrate .. //depot/projects/multipass/sys/boot/arm/uboot/version#2 integrate .. //depot/projects/multipass/sys/boot/common/interp.c#2 integrate .. //depot/projects/multipass/sys/boot/common/load.c#2 delete .. //depot/projects/multipass/sys/boot/common/loader.8#2 integrate .. //depot/projects/multipass/sys/boot/common/module.c#2 integrate .. //depot/projects/multipass/sys/boot/ficl/mips/sysdep.c#1 branch .. //depot/projects/multipass/sys/boot/ficl/mips/sysdep.h#1 branch .. //depot/projects/multipass/sys/boot/forth/loader.4th#2 integrate .. //depot/projects/multipass/sys/boot/forth/loader.conf#2 integrate .. //depot/projects/multipass/sys/boot/forth/pnp.4th#2 integrate .. //depot/projects/multipass/sys/boot/forth/support.4th#2 integrate .. //depot/projects/multipass/sys/boot/i386/Makefile#2 integrate .. //depot/projects/multipass/sys/boot/i386/boot0/Makefile#2 integrate .. //depot/projects/multipass/sys/boot/i386/boot0/boot0.S#2 integrate .. //depot/projects/multipass/sys/boot/i386/boot2/Makefile#2 integrate .. //depot/projects/multipass/sys/boot/i386/boot2/boot1.S#2 integrate .. //depot/projects/multipass/sys/boot/i386/btx/btx/btx.S#2 integrate .. //depot/projects/multipass/sys/boot/i386/btx/btxldr/btxldr.S#2 integrate .. //depot/projects/multipass/sys/boot/i386/gptzfsboot/Makefile#1 branch .. //depot/projects/multipass/sys/boot/i386/libi386/Makefile#2 integrate .. //depot/projects/multipass/sys/boot/i386/libi386/bioscd.c#2 integrate .. //depot/projects/multipass/sys/boot/i386/libi386/biosdisk.c#2 integrate .. //depot/projects/multipass/sys/boot/i386/libi386/bootinfo64.c#2 integrate .. //depot/projects/multipass/sys/boot/i386/libi386/devicename.c#2 integrate .. //depot/projects/multipass/sys/boot/i386/libi386/libi386.h#2 integrate .. //depot/projects/multipass/sys/boot/i386/libi386/smbios.c#2 integrate .. //depot/projects/multipass/sys/boot/i386/loader/Makefile#2 integrate .. //depot/projects/multipass/sys/boot/i386/loader/main.c#2 integrate .. //depot/projects/multipass/sys/boot/i386/pxeldr/pxeboot.8#2 integrate .. //depot/projects/multipass/sys/boot/i386/zfsboot/Makefile#2 integrate .. //depot/projects/multipass/sys/boot/i386/zfsboot/zfsboot.c#2 integrate .. //depot/projects/multipass/sys/boot/ia64/common/Makefile#2 integrate .. //depot/projects/multipass/sys/boot/ia64/efi/Makefile#2 integrate .. //depot/projects/multipass/sys/boot/ia64/ski/Makefile#2 integrate .. //depot/projects/multipass/sys/boot/pc98/libpc98/Makefile#2 integrate .. //depot/projects/multipass/sys/boot/pc98/libpc98/bioscd.c#2 integrate .. //depot/projects/multipass/sys/boot/pc98/libpc98/biosdisk.c#2 integrate .. //depot/projects/multipass/sys/boot/pc98/libpc98/time.c#2 integrate .. //depot/projects/multipass/sys/boot/pc98/loader/Makefile#2 integrate .. //depot/projects/multipass/sys/boot/pc98/loader/main.c#2 integrate .. //depot/projects/multipass/sys/boot/powerpc/ofw/Makefile#2 integrate .. //depot/projects/multipass/sys/boot/powerpc/uboot/conf.c#2 integrate .. //depot/projects/multipass/sys/boot/sparc64/loader/Makefile#2 integrate .. //depot/projects/multipass/sys/boot/sparc64/loader/main.c#2 integrate .. //depot/projects/multipass/sys/boot/uboot/common/main.c#2 integrate .. //depot/projects/multipass/sys/boot/uboot/lib/devicename.c#2 integrate .. //depot/projects/multipass/sys/boot/uboot/lib/disk.c#2 integrate .. //depot/projects/multipass/sys/boot/uboot/lib/glue.c#2 integrate .. //depot/projects/multipass/sys/boot/uboot/lib/glue.h#2 integrate .. //depot/projects/multipass/sys/boot/uboot/lib/libuboot.h#2 integrate .. //depot/projects/multipass/sys/boot/uboot/lib/net.c#2 integrate .. //depot/projects/multipass/sys/boot/zfs/Makefile#2 integrate .. //depot/projects/multipass/sys/boot/zfs/zfs.c#2 integrate .. //depot/projects/multipass/sys/boot/zfs/zfsimpl.c#2 integrate .. //depot/projects/multipass/sys/bsm/audit.h#2 integrate .. //depot/projects/multipass/sys/bsm/audit_domain.h#1 branch .. //depot/projects/multipass/sys/bsm/audit_errno.h#1 branch .. //depot/projects/multipass/sys/bsm/audit_internal.h#2 integrate .. //depot/projects/multipass/sys/bsm/audit_kevents.h#2 integrate .. //depot/projects/multipass/sys/bsm/audit_record.h#2 integrate .. //depot/projects/multipass/sys/bsm/audit_socket_type.h#1 branch .. //depot/projects/multipass/sys/cam/cam_periph.c#2 integrate .. //depot/projects/multipass/sys/cam/cam_periph.h#2 integrate .. //depot/projects/multipass/sys/cam/cam_sim.c#2 integrate .. //depot/projects/multipass/sys/cam/cam_sim.h#2 integrate .. //depot/projects/multipass/sys/cam/cam_xpt.c#2 integrate .. //depot/projects/multipass/sys/cam/cam_xpt_sim.h#2 integrate .. //depot/projects/multipass/sys/cam/scsi/scsi_all.c#2 integrate .. //depot/projects/multipass/sys/cam/scsi/scsi_cd.c#2 integrate .. //depot/projects/multipass/sys/cam/scsi/scsi_ch.c#2 integrate .. //depot/projects/multipass/sys/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/multipass/sys/cam/scsi/scsi_low.c#2 integrate .. //depot/projects/multipass/sys/cam/scsi/scsi_pass.c#2 integrate .. //depot/projects/multipass/sys/cam/scsi/scsi_pt.c#2 integrate .. //depot/projects/multipass/sys/cam/scsi/scsi_sa.c#2 integrate .. //depot/projects/multipass/sys/cam/scsi/scsi_ses.c#2 integrate .. //depot/projects/multipass/sys/cam/scsi/scsi_sg.c#2 integrate .. //depot/projects/multipass/sys/cddl/boot/zfs/zfsimpl.h#2 integrate .. //depot/projects/multipass/sys/cddl/boot/zfs/zfssubr.c#2 integrate .. //depot/projects/multipass/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate .. //depot/projects/multipass/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#2 integrate .. //depot/projects/multipass/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate .. //depot/projects/multipass/sys/cddl/compat/opensolaris/sys/sysmacros.h#2 integrate .. //depot/projects/multipass/sys/cddl/compat/opensolaris/sys/vnode.h#2 integrate .. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#2 integrate .. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#2 integrate .. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#2 integrate .. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#2 integrate .. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 integrate .. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#2 integrate .. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate .. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate .. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#2 integrate .. //depot/projects/multipass/sys/cddl/dev/cyclic/cyclic.c#2 integrate .. //depot/projects/multipass/sys/cddl/dev/dtrace/i386/dtrace_subr.c#2 integrate .. //depot/projects/multipass/sys/compat/freebsd32/freebsd32.h#2 integrate .. //depot/projects/multipass/sys/compat/freebsd32/freebsd32_ioctl.c#2 integrate .. //depot/projects/multipass/sys/compat/freebsd32/freebsd32_ioctl.h#2 integrate .. //depot/projects/multipass/sys/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/multipass/sys/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/multipass/sys/compat/freebsd32/freebsd32_signal.h#2 integrate .. //depot/projects/multipass/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/multipass/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/multipass/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/multipass/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/multipass/sys/compat/ia32/ia32_signal.h#2 integrate .. //depot/projects/multipass/sys/compat/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/multipass/sys/compat/linprocfs/linprocfs.c#2 integrate .. //depot/projects/multipass/sys/compat/linux/linux_emul.h#2 integrate .. //depot/projects/multipass/sys/compat/linux/linux_file.c#2 integrate .. //depot/projects/multipass/sys/compat/linux/linux_futex.c#2 integrate .. //depot/projects/multipass/sys/compat/linux/linux_futex.h#2 integrate .. //depot/projects/multipass/sys/compat/linux/linux_getcwd.c#2 integrate .. //depot/projects/multipass/sys/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/multipass/sys/compat/linux/linux_ipc.c#2 integrate .. //depot/projects/multipass/sys/compat/linux/linux_misc.c#2 integrate .. //depot/projects/multipass/sys/compat/linux/linux_misc.h#2 integrate .. //depot/projects/multipass/sys/compat/linux/linux_socket.c#2 integrate .. //depot/projects/multipass/sys/compat/linux/linux_socket.h#2 integrate .. //depot/projects/multipass/sys/compat/linux/linux_stats.c#2 integrate .. //depot/projects/multipass/sys/compat/ndis/hal_var.h#2 integrate .. //depot/projects/multipass/sys/compat/ndis/kern_ndis.c#2 integrate .. //depot/projects/multipass/sys/compat/ndis/kern_windrv.c#2 integrate .. //depot/projects/multipass/sys/compat/ndis/ndis_var.h#2 integrate .. //depot/projects/multipass/sys/compat/ndis/ntoskrnl_var.h#2 integrate .. //depot/projects/multipass/sys/compat/ndis/pe_var.h#2 integrate .. //depot/projects/multipass/sys/compat/ndis/resource_var.h#2 integrate .. //depot/projects/multipass/sys/compat/ndis/subr_hal.c#2 integrate .. //depot/projects/multipass/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/multipass/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/multipass/sys/compat/ndis/subr_pe.c#2 integrate .. //depot/projects/multipass/sys/compat/ndis/subr_usbd.c#2 integrate .. //depot/projects/multipass/sys/compat/ndis/usbd_var.h#2 integrate .. //depot/projects/multipass/sys/compat/ndis/winx32_wrap.S#2 integrate .. //depot/projects/multipass/sys/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/multipass/sys/compat/svr4/svr4_sockio.c#2 integrate .. //depot/projects/multipass/sys/compat/svr4/svr4_sysvec.c#2 integrate .. //depot/projects/multipass/sys/compat/svr4/svr4_types.h#2 integrate .. //depot/projects/multipass/sys/conf/Makefile.arm#2 integrate .. //depot/projects/multipass/sys/conf/NOTES#2 integrate .. //depot/projects/multipass/sys/conf/files#2 integrate .. //depot/projects/multipass/sys/conf/files.amd64#2 integrate .. //depot/projects/multipass/sys/conf/files.arm#2 integrate .. //depot/projects/multipass/sys/conf/files.i386#2 integrate .. //depot/projects/multipass/sys/conf/files.ia64#2 integrate .. //depot/projects/multipass/sys/conf/files.mips#2 integrate .. //depot/projects/multipass/sys/conf/files.pc98#2 integrate .. //depot/projects/multipass/sys/conf/files.powerpc#2 integrate .. //depot/projects/multipass/sys/conf/files.sparc64#2 integrate .. //depot/projects/multipass/sys/conf/files.sun4v#2 integrate .. //depot/projects/multipass/sys/conf/kern.mk#2 integrate .. //depot/projects/multipass/sys/conf/kern.post.mk#2 integrate .. //depot/projects/multipass/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/multipass/sys/conf/kmod.mk#2 integrate .. //depot/projects/multipass/sys/conf/newvers.sh#2 integrate .. //depot/projects/multipass/sys/conf/options#2 integrate .. //depot/projects/multipass/sys/conf/options.amd64#2 integrate .. //depot/projects/multipass/sys/conf/options.arm#2 integrate .. //depot/projects/multipass/sys/conf/options.i386#2 integrate .. //depot/projects/multipass/sys/conf/options.ia64#2 integrate .. //depot/projects/multipass/sys/conf/options.mips#2 integrate .. //depot/projects/multipass/sys/conf/options.pc98#2 integrate .. //depot/projects/multipass/sys/contrib/altq/altq/altq_subr.c#2 integrate .. //depot/projects/multipass/sys/contrib/dev/ath/COPYRIGHT#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/README#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/ah.h#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/ah_desc.h#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/ah_devid.h#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/ah_soc.h#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/alpha-elf.inc#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/alpha-elf.opt_ah.h#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/ap30.hal.o.uu#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/ap30.inc#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/ap30.opt_ah.h#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/ap43.hal.o.uu#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/ap43.inc#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/ap43.opt_ah.h#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/ap51.hal.o.uu#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/ap51.inc#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/ap51.opt_ah.h#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/ap61.hal.o.uu#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/ap61.inc#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/ap61.opt_ah.h#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/armv4-be-elf.inc#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/armv4-le-elf.inc#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/i386-elf.inc#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/mips-be-elf.inc#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/mips-le-elf.inc#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/mips1-be-elf.inc#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/mips1-le-elf.inc#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/powerpc-be-elf.inc#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/sh4-le-elf.inc#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/sparc-be-elf.inc#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/sparc-be-elf.opt_ah.h#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/sparc64-be-elf.inc#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/wackelf.c#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/wisoc.hal.o.uu#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/wisoc.inc#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/wisoc.opt_ah.h#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/x86_64-elf.inc#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/xscale-be-elf.inc#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/xscale-le-elf.inc#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#2 delete .. //depot/projects/multipass/sys/contrib/dev/ath/version.h#2 delete .. //depot/projects/multipass/sys/contrib/dev/npe/IxNpeMicrocode.dat.uu#2 integrate .. //depot/projects/multipass/sys/contrib/dev/uath/ar5523.bin.uu#1 branch .. //depot/projects/multipass/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate .. //depot/projects/multipass/sys/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate .. //depot/projects/multipass/sys/contrib/pf/net/pf.c#2 integrate .. //depot/projects/multipass/sys/contrib/pf/net/pf_if.c#2 integrate .. //depot/projects/multipass/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/multipass/sys/contrib/pf/net/pf_subr.c#2 integrate .. //depot/projects/multipass/sys/contrib/pf/net/pf_table.c#2 integrate .. //depot/projects/multipass/sys/contrib/rdma/rdma_addr.c#2 integrate .. //depot/projects/multipass/sys/contrib/rdma/rdma_cma.c#2 integrate .. //depot/projects/multipass/sys/crypto/rc4/rc4.c#2 integrate .. //depot/projects/multipass/sys/crypto/via/padlock.c#2 integrate .. //depot/projects/multipass/sys/crypto/via/padlock_hash.c#2 integrate .. //depot/projects/multipass/sys/ddb/db_expr.c#2 integrate .. //depot/projects/multipass/sys/dev/aac/aac.c#2 integrate .. //depot/projects/multipass/sys/dev/aac/aac_debug.c#2 integrate .. //depot/projects/multipass/sys/dev/aac/aac_pci.c#2 integrate .. //depot/projects/multipass/sys/dev/aac/aacreg.h#2 integrate .. //depot/projects/multipass/sys/dev/aac/aacvar.h#2 integrate .. //depot/projects/multipass/sys/dev/acpi_support/acpi_asus.c#2 integrate .. //depot/projects/multipass/sys/dev/acpi_support/acpi_panasonic.c#2 integrate .. //depot/projects/multipass/sys/dev/acpica/acpi.c#3 integrate .. //depot/projects/multipass/sys/dev/acpica/acpi_battery.c#2 integrate .. //depot/projects/multipass/sys/dev/acpica/acpi_cpu.c#3 integrate .. //depot/projects/multipass/sys/dev/acpica/acpi_ec.c#3 integrate .. //depot/projects/multipass/sys/dev/acpica/acpi_hpet.c#3 integrate .. //depot/projects/multipass/sys/dev/acpica/acpi_pcib.c#2 integrate .. //depot/projects/multipass/sys/dev/acpica/acpi_pcib_acpi.c#3 integrate .. //depot/projects/multipass/sys/dev/acpica/acpi_smbat.c#2 integrate .. //depot/projects/multipass/sys/dev/acpica/acpivar.h#2 integrate .. //depot/projects/multipass/sys/dev/adb/adb.h#2 integrate .. //depot/projects/multipass/sys/dev/adb/adb_bus.c#2 integrate .. //depot/projects/multipass/sys/dev/adb/adb_kbd.c#2 integrate .. //depot/projects/multipass/sys/dev/adb/adb_mouse.c#2 integrate .. //depot/projects/multipass/sys/dev/adb/adbvar.h#2 integrate .. //depot/projects/multipass/sys/dev/ae/if_ae.c#2 integrate .. //depot/projects/multipass/sys/dev/age/if_age.c#2 integrate .. //depot/projects/multipass/sys/dev/age/if_agereg.h#2 integrate .. //depot/projects/multipass/sys/dev/agp/agp.c#2 integrate .. //depot/projects/multipass/sys/dev/agp/agp_amd64.c#2 integrate .. //depot/projects/multipass/sys/dev/agp/agp_i810.c#2 integrate .. //depot/projects/multipass/sys/dev/agp/agp_intel.c#2 integrate .. //depot/projects/multipass/sys/dev/agp/agp_via.c#2 integrate .. //depot/projects/multipass/sys/dev/agp/agppriv.h#2 integrate .. //depot/projects/multipass/sys/dev/aic7xxx/ahc_pci.c#2 integrate .. //depot/projects/multipass/sys/dev/aic7xxx/ahd_pci.c#2 integrate .. //depot/projects/multipass/sys/dev/ale/if_ale.c#2 integrate .. //depot/projects/multipass/sys/dev/amdtemp/amdtemp.c#1 branch .. //depot/projects/multipass/sys/dev/an/if_an.c#2 integrate .. //depot/projects/multipass/sys/dev/an/if_anreg.h#2 integrate .. //depot/projects/multipass/sys/dev/arcmsr/arcmsr.c#2 integrate .. //depot/projects/multipass/sys/dev/asmc/asmc.c#2 integrate .. //depot/projects/multipass/sys/dev/ata/ata-all.c#2 integrate .. //depot/projects/multipass/sys/dev/ata/ata-all.h#2 integrate .. //depot/projects/multipass/sys/dev/ata/ata-card.c#2 integrate .. //depot/projects/multipass/sys/dev/ata/ata-cbus.c#2 integrate .. //depot/projects/multipass/sys/dev/ata/ata-disk.c#2 integrate .. //depot/projects/multipass/sys/dev/ata/ata-dma.c#2 integrate .. //depot/projects/multipass/sys/dev/ata/ata-isa.c#2 integrate .. //depot/projects/multipass/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/multipass/sys/dev/ata/ata-pci.h#2 integrate .. //depot/projects/multipass/sys/dev/ata/ata-queue.c#2 integrate .. //depot/projects/multipass/sys/dev/ata/ata-raid-ddf.h#1 branch .. //depot/projects/multipass/sys/dev/ata/ata-raid.c#2 integrate .. //depot/projects/multipass/sys/dev/ata/ata-raid.h#2 integrate .. //depot/projects/multipass/sys/dev/ata/ata-sata.c#2 integrate .. //depot/projects/multipass/sys/dev/ata/atapi-cam.c#2 integrate .. //depot/projects/multipass/sys/dev/ata/atapi-cd.c#2 integrate .. //depot/projects/multipass/sys/dev/ata/atapi-fd.c#2 integrate .. //depot/projects/multipass/sys/dev/ata/atapi-tape.c#2 integrate .. //depot/projects/multipass/sys/dev/ata/chipsets/ata-acard.c#2 integrate .. //depot/projects/multipass/sys/dev/ata/chipsets/ata-acerlabs.c#2 integrate .. //depot/projects/multipass/sys/dev/ata/chipsets/ata-ahci.c#2 integrate .. //depot/projects/multipass/sys/dev/ata/chipsets/ata-highpoint.c#2 integrate .. //depot/projects/multipass/sys/dev/ata/chipsets/ata-intel.c#2 integrate .. //depot/projects/multipass/sys/dev/ata/chipsets/ata-jmicron.c#2 integrate .. //depot/projects/multipass/sys/dev/ata/chipsets/ata-marvell.c#2 integrate .. //depot/projects/multipass/sys/dev/ata/chipsets/ata-netcell.c#2 integrate .. //depot/projects/multipass/sys/dev/ata/chipsets/ata-nvidia.c#2 integrate .. //depot/projects/multipass/sys/dev/ata/chipsets/ata-promise.c#2 integrate .. //depot/projects/multipass/sys/dev/ata/chipsets/ata-serverworks.c#2 integrate .. //depot/projects/multipass/sys/dev/ata/chipsets/ata-siliconimage.c#2 integrate .. //depot/projects/multipass/sys/dev/ata/chipsets/ata-sis.c#2 integrate .. //depot/projects/multipass/sys/dev/ata/chipsets/ata-via.c#2 integrate .. //depot/projects/multipass/sys/dev/ath/ah_osdep.c#2 integrate .. //depot/projects/multipass/sys/dev/ath/ah_osdep.h#2 integrate .. //depot/projects/multipass/sys/dev/ath/ath_hal/ah.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ah.h#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ah_debug.h#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ah_decode.h#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ah_desc.h#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ah_devid.h#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ah_eeprom.h#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ah_eeprom_v1.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ah_eeprom_v1.h#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ah_eeprom_v14.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ah_eeprom_v14.h#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ah_eeprom_v3.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ah_eeprom_v3.h#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ah_internal.h#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ah_regdomain.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ah_soc.h#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5210/ar5210.h#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5210/ar5210_beacon.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5210/ar5210_interrupts.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5210/ar5210_keycache.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5210/ar5210_misc.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5210/ar5210_phy.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5210/ar5210_power.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5210/ar5210_recv.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5210/ar5210_xmit.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5210/ar5210desc.h#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5210/ar5210phy.h#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5210/ar5210reg.h#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5210/ar5k_0007.ini#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5211/ar5211.h#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5211/ar5211_beacon.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5211/ar5211_interrupts.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5211/ar5211_keycache.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5211/ar5211_phy.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5211/ar5211_power.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5211/ar5211_recv.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5211/ar5211_xmit.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5211/ar5211desc.h#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5211/ar5211phy.h#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5211/ar5211reg.h#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5211/boss.ini#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5212/ar2316.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5212/ar2317.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5212/ar2413.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5212/ar2425.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5212/ar5111.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5212/ar5112.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5212/ar5212.h#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5212/ar5212.ini#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5212/ar5212_beacon.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5212/ar5212_eeprom.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5212/ar5212_gpio.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5212/ar5212_interrupts.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5212/ar5212_keycache.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5212/ar5212_phy.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5212/ar5212_power.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5212/ar5212_recv.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5212/ar5212_rfgain.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5212/ar5212desc.h#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5212/ar5212phy.h#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5212/ar5212reg.h#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5212/ar5311reg.h#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5212/ar5413.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5312/ar5312.h#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5312/ar5312_eeprom.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5312/ar5312_gpio.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5312/ar5312_interrupts.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5312/ar5312_misc.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5312/ar5312_power.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5312/ar5312_reset.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5312/ar5312phy.h#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5312/ar5312reg.h#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5312/ar5315_gpio.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5416/ar2133.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5416/ar5416.h#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5416/ar5416.ini#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5416/ar5416_beacon.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5416/ar5416_cal.h#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5416/ar5416_cal_adcdc.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5416/ar5416_cal_adcgain.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5416/ar5416_eeprom.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5416/ar5416_gpio.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5416/ar5416_keycache.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5416/ar5416_phy.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5416/ar5416_power.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5416/ar5416_recv.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5416/ar5416desc.h#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5416/ar5416phy.h#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5416/ar5416reg.h#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5416/ar9160.ini#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5416/ar9280.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5416/ar9280.h#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5416/ar9280_attach.c#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5416/ar9280v1.ini#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5416/ar9280v2.ini#1 branch .. //depot/projects/multipass/sys/dev/ath/ath_rate/amrr/amrr.c#2 integrate .. //depot/projects/multipass/sys/dev/ath/ath_rate/onoe/onoe.c#2 integrate .. //depot/projects/multipass/sys/dev/ath/ath_rate/sample/sample.c#2 integrate .. //depot/projects/multipass/sys/dev/ath/ath_rate/sample/sample.h#2 integrate .. //depot/projects/multipass/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/multipass/sys/dev/ath/if_ath_pci.c#2 integrate .. //depot/projects/multipass/sys/dev/ath/if_athioctl.h#2 integrate .. //depot/projects/multipass/sys/dev/ath/if_athvar.h#2 integrate .. //depot/projects/multipass/sys/dev/atkbdc/atkbdc_isa.c#2 integrate .. //depot/projects/multipass/sys/dev/atkbdc/psm.c#2 integrate .. //depot/projects/multipass/sys/dev/bce/if_bce.c#2 integrate .. //depot/projects/multipass/sys/dev/bce/if_bcefw.h#2 integrate .. //depot/projects/multipass/sys/dev/bce/if_bcereg.h#2 integrate .. //depot/projects/multipass/sys/dev/bge/if_bge.c#2 integrate .. //depot/projects/multipass/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/multipass/sys/dev/bm/if_bm.c#2 integrate .. //depot/projects/multipass/sys/dev/cardbus/cardbus.c#2 integrate .. //depot/projects/multipass/sys/dev/cardbus/cardbus_cis.c#2 integrate .. //depot/projects/multipass/sys/dev/cardbus/cardbus_device.c#2 integrate .. //depot/projects/multipass/sys/dev/cardbus/cardbusvar.h#2 integrate .. //depot/projects/multipass/sys/dev/ce/if_ce.c#2 integrate .. //depot/projects/multipass/sys/dev/cfe/cfe_console.c#2 integrate .. //depot/projects/multipass/sys/dev/cfi/cfi_bus_ixp4xx.c#1 branch .. //depot/projects/multipass/sys/dev/cfi/cfi_core.c#2 integrate .. //depot/projects/multipass/sys/dev/cfi/cfi_dev.c#2 integrate .. //depot/projects/multipass/sys/dev/cfi/cfi_disk.c#1 branch .. //depot/projects/multipass/sys/dev/cfi/cfi_reg.h#2 integrate .. //depot/projects/multipass/sys/dev/cfi/cfi_var.h#2 integrate .. //depot/projects/multipass/sys/dev/ciss/ciss.c#2 integrate .. //depot/projects/multipass/sys/dev/cm/smc90cx6.c#2 integrate .. //depot/projects/multipass/sys/dev/coretemp/coretemp.c#2 integrate .. //depot/projects/multipass/sys/dev/cp/if_cp.c#2 integrate .. //depot/projects/multipass/sys/dev/ctau/if_ct.c#2 integrate .. //depot/projects/multipass/sys/dev/cx/if_cx.c#2 integrate .. //depot/projects/multipass/sys/dev/cxgb/bin2h.pl#2 integrate .. //depot/projects/multipass/sys/dev/cxgb/common/cxgb_ael1002.c#2 integrate .. //depot/projects/multipass/sys/dev/cxgb/common/cxgb_common.h#2 integrate .. //depot/projects/multipass/sys/dev/cxgb/common/cxgb_t3_cpl.h#2 integrate .. //depot/projects/multipass/sys/dev/cxgb/common/cxgb_t3_hw.c#2 integrate .. //depot/projects/multipass/sys/dev/cxgb/common/cxgb_xgmac.c#2 integrate .. //depot/projects/multipass/sys/dev/cxgb/cxgb_adapter.h#2 integrate .. //depot/projects/multipass/sys/dev/cxgb/cxgb_config.h#2 integrate .. //depot/projects/multipass/sys/dev/cxgb/cxgb_ioctl.h#2 integrate .. //depot/projects/multipass/sys/dev/cxgb/cxgb_main.c#2 integrate .. //depot/projects/multipass/sys/dev/cxgb/cxgb_multiq.c#2 integrate .. //depot/projects/multipass/sys/dev/cxgb/cxgb_offload.c#2 integrate .. //depot/projects/multipass/sys/dev/cxgb/cxgb_osdep.h#2 integrate .. //depot/projects/multipass/sys/dev/cxgb/cxgb_sge.c#2 integrate .. //depot/projects/multipass/sys/dev/cxgb/cxgb_t3fw.c#2 integrate .. //depot/projects/multipass/sys/dev/cxgb/cxgb_t3fw.h#2 integrate .. //depot/projects/multipass/sys/dev/cxgb/sys/cxgb_support.c#2 integrate .. //depot/projects/multipass/sys/dev/cxgb/sys/uipc_mvec.c#2 integrate .. //depot/projects/multipass/sys/dev/cxgb/t3c_protocol_sram.h#1 branch .. //depot/projects/multipass/sys/dev/cxgb/t3c_tp_eeprom.h#1 branch .. //depot/projects/multipass/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#2 integrate .. //depot/projects/multipass/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c#2 integrate .. //depot/projects/multipass/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#2 integrate .. //depot/projects/multipass/sys/dev/cxgb/ulp/tom/cxgb_l2t.c#2 integrate .. //depot/projects/multipass/sys/dev/cxgb/ulp/tom/cxgb_l2t.h#2 integrate .. //depot/projects/multipass/sys/dev/dc/dcphy.c#2 integrate .. //depot/projects/multipass/sys/dev/dc/if_dc.c#2 integrate .. //depot/projects/multipass/sys/dev/dc/if_dcreg.h#2 integrate .. //depot/projects/multipass/sys/dev/dc/pnphy.c#2 integrate .. //depot/projects/multipass/sys/dev/dcons/dcons_crom.c#2 integrate .. //depot/projects/multipass/sys/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/multipass/sys/dev/de/if_de.c#2 integrate .. //depot/projects/multipass/sys/dev/digi/con.CX-IBM.h#2 delete .. //depot/projects/multipass/sys/dev/digi/con.CX.h#2 delete .. //depot/projects/multipass/sys/dev/digi/con.EPCX.h#2 delete .. //depot/projects/multipass/sys/dev/digi/con.MBank.h#2 delete .. //depot/projects/multipass/sys/dev/drm/ati_pcigart.c#2 integrate .. //depot/projects/multipass/sys/dev/drm/drmP.h#2 integrate .. //depot/projects/multipass/sys/dev/drm/drm_bufs.c#2 integrate .. //depot/projects/multipass/sys/dev/drm/drm_drv.c#2 integrate .. //depot/projects/multipass/sys/dev/drm/drm_irq.c#2 integrate .. //depot/projects/multipass/sys/dev/drm/drm_linux_list.h#2 integrate .. //depot/projects/multipass/sys/dev/drm/drm_lock.c#2 integrate .. //depot/projects/multipass/sys/dev/drm/drm_pci.c#2 integrate .. //depot/projects/multipass/sys/dev/drm/drm_pciids.h#2 integrate .. //depot/projects/multipass/sys/dev/drm/drm_scatter.c#2 integrate .. //depot/projects/multipass/sys/dev/drm/drm_sysctl.c#2 integrate .. //depot/projects/multipass/sys/dev/drm/drm_vm.c#2 integrate .. //depot/projects/multipass/sys/dev/drm/i915_dma.c#2 integrate .. //depot/projects/multipass/sys/dev/drm/i915_drv.c#2 integrate .. //depot/projects/multipass/sys/dev/drm/i915_drv.h#2 integrate .. //depot/projects/multipass/sys/dev/drm/i915_irq.c#2 integrate .. //depot/projects/multipass/sys/dev/drm/i915_reg.h#1 branch .. //depot/projects/multipass/sys/dev/drm/i915_suspend.c#2 integrate .. //depot/projects/multipass/sys/dev/drm/mach64_drv.c#2 integrate .. //depot/projects/multipass/sys/dev/drm/mach64_drv.h#2 integrate .. //depot/projects/multipass/sys/dev/drm/mach64_irq.c#2 integrate .. //depot/projects/multipass/sys/dev/drm/mga_dma.c#2 integrate .. //depot/projects/multipass/sys/dev/drm/mga_drv.c#2 integrate .. //depot/projects/multipass/sys/dev/drm/mga_irq.c#2 integrate .. //depot/projects/multipass/sys/dev/drm/r128_drv.c#2 integrate .. //depot/projects/multipass/sys/dev/drm/r128_drv.h#2 integrate .. //depot/projects/multipass/sys/dev/drm/r128_irq.c#2 integrate .. //depot/projects/multipass/sys/dev/drm/r300_cmdbuf.c#2 integrate .. //depot/projects/multipass/sys/dev/drm/r300_reg.h#2 integrate .. //depot/projects/multipass/sys/dev/drm/r600_cp.c#1 branch .. //depot/projects/multipass/sys/dev/drm/r600_microcode.h#1 branch .. //depot/projects/multipass/sys/dev/drm/radeon_cp.c#2 integrate .. //depot/projects/multipass/sys/dev/drm/radeon_drm.h#2 integrate .. //depot/projects/multipass/sys/dev/drm/radeon_drv.c#2 integrate .. //depot/projects/multipass/sys/dev/drm/radeon_drv.h#2 integrate .. //depot/projects/multipass/sys/dev/drm/radeon_irq.c#2 integrate .. //depot/projects/multipass/sys/dev/drm/radeon_state.c#2 integrate .. //depot/projects/multipass/sys/dev/drm/savage_drv.c#2 integrate .. //depot/projects/multipass/sys/dev/drm/sis_drv.c#2 integrate .. //depot/projects/multipass/sys/dev/drm/tdfx_drv.c#2 integrate .. //depot/projects/multipass/sys/dev/e1000/e1000_80003es2lan.c#2 integrate .. //depot/projects/multipass/sys/dev/e1000/e1000_82540.c#2 integrate .. //depot/projects/multipass/sys/dev/e1000/e1000_82541.c#2 integrate .. //depot/projects/multipass/sys/dev/e1000/e1000_82542.c#2 integrate .. //depot/projects/multipass/sys/dev/e1000/e1000_82543.c#2 integrate .. //depot/projects/multipass/sys/dev/e1000/e1000_82571.c#2 integrate .. //depot/projects/multipass/sys/dev/e1000/e1000_82575.c#2 integrate .. //depot/projects/multipass/sys/dev/e1000/e1000_82575.h#2 integrate .. //depot/projects/multipass/sys/dev/e1000/e1000_api.c#2 integrate .. //depot/projects/multipass/sys/dev/e1000/e1000_api.h#2 integrate .. //depot/projects/multipass/sys/dev/e1000/e1000_defines.h#2 integrate .. //depot/projects/multipass/sys/dev/e1000/e1000_hw.h#2 integrate .. //depot/projects/multipass/sys/dev/e1000/e1000_ich8lan.c#2 integrate .. //depot/projects/multipass/sys/dev/e1000/e1000_ich8lan.h#2 integrate .. //depot/projects/multipass/sys/dev/e1000/e1000_mac.c#2 integrate .. //depot/projects/multipass/sys/dev/e1000/e1000_mac.h#2 integrate .. //depot/projects/multipass/sys/dev/e1000/e1000_manage.c#2 integrate .. //depot/projects/multipass/sys/dev/e1000/e1000_nvm.c#2 integrate .. //depot/projects/multipass/sys/dev/e1000/e1000_nvm.h#2 integrate .. //depot/projects/multipass/sys/dev/e1000/e1000_osdep.c#2 integrate .. //depot/projects/multipass/sys/dev/e1000/e1000_osdep.h#2 integrate .. //depot/projects/multipass/sys/dev/e1000/e1000_phy.c#2 integrate .. //depot/projects/multipass/sys/dev/e1000/e1000_phy.h#2 integrate .. //depot/projects/multipass/sys/dev/e1000/e1000_regs.h#2 integrate .. //depot/projects/multipass/sys/dev/e1000/if_em.c#2 integrate .. //depot/projects/multipass/sys/dev/e1000/if_em.h#2 integrate .. //depot/projects/multipass/sys/dev/e1000/if_igb.c#2 integrate .. //depot/projects/multipass/sys/dev/e1000/if_igb.h#2 integrate .. //depot/projects/multipass/sys/dev/ed/ax88x90reg.h#2 integrate .. //depot/projects/multipass/sys/dev/ed/dl100xxreg.h#2 integrate .. //depot/projects/multipass/sys/dev/ed/if_ed.c#2 integrate .. //depot/projects/multipass/sys/dev/ed/if_ed_cbus.c#2 integrate .. //depot/projects/multipass/sys/dev/ed/if_ed_isa.c#2 integrate .. //depot/projects/multipass/sys/dev/ed/if_ed_pccard.c#2 integrate .. //depot/projects/multipass/sys/dev/ed/if_ed_pci.c#2 integrate .. //depot/projects/multipass/sys/dev/ed/if_ed_wd80x3.c#2 integrate .. //depot/projects/multipass/sys/dev/ed/if_edreg.h#2 integrate .. //depot/projects/multipass/sys/dev/ed/if_edvar.h#2 integrate .. //depot/projects/multipass/sys/dev/ep/if_ep.c#2 integrate .. //depot/projects/multipass/sys/dev/ep/if_ep_pccard.c#2 integrate .. //depot/projects/multipass/sys/dev/ep/if_epreg.h#2 integrate .. //depot/projects/multipass/sys/dev/ep/if_epvar.h#2 integrate .. //depot/projects/multipass/sys/dev/exca/exca.c#2 integrate .. //depot/projects/multipass/sys/dev/fb/s3_pci.c#2 integrate .. //depot/projects/multipass/sys/dev/fdc/fdc_pccard.c#2 integrate .. //depot/projects/multipass/sys/dev/fe/if_fe_pccard.c#2 integrate .. //depot/projects/multipass/sys/dev/firewire/firewire.c#2 integrate .. //depot/projects/multipass/sys/dev/firewire/firewire.h#2 integrate .. //depot/projects/multipass/sys/dev/firewire/fwohci.c#2 integrate .. //depot/projects/multipass/sys/dev/firewire/fwohci_pci.c#2 integrate .. //depot/projects/multipass/sys/dev/firewire/fwohcireg.h#2 integrate .. //depot/projects/multipass/sys/dev/firewire/fwohcivar.h#2 integrate .. //depot/projects/multipass/sys/dev/firewire/fwphyreg.h#2 integrate .. //depot/projects/multipass/sys/dev/firewire/if_fwe.c#2 integrate .. //depot/projects/multipass/sys/dev/firewire/if_fwip.c#2 integrate .. //depot/projects/multipass/sys/dev/firewire/sbp.c#2 integrate .. //depot/projects/multipass/sys/dev/firewire/sbp.h#2 integrate .. //depot/projects/multipass/sys/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/multipass/sys/dev/fxp/if_fxpreg.h#2 integrate .. //depot/projects/multipass/sys/dev/fxp/if_fxpvar.h#2 integrate .. //depot/projects/multipass/sys/dev/hifn/hifn7751.c#2 integrate .. //depot/projects/multipass/sys/dev/hptiop/hptiop.h#2 integrate .. //depot/projects/multipass/sys/dev/hptmv/access601.h#2 integrate .. //depot/projects/multipass/sys/dev/hptmv/amd64-elf.raid.o.uu#2 integrate .. //depot/projects/multipass/sys/dev/hptmv/array.h#2 integrate .. //depot/projects/multipass/sys/dev/hptmv/command.h#2 integrate .. //depot/projects/multipass/sys/dev/hptmv/entry.c#2 integrate .. //depot/projects/multipass/sys/dev/hptmv/global.h#2 integrate .. //depot/projects/multipass/sys/dev/hptmv/gui_lib.c#2 integrate .. //depot/projects/multipass/sys/dev/hptmv/hptintf.h#2 integrate .. //depot/projects/multipass/sys/dev/hptmv/hptproc.c#2 integrate .. //depot/projects/multipass/sys/dev/hptmv/i386-elf.raid.o.uu#2 integrate .. //depot/projects/multipass/sys/dev/hptmv/ioctl.c#2 integrate .. //depot/projects/multipass/sys/dev/hptmv/mvOs.h#2 integrate .. //depot/projects/multipass/sys/dev/hptmv/mvSata.h#2 integrate .. //depot/projects/multipass/sys/dev/hptmv/mvStorageDev.h#2 integrate .. //depot/projects/multipass/sys/dev/hptmv/osbsd.h#2 integrate .. //depot/projects/multipass/sys/dev/hptmv/raid5n.h#2 integrate .. //depot/projects/multipass/sys/dev/hptmv/readme.txt#2 integrate .. //depot/projects/multipass/sys/dev/hptmv/vdevice.h#2 integrate .. //depot/projects/multipass/sys/dev/hwpmc/hwpmc_amd.c#2 integrate .. //depot/projects/multipass/sys/dev/hwpmc/hwpmc_arm.c#2 integrate .. //depot/projects/multipass/sys/dev/hwpmc/hwpmc_core.c#1 branch .. //depot/projects/multipass/sys/dev/hwpmc/hwpmc_core.h#1 branch .. //depot/projects/multipass/sys/dev/hwpmc/hwpmc_ia64.c#2 integrate .. //depot/projects/multipass/sys/dev/hwpmc/hwpmc_intel.c#2 integrate .. //depot/projects/multipass/sys/dev/hwpmc/hwpmc_logging.c#2 integrate .. //depot/projects/multipass/sys/dev/hwpmc/hwpmc_mod.c#2 integrate .. //depot/projects/multipass/sys/dev/hwpmc/hwpmc_piv.c#2 integrate .. //depot/projects/multipass/sys/dev/hwpmc/hwpmc_powerpc.c#2 integrate .. //depot/projects/multipass/sys/dev/hwpmc/hwpmc_ppro.c#2 integrate .. //depot/projects/multipass/sys/dev/hwpmc/hwpmc_sparc64.c#2 integrate .. //depot/projects/multipass/sys/dev/hwpmc/hwpmc_x86.c#2 integrate .. //depot/projects/multipass/sys/dev/hwpmc/pmc_events.h#2 integrate .. //depot/projects/multipass/sys/dev/ichsmb/ichsmb.c#2 integrate .. //depot/projects/multipass/sys/dev/ichwd/ichwd.c#2 integrate .. //depot/projects/multipass/sys/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/multipass/sys/dev/if_ndis/if_ndis_pccard.c#2 integrate .. //depot/projects/multipass/sys/dev/if_ndis/if_ndis_pci.c#2 integrate .. //depot/projects/multipass/sys/dev/if_ndis/if_ndis_usb.c#2 integrate .. //depot/projects/multipass/sys/dev/if_ndis/if_ndisvar.h#2 integrate .. //depot/projects/multipass/sys/dev/iicbus/ad7418.c#2 integrate .. //depot/projects/multipass/sys/dev/iicbus/ds1672.c#2 integrate .. //depot/projects/multipass/sys/dev/iicbus/icee.c#2 integrate .. //depot/projects/multipass/sys/dev/iicbus/if_ic.c#2 integrate .. //depot/projects/multipass/sys/dev/iicbus/iic.c#2 integrate .. //depot/projects/multipass/sys/dev/iicbus/iic.h#2 integrate .. //depot/projects/multipass/sys/dev/iicbus/iicbb.c#2 integrate .. //depot/projects/multipass/sys/dev/iicbus/iicbus.c#2 integrate .. //depot/projects/multipass/sys/dev/iicbus/iicsmb.c#2 integrate .. //depot/projects/multipass/sys/dev/ipmi/ipmi_acpi.c#2 integrate .. //depot/projects/multipass/sys/dev/ipmi/ipmi_linux.c#1 branch .. //depot/projects/multipass/sys/dev/ipmi/ipmi_smbios.c#2 integrate .. //depot/projects/multipass/sys/dev/ipw/if_ipw.c#2 integrate .. //depot/projects/multipass/sys/dev/iscsi/initiator/isc_cam.c#2 integrate .. //depot/projects/multipass/sys/dev/iscsi/initiator/isc_sm.c#2 integrate .. //depot/projects/multipass/sys/dev/iscsi/initiator/isc_soc.c#2 integrate .. //depot/projects/multipass/sys/dev/iscsi/initiator/isc_subr.c#2 integrate .. //depot/projects/multipass/sys/dev/iscsi/initiator/iscsi.c#2 integrate .. //depot/projects/multipass/sys/dev/iscsi/initiator/iscsi.h#2 integrate .. //depot/projects/multipass/sys/dev/iscsi/initiator/iscsi_subr.c#2 integrate .. //depot/projects/multipass/sys/dev/iscsi/initiator/iscsivar.h#2 integrate .. //depot/projects/multipass/sys/dev/isp/isp.c#2 integrate .. //depot/projects/multipass/sys/dev/iwi/if_iwi.c#2 integrate .. //depot/projects/multipass/sys/dev/iwn/if_iwn.c#2 integrate .. //depot/projects/multipass/sys/dev/ixgbe/LICENSE#2 integrate .. //depot/projects/multipass/sys/dev/ixgbe/README#2 integrate .. //depot/projects/multipass/sys/dev/ixgbe/ixgbe.c#2 integrate .. //depot/projects/multipass/sys/dev/ixgbe/ixgbe.h#2 integrate .. //depot/projects/multipass/sys/dev/ixgbe/ixgbe_82598.c#2 integrate .. //depot/projects/multipass/sys/dev/ixgbe/ixgbe_82599.c#1 branch .. //depot/projects/multipass/sys/dev/ixgbe/ixgbe_api.c#2 integrate .. //depot/projects/multipass/sys/dev/ixgbe/ixgbe_api.h#2 integrate .. //depot/projects/multipass/sys/dev/ixgbe/ixgbe_common.c#2 integrate .. //depot/projects/multipass/sys/dev/ixgbe/ixgbe_common.h#2 integrate .. //depot/projects/multipass/sys/dev/ixgbe/ixgbe_osdep.h#2 integrate .. //depot/projects/multipass/sys/dev/ixgbe/ixgbe_phy.c#2 integrate .. //depot/projects/multipass/sys/dev/ixgbe/ixgbe_phy.h#2 integrate .. //depot/projects/multipass/sys/dev/ixgbe/ixgbe_type.h#2 integrate .. //depot/projects/multipass/sys/dev/jme/if_jme.c#2 integrate .. //depot/projects/multipass/sys/dev/jme/if_jmereg.h#2 integrate .. //depot/projects/multipass/sys/dev/jme/if_jmevar.h#2 integrate .. //depot/projects/multipass/sys/dev/joy/joy.c#2 integrate .. //depot/projects/multipass/sys/dev/k8temp/k8temp.c#2 delete .. //depot/projects/multipass/sys/dev/kbd/kbdreg.h#2 integrate .. //depot/projects/multipass/sys/dev/kbdmux/kbdmux.c#2 integrate .. //depot/projects/multipass/sys/dev/lmc/if_lmc.c#2 integrate .. //depot/projects/multipass/sys/dev/lmc/if_lmc.h#2 integrate .. //depot/projects/multipass/sys/dev/malo/if_malo.c#2 integrate .. //depot/projects/multipass/sys/dev/malo/if_malo_pci.c#2 integrate .. //depot/projects/multipass/sys/dev/malo/if_malohal.c#2 integrate .. //depot/projects/multipass/sys/dev/mca/mca_bus.c#2 integrate .. //depot/projects/multipass/sys/dev/md/md.c#2 integrate .. //depot/projects/multipass/sys/dev/mfi/mfi.c#2 integrate .. //depot/projects/multipass/sys/dev/mfi/mfi_pci.c#2 integrate .. //depot/projects/multipass/sys/dev/mge/if_mge.c#2 integrate .. //depot/projects/multipass/sys/dev/mge/if_mgevar.h#2 integrate .. //depot/projects/multipass/sys/dev/mii/axphy.c#1 branch .. //depot/projects/multipass/sys/dev/mii/axphyreg.h#1 branch .. //depot/projects/multipass/sys/dev/mii/ip1000phy.c#2 integrate .. //depot/projects/multipass/sys/dev/mii/ip1000phyreg.h#2 integrate .. //depot/projects/multipass/sys/dev/mii/miidevs#2 integrate .. //depot/projects/multipass/sys/dev/mii/truephy.c#2 integrate .. //depot/projects/multipass/sys/dev/mmc/mmc.c#2 integrate .. //depot/projects/multipass/sys/dev/mmc/mmcreg.h#2 integrate .. //depot/projects/multipass/sys/dev/mmc/mmcsd.c#2 integrate .. //depot/projects/multipass/sys/dev/mpt/mpt.c#2 integrate .. //depot/projects/multipass/sys/dev/mpt/mpt.h#2 integrate .. //depot/projects/multipass/sys/dev/mpt/mpt_cam.c#2 integrate .. //depot/projects/multipass/sys/dev/mpt/mpt_raid.c#2 integrate .. //depot/projects/multipass/sys/dev/mpt/mpt_user.c#2 integrate .. //depot/projects/multipass/sys/dev/msk/if_msk.c#2 integrate .. //depot/projects/multipass/sys/dev/msk/if_mskreg.h#2 integrate .. //depot/projects/multipass/sys/dev/mxge/eth_z8e.h#2 integrate .. //depot/projects/multipass/sys/dev/mxge/ethp_z8e.h#2 integrate .. //depot/projects/multipass/sys/dev/mxge/if_mxge.c#2 integrate .. //depot/projects/multipass/sys/dev/mxge/if_mxge_var.h#2 integrate .. //depot/projects/multipass/sys/dev/mxge/mxge_mcp.h#2 integrate .. //depot/projects/multipass/sys/dev/mxge/rss_eth_z8e.h#2 integrate .. //depot/projects/multipass/sys/dev/mxge/rss_ethp_z8e.h#2 integrate .. //depot/projects/multipass/sys/dev/my/if_my.c#2 integrate .. //depot/projects/multipass/sys/dev/nfe/if_nfe.c#2 integrate .. //depot/projects/multipass/sys/dev/nmdm/nmdm.c#2 integrate .. //depot/projects/multipass/sys/dev/nsp/nsp.c#2 integrate .. //depot/projects/multipass/sys/dev/nve/if_nve.c#2 integrate .. //depot/projects/multipass/sys/dev/nxge/xge-osdep.h#2 integrate .. //depot/projects/multipass/sys/dev/ofw/ofw_bus_subr.c#2 integrate .. //depot/projects/multipass/sys/dev/ofw/ofw_bus_subr.h#2 integrate .. //depot/projects/multipass/sys/dev/ofw/ofw_if.m#1 branch .. //depot/projects/multipass/sys/dev/ofw/ofw_iicbus.c#1 branch .. //depot/projects/multipass/sys/dev/ofw/ofw_standard.c#1 branch .. //depot/projects/multipass/sys/dev/ofw/ofwvar.h#1 branch .. //depot/projects/multipass/sys/dev/ofw/openfirm.c#2 integrate .. //depot/projects/multipass/sys/dev/ofw/openfirm.h#2 integrate .. //depot/projects/multipass/sys/dev/ofw/openfirmio.c#2 integrate .. //depot/projects/multipass/sys/dev/ofw/openpromio.c#2 integrate .. //depot/projects/multipass/sys/dev/patm/if_patm_intr.c#2 integrate .. //depot/projects/multipass/sys/dev/pccard/card_if.m#2 integrate .. //depot/projects/multipass/sys/dev/pccard/pccard.c#2 integrate .. //depot/projects/multipass/sys/dev/pccard/pccard_cis.c#2 integrate .. //depot/projects/multipass/sys/dev/pccard/pccarddevs#2 integrate .. //depot/projects/multipass/sys/dev/pccard/pccardvar.h#2 integrate .. //depot/projects/multipass/sys/dev/pccard/pccardvarp.h#2 integrate .. //depot/projects/multipass/sys/dev/pccbb/pccbb.c#2 integrate .. //depot/projects/multipass/sys/dev/pccbb/pccbb_pci.c#2 integrate .. //depot/projects/multipass/sys/dev/pccbb/pccbbvar.h#2 integrate .. //depot/projects/multipass/sys/dev/pci/pci.c#3 integrate .. //depot/projects/multipass/sys/dev/pci/pci_pci.c#3 integrate .. //depot/projects/multipass/sys/dev/pci/pci_private.h#2 integrate .. //depot/projects/multipass/sys/dev/pci/pci_user.c#2 integrate .. //depot/projects/multipass/sys/dev/pci/pcib_private.h#2 integrate .. //depot/projects/multipass/sys/dev/pci/pcireg.h#2 integrate .. //depot/projects/multipass/sys/dev/pci/vga_pci.c#3 integrate .. //depot/projects/multipass/sys/dev/pcn/if_pcn.c#2 integrate .. //depot/projects/multipass/sys/dev/powermac_nvram/powermac_nvram.c#2 integrate .. //depot/projects/multipass/sys/dev/ppbus/if_plip.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Apr 14 20:29:19 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E23E11065786; Tue, 14 Apr 2009 20:29:18 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6E89F106576B for ; Tue, 14 Apr 2009 20:29:18 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5A71C8FC08 for ; Tue, 14 Apr 2009 20:29:18 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3EKTIX9025843 for ; Tue, 14 Apr 2009 20:29:18 GMT (envelope-from sson@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3EKTINV025841 for perforce@freebsd.org; Tue, 14 Apr 2009 20:29:18 GMT (envelope-from sson@FreeBSD.org) Date: Tue, 14 Apr 2009 20:29:18 GMT Message-Id: <200904142029.n3EKTINV025841@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sson@FreeBSD.org using -f From: Stacey Son To: Perforce Change Reviews Cc: Subject: PERFORCE change 160640 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, 14 Apr 2009 20:29:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=160640 Change 160640 by sson@sson_amd64 on 2009/04/14 20:29:05 Adding AUE_ssauthmech event, the "aa" class, and changing flags to audit the aa event class by default. Sync sys/bsm/audit.h with darwin kernel version. Credit: Gary Hoo Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_uevents.h#11 edit .. //depot/projects/trustedbsd/openbsm/etc/audit_class#6 edit .. //depot/projects/trustedbsd/openbsm/etc/audit_control#8 edit .. //depot/projects/trustedbsd/openbsm/etc/audit_event#39 edit .. //depot/projects/trustedbsd/openbsm/sys/bsm/audit.h#9 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_uevents.h#11 (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/audit_uevents.h#10 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_uevents.h#11 $ */ #ifndef _BSM_AUDIT_UEVENTS_H_ @@ -138,5 +138,6 @@ #define AUE_calife 45027 /* OpenBSM-allocated. */ #define AUE_sudo 45028 /* OpenBSM-allocated. */ #define AUE_audit_recovery 45029 /* OpenBSM-allocated. */ +#define AUE_ssauthmech 45030 /* Darwin-specific. */ #endif /* !_BSM_AUDIT_UEVENTS_H_ */ ==== //depot/projects/trustedbsd/openbsm/etc/audit_class#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_class#5 $ +# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_class#6 $ # 0x00000000:no:invalid class 0x00000001:fr:file read @@ -15,6 +15,7 @@ 0x00000400:na:non attributable 0x00000800:ad:administrative 0x00001000:lo:login_logout +0x00002000:aa:authentication and authorization 0x00004000:ap:application 0x20000000:io:ioctl 0x40000000:ex:exec ==== //depot/projects/trustedbsd/openbsm/etc/audit_control#8 (text+ko) ==== @@ -1,10 +1,10 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_control#7 $ +# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_control#8 $ # dir:/var/audit -flags:lo +flags:lo,aa minfree:5 -naflags:lo +naflags:lo,aa policy:cnt,argv filesz:2M expire-after:10M ==== //depot/projects/trustedbsd/openbsm/etc/audit_event#39 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#38 $ +# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#39 $ # # The mapping between event identifiers and values is also hard-coded in # audit_kevents.h and audit_uevents.h, so changes must occur in both places, @@ -628,10 +628,10 @@ 6521:AUE_DARWIN_revoke_obj:revoke object priv:fm 6600:AUE_DARWIN_lw_login:loginwindow login:lo 6601:AUE_DARWIN_lw_logout:loginwindow logout:lo -7000:AUE_DARWIN_auth_user:user authentication:ad -7001:AUE_DARWIN_ssconn:SecSrvr connection setup:ad -7002:AUE_DARWIN_ssauthorize:SecSrvr AuthEngine:ad -7003:AUE_DARWIN_ssauthint:SecSrvr authinternal mech:ad +7000:AUE_DARWIN_auth_user:user authentication:aa +7001:AUE_DARWIN_ssconn:SecSrvr connection setup:aa +7002:AUE_DARWIN_ssauthorize:SecSrvr AuthEngine:aa +7003:AUE_DARWIN_ssauthint:SecSrvr authinternal mech:aa # # Historic/third-party application allocations of event identifiers. # @@ -650,10 +650,11 @@ 45020:AUE_revoke_obj:revoke object priv:fm 45021:AUE_lw_login:loginwindow login:lo 45022:AUE_lw_logout:loginwindow logout:lo -45023:AUE_auth_user:user authentication:ad -45024:AUE_ssconn:SecSrvr connection setup:ad -45025:AUE_ssauthorize:SecSrvr AuthEngine:ad -45026:AUE_ssauthint:SecSrvr authinternal mech:ad +45023:AUE_auth_user:user authentication:aa +45024:AUE_ssconn:SecSrvr connection setup:aa +45025:AUE_ssauthorize:SecSrvr AuthEngine:aa +45026:AUE_ssauthint:SecSrvr authinternal mech:aa 45027:AUE_calife:Calife:ad -45028:AUE_sudo:sudo(1):ad +45028:AUE_sudo:sudo(1):aa 45029:AUE_audit_recovery:audit crash recovery:ad +45030:AUE_ssauthmech:SecSrvr AuthMechanism:aa ==== //depot/projects/trustedbsd/openbsm/sys/bsm/audit.h#9 (text+ko) ==== @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit.h#8 $ + * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit.h#9 $ */ #ifndef _BSM_AUDIT_H @@ -313,10 +313,10 @@ int getaudit_addr(struct auditinfo_addr *, int); int setaudit_addr(const struct auditinfo_addr *, int); -#ifdef __APPLE_API_PRIVATE +#ifdef __APPLE_API_PRIVATE #include -mach_port_name_t audit_session_self(void); -au_asid_t audit_sesison_join(mach_port_name_t port); +mach_port_name_t audit_session_self(void); +au_asid_t audit_session_join(mach_port_name_t port); #endif /* __APPLE_API_PRIVATE */ #endif /* defined(_KERNEL) || defined(KERNEL) */ From owner-p4-projects@FreeBSD.ORG Tue Apr 14 21:05:57 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 917FC1065670; Tue, 14 Apr 2009 21:05:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4DC50106564A for ; Tue, 14 Apr 2009 21:05:56 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3D4C18FC0C for ; Tue, 14 Apr 2009 21:05:56 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3EL5uVh041107 for ; Tue, 14 Apr 2009 21:05:56 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3EL5tTW041105 for perforce@freebsd.org; Tue, 14 Apr 2009 21:05:55 GMT (envelope-from zec@fer.hr) Date: Tue, 14 Apr 2009 21:05:55 GMT Message-Id: <200904142105.n3EL5tTW041105@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 160642 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, 14 Apr 2009 21:05:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=160642 Change 160642 by zec@zec_tpx32 on 2009/04/14 21:05:18 Either register vnet_inet_iattach() via the vnet_mod_register() framework and let it be called by the framework, or call vnet_net_iattach() directly, but not both. Affected files ... .. //depot/projects/vimage-commit/src/sys/net/if.c#18 edit Differences ... ==== //depot/projects/vimage-commit/src/sys/net/if.c#18 (text+ko) ==== @@ -401,8 +401,9 @@ #ifndef VIMAGE_GLOBALS vnet_mod_register(&vnet_net_modinfo); +#else + vnet_net_iattach(NULL); #endif - vnet_net_iattach(NULL); IFNET_LOCK_INIT(); ifdev_setbyindex(0, make_dev(&net_cdevsw, 0, UID_ROOT, GID_WHEEL, From owner-p4-projects@FreeBSD.ORG Tue Apr 14 21:12:03 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F260B1065672; Tue, 14 Apr 2009 21:12:02 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B10171065670 for ; Tue, 14 Apr 2009 21:12:02 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 86B088FC08 for ; Tue, 14 Apr 2009 21:12:02 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3ELC2wm041632 for ; Tue, 14 Apr 2009 21:12:02 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3ELC2RC041630 for perforce@freebsd.org; Tue, 14 Apr 2009 21:12:02 GMT (envelope-from zec@fer.hr) Date: Tue, 14 Apr 2009 21:12:02 GMT Message-Id: <200904142112.n3ELC2RC041630@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 160643 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, 14 Apr 2009 21:12:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=160643 Change 160643 by zec@zec_tpx32 on 2009/04/14 21:11:32 Remove an unneeded INIT_VNET_NET() line. Affected files ... .. //depot/projects/vimage-commit/src/sys/net/if_loop.c#16 edit Differences ... ==== //depot/projects/vimage-commit/src/sys/net/if_loop.c#16 (text+ko) ==== @@ -174,7 +174,6 @@ static int loop_modevent(module_t mod, int type, void *data) { - INIT_VNET_NET(curvnet); switch (type) { case MOD_LOAD: From owner-p4-projects@FreeBSD.ORG Tue Apr 14 21:37:29 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0B48B1065672; Tue, 14 Apr 2009 21:37:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BC2AE106564A for ; Tue, 14 Apr 2009 21:37:28 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AC1368FC08 for ; Tue, 14 Apr 2009 21:37:28 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3ELbSSj043628 for ; Tue, 14 Apr 2009 21:37:28 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3ELbStO043626 for perforce@freebsd.org; Tue, 14 Apr 2009 21:37:28 GMT (envelope-from zec@fer.hr) Date: Tue, 14 Apr 2009 21:37:28 GMT Message-Id: <200904142137.n3ELbStO043626@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 160646 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, 14 Apr 2009 21:37:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=160646 Change 160646 by zec@zec_tpx32 on 2009/04/14 21:36:28 Minor / random whitespace nits. Affected files ... .. //depot/projects/vimage/src/sys/sys/vimage.h#87 edit Differences ... ==== //depot/projects/vimage/src/sys/sys/vimage.h#87 (text+ko) ==== @@ -30,8 +30,8 @@ * $FreeBSD: src/sys/sys/vimage.h,v 1.14 2009/04/11 05:58:58 zec Exp $ */ -#ifndef _SYS_VIMAGE_H_ -#define _SYS_VIMAGE_H_ +#ifndef _SYS_VIMAGE_H_ +#define _SYS_VIMAGE_H_ #include #include @@ -159,7 +159,7 @@ #define V_GLOBAL 0 #define V_NET 1 #define V_PROCG 2 -#define V_CPU 3 +#define V_CPU 3 #define V_MOD_vprocg 0 #define V_MOD_vcpu 0 @@ -263,11 +263,11 @@ /* Non-VIMAGE null-macros */ #define IS_DEFAULT_VNET(arg) 1 -#define VNET_ASSERT(condition) -#define INIT_FROM_VNET(vnet, modindex, modtype, sym) #define CURVNET_SET(arg) #define CURVNET_SET_QUIET(arg) #define CURVNET_RESTORE() +#define VNET_ASSERT(condition) +#define INIT_FROM_VNET(vnet, modindex, modtype, sym) #define VNET_ITERATOR_DECL(arg) #define VNET_FOREACH(arg) #define VNET_LIST_RLOCK() @@ -288,8 +288,8 @@ #endif /* !VIMAGE */ /* XXX those defines bellow should probably go into vprocg.h and vcpu.h */ -#define VPROCG(sym) VSYM(vprocg, sym) -#define VCPU(sym) VSYM(vcpu, sym) +#define VPROCG(sym) VSYM(vprocg, sym) +#define VCPU(sym) VSYM(vcpu, sym) #define V_hostname VPROCG(hostname) #ifdef VIMAGE From owner-p4-projects@FreeBSD.ORG Wed Apr 15 07:44:48 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A3E08106571B; Wed, 15 Apr 2009 07:44:47 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3E586106570F for ; Wed, 15 Apr 2009 07:44:47 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 209598FC08 for ; Wed, 15 Apr 2009 07:44:47 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3F7ilig030355 for ; Wed, 15 Apr 2009 07:44:47 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3F7ik5O030353 for perforce@freebsd.org; Wed, 15 Apr 2009 07:44:46 GMT (envelope-from zec@fer.hr) Date: Wed, 15 Apr 2009 07:44:46 GMT Message-Id: <200904150744.n3F7ik5O030353@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 160654 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, 15 Apr 2009 07:44:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=160654 Change 160654 by zec@zec_amdx2 on 2009/04/15 07:44:27 Declare vnet container struct sizes when registering vnet modules, so that the initialization subsystem can allocate memory for those structs. This makes options VIMAGE builds bootable again. Submitted from: a non-default VIMAGE far, far away... Affected files ... .. //depot/projects/vimage/src/sys/net/if_gif.c#28 edit .. //depot/projects/vimage/src/sys/netgraph/ng_base.c#53 edit .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#72 edit .. //depot/projects/vimage/src/sys/netinet/ip_input.c#53 edit .. //depot/projects/vimage/src/sys/netinet/ip_mroute.c#20 edit .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#80 edit .. //depot/projects/vimage/src/sys/netinet6/ip6_input.c#53 edit .. //depot/projects/vimage/src/sys/netipsec/ipsec.c#45 edit Differences ... ==== //depot/projects/vimage/src/sys/net/if_gif.c#28 (text+ko) ==== @@ -127,6 +127,7 @@ static const vnet_modinfo_t vnet_gif_modinfo = { .vmi_id = VNET_MOD_GIF, .vmi_name = "gif", + .vmi_size = sizeof(struct vnet_gif), .vmi_dependson = VNET_MOD_NET, .vmi_iattach = vnet_gif_iattach }; ==== //depot/projects/vimage/src/sys/netgraph/ng_base.c#53 (text+ko) ==== @@ -275,6 +275,7 @@ static vnet_modinfo_t vnet_netgraph_modinfo = { .vmi_id = VNET_MOD_NETGRAPH, .vmi_name = "netgraph", + .vmi_size = sizeof(struct vnet_netgraph), .vmi_dependson = VNET_MOD_LOIF, .vmi_iattach = vnet_netgraph_iattach, #ifdef VIMAGE ==== //depot/projects/vimage/src/sys/netinet/ip_fw2.c#72 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netinet/ip_input.c#53 (text+ko) ==== @@ -230,6 +230,7 @@ static const vnet_modinfo_t vnet_inet_modinfo = { .vmi_id = VNET_MOD_INET, .vmi_name = "inet", + .vmi_size = sizeof(struct vnet_inet) }; static void vnet_inet_register() ==== //depot/projects/vimage/src/sys/netinet/ip_mroute.c#20 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netinet/tcp_subr.c#80 (text+ko) ==== @@ -345,7 +345,6 @@ V_tcp_autosndbuf_inc = 8*1024; V_tcp_autosndbuf_max = 256*1024; - /* * These have to be type stable for the benefit of the timers. */ @@ -369,6 +368,9 @@ INP_INFO_LOCK_INIT(&V_tcbinfo, "tcp"); LIST_INIT(&V_tcb); V_tcbinfo.ipi_listhead = &V_tcb; +#ifdef VIMAGE + V_tcbinfo.ipi_vnet = curvnet; +#endif hashsize = TCBHASHSIZE; TUNABLE_INT_FETCH("net.inet.tcp.tcbhashsize", &hashsize); if (!powerof2(hashsize)) { ==== //depot/projects/vimage/src/sys/netinet6/ip6_input.c#53 (text+ko) ==== @@ -161,6 +161,7 @@ static const vnet_modinfo_t vnet_inet6_modinfo = { .vmi_id = VNET_MOD_INET6, .vmi_name = "inet6", + .vmi_size = sizeof(struct vnet_inet6), .vmi_dependson = VNET_MOD_INET /* XXX revisit - TCP/UDP needs this? */ }; ==== //depot/projects/vimage/src/sys/netipsec/ipsec.c#45 (text+ko) ==== @@ -251,6 +251,7 @@ static const vnet_modinfo_t vnet_ipsec_modinfo = { .vmi_id = VNET_MOD_IPSEC, .vmi_name = "ipsec", + .vmi_size = sizeof(struct vnet_ipsec), .vmi_dependson = VNET_MOD_INET, /* XXX revisit - INET6 ? */ .vmi_iattach = ipsec_iattach, #ifdef VIMAGE From owner-p4-projects@FreeBSD.ORG Wed Apr 15 12:59:08 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 782171065786; Wed, 15 Apr 2009 12:59:07 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 064BE106577D for ; Wed, 15 Apr 2009 12:59:07 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E44768FC21 for ; Wed, 15 Apr 2009 12:59:06 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3FCx6JR089431 for ; Wed, 15 Apr 2009 12:59:06 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3FCx6FT089429 for perforce@freebsd.org; Wed, 15 Apr 2009 12:59:06 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 15 Apr 2009 12:59:06 GMT Message-Id: <200904151259.n3FCx6FT089429@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 160655 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, 15 Apr 2009 12:59:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=160655 Change 160655 by hselasky@hselasky_laptop001 on 2009/04/15 12:59:06 USB CORE: Fix possible issue with clear-stall and set-config happening at the same time. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_device.c#25 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_device.c#25 (text+ko) ==== @@ -724,22 +724,33 @@ goto done; } } - udev->pipes_max = ep_max; - udev->pipes = NULL; - if (udev->pipes_max != 0) { - udev->pipes = malloc(sizeof(*pipe) * udev->pipes_max, + if (ep_max != 0) { + udev->pipes = malloc(sizeof(*pipe) * ep_max, M_USB, M_WAITOK | M_ZERO); if (udev->pipes == NULL) { err = USB_ERR_NOMEM; goto done; } + } else { + udev->pipes = NULL; } + USB_BUS_LOCK(udev->bus); + udev->pipes_max = ep_max; + /* reset any ongoing clear-stall */ + udev->pipe_curr = NULL; + USB_BUS_UNLOCK(udev->bus); } done: if (err) { if (cmd == USB_CFG_ALLOC) { cleanup: + USB_BUS_LOCK(udev->bus); + udev->pipes_max = 0; + /* reset any ongoing clear-stall */ + udev->pipe_curr = NULL; + USB_BUS_UNLOCK(udev->bus); + /* cleanup */ if (udev->ifaces != NULL) free(udev->ifaces, M_USB); @@ -749,7 +760,6 @@ udev->ifaces = NULL; udev->pipes = NULL; udev->ifaces_max = 0; - udev->pipes_max = 0; } } return (err); From owner-p4-projects@FreeBSD.ORG Wed Apr 15 23:26:01 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 22A761065670; Wed, 15 Apr 2009 23:26:01 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D5387106564A for ; Wed, 15 Apr 2009 23:26:00 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C2F678FC13 for ; Wed, 15 Apr 2009 23:26:00 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3FNQ0h0069299 for ; Wed, 15 Apr 2009 23:26:00 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3FNQ0Li069297 for perforce@freebsd.org; Wed, 15 Apr 2009 23:26:00 GMT (envelope-from zec@fer.hr) Date: Wed, 15 Apr 2009 23:26:00 GMT Message-Id: <200904152326.n3FNQ0Li069297@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 160676 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, 15 Apr 2009 23:26:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=160676 Change 160676 by zec@zec_amdx2 on 2009/04/15 23:25:57 A small step towards allowing for "options VIMAGE" builds to compile. Affected files ... .. //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#15 edit .. //depot/projects/vimage-commit2/src/sys/net/if_gif.c#22 edit .. //depot/projects/vimage-commit2/src/sys/net/if_loop.c#24 edit .. //depot/projects/vimage-commit2/src/sys/net/if_var.h#16 edit .. //depot/projects/vimage-commit2/src/sys/net/route.c#33 edit .. //depot/projects/vimage-commit2/src/sys/net/rtsock.c#20 edit .. //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#24 edit .. //depot/projects/vimage-commit2/src/sys/netinet/in.c#21 edit .. //depot/projects/vimage-commit2/src/sys/netinet/in_mcast.c#19 edit .. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.h#16 edit .. //depot/projects/vimage-commit2/src/sys/netinet/in_rmx.c#25 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#46 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.h#5 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_timewait.c#23 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_var.h#11 edit .. //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#33 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_rmx.c#26 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#25 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_rtr.c#23 edit .. //depot/projects/vimage-commit2/src/sys/sys/socketvar.h#4 edit .. //depot/projects/vimage-commit2/src/sys/sys/sysctl.h#17 edit .. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#38 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#15 (text+ko) ==== @@ -42,12 +42,18 @@ #ifndef VIMAGE_GLOBALS MALLOC_DEFINE(M_VIMAGE, "vimage", "vimage resource container"); +MALLOC_DEFINE(M_VNET, "vnet", "network stack control block"); static TAILQ_HEAD(vnet_modlink_head, vnet_modlink) vnet_modlink_head; static TAILQ_HEAD(vnet_modpending_head, vnet_modlink) vnet_modpending_head; static void vnet_mod_complete_registration(struct vnet_modlink *); static int vnet_mod_constructor(struct vnet_modlink *); +/* curvnet should be thread-local - this is only a temporary step */ +#ifdef VIMAGE +struct vnet *curvnet; +#endif + void vnet_mod_register(const struct vnet_modinfo *vmi) { @@ -194,7 +200,13 @@ for (mapentry = vml->vml_modinfo->vmi_symmap; mapentry->name != NULL; mapentry++) { if (strcmp(symstr, mapentry->name) == 0) { - lookup->symvalue = (u_long) mapentry->base; +#ifdef VIMAGE + lookup->symvalue = + (u_long) curvnet->mod_data[vml->vml_modinfo->vmi_id]; + lookup->symvalue += mapentry->offset; +#else + lookup->symvalue = (u_long) mapentry->offset; +#endif lookup->symsize = mapentry->size; return (0); } @@ -206,9 +218,21 @@ static void vi_init(void *unused) { + struct vnet *vnet; TAILQ_INIT(&vnet_modlink_head); TAILQ_INIT(&vnet_modpending_head); + +#ifdef VIMAGE + LIST_INIT(&vnet_head); + + vnet = malloc(sizeof(struct vnet), M_VNET, M_NOWAIT | M_ZERO); + if (vnet == NULL) + panic("vi_alloc: malloc failed"); + LIST_INSERT_HEAD(&vnet_head, vnet, vnet_le); + + curvnet = LIST_FIRST(&vnet_head); +#endif } static void ==== //depot/projects/vimage-commit2/src/sys/net/if_gif.c#22 (text+ko) ==== @@ -303,8 +303,10 @@ if_clone_detach(&gif_cloner); mtx_destroy(&gif_mtx); #ifdef INET6 +#ifndef VIMAGE V_ip6_gif_hlim = 0; /* XXX -> vnet_gif_idetach() */ #endif +#endif break; default: return EOPNOTSUPP; ==== //depot/projects/vimage-commit2/src/sys/net/if_loop.c#24 (text+ko) ==== @@ -174,7 +174,6 @@ static int loop_modevent(module_t mod, int type, void *data) { - INIT_VNET_NET(curvnet); switch (type) { case MOD_LOAD: ==== //depot/projects/vimage-commit2/src/sys/net/if_var.h#16 (text+ko) ==== @@ -116,6 +116,7 @@ struct ifnet { void *if_softc; /* pointer to driver state */ void *if_l2com; /* pointer to protocol bits */ + struct vnet *if_vnet; /* pointer to vnet */ TAILQ_ENTRY(ifnet) if_link; /* all struct ifnets are chained */ char if_xname[IFNAMSIZ]; /* external name (name + unit) */ const char *if_dname; /* driver name */ ==== //depot/projects/vimage-commit2/src/sys/net/route.c#33 (text+ko) ==== @@ -178,7 +178,7 @@ static int vnet_route_iattach(const void *unused __unused) { - INIT_VNET_INET(curvnet); + INIT_VNET_NET(curvnet); int table; struct domain *dom; int fam; ==== //depot/projects/vimage-commit2/src/sys/net/rtsock.c#20 (text+ko) ==== @@ -1203,7 +1203,6 @@ static void rt_dispatch(struct mbuf *m, const struct sockaddr *sa) { - INIT_VNET_NET(curvnet); struct m_tag *tag; /* ==== //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#24 (text+ko) ==== @@ -141,13 +141,8 @@ static int sysctl_igmp_gsr(SYSCTL_HANDLER_ARGS); static int sysctl_igmp_ifinfo(SYSCTL_HANDLER_ARGS); -#ifdef VIMAGE static vnet_attach_fn vnet_igmp_iattach; static vnet_detach_fn vnet_igmp_idetach; -#else -static int vnet_igmp_iattach(const void *); -static int vnet_igmp_idetach(const void *); -#endif /* VIMAGE */ /* * System-wide globals. @@ -340,6 +335,7 @@ static int sysctl_igmp_default_version(SYSCTL_HANDLER_ARGS) { + INIT_VNET_INET(curvnet); int error; int new; @@ -379,6 +375,7 @@ static int sysctl_igmp_gsr(SYSCTL_HANDLER_ARGS) { + INIT_VNET_INET(curvnet); int error; int i; @@ -420,6 +417,7 @@ sysctl_igmp_ifinfo(SYSCTL_HANDLER_ARGS) { INIT_VNET_NET(curvnet); + INIT_VNET_INET(curvnet); int *name; int error; u_int namelen; @@ -505,6 +503,7 @@ static __inline int igmp_isgroupreported(const struct in_addr addr) { + INIT_VNET_INET(curvnet); if (in_allhosts(addr) || ((!V_igmp_sendlocal && IN_LOCAL_GROUP(ntohl(addr.s_addr))))) @@ -567,6 +566,7 @@ static struct igmp_ifinfo * igi_alloc_locked(/*const*/ struct ifnet *ifp) { + INIT_VNET_INET(ifp->if_vnet); struct igmp_ifinfo *igi; IGMP_LOCK_ASSERT(); @@ -712,6 +712,7 @@ static void igi_delete_locked(const struct ifnet *ifp) { + INIT_VNET_INET(ifp->if_vnet); struct igmp_ifinfo *igi, *tigi; CTR3(KTR_IGMPV3, "%s: freeing igmp_ifinfo for ifp %p(%s)", @@ -836,6 +837,7 @@ igmp_input_v2_query(struct ifnet *ifp, const struct ip *ip, const struct igmp *igmp) { + INIT_VNET_INET(ifp->if_vnet); struct ifmultiaddr *ifma; struct igmp_ifinfo *igi; struct in_multi *inm; @@ -928,6 +930,7 @@ static void igmp_v2_update_group(struct in_multi *inm, const int timer) { + INIT_VNET_INET(curvnet); CTR4(KTR_IGMPV3, "%s: %s/%s timer=%d", __func__, inet_ntoa(inm->inm_addr), inm->inm_ifp->if_xname, timer); @@ -975,6 +978,7 @@ igmp_input_v3_query(struct ifnet *ifp, const struct ip *ip, /*const*/ struct igmpv3 *igmpv3) { + INIT_VNET_INET(ifp->if_vnet); struct igmp_ifinfo *igi; struct in_multi *inm; uint32_t maxresp, nsrc, qqi; @@ -1119,6 +1123,7 @@ igmp_input_v3_group_query(struct in_multi *inm, struct igmp_ifinfo *igi, int timer, /*const*/ struct igmpv3 *igmpv3) { + INIT_VNET_INET(curvnet); int retval; uint16_t nsrc; @@ -1221,6 +1226,7 @@ igmp_input_v1_report(struct ifnet *ifp, /*const*/ struct ip *ip, /*const*/ struct igmp *igmp) { + INIT_VNET_INET(ifp->if_vnet); struct in_ifaddr *ia; struct in_multi *inm; @@ -1327,6 +1333,7 @@ igmp_input_v2_report(struct ifnet *ifp, /*const*/ struct ip *ip, /*const*/ struct igmp *igmp) { + INIT_VNET_INET(ifp->if_vnet); struct in_ifaddr *ia; struct in_multi *inm; @@ -1612,21 +1619,15 @@ void igmp_fasttimo(void) { -#ifdef VIMAGE VNET_ITERATOR_DECL(vnet_iter); VNET_LIST_RLOCK(); VNET_FOREACH(vnet_iter) { CURVNET_SET(vnet_iter); - INIT_VNET_INET(vnet_iter); igmp_fasttimo_vnet(); CURVNET_RESTORE(); } VNET_LIST_RUNLOCK(); -#else /* !VIMAGE */ - - igmp_fasttimo_vnet(); -#endif /* VIMAGE */ } /* @@ -1638,6 +1639,7 @@ static void igmp_fasttimo_vnet(void) { + INIT_VNET_INET(curvnet); struct ifqueue scq; /* State-change packets */ struct ifqueue qrq; /* Query response packets */ struct ifnet *ifp; @@ -1765,6 +1767,7 @@ static void igmp_v1v2_process_group_timer(struct in_multi *inm, const int version) { + INIT_VNET_INET(curvnet); int report_timer_expired; IN_MULTI_LOCK_ASSERT(); @@ -1813,6 +1816,7 @@ struct ifqueue *qrq, struct ifqueue *scq, struct in_multi *inm, const int uri_fasthz) { + INIT_VNET_INET(curvnet); int query_response_timer_expired; int state_change_retransmit_timer_expired; @@ -2002,6 +2006,7 @@ static void igmp_v3_cancel_link_timers(struct igmp_ifinfo *igi) { + INIT_VNET_INET(curvnet); struct ifmultiaddr *ifma; struct ifnet *ifp; struct in_multi *inm; @@ -2077,6 +2082,7 @@ static void igmp_v1v2_process_querier_timers(struct igmp_ifinfo *igi) { + INIT_VNET_INET(curvnet); IGMP_LOCK_ASSERT(); @@ -2153,20 +2159,15 @@ void igmp_slowtimo(void) { -#ifdef VIMAGE VNET_ITERATOR_DECL(vnet_iter); VNET_LIST_RLOCK(); VNET_FOREACH(vnet_iter) { CURVNET_SET(vnet_iter); - INIT_VNET_INET(vnet_iter); igmp_slowtimo_vnet(); CURVNET_RESTORE(); } VNET_LIST_RUNLOCK(); -#else /* !VIMAGE */ - igmp_slowtimo_vnet(); -#endif /* VIMAGE */ } /* @@ -2175,6 +2176,7 @@ static void igmp_slowtimo_vnet(void) { + INIT_VNET_INET(curvnet); struct igmp_ifinfo *igi; IGMP_LOCK(); @@ -2202,9 +2204,6 @@ IGMP_LOCK_ASSERT(); ifp = inm->inm_ifp; - /* XXX are these needed ? */ - INIT_VNET_NET(ifp->if_vnet); - INIT_VNET_INET(ifp->if_vnet); MGETHDR(m, M_DONTWAIT, MT_DATA); if (m == NULL) @@ -2342,6 +2341,7 @@ static int igmp_initial_join(struct in_multi *inm, struct igmp_ifinfo *igi) { + INIT_VNET_INET(curvnet); struct ifnet *ifp; struct ifqueue *ifq; int error, retval, syncstates; @@ -2470,6 +2470,7 @@ static int igmp_handle_state_change(struct in_multi *inm, struct igmp_ifinfo *igi) { + INIT_VNET_INET(curvnet); struct ifnet *ifp; int retval; @@ -2529,6 +2530,7 @@ static void igmp_final_leave(struct in_multi *inm, struct igmp_ifinfo *igi) { + INIT_VNET_INET(curvnet); int syncstates; syncstates = 1; @@ -3314,6 +3316,7 @@ static void igmp_v3_dispatch_general_query(struct igmp_ifinfo *igi) { + INIT_VNET_INET(curvnet); struct ifmultiaddr *ifma, *tifma; struct ifnet *ifp; struct in_multi *inm; @@ -3395,12 +3398,14 @@ CTR2(KTR_IGMPV3, "%s: transmit %p", __func__, m); /* - * Restore VNET image pointer from enqueued mbuf chain + * Set VNET image pointer from enqueued mbuf chain * before doing anything else. Whilst we use interface * indexes to guard against interface detach, they are * unique to each VIMAGE and must be retrieved. */ CURVNET_SET(m->m_pkthdr.header); + INIT_VNET_NET(curvnet); + INIT_VNET_INET(curvnet); ifindex = igmp_restore_context(m); /* @@ -3482,7 +3487,6 @@ static struct mbuf * igmp_v3_encap_report(struct ifnet *ifp, struct mbuf *m) { - INIT_VNET_NET(curvnet); INIT_VNET_INET(curvnet); struct igmp_report *igmp; struct ip *ip; @@ -3661,15 +3665,28 @@ return (0); } -#ifdef VIMAGE +/* + * XXX Are igi_head and igmpstat really accessed via kmem / kldsym? + * If so, given that they are members of struct vnet_inet, they should + * be registered with VNET_MOD_INET, not here. Revisit!!! + */ +#if 0 static struct vnet_symmap vnet_igmp_symmap[] = { VNET_SYMMAP(igmp, igi_head), VNET_SYMMAP(igmp, igmpstat), VNET_SYMMAP_END }; -VNET_MOD_DECLARE(IGMP, igmp, vnet_igmp_iattach, vnet_igmp_idetach, - vnet_igmp_symmap); -#endif /* VIMAGE */ +#endif + +#ifndef VIMAGE_GLOBALS +static vnet_modinfo_t vnet_igmp_modinfo = { + .vmi_id = VNET_MOD_IGMP, + .vmi_name = "igmp", + .vmi_dependson = VNET_MOD_INET, + .vmi_iattach = vnet_igmp_iattach, + .vmi_idetach = vnet_igmp_idetach +}; +#endif static int igmp_modevent(module_t mod, int type, void *unused __unused) @@ -3678,22 +3695,20 @@ switch (type) { case MOD_LOAD: igmp_sysinit(); -#ifdef VIMAGE +#ifndef VIMAGE_GLOBALS vnet_mod_register(&vnet_igmp_modinfo); #else - (void)vnet_igmp_iattach(NULL); -#endif /* VIMAGE */ + vnet_igmp_iattach(NULL); +#endif break; case MOD_UNLOAD: -#ifdef VIMAGE - /* - * TODO: Allow module unload if any VIMAGE instances - * are using this module. - */ - return (EBUSY); +#ifndef VIMAGE_GLOBALS +#ifdef NOTYET + vnet_mod_deregister(&vnet_igmp_modinfo); +#endif #else - (void)vnet_igmp_idetach(NULL); -#endif /* VIMAGE */ + vnet_igmp_idetach(NULL); +#endif igmp_sysuninit(); break; default: ==== //depot/projects/vimage-commit2/src/sys/netinet/in.c#21 (text+ko) ==== @@ -1017,7 +1017,6 @@ static void in_purgemaddrs(struct ifnet *ifp) { - INIT_VNET_INET(ifp->if_vnet); LIST_HEAD(,in_multi) purgeinms; struct in_multi *inm, *tinm; struct ifmultiaddr *ifma; ==== //depot/projects/vimage-commit2/src/sys/netinet/in_mcast.c#19 (text+ko) ==== @@ -392,7 +392,6 @@ in_getmulti(struct ifnet *ifp, const struct in_addr *group, struct in_multi **pinm) { - INIT_VNET_INET(ifp->if_vnet); struct sockaddr_in gsin; struct ifmultiaddr *ifma; struct in_ifinfo *ii; @@ -1821,6 +1820,7 @@ inp_lookup_mcast_ifp(const struct inpcb *inp, const struct sockaddr_in *gsin, const struct in_addr ina) { + INIT_VNET_INET(curvnet); struct ifnet *ifp; KASSERT(gsin->sin_family == AF_INET, ("%s: not AF_INET", __func__)); @@ -1866,7 +1866,6 @@ inp_join_group(struct inpcb *inp, struct sockopt *sopt) { INIT_VNET_NET(curvnet); - INIT_VNET_INET(curvnet); struct group_source_req gsr; sockunion_t *gsa, *ssa; struct ifnet *ifp; @@ -2319,6 +2318,7 @@ inp_set_multicast_if(struct inpcb *inp, struct sockopt *sopt) { INIT_VNET_NET(curvnet); + INIT_VNET_INET(curvnet); struct in_addr addr; struct ip_mreqn mreqn; struct ifnet *ifp; ==== //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.h#16 (text+ko) ==== @@ -221,6 +221,8 @@ #define in6p_icmp6filt inp_depend6.inp6_icmp6filt #define in6p_cksum inp_depend6.inp6_cksum +#define inp_vnet inp_pcbinfo->ipi_vnet + /* * The range of the generation count, as used in this implementation, is 9e19. * We would have to create 300 billion connections per second for this number @@ -298,8 +300,12 @@ struct rwlock ipi_lock; /* - * vimage 1 - * general use 1 + * Pointer to network stack instance + */ + struct vnet *ipi_vnet; + + /* + * general use 2 */ void *ipi_pspare[2]; }; ==== //depot/projects/vimage-commit2/src/sys/netinet/in_rmx.c#25 (text+ko) ==== @@ -250,6 +250,8 @@ static void in_rtqtimo(void *rock) { + INIT_VNET_NET(curvnet); /* XXX revisit!!! */ + INIT_VNET_INET(curvnet); /* XXX revisit!!! */ int fibnum; void *newrock; struct timeval atv; ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#46 (text+ko) ==== @@ -288,6 +288,7 @@ static void tcp_zone_change(void *tag) { + INIT_VNET_INET(curvnet); uma_zone_set_max(V_tcbinfo.ipi_zone, maxsockets); uma_zone_set_max(V_tcpcb_zone, maxsockets); ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.h#5 (text+ko) ==== @@ -96,6 +96,7 @@ #define SYNCOOKIE_LIFETIME 16 /* seconds */ struct syncache_head { + struct vnet *sch_vnet; struct mtx sch_mtx; TAILQ_HEAD(sch_head, syncache) sch_bucket; struct callout sch_timer; ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_timewait.c#23 (text+ko) ==== @@ -132,6 +132,7 @@ static int sysctl_maxtcptw(SYSCTL_HANDLER_ARGS) { + INIT_VNET_INET(curvnet); int error, new; if (maxtcptw == 0) @@ -158,6 +159,7 @@ void tcp_tw_zone_change(void) { + INIT_VNET_INET(curvnet); if (maxtcptw == 0) uma_zone_set_max(V_tcptw_zone, tcptw_auto_size()); ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_var.h#11 (text+ko) ==== @@ -35,6 +35,8 @@ #include +struct vnet; + /* * Kernel variables for tcp. */ @@ -186,7 +188,8 @@ int t_rttlow; /* smallest observerved RTT */ u_int32_t rfbuf_ts; /* recv buffer autoscaling timestamp */ int rfbuf_cnt; /* recv buffer autoscaling byte count */ - void *t_pspare[3]; /* toe usrreqs / toepcb * / congestion algo / vimage / 1 general use */ + struct vnet *t_vnet; /* pointer to parent vnet */ + void *t_pspare[2]; /* toe usrreqs / toepcb * / congestion algo / vimage / 1 general use */ struct toe_usrreqs *t_tu; /* offload operations vector */ void *t_toe; /* TOE pcb pointer */ int t_bytes_acked; /* # bytes acked during current RTT */ ==== //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#33 (text+ko) ==== @@ -155,6 +155,7 @@ static void udp_zone_change(void *tag) { + INIT_VNET_INET(curvnet); uma_zone_set_max(V_udbinfo.ipi_zone, maxsockets); } ==== //depot/projects/vimage-commit2/src/sys/netinet6/in6_rmx.c#26 (text+ko) ==== @@ -289,7 +289,6 @@ in6_rtqtimo(void *rock) { CURVNET_SET_QUIET((struct vnet *) rock); - INIT_VNET_NET((struct vnet *) rock); INIT_VNET_INET6((struct vnet *) rock); struct radix_node_head *rnh = rock; struct rtqk_arg arg; @@ -377,7 +376,6 @@ in6_mtutimo(void *rock) { CURVNET_SET_QUIET((struct vnet *) rock); - INIT_VNET_NET((struct vnet *) rock); INIT_VNET_INET6((struct vnet *) rock); struct radix_node_head *rnh = rock; struct mtuex_arg arg; ==== //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#25 (text+ko) ==== @@ -869,7 +869,6 @@ struct llentry * nd6_lookup(struct in6_addr *addr6, int flags, struct ifnet *ifp) { - INIT_VNET_INET6(curvnet); struct sockaddr_in6 sin6; struct llentry *ln; int llflags = 0; ==== //depot/projects/vimage-commit2/src/sys/netinet6/nd6_rtr.c#23 (text+ko) ==== @@ -1543,6 +1543,7 @@ int nd6_prefix_onlink(struct nd_prefix *pr) { + INIT_VNET_NET(curvnet); INIT_VNET_INET6(curvnet); struct ifaddr *ifa; struct ifnet *ifp = pr->ndpr_ifp; ==== //depot/projects/vimage-commit2/src/sys/sys/socketvar.h#4 (text+ko) ==== @@ -45,6 +45,8 @@ #include #endif +struct vnet; + /* * Kernel structure per socket. * Contains send and receive buffer queues, @@ -72,6 +74,7 @@ short so_state; /* (b) internal state flags SS_* */ int so_qstate; /* (e) internal state flags SQ_* */ void *so_pcb; /* protocol control block */ + struct vnet *so_vnet; /* network stack instance */ struct protosw *so_proto; /* (a) protocol handle */ /* * Variables for connection queuing. ==== //depot/projects/vimage-commit2/src/sys/sys/sysctl.h#17 (text+ko) ==== @@ -163,6 +163,8 @@ const char *oid_fmt; int oid_refcnt; const char *oid_descr; + short oid_v_subs; + short oid_v_mod; }; #define SYSCTL_IN(r, p, l) (r->newfunc)(r, p, l) ==== //depot/projects/vimage-commit2/src/sys/sys/vimage.h#38 (text+ko) ==== @@ -48,8 +48,8 @@ struct vnet_symmap { char *name; - void *base; - size_t size; + size_t offset; + size_t size; }; typedef struct vnet_symmap vnet_symmap_t; @@ -71,12 +71,6 @@ const char *vml_iname; }; -#define VNET_SYMMAP(mod, name) \ - { #name, &(vnet_ ## mod ## _0._ ## name), \ - sizeof(vnet_ ## mod ## _0._ ## name) } - -#define VNET_SYMMAP_END { NULL, 0 } - /* stateful modules */ #define VNET_MOD_NET 0 /* MUST be 0 - implicit dependency */ #define VNET_MOD_NETGRAPH 1 @@ -108,7 +102,11 @@ #define VNET_MOD_DYNAMIC_START 32 #define VNET_MOD_MAX 64 -/* Sysctl virtualization macros need these name mappings bellow */ +/* Major module IDs for vimage sysctl virtualization */ +#define V_GLOBAL 0 /* global variable - no indirection */ +#define V_NET 1 + +/* Name mappings for minor module IDs in vimage sysctl virtualization */ #define V_MOD_vnet_net VNET_MOD_NET #define V_MOD_vnet_netgraph VNET_MOD_NETGRAPH #define V_MOD_vnet_inet VNET_MOD_INET @@ -128,21 +126,67 @@ #define VSYM(base, sym) (sym) #else #ifdef VIMAGE -#error "No option VIMAGE yet!" +#define VSYM(base, sym) ((base)->_ ## sym) #else #define VSYM(base, sym) (base ## _0._ ## sym) #endif #endif +#ifndef VIMAGE_GLOBALS +#ifdef VIMAGE +#define VNET_SYMMAP(mod, name) \ + { #name, offsetof(struct vnet_ ## mod, _ ## name), \ + sizeof(((struct vnet_ ## mod *) curthread)->_ ## name) } +#else +#define VNET_SYMMAP(mod, name) \ + { #name, &(vnet_ ## mod ## _0._ ## name), \ + sizeof(vnet_ ## mod ## _0._ ## name) } +#endif +#define VNET_SYMMAP_END { NULL, 0 } +#endif /* !VIMAGE_GLOBALS */ + +#ifdef VIMAGE +struct vnet { + void *mod_data[VNET_MOD_MAX]; + LIST_ENTRY(vnet) vnet_le; /* all vnets list */ + u_int vnet_magic_n; +}; + +extern struct vnet *curvnet; +#endif + +#ifdef VIMAGE +#ifdef VNET_DEBUG +#define INIT_FROM_VNET(vnet, modindex, modtype, sym) \ + if (vnet != curvnet) \ + panic("in %s:%d %s()\n vnet=%p curvnet=%p", \ + __FILE__, __LINE__, __FUNCTION__, \ + vnet, curvnet); \ + modtype *sym = (vnet)->mod_data[modindex]; +#else /* !VNET_DEBUG */ +#define INIT_FROM_VNET(vnet, modindex, modtype, sym) \ + modtype *sym = (vnet)->mod_data[modindex]; +#endif /* !VNET_DEBUG */ +#else /* !VIMAGE */ +#define INIT_FROM_VNET(vnet, modindex, modtype, sym) +#endif + +#ifdef VIMAGE +LIST_HEAD(vnet_list_head, vnet); +extern struct vnet_list_head vnet_head; +#define VNET_ITERATOR_DECL(arg) struct vnet *arg; +#define VNET_FOREACH(arg) LIST_FOREACH(arg, &vnet_head, vnet_le) +#else +#define VNET_ITERATOR_DECL(arg) +#define VNET_FOREACH(arg) +#endif + /* Non-VIMAGE null-macros */ #define IS_DEFAULT_VNET(arg) 1 #define CURVNET_SET(arg) #define CURVNET_SET_QUIET(arg) #define CURVNET_RESTORE() #define VNET_ASSERT(condition) -#define INIT_FROM_VNET(vnet, modindex, modtype, sym) -#define VNET_ITERATOR_DECL(arg) -#define VNET_FOREACH(arg) #define VNET_LIST_RLOCK() #define VNET_LIST_RUNLOCK() #define INIT_VPROCG(arg) From owner-p4-projects@FreeBSD.ORG Thu Apr 16 04:48:29 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 30648106566B; Thu, 16 Apr 2009 04:48:28 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D6EC21065673 for ; Thu, 16 Apr 2009 04:48:27 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C542A8FC15 for ; Thu, 16 Apr 2009 04:48:27 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3G4mRIt019064 for ; Thu, 16 Apr 2009 04:48:27 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3G4mRUq019062 for perforce@freebsd.org; Thu, 16 Apr 2009 04:48:27 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 16 Apr 2009 04:48:27 GMT Message-Id: <200904160448.n3G4mRUq019062@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 160678 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, 16 Apr 2009 04:48:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=160678 Change 160678 by hselasky@hselasky_laptop001 on 2009/04/16 04:47:27 USB controller: Remove unused field. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/at91dci.h#3 edit .. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.h#5 edit .. //depot/projects/usb/src/sys/dev/usb/controller/uss820dci.h#3 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/at91dci.h#3 (text+ko) ==== @@ -203,7 +203,6 @@ struct at91dci_softc { struct usb2_bus sc_bus; union at91dci_hub_temp sc_hub_temp; - LIST_HEAD(, usb2_xfer) sc_interrupt_list_head; struct usb2_device *sc_devices[AT91_MAX_DEVICES]; struct resource *sc_io_res; ==== //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.h#5 (text+ko) ==== @@ -236,7 +236,6 @@ struct atmegadci_softc { struct usb2_bus sc_bus; union atmegadci_hub_temp sc_hub_temp; - LIST_HEAD(, usb2_xfer) sc_interrupt_list_head; /* must be set by by the bus interface layer */ atmegadci_clocks_t *sc_clocks_on; ==== //depot/projects/usb/src/sys/dev/usb/controller/uss820dci.h#3 (text+ko) ==== @@ -344,7 +344,6 @@ struct uss820dci_softc { struct usb2_bus sc_bus; union uss820_hub_temp sc_hub_temp; - LIST_HEAD(, usb2_xfer) sc_interrupt_list_head; struct usb2_device *sc_devices[USS820_MAX_DEVICES]; struct resource *sc_io_res; From owner-p4-projects@FreeBSD.ORG Thu Apr 16 11:58:49 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 352131065678; Thu, 16 Apr 2009 11:58:49 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CC4C91065676 for ; Thu, 16 Apr 2009 11:58:48 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9DCD88FC16 for ; Thu, 16 Apr 2009 11:58:48 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3GBwm4T086909 for ; Thu, 16 Apr 2009 11:58:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3GBwmvZ086907 for perforce@freebsd.org; Thu, 16 Apr 2009 11:58:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 16 Apr 2009 11:58:48 GMT Message-Id: <200904161158.n3GBwmvZ086907@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 160688 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, 16 Apr 2009 11:58:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=160688 Change 160688 by rwatson@rwatson_cinnamon on 2009/04/16 11:58:21 Add Gary Hoo to CREDITS. Affected files ... .. //depot/projects/trustedbsd/openbsm/CREDITS#6 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/CREDITS#6 (text+ko) ==== @@ -28,6 +28,7 @@ Xin LI Stacey Son Todd Heberlein + Gary Hoo In addition, Coverity, Inc.'s Prevent(tm) static analysis tool and Gimpel Software's FlexeLint tool were used to identify a number of bugs in the From owner-p4-projects@FreeBSD.ORG Thu Apr 16 12:17:08 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D3D6106566C; Thu, 16 Apr 2009 12:17:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BEE67106564A for ; Thu, 16 Apr 2009 12:17:07 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A35398FC14 for ; Thu, 16 Apr 2009 12:17:07 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3GCH7aZ089955 for ; Thu, 16 Apr 2009 12:17:07 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3GCH7aG089953 for perforce@freebsd.org; Thu, 16 Apr 2009 12:17:07 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 16 Apr 2009 12:17:07 GMT Message-Id: <200904161217.n3GCH7aG089953@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 160690 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, 16 Apr 2009 12:17:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=160690 Change 160690 by rwatson@rwatson_cinnamon on 2009/04/16 12:16:39 Update install instructions, version information for OpenBSM 1.1. Affected files ... .. //depot/projects/trustedbsd/openbsm/INSTALL#6 edit .. //depot/projects/trustedbsd/openbsm/NEWS#39 edit .. //depot/projects/trustedbsd/openbsm/TODO#13 edit .. //depot/projects/trustedbsd/openbsm/VERSION#24 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/INSTALL#6 (text+ko) ==== @@ -2,9 +2,8 @@ OpenBSM is currently built using autoconf and automake, which should allow for building on a range of operating systems, including FreeBSD, Mac OS X, -and Linux. Depending on the availability of audit facilities in the -underlying operating system, some components that depend on kernel audit -support are built conditionally. Typically, build will be performed using: +and Linux. Some components are built only if appropriate kernel audit +suppport is found. Typical builds will be performed using: ./configure make @@ -15,10 +14,14 @@ CFLAGS="-Wall -Werror" ./configure -To install, use: +To install the library, binaries, and man pages, use: make install +The OpenBSM install will not install files in /etc; these have to be +manually installed or merged. Currently, the locations of these files are +not configurable. + You may wish to specify that the OpenBSM components not be installed in the base system, rather in a specific directory. This may be done using the --prefix argument to configure. If installing to a specific directory, @@ -29,7 +32,3 @@ make make install LD_LIBRARY_PATH=/home/rwatson/openbsm/libbsm ; export LD_LIBRARY_PATH - -You will need to manually propagate openbsm/etc/* into /etc/security on your -system; this is not done automatically so as to avoid disrupting the current -configuration. Currently, the locations of these files is not configurable. ==== //depot/projects/trustedbsd/openbsm/NEWS#39 (text+ko) ==== @@ -1,6 +1,6 @@ OpenBSM Version History -OpenBSM 1.1 beta 2 +OpenBSM 1.1 - Change auditon(2) parameters and data structures to be 32/64-bit architecture independent. Add more information to man page about auditon(2) parameters. @@ -447,4 +447,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/NEWS#38 $ +$P4: //depot/projects/trustedbsd/openbsm/NEWS#39 $ ==== //depot/projects/trustedbsd/openbsm/TODO#13 (text+ko) ==== @@ -16,11 +16,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. -- Put hostname in trail file name. - Document audit_warn event arguments. - Allow the path /etc/security to be configured at configure-time so that alternative locations can be used. - NLS support for au_strerror(3), which provides error strings for BSM errors not available on the local OS platform. -$P4: //depot/projects/trustedbsd/openbsm/TODO#12 $ +$P4: //depot/projects/trustedbsd/openbsm/TODO#13 $ ==== //depot/projects/trustedbsd/openbsm/VERSION#24 (text+ko) ==== @@ -1,1 +1,1 @@ -OPENBSM_1_1_BETA_1 +OPENBSM_1_1 From owner-p4-projects@FreeBSD.ORG Thu Apr 16 12:19:10 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 33DD7106567F; Thu, 16 Apr 2009 12:19:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E64481065679 for ; Thu, 16 Apr 2009 12:19:09 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D2D1C8FC1A for ; Thu, 16 Apr 2009 12:19:09 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3GCJ97J090079 for ; Thu, 16 Apr 2009 12:19:09 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3GCJ9Ru090077 for perforce@freebsd.org; Thu, 16 Apr 2009 12:19:09 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 16 Apr 2009 12:19:09 GMT Message-Id: <200904161219.n3GCJ9Ru090077@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 160691 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, 16 Apr 2009 12:19:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=160691 Change 160691 by rwatson@rwatson_cinnamon on 2009/04/16 12:18:14 Add news of the new audit class 'aa'. Affected files ... .. //depot/projects/trustedbsd/openbsm/NEWS#40 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/NEWS#40 (text+ko) ==== @@ -15,6 +15,8 @@ generated by audit_submit(3) were improperly encoded has been fixed. - Fix example in audit_submit(3) man page. Also, make it clear that we want the audit ID as the argument. +- A new audit event class 'aa', for post-login authentication and + authorization events, has been added. OpenBSM 1.1 beta 1 @@ -447,4 +449,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/NEWS#39 $ +$P4: //depot/projects/trustedbsd/openbsm/NEWS#40 $ From owner-p4-projects@FreeBSD.ORG Thu Apr 16 12:30:23 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F1E561065724; Thu, 16 Apr 2009 12:30:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 95CC11065714 for ; Thu, 16 Apr 2009 12:30:21 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7F1F08FC1A for ; Thu, 16 Apr 2009 12:30:21 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3GCULx7092213 for ; Thu, 16 Apr 2009 12:30:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3GCULFB092211 for perforce@freebsd.org; Thu, 16 Apr 2009 12:30:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 16 Apr 2009 12:30:21 GMT Message-Id: <200904161230.n3GCULFB092211@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 160692 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, 16 Apr 2009 12:30:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=160692 Change 160692 by rwatson@rwatson_cinnamon on 2009/04/16 12:30:09 Bump OpenBSM version in configure.ac to 1.1; regenerate generated files, upgrading automake versions along the way. Affected files ... .. //depot/projects/trustedbsd/openbsm/Makefile.in#10 edit .. //depot/projects/trustedbsd/openbsm/aclocal.m4#4 edit .. //depot/projects/trustedbsd/openbsm/bin/Makefile.in#11 edit .. //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#12 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#11 edit .. //depot/projects/trustedbsd/openbsm/bin/auditfilterd/Makefile.in#8 edit .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.in#10 edit .. //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile.in#10 edit .. //depot/projects/trustedbsd/openbsm/bsm/Makefile.in#10 edit .. //depot/projects/trustedbsd/openbsm/config/ltmain.sh#6 edit .. //depot/projects/trustedbsd/openbsm/configure#52 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#51 edit .. //depot/projects/trustedbsd/openbsm/libauditd/Makefile.in#3 edit .. //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#15 edit .. //depot/projects/trustedbsd/openbsm/man/Makefile.in#9 edit .. //depot/projects/trustedbsd/openbsm/modules/Makefile.in#7 edit .. //depot/projects/trustedbsd/openbsm/modules/auditfilter_noop/Makefile.in#8 edit .. //depot/projects/trustedbsd/openbsm/sys/Makefile.in#4 edit .. //depot/projects/trustedbsd/openbsm/sys/bsm/Makefile.in#7 edit .. //depot/projects/trustedbsd/openbsm/test/Makefile.in#8 edit .. //depot/projects/trustedbsd/openbsm/test/bsm/Makefile.in#8 edit .. //depot/projects/trustedbsd/openbsm/tools/Makefile.in#11 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/Makefile.in#10 (text+ko) ==== @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/Makefile.in#9 $ +# $P4: //depot/projects/trustedbsd/openbsm/Makefile.in#10 $ # VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ @@ -97,6 +97,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -121,6 +122,7 @@ MAKEINFO = @MAKEINFO@ MIG = @MIG@ MKDIR_P = @MKDIR_P@ +NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -184,6 +186,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = bsm $(am__append_1) libbsm bin man modules sys @@ -332,8 +335,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -358,8 +361,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -369,13 +372,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -446,6 +448,10 @@ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) +dist-lzma: distdir + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma + $(am__remove_distdir) + dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -472,6 +478,8 @@ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ + unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ @@ -623,8 +631,8 @@ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-generic \ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \ - distclean-generic distclean-hdr distclean-libtool \ + dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \ + distclean distclean-generic distclean-hdr distclean-libtool \ distclean-tags distcleancheck distdir distuninstallcheck dvi \ dvi-am html html-am info info-am install install-am \ install-data install-data-am install-dvi install-dvi-am \ ==== //depot/projects/trustedbsd/openbsm/aclocal.m4#4 (text+ko) ==== @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.10 -*- Autoconf -*- +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,14 +11,17 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -m4_if(m4_PACKAGE_VERSION, [2.61],, -[m4_fatal([this file was generated for autoconf 2.61. -You have another version of autoconf. If you want to use that, -you should regenerate the build system entirely.], [63])]) +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +m4_if(AC_AUTOCONF_VERSION, [2.62],, +[m4_warning([this file was generated for autoconf 2.62. +You have another version of autoconf. It may work, but is not guaranteed to. +If you have problems, you may need to regenerate the build system entirely. +To do so, use the procedure documented by the package, typically `autoreconf'.])]) # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# serial 51 AC_PROG_LIBTOOL +# serial 52 AC_PROG_LIBTOOL # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) @@ -106,7 +109,6 @@ AC_REQUIRE([AC_OBJEXT])dnl AC_REQUIRE([AC_EXEEXT])dnl dnl - AC_LIBTOOL_SYS_MAX_CMD_LEN AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE AC_LIBTOOL_OBJDIR @@ -208,6 +210,8 @@ ;; esac +_LT_REQUIRED_DARWIN_CHECKS + AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], enable_win32_dll=yes, enable_win32_dll=no) @@ -287,10 +291,81 @@ echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` -$rm conftest* +$rm -r conftest* ])# _LT_LINKER_BOILERPLATE +# _LT_REQUIRED_DARWIN_CHECKS +# -------------------------- +# Check for some things on darwin +AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[ + case $host_os in + rhapsody* | darwin*) + AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) + AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) + AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], + [lt_cv_apple_cc_single_mod=no + if test -z "${LT_MULTI_MODULE}"; then + # By default we will add the -single_module flag. You can override + # by either setting the environment variable LT_MULTI_MODULE + # non-empty at configure time, or by adding -multi_module to the + # link flags. + echo "int foo(void){return 1;}" > conftest.c + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ + -dynamiclib ${wl}-single_module conftest.c + if test -f libconftest.dylib; then + lt_cv_apple_cc_single_mod=yes + rm -rf libconftest.dylib* + fi + rm conftest.c + fi]) + AC_CACHE_CHECK([for -exported_symbols_list linker flag], + [lt_cv_ld_exported_symbols_list], + [lt_cv_ld_exported_symbols_list=no + save_LDFLAGS=$LDFLAGS + echo "_main" > conftest.sym + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], + [lt_cv_ld_exported_symbols_list=yes], + [lt_cv_ld_exported_symbols_list=no]) + LDFLAGS="$save_LDFLAGS" + ]) + case $host_os in + rhapsody* | darwin1.[[0123]]) + _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + darwin1.*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + darwin*) + # if running on 10.5 or later, the deployment target defaults + # to the OS version, if on x86, and 10.4, the deployment + # target defaults to 10.4. Don't you love it? + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in + 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + 10.[[012]]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + 10.*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + esac + ;; + esac + if test "$lt_cv_apple_cc_single_mod" = "yes"; then + _lt_dar_single_mod='$single_module' + fi + if test "$lt_cv_ld_exported_symbols_list" = "yes"; then + _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + else + _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" + fi + if test "$DSYMUTIL" != ":"; then + _lt_dsymutil="~$DSYMUTIL \$lib || :" + else + _lt_dsymutil= + fi + ;; + esac +]) + # _LT_AC_SYS_LIBPATH_AIX # ---------------------- # Links a minimal program and checks the executable @@ -614,7 +689,11 @@ *64-bit*) case $lt_cv_prog_gnu_ld in yes*) LD="${LD-ld} -m elf64_sparc" ;; - *) LD="${LD-ld} -64" ;; + *) + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then + LD="${LD-ld} -64" + fi + ;; esac ;; esac @@ -707,7 +786,7 @@ $2=yes fi fi - $rm conftest* + $rm -r conftest* LDFLAGS="$save_LDFLAGS" ]) @@ -978,7 +1057,7 @@ AC_CHECK_FUNC([shl_load], [lt_cv_dlopen="shl_load"], [AC_CHECK_LIB([dld], [shl_load], - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], + [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], [AC_CHECK_FUNC([dlopen], [lt_cv_dlopen="dlopen"], [AC_CHECK_LIB([dl], [dlopen], @@ -986,7 +1065,7 @@ [AC_CHECK_LIB([svld], [dlopen], [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], [AC_CHECK_LIB([dld], [dld_link], - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) + [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) ]) ]) ]) @@ -1303,7 +1382,7 @@ soname_spec='${libname}${release}${shared_ext}$major' ;; -aix4* | aix5*) +aix[[4-9]]*) version_type=linux need_lib_prefix=no need_version=no @@ -1824,6 +1903,13 @@ AC_MSG_RESULT([$dynamic_linker]) test "$dynamic_linker" = no && can_build_shared=no +AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec], +[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"]) +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec], +[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"]) +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" @@ -2323,7 +2409,7 @@ # whether `pass_all' will *always* work, you probably want this one. case $host_os in -aix4* | aix5*) +aix[[4-9]]*) lt_cv_deplibs_check_method=pass_all ;; @@ -2759,7 +2845,7 @@ fi ;; -aix4* | aix5*) +aix[[4-9]]*) if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then test "$enable_shared" = yes && enable_static=no fi @@ -2816,6 +2902,7 @@ _LT_AC_TAGVAR(predeps, $1)= _LT_AC_TAGVAR(postdeps, $1)= _LT_AC_TAGVAR(compiler_lib_search_path, $1)= +_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= # Source file extension for C++ test sources. ac_ext=cpp @@ -2925,7 +3012,7 @@ # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; - aix4* | aix5*) + aix[[4-9]]*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -2938,7 +3025,7 @@ # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) for ld_flag in $LDFLAGS; do case $ld_flag in *-brtl*) @@ -3084,52 +3171,24 @@ fi ;; darwin* | rhapsody*) - case $host_os in - rhapsody* | darwin1.[[012]]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[[012]]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - ;; - 10.*) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' - ;; - esac - fi - ;; - esac _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no _LT_AC_TAGVAR(hardcode_direct, $1)=no _LT_AC_TAGVAR(hardcode_automatic, $1)=yes _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - - if test "$GXX" = yes ; then - lt_int_apple_cc_single_mod=no + _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" + if test "$GXX" = yes ; then output_verbose_link_cmd='echo' - if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then - lt_int_apple_cc_single_mod=yes + _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + if test "$lt_cv_apple_cc_single_mod" != "yes"; then + _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" fi - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - fi - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else case $cc_basename in xlc*) output_verbose_link_cmd='echo' @@ -3379,7 +3438,7 @@ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' ;; - pgCC*) + pgCC* | pgcpp*) # Portland Group C++ compiler _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' @@ -3814,7 +3873,8 @@ # compiler output when linking a shared library. # Parse the compiler output and extract the necessary # objects, libraries and library flags. -AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[ +AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP], +[AC_REQUIRE([LT_AC_PROG_SED])dnl dnl we can't use the lt_simple_compile_test_code here, dnl because it contains code intended for an executable, dnl not a library. It's possible we should let each @@ -3939,6 +3999,11 @@ $rm -f confest.$objext +_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= +if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then + _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` +fi + # PORTME: override above test on systems where it is broken ifelse([$1],[CXX], [case $host_os in @@ -3995,7 +4060,6 @@ ;; esac ]) - case " $_LT_AC_TAGVAR(postdeps, $1) " in *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; esac @@ -4080,7 +4144,7 @@ postinstall_cmds='$RANLIB $lib' fi ;; -aix4* | aix5*) +aix[[4-9]]*) if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then test "$enable_shared" = yes && enable_static=no fi @@ -4257,6 +4321,7 @@ _LT_AC_TAGVAR(predeps, $1) \ _LT_AC_TAGVAR(postdeps, $1) \ _LT_AC_TAGVAR(compiler_lib_search_path, $1) \ + _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \ _LT_AC_TAGVAR(archive_cmds, $1) \ _LT_AC_TAGVAR(archive_expsym_cmds, $1) \ _LT_AC_TAGVAR(postinstall_cmds, $1) \ @@ -4319,7 +4384,7 @@ # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) # NOTE: Changes made to this file will be lost: look at ltmain.sh. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 # Free Software Foundation, Inc. # # This file is part of GNU Libtool: @@ -4556,6 +4621,10 @@ # shared library. postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) +# The directories searched by this compiler when creating a shared +# library +compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1) + # The library search path used internally by the compiler when linking # a shared library. compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) @@ -4905,7 +4974,7 @@ echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD cat conftest.$ac_ext >&5 fi - rm -f conftest* conftst* + rm -rf conftest* conftst* # Do not use the global_symbol_pipe unless it works. if test "$pipe_works" = yes; then @@ -4962,7 +5031,8 @@ # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' + m4_if([$1], [GCJ], [], + [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ;; darwin* | rhapsody*) # PIC is the default on this platform @@ -4999,7 +5069,7 @@ esac else case $host_os in - aix4* | aix5*) + aix[[4-9]]*) # All AIX code is PIC. if test "$host_cpu" = ia64; then # AIX 5 now supports IA64 processor @@ -5095,7 +5165,7 @@ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ;; - pgCC*) + pgCC* | pgcpp*) # Portland Group C++ compiler. _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' @@ -5246,7 +5316,8 @@ # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' + m4_if([$1], [GCJ], [], + [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ;; darwin* | rhapsody*) @@ -5316,7 +5387,8 @@ mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' + m4_if([$1], [GCJ], [], + [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ;; hpux9* | hpux10* | hpux11*) @@ -5453,7 +5525,7 @@ # if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], - _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1), + _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1), [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in "" | " "*) ;; @@ -5477,7 +5549,7 @@ # wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], - _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), + _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1), $lt_tmp_static_flag, [], [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) @@ -5493,7 +5565,7 @@ ifelse([$1],[CXX],[ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' case $host_os in - aix4* | aix5*) + aix[[4-9]]*) # If we're using GNU nm, then we don't want the "-C" option. # -C means demangle to AIX nm, but means don't demangle with GNU nm if $NM -V 2>&1 | grep 'GNU' > /dev/null; then @@ -5512,6 +5584,7 @@ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; esac + _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] ],[ runpath_var= _LT_AC_TAGVAR(allow_undefined_flag, $1)= @@ -5542,12 +5615,14 @@ # it will be wrapped by ` (' and `)$', so one must not match beginning or # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', # as well as any symbol that contains `d'. - _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_" + _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if # the symbol is explicitly referenced. Since portable code cannot # rely on this symbol name, it's probably fine to never include it in # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. +dnl Note also adjust exclude_expsyms for C++ above. extract_expsyms_cmds= # Just being paranoid about ensuring that cc_basename is set. _LT_CC_BASENAME([$compiler]) @@ -5597,7 +5672,7 @@ # See if GNU ld supports shared libraries. case $host_os in - aix3* | aix4* | aix5*) + aix[[3-9]]*) # On AIX/PPC, the GNU linker is very broken if test "$host_cpu" != ia64; then _LT_AC_TAGVAR(ld_shlibs, $1)=no @@ -5816,7 +5891,7 @@ fi ;; - aix4* | aix5*) + aix[[4-9]]*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -5836,7 +5911,7 @@ # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) for ld_flag in $LDFLAGS; do if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then aix_use_runtimelinking=yes @@ -5996,11 +6071,10 @@ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes if test "$GCC" = yes ; then output_verbose_link_cmd='echo' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" else case $cc_basename in xlc*) @@ -6581,7 +6655,7 @@ AC_MSG_RESULT([$SED]) ]) -# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -6596,7 +6670,7 @@ [am__api_version='1.10' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.10], [], +m4_if([$1], [1.10.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -6612,8 +6686,10 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.10])dnl -_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) +[AM_AUTOMAKE_VERSION([1.10.1])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- @@ -6885,7 +6961,7 @@ # each Makefile.in and add a new line on top of each file to say so. # Grep'ing the whole file is not good either: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then dirpart=`AS_DIRNAME("$mf")` else continue @@ -6933,13 +7009,13 @@ # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# 2005, 2006, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 12 +# serial 13 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -7044,16 +7120,17 @@ # our stamp files there. AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers. +_am_arg=$1 _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $1 | $1:* ) + $_am_arg | $_am_arg:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # @@ -7354,7 +7431,7 @@ # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- -# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. # This macro is traced by Automake. AC_DEFUN([_AM_SUBST_NOTMAKE]) ==== //depot/projects/trustedbsd/openbsm/bin/Makefile.in#11 (text+ko) ==== @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile.in#10 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile.in#11 $ # VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ @@ -82,6 +82,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -106,6 +107,7 @@ MAKEINFO = @MAKEINFO@ MIG = @MIG@ MKDIR_P = @MKDIR_P@ +NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -169,6 +171,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = auditfilterd auditreduce praudit $(am__append_1) @@ -286,8 +289,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -312,8 +315,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -323,13 +326,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique ==== //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#12 (text+ko) ==== @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#11 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#12 $ # VPATH = @srcdir@ @@ -55,7 +55,7 @@ @USE_MACH_IPC_TRUE@ audit.$(OBJEXT) audit_OBJECTS = $(am_audit_OBJECTS) audit_DEPENDENCIES = $(top_builddir)/libbsm/libbsm.la -DEFAULT_INCLUDES = -I. -I$(top_builddir)/config@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/config depcomp = $(SHELL) $(top_srcdir)/config/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -94,6 +94,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -118,6 +119,7 @@ MAKEINFO = @MAKEINFO@ MIG = @MIG@ MKDIR_P = @MKDIR_P@ +NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -181,6 +183,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @USE_NATIVE_INCLUDES_FALSE@INCLUDES = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/sys @@ -232,8 +235,8 @@ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \ else :; fi; \ done @@ -341,8 +344,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -354,8 +357,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -365,13 +368,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique ==== //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#11 (text+ko) ==== @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#10 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#11 $ # VPATH = @srcdir@ @@ -60,7 +60,7 @@ auditd_OBJECTS = $(am_auditd_OBJECTS) auditd_DEPENDENCIES = $(top_builddir)/libbsm/libbsm.la \ $(top_builddir)/libauditd/libauditd.la -DEFAULT_INCLUDES = -I. -I$(top_builddir)/config@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/config depcomp = $(SHELL) $(top_srcdir)/config/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -99,6 +99,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -123,6 +124,7 @@ MAKEINFO = @MAKEINFO@ MIG = @MIG@ MKDIR_P = @MKDIR_P@ +NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Apr 16 12:41:34 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0358E1065758; Thu, 16 Apr 2009 12:41:34 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 670EF106571E for ; Thu, 16 Apr 2009 12:41:33 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4F0708FC17 for ; Thu, 16 Apr 2009 12:41:33 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3GCfX5t093073 for ; Thu, 16 Apr 2009 12:41:33 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3GCfWue093071 for perforce@freebsd.org; Thu, 16 Apr 2009 12:41:32 GMT (envelope-from zec@fer.hr) Date: Thu, 16 Apr 2009 12:41:32 GMT Message-Id: <200904161241.n3GCfWue093071@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 160693 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, 16 Apr 2009 12:41:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=160693 Change 160693 by zec@zec_amdx2 on 2009/04/16 12:41:22 Make GENERIC + options VIMAGE + nooptions SCTP compile. Affected files ... .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_socket.c#12 edit .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#16 edit .. //depot/projects/vimage-commit2/src/sys/kern/kern_mib.c#12 edit .. //depot/projects/vimage-commit2/src/sys/kern/kern_sysctl.c#8 edit .. //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#16 edit .. //depot/projects/vimage-commit2/src/sys/net/if.c#43 edit .. //depot/projects/vimage-commit2/src/sys/net/if_gif.c#23 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_base.c#24 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_eiface.c#18 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_ether.c#12 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_iface.c#16 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_divert.c#24 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#38 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#34 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_mroute.c#13 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_input.c#28 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.c#28 edit .. //depot/projects/vimage-commit2/src/sys/sys/sysctl.h#18 edit .. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#39 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_socket.c#12 (text+ko) ==== @@ -584,8 +584,10 @@ linux_socket(struct thread *td, struct linux_socket_args *args) { #ifdef INET6 +#ifndef KLD_MODULE INIT_VNET_INET6(curvnet); #endif +#endif struct socket_args /* { int domain; int type; ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#16 (text+ko) ==== @@ -213,6 +213,7 @@ int ipfattach() { + INIT_VNET_INET(curvnet); #ifdef USE_SPL int s; #endif @@ -264,6 +265,7 @@ */ int ipfdetach() { + INIT_VNET_INET(curvnet); #ifdef USE_SPL int s; #endif @@ -646,6 +648,7 @@ fr_info_t *fin; mb_t *m, **mpp; { + INIT_VNET_INET(curvnet); fr_info_t fnew; ip_t *ip, *oip; int hlen; ==== //depot/projects/vimage-commit2/src/sys/kern/kern_mib.c#12 (text+ko) ==== @@ -208,9 +208,8 @@ SYSCTL_STRING(_hw, HW_MACHINE_ARCH, machine_arch, CTLFLAG_RD, machine_arch, 0, "System architecture"); -#ifndef VIMAGE +/* should become #ifndef VIMAGE */ char hostname[MAXHOSTNAMELEN]; -#endif /* * This mutex is used to protect the hostname and domainname variables, and @@ -349,9 +348,8 @@ 0, 0, sysctl_kern_config, "", "Kernel configuration file"); #endif -#ifndef VIMAGE +/* should become #ifndef VIMAGE */ char domainname[MAXHOSTNAMELEN]; /* Protected by hostname_mtx. */ -#endif static int sysctl_domainname(SYSCTL_HANDLER_ARGS) ==== //depot/projects/vimage-commit2/src/sys/kern/kern_sysctl.c#8 (text+ko) ==== @@ -934,6 +934,30 @@ return (error); } +#ifdef VIMAGE +int +sysctl_handle_v_int(SYSCTL_HANDLER_ARGS) +{ + int tmpout, error = 0; + + SYSCTL_RESOLVE_V_ARG1(); + + /* + * Attempt to get a coherent snapshot by making a copy of the data. + */ + tmpout = *(int *)arg1; + error = SYSCTL_OUT(req, &tmpout, sizeof(int)); + + if (error || !req->newptr) + return (error); + + if (!arg1) + error = EPERM; + else + error = SYSCTL_IN(req, arg1, sizeof(int)); + return (error); +} +#endif /* * Based on on sysctl_handle_int() convert milliseconds into ticks. @@ -1069,6 +1093,47 @@ return (error); } +#ifdef VIMAGE +int +sysctl_handle_v_string(SYSCTL_HANDLER_ARGS) +{ + int error=0; + char *tmparg; + size_t outlen; + + SYSCTL_RESOLVE_V_ARG1(); + + /* + * Attempt to get a coherent snapshot by copying to a + * temporary kernel buffer. + */ +retry: + outlen = strlen((char *)arg1)+1; + tmparg = malloc(outlen, M_SYSCTLTMP, M_WAITOK); + + if (strlcpy(tmparg, (char *)arg1, outlen) >= outlen) { + free(tmparg, M_SYSCTLTMP); + goto retry; + } + + error = SYSCTL_OUT(req, tmparg, outlen); + free(tmparg, M_SYSCTLTMP); + + if (error || !req->newptr) + return (error); + + if ((req->newlen - req->newidx) >= arg2) { + error = EINVAL; + } else { + arg2 = (req->newlen - req->newidx); + error = SYSCTL_IN(req, arg1, arg2); + ((char *)arg1)[arg2] = '\0'; + } + + return (error); +} +#endif + /* * Handle any kind of opaque data. * arg1 points to it, arg2 is the size. @@ -1106,6 +1171,35 @@ return (error); } +#ifdef VIMAGE +int +sysctl_handle_v_opaque(SYSCTL_HANDLER_ARGS) +{ + int error, tries; + u_int generation; + struct sysctl_req req2; + + SYSCTL_RESOLVE_V_ARG1(); + + tries = 0; + req2 = *req; +retry: + generation = curthread->td_generation; + error = SYSCTL_OUT(req, arg1, arg2); + if (error) + return (error); + tries++; + if (generation != curthread->td_generation && tries < 3) { + *req = req2; + goto retry; + } + + error = SYSCTL_IN(req, arg1, arg2); + + return (error); +} +#endif + /* * Transfer functions to/from kernel space. * XXX: rather untested at this point ==== //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#16 (text+ko) ==== @@ -49,9 +49,10 @@ static void vnet_mod_complete_registration(struct vnet_modlink *); static int vnet_mod_constructor(struct vnet_modlink *); +#ifdef VIMAGE /* curvnet should be thread-local - this is only a temporary step */ -#ifdef VIMAGE struct vnet *curvnet; +struct vnet_list_head vnet_head; #endif void @@ -159,16 +160,16 @@ if (vml->vml_iarg) printf("/%s", vml->vml_iname); printf(": "); - if (vmi->vmi_struct_size) - printf("malloc(%zu); ", vmi->vmi_struct_size); + if (vmi->vmi_size) + printf("malloc(%zu); ", vmi->vmi_size); if (vmi->vmi_iattach != NULL) printf("iattach()"); printf("\n"); #endif #ifdef VIMAGE - if (vmi->vmi_struct_size) { - void *mem = malloc(vmi->vmi_struct_size, M_VNET, + if (vmi->vmi_size) { + void *mem = malloc(vmi->vmi_size, M_VNET, M_NOWAIT | M_ZERO); if (mem == NULL) /* XXX should return error, not panic. */ panic("vi_alloc: malloc for %s\n", vmi->vmi_name); @@ -218,7 +219,9 @@ static void vi_init(void *unused) { +#ifdef VIMAGE struct vnet *vnet; +#endif TAILQ_INIT(&vnet_modlink_head); TAILQ_INIT(&vnet_modpending_head); ==== //depot/projects/vimage-commit2/src/sys/net/if.c#43 (text+ko) ==== @@ -186,6 +186,7 @@ static const vnet_modinfo_t vnet_net_modinfo = { .vmi_id = VNET_MOD_NET, .vmi_name = "net", + .vmi_size = sizeof(struct vnet_net), .vmi_symmap = vnet_net_symmap, .vmi_iattach = vnet_net_iattach }; ==== //depot/projects/vimage-commit2/src/sys/net/if_gif.c#23 (text+ko) ==== @@ -127,6 +127,7 @@ static const vnet_modinfo_t vnet_gif_modinfo = { .vmi_id = VNET_MOD_GIF, .vmi_name = "gif", + .vmi_size = sizeof(struct vnet_gif), .vmi_dependson = VNET_MOD_NET, .vmi_iattach = vnet_gif_iattach }; ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_base.c#24 (text+ko) ==== @@ -3075,6 +3075,7 @@ static int ngb_mod_event(module_t mod, int event, void *data) { + INIT_VNET_NETGRAPH(curvnet); /* XXX move to iattach - revisit! */ struct proc *p; struct thread *td; int i, error = 0; ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_eiface.c#18 (text+ko) ==== @@ -583,6 +583,7 @@ static int ng_eiface_mod_event(module_t mod, int event, void *data) { + INIT_VNET_NETGRAPH(curvnet); /* XXX move to iattach -> revisit! */ int error = 0; switch (event) { ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_ether.c#12 (text+ko) ==== @@ -741,6 +741,7 @@ static int ng_ether_mod_event(module_t mod, int event, void *data) { + INIT_VNET_NET(curvnet); /* XXX move to iattach - revisit! */ struct ifnet *ifp; int error = 0; int s; ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_iface.c#16 (text+ko) ==== @@ -829,6 +829,7 @@ static int ng_iface_mod_event(module_t mod, int event, void *data) { + INIT_VNET_NETGRAPH(curvnet); /* XXX move to iattach - revisit! */ int error = 0; switch (event) { ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_divert.c#24 (text+ko) ==== @@ -132,6 +132,7 @@ static void div_zone_change(void *tag) { + INIT_VNET_INET(curvnet); uma_zone_set_max(V_divcbinfo.ipi_zone, maxsockets); } @@ -719,6 +720,7 @@ static int div_modevent(module_t mod, int type, void *unused) { + INIT_VNET_INET(curvnet); /* XXX move to iattach - revisit!!! */ int err = 0; int n; ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#38 (text+ko) ==== @@ -1810,7 +1810,6 @@ add_table_entry(struct ip_fw_chain *ch, uint16_t tbl, in_addr_t addr, uint8_t mlen, uint32_t value) { - INIT_VNET_IPFW(curvnet); struct radix_node_head *rnh; struct table_entry *ent; struct radix_node *rn; @@ -4527,6 +4526,7 @@ static void ipfw_tick(void * __unused unused) { + INIT_VNET_IPFW(curvnet); struct mbuf *m0, *m, *mnext, **mtailp; int i; ipfw_dyn_rule *q; @@ -4710,6 +4710,7 @@ void ipfw_destroy(void) { + INIT_VNET_IPFW(curvnet); struct ip_fw *reap; ip_fw_chk_ptr = NULL; ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#34 (text+ko) ==== @@ -230,6 +230,7 @@ static const vnet_modinfo_t vnet_inet_modinfo = { .vmi_id = VNET_MOD_INET, .vmi_name = "inet", + .vmi_size = sizeof(struct vnet_inet) }; static void vnet_inet_register() ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_mroute.c#13 (text+ko) ==== @@ -1709,6 +1709,7 @@ static void X_rsvp_input(struct mbuf *m, int off __unused) { + INIT_VNET_INET(curvnet); if (!V_rsvp_on) m_freem(m); ==== //depot/projects/vimage-commit2/src/sys/netinet6/ip6_input.c#28 (text+ko) ==== @@ -161,6 +161,7 @@ static const vnet_modinfo_t vnet_inet6_modinfo = { .vmi_id = VNET_MOD_INET6, .vmi_name = "inet6", + .vmi_size = sizeof(struct vnet_inet6), .vmi_dependson = VNET_MOD_INET /* XXX revisit - TCP/UDP needs this? */ }; ==== //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.c#28 (text+ko) ==== @@ -248,6 +248,7 @@ static const vnet_modinfo_t vnet_ipsec_modinfo = { .vmi_id = VNET_MOD_IPSEC, .vmi_name = "ipsec", + .vmi_size = sizeof(struct vnet_inet), .vmi_dependson = VNET_MOD_INET, /* XXX revisit - INET6 ? */ .vmi_iattach = ipsec_iattach }; ==== //depot/projects/vimage-commit2/src/sys/sys/sysctl.h#18 (text+ko) ==== @@ -442,6 +442,29 @@ #define FEATURE(name, desc) \ SYSCTL_INT(_kern_features, OID_AUTO, name, CTLFLAG_RD, 0, 1, desc) +/* + * Resolve void *arg1 in a proper virtualization container. + */ +#ifdef VIMAGE +#define SYSCTL_RESOLVE_V_ARG1() do { \ + char *cp; \ + switch (oidp->oid_v_subs) { \ + case V_GLOBAL: \ + /* do nothing - this is NOT a virtualized variable! */ \ + break; \ + case V_NET: \ + cp = (char *) \ + TD_TO_VNET(curthread)->mod_data[oidp->oid_v_mod]; \ + arg1 = cp + (size_t) arg1; \ + break; \ + default: \ + panic("unsupported module id %d", oidp->oid_v_subs); \ + } \ +} while (0) +#else +#define SYSCTL_RESOLVE_V_ARG1() +#endif + #endif /* _KERNEL */ /* ==== //depot/projects/vimage-commit2/src/sys/sys/vimage.h#39 (text+ko) ==== @@ -59,7 +59,7 @@ char *vmi_name; vnet_attach_fn *vmi_iattach; vnet_detach_fn *vmi_idetach; - size_t vmi_struct_size; + size_t vmi_size; struct vnet_symmap *vmi_symmap; }; typedef struct vnet_modinfo vnet_modinfo_t; @@ -139,7 +139,7 @@ sizeof(((struct vnet_ ## mod *) curthread)->_ ## name) } #else #define VNET_SYMMAP(mod, name) \ - { #name, &(vnet_ ## mod ## _0._ ## name), \ + { #name, (size_t) &(vnet_ ## mod ## _0._ ## name), \ sizeof(vnet_ ## mod ## _0._ ## name) } #endif #define VNET_SYMMAP_END { NULL, 0 } @@ -181,6 +181,12 @@ #define VNET_FOREACH(arg) #endif +#ifdef VIMAGE +#define TD_TO_VNET(td) curvnet +#else +#define TD_TO_VNET(td) +#endif + /* Non-VIMAGE null-macros */ #define IS_DEFAULT_VNET(arg) 1 #define CURVNET_SET(arg) @@ -192,7 +198,6 @@ #define INIT_VPROCG(arg) #define INIT_VCPU(arg) #define TD_TO_VIMAGE(td) -#define TD_TO_VNET(td) #define TD_TO_VPROCG(td) #define TD_TO_VCPU(td) #define P_TO_VIMAGE(p) From owner-p4-projects@FreeBSD.ORG Thu Apr 16 12:45:38 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1206E1065779; Thu, 16 Apr 2009 12:45:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A7B4B1065775 for ; Thu, 16 Apr 2009 12:45:37 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 92D6D8FC16 for ; Thu, 16 Apr 2009 12:45:37 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3GCjbC7093382 for ; Thu, 16 Apr 2009 12:45:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3GCjb1d093380 for perforce@freebsd.org; Thu, 16 Apr 2009 12:45:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 16 Apr 2009 12:45:37 GMT Message-Id: <200904161245.n3GCjb1d093380@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 160694 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, 16 Apr 2009 12:45:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=160694 Change 160694 by rwatson@rwatson_cinnamon on 2009/04/16 12:45:36 Don't use BSD-specific st_ctimespec.tv_sec when portable st_ctime will do. Fixes the Linux build for bsm_control.c. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#33 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#33 (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#32 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#33 $ */ #include @@ -300,8 +300,8 @@ */ if (fstat(fileno(fp), &sbuf) < 0) goto closefp; - if (lastctime != sbuf.st_ctimespec.tv_sec) { - lastctime = sbuf.st_ctimespec.tv_sec; + if (lastctime != sbuf.st_ctime) { + lastctime = sbuf.st_ctime; closefp: fclose(fp); fp = NULL; From owner-p4-projects@FreeBSD.ORG Thu Apr 16 13:51:46 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C0F610656C9; Thu, 16 Apr 2009 13:51:45 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1257610656C2 for ; Thu, 16 Apr 2009 13:51:45 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 00FD48FC08 for ; Thu, 16 Apr 2009 13:51:45 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3GDpi7L010990 for ; Thu, 16 Apr 2009 13:51:44 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3GDpicO010988 for perforce@freebsd.org; Thu, 16 Apr 2009 13:51:44 GMT (envelope-from zec@fer.hr) Date: Thu, 16 Apr 2009 13:51:44 GMT Message-Id: <200904161351.n3GDpicO010988@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 160695 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, 16 Apr 2009 13:51:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=160695 Change 160695 by zec@zec_amdx2 on 2009/04/16 13:50:57 Small steps towards booting VIMAGE. Affected files ... .. //depot/projects/vimage-commit2/src/sys/kern/uipc_socket.c#14 edit .. //depot/projects/vimage-commit2/src/sys/net/if.c#44 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_rmx.c#27 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#26 edit .. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#40 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/kern/uipc_socket.c#14 (text+ko) ==== @@ -130,6 +130,7 @@ #include #include #include +#include #include @@ -284,6 +285,9 @@ mtx_lock(&so_global_mtx); so->so_gencnt = ++so_gencnt; ++numopensockets; +#ifdef VIMAGE + so->so_vnet = curvnet; +#endif mtx_unlock(&so_global_mtx); return (so); } ==== //depot/projects/vimage-commit2/src/sys/net/if.c#44 (text+ko) ==== @@ -598,6 +598,10 @@ panic ("%s: BUG: if_attach called without if_alloc'd input()\n", ifp->if_xname); +#ifdef VIMAGE + ifp->if_vnet = curvnet; +#endif + TASK_INIT(&ifp->if_linktask, 0, do_link_state_change, ifp); IF_AFDATA_LOCK_INIT(ifp); ifp->if_afdata_initialized = 0; @@ -911,6 +915,9 @@ knlist_destroy(&ifp->if_klist); ifq_detach(&ifp->if_snd); IF_AFDATA_DESTROY(ifp); +#ifdef VIMAGE + ifp->if_vnet = NULL; +#endif splx(s); } @@ -920,7 +927,10 @@ int if_addgroup(struct ifnet *ifp, const char *groupname) { +printf("%s #0 ifp->if_vnet=%p\n", __FUNCTION__, ifp); +printf("%s #1 ifp->if_vnet=%p\n", __FUNCTION__, ifp->if_vnet); INIT_VNET_NET(ifp->if_vnet); +printf("%s #2 ifp->if_vnet=%p\n", __FUNCTION__, ifp->if_vnet); struct ifg_list *ifgl; struct ifg_group *ifg = NULL; struct ifg_member *ifgm; ==== //depot/projects/vimage-commit2/src/sys/netinet6/in6_rmx.c#27 (text+ko) ==== @@ -288,8 +288,8 @@ static void in6_rtqtimo(void *rock) { - CURVNET_SET_QUIET((struct vnet *) rock); - INIT_VNET_INET6((struct vnet *) rock); + CURVNET_SET_QUIET((struct vnet *) rock); /* XXX revisit ! */ + INIT_VNET_INET6(curvnet); /* XXX revisit ! */ struct radix_node_head *rnh = rock; struct rtqk_arg arg; struct timeval atv; @@ -375,8 +375,8 @@ static void in6_mtutimo(void *rock) { - CURVNET_SET_QUIET((struct vnet *) rock); - INIT_VNET_INET6((struct vnet *) rock); + CURVNET_SET_QUIET((struct vnet *) rock); /* XXX revisit! */ + INIT_VNET_INET6(curvnet); /* XXX revisit! */ struct radix_node_head *rnh = rock; struct mtuex_arg arg; struct timeval atv; ==== //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#26 (text+ko) ==== @@ -592,8 +592,8 @@ void nd6_timer(void *arg) { - CURVNET_SET_QUIET((struct vnet *) arg); - INIT_VNET_INET6((struct vnet *) arg); + CURVNET_SET_QUIET((struct vnet *) arg); /* XXX revisit! */ + INIT_VNET_INET6(curvnet); /* XXX revisit! */ int s; struct nd_defrouter *dr; struct nd_prefix *pr; ==== //depot/projects/vimage-commit2/src/sys/sys/vimage.h#40 (text+ko) ==== @@ -39,6 +39,10 @@ #error "You cannot have both option VIMAGE and option VIMAGE_GLOBALS!" #endif +#ifdef INVARIANTS +#define VNET_DEBUG +#endif + typedef int vnet_attach_fn(const void *); typedef int vnet_detach_fn(const void *); @@ -157,15 +161,15 @@ #ifdef VIMAGE #ifdef VNET_DEBUG -#define INIT_FROM_VNET(vnet, modindex, modtype, sym) \ - if (vnet != curvnet) \ - panic("in %s:%d %s()\n vnet=%p curvnet=%p", \ - __FILE__, __LINE__, __FUNCTION__, \ - vnet, curvnet); \ - modtype *sym = (vnet)->mod_data[modindex]; +#define INIT_FROM_VNET(vnet, modindex, modtype, sym) \ + if (vnet == NULL || vnet != curvnet) \ + panic("in %s:%d %s()\n vnet=%p curvnet=%p", \ + __FILE__, __LINE__, __FUNCTION__, \ + vnet, curvnet); \ + modtype *sym = (vnet)->mod_data[modindex]; #else /* !VNET_DEBUG */ -#define INIT_FROM_VNET(vnet, modindex, modtype, sym) \ - modtype *sym = (vnet)->mod_data[modindex]; +#define INIT_FROM_VNET(vnet, modindex, modtype, sym) \ + modtype *sym = (vnet)->mod_data[modindex]; #endif /* !VNET_DEBUG */ #else /* !VIMAGE */ #define INIT_FROM_VNET(vnet, modindex, modtype, sym) From owner-p4-projects@FreeBSD.ORG Thu Apr 16 13:56:50 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9D8681065694; Thu, 16 Apr 2009 13:56:50 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 567021065690 for ; Thu, 16 Apr 2009 13:56:50 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 44EF58FC31 for ; Thu, 16 Apr 2009 13:56:50 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3GDuofw012123 for ; Thu, 16 Apr 2009 13:56:50 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3GDuopZ012121 for perforce@freebsd.org; Thu, 16 Apr 2009 13:56:50 GMT (envelope-from zec@fer.hr) Date: Thu, 16 Apr 2009 13:56:50 GMT Message-Id: <200904161356.n3GDuopZ012121@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 160696 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, 16 Apr 2009 13:56:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=160696 Change 160696 by zec@zec_amdx2 on 2009/04/16 13:56:32 Remove debugging printfs(). Affected files ... .. //depot/projects/vimage-commit2/src/sys/net/if.c#45 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/net/if.c#45 (text+ko) ==== @@ -927,10 +927,7 @@ int if_addgroup(struct ifnet *ifp, const char *groupname) { -printf("%s #0 ifp->if_vnet=%p\n", __FUNCTION__, ifp); -printf("%s #1 ifp->if_vnet=%p\n", __FUNCTION__, ifp->if_vnet); INIT_VNET_NET(ifp->if_vnet); -printf("%s #2 ifp->if_vnet=%p\n", __FUNCTION__, ifp->if_vnet); struct ifg_list *ifgl; struct ifg_group *ifg = NULL; struct ifg_member *ifgm; From owner-p4-projects@FreeBSD.ORG Thu Apr 16 14:02:57 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B9A610656EA; Thu, 16 Apr 2009 14:02:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D77D110656EC for ; Thu, 16 Apr 2009 14:02:56 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AA5B08FC27 for ; Thu, 16 Apr 2009 14:02:56 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3GE2uq8012855 for ; Thu, 16 Apr 2009 14:02:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3GE2uma012853 for perforce@freebsd.org; Thu, 16 Apr 2009 14:02:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 16 Apr 2009 14:02:56 GMT Message-Id: <200904161402.n3GE2uma012853@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 160697 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, 16 Apr 2009 14:02:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=160697 Change 160697 by rwatson@rwatson_cinnamon on 2009/04/16 14:02:21 Define _GNU_SOURCE so that we can use strcasecmp() on Linux. Affected files ... .. //depot/projects/trustedbsd/openbsm/config/config.h.in#17 edit .. //depot/projects/trustedbsd/openbsm/configure#53 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#52 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/config/config.h.in#17 (text+ko) ==== @@ -192,6 +192,9 @@ /* Version number of package */ #undef VERSION +/* Use extended API on platforms that require it */ +#undef _GNU_SOURCE + /* Define to empty if `const' does not conform to ANSI C. */ #undef const ==== //depot/projects/trustedbsd/openbsm/configure#53 (xtext) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#50 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#51 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.62 for OpenBSM 1.1. # @@ -20602,6 +20602,12 @@ done + +cat >>confdefs.h <<\_ACEOF +#define _GNU_SOURCE /**/ +_ACEOF + + # Checks for typedefs, structures, and compiler characteristics. { $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 $as_echo_n "checking for an ANSI C-conforming const... " >&6; } ==== //depot/projects/trustedbsd/openbsm/configure.ac#52 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.1], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#51 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#52 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) @@ -37,6 +37,8 @@ AC_HEADER_SYS_WAIT AC_CHECK_HEADERS([endian.h mach/mach.h machine/endian.h sys/endian.h stdint.h]) +AC_DEFINE([_GNU_SOURCE],,[Use extended API on platforms that require it]) + # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST AC_TYPE_UID_T From owner-p4-projects@FreeBSD.ORG Thu Apr 16 14:07:01 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5F69A1065672; Thu, 16 Apr 2009 14:07:01 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1FCF3106566C for ; Thu, 16 Apr 2009 14:07:01 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0F2068FC13 for ; Thu, 16 Apr 2009 14:07:01 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3GE70m7014138 for ; Thu, 16 Apr 2009 14:07:00 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3GE703t014136 for perforce@freebsd.org; Thu, 16 Apr 2009 14:07:00 GMT (envelope-from zec@fer.hr) Date: Thu, 16 Apr 2009 14:07:00 GMT Message-Id: <200904161407.n3GE703t014136@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 160698 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, 16 Apr 2009 14:07:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=160698 Change 160698 by zec@zec_amdx2 on 2009/04/16 14:06:53 Attempt to unbreak a few obscure virtualized sysctl cases. Affected files ... .. //depot/projects/vimage-commit2/src/sys/kern/kern_sysctl.c#9 edit .. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#35 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/kern/kern_sysctl.c#9 (text+ko) ==== @@ -968,7 +968,9 @@ { int error, s, tt; - tt = *(int *)oidp->oid_arg1; + SYSCTL_RESOLVE_V_ARG1(); + + tt = *(int *)arg1; s = (int)((int64_t)tt * 1000 / hz); error = sysctl_handle_int(oidp, &s, 0, req); @@ -979,7 +981,7 @@ if (tt < 1) return (EINVAL); - *(int *)oidp->oid_arg1 = tt; + *(int *)arg1 = tt; return (0); } ==== //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#35 (text+ko) ==== @@ -126,7 +126,9 @@ INIT_VNET_INET(curvnet); int error; - error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req); + SYSCTL_RESOLVE_V_ARG1(); + + error = sysctl_handle_int(oidp, arg1, arg2, req); if (error == 0) { RANGECHK(V_ipport_lowfirstauto, 1, IPPORT_RESERVED - 1); RANGECHK(V_ipport_lowlastauto, 1, IPPORT_RESERVED - 1); From owner-p4-projects@FreeBSD.ORG Thu Apr 16 14:08:02 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D8A01065676; Thu, 16 Apr 2009 14:08:02 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4AC621065670 for ; Thu, 16 Apr 2009 14:08:02 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 37C188FC13 for ; Thu, 16 Apr 2009 14:08:02 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3GE826j014231 for ; Thu, 16 Apr 2009 14:08:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3GE82e3014229 for perforce@freebsd.org; Thu, 16 Apr 2009 14:08:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 16 Apr 2009 14:08:02 GMT Message-Id: <200904161408.n3GE82e3014229@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 160699 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, 16 Apr 2009 14:08:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=160699 Change 160699 by rwatson@rwatson_cinnamon_macosx on 2009/04/16 14:08:00 Mac OS X Leopard documents sys/param.h and sys/mount.h for statfs(), but it turns out it also requires queue.h? Affected files ... .. //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#10 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#10 (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/libauditd/auditd_lib.c#9 $ + * $P4: //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#10 $ */ #include @@ -34,13 +34,13 @@ #include #include -#include -#include #ifdef HAVE_FULL_QUEUE_H #include #else /* !HAVE_FULL_QUEUE_H */ #include #endif /* !HAVE_FULL_QUEUE_H */ +#include +#include #include #include From owner-p4-projects@FreeBSD.ORG Thu Apr 16 14:25:20 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7CEE61065674; Thu, 16 Apr 2009 14:25:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3BA31106564A for ; Thu, 16 Apr 2009 14:25:20 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0E4858FC13 for ; Thu, 16 Apr 2009 14:25:20 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3GEPJ1h016761 for ; Thu, 16 Apr 2009 14:25:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3GEPJAG016759 for perforce@freebsd.org; Thu, 16 Apr 2009 14:25:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 16 Apr 2009 14:25:19 GMT Message-Id: <200904161425.n3GEPJAG016759@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 160700 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, 16 Apr 2009 14:25:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=160700 Change 160700 by rwatson@rwatson_cinnamon on 2009/04/16 14:24:44 Update OpenBSM 1.1 README. Affected files ... .. //depot/projects/trustedbsd/openbsm/README#36 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/README#36 (text+ko) ==== @@ -1,15 +1,22 @@ -OpenBSM 1.1 beta 1 +OpenBSM 1.1 Introduction -OpenBSM provides an open source implementation of Sun's BSM Audit API. -Originally created under contract to Apple Computer by McAfee Research, this -implementation is now maintained by volunteers and the generous contribution -of several organizations. Coupled with a kernel audit implementation, -OpenBSM can be used to maintain system audit streams, and is a foundation for -an Audit-enabled system. Portions of OpenBSM, including include files and -token-building routines, are reusable in a kernel audit implementation, and -may be found in the FreeBSD and Mac OS X kernels. +OpenBSM is an open source implementation of Sun's BSM event auditing file +format and API. Originally created for Apple Computer by McAfee Research, +OpenBSM is now maintained by volunteers and through the generous contribution +of several organizations. + +OpenBSM includes several command line tools, including auditreduce(8) and +praudit(8) for reducing and printing audit trails, as well as the libbsm(3) +library to manage configuration files, generate audit records, and parse and +print audit trils. + +Coupled with a kernel audit implementation, OpenBSM can be used to maintain +system audit streams, and is a foundation for a full audit-enabled system. +Portions of OpenBSM, including include files and token-building routines, are +reusable in a kernel audit implementation, and may be found in the FreeBSD +and Mac OS X kernels. Contents @@ -17,7 +24,7 @@ bin/ Audit-related command line tools bsm/ Library include files for BSM - compat/ Compatibility code to build on various OS's + compat/ Compatibility code to build on various operating systems etc/ Sample /etc/security configuration files libauditd Common audit management functions for auditd and launchd libbsm/ Implementation of BSM library interfaces and man pages @@ -44,7 +51,8 @@ The TrustedBSD Project would appreciate the contribution of bug fixes, enhancements, etc, under identically or substantially similar licenses to -those present on the remainder of the OpenBSM source code. +those present on the remainder of the OpenBSM source code. Please see the +file CREDITS to learn more about who has contributed to the project. Location @@ -56,4 +64,4 @@ http://www.TrustedBSD.org/ -$P4: //depot/projects/trustedbsd/openbsm/README#35 $ +$P4: //depot/projects/trustedbsd/openbsm/README#36 $ From owner-p4-projects@FreeBSD.ORG Thu Apr 16 14:39:35 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF1E4106566C; Thu, 16 Apr 2009 14:39:34 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9EF45106564A for ; Thu, 16 Apr 2009 14:39:34 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8C5A28FC21 for ; Thu, 16 Apr 2009 14:39:34 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3GEdYYR018114 for ; Thu, 16 Apr 2009 14:39:34 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3GEdYr0018112 for perforce@freebsd.org; Thu, 16 Apr 2009 14:39:34 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 16 Apr 2009 14:39:34 GMT Message-Id: <200904161439.n3GEdYr0018112@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 160701 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, 16 Apr 2009 14:39:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=160701 Change 160701 by rwatson@rwatson_cinnamon_macosx on 2009/04/16 14:38:54 Remove xref to audit_filter(5) man page, as we don't have one yet. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.8#5 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.8#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/openbsm/bin/auditfilterd/auditfilterd.8#4 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.8#5 $ .\" .Dd October 3, 2006 .Dt AUDITFILTERD 8 @@ -42,9 +42,7 @@ .Nm daemon is an extensible audit event monitoring daemon, allowing pluggable modules to track audit events from a live audit source. -It is configured using the -.Xr audit_filter 5 -configuration file. +It is configured using the audit_filter configuration file. The source can either be a pipe or a file. .Pp The options are as follows: From owner-p4-projects@FreeBSD.ORG Thu Apr 16 14:42:38 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 28E6C1065676; Thu, 16 Apr 2009 14:42:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D76B2106566C for ; Thu, 16 Apr 2009 14:42:37 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C4EB98FC19 for ; Thu, 16 Apr 2009 14:42:37 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3GEgbpf018387 for ; Thu, 16 Apr 2009 14:42:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3GEgbcK018385 for perforce@freebsd.org; Thu, 16 Apr 2009 14:42:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 16 Apr 2009 14:42:37 GMT Message-Id: <200904161442.n3GEgbcK018385@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 160702 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, 16 Apr 2009 14:42:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=160702 Change 160702 by rwatson@rwatson_cinnamon_macosx on 2009/04/16 14:42:34 Add a warning about auditfilterd being experimental. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.8#6 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.8#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/bin/auditfilterd/auditfilterd.8#5 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.8#6 $ .\" .Dd October 3, 2006 .Dt AUDITFILTERD 8 @@ -80,3 +80,7 @@ .Nm daemon and audit filter APIs were created by .An Robert Watson . +.Sh BUGS +.Nm +is experimental, and should not be relied on in production. +APIs and services it offers can and will change in future OpenBSM releases. From owner-p4-projects@FreeBSD.ORG Thu Apr 16 15:15:12 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 81E2E106572E; Thu, 16 Apr 2009 15:15:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F115810656CC for ; Thu, 16 Apr 2009 15:15:10 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D35868FC1A for ; Thu, 16 Apr 2009 15:15:10 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3GFFAU3021772 for ; Thu, 16 Apr 2009 15:15:10 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3GFFANK021770 for perforce@freebsd.org; Thu, 16 Apr 2009 15:15:10 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 16 Apr 2009 15:15:10 GMT Message-Id: <200904161515.n3GFFANK021770@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 160703 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, 16 Apr 2009 15:15:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=160703 Change 160703 by rwatson@rwatson_fledge on 2009/04/16 15:15:01 OpenBSM 1.1 tarball, OpenBSM web page update, and news announcement. Affected files ... .. //depot/projects/trustedbsd/www/downloads/openbsm-1.1.tgz#1 add .. //depot/projects/trustedbsd/www/news.page#22 edit .. //depot/projects/trustedbsd/www/openbsm.page#37 edit Differences ... ==== //depot/projects/trustedbsd/www/news.page#22 (text+ko) ==== @@ -37,7 +37,7 @@ - $P4: //depot/projects/trustedbsd/www/news.page#21 $ + $P4: //depot/projects/trustedbsd/www/news.page#22 $ @@ -50,6 +50,15 @@
    +
    April 16, 2009 OpenBSM 1.1 released
    +

    OpenBSM 1.1 has been released; this is a production release of + OpenBSM, and improves OpenBSM through the addition of Mac OS X + Snow Leopard and launchd(8) support, audit trail file expiration + based on age and size, extended header support including IPv6 + address support, and improvements to the OpenBSM file format. See + the OpenBSM web page for more + information.

    +
    February 24, 2009 OpenBSM 1.1 beta 1 released

    OpenBSM 1.1 beta 1 has been released; this is a test release ==== //depot/projects/trustedbsd/www/openbsm.page#37 (text+ko) ==== @@ -30,7 +30,7 @@ - $P4: //depot/projects/trustedbsd/www/openbsm.page#36 $ + $P4: //depot/projects/trustedbsd/www/openbsm.page#37 $ @@ -125,7 +125,7 @@ snapshot and release tarballs, vendor integrated source code (such as the FreeBSD source tree), cvsup, and the TrustedBSD Perforce repository. - The current release is OpenBSM 1.0, released on 28 October 2007. + The current release is OpenBSM 1.1, released on 16 April 2009. Please see the file README present in the OpenBSM distribution for build and installation instructions.

    @@ -138,6 +138,46 @@ Description + 1.1 + openbsm-1.1.tgz + 560K + 2009-04-16 + +

    OpenBSM 1.1 is the second production release of the OpenBSM + code base. Major changes since OpenBSM 1.0 include:

    + +
      +
    • Trail files now include the host where the trail is + generated. Crash recovery has been improved. Trail + expiration based on size and date is now supported; by + default trail files will be expired after 10MB of trails. + The default individual trail limit is now 2MB.
      • + +
    • Mac OS X Snow Leopard is now a fully supported platform; + launchd(8) can now be used to launchd auditd(8). Command + line tools and libraries are now supported on Mac OS X + Leopard.
      • + +
    • Extended header tokens are now supported, allowing audit + trails to be tagged with a host identifier. IPv6 addresses + are now supported in subject tokens.
      • + +
    • BSM token and record types have been further synchronized + to OpenSolaris; support for many new system calls has been + added. Local errors and socket types are mapped to and from + BSM values.
      • +
    + +

    Since the last test release, OpenBSM 1.1 beta 1, 32/64-bit + compatibility has been fixed for the auditon(2) system call. + A default "expire-after" of 10MB is now set in + audit_control(5). Local fcntl(2) arguments are now mapped to + wire BSM versions using new APIs. The audit_submit(3) man + page has been fixed. A new audit event class has been added + for post-login authentication and access control events.

    + + + 1.0 openbsm-1.0.tgz 496K @@ -177,21 +217,9 @@ Date Description - - 1.1 beta 1 - openbsm-1.1-beta1.tgz - 544K - 2009-02-24 - -

    In this revision, OpenBSM's auditd(8) grows support for audit - trail expiration based on age and trail size, various defaults - in audit_control(5) are modernized (such as smaller percent - free default, and enabling execve(2)argument auditing by - default), socket types and domains are converted to BSM format - when written out, and bugs are fixed in IPC permission token - encoding.

    - - + + There have been no new development snapshots + since OpenBSM 1.1. @@ -214,6 +242,21 @@ Description + 1.1 beta 1 + openbsm-1.1-beta1.tgz + 544K + 2009-02-24 + +

    In this revision, OpenBSM's auditd(8) grows support for audit + trail expiration based on age and trail size, various defaults + in audit_control(5) are modernized (such as smaller percent + free default, and enabling execve(2)argument auditing by + default), socket types and domains are converted to BSM format + when written out, and bugs are fixed in IPC permission token + encoding.

    + + + 1.1 alpha 5 openbsm-1.1-alpha5.tgz 544K From owner-p4-projects@FreeBSD.ORG Thu Apr 16 17:14:12 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 45B111065670; Thu, 16 Apr 2009 17:14:12 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0338A106566B for ; Thu, 16 Apr 2009 17:14:12 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CC3EB8FC1D for ; Thu, 16 Apr 2009 17:14:11 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3GHEB6K048417 for ; Thu, 16 Apr 2009 17:14:11 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3GHEBm4048415 for perforce@freebsd.org; Thu, 16 Apr 2009 17:14:11 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 16 Apr 2009 17:14:11 GMT Message-Id: <200904161714.n3GHEBm4048415@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 160706 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, 16 Apr 2009 17:14:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=160706 Change 160706 by hselasky@hselasky_laptop001 on 2009/04/16 17:13:34 USB CORE: - resolve possible device side mode deadlock by creating another thread. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/usb_controller.c#12 edit .. //depot/projects/usb/src/sys/dev/usb/usb_bus.h#7 edit .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#140 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/usb_controller.c#12 (text+ko) ==== @@ -169,6 +169,10 @@ usb2_proc_free(&bus->explore_proc); + /* Get rid of control transfer process */ + + usb2_proc_free(&bus->control_xfer_proc); + return (0); } @@ -418,6 +422,10 @@ &bus->bus_mtx, pname, USB_PRI_MED)) { printf("WARNING: Creation of USB explore " "process failed.\n"); + } else if (usb2_proc_create(&bus->control_xfer_proc, + &bus->bus_mtx, pname, USB_PRI_MED)) { + printf("WARNING: Creation of USB control transfer " + "process failed.\n"); } else { /* Get final attach going */ USB_BUS_LOCK(bus); ==== //depot/projects/usb/src/sys/dev/usb/usb_bus.h#7 (text+ko) ==== @@ -62,7 +62,6 @@ struct usb2_bus { struct usb2_bus_stat stats_err; struct usb2_bus_stat stats_ok; - struct usb2_process explore_proc; struct usb2_sw_transfer roothub_req; struct root_hold_token *bus_roothold; /* @@ -72,6 +71,13 @@ */ struct usb2_process giant_callback_proc; struct usb2_process non_giant_callback_proc; + + /* Explore process */ + struct usb2_process explore_proc; + + /* Control request process */ + struct usb2_process control_xfer_proc; + struct usb2_bus_msg explore_msg[2]; struct usb2_bus_msg detach_msg[2]; struct usb2_bus_msg attach_msg[2]; ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#140 (text+ko) ==== @@ -822,7 +822,16 @@ info->done_m[1].hdr.pm_callback = &usb2_callback_proc; info->done_m[1].xroot = info; - if (xfer_mtx == &Giant) + /* + * In device side mode control endpoint + * requests need to run from a separate + * context, else there is a chance of + * deadlock! + */ + if (setup_start == usb2_control_ep_cfg) + info->done_p = + &udev->bus->control_xfer_proc; + else if (xfer_mtx == &Giant) info->done_p = &udev->bus->giant_callback_proc; else From owner-p4-projects@FreeBSD.ORG Thu Apr 16 18:43:43 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1EA5F106566C; Thu, 16 Apr 2009 18:43:43 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D2B42106564A for ; Thu, 16 Apr 2009 18:43:42 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C0E108FC12 for ; Thu, 16 Apr 2009 18:43:42 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3GIhg9M056912 for ; Thu, 16 Apr 2009 18:43:42 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3GIhgZJ056910 for perforce@freebsd.org; Thu, 16 Apr 2009 18:43:42 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 16 Apr 2009 18:43:42 GMT Message-Id: <200904161843.n3GIhgZJ056910@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 160708 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, 16 Apr 2009 18:43:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=160708 Change 160708 by hselasky@hselasky_laptop001 on 2009/04/16 18:43:15 USB controller (ATMEGADCI): - bugfix: Need to check Read/Write allowed before writing any data for non-control transfers. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#18 edit .. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.h#6 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#18 (text+ko) ==== @@ -458,6 +458,12 @@ /* cannot write any data */ goto not_complete; } + if (!(temp & ATMEGA_UEINTX_RWAL)) { + if (!td->control_xfr) { + /* cannot write any data */ + goto not_complete; + } + } count = td->max_packet_size; if (td->remainder < count) { /* we have a short packet */ @@ -1979,6 +1985,7 @@ uint32_t ntd; uint32_t n; uint8_t ep_no; + uint8_t is_control; sc = ATMEGA_BUS2SC(parm->udev->bus); xfer = parm->curr_xfer; @@ -1997,7 +2004,8 @@ /* * compute maximum number of TDs */ - if ((xfer->pipe->edesc->bmAttributes & UE_XFERTYPE) == UE_CONTROL) { + is_control = ((xfer->pipe->edesc->bmAttributes & UE_XFERTYPE) == UE_CONTROL); + if (is_control) { ntd = xfer->nframes + 1 /* STATUS */ + 1 /* SYNC 1 */ + 1 /* SYNC 2 */ ; @@ -2041,6 +2049,8 @@ td = USB_ADD_BYTES(parm->buf, parm->size[0]); /* init TD */ + if (is_control) + td->control_xfr = 1; td->max_packet_size = xfer->max_packet_size; td->ep_no = ep_no; if (pf->support_multi_buffer) { ==== //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.h#6 (text+ko) ==== @@ -189,6 +189,7 @@ uint8_t short_pkt:1; uint8_t support_multi_buffer:1; uint8_t did_stall:1; + uint8_t control_xfr:1; uint8_t ep_no:3; }; From owner-p4-projects@FreeBSD.ORG Thu Apr 16 19:38:39 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BD6BA1065672; Thu, 16 Apr 2009 19:38:38 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 753261065670 for ; Thu, 16 Apr 2009 19:38:38 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 626018FC08 for ; Thu, 16 Apr 2009 19:38:38 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3GJccuQ064374 for ; Thu, 16 Apr 2009 19:38:38 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3GJccPW064372 for perforce@freebsd.org; Thu, 16 Apr 2009 19:38:38 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 16 Apr 2009 19:38:38 GMT Message-Id: <200904161938.n3GJccPW064372@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 160709 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, 16 Apr 2009 19:38:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=160709 Change 160709 by hselasky@hselasky_laptop001 on 2009/04/16 19:37:41 USB controller (ATMEGADCI): Re-do last patch. Use single buffering. Double buffering does not seem to be supported for 64-byte wMaxPacketSize. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#19 edit .. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.h#7 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#19 (text+ko) ==== @@ -105,7 +105,6 @@ .max_in_frame_size = 64, .max_out_frame_size = 64, .is_simplex = 1, - .support_multi_buffer = 1, .support_bulk = 1, .support_interrupt = 1, .support_isochronous = 1, @@ -453,17 +452,13 @@ td->error = 1; return (0); /* complete */ } - if (!(temp & (ATMEGA_UEINTX_FIFOCON | - ATMEGA_UEINTX_TXINI))) { - /* cannot write any data */ + + temp = ATMEGA_READ_1(sc, ATMEGA_UESTA0X); + if (temp & 3) { + /* cannot write any data - a bank is busy */ goto not_complete; } - if (!(temp & ATMEGA_UEINTX_RWAL)) { - if (!td->control_xfr) { - /* cannot write any data */ - goto not_complete; - } - } + count = td->max_packet_size; if (td->remainder < count) { /* we have a short packet */ @@ -537,9 +532,9 @@ * The control endpoint has only got one bank, so if that bank * is free the packet has been transferred! */ - if (!(temp & (ATMEGA_UEINTX_FIFOCON | - ATMEGA_UEINTX_TXINI))) { - /* cannot write any data */ + temp = ATMEGA_READ_1(sc, ATMEGA_UESTA0X); + if (temp & 3) { + /* cannot write any data - a bank is busy */ goto not_complete; } if (sc->sc_dv_addr != 0xFF) { @@ -1174,7 +1169,7 @@ ATMEGA_WRITE_1(sc, ATMEGA_UECFG0X, temp); ATMEGA_WRITE_1(sc, ATMEGA_UECFG1X, ATMEGA_UECFG1X_ALLOC | - ATMEGA_UECFG1X_EPBK1 | + ATMEGA_UECFG1X_EPBK0 | /* one bank */ ATMEGA_UECFG1X_EPSIZE(3)); temp = ATMEGA_READ_1(sc, ATMEGA_UESTA0X); @@ -1985,7 +1980,6 @@ uint32_t ntd; uint32_t n; uint8_t ep_no; - uint8_t is_control; sc = ATMEGA_BUS2SC(parm->udev->bus); xfer = parm->curr_xfer; @@ -2004,8 +1998,7 @@ /* * compute maximum number of TDs */ - is_control = ((xfer->pipe->edesc->bmAttributes & UE_XFERTYPE) == UE_CONTROL); - if (is_control) { + if ((xfer->pipe->edesc->bmAttributes & UE_XFERTYPE) == UE_CONTROL) { ntd = xfer->nframes + 1 /* STATUS */ + 1 /* SYNC 1 */ + 1 /* SYNC 2 */ ; @@ -2049,8 +2042,6 @@ td = USB_ADD_BYTES(parm->buf, parm->size[0]); /* init TD */ - if (is_control) - td->control_xfr = 1; td->max_packet_size = xfer->max_packet_size; td->ep_no = ep_no; if (pf->support_multi_buffer) { ==== //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.h#7 (text+ko) ==== @@ -189,7 +189,6 @@ uint8_t short_pkt:1; uint8_t support_multi_buffer:1; uint8_t did_stall:1; - uint8_t control_xfr:1; uint8_t ep_no:3; }; From owner-p4-projects@FreeBSD.ORG Fri Apr 17 07:29:46 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8F8FC1065672; Fri, 17 Apr 2009 07:29:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 44632106564A for ; Fri, 17 Apr 2009 07:29:46 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 329B68FC12 for ; Fri, 17 Apr 2009 07:29:46 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3H7Tkh1071811 for ; Fri, 17 Apr 2009 07:29:46 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3H7Tj18071809 for perforce@freebsd.org; Fri, 17 Apr 2009 07:29:45 GMT (envelope-from zec@fer.hr) Date: Fri, 17 Apr 2009 07:29:45 GMT Message-Id: <200904170729.n3H7Tj18071809@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 160728 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, 17 Apr 2009 07:29:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=160728 Change 160728 by zec@zec_amdx2 on 2009/04/17 07:29:34 Populate vnet backpointers in various embedded per-vnet structs, which are user to set per-vnet-module base pointers such as INIT_VNET_INET(tp->t_vnet). At this point the vimage-commit2 branch builds, boots and works quite happily both as GENERIC as well as with options VIMAGE. Submitted from: amdx2 8.0-CURRENT /p4/vc2_compile/sys/VIMAGE Affected files ... .. //depot/projects/vimage-commit2/src/sys/netinet/ip_divert.c#25 edit .. //depot/projects/vimage-commit2/src/sys/netinet/raw_ip.c#26 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#47 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.c#33 edit .. //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#34 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_divert.c#25 (text+ko) ==== @@ -162,6 +162,9 @@ INP_INFO_LOCK_INIT(&V_divcbinfo, "div"); LIST_INIT(&V_divcb); V_divcbinfo.ipi_listhead = &V_divcb; +#ifdef VIMAGE + V_divcbinfo.ipi_vnet = curvnet; +#endif /* * XXX We don't use the hash list for divert IP, but it's easier * to allocate a one entry hash list than it is to check all ==== //depot/projects/vimage-commit2/src/sys/netinet/raw_ip.c#26 (text+ko) ==== @@ -187,6 +187,9 @@ INP_INFO_LOCK_INIT(&V_ripcbinfo, "rip"); LIST_INIT(&V_ripcb); +#ifdef VIMAGE + V_ripcbinfo.ipi_vnet = curvnet; +#endif V_ripcbinfo.ipi_listhead = &V_ripcb; V_ripcbinfo.ipi_hashbase = hashinit(INP_PCBHASH_RAW_SIZE, M_PCB, &V_ripcbinfo.ipi_hashmask); ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#47 (text+ko) ==== @@ -359,6 +359,9 @@ INP_INFO_LOCK_INIT(&V_tcbinfo, "tcp"); LIST_INIT(&V_tcb); +#ifdef VIMAGE + V_tcbinfo.ipi_vnet = curvnet; +#endif V_tcbinfo.ipi_listhead = &V_tcb; hashsize = TCBHASHSIZE; TUNABLE_INT_FETCH("net.inet.tcp.tcbhashsize", &hashsize); @@ -703,6 +706,9 @@ if (tm == NULL) return (NULL); tp = &tm->tcb; +#ifdef VIMAGE + tp->t_vnet = inp->inp_vnet; +#endif tp->t_timers = &tm->tt; /* LIST_INIT(&tp->t_segq); */ /* XXX covered by M_ZERO */ tp->t_maxseg = tp->t_maxopd = ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.c#33 (text+ko) ==== @@ -259,6 +259,9 @@ /* Initialize the hash buckets. */ for (i = 0; i < V_tcp_syncache.hashsize; i++) { +#ifdef VIMAGE + V_tcp_syncache.hashbase[i].sch_vnet = curvnet; +#endif TAILQ_INIT(&V_tcp_syncache.hashbase[i].sch_bucket); mtx_init(&V_tcp_syncache.hashbase[i].sch_mtx, "tcp_sc_head", NULL, MTX_DEF); ==== //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#34 (text+ko) ==== @@ -179,6 +179,9 @@ INP_INFO_LOCK_INIT(&V_udbinfo, "udp"); LIST_INIT(&V_udb); +#ifdef VIMAGE + V_udbinfo.ipi_vnet = curvnet; +#endif V_udbinfo.ipi_listhead = &V_udb; V_udbinfo.ipi_hashbase = hashinit(UDBHASHSIZE, M_PCB, &V_udbinfo.ipi_hashmask); From owner-p4-projects@FreeBSD.ORG Fri Apr 17 08:01:19 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A546B1065676; Fri, 17 Apr 2009 08:01:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 63FA71065672 for ; Fri, 17 Apr 2009 08:01:18 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 52CC98FC0C for ; Fri, 17 Apr 2009 08:01:18 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3H81Ike074209 for ; Fri, 17 Apr 2009 08:01:18 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3H81IQJ074207 for perforce@freebsd.org; Fri, 17 Apr 2009 08:01:18 GMT (envelope-from zec@fer.hr) Date: Fri, 17 Apr 2009 08:01:18 GMT Message-Id: <200904170801.n3H81IQJ074207@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 160730 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, 17 Apr 2009 08:01:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=160730 Change 160730 by zec@zec_amdx2 on 2009/04/17 08:00:38 Add the missing macros for resolving offsets in vnet containers to real addresses into two forgotten sysctl handlers. "sysctl net" output from GENERIC and VIMAGE (modulo SCTP which is not yet compilable with VIMAGE) is now completely in sync. Affected files ... .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_proto.c#21 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netinet6/in6_proto.c#21 (text+ko) ==== @@ -446,6 +446,8 @@ int error = 0; int old; + SYSCTL_RESOLVE_V_ARG1(); + error = SYSCTL_OUT(req, arg1, sizeof(int)); if (error || !req->newptr) return (error); @@ -466,6 +468,8 @@ int error = 0; int old; + SYSCTL_RESOLVE_V_ARG1(); + error = SYSCTL_OUT(req, arg1, sizeof(int)); if (error || !req->newptr) return (error); From owner-p4-projects@FreeBSD.ORG Fri Apr 17 16:55:01 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9173410656D7; Fri, 17 Apr 2009 16:55:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3EB7210656C4 for ; Fri, 17 Apr 2009 16:55:00 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 29DF68FC12 for ; Fri, 17 Apr 2009 16:55:00 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3HGt0X9058302 for ; Fri, 17 Apr 2009 16:55:00 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3HGsxF7058300 for perforce@freebsd.org; Fri, 17 Apr 2009 16:54:59 GMT (envelope-from zec@fer.hr) Date: Fri, 17 Apr 2009 16:54:59 GMT Message-Id: <200904171654.n3HGsxF7058300@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 160746 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, 17 Apr 2009 16:55:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=160746 Change 160746 by zec@zec_tpx32 on 2009/04/17 16:54:42 IFC @ 160745 Affected files ... .. //depot/projects/vimage-commit/src/sys/amd64/amd64/busdma_machdep.c#6 integrate .. //depot/projects/vimage-commit/src/sys/amd64/conf/DEFAULTS#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/metadata.h#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/pc/bios.h#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/busdma_machdep.c#6 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/cpufunc_asm_armv5_ec.S#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/cpufunc_asm_sheeva.S#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/mv/common.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/mv/gpio.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/mv/ic.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/mv/mv_pci.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/mv/mvreg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/biossmap.c#4 integrate .. //depot/projects/vimage-commit/src/sys/boot/sparc64/loader/main.c#8 integrate .. //depot/projects/vimage-commit/src/sys/bsm/audit_fcntl.h#1 branch .. //depot/projects/vimage-commit/src/sys/conf/NOTES#14 integrate .. //depot/projects/vimage-commit/src/sys/conf/files#20 integrate .. //depot/projects/vimage-commit/src/sys/conf/options#12 integrate .. //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#7 integrate .. //depot/projects/vimage-commit/src/sys/contrib/pf/net/if_pflog.c#4 integrate .. //depot/projects/vimage-commit/src/sys/contrib/pf/net/if_pfsync.c#5 integrate .. //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf.c#9 integrate .. //depot/projects/vimage-commit/src/sys/dev/ar/if_ar.c#4 delete .. //depot/projects/vimage-commit/src/sys/dev/ar/if_ar.h#3 delete .. //depot/projects/vimage-commit/src/sys/dev/ar/if_ar_isa.c#3 delete .. //depot/projects/vimage-commit/src/sys/dev/ar/if_ar_pci.c#3 delete .. //depot/projects/vimage-commit/src/sys/dev/ar/if_arregs.h#3 delete .. //depot/projects/vimage-commit/src/sys/dev/atkbdc/atkbd.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/e1000/if_em.c#8 integrate .. //depot/projects/vimage-commit/src/sys/dev/fb/creator.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/fb/machfb.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/if_ndis/if_ndis.c#10 integrate .. //depot/projects/vimage-commit/src/sys/dev/iicbus/if_ic.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/ipw/if_ipw.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/lmc/if_lmc.c#8 integrate .. //depot/projects/vimage-commit/src/sys/dev/lmc/if_lmc.h#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/mge/if_mge.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/pci/pci.c#9 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppbus/if_plip.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/ray/if_ray.c#4 delete .. //depot/projects/vimage-commit/src/sys/dev/ray/if_raydbg.h#3 delete .. //depot/projects/vimage-commit/src/sys/dev/ray/if_raymib.h#3 delete .. //depot/projects/vimage-commit/src/sys/dev/ray/if_rayreg.h#3 delete .. //depot/projects/vimage-commit/src/sys/dev/ray/if_rayvar.h#4 delete .. //depot/projects/vimage-commit/src/sys/dev/sr/if_sr.c#4 delete .. //depot/projects/vimage-commit/src/sys/dev/sr/if_sr.h#3 delete .. //depot/projects/vimage-commit/src/sys/dev/sr/if_sr_isa.c#3 delete .. //depot/projects/vimage-commit/src/sys/dev/sr/if_sr_pci.c#3 delete .. //depot/projects/vimage-commit/src/sys/dev/sr/if_srregs.h#3 delete .. //depot/projects/vimage-commit/src/sys/geom/part/g_part.c#10 integrate .. //depot/projects/vimage-commit/src/sys/geom/part/g_part_ebr.c#5 integrate .. //depot/projects/vimage-commit/src/sys/geom/part/g_part_if.m#5 integrate .. //depot/projects/vimage-commit/src/sys/i386/conf/DEFAULTS#5 integrate .. //depot/projects/vimage-commit/src/sys/i386/i386/busdma_machdep.c#7 integrate .. //depot/projects/vimage-commit/src/sys/i386/include/metadata.h#3 integrate .. //depot/projects/vimage-commit/src/sys/i386/include/pc/bios.h#3 integrate .. //depot/projects/vimage-commit/src/sys/ia64/ia64/busdma_machdep.c#6 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_conf.c#11 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_descrip.c#8 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_bio.c#8 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_cache.c#12 integrate .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/if_aue.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/if_auereg.h#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/if_axe.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/if_axereg.h#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/if_cdce.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/if_cdcereg.h#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/if_cue.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/if_cuereg.h#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/if_kue.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/if_kuereg.h#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/if_rue.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/if_ruereg.h#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/if_rum.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/if_rumreg.h#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/if_rumvar.h#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/if_udav.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/if_udavreg.h#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/if_ural.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/if_uralreg.h#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/if_uralvar.h#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/if_zyd.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/if_zydfw.h#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/if_zydreg.h#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/kue_fw.h#2 delete .. //depot/projects/vimage-commit/src/sys/modules/Makefile#15 integrate .. //depot/projects/vimage-commit/src/sys/modules/ar/Makefile#3 delete .. //depot/projects/vimage-commit/src/sys/modules/netgraph/sync_ar/Makefile#3 delete .. //depot/projects/vimage-commit/src/sys/modules/netgraph/sync_sr/Makefile#3 delete .. //depot/projects/vimage-commit/src/sys/modules/ray/Makefile#3 delete .. //depot/projects/vimage-commit/src/sys/modules/sr/Makefile#3 delete .. //depot/projects/vimage-commit/src/sys/net/ethernet.h#3 integrate .. //depot/projects/vimage-commit/src/sys/net/if.c#19 integrate .. //depot/projects/vimage-commit/src/sys/net/if_arc.h#3 integrate .. //depot/projects/vimage-commit/src/sys/net/if_arcsubr.c#5 integrate .. //depot/projects/vimage-commit/src/sys/net/if_atm.h#3 integrate .. //depot/projects/vimage-commit/src/sys/net/if_atmsubr.c#5 integrate .. //depot/projects/vimage-commit/src/sys/net/if_disc.c#3 integrate .. //depot/projects/vimage-commit/src/sys/net/if_enc.c#5 integrate .. //depot/projects/vimage-commit/src/sys/net/if_ethersubr.c#10 integrate .. //depot/projects/vimage-commit/src/sys/net/if_faith.c#9 integrate .. //depot/projects/vimage-commit/src/sys/net/if_fddisubr.c#5 integrate .. //depot/projects/vimage-commit/src/sys/net/if_fwsubr.c#5 integrate .. //depot/projects/vimage-commit/src/sys/net/if_gif.c#12 integrate .. //depot/projects/vimage-commit/src/sys/net/if_gif.h#8 integrate .. //depot/projects/vimage-commit/src/sys/net/if_gre.c#9 integrate .. //depot/projects/vimage-commit/src/sys/net/if_iso88025subr.c#5 integrate .. //depot/projects/vimage-commit/src/sys/net/if_lagg.c#6 integrate .. //depot/projects/vimage-commit/src/sys/net/if_lagg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/net/if_llatbl.c#2 integrate .. //depot/projects/vimage-commit/src/sys/net/if_llatbl.h#2 integrate .. //depot/projects/vimage-commit/src/sys/net/if_loop.c#17 integrate .. //depot/projects/vimage-commit/src/sys/net/if_spppsubr.c#10 integrate .. //depot/projects/vimage-commit/src/sys/net/if_stf.c#10 integrate .. //depot/projects/vimage-commit/src/sys/net/if_tun.c#9 integrate .. //depot/projects/vimage-commit/src/sys/net/if_var.h#11 integrate .. //depot/projects/vimage-commit/src/sys/net/iso88025.h#3 integrate .. //depot/projects/vimage-commit/src/sys/net/radix_mpath.c#5 integrate .. //depot/projects/vimage-commit/src/sys/net/route.c#13 integrate .. //depot/projects/vimage-commit/src/sys/net/route.h#5 integrate .. //depot/projects/vimage-commit/src/sys/net/rtsock.c#11 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211.c#10 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_output.c#9 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_proto.h#6 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_var.h#9 integrate .. //depot/projects/vimage-commit/src/sys/netgraph/ng_fec.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netgraph/ng_iface.c#10 integrate .. //depot/projects/vimage-commit/src/sys/netinet/if_ether.c#13 integrate .. //depot/projects/vimage-commit/src/sys/netinet/in_pcb.h#10 integrate .. //depot/projects/vimage-commit/src/sys/netinet/in_var.h#7 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_carp.c#10 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_fastfwd.c#10 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_output.c#13 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_bsd_addr.c#7 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_structs.h#5 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/in6.h#4 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/nd6.c#12 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/nd6.h#8 integrate .. //depot/projects/vimage-commit/src/sys/netipx/ipx_outputfl.c#3 integrate .. //depot/projects/vimage-commit/src/sys/pc98/cbus/olpt.c#4 integrate .. //depot/projects/vimage-commit/src/sys/rpc/svc.h#4 integrate .. //depot/projects/vimage-commit/src/sys/security/audit/audit_bsm_fcntl.c#1 branch .. //depot/projects/vimage-commit/src/sys/security/audit/audit_pipe.c#7 integrate .. //depot/projects/vimage-commit/src/sys/sys/param.h#17 integrate .. //depot/projects/vimage-commit/src/sys/ufs/ufs/ufs_lookup.c#6 integrate Differences ... ==== //depot/projects/vimage-commit/src/sys/amd64/amd64/busdma_machdep.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.89 2009/04/13 19:20:32 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.90 2009/04/17 13:22:18 jhb Exp $"); #include #include @@ -1137,9 +1137,7 @@ mtx_unlock(&bounce_lock); if (dmat->flags & BUS_DMA_KEEP_PG_OFFSET) { - /* page offset needs to be preserved */ - bpage->vaddr &= ~PAGE_MASK; - bpage->busaddr &= ~PAGE_MASK; + /* Page offset needs to be preserved. */ bpage->vaddr |= vaddr & PAGE_MASK; bpage->busaddr |= vaddr & PAGE_MASK; } @@ -1158,6 +1156,15 @@ bz = dmat->bounce_zone; bpage->datavaddr = 0; bpage->datacount = 0; + if (dmat->flags & BUS_DMA_KEEP_PG_OFFSET) { + /* + * Reset the bounce page to start at offset 0. Other uses + * of this bounce page may need to store a full page of + * data and/or assume it starts on a page boundary. + */ + bpage->vaddr &= ~PAGE_MASK; + bpage->busaddr &= ~PAGE_MASK; + } mtx_lock(&bounce_lock); STAILQ_INSERT_HEAD(&bz->bounce_page_list, bpage, links); ==== //depot/projects/vimage-commit/src/sys/amd64/conf/DEFAULTS#4 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/amd64 # -# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.15 2009/02/10 00:08:39 marcel Exp $ +# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.16 2009/04/15 22:38:22 marcel Exp $ machine amd64 @@ -18,4 +18,5 @@ # Default partitioning schemes options GEOM_PART_BSD options GEOM_PART_EBR +options GEOM_PART_EBR_COMPAT options GEOM_PART_MBR ==== //depot/projects/vimage-commit/src/sys/amd64/include/metadata.h#3 (text+ko) ==== @@ -23,12 +23,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/metadata.h,v 1.2 2005/01/05 20:17:20 imp Exp $ + * $FreeBSD: src/sys/amd64/include/metadata.h,v 1.3 2009/04/15 17:31:22 jkim Exp $ */ #ifndef _MACHINE_METADATA_H_ #define _MACHINE_METADATA_H_ #define MODINFOMD_SMAP 0x1001 +#define MODINFOMD_SMAP_XATTR 0x1002 #endif /* !_MACHINE_METADATA_H_ */ ==== //depot/projects/vimage-commit/src/sys/amd64/include/pc/bios.h#3 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/pc/bios.h,v 1.20 2007/10/28 21:23:49 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/pc/bios.h,v 1.21 2009/04/15 17:31:22 jkim Exp $ */ #ifndef _MACHINE_PC_BIOS_H_ @@ -48,6 +48,10 @@ #define SMAP_TYPE_ACPI_NVS 4 #define SMAP_TYPE_ACPI_ERROR 5 +#define SMAP_XATTR_ENABLED 0x00000001 +#define SMAP_XATTR_NON_VOLATILE 0x00000002 +#define SMAP_XATTR_MASK (SMAP_XATTR_ENABLED | SMAP_XATTR_NON_VOLATILE) + struct bios_smap { u_int64_t base; u_int64_t length; ==== //depot/projects/vimage-commit/src/sys/arm/arm/busdma_machdep.c#6 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.45 2009/04/13 19:20:32 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.46 2009/04/17 13:22:18 jhb Exp $"); /* * ARM bus dma support routines @@ -1427,9 +1427,7 @@ mtx_unlock(&bounce_lock); if (dmat->flags & BUS_DMA_KEEP_PG_OFFSET) { - /* page offset needs to be preserved */ - bpage->vaddr &= ~PAGE_MASK; - bpage->busaddr &= ~PAGE_MASK; + /* Page offset needs to be preserved. */ bpage->vaddr |= vaddr & PAGE_MASK; bpage->busaddr |= vaddr & PAGE_MASK; } @@ -1448,6 +1446,15 @@ bz = dmat->bounce_zone; bpage->datavaddr = 0; bpage->datacount = 0; + if (dmat->flags & BUS_DMA_KEEP_PG_OFFSET) { + /* + * Reset the bounce page to start at offset 0. Other uses + * of this bounce page may need to store a full page of + * data and/or assume it starts on a page boundary. + */ + bpage->vaddr &= ~PAGE_MASK; + bpage->busaddr &= ~PAGE_MASK; + } mtx_lock(&bounce_lock); STAILQ_INSERT_HEAD(&bz->bounce_page_list, bpage, links); ==== //depot/projects/vimage-commit/src/sys/arm/arm/cpufunc_asm_armv5_ec.S#3 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc_asm_armv5_ec.S,v 1.1 2007/10/18 05:33:05 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc_asm_armv5_ec.S,v 1.2 2009/04/16 11:21:52 raj Exp $"); /* * Functions to set the MMU Translation Table Base register @@ -204,3 +204,4 @@ bne 1b /* More to do? */ mcr p15, 0, r0, c7, c10, 4 /* drain the write buffer */ RET + ==== //depot/projects/vimage-commit/src/sys/arm/arm/cpufunc_asm_sheeva.S#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc_asm_sheeva.S,v 1.1 2009/01/09 10:55:33 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc_asm_sheeva.S,v 1.2 2009/04/16 11:21:52 raj Exp $"); #include @@ -375,6 +375,14 @@ mcr p15, 0, r0, c7, c10, 4 /* drain the write buffer */ RET +/* This function modifies register value as follows: + * + * arg1 arg EFFECT (bit value saved into register) + * 0 0 not changed + * 0 1 negated + * 1 0 cleared + * 1 1 set + */ ENTRY(sheeva_control_ext) mrc p15, 1, r3, c15, c1, 0 /* Read the control register */ bic r2, r3, r0 /* Clear bits */ ==== //depot/projects/vimage-commit/src/sys/arm/mv/common.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/mv/common.c,v 1.5 2009/01/08 18:31:43 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/mv/common.c,v 1.6 2009/04/16 11:20:18 raj Exp $"); #include #include @@ -91,7 +91,8 @@ uint32_t ef = 0; soc_id(&dev, &rev); - if (dev == MV_DEV_88F6281 || dev == MV_DEV_MV78100) + if (dev == MV_DEV_88F6281 || dev == MV_DEV_MV78100_Z0 || + dev == MV_DEV_MV78100) __asm __volatile("mrc p15, 1, %0, c15, c1, 0" : "=r" (ef)); else if (dev == MV_DEV_88F5182 || dev == MV_DEV_88F5281) __asm __volatile("mrc p15, 0, %0, c14, c0, 0" : "=r" (ef)); @@ -166,6 +167,9 @@ else if (r == 2) rev = "A0"; break; + case MV_DEV_MV78100_Z0: + dev = "Marvell MV78100 Z0"; + break; case MV_DEV_MV78100: dev = "Marvell MV78100"; break; @@ -199,15 +203,16 @@ decode_win_cpu_setup(); decode_win_usb_setup(); decode_win_eth_setup(MV_ETH0_BASE); - if (dev == MV_DEV_MV78100) + if (dev == MV_DEV_MV78100 || dev == MV_DEV_MV78100_Z0) decode_win_eth_setup(MV_ETH1_BASE); - if (dev == MV_DEV_88F6281 || dev == MV_DEV_MV78100) + if (dev == MV_DEV_88F6281 || dev == MV_DEV_MV78100 || + dev == MV_DEV_MV78100_Z0) decode_win_cesa_setup(); decode_win_idma_setup(); decode_win_xor_setup(); - if (dev == MV_DEV_MV78100) { + if (dev == MV_DEV_MV78100 || dev == MV_DEV_MV78100_Z0) { decode_win_pcie_setup(MV_PCIE00_BASE); decode_win_pcie_setup(MV_PCIE01_BASE); decode_win_pcie_setup(MV_PCIE02_BASE); @@ -360,7 +365,8 @@ if ((dev == MV_DEV_88F5182 && i < 2) || (dev == MV_DEV_88F5281 && i < 4) || (dev == MV_DEV_88F6281 && i < 4) || - (dev == MV_DEV_MV78100 && i < 8)) + (dev == MV_DEV_MV78100 && i < 8) || + (dev == MV_DEV_MV78100_Z0 && i < 8)) return (1); return (0); @@ -590,7 +596,7 @@ uint32_t dev, rev; soc_id(&dev, &rev); - return (dev == MV_DEV_MV78100 ? 3 : 1); + return ((dev == MV_DEV_MV78100 || dev == MV_DEV_MV78100_Z0) ? 3 : 1); } static void @@ -1109,14 +1115,18 @@ return (0); } -static __inline int +static int xor_max_eng(void) { uint32_t dev, rev; soc_id(&dev, &rev); - return ((dev == MV_DEV_88F6281) ? 2 : - (dev == MV_DEV_MV78100) ? 1 : 0); + if (dev == MV_DEV_88F6281) + return (2); + else if ((dev == MV_DEV_MV78100) || (dev == MV_DEV_MV78100_Z0)) + return (1); + else + return (0); } static void ==== //depot/projects/vimage-commit/src/sys/arm/mv/gpio.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/mv/gpio.c,v 1.3 2009/01/08 18:31:43 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/mv/gpio.c,v 1.4 2009/04/16 11:20:18 raj Exp $"); #include #include @@ -123,12 +123,13 @@ return (ENXIO); mv_gpio_softc = sc; - /* Get board id and revision */ + /* Get chip id and revision */ soc_id(&dev_id, &rev_id); if (dev_id == MV_DEV_88F5182 || dev_id == MV_DEV_88F5281 || - dev_id == MV_DEV_MV78100) { + dev_id == MV_DEV_MV78100 || + dev_id == MV_DEV_MV78100_Z0 ) { sc->pin_num = 32; sc->irq_num = 4; sc->use_high = 0; @@ -139,7 +140,7 @@ sc->use_high = 1; } else { - device_printf(dev, "unknown board id=0x%x\n", dev_id); + device_printf(dev, "unknown chip id=0x%x\n", dev_id); return (ENXIO); } ==== //depot/projects/vimage-commit/src/sys/arm/mv/ic.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/mv/ic.c,v 1.1 2008/10/13 20:07:13 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/mv/ic.c,v 1.2 2009/04/16 11:20:18 raj Exp $"); #include #include @@ -98,10 +98,11 @@ sc->ic_high_regs = 0; sc->ic_error_regs = 0; - if (dev_id == MV_DEV_88F6281 || dev_id == MV_DEV_MV78100) + if (dev_id == MV_DEV_88F6281 || dev_id == MV_DEV_MV78100 || + dev_id == MV_DEV_MV78100_Z0) sc->ic_high_regs = 1; - if (dev_id == MV_DEV_MV78100) + if (dev_id == MV_DEV_MV78100 || dev_id == MV_DEV_MV78100_Z0) sc->ic_error_regs = 1; error = bus_alloc_resources(dev, mv_ic_spec, sc->ic_res); ==== //depot/projects/vimage-commit/src/sys/arm/mv/mv_pci.c#3 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/mv/mv_pci.c,v 1.5 2009/01/09 12:38:41 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/mv/mv_pci.c,v 1.6 2009/04/16 11:20:18 raj Exp $"); #include #include @@ -459,8 +459,18 @@ id = "88F6281"; break; case 0x6381: + id = "MV78100 Z0"; + break; + case 0x7810: id = "MV78100"; break; + case 0x7820: + /* + * According to documentation ID 0x7820 is assigned to MV78200. + * However some MV78100 chips also use it. + */ + id = "MV78100/MV78200"; + break; default: device_printf(self, "unknown Marvell PCI bridge: %x\n", val); goto out; ==== //depot/projects/vimage-commit/src/sys/arm/mv/mvreg.h#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/sys/arm/mv/mvreg.h,v 1.4 2009/01/08 18:31:43 raj Exp $ + * $FreeBSD: src/sys/arm/mv/mvreg.h,v 1.5 2009/04/16 11:20:18 raj Exp $ */ #ifndef _MVREG_H_ @@ -471,11 +471,12 @@ /* * Chip ID */ -#define MV_DEV_88F5181 0x5181 -#define MV_DEV_88F5182 0x5182 -#define MV_DEV_88F5281 0x5281 -#define MV_DEV_88F6281 0x6281 -#define MV_DEV_MV78100 0x6381 +#define MV_DEV_88F5181 0x5181 +#define MV_DEV_88F5182 0x5182 +#define MV_DEV_88F5281 0x5281 +#define MV_DEV_88F6281 0x6281 +#define MV_DEV_MV78100_Z0 0x6381 +#define MV_DEV_MV78100 0x7810 /* * Decode windows definitions and macros ==== //depot/projects/vimage-commit/src/sys/boot/i386/libi386/biossmap.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biossmap.c,v 1.8 2008/06/07 03:07:32 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biossmap.c,v 1.9 2009/04/15 17:31:22 jkim Exp $"); /* * Obtain memory configuration information from the BIOS @@ -33,74 +33,107 @@ #include #include #include +#include +#include #include +#include #include #include "bootstrap.h" #include "libi386.h" #include "btxv86.h" -static struct { - struct bios_smap _smap_entry; - char pad[8]; /* Bad BIOS writer, no cookie! */ -} smap; +#define V86_CY(x) ((x) & PSL_C) + +struct smap_buf { + struct bios_smap smap; + uint32_t xattr; /* Extended attribute from ACPI 3.0 */ + STAILQ_ENTRY(smap_buf) bufs; +}; + +#define SMAP_BUFSIZE offsetof(struct smap_buf, bufs) -static struct bios_smap *smapbase; -static int smaplen; +static struct bios_smap *smapbase; +static uint32_t *smapattr; +static u_int smaplen; void bios_getsmap(void) { - int n; + struct smap_buf buf; + STAILQ_HEAD(smap_head, smap_buf) head = + STAILQ_HEAD_INITIALIZER(head); + struct smap_buf *cur, *next; + u_int n, x; + STAILQ_INIT(&head); n = 0; - smaplen = 0; - /* Count up segments in system memory map */ + x = 0; v86.ebx = 0; do { v86.ctl = V86_FLAGS; - v86.addr = 0x15; /* int 0x15 function 0xe820*/ - v86.eax = 0xe820; - v86.ecx = sizeof(struct bios_smap); + v86.addr = 0x15; + v86.eax = 0xe820; /* int 0x15 function 0xe820 */ + v86.ecx = SMAP_BUFSIZE; v86.edx = SMAP_SIG; - v86.es = VTOPSEG(&smap); - v86.edi = VTOPOFF(&smap); + v86.es = VTOPSEG(&buf); + v86.edi = VTOPOFF(&buf); v86int(); - if ((v86.efl & 1) || (v86.eax != SMAP_SIG)) + if (V86_CY(v86.efl) || v86.eax != SMAP_SIG || + v86.ecx < sizeof(buf.smap) || v86.ecx > SMAP_BUFSIZE) + break; + + next = malloc(sizeof(*next)); + if (next == NULL) break; + next->smap = buf.smap; + if (v86.ecx == SMAP_BUFSIZE) { + next->xattr = buf.xattr; + x++; + } + STAILQ_INSERT_TAIL(&head, next, bufs); n++; } while (v86.ebx != 0); - if (n == 0) - return; - n += 10; /* spare room */ - smapbase = malloc(n * sizeof(*smapbase)); + smaplen = n; - /* Save system memory map */ - v86.ebx = 0; - do { - v86.ctl = V86_FLAGS; - v86.addr = 0x15; /* int 0x15 function 0xe820*/ - v86.eax = 0xe820; - v86.ecx = sizeof(struct bios_smap); - v86.edx = SMAP_SIG; - v86.es = VTOPSEG(&smap); - v86.edi = VTOPOFF(&smap); - v86int(); - bcopy(&smap, &smapbase[smaplen], sizeof(struct bios_smap)); - smaplen++; - if ((v86.efl & 1) || (v86.eax != SMAP_SIG)) - break; - } while (v86.ebx != 0 && smaplen < n); + if (smaplen > 0) { + smapbase = malloc(smaplen * sizeof(*smapbase)); + if (smapbase != NULL) { + n = 0; + STAILQ_FOREACH(cur, &head, bufs) + smapbase[n++] = cur->smap; + } + if (smaplen == x) { + smapattr = malloc(smaplen * sizeof(*smapattr)); + if (smapattr != NULL) { + n = 0; + STAILQ_FOREACH(cur, &head, bufs) + smapattr[n++] = cur->xattr & + SMAP_XATTR_MASK; + } + } else + smapattr = NULL; + cur = STAILQ_FIRST(&head); + while (cur != NULL) { + next = STAILQ_NEXT(cur, bufs); + free(cur); + cur = next; + } + } } void bios_addsmapdata(struct preloaded_file *kfp) { - int len; + size_t size; - if (smapbase == 0 || smaplen == 0) + if (smapbase == NULL || smaplen == 0) return; - len = smaplen * sizeof(*smapbase); - file_addmetadata(kfp, MODINFOMD_SMAP, len, smapbase); + size = smaplen * sizeof(*smapbase); + file_addmetadata(kfp, MODINFOMD_SMAP, size, smapbase); + if (smapattr != NULL) { + size = smaplen * sizeof(*smapattr); + file_addmetadata(kfp, MODINFOMD_SMAP_XATTR, size, smapattr); + } } COMMAND_SET(smap, "smap", "show BIOS SMAP", command_smap); @@ -108,12 +141,22 @@ static int command_smap(int argc, char *argv[]) { - int i; + u_int i; - if (smapbase == 0 || smaplen == 0) + if (smapbase == NULL || smaplen == 0) return (CMD_ERROR); - for (i = 0; i < smaplen; i++) - printf("SMAP type=%02x base=%016llx len=%016llx\n", - smapbase[i].type, smapbase[i].base, smapbase[i].length); + if (smapattr != NULL) + for (i = 0; i < smaplen; i++) + printf("SMAP type=%02x base=%016llx len=%016llx attr=%02x\n", + (unsigned int)smapbase[i].type, + (unsigned long long)smapbase[i].base, + (unsigned long long)smapbase[i].length, + (unsigned int)smapattr[i]); + else + for (i = 0; i < smaplen; i++) + printf("SMAP type=%02x base=%016llx len=%016llx\n", + (unsigned int)smapbase[i].type, + (unsigned long long)smapbase[i].base, + (unsigned long long)smapbase[i].length); return (CMD_OK); } ==== //depot/projects/vimage-commit/src/sys/boot/sparc64/loader/main.c#8 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.41 2009/04/13 19:43:37 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.42 2009/04/14 19:02:34 marius Exp $"); /* * FreeBSD/sparc64 kernel loader - machine dependent part @@ -434,9 +434,10 @@ continue; reg = dtlb_get_data_sun4u(i); wrpr(pstate, pstate, 0); + reg >>= TD_PA_SHIFT; if (cpu_impl >= CPU_IMPL_ULTRASPARCIII) - return ((reg & TD_PA_CH_MASK) >> TD_PA_SHIFT); - return ((reg & TD_PA_SF_MASK) >> TD_PA_SHIFT); + return (reg & TD_PA_CH_MASK); + return (reg & TD_PA_SF_MASK); } wrpr(pstate, pstate, 0); return (-1); @@ -456,9 +457,10 @@ continue; reg = itlb_get_data_sun4u(i); wrpr(pstate, pstate, 0); + reg >>= TD_PA_SHIFT; if (cpu_impl >= CPU_IMPL_ULTRASPARCIII) - return ((reg & TD_PA_CH_MASK) >> TD_PA_SHIFT); - return ((reg & TD_PA_SF_MASK) >> TD_PA_SHIFT); + return (reg & TD_PA_CH_MASK); + return (reg & TD_PA_SF_MASK); } wrpr(pstate, pstate, 0); return (-1); @@ -846,7 +848,7 @@ { printf("%s %s ", - page_sizes[(tte & TD_SIZE_MASK) >> TD_SIZE_SHIFT], + page_sizes[(tte >> TD_SIZE_SHIFT) & TD_SIZE_MASK], tag & TD_G ? "G" : " "); printf(tte & TD_W ? "W " : " "); printf(tte & TD_P ? "\e[33mP\e[0m " : " "); ==== //depot/projects/vimage-commit/src/sys/conf/NOTES#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1533 2009/04/10 00:34:55 jfv Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1534 2009/04/15 22:38:22 marcel Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -148,6 +148,7 @@ options GEOM_PART_APM # Apple partitioning options GEOM_PART_BSD # BSD disklabel options GEOM_PART_EBR # Extended Boot Records +options GEOM_PART_EBR_COMPAT # Backward compatible partition names options GEOM_PART_GPT # GPT partitioning options GEOM_PART_MBR # MBR partitioning options GEOM_PART_PC98 # PC-9800 disk partitioning ==== //depot/projects/vimage-commit/src/sys/conf/files#20 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1390 2009/04/12 19:04:27 rmacklem Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1391 2009/04/17 09:42:26 rwatson Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1501,7 +1501,6 @@ legacy/dev/usb/ehci_ddb.c optional oehci legacy/dev/usb/ehci_pci.c optional oehci pci legacy/dev/usb/hid.c optional ousb -legacy/dev/usb/if_aue.c optional oaue legacy/dev/usb/ohci.c optional oohci legacy/dev/usb/ohci_pci.c optional oohci pci legacy/dev/usb/sl811hs.c optional oslhci ==== //depot/projects/vimage-commit/src/sys/conf/options#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.664 2009/03/30 19:23:49 sam Exp $ +# $FreeBSD: src/sys/conf/options,v 1.665 2009/04/15 22:38:22 marcel Exp $ # # On the handling of kernel options # @@ -93,6 +93,7 @@ GEOM_PART_APM opt_geom.h GEOM_PART_BSD opt_geom.h GEOM_PART_EBR opt_geom.h +GEOM_PART_EBR_COMPAT opt_geom.h GEOM_PART_GPT opt_geom.h GEOM_PART_MBR opt_geom.h GEOM_PART_PC98 opt_geom.h ==== //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#7 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c,v 1.15 2009/02/27 13:29:18 bz Exp $ */ +/* $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c,v 1.16 2009/04/16 20:30:28 kmacy Exp $ */ /* * Copyright (C) 1993-2003 by Darren Reed. @@ -1046,7 +1046,7 @@ if (!ip->ip_sum) ip->ip_sum = in_cksum(m, hlen); error = (*ifp->if_output)(ifp, m, (struct sockaddr *)dst, - ro->ro_rt); + ro); goto done; } /* @@ -1127,7 +1127,7 @@ m->m_act = 0; if (error == 0) error = (*ifp->if_output)(ifp, m, - (struct sockaddr *)dst, ro->ro_rt); + (struct sockaddr *)dst, ro); else FREE_MB_T(m); } ==== //depot/projects/vimage-commit/src/sys/contrib/pf/net/if_pflog.c#4 (text+ko) ==== @@ -40,7 +40,7 @@ #include "opt_pf.h" #include -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/if_pflog.c,v 1.21 2007/07/03 12:16:07 mlaier Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/if_pflog.c,v 1.22 2009/04/16 20:30:28 kmacy Exp $"); #ifdef DEV_BPF #define NBPFILTER DEV_BPF @@ -113,7 +113,7 @@ void pflogattach(int); int pflogoutput(struct ifnet *, struct mbuf *, struct sockaddr *, - struct rtentry *); + struct route *); int pflogioctl(struct ifnet *, u_long, caddr_t); void pflogstart(struct ifnet *); #ifdef __FreeBSD__ @@ -287,7 +287,7 @@ int pflogoutput(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst, - struct rtentry *rt) + struct route *ro) { m_freem(m); return (0); ==== //depot/projects/vimage-commit/src/sys/contrib/pf/net/if_pfsync.c#5 (text+ko) ==== @@ -34,7 +34,7 @@ #include "opt_pf.h" #include -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.36 2007/07/28 07:31:29 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.37 2009/04/16 20:30:28 kmacy Exp $"); #ifdef DEV_BPF #define NBPFILTER DEV_BPF @@ -152,7 +152,7 @@ void pfsync_update_net_tdb(struct pfsync_tdb *); #endif int pfsyncoutput(struct ifnet *, struct mbuf *, struct sockaddr *, - struct rtentry *); + struct route *); int pfsyncioctl(struct ifnet *, u_long, caddr_t); void pfsyncstart(struct ifnet *); @@ -1083,7 +1083,7 @@ int pfsyncoutput(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst, - struct rtentry *rt) + struct route *ro) { m_freem(m); return (0); ==== //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf.c#9 (text+ko) ==== @@ -41,7 +41,7 @@ #include "opt_inet6.h" #include -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.64 2009/04/12 13:22:33 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.65 2009/04/16 20:30:28 kmacy Exp $"); #endif #ifdef __FreeBSD__ @@ -6245,7 +6245,7 @@ } } PF_UNLOCK(); - error = (*ifp->if_output)(ifp, m0, sintosa(dst), ro->ro_rt); + error = (*ifp->if_output)(ifp, m0, sintosa(dst), ro); PF_LOCK(); goto done; } ==== //depot/projects/vimage-commit/src/sys/dev/atkbdc/atkbd.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/atkbdc/atkbd.c,v 1.53 2007/12/29 21:55:22 wkoszek Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/atkbdc/atkbd.c,v 1.54 2009/04/17 00:30:56 emax Exp $"); #include "opt_compat.h" #include "opt_kbd.h" @@ -476,7 +476,7 @@ static int atkbd_intr(keyboard_t *kbd, void *arg) { - atkbd_state_t *state; + atkbd_state_t *state = (atkbd_state_t *)kbd->kb_data; int delay[2]; int c; @@ -485,7 +485,6 @@ * The keyboard was not detected before; * it must have been reconnected! */ - state = (atkbd_state_t *)kbd->kb_data; init_keyboard(state->kbdc, &kbd->kb_type, kbd->kb_config); KBD_FOUND_DEVICE(kbd); @@ -496,6 +495,9 @@ atkbd_ioctl(kbd, KDSETREPEAT, (caddr_t)delay); } + if (state->ks_polling) + return 0; + if (KBD_IS_ACTIVE(kbd) && KBD_IS_BUSY(kbd)) { /* let the callback function to process the input */ (*kbd->kb_callback.kc_func)(kbd, KBDIO_KEYINPUT, ==== //depot/projects/vimage-commit/src/sys/dev/e1000/if_em.c#8 (text+ko) ==== @@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE. ******************************************************************************/ -/*$FreeBSD: src/sys/dev/e1000/if_em.c,v 1.6 2009/04/14 03:36:59 kmacy Exp $*/ +/*$FreeBSD: src/sys/dev/e1000/if_em.c,v 1.7 2009/04/16 23:08:02 kmacy Exp $*/ #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" @@ -1055,6 +1055,7 @@ EM_TX_LOCK(adapter); while ((m = buf_ring_dequeue_sc(adapter->br)) != NULL) m_freem(m); + if_qflush(ifp); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Apr 17 17:00:06 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 39E9E1065705; Fri, 17 Apr 2009 17:00:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E9DE91065703 for ; Fri, 17 Apr 2009 17:00:05 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D0B9E8FC1A for ; Fri, 17 Apr 2009 17:00:05 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3HH05rN058732 for ; Fri, 17 Apr 2009 17:00:05 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3HH05tB058730 for perforce@freebsd.org; Fri, 17 Apr 2009 17:00:05 GMT (envelope-from zec@fer.hr) Date: Fri, 17 Apr 2009 17:00:05 GMT Message-Id: <200904171700.n3HH05tB058730@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 160748 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, 17 Apr 2009 17:00:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=160748 Change 160748 by zec@zec_tpx32 on 2009/04/17 17:00:03 IFC @ 160745 Affected files ... .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/busdma_machdep.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/conf/DEFAULTS#3 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/metadata.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/pc/bios.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/arm/busdma_machdep.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/arm/arm/cpufunc_asm_armv5_ec.S#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/arm/cpufunc_asm_sheeva.S#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/mv/common.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/arm/mv/gpio.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/mv/ic.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/mv/mv_pci.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/arm/mv/mvreg.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/boot/i386/libi386/biossmap.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/sparc64/loader/main.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/bsm/audit_fcntl.h#1 branch .. //depot/projects/vimage-commit2/src/sys/conf/NOTES#20 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files#29 integrate .. //depot/projects/vimage-commit2/src/sys/conf/options#23 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/if_pflog.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/if_pfsync.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ar/if_ar.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/ar/if_ar.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/ar/if_ar_isa.c#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/ar/if_ar_pci.c#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/ar/if_arregs.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/atkbdc/atkbd.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/e1000/if_em.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/fb/creator.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/fb/machfb.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/if_ndis/if_ndis.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/dev/iicbus/if_ic.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ipw/if_ipw.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/lmc/if_lmc.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/lmc/if_lmc.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mge/if_mge.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pci/pci.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ppbus/if_plip.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ray/if_ray.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/ray/if_raydbg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/ray/if_raymib.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/ray/if_rayreg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/ray/if_rayvar.h#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/sr/if_sr.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/sr/if_sr.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/sr/if_sr_isa.c#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/sr/if_sr_pci.c#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/sr/if_srregs.h#2 delete .. //depot/projects/vimage-commit2/src/sys/geom/part/g_part.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/geom/part/g_part_ebr.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/geom/part/g_part_if.m#4 integrate .. //depot/projects/vimage-commit2/src/sys/i386/conf/DEFAULTS#4 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/busdma_machdep.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/metadata.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/pc/bios.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/ia64/ia64/busdma_machdep.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_conf.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_descrip.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_bio.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_cache.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/if_aue.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/if_auereg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/if_axe.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/if_axereg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/if_cdce.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/if_cdcereg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/if_cue.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/if_cuereg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/if_kue.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/if_kuereg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/if_rue.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/if_ruereg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/if_rum.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/if_rumreg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/if_rumvar.h#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/if_udav.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/if_udavreg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/if_ural.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/if_uralreg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/if_uralvar.h#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/if_zyd.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/if_zydfw.h#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/if_zydreg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/kue_fw.h#2 delete .. //depot/projects/vimage-commit2/src/sys/modules/Makefile#19 integrate .. //depot/projects/vimage-commit2/src/sys/modules/ar/Makefile#3 delete .. //depot/projects/vimage-commit2/src/sys/modules/netgraph/sync_ar/Makefile#3 delete .. //depot/projects/vimage-commit2/src/sys/modules/netgraph/sync_sr/Makefile#3 delete .. //depot/projects/vimage-commit2/src/sys/modules/ray/Makefile#2 delete .. //depot/projects/vimage-commit2/src/sys/modules/sr/Makefile#3 delete .. //depot/projects/vimage-commit2/src/sys/net/ethernet.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/net/if.c#46 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_arc.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_arcsubr.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_atm.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_atmsubr.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_disc.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_enc.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_ethersubr.c#22 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_faith.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_fddisubr.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_fwsubr.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_gif.c#24 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_gif.h#10 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_gre.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_iso88025subr.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_lagg.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_lagg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_llatbl.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_llatbl.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_loop.c#25 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_spppsubr.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_stf.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_tun.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_var.h#17 integrate .. //depot/projects/vimage-commit2/src/sys/net/iso88025.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/net/radix_mpath.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/net/route.c#34 integrate .. //depot/projects/vimage-commit2/src/sys/net/route.h#9 integrate .. //depot/projects/vimage-commit2/src/sys/net/rtsock.c#21 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_output.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_proto.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_var.h#9 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_fec.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_iface.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#32 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.h#17 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_var.h#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_carp.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fastfwd.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_output.c#24 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_bsd_addr.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_structs.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#27 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.h#8 integrate .. //depot/projects/vimage-commit2/src/sys/netipx/ipx_outputfl.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/pc98/cbus/olpt.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/rpc/svc.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/security/audit/audit_bsm_fcntl.c#1 branch .. //depot/projects/vimage-commit2/src/sys/security/audit/audit_pipe.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/sys/param.h#33 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ufs/ufs_lookup.c#7 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/busdma_machdep.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.89 2009/04/13 19:20:32 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.90 2009/04/17 13:22:18 jhb Exp $"); #include #include @@ -1137,9 +1137,7 @@ mtx_unlock(&bounce_lock); if (dmat->flags & BUS_DMA_KEEP_PG_OFFSET) { - /* page offset needs to be preserved */ - bpage->vaddr &= ~PAGE_MASK; - bpage->busaddr &= ~PAGE_MASK; + /* Page offset needs to be preserved. */ bpage->vaddr |= vaddr & PAGE_MASK; bpage->busaddr |= vaddr & PAGE_MASK; } @@ -1158,6 +1156,15 @@ bz = dmat->bounce_zone; bpage->datavaddr = 0; bpage->datacount = 0; + if (dmat->flags & BUS_DMA_KEEP_PG_OFFSET) { + /* + * Reset the bounce page to start at offset 0. Other uses + * of this bounce page may need to store a full page of + * data and/or assume it starts on a page boundary. + */ + bpage->vaddr &= ~PAGE_MASK; + bpage->busaddr &= ~PAGE_MASK; + } mtx_lock(&bounce_lock); STAILQ_INSERT_HEAD(&bz->bounce_page_list, bpage, links); ==== //depot/projects/vimage-commit2/src/sys/amd64/conf/DEFAULTS#3 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/amd64 # -# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.15 2009/02/10 00:08:39 marcel Exp $ +# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.16 2009/04/15 22:38:22 marcel Exp $ machine amd64 @@ -18,4 +18,5 @@ # Default partitioning schemes options GEOM_PART_BSD options GEOM_PART_EBR +options GEOM_PART_EBR_COMPAT options GEOM_PART_MBR ==== //depot/projects/vimage-commit2/src/sys/amd64/include/metadata.h#2 (text+ko) ==== @@ -23,12 +23,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/metadata.h,v 1.2 2005/01/05 20:17:20 imp Exp $ + * $FreeBSD: src/sys/amd64/include/metadata.h,v 1.3 2009/04/15 17:31:22 jkim Exp $ */ #ifndef _MACHINE_METADATA_H_ #define _MACHINE_METADATA_H_ #define MODINFOMD_SMAP 0x1001 +#define MODINFOMD_SMAP_XATTR 0x1002 #endif /* !_MACHINE_METADATA_H_ */ ==== //depot/projects/vimage-commit2/src/sys/amd64/include/pc/bios.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/pc/bios.h,v 1.20 2007/10/28 21:23:49 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/pc/bios.h,v 1.21 2009/04/15 17:31:22 jkim Exp $ */ #ifndef _MACHINE_PC_BIOS_H_ @@ -48,6 +48,10 @@ #define SMAP_TYPE_ACPI_NVS 4 #define SMAP_TYPE_ACPI_ERROR 5 +#define SMAP_XATTR_ENABLED 0x00000001 +#define SMAP_XATTR_NON_VOLATILE 0x00000002 +#define SMAP_XATTR_MASK (SMAP_XATTR_ENABLED | SMAP_XATTR_NON_VOLATILE) + struct bios_smap { u_int64_t base; u_int64_t length; ==== //depot/projects/vimage-commit2/src/sys/arm/arm/busdma_machdep.c#6 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.45 2009/04/13 19:20:32 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.46 2009/04/17 13:22:18 jhb Exp $"); /* * ARM bus dma support routines @@ -1427,9 +1427,7 @@ mtx_unlock(&bounce_lock); if (dmat->flags & BUS_DMA_KEEP_PG_OFFSET) { - /* page offset needs to be preserved */ - bpage->vaddr &= ~PAGE_MASK; - bpage->busaddr &= ~PAGE_MASK; + /* Page offset needs to be preserved. */ bpage->vaddr |= vaddr & PAGE_MASK; bpage->busaddr |= vaddr & PAGE_MASK; } @@ -1448,6 +1446,15 @@ bz = dmat->bounce_zone; bpage->datavaddr = 0; bpage->datacount = 0; + if (dmat->flags & BUS_DMA_KEEP_PG_OFFSET) { + /* + * Reset the bounce page to start at offset 0. Other uses + * of this bounce page may need to store a full page of + * data and/or assume it starts on a page boundary. + */ + bpage->vaddr &= ~PAGE_MASK; + bpage->busaddr &= ~PAGE_MASK; + } mtx_lock(&bounce_lock); STAILQ_INSERT_HEAD(&bz->bounce_page_list, bpage, links); ==== //depot/projects/vimage-commit2/src/sys/arm/arm/cpufunc_asm_armv5_ec.S#2 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc_asm_armv5_ec.S,v 1.1 2007/10/18 05:33:05 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc_asm_armv5_ec.S,v 1.2 2009/04/16 11:21:52 raj Exp $"); /* * Functions to set the MMU Translation Table Base register @@ -204,3 +204,4 @@ bne 1b /* More to do? */ mcr p15, 0, r0, c7, c10, 4 /* drain the write buffer */ RET + ==== //depot/projects/vimage-commit2/src/sys/arm/arm/cpufunc_asm_sheeva.S#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc_asm_sheeva.S,v 1.1 2009/01/09 10:55:33 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc_asm_sheeva.S,v 1.2 2009/04/16 11:21:52 raj Exp $"); #include @@ -375,6 +375,14 @@ mcr p15, 0, r0, c7, c10, 4 /* drain the write buffer */ RET +/* This function modifies register value as follows: + * + * arg1 arg EFFECT (bit value saved into register) + * 0 0 not changed + * 0 1 negated + * 1 0 cleared + * 1 1 set + */ ENTRY(sheeva_control_ext) mrc p15, 1, r3, c15, c1, 0 /* Read the control register */ bic r2, r3, r0 /* Clear bits */ ==== //depot/projects/vimage-commit2/src/sys/arm/mv/common.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/mv/common.c,v 1.5 2009/01/08 18:31:43 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/mv/common.c,v 1.6 2009/04/16 11:20:18 raj Exp $"); #include #include @@ -91,7 +91,8 @@ uint32_t ef = 0; soc_id(&dev, &rev); - if (dev == MV_DEV_88F6281 || dev == MV_DEV_MV78100) + if (dev == MV_DEV_88F6281 || dev == MV_DEV_MV78100_Z0 || + dev == MV_DEV_MV78100) __asm __volatile("mrc p15, 1, %0, c15, c1, 0" : "=r" (ef)); else if (dev == MV_DEV_88F5182 || dev == MV_DEV_88F5281) __asm __volatile("mrc p15, 0, %0, c14, c0, 0" : "=r" (ef)); @@ -166,6 +167,9 @@ else if (r == 2) rev = "A0"; break; + case MV_DEV_MV78100_Z0: + dev = "Marvell MV78100 Z0"; + break; case MV_DEV_MV78100: dev = "Marvell MV78100"; break; @@ -199,15 +203,16 @@ decode_win_cpu_setup(); decode_win_usb_setup(); decode_win_eth_setup(MV_ETH0_BASE); - if (dev == MV_DEV_MV78100) + if (dev == MV_DEV_MV78100 || dev == MV_DEV_MV78100_Z0) decode_win_eth_setup(MV_ETH1_BASE); - if (dev == MV_DEV_88F6281 || dev == MV_DEV_MV78100) + if (dev == MV_DEV_88F6281 || dev == MV_DEV_MV78100 || + dev == MV_DEV_MV78100_Z0) decode_win_cesa_setup(); decode_win_idma_setup(); decode_win_xor_setup(); - if (dev == MV_DEV_MV78100) { + if (dev == MV_DEV_MV78100 || dev == MV_DEV_MV78100_Z0) { decode_win_pcie_setup(MV_PCIE00_BASE); decode_win_pcie_setup(MV_PCIE01_BASE); decode_win_pcie_setup(MV_PCIE02_BASE); @@ -360,7 +365,8 @@ if ((dev == MV_DEV_88F5182 && i < 2) || (dev == MV_DEV_88F5281 && i < 4) || (dev == MV_DEV_88F6281 && i < 4) || - (dev == MV_DEV_MV78100 && i < 8)) + (dev == MV_DEV_MV78100 && i < 8) || + (dev == MV_DEV_MV78100_Z0 && i < 8)) return (1); return (0); @@ -590,7 +596,7 @@ uint32_t dev, rev; soc_id(&dev, &rev); - return (dev == MV_DEV_MV78100 ? 3 : 1); + return ((dev == MV_DEV_MV78100 || dev == MV_DEV_MV78100_Z0) ? 3 : 1); } static void @@ -1109,14 +1115,18 @@ return (0); } -static __inline int +static int xor_max_eng(void) { uint32_t dev, rev; soc_id(&dev, &rev); - return ((dev == MV_DEV_88F6281) ? 2 : - (dev == MV_DEV_MV78100) ? 1 : 0); + if (dev == MV_DEV_88F6281) + return (2); + else if ((dev == MV_DEV_MV78100) || (dev == MV_DEV_MV78100_Z0)) + return (1); + else + return (0); } static void ==== //depot/projects/vimage-commit2/src/sys/arm/mv/gpio.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/mv/gpio.c,v 1.3 2009/01/08 18:31:43 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/mv/gpio.c,v 1.4 2009/04/16 11:20:18 raj Exp $"); #include #include @@ -123,12 +123,13 @@ return (ENXIO); mv_gpio_softc = sc; - /* Get board id and revision */ + /* Get chip id and revision */ soc_id(&dev_id, &rev_id); if (dev_id == MV_DEV_88F5182 || dev_id == MV_DEV_88F5281 || - dev_id == MV_DEV_MV78100) { + dev_id == MV_DEV_MV78100 || + dev_id == MV_DEV_MV78100_Z0 ) { sc->pin_num = 32; sc->irq_num = 4; sc->use_high = 0; @@ -139,7 +140,7 @@ sc->use_high = 1; } else { - device_printf(dev, "unknown board id=0x%x\n", dev_id); + device_printf(dev, "unknown chip id=0x%x\n", dev_id); return (ENXIO); } ==== //depot/projects/vimage-commit2/src/sys/arm/mv/ic.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/mv/ic.c,v 1.1 2008/10/13 20:07:13 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/mv/ic.c,v 1.2 2009/04/16 11:20:18 raj Exp $"); #include #include @@ -98,10 +98,11 @@ sc->ic_high_regs = 0; sc->ic_error_regs = 0; - if (dev_id == MV_DEV_88F6281 || dev_id == MV_DEV_MV78100) + if (dev_id == MV_DEV_88F6281 || dev_id == MV_DEV_MV78100 || + dev_id == MV_DEV_MV78100_Z0) sc->ic_high_regs = 1; - if (dev_id == MV_DEV_MV78100) + if (dev_id == MV_DEV_MV78100 || dev_id == MV_DEV_MV78100_Z0) sc->ic_error_regs = 1; error = bus_alloc_resources(dev, mv_ic_spec, sc->ic_res); ==== //depot/projects/vimage-commit2/src/sys/arm/mv/mv_pci.c#4 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/mv/mv_pci.c,v 1.5 2009/01/09 12:38:41 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/mv/mv_pci.c,v 1.6 2009/04/16 11:20:18 raj Exp $"); #include #include @@ -459,8 +459,18 @@ id = "88F6281"; break; case 0x6381: + id = "MV78100 Z0"; + break; + case 0x7810: id = "MV78100"; break; + case 0x7820: + /* + * According to documentation ID 0x7820 is assigned to MV78200. + * However some MV78100 chips also use it. + */ + id = "MV78100/MV78200"; + break; default: device_printf(self, "unknown Marvell PCI bridge: %x\n", val); goto out; ==== //depot/projects/vimage-commit2/src/sys/arm/mv/mvreg.h#4 (text+ko) ==== @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/mv/mvreg.h,v 1.4 2009/01/08 18:31:43 raj Exp $ + * $FreeBSD: src/sys/arm/mv/mvreg.h,v 1.5 2009/04/16 11:20:18 raj Exp $ */ #ifndef _MVREG_H_ @@ -471,11 +471,12 @@ /* * Chip ID */ -#define MV_DEV_88F5181 0x5181 -#define MV_DEV_88F5182 0x5182 -#define MV_DEV_88F5281 0x5281 -#define MV_DEV_88F6281 0x6281 -#define MV_DEV_MV78100 0x6381 +#define MV_DEV_88F5181 0x5181 +#define MV_DEV_88F5182 0x5182 +#define MV_DEV_88F5281 0x5281 +#define MV_DEV_88F6281 0x6281 +#define MV_DEV_MV78100_Z0 0x6381 +#define MV_DEV_MV78100 0x7810 /* * Decode windows definitions and macros ==== //depot/projects/vimage-commit2/src/sys/boot/i386/libi386/biossmap.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biossmap.c,v 1.8 2008/06/07 03:07:32 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biossmap.c,v 1.9 2009/04/15 17:31:22 jkim Exp $"); /* * Obtain memory configuration information from the BIOS @@ -33,74 +33,107 @@ #include #include #include +#include +#include #include +#include #include #include "bootstrap.h" #include "libi386.h" #include "btxv86.h" -static struct { - struct bios_smap _smap_entry; - char pad[8]; /* Bad BIOS writer, no cookie! */ -} smap; +#define V86_CY(x) ((x) & PSL_C) + +struct smap_buf { + struct bios_smap smap; + uint32_t xattr; /* Extended attribute from ACPI 3.0 */ + STAILQ_ENTRY(smap_buf) bufs; +}; + +#define SMAP_BUFSIZE offsetof(struct smap_buf, bufs) -static struct bios_smap *smapbase; -static int smaplen; +static struct bios_smap *smapbase; +static uint32_t *smapattr; +static u_int smaplen; void bios_getsmap(void) { - int n; + struct smap_buf buf; + STAILQ_HEAD(smap_head, smap_buf) head = + STAILQ_HEAD_INITIALIZER(head); + struct smap_buf *cur, *next; + u_int n, x; + STAILQ_INIT(&head); n = 0; - smaplen = 0; - /* Count up segments in system memory map */ + x = 0; v86.ebx = 0; do { v86.ctl = V86_FLAGS; - v86.addr = 0x15; /* int 0x15 function 0xe820*/ - v86.eax = 0xe820; - v86.ecx = sizeof(struct bios_smap); + v86.addr = 0x15; + v86.eax = 0xe820; /* int 0x15 function 0xe820 */ + v86.ecx = SMAP_BUFSIZE; v86.edx = SMAP_SIG; - v86.es = VTOPSEG(&smap); - v86.edi = VTOPOFF(&smap); + v86.es = VTOPSEG(&buf); + v86.edi = VTOPOFF(&buf); v86int(); - if ((v86.efl & 1) || (v86.eax != SMAP_SIG)) + if (V86_CY(v86.efl) || v86.eax != SMAP_SIG || + v86.ecx < sizeof(buf.smap) || v86.ecx > SMAP_BUFSIZE) + break; + + next = malloc(sizeof(*next)); + if (next == NULL) break; + next->smap = buf.smap; + if (v86.ecx == SMAP_BUFSIZE) { + next->xattr = buf.xattr; + x++; + } + STAILQ_INSERT_TAIL(&head, next, bufs); n++; } while (v86.ebx != 0); - if (n == 0) - return; - n += 10; /* spare room */ - smapbase = malloc(n * sizeof(*smapbase)); + smaplen = n; - /* Save system memory map */ - v86.ebx = 0; - do { - v86.ctl = V86_FLAGS; - v86.addr = 0x15; /* int 0x15 function 0xe820*/ - v86.eax = 0xe820; - v86.ecx = sizeof(struct bios_smap); - v86.edx = SMAP_SIG; - v86.es = VTOPSEG(&smap); - v86.edi = VTOPOFF(&smap); - v86int(); - bcopy(&smap, &smapbase[smaplen], sizeof(struct bios_smap)); - smaplen++; - if ((v86.efl & 1) || (v86.eax != SMAP_SIG)) - break; - } while (v86.ebx != 0 && smaplen < n); + if (smaplen > 0) { + smapbase = malloc(smaplen * sizeof(*smapbase)); + if (smapbase != NULL) { + n = 0; + STAILQ_FOREACH(cur, &head, bufs) + smapbase[n++] = cur->smap; + } + if (smaplen == x) { + smapattr = malloc(smaplen * sizeof(*smapattr)); + if (smapattr != NULL) { + n = 0; + STAILQ_FOREACH(cur, &head, bufs) + smapattr[n++] = cur->xattr & + SMAP_XATTR_MASK; + } + } else + smapattr = NULL; + cur = STAILQ_FIRST(&head); + while (cur != NULL) { + next = STAILQ_NEXT(cur, bufs); + free(cur); + cur = next; + } + } } void bios_addsmapdata(struct preloaded_file *kfp) { - int len; + size_t size; - if (smapbase == 0 || smaplen == 0) + if (smapbase == NULL || smaplen == 0) return; - len = smaplen * sizeof(*smapbase); - file_addmetadata(kfp, MODINFOMD_SMAP, len, smapbase); + size = smaplen * sizeof(*smapbase); + file_addmetadata(kfp, MODINFOMD_SMAP, size, smapbase); + if (smapattr != NULL) { + size = smaplen * sizeof(*smapattr); + file_addmetadata(kfp, MODINFOMD_SMAP_XATTR, size, smapattr); + } } COMMAND_SET(smap, "smap", "show BIOS SMAP", command_smap); @@ -108,12 +141,22 @@ static int command_smap(int argc, char *argv[]) { - int i; + u_int i; - if (smapbase == 0 || smaplen == 0) + if (smapbase == NULL || smaplen == 0) return (CMD_ERROR); - for (i = 0; i < smaplen; i++) - printf("SMAP type=%02x base=%016llx len=%016llx\n", - smapbase[i].type, smapbase[i].base, smapbase[i].length); + if (smapattr != NULL) + for (i = 0; i < smaplen; i++) + printf("SMAP type=%02x base=%016llx len=%016llx attr=%02x\n", + (unsigned int)smapbase[i].type, + (unsigned long long)smapbase[i].base, + (unsigned long long)smapbase[i].length, + (unsigned int)smapattr[i]); + else + for (i = 0; i < smaplen; i++) + printf("SMAP type=%02x base=%016llx len=%016llx\n", + (unsigned int)smapbase[i].type, + (unsigned long long)smapbase[i].base, + (unsigned long long)smapbase[i].length); return (CMD_OK); } ==== //depot/projects/vimage-commit2/src/sys/boot/sparc64/loader/main.c#10 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.41 2009/04/13 19:43:37 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.42 2009/04/14 19:02:34 marius Exp $"); /* * FreeBSD/sparc64 kernel loader - machine dependent part @@ -434,9 +434,10 @@ continue; reg = dtlb_get_data_sun4u(i); wrpr(pstate, pstate, 0); + reg >>= TD_PA_SHIFT; if (cpu_impl >= CPU_IMPL_ULTRASPARCIII) - return ((reg & TD_PA_CH_MASK) >> TD_PA_SHIFT); - return ((reg & TD_PA_SF_MASK) >> TD_PA_SHIFT); + return (reg & TD_PA_CH_MASK); + return (reg & TD_PA_SF_MASK); } wrpr(pstate, pstate, 0); return (-1); @@ -456,9 +457,10 @@ continue; reg = itlb_get_data_sun4u(i); wrpr(pstate, pstate, 0); + reg >>= TD_PA_SHIFT; if (cpu_impl >= CPU_IMPL_ULTRASPARCIII) - return ((reg & TD_PA_CH_MASK) >> TD_PA_SHIFT); - return ((reg & TD_PA_SF_MASK) >> TD_PA_SHIFT); + return (reg & TD_PA_CH_MASK); + return (reg & TD_PA_SF_MASK); } wrpr(pstate, pstate, 0); return (-1); @@ -846,7 +848,7 @@ { printf("%s %s ", - page_sizes[(tte & TD_SIZE_MASK) >> TD_SIZE_SHIFT], + page_sizes[(tte >> TD_SIZE_SHIFT) & TD_SIZE_MASK], tag & TD_G ? "G" : " "); printf(tte & TD_W ? "W " : " "); printf(tte & TD_P ? "\e[33mP\e[0m " : " "); ==== //depot/projects/vimage-commit2/src/sys/conf/NOTES#20 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1533 2009/04/10 00:34:55 jfv Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1534 2009/04/15 22:38:22 marcel Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -148,6 +148,7 @@ options GEOM_PART_APM # Apple partitioning options GEOM_PART_BSD # BSD disklabel options GEOM_PART_EBR # Extended Boot Records +options GEOM_PART_EBR_COMPAT # Backward compatible partition names options GEOM_PART_GPT # GPT partitioning options GEOM_PART_MBR # MBR partitioning options GEOM_PART_PC98 # PC-9800 disk partitioning ==== //depot/projects/vimage-commit2/src/sys/conf/files#29 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1390 2009/04/12 19:04:27 rmacklem Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1391 2009/04/17 09:42:26 rwatson Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1501,7 +1501,6 @@ legacy/dev/usb/ehci_ddb.c optional oehci legacy/dev/usb/ehci_pci.c optional oehci pci legacy/dev/usb/hid.c optional ousb -legacy/dev/usb/if_aue.c optional oaue legacy/dev/usb/ohci.c optional oohci legacy/dev/usb/ohci_pci.c optional oohci pci legacy/dev/usb/sl811hs.c optional oslhci ==== //depot/projects/vimage-commit2/src/sys/conf/options#23 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.664 2009/03/30 19:23:49 sam Exp $ +# $FreeBSD: src/sys/conf/options,v 1.665 2009/04/15 22:38:22 marcel Exp $ # # On the handling of kernel options # @@ -93,6 +93,7 @@ GEOM_PART_APM opt_geom.h GEOM_PART_BSD opt_geom.h GEOM_PART_EBR opt_geom.h +GEOM_PART_EBR_COMPAT opt_geom.h GEOM_PART_GPT opt_geom.h GEOM_PART_MBR opt_geom.h GEOM_PART_PC98 opt_geom.h ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#17 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c,v 1.15 2009/02/27 13:29:18 bz Exp $ */ +/* $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c,v 1.16 2009/04/16 20:30:28 kmacy Exp $ */ /* * Copyright (C) 1993-2003 by Darren Reed. @@ -1049,7 +1049,7 @@ if (!ip->ip_sum) ip->ip_sum = in_cksum(m, hlen); error = (*ifp->if_output)(ifp, m, (struct sockaddr *)dst, - ro->ro_rt); + ro); goto done; } /* @@ -1130,7 +1130,7 @@ m->m_act = 0; if (error == 0) error = (*ifp->if_output)(ifp, m, - (struct sockaddr *)dst, ro->ro_rt); + (struct sockaddr *)dst, ro); else FREE_MB_T(m); } ==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/if_pflog.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ #include "opt_pf.h" #include -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/if_pflog.c,v 1.21 2007/07/03 12:16:07 mlaier Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/if_pflog.c,v 1.22 2009/04/16 20:30:28 kmacy Exp $"); #ifdef DEV_BPF #define NBPFILTER DEV_BPF @@ -113,7 +113,7 @@ void pflogattach(int); int pflogoutput(struct ifnet *, struct mbuf *, struct sockaddr *, - struct rtentry *); + struct route *); int pflogioctl(struct ifnet *, u_long, caddr_t); void pflogstart(struct ifnet *); #ifdef __FreeBSD__ @@ -287,7 +287,7 @@ int pflogoutput(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst, - struct rtentry *rt) + struct route *ro) { m_freem(m); return (0); ==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/if_pfsync.c#6 (text+ko) ==== @@ -34,7 +34,7 @@ #include "opt_pf.h" #include -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.36 2007/07/28 07:31:29 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.37 2009/04/16 20:30:28 kmacy Exp $"); #ifdef DEV_BPF #define NBPFILTER DEV_BPF @@ -152,7 +152,7 @@ void pfsync_update_net_tdb(struct pfsync_tdb *); #endif int pfsyncoutput(struct ifnet *, struct mbuf *, struct sockaddr *, - struct rtentry *); + struct route *); int pfsyncioctl(struct ifnet *, u_long, caddr_t); void pfsyncstart(struct ifnet *); @@ -1083,7 +1083,7 @@ int pfsyncoutput(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst, - struct rtentry *rt) + struct route *ro) { m_freem(m); return (0); ==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf.c#14 (text+ko) ==== @@ -41,7 +41,7 @@ #include "opt_inet6.h" #include -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.64 2009/04/12 13:22:33 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.65 2009/04/16 20:30:28 kmacy Exp $"); #endif #ifdef __FreeBSD__ @@ -6245,7 +6245,7 @@ } } PF_UNLOCK(); - error = (*ifp->if_output)(ifp, m0, sintosa(dst), ro->ro_rt); + error = (*ifp->if_output)(ifp, m0, sintosa(dst), ro); PF_LOCK(); goto done; } ==== //depot/projects/vimage-commit2/src/sys/dev/atkbdc/atkbd.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/atkbdc/atkbd.c,v 1.53 2007/12/29 21:55:22 wkoszek Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/atkbdc/atkbd.c,v 1.54 2009/04/17 00:30:56 emax Exp $"); #include "opt_compat.h" #include "opt_kbd.h" @@ -476,7 +476,7 @@ static int atkbd_intr(keyboard_t *kbd, void *arg) { - atkbd_state_t *state; + atkbd_state_t *state = (atkbd_state_t *)kbd->kb_data; int delay[2]; int c; @@ -485,7 +485,6 @@ * The keyboard was not detected before; * it must have been reconnected! */ - state = (atkbd_state_t *)kbd->kb_data; init_keyboard(state->kbdc, &kbd->kb_type, kbd->kb_config); KBD_FOUND_DEVICE(kbd); @@ -496,6 +495,9 @@ atkbd_ioctl(kbd, KDSETREPEAT, (caddr_t)delay); } + if (state->ks_polling) + return 0; + if (KBD_IS_ACTIVE(kbd) && KBD_IS_BUSY(kbd)) { /* let the callback function to process the input */ (*kbd->kb_callback.kc_func)(kbd, KBDIO_KEYINPUT, ==== //depot/projects/vimage-commit2/src/sys/dev/e1000/if_em.c#7 (text+ko) ==== @@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE. ******************************************************************************/ -/*$FreeBSD: src/sys/dev/e1000/if_em.c,v 1.6 2009/04/14 03:36:59 kmacy Exp $*/ +/*$FreeBSD: src/sys/dev/e1000/if_em.c,v 1.7 2009/04/16 23:08:02 kmacy Exp $*/ #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" @@ -1055,6 +1055,7 @@ EM_TX_LOCK(adapter); while ((m = buf_ring_dequeue_sc(adapter->br)) != NULL) m_freem(m); + if_qflush(ifp); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Apr 17 17:07:14 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DA09C10656EA; Fri, 17 Apr 2009 17:07:13 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8B3A81065689 for ; Fri, 17 Apr 2009 17:07:13 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 768178FC1F for ; Fri, 17 Apr 2009 17:07:13 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3HH7DAR060304 for ; Fri, 17 Apr 2009 17:07:13 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3HH7Dr9060302 for perforce@freebsd.org; Fri, 17 Apr 2009 17:07:13 GMT (envelope-from zec@fer.hr) Date: Fri, 17 Apr 2009 17:07:13 GMT Message-Id: <200904171707.n3HH7Dr9060302@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 160749 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, 17 Apr 2009 17:07:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=160749 Change 160749 by zec@zec_tpx32 on 2009/04/17 17:06:34 IFC @ 160745 Affected files ... .. //depot/projects/vimage/src/share/man/man4/man4.i386/Makefile#2 integrate .. //depot/projects/vimage/src/share/man/man4/man4.i386/ar.4#2 delete .. //depot/projects/vimage/src/share/man/man4/man4.i386/ray.4#2 delete .. //depot/projects/vimage/src/share/man/man4/man4.i386/sr.4#2 delete .. //depot/projects/vimage/src/sys/amd64/amd64/busdma_machdep.c#10 integrate .. //depot/projects/vimage/src/sys/amd64/conf/DEFAULTS#7 integrate .. //depot/projects/vimage/src/sys/amd64/include/metadata.h#2 integrate .. //depot/projects/vimage/src/sys/amd64/include/pc/bios.h#3 integrate .. //depot/projects/vimage/src/sys/arm/arm/busdma_machdep.c#15 integrate .. //depot/projects/vimage/src/sys/arm/arm/cpufunc_asm_armv5_ec.S#2 integrate .. //depot/projects/vimage/src/sys/arm/arm/cpufunc_asm_sheeva.S#2 integrate .. //depot/projects/vimage/src/sys/arm/mv/common.c#4 integrate .. //depot/projects/vimage/src/sys/arm/mv/gpio.c#3 integrate .. //depot/projects/vimage/src/sys/arm/mv/ic.c#2 integrate .. //depot/projects/vimage/src/sys/arm/mv/mv_pci.c#4 integrate .. //depot/projects/vimage/src/sys/arm/mv/mvreg.h#4 integrate .. //depot/projects/vimage/src/sys/boot/i386/libi386/biossmap.c#4 integrate .. //depot/projects/vimage/src/sys/boot/sparc64/loader/main.c#11 integrate .. //depot/projects/vimage/src/sys/bsm/audit_fcntl.h#1 branch .. //depot/projects/vimage/src/sys/conf/NOTES#46 integrate .. //depot/projects/vimage/src/sys/conf/files#62 integrate .. //depot/projects/vimage/src/sys/conf/options#45 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#16 integrate .. //depot/projects/vimage/src/sys/contrib/pf/net/if_pflog.c#5 integrate .. //depot/projects/vimage/src/sys/contrib/pf/net/if_pfsync.c#9 integrate .. //depot/projects/vimage/src/sys/contrib/pf/net/pf.c#22 integrate .. //depot/projects/vimage/src/sys/dev/ar/if_ar.c#4 delete .. //depot/projects/vimage/src/sys/dev/ar/if_ar.h#2 delete .. //depot/projects/vimage/src/sys/dev/ar/if_ar_isa.c#2 delete .. //depot/projects/vimage/src/sys/dev/ar/if_ar_pci.c#2 delete .. //depot/projects/vimage/src/sys/dev/ar/if_arregs.h#2 delete .. //depot/projects/vimage/src/sys/dev/atkbdc/atkbd.c#3 integrate .. //depot/projects/vimage/src/sys/dev/e1000/if_em.c#7 integrate .. //depot/projects/vimage/src/sys/dev/fb/creator.c#6 integrate .. //depot/projects/vimage/src/sys/dev/fb/machfb.c#4 integrate .. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndis.c#24 integrate .. //depot/projects/vimage/src/sys/dev/iicbus/if_ic.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ipw/if_ipw.c#13 integrate .. //depot/projects/vimage/src/sys/dev/lmc/if_lmc.c#9 integrate .. //depot/projects/vimage/src/sys/dev/lmc/if_lmc.h#4 integrate .. //depot/projects/vimage/src/sys/dev/mge/if_mge.c#3 integrate .. //depot/projects/vimage/src/sys/dev/pci/pci.c#22 integrate .. //depot/projects/vimage/src/sys/dev/ppbus/if_plip.c#9 integrate .. //depot/projects/vimage/src/sys/dev/ray/if_ray.c#5 delete .. //depot/projects/vimage/src/sys/dev/ray/if_raydbg.h#2 delete .. //depot/projects/vimage/src/sys/dev/ray/if_raymib.h#2 delete .. //depot/projects/vimage/src/sys/dev/ray/if_rayreg.h#2 delete .. //depot/projects/vimage/src/sys/dev/ray/if_rayvar.h#3 delete .. //depot/projects/vimage/src/sys/dev/sr/if_sr.c#4 delete .. //depot/projects/vimage/src/sys/dev/sr/if_sr.h#2 delete .. //depot/projects/vimage/src/sys/dev/sr/if_sr_isa.c#2 delete .. //depot/projects/vimage/src/sys/dev/sr/if_sr_pci.c#2 delete .. //depot/projects/vimage/src/sys/dev/sr/if_srregs.h#2 delete .. //depot/projects/vimage/src/sys/geom/part/g_part.c#19 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part_ebr.c#6 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part_if.m#6 integrate .. //depot/projects/vimage/src/sys/i386/conf/DEFAULTS#11 integrate .. //depot/projects/vimage/src/sys/i386/i386/busdma_machdep.c#12 integrate .. //depot/projects/vimage/src/sys/i386/include/metadata.h#2 integrate .. //depot/projects/vimage/src/sys/i386/include/pc/bios.h#3 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/busdma_machdep.c#8 integrate .. //depot/projects/vimage/src/sys/kern/kern_conf.c#19 integrate .. //depot/projects/vimage/src/sys/kern/kern_descrip.c#24 integrate .. //depot/projects/vimage/src/sys/kern/vfs_bio.c#20 integrate .. //depot/projects/vimage/src/sys/kern/vfs_cache.c#24 integrate .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_aue.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_auereg.h#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_axe.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_axereg.h#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_cdce.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_cdcereg.h#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_cue.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_cuereg.h#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_kue.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_kuereg.h#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_rue.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_ruereg.h#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_rum.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_rumreg.h#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_rumvar.h#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_udav.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_udavreg.h#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_ural.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_uralreg.h#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_uralvar.h#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_zyd.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_zydfw.h#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_zydreg.h#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/kue_fw.h#2 delete .. //depot/projects/vimage/src/sys/modules/Makefile#44 integrate .. //depot/projects/vimage/src/sys/modules/ar/Makefile#3 delete .. //depot/projects/vimage/src/sys/modules/netgraph/sync_ar/Makefile#3 delete .. //depot/projects/vimage/src/sys/modules/netgraph/sync_sr/Makefile#3 delete .. //depot/projects/vimage/src/sys/modules/ray/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/sr/Makefile#3 delete .. //depot/projects/vimage/src/sys/net/ethernet.h#9 integrate .. //depot/projects/vimage/src/sys/net/if.c#77 integrate .. //depot/projects/vimage/src/sys/net/if_arc.h#2 integrate .. //depot/projects/vimage/src/sys/net/if_arcsubr.c#6 integrate .. //depot/projects/vimage/src/sys/net/if_atm.h#2 integrate .. //depot/projects/vimage/src/sys/net/if_atmsubr.c#7 integrate .. //depot/projects/vimage/src/sys/net/if_disc.c#4 integrate .. //depot/projects/vimage/src/sys/net/if_enc.c#8 integrate .. //depot/projects/vimage/src/sys/net/if_ethersubr.c#39 integrate .. //depot/projects/vimage/src/sys/net/if_faith.c#9 integrate .. //depot/projects/vimage/src/sys/net/if_fddisubr.c#9 integrate .. //depot/projects/vimage/src/sys/net/if_fwsubr.c#11 integrate .. //depot/projects/vimage/src/sys/net/if_gif.c#29 integrate .. //depot/projects/vimage/src/sys/net/if_gif.h#12 integrate .. //depot/projects/vimage/src/sys/net/if_gre.c#13 integrate .. //depot/projects/vimage/src/sys/net/if_iso88025subr.c#9 integrate .. //depot/projects/vimage/src/sys/net/if_lagg.c#21 integrate .. //depot/projects/vimage/src/sys/net/if_lagg.h#8 integrate .. //depot/projects/vimage/src/sys/net/if_llatbl.c#4 integrate .. //depot/projects/vimage/src/sys/net/if_llatbl.h#3 integrate .. //depot/projects/vimage/src/sys/net/if_loop.c#44 integrate .. //depot/projects/vimage/src/sys/net/if_spppsubr.c#17 integrate .. //depot/projects/vimage/src/sys/net/if_stf.c#16 integrate .. //depot/projects/vimage/src/sys/net/if_tun.c#15 integrate .. //depot/projects/vimage/src/sys/net/if_var.h#32 integrate .. //depot/projects/vimage/src/sys/net/iso88025.h#2 integrate .. //depot/projects/vimage/src/sys/net/radix_mpath.c#6 integrate .. //depot/projects/vimage/src/sys/net/route.c#47 integrate .. //depot/projects/vimage/src/sys/net/route.h#9 integrate .. //depot/projects/vimage/src/sys/net/rtsock.c#30 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211.c#31 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_output.c#22 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_proto.h#15 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_var.h#24 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_fec.c#4 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_iface.c#21 integrate .. //depot/projects/vimage/src/sys/netinet/if_ether.c#42 integrate .. //depot/projects/vimage/src/sys/netinet/in_pcb.h#31 integrate .. //depot/projects/vimage/src/sys/netinet/in_var.h#18 integrate .. //depot/projects/vimage/src/sys/netinet/ip_carp.c#21 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fastfwd.c#19 integrate .. //depot/projects/vimage/src/sys/netinet/ip_output.c#34 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_bsd_addr.c#18 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_structs.h#22 integrate .. //depot/projects/vimage/src/sys/netinet6/in6.h#9 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6.c#47 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6.h#16 integrate .. //depot/projects/vimage/src/sys/netipx/ipx_outputfl.c#4 integrate .. //depot/projects/vimage/src/sys/pc98/cbus/olpt.c#4 integrate .. //depot/projects/vimage/src/sys/rpc/svc.h#3 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_bsm_fcntl.c#1 branch .. //depot/projects/vimage/src/sys/security/audit/audit_pipe.c#13 integrate .. //depot/projects/vimage/src/sys/sys/param.h#48 integrate .. //depot/projects/vimage/src/sys/ufs/ufs/ufs_lookup.c#12 integrate Differences ... ==== //depot/projects/vimage/src/share/man/man4/man4.i386/Makefile#2 (text+ko) ==== @@ -1,10 +1,9 @@ -# $FreeBSD: src/share/man/man4/man4.i386/Makefile,v 1.193 2008/09/10 18:36:58 jhb Exp $ +# $FreeBSD: src/share/man/man4/man4.i386/Makefile,v 1.194 2009/04/16 11:09:59 rwatson Exp $ MAN= aic.4 \ alpm.4 \ amdpm.4 \ apm.4 \ - ar.4 \ ce.4 \ cp.4 \ CPU_ELAN.4 \ @@ -29,12 +28,10 @@ perfmon.4 \ pnp.4 \ pnpbios.4 \ - ray.4 \ sbni.4 \ scd.4 \ smapi.4 \ snc.4 \ - sr.4 \ streams.4 \ svr4.4 \ viapm.4 \ ==== //depot/projects/vimage/src/sys/amd64/amd64/busdma_machdep.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.89 2009/04/13 19:20:32 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.90 2009/04/17 13:22:18 jhb Exp $"); #include #include @@ -1137,9 +1137,7 @@ mtx_unlock(&bounce_lock); if (dmat->flags & BUS_DMA_KEEP_PG_OFFSET) { - /* page offset needs to be preserved */ - bpage->vaddr &= ~PAGE_MASK; - bpage->busaddr &= ~PAGE_MASK; + /* Page offset needs to be preserved. */ bpage->vaddr |= vaddr & PAGE_MASK; bpage->busaddr |= vaddr & PAGE_MASK; } @@ -1158,6 +1156,15 @@ bz = dmat->bounce_zone; bpage->datavaddr = 0; bpage->datacount = 0; + if (dmat->flags & BUS_DMA_KEEP_PG_OFFSET) { + /* + * Reset the bounce page to start at offset 0. Other uses + * of this bounce page may need to store a full page of + * data and/or assume it starts on a page boundary. + */ + bpage->vaddr &= ~PAGE_MASK; + bpage->busaddr &= ~PAGE_MASK; + } mtx_lock(&bounce_lock); STAILQ_INSERT_HEAD(&bz->bounce_page_list, bpage, links); ==== //depot/projects/vimage/src/sys/amd64/conf/DEFAULTS#7 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/amd64 # -# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.15 2009/02/10 00:08:39 marcel Exp $ +# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.16 2009/04/15 22:38:22 marcel Exp $ machine amd64 @@ -18,4 +18,5 @@ # Default partitioning schemes options GEOM_PART_BSD options GEOM_PART_EBR +options GEOM_PART_EBR_COMPAT options GEOM_PART_MBR ==== //depot/projects/vimage/src/sys/amd64/include/metadata.h#2 (text+ko) ==== @@ -23,12 +23,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/metadata.h,v 1.2 2005/01/05 20:17:20 imp Exp $ + * $FreeBSD: src/sys/amd64/include/metadata.h,v 1.3 2009/04/15 17:31:22 jkim Exp $ */ #ifndef _MACHINE_METADATA_H_ #define _MACHINE_METADATA_H_ #define MODINFOMD_SMAP 0x1001 +#define MODINFOMD_SMAP_XATTR 0x1002 #endif /* !_MACHINE_METADATA_H_ */ ==== //depot/projects/vimage/src/sys/amd64/include/pc/bios.h#3 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/pc/bios.h,v 1.20 2007/10/28 21:23:49 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/pc/bios.h,v 1.21 2009/04/15 17:31:22 jkim Exp $ */ #ifndef _MACHINE_PC_BIOS_H_ @@ -48,6 +48,10 @@ #define SMAP_TYPE_ACPI_NVS 4 #define SMAP_TYPE_ACPI_ERROR 5 +#define SMAP_XATTR_ENABLED 0x00000001 +#define SMAP_XATTR_NON_VOLATILE 0x00000002 +#define SMAP_XATTR_MASK (SMAP_XATTR_ENABLED | SMAP_XATTR_NON_VOLATILE) + struct bios_smap { u_int64_t base; u_int64_t length; ==== //depot/projects/vimage/src/sys/arm/arm/busdma_machdep.c#15 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.45 2009/04/13 19:20:32 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.46 2009/04/17 13:22:18 jhb Exp $"); /* * ARM bus dma support routines @@ -1427,9 +1427,7 @@ mtx_unlock(&bounce_lock); if (dmat->flags & BUS_DMA_KEEP_PG_OFFSET) { - /* page offset needs to be preserved */ - bpage->vaddr &= ~PAGE_MASK; - bpage->busaddr &= ~PAGE_MASK; + /* Page offset needs to be preserved. */ bpage->vaddr |= vaddr & PAGE_MASK; bpage->busaddr |= vaddr & PAGE_MASK; } @@ -1448,6 +1446,15 @@ bz = dmat->bounce_zone; bpage->datavaddr = 0; bpage->datacount = 0; + if (dmat->flags & BUS_DMA_KEEP_PG_OFFSET) { + /* + * Reset the bounce page to start at offset 0. Other uses + * of this bounce page may need to store a full page of + * data and/or assume it starts on a page boundary. + */ + bpage->vaddr &= ~PAGE_MASK; + bpage->busaddr &= ~PAGE_MASK; + } mtx_lock(&bounce_lock); STAILQ_INSERT_HEAD(&bz->bounce_page_list, bpage, links); ==== //depot/projects/vimage/src/sys/arm/arm/cpufunc_asm_armv5_ec.S#2 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc_asm_armv5_ec.S,v 1.1 2007/10/18 05:33:05 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc_asm_armv5_ec.S,v 1.2 2009/04/16 11:21:52 raj Exp $"); /* * Functions to set the MMU Translation Table Base register @@ -204,3 +204,4 @@ bne 1b /* More to do? */ mcr p15, 0, r0, c7, c10, 4 /* drain the write buffer */ RET + ==== //depot/projects/vimage/src/sys/arm/arm/cpufunc_asm_sheeva.S#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc_asm_sheeva.S,v 1.1 2009/01/09 10:55:33 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc_asm_sheeva.S,v 1.2 2009/04/16 11:21:52 raj Exp $"); #include @@ -375,6 +375,14 @@ mcr p15, 0, r0, c7, c10, 4 /* drain the write buffer */ RET +/* This function modifies register value as follows: + * + * arg1 arg EFFECT (bit value saved into register) + * 0 0 not changed + * 0 1 negated + * 1 0 cleared + * 1 1 set + */ ENTRY(sheeva_control_ext) mrc p15, 1, r3, c15, c1, 0 /* Read the control register */ bic r2, r3, r0 /* Clear bits */ ==== //depot/projects/vimage/src/sys/arm/mv/common.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/mv/common.c,v 1.5 2009/01/08 18:31:43 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/mv/common.c,v 1.6 2009/04/16 11:20:18 raj Exp $"); #include #include @@ -91,7 +91,8 @@ uint32_t ef = 0; soc_id(&dev, &rev); - if (dev == MV_DEV_88F6281 || dev == MV_DEV_MV78100) + if (dev == MV_DEV_88F6281 || dev == MV_DEV_MV78100_Z0 || + dev == MV_DEV_MV78100) __asm __volatile("mrc p15, 1, %0, c15, c1, 0" : "=r" (ef)); else if (dev == MV_DEV_88F5182 || dev == MV_DEV_88F5281) __asm __volatile("mrc p15, 0, %0, c14, c0, 0" : "=r" (ef)); @@ -166,6 +167,9 @@ else if (r == 2) rev = "A0"; break; + case MV_DEV_MV78100_Z0: + dev = "Marvell MV78100 Z0"; + break; case MV_DEV_MV78100: dev = "Marvell MV78100"; break; @@ -199,15 +203,16 @@ decode_win_cpu_setup(); decode_win_usb_setup(); decode_win_eth_setup(MV_ETH0_BASE); - if (dev == MV_DEV_MV78100) + if (dev == MV_DEV_MV78100 || dev == MV_DEV_MV78100_Z0) decode_win_eth_setup(MV_ETH1_BASE); - if (dev == MV_DEV_88F6281 || dev == MV_DEV_MV78100) + if (dev == MV_DEV_88F6281 || dev == MV_DEV_MV78100 || + dev == MV_DEV_MV78100_Z0) decode_win_cesa_setup(); decode_win_idma_setup(); decode_win_xor_setup(); - if (dev == MV_DEV_MV78100) { + if (dev == MV_DEV_MV78100 || dev == MV_DEV_MV78100_Z0) { decode_win_pcie_setup(MV_PCIE00_BASE); decode_win_pcie_setup(MV_PCIE01_BASE); decode_win_pcie_setup(MV_PCIE02_BASE); @@ -360,7 +365,8 @@ if ((dev == MV_DEV_88F5182 && i < 2) || (dev == MV_DEV_88F5281 && i < 4) || (dev == MV_DEV_88F6281 && i < 4) || - (dev == MV_DEV_MV78100 && i < 8)) + (dev == MV_DEV_MV78100 && i < 8) || + (dev == MV_DEV_MV78100_Z0 && i < 8)) return (1); return (0); @@ -590,7 +596,7 @@ uint32_t dev, rev; soc_id(&dev, &rev); - return (dev == MV_DEV_MV78100 ? 3 : 1); + return ((dev == MV_DEV_MV78100 || dev == MV_DEV_MV78100_Z0) ? 3 : 1); } static void @@ -1109,14 +1115,18 @@ return (0); } -static __inline int +static int xor_max_eng(void) { uint32_t dev, rev; soc_id(&dev, &rev); - return ((dev == MV_DEV_88F6281) ? 2 : - (dev == MV_DEV_MV78100) ? 1 : 0); + if (dev == MV_DEV_88F6281) + return (2); + else if ((dev == MV_DEV_MV78100) || (dev == MV_DEV_MV78100_Z0)) + return (1); + else + return (0); } static void ==== //depot/projects/vimage/src/sys/arm/mv/gpio.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/mv/gpio.c,v 1.3 2009/01/08 18:31:43 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/mv/gpio.c,v 1.4 2009/04/16 11:20:18 raj Exp $"); #include #include @@ -123,12 +123,13 @@ return (ENXIO); mv_gpio_softc = sc; - /* Get board id and revision */ + /* Get chip id and revision */ soc_id(&dev_id, &rev_id); if (dev_id == MV_DEV_88F5182 || dev_id == MV_DEV_88F5281 || - dev_id == MV_DEV_MV78100) { + dev_id == MV_DEV_MV78100 || + dev_id == MV_DEV_MV78100_Z0 ) { sc->pin_num = 32; sc->irq_num = 4; sc->use_high = 0; @@ -139,7 +140,7 @@ sc->use_high = 1; } else { - device_printf(dev, "unknown board id=0x%x\n", dev_id); + device_printf(dev, "unknown chip id=0x%x\n", dev_id); return (ENXIO); } ==== //depot/projects/vimage/src/sys/arm/mv/ic.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/mv/ic.c,v 1.1 2008/10/13 20:07:13 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/mv/ic.c,v 1.2 2009/04/16 11:20:18 raj Exp $"); #include #include @@ -98,10 +98,11 @@ sc->ic_high_regs = 0; sc->ic_error_regs = 0; - if (dev_id == MV_DEV_88F6281 || dev_id == MV_DEV_MV78100) + if (dev_id == MV_DEV_88F6281 || dev_id == MV_DEV_MV78100 || + dev_id == MV_DEV_MV78100_Z0) sc->ic_high_regs = 1; - if (dev_id == MV_DEV_MV78100) + if (dev_id == MV_DEV_MV78100 || dev_id == MV_DEV_MV78100_Z0) sc->ic_error_regs = 1; error = bus_alloc_resources(dev, mv_ic_spec, sc->ic_res); ==== //depot/projects/vimage/src/sys/arm/mv/mv_pci.c#4 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/mv/mv_pci.c,v 1.5 2009/01/09 12:38:41 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/mv/mv_pci.c,v 1.6 2009/04/16 11:20:18 raj Exp $"); #include #include @@ -459,8 +459,18 @@ id = "88F6281"; break; case 0x6381: + id = "MV78100 Z0"; + break; + case 0x7810: id = "MV78100"; break; + case 0x7820: + /* + * According to documentation ID 0x7820 is assigned to MV78200. + * However some MV78100 chips also use it. + */ + id = "MV78100/MV78200"; + break; default: device_printf(self, "unknown Marvell PCI bridge: %x\n", val); goto out; ==== //depot/projects/vimage/src/sys/arm/mv/mvreg.h#4 (text+ko) ==== @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/mv/mvreg.h,v 1.4 2009/01/08 18:31:43 raj Exp $ + * $FreeBSD: src/sys/arm/mv/mvreg.h,v 1.5 2009/04/16 11:20:18 raj Exp $ */ #ifndef _MVREG_H_ @@ -471,11 +471,12 @@ /* * Chip ID */ -#define MV_DEV_88F5181 0x5181 -#define MV_DEV_88F5182 0x5182 -#define MV_DEV_88F5281 0x5281 -#define MV_DEV_88F6281 0x6281 -#define MV_DEV_MV78100 0x6381 +#define MV_DEV_88F5181 0x5181 +#define MV_DEV_88F5182 0x5182 +#define MV_DEV_88F5281 0x5281 +#define MV_DEV_88F6281 0x6281 +#define MV_DEV_MV78100_Z0 0x6381 +#define MV_DEV_MV78100 0x7810 /* * Decode windows definitions and macros ==== //depot/projects/vimage/src/sys/boot/i386/libi386/biossmap.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biossmap.c,v 1.8 2008/06/07 03:07:32 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biossmap.c,v 1.9 2009/04/15 17:31:22 jkim Exp $"); /* * Obtain memory configuration information from the BIOS @@ -33,74 +33,107 @@ #include #include #include +#include +#include #include +#include #include #include "bootstrap.h" #include "libi386.h" #include "btxv86.h" -static struct { - struct bios_smap _smap_entry; - char pad[8]; /* Bad BIOS writer, no cookie! */ -} smap; +#define V86_CY(x) ((x) & PSL_C) + +struct smap_buf { + struct bios_smap smap; + uint32_t xattr; /* Extended attribute from ACPI 3.0 */ + STAILQ_ENTRY(smap_buf) bufs; +}; + +#define SMAP_BUFSIZE offsetof(struct smap_buf, bufs) -static struct bios_smap *smapbase; -static int smaplen; +static struct bios_smap *smapbase; +static uint32_t *smapattr; +static u_int smaplen; void bios_getsmap(void) { - int n; + struct smap_buf buf; + STAILQ_HEAD(smap_head, smap_buf) head = + STAILQ_HEAD_INITIALIZER(head); + struct smap_buf *cur, *next; + u_int n, x; + STAILQ_INIT(&head); n = 0; - smaplen = 0; - /* Count up segments in system memory map */ + x = 0; v86.ebx = 0; do { v86.ctl = V86_FLAGS; - v86.addr = 0x15; /* int 0x15 function 0xe820*/ - v86.eax = 0xe820; - v86.ecx = sizeof(struct bios_smap); + v86.addr = 0x15; + v86.eax = 0xe820; /* int 0x15 function 0xe820 */ + v86.ecx = SMAP_BUFSIZE; v86.edx = SMAP_SIG; - v86.es = VTOPSEG(&smap); - v86.edi = VTOPOFF(&smap); + v86.es = VTOPSEG(&buf); + v86.edi = VTOPOFF(&buf); v86int(); - if ((v86.efl & 1) || (v86.eax != SMAP_SIG)) + if (V86_CY(v86.efl) || v86.eax != SMAP_SIG || + v86.ecx < sizeof(buf.smap) || v86.ecx > SMAP_BUFSIZE) + break; + + next = malloc(sizeof(*next)); + if (next == NULL) break; + next->smap = buf.smap; + if (v86.ecx == SMAP_BUFSIZE) { + next->xattr = buf.xattr; + x++; + } + STAILQ_INSERT_TAIL(&head, next, bufs); n++; } while (v86.ebx != 0); - if (n == 0) - return; - n += 10; /* spare room */ - smapbase = malloc(n * sizeof(*smapbase)); + smaplen = n; - /* Save system memory map */ - v86.ebx = 0; - do { - v86.ctl = V86_FLAGS; - v86.addr = 0x15; /* int 0x15 function 0xe820*/ - v86.eax = 0xe820; - v86.ecx = sizeof(struct bios_smap); - v86.edx = SMAP_SIG; - v86.es = VTOPSEG(&smap); - v86.edi = VTOPOFF(&smap); - v86int(); - bcopy(&smap, &smapbase[smaplen], sizeof(struct bios_smap)); - smaplen++; - if ((v86.efl & 1) || (v86.eax != SMAP_SIG)) - break; - } while (v86.ebx != 0 && smaplen < n); + if (smaplen > 0) { + smapbase = malloc(smaplen * sizeof(*smapbase)); + if (smapbase != NULL) { + n = 0; + STAILQ_FOREACH(cur, &head, bufs) + smapbase[n++] = cur->smap; + } + if (smaplen == x) { + smapattr = malloc(smaplen * sizeof(*smapattr)); + if (smapattr != NULL) { + n = 0; + STAILQ_FOREACH(cur, &head, bufs) + smapattr[n++] = cur->xattr & + SMAP_XATTR_MASK; + } + } else + smapattr = NULL; + cur = STAILQ_FIRST(&head); + while (cur != NULL) { + next = STAILQ_NEXT(cur, bufs); + free(cur); + cur = next; + } + } } void bios_addsmapdata(struct preloaded_file *kfp) { - int len; + size_t size; - if (smapbase == 0 || smaplen == 0) + if (smapbase == NULL || smaplen == 0) return; - len = smaplen * sizeof(*smapbase); - file_addmetadata(kfp, MODINFOMD_SMAP, len, smapbase); + size = smaplen * sizeof(*smapbase); + file_addmetadata(kfp, MODINFOMD_SMAP, size, smapbase); + if (smapattr != NULL) { + size = smaplen * sizeof(*smapattr); + file_addmetadata(kfp, MODINFOMD_SMAP_XATTR, size, smapattr); + } } COMMAND_SET(smap, "smap", "show BIOS SMAP", command_smap); @@ -108,12 +141,22 @@ static int command_smap(int argc, char *argv[]) { - int i; + u_int i; - if (smapbase == 0 || smaplen == 0) + if (smapbase == NULL || smaplen == 0) return (CMD_ERROR); - for (i = 0; i < smaplen; i++) - printf("SMAP type=%02x base=%016llx len=%016llx\n", - smapbase[i].type, smapbase[i].base, smapbase[i].length); + if (smapattr != NULL) + for (i = 0; i < smaplen; i++) + printf("SMAP type=%02x base=%016llx len=%016llx attr=%02x\n", + (unsigned int)smapbase[i].type, + (unsigned long long)smapbase[i].base, + (unsigned long long)smapbase[i].length, + (unsigned int)smapattr[i]); + else + for (i = 0; i < smaplen; i++) + printf("SMAP type=%02x base=%016llx len=%016llx\n", + (unsigned int)smapbase[i].type, + (unsigned long long)smapbase[i].base, + (unsigned long long)smapbase[i].length); return (CMD_OK); } ==== //depot/projects/vimage/src/sys/boot/sparc64/loader/main.c#11 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.41 2009/04/13 19:43:37 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.42 2009/04/14 19:02:34 marius Exp $"); /* * FreeBSD/sparc64 kernel loader - machine dependent part @@ -434,9 +434,10 @@ continue; reg = dtlb_get_data_sun4u(i); wrpr(pstate, pstate, 0); + reg >>= TD_PA_SHIFT; if (cpu_impl >= CPU_IMPL_ULTRASPARCIII) - return ((reg & TD_PA_CH_MASK) >> TD_PA_SHIFT); - return ((reg & TD_PA_SF_MASK) >> TD_PA_SHIFT); + return (reg & TD_PA_CH_MASK); + return (reg & TD_PA_SF_MASK); } wrpr(pstate, pstate, 0); return (-1); @@ -456,9 +457,10 @@ continue; reg = itlb_get_data_sun4u(i); wrpr(pstate, pstate, 0); + reg >>= TD_PA_SHIFT; if (cpu_impl >= CPU_IMPL_ULTRASPARCIII) - return ((reg & TD_PA_CH_MASK) >> TD_PA_SHIFT); - return ((reg & TD_PA_SF_MASK) >> TD_PA_SHIFT); + return (reg & TD_PA_CH_MASK); + return (reg & TD_PA_SF_MASK); } wrpr(pstate, pstate, 0); return (-1); @@ -846,7 +848,7 @@ { printf("%s %s ", - page_sizes[(tte & TD_SIZE_MASK) >> TD_SIZE_SHIFT], + page_sizes[(tte >> TD_SIZE_SHIFT) & TD_SIZE_MASK], tag & TD_G ? "G" : " "); printf(tte & TD_W ? "W " : " "); printf(tte & TD_P ? "\e[33mP\e[0m " : " "); ==== //depot/projects/vimage/src/sys/conf/NOTES#46 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1533 2009/04/10 00:34:55 jfv Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1534 2009/04/15 22:38:22 marcel Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -148,6 +148,7 @@ options GEOM_PART_APM # Apple partitioning options GEOM_PART_BSD # BSD disklabel options GEOM_PART_EBR # Extended Boot Records +options GEOM_PART_EBR_COMPAT # Backward compatible partition names options GEOM_PART_GPT # GPT partitioning options GEOM_PART_MBR # MBR partitioning options GEOM_PART_PC98 # PC-9800 disk partitioning ==== //depot/projects/vimage/src/sys/conf/files#62 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1390 2009/04/12 19:04:27 rmacklem Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1391 2009/04/17 09:42:26 rwatson Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1501,7 +1501,6 @@ legacy/dev/usb/ehci_ddb.c optional oehci legacy/dev/usb/ehci_pci.c optional oehci pci legacy/dev/usb/hid.c optional ousb -legacy/dev/usb/if_aue.c optional oaue legacy/dev/usb/ohci.c optional oohci legacy/dev/usb/ohci_pci.c optional oohci pci legacy/dev/usb/sl811hs.c optional oslhci ==== //depot/projects/vimage/src/sys/conf/options#45 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.664 2009/03/30 19:23:49 sam Exp $ +# $FreeBSD: src/sys/conf/options,v 1.665 2009/04/15 22:38:22 marcel Exp $ # # On the handling of kernel options # @@ -93,6 +93,7 @@ GEOM_PART_APM opt_geom.h GEOM_PART_BSD opt_geom.h GEOM_PART_EBR opt_geom.h +GEOM_PART_EBR_COMPAT opt_geom.h GEOM_PART_GPT opt_geom.h GEOM_PART_MBR opt_geom.h GEOM_PART_PC98 opt_geom.h ==== //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#16 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c,v 1.15 2009/02/27 13:29:18 bz Exp $ */ +/* $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c,v 1.16 2009/04/16 20:30:28 kmacy Exp $ */ /* * Copyright (C) 1993-2003 by Darren Reed. @@ -1051,7 +1051,7 @@ if (!ip->ip_sum) ip->ip_sum = in_cksum(m, hlen); error = (*ifp->if_output)(ifp, m, (struct sockaddr *)dst, - ro->ro_rt); + ro); goto done; } /* @@ -1132,7 +1132,7 @@ m->m_act = 0; if (error == 0) error = (*ifp->if_output)(ifp, m, - (struct sockaddr *)dst, ro->ro_rt); + (struct sockaddr *)dst, ro); else FREE_MB_T(m); } ==== //depot/projects/vimage/src/sys/contrib/pf/net/if_pflog.c#5 (text+ko) ==== @@ -40,7 +40,7 @@ #include "opt_pf.h" #include -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/if_pflog.c,v 1.21 2007/07/03 12:16:07 mlaier Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/if_pflog.c,v 1.22 2009/04/16 20:30:28 kmacy Exp $"); #ifdef DEV_BPF #define NBPFILTER DEV_BPF @@ -113,7 +113,7 @@ void pflogattach(int); int pflogoutput(struct ifnet *, struct mbuf *, struct sockaddr *, - struct rtentry *); + struct route *); int pflogioctl(struct ifnet *, u_long, caddr_t); void pflogstart(struct ifnet *); #ifdef __FreeBSD__ @@ -287,7 +287,7 @@ int pflogoutput(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst, - struct rtentry *rt) + struct route *ro) { m_freem(m); return (0); ==== //depot/projects/vimage/src/sys/contrib/pf/net/if_pfsync.c#9 (text+ko) ==== @@ -34,7 +34,7 @@ #include "opt_pf.h" #include -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.36 2007/07/28 07:31:29 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.37 2009/04/16 20:30:28 kmacy Exp $"); #ifdef DEV_BPF #define NBPFILTER DEV_BPF @@ -152,7 +152,7 @@ void pfsync_update_net_tdb(struct pfsync_tdb *); #endif int pfsyncoutput(struct ifnet *, struct mbuf *, struct sockaddr *, - struct rtentry *); + struct route *); int pfsyncioctl(struct ifnet *, u_long, caddr_t); void pfsyncstart(struct ifnet *); @@ -1083,7 +1083,7 @@ int pfsyncoutput(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst, - struct rtentry *rt) + struct route *ro) { m_freem(m); return (0); ==== //depot/projects/vimage/src/sys/contrib/pf/net/pf.c#22 (text+ko) ==== @@ -41,7 +41,7 @@ #include "opt_inet6.h" #include -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.64 2009/04/12 13:22:33 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.65 2009/04/16 20:30:28 kmacy Exp $"); #endif #ifdef __FreeBSD__ @@ -6245,7 +6245,7 @@ } } PF_UNLOCK(); - error = (*ifp->if_output)(ifp, m0, sintosa(dst), ro->ro_rt); + error = (*ifp->if_output)(ifp, m0, sintosa(dst), ro); PF_LOCK(); goto done; } ==== //depot/projects/vimage/src/sys/dev/atkbdc/atkbd.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/atkbdc/atkbd.c,v 1.53 2007/12/29 21:55:22 wkoszek Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/atkbdc/atkbd.c,v 1.54 2009/04/17 00:30:56 emax Exp $"); #include "opt_compat.h" #include "opt_kbd.h" @@ -476,7 +476,7 @@ static int atkbd_intr(keyboard_t *kbd, void *arg) { - atkbd_state_t *state; + atkbd_state_t *state = (atkbd_state_t *)kbd->kb_data; int delay[2]; int c; @@ -485,7 +485,6 @@ * The keyboard was not detected before; * it must have been reconnected! >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Apr 17 19:20:30 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 65BEC1065672; Fri, 17 Apr 2009 19:20:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1AAC1106566B for ; Fri, 17 Apr 2009 19:20:30 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 09C918FC13 for ; Fri, 17 Apr 2009 19:20:30 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3HJKTZM074846 for ; Fri, 17 Apr 2009 19:20:29 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3HJKThW074844 for perforce@freebsd.org; Fri, 17 Apr 2009 19:20:29 GMT (envelope-from zec@fer.hr) Date: Fri, 17 Apr 2009 19:20:29 GMT Message-Id: <200904171920.n3HJKThW074844@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 160757 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, 17 Apr 2009 19:20:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=160757 Change 160757 by zec@zec_tpx32 on 2009/04/17 19:20:09 Use the appropriate sizeof(struct ipsec) when declaring storage requirements for ipsec vnet module. Spotted by: bz Affected files ... .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.c#29 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.c#29 (text+ko) ==== @@ -248,7 +248,7 @@ static const vnet_modinfo_t vnet_ipsec_modinfo = { .vmi_id = VNET_MOD_IPSEC, .vmi_name = "ipsec", - .vmi_size = sizeof(struct vnet_inet), + .vmi_size = sizeof(struct vnet_ipsec), .vmi_dependson = VNET_MOD_INET, /* XXX revisit - INET6 ? */ .vmi_iattach = ipsec_iattach }; From owner-p4-projects@FreeBSD.ORG Sat Apr 18 06:06:29 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C23B9106566C; Sat, 18 Apr 2009 06:06:28 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 77531106564A for ; Sat, 18 Apr 2009 06:06:28 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 646CD8FC1B for ; Sat, 18 Apr 2009 06:06:28 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3I66Snd067580 for ; Sat, 18 Apr 2009 06:06:28 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3I66SIO067578 for perforce@freebsd.org; Sat, 18 Apr 2009 06:06:28 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 18 Apr 2009 06:06:28 GMT Message-Id: <200904180606.n3I66SIO067578@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 160774 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, 18 Apr 2009 06:06:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=160774 Change 160774 by pgj@petymeg on 2009/04/18 06:06:17 IFC Affected files ... .. //depot/projects/docproj_hu/doc/share/sgml/freebsd.ent#9 integrate .. //depot/projects/docproj_hu/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#12 integrate .. //depot/projects/docproj_hu/src/release/doc/share/misc/dev.archlist.txt#5 integrate .. //depot/projects/docproj_hu/www/en/releases/7.2R/schedule.sgml#7 integrate .. //depot/projects/docproj_hu/www/en/releng/index.sgml#20 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/events.xml#6 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#13 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/press.xml#6 integrate .. //depot/projects/docproj_hu/www/share/sgml/news.xml#49 integrate .. //depot/projects/docproj_hu/www/share/sgml/release.ent#13 integrate Differences ... ==== //depot/projects/docproj_hu/doc/share/sgml/freebsd.ent#9 (text+ko) ==== @@ -1,7 +1,7 @@ - + ==== //depot/projects/docproj_hu/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#12 (text+ko) ==== @@ -17,7 +17,7 @@ The &os; Documentation Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.348 2009/04/07 20:12:15 brueffer Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.349 2009/04/17 15:49:37 nyan Exp $ 2000 @@ -853,9 +853,6 @@ &hwlist.ral; - [&arch.i386;, &arch.pc98;] Raytheon Raylink 2.4GHz - wireless adapters (&man.ray.4; driver) - &hwlist.rum; &hwlist.uath; @@ -1039,9 +1036,6 @@ [&arch.amd64;, &arch.i386;] AST 4 port serial card using shared IRQ - [&arch.i386;] ARNET serial cards (&man.ar.4; - driver) - ARNET 8 port serial card using shared IRQ @@ -1207,8 +1201,6 @@ &hwlist.rc; - &hwlist.sr; - [&arch.i386;, &arch.amd64;] Specialix SI/XIO/SX multiport serial cards, with both the older SIHOST2.x and the enhanced (transputer based, aka JET) host cards ==== //depot/projects/docproj_hu/src/release/doc/share/misc/dev.archlist.txt#5 (text+ko) ==== @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.108 2009/03/20 09:25:21 brueffer Exp $ +# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.109 2009/04/17 15:54:41 nyan Exp $ # # @@ -140,7 +140,6 @@ snd_via8233 i386,amd64 snd_via82c686 i386,amd64 snd_vibes i386,amd64 -sr i386 ste i386,pc98,amd64 stg i386,pc98 stge i386,amd64,sparc64 ==== //depot/projects/docproj_hu/www/en/releases/7.2R/schedule.sgml#7 (text+ko) ==== @@ -1,7 +1,7 @@ - + @@ -97,7 +97,7 @@ doc/ tree tagged. 17 April 2009 - -- + 17 April 2009 Version number bumps for doc/ subtree. RELEASE_&local.rel.tag;_0 tag for doc/. doc/ slush ends at this time. @@ -112,8 +112,8 @@ RELENG_7_2 branch - 10 April 2009 - -- + 10 April 2009 + 15 April 2009 The new release branch is created. Update newvers.sh and release.ent on various branches involved. @@ -121,7 +121,7 @@ RC1 builds 13 April 2009 - -- + 15 April 2009 Begin RC1 builds. ==== //depot/projects/docproj_hu/www/en/releng/index.sgml#20 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -50,7 +50,7 @@ May 2009 FreeBSD 7.2 - BETA1 is available + RC1 is available @@ -296,7 +296,7 @@ doc/ - Slush + Open &contact.doc; SGML/XML based documentation set. ==== //depot/projects/docproj_hu/www/hu/share/sgml/events.xml#6 (text+ko) ==== @@ -17,7 +17,7 @@ - $FreeBSD: www/hu/share/sgml/events.xml,v 1.1 2009/04/06 17:56:08 pgj Exp $ + $FreeBSD: www/hu/share/sgml/events.xml,v 1.2 2009/04/14 17:52:55 pgj Exp $ ==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#13 (text+ko) ==== @@ -11,7 +11,7 @@ - $FreeBSD: www/hu/share/sgml/news.xml,v 1.1 2009/04/06 17:56:08 pgj Exp $ + $FreeBSD: www/hu/share/sgml/news.xml,v 1.2 2009/04/14 17:52:55 pgj Exp $ ==== //depot/projects/docproj_hu/www/hu/share/sgml/press.xml#6 (text+ko) ==== @@ -11,7 +11,7 @@ - $FreeBSD: www/hu/share/sgml/press.xml,v 1.1 2009/04/06 17:56:08 pgj Exp $ + $FreeBSD: www/hu/share/sgml/press.xml,v 1.2 2009/04/14 17:52:55 pgj Exp $ ==== //depot/projects/docproj_hu/www/share/sgml/news.xml#49 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.241 2009/04/13 19:41:56 jkois Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.242 2009/04/17 18:29:15 blackend Exp $ @@ -36,6 +36,23 @@ 4 + 17 + + + FreeBSD 7.2-RC1 Available + +

    The first of two planned Release Candidates for the &os; + 7.2-RELEASE cycle is now available. ISO images for Tier-1 + architectures are now available + on most of the &os; + mirror sites.

    +     +     + + 12 ==== //depot/projects/docproj_hu/www/share/sgml/release.ent#13 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -22,6 +22,25 @@ 4 + 17 + + + Megjelent a &os; 7.2-RC1! + +

    Megjelent a &os; 7.2-RELEASE kiadási + ciklusában következõ, elsõ + kiadásra jelölt (Release Candidate) + változata. Az összes Tier 1 + architektúrára a legtöbb &os; + tükrözésen már + mostantól elérhetõek + hozzá lemezképek.

    +     +     + + 12 From owner-p4-projects@FreeBSD.ORG Sat Apr 18 15:14:53 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 380581065AEC; Sat, 18 Apr 2009 15:14:50 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9C7BC1065AD6 for ; Sat, 18 Apr 2009 15:14:49 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8912D8FC12 for ; Sat, 18 Apr 2009 15:14:49 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3IFEncl041186 for ; Sat, 18 Apr 2009 15:14:49 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3IFEnU3041184 for perforce@freebsd.org; Sat, 18 Apr 2009 15:14:49 GMT (envelope-from lulf@FreeBSD.org) Date: Sat, 18 Apr 2009 15:14:49 GMT Message-Id: <200904181514.n3IFEnU3041184@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 160784 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, 18 Apr 2009 15:14:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=160784 Change 160784 by lulf@lulf_carrot on 2009/04/18 15:13:54 - s/atmel/ATMEL on macros - Move non-at91 specific headers out. Affected files ... .. //depot/projects/avr32/src/sys/arm/at91/at91_mci.c#3 delete .. //depot/projects/avr32/src/sys/arm/at91/at91_mcireg.h#2 delete .. //depot/projects/avr32/src/sys/arm/at91/at91_pdcreg.h#2 delete .. //depot/projects/avr32/src/sys/dev/mmc/atmel_mci.c#4 edit .. //depot/projects/avr32/src/sys/dev/mmc/atmel_mcireg.h#1 add .. //depot/projects/avr32/src/sys/dev/mmc/atmel_pdcreg.h#1 add Differences ... ==== //depot/projects/avr32/src/sys/dev/mmc/atmel_mci.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/atmel/at91_mci.c,v 1.13 2009/01/21 17:39:11 imp Exp $"); +__FBSDID("$FreeBSD$"); #include #include @@ -53,10 +53,8 @@ #include #include #include -#include -#include -#include -#include +#include +#include #include #include #include @@ -110,14 +108,14 @@ static int atmel_mci_activate(device_t dev); static void atmel_mci_deactivate(device_t dev); -#define atmel_MCI_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx) -#define atmel_MCI_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx) -#define atmel_MCI_LOCK_INIT(_sc) \ +#define ATMEL_MCI_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx) +#define ATMEL_MCI_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx) +#define ATMEL_MCI_LOCK_INIT(_sc) \ mtx_init(&_sc->sc_mtx, device_get_nameunit(_sc->dev), \ "mci", MTX_DEF) -#define atmel_MCI_LOCK_DESTROY(_sc) mtx_destroy(&_sc->sc_mtx); -#define atmel_MCI_ASSERT_LOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_OWNED); -#define atmel_MCI_ASSERT_UNLOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_NOTOWNED); +#define ATMEL_MCI_LOCK_DESTROY(_sc) mtx_destroy(&_sc->sc_mtx); +#define ATMEL_MCI_ASSERT_LOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_OWNED); +#define ATMEL_MCI_ASSERT_UNLOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_NOTOWNED); static void atmel_mci_pdc_disable(struct atmel_mci_softc *sc) @@ -175,7 +173,7 @@ if (err) goto out; - atmel_MCI_LOCK_INIT(sc); + ATMEL_MCI_LOCK_INIT(sc); /* * Allocate DMA tags and maps @@ -198,7 +196,7 @@ err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC | INTR_MPSAFE, NULL, atmel_mci_intr, sc, &sc->intrhand); if (err) { - atmel_MCI_LOCK_DESTROY(sc); + ATMEL_MCI_LOCK_DESTROY(sc); goto out; } mci_clockfreq = devclk_get_rate(dev); @@ -347,10 +345,10 @@ if (!data) { // The no data case is fairly simple atmel_mci_pdc_disable(sc); - printf("CMDR %x ARGR %x\n", cmdr, cmd->arg); + //avr32_debug("CMDR %x ARGR %x\n", cmdr, cmd->arg); WR4(sc, MCI_ARGR, cmd->arg); WR4(sc, MCI_CMDR, cmdr); - WR4(sc, MCI_IER, 0xffffffff); //MCI_SR_ERROR | MCI_SR_CMDRDY); + WR4(sc, MCI_IER, MCI_SR_ERROR | MCI_SR_CMDRDY); return; } if (data->flags & MMC_DATA_READ) @@ -451,18 +449,18 @@ { struct atmel_mci_softc *sc = device_get_softc(brdev); - atmel_MCI_LOCK(sc); + ATMEL_MCI_LOCK(sc); // XXX do we want to be able to queue up multiple commands? // XXX sounds like a good idea, but all protocols are sync, so // XXX maybe the idea is naive... if (sc->req != NULL) { - atmel_MCI_UNLOCK(sc); + ATMEL_MCI_UNLOCK(sc); return EBUSY; } sc->req = req; sc->flags = 0; atmel_mci_start(sc); - atmel_MCI_UNLOCK(sc); + ATMEL_MCI_UNLOCK(sc); return (0); } @@ -478,11 +476,11 @@ struct atmel_mci_softc *sc = device_get_softc(brdev); int err = 0; - atmel_MCI_LOCK(sc); + ATMEL_MCI_LOCK(sc); while (sc->bus_busy) msleep(sc, &sc->sc_mtx, PZERO, "mciah", hz / 5); sc->bus_busy++; - atmel_MCI_UNLOCK(sc); + ATMEL_MCI_UNLOCK(sc); return (err); } @@ -491,10 +489,10 @@ { struct atmel_mci_softc *sc = device_get_softc(brdev); - atmel_MCI_LOCK(sc); + ATMEL_MCI_LOCK(sc); sc->bus_busy--; wakeup(sc); - atmel_MCI_UNLOCK(sc); + ATMEL_MCI_UNLOCK(sc); return (0); } @@ -539,7 +537,7 @@ int i, done = 0; struct mmc_command *cmd; - atmel_MCI_LOCK(sc); + ATMEL_MCI_LOCK(sc); sr = RD4(sc, MCI_SR) & RD4(sc, MCI_IMR); // printf("i 0x%x\n", sr); cmd = sc->curcmd; @@ -612,7 +610,7 @@ } atmel_mci_start(sc); } - atmel_MCI_UNLOCK(sc); + ATMEL_MCI_UNLOCK(sc); } static int From owner-p4-projects@FreeBSD.ORG Sat Apr 18 16:00:37 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ACAA31065794; Sat, 18 Apr 2009 16:00:36 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2B9B6106578F for ; Sat, 18 Apr 2009 16:00:36 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1527D8FC14 for ; Sat, 18 Apr 2009 16:00:36 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3IG0aZc044663 for ; Sat, 18 Apr 2009 16:00:36 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3IG0aG6044661 for perforce@freebsd.org; Sat, 18 Apr 2009 16:00:36 GMT (envelope-from lulf@FreeBSD.org) Date: Sat, 18 Apr 2009 16:00:36 GMT Message-Id: <200904181600.n3IG0aG6044661@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 160785 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, 18 Apr 2009 16:00:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=160785 Change 160785 by lulf@lulf_carrot on 2009/04/18 16:00:07 - Drop using a clk_index, and create the device clocks in the power manager itself instead. We might use a softc per clock to distinguish between clocks that are on the same height such as pba,pbb,cpu,hsb or mci,uart,spi etc. - Remove lookup_index and rename lookup_name to lookup_clock. - Add function to set a clock parent. - PBB/PBA are not clocks more than just a mask, so drop them and let the clock tree "leafs" like mci handle it. Affected files ... .. //depot/projects/avr32/src/sys/avr32/avr32/at32.c#11 edit .. //depot/projects/avr32/src/sys/avr32/avr32/at32_pm.c#7 edit .. //depot/projects/avr32/src/sys/avr32/avr32/at32_tc.c#3 edit .. //depot/projects/avr32/src/sys/avr32/avr32/at32_tc_channel.c#3 edit .. //depot/projects/avr32/src/sys/avr32/conf/cpu/at32ap700x.hints#5 edit .. //depot/projects/avr32/src/sys/kern/devclk_if.m#6 edit .. //depot/projects/avr32/src/sys/kern/subr_devclk.c#6 edit .. //depot/projects/avr32/src/sys/sys/devclk.h#6 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/avr32/at32.c#11 (text+ko) ==== @@ -67,13 +67,8 @@ struct resource *); static struct resource *at32_alloc_resource(device_t, device_t, int, int *, u_long, u_long, u_long, u_int); -static uint64_t at32_clk_get_rate(device_t, device_t); -static int at32_clk_set_rate(device_t, device_t, uint64_t); -static void at32_clk_enable(device_t, device_t); -static void at32_clk_disable(device_t, device_t); +static const char *at32_lookup_clock(device_t, device_t); -static const char *at32_clk_lookup_name(device_t, device_t); -static int at32_clk_lookup_index(device_t, device_t); /* Driver variables and private data */ struct at32_softc { struct rman sc_irq_rman; @@ -82,7 +77,6 @@ }; struct at32_ivar { char *clk_name; - int clk_index; struct resource_list resources; }; @@ -103,13 +97,7 @@ DEVMETHOD(bus_get_resource, bus_generic_rl_get_resource), DEVMETHOD(bus_release_resource, at32_release_resource), - DEVMETHOD(devclk_lookup_name, at32_clk_lookup_name), - DEVMETHOD(devclk_lookup_index, at32_clk_lookup_index), -/* - DEVMETHOD(devclk_get_rate, at32_clk_get_rate), - DEVMETHOD(devclk_set_rate, at32_clk_set_rate), - DEVMETHOD(devclk_enable, at32_clk_enable), - DEVMETHOD(devclk_disable, at32_clk_disable),*/ + DEVMETHOD(devclk_lookup_clock, at32_lookup_clock), {0, 0}, }; @@ -226,9 +214,6 @@ ivar = device_get_ivars(child); ivar->clk_name = NULL; if (resource_string_value(dname, dunit, "clk", &resval) == 0) { - if (resource_int_value(dname, dunit, "clk_index", - &ivar->clk_index) != 0) - ivar->clk_index = 0; /* Default */ ivar->clk_name = malloc(strlen(resval) + 1, M_DEVBUF, M_WAITOK | M_ZERO); strlcpy(ivar->clk_name, resval, strlen(resval) + 1); @@ -368,55 +353,10 @@ } static const char * -at32_clk_lookup_name(device_t dev, device_t child) +at32_lookup_clock(device_t dev, device_t child) { struct at32_ivar *ivar; ivar = device_get_ivars(child); return (ivar->clk_name); } - -static int -at32_clk_lookup_index(device_t dev, device_t child) -{ - struct at32_ivar *ivar; - - ivar = device_get_ivars(child); - return (ivar->clk_index); -} - -#if 0 -static uint64_t -at32_clk_get_rate(device_t dev, device_t child) -{ - avr32_impl(); - return (0); -} - -static int -at32_clk_set_rate(device_t dev, device_t child, uint64_t rate) -{ - avr32_impl(); - return (0); -} - -static void -at32_clk_enable(device_t dev, device_t child) -{ - struct at32_ivar *ivar = device_get_ivars(child); - - /* Only activate if it actually has a clock. */ - if (strcmp(ivar->clk_name, "") != 0) - devclk_activate(ivar->clk_name, ivar->clk_index); -} - -static void -at32_clk_disable(device_t dev, device_t child) -{ - struct at32_ivar *ivar = device_get_ivars(child); - - /* Only deactivate if it actually has a clock. */ - if (strcmp(ivar->clk_name, "") != 0) - devclk_deactivate(ivar->clk_name, ivar->clk_index); -} -#endif ==== //depot/projects/avr32/src/sys/avr32/avr32/at32_pm.c#7 (text+ko) ==== @@ -65,26 +65,21 @@ static int at32_pm_activate(device_t); static void at32_pm_deactivate(device_t); -static void at32_pba_enable(devclk_t, int); -static void at32_pba_disable(devclk_t, int); -static uint64_t at32_pba_get_rate(devclk_t, int); -static int at32_pba_set_rate(devclk_t, int, uint64_t); +static void at32_mci_enable(devclk_t); +static void at32_mci_disable(devclk_t); +static uint64_t at32_mci_get_rate(devclk_t); +static int at32_mci_set_rate(devclk_t, uint64_t); -static void at32_pbb_enable(devclk_t, int); -static void at32_pbb_disable(devclk_t, int); -static uint64_t at32_pbb_get_rate(devclk_t, int); -static int at32_pbb_set_rate(devclk_t, int, uint64_t); +static void at32_pll_enable(devclk_t); +static void at32_pll_disable(devclk_t); +static uint64_t at32_pll_get_rate(devclk_t); +static int at32_pll_set_rate(devclk_t, uint64_t); -static void at32_pll_enable(devclk_t, int); -static void at32_pll_disable(devclk_t, int); -static uint64_t at32_pll_get_rate(devclk_t, int); -static int at32_pll_set_rate(devclk_t, int, uint64_t); +static void at32_osc_enable(devclk_t); +static void at32_osc_disable(devclk_t); +static uint64_t at32_osc_get_rate(devclk_t); +static int at32_osc_set_rate(devclk_t, uint64_t); -static void at32_osc_enable(devclk_t, int); -static void at32_osc_disable(devclk_t, int); -static uint64_t at32_osc_get_rate(devclk_t, int); -static int at32_osc_set_rate(devclk_t, int, uint64_t); - /* Driver variables and private data */ struct at32_pm_softc { struct resource *regs_res; @@ -93,6 +88,14 @@ bus_space_handle_t bsh; }; +#if 0 +struct at32_clk_softc { + const char *name; + int index; + devclk_t clk; +}; +#endif + static device_method_t at32_pm_methods[] = { /* Device interface */ DEVMETHOD(device_probe, at32_pm_probe), @@ -130,27 +133,16 @@ }; DEFINE_CLASS(at32_pll, at32_pll_methods, sizeof(struct devclk)); -/* Class defining the PBB clock mask. */ -static kobj_method_t at32_pbb_methods[] = { - KOBJMETHOD(devclk_enable, at32_pbb_enable), - KOBJMETHOD(devclk_disable, at32_pbb_disable), - KOBJMETHOD(devclk_set_rate, at32_pbb_set_rate), - KOBJMETHOD(devclk_get_rate, at32_pbb_get_rate), +/* Class defining the mci device clock. */ +static kobj_method_t at32_mci_methods[] = { + KOBJMETHOD(devclk_enable, at32_mci_enable), + KOBJMETHOD(devclk_disable, at32_mci_disable), + KOBJMETHOD(devclk_set_rate, at32_mci_set_rate), + KOBJMETHOD(devclk_get_rate, at32_mci_get_rate), {0, 0}, }; -DEFINE_CLASS(at32_pbb, at32_pbb_methods, sizeof(struct devclk)); +DEFINE_CLASS(at32_mci, at32_mci_methods, sizeof(struct devclk)); -/* Class defining the pba clock mask. */ -static kobj_method_t at32_pba_methods[] = { - KOBJMETHOD(devclk_enable, at32_pba_enable), - KOBJMETHOD(devclk_disable, at32_pba_disable), - KOBJMETHOD(devclk_set_rate, at32_pba_set_rate), - KOBJMETHOD(devclk_get_rate, at32_pba_get_rate), - {0, 0}, -}; -DEFINE_CLASS(at32_pba, at32_pba_methods, sizeof(struct devclk)); - - /* Code */ static int at32_pm_probe(device_t dev) @@ -183,11 +175,9 @@ at32_pm_activate(device_t dev) { struct at32_pm_softc *sc = device_get_softc(dev); + devclk_t clk; int err = ENOMEM; - /* Make sure device clock is enabled before writing */ - devclk_enable(dev); - /* Set private data and map register space */ sc->regs_res = bus_alloc_resource(dev, SYS_RES_MEMORY, &sc->regs_rid, 0, ~0, 0, RF_ACTIVE); @@ -201,20 +191,18 @@ /* Register main clocks. */ //devclk_register_clock(dev, "osc32", NULL); - devclk_register_clock(dev, &at32_osc_class, "osc0", NULL); + devclk_register_clock(dev, &at32_osc_class, "osc0"); //devclk_register_clock(dev, &sc->osc1, "osc1", NULL); /* Register prescalers. */ - devclk_register_clock(dev, &at32_pll_class, "pll0", "osc0"); + clk = devclk_register_clock(dev, &at32_pll_class, "pll0"); + devclk_set_parent(clk, "osc0"); //devclk_register_clock(dev, &sc->pll1, "pll1", &sc->osc0); /* Register master device clocks. */ - devclk_register_clock(dev, &at32_pbb_class, "pbb", "pll0"); - devclk_register_clock(dev, &at32_pba_class, "pba", "pll0"); -// devclk_register_clock(dev, &sc->cpu, "cpu", &sc->pll0); -// devclk_register_clock(dev, &sc->hsb, "hsb", &sc->cpu); -// devclk_register_clock(dev, &sc->pba, "pba", &sc->hsb); -// devclk_register_clock(dev, &sc->pbb, "pbb", &sc->hsb); + clk = devclk_register_clock(dev, &at32_mci_class, "mci"); + devclk_set_parent(clk, "pll0"); + /* XXX: Implement rest of device clocks. */ return (0); err: @@ -237,186 +225,81 @@ } static void -at32_pbb_enable(devclk_t clk, int index) +at32_mci_enable(devclk_t clk) { struct at32_pm_softc *sc; uint32_t reg; KASSERT(clk != NULL, ("NULL clk")); - KASSERT(index < 31, ("index > register width")); sc = device_get_softc(clk->dev); reg = RD4(AT32_PM_PBBMASK); - WR4(AT32_PM_PBBMASK, reg | (1 << index)); + WR4(AT32_PM_PBBMASK, reg | (1 << 9)); } static void -at32_pbb_disable(devclk_t clk, int index) +at32_mci_disable(devclk_t clk) { struct at32_pm_softc *sc; uint32_t reg; KASSERT(clk != NULL, ("NULL clk")); - KASSERT(index < 31, ("index > register width")); sc = device_get_softc(clk->dev); reg = RD4(AT32_PM_PBBMASK); - WR4(AT32_PM_PBBMASK, reg & ~(1 << index)); + WR4(AT32_PM_PBBMASK, reg & ~(1 << 9)); } -extern uint64_t clock_cpu_frequency; - static uint64_t -at32_pbb_get_rate(devclk_t clk, int index) +at32_mci_get_rate(devclk_t clk) { - /* XXX: Temporary. */ - return (clock_cpu_frequency); -} - -static int -at32_pbb_set_rate(devclk_t clk, int index, uint64_t rate) -{ return (0); -} - -static void -at32_pba_enable(devclk_t clk, int index) -{ - struct at32_pm_softc *sc; - uint32_t reg; +} - KASSERT(clk != NULL, ("NULL clk")); - KASSERT(index < 31, ("index > register width")); - sc = device_get_softc(clk->dev); - reg = RD4(AT32_PM_PBAMASK); - WR4(AT32_PM_PBAMASK, reg | (1 << index)); -} - -static void -at32_pba_disable(devclk_t clk, int index) -{ - struct at32_pm_softc *sc; - uint32_t reg; - - KASSERT(clk != NULL, ("NULL clk")); - KASSERT(index < 31, ("index > register width")); - sc = device_get_softc(clk->dev); - reg = RD4(AT32_PM_PBAMASK); - WR4(AT32_PM_PBAMASK, reg & ~(1 << index)); -} - -static uint64_t -at32_pba_get_rate(devclk_t clk, int index) -{ - /* XXX: Temporary. */ - return (clock_cpu_frequency); -} - static int -at32_pba_set_rate(devclk_t clk, int index, uint64_t rate) +at32_mci_set_rate(devclk_t clk, uint64_t rate) { return (0); } static void -at32_osc_enable(devclk_t clk, int index) +at32_osc_enable(devclk_t clk) { - /* In this case, index means which oscilliator. */ - switch (index) { - case 0: /* OSC0 */ - break; - case 1: /* OSC1 */ - break; - case 2: /* OSC32 */ - break; - } } static void -at32_osc_disable(devclk_t clk, int index) +at32_osc_disable(devclk_t clk) { - /* In this case, index means which oscilliator. */ - switch (index) { - case 0: /* OSC0 */ - break; - case 1: /* OSC1 */ - break; - case 2: /* OSC32 */ - break; - } } static uint64_t -at32_osc_get_rate(devclk_t clk, int index) +at32_osc_get_rate(devclk_t clk) { - /* In this case, index means which oscilliator. */ - switch (index) { - case 0: /* OSC0 */ - break; - case 1: /* OSC1 */ - break; - case 2: /* OSC32 */ - break; - } + return (0); } static int -at32_osc_set_rate(devclk_t clk, int index, uint64_t rate) +at32_osc_set_rate(devclk_t clk, uint64_t rate) { - /* In this case, index means which oscilliator. */ - switch (index) { - case 0: /* OSC0 */ - break; - case 1: /* OSC1 */ - break; - case 2: /* OSC32 */ - break; - } return (0); } static void -at32_pll_enable(devclk_t clk, int index) +at32_pll_enable(devclk_t clk) { - /* Here, index means which pll. */ - switch (index) { - case 0: /* PLL0. */ - break; - case 1: /* PLL1. */ - break; - } } static void -at32_pll_disable(devclk_t clk, int index) +at32_pll_disable(devclk_t clk) { - /* Here, index means which pll. */ - switch (index) { - case 0: /* PLL0. */ - break; - case 1: /* PLL1. */ - break; - } } static uint64_t -at32_pll_get_rate(devclk_t clk, int index) +at32_pll_get_rate(devclk_t clk) { - switch (index) { - case 0: /* PLL0 */ - break; - case 1: /* PLL1 */ - break; - } return (0); } static int -at32_pll_set_rate(devclk_t clk, int index, uint64_t rate) +at32_pll_set_rate(devclk_t clk, uint64_t rate) { - switch (index) { - case 0: /* PLL0 */ - break; - case 1: /* PLL1 */ - break; - } return (0); } ==== //depot/projects/avr32/src/sys/avr32/avr32/at32_tc.c#3 (text+ko) ==== @@ -67,8 +67,7 @@ u_long, u_long, u_long, u_int); static int at32_tc_release_resource(device_t, device_t, int, int, struct resource *); -static const char *at32_tc_clk_lookup_name(device_t, device_t); -static int at32_tc_clk_lookup_index(device_t, device_t); +static const char *at32_tc_lookup_clock(device_t, device_t); /*** Driver variables and private data */ struct at32_tc_softc { @@ -99,8 +98,7 @@ DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), - DEVMETHOD(devclk_lookup_name, at32_tc_clk_lookup_name), - DEVMETHOD(devclk_lookup_index, at32_tc_clk_lookup_index), + DEVMETHOD(devclk_lookup_clock, at32_tc_lookup_clock), {0, 0}, }; @@ -127,7 +125,7 @@ int rid, err = ENOMEM; /* Make sure device clock is enabled before writing */ - devclk_enable(dev); + //devclk_enable(dev); /* Setup register space */ rid = 0; @@ -193,7 +191,7 @@ } /* Turn off device clock */ - devclk_disable(dev); + //devclk_disable(dev); return (0); } @@ -354,23 +352,12 @@ } static const char * -at32_tc_clk_lookup_name(device_t dev, device_t child) +at32_tc_lookup_clock(device_t dev, device_t child) { device_t parent; parent = device_get_parent(dev); if (parent != NULL) - return (DEVCLK_LOOKUP_NAME(parent, dev)); - return (NULL); -} - -static int -at32_tc_clk_lookup_index(device_t dev, device_t child) -{ - device_t parent; - - parent = device_get_parent(dev); - if (parent != NULL) - return (DEVCLK_LOOKUP_INDEX(parent, dev)); + return (DEVCLK_LOOKUP_CLOCK(parent, dev)); return (NULL); } ==== //depot/projects/avr32/src/sys/avr32/avr32/at32_tc_channel.c#3 (text+ko) ==== @@ -104,7 +104,7 @@ int rid, err = ENOMEM; /* Make sure device clock is enabled before writing */ - devclk_enable(dev); + //devclk_enable(dev); /* Setup register space */ rid = 0; @@ -157,7 +157,7 @@ } /* Turn off device clock */ - devclk_disable(dev); + //devclk_disable(dev); return (0); } ==== //depot/projects/avr32/src/sys/avr32/conf/cpu/at32ap700x.hints#5 (text+ko) ==== @@ -34,29 +34,21 @@ hint.uart.0.maddr="0xFFE00C00" hint.uart.0.msize="0x400" hint.uart.0.irq="6" -hint.uart.0.clk="pba" -hint.uart.0.clk_index="3" hint.uart.1.at="at32bus0" hint.uart.1.maddr="0xFFE01000" hint.uart.1.msize="0x400" hint.uart.1.irq="7" -#hint.uart.1.clk="pba" -#hint.uart.1.clk_index="4" hint.uart.2.at="at32bus0" hint.uart.2.maddr="0xFFE01400" hint.uart.2.msize="0x400" hint.uart.2.irq="8" -#hint.uart.2.clk="pba" -#hint.uart.2.clk_index="5" hint.uart.3.at="at32bus0" hint.uart.3.maddr="0xFFE01800" hint.uart.3.msize="0x400" hint.uart.3.irq="9" -#hint.uart.3.clk="pba" -#hint.uart.3.clk_index="6" hint.atmel_ssc.0.at="at32bus0" hint.atmel_ssc.0.maddr="0xFFE01C00" @@ -168,8 +160,7 @@ hint.atmel_mci.0.maddr="0xFFF02400" hint.atmel_mci.0.msize="0x400" hint.atmel_mci.0.irq="28" -hint.atmel_mci.0.clk="pbb" -hint.atmel_mci.0.clk_index="9" +hint.atmel_mci.0.clk="mci" hint.at32_ac97c.0.at="at32bus0" hint.at32_ac97c.0.maddr="0xFFF02800" ==== //depot/projects/avr32/src/sys/kern/devclk_if.m#6 (text+ko) ==== @@ -33,36 +33,26 @@ # Get device clock rate METHOD uint64_t get_rate { devclk_t _clk; - int _index; }; # Set device clock rate METHOD int set_rate { devclk_t _clk; - int _index; uint64_t _rate; }; # Enable a device clock METHOD void enable { devclk_t _clk; - int _index; }; # Disable a device clock METHOD void disable { devclk_t _clk; - int _index; }; -# Look for clock name -METHOD const char* lookup_name { - device_t _dev; - device_t _child; -}; - -# Look for clock index -METHOD int lookup_index { +# Look for clock name mapped to child +METHOD const char* lookup_clock { device_t _dev; device_t _child; }; ==== //depot/projects/avr32/src/sys/kern/subr_devclk.c#6 (text+ko) ==== @@ -55,19 +55,20 @@ device_t parent; devclk_t clk; const char *name; - int index; - /* The device parent should know which clock to use. */ + /* Get the device knowing how the mapping is. */ parent = device_get_parent(dev); if (parent != NULL) { - name = DEVCLK_LOOKUP_NAME(parent, dev); - if (name == NULL) + name = DEVCLK_LOOKUP_CLOCK(parent, dev); + if (name == NULL) { + device_printf(dev, "warning: devclk_get_rate() without " + "clock\n"); goto bad; - index = DEVCLK_LOOKUP_INDEX(parent, dev); + } clk = devclk_find_clock(name); if (clk == NULL) goto bad; - return (DEVCLK_GET_RATE(clk, index)); + return (DEVCLK_GET_RATE(clk)); } bad: return (EINVAL); @@ -79,19 +80,20 @@ device_t parent; devclk_t clk; const char *name; - int index; /* The device parent should know which clock to use. */ parent = device_get_parent(dev); if (parent != NULL) { - name = DEVCLK_LOOKUP_NAME(parent, dev); - if (name == NULL) + name = DEVCLK_LOOKUP_CLOCK(parent, dev); + if (name == NULL) { + device_printf(dev, "warning: devclk_set_rate() without " + "clock\n"); goto bad; - index = DEVCLK_LOOKUP_INDEX(parent, dev); + } clk = devclk_find_clock(name); if (clk == NULL) goto bad; - DEVCLK_SET_RATE(clk, index, rate); + DEVCLK_SET_RATE(clk, rate); return (0); } bad: @@ -104,18 +106,19 @@ device_t parent; devclk_t clk; const char *name; - int index; /* The device parent should know which clock to use. */ parent = device_get_parent(dev); if (parent != NULL) { - name = DEVCLK_LOOKUP_NAME(parent, dev); - if (name == NULL) + name = DEVCLK_LOOKUP_CLOCK(parent, dev); + if (name == NULL) { + device_printf(dev, "warning: devclk_enable() without " + "clock\n"); return; - index = DEVCLK_LOOKUP_INDEX(parent, dev); + } clk = devclk_find_clock(name); if (clk != NULL) - DEVCLK_ENABLE(clk, index); + DEVCLK_ENABLE(clk); } } @@ -125,37 +128,45 @@ device_t parent; devclk_t clk; const char *name; - int index; /* The device parent should know which clock to use. */ parent = device_get_parent(dev); if (parent != NULL) { - name = DEVCLK_LOOKUP_NAME(parent, dev); - if (name == NULL) + name = DEVCLK_LOOKUP_CLOCK(parent, dev); + if (name == NULL) { + device_printf(dev, "warning: devclk_disable() without " + "clock\n"); return; - index = DEVCLK_LOOKUP_INDEX(parent, dev); + } clk = devclk_find_clock(name); if (clk != NULL) - DEVCLK_DISABLE(clk, index); + DEVCLK_DISABLE(clk); } } /** * Register clock to be associated with dev */ -void -devclk_register_clock(device_t dev, kobj_class_t cls, const char *name, - const char *parent) +devclk_t +devclk_register_clock(device_t dev, kobj_class_t cls, const char *name) { devclk_t clk; clk = kobj_create(cls, M_DEVBUF, M_WAITOK | M_ZERO); clk->dev = dev; - strlcpy(clk->name, name, sizeof(clk->name)); - clk->parent = ((parent == NULL) ? NULL : devclk_find_clock(parent)); + clk->name = strdup(name, M_DEVBUF); /* Insert clock into list. */ STAILQ_INSERT_HEAD(&devclks, clk, link); + return (clk); +} + +void +devclk_set_parent(devclk_t clk, const char *parent) +{ + + KASSERT(parent != NULL, ("NULL parent")); + clk->parent = devclk_find_clock(parent); } static devclk_t ==== //depot/projects/avr32/src/sys/sys/devclk.h#6 (text+ko) ==== @@ -7,16 +7,20 @@ struct devclk { KOBJ_FIELDS; device_t dev; /* Device responsible for clock. */ - char name[32]; /* Clock name. */ struct devclk *parent; /* Clock we originate from. */ + char *name; /* Clock name. */ int index; /* Our index in our parent. */ STAILQ_ENTRY(devclk) link; + void *data; /* Arch dependant data. */ }; typedef struct devclk* devclk_t; typedef STAILQ_HEAD(, devclk) devclk_list_t; #include "devclk_if.h" +/** + * Initialize clock manager. + */ void devclk_init(void); /** @@ -42,12 +46,11 @@ /** * Add a clock to the devclk manager. */ -void devclk_register_clock(device_t, kobj_class_t, const char *, const char *); +devclk_t devclk_register_clock(device_t, kobj_class_t, const char *); /** - * Register a mapping from device to clock + * Set the parent of a device clock. */ -void devclk_register_map(device_t, const char *, int); - +void devclk_set_parent(devclk_t, const char *); #endif /* _KERNEL */ #endif /* !_SYS_DEVCLK_H_ */