From owner-p4-projects@FreeBSD.ORG Sun Sep 28 14:42:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3309910656AF; Sun, 28 Sep 2008 14:42: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 E17981065686 for ; Sun, 28 Sep 2008 14:42:40 +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 CEC6D8FC63 for ; Sun, 28 Sep 2008 14:42:40 +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 m8SEgeWr092283 for ; Sun, 28 Sep 2008 14:42:40 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8SEgeQY092271 for perforce@freebsd.org; Sun, 28 Sep 2008 14:42:40 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 28 Sep 2008 14:42:40 GMT Message-Id: <200809281442.m8SEgeQY092271@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 150598 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, 28 Sep 2008 14:42:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=150598 Change 150598 by rene@rene_self on 2008/09/28 14:41:50 Partial MFen of MAC from 1.49 to 1.73. All changes are processed, English text remains. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mac/chapter.sgml#6 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mac/chapter.sgml#6 (text+ko) ==== @@ -3,7 +3,9 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/mac/chapter.sgml,v 1.3 2008/05/21 21:29:21 remko Exp $ $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/mac/chapter.sgml,v 1.22 2006/01/05 21:13:23 siebrand Exp $ - Gebaseerd op: 1.49 + + %SOURCE% en_US.ISO8859-1/books/handbook/mac/chapter.sgml + %SRCID% 1.73 --> @@ -15,6 +17,20 @@ Geschreven door + + + Siebrand + Mazeland + Vertaald door + + + + + René + Ladan + Vertaling voortgezet door + + Verplichte Toegangscontrole (MAC) @@ -35,27 +51,28 @@ In &os; 5.X worden nieuwe beveiligingsuitbreidingen geïntroduceerd uit het TrustedBSD project, dat is gebaseerd op de &posix;.1e draft. Twee van de meest significante nieuwe - beveiligingsmechanismen zijn bestandssysteem - Toegangscontrolelijsten (ACL's) en - Verplichte Toegangscontrole (Mandatory Access Control of - MAC) facilities. Met Verplichte - Toegangscontrole kunnen nieuwe toegangscontrolemodules geladen - worden, waarmee nieuw beveiligingsbeleid opgelegd kan worden. - Een aantal daarvan bieden beveiliging aan hele kleine onderdelen - van het systeem, waardoor een bepaalde dienst weerbaarder wordt, - terwijl andere allesomvattende gelabelde beveiliging bieden op - alle vlakken en objecten. Het verplichte deel van de definitie - komt van het feit dat het opleggen van de controle wordt gedaan - door beheerders en het systeem en niet wordt overgelaten aan - de nukken van gebruikers, zoals wel wordt gedaan met - toegangscontrole naar goeddunken (discretionary access control of - DAC, de standaard bestands- en System V + beveiligingsmechanismen zijn facilititeiten voor + Toegangscontrolelijsten voor bestandssystemen + (ACLs) en Verplichte Toegangscontrole + (Mandatory Access Control of MAC) . Met + Verplichte Toegangscontrole kunnen nieuwe toegangscontrolemodules + geladen worden, waarmee nieuw beveiligingsbeleid opgelegd kan + worden. Een aantal daarvan bieden beveiliging aan hele kleine + onderdelen van het systeem, waardoor een bepaalde dienst + weerbaarder wordt. Andere bieden allesomvattende gelabelde + beveiliging op alle vlakken en objecten. Het verplichte deel van + de definitie komt van het feit dat het opleggen van de controle + wordt gedaan door beheerders en het systeem en niet wordt + overgelaten aan de nukken van gebruikers, zoals wel wordt gedaan + met toegangscontrole naar goeddunken (discretionary access control + of DAC, de standaard bestands- en System V IPC rechten in &os;). In dit hoofdstuk wordt de nadruk gelegd op het - Verplichte Toegangscontrole Framework (MAC Framework) en een set - van te activeren beveiligingsbeleidsmodules waarmee verschillende - soorten beveiligingmechanismen wordt ingeschakeld. + Verplichte Toegangscontrole Raamwerk (MAC + Framework) en een verzameling van te activeren + beveiligingsbeleidsmodules waarmee verschillende soorten + beveiligingmechanismen wordt ingeschakeld. Na het lezen van dit hoofdstuk weet de lezer: @@ -74,24 +91,25 @@ Hoe een systeem efficiënt ingesteld kan worden om - met het MAC framework te werken; + met het MAC-raamwerk te werken; Hoe het beleid van de verschillende - beveiligingsbeleidsmodules die in het MAC - framework zitten ingesteld kunnen worden; + beveiligingsbeleidsmodules die in het + MAC-raamwerk zitten ingesteld kunnen + worden; Hoe een veiliger omgeving gemaakt kan worden met het - MAC framework en de getoonde + MAC-raamwerk en de getoonde voorbeelden; Hoe de MAC instellingen getest - kunnen worden om er zeker van te zijn dat het framework juist + kunnen worden om er zeker van te zijn dat het raamwerk juist is geïmplementeerd. @@ -117,13 +135,13 @@ - Het verkeerd gebruiken van de informatie in dit hoofdstuk + Het verkeerd gebruiken van de informatie die hierin staat kan leiden tot het niet langer toegang hebben tot een systeem, grote ergernis bij gebruikers of het niet langer kunnen gebruiken van de mogelijkheden die X11 biedt. Nog belangrijker is dat niet alleen op MAC vertrouwd moet worden voor de beveiliging van een systeem. Het - MAC framework vergroot alleen het bestaande + MAC-raamwerk vergroot alleen het bestaande beveiligingsbeleid. Zonder goede beveiligingsprocedures en regelmatige beveiligingscontroles is een systeem nooit helemaal veilig. @@ -132,9 +150,9 @@ dit hoofdstuk alleen voorbeelden zijn. Het is niet aan te raden ze uit te rollen op een productiesysteem. Het implementeren van de verschillende beveiligingsbeleidmodules - dient goed overdacht te worden. Iemand die niet helemaal - begrijpt hoe alles werkt, komt er waarschijnlijk achter dat die - het complete systeem van voor naar achter en weer terug + dient goed overdacht en getest te worden. Iemand die niet + helemaal begrijpt hoe alles werkt, komt er waarschijnlijk achter + dat die het complete systeem van voor naar achter en weer terug doorloopt en heel erg veel bestanden en mappen opnieuw moet instellen. @@ -144,10 +162,10 @@ In dit hoofdstuk wordt een brede reeks beveiligingsonderwerpen met betrekking tot het - MAC framework behandeld. De ontwikkeling + MAC-raamwerk behandeld. De ontwikkeling van nieuwe MAC beveiligingsbeleidmodules wordt niet behandeld. Een aantal modules die bij het - MAC framework zitten hebben specifieke + MAC-raamwerk zitten hebben specifieke eigenschappen voor het testen en ontwikkelen van (nieuwe) modules. Daaronder vallen &man.mac.test.4;, &man.mac.stub.4; en &man.mac.none.4;. Meer informatie over deze @@ -178,6 +196,17 @@ + hoogwatermarkering: Een + hoogwatermarkeringsbeleid is een beleid dat toestaat om + beveiligingsniveaus te verhogen met het doel informatie dat op + een hoger niveau aanwezig is te benadaren. In de meeste + gevallen wordt het originele niveau hersteld nadat het proces + voltooid is. Momenteel heeft het + MAC-raamwerk van &os; hier geen beleid + voor, maar de definitie is voor de volledigheid opgenomen. + + + integriteit: integriteit, als sleutelconcept, is het niveau van vertrouwen dat in data gesteld kan worden. Als de integriteit van data wordt @@ -210,6 +239,16 @@ + laagwatermarkering: Een + laagwatermarkeringsbeleid is een beleid dat toestaat om de + beveiligingsniveaus te verlagen met het doel informatie te + benaderen die minder veilig is. In de meeste gevallen wordt + het originele niveau van de gebruiker hersteld nadat het + proces voltooid is. De enige beveiligingsbeleidsmodule die + dit gebruikt is &man.mac.lomac.4;. + + + meervoudig label: de eigenschap is een optie van het bestandssysteem die in single user modus met &man.tunefs.8;, @@ -284,10 +323,10 @@ Uitleg over MAC Met al deze nieuwe termen in gedachten, kan overdacht worden - het MAC framework de complete beveiliging van + het MAC-raamwerk de complete beveiliging van een systeem kan vergroten. De verschillende - beveiligingsbeleidsmodules die het MAC - framework biedt zouden gebruikt kunnen worden om het netwerk en + beveiligingsbeleidsmodules die het MAC-raamwerk + biedt zouden gebruikt kunnen worden om het netwerk en bestandssystemen te beschermen, gebruikers toegang tot bepaalde poorten en sockets kunnen ontzeggen en nog veel meer. Misschien kunnen de beleidsmodules het beste gebruikt worden door ze samen @@ -304,7 +343,7 @@ per gebruiker, enzovoort. De nadelen zijn wel minimaal als ze worden vergeleken met - het immer durende effect van het framework. Zo zorgt + het immer durende effect van het raamwerk. Zo zorgt bijvoorbeeld de mogelijkheid om te kiezen welke beleidseenheden voor een specifiek gebruik nodig zijn voor het zo laag mogelijk houden van de beheerslast. Het terugdringen van ondersteuning @@ -312,7 +351,7 @@ verhogen en ook de keuzevrijheid vergroten. Voor een goede implementatie worden alle beveiligingseisen in beschouwing genomen en daarna worden de verschillende - beveiligingsbeleidsmodules effectief door het framework + beveiligingsbeleidsmodules effectief door het raamwerk geïmplementeerd. Een systeem dat gebruik maakt van de mogelijkheden van @@ -356,7 +395,7 @@ hebben tot objecten die zijn geschreven door ontwikkelaars in project C. Dat is nogal wat. Door gebruik te maken van de verschillende beveiligingsbeleidsmodules in het - MAC framework kunnen gebruikers in hun groepen + MAC-raamwerk kunnen gebruikers in hun groepen worden opgedeeld en kan ze toegang gegeven worden tot de juiste locaties zonder dat er angst hoeft te zijn voor het lekken van informatie. @@ -367,12 +406,12 @@ uitgedacht beveiligingsbeleid. In veel gevallen wordt het totale beveiligingsbeleid aangepast en opnieuw toegepast op een systeem. Een goed begrip van de verschillende beveiligingsbeleidsmodules - die het MAC framework biedt helpt beheerders + die het MAC-raamwerk biedt helpt beheerders bij het kiezen van de juiste beleidseenheden voor hun situatie. De standaard &os; kernel kent geen ondersteuning voor het - MAC framework en daarom dient de volgende + MAC-raamwerk en daarom dient de volgende kerneloptie toegevoegd te worden voordat op basis van de voorbeelden of informatie uit dit hoofdstuk wijzigen worden gemaakt: @@ -417,7 +456,7 @@ beleidseenheid. Voor sommige beleidseenheden bevat het label zelf alle informatie die nodig is voor het maken van een beslissing; in andere modellen kunnen de labels als onderdeel van - een grotere set verwerkt worden, enzovoort. + een grotere verzameling verwerkt worden, enzovoort. Zo staat bijvoorbeeld het instellen van het label biba/low op een bestand voor een label dat @@ -437,7 +476,7 @@ Binnen een bestandssysteemomgeving met een enkelvoudig label kan er maar één label gebruikt worden op objecten. - Hiermee wordt een set van toegangsrechten op het hele systeem + Hiermee wordt een verzameling van toegangsrechten op het hele systeem opgelegd en dat is voor veel omgevingen voldoende. Er zijn echter een aantal gevallen waarin het wenselijk is meervoudige label in te stellen op subject of objecten in het @@ -497,7 +536,7 @@ denied zijn en deze ontstaat meestal als het label wordt ingesteld of gewijzigd op een object dat is beperkt. - + Andere condities kunnen andere foutmeldingen veroorzaken. De gebruiker die het object probeert te @@ -571,15 +610,16 @@ inzicht in de precieze eigenschappen van de standaard labelinstellingen. - + Gevorderde labelinstellingen - Dit zijn numerieke graden die gebruikt worden voor - vergelijking:afdeling+afdeling;. + Dit zijn de labels met numerieke graden die gebruikt + worden voor + vergelijking:afdeling+afdeling. biba/10:2+3+6(5:2+3-20:2+3+4+5+6) - Het bovenstaande kan dus geiuml;nterpreteerd worden + Het bovenstaande kan dus geïnterpreteerd worden als: Biba Policy Label/Graad @@ -588,7 +628,7 @@ In dit voorbeeld is de eerste graad de effectieve graad met de effectieve - afdelingen, de tweede graag is is lage graagd en de + afdelingen, de tweede graad is is lage graad en de laatste is de hoge graad. In de meeste instellingen worden deze instellingen niet gebruikt. Ze zijn inderdaad instellingen voor gevorderden. @@ -606,13 +646,14 @@ domineren. Het geval beiden domineren komt voor als de twee labels gelijk zijn. Vanwege de natuur van de informatiestroom van Biba, heeft een gebruiker rechten - op een set van afdelingen, need to know, die - overeen zouden kunnen komen met projecten, maar objecten - hebben ook een set van afdelingen. Gebruikers dienen - wellicht hun rechten te subsetten met su - of setpmac om toegang te krijgen tot - objecten in een afdeling die geen verboden terrein voor - ze zijn. + op een verzameling van afdelingen, + need to know, die overeen zouden kunnen komen + met projecten, maar objecten hebben ook een verzameling van + afdelingen. Gebruikers dienen wellicht hun rechten onder te + verdelen met su of + setpmac om toegang te krijgen tot + objecten in een afdeling die geen verboden terrein voor ze + zijn. @@ -653,7 +694,7 @@ :passwordtime=91d:\ :umask=022:\ :ignoretime@:\ - :label=partition/13,mls/5,biba/10(5-15),lomac10[2]: + :label=partition/13,mls/5,biba/10(5-15),lomac/10[2]: De optie label wordt gebruikt om het standaardlabel voor aanmeldklasse in te stellen dat door @@ -768,7 +809,7 @@ &os; webserver die gebruik maakt van het - MAC framework en een mengeling van + MAC-raamwerk en een mengeling van verschillende beleidseenheden. @@ -822,102 +863,82 @@ Sommige gebruikers hebben problemen ondervonden met het instelling van de vlag op de rootpartitie. Als dit het geval is, kijk dan naar . + linkend="mac-troubleshoot"> van dit hoofdstuk. + - - MAC beheren met tunables + + De beveiligingsconfiguratie plannen - Zonder dat er modules zijn geladen, kunnen er al onderdelen - van MAC ingesteld worden met de - sysctl interface. Deze tunables worden - hieronder beschreven en in alle gevallen betekent het getal een - (1) ingeschakeld en nul (0) betekent uitgeschakeld: + Wanneer een nieuwe technologie wordt geïmplementeerd is + een planningsfase altijd een goed idee. Tijdens de planningsfases + zou een beheerder in het algemeen naar de big + picture moeten kijken, en daarbij minstens het volgende + in de gaten proberen te houden: - - - security.mac.enforce_fs staat - standaard op een (1) en dwingt MAC - bestandssysteembeleid af op bestandssystemen. - + + + De implementatiebenodigdheden; + - - security.mac.enforce_kld staat - standaard op een (1) en dwingt MAC - kernellinkingbeleid af op de dynamische kernellinker (zie - &man.kld.4;). - + + De implementatiedoelen; + + - - security.mac.enforce_network staat - standaard op een (1) en dwingt MAC - netwerkbeleid af. - + Voor MAC-installaties houden deze in: - - security.mac.enforce_pipe staat - standaard op een (1) en dwingt MAC - beleid op pipes af. - + + + Hoe de beschikbare informatie en bronnen die op het + doelsysteem aanwezig zijn te classificeren. + - - security.mac.enforce_process staat - standaard op een (1) en dwingt MAC - beleid af op processen die gebruik maken van inter-proces - communicatie. - + + Voor wat voor soort informatie of bronnen de toegang te + beperken samen met het type van de beperkingen die dienen te + worden toegepast. + - - security.mac.enforce_socket staat - standaard op een (1) en dwingt MAC - beleid op sockets af (zie &man.socket.2;). - + + Welke MAC-module(s) nodig zullen zijn + om dit doel te bereiken. + + - - security.mac.enforce_system staat - standaard op een (1) en dwingt MAC - beleid af op op systeemactiviteit zoals accounting en - herstarten. - + Het is altijd mogelijk om de systeembronnen en de + beveiligingsinstellingen te veranderen en te herconfigureren, het + komt vaak erg ongelegen om het systeem te doorzoeken en bestaande + bestanden en gebruikersaccounts te repareren. Plannen helpt om + zeker te zijn van een probleemloze en efficiënte + systeemimplementatie. Het is vaak vitaal en zeker in uw voordeel + om een proefronde van het vertrouwde systeem, inclusief de + configuratie, te draaien + vóórdat een + MAC-implementatie wordt gebruikt op + productiesystemen. Het idee om een systeem met + MAC gewoon los te laten is als het plannen van + mislukkingen. - - security.mac.enforce_vm staat - standaard op een (1) en dwingt MAC - beleid af op het virtuele geheugensysteem. - - - - - Ieder beleid of MAC optie ondersteunt - tunables. Die zijn in het algemeen te vinden in de - boomstructuur - security.mac.<policyname>. Alle - tunables voor MAC zijn met het volgende - commando zichtbaar te maken: - - &prompt.root; sysctl -da | grep mac - - - Dit moet opgevat worden als dat alle basis - MAC beleidseenheden standaard worden - afgedwonen. Als de modules in de kernel zouden zijn gebouwd, - zou een systeem bijzonder sterk zijn dichtgetimmerd en zeer - waarschijnlijk niet kunnen communiceren met een lokaal netwerk - of verbonden kunnen worden met internet, enzovoort. Om deze - reden is het inbouwen van modules in de kernel niet volledig - aan te raden. Niet omdat het de mogelijkheid om opties direct - uit te schakelen met sysctl limiteert, maar - het stelt een beheerder in staat om beleid direct aan of uit te - schakelen zonder dat een nieuw systeem gebouwd en - geïnstalleerd hoeft te worden. - + Verschillende omgevingen kunnen verschillende behoeften en + benodidheden nodig hebben. Het opzetten van een diegaand en + compleet beveiligingsprofiel zal de noodzaak van verandering + verminderen wanneer het systeem in gebruik wordt genomen. + Zodoende zullen de toekomstige secties de verschillende modules + die beschikbaar zijn voor beheerders behandelen; hun gebruik en + configuratie beschrijven; en in sommige gevallen inzicht bieden in + welke situaties ze het beste tot hun recht komen. Een webserver + bijvorbeeld zou de beleiden &man.mac.biba.4; en + &man.mac.bsdextended.4; in gebruik nemen. In andere gevallen kan + voor een machine met erg weinig lokale gebruikers + &man.mac.partition.4; een goede keuze zijn. Module-instellingen - Iedere module uit het MAC framework kan + Iedere module uit het MAC-raamwerk kan zoals zojuist aangegeven in de kernel worden gecompileerd of als runtime kernelmodule geladen worden. De geadviseerde methode is de naam van een module toevoegen aan het bestand @@ -941,68 +962,66 @@ één label over een heel systeem afdwingen, daarom wordt de optie tunefs genoemd. + - - MAC module seeotheruids + + MAC-module seeotheruids - MAC zie andere UID's beleidsinstelling + MAC zie andere UID's beleidsinstelling - Modulenaam: mac_seeotheruids.ko + Modulenaam: mac_seeotheruids.ko - Kernelinstelling: options - MAC_SEEOTHERUIDS + Kernelinstelling: options + MAC_SEEOTHERUIDS - Bootoptie: - mac_seeotheruids_load="YES" + Opstartoptie: + mac_seeotheruids_load="YES" - De module &man.mac.seeotheruids.4; imiteert de - sysctl tunables - security.bsd.see_other_uids en - security.bsd.see_other_gids en bereidt deze - uit. Voor deze optie hoeven geen labels ingesteld te worden - voor de instelling en hij werkt transparant met de andere - modules. + De module &man.mac.seeotheruids.4; imiteert de + sysctl-tunables + security.bsd.see_other_uids en + security.bsd.see_other_gids en bereidt deze + uit. Voor deze optie hoeven geen labels ingesteld te worden voor + de instelling en hij werkt transparant met de andere modules. - Na het laden van de module kunnen de volgende - sysctl tunables gebruikt worden om de opties - in te stellen: + Na het laden van de module kunnen de volgende + sysctl-tunables gebruikt worden om de opties in + te stellen: - - - security.mac.seeotheruids.enabled - schakelt de opties van de module in en gebruikt de - standaardinstellingen. Deze standaardinstellingen - ontzeggen gebruikt de mogelijkheid processen en sockets te - zien die in eigendom zijn van andere gebruikers. - + + + security.mac.seeotheruids.enabled + schakelt de opties van de module in en gebruikt de + standaardinstellingen. Deze standaardinstellingen ontzeggen + gebruikt de mogelijkheid processen en sockets te zien die + eigendom zijn van andere gebruikers. + - - security.mac.seeotheruids.specificgid_enabled - staat toe dat een bepaalde groep niet onder dit beleid - valt. Om bepaalde groepen van dit beleid uit te sluiten, - kan de sysctl tunable - security.mac.seeotheruids.specificgid=XXX - gebruikt worden. In het bovenstaande voorbeeld dient - XXX vervangen te worden door het - numerieke ID van een groep die uitgesloten moet worden van - de beleidsinstelling. - + + security.mac.seeotheruids.specificgid_enabled + staat toe dat een bepaalde groep niet onder dit beleid valt. + Om bepaalde groepen van dit beleid uit te sluiten, kan de + sysctl-tunable + security.mac.seeotheruids.specificgid=XXX + gebruikt worden. In het bovenstaande voorbeeld dient + XXX vervangen te worden door het + numerieke ID van een groep die uitgesloten moet worden van de + beleidsinstelling. + - - - security.mac.seeotheruids.primarygroup_enabled - wordt gebruikt om specifieke primaire groepen uit te - sluiten van dit beleid. Als deze tunable wordt gebruikt, - mag - security.mac.seeotheruids.specificgid_enabled - niet gebruikt worden. - - - + + + security.mac.seeotheruids.primarygroup_enabled + wordt gebruikt om specifieke primaire groepen uit te sluiten + van dit beleid. Als deze tunable wordt gebruikt, mag + security.mac.seeotheruids.specificgid_enabled + niet gebruikt worden. + + - MAC module bsdextended + MAC-module bsdextended MAC @@ -1015,17 +1034,27 @@ Kernelinstelling: options MAC_BSDEXTENDED - Bootoptie: + Opstartoptie: mac_bsdextended_load="YES" De module &man.mac.bsdextended.4; dwingt de bestandssysteemfirewall af. Het beleid van deze module biedt een uitbreiding van het standaard rechtenmodel voor bestandssystemen, - waardoor een beheerder een firewallachtige set met regels kan - maken om bestanden, programma's en mappen in de - bestandssysteemhierarchie te beschermen. + waardoor een beheerder een firewallachtige verzameling met regels + kan maken om bestanden, programma's en mappen in de + bestandssysteemhiërarchie te beschermen. Wanneer geprobeerd + wordt om toegang tot een object in het bestandssysteem te krijgen, + wordt de lijst met regels afgelopen totdat er òf een + overeenkomstige regel is gevonden òf het einde van de lijst + is bereikt. Dit gedrag kan veranderd worden door het gebruik van + de &man.sysctl.8;-parameter + security.mac.bsdextended.firstmatch_enabled. Net zoals andere + firewall-modules in &os; kan een bestand dat regels voor + toegangscontrole bevat tijdens het opstarten door het systeem + worden aangemaakt en gelezen door een &man.rc.conf.5;-variabele te + gebruiken. - Het beleid kan gemaakt worden met het hulpprogramma + De lijst met regels kan ingevoerd worden met het hulpprogramma &man.ugidfw.8;, dat een syntaxis heeft die lijkt op die van &man.ipfw.8;. Meer hulpprogramma's kunnen geschreven worden met de functies in de bibliotheek &man.libugidfw.3;. @@ -1091,7 +1120,7 @@ - MAC module ifoff + MAC-module ifoff MAC Interface Silencing beleidsinstelling @@ -1100,7 +1129,7 @@ Kernelinstelling: options MAC_IFOFF - Bootoptie: mac_ifoff_load="YES" + Opstartoptie: mac_ifoff_load="YES" !!!The &man.mac.ifoff.4; module exists solely to disable network interfaces on the fly and keep network interfaces from being @@ -1140,7 +1169,7 @@ - MAC module portacl + MAC-module portacl MAC poort toegangscontrolelijst beleidsinstelling @@ -1149,7 +1178,7 @@ Kernelinstelling: MAC_PORTACL - Bootoptie: mac_portacl_load="YES" + Opstartoptie: mac_portacl_load="YES" The &man.mac.portacl.4; module is used to limit binding to local TCP and UDP ports @@ -1165,10 +1194,7 @@ security.mac.portacl.enabled will - enable/disable the policy completely.Due to - a bug the security.mac.portacl.enabled - sysctl variable will not work on - &os; 5.2.1 or previous releases. + enable/disable the policy completely. @@ -1266,111 +1292,8 @@ - - MAC beleidsinstellingen met labelmogelijkheden - - The next few sections will discuss MAC - policies which use labels. - - From here on this chapter will focus on the features - of &man.mac.biba.4;, &man.mac.lomac.4;, - &man.mac.partition.4;, and &man.mac.mls.4;. - - - This is an example configuration only and should not be - considered for a production implementation. The goal is - to document and show the syntax as well as examples for - implementation and testing. - - - For these policies to work correctly several - preparations must be made. - - - Voorbereiding voor labelbeleidsinstellingen - - The following changes are required in the - login.conf file: - - - - An insecure class, or another - class of similar type, must be - added. The login class of insecure - is not required and just used as an example here; different - configurations may use another class name. - - - - The insecure class should have - the following settings and definitions. Several of these - can be altered but the line which defines the default - label is a requirement and must remain. - - insecure:\ - :copyright=/etc/COPYRIGHT:\ - :welcome=/etc/motd:\ - :setenv=MAIL=/var/mail/$,BLOCKSIZE=K:\ - :path=~/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:\ - :manpath=/usr/share/man /usr/local/man:\ - :nologin=/usr/sbin/nologin:\ - :cputime=1h30m:\ - :datasize=8M:\ - :vmemoryuse=100M:\ - :stacksize=2M:\ - :memorylocked=4M:\ - :memoryuse=8M:\ - :filesize=8M:\ - :coredumpsize=8M:\ - :openfiles=24:\ - :maxproc=32:\ - :priority=0:\ - :requirehome:\ - :passwordtime=91d:\ - :umask=022:\ - :ignoretime@:\ - :label=partition/13,mls/5,biba/low: - - The &man.cap.mkdb.1; command needs to be ran on - &man.login.conf.5; before any of the - users can be switched over to the new class. - - The root username should also be placed - into a login class; otherwise, almost every command - executed by root will require the - use of setpmac. - - - Rebuilding the login.conf - database may cause some errors later with the daemon - class. Simply uncommenting the daemon account and - rebuilding the database should alleviate these - issues. - - - - - Ensure that all partitions on which - MAC labeling will be implemented support - the . We must do this because - many of the examples here contain different labels for - testing purposes. Review the output from the - mount command as a precautionary - measure. - - - - Switch any users who will have the higher security - mechanisms enforced over to the new user class. A quick - run of &man.pw.8; or &man.vipw.8; should do the - trick. - - - - - - MAC module partition + MAC-module partition MAC procespartitionering beleidsinstelling @@ -1379,7 +1302,7 @@ Kernelinstelling: options MAC_PARTITION - Bootoptie: + Opstartoptie: mac_partition_load="YES" The &man.mac.partition.4; policy will drop processes into @@ -1405,12 +1328,12 @@ - When this policy is enabled, users will only be permitted - to see their processes but will not be permitted to work with - certain utilities. For instance, a user in the - insecure class above will not be permitted - to access the top command as well as many - other commands that must spawn a process. + Wanneer dit beleid aanstaat, mogen gebruikers alleen hun eigen + processen zien, en elke andere in hun patitie, maar mogen niet met + gereedschappen buiten deze partitie werken. Bijvoorbeeld, een + gebruiker in de klasse insecure heeft geen + toegang tot het commando top noch tot vele + andere commando's die een proces moeten draaien. To set or drop utilities into a partition label, use the setpmac utility: @@ -1458,7 +1381,7 @@ - MAC module meerlagen beveiliging + MAC-module Multi-Level Security MAC Multi-Level Security Policy @@ -1469,7 +1392,7 @@ Kernelinstelling: options MAC_MLS - Bootoptie: mac_mls_load="YES" + Opstartoptie: mac_mls_load="YES" The &man.mac.mls.4; policy controls access between subjects and objects in the system by enforcing a strict information @@ -1590,19 +1513,40 @@ feed that file into the setfmac command. This method will be explained after all policies are covered. - Observations: an object with lower clearance is unable to - observe higher clearance processes. A basic policy would be - to enforce mls/high on everything not to be - read, even if it needs to be written. Enforce - mls/low on everything not to be written, even - if it needs to be read. And finally enforce - mls/equal on the rest. All users marked - insecure should be set at - mls/low. + + Verplichte Gevoeligheid plannen + + Met de beleidsmodule voor meerlaagse beveiliging plant een + beheerder het beheren van gevoelige informatiestromen. + Standaard zet het systeem met zijn natuur van lezen naar boven + blokkeren en schrijven naar beneden blokkeren alles in een lage + toestand. Alles is beschikbaar en een beheerder verandert dit + langzaam tijdens de configuratiefase; waarbij de + vertrouwelijkheid van de informatie toeneemt. + + Buiten de bovengenoemde drie basisopties voor labels, kan + een beheerder gebruikers en groepen indelen als nodig om de + informatiestroom tussen hun te blokkeren. Het is misschien + gemakkeluijer om naar de informatie te kijken in + toestemmingsniveaus waarvoor bekende woorden bestaan, zoals + Vertrouwelijk, Geheim en + Strikt Geheim. Sommige beheerders zullen + verschillende groepen aanmaken gebaseerd op verschillende + projecten. Ongeacht de classificatiemethode moet er een goed + overwogen plan bestaan voordat zo'n berperkend beleid wordt + geïmplementeerd. + + Wat voorbeelsituaties voor deze beveiligingsbeleidsmodule + kunnen een e-commerce webserver, een bestandsserver die kritieke + bedrijfsinformatie, en omgevingen van financiële + instellingen zijn. De meest onwaarschijnlijke plaats zou een + persoonlijk werkstation met slechts twee of drie gebruikers + zijn. + - MAC module Biba + MAC-module Biba MAC Biba Integrity Policy @@ -1612,7 +1556,7 @@ Kernelinstelling: options MAC_BIBA - Bootoptie: mac_biba_load="YES" + Opstartoptie: mac_biba_load="YES" The &man.mac.biba.4; module loads the MAC Biba policy. This policy works much like that of the @@ -1714,20 +1658,63 @@ &prompt.root; getfmac test test: biba/low - Observations: a lower integrity subject is unable to write - to a higher integrity subject; a higher integrity subject cannot - observe or read a lower integrity object. + + Verplichte Integriteit plannen + + Integriteit, anders dan gevoeligheid, garandeert dat de + informatie nooitdoor onvertrouwde gebruikers zal worden + gemanipuleerd. Dit geldt ook voor informatie die tussen + subjecten, objecten, of beiden wordt doorgegeven. Het verzekert + dat gebruikers alleen de informatie kunnen wijzigen en in + sommige gevallen zelfs benaderen die ze expliciet nodig hebben. + + De beveiligingsbeleidsmodule &man.mac.biba.4; staat een + beheerder in staat om te bepalen welke bestanden en programma's + een gebruiker of gebruikers mogen zien en draaien terwijl het + verzekert dat de programma's en bestanden vrij zijn van + dreigingen en vertrouwt zijn door het systeem voor die gebruiker + of groep van gebruikers. + + Tijdens de initiële planningsfase moet een beheerder + bereid zijn om gebruikers in gradaties, niveaus, en gebieden in + te delen. Gebruikers zal toegang tot niet alleen gegevens maar + ook tot programma's en hulpmiddelen ontzegt worden zowel voordat + en nadat ze beginnen. Het systeem zal standaard een hoog label + instellen nadat deze beleidsmodule is ingeschakeld, en het is + aan de beheerder om de verschillende gradaties en niveaus voor + gebruikers in te stellen. In plaats van toestemmingsniveaus + zoals boven beschreven te gebruiken, kan een goede + planningsmethode onderwerpen bevatten. Bijvoorbeeld, geef + alleen ontwikkelaars veranderingstoegang tot het + broncoderepository, de broncodecompiler, en andere + ontwikkelgereedschappen. Andere gebruikers zouden in andere + groepen zoals testers, ontwerpers, of gewone gebruikers worden + ingedeeld en zouden alleen leestoegang hebben. + + + Met zijn natuurlijke beveiligingssbeheer kan een subject van + lagere integriteit niet schijven naar een subject van hogere + integriteit; een subject van hogere integriteit kan geen subject + van lagere integriteit observeren of lezen. Een label op de + laagst mogelijke graad instellen kan het ontoegankelijk voor + subjects maken. Sommige succesvolle omgevingen voor deze + beveiligingsbeheermodule zijn een beperkte webserver, een + ontwikkel- en testmachine, en broncoderepositories. Minder + nuttige implementaties zouden een persoonlijk werkstation, een + machine gebruikt als router, of een netwerkfirewall zijn. + - MAC module LOMAC + MAC-module LOMAC MAC LOMAC Modulenaam: mac_lomac.ko Kernelinstelling: options MAC_LOMAC - Bootoptie: mac_lomac_load="YES" + + Opstartoptie: mac_lomac_load="YES" Unlike the MAC Biba policy, the &man.mac.lomac.4; policy permits access to lower integrity >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Sep 28 14:45:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6135D1065696; Sun, 28 Sep 2008 14: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 2532F1065693 for ; Sun, 28 Sep 2008 14:45:44 +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 142948FC2F for ; Sun, 28 Sep 2008 14:45:44 +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 m8SEjhN2013620 for ; Sun, 28 Sep 2008 14:45:43 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8SEjhIj013614 for perforce@freebsd.org; Sun, 28 Sep 2008 14:45:43 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 28 Sep 2008 14:45:43 GMT Message-Id: <200809281445.m8SEjhIj013614@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 150599 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, 28 Sep 2008 14:45:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=150599 Change 150599 by rene@rene_self on 2008/09/28 14:44:50 Fix build. Pointy hat requested :-) Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mac/chapter.sgml#7 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mac/chapter.sgml#7 (text+ko) ==== @@ -1774,7 +1774,7 @@ bestandssysteem zoals vermeld aan het begin van dit hoofdstuk. Nalatigheid zal in fouten resulteren. Zorg er ook voor dat de ports net-mgmt/nagios-plugins, - net-mgmt/nagios, en net-mgmt/nagios, en www/apache13 allemaal geïnstalleerde en geconfigureerd zijn en correct werken. From owner-p4-projects@FreeBSD.ORG Sun Sep 28 15:31:31 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 40BDF106568C; Sun, 28 Sep 2008 15:31:31 +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 03F081065689 for ; Sun, 28 Sep 2008 15:31:31 +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 E4CF58FC0A for ; Sun, 28 Sep 2008 15:31:30 +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 m8SFVUXn089497 for ; Sun, 28 Sep 2008 15:31:30 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8SFVUIA089485 for perforce@freebsd.org; Sun, 28 Sep 2008 15:31:30 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 28 Sep 2008 15:31:30 GMT Message-Id: <200809281531.m8SFVUIA089485@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 150602 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, 28 Sep 2008 15:31:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=150602 Change 150602 by rene@rene_self on 2008/09/28 15:31:12 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/gjournal-desktop/article.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/Makefile#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/book.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/chapters.ent#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/dtrace/Makefile#1 branch .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/dtrace/chapter.sgml#1 branch .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#6 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/filesystems/Makefile#1 branch .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/filesystems/chapter.sgml#1 branch .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/geom/chapter.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#6 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/security/chapter.sgml#8 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/updating/Makefile#1 branch .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/updating/chapter.sgml#1 branch .. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/mailing-lists.ent#5 integrate .. //depot/projects/docproj_nl/share/sgml/man-refs.ent#5 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/gjournal-desktop/article.sgml#2 (text+ko) ==== @@ -13,22 +13,22 @@
- Implementing UFS journaling on a desktop PC + Implementing UFS Journaling on a Desktop PC Manolis Kiagias -
sonicy@otenet.gr
+
manolis@FreeBSD.org
 2008 - Manolis Kiagias + Manolis Kiagias - $FreeBSD: doc/en_US.ISO8859-1/articles/gjournal-desktop/article.sgml,v 1.2 2008/04/28 15:56:20 gabor Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/gjournal-desktop/article.sgml,v 1.3 2008/09/26 11:44:17 pgj Exp $ &tm-attrib.freebsd; @@ -36,16 +36,16 @@ - A journaling filesystem uses a log to record all transactions - that take place in the filesystem, and preserves its integrity in the + A journaling file system uses a log to record all transactions + that take place in the file system, and preserves its integrity in the event of a system crash or power failure. Although it is still possible to lose unsaved changes to files, journaling almost - completely eliminates the possibility of filesystem corruption caused + completely eliminates the possibility of file system corruption caused by an unclean shutdown. It also shortens to a minimum the time - required for after-failure filesystem checking. Although the UFS - filesystem employed by &os; does not implement journaling itself, - the new journal class of the GEOM framework in &os; 7.X can be - used to provide filesystem independent journaling. This article + required for after-failure file system checking. Although the UFS + file system employed by &os; does not implement journaling itself, + the new journal class of the GEOM framework in &os; 7.X can be + used to provide file system independent journaling. This article explains how to implement UFS journaling on a typical desktop PC scenario. @@ -57,15 +57,15 @@ While professional servers are usually well protected from unforeseen shutdowns, the typical desktop is at the mercy of power failures, accidental resets, and other user related incidents that can - lead to unclean shutdowns. Soft updates usually protect the filesystem + lead to unclean shutdowns. Soft Updates usually protect the file system efficiently in such cases, although most of the times a lengthy - background check is required. On rare occasions, filesystem corruption + background check is required. On rare occasions, file system corruption reaches a point where user intervention is required and data may be lost. The new journaling capability provided by GEOM can greatly assist in such scenarios, by virtually eliminating the time required for - filesystem checking, and ensuring that the filesystem is quickly + file system checking, and ensuring that the file system is quickly restored to a consistent state. This article describes a procedure for implementing UFS journaling @@ -88,7 +88,7 @@ - How to convert your existing filesystems to utilize journaling, + How to convert your existing file systems to utilize journaling, and what options to use in /etc/fstab to mount them. @@ -128,59 +128,59 @@ - Understanding journaling in &os; + Understanding Journaling in &os; - The journaling provided by GEOM in &os; 7.X is not filesystem - specific (unlike for example the ext3 filesystem in &linux;) but is + The journaling provided by GEOM in &os; 7.X is not file system + specific (unlike for example the ext3 file system in &linux;) but is functioning at the block level. Though this means it can be applied - to different filesystems, for &os; 7.0-RELEASE, it can only be used + to different file systems, for &os; 7.0-RELEASE, it can only be used on UFS2. This functionality is provided by loading the geom_journal.ko module into the kernel (or building it into a custom kernel) and using the - gjournal command to configure the filesystems. - In general, you would like to journal large filesystems, like + gjournal command to configure the file systems. + In general, you would like to journal large file systems, like /usr. You will need however (see the following section) to reserve some free disk space. - When a filesystem is journaled, some disk space is needed to keep + When a file system is journaled, some disk space is needed to keep the journal itself. The disk space that holds the actual data is referred to as the data provider, while the one that holds the journal is referred to as the journal provider. The data and journal providers need to be on different partitions when journaling an existing - (non empty) partition. When journaling a new partition, you have the + (non-empty) partition. When journaling a new partition, you have the option to use a single provider for both data and journal. In any case, the gjournal command combines both providers to - create the final journaled filesystem. For example: + create the final journaled file system. For example: - You wish to journal your /usr filesystem, - stored in /dev/ad0s1f (which + You wish to journal your /usr file system, + stored in /dev/ad0s1f (which already contains data). You reserved some free disk space in a partition in - /dev/ad0s1g. + /dev/ad0s1g. Using gjournal, a new /dev/ad0s1f.journal device is created - where /dev/ad0s1f is the data - provider, and /dev/ad0s1g is + class="devicefile">/dev/ad0s1f.journal device is created + where /dev/ad0s1f is the data + provider, and /dev/ad0s1g is the journal provider. This new device is then used for all subsequent file operations. The amount of disk space you need to reserve for the journal - provider depends on the usage load of the filesystem and not on the + provider depends on the usage load of the file system and not on the size of the data provider. For example on a typical office desktop, - a 1Gb journal provider for the /usr filesystem + a 1 GB journal provider for the /usr file system will suffice, while a machine that deals with heavy disk I/O (i.e. video editing) may need more. A kernel panic will occur if the journal space is exhausted before it has a chance to be @@ -191,10 +191,10 @@ - Steps during the installation of &os; + Steps During the Installation of &os; - Reserving space for journaling + Reserving Space for Journaling A typical desktop machine usually has one hard disk that stores both the OS and user data. Arguably, the default partitioning scheme @@ -202,17 +202,17 @@ suitable: A desktop machine does not need a large /var partition, while /usr is allocated the bulk of the disk space, since user data and a lot of - packages are installed into its sub-directories. + packages are installed into its subdirectories. The default partitioning (the one obtained by pressing - A at the disklabel editor) does not leave any + A at the &os; partition editor, called Disklabel) does not leave any unallocated space. Each partition that will be journaled, requires another partition for the journal. Since the /usr partition is the largest, it makes sense to shrink this partition slightly, to obtain the space required for journaling. - In our example, an 80Gb disk is used. The following screenshot - shows the default partitions created by the disklabel editor during + In our example, an 80 GB disk is used. The following screenshot + shows the default partitions created by Disklabel during installation: @@ -222,25 +222,25 @@ If this is more or less what you need, it is very easy to adjust - for journaling. Simply use the up and - down arrow keys to move the highlight to the + for journaling. Simply use the + arrow keys to move the highlight to the /usr partition and press D to delete it. Now, move the highlight to the disk name at the top of the screen and press C to create a new partition for /usr. This new partition should be smaller by - 1Gb (if you intend to journal /usr only), or - 2Gb (if you intend to journal both /usr and + 1 GB (if you intend to journal /usr only), or + 2 GB (if you intend to journal both /usr and /var). From the pop-up that appears, opt to - create a filesystem, and type /usr as the mount + create a file system, and type /usr as the mount point. Should you journal the /var partition? Normally, journaling makes sense on quite large partitions. You may decide not to journal /var, although doing so - on a typical desktop will cause no harm. If the filesystem is + on a typical desktop will cause no harm. If the file system is lightly used (quite probable for a desktop) you may wish to allocate less disk space for its journal. @@ -266,9 +266,9 @@ /etc/fstab will have to be edited, and the extra swap space entries removed. - To create the swap, again use the up and - down arrow keys to move the highlight to the top of - the disklabel editor screen, so that the disk name itself is + To create the swap, again use the + arrow keys to move the highlight to the top of + Disklabel screen, so that the disk name itself is highlighted. Then press N, enter the desired size (1024M), and select swap space from the pop-up menu that appears. Repeat @@ -290,12 +290,12 @@ following table shows our notes for the sample configuration: - Partitions and journals + Partitions and Journals Partition - Mount point + Mount Point Journal @@ -316,7 +316,7 @@
Continue the installation as you would normally do. We would - however suggest you postpone installation of add-on software + however suggest you postpone installation of third party software (packages) until you have completely setup journaling. @@ -335,42 +335,42 @@ - Setting up journaling + Setting Up Journaling - Executing gjournal + Executing <command>gjournal</command> Having prepared all the required partitions, it is quite easy to configure journaling. We will need to switch to single user - mode, so login as root and type: + mode, so login as root and type: - &prompt.root; shutdown now + &prompt.root; shutdown now - Press enter to get the default shell. We will need to unmount + Press Enter to get the default shell. We will need to unmount the partitions that will be journaled, in our example - /usr and /var: + /usr and /var: - &prompt.root; umount /usr /var + &prompt.root; umount /usr /var Load the module required for journaling: - &prompt.root; gjournal load + &prompt.root; gjournal load Now, use your notes to determine which partition will be used for each journal. In our example, /usr is - ad0s1f and its journal will be - ad0s1g, while + ad0s1f and its journal will be + ad0s1g, while /var is ad0s1d and will - be journaled to ad0s1h. + class="devicefile">ad0s1d and will + be journaled to ad0s1h. The following commands are required: - &prompt.root; gjournal label ad0s1f ad0s1g + &prompt.root; gjournal label ad0s1f ad0s1g GEOM_JOURNAL: Journal 2948326772: ad0s1f contains data. GEOM_JOURNAL: Journal 2948326772: ad0s1g contains journal. -&prompt.root; gjournal label ad0s1d ad0s1h +&prompt.root; gjournal label ad0s1d ad0s1h GEOM_JOURNAL: Journal 3193218002: ad0s1d contains data. GEOM_JOURNAL: Journal 3193218002: ad0s1h contains journal. @@ -381,34 +381,34 @@ to run the command using the flag to force an overwrite, i.e.: - &prompt.root; gjournal label -f ad0s1d ad0s1h + &prompt.root; gjournal label -f ad0s1d ad0s1h Since this is a new installation, it is highly unlikely that anything will be actually overwritten. At this point, two new devices are created, namely - ad0s1d.journal and - ad0s1f.journal. These represent + ad0s1d.journal and + ad0s1f.journal. These represent the /var and /usr partitions we have to mount. Before mounting, we must however set - the journal flag on them and clear the soft updates flag: + the journal flag on them and clear the Soft Updates flag: - &prompt.root; tunefs -J enable -n disable ad0s1d.journal + &prompt.root; tunefs -J enable -n disable ad0s1d.journal tunefs: gjournal set tunefs: soft updates cleared -&prompt.root; tunefs -J enable -n disable ad0s1f.journal +&prompt.root; tunefs -J enable -n disable ad0s1f.journal tunefs: gjournal set tunefs: soft updates cleared Now, mount the new devices manually at their respective places - (note that we can now use the async mount + (note that we can now use the mount option): - &prompt.root; mount -o async /dev/ad0s1d.journal /var -&prompt.root; mount -o async /dev/ad0s1f.journal /usr + &prompt.root; mount -o async /dev/ad0s1d.journal /var +&prompt.root; mount -o async /dev/ad0s1f.journal /usr Edit /etc/fstab and update the entries for /usr and /var: @@ -428,7 +428,7 @@ geom_journal_load="YES" Congratulations! Your system is now set for journaling. You can - either type exit to return to multi-user mode, or + either type exit to return to multi-user mode, or reboot to test your configuration (recommended). During the boot you will see messages like the following: @@ -446,42 +446,42 @@ GEOM_JOURNAL: Journal ad0s1d consistent. This usually means that &man.gjournal.8; used the information in - the journal provider to return the filesystem to a consistent + the journal provider to return the file system to a consistent state. - Journaling newly created partitions + Journaling Newly Created Partitions While the above procedure is necessary for journaling partitions that already contain data, journaling an empty partition is somewhat easier, since both the data and the journal provider can be stored in the same partition. For example, assume a new disk was installed, - and a new partition /dev/ads1s1d + and a new partition /dev/ad1s1d was created. Creating the journal would be as simple as: - &prompt.root; gjournal label ad1s1d + &prompt.root; gjournal label ad1s1d - The journal size will be 1GB by default. You may adjust it by + The journal size will be 1 GB by default. You may adjust it by using the option. The value can be given in bytes, or appended by K, M or G to denote Kilobytes, Megabytes or Gigabytes respectively. Note that gjournal will not allow you to create unsuitably small journal sizes. - For example, to create a 2GB journal, you could use the following + For example, to create a 2 GB journal, you could use the following command: - &prompt.root; gjournal label -s 2G ad1s1d + &prompt.root; gjournal label -s 2G ad1s1d - You can then create a filesystem on your new partition, and + You can then create a file system on your new partition, and enable journaling using the option: - &prompt.root; newfs -J /dev/ad1s1d.journal + &prompt.root; newfs -J /dev/ad1s1d.journal - Building journaling into your custom kernel + Building Journaling into Your Custom Kernel If you do not wish to load geom_journal as a module, you can build its functions right into your kernel. Edit your @@ -503,7 +503,7 @@ - Troubleshooting journaling + Troubleshooting Journaling The following section covers frequently asked questions regarding problems related to journaling. @@ -534,17 +534,17 @@ You either forgot (or misspelled) the entry in /boot/loader.conf, or there are errors in your /etc/fstab file. These are usually easy - to fix. Press enter to get to the default single user shell. Then + to fix. Press Enter to get to the default single user shell. Then locate the root of the problem: - &prompt.root; cat /boot/loader.conf + &prompt.root; cat /boot/loader.conf If the geom_journal_load entry is missing or misspelled, the journaled devices are never created. Load the module manually, mount all partitions, and continue with multi-user boot: - &prompt.root; gjournal load + &prompt.root; gjournal load GEOM_JOURNAL: Journal 2948326772: ad0s1g contains journal. GEOM_JOURNAL: Journal 3193218002: ad0s1h contains journal. @@ -553,9 +553,9 @@ GEOM_JOURNAL: Journal 2948326772: ad0s1f contains data. GEOM_JOURNAL: Journal ad0s1f clean. -&prompt.root; mount -a -&prompt.root; exit -(boot continues) +&prompt.root; mount -a +&prompt.root; exit +(boot continues) If, on the other hand, this entry is correct, have a look at /etc/fstab. You will probably find a @@ -566,8 +566,8 @@ - Can I remove journaling and return to my standard filesystem - with soft updates? + Can I remove journaling and return to my standard file system + with Soft Updates? @@ -575,47 +575,47 @@ changes. The partitions you created for the journal providers can then be used for other purposes, if you so wish. - Login as root and switch to single user mode: + Login as root and switch to single user mode: - &prompt.root; shutdown now + &prompt.root; shutdown now Synchronize the journals: - &prompt.root; gjournal sync + &prompt.root; gjournal sync Unmount the journaled partitions: - &prompt.root; umount /usr /var + &prompt.root; umount /usr /var Stop the journaling providers: - &prompt.root; gjournal stop ad0s1d.journal -&prompt.root; gjournal stop ad0s1f.journal + &prompt.root; gjournal stop ad0s1d.journal +&prompt.root; gjournal stop ad0s1f.journal Clear journaling metadata from all the devices used: - &prompt.root; gjournal clear ad0s1d -&prompt.root; gjournal clear ad0s1f -&prompt.root; gjournal clear ad0s1g -&prompt.root; gjournal clear ad0s1h + &prompt.root; gjournal clear ad0s1d +&prompt.root; gjournal clear ad0s1f +&prompt.root; gjournal clear ad0s1g +&prompt.root; gjournal clear ad0s1h - Clear the filesystem journaling flag, and restore the soft - updates flag: + Clear the file system journaling flag, and restore the Soft + Updates flag: - &prompt.root; tunefs -J disable -n enable ad0s1d + &prompt.root; tunefs -J disable -n enable ad0s1d tunefs: gjournal cleared tunefs: soft updates set -&prompt.root; tunefs-J disable -n enable ad0s1f +&prompt.root; tunefs -J disable -n enable ad0s1f tunefs: gjournal cleared tunefs: soft updates set Remount the old devices by hand: - &prompt.root; mount -o rw /dev/ad0s1d /var -&prompt.root; mount -o rw /dev/ad0s1f /usr + &prompt.root; mount -o rw /dev/ad0s1d /var +&prompt.root; mount -o rw /dev/ad0s1f /usr Edit /etc/fstab and restore it to its original state: @@ -633,7 +633,7 @@ - Further reading + Further Reading Journaling is a fairly new feature of &os;, and as such, it is not very well documented yet. You may however find the following @@ -652,7 +652,7 @@ This post - in &a.questions.name; by Ivan Voras. + in &a.questions.name; by &a.ivoras;. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: doc/en_US.ISO8859-1/books/handbook/Makefile,v 1.109 2008/03/03 11:07:37 brd Exp $ +# $FreeBSD: doc/en_US.ISO8859-1/books/handbook/Makefile,v 1.110 2008/09/28 12:54:12 trhodes Exp $ # # Build the FreeBSD Handbook. # @@ -198,6 +198,7 @@ SRCS+= audit/chapter.sgml SRCS+= book.sgml SRCS+= colophon.sgml +SRCS+= dtrace/chapter.sgml SRCS+= freebsd-glossary.sgml SRCS+= advanced-networking/chapter.sgml SRCS+= basics/chapter.sgml @@ -209,6 +210,7 @@ SRCS+= disks/chapter.sgml SRCS+= eresources/chapter.sgml SRCS+= firewalls/chapter.sgml +SRCS+= filesystems/chapter.sgml SRCS+= geom/chapter.sgml SRCS+= install/chapter.sgml SRCS+= introduction/chapter.sgml @@ -228,6 +230,7 @@ SRCS+= printing/chapter.sgml SRCS+= security/chapter.sgml SRCS+= serialcomms/chapter.sgml +SRCS+= updating/chapter.sgml SRCS+= users/chapter.sgml SRCS+= vinum/chapter.sgml SRCS+= virtualization/chapter.sgml ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -653,6 +653,145 @@ over the &man.chflags.1; and &man.chflags.2; manual pages for more information. + + + + + + Tom + Rhodes + Contributed by + + + + + The setuid, setgid, and sticky Permissions + + Other than the permissions already discussed, there are + three other specific settings that all administrators should + know about. They are the setuid, + setgid and sticky + permissions. + + These settings are important for some &unix; operations + as they provide functionality not normally granted to normal + users. To understand them, the difference between the real + user ID and effective user ID must also be noted. + + The real user ID is the UID who owns + or starts the process. The effective UID + is the user ID the process runs as. As an example, the + &man.passwd.1; utility runs with the real user ID as the + user changing their password; however, to manipulate the + password database, it runs as the effective ID of the + root user. This is what allows normal + users to change their passwords without seeing a + Permission Denied error. + + + The nosuid &man.mount.8; option will + cause these binaries to silently fail. That is, they will + fail to execute without ever alerting the user. That option + is also not completely reliable as a nosuid + wrapper may be able to circumvent it; according to the + &man.mount.8; manual page. + + + The setuid permission may be set by prefixing a permission + set with the number four (4) as shown in the following + example: + + &prompt.root; chmod 4755 suidexample.sh + + The permissions on the + suidexample.sh + file should now look like the following: + + -rwsr-xr-x 1 trhodes trhodes 63 Aug 29 06:36 suidexample.sh + + It should be noticeable from this example that an + s is now part of the permission set + designated for the file owner, replacing the executable + bit. This allows utilities which need elevated permissions, + such as passwd. + + To view this in real time, open two terminals. On + one, start the passwd process as a normal + user. While it waits for a new password, check the process + table and look at the user information of the + passwd command. + + In terminal A: + + Changing local password for trhodes +Old Password: + + In terminal B: + + &prompt.root; ps aux | grep passwd + + trhodes 5232 0.0 0.2 3420 1608 0 R+ 2:10AM 0:00.00 grep passwd +root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd + + As stated above, the passwd is run + by a normal user, but is using the effective + UID of root. + + The setgid permission performs the + same function as the setuid permission; + except that it alters the group settings. When an application + or utility is ran with this setting, it will be granted the + permissions based on the group that owns the file, not + the user who started the process. + + To set the setgid permission on a + file, provide the chmod command with a + leading two (2) as in the following example: + + &prompt.root; chmod 2755 suidexample.sh + + The new setting may be viewed as before, notice the + s is now in the field designated for the + group permission settings: + + -rwxr-sr-x 1 trhodes trhodes 44 Aug 31 01:49 suidexample.sh + + + In these examples, even though the shell script in + question is an executable file, it will not run with + a different EUID or effective user ID. + This is because shell scripts may not access the + &man.setuid.2; system calls. + + + The first two special permission bits we discussed + (the setuid and setgid + permission bits) may lower system security, by allowing for + elevated permissions. There is a third special permission bit + that can strengthen the security of a system: the + sticky bit. + + The sticky bit, when set on a directory, + allows file deletion only by the file owner. This + permission set is useful to prevent file deletion in public + directories, such as + /tmp, by users who do + not own the file. To utilize this permission, prefix the + permission with a one (1). For example: + + &prompt.root; chmod 1777 /tmp + + Now, it is possible to see the effect by using the + ls command: + + &prompt.root; ls -al / | grep tmp + + drwxrwxrwt 10 root wheel 512 Aug 31 01:49 tmp + + The sticky bit permission is + distinguishable from the t at the very + end of the set. + ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/book.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ + + + %pgpkeys; ]> @@ -270,10 +273,12 @@ + + @@ -316,6 +321,7 @@ can begin using FreeBSD in a network environment. + ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/chapters.ent#2 (text+ko) ==== @@ -6,7 +6,7 @@ Chapters should be listed in the order in which they are referenced. - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/chapters.ent,v 1.37 2007/04/06 07:38:50 murray Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/chapters.ent,v 1.38 2008/09/28 12:54:12 trhodes Exp $ --> @@ -35,12 +35,15 @@ + + + ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#6 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -594,10 +594,11 @@ you can change your digest options in your account options section. - CVS lists: The following lists are for people - interested in seeing the log messages for changes to various areas of - the source tree. They are Read-Only lists and - should not have mail sent to them. + CVS & SVN lists: The following lists + are for people interested in seeing the log messages for changes to + various areas of the source tree. They are + Read-Only lists and should not have mail sent to + them. @@ -637,7 +638,15 @@ &a.cvs-src.name; /usr/src - All changes to the src tree + All changes to the src tree (generated by the svn-to-cvs + importer commits) + + + + &a.svn-src.name; + /usr/src + All changes to the src tree + (SVN commit logs) ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/geom/chapter.sgml#3 (text+ko) ==== @@ -1,6 +1,6 @@ @@ -240,135 +240,126 @@ safe. To begin, ensure the system has two disk drives of equal size, - this exercise assumes they are direct access (&man.da.4;) + these exercises assume they are direct access (&man.da.4;) SCSI disks. - Begin by installing &os; on the first disk with only two - partitions. One should be a swap partition, double the - RAM size and all remaining space devoted to - the root (/) file system. - It is possible to have separate partitions for other mount points; - however, this will increase the difficulty level ten fold due to - manual alteration of the &man.bsdlabel.8; and &man.fdisk.8; - settings. + + Mirroring Primary Disks - Reboot and wait for the system to fully initialize. Once this - process has completed, log in as the root - user. + Assuming &os; has been installed on the first, + da0 disk device, &man.gmirror.8; + should be told to store its primary data there. - Create the /dev/mirror/gm device and link - it with /dev/da1: + Before building the mirror, enable additional debugging + information and opening access to the device by setting the + kern.geom.debugflags &man.sysctl.8; option + to the following value: - &prompt.root; gmirror label -vnb round-robin gm0 /dev/da1 + &prompt.root; sysctl kern.geom.debugflags=17 - The system should respond with: - -Metadata value stored on /dev/da1. -Done. + Now create the mirror. Begin the process by storing + meta-data information on the primary disk device, + effectively creating the + /dev/mirror/gm device + using the following command: - Initialize GEOM, this will load the - /boot/kernel/geom_mirror.ko kernel - module: + &prompt.root; gmirror label -vb round-robin gm0 /dev/da0 - &prompt.root; gmirror load + The system should respond with: - - This command should have created the - gm0, device node under the - /dev/mirror - directory. - + Metadata value stored on /dev/da0. +Done. - Install a generic fdisk label and boot code - to new gm0 device: + Initialize GEOM, this will load the + /boot/kernel/geom_mirror.ko kernel + module: - &prompt.root; fdisk -vBI /dev/mirror/gm0 + &prompt.root; gmirror load - Now install generic bsdlabel - information: + + When this command completes successfully, it creates the + gm0 device node under the + /dev/mirror + directory. + - &prompt.root; bsdlabel -wB /dev/mirror/gm0s1 + Enable loading of the geom_mirror.ko + kernel module during system initialization: - - If multiple slices and partitions exist, the flags for the - previous two commands will require alteration. They must match - the slice and partition size of the other disk. - + &prompt.root; echo 'geom_mirror_load="YES"' >> /boot/loader.conf - Use the &man.newfs.8; utility to construct a default UFS >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Sep 28 15:50:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B37D106568A; Sun, 28 Sep 2008 15:50: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 CA376106568E for ; Sun, 28 Sep 2008 15:50:50 +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 B80B08FC0A for ; Sun, 28 Sep 2008 15:50:50 +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 m8SFoo0G008140 for ; Sun, 28 Sep 2008 15:50:50 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8SFooTD008113 for perforce@freebsd.org; Sun, 28 Sep 2008 15:50:50 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 28 Sep 2008 15:50:50 GMT Message-Id: <200809281550.m8SFooTD008113@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 150603 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, 28 Sep 2008 15:50:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=150603 Change 150603 by rene@rene_self on 2008/09/28 15:50:25 MFen: mailing-lists.ent 1.61 -> 1.62 eresources 1.188 -> 1.190 Checked build. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml#7 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent#5 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml#7 (text+ko) ==== @@ -6,7 +6,7 @@ Vertaald door: Siebrand Mazeland %SOURCE% en_US.ISO8859-1/books/handbook/eresources/chapter.sgml - %SRCID% 1.188 + %SRCID% 1.190 --> @@ -656,7 +656,7 @@ &a.vuxml.name; - Discussie over VuXML infrastructuur + Discussie over VuXML-infrastructuur @@ -728,12 +728,12 @@ vorm. Na het lid worden van een lijst zijn de digest opties te wijzigen bij de accountopties. - CVS lijsten: De volgende lijsten zijn - voor mensen met interesse in het zien van logboekberichten voor - wijzigingen in verschillende onderdelen van de - broncodestructuur. Het zijn Alleen-lezen - lijsten waar geen e–mail heen gezonden hoort te - worden. + CVS- & SVN-lijsten: De volgende + lijsten zijn voor mensen met interesse in het zien van + logboekberichten voor wijzigingen in verschillende onderdelen + van de broncodestructuur. Het zijn + Alleen-lezen-lijsten waar geen email heen + gezonden hoort te worden. @@ -754,8 +754,7 @@ /usr/(CVSROOT|doc|ports|projects|src) Alle wijzigingen op welke plaats in de structuur - dan ook (som van alle andere CVS commit - lijsten) + dan ook (som van alle andere CVS-commit-lijsten) @@ -763,8 +762,8 @@ /usr/(doc|www) - Alle wijzigingen aan de doc en www - structuren + Alle wijzigingen aan de doc- en + www-structuren @@ -772,7 +771,7 @@ /usr/ports - Alle wijzigingen aan de ports structuur + Alle wijzigingen aan de ports-structuur @@ -780,7 +779,7 @@ /usr/projects - Alle wijzigingen aan de projects structuur + Alle wijzigingen aan de projects-structuur @@ -788,7 +787,17 @@ /usr/src - Alle wijzigingen aan de src structuur + Alle wijzigingen aan de src-structuur (gegenereerd + door de commits van de svn-naar-cvs-importer) + + + + &a.svn-src.name; + + /usr/src + + Alle wijzigingen aan de src-structuur (logs van + SVN-commits) ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent#5 (text+ko) ==== @@ -6,7 +6,7 @@ Vertaald door: Siebrand Mazeland %SOURCE% en_US.ISO8859-1/share/sgml/mailing-lists.ent - %SRCID% 1.61 + %SRCID% 1.62 --> @@ -400,6 +400,10 @@ FreeBSD sun4v porting mailinglijst"> freebsd-sun4v"> + +FreeBSD SVN-src-commitlijst"> +svn-src"> + FreeBSD test mailinglijst"> freebsd-test"> From owner-p4-projects@FreeBSD.ORG Sun Sep 28 15:51:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 570E0106568D; Sun, 28 Sep 2008 15:51:52 +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 1B5D81065686 for ; Sun, 28 Sep 2008 15:51:52 +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 E4B2C8FC08 for ; Sun, 28 Sep 2008 15:51: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 m8SFppJJ016205 for ; Sun, 28 Sep 2008 15:51:51 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8SFppQp016197 for perforce@freebsd.org; Sun, 28 Sep 2008 15:51:51 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 28 Sep 2008 15:51:51 GMT Message-Id: <200809281551.m8SFppQp016197@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 150604 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, 28 Sep 2008 15:51:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=150604 Change 150604 by rene@rene_self on 2008/09/28 15:51:22 Bump SRCID of security chapter Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/security/chapter.sgml#5 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/security/chapter.sgml#5 (text+ko) ==== @@ -5,7 +5,7 @@ $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/security/chapter.sgml,v 1.80 2006/01/05 21:13:24 siebrand Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/security/chapter.sgml - %SRCID% 1.330 + %SRCID% 1.331 --> From owner-p4-projects@FreeBSD.ORG Sun Sep 28 16:02:09 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BAB6A1065689; Sun, 28 Sep 2008 16:02:09 +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 7D27B106564A for ; Sun, 28 Sep 2008 16:02:09 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 68D788FC1A for ; Sun, 28 Sep 2008 16:02:09 +0000 (UTC) (envelope-from nwhitehorn@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 m8SG29SD075762 for ; Sun, 28 Sep 2008 16:02:09 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8SG27Ni075566 for perforce@freebsd.org; Sun, 28 Sep 2008 16:02:07 GMT (envelope-from nwhitehorn@freebsd.org) Date: Sun, 28 Sep 2008 16:02:07 GMT Message-Id: <200809281602.m8SG27Ni075566@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nwhitehorn@freebsd.org using -f From: Nathan Whitehorn To: Perforce Change Reviews Cc: Subject: PERFORCE change 150605 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, 28 Sep 2008 16:02:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=150605 Change 150605 by nwhitehorn@nwhitehorn_trantor on 2008/09/28 16:02:07 IFC @183437 Affected files ... .. //depot/projects/ppc-g5/Makefile.inc1#2 integrate .. //depot/projects/ppc-g5/ObsoleteFiles.inc#3 integrate .. //depot/projects/ppc-g5/UPDATING#3 integrate .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c#2 integrate .. //depot/projects/ppc-g5/contrib/libpcap/pcap-bpf.c#2 integrate .. //depot/projects/ppc-g5/contrib/libpcap/pcap-int.h#2 integrate .. //depot/projects/ppc-g5/contrib/libpcap/pcap.c#2 integrate .. //depot/projects/ppc-g5/crypto/openssh/sshconnect2.c#2 integrate .. //depot/projects/ppc-g5/crypto/openssl/FREEBSD-Xlist#2 delete .. //depot/projects/ppc-g5/crypto/openssl/FREEBSD-upgrade#2 delete .. //depot/projects/ppc-g5/etc/Makefile#2 integrate .. //depot/projects/ppc-g5/etc/defaults/rc.conf#3 integrate .. //depot/projects/ppc-g5/etc/periodic/daily/Makefile#2 integrate .. //depot/projects/ppc-g5/etc/periodic/monthly/Makefile#2 integrate .. //depot/projects/ppc-g5/etc/periodic/security/Makefile#2 integrate .. //depot/projects/ppc-g5/etc/periodic/weekly/Makefile#2 integrate .. //depot/projects/ppc-g5/etc/rc.d/jail#2 integrate .. //depot/projects/ppc-g5/gnu/lib/csu/Makefile#2 integrate .. //depot/projects/ppc-g5/gnu/lib/libgcc/Makefile#3 integrate .. //depot/projects/ppc-g5/gnu/lib/libgomp/Makefile#3 integrate .. //depot/projects/ppc-g5/gnu/usr.bin/Makefile#3 integrate .. //depot/projects/ppc-g5/gnu/usr.bin/gdb/kgdb/kld.c#2 integrate .. //depot/projects/ppc-g5/gnu/usr.bin/gdb/kgdb/trgt_i386.c#2 integrate .. //depot/projects/ppc-g5/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#2 integrate .. //depot/projects/ppc-g5/include/Makefile#2 integrate .. //depot/projects/ppc-g5/include/unistd.h#2 integrate .. //depot/projects/ppc-g5/include/uuid.h#2 integrate .. //depot/projects/ppc-g5/lib/Makefile#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive.h#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_entry.h#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_read_support_format_mtree.c#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_write_disk.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/config_freebsd.h#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/test/test_read_format_mtree.c#3 integrate .. //depot/projects/ppc-g5/lib/libc/gen/getosreldate.3#2 integrate .. //depot/projects/ppc-g5/lib/libc/powerpc/gen/syncicache.c#3 integrate .. //depot/projects/ppc-g5/lib/libc/rpc/clnt_dg.c#2 integrate .. //depot/projects/ppc-g5/lib/libc/uuid/Symbol.map#2 integrate .. //depot/projects/ppc-g5/lib/libpmc/Makefile#2 integrate .. //depot/projects/ppc-g5/lib/libpmc/libpmc.c#2 integrate .. //depot/projects/ppc-g5/lib/libpmc/pmc.3#2 integrate .. //depot/projects/ppc-g5/lib/libpmc/pmc.k7.3#1 branch .. //depot/projects/ppc-g5/lib/libpmc/pmc.k8.3#1 branch .. //depot/projects/ppc-g5/lib/libpmc/pmc.p4.3#1 branch .. //depot/projects/ppc-g5/lib/libpmc/pmc.p5.3#1 branch .. //depot/projects/ppc-g5/lib/libpmc/pmc.p6.3#1 branch .. //depot/projects/ppc-g5/lib/libpmc/pmc.tsc.3#1 branch .. //depot/projects/ppc-g5/lib/libpmc/pmc_allocate.3#2 integrate .. //depot/projects/ppc-g5/lib/libpmc/pmc_capabilities.3#2 integrate .. //depot/projects/ppc-g5/lib/libpmc/pmc_disable.3#2 integrate .. //depot/projects/ppc-g5/lib/libpmc/pmc_start.3#2 integrate .. //depot/projects/ppc-g5/lib/libthr/thread/thr_event.c#2 integrate .. //depot/projects/ppc-g5/lib/libthread_db/libpthread_db.c#2 integrate .. //depot/projects/ppc-g5/lib/libthread_db/libthr_db.c#2 integrate .. //depot/projects/ppc-g5/lib/libthread_db/thread_db.c#2 integrate .. //depot/projects/ppc-g5/lib/libthread_db/thread_db.h#2 integrate .. //depot/projects/ppc-g5/lib/libthread_db/thread_db_int.h#2 integrate .. //depot/projects/ppc-g5/libexec/Makefile#2 integrate .. //depot/projects/ppc-g5/libexec/rtld-elf/rtld_lock.c#2 integrate .. //depot/projects/ppc-g5/release/doc/zh_CN.GB2312/Makefile#2 integrate .. //depot/projects/ppc-g5/release/doc/zh_CN.GB2312/errata/Makefile#2 integrate .. //depot/projects/ppc-g5/release/doc/zh_CN.GB2312/errata/article.sgml#2 integrate .. //depot/projects/ppc-g5/release/doc/zh_CN.GB2312/hardware/Makefile#2 integrate .. //depot/projects/ppc-g5/release/doc/zh_CN.GB2312/hardware/article.sgml#2 integrate .. //depot/projects/ppc-g5/release/doc/zh_CN.GB2312/readme/Makefile#2 integrate .. //depot/projects/ppc-g5/release/doc/zh_CN.GB2312/readme/article.sgml#2 integrate .. //depot/projects/ppc-g5/release/doc/zh_CN.GB2312/relnotes/Makefile#2 integrate .. //depot/projects/ppc-g5/release/doc/zh_CN.GB2312/relnotes/article.sgml#2 integrate .. //depot/projects/ppc-g5/release/doc/zh_CN.GB2312/share/sgml/catalog#2 integrate .. //depot/projects/ppc-g5/release/doc/zh_CN.GB2312/share/sgml/release.dsl#2 integrate .. //depot/projects/ppc-g5/release/i386/fixit_crunch.conf#2 integrate .. //depot/projects/ppc-g5/release/pc98/fixit-small_crunch.conf#2 integrate .. //depot/projects/ppc-g5/release/pc98/fixit_crunch.conf#2 integrate .. //depot/projects/ppc-g5/sbin/Makefile#2 integrate .. //depot/projects/ppc-g5/sbin/bsdlabel/Makefile#2 integrate .. //depot/projects/ppc-g5/sbin/bsdlabel/bsdlabel.c#2 integrate .. //depot/projects/ppc-g5/sbin/fdisk/Makefile#2 integrate .. //depot/projects/ppc-g5/sbin/fsck_ffs/fsck_ffs.8#2 integrate .. //depot/projects/ppc-g5/sbin/ifconfig/ifconfig.8#3 integrate .. //depot/projects/ppc-g5/sbin/ifconfig/ifieee80211.c#2 integrate .. //depot/projects/ppc-g5/sbin/ifconfig/regdomain.c#2 integrate .. //depot/projects/ppc-g5/sbin/init/init.c#2 integrate .. //depot/projects/ppc-g5/sbin/ipfw/ipfw.8#3 integrate .. //depot/projects/ppc-g5/sbin/ipfw/ipfw2.c#3 integrate .. //depot/projects/ppc-g5/sbin/mount_nfs/mount_nfs.c#3 integrate .. //depot/projects/ppc-g5/share/Makefile#2 integrate .. //depot/projects/ppc-g5/share/examples/drivers/make_pseudo_driver.sh#2 integrate .. //depot/projects/ppc-g5/share/man/man4/age.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/ddb.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/hwpmc.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/snd_hda.4#3 integrate .. //depot/projects/ppc-g5/share/man/man5/rc.conf.5#2 integrate .. //depot/projects/ppc-g5/share/man/man5/src.conf.5#2 integrate .. //depot/projects/ppc-g5/share/man/man9/DB_COMMAND.9#1 branch .. //depot/projects/ppc-g5/share/man/man9/Makefile#3 integrate .. //depot/projects/ppc-g5/share/man/man9/make_dev.9#3 integrate .. //depot/projects/ppc-g5/share/man/man9/priv.9#2 integrate .. //depot/projects/ppc-g5/share/man/man9/spl.9#2 integrate .. //depot/projects/ppc-g5/share/man/man9/suser.9#2 delete .. //depot/projects/ppc-g5/share/man/man9/ucred.9#2 integrate .. //depot/projects/ppc-g5/share/man/man9/vfs_suser.9#2 integrate .. //depot/projects/ppc-g5/share/misc/committers-src.dot#2 integrate .. //depot/projects/ppc-g5/share/mk/bsd.own.mk#2 integrate .. //depot/projects/ppc-g5/share/zoneinfo/africa#2 integrate .. //depot/projects/ppc-g5/share/zoneinfo/asia#2 integrate .. //depot/projects/ppc-g5/share/zoneinfo/europe#2 integrate .. //depot/projects/ppc-g5/share/zoneinfo/southamerica#2 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/elf_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/mem.c#2 integrate .. //depot/projects/ppc-g5/sys/amd64/include/pmc_mdep.h#2 integrate .. //depot/projects/ppc-g5/sys/amd64/linux32/linux32_sysvec.c#2 integrate .. //depot/projects/ppc-g5/sys/arm/arm/elf_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/arm/arm/mem.c#2 integrate .. //depot/projects/ppc-g5/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/ppc-g5/sys/boot/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/boot/ofw/libofw/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/boot/ofw/libofw/ofw_console.c#2 integrate .. //depot/projects/ppc-g5/sys/cam/cam.h#2 integrate .. //depot/projects/ppc-g5/sys/cam/scsi/scsi_pass.c#2 integrate .. //depot/projects/ppc-g5/sys/cam/scsi/scsi_sa.c#2 integrate .. //depot/projects/ppc-g5/sys/cam/scsi/scsi_ses.c#2 integrate .. //depot/projects/ppc-g5/sys/cam/scsi/scsi_sg.c#2 integrate .. //depot/projects/ppc-g5/sys/cam/scsi/scsi_target.c#2 integrate .. //depot/projects/ppc-g5/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#2 integrate .. //depot/projects/ppc-g5/sys/cddl/compat/opensolaris/sys/atomic.h#2 integrate .. //depot/projects/ppc-g5/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#2 integrate .. //depot/projects/ppc-g5/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#3 integrate .. //depot/projects/ppc-g5/sys/cddl/dev/dtrace/dtrace_clone.c#2 integrate .. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32_ioctl.c#1 branch .. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32_ioctl.h#1 branch .. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32_util.h#2 integrate .. //depot/projects/ppc-g5/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/ppc-g5/sys/compat/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/ppc-g5/sys/compat/linprocfs/linprocfs.c#3 integrate .. //depot/projects/ppc-g5/sys/compat/linux/linux_misc.c#3 integrate .. //depot/projects/ppc-g5/sys/compat/svr4/svr4_stream.c#2 integrate .. //depot/projects/ppc-g5/sys/compat/svr4/svr4_sysvec.c#2 integrate .. //depot/projects/ppc-g5/sys/conf/files#2 integrate .. //depot/projects/ppc-g5/sys/conf/files.amd64#2 integrate .. //depot/projects/ppc-g5/sys/conf/files.i386#3 integrate .. //depot/projects/ppc-g5/sys/conf/files.ia64#2 integrate .. //depot/projects/ppc-g5/sys/conf/files.mips#3 integrate .. //depot/projects/ppc-g5/sys/conf/files.powerpc#3 integrate .. //depot/projects/ppc-g5/sys/conf/files.sparc64#3 integrate .. //depot/projects/ppc-g5/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/ppc-g5/sys/conf/ldscript.mips#2 integrate .. //depot/projects/ppc-g5/sys/conf/options.mips#2 integrate .. //depot/projects/ppc-g5/sys/conf/options.sparc64#2 integrate .. //depot/projects/ppc-g5/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate .. //depot/projects/ppc-g5/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/ppc-g5/sys/ddb/db_command.c#2 integrate .. //depot/projects/ppc-g5/sys/ddb/db_command.h#2 integrate .. //depot/projects/ppc-g5/sys/ddb/db_main.c#2 integrate .. //depot/projects/ppc-g5/sys/ddb/ddb.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/acpica/acpi_quirk.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/agp/agp.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/aic7xxx/aic79xx_osm.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/amr/amr.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/arcmsr/arcmsr.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/asr/asr.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ata/ata-chipset.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/ata/atapi-tape.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ath/if_athvar.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/atkbdc/psm.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/bge/if_bge.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/bktr/bktr_os.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/bm/if_bm.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/ce/if_ce.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cfe/cfe_api.c#1 branch .. //depot/projects/ppc-g5/sys/dev/cfe/cfe_api.h#1 branch .. //depot/projects/ppc-g5/sys/dev/cfe/cfe_api_int.h#1 branch .. //depot/projects/ppc-g5/sys/dev/cfe/cfe_console.c#1 branch .. //depot/projects/ppc-g5/sys/dev/cfe/cfe_error.h#1 branch .. //depot/projects/ppc-g5/sys/dev/cfe/cfe_ioctl.h#1 branch .. //depot/projects/ppc-g5/sys/dev/cfe/cfe_resource.c#1 branch .. //depot/projects/ppc-g5/sys/dev/cp/if_cp.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cpuctl/cpuctl.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/ctau/if_ct.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/common/cxgb_ael1002.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/common/cxgb_common.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/common/cxgb_mc5.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/common/cxgb_t3_hw.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/common/cxgb_tn1010.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/common/cxgb_vsc7323.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/common/cxgb_vsc8211.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/common/cxgb_xgmac.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/cxgb_adapter.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/cxgb_config.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/cxgb_include.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/cxgb_main.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/cxgb_multiq.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/cxgb_offload.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/cxgb_offload.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/cxgb_osdep.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/cxgb_sge.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/cxgb_t3fw.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/sys/cxgb_support.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/sys/mbufq.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/sys/mvec.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/sys/uipc_mvec.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_dbg.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/toecore/cxgb_toedev.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/toecore/toedev.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/tom/cxgb_defs.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/tom/cxgb_l2t.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/tom/cxgb_l2t.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/tom/cxgb_listen.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/tom/cxgb_tom.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/tom/cxgb_tom.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/tom/cxgb_vm.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_drv.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_fops.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/fb/fb.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/fb/vgareg.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/firewire/firewire.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/firewire/fwdev.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/hptiop/hptiop.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/hwpmc/hwpmc_amd.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/hwpmc/hwpmc_mod.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/hwpmc/hwpmc_piv.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/hwpmc/hwpmc_ppro.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/hwpmc/hwpmc_x86.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/iir/iir_ctrl.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/iscsi/initiator/isc_cam.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/iscsi/initiator/iscsi.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/isp/isp_freebsd.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/jme/if_jme.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/jme/if_jmereg.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/joy/joy.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/kbd/kbd.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/kbdmux/kbdmux.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/le/if_le_cbus.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/le/if_le_isa.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/le/if_le_lebuffer.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/le/if_le_pci.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/le/lebuffer_sbus.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/led/led.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/mlx/mlx.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/mly/mly.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/mse/mse.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/msk/if_msk.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/msk/if_mskreg.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/pbio/pbio.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/pci/vga_pci.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/powermac_nvram/powermac_nvram.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ppbus/if_plip.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ppbus/lpt.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ppbus/pcfclock.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ppbus/ppbconf.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ppbus/ppbconf.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/ppbus/ppi.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ppbus/pps.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ppc/ppc.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ppc/ppc_acpi.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ppc/ppc_isa.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/ppc/ppc_pci.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ppc/ppc_puc.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ppc/ppcreg.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/ppc/ppcvar.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/rp/rpvar.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/siba/siba.c#1 branch .. //depot/projects/ppc-g5/sys/dev/siba/siba_ids.h#1 branch .. //depot/projects/ppc-g5/sys/dev/siba/siba_pcib.c#1 branch .. //depot/projects/ppc-g5/sys/dev/siba/siba_pcibvar.h#1 branch .. //depot/projects/ppc-g5/sys/dev/siba/sibareg.h#1 branch .. //depot/projects/ppc-g5/sys/dev/siba/sibavar.h#1 branch .. //depot/projects/ppc-g5/sys/dev/snp/snp.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/sound/midi/sequencer.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/sound/pci/emu10kx.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/sound/pci/hda/hdac.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/sound/pcm/dsp.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/sound/pcm/mixer.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/speaker/spkr.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/streams/streams.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/tdfx/tdfx_pci.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/twa/tw_osl_freebsd.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/twe/twe_freebsd.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/if_zyd.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb/ubsa.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/ucomvar.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb/ufm.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/ufoma.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb/ugen.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/uhid.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/ulpt.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/umass.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/ums.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/urio.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usb.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb/uscanner.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/vkbd/vkbd.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/xen/blkfront/blkfront.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/xen/console/console.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/xen/netfront/netfront.c#2 integrate .. //depot/projects/ppc-g5/sys/fs/coda/coda_fbsd.c#2 integrate .. //depot/projects/ppc-g5/sys/fs/devfs/devfs_devs.c#2 integrate .. //depot/projects/ppc-g5/sys/fs/devfs/devfs_vnops.c#3 integrate .. //depot/projects/ppc-g5/sys/fs/fdescfs/fdesc_vnops.c#3 integrate .. //depot/projects/ppc-g5/sys/fs/hpfs/hpfs_vnops.c#3 integrate .. //depot/projects/ppc-g5/sys/fs/msdosfs/msdosfs_vnops.c#3 integrate .. //depot/projects/ppc-g5/sys/fs/ntfs/ntfs_vnops.c#2 integrate .. //depot/projects/ppc-g5/sys/fs/portalfs/portal_vnops.c#3 integrate .. //depot/projects/ppc-g5/sys/fs/pseudofs/pseudofs_vnops.c#3 integrate .. //depot/projects/ppc-g5/sys/fs/smbfs/smbfs_node.c#3 integrate .. //depot/projects/ppc-g5/sys/fs/tmpfs/tmpfs.h#3 integrate .. //depot/projects/ppc-g5/sys/fs/tmpfs/tmpfs_subr.c#3 integrate .. //depot/projects/ppc-g5/sys/fs/tmpfs/tmpfs_vnops.c#3 integrate .. //depot/projects/ppc-g5/sys/fs/udf/udf_vnops.c#2 integrate .. //depot/projects/ppc-g5/sys/geom/geom_dev.c#3 integrate .. //depot/projects/ppc-g5/sys/geom/geom_io.c#2 integrate .. //depot/projects/ppc-g5/sys/geom/part/g_part.c#3 integrate .. //depot/projects/ppc-g5/sys/geom/part/g_part_bsd.c#2 integrate .. //depot/projects/ppc-g5/sys/geom/part/g_part_pc98.c#2 integrate .. //depot/projects/ppc-g5/sys/gnu/fs/ext2fs/ext2_inode.c#2 integrate .. //depot/projects/ppc-g5/sys/gnu/fs/xfs/FreeBSD/support/kdb.c#2 integrate .. //depot/projects/ppc-g5/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#3 integrate .. //depot/projects/ppc-g5/sys/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/i386/bios/apm.c#2 integrate .. //depot/projects/ppc-g5/sys/i386/bios/apm.h#2 integrate .. //depot/projects/ppc-g5/sys/i386/bios/smapi.c#2 integrate .. //depot/projects/ppc-g5/sys/i386/conf/GENERIC#2 integrate .. //depot/projects/ppc-g5/sys/i386/i386/bios.c#2 integrate .. //depot/projects/ppc-g5/sys/i386/i386/db_trace.c#2 integrate .. //depot/projects/ppc-g5/sys/i386/i386/elf_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/i386/i386/identcpu.c#2 integrate .. //depot/projects/ppc-g5/sys/i386/i386/intr_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/i386/i386/mem.c#2 integrate .. //depot/projects/ppc-g5/sys/i386/i386/pmap.c#2 integrate .. //depot/projects/ppc-g5/sys/i386/ibcs2/ibcs2_sysvec.c#2 integrate .. //depot/projects/ppc-g5/sys/i386/include/param.h#2 integrate .. //depot/projects/ppc-g5/sys/i386/include/pmc_mdep.h#3 integrate .. //depot/projects/ppc-g5/sys/i386/include/smp.h#2 integrate .. //depot/projects/ppc-g5/sys/i386/include/specialreg.h#2 integrate .. //depot/projects/ppc-g5/sys/i386/include/xen/evtchn.h#2 integrate .. //depot/projects/ppc-g5/sys/i386/linux/linux_sysvec.c#2 integrate .. //depot/projects/ppc-g5/sys/i386/xen/mp_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/i386/xen/pmap.c#3 integrate .. //depot/projects/ppc-g5/sys/i386/xen/xen_machdep.c#3 integrate .. //depot/projects/ppc-g5/sys/ia64/ia64/efi.c#2 integrate .. //depot/projects/ppc-g5/sys/ia64/ia64/elf_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/ia64/ia64/mem.c#2 integrate .. //depot/projects/ppc-g5/sys/ia64/ia64/sal.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/imgact_aout.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/init_main.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/init_sysent.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/kern_condvar.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/kern_conf.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/kern_intr.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/kern_pmc.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/kern_priv.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/kern_proc.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/kern_shutdown.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/kern_synch.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/kern_syscalls.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/makesyscalls.sh#2 integrate .. //depot/projects/ppc-g5/sys/kern/subr_clist.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/subr_pcpu.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/subr_rman.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/subr_sleepqueue.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/subr_turnstile.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/subr_witness.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/sys_generic.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/syscalls.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/syscalls.master#2 integrate .. //depot/projects/ppc-g5/sys/kern/systrace_args.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/tty.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/tty_pts.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/tty_ttydisc.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/uipc_mqueue.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/vfs_bio.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/vfs_cache.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/vfs_mount.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/vfs_vnops.c#3 integrate .. //depot/projects/ppc-g5/sys/libkern/memcmp.c#1 branch .. //depot/projects/ppc-g5/sys/mips/adm5120/if_admsw.c#3 integrate .. //depot/projects/ppc-g5/sys/mips/adm5120/obio.c#3 integrate .. //depot/projects/ppc-g5/sys/mips/conf/IDT#3 integrate .. //depot/projects/ppc-g5/sys/mips/idt/obio.c#3 integrate .. //depot/projects/ppc-g5/sys/mips/malta/gt_pci.c#3 integrate .. //depot/projects/ppc-g5/sys/mips/mips/elf_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/mips/mips/intr_machdep.c#3 integrate .. //depot/projects/ppc-g5/sys/mips/mips/mem.c#2 integrate .. //depot/projects/ppc-g5/sys/mips/mips/pmap.c#2 integrate .. //depot/projects/ppc-g5/sys/mips/mips/support.S#2 integrate .. //depot/projects/ppc-g5/sys/mips/mips/trap.c#2 integrate .. //depot/projects/ppc-g5/sys/mips/sentry5/s5_machdep.c#3 integrate .. //depot/projects/ppc-g5/sys/modules/cxgb/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/modules/cxgb/cxgb/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/modules/cxgb/cxgb_t3fw/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/modules/cxgb/iw_cxgb/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/modules/cxgb/toecore/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/modules/cxgb/tom/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/modules/svr4/Makefile#3 integrate .. //depot/projects/ppc-g5/sys/modules/wlan/Makefile#3 integrate .. //depot/projects/ppc-g5/sys/net/if.c#2 integrate .. //depot/projects/ppc-g5/sys/net/if_atmsubr.c#2 integrate .. //depot/projects/ppc-g5/sys/net/if_clone.c#2 integrate .. //depot/projects/ppc-g5/sys/net/if_clone.h#2 integrate .. //depot/projects/ppc-g5/sys/net/if_fwsubr.c#2 integrate .. //depot/projects/ppc-g5/sys/net/if_iso88025subr.c#2 integrate .. //depot/projects/ppc-g5/sys/net/if_lagg.c#2 integrate .. //depot/projects/ppc-g5/sys/net/if_stf.c#2 integrate .. //depot/projects/ppc-g5/sys/net/if_tap.c#3 integrate .. //depot/projects/ppc-g5/sys/net/if_tun.c#2 integrate .. //depot/projects/ppc-g5/sys/net/route.c#3 integrate .. //depot/projects/ppc-g5/sys/net/route.h#3 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211.h#3 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_adhoc.c#2 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_crypto.c#2 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_crypto.h#2 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_ddb.c#3 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_freebsd.c#2 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_freebsd.h#3 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_hostap.c#2 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_ht.c#3 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_ht.h#3 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_ioctl.c#3 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_ioctl.h#3 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_node.c#3 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_node.h#3 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_output.c#2 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_scan_sta.c#2 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_sta.c#3 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_var.h#2 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_wds.c#2 integrate .. //depot/projects/ppc-g5/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#2 integrate .. //depot/projects/ppc-g5/sys/netgraph/netgraph.h#2 integrate .. //depot/projects/ppc-g5/sys/netgraph/ng_base.c#3 integrate .. //depot/projects/ppc-g5/sys/netgraph/ng_device.c#2 integrate .. //depot/projects/ppc-g5/sys/netgraph/ng_source.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/if_ether.c#3 integrate .. //depot/projects/ppc-g5/sys/netinet/in_rmx.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/in_var.h#2 integrate .. //depot/projects/ppc-g5/sys/netinet/ip.h#2 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_fw.h#3 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_fw2.c#3 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_input.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/tcp_input.c#3 integrate .. //depot/projects/ppc-g5/sys/netinet6/udp6_usrreq.c#3 integrate .. //depot/projects/ppc-g5/sys/netipx/ipx.c#2 integrate .. //depot/projects/ppc-g5/sys/netsmb/smb_dev.c#2 integrate .. //depot/projects/ppc-g5/sys/nfsclient/nfs_vnops.c#3 integrate .. //depot/projects/ppc-g5/sys/nfsserver/nfs.h#2 integrate .. //depot/projects/ppc-g5/sys/nfsserver/nfs_serv.c#3 integrate .. //depot/projects/ppc-g5/sys/nfsserver/nfs_srvsock.c#2 integrate .. //depot/projects/ppc-g5/sys/nfsserver/nfs_srvsubs.c#3 integrate .. //depot/projects/ppc-g5/sys/nfsserver/nfs_syscalls.c#2 integrate .. //depot/projects/ppc-g5/sys/pc98/cbus/gdc.c#2 integrate .. //depot/projects/ppc-g5/sys/pc98/cbus/olpt.c#2 integrate .. //depot/projects/ppc-g5/sys/powerpc/aim/clock.c#3 integrate .. //depot/projects/ppc-g5/sys/powerpc/aim/machdep.c#4 integrate .. //depot/projects/ppc-g5/sys/powerpc/aim/mmu_oea.c#4 integrate .. //depot/projects/ppc-g5/sys/powerpc/aim/mp_cpudep.c#2 integrate .. //depot/projects/ppc-g5/sys/powerpc/aim/swtch.S#2 integrate .. //depot/projects/ppc-g5/sys/powerpc/aim/trap_subr.S#3 integrate .. //depot/projects/ppc-g5/sys/powerpc/booke/machdep.c#3 integrate .. //depot/projects/ppc-g5/sys/powerpc/include/cpufunc.h#3 integrate .. //depot/projects/ppc-g5/sys/powerpc/include/dbdma.h#2 integrate .. //depot/projects/ppc-g5/sys/powerpc/include/md_var.h#3 integrate .. //depot/projects/ppc-g5/sys/powerpc/include/pmap.h#3 integrate .. //depot/projects/ppc-g5/sys/powerpc/include/pte.h#3 integrate .. //depot/projects/ppc-g5/sys/powerpc/include/smp.h#2 integrate .. //depot/projects/ppc-g5/sys/powerpc/include/spr.h#3 integrate .. //depot/projects/ppc-g5/sys/powerpc/ofw/ofw_syscons.c#2 integrate .. //depot/projects/ppc-g5/sys/powerpc/powermac/ata_dbdma.c#1 branch .. //depot/projects/ppc-g5/sys/powerpc/powermac/ata_dbdma.h#1 branch .. //depot/projects/ppc-g5/sys/powerpc/powermac/ata_kauai.c#3 integrate .. //depot/projects/ppc-g5/sys/powerpc/powermac/ata_macio.c#2 integrate .. //depot/projects/ppc-g5/sys/powerpc/powermac/dbdma.c#2 integrate .. //depot/projects/ppc-g5/sys/powerpc/powermac/dbdmavar.h#2 integrate .. //depot/projects/ppc-g5/sys/powerpc/powerpc/autoconf.c#2 integrate .. //depot/projects/ppc-g5/sys/powerpc/powerpc/cpu.c#3 integrate .. //depot/projects/ppc-g5/sys/powerpc/powerpc/elf_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/powerpc/powerpc/mem.c#2 integrate .. //depot/projects/ppc-g5/sys/powerpc/powerpc/mp_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/powerpc/powerpc/openpic.c#2 integrate .. //depot/projects/ppc-g5/sys/powerpc/powerpc/syncicache.c#3 integrate .. //depot/projects/ppc-g5/sys/security/audit/audit_pipe.c#2 integrate .. //depot/projects/ppc-g5/sys/security/mac_bsdextended/mac_bsdextended.c#3 integrate .. //depot/projects/ppc-g5/sys/sparc64/include/smp.h#3 integrate .. //depot/projects/ppc-g5/sys/sparc64/include/tick.h#3 integrate .. //depot/projects/ppc-g5/sys/sparc64/pci/psycho.c#2 integrate .. //depot/projects/ppc-g5/sys/sparc64/pci/psychoreg.h#2 integrate .. //depot/projects/ppc-g5/sys/sparc64/pci/schizo.c#1 branch .. //depot/projects/ppc-g5/sys/sparc64/pci/schizoreg.h#1 branch .. //depot/projects/ppc-g5/sys/sparc64/pci/schizovar.h#1 branch .. //depot/projects/ppc-g5/sys/sparc64/sparc64/elf_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/sparc64/sparc64/genassym.c#3 integrate .. //depot/projects/ppc-g5/sys/sparc64/sparc64/intr_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/sparc64/sparc64/mem.c#2 integrate .. //depot/projects/ppc-g5/sys/sparc64/sparc64/mp_machdep.c#3 integrate .. //depot/projects/ppc-g5/sys/sparc64/sparc64/tick.c#3 integrate .. //depot/projects/ppc-g5/sys/sys/clist.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/conf.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/interrupt.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/libkern.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/mount.h#3 integrate .. //depot/projects/ppc-g5/sys/sys/param.h#3 integrate .. //depot/projects/ppc-g5/sys/sys/pmc.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/pmckern.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/priv.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/proc.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/procfs.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/syscall.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/syscall.mk#2 integrate .. //depot/projects/ppc-g5/sys/sys/sysent.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/sysproto.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/systm.h#3 integrate .. //depot/projects/ppc-g5/sys/sys/tty.h#3 integrate .. //depot/projects/ppc-g5/sys/sys/ttydevsw.h#3 integrate .. //depot/projects/ppc-g5/sys/sys/ttydisc.h#3 integrate .. //depot/projects/ppc-g5/sys/sys/ttyhook.h#1 branch .. //depot/projects/ppc-g5/sys/sys/ttyqueue.h#3 integrate .. //depot/projects/ppc-g5/sys/sys/types.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/vnode.h#3 integrate .. //depot/projects/ppc-g5/sys/ufs/ffs/ffs_extern.h#3 integrate .. //depot/projects/ppc-g5/sys/ufs/ffs/ffs_inode.c#2 integrate .. //depot/projects/ppc-g5/sys/ufs/ffs/ffs_snapshot.c#3 integrate .. //depot/projects/ppc-g5/sys/ufs/ffs/ffs_softdep.c#3 integrate .. //depot/projects/ppc-g5/sys/ufs/ffs/ffs_vfsops.c#3 integrate .. //depot/projects/ppc-g5/sys/ufs/ufs/dirhash.h#2 integrate .. //depot/projects/ppc-g5/sys/ufs/ufs/inode.h#2 integrate .. //depot/projects/ppc-g5/sys/ufs/ufs/ufs_dirhash.c#2 integrate .. //depot/projects/ppc-g5/sys/ufs/ufs/ufs_inode.c#2 integrate .. //depot/projects/ppc-g5/sys/ufs/ufs/ufs_lookup.c#2 integrate .. //depot/projects/ppc-g5/sys/ufs/ufs/ufs_vnops.c#3 integrate .. //depot/projects/ppc-g5/sys/ufs/ufs/ufsmount.h#2 integrate .. //depot/projects/ppc-g5/sys/vm/device_pager.c#2 integrate .. //depot/projects/ppc-g5/sys/vm/vm_mmap.c#3 integrate .. //depot/projects/ppc-g5/sys/vm/vm_page.c#2 integrate .. //depot/projects/ppc-g5/sys/vm/vm_page.h#2 integrate .. //depot/projects/ppc-g5/sys/vm/vm_pageout.c#2 integrate .. //depot/projects/ppc-g5/sys/xen/evtchn/evtchn.c#2 integrate .. //depot/projects/ppc-g5/sys/xen/gnttab.c#2 integrate .. //depot/projects/ppc-g5/sys/xen/gnttab.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/arch-ia64.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/arch-powerpc.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/arch-x86/cpuid.h#1 branch .. //depot/projects/ppc-g5/sys/xen/interface/arch-x86/hvm/save.h#1 branch .. //depot/projects/ppc-g5/sys/xen/interface/arch-x86/xen-mca.h#1 branch .. //depot/projects/ppc-g5/sys/xen/interface/arch-x86/xen-x86_32.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/arch-x86/xen-x86_64.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/arch-x86/xen.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/callback.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/domctl.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/features.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/foreign/mkchecker.py#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/foreign/mkheader.py#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/foreign/structs.py#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/grant_table.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/hvm/hvm_op.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/hvm/ioreq.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/hvm/params.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/hvm/save.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/io/blkif.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/io/fbif.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/io/kbdif.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/io/netif.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/io/pciif.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/io/protocols.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/io/ring.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/io/xenbus.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/io/xs_wire.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/kexec.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/libelf.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/memory.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/physdev.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/platform.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/sysctl.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/trace.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/vcpu.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/xen-compat.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/xen.h#2 integrate .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_ACCT#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_AMD#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_APM#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_AT#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_BSNMP#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_CTM#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_FLOPPY#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_FREEBSD_UPDATE#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_IPFW#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_JAIL#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_LEGACY_CONSOLE#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_LOCATE#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_MAIL#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_MAKE#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_NDIS#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_NETGRAPH#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_NETGRAPH_SUPPORT#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_NTP#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_PKGTOOLS#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_PMC#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_PORTSNAP#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_PPP#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_QUOTAS#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_ROUTED#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_SLIP#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_SYSINSTALL#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_TELNET#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_TEXTPROC#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_WIRELESS#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_WIRELESS_SUPPORT#1 branch .. //depot/projects/ppc-g5/tools/tools/nanobsd/nanobsd.sh#3 integrate .. //depot/projects/ppc-g5/tools/tools/net80211/scripts/config#2 integrate .. //depot/projects/ppc-g5/usr.bin/Makefile#3 integrate .. //depot/projects/ppc-g5/usr.bin/ar/Makefile#2 integrate .. //depot/projects/ppc-g5/usr.bin/ar/acplex.l#1 branch .. //depot/projects/ppc-g5/usr.bin/ar/acpyacc.y#1 branch .. //depot/projects/ppc-g5/usr.bin/ar/ar.c#2 integrate .. //depot/projects/ppc-g5/usr.bin/ar/ar.h#2 integrate .. //depot/projects/ppc-g5/usr.bin/ar/write.c#2 integrate .. //depot/projects/ppc-g5/usr.bin/netstat/Makefile#2 integrate .. //depot/projects/ppc-g5/usr.bin/netstat/main.c#3 integrate .. //depot/projects/ppc-g5/usr.bin/netstat/netstat.h#3 integrate .. //depot/projects/ppc-g5/usr.bin/tar/config_freebsd.h#2 integrate .. //depot/projects/ppc-g5/usr.bin/tar/write.c#2 integrate .. //depot/projects/ppc-g5/usr.sbin/Makefile#2 integrate .. //depot/projects/ppc-g5/usr.sbin/pmcstat/pmcstat.8#2 integrate .. //depot/projects/ppc-g5/usr.sbin/pmcstat/pmcstat.c#2 integrate .. //depot/projects/ppc-g5/usr.sbin/portsnap/portsnap/portsnap.8#2 integrate .. //depot/projects/ppc-g5/usr.sbin/pstat/pstat.8#2 integrate .. //depot/projects/ppc-g5/usr.sbin/pstat/pstat.c#2 integrate .. //depot/projects/ppc-g5/usr.sbin/quot/quot.c#2 integrate .. //depot/projects/ppc-g5/usr.sbin/syslogd/syslogd.8#2 integrate .. //depot/projects/ppc-g5/usr.sbin/syslogd/syslogd.c#3 integrate .. //depot/projects/ppc-g5/usr.sbin/timed/timed/globals.h#2 integrate .. //depot/projects/ppc-g5/usr.sbin/ypbind/yp_ping.c#2 integrate Differences ... ==== //depot/projects/ppc-g5/Makefile.inc1#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.610 2008/08/19 14:23:26 jhb Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.611 2008/09/19 16:14:42 obrien Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -27,6 +27,10 @@ .include +.if ${MACHINE_ARCH} == "mips" +MK_RESCUE=no # not yet +.endif + # We must do share/info early so that installation of info `dir' # entries works correctly. Do it first since it is less likely to # grow dependencies on include and lib than vice versa. ==== //depot/projects/ppc-g5/ObsoleteFiles.inc#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.159 2008/09/13 17:29:49 antoine Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.162 2008/09/21 16:11:11 antoine 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,11 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20080917: removal of manpage for axed kernel primitive suser(9) +OLD_FILES+=usr/share/man/man9/suser.9.gz +OLD_FILES+=usr/share/man/man9/suser_cred.9.gz +# 20080913: pax removed from rescue +OLD_FILES+=rescue/pax # 20080823: removal of unneeded pt_chown, to implement grantpt(3) OLD_FILES+=usr/libexec/pt_chown # 20080822: ntp 4.2.4p5 import ==== //depot/projects/ppc-g5/UPDATING#3 (text+ko) ==== @@ -30,10 +30,10 @@ drivers have not yet been ported to the new TTY layer: PCI/ISA: - cy, digi, rc, rp, si, sio + cy, digi, rc, rp, sio USB: - ubser, ucycom, ufoma + ubser, ucycom Line disciplines: ng_h4, ng_tty, ppp, sl, snp @@ -1126,4 +1126,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.541 2008/09/03 08:30:17 roberto Exp $ +$FreeBSD: src/UPDATING,v 1.542 2008/09/14 19:25:57 ed Exp $ ==== //depot/projects/ppc-g5/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c#2 (text+ko) ==== @@ -306,7 +306,7 @@ case sizeof (double): return (dt_printf(dtp, fp, format, *((double *)addr) / n)); -#if !defined(__arm__) && !defined(__powerpc__) +#if !defined(__arm__) && !defined(__powerpc__) && !defined(__mips__) case sizeof (long double): return (dt_printf(dtp, fp, format, *((long double *)addr) / ldn)); ==== //depot/projects/ppc-g5/contrib/libpcap/pcap-bpf.c#2 (text+ko) ==== @@ -18,7 +18,7 @@ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $FreeBSD: src/contrib/libpcap/pcap-bpf.c,v 1.4 2007/10/16 02:07:55 mlaier Exp $ + * $FreeBSD: src/contrib/libpcap/pcap-bpf.c,v 1.5 2008/09/16 20:32:29 csjp Exp $ */ #ifndef lint static const char rcsid[] _U_ = @@ -30,6 +30,7 @@ #endif #include /* optionally get BSD define */ +#include #include #include #include @@ -86,6 +87,10 @@ #endif /* _AIX */ +#ifdef BIOCSETBUFMODE +#include +#endif + #include #include #include @@ -139,6 +144,159 @@ return (0); } +#ifdef BIOCGETBUFMODE +/* + * Zero-copy BPF buffer routines to check for and acknowledge BPF data in + * shared memory buffers. + * + * pcap_next_zbuf_shm(): Check for a newly available shared memory buffer, + * and set up p->buffer and cc to reflect one if available. Notice that if + * there was no prior buffer, we select zbuf1 as this will be the first + * buffer filled for a fresh BPF session. + */ +static int +pcap_next_zbuf_shm(pcap_t *p, int *cc) +{ + struct bpf_zbuf_header *bzh; + + if (p->zbuffer == p->zbuf2 || p->zbuffer == NULL) { + bzh = (struct bpf_zbuf_header *)p->zbuf1; + if (bzh->bzh_user_gen != + atomic_load_acq_int(&bzh->bzh_kernel_gen)) { + p->bzh = bzh; + p->zbuffer = (u_char *)p->zbuf1; + p->buffer = p->zbuffer + sizeof(*bzh); + *cc = bzh->bzh_kernel_len; + return (1); + } + } else if (p->zbuffer == p->zbuf1) { + bzh = (struct bpf_zbuf_header *)p->zbuf2; + if (bzh->bzh_user_gen != + atomic_load_acq_int(&bzh->bzh_kernel_gen)) { + p->bzh = bzh; + p->zbuffer = (u_char *)p->zbuf2; + p->buffer = p->zbuffer + sizeof(*bzh); + *cc = bzh->bzh_kernel_len; + return (1); + } + } + *cc = 0; + return (0); +} + +/* + * pcap_next_zbuf() -- Similar to pcap_next_zbuf_shm(), except wait using + * select() for data or a timeout, and possibly force rotation of the buffer + * in the event we time out or are in immediate mode. Invoke the shared + * memory check before doing system calls in order to avoid doing avoidable + * work. + */ +static int +pcap_next_zbuf(pcap_t *p, int *cc) +{ + struct bpf_zbuf bz; + struct timeval tv; + struct timespec cur; + fd_set r_set; + int data, r; + int tmout, expire; + +#define TSTOMILLI(ts) (((ts)->tv_sec * 1000) + ((ts)->tv_nsec / 1000000)) + /* + * Start out by seeing whether anything is waiting by checking the + * next shared memory buffer for data. + */ + data = pcap_next_zbuf_shm(p, cc); + if (data) + return (data); + /* + * If a previous sleep was interrupted due to signal delivery, make + * sure that the timeout gets adjusted accordingly. This requires + * that we analyze when the timeout should be been expired, and + * subtract the current time from that. If after this operation, + * our timeout is less then or equal to zero, handle it like a + * regular timeout. + */ + tmout = p->to_ms; + if (tmout) + (void) clock_gettime(CLOCK_MONOTONIC, &cur); + if (p->interrupted && p->to_ms) { + expire = TSTOMILLI(&p->firstsel) + p->to_ms; + tmout = expire - TSTOMILLI(&cur); +#undef TSTOMILLI + if (tmout <= 0) { + p->interrupted = 0; + data = pcap_next_zbuf_shm(p, cc); + if (data) + return (data); + if (ioctl(p->fd, BIOCROTZBUF, &bz) < 0) { + (void) snprintf(p->errbuf, PCAP_ERRBUF_SIZE, + "BIOCROTZBUF: %s", strerror(errno)); + return (-1); + } + return (pcap_next_zbuf_shm(p, cc)); + } + } + /* + * No data in the buffer, so must use select() to wait for data or + * the next timeout. + */ + FD_ZERO(&r_set); + FD_SET(p->fd, &r_set); + if (tmout != 0) { + tv.tv_sec = tmout / 1000; + tv.tv_usec = (tmout * 1000) % 1000000; + } + r = select(p->fd + 1, &r_set, NULL, NULL, p->to_ms != 0 ? &tv : + NULL); + if (r < 0 && errno == EINTR) { + if (!p->interrupted && p->to_ms) { + p->interrupted = 1; + p->firstsel = cur; + } + return (0); + } else if (r < 0) { + (void) snprintf(p->errbuf, PCAP_ERRBUF_SIZE, + "select: %s", strerror(errno)); + return (-1); + } + p->interrupted = 0; + /* + * Check again for data, which may exist now that we've either been + * woken up as a result of data or timed out. Try the "there's data" + * case first since it doesn't require a system call. + */ + data = pcap_next_zbuf_shm(p, cc); + if (data) + return (data); + + /* + * Try forcing a buffer rotation to dislodge timed out or immediate + * data. + */ + if (ioctl(p->fd, BIOCROTZBUF, &bz) < 0) { + (void) snprintf(p->errbuf, PCAP_ERRBUF_SIZE, + "BIOCROTZBUF: %s", strerror(errno)); + return (-1); + } + return (pcap_next_zbuf_shm(p, cc)); +} + +/* + * Notify kernel that we are done with the buffer. We don't reset zbuffer so + * that we know which buffer to use next time around. + */ +static int +pcap_ack_zbuf(pcap_t *p) +{ + + atomic_store_rel_int(&p->bzh->bzh_user_gen, p->bzh->bzh_kernel_gen); + p->bzh = NULL; + p->buffer = NULL; + return (0); +} +#endif + static int pcap_read_bpf(pcap_t *p, int cnt, pcap_handler callback, u_char *user) { @@ -147,6 +305,9 @@ register u_char *bp, *ep; u_char *datap; struct bpf_insn *fcode; +#ifdef BIOCSETBUFMODE + int i; +#endif #ifdef PCAP_FDDIPAD register int pad; #endif @@ -167,7 +328,27 @@ } cc = p->cc; if (p->cc == 0) { - cc = read(p->fd, (char *)p->buffer, p->bufsize); + /* + * When reading without zero-copy from a file descriptor, we + * use a single buffer and return a length of data in the + * buffer. With zero-copy, we update the p->buffer pointer + * to point at whatever underlying buffer contains the next + * data and update cc to reflect the data found in the + * buffer. + */ +#ifdef BIOCSETBUFMODE + if (p->zerocopy) { + if (p->buffer != NULL) + pcap_ack_zbuf(p); + i = pcap_next_zbuf(p, &cc); + if (i == 0) + goto again; + if (i < 0) + return (-1); + } else +#endif + cc = read(p->fd, (char *)p->buffer, p->bufsize); + if (cc < 0) { /* Don't choke when we get ptraced */ switch (errno) { @@ -609,6 +790,10 @@ struct bpf_insn total_insn; struct bpf_program total_prog; struct utsname osinfo; +#ifdef BIOCSETBUFMODE + struct bpf_zbuf bz; + u_int bufmode, zbufmax; +#endif #ifdef HAVE_DAG_API if (strstr(device, "dag")) { @@ -646,41 +831,105 @@ goto bad; } +#ifdef BIOCSETBUFMODE /* - * Try finding a good size for the buffer; 32768 may be too - * big, so keep cutting it in half until we find a size - * that works, or run out of sizes to try. If the default - * is larger, don't make it smaller. - * - * XXX - there should be a user-accessible hook to set the - * initial buffer size. + * If the BPF extension to set buffer mode is present, try setting + * the mode to zero-copy. If that fails, use regular buffering. If + * it succeeds but other setup fails, return an error to the user. */ - if ((ioctl(fd, BIOCGBLEN, (caddr_t)&v) < 0) || v < 32768) - v = 32768; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Sep 28 16:43:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5AC661065694; Sun, 28 Sep 2008 16:43:52 +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 1EE531065691 for ; Sun, 28 Sep 2008 16:43:52 +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 0BE958FC13 for ; Sun, 28 Sep 2008 16:43:52 +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 m8SGhqPD037052 for ; Sun, 28 Sep 2008 16:43:52 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8SGhpr8037046 for perforce@freebsd.org; Sun, 28 Sep 2008 16:43:51 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 28 Sep 2008 16:43:51 GMT Message-Id: <200809281643.m8SGhpr8037046@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 150607 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, 28 Sep 2008 16:43:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=150607 Change 150607 by rene@rene_self on 2008/09/28 16:43:27 Try to keep up with throdes' changes. - Add English versions of dtrace, filesystems, and updating chapters and their Makefiles. - MFen: handbook/Makefile 1.109 -> 1.110 handbook/book.sgml 1.172 -> 1.173 handbook/chapters.ent 1.37 -> 1.38 handbook/mirrors/chapter.sgml 1.448 -> 1.451 handbook/ports/chapter.sgml 1.282 -> 1.283 Checked build. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/Makefile#9 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/book.sgml#6 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/chapters.ent#6 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/dtrace/Makefile#1 add .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/dtrace/chapter.sgml#1 add .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/filesystems/Makefile#1 add .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/filesystems/chapter.sgml#1 add .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#6 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/ports/chapter.sgml#5 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/updating/Makefile#1 add .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/updating/chapter.sgml#1 add Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/Makefile#9 (text+ko) ==== @@ -3,7 +3,7 @@ # $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/Makefile,v 1.19 2006/01/03 21:17:07 siebrand Exp $ # # %SOURCE% en_US.ISO8859-1/books/handbook/Makefile -# %SRCID% 1.109 +# %SRCID% 1.110 # # Bouw het Nederlandse FreeBSD Handboek. # @@ -203,6 +203,7 @@ SRCS+= audit/chapter.sgml SRCS+= book.sgml SRCS+= colophon.sgml +SRCS+= dtrace/chapter.sgml SRCS+= freebsd-glossary.sgml SRCS+= advanced-networking/chapter.sgml SRCS+= basics/chapter.sgml @@ -214,6 +215,7 @@ SRCS+= disks/chapter.sgml SRCS+= eresources/chapter.sgml SRCS+= firewalls/chapter.sgml +SRCS+= filesystems/chapter.sgml SRCS+= geom/chapter.sgml SRCS+= install/chapter.sgml SRCS+= introduction/chapter.sgml @@ -233,6 +235,7 @@ SRCS+= printing/chapter.sgml SRCS+= security/chapter.sgml SRCS+= serialcomms/chapter.sgml +SRCS+= updating/chapter.sgml SRCS+= users/chapter.sgml SRCS+= vinum/chapter.sgml SRCS+= virtualization/chapter.sgml ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/book.sgml#6 (text+ko) ==== @@ -1,7 +1,10 @@ + + + %pgpkeys; ]> @@ -273,10 +279,12 @@ + + @@ -320,6 +328,7 @@ zetten. + ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/chapters.ent#6 (text+ko) ==== @@ -8,7 +8,9 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/chapters.ent,v 1.5 2008/05/21 20:33:28 remko Exp $ $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/chapters.ent,v 1.3 2004/10/21 16:57:00 siebrand Exp $ - gebaseerd op: 1.37 + + %SOURCE% en_US.ISO8859-1/books/handbook/chapters.ent + %SRCID% 1.38 --> @@ -37,12 +39,15 @@ + + + ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#6 (text+ko) ==== @@ -6,7 +6,7 @@ Vertaald door: Siebrand Mazeland %SOURCE% en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml - %SRCID% 1.448 + %SRCID% 1.451 --> @@ -2490,201 +2490,6 @@ - - Portsnap gebruiken - - - Introductie - - Portsnap is een systeem voor het - veilig distribueren van de &os; portsstructuur. Er wordt - ongeveer eens per uur een snapshot van de - portsstructuur gemaakt en dat wordt cryptografisch getekend. - De resulterende bestanden worden daarna gedistribueerd via - HTTP. - - Net als CVSup gebruikt - Portsnap een - pull-model voor het bijwerken: de - voorverpakte en getekende portsstructuren worden op een - webserver geplaatst die passief wacht op verzoeken om bestanden - door clients. Gebruikers dienen ofwel handmatig - &man.portsnap.8; te draaien om de updates op te halen ofwel een - taak in &man.cron.8; in te stellen om de updates regelmatig - automatisch op te laten halen. - - Om technische redenen werkt - Portsnap de portsstructuur in - /usr/ports/ niet direct - live bij. In plaats daarvan werkt het met een - gecomprimeerde kopie van de portsstructuur die standaard in - /var/db/portsnap/ staat. Deze - gecomprimeerde kopie wordt daarna gebruikt om de eigenlijke - portsstructuur bij te werken. - - - Als Portsnap is - geïnstalleerd uit de &os; Portscollectie, dan is de - standaardlocatie voor het gecomprimeerde snapshot - /usr/local/portsnap/ in plaats van - /var/db/portsnap/. - - - - - Installatie - - In &os; 6.0 en nieuwere versies, is - Portsnap onderdeel van het &os; - basissysteem. In oudere versies van &os; kan het - geïnstalleerd worden met de port ports-mgmt/portsnap. - - - - Portsnap instellen - - De werking van Portsnap wordt - bepaald door het instellingenbestand - /etc/portsnap.conf. Voor de meeste - gebruikers voldoen de standaard instellingen. Meer details - staan in de handleiding van &man.portsnap.conf.5;. - - - Als Portsnap is - geïnstalleerd uit de Portscollectie, dan wordt als - instellingenbestand - /usr/local/etc/portsnap.conf gebruikt in - plaats van - /etc/portsnap.conf. Dit - instellingenbestand wordt niet gemaakt als de port wordt - geïnstalleerd, maar er wordt een voorbeeldbestand - gedistribueerd. Voer het volgende commando uit om dit - bestand juist te plaatsen: - - &prompt.root; cd /usr/local/etc && cp portsnap.conf.sample portsnap.conf - - - - - <application>Portsnap</application> voor de eerste keer - draaien - - De eerste keer dat &man.portsnap.8; wordt gedraaid, moet - het een gecomprimeerde snapshot van de complete portsstructuur - downloaden naar /var/db/portsnap/ (of - /usr/local/portsnap/ als - Portsnap geïnstalleerd is uit - de Portscollectie). Aan het begin van 2006 was dit ongeveer - een download van 41 MB. - - &prompt.root; portsnap fetch - - Als het gecomprimeerde snapshot is gedownload, dan kan een - live kopie van de portsstructuur uitgepakt - worden naar /usr/ports/. Dit moet - gebeuren, zelfs als er al een portsstructuur bestaat in die map - (bijvoorbeeld door gebruik van - CVSup), omdat hiermee een - uitgangspunt wordt gemaakt dat portsnap - gebruikt om later te bepalen welke delen van de portsstructuur - bijgewerkt moeten worden. - - &prompt.root; portsnap extract - - - In de standaardinstallatie wordt /usr/ports niet aangemaakt. - Als gebruik gemaakt wordt van &os; 6.0-RELEASE moet - deze map gemaakt worden alvorens portsnap - te gebruiken. In recentere versies van &os; en - Portsnap wordt dit automatisch - gedaan wanneer portsnap voor het eerst - gebruikt wordt. - - - - - Portsstructuur bijwerken - - Nadat een eerste gecomprimeerd snapshot van de - portsstructuur is gedownload en uitgepakt in - /usr/ports/, bestaat het bijwerken van - de portsstructuur uit twee stappen: het ophalen van de - gecomprimeerde updates voor het snapshot - (fetch) en die gebruiken om de live - portsstructuur bij te werken (update). - Deze twee stappen kunnen door portsnap in - een enkel commando worden uitgevoerd: - - &prompt.root; portsnap fetch update - - - Sommige oudere versies van portsnap - ondersteunen deze syntaxis niet. Als het bovenstaande niet - werkt, probeer dan het volgende: - - &prompt.root; portsnap fetch -&prompt.root; portsnap update - - - - - Portsnap draaien vanuit cron - - Om het probleem dat hordes gebruikers inhameren op de - servers voor Portsnap te voorkomen, - draait portsnap fetch niet vanuit een - &man.cron.8;-opdracht. In plaats daarvan is het commando - portsnap cron beschikbaar, dat een - willekeurige periode wacht, tot 3600 seconden, voordat de - updates worden opgehaald. - - Daarnaast wordt het sterk aangeraden om - portsnap update niet vanuit de - cron te draaien, omdat er grote problemen te - verwachten zijn als dit commando op hetzelfde moment draait als - waarop een port wordt gebouwd of geïnstalleerd. Het is - wel veilig om de INDEX-bestanden voor de ports bij te werken en - dit kan gedaan worden door de vlag mee te - geven aan portsnap. Natuurlijk is het op - een later moment nodig om, als portsnap -I - update draait vanuit de cron, - portsnap update te draaien zonder de vlag - om de rest van de structuur bij te - werken. - - Door de volgende regel toe te voegen aan - /etc/crontab werkt - Portsnap zijn gecomprimeerde - snapshot bij, worden de INDEX-bestanden in - /usr/ports/ bijgewerkt en wordt er een - e-mail verzonden als er ports zijn die bijgewerkt moeten - worden: - - 0 3 * * * root portsnap -I cron update && pkg_version -vIL= - - - Als een systeemklok niet is ingesteld op de lokale - tijdzone, vervang 3 dan door een - willekeurige waarde tussen 0 en 23 om de belasting op de - servers voor Portsnap zo - evenwichtig mogelijk te verdelen. - - - - Sommige oudere versie van - portsnap bieden geen ondersteuning voor - het opgeven van meerdere commando's, zoals bijvoorbeeld - cron update, in dezelfde aanroep van - portsnap. Als de regel hierboven faalt, - probeer portsnap -I cron update dan te - vervangen door portsnap cron && portsnap -I - update. - - - - CVS labels ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/ports/chapter.sgml#5 (text+ko) ==== @@ -5,7 +5,7 @@ $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/ports/chapter.sgml,v 1.29 2006/08/12 22:53:16 remko Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/ports/chapter.sgml - %SRCID% 1.282 + %SRCID% 1.283 --> @@ -770,9 +770,9 @@ &prompt.root; pkg_add -r portsnap - In Portsnap gebruiken - staat een gedetailleerde beschrijving van alle mogelijkheden - van Portsnap. + In Portsnap + gebruiken staat een gedetailleerde beschrijving van + alle mogelijkheden van Portsnap. Sinds &os;- 6.1-RELEASE en met recente versies van From owner-p4-projects@FreeBSD.ORG Sun Sep 28 18:23:34 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0B0B91065688; Sun, 28 Sep 2008 18:23: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 B37FA1065678 for ; Sun, 28 Sep 2008 18:23:33 +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 880D28FC1A for ; Sun, 28 Sep 2008 18:23:33 +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 m8SINXgW058420 for ; Sun, 28 Sep 2008 18:23:33 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8SINXjQ058414 for perforce@freebsd.org; Sun, 28 Sep 2008 18:23:33 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 28 Sep 2008 18:23:33 GMT Message-Id: <200809281823.m8SINXjQ058414@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 150610 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, 28 Sep 2008 18:23:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=150610 Change 150610 by hselasky@hselasky_laptop001 on 2008/09/28 18:22:47 Initial commit of usbconfig. Affected files ... .. //depot/projects/usb/src/usr.sbin/usbconfig/Makefile#1 add .. //depot/projects/usb/src/usr.sbin/usbconfig/dump.c#1 add .. //depot/projects/usb/src/usr.sbin/usbconfig/dump.h#1 add .. //depot/projects/usb/src/usr.sbin/usbconfig/main.c#1 add .. //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.8#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Sep 28 18:24:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 28C2F106568F; Sun, 28 Sep 2008 18:24: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 DB954106568A for ; Sun, 28 Sep 2008 18:24:34 +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 B03438FC0A for ; Sun, 28 Sep 2008 18:24:34 +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 m8SIOYXF067170 for ; Sun, 28 Sep 2008 18:24:34 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8SIOY2J067168 for perforce@freebsd.org; Sun, 28 Sep 2008 18:24:34 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 28 Sep 2008 18:24:34 GMT Message-Id: <200809281824.m8SIOY2J067168@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 150611 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, 28 Sep 2008 18:24:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=150611 Change 150611 by hselasky@hselasky_laptop001 on 2008/09/28 18:24:20 The usbdevs utility has been superceeded by usbconfig. Affected files ... .. //depot/projects/usb/src/usr.sbin/usbdevs/Makefile#2 delete .. //depot/projects/usb/src/usr.sbin/usbdevs/usbdevs.8#2 delete .. //depot/projects/usb/src/usr.sbin/usbdevs/usbdevs.c#3 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sun Sep 28 18:46:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2A3C21065696; Sun, 28 Sep 2008 18:46:58 +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 E1B0D10656A0 for ; Sun, 28 Sep 2008 18:46:57 +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 CFB518FC20 for ; Sun, 28 Sep 2008 18:46:57 +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 m8SIkvwV007043 for ; Sun, 28 Sep 2008 18:46:57 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8SIkv94007033 for perforce@freebsd.org; Sun, 28 Sep 2008 18:46:57 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 28 Sep 2008 18:46:57 GMT Message-Id: <200809281846.m8SIkv94007033@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 150613 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, 28 Sep 2008 18:46:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=150613 Change 150613 by hselasky@hselasky_laptop001 on 2008/09/28 18:46:55 Add initial version of libusb20. Affected files ... .. //depot/projects/usb/src/lib/libusb20/Makefile#1 add .. //depot/projects/usb/src/lib/libusb20/libusb20.3#1 add .. //depot/projects/usb/src/lib/libusb20/libusb20.c#1 add .. //depot/projects/usb/src/lib/libusb20/libusb20.h#1 add .. //depot/projects/usb/src/lib/libusb20/libusb20_desc.c#1 add .. //depot/projects/usb/src/lib/libusb20/libusb20_desc.h#1 add .. //depot/projects/usb/src/lib/libusb20/libusb20_int.h#1 add .. //depot/projects/usb/src/lib/libusb20/libusb20_ugen20.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Sep 28 18:50:02 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C29411065695; Sun, 28 Sep 2008 18:50: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 876DB106568D for ; Sun, 28 Sep 2008 18:50:01 +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 7515C8FC14 for ; Sun, 28 Sep 2008 18:50:01 +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 m8SIo07P015376 for ; Sun, 28 Sep 2008 18:50:00 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8SIo0Ye015374 for perforce@freebsd.org; Sun, 28 Sep 2008 18:50:00 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 28 Sep 2008 18:50:00 GMT Message-Id: <200809281850.m8SIo0Ye015374@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 150614 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, 28 Sep 2008 18:50:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=150614 Change 150614 by hselasky@hselasky_laptop001 on 2008/09/28 18:49:30 Add empty FreeBSD RCS tags. Affected files ... .. //depot/projects/usb/src/lib/libusb20/libusb20.c#2 edit .. //depot/projects/usb/src/lib/libusb20/libusb20.h#2 edit .. //depot/projects/usb/src/lib/libusb20/libusb20_desc.c#2 edit .. //depot/projects/usb/src/lib/libusb20/libusb20_desc.h#2 edit .. //depot/projects/usb/src/lib/libusb20/libusb20_int.h#2 edit .. //depot/projects/usb/src/lib/libusb20/libusb20_ugen20.c#2 edit .. //depot/projects/usb/src/usr.sbin/usbconfig/dump.c#2 edit .. //depot/projects/usb/src/usr.sbin/usbconfig/dump.h#2 edit .. //depot/projects/usb/src/usr.sbin/usbconfig/main.c#2 edit Differences ... ==== //depot/projects/usb/src/lib/libusb20/libusb20.c#2 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/lib/libusb20/libusb20.h#2 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * Copyright (c) 2007-2008 Daniel Drake. All rights reserved. ==== //depot/projects/usb/src/lib/libusb20/libusb20_desc.c#2 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/lib/libusb20/libusb20_desc.h#2 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * Copyright (c) 2007-2008 Daniel Drake. All rights reserved. ==== //depot/projects/usb/src/lib/libusb20/libusb20_int.h#2 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/lib/libusb20/libusb20_ugen20.c#2 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/usr.sbin/usbconfig/dump.c#2 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/usr.sbin/usbconfig/dump.h#2 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/usr.sbin/usbconfig/main.c#2 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * From owner-p4-projects@FreeBSD.ORG Sun Sep 28 19:03:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2D69B10656AD; Sun, 28 Sep 2008 19:03:15 +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 E23AF1065695 for ; Sun, 28 Sep 2008 19:03:14 +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 B737C8FC0C for ; Sun, 28 Sep 2008 19:03:14 +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 m8SJ3Etm001628 for ; Sun, 28 Sep 2008 19:03:14 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8SJ3Em8001621 for perforce@freebsd.org; Sun, 28 Sep 2008 19:03:14 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 28 Sep 2008 19:03:14 GMT Message-Id: <200809281903.m8SJ3Em8001621@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 150616 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, 28 Sep 2008 19:03:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=150616 Change 150616 by hselasky@hselasky_laptop001 on 2008/09/28 19:03:11 Use correct base name for main C-file. Affected files ... .. //depot/projects/usb/src/usr.sbin/usbconfig/Makefile#2 edit .. //depot/projects/usb/src/usr.sbin/usbconfig/main.c#3 delete .. //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.c#1 branch Differences ... ==== //depot/projects/usb/src/usr.sbin/usbconfig/Makefile#2 (text+ko) ==== @@ -3,7 +3,7 @@ # PROG= usbconfig MAN= usbconfig.8 -SRCS= main.c dump.c +SRCS= usbconfig.c dump.c LDADD+= -lusb20 .include From owner-p4-projects@FreeBSD.ORG Sun Sep 28 19:08:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ECE5C106568F; Sun, 28 Sep 2008 19:08:24 +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 B0D441065689 for ; Sun, 28 Sep 2008 19:08:24 +0000 (UTC) (envelope-from thompsa@FreeBSD.org) Received: from pele.citylink.co.nz (pele.citylink.co.nz [202.8.44.226]) by mx1.freebsd.org (Postfix) with ESMTP id 7661E8FC12 for ; Sun, 28 Sep 2008 19:08:24 +0000 (UTC) (envelope-from thompsa@FreeBSD.org) Received: from localhost (localhost [127.0.0.1]) by pele.citylink.co.nz (Postfix) with ESMTP id 3D4CE2BC7C; Mon, 29 Sep 2008 07:41:46 +1300 (NZDT) X-Virus-Scanned: Debian amavisd-new at citylink.co.nz Received: from pele.citylink.co.nz ([127.0.0.1]) by localhost (pele.citylink.co.nz [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id plfXn+R984lW; Mon, 29 Sep 2008 07:41:42 +1300 (NZDT) Received: from citylink.fud.org.nz (unknown [202.8.44.45]) by pele.citylink.co.nz (Postfix) with ESMTP; Mon, 29 Sep 2008 07:41:42 +1300 (NZDT) Received: by citylink.fud.org.nz (Postfix, from userid 1001) id 4F9421142C; Mon, 29 Sep 2008 07:41:42 +1300 (NZDT) Date: Sun, 28 Sep 2008 11:41:42 -0700 From: Andrew Thompson To: Hans Petter Selasky Message-ID: <20080928184142.GA92149@citylink.fud.org.nz> References: <200809281823.m8SINXjQ058414@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200809281823.m8SINXjQ058414@repoman.freebsd.org> User-Agent: Mutt/1.5.17 (2007-11-01) Cc: Perforce Change Reviews Subject: Re: PERFORCE change 150610 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, 28 Sep 2008 19:08:25 -0000 On Sun, Sep 28, 2008 at 06:23:33PM +0000, Hans Petter Selasky wrote: > http://perforce.freebsd.org/chv.cgi?CH=150610 > > Change 150610 by hselasky@hselasky_laptop001 on 2008/09/28 18:22:47 > > > Initial commit of usbconfig. Yay. > Affected files ... > > .. //depot/projects/usb/src/usr.sbin/usbconfig/Makefile#1 add > .. //depot/projects/usb/src/usr.sbin/usbconfig/dump.c#1 add > .. //depot/projects/usb/src/usr.sbin/usbconfig/dump.h#1 add > .. //depot/projects/usb/src/usr.sbin/usbconfig/main.c#1 add The convention is that this will be named usbconfig.c > .. //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.8#1 add > > Differences ... From owner-p4-projects@FreeBSD.ORG Sun Sep 28 19:23:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 434CE1065693; Sun, 28 Sep 2008 19:23: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 EFC34106568D for ; Sun, 28 Sep 2008 19:23: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 DDDA28FC1E for ; Sun, 28 Sep 2008 19:23: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 m8SJNZMh037633 for ; Sun, 28 Sep 2008 19:23:35 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8SJNZ9i037627 for perforce@freebsd.org; Sun, 28 Sep 2008 19:23:35 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 28 Sep 2008 19:23:35 GMT Message-Id: <200809281923.m8SJNZ9i037627@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 150618 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, 28 Sep 2008 19:23:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=150618 Change 150618 by hselasky@hselasky_laptop001 on 2008/09/28 19:23:13 First step adding support for super speed USB (4.8Gbps) Affected files ... .. //depot/projects/usb/src/lib/libusb20/libusb20.h#3 edit .. //depot/projects/usb/src/lib/libusb20/libusb20_ugen20.c#3 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_revision.h#4 edit .. //depot/projects/usb/src/usr.sbin/usbconfig/dump.c#3 edit Differences ... ==== //depot/projects/usb/src/lib/libusb20/libusb20.h#3 (text+ko) ==== @@ -160,6 +160,7 @@ LIBUSB20_SPEED_FULL, LIBUSB20_SPEED_HIGH, LIBUSB20_SPEED_VARIABLE, + LIBUSB20_SPEED_SUPER, }; /** \ingroup misc ==== //depot/projects/usb/src/lib/libusb20/libusb20_ugen20.c#3 (text+ko) ==== @@ -199,6 +199,9 @@ case USB_SPEED_VARIABLE: pdev->usb_speed = LIBUSB20_SPEED_VARIABLE; break; + case USB_SPEED_SUPER: + pdev->usb_speed = LIBUSB20_SPEED_SUPER; + break; default: pdev->usb_speed = LIBUSB20_SPEED_UNKNOWN; break; ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_revision.h#4 (text+ko) ==== @@ -37,6 +37,7 @@ m(n, USB_SPEED_LOW)\ m(n, USB_SPEED_FULL)\ m(n, USB_SPEED_HIGH)\ +m(n, USB_SPEED_SUPER)\ USB_MAKE_ENUM(USB_SPEED); ==== //depot/projects/usb/src/usr.sbin/usbconfig/dump.c#3 (text+ko) ==== @@ -63,7 +63,9 @@ case LIBUSB20_SPEED_HIGH: return ("HIGH (480Mbps)"); case LIBUSB20_SPEED_VARIABLE: - return ("VARIABLE"); + return ("VARIABLE (52-480Mbps)"); + case LIBUSB20_SPEED_SUPER: + return ("SUPER (4.8Gbps)"); default: break; } From owner-p4-projects@FreeBSD.ORG Sun Sep 28 19:52:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7DE511065694; Sun, 28 Sep 2008 19:52:05 +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 40DAD106568B for ; Sun, 28 Sep 2008 19:52:05 +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 2F3698FC1D for ; Sun, 28 Sep 2008 19:52:05 +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 m8SJq5EC009570 for ; Sun, 28 Sep 2008 19:52:05 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8SJq5WV009563 for perforce@freebsd.org; Sun, 28 Sep 2008 19:52:05 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 28 Sep 2008 19:52:05 GMT Message-Id: <200809281952.m8SJq5WV009563@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 150621 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, 28 Sep 2008 19:52:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=150621 Change 150621 by hselasky@hselasky_laptop001 on 2008/09/28 19:51:37 Revert some changes to "subr_bus.c" . Affected files ... .. //depot/projects/usb/src/sys/kern/subr_bus.c#13 integrate Differences ... ==== //depot/projects/usb/src/sys/kern/subr_bus.c#13 (text+ko) ==== @@ -1879,8 +1879,7 @@ int device_get_children(device_t dev, device_t **devlistp, int *devcountp) { - uint32_t count; - uint32_t n; + int count; device_t child; device_t *list; @@ -1889,34 +1888,14 @@ count++; } - if (count == 0) { - /* avoid zero size allocation */ - n = 1 * sizeof(device_t); - } else { - n = count * sizeof(device_t); - } - - list = malloc(n, M_TEMP, M_NOWAIT|M_ZERO); - if (!list) { - *devlistp = NULL; - *devcountp = 0; + list = malloc(count * sizeof(device_t), M_TEMP, M_NOWAIT|M_ZERO); + if (!list) return (ENOMEM); - } - n = 0; + count = 0; TAILQ_FOREACH(child, &dev->children, link) { - if (n < count) { - list[n] = child; - } - n++; - } - - if (n != count) { - printf("device_get_children: Number of devices changed " - "from %d to %d!\n", count, n); - if (n < count) { - count = n; - } + list[count] = child; + count++; } *devlistp = list; From owner-p4-projects@FreeBSD.ORG Mon Sep 29 02:53:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 108BA1065689; Mon, 29 Sep 2008 02:53:15 +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 C8AD11065686 for ; Mon, 29 Sep 2008 02:53:14 +0000 (UTC) (envelope-from rfrench@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B6AFC8FC12 for ; Mon, 29 Sep 2008 02:53:14 +0000 (UTC) (envelope-from rfrench@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 m8T2rE67016671 for ; Mon, 29 Sep 2008 02:53:14 GMT (envelope-from rfrench@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8T2rErw016669 for perforce@freebsd.org; Mon, 29 Sep 2008 02:53:14 GMT (envelope-from rfrench@FreeBSD.org) Date: Mon, 29 Sep 2008 02:53:14 GMT Message-Id: <200809290253.m8T2rErw016669@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rfrench@FreeBSD.org using -f From: Ryan French To: Perforce Change Reviews Cc: Subject: PERFORCE change 150638 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, 29 Sep 2008 02:53:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=150638 Change 150638 by rfrench@rfrench_mpls on 2008/09/29 02:52:48 Made some changed to mpls-needle for debugging to check that the correctethertype was being assigned to the packet. Affected files ... .. //depot/projects/soc2008/rfrench_mpls/mpls-needle/mpls-needle.c#6 edit Differences ... ==== //depot/projects/soc2008/rfrench_mpls/mpls-needle/mpls-needle.c#6 (text+ko) ==== @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -366,32 +367,34 @@ /* * The following lines are used during debugging to check the values extracted from the * config file are correct. Uncomment these when debugging. - * printf("\nbuilt packets values\n"); - * - * printf("dst_mac = %s\n", ether_ntoa(&dst_mac)); - * printf("src_mac = %s\n", ether_ntoa(&src_mac)); + */ + printf("\nbuilt packets values\n"); + + printf("dst_mac = %s\n", ether_ntoa(&dst_mac)); + printf("src_mac = %s\n", ether_ntoa(&src_mac)); + printf("ethertype = %x\n", ntohs(eth->ether_type)); + + printf("ip_hl = %d\n", iph->ip_hl); + printf("ip_v = %d\n", iph->ip_v); + printf("ip_tos = %d\n", iph->ip_tos); + printf("ip_len = %d\n", iph->ip_len); + printf("ip_id = %d\n", iph->ip_id); + printf("ip_off = %d\n", iph->ip_off); + printf("ip_ttl = %d\n", iph->ip_ttl); + printf("ip_p = %d\n", iph->ip_p); + printf("ip_sum = %d\n", iph->ip_sum); + printf("ip_src = %s\n", inet_ntoa(iph->ip_src)); + printf("ip_dst = %s\n", inet_ntoa(iph->ip_dst)); + + printf("icmp_type = %d\n", icmph->icmp_type); + printf("icmp_code = %d\n", icmph->icmp_code); + printf("icmp_cksum = %d\n", icmph->icmp_cksum); - * printf("ip_hl = %d\n", iph->ip_hl); - * printf("ip_v = %d\n", iph->ip_v); - * printf("ip_tos = %d\n", iph->ip_tos); - * printf("ip_len = %d\n", iph->ip_len); - * printf("ip_id = %d\n", iph->ip_id); - * printf("ip_off = %d\n", iph->ip_off); - * printf("ip_ttl = %d\n", iph->ip_ttl); - * printf("ip_p = %d\n", iph->ip_p); - * printf("ip_sum = %d\n", iph->ip_sum); - * printf("ip_src = %s\n", inet_ntoa(iph->ip_src)); - * printf("ip_dst = %s\n", inet_ntoa(iph->ip_dst)); - * - * printf("icmp_type = %d\n", icmph->icmp_type); - * printf("icmp_code = %d\n", icmph->icmp_code); - * printf("icmp_cksum = %d\n", icmph->icmp_cksum); - * - * printf("mpls_label = %d\n", mpls_label); - * printf("mpls_qos = %d\n", mpls_qos); - * printf("mpls_bos_flag = %d\n", mpls_bos_flag); - * printf("mpls_ttl = %d\n", mpls_ttl); - */ + printf("mpls_label = %d\n", mpls_label); + printf("mpls_qos = %d\n", mpls_qos); + printf("mpls_bos_flag = %d\n", mpls_bos_flag); + printf("mpls_ttl = %d\n", mpls_ttl); + return 0; } From owner-p4-projects@FreeBSD.ORG Mon Sep 29 02:54:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 39C24106568E; Mon, 29 Sep 2008 02:54: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 F2504106568B for ; Mon, 29 Sep 2008 02:54:15 +0000 (UTC) (envelope-from rfrench@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E0BCC8FC17 for ; Mon, 29 Sep 2008 02:54:15 +0000 (UTC) (envelope-from rfrench@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 m8T2sFvr024539 for ; Mon, 29 Sep 2008 02:54:15 GMT (envelope-from rfrench@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8T2sFmh024533 for perforce@freebsd.org; Mon, 29 Sep 2008 02:54:15 GMT (envelope-from rfrench@FreeBSD.org) Date: Mon, 29 Sep 2008 02:54:15 GMT Message-Id: <200809290254.m8T2sFmh024533@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rfrench@FreeBSD.org using -f From: Ryan French To: Perforce Change Reviews Cc: Subject: PERFORCE change 150639 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, 29 Sep 2008 02:54:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=150639 Change 150639 by rfrench@rfrench_mpls on 2008/09/29 02:53:32 Changed during testing. Not really that important. Affected files ... .. //depot/projects/soc2008/rfrench_mpls/mpls-needle/mpls-needle.conf#4 edit Differences ... ==== //depot/projects/soc2008/rfrench_mpls/mpls-needle/mpls-needle.conf#4 (text+ko) ==== @@ -1,3 +1,3 @@ -dst_mac 00:16:d3:fc:c0:b8 ip4 10.1.60.134/10.1.60.123/2/0 icmp 8/0 mpls 55/1/1/3 -dst_mac 00:16:d3:fc:c0:b8 ip4 10.1.60.134/10.1.60.123/2/0 icmp 8/0 mpls 44/1/1/3 -dst_mac 00:16:d3:fc:c0:b8 ip4 10.1.60.134/10.1.60.123/2/0 icmp 8/0 mpls 66/1/1/3 +dst_mac 00:0c:29:d7:3b:c5 ip4 10.1.18.191/10.1.18.149/2/0 icmp 8/0 mpls 55/1/1/3 +dst_mac 00:0c:29:d7:3b:c5 ip4 10.1.18.191/10.1.18.149/2/0 icmp 8/0 mpls 44/1/1/3 +dst_mac 00:0c:29:d7:3b:c5 ip4 10.1.18.191/10.1.18.149/2/0 icmp 8/0 mpls 66/1/1/3 From owner-p4-projects@FreeBSD.ORG Mon Sep 29 03:01:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9AAC61065698; Mon, 29 Sep 2008 03:01:23 +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 51A851065693 for ; Mon, 29 Sep 2008 03:01:23 +0000 (UTC) (envelope-from rfrench@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3F3AD8FC21 for ; Mon, 29 Sep 2008 03:01:23 +0000 (UTC) (envelope-from rfrench@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 m8T31Nvu059619 for ; Mon, 29 Sep 2008 03:01:23 GMT (envelope-from rfrench@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8T31NHH059617 for perforce@freebsd.org; Mon, 29 Sep 2008 03:01:23 GMT (envelope-from rfrench@FreeBSD.org) Date: Mon, 29 Sep 2008 03:01:23 GMT Message-Id: <200809290301.m8T31NHH059617@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rfrench@FreeBSD.org using -f From: Ryan French To: Perforce Change Reviews Cc: Subject: PERFORCE change 150640 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, 29 Sep 2008 03:01:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=150640 Change 150640 by rfrench@rfrench_mpls on 2008/09/29 03:00:37 MPLS protocol is now being registered properly with netisr. Unfortunately when an MPLS packet is received a page fault occurs. I believe this is happeneing somewhere between netisr_dispatch and the mpls_input functions being called due to the debug statements I have in there. Hopefully I can get that figured out tomorrow. Affected files ... .. //depot/projects/soc2008/rfrench_mpls/net/if_ethersubr.c#8 edit .. //depot/projects/soc2008/rfrench_mpls/net/netisr.h#4 edit .. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_input.c#6 edit .. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_proto.c#6 edit Differences ... ==== //depot/projects/soc2008/rfrench_mpls/net/if_ethersubr.c#8 (text+ko) ==== @@ -37,6 +37,7 @@ #include "opt_mac.h" #include "opt_netgraph.h" #include "opt_carp.h" +#include "opt_mpls.h" #include #include @@ -99,7 +100,7 @@ #ifdef MPLS #include -#endif /* MPLS */ +#endif /*MPLS*/ #include @@ -832,11 +833,12 @@ // } /* XXX handling for simplex devices in case of M/BCAST ?? */ if (m->m_flags && (M_BCAST | M_MCAST)) - isr = NETISR_MPLS_MCAST; +// isr = NETISR_MPLS_MCAST; + isr = NETISR_MPLS; else isr = NETISR_MPLS; break; -#endif /* MPLS */ +#endif default: #ifdef IPX if (ef_inputp && ef_inputp(ifp, eh, m) == 0) ==== //depot/projects/soc2008/rfrench_mpls/net/netisr.h#4 (text+ko) ==== @@ -51,7 +51,7 @@ #define NETISR_POLL 0 /* polling callback, must be first */ #define NETISR_IP 2 /* same as AF_INET */ #define NETISR_MPLS 4 /* mpls packet */ -#define NETISR_MPLS_MCAST /* mpls multicase packet */ +#define NETISR_MPLS_MCAST 5 /* mpls multicast packet */ #define NETISR_ROUTE 14 /* routing socket */ #define NETISR_AARP 15 /* Appletalk ARP */ #define NETISR_ATALK2 16 /* Appletalk phase 2 */ ==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_input.c#6 (text+ko) ==== @@ -43,7 +43,9 @@ { mplsintrq.ifq_maxlen = mplsqmaxlen; netisr_register(NETISR_MPLS, mpls_input, &mplsintrq, 0); - printf("mpls initialised"); +#ifdef MPLS_DEBUG + printf("mpls initialised\n"); +#endif } void @@ -78,6 +80,10 @@ u_int32_t ttl; int i, hasbos; +#ifdef MPLS_DEBUG + printf("entering mpls_input\n"); +#endif + if (!mpls_enable) { m_freem(m); return; ==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_proto.c#6 (text+ko) ==== @@ -82,3 +82,5 @@ offsetof(struct sockaddr_mpls, smpls_in_ifindex) << 3, sizeof(struct sockaddr_mpls) }; + +DOMAIN_SET(mpls); From owner-p4-projects@FreeBSD.ORG Mon Sep 29 10:16:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CB18D1065690; Mon, 29 Sep 2008 10:16: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 74838106569E for ; Mon, 29 Sep 2008 10:16:46 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 631AC8FC0A for ; Mon, 29 Sep 2008 10:16:46 +0000 (UTC) (envelope-from ed@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 m8TAGkEc061724 for ; Mon, 29 Sep 2008 10:16:46 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8TAGken061722 for perforce@freebsd.org; Mon, 29 Sep 2008 10:16:46 GMT (envelope-from ed@FreeBSD.org) Date: Mon, 29 Sep 2008 10:16:46 GMT Message-Id: <200809291016.m8TAGken061722@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 150646 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, 29 Sep 2008 10:16:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=150646 Change 150646 by ed@ed_dull on 2008/09/29 10:16:25 IFC. Affected files ... .. //depot/projects/mpsafetty/ObsoleteFiles.inc#14 integrate .. //depot/projects/mpsafetty/bin/pkill/pkill.1#2 integrate .. //depot/projects/mpsafetty/bin/pkill/pkill.c#2 integrate .. //depot/projects/mpsafetty/gnu/lib/csu/Makefile#3 integrate .. //depot/projects/mpsafetty/gnu/usr.bin/gdb/kgdb/trgt_i386.c#2 integrate .. //depot/projects/mpsafetty/sbin/ipfw/ipfw.8#5 integrate .. //depot/projects/mpsafetty/sbin/ipfw/ipfw2.c#5 integrate .. //depot/projects/mpsafetty/sbin/setkey/setkey.8#2 integrate .. //depot/projects/mpsafetty/share/examples/drivers/make_pseudo_driver.sh#3 integrate .. //depot/projects/mpsafetty/share/man/man3/Makefile#2 integrate .. //depot/projects/mpsafetty/share/man/man3/makedev.3#1 branch .. //depot/projects/mpsafetty/share/man/man9/Makefile#8 integrate .. //depot/projects/mpsafetty/share/man/man9/device_ids.9#2 delete .. //depot/projects/mpsafetty/share/man/man9/make_dev.9#4 integrate .. //depot/projects/mpsafetty/share/man/man9/spl.9#2 integrate .. //depot/projects/mpsafetty/sys/amd64/amd64/mp_machdep.c#4 integrate .. //depot/projects/mpsafetty/sys/amd64/include/smp.h#2 integrate .. //depot/projects/mpsafetty/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/mpsafetty/sys/arm/at91/at91_mci.c#3 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#4 integrate .. //depot/projects/mpsafetty/sys/conf/files.powerpc#3 integrate .. //depot/projects/mpsafetty/sys/conf/files.sparc64#5 integrate .. //depot/projects/mpsafetty/sys/conf/options.sparc64#4 integrate .. //depot/projects/mpsafetty/sys/dev/cfe/cfe_console.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/mmc/mmc.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/mmc/mmcbrvar.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/mmc/mmcreg.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/mmc/mmcsd.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/mmc/mmcvar.h#2 integrate .. //depot/projects/mpsafetty/sys/geom/part/g_part.c#4 integrate .. //depot/projects/mpsafetty/sys/geom/part/g_part_bsd.c#2 integrate .. //depot/projects/mpsafetty/sys/geom/part/g_part_pc98.c#2 integrate .. //depot/projects/mpsafetty/sys/i386/i386/db_trace.c#2 integrate .. //depot/projects/mpsafetty/sys/i386/i386/mp_machdep.c#3 integrate .. //depot/projects/mpsafetty/sys/i386/include/smp.h#3 integrate .. //depot/projects/mpsafetty/sys/i386/xen/mp_machdep.c#4 integrate .. //depot/projects/mpsafetty/sys/ia64/ia64/interrupt.c#2 integrate .. //depot/projects/mpsafetty/sys/ia64/ia64/mp_machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/ia64/ia64/sal.c#3 integrate .. //depot/projects/mpsafetty/sys/ia64/include/smp.h#2 integrate .. //depot/projects/mpsafetty/sys/kern/kern_conf.c#8 integrate .. //depot/projects/mpsafetty/sys/kern/kern_shutdown.c#2 integrate .. //depot/projects/mpsafetty/sys/mips/adm5120/if_admsw.c#3 integrate .. //depot/projects/mpsafetty/sys/mips/include/param.h#2 integrate .. //depot/projects/mpsafetty/sys/mips/include/smp.h#2 integrate .. //depot/projects/mpsafetty/sys/mips/mips/mp_machdep.c#3 integrate .. //depot/projects/mpsafetty/sys/mips/mips/pmap.c#2 integrate .. //depot/projects/mpsafetty/sys/mips/mips/trap.c#2 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_scan_sta.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_fw2.c#9 integrate .. //depot/projects/mpsafetty/sys/powerpc/include/dbdma.h#3 integrate .. //depot/projects/mpsafetty/sys/powerpc/include/smp.h#3 integrate .. //depot/projects/mpsafetty/sys/powerpc/powermac/ata_dbdma.c#1 branch .. //depot/projects/mpsafetty/sys/powerpc/powermac/ata_dbdma.h#1 branch .. //depot/projects/mpsafetty/sys/powerpc/powermac/ata_kauai.c#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/powermac/ata_macio.c#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/powermac/dbdma.c#3 integrate .. //depot/projects/mpsafetty/sys/powerpc/powerpc/cpu.c#4 integrate .. //depot/projects/mpsafetty/sys/powerpc/powerpc/intr_machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/powerpc/mp_machdep.c#3 integrate .. //depot/projects/mpsafetty/sys/sparc64/pci/schizo.c#1 branch .. //depot/projects/mpsafetty/sys/sparc64/pci/schizoreg.h#1 branch .. //depot/projects/mpsafetty/sys/sparc64/pci/schizovar.h#1 branch .. //depot/projects/mpsafetty/sys/sun4v/include/smp.h#2 integrate .. //depot/projects/mpsafetty/sys/sys/pmc.h#2 integrate .. //depot/projects/mpsafetty/sys/sys/systm.h#3 integrate .. //depot/projects/mpsafetty/sys/sys/types.h#3 integrate .. //depot/projects/mpsafetty/usr.sbin/Makefile#9 integrate Differences ... ==== //depot/projects/mpsafetty/ObsoleteFiles.inc#14 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.162 2008/09/21 16:11:11 antoine Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.163 2008/09/28 20:15:45 ed 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,12 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20080928: removal of inaccurate device_ids(9) manual page +OLD_FILES+=usr/share/man/man9/device_ids.9.gz +OLD_FILES+=usr/share/man/man9/major.9.gz +OLD_FILES+=usr/share/man/man9/minor.9.gz +OLD_FILES+=usr/share/man/man9/umajor.9.gz +OLD_FILES+=usr/share/man/man9/uminor.9.gz # 20080917: removal of manpage for axed kernel primitive suser(9) OLD_FILES+=usr/share/man/man9/suser.9.gz OLD_FILES+=usr/share/man/man9/suser_cred.9.gz ==== //depot/projects/mpsafetty/bin/pkill/pkill.1#2 (text+ko) ==== @@ -1,6 +1,6 @@ .\" $NetBSD: pkill.1,v 1.8 2003/02/14 15:59:18 grant Exp $ .\" -.\" $FreeBSD: src/bin/pkill/pkill.1,v 1.1 2008/08/31 14:27:59 yar Exp $ +.\" $FreeBSD: src/bin/pkill/pkill.1,v 1.2 2008/09/28 16:44:15 ed Exp $ .\" .\" Copyright (c) 2002 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -179,10 +179,9 @@ Restrict matches to processes associated with a terminal in the comma-separated list .Ar tty . -Terminal names may be of the form -.Pa tty Ns Ar xx -or the shortened form -.Ar xx . +The +.Pa /dev/ +prefix of the terminal names must be omitted. A single dash .Pq Ql - matches processes not associated with a terminal. ==== //depot/projects/mpsafetty/bin/pkill/pkill.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.1 2008/08/31 14:27:59 yar Exp $"); +__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.2 2008/09/28 16:44:15 ed Exp $"); #include #include @@ -607,12 +607,11 @@ struct passwd *pw; struct group *gr; struct stat st; - const char *cp, *prefix; + const char *cp; char *sp, *ep, buf[MAXPATHLEN]; int empty; empty = 1; - prefix = _PATH_DEV; while ((sp = strsep(&src, ",")) != NULL) { if (*sp == '\0') @@ -673,11 +672,9 @@ cp = "console"; } else { cp = sp; - if (strncmp(sp, "tty", 3) != 0) - prefix = _PATH_TTY; } - snprintf(buf, sizeof(buf), "%s%s", prefix, cp); + snprintf(buf, sizeof(buf), _PATH_DEV "%s", cp); if (stat(buf, &st) == -1) { if (errno == ENOENT) { ==== //depot/projects/mpsafetty/gnu/lib/csu/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.30 2008/09/26 15:00:18 marcel Exp $ +# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.31 2008/09/28 19:17:54 marcel Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../contrib/gcclibs @@ -25,7 +25,7 @@ BEGINSRC= crtbegin.asm ENDSRC= crtend.asm CFLAGS+= -x assembler-with-cpp # Ugly hack -CFLAGS+= -D_OSRELDATE_H -include osreldate.h +CFLAGS+= -include osreldate.h .undef SRCS # hack for 'make depend' .endif .if ${MACHINE_ARCH} == "powerpc" ==== //depot/projects/mpsafetty/gnu/usr.bin/gdb/kgdb/trgt_i386.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt_i386.c,v 1.12 2008/05/09 19:00:40 jhb Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt_i386.c,v 1.13 2008/09/27 15:58:37 kib Exp $"); #include #include @@ -242,10 +242,14 @@ }; struct kgdb_frame_cache { - int intrframe; + int frame_type; CORE_ADDR pc; CORE_ADDR sp; }; +#define FT_NORMAL 1 +#define FT_INTRFRAME 2 +#define FT_INTRTRAPFRAME 3 +#define FT_TIMERFRAME 4 static int kgdb_trgt_frame_offset[15] = { offsetof(struct trapframe, tf_eax), @@ -278,7 +282,17 @@ *this_cache = cache; cache->pc = frame_func_unwind(next_frame); find_pc_partial_function(cache->pc, &pname, NULL, NULL); - cache->intrframe = (pname[0] == 'X') ? 1 : 0; + if (pname[0] != 'X') + cache->frame_type = FT_NORMAL; + else if (strcmp(pname, "Xtimerint") == 0) + cache->frame_type = FT_TIMERFRAME; + else if (strcmp(pname, "Xcpustop") == 0 || + strcmp(pname, "Xrendezvous") == 0 || + strcmp(pname, "Xipi_intr_bitmap_handler") == 0 || + strcmp(pname, "Xlazypmap") == 0) + cache->frame_type = FT_INTRTRAPFRAME; + else + cache->frame_type = FT_INTRFRAME; frame_unwind_register(next_frame, SP_REGNUM, buf); cache->sp = extract_unsigned_integer(buf, register_size(current_gdbarch, SP_REGNUM)); @@ -321,7 +335,23 @@ return; cache = kgdb_trgt_frame_cache(next_frame, this_cache); - *addrp = cache->sp + ofs + (cache->intrframe ? 4 : 0); + switch (cache->frame_type) { + case FT_NORMAL: + break; + case FT_INTRFRAME: + ofs += 4; + break; + case FT_TIMERFRAME: + break; + case FT_INTRTRAPFRAME: + ofs -= ofs_fix; + break; + default: + fprintf_unfiltered(gdb_stderr, "Correct FT_XXX frame offsets " + "for %d\n", cache->frame_type); + break; + } + *addrp = cache->sp + ofs; *lvalp = lval_memory; target_read_memory(*addrp, valuep, regsz); } ==== //depot/projects/mpsafetty/sbin/ipfw/ipfw.8#5 (text+ko) ==== @@ -1,7 +1,7 @@ .\" -.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.216 2008/08/27 15:30:09 ivoras Exp $ +.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.217 2008/09/27 15:09:00 rik Exp $ .\" -.Dd November 26, 2007 +.Dd September 27, 2008 .Dt IPFW 8 .Os .Sh NAME @@ -49,9 +49,13 @@ .Nm .Cm table Ar number Cm delete Ar addr Ns Op / Ns Ar masklen .Nm -.Cm table Ar number Cm flush +.Cm table +.Brq Ar number | all +.Cm flush .Nm -.Cm table Ar number Cm list +.Cm table +.Brq Ar number | all +.Cm list .Pp .Nm .Brq Cm pipe | queue @@ -2242,6 +2246,11 @@ .It Va net.inet.ip.fw.debug : No 1 Controls debugging messages produced by .Nm . +.It Va net.inet.ip.fw.default_rule : No 65535 +The default rule number (read-only). +By the design of +.Nm , the default rule is the last one, so its number +can also serve as the highest number allowed for a rule. .It Va net.inet.ip.fw.dyn_buckets : No 256 The number of buckets in the hash table for dynamic rules. Must be a power of 2, up to 65536. @@ -2295,6 +2304,8 @@ node is not passed though the firewall again. Otherwise, after an action, the packet is reinjected into the firewall at the next rule. +.It Va net.inet.ip.fw.tables_max : No 128 +Maximum number of tables (read-only). .It Va net.inet.ip.fw.verbose : No 1 Enables verbose messages. .It Va net.inet.ip.fw.verbose_limit : No 0 ==== //depot/projects/mpsafetty/sbin/ipfw/ipfw2.c#5 (text+ko) ==== @@ -17,7 +17,7 @@ * * NEW command line interface for IP firewall facility * - * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.128 2008/09/22 04:12:27 keramida Exp $ + * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.130 2008/09/27 15:58:54 rik Exp $ */ #include @@ -2721,6 +2721,7 @@ "set [disable N... enable N...] | move [rule] X to Y | swap X Y | show\n" "set N {show|list|zero|resetlog|delete} [N{,N}] | flush\n" "table N {add ip[/bits] [value] | delete ip[/bits] | flush | list}\n" +"table all {flush | list}\n" "\n" "RULE-BODY: check-state [PARAMS] | ACTION [PARAMS] ADDR [OPTION_LIST]\n" "ACTION: check-state | allow | count | deny | unreach{,6} CODE |\n" @@ -5856,22 +5857,24 @@ free(av); } -static void table_list(ipfw_table_entry ent); +static void table_list(ipfw_table_entry ent, int need_header); /* * This one handles all table-related commands * ipfw table N add addr[/masklen] [value] * ipfw table N delete addr[/masklen] - * ipfw table N flush - * ipfw table N list + * ipfw table {N | all} flush + * ipfw table {N | all} list */ static void table_handler(int ac, char *av[]) { ipfw_table_entry ent; int do_add; + int is_all; size_t len; char *p; + uint32_t a; uint32_t tables_max; len = sizeof(tables_max); @@ -5889,13 +5892,22 @@ ac--; av++; if (ac && isdigit(**av)) { ent.tbl = atoi(*av); + is_all = 0; + ac--; av++; + } else if (ac && _substrcmp(*av, "all") == 0) { + ent.tbl = 0; + is_all = 1; ac--; av++; } else - errx(EX_USAGE, "table number required"); + errx(EX_USAGE, "table number or 'all' keyword required"); if (ent.tbl >= tables_max) errx(EX_USAGE, "The table number exceeds the maximum allowed " "value (%d)", tables_max - 1); NEED1("table needs command"); + if (is_all && _substrcmp(*av, "list") != 0 + && _substrcmp(*av, "flush") != 0) + errx(EX_USAGE, "table number required"); + if (_substrcmp(*av, "add") == 0 || _substrcmp(*av, "delete") == 0) { do_add = **av == 'a'; @@ -5945,16 +5957,23 @@ } } } else if (_substrcmp(*av, "flush") == 0) { - if (do_cmd(IP_FW_TABLE_FLUSH, &ent.tbl, sizeof(ent.tbl)) < 0) - err(EX_OSERR, "setsockopt(IP_FW_TABLE_FLUSH)"); + a = is_all ? tables_max : (ent.tbl + 1); + do { + if (do_cmd(IP_FW_TABLE_FLUSH, &ent.tbl, + sizeof(ent.tbl)) < 0) + err(EX_OSERR, "setsockopt(IP_FW_TABLE_FLUSH)"); + } while (++ent.tbl < a); } else if (_substrcmp(*av, "list") == 0) { - table_list(ent); + a = is_all ? tables_max : (ent.tbl + 1); + do { + table_list(ent, is_all); + } while (++ent.tbl < a); } else errx(EX_USAGE, "invalid table command %s", *av); } static void -table_list(ipfw_table_entry ent) +table_list(ipfw_table_entry ent, int need_header) { ipfw_table *tbl; socklen_t l; @@ -5976,6 +5995,8 @@ tbl->tbl = ent.tbl; if (do_cmd(IP_FW_TABLE_LIST, tbl, (uintptr_t)&l) < 0) err(EX_OSERR, "getsockopt(IP_FW_TABLE_LIST)"); + if (tbl->cnt && need_header) + printf("---table(%d)---\n", tbl->tbl); for (a = 0; a < tbl->cnt; a++) { unsigned int tval; tval = tbl->ent[a].value; ==== //depot/projects/mpsafetty/sbin/setkey/setkey.8#2 (text+ko) ==== @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/setkey/setkey.8,v 1.38 2007/05/09 19:37:00 gnn Exp $ +.\" $FreeBSD: src/sbin/setkey/setkey.8,v 1.39 2008/09/29 05:31:27 maxim Exp $ .\" .Dd May 13, 2006 .Dt SETKEY 8 @@ -475,7 +475,7 @@ .Li ah , .Li esp or -.Li ipcomp +.Li ipcomp . The .Ar mode is either ==== //depot/projects/mpsafetty/share/examples/drivers/make_pseudo_driver.sh#3 (text+ko) ==== @@ -6,7 +6,7 @@ # # Trust me, RUN THIS SCRIPT :) # -# $FreeBSD: src/share/examples/drivers/make_pseudo_driver.sh,v 1.14 2008/09/22 16:10:12 ed Exp $ +# $FreeBSD: src/share/examples/drivers/make_pseudo_driver.sh,v 1.15 2008/09/27 16:52:57 ed Exp $ # #-------cut here------------------ @@ -168,7 +168,7 @@ * device specific Misc defines */ #define BUFFERSIZE 1024 -#define UNIT(dev) minor(dev) /* assume one minor number per unit */ +#define UNIT(dev) dev2unit(dev) /* assume one minor number per unit */ /* * One of these per allocated device ==== //depot/projects/mpsafetty/share/man/man3/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 12/13/93 -# $FreeBSD: src/share/man/man3/Makefile,v 1.48 2008/05/22 14:40:03 ed Exp $ +# $FreeBSD: src/share/man/man3/Makefile,v 1.49 2008/09/28 20:15:45 ed Exp $ .include @@ -8,6 +8,7 @@ end.3 \ fpgetround.3 \ intro.3 \ + makedev.3 \ ${PTHREAD_MAN} \ queue.3 \ siginfo.3 \ @@ -36,6 +37,8 @@ fpgetround.3 fpsetmask.3 \ fpgetround.3 fpsetprec.3 \ fpgetround.3 fpsetround.3 +MLINKS+= makedev.3 major.3 \ + makedev.3 minor.3 MLINKS+= ${PTHREAD_MLINKS} MLINKS+= queue.3 LIST_EMPTY.3 \ queue.3 LIST_ENTRY.3 \ ==== //depot/projects/mpsafetty/share/man/man9/Makefile#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.341 2008/09/17 15:49:44 attilio Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.342 2008/09/28 20:15:45 ed Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -82,7 +82,6 @@ device_get_sysctl.9 \ device_get_unit.9 \ DEVICE_IDENTIFY.9 \ - device_ids.9 \ device_printf.9 \ DEVICE_PROBE.9 \ device_probe_and_attach.9 \ @@ -570,10 +569,6 @@ device_get_state.9 device_unbusy.9 MLINKS+=device_get_sysctl.9 device_get_sysctl_ctx.9 \ device_get_sysctl.9 device_get_sysctl_tree.9 -MLINKS+=device_ids.9 major.9 \ - device_ids.9 minor.9 \ - device_ids.9 umajor.9 \ - device_ids.9 uminor.9 MLINKS+=device_quiet.9 device_is_quiet.9 \ device_quiet.9 device_verbose.9 MLINKS+=device_set_desc.9 device_get_desc.9 \ ==== //depot/projects/mpsafetty/share/man/man9/make_dev.9#4 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/make_dev.9,v 1.25 2008/09/26 14:31:24 ed Exp $ +.\" $FreeBSD: src/share/man/man9/make_dev.9,v 1.26 2008/09/28 20:15:45 ed Exp $ .\" -.Dd September 8, 2008 +.Dd September 28, 2008 .Os .Dt MAKE_DEV 9 .Sh NAME @@ -186,7 +186,9 @@ These are designed to replace the .Fa unit argument to -.Fn make_dev . +.Fn make_dev , +which can be obtained with +.Fn dev2unit . .Pp The .Fn destroy_dev ==== //depot/projects/mpsafetty/share/man/man9/spl.9#2 (text+ko) ==== @@ -23,7 +23,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. .\" -.\" $FreeBSD: src/share/man/man9/spl.9,v 1.20 2005/06/28 20:15:18 hmp Exp $ +.\" $FreeBSD: src/share/man/man9/spl.9,v 1.21 2008/09/28 03:45:16 imp Exp $ .\" .Dd July 21, 1996 .Os @@ -74,6 +74,15 @@ See .Xr mutex 9 for more information. +The API is now a complete NOP. +This man page documents historical behavior so you can understand the +code locking that the spl did when converting code from versions of the +kernel prior to +.Fx 5.0 . +The examples in this man page are also obsolete and should not be viewed +as documenting +.Fx 5.0 +and newer. .Ef .Pp The @@ -211,6 +220,9 @@ the system. The historical number scheme can be considered as a simple linearly ordered set of interrupt priority groups. +.Pp +.Fx 5.0 eliminated spl entirely in favor of locking primitives which scale +to more than one processor. .Sh AUTHORS This manual page was written by .An J\(:org Wunsch . ==== //depot/projects/mpsafetty/sys/amd64/amd64/mp_machdep.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.293 2008/09/08 09:59:05 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.294 2008/09/28 18:34:14 marius Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -1013,21 +1013,6 @@ } /* - * send an IPI INTerrupt containing 'vector' to all CPUs, including myself - */ -void -ipi_all(u_int ipi) -{ - - if (IPI_IS_BITMAPED(ipi) || (ipi == IPI_STOP && stop_cpus_with_nmi)) { - ipi_selected(all_cpus, ipi); - return; - } - CTR2(KTR_SMP, "%s: ipi: %x", __func__, ipi); - lapic_ipi_vectored(ipi, APIC_IPI_DEST_ALL); -} - -/* * send an IPI to all CPUs EXCEPT myself */ void @@ -1042,21 +1027,6 @@ lapic_ipi_vectored(ipi, APIC_IPI_DEST_OTHERS); } -/* - * send an IPI to myself - */ -void -ipi_self(u_int ipi) -{ - - if (IPI_IS_BITMAPED(ipi) || (ipi == IPI_STOP && stop_cpus_with_nmi)) { - ipi_selected(PCPU_GET(cpumask), ipi); - return; - } - CTR2(KTR_SMP, "%s: ipi: %x", __func__, ipi); - lapic_ipi_vectored(ipi, APIC_IPI_DEST_SELF); -} - #ifdef STOP_NMI /* * send NMI IPI to selected CPUs ==== //depot/projects/mpsafetty/sys/amd64/include/smp.h#2 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/amd64/include/smp.h,v 1.92 2008/03/02 07:58:40 jeff Exp $ + * $FreeBSD: src/sys/amd64/include/smp.h,v 1.93 2008/09/28 18:34:14 marius Exp $ * */ @@ -55,9 +55,7 @@ void cpustop_handler(void); void init_secondary(void); void ipi_selected(u_int cpus, u_int ipi); -void ipi_all(u_int ipi); void ipi_all_but_self(u_int ipi); -void ipi_self(u_int ipi); void ipi_bitmap_handler(struct trapframe frame); u_int mp_bootaddress(u_int); int mp_grab_cpu_hlt(void); ==== //depot/projects/mpsafetty/sys/arm/arm/pmap.c#2 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.101 2008/05/18 04:16:55 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.102 2008/09/28 05:36:25 imp Exp $"); #include #include #include @@ -2592,7 +2592,6 @@ cpu_tlb_flushD(); cpu_cpwait(); kernel_vm_end = pmap_curmaxkvaddr; - } ==== //depot/projects/mpsafetty/sys/arm/at91/at91_mci.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.5 2008/09/05 22:30:59 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.6 2008/09/28 23:37:56 imp Exp $"); #include #include @@ -642,6 +642,9 @@ case MMCBR_IVAR_VDD: *(int *)result = sc->host.ios.vdd; break; + case MMCBR_IVAR_CAPS: + *(int *)result = sc->host.ios.caps; + break; } return (0); } @@ -678,9 +681,11 @@ case MMCBR_IVAR_VDD: sc->host.ios.vdd = value; break; + /* These are read-only */ case MMCBR_IVAR_HOST_OCR: case MMCBR_IVAR_F_MIN: case MMCBR_IVAR_F_MAX: + case MMCBR_IVAR_CAPS: return (EINVAL); } return (0); ==== //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#4 (text+ko) ==== @@ -18,7 +18,7 @@ * * CDDL HEADER END * - * $FreeBSD: src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c,v 1.7 2008/09/27 08:51:18 ed Exp $ + * $FreeBSD: src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c,v 1.8 2008/09/27 17:52:48 jb Exp $ */ /* @@ -12815,7 +12815,11 @@ state = ddi_get_soft_state(dtrace_softstate, minor); #else if (dev != NULL) { - cr = dev->si_cred; + /* + * Disable this until we have the ability to set user + * credentials for DTrace. + * cr = dev->si_cred; + */ m = dev2unit(dev); } ==== //depot/projects/mpsafetty/sys/conf/files.powerpc#3 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.powerpc,v 1.80 2008/08/26 10:41:49 raj Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.81 2008/09/27 15:13:44 nwhitehorn Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -109,6 +109,7 @@ powerpc/ofw/ofw_syscons.c optional sc aim powerpc/powermac/ata_kauai.c optional powermac ata powerpc/powermac/ata_macio.c optional powermac ata +powerpc/powermac/ata_dbdma.c optional powermac ata powerpc/powermac/dbdma.c optional powermac pci powerpc/powermac/grackle.c optional powermac pci powerpc/powermac/hrowpic.c optional powermac pci ==== //depot/projects/mpsafetty/sys/conf/files.sparc64#5 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sparc64,v 1.99 2008/09/20 11:34:18 marius Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.100 2008/09/28 00:07:05 marius Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -84,6 +84,7 @@ sparc64/pci/ofw_pcib_subr.c optional pci sparc64/pci/ofw_pcibus.c optional pci sparc64/pci/psycho.c optional pci +sparc64/pci/schizo.c optional pci sparc64/sbus/dma_sbus.c optional sbus sparc64/sbus/sbus.c optional sbus sparc64/sbus/lsi64854.c optional sbus ==== //depot/projects/mpsafetty/sys/conf/options.sparc64#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.sparc64,v 1.17 2008/09/20 11:46:07 marius Exp $ +# $FreeBSD: src/sys/conf/options.sparc64,v 1.18 2008/09/28 00:07:05 marius Exp $ GFB_DEBUG opt_gfb.h GFB_NO_FONT_LOADING opt_gfb.h @@ -24,5 +24,7 @@ DEBUGGER_ON_POWERFAIL opt_psycho.h PSYCHO_DEBUG opt_psycho.h +SCHIZO_DEBUG opt_schizo.h + SUNKBD_DFLT_KEYMAP opt_sunkbd.h SUNKBD_EMULATE_ATKBD opt_sunkbd.h ==== //depot/projects/mpsafetty/sys/dev/cfe/cfe_console.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cfe/cfe_console.c,v 1.3 2008/09/26 05:37:54 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cfe/cfe_console.c,v 1.4 2008/09/28 03:33:01 imp Exp $"); #include "opt_comconsole.h" @@ -126,7 +126,7 @@ if (len == 0) break; while (cfe_write(conhandle, buf, len) == 0) - ; + continue; } } @@ -190,7 +190,7 @@ unsigned char ch; while ((result = cfe_read(conhandle, &ch, 1)) == 0) - ; + continue; if (result > 0) { #if defined(KDB) && defined(ALT_BREAK_TO_DEBUGGER) @@ -228,7 +228,7 @@ cbuf = c; while (cfe_write(conhandle, &cbuf, 1) == 0) - ; + continue; } SYSINIT(cndev, SI_SUB_CONFIGURE, SI_ORDER_MIDDLE, cn_drvinit, NULL); ==== //depot/projects/mpsafetty/sys/dev/mmc/mmc.c#2 (text+ko) ==== @@ -51,7 +51,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mmc/mmc.c,v 1.4 2007/06/05 17:04:44 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mmc/mmc.c,v 1.11 2008/09/29 01:32:21 imp Exp $"); #include #include @@ -86,6 +86,7 @@ enum mmc_card_mode mode; struct mmc_cid cid; /* cid decoded */ struct mmc_csd csd; /* csd decoded */ + u_char read_only; /* True when the device is read-only */ }; #define CMD_RETRIES 3 @@ -97,14 +98,15 @@ #define MMC_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx) #define MMC_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx) -#define MMC_LOCK_INIT(_sc) \ - mtx_init(&_sc->sc_mtx, device_get_nameunit(_sc->dev), \ +#define MMC_LOCK_INIT(_sc) \ + mtx_init(&_sc->sc_mtx, device_get_nameunit(_sc->dev), \ "mmc", MTX_DEF) #define MMC_LOCK_DESTROY(_sc) mtx_destroy(&_sc->sc_mtx); #define MMC_ASSERT_LOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_OWNED); #define MMC_ASSERT_UNLOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_NOTOWNED); static void mmc_delayed_attach(void *); +static void mmc_power_down(struct mmc_softc *sc); static int mmc_wait_for_cmd(struct mmc_softc *sc, struct mmc_command *cmd, int retries); static int mmc_wait_for_command(struct mmc_softc *sc, uint32_t opcode, @@ -120,7 +122,7 @@ mmc_probe(device_t dev) { - device_set_desc(dev, "mmc/sd bus"); + device_set_desc(dev, "MMC/SD bus"); return (0); } @@ -160,6 +162,7 @@ free(ivar, M_DEVBUF); } free(kids, M_TEMP); + mmc_power_down(sc); MMC_LOCK_DESTROY(sc); @@ -173,7 +176,7 @@ int err; int rca; - err = MMCBR_ACQUIRE_HOST(device_get_parent(busdev), dev); + err = MMCBR_ACQUIRE_HOST(device_get_parent(busdev), busdev); if (err) return (err); sc = device_get_softc(busdev); @@ -184,24 +187,29 @@ MMC_UNLOCK(sc); if (busdev != dev) { - // Keep track of the last rca that we've selected. If - // we're asked to do it again, don't. We never unselect - // unless the bus code itself wants the mmc bus. + /* + * Keep track of the last rca that we've selected. If + * we're asked to do it again, don't. We never + * unselect unless the bus code itself wants the mmc + * bus, and constantly reselecting causes problems. + */ rca = mmc_get_rca(dev); if (sc->last_rca != rca) { mmc_wait_for_command(sc, MMC_SELECT_CARD, rca << 16, MMC_RSP_R1 | MMC_CMD_AC, NULL, CMD_RETRIES); sc->last_rca = rca; } - // XXX should set bus width here? + /* XXX should set bus width here? */ } else { - // If there's a card selected, stand down. + /* + * If there's a card selected, stand down. + */ if (sc->last_rca != 0) { mmc_wait_for_command(sc, MMC_SELECT_CARD, 0, MMC_RSP_R1 | MMC_CMD_AC, NULL, CMD_RETRIES); sc->last_rca = 0; } - // XXX should set bus width here? + /* XXX should set bus width here? */ } return (0); @@ -221,7 +229,7 @@ if (sc->owner != dev) panic("mmc: you don't own the bus. game over."); MMC_UNLOCK(sc); - err = MMCBR_RELEASE_HOST(device_get_parent(busdev), dev); + err = MMCBR_RELEASE_HOST(device_get_parent(busdev), busdev); if (err) return (err); MMC_LOCK(sc); @@ -239,8 +247,8 @@ static uint32_t mmc_select_vdd(struct mmc_softc *sc, uint32_t ocr) { - // XXX - return ocr; + + return ocr & MMC_OCR_VOLTAGE; } static int @@ -259,7 +267,7 @@ { struct mmc_softc *sc; -// printf("Wakeup for req %p done_data %p\n", req, req->done_data); +/* printf("Wakeup for req %p done_data %p\n", req, req->done_data); */ sc = (struct mmc_softc *)req->done_data; MMC_LOCK(sc); req->flags |= MMC_REQ_DONE; @@ -274,14 +282,14 @@ req->done = mmc_wakeup; req->done_data = sc; -// printf("Submitting request %p sc %p\n", req, sc); +/* printf("Submitting request %p sc %p\n", req, sc); */ MMCBR_REQUEST(device_get_parent(sc->dev), sc->dev, req); MMC_LOCK(sc); do { err = msleep(req, &sc->sc_mtx, PZERO | PCATCH, "mmcreq", hz / 10); } while (!(req->flags & MMC_REQ_DONE) && err == EAGAIN); -// printf("Request %p done with error %d\n", req, err); +/* printf("Request %p done with error %d\n", req, err); */ MMC_UNLOCK(sc); return (err); } @@ -304,7 +312,7 @@ cmd->retries = retries; cmd->data = NULL; mreq.cmd = cmd; -// printf("CMD: %x ARG %x\n", cmd->opcode, cmd->arg); +/* printf("CMD: %x ARG %x\n", cmd->opcode, cmd->arg); */ mmc_wait_for_req(sc, &mreq); return (cmd->error); } @@ -453,7 +461,19 @@ mmc_ms_delay(2); } -// I wonder if the following is endian safe. +static void +mmc_power_down(struct mmc_softc *sc) +{ + device_t dev = sc->dev; + + mmcbr_set_bus_mode(dev, opendrain); + mmcbr_set_chip_select(dev, cs_dontcare); + mmcbr_set_bus_width(dev, bus_width_1); + mmcbr_set_power_mode(dev, power_off); + mmcbr_set_clock(dev, 0); + mmcbr_update_ios(dev); +} + static uint32_t >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Sep 29 14:19:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 845CD106568E; Mon, 29 Sep 2008 14:19:54 +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 40669106568C for ; Mon, 29 Sep 2008 14:19:54 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2F1A98FC0C for ; Mon, 29 Sep 2008 14:19:54 +0000 (UTC) (envelope-from zec@tel.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 m8TEJstI070478 for ; Mon, 29 Sep 2008 14:19:54 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8TEJrXg070473 for perforce@freebsd.org; Mon, 29 Sep 2008 14:19:53 GMT (envelope-from zec@tel.fer.hr) Date: Mon, 29 Sep 2008 14:19:53 GMT Message-Id: <200809291419.m8TEJrXg070473@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 150652 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, 29 Sep 2008 14:19:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=150652 Change 150652 by zec@zec_tpx32 on 2008/09/29 14:19:24 IFC @ 150651 Affected files ... .. //depot/projects/vimage/src/sys/amd64/amd64/mem.c#4 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/mp_machdep.c#11 integrate .. //depot/projects/vimage/src/sys/amd64/include/smp.h#6 integrate .. //depot/projects/vimage/src/sys/arm/arm/mem.c#3 integrate .. //depot/projects/vimage/src/sys/arm/arm/pmap.c#14 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_mci.c#6 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_pass.c#5 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_sa.c#6 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_ses.c#7 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_sg.c#3 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_target.c#5 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#4 integrate .. //depot/projects/vimage/src/sys/cddl/dev/dtrace/dtrace_clone.c#2 integrate .. //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#23 integrate .. //depot/projects/vimage/src/sys/conf/files.powerpc#12 integrate .. //depot/projects/vimage/src/sys/conf/files.sparc64#13 integrate .. //depot/projects/vimage/src/sys/conf/options.sparc64#4 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_compat.h#6 integrate .. //depot/projects/vimage/src/sys/contrib/pf/net/pf_ioctl.c#17 integrate .. //depot/projects/vimage/src/sys/dev/agp/agp.c#3 integrate .. //depot/projects/vimage/src/sys/dev/amr/amr.c#6 integrate .. //depot/projects/vimage/src/sys/dev/arcmsr/arcmsr.c#9 integrate .. //depot/projects/vimage/src/sys/dev/asr/asr.c#6 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-chipset.c#18 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-pci.h#13 integrate .. //depot/projects/vimage/src/sys/dev/ata/atapi-tape.c#5 integrate .. //depot/projects/vimage/src/sys/dev/atkbdc/psm.c#9 integrate .. //depot/projects/vimage/src/sys/dev/bktr/bktr_os.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ce/if_ce.c#6 integrate .. //depot/projects/vimage/src/sys/dev/cfe/cfe_api.c#1 branch .. //depot/projects/vimage/src/sys/dev/cfe/cfe_api.h#1 branch .. //depot/projects/vimage/src/sys/dev/cfe/cfe_api_int.h#1 branch .. //depot/projects/vimage/src/sys/dev/cfe/cfe_console.c#1 branch .. //depot/projects/vimage/src/sys/dev/cfe/cfe_error.h#1 branch .. //depot/projects/vimage/src/sys/dev/cfe/cfe_ioctl.h#1 branch .. //depot/projects/vimage/src/sys/dev/cfe/cfe_resource.c#1 branch .. //depot/projects/vimage/src/sys/dev/cp/if_cp.c#6 integrate .. //depot/projects/vimage/src/sys/dev/cpuctl/cpuctl.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ctau/if_ct.c#7 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_drv.c#5 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_fops.c#3 integrate .. //depot/projects/vimage/src/sys/dev/fb/fb.c#3 integrate .. //depot/projects/vimage/src/sys/dev/fb/vgareg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/firewire/firewire.h#3 integrate .. //depot/projects/vimage/src/sys/dev/firewire/fwdev.c#6 integrate .. //depot/projects/vimage/src/sys/dev/hptiop/hptiop.c#4 integrate .. //depot/projects/vimage/src/sys/dev/iir/iir_ctrl.c#2 integrate .. //depot/projects/vimage/src/sys/dev/iscsi/initiator/isc_cam.c#2 integrate .. //depot/projects/vimage/src/sys/dev/iscsi/initiator/iscsi.c#3 integrate .. //depot/projects/vimage/src/sys/dev/isp/isp_freebsd.c#13 integrate .. //depot/projects/vimage/src/sys/dev/joy/joy.c#2 integrate .. //depot/projects/vimage/src/sys/dev/kbd/kbd.c#4 integrate .. //depot/projects/vimage/src/sys/dev/led/led.c#5 integrate .. //depot/projects/vimage/src/sys/dev/mlx/mlx.c#4 integrate .. //depot/projects/vimage/src/sys/dev/mly/mly.c#6 integrate .. //depot/projects/vimage/src/sys/dev/mmc/mmc.c#4 integrate .. //depot/projects/vimage/src/sys/dev/mmc/mmcbrvar.h#3 integrate .. //depot/projects/vimage/src/sys/dev/mmc/mmcreg.h#3 integrate .. //depot/projects/vimage/src/sys/dev/mmc/mmcsd.c#5 integrate .. //depot/projects/vimage/src/sys/dev/mmc/mmcvar.h#4 integrate .. //depot/projects/vimage/src/sys/dev/mse/mse.c#3 integrate .. //depot/projects/vimage/src/sys/dev/pbio/pbio.c#2 integrate .. //depot/projects/vimage/src/sys/dev/powermac_nvram/powermac_nvram.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ppbus/lpt.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ppbus/pcfclock.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ppbus/ppi.c#4 integrate .. //depot/projects/vimage/src/sys/dev/rp/rpvar.h#2 integrate .. //depot/projects/vimage/src/sys/dev/siba/siba.c#1 branch .. //depot/projects/vimage/src/sys/dev/siba/siba_ids.h#1 branch .. //depot/projects/vimage/src/sys/dev/siba/siba_pcib.c#1 branch .. //depot/projects/vimage/src/sys/dev/siba/siba_pcibvar.h#1 branch .. //depot/projects/vimage/src/sys/dev/siba/sibareg.h#1 branch .. //depot/projects/vimage/src/sys/dev/siba/sibavar.h#1 branch .. //depot/projects/vimage/src/sys/dev/sound/midi/sequencer.c#6 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/emu10kx.c#8 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/dsp.c#8 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/mixer.c#4 integrate .. //depot/projects/vimage/src/sys/dev/speaker/spkr.c#5 integrate .. //depot/projects/vimage/src/sys/dev/streams/streams.c#6 integrate .. //depot/projects/vimage/src/sys/dev/tdfx/tdfx_pci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/twa/tw_osl_freebsd.c#6 integrate .. //depot/projects/vimage/src/sys/dev/twe/twe_freebsd.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/ucomvar.h#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/ufm.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/ugen.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/uhid.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/ulpt.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/ums.c#10 integrate .. //depot/projects/vimage/src/sys/dev/usb/urio.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb.c#7 integrate .. //depot/projects/vimage/src/sys/dev/usb/uscanner.c#9 integrate .. //depot/projects/vimage/src/sys/dev/vkbd/vkbd.c#4 integrate .. //depot/projects/vimage/src/sys/dev/xen/blkfront/blkfront.c#4 integrate .. //depot/projects/vimage/src/sys/dev/xen/console/console.c#3 integrate .. //depot/projects/vimage/src/sys/dev/xen/netfront/netfront.c#4 integrate .. //depot/projects/vimage/src/sys/fs/coda/coda_fbsd.c#3 integrate .. //depot/projects/vimage/src/sys/fs/devfs/devfs_vnops.c#19 integrate .. //depot/projects/vimage/src/sys/geom/geom_dev.c#7 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part.c#11 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part_bsd.c#4 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part_pc98.c#3 integrate .. //depot/projects/vimage/src/sys/i386/acpica/acpi_machdep.c#7 integrate .. //depot/projects/vimage/src/sys/i386/bios/apm.c#6 integrate .. //depot/projects/vimage/src/sys/i386/bios/smapi.c#3 integrate .. //depot/projects/vimage/src/sys/i386/i386/db_trace.c#4 integrate .. //depot/projects/vimage/src/sys/i386/i386/mem.c#2 integrate .. //depot/projects/vimage/src/sys/i386/i386/mp_machdep.c#12 integrate .. //depot/projects/vimage/src/sys/i386/include/smp.h#7 integrate .. //depot/projects/vimage/src/sys/i386/include/xen/evtchn.h#2 integrate .. //depot/projects/vimage/src/sys/i386/xen/mp_machdep.c#4 integrate .. //depot/projects/vimage/src/sys/i386/xen/xen_machdep.c#8 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/interrupt.c#9 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/mem.c#2 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/mp_machdep.c#6 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/sal.c#3 integrate .. //depot/projects/vimage/src/sys/ia64/include/smp.h#2 integrate .. //depot/projects/vimage/src/sys/kern/kern_conf.c#16 integrate .. //depot/projects/vimage/src/sys/kern/kern_shutdown.c#8 integrate .. //depot/projects/vimage/src/sys/kern/tty.c#22 integrate .. //depot/projects/vimage/src/sys/mips/adm5120/if_admsw.c#3 integrate .. //depot/projects/vimage/src/sys/mips/include/param.h#2 integrate .. //depot/projects/vimage/src/sys/mips/include/smp.h#2 integrate .. //depot/projects/vimage/src/sys/mips/mips/mem.c#2 integrate .. //depot/projects/vimage/src/sys/mips/mips/mp_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/mips/mips/pmap.c#4 integrate .. //depot/projects/vimage/src/sys/mips/mips/trap.c#3 integrate .. //depot/projects/vimage/src/sys/mips/sentry5/s5_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/net/if.c#40 integrate .. //depot/projects/vimage/src/sys/net/if_tap.c#8 integrate .. //depot/projects/vimage/src/sys/net/if_tun.c#8 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_scan_sta.c#7 integrate .. //depot/projects/vimage/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#4 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_device.c#2 integrate .. //depot/projects/vimage/src/sys/netinet/in_pcb.c#32 integrate .. //depot/projects/vimage/src/sys/netinet/in_pcb.h#17 integrate .. //depot/projects/vimage/src/sys/netinet/ip.h#5 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#46 integrate .. //depot/projects/vimage/src/sys/netinet/ip_input.c#35 integrate .. //depot/projects/vimage/src/sys/netsmb/smb_dev.c#5 integrate .. //depot/projects/vimage/src/sys/pc98/cbus/gdc.c#3 integrate .. //depot/projects/vimage/src/sys/pc98/cbus/olpt.c#3 integrate .. //depot/projects/vimage/src/sys/powerpc/include/dbdma.h#3 integrate .. //depot/projects/vimage/src/sys/powerpc/include/smp.h#4 integrate .. //depot/projects/vimage/src/sys/powerpc/powermac/ata_dbdma.c#1 branch .. //depot/projects/vimage/src/sys/powerpc/powermac/ata_dbdma.h#1 branch .. //depot/projects/vimage/src/sys/powerpc/powermac/ata_kauai.c#3 integrate .. //depot/projects/vimage/src/sys/powerpc/powermac/ata_macio.c#2 integrate .. //depot/projects/vimage/src/sys/powerpc/powermac/dbdma.c#3 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/cpu.c#8 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/intr_machdep.c#10 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/mem.c#2 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/mp_machdep.c#4 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_pipe.c#9 integrate .. //depot/projects/vimage/src/sys/sparc64/pci/schizo.c#1 branch .. //depot/projects/vimage/src/sys/sparc64/pci/schizoreg.h#1 branch .. //depot/projects/vimage/src/sys/sparc64/pci/schizovar.h#1 branch .. //depot/projects/vimage/src/sys/sparc64/sparc64/mem.c#4 integrate .. //depot/projects/vimage/src/sys/sun4v/include/smp.h#5 integrate .. //depot/projects/vimage/src/sys/sys/conf.h#12 integrate .. //depot/projects/vimage/src/sys/sys/pmc.h#4 integrate .. //depot/projects/vimage/src/sys/sys/systm.h#14 integrate .. //depot/projects/vimage/src/sys/sys/types.h#5 integrate .. //depot/projects/vimage/src/sys/vm/device_pager.c#5 integrate .. //depot/projects/vimage/src/sys/vm/vm_page.c#18 integrate .. //depot/projects/vimage/src/sys/vm/vm_page.h#9 integrate .. //depot/projects/vimage/src/sys/xen/evtchn/evtchn.c#3 integrate .. //depot/projects/vimage/src/sys/xen/gnttab.c#4 integrate .. //depot/projects/vimage/src/sys/xen/gnttab.h#3 integrate .. //depot/projects/vimage/src/sys/xen/interface/arch-ia64.h#2 integrate .. //depot/projects/vimage/src/sys/xen/interface/arch-powerpc.h#2 integrate .. //depot/projects/vimage/src/sys/xen/interface/arch-x86/cpuid.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/arch-x86/hvm/save.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/arch-x86/xen-mca.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/domctl.h#3 integrate .. //depot/projects/vimage/src/sys/xen/interface/foreign/mkchecker.py#2 integrate .. //depot/projects/vimage/src/sys/xen/interface/foreign/mkheader.py#2 integrate .. //depot/projects/vimage/src/sys/xen/interface/foreign/structs.py#2 integrate .. //depot/projects/vimage/src/sys/xen/interface/grant_table.h#3 integrate .. //depot/projects/vimage/src/sys/xen/interface/hvm/hvm_op.h#2 integrate .. //depot/projects/vimage/src/sys/xen/interface/hvm/ioreq.h#2 integrate .. //depot/projects/vimage/src/sys/xen/interface/hvm/params.h#2 integrate .. //depot/projects/vimage/src/sys/xen/interface/hvm/save.h#2 integrate .. //depot/projects/vimage/src/sys/xen/interface/io/blkif.h#2 integrate .. //depot/projects/vimage/src/sys/xen/interface/io/fbif.h#2 integrate .. //depot/projects/vimage/src/sys/xen/interface/io/kbdif.h#2 integrate .. //depot/projects/vimage/src/sys/xen/interface/io/netif.h#2 integrate .. //depot/projects/vimage/src/sys/xen/interface/io/pciif.h#2 integrate .. //depot/projects/vimage/src/sys/xen/interface/io/protocols.h#2 integrate .. //depot/projects/vimage/src/sys/xen/interface/io/ring.h#2 integrate .. //depot/projects/vimage/src/sys/xen/interface/io/xenbus.h#2 integrate .. //depot/projects/vimage/src/sys/xen/interface/io/xs_wire.h#2 integrate .. //depot/projects/vimage/src/sys/xen/interface/kexec.h#2 integrate .. //depot/projects/vimage/src/sys/xen/interface/libelf.h#2 integrate .. //depot/projects/vimage/src/sys/xen/interface/memory.h#3 integrate .. //depot/projects/vimage/src/sys/xen/interface/platform.h#2 integrate .. //depot/projects/vimage/src/sys/xen/interface/sysctl.h#2 integrate .. //depot/projects/vimage/src/sys/xen/interface/trace.h#2 integrate .. //depot/projects/vimage/src/sys/xen/interface/xen-compat.h#2 integrate .. //depot/projects/vimage/src/sys/xen/interface/xen.h#2 integrate Differences ... ==== //depot/projects/vimage/src/sys/amd64/amd64/mem.c#4 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mem.c,v 1.123 2008/06/20 05:22:09 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mem.c,v 1.124 2008/09/27 08:51:18 ed Exp $"); /* * Memory special file @@ -93,7 +93,7 @@ panic("memrw"); continue; } - if (minor(dev) == CDEV_MINOR_MEM) { + if (dev2unit(dev) == CDEV_MINOR_MEM) { v = uio->uio_offset; kmemphys: o = v & PAGE_MASK; @@ -101,7 +101,7 @@ error = uiomove((void *)PHYS_TO_DMAP(v), (int)c, uio); continue; } - else if (minor(dev) == CDEV_MINOR_KMEM) { + else if (dev2unit(dev) == CDEV_MINOR_KMEM) { v = uio->uio_offset; if (v >= DMAP_MIN_ADDRESS && v < DMAP_MAX_ADDRESS) { @@ -147,9 +147,9 @@ memmmap(struct cdev *dev, vm_offset_t offset, vm_paddr_t *paddr, int prot __unused) { - if (minor(dev) == CDEV_MINOR_MEM) + if (dev2unit(dev) == CDEV_MINOR_MEM) *paddr = offset; - else if (minor(dev) == CDEV_MINOR_KMEM) + else if (dev2unit(dev) == CDEV_MINOR_KMEM) *paddr = vtophys(offset); /* else panic! */ return (0); ==== //depot/projects/vimage/src/sys/amd64/amd64/mp_machdep.c#11 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.293 2008/09/08 09:59:05 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.294 2008/09/28 18:34:14 marius Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -1013,21 +1013,6 @@ } /* - * send an IPI INTerrupt containing 'vector' to all CPUs, including myself - */ -void -ipi_all(u_int ipi) -{ - - if (IPI_IS_BITMAPED(ipi) || (ipi == IPI_STOP && stop_cpus_with_nmi)) { - ipi_selected(all_cpus, ipi); - return; - } - CTR2(KTR_SMP, "%s: ipi: %x", __func__, ipi); - lapic_ipi_vectored(ipi, APIC_IPI_DEST_ALL); -} - -/* * send an IPI to all CPUs EXCEPT myself */ void @@ -1042,21 +1027,6 @@ lapic_ipi_vectored(ipi, APIC_IPI_DEST_OTHERS); } -/* - * send an IPI to myself - */ -void -ipi_self(u_int ipi) -{ - - if (IPI_IS_BITMAPED(ipi) || (ipi == IPI_STOP && stop_cpus_with_nmi)) { - ipi_selected(PCPU_GET(cpumask), ipi); - return; - } - CTR2(KTR_SMP, "%s: ipi: %x", __func__, ipi); - lapic_ipi_vectored(ipi, APIC_IPI_DEST_SELF); -} - #ifdef STOP_NMI /* * send NMI IPI to selected CPUs ==== //depot/projects/vimage/src/sys/amd64/include/smp.h#6 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/amd64/include/smp.h,v 1.92 2008/03/02 07:58:40 jeff Exp $ + * $FreeBSD: src/sys/amd64/include/smp.h,v 1.93 2008/09/28 18:34:14 marius Exp $ * */ @@ -55,9 +55,7 @@ void cpustop_handler(void); void init_secondary(void); void ipi_selected(u_int cpus, u_int ipi); -void ipi_all(u_int ipi); void ipi_all_but_self(u_int ipi); -void ipi_self(u_int ipi); void ipi_bitmap_handler(struct trapframe frame); u_int mp_bootaddress(u_int); int mp_grab_cpu_hlt(void); ==== //depot/projects/vimage/src/sys/arm/arm/mem.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/mem.c,v 1.5 2007/02/13 15:35:57 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/mem.c,v 1.6 2008/09/27 08:51:18 ed Exp $"); /* * Memory special file @@ -91,7 +91,7 @@ panic("memrw"); continue; } - if (minor(dev) == CDEV_MINOR_MEM) { + if (dev2unit(dev) == CDEV_MINOR_MEM) { int i; int address_valid = 0; @@ -116,7 +116,7 @@ pmap_qremove((vm_offset_t)_tmppt, 1); continue; } - else if (minor(dev) == CDEV_MINOR_KMEM) { + else if (dev2unit(dev) == CDEV_MINOR_KMEM) { c = iov->iov_len; /* @@ -156,9 +156,9 @@ memmmap(struct cdev *dev, vm_offset_t offset, vm_paddr_t *paddr, int prot __unused) { - if (minor(dev) == CDEV_MINOR_MEM) + if (dev2unit(dev) == CDEV_MINOR_MEM) *paddr = offset; - else if (minor(dev) == CDEV_MINOR_KMEM) + else if (dev2unit(dev) == CDEV_MINOR_KMEM) *paddr = vtophys(offset); /* else panic! */ return (0); ==== //depot/projects/vimage/src/sys/arm/arm/pmap.c#14 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.101 2008/05/18 04:16:55 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.102 2008/09/28 05:36:25 imp Exp $"); #include #include #include @@ -2592,7 +2592,6 @@ cpu_tlb_flushD(); cpu_cpwait(); kernel_vm_end = pmap_curmaxkvaddr; - } ==== //depot/projects/vimage/src/sys/arm/at91/at91_mci.c#6 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.5 2008/09/05 22:30:59 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.6 2008/09/28 23:37:56 imp Exp $"); #include #include @@ -642,6 +642,9 @@ case MMCBR_IVAR_VDD: *(int *)result = sc->host.ios.vdd; break; + case MMCBR_IVAR_CAPS: + *(int *)result = sc->host.ios.caps; + break; } return (0); } @@ -678,9 +681,11 @@ case MMCBR_IVAR_VDD: sc->host.ios.vdd = value; break; + /* These are read-only */ case MMCBR_IVAR_HOST_OCR: case MMCBR_IVAR_F_MIN: case MMCBR_IVAR_F_MAX: + case MMCBR_IVAR_CAPS: return (EINVAL); } return (0); ==== //depot/projects/vimage/src/sys/cam/scsi/scsi_pass.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pass.c,v 1.48 2007/05/16 16:54:23 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pass.c,v 1.49 2008/09/26 14:19:52 ed Exp $"); #include #include @@ -265,7 +265,7 @@ mtx_unlock(periph->sim->mtx); no_tags = (cgd->inq_data.flags & SID_CmdQue) == 0; softc->device_stats = devstat_new_entry("pass", - unit2minor(periph->unit_number), 0, + periph->unit_number, 0, DEVSTAT_NO_BLOCKSIZE | (no_tags ? DEVSTAT_NO_ORDERED_TAGS : 0), softc->pd_type | @@ -274,7 +274,7 @@ DEVSTAT_PRIORITY_PASS); /* Register the device */ - softc->dev = make_dev(&pass_cdevsw, unit2minor(periph->unit_number), + softc->dev = make_dev(&pass_cdevsw, periph->unit_number, UID_ROOT, GID_OPERATOR, 0600, "%s%d", periph->periph_name, periph->unit_number); mtx_lock(periph->sim->mtx); ==== //depot/projects/vimage/src/sys/cam/scsi/scsi_sa.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.113 2007/06/16 18:20:29 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.114 2008/09/27 08:51:18 ed Exp $"); #include #include @@ -175,11 +175,11 @@ /* units are bits 4-7, 16-21 (1024 units) */ #define SAUNIT(DEV) \ - (((minor(DEV) & 0xF0) >> 4) | ((minor(DEV) & 0x3f0000) >> 16)) + (((dev2unit(DEV) & 0xF0) >> 4) | ((dev2unit(DEV) & 0x3f0000) >> 16)) -#define SAMODE(z) ((minor(z) & 0x3)) -#define SADENSITY(z) (((minor(z) >> 2) & 0x3)) -#define SA_IS_CTRL(z) (minor(z) & (1 << 29)) +#define SAMODE(z) ((dev2unit(z) & 0x3)) +#define SADENSITY(z) (((dev2unit(z) >> 2) & 0x3)) +#define SA_IS_CTRL(z) (dev2unit(z) & (1 << 29)) #define SA_NOT_CTLDEV 0 #define SA_CTLDEV 1 ==== //depot/projects/vimage/src/sys/cam/scsi/scsi_ses.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ses.c,v 1.37 2008/03/17 17:18:16 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ses.c,v 1.39 2008/09/27 08:51:18 ed Exp $"); #include #include @@ -155,7 +155,7 @@ #define SES_FLAG_OPEN 0x02 #define SES_FLAG_INITIALIZED 0x04 -#define SESUNIT(x) (minor((x))) +#define SESUNIT(x) (dev2unit((x))) static d_open_t sesopen; static d_close_t sesclose; @@ -343,7 +343,7 @@ } cam_periph_unlock(periph); - softc->ses_dev = make_dev(&ses_cdevsw, unit2minor(periph->unit_number), + softc->ses_dev = make_dev(&ses_cdevsw, periph->unit_number, UID_ROOT, GID_OPERATOR, 0600, "%s%d", periph->periph_name, periph->unit_number); cam_periph_lock(periph); ==== //depot/projects/vimage/src/sys/cam/scsi/scsi_sg.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sg.c,v 1.9 2007/05/16 16:54:23 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sg.c,v 1.10 2008/09/26 14:19:52 ed Exp $"); #include #include @@ -287,7 +287,7 @@ cam_periph_unlock(periph); no_tags = (cgd->inq_data.flags & SID_CmdQue) == 0; softc->device_stats = devstat_new_entry("sg", - unit2minor(periph->unit_number), 0, + periph->unit_number, 0, DEVSTAT_NO_BLOCKSIZE | (no_tags ? DEVSTAT_NO_ORDERED_TAGS : 0), softc->pd_type | @@ -296,7 +296,7 @@ DEVSTAT_PRIORITY_PASS); /* Register the device */ - softc->dev = make_dev(&sg_cdevsw, unit2minor(periph->unit_number), + softc->dev = make_dev(&sg_cdevsw, periph->unit_number, UID_ROOT, GID_OPERATOR, 0600, "%s%d", periph->periph_name, periph->unit_number); (void)make_dev_alias(softc->dev, "sg%c", 'a' + periph->unit_number); ==== //depot/projects/vimage/src/sys/cam/scsi/scsi_target.c#5 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.73 2007/04/15 08:49:11 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.75 2008/09/27 08:51:18 ed Exp $"); #include @@ -180,7 +180,7 @@ /* Create the targ device, allocate its softc, initialize it */ if ((dev->si_flags & SI_NAMED) == 0) { - make_dev(&targ_cdevsw, minor(dev), UID_ROOT, GID_WHEEL, 0600, + make_dev(&targ_cdevsw, dev2unit(dev), UID_ROOT, GID_WHEEL, 0600, "targ%d", dev2unit(dev)); } MALLOC(softc, struct targ_softc *, sizeof(*softc), M_TARG, @@ -1031,7 +1031,7 @@ return; if (dev_stdclone(name, NULL, "targ", &u) != 1) return; - *dev = make_dev(&targ_cdevsw, unit2minor(u), UID_ROOT, GID_WHEEL, + *dev = make_dev(&targ_cdevsw, u, UID_ROOT, GID_WHEEL, 0600, "targ%d", u); dev_ref(*dev); (*dev)->si_flags |= SI_CHEAPCLONE; ==== //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#4 (text+ko) ==== @@ -18,7 +18,7 @@ * * CDDL HEADER END * - * $FreeBSD: src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c,v 1.6 2008/08/19 21:28:58 jb Exp $ + * $FreeBSD: src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c,v 1.8 2008/09/27 17:52:48 jb Exp $ */ /* @@ -12815,8 +12815,12 @@ state = ddi_get_soft_state(dtrace_softstate, minor); #else if (dev != NULL) { - cr = dev->si_cred; - m = minor(dev); + /* + * Disable this until we have the ability to set user + * credentials for DTrace. + * cr = dev->si_cred; + */ + m = dev2unit(dev); } /* Allocate memory for the state. */ @@ -15266,7 +15270,7 @@ * The first minor device is the one that is cloned so there is * nothing more to do here. */ - if (minor(dev) == 0) + if (dev2unit(dev) == 0) return 0; /* @@ -15367,7 +15371,7 @@ dtrace_state_t *state = dev->si_drv1; /* Check if this is not a cloned device. */ - if (minor(dev) == 0) + if (dev2unit(dev) == 0) return (0); #endif ==== //depot/projects/vimage/src/sys/cddl/dev/dtrace/dtrace_clone.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH * DAMAGE. * - * $FreeBSD: src/sys/cddl/dev/dtrace/dtrace_clone.c,v 1.1 2008/05/23 05:59:41 jb Exp $ + * $FreeBSD: src/sys/cddl/dev/dtrace/dtrace_clone.c,v 1.2 2008/09/26 14:19:52 ed Exp $ * */ @@ -52,7 +52,7 @@ /* Clone the device to the new minor number. */ if (clone_create(&dtrace_clones, &dtrace_cdevsw, &u, dev, 0) != 0) /* Create the /dev/dtrace/dtraceNN entry. */ - *dev = make_dev_cred(&dtrace_cdevsw, unit2minor(u), cred, + *dev = make_dev_cred(&dtrace_cdevsw, u, cred, UID_ROOT, GID_WHEEL, 0600, "dtrace/dtrace%d", u); if (*dev != NULL) { dev_ref(*dev); ==== //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#23 (text+ko) ==== @@ -42,7 +42,7 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.122 2008/08/28 15:23:18 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.123 2008/09/26 15:29:18 cognet Exp $"); #include "opt_compat.h" @@ -226,7 +226,7 @@ "sep", "sep", "mtrr", "pge", "mca", "cmov", "pat", "pse36", "pn", "b19", "b20", "b21", "mmxext", "mmx", "fxsr", - "xmm", "b26", "b27", "b28", "b29", + "xmm", "sse2", "b27", "b28", "b29", "3dnowext", "3dnow" }; ==== //depot/projects/vimage/src/sys/conf/files.powerpc#12 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.powerpc,v 1.80 2008/08/26 10:41:49 raj Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.81 2008/09/27 15:13:44 nwhitehorn Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -109,6 +109,7 @@ powerpc/ofw/ofw_syscons.c optional sc aim powerpc/powermac/ata_kauai.c optional powermac ata powerpc/powermac/ata_macio.c optional powermac ata +powerpc/powermac/ata_dbdma.c optional powermac ata powerpc/powermac/dbdma.c optional powermac pci powerpc/powermac/grackle.c optional powermac pci powerpc/powermac/hrowpic.c optional powermac pci ==== //depot/projects/vimage/src/sys/conf/files.sparc64#13 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sparc64,v 1.99 2008/09/20 11:34:18 marius Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.100 2008/09/28 00:07:05 marius Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -84,6 +84,7 @@ sparc64/pci/ofw_pcib_subr.c optional pci sparc64/pci/ofw_pcibus.c optional pci sparc64/pci/psycho.c optional pci +sparc64/pci/schizo.c optional pci sparc64/sbus/dma_sbus.c optional sbus sparc64/sbus/sbus.c optional sbus sparc64/sbus/lsi64854.c optional sbus ==== //depot/projects/vimage/src/sys/conf/options.sparc64#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.sparc64,v 1.17 2008/09/20 11:46:07 marius Exp $ +# $FreeBSD: src/sys/conf/options.sparc64,v 1.18 2008/09/28 00:07:05 marius Exp $ GFB_DEBUG opt_gfb.h GFB_NO_FONT_LOADING opt_gfb.h @@ -24,5 +24,7 @@ DEBUGGER_ON_POWERFAIL opt_psycho.h PSYCHO_DEBUG opt_psycho.h +SCHIZO_DEBUG opt_schizo.h + SUNKBD_DFLT_KEYMAP opt_sunkbd.h SUNKBD_EMULATE_ATKBD opt_sunkbd.h ==== //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_compat.h#6 (text+ko) ==== @@ -4,7 +4,7 @@ * See the IPFILTER.LICENCE file for details on licencing. * * @(#)ip_compat.h 1.8 1/14/96 - * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_compat.h,v 1.36 2008/07/24 12:35:05 darrenr Exp $ + * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_compat.h,v 1.37 2008/09/27 08:51:18 ed Exp $ * Id: ip_compat.h,v 2.142.2.57 2007/10/10 09:51:42 darrenr Exp $ */ @@ -1709,7 +1709,7 @@ # endif # ifndef GET_MINOR -# define GET_MINOR(x) minor(x) +# define GET_MINOR(x) dev2unit(x) # endif # define PANIC(x,y) if (x) panic y #endif /* _KERNEL */ ==== //depot/projects/vimage/src/sys/contrib/pf/net/pf_ioctl.c#17 (text+ko) ==== @@ -40,7 +40,7 @@ #include "opt_inet6.h" #include -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.35 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.36 2008/09/27 08:51:18 ed Exp $"); #endif #ifdef __FreeBSD__ @@ -481,7 +481,7 @@ int pfopen(struct cdev *dev, int flags, int fmt, struct proc *p) { - if (minor(dev) >= 1) + if (dev2unit(dev) >= 1) return (ENXIO); return (0); } @@ -489,7 +489,7 @@ int pfclose(struct cdev *dev, int flags, int fmt, struct proc *p) { - if (minor(dev) >= 1) + if (dev2unit(dev) >= 1) return (ENXIO); return (0); } ==== //depot/projects/vimage/src/sys/dev/agp/agp.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/agp/agp.c,v 1.59 2008/08/23 15:57:43 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/agp/agp.c,v 1.60 2008/09/27 08:51:18 ed Exp $"); #include "opt_bus.h" @@ -80,7 +80,7 @@ }; static devclass_t agp_devclass; -#define KDEV2DEV(kdev) devclass_get_device(agp_devclass, minor(kdev)) +#define KDEV2DEV(kdev) devclass_get_device(agp_devclass, dev2unit(kdev)) /* Helper functions for implementing chipset mini drivers. */ ==== //depot/projects/vimage/src/sys/dev/amr/amr.c#6 (text+ko) ==== @@ -56,7 +56,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/amr/amr.c,v 1.86 2008/07/20 16:50:14 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/amr/amr.c,v 1.87 2008/09/27 08:51:18 ed Exp $"); /* * Driver for the AMI MegaRaid family of controllers. @@ -438,7 +438,7 @@ static int amr_open(struct cdev *dev, int flags, int fmt, d_thread_t *td) { - int unit = minor(dev); + int unit = dev2unit(dev); struct amr_softc *sc = devclass_get_softc(devclass_find("amr"), unit); debug_called(1); @@ -494,7 +494,7 @@ static int amr_close(struct cdev *dev, int flags, int fmt, d_thread_t *td) { - int unit = minor(dev); + int unit = dev2unit(dev); struct amr_softc *sc = devclass_get_softc(devclass_find("amr"), unit); debug_called(1); ==== //depot/projects/vimage/src/sys/dev/arcmsr/arcmsr.c#9 (text+ko) ==== @@ -56,7 +56,7 @@ ** and cause g_vfs_done() read write error ** 1.20.00.15 10/10/2007 Erich Chen support new RAID adapter type ARC120x ****************************************************************************************** -* $FreeBSD: src/sys/dev/arcmsr/arcmsr.c,v 1.27 2007/12/09 19:24:27 scottl Exp $ +* $FreeBSD: src/sys/dev/arcmsr/arcmsr.c,v 1.28 2008/09/27 08:51:18 ed Exp $ */ #include #include @@ -256,7 +256,7 @@ #if __FreeBSD_version < 503000 struct AdapterControlBlock *acb=dev->si_drv1; #else - int unit = minor(dev); + int unit = dev2unit(dev); struct AdapterControlBlock *acb = devclass_get_softc(arcmsr_devclass, unit); #endif if(acb==NULL) { @@ -281,7 +281,7 @@ #if __FreeBSD_version < 503000 struct AdapterControlBlock *acb=dev->si_drv1; #else - int unit = minor(dev); + int unit = dev2unit(dev); struct AdapterControlBlock *acb = devclass_get_softc(arcmsr_devclass, unit); #endif if(acb==NULL) { @@ -306,7 +306,7 @@ #if __FreeBSD_version < 503000 struct AdapterControlBlock *acb=dev->si_drv1; #else - int unit = minor(dev); + int unit = dev2unit(dev); struct AdapterControlBlock *acb = devclass_get_softc(arcmsr_devclass, unit); #endif ==== //depot/projects/vimage/src/sys/dev/asr/asr.c#6 (text+ko) ==== @@ -163,7 +163,7 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/asr/asr.c,v 1.85 2007/06/17 05:55:48 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/asr/asr.c,v 1.86 2008/09/27 08:51:18 ed Exp $"); #define ASR_VERSION 1 #define ASR_REVISION '1' @@ -3113,7 +3113,7 @@ #undef SCSI_RESET /* Conflicts with "scsi/scsiconf.h" defintion */ #include "dev/asr/osd_unix.h" -#define asr_unit(dev) minor(dev) +#define asr_unit(dev) dev2unit(dev) static u_int8_t ASR_ctlr_held; ==== //depot/projects/vimage/src/sys/dev/ata/ata-chipset.c#18 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.227 2008/09/18 12:12:34 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.228 2008/09/26 07:29:48 sos Exp $"); #include "opt_ata.h" #include @@ -107,7 +107,8 @@ static void ata_intel_31244_tf_write(struct ata_request *request); static void ata_intel_31244_reset(device_t dev); static int ata_ite_chipinit(device_t dev); -static void ata_ite_setmode(device_t dev, int mode); +static void ata_ite_8213_setmode(device_t dev, int mode); +static void ata_ite_821x_setmode(device_t dev, int mode); static int ata_jmicron_chipinit(device_t dev); static int ata_jmicron_allocate(device_t dev); static void ata_jmicron_reset(device_t dev); @@ -2350,52 +2351,54 @@ device_printf(dev, "%ssetting %s on %s chip\n", (error) ? "FAILURE " : "", ata_mode2str(mode), ctlr->chip->text); - if (error) - return; + if (!error) { + if (mode >= ATA_UDMA0) { + u_int8_t utimings[] = { 0x00, 0x01, 0x10, 0x01, 0x10, 0x01, 0x10 }; + + pci_write_config(gparent, 0x48, reg48 | (0x0001 << devno), 2); + pci_write_config(gparent, 0x4a, + (reg4a & ~(0x3 << (devno << 2))) | + (utimings[mode & ATA_MODE_MASK] << (devno<<2)), 2); + } + else { + pci_write_config(gparent, 0x48, reg48 & ~(0x0001 << devno), 2); + pci_write_config(gparent, 0x4a, (reg4a & ~(0x3 << (devno << 2))),2); + } + reg54 |= 0x0400; + if (mode >= ATA_UDMA2) + reg54 |= (0x1 << devno); + else + reg54 &= ~(0x1 << devno); + if (mode >= ATA_UDMA5) + reg54 |= (0x1000 << devno); + else + reg54 &= ~(0x1000 << devno); - if (mode >= ATA_UDMA0) { - pci_write_config(gparent, 0x48, reg48 | (0x0001 << devno), 2); - pci_write_config(gparent, 0x4a, - (reg4a & ~(0x3 << (devno << 2))) | - ((0x01 + !(mode & 0x01)) << (devno << 2)), 2); - } - else { - pci_write_config(gparent, 0x48, reg48 & ~(0x0001 << devno), 2); - pci_write_config(gparent, 0x4a, (reg4a & ~(0x3 << (devno << 2))), 2); - } - reg54 |= 0x0400; - if (mode >= ATA_UDMA2) - pci_write_config(gparent, 0x54, reg54 | (0x1 << devno), 2); - else - pci_write_config(gparent, 0x54, reg54 & ~(0x1 << devno), 2); + pci_write_config(gparent, 0x54, reg54, 2); - if (mode >= ATA_UDMA5) - pci_write_config(gparent, 0x54, reg54 | (0x1000 << devno), 2); - else - pci_write_config(gparent, 0x54, reg54 & ~(0x1000 << devno), 2); + reg40 &= ~0x00ff00ff; + reg40 |= 0x40774077; - reg40 &= ~0x00ff00ff; - reg40 |= 0x40774077; + if (atadev->unit == ATA_MASTER) { + mask40 = 0x3300; + new40 = timings[ata_mode2idx(mode)] << 8; + } + else { + mask44 = 0x0f; + new44 = ((timings[ata_mode2idx(mode)] & 0x30) >> 2) | + (timings[ata_mode2idx(mode)] & 0x03); + } + if (ch->unit) { + mask40 <<= 16; + new40 <<= 16; + mask44 <<= 4; + new44 <<= 4; + } + pci_write_config(gparent, 0x40, (reg40 & ~mask40) | new40, 4); + pci_write_config(gparent, 0x44, (reg44 & ~mask44) | new44, 1); - if (atadev->unit == ATA_MASTER) { - mask40 = 0x3300; - new40 = timings[ata_mode2idx(mode)] << 8; - } - else { - mask44 = 0x0f; - new44 = ((timings[ata_mode2idx(mode)] & 0x30) >> 2) | - (timings[ata_mode2idx(mode)] & 0x03); - } - if (ch->unit) { - mask40 <<= 16; - new40 <<= 16; - mask44 <<= 4; - new44 <<= 4; + atadev->mode = mode; } - pci_write_config(gparent, 0x40, (reg40 & ~mask40) | new40, 4); - pci_write_config(gparent, 0x44, (reg44 & ~mask44) | new44, 1); - - atadev->mode = mode; } static void @@ -2555,7 +2558,8 @@ { struct ata_pci_controller *ctlr = device_get_softc(dev); static struct ata_chip_id ids[] = - {{ ATA_IT8212F, 0x00, 0x00, 0x00, ATA_UDMA6, "IT8212F" }, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Sep 29 14:25:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3AC32106568C; Mon, 29 Sep 2008 14:25: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 F18BE106568A for ; Mon, 29 Sep 2008 14:24:59 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E039E8FC19 for ; Mon, 29 Sep 2008 14:24:59 +0000 (UTC) (envelope-from zec@tel.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 m8TEOx0k007753 for ; Mon, 29 Sep 2008 14:24:59 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8TEOxIT007667 for perforce@freebsd.org; Mon, 29 Sep 2008 14:24:59 GMT (envelope-from zec@tel.fer.hr) Date: Mon, 29 Sep 2008 14:24:59 GMT Message-Id: <200809291424.m8TEOxIT007667@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 150653 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, 29 Sep 2008 14:25:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=150653 Change 150653 by zec@zec_tpx32 on 2008/09/29 14:24:48 IFC @ 150651 Affected files ... .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/mem.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/mp_machdep.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/smp.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/arm/mem.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/at91_mci.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/cam/scsi/scsi_pass.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/cam/scsi/scsi_sa.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/cam/scsi/scsi_ses.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/cam/scsi/scsi_sg.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/cam/scsi/scsi_target.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/dev/dtrace/dtrace_clone.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.powerpc#3 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.sparc64#5 integrate .. //depot/projects/vimage-commit2/src/sys/conf/options.sparc64#4 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_compat.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_ioctl.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/agp/agp.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/amr/amr.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/arcmsr/arcmsr.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/asr/asr.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-chipset.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-pci.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/atapi-tape.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/atkbdc/psm.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/bktr/bktr_os.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ce/if_ce.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cfe/cfe_api.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/cfe/cfe_api.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/cfe/cfe_api_int.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/cfe/cfe_console.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/cfe/cfe_error.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/cfe/cfe_ioctl.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/cfe/cfe_resource.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/cp/if_cp.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cpuctl/cpuctl.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ctau/if_ct.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_drv.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_fops.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/fb/fb.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/fb/vgareg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/firewire/firewire.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/firewire/fwdev.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/hptiop/hptiop.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/iir/iir_ctrl.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/iscsi/initiator/isc_cam.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/iscsi/initiator/iscsi.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/isp/isp_freebsd.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/joy/joy.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/kbd/kbd.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/led/led.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mlx/mlx.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mly/mly.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mmc/mmc.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mmc/mmcbrvar.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mmc/mmcreg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mmc/mmcsd.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mmc/mmcvar.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mse/mse.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pbio/pbio.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/powermac_nvram/powermac_nvram.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ppbus/lpt.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ppbus/pcfclock.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ppbus/ppi.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/rp/rpvar.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/siba/siba.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/siba/siba_ids.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/siba/siba_pcib.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/siba/siba_pcibvar.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/siba/sibareg.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/siba/sibavar.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/sound/midi/sequencer.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/emu10kx.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/dsp.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/mixer.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/speaker/spkr.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/streams/streams.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/tdfx/tdfx_pci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/twa/tw_osl_freebsd.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/twe/twe_freebsd.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/ucomvar.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/ufm.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/ugen.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/uhid.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/ulpt.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/ums.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/urio.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/uscanner.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/vkbd/vkbd.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/xen/blkfront/blkfront.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/xen/console/console.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/xen/netfront/netfront.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/fs/coda/coda_fbsd.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/devfs/devfs_vnops.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/geom/geom_dev.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/geom/part/g_part.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/geom/part/g_part_bsd.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/geom/part/g_part_pc98.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/i386/acpica/acpi_machdep.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/i386/bios/apm.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/bios/smapi.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/db_trace.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/mem.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/mp_machdep.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/smp.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/xen/evtchn.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/xen/mp_machdep.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/i386/xen/xen_machdep.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/ia64/ia64/interrupt.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/ia64/ia64/mem.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/ia64/ia64/mp_machdep.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/ia64/ia64/sal.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/ia64/include/smp.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_conf.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_shutdown.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/tty.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/mips/adm5120/if_admsw.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/mips/include/param.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/mips/include/smp.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/mips/mips/mem.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/mips/mips/mp_machdep.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/mips/mips/pmap.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/mips/mips/trap.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/mips/sentry5/s5_machdep.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/net/if.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_tap.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_tun.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_scan_sta.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_device.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#22 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/netsmb/smb_dev.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/pc98/cbus/gdc.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/pc98/cbus/olpt.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/include/dbdma.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/include/smp.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/powermac/ata_dbdma.c#1 branch .. //depot/projects/vimage-commit2/src/sys/powerpc/powermac/ata_dbdma.h#1 branch .. //depot/projects/vimage-commit2/src/sys/powerpc/powermac/ata_kauai.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/powermac/ata_macio.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/powermac/dbdma.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/powerpc/cpu.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/powerpc/intr_machdep.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/powerpc/mem.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/powerpc/mp_machdep.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/security/audit/audit_pipe.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/pci/schizo.c#1 branch .. //depot/projects/vimage-commit2/src/sys/sparc64/pci/schizoreg.h#1 branch .. //depot/projects/vimage-commit2/src/sys/sparc64/pci/schizovar.h#1 branch .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/mem.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/sun4v/include/smp.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/conf.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/sys/pmc.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/systm.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/sys/types.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/vm/device_pager.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_page.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_page.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/xen/evtchn/evtchn.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/xen/gnttab.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/xen/gnttab.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/xen/interface/arch-ia64.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/xen/interface/arch-powerpc.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/xen/interface/arch-x86/cpuid.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/arch-x86/hvm/save.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/arch-x86/xen-mca.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/domctl.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/xen/interface/foreign/mkchecker.py#2 integrate .. //depot/projects/vimage-commit2/src/sys/xen/interface/foreign/mkheader.py#2 integrate .. //depot/projects/vimage-commit2/src/sys/xen/interface/foreign/structs.py#2 integrate .. //depot/projects/vimage-commit2/src/sys/xen/interface/grant_table.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/xen/interface/hvm/hvm_op.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/xen/interface/hvm/ioreq.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/xen/interface/hvm/params.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/xen/interface/hvm/save.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/xen/interface/io/blkif.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/xen/interface/io/fbif.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/xen/interface/io/kbdif.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/xen/interface/io/netif.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/xen/interface/io/pciif.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/xen/interface/io/protocols.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/xen/interface/io/ring.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/xen/interface/io/xenbus.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/xen/interface/io/xs_wire.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/xen/interface/kexec.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/xen/interface/libelf.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/xen/interface/memory.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/xen/interface/platform.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/xen/interface/sysctl.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/xen/interface/trace.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/xen/interface/xen-compat.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/xen/interface/xen.h#2 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/mem.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mem.c,v 1.123 2008/06/20 05:22:09 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mem.c,v 1.124 2008/09/27 08:51:18 ed Exp $"); /* * Memory special file @@ -93,7 +93,7 @@ panic("memrw"); continue; } - if (minor(dev) == CDEV_MINOR_MEM) { + if (dev2unit(dev) == CDEV_MINOR_MEM) { v = uio->uio_offset; kmemphys: o = v & PAGE_MASK; @@ -101,7 +101,7 @@ error = uiomove((void *)PHYS_TO_DMAP(v), (int)c, uio); continue; } - else if (minor(dev) == CDEV_MINOR_KMEM) { + else if (dev2unit(dev) == CDEV_MINOR_KMEM) { v = uio->uio_offset; if (v >= DMAP_MIN_ADDRESS && v < DMAP_MAX_ADDRESS) { @@ -147,9 +147,9 @@ memmmap(struct cdev *dev, vm_offset_t offset, vm_paddr_t *paddr, int prot __unused) { - if (minor(dev) == CDEV_MINOR_MEM) + if (dev2unit(dev) == CDEV_MINOR_MEM) *paddr = offset; - else if (minor(dev) == CDEV_MINOR_KMEM) + else if (dev2unit(dev) == CDEV_MINOR_KMEM) *paddr = vtophys(offset); /* else panic! */ return (0); ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/mp_machdep.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.293 2008/09/08 09:59:05 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.294 2008/09/28 18:34:14 marius Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -1013,21 +1013,6 @@ } /* - * send an IPI INTerrupt containing 'vector' to all CPUs, including myself - */ -void -ipi_all(u_int ipi) -{ - - if (IPI_IS_BITMAPED(ipi) || (ipi == IPI_STOP && stop_cpus_with_nmi)) { - ipi_selected(all_cpus, ipi); - return; - } - CTR2(KTR_SMP, "%s: ipi: %x", __func__, ipi); - lapic_ipi_vectored(ipi, APIC_IPI_DEST_ALL); -} - -/* * send an IPI to all CPUs EXCEPT myself */ void @@ -1042,21 +1027,6 @@ lapic_ipi_vectored(ipi, APIC_IPI_DEST_OTHERS); } -/* - * send an IPI to myself - */ -void -ipi_self(u_int ipi) -{ - - if (IPI_IS_BITMAPED(ipi) || (ipi == IPI_STOP && stop_cpus_with_nmi)) { - ipi_selected(PCPU_GET(cpumask), ipi); - return; - } - CTR2(KTR_SMP, "%s: ipi: %x", __func__, ipi); - lapic_ipi_vectored(ipi, APIC_IPI_DEST_SELF); -} - #ifdef STOP_NMI /* * send NMI IPI to selected CPUs ==== //depot/projects/vimage-commit2/src/sys/amd64/include/smp.h#2 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/amd64/include/smp.h,v 1.92 2008/03/02 07:58:40 jeff Exp $ + * $FreeBSD: src/sys/amd64/include/smp.h,v 1.93 2008/09/28 18:34:14 marius Exp $ * */ @@ -55,9 +55,7 @@ void cpustop_handler(void); void init_secondary(void); void ipi_selected(u_int cpus, u_int ipi); -void ipi_all(u_int ipi); void ipi_all_but_self(u_int ipi); -void ipi_self(u_int ipi); void ipi_bitmap_handler(struct trapframe frame); u_int mp_bootaddress(u_int); int mp_grab_cpu_hlt(void); ==== //depot/projects/vimage-commit2/src/sys/arm/arm/mem.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/mem.c,v 1.5 2007/02/13 15:35:57 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/mem.c,v 1.6 2008/09/27 08:51:18 ed Exp $"); /* * Memory special file @@ -91,7 +91,7 @@ panic("memrw"); continue; } - if (minor(dev) == CDEV_MINOR_MEM) { + if (dev2unit(dev) == CDEV_MINOR_MEM) { int i; int address_valid = 0; @@ -116,7 +116,7 @@ pmap_qremove((vm_offset_t)_tmppt, 1); continue; } - else if (minor(dev) == CDEV_MINOR_KMEM) { + else if (dev2unit(dev) == CDEV_MINOR_KMEM) { c = iov->iov_len; /* @@ -156,9 +156,9 @@ memmmap(struct cdev *dev, vm_offset_t offset, vm_paddr_t *paddr, int prot __unused) { - if (minor(dev) == CDEV_MINOR_MEM) + if (dev2unit(dev) == CDEV_MINOR_MEM) *paddr = offset; - else if (minor(dev) == CDEV_MINOR_KMEM) + else if (dev2unit(dev) == CDEV_MINOR_KMEM) *paddr = vtophys(offset); /* else panic! */ return (0); ==== //depot/projects/vimage-commit2/src/sys/arm/arm/pmap.c#2 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.101 2008/05/18 04:16:55 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.102 2008/09/28 05:36:25 imp Exp $"); #include #include #include @@ -2592,7 +2592,6 @@ cpu_tlb_flushD(); cpu_cpwait(); kernel_vm_end = pmap_curmaxkvaddr; - } ==== //depot/projects/vimage-commit2/src/sys/arm/at91/at91_mci.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.5 2008/09/05 22:30:59 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.6 2008/09/28 23:37:56 imp Exp $"); #include #include @@ -642,6 +642,9 @@ case MMCBR_IVAR_VDD: *(int *)result = sc->host.ios.vdd; break; + case MMCBR_IVAR_CAPS: + *(int *)result = sc->host.ios.caps; + break; } return (0); } @@ -678,9 +681,11 @@ case MMCBR_IVAR_VDD: sc->host.ios.vdd = value; break; + /* These are read-only */ case MMCBR_IVAR_HOST_OCR: case MMCBR_IVAR_F_MIN: case MMCBR_IVAR_F_MAX: + case MMCBR_IVAR_CAPS: return (EINVAL); } return (0); ==== //depot/projects/vimage-commit2/src/sys/cam/scsi/scsi_pass.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pass.c,v 1.48 2007/05/16 16:54:23 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pass.c,v 1.49 2008/09/26 14:19:52 ed Exp $"); #include #include @@ -265,7 +265,7 @@ mtx_unlock(periph->sim->mtx); no_tags = (cgd->inq_data.flags & SID_CmdQue) == 0; softc->device_stats = devstat_new_entry("pass", - unit2minor(periph->unit_number), 0, + periph->unit_number, 0, DEVSTAT_NO_BLOCKSIZE | (no_tags ? DEVSTAT_NO_ORDERED_TAGS : 0), softc->pd_type | @@ -274,7 +274,7 @@ DEVSTAT_PRIORITY_PASS); /* Register the device */ - softc->dev = make_dev(&pass_cdevsw, unit2minor(periph->unit_number), + softc->dev = make_dev(&pass_cdevsw, periph->unit_number, UID_ROOT, GID_OPERATOR, 0600, "%s%d", periph->periph_name, periph->unit_number); mtx_lock(periph->sim->mtx); ==== //depot/projects/vimage-commit2/src/sys/cam/scsi/scsi_sa.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.113 2007/06/16 18:20:29 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.114 2008/09/27 08:51:18 ed Exp $"); #include #include @@ -175,11 +175,11 @@ /* units are bits 4-7, 16-21 (1024 units) */ #define SAUNIT(DEV) \ - (((minor(DEV) & 0xF0) >> 4) | ((minor(DEV) & 0x3f0000) >> 16)) + (((dev2unit(DEV) & 0xF0) >> 4) | ((dev2unit(DEV) & 0x3f0000) >> 16)) -#define SAMODE(z) ((minor(z) & 0x3)) -#define SADENSITY(z) (((minor(z) >> 2) & 0x3)) -#define SA_IS_CTRL(z) (minor(z) & (1 << 29)) +#define SAMODE(z) ((dev2unit(z) & 0x3)) +#define SADENSITY(z) (((dev2unit(z) >> 2) & 0x3)) +#define SA_IS_CTRL(z) (dev2unit(z) & (1 << 29)) #define SA_NOT_CTLDEV 0 #define SA_CTLDEV 1 ==== //depot/projects/vimage-commit2/src/sys/cam/scsi/scsi_ses.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ses.c,v 1.37 2008/03/17 17:18:16 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ses.c,v 1.39 2008/09/27 08:51:18 ed Exp $"); #include #include @@ -155,7 +155,7 @@ #define SES_FLAG_OPEN 0x02 #define SES_FLAG_INITIALIZED 0x04 -#define SESUNIT(x) (minor((x))) +#define SESUNIT(x) (dev2unit((x))) static d_open_t sesopen; static d_close_t sesclose; @@ -343,7 +343,7 @@ } cam_periph_unlock(periph); - softc->ses_dev = make_dev(&ses_cdevsw, unit2minor(periph->unit_number), + softc->ses_dev = make_dev(&ses_cdevsw, periph->unit_number, UID_ROOT, GID_OPERATOR, 0600, "%s%d", periph->periph_name, periph->unit_number); cam_periph_lock(periph); ==== //depot/projects/vimage-commit2/src/sys/cam/scsi/scsi_sg.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sg.c,v 1.9 2007/05/16 16:54:23 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sg.c,v 1.10 2008/09/26 14:19:52 ed Exp $"); #include #include @@ -287,7 +287,7 @@ cam_periph_unlock(periph); no_tags = (cgd->inq_data.flags & SID_CmdQue) == 0; softc->device_stats = devstat_new_entry("sg", - unit2minor(periph->unit_number), 0, + periph->unit_number, 0, DEVSTAT_NO_BLOCKSIZE | (no_tags ? DEVSTAT_NO_ORDERED_TAGS : 0), softc->pd_type | @@ -296,7 +296,7 @@ DEVSTAT_PRIORITY_PASS); /* Register the device */ - softc->dev = make_dev(&sg_cdevsw, unit2minor(periph->unit_number), + softc->dev = make_dev(&sg_cdevsw, periph->unit_number, UID_ROOT, GID_OPERATOR, 0600, "%s%d", periph->periph_name, periph->unit_number); (void)make_dev_alias(softc->dev, "sg%c", 'a' + periph->unit_number); ==== //depot/projects/vimage-commit2/src/sys/cam/scsi/scsi_target.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.73 2007/04/15 08:49:11 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.75 2008/09/27 08:51:18 ed Exp $"); #include @@ -180,7 +180,7 @@ /* Create the targ device, allocate its softc, initialize it */ if ((dev->si_flags & SI_NAMED) == 0) { - make_dev(&targ_cdevsw, minor(dev), UID_ROOT, GID_WHEEL, 0600, + make_dev(&targ_cdevsw, dev2unit(dev), UID_ROOT, GID_WHEEL, 0600, "targ%d", dev2unit(dev)); } MALLOC(softc, struct targ_softc *, sizeof(*softc), M_TARG, @@ -1031,7 +1031,7 @@ return; if (dev_stdclone(name, NULL, "targ", &u) != 1) return; - *dev = make_dev(&targ_cdevsw, unit2minor(u), UID_ROOT, GID_WHEEL, + *dev = make_dev(&targ_cdevsw, u, UID_ROOT, GID_WHEEL, 0600, "targ%d", u); dev_ref(*dev); (*dev)->si_flags |= SI_CHEAPCLONE; ==== //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#4 (text+ko) ==== @@ -18,7 +18,7 @@ * * CDDL HEADER END * - * $FreeBSD: src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c,v 1.6 2008/08/19 21:28:58 jb Exp $ + * $FreeBSD: src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c,v 1.8 2008/09/27 17:52:48 jb Exp $ */ /* @@ -12815,8 +12815,12 @@ state = ddi_get_soft_state(dtrace_softstate, minor); #else if (dev != NULL) { - cr = dev->si_cred; - m = minor(dev); + /* + * Disable this until we have the ability to set user + * credentials for DTrace. + * cr = dev->si_cred; + */ + m = dev2unit(dev); } /* Allocate memory for the state. */ @@ -15266,7 +15270,7 @@ * The first minor device is the one that is cloned so there is * nothing more to do here. */ - if (minor(dev) == 0) + if (dev2unit(dev) == 0) return 0; /* @@ -15367,7 +15371,7 @@ dtrace_state_t *state = dev->si_drv1; /* Check if this is not a cloned device. */ - if (minor(dev) == 0) + if (dev2unit(dev) == 0) return (0); #endif ==== //depot/projects/vimage-commit2/src/sys/cddl/dev/dtrace/dtrace_clone.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH * DAMAGE. * - * $FreeBSD: src/sys/cddl/dev/dtrace/dtrace_clone.c,v 1.1 2008/05/23 05:59:41 jb Exp $ + * $FreeBSD: src/sys/cddl/dev/dtrace/dtrace_clone.c,v 1.2 2008/09/26 14:19:52 ed Exp $ * */ @@ -52,7 +52,7 @@ /* Clone the device to the new minor number. */ if (clone_create(&dtrace_clones, &dtrace_cdevsw, &u, dev, 0) != 0) /* Create the /dev/dtrace/dtraceNN entry. */ - *dev = make_dev_cred(&dtrace_cdevsw, unit2minor(u), cred, + *dev = make_dev_cred(&dtrace_cdevsw, u, cred, UID_ROOT, GID_WHEEL, 0600, "dtrace/dtrace%d", u); if (*dev != NULL) { dev_ref(*dev); ==== //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#10 (text+ko) ==== @@ -42,7 +42,7 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.122 2008/08/28 15:23:18 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.123 2008/09/26 15:29:18 cognet Exp $"); #include #include @@ -223,7 +223,7 @@ "sep", "sep", "mtrr", "pge", "mca", "cmov", "pat", "pse36", "pn", "b19", "b20", "b21", "mmxext", "mmx", "fxsr", - "xmm", "b26", "b27", "b28", "b29", + "xmm", "sse2", "b27", "b28", "b29", "3dnowext", "3dnow" }; ==== //depot/projects/vimage-commit2/src/sys/conf/files.powerpc#3 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.powerpc,v 1.80 2008/08/26 10:41:49 raj Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.81 2008/09/27 15:13:44 nwhitehorn Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -109,6 +109,7 @@ powerpc/ofw/ofw_syscons.c optional sc aim powerpc/powermac/ata_kauai.c optional powermac ata powerpc/powermac/ata_macio.c optional powermac ata +powerpc/powermac/ata_dbdma.c optional powermac ata powerpc/powermac/dbdma.c optional powermac pci powerpc/powermac/grackle.c optional powermac pci powerpc/powermac/hrowpic.c optional powermac pci ==== //depot/projects/vimage-commit2/src/sys/conf/files.sparc64#5 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sparc64,v 1.99 2008/09/20 11:34:18 marius Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.100 2008/09/28 00:07:05 marius Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -84,6 +84,7 @@ sparc64/pci/ofw_pcib_subr.c optional pci sparc64/pci/ofw_pcibus.c optional pci sparc64/pci/psycho.c optional pci +sparc64/pci/schizo.c optional pci sparc64/sbus/dma_sbus.c optional sbus sparc64/sbus/sbus.c optional sbus sparc64/sbus/lsi64854.c optional sbus ==== //depot/projects/vimage-commit2/src/sys/conf/options.sparc64#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.sparc64,v 1.17 2008/09/20 11:46:07 marius Exp $ +# $FreeBSD: src/sys/conf/options.sparc64,v 1.18 2008/09/28 00:07:05 marius Exp $ GFB_DEBUG opt_gfb.h GFB_NO_FONT_LOADING opt_gfb.h @@ -24,5 +24,7 @@ DEBUGGER_ON_POWERFAIL opt_psycho.h PSYCHO_DEBUG opt_psycho.h +SCHIZO_DEBUG opt_schizo.h + SUNKBD_DFLT_KEYMAP opt_sunkbd.h SUNKBD_EMULATE_ATKBD opt_sunkbd.h ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_compat.h#5 (text+ko) ==== @@ -4,7 +4,7 @@ * See the IPFILTER.LICENCE file for details on licencing. * * @(#)ip_compat.h 1.8 1/14/96 - * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_compat.h,v 1.36 2008/07/24 12:35:05 darrenr Exp $ + * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_compat.h,v 1.37 2008/09/27 08:51:18 ed Exp $ * Id: ip_compat.h,v 2.142.2.57 2007/10/10 09:51:42 darrenr Exp $ */ @@ -1709,7 +1709,7 @@ # endif # ifndef GET_MINOR -# define GET_MINOR(x) minor(x) +# define GET_MINOR(x) dev2unit(x) # endif # define PANIC(x,y) if (x) panic y #endif /* _KERNEL */ ==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_ioctl.c#9 (text+ko) ==== @@ -40,7 +40,7 @@ #include "opt_inet6.h" #include -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.35 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.36 2008/09/27 08:51:18 ed Exp $"); #endif #ifdef __FreeBSD__ @@ -478,7 +478,7 @@ int pfopen(struct cdev *dev, int flags, int fmt, struct proc *p) { - if (minor(dev) >= 1) + if (dev2unit(dev) >= 1) return (ENXIO); return (0); } @@ -486,7 +486,7 @@ int pfclose(struct cdev *dev, int flags, int fmt, struct proc *p) { - if (minor(dev) >= 1) + if (dev2unit(dev) >= 1) return (ENXIO); return (0); } ==== //depot/projects/vimage-commit2/src/sys/dev/agp/agp.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/agp/agp.c,v 1.59 2008/08/23 15:57:43 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/agp/agp.c,v 1.60 2008/09/27 08:51:18 ed Exp $"); #include "opt_bus.h" @@ -80,7 +80,7 @@ }; static devclass_t agp_devclass; -#define KDEV2DEV(kdev) devclass_get_device(agp_devclass, minor(kdev)) +#define KDEV2DEV(kdev) devclass_get_device(agp_devclass, dev2unit(kdev)) /* Helper functions for implementing chipset mini drivers. */ ==== //depot/projects/vimage-commit2/src/sys/dev/amr/amr.c#3 (text+ko) ==== @@ -56,7 +56,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/amr/amr.c,v 1.86 2008/07/20 16:50:14 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/amr/amr.c,v 1.87 2008/09/27 08:51:18 ed Exp $"); /* * Driver for the AMI MegaRaid family of controllers. @@ -438,7 +438,7 @@ static int amr_open(struct cdev *dev, int flags, int fmt, d_thread_t *td) { - int unit = minor(dev); + int unit = dev2unit(dev); struct amr_softc *sc = devclass_get_softc(devclass_find("amr"), unit); debug_called(1); @@ -494,7 +494,7 @@ static int amr_close(struct cdev *dev, int flags, int fmt, d_thread_t *td) { - int unit = minor(dev); + int unit = dev2unit(dev); struct amr_softc *sc = devclass_get_softc(devclass_find("amr"), unit); debug_called(1); ==== //depot/projects/vimage-commit2/src/sys/dev/arcmsr/arcmsr.c#2 (text+ko) ==== @@ -56,7 +56,7 @@ ** and cause g_vfs_done() read write error ** 1.20.00.15 10/10/2007 Erich Chen support new RAID adapter type ARC120x ****************************************************************************************** -* $FreeBSD: src/sys/dev/arcmsr/arcmsr.c,v 1.27 2007/12/09 19:24:27 scottl Exp $ +* $FreeBSD: src/sys/dev/arcmsr/arcmsr.c,v 1.28 2008/09/27 08:51:18 ed Exp $ */ #include #include @@ -256,7 +256,7 @@ #if __FreeBSD_version < 503000 struct AdapterControlBlock *acb=dev->si_drv1; #else - int unit = minor(dev); + int unit = dev2unit(dev); struct AdapterControlBlock *acb = devclass_get_softc(arcmsr_devclass, unit); #endif if(acb==NULL) { @@ -281,7 +281,7 @@ #if __FreeBSD_version < 503000 struct AdapterControlBlock *acb=dev->si_drv1; #else - int unit = minor(dev); + int unit = dev2unit(dev); struct AdapterControlBlock *acb = devclass_get_softc(arcmsr_devclass, unit); #endif if(acb==NULL) { @@ -306,7 +306,7 @@ #if __FreeBSD_version < 503000 struct AdapterControlBlock *acb=dev->si_drv1; #else - int unit = minor(dev); + int unit = dev2unit(dev); struct AdapterControlBlock *acb = devclass_get_softc(arcmsr_devclass, unit); #endif ==== //depot/projects/vimage-commit2/src/sys/dev/asr/asr.c#2 (text+ko) ==== @@ -163,7 +163,7 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/asr/asr.c,v 1.85 2007/06/17 05:55:48 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/asr/asr.c,v 1.86 2008/09/27 08:51:18 ed Exp $"); #define ASR_VERSION 1 #define ASR_REVISION '1' @@ -3113,7 +3113,7 @@ #undef SCSI_RESET /* Conflicts with "scsi/scsiconf.h" defintion */ #include "dev/asr/osd_unix.h" -#define asr_unit(dev) minor(dev) +#define asr_unit(dev) dev2unit(dev) static u_int8_t ASR_ctlr_held; ==== //depot/projects/vimage-commit2/src/sys/dev/ata/ata-chipset.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.227 2008/09/18 12:12:34 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.228 2008/09/26 07:29:48 sos Exp $"); #include "opt_ata.h" #include @@ -107,7 +107,8 @@ static void ata_intel_31244_tf_write(struct ata_request *request); static void ata_intel_31244_reset(device_t dev); static int ata_ite_chipinit(device_t dev); -static void ata_ite_setmode(device_t dev, int mode); +static void ata_ite_8213_setmode(device_t dev, int mode); +static void ata_ite_821x_setmode(device_t dev, int mode); static int ata_jmicron_chipinit(device_t dev); static int ata_jmicron_allocate(device_t dev); static void ata_jmicron_reset(device_t dev); @@ -2350,52 +2351,54 @@ device_printf(dev, "%ssetting %s on %s chip\n", (error) ? "FAILURE " : "", ata_mode2str(mode), ctlr->chip->text); - if (error) - return; + if (!error) { + if (mode >= ATA_UDMA0) { + u_int8_t utimings[] = { 0x00, 0x01, 0x10, 0x01, 0x10, 0x01, 0x10 }; + + pci_write_config(gparent, 0x48, reg48 | (0x0001 << devno), 2); + pci_write_config(gparent, 0x4a, + (reg4a & ~(0x3 << (devno << 2))) | + (utimings[mode & ATA_MODE_MASK] << (devno<<2)), 2); + } + else { + pci_write_config(gparent, 0x48, reg48 & ~(0x0001 << devno), 2); + pci_write_config(gparent, 0x4a, (reg4a & ~(0x3 << (devno << 2))),2); + } + reg54 |= 0x0400; + if (mode >= ATA_UDMA2) + reg54 |= (0x1 << devno); + else + reg54 &= ~(0x1 << devno); + if (mode >= ATA_UDMA5) + reg54 |= (0x1000 << devno); + else + reg54 &= ~(0x1000 << devno); - if (mode >= ATA_UDMA0) { - pci_write_config(gparent, 0x48, reg48 | (0x0001 << devno), 2); - pci_write_config(gparent, 0x4a, - (reg4a & ~(0x3 << (devno << 2))) | - ((0x01 + !(mode & 0x01)) << (devno << 2)), 2); - } - else { - pci_write_config(gparent, 0x48, reg48 & ~(0x0001 << devno), 2); - pci_write_config(gparent, 0x4a, (reg4a & ~(0x3 << (devno << 2))), 2); - } - reg54 |= 0x0400; - if (mode >= ATA_UDMA2) - pci_write_config(gparent, 0x54, reg54 | (0x1 << devno), 2); - else - pci_write_config(gparent, 0x54, reg54 & ~(0x1 << devno), 2); + pci_write_config(gparent, 0x54, reg54, 2); - if (mode >= ATA_UDMA5) - pci_write_config(gparent, 0x54, reg54 | (0x1000 << devno), 2); - else - pci_write_config(gparent, 0x54, reg54 & ~(0x1000 << devno), 2); + reg40 &= ~0x00ff00ff; + reg40 |= 0x40774077; - reg40 &= ~0x00ff00ff; - reg40 |= 0x40774077; + if (atadev->unit == ATA_MASTER) { + mask40 = 0x3300; + new40 = timings[ata_mode2idx(mode)] << 8; + } + else { + mask44 = 0x0f; + new44 = ((timings[ata_mode2idx(mode)] & 0x30) >> 2) | + (timings[ata_mode2idx(mode)] & 0x03); + } + if (ch->unit) { + mask40 <<= 16; + new40 <<= 16; + mask44 <<= 4; + new44 <<= 4; + } + pci_write_config(gparent, 0x40, (reg40 & ~mask40) | new40, 4); + pci_write_config(gparent, 0x44, (reg44 & ~mask44) | new44, 1); - if (atadev->unit == ATA_MASTER) { - mask40 = 0x3300; - new40 = timings[ata_mode2idx(mode)] << 8; - } - else { - mask44 = 0x0f; - new44 = ((timings[ata_mode2idx(mode)] & 0x30) >> 2) | - (timings[ata_mode2idx(mode)] & 0x03); - } - if (ch->unit) { - mask40 <<= 16; - new40 <<= 16; - mask44 <<= 4; - new44 <<= 4; + atadev->mode = mode; } - pci_write_config(gparent, 0x40, (reg40 & ~mask40) | new40, 4); - pci_write_config(gparent, 0x44, (reg44 & ~mask44) | new44, 1); - - atadev->mode = mode; } static void @@ -2555,7 +2558,8 @@ { struct ata_pci_controller *ctlr = device_get_softc(dev); static struct ata_chip_id ids[] = - {{ ATA_IT8212F, 0x00, 0x00, 0x00, ATA_UDMA6, "IT8212F" }, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Sep 29 14:40:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E08851065688; Mon, 29 Sep 2008 14:40:15 +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 A5037106568A for ; Mon, 29 Sep 2008 14:40:15 +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 7C01F8FC15 for ; Mon, 29 Sep 2008 14:40:15 +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 m8TEeFhR098331 for ; Mon, 29 Sep 2008 14:40:15 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8TEeFCK098325 for perforce@freebsd.org; Mon, 29 Sep 2008 14:40:15 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 29 Sep 2008 14:40:15 GMT Message-Id: <200809291440.m8TEeFCK098325@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 150654 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, 29 Sep 2008 14:40:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=150654 Change 150654 by hselasky@hselasky_laptop001 on 2008/09/29 14:40:00 Regression issue. Increase the size of the buffer for the MAC-address. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cdce2.c#9 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cdce2.c#9 (text+ko) ==== @@ -228,7 +228,7 @@ uint8_t alt_index; uint8_t i; uint8_t eaddr[ETHER_ADDR_LEN]; - char eaddr_str[3 * ETHER_ADDR_LEN]; /* approx */ + char eaddr_str[5 * ETHER_ADDR_LEN]; /* approx */ if (sc == NULL) { return (ENOMEM); From owner-p4-projects@FreeBSD.ORG Mon Sep 29 17:42:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C9BDC1065678; Mon, 29 Sep 2008 17:42:25 +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 8746E10656AA for ; Mon, 29 Sep 2008 17:42:25 +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 7547E8FC19 for ; Mon, 29 Sep 2008 17:42:25 +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 m8THgPfX037447 for ; Mon, 29 Sep 2008 17:42:25 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8THgPiN037441 for perforce@freebsd.org; Mon, 29 Sep 2008 17:42:25 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 29 Sep 2008 17:42:25 GMT Message-Id: <200809291742.m8THgPiN037441@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 150659 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, 29 Sep 2008 17:42:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=150659 Change 150659 by hselasky@hselasky_laptop001 on 2008/09/29 17:41:31 Sync with the Penguins: Videodev updates from Fritz Katz. Affected files ... .. //depot/projects/usb/src/sys/sys/videodev.h#8 edit Differences ... ==== //depot/projects/usb/src/sys/sys/videodev.h#8 (text+ko) ==== @@ -557,7 +557,7 @@ #define V4L2_STD_PAL_M (1ULL << 0x08) #define V4L2_STD_PAL_N (1ULL << 0x09) -#define V4L2_STD_PAL_NC (1ULL << 0x0A) +#define V4L2_STD_PAL_Nc (1ULL << 0x0A) #define V4L2_STD_PAL_60 (1ULL << 0x0B) #define V4L2_STD_NTSC_M (1ULL << 0x0C) @@ -579,7 +579,7 @@ #define V4L2_STD_ATSC_16_VSB (1ULL << 0x1A) /* some merged standards */ -#define V4L2_STD_MN (V4L2_STD_PAL_M|V4L2_STD_PAL_N|V4L2_STD_PAL_NC|V4L2_STD_NTSC) +#define V4L2_STD_MN (V4L2_STD_PAL_M|V4L2_STD_PAL_N|V4L2_STD_PAL_Nc|V4L2_STD_NTSC) #define V4L2_STD_B (V4L2_STD_PAL_B|V4L2_STD_PAL_B1|V4L2_STD_SECAM_B) #define V4L2_STD_GH (V4L2_STD_PAL_G|V4L2_STD_PAL_H|V4L2_STD_SECAM_G|V4L2_STD_SECAM_H) #define V4L2_STD_DK (V4L2_STD_PAL_DK|V4L2_STD_SECAM_DK) @@ -614,7 +614,7 @@ V4L2_STD_NTSC_443) #define V4L2_STD_625_50 (V4L2_STD_PAL | \ V4L2_STD_PAL_N | \ - V4L2_STD_PAL_NC | \ + V4L2_STD_PAL_Nc | \ V4L2_STD_SECAM) #define V4L2_STD_ATSC (V4L2_STD_ATSC_8_VSB | \ V4L2_STD_ATSC_16_VSB) @@ -759,13 +759,13 @@ #define V4L2_CID_AUDIO_TREBLE (V4L2_CID_BASE+8) #define V4L2_CID_AUDIO_MUTE (V4L2_CID_BASE+9) #define V4L2_CID_AUDIO_LOUDNESS (V4L2_CID_BASE+10) -#define V4L2_CID_BLACK_LEVEL (V4L2_CID_BASE+11) +#define V4L2_CID_BLACK_LEVEL (V4L2_CID_BASE+11) /* Deprecated */ #define V4L2_CID_AUTO_WHITE_BALANCE (V4L2_CID_BASE+12) #define V4L2_CID_DO_WHITE_BALANCE (V4L2_CID_BASE+13) #define V4L2_CID_RED_BALANCE (V4L2_CID_BASE+14) #define V4L2_CID_BLUE_BALANCE (V4L2_CID_BASE+15) #define V4L2_CID_GAMMA (V4L2_CID_BASE+16) -#define V4L2_CID_WHITENESS (V4L2_CID_GAMMA) /* ? Not sure */ +#define V4L2_CID_WHITENESS (V4L2_CID_GAMMA) /* Deprecated */ #define V4L2_CID_EXPOSURE (V4L2_CID_BASE+17) #define V4L2_CID_AUTOGAIN (V4L2_CID_BASE+18) #define V4L2_CID_GAIN (V4L2_CID_BASE+19) @@ -773,7 +773,20 @@ #define V4L2_CID_VFLIP (V4L2_CID_BASE+21) #define V4L2_CID_HCENTER (V4L2_CID_BASE+22) #define V4L2_CID_VCENTER (V4L2_CID_BASE+23) -#define V4L2_CID_LASTP1 (V4L2_CID_BASE+24) /* last CID + 1 */ +#define V4L2_CID_POWER_LINE_FREQUENCY (V4L2_CID_BASE+24) +enum v4l2_power_line_frequency { + V4L2_CID_POWER_LINE_FREQUENCY_DISABLED = 0, + V4L2_CID_POWER_LINE_FREQUENCY_50HZ = 1, + V4L2_CID_POWER_LINE_FREQUENCY_60HZ = 2, +}; + +#define V4L2_CID_HUE_AUTO (V4L2_CID_BASE+25) +#define V4L2_CID_WHITE_BALANCE_TEMPERATURE (V4L2_CID_BASE+26) +#define V4L2_CID_SHARPNESS (V4L2_CID_BASE+27) +#define V4L2_CID_BACKLIGHT_COMPENSATION (V4L2_CID_BASE+28) +#define V4L2_CID_CHROMA_AGC (V4L2_CID_BASE+29) +#define V4L2_CID_COLOR_KILLER (V4L2_CID_BASE+30) +#define V4L2_CID_LASTP1 (V4L2_CID_BASE+31) /* last CID + 1 */ /* MPEG-class control IDs defined by V4L2 */ #define V4L2_CID_MPEG_BASE (V4L2_CTRL_CLASS_MPEG | 0x900) From owner-p4-projects@FreeBSD.ORG Mon Sep 29 21:18:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F0EC4106568D; Mon, 29 Sep 2008 21:18: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 B439F106568A for ; Mon, 29 Sep 2008 21:18:10 +0000 (UTC) (envelope-from snb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A266A8FC1C for ; Mon, 29 Sep 2008 21:18:10 +0000 (UTC) (envelope-from snb@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 m8TLIA8B077122 for ; Mon, 29 Sep 2008 21:18:10 GMT (envelope-from snb@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8TLIAHe077116 for perforce@freebsd.org; Mon, 29 Sep 2008 21:18:10 GMT (envelope-from snb@FreeBSD.org) Date: Mon, 29 Sep 2008 21:18:10 GMT Message-Id: <200809292118.m8TLIAHe077116@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to snb@FreeBSD.org using -f From: Nick Barkas To: Perforce Change Reviews Cc: Subject: PERFORCE change 150670 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, 29 Sep 2008 21:18:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=150670 Change 150670 by snb@snb_toro on 2008/09/29 21:17:43 Don't need a declaration for this function. Affected files ... .. //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/freebsd7/ufs_dirhash.c#3 edit .. //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/ufs_dirhash.c#12 edit Differences ... ==== //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/freebsd7/ufs_dirhash.c#3 (text+ko) ==== @@ -96,7 +96,6 @@ static int ufsdirhash_findslot(struct dirhash *dh, char *name, int namelen, doff_t offset); static doff_t ufsdirhash_getprev(struct direct *dp, doff_t offset); -static int ufsdirhash_destroy(struct dirhash *dh); static int ufsdirhash_recycle(int wanted); static void ufsdirhash_lowmem(void); ==== //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/ufs_dirhash.c#12 (text+ko) ==== @@ -98,7 +98,6 @@ static int ufsdirhash_findslot(struct dirhash *dh, char *name, int namelen, doff_t offset); static doff_t ufsdirhash_getprev(struct direct *dp, doff_t offset); -static int ufsdirhash_destroy(struct dirhash *dh); static int ufsdirhash_recycle(int wanted); static void ufsdirhash_lowmem(void); static void ufsdirhash_free_locked(struct inode *ip); From owner-p4-projects@FreeBSD.ORG Mon Sep 29 21:33:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AB7011065697; Mon, 29 Sep 2008 21:33:26 +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 566E51065695 for ; Mon, 29 Sep 2008 21:33:26 +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 44D388FC17 for ; Mon, 29 Sep 2008 21:33:26 +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 m8TLXQRd066463 for ; Mon, 29 Sep 2008 21:33:26 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8TLXQbh066454 for perforce@freebsd.org; Mon, 29 Sep 2008 21:33:26 GMT (envelope-from pgj@FreeBSD.org) Date: Mon, 29 Sep 2008 21:33:26 GMT Message-Id: <200809292133.m8TLXQbh066454@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 150671 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, 29 Sep 2008 21:33:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=150671 Change 150671 by pgj@kolbasz on 2008/09/29 21:33:23 IFC Affected files ... .. //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent#6 integrate .. //depot/projects/docproj_hu/doc/share/sgml/man-refs.ent#7 integrate Differences ... ==== //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent#6 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -395,6 +395,10 @@ FreeBSD sun4v porting mailing list"> freebsd-sun4v"> + +FreeBSD SVN src commit list"> +svn-src"> + FreeBSD test mailing list"> freebsd-test"> ==== //depot/projects/docproj_hu/doc/share/sgml/man-refs.ent#7 (text+ko) ==== @@ -20,7 +20,7 @@ lexicographical order by the entity (i.e., the dots used in place of special characters should not be expanded when comparing). - $FreeBSD: doc/share/sgml/man-refs.ent,v 1.467 2008/09/18 07:11:04 gabor Exp $ + $FreeBSD: doc/share/sgml/man-refs.ent,v 1.469 2008/09/28 19:09:35 danger Exp $ --> @@ -727,9 +727,11 @@ + + @@ -3439,6 +3441,7 @@ + From owner-p4-projects@FreeBSD.ORG Tue Sep 30 00:33:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A974F106568E; Tue, 30 Sep 2008 00:33: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 603261065697 for ; Tue, 30 Sep 2008 00:33: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 4E1AC8FC3D for ; Tue, 30 Sep 2008 00:33: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 m8U0XSps014759 for ; Tue, 30 Sep 2008 00:33:28 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8U0XSc3014746 for perforce@freebsd.org; Tue, 30 Sep 2008 00:33:28 GMT (envelope-from pgj@FreeBSD.org) Date: Tue, 30 Sep 2008 00:33:28 GMT Message-Id: <200809300033.m8U0XSc3014746@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 150673 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, 30 Sep 2008 00:33:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=150673 Change 150673 by pgj@kolbasz on 2008/09/30 00:33:08 MFen (www): 1.113 -> 1.115 hu/search/search.sgml Affected files ... .. //depot/projects/docproj_hu/www/hu/search/search.sgml#14 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/search/search.sgml#14 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -23,14 +23,19 @@ href="http://www.FreeBSD.org/cgi/query-pr-summary.cgi?query">GNATS hibajelentések adatbázisa
  • Man oldalak
  • Változások a portokban
    • + + +

    + +

    A &os; OpenSearch bõvítmények listája

    Weboldalak (beleértve a GYIK @@ -56,7 +61,7 @@ - + From owner-p4-projects@FreeBSD.ORG Tue Sep 30 00:39:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F379F106568A; Tue, 30 Sep 2008 00:39: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 B4A521065686 for ; Tue, 30 Sep 2008 00:39:36 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A08B38FC17 for ; Tue, 30 Sep 2008 00:39:36 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8U0dagU050371 for ; Tue, 30 Sep 2008 00:39:36 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8U0dZ2s050365 for perforce@freebsd.org; Tue, 30 Sep 2008 00:39:35 GMT (envelope-from peter-gmail@wemm.org) Date: Tue, 30 Sep 2008 00:39:35 GMT Message-Id: <200809300039.m8U0dZ2s050365@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 150674 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, 30 Sep 2008 00:39:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=150674 Change 150674 by peter@peter_overcee on 2008/09/30 00:38:55 IFC @150672 Affected files ... .. //depot/projects/hammer/Makefile.inc1#140 integrate .. //depot/projects/hammer/ObsoleteFiles.inc#61 integrate .. //depot/projects/hammer/bin/pkill/pkill.1#2 integrate .. //depot/projects/hammer/bin/pkill/pkill.c#2 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c#2 integrate .. //depot/projects/hammer/crypto/openssh/moduli.5#2 integrate .. //depot/projects/hammer/crypto/openssh/scp.1#11 integrate .. //depot/projects/hammer/crypto/openssh/sftp-server.8#6 integrate .. //depot/projects/hammer/crypto/openssh/sftp.1#11 integrate .. //depot/projects/hammer/crypto/openssh/ssh-add.1#8 integrate .. //depot/projects/hammer/crypto/openssh/ssh-agent.1#9 integrate .. //depot/projects/hammer/crypto/openssh/ssh-keygen.1#10 integrate .. //depot/projects/hammer/crypto/openssh/ssh-keyscan.1#9 integrate .. //depot/projects/hammer/crypto/openssh/ssh-keysign.8#7 integrate .. //depot/projects/hammer/crypto/openssh/ssh.1#13 integrate .. //depot/projects/hammer/crypto/openssh/ssh_config.5#16 integrate .. //depot/projects/hammer/crypto/openssh/sshconnect2.c#13 integrate .. //depot/projects/hammer/crypto/openssh/sshd.8#13 integrate .. //depot/projects/hammer/crypto/openssh/sshd_config.5#18 integrate .. //depot/projects/hammer/crypto/openssl/FREEBSD-Xlist#5 delete .. //depot/projects/hammer/crypto/openssl/FREEBSD-upgrade#3 delete .. //depot/projects/hammer/etc/Makefile#64 integrate .. //depot/projects/hammer/etc/periodic/daily/Makefile#8 integrate .. //depot/projects/hammer/etc/periodic/monthly/Makefile#2 integrate .. //depot/projects/hammer/etc/periodic/security/Makefile#6 integrate .. //depot/projects/hammer/etc/periodic/weekly/Makefile#3 integrate .. //depot/projects/hammer/etc/rc.d/jail#25 integrate .. //depot/projects/hammer/gnu/lib/csu/Makefile#13 integrate .. //depot/projects/hammer/gnu/lib/libgcc/Makefile#19 integrate .. //depot/projects/hammer/gnu/lib/libgomp/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/Makefile#21 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/kld.c#4 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/trgt_i386.c#9 integrate .. //depot/projects/hammer/include/Makefile#76 integrate .. //depot/projects/hammer/include/unistd.h#27 integrate .. //depot/projects/hammer/lib/Makefile#73 integrate .. //depot/projects/hammer/lib/libarchive/archive.h#16 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry.h#25 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_mtree.c#7 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_mtree.c#4 integrate .. //depot/projects/hammer/lib/libc/gen/getosreldate.3#3 integrate .. //depot/projects/hammer/lib/libc/powerpc/gen/syncicache.c#4 integrate .. //depot/projects/hammer/lib/libc/sys/cpuset.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/cpuset_getaffinity.2#3 integrate .. //depot/projects/hammer/lib/libc/uuid/Symbol.map#4 integrate .. //depot/projects/hammer/lib/libpmc/pmc.3#17 integrate .. //depot/projects/hammer/lib/libpmc/pmc_allocate.3#2 integrate .. //depot/projects/hammer/lib/libpmc/pmc_capabilities.3#3 integrate .. //depot/projects/hammer/lib/libpmc/pmc_disable.3#2 integrate .. //depot/projects/hammer/lib/libpmc/pmc_start.3#2 integrate .. //depot/projects/hammer/libexec/Makefile#35 integrate .. //depot/projects/hammer/release/i386/fixit_crunch.conf#10 integrate .. //depot/projects/hammer/release/pc98/fixit-small_crunch.conf#10 integrate .. //depot/projects/hammer/release/pc98/fixit_crunch.conf#10 integrate .. //depot/projects/hammer/sbin/Makefile#50 integrate .. //depot/projects/hammer/sbin/bsdlabel/Makefile#11 integrate .. //depot/projects/hammer/sbin/bsdlabel/bsdlabel.c#23 integrate .. //depot/projects/hammer/sbin/fdisk/Makefile#5 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.8#53 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.c#41 integrate .. //depot/projects/hammer/sbin/ifconfig/ifieee80211.c#37 integrate .. //depot/projects/hammer/sbin/ifconfig/regdomain.c#4 integrate .. //depot/projects/hammer/sbin/init/init.c#13 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw.8#68 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw2.c#66 integrate .. //depot/projects/hammer/sbin/mount_nfs/mount_nfs.c#18 integrate .. //depot/projects/hammer/sbin/setkey/setkey.8#6 integrate .. //depot/projects/hammer/share/Makefile#12 integrate .. //depot/projects/hammer/share/examples/drivers/make_pseudo_driver.sh#4 integrate .. //depot/projects/hammer/share/man/man3/Makefile#21 integrate .. //depot/projects/hammer/share/man/man3/makedev.3#1 branch .. //depot/projects/hammer/share/man/man4/age.4#2 integrate .. //depot/projects/hammer/share/man/man4/hwpmc.4#18 integrate .. //depot/projects/hammer/share/man/man4/snd_hda.4#11 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#94 integrate .. //depot/projects/hammer/share/man/man5/src.conf.5#20 integrate .. //depot/projects/hammer/share/man/man9/Makefile#87 integrate .. //depot/projects/hammer/share/man/man9/device_ids.9#4 delete .. //depot/projects/hammer/share/man/man9/make_dev.9#13 integrate .. //depot/projects/hammer/share/man/man9/spl.9#5 integrate .. //depot/projects/hammer/share/misc/committers-src.dot#15 integrate .. //depot/projects/hammer/share/mk/bsd.own.mk#28 integrate .. //depot/projects/hammer/sys/amd64/amd64/elf_machdep.c#37 integrate .. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#61 integrate .. //depot/projects/hammer/sys/amd64/amd64/mem.c#29 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#134 integrate .. //depot/projects/hammer/sys/amd64/include/smp.h#37 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_sysvec.c#23 integrate .. //depot/projects/hammer/sys/arm/arm/elf_machdep.c#8 integrate .. //depot/projects/hammer/sys/arm/arm/mem.c#5 integrate .. //depot/projects/hammer/sys/arm/arm/pmap.c#52 integrate .. //depot/projects/hammer/sys/arm/at91/at91_mci.c#5 integrate .. //depot/projects/hammer/sys/boot/Makefile#22 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/Makefile#6 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/ofw_console.c#8 integrate .. //depot/projects/hammer/sys/cam/cam.h#3 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_pass.c#12 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_sa.c#22 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_ses.c#17 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_sg.c#4 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_target.c#21 integrate .. //depot/projects/hammer/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#2 integrate .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/atomic.h#3 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#4 integrate .. //depot/projects/hammer/sys/cddl/dev/dtrace/dtrace_clone.c#2 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_ioctl.c#1 branch .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_ioctl.h#1 branch .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#58 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#58 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#55 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#55 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#55 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_util.h#5 integrate .. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#60 integrate .. //depot/projects/hammer/sys/compat/ia32/ia32_sysvec.c#22 integrate .. //depot/projects/hammer/sys/compat/linprocfs/linprocfs.c#43 integrate .. //depot/projects/hammer/sys/compat/linux/linux_misc.c#54 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_sysvec.c#21 integrate .. //depot/projects/hammer/sys/conf/files#188 integrate .. //depot/projects/hammer/sys/conf/files.amd64#106 integrate .. //depot/projects/hammer/sys/conf/files.i386#97 integrate .. //depot/projects/hammer/sys/conf/files.ia64#42 integrate .. //depot/projects/hammer/sys/conf/files.mips#3 integrate .. //depot/projects/hammer/sys/conf/files.powerpc#33 integrate .. //depot/projects/hammer/sys/conf/files.sparc64#47 integrate .. //depot/projects/hammer/sys/conf/kern.pre.mk#55 integrate .. //depot/projects/hammer/sys/conf/ldscript.mips#3 integrate .. //depot/projects/hammer/sys/conf/options.mips#2 integrate .. //depot/projects/hammer/sys/conf/options.sparc64#13 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_compat.h#17 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pf_ioctl.c#32 integrate .. //depot/projects/hammer/sys/ddb/db_command.c#25 integrate .. //depot/projects/hammer/sys/ddb/db_command.h#4 integrate .. //depot/projects/hammer/sys/ddb/db_main.c#6 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_quirk.c#5 integrate .. //depot/projects/hammer/sys/dev/agp/agp.c#3 integrate .. //depot/projects/hammer/sys/dev/amr/amr.c#40 integrate .. //depot/projects/hammer/sys/dev/arcmsr/arcmsr.c#16 integrate .. //depot/projects/hammer/sys/dev/asr/asr.c#25 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#91 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.c#48 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.h#56 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-tape.c#25 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath.c#61 integrate .. //depot/projects/hammer/sys/dev/ath/if_athvar.h#33 integrate .. //depot/projects/hammer/sys/dev/atkbdc/psm.c#13 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#84 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_os.c#20 integrate .. //depot/projects/hammer/sys/dev/bm/if_bm.c#4 integrate .. //depot/projects/hammer/sys/dev/ce/if_ce.c#8 integrate .. //depot/projects/hammer/sys/dev/cfe/cfe_api.c#1 branch .. //depot/projects/hammer/sys/dev/cfe/cfe_api.h#1 branch .. //depot/projects/hammer/sys/dev/cfe/cfe_api_int.h#1 branch .. //depot/projects/hammer/sys/dev/cfe/cfe_console.c#1 branch .. //depot/projects/hammer/sys/dev/cfe/cfe_error.h#1 branch .. //depot/projects/hammer/sys/dev/cfe/cfe_ioctl.h#1 branch .. //depot/projects/hammer/sys/dev/cfe/cfe_resource.c#1 branch .. //depot/projects/hammer/sys/dev/cp/if_cp.c#27 integrate .. //depot/projects/hammer/sys/dev/cpuctl/cpuctl.c#2 integrate .. //depot/projects/hammer/sys/dev/ctau/if_ct.c#30 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_ael1002.c#8 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_common.h#10 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_mc5.c#7 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#5 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_t3_hw.c#11 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_tn1010.c#2 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_vsc7323.c#4 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_vsc8211.c#6 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_xgmac.c#9 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_adapter.h#21 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_config.h#8 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_include.h#6 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_main.c#25 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_multiq.c#4 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_offload.c#11 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_offload.h#11 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_osdep.h#13 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_sge.c#23 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_t3fw.c#2 integrate .. //depot/projects/hammer/sys/dev/cxgb/sys/cxgb_support.c#7 integrate .. //depot/projects/hammer/sys/dev/cxgb/sys/mvec.h#9 integrate .. //depot/projects/hammer/sys/dev/cxgb/sys/uipc_mvec.c#8 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#3 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#2 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c#2 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_dbg.c#2 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c#2 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c#2 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c#2 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c#2 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c#2 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c#2 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/toecore/toedev.c#3 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#11 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#11 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#7 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_defs.h#5 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_l2t.c#3 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_l2t.h#2 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_listen.c#6 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#4 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c#3 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#4 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_tom.c#7 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_tom.h#3 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#5 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_vm.c#2 integrate .. //depot/projects/hammer/sys/dev/drm/drm_drv.c#7 integrate .. //depot/projects/hammer/sys/dev/drm/drm_fops.c#4 integrate .. //depot/projects/hammer/sys/dev/fb/fb.c#10 integrate .. //depot/projects/hammer/sys/dev/fb/vgareg.h#5 integrate .. //depot/projects/hammer/sys/dev/firewire/firewire.h#11 integrate .. //depot/projects/hammer/sys/dev/firewire/fwdev.c#23 integrate .. //depot/projects/hammer/sys/dev/hptiop/hptiop.c#4 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_amd.c#12 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_mod.c#24 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_piv.c#12 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_ppro.c#8 integrate .. //depot/projects/hammer/sys/dev/iir/iir_ctrl.c#12 integrate .. //depot/projects/hammer/sys/dev/iscsi/initiator/isc_cam.c#2 integrate .. //depot/projects/hammer/sys/dev/iscsi/initiator/iscsi.c#3 integrate .. //depot/projects/hammer/sys/dev/isp/isp_freebsd.c#33 integrate .. //depot/projects/hammer/sys/dev/jme/if_jme.c#4 integrate .. //depot/projects/hammer/sys/dev/jme/if_jmereg.h#3 integrate .. //depot/projects/hammer/sys/dev/joy/joy.c#8 integrate .. //depot/projects/hammer/sys/dev/kbd/kbd.c#16 integrate .. //depot/projects/hammer/sys/dev/kbdmux/kbdmux.c#8 integrate .. //depot/projects/hammer/sys/dev/le/if_le_cbus.c#4 integrate .. //depot/projects/hammer/sys/dev/le/if_le_isa.c#4 integrate .. //depot/projects/hammer/sys/dev/le/if_le_lebuffer.c#3 integrate .. //depot/projects/hammer/sys/dev/le/if_le_pci.c#5 integrate .. //depot/projects/hammer/sys/dev/le/lebuffer_sbus.c#2 integrate .. //depot/projects/hammer/sys/dev/led/led.c#17 integrate .. //depot/projects/hammer/sys/dev/mlx/mlx.c#14 integrate .. //depot/projects/hammer/sys/dev/mly/mly.c#19 integrate .. //depot/projects/hammer/sys/dev/mmc/mmc.c#3 integrate .. //depot/projects/hammer/sys/dev/mmc/mmcbrvar.h#3 integrate .. //depot/projects/hammer/sys/dev/mmc/mmcreg.h#3 integrate .. //depot/projects/hammer/sys/dev/mmc/mmcsd.c#4 integrate .. //depot/projects/hammer/sys/dev/mmc/mmcvar.h#3 integrate .. //depot/projects/hammer/sys/dev/mse/mse.c#8 integrate .. //depot/projects/hammer/sys/dev/msk/if_msk.c#12 integrate .. //depot/projects/hammer/sys/dev/msk/if_mskreg.h#7 integrate .. //depot/projects/hammer/sys/dev/pbio/pbio.c#7 integrate .. //depot/projects/hammer/sys/dev/pci/vga_pci.c#4 integrate .. //depot/projects/hammer/sys/dev/powermac_nvram/powermac_nvram.c#3 integrate .. //depot/projects/hammer/sys/dev/ppbus/lpt.c#16 integrate .. //depot/projects/hammer/sys/dev/ppbus/pcfclock.c#11 integrate .. //depot/projects/hammer/sys/dev/ppbus/ppi.c#13 integrate .. //depot/projects/hammer/sys/dev/rp/rpvar.h#7 integrate .. //depot/projects/hammer/sys/dev/siba/siba.c#1 branch .. //depot/projects/hammer/sys/dev/siba/siba_ids.h#1 branch .. //depot/projects/hammer/sys/dev/siba/siba_pcib.c#1 branch .. //depot/projects/hammer/sys/dev/siba/siba_pcibvar.h#1 branch .. //depot/projects/hammer/sys/dev/siba/sibareg.h#1 branch .. //depot/projects/hammer/sys/dev/siba/sibavar.h#1 branch .. //depot/projects/hammer/sys/dev/snp/snp.c#28 integrate .. //depot/projects/hammer/sys/dev/sound/midi/sequencer.c#12 integrate .. //depot/projects/hammer/sys/dev/sound/pci/emu10kx.c#7 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/dsp.c#36 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/mixer.c#25 integrate .. //depot/projects/hammer/sys/dev/speaker/spkr.c#6 integrate .. //depot/projects/hammer/sys/dev/streams/streams.c#18 integrate .. //depot/projects/hammer/sys/dev/tdfx/tdfx_pci.c#18 integrate .. //depot/projects/hammer/sys/dev/twa/tw_osl_freebsd.c#9 integrate .. //depot/projects/hammer/sys/dev/twe/twe_freebsd.c#18 integrate .. //depot/projects/hammer/sys/dev/usb/if_zyd.c#15 integrate .. //depot/projects/hammer/sys/dev/usb/ubsa.c#24 integrate .. //depot/projects/hammer/sys/dev/usb/ucomvar.h#11 integrate .. //depot/projects/hammer/sys/dev/usb/ufm.c#15 integrate .. //depot/projects/hammer/sys/dev/usb/ugen.c#32 integrate .. //depot/projects/hammer/sys/dev/usb/uhid.c#25 integrate .. //depot/projects/hammer/sys/dev/usb/ulpt.c#18 integrate .. //depot/projects/hammer/sys/dev/usb/umass.c#51 integrate .. //depot/projects/hammer/sys/dev/usb/ums.c#28 integrate .. //depot/projects/hammer/sys/dev/usb/urio.c#13 integrate .. //depot/projects/hammer/sys/dev/usb/usb.c#23 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#110 integrate .. //depot/projects/hammer/sys/dev/usb/uscanner.c#32 integrate .. //depot/projects/hammer/sys/dev/vkbd/vkbd.c#14 integrate .. //depot/projects/hammer/sys/dev/xen/blkfront/blkfront.c#2 integrate .. //depot/projects/hammer/sys/dev/xen/console/console.c#2 integrate .. //depot/projects/hammer/sys/dev/xen/netfront/netfront.c#2 integrate .. //depot/projects/hammer/sys/fs/coda/coda_fbsd.c#3 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_devs.c#22 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#61 integrate .. //depot/projects/hammer/sys/fs/fdescfs/fdesc_vnops.c#26 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs_vnops.c#27 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vnops.c#40 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_vnops.c#24 integrate .. //depot/projects/hammer/sys/fs/portalfs/portal_vnops.c#18 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_vnops.c#29 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_node.c#28 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs.h#9 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_subr.c#12 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_vnops.c#14 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vnops.c#41 integrate .. //depot/projects/hammer/sys/geom/geom_dev.c#40 integrate .. //depot/projects/hammer/sys/geom/geom_io.c#43 integrate .. //depot/projects/hammer/sys/geom/part/g_part.c#16 integrate .. //depot/projects/hammer/sys/geom/part/g_part_bsd.c#7 integrate .. //depot/projects/hammer/sys/geom/part/g_part_pc98.c#5 integrate .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#8 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_machdep.c#32 integrate .. //depot/projects/hammer/sys/i386/bios/apm.c#18 integrate .. //depot/projects/hammer/sys/i386/bios/apm.h#5 integrate .. //depot/projects/hammer/sys/i386/bios/smapi.c#10 integrate .. //depot/projects/hammer/sys/i386/i386/bios.c#21 integrate .. //depot/projects/hammer/sys/i386/i386/db_trace.c#24 integrate .. //depot/projects/hammer/sys/i386/i386/elf_machdep.c#16 integrate .. //depot/projects/hammer/sys/i386/i386/identcpu.c#45 integrate .. //depot/projects/hammer/sys/i386/i386/intr_machdep.c#28 integrate .. //depot/projects/hammer/sys/i386/i386/mem.c#14 integrate .. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#77 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#116 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_sysvec.c#10 integrate .. //depot/projects/hammer/sys/i386/include/param.h#15 integrate .. //depot/projects/hammer/sys/i386/include/smp.h#20 integrate .. //depot/projects/hammer/sys/i386/include/xen/evtchn.h#2 integrate .. //depot/projects/hammer/sys/i386/linux/linux_sysvec.c#34 integrate .. //depot/projects/hammer/sys/i386/xen/mp_machdep.c#2 integrate .. //depot/projects/hammer/sys/i386/xen/pmap.c#3 integrate .. //depot/projects/hammer/sys/i386/xen/xen_machdep.c#4 integrate .. //depot/projects/hammer/sys/ia64/ia64/efi.c#4 integrate .. //depot/projects/hammer/sys/ia64/ia64/elf_machdep.c#23 integrate .. //depot/projects/hammer/sys/ia64/ia64/interrupt.c#32 integrate .. //depot/projects/hammer/sys/ia64/ia64/mem.c#12 integrate .. //depot/projects/hammer/sys/ia64/ia64/mp_machdep.c#23 integrate .. //depot/projects/hammer/sys/ia64/ia64/sal.c#7 integrate .. //depot/projects/hammer/sys/ia64/include/smp.h#5 integrate .. //depot/projects/hammer/sys/kern/imgact_aout.c#20 integrate .. //depot/projects/hammer/sys/kern/init_main.c#56 integrate .. //depot/projects/hammer/sys/kern/init_sysent.c#71 integrate .. //depot/projects/hammer/sys/kern/kern_condvar.c#30 integrate .. //depot/projects/hammer/sys/kern/kern_conf.c#54 integrate .. //depot/projects/hammer/sys/kern/kern_intr.c#54 integrate .. //depot/projects/hammer/sys/kern/kern_pmc.c#7 integrate .. //depot/projects/hammer/sys/kern/kern_shutdown.c#54 integrate .. //depot/projects/hammer/sys/kern/kern_synch.c#70 integrate .. //depot/projects/hammer/sys/kern/kern_syscalls.c#6 integrate .. //depot/projects/hammer/sys/kern/makesyscalls.sh#14 integrate .. //depot/projects/hammer/sys/kern/subr_clist.c#3 integrate .. //depot/projects/hammer/sys/kern/subr_witness.c#77 integrate .. //depot/projects/hammer/sys/kern/sys_generic.c#40 integrate .. //depot/projects/hammer/sys/kern/syscalls.c#69 integrate .. //depot/projects/hammer/sys/kern/syscalls.master#71 integrate .. //depot/projects/hammer/sys/kern/systrace_args.c#15 integrate .. //depot/projects/hammer/sys/kern/tty.c#63 integrate .. //depot/projects/hammer/sys/kern/tty_pts.c#11 integrate .. //depot/projects/hammer/sys/kern/tty_ttydisc.c#3 integrate .. //depot/projects/hammer/sys/kern/uipc_mqueue.c#17 integrate .. //depot/projects/hammer/sys/kern/vfs_cache.c#33 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#98 integrate .. //depot/projects/hammer/sys/kern/vfs_vnops.c#58 integrate .. //depot/projects/hammer/sys/libkern/memcmp.c#1 branch .. //depot/projects/hammer/sys/mips/adm5120/if_admsw.c#3 integrate .. //depot/projects/hammer/sys/mips/adm5120/obio.c#3 integrate .. //depot/projects/hammer/sys/mips/conf/IDT#4 integrate .. //depot/projects/hammer/sys/mips/idt/obio.c#3 integrate .. //depot/projects/hammer/sys/mips/include/param.h#2 integrate .. //depot/projects/hammer/sys/mips/include/smp.h#2 integrate .. //depot/projects/hammer/sys/mips/malta/gt_pci.c#3 integrate .. //depot/projects/hammer/sys/mips/mips/elf_machdep.c#2 integrate .. //depot/projects/hammer/sys/mips/mips/intr_machdep.c#3 integrate .. //depot/projects/hammer/sys/mips/mips/mem.c#2 integrate .. //depot/projects/hammer/sys/mips/mips/mp_machdep.c#3 integrate .. //depot/projects/hammer/sys/mips/mips/pmap.c#5 integrate .. //depot/projects/hammer/sys/mips/mips/support.S#2 integrate .. //depot/projects/hammer/sys/mips/mips/trap.c#3 integrate .. //depot/projects/hammer/sys/mips/sentry5/s5_machdep.c#3 integrate .. //depot/projects/hammer/sys/modules/cxgb/Makefile#11 integrate .. //depot/projects/hammer/sys/modules/cxgb/cxgb/Makefile#9 integrate .. //depot/projects/hammer/sys/modules/cxgb/cxgb_t3fw/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/cxgb/iw_cxgb/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/cxgb/toecore/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/cxgb/tom/Makefile#5 integrate .. //depot/projects/hammer/sys/net/if.c#79 integrate .. //depot/projects/hammer/sys/net/if_clone.c#12 integrate .. //depot/projects/hammer/sys/net/if_clone.h#5 integrate .. //depot/projects/hammer/sys/net/if_lagg.c#16 integrate .. //depot/projects/hammer/sys/net/if_stf.c#31 integrate .. //depot/projects/hammer/sys/net/if_tap.c#36 integrate .. //depot/projects/hammer/sys/net/if_tun.c#34 integrate .. //depot/projects/hammer/sys/net/route.c#38 integrate .. //depot/projects/hammer/sys/net/route.h#23 integrate .. //depot/projects/hammer/sys/net80211/ieee80211.h#21 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_adhoc.c#3 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto.c#16 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto.h#14 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ddb.c#5 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_freebsd.c#18 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_freebsd.h#17 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_hostap.c#3 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ht.c#13 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ht.h#8 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.c#40 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.h#23 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.c#49 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.h#28 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_output.c#38 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_scan_sta.c#9 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_sta.c#3 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_var.h#36 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_wds.c#3 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#13 integrate .. //depot/projects/hammer/sys/netgraph/netgraph.h#36 integrate .. //depot/projects/hammer/sys/netgraph/ng_base.c#63 integrate .. //depot/projects/hammer/sys/netgraph/ng_device.c#20 integrate .. //depot/projects/hammer/sys/netgraph/ng_source.c#17 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.c#61 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.h#43 integrate .. //depot/projects/hammer/sys/netinet/ip.h#11 integrate .. //depot/projects/hammer/sys/netinet/ip_fw.h#37 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#100 integrate .. //depot/projects/hammer/sys/netinet/ip_input.c#75 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#88 integrate .. //depot/projects/hammer/sys/netinet6/udp6_usrreq.c#41 integrate .. //depot/projects/hammer/sys/netsmb/smb_dev.c#17 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#64 integrate .. //depot/projects/hammer/sys/pc98/cbus/gdc.c#5 integrate .. //depot/projects/hammer/sys/pc98/cbus/olpt.c#4 integrate .. //depot/projects/hammer/sys/powerpc/aim/machdep.c#10 integrate .. //depot/projects/hammer/sys/powerpc/aim/mmu_oea.c#7 integrate .. //depot/projects/hammer/sys/powerpc/booke/machdep.c#6 integrate .. //depot/projects/hammer/sys/powerpc/include/dbdma.h#2 integrate .. //depot/projects/hammer/sys/powerpc/include/md_var.h#10 integrate .. //depot/projects/hammer/sys/powerpc/include/pmap.h#14 integrate .. //depot/projects/hammer/sys/powerpc/include/pte.h#4 integrate .. //depot/projects/hammer/sys/powerpc/include/smp.h#4 integrate .. //depot/projects/hammer/sys/powerpc/ofw/ofw_syscons.c#10 integrate .. //depot/projects/hammer/sys/powerpc/powermac/ata_dbdma.c#1 branch .. //depot/projects/hammer/sys/powerpc/powermac/ata_dbdma.h#1 branch .. //depot/projects/hammer/sys/powerpc/powermac/ata_kauai.c#12 integrate .. //depot/projects/hammer/sys/powerpc/powermac/ata_macio.c#15 integrate .. //depot/projects/hammer/sys/powerpc/powermac/dbdma.c#2 integrate .. //depot/projects/hammer/sys/powerpc/powermac/dbdmavar.h#2 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/cpu.c#11 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/elf_machdep.c#17 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/intr_machdep.c#20 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/mem.c#3 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/mp_machdep.c#10 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/syncicache.c#6 integrate .. //depot/projects/hammer/sys/security/audit/audit_pipe.c#12 integrate .. //depot/projects/hammer/sys/sparc64/include/smp.h#12 integrate .. //depot/projects/hammer/sys/sparc64/include/tick.h#5 integrate .. //depot/projects/hammer/sys/sparc64/pci/psycho.c#43 integrate .. //depot/projects/hammer/sys/sparc64/pci/psychoreg.h#11 integrate .. //depot/projects/hammer/sys/sparc64/pci/schizo.c#1 branch .. //depot/projects/hammer/sys/sparc64/pci/schizoreg.h#1 branch .. //depot/projects/hammer/sys/sparc64/pci/schizovar.h#1 branch .. //depot/projects/hammer/sys/sparc64/sparc64/elf_machdep.c#20 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/genassym.c#18 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/intr_machdep.c#20 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/mem.c#16 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/mp_machdep.c#26 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/tick.c#15 integrate .. //depot/projects/hammer/sys/sun4v/include/smp.h#4 integrate .. //depot/projects/hammer/sys/sys/clist.h#4 integrate .. //depot/projects/hammer/sys/sys/conf.h#47 integrate .. //depot/projects/hammer/sys/sys/libkern.h#18 integrate .. //depot/projects/hammer/sys/sys/mount.h#57 integrate .. //depot/projects/hammer/sys/sys/param.h#119 integrate .. //depot/projects/hammer/sys/sys/pmc.h#12 integrate .. //depot/projects/hammer/sys/sys/pmckern.h#8 integrate .. //depot/projects/hammer/sys/sys/syscall.h#68 integrate .. //depot/projects/hammer/sys/sys/syscall.mk#68 integrate .. //depot/projects/hammer/sys/sys/sysent.h#13 integrate .. //depot/projects/hammer/sys/sys/sysproto.h#69 integrate .. //depot/projects/hammer/sys/sys/systm.h#57 integrate .. //depot/projects/hammer/sys/sys/tty.h#25 integrate .. //depot/projects/hammer/sys/sys/ttydevsw.h#2 integrate .. //depot/projects/hammer/sys/sys/ttydisc.h#3 integrate .. //depot/projects/hammer/sys/sys/ttyhook.h#1 branch .. //depot/projects/hammer/sys/sys/ttyqueue.h#2 integrate .. //depot/projects/hammer/sys/sys/types.h#27 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#79 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_dirhash.c#12 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_vnops.c#57 integrate .. //depot/projects/hammer/sys/vm/device_pager.c#19 integrate .. //depot/projects/hammer/sys/vm/swap_pager.c#61 integrate .. //depot/projects/hammer/sys/vm/vm_mmap.c#56 integrate .. //depot/projects/hammer/sys/vm/vm_page.c#75 integrate .. //depot/projects/hammer/sys/vm/vm_page.h#33 integrate .. //depot/projects/hammer/sys/vm/vm_pageout.c#51 integrate .. //depot/projects/hammer/sys/vm/vm_pageout.h#12 integrate .. //depot/projects/hammer/sys/xen/evtchn/evtchn.c#2 integrate .. //depot/projects/hammer/sys/xen/gnttab.c#2 integrate .. //depot/projects/hammer/sys/xen/gnttab.h#2 integrate .. //depot/projects/hammer/sys/xen/interface/arch-ia64.h#2 integrate .. //depot/projects/hammer/sys/xen/interface/arch-powerpc.h#2 integrate .. //depot/projects/hammer/sys/xen/interface/arch-x86/cpuid.h#1 branch .. //depot/projects/hammer/sys/xen/interface/arch-x86/hvm/save.h#1 branch .. //depot/projects/hammer/sys/xen/interface/arch-x86/xen-mca.h#1 branch .. //depot/projects/hammer/sys/xen/interface/arch-x86/xen-x86_32.h#2 integrate .. //depot/projects/hammer/sys/xen/interface/arch-x86/xen-x86_64.h#2 integrate .. //depot/projects/hammer/sys/xen/interface/arch-x86/xen.h#2 integrate .. //depot/projects/hammer/sys/xen/interface/callback.h#2 integrate .. //depot/projects/hammer/sys/xen/interface/domctl.h#2 integrate .. //depot/projects/hammer/sys/xen/interface/features.h#2 integrate .. //depot/projects/hammer/sys/xen/interface/foreign/mkchecker.py#2 integrate .. //depot/projects/hammer/sys/xen/interface/foreign/mkheader.py#2 integrate .. //depot/projects/hammer/sys/xen/interface/foreign/structs.py#2 integrate .. //depot/projects/hammer/sys/xen/interface/grant_table.h#2 integrate .. //depot/projects/hammer/sys/xen/interface/hvm/hvm_op.h#2 integrate .. //depot/projects/hammer/sys/xen/interface/hvm/ioreq.h#2 integrate .. //depot/projects/hammer/sys/xen/interface/hvm/params.h#2 integrate .. //depot/projects/hammer/sys/xen/interface/hvm/save.h#2 integrate .. //depot/projects/hammer/sys/xen/interface/io/blkif.h#2 integrate .. //depot/projects/hammer/sys/xen/interface/io/fbif.h#2 integrate .. //depot/projects/hammer/sys/xen/interface/io/kbdif.h#2 integrate .. //depot/projects/hammer/sys/xen/interface/io/netif.h#2 integrate .. //depot/projects/hammer/sys/xen/interface/io/pciif.h#2 integrate .. //depot/projects/hammer/sys/xen/interface/io/protocols.h#2 integrate .. //depot/projects/hammer/sys/xen/interface/io/ring.h#2 integrate .. //depot/projects/hammer/sys/xen/interface/io/xenbus.h#2 integrate .. //depot/projects/hammer/sys/xen/interface/io/xs_wire.h#2 integrate .. //depot/projects/hammer/sys/xen/interface/kexec.h#2 integrate .. //depot/projects/hammer/sys/xen/interface/libelf.h#2 integrate .. //depot/projects/hammer/sys/xen/interface/memory.h#2 integrate .. //depot/projects/hammer/sys/xen/interface/physdev.h#2 integrate .. //depot/projects/hammer/sys/xen/interface/platform.h#2 integrate .. //depot/projects/hammer/sys/xen/interface/sysctl.h#2 integrate .. //depot/projects/hammer/sys/xen/interface/trace.h#2 integrate .. //depot/projects/hammer/sys/xen/interface/vcpu.h#2 integrate .. //depot/projects/hammer/sys/xen/interface/xen-compat.h#2 integrate .. //depot/projects/hammer/sys/xen/interface/xen.h#2 integrate .. //depot/projects/hammer/tools/build/options/WITHOUT_ACCT#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_AMD#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_APM#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_AT#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_BSNMP#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_CTM#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_FLOPPY#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_FREEBSD_UPDATE#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_IPFW#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_JAIL#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_LEGACY_CONSOLE#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_LOCATE#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_MAIL#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_MAKE#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_NDIS#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_NETGRAPH#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_NETGRAPH_SUPPORT#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_NTP#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_PKGTOOLS#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_PMC#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_PORTSNAP#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_PPP#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_QUOTAS#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_ROUTED#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_SLIP#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_SYSINSTALL#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_TELNET#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_TEXTPROC#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_WIRELESS#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_WIRELESS_SUPPORT#1 branch .. //depot/projects/hammer/tools/tools/nanobsd/nanobsd.sh#19 integrate .. //depot/projects/hammer/tools/tools/net80211/scripts/config#2 integrate .. //depot/projects/hammer/usr.bin/Makefile#65 integrate .. //depot/projects/hammer/usr.bin/ar/Makefile#5 integrate .. //depot/projects/hammer/usr.bin/ar/acplex.l#1 branch .. //depot/projects/hammer/usr.bin/ar/acpyacc.y#1 branch .. //depot/projects/hammer/usr.bin/ar/ar.c#6 integrate .. //depot/projects/hammer/usr.bin/ar/ar.h#3 integrate .. //depot/projects/hammer/usr.bin/ar/write.c#4 integrate .. //depot/projects/hammer/usr.bin/cpuset/cpuset.1#3 integrate .. //depot/projects/hammer/usr.bin/make/job.c#33 integrate .. //depot/projects/hammer/usr.bin/netstat/Makefile#17 integrate .. //depot/projects/hammer/usr.bin/netstat/main.c#28 integrate .. //depot/projects/hammer/usr.bin/netstat/netstat.h#23 integrate .. //depot/projects/hammer/usr.sbin/Makefile#93 integrate .. //depot/projects/hammer/usr.sbin/pmcstat/pmcstat.8#12 integrate .. //depot/projects/hammer/usr.sbin/pmcstat/pmcstat.c#17 integrate .. //depot/projects/hammer/usr.sbin/pstat/pstat.8#11 integrate .. //depot/projects/hammer/usr.sbin/pstat/pstat.c#22 integrate .. //depot/projects/hammer/usr.sbin/syslogd/syslogd.8#15 integrate .. //depot/projects/hammer/usr.sbin/syslogd/syslogd.c#36 integrate .. //depot/projects/hammer/usr.sbin/timed/timed/globals.h#3 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#140 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.610 2008/08/19 14:23:26 jhb Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.611 2008/09/19 16:14:42 obrien Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -27,6 +27,10 @@ .include +.if ${MACHINE_ARCH} == "mips" +MK_RESCUE=no # not yet +.endif + # We must do share/info early so that installation of info `dir' # entries works correctly. Do it first since it is less likely to # grow dependencies on include and lib than vice versa. ==== //depot/projects/hammer/ObsoleteFiles.inc#61 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.161 2008/09/17 15:49:44 attilio Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.163 2008/09/28 20:15:45 ed Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,8 +14,15 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20080928: removal of inaccurate device_ids(9) manual page +OLD_FILES+=usr/share/man/man9/device_ids.9.gz +OLD_FILES+=usr/share/man/man9/major.9.gz +OLD_FILES+=usr/share/man/man9/minor.9.gz +OLD_FILES+=usr/share/man/man9/umajor.9.gz +OLD_FILES+=usr/share/man/man9/uminor.9.gz # 20080917: removal of manpage for axed kernel primitive suser(9) -OLD_FILES+=usr/share/man/man9/suser.9 +OLD_FILES+=usr/share/man/man9/suser.9.gz +OLD_FILES+=usr/share/man/man9/suser_cred.9.gz # 20080913: pax removed from rescue OLD_FILES+=rescue/pax # 20080823: removal of unneeded pt_chown, to implement grantpt(3) ==== //depot/projects/hammer/bin/pkill/pkill.1#2 (text+ko) ==== @@ -1,6 +1,6 @@ .\" $NetBSD: pkill.1,v 1.8 2003/02/14 15:59:18 grant Exp $ .\" -.\" $FreeBSD: src/bin/pkill/pkill.1,v 1.1 2008/08/31 14:27:59 yar Exp $ +.\" $FreeBSD: src/bin/pkill/pkill.1,v 1.2 2008/09/28 16:44:15 ed Exp $ .\" .\" Copyright (c) 2002 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -179,10 +179,9 @@ Restrict matches to processes associated with a terminal in the comma-separated list .Ar tty . -Terminal names may be of the form -.Pa tty Ns Ar xx -or the shortened form -.Ar xx . +The +.Pa /dev/ +prefix of the terminal names must be omitted. A single dash .Pq Ql - matches processes not associated with a terminal. ==== //depot/projects/hammer/bin/pkill/pkill.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.1 2008/08/31 14:27:59 yar Exp $"); +__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.2 2008/09/28 16:44:15 ed Exp $"); #include #include @@ -607,12 +607,11 @@ struct passwd *pw; struct group *gr; struct stat st; - const char *cp, *prefix; + const char *cp; char *sp, *ep, buf[MAXPATHLEN]; int empty; empty = 1; - prefix = _PATH_DEV; while ((sp = strsep(&src, ",")) != NULL) { if (*sp == '\0') @@ -673,11 +672,9 @@ cp = "console"; } else { cp = sp; - if (strncmp(sp, "tty", 3) != 0) - prefix = _PATH_TTY; } - snprintf(buf, sizeof(buf), "%s%s", prefix, cp); + snprintf(buf, sizeof(buf), _PATH_DEV "%s", cp); if (stat(buf, &st) == -1) { if (errno == ENOENT) { ==== //depot/projects/hammer/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c#2 (text+ko) ==== @@ -306,7 +306,7 @@ case sizeof (double): return (dt_printf(dtp, fp, format, *((double *)addr) / n)); -#if !defined(__arm__) && !defined(__powerpc__) +#if !defined(__arm__) && !defined(__powerpc__) && !defined(__mips__) case sizeof (long double): return (dt_printf(dtp, fp, format, *((long double *)addr) / ldn)); ==== //depot/projects/hammer/crypto/openssh/moduli.5#2 (text+ko) ==== @@ -13,7 +13,7 @@ .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -.Dd $Mdocdate: June 26 2008 $ +.Dd June 26 2008 .Dt MODULI 5 .Os .Sh NAME ==== //depot/projects/hammer/crypto/openssh/scp.1#11 (text+ko) ==== @@ -11,7 +11,7 @@ .\" .\" $OpenBSD: scp.1,v 1.46 2008/07/12 05:33:41 djm Exp $ .\" -.Dd $Mdocdate: July 12 2008 $ +.Dd July 12 2008 .Dt SCP 1 .Os .Sh NAME ==== //depot/projects/hammer/crypto/openssh/sftp-server.8#6 (text+ko) ==== @@ -22,7 +22,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. .\" -.Dd $Mdocdate: July 18 2008 $ +.Dd July 18 2008 .Dt SFTP-SERVER 8 .Os .Sh NAME ==== //depot/projects/hammer/crypto/openssh/sftp.1#11 (text+ko) ==== @@ -22,7 +22,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. .\" -.Dd $Mdocdate: July 15 2008 $ +.Dd July 15 2008 .Dt SFTP 1 .Os .Sh NAME ==== //depot/projects/hammer/crypto/openssh/ssh-add.1#8 (text+ko) ==== @@ -37,7 +37,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. .\" -.Dd $Mdocdate: June 12 2007 $ +.Dd June 12 2007 .Dt SSH-ADD 1 .Os .Sh NAME ==== //depot/projects/hammer/crypto/openssh/ssh-agent.1#9 (text+ko) ==== @@ -34,7 +34,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. .\" -.Dd $Mdocdate: June 5 2007 $ +.Dd June 5 2007 .Dt SSH-AGENT 1 .Os .Sh NAME ==== //depot/projects/hammer/crypto/openssh/ssh-keygen.1#10 (text+ko) ==== @@ -37,7 +37,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. .\" -.Dd $Mdocdate: June 12 2008 $ +.Dd June 12 2008 .Dt SSH-KEYGEN 1 .Os .Sh NAME ==== //depot/projects/hammer/crypto/openssh/ssh-keyscan.1#9 (text+ko) ==== @@ -6,7 +6,7 @@ .\" permitted provided that due credit is given to the author and the .\" OpenBSD project by leaving this copyright notice intact. .\" -.Dd $Mdocdate: April 30 2008 $ +.Dd April 30 2008 .Dt SSH-KEYSCAN 1 .Os .Sh NAME ==== //depot/projects/hammer/crypto/openssh/ssh-keysign.8#7 (text+ko) ==== @@ -22,7 +22,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. .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd May 31 2007 .Dt SSH-KEYSIGN 8 .Os .Sh NAME ==== //depot/projects/hammer/crypto/openssh/ssh.1#13 (text+ko) ==== @@ -35,8 +35,8 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: ssh.1,v 1.277 2008/07/02 13:47:39 djm Exp $ -.\" $FreeBSD: src/crypto/openssh/ssh.1,v 1.36 2008/08/01 02:48:36 des Exp $ -.Dd $Mdocdate: July 2 2008 $ +.\" $FreeBSD: src/crypto/openssh/ssh.1,v 1.37 2008/09/29 10:53:05 des Exp $ +.Dd July 2 2008 .Dt SSH 1 .Os .Sh NAME ==== //depot/projects/hammer/crypto/openssh/ssh_config.5#16 (text+ko) ==== @@ -35,8 +35,8 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: ssh_config.5,v 1.111 2008/06/26 11:46:31 grunk Exp $ -.\" $FreeBSD: src/crypto/openssh/ssh_config.5,v 1.24 2008/08/01 02:48:36 des Exp $ -.Dd $Mdocdate: June 26 2008 $ +.\" $FreeBSD: src/crypto/openssh/ssh_config.5,v 1.25 2008/09/29 10:53:05 des Exp $ +.Dd June 26 2008 .Dt SSH_CONFIG 5 .Os .Sh NAME ==== //depot/projects/hammer/crypto/openssh/sshconnect2.c#13 (text+ko) ==== @@ -386,8 +386,9 @@ if (options.log_level >= SYSLOG_LEVEL_INFO) { if (len > 65536) len = 65536; - msg = xmalloc(len * 4); /* max expansion from strnvis() */ + msg = xmalloc(len * 4 + 1); /* max expansion from strnvis() */ strnvis(msg, raw, len * 4, VIS_SAFE|VIS_OCTAL); + msg[len*4] = '\0'; fprintf(stderr, "%s", msg); xfree(msg); } ==== //depot/projects/hammer/crypto/openssh/sshd.8#13 (text+ko) ==== @@ -35,8 +35,8 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: sshd.8,v 1.246 2008/07/02 02:24:18 djm Exp $ -.\" $FreeBSD: src/crypto/openssh/sshd.8,v 1.35 2008/08/01 02:48:36 des Exp $ -.Dd $Mdocdate: July 2 2008 $ +.\" $FreeBSD: src/crypto/openssh/sshd.8,v 1.36 2008/09/29 10:53:05 des Exp $ +.Dd July 2 2008 .Dt SSHD 8 .Os .Sh NAME ==== //depot/projects/hammer/crypto/openssh/sshd_config.5#18 (text+ko) ==== @@ -35,8 +35,8 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: sshd_config.5,v 1.96 2008/07/02 02:24:18 djm Exp $ -.\" $FreeBSD: src/crypto/openssh/sshd_config.5,v 1.30 2008/08/01 02:48:36 des Exp $ -.Dd $Mdocdate: July 2 2008 $ +.\" $FreeBSD: src/crypto/openssh/sshd_config.5,v 1.31 2008/09/29 10:53:05 des Exp $ +.Dd July 2 2008 .Dt SSHD_CONFIG 5 .Os .Sh NAME ==== //depot/projects/hammer/etc/Makefile#64 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.368 2008/05/26 10:39:45 bz Exp $ +# $FreeBSD: src/etc/Makefile,v 1.370 2008/09/22 15:37:47 sam Exp $ .include @@ -7,22 +7,19 @@ SUBDIR= sendmail .endif -BIN1= amd.map apmd.conf auth.conf \ +BIN1= auth.conf \ crontab csh.cshrc csh.login csh.logout devd.conf devfs.conf \ - ddb.conf dhclient.conf disktab fbtab freebsd-update.conf \ + ddb.conf dhclient.conf disktab fbtab \ ftpusers gettytab group \ - hosts hosts.allow hosts.equiv hosts.lpd \ + hosts hosts.allow hosts.equiv \ inetd.conf libalias.conf login.access login.conf mac.conf motd \ netconfig network.subr networks newsyslog.conf nsswitch.conf \ - portsnap.conf pf.os phones profile protocols \ + phones profile protocols \ rc rc.bsdextended rc.firewall rc.firewall6 rc.initdiskless \ rc.sendmail rc.shutdown \ - rc.subr regdomain.xml remote rpc services shells \ - snmpd.config sysctl.conf syslog.conf \ - etc.${MACHINE_ARCH}/ttys \ - ${.CURDIR}/../gnu/usr.bin/man/manpath/manpath.config \ - ${.CURDIR}/../usr.bin/mail/misc/mail.rc \ - ${.CURDIR}/../usr.bin/locate/locate/locate.rc + rc.subr remote rpc services shells \ + sysctl.conf syslog.conf \ + etc.${MACHINE_ARCH}/ttys OPENBSMDIR= ${.CURDIR}/../contrib/openbsm BSM_ETC_OPEN_FILES= ${OPENBSMDIR}/etc/audit_class \ @@ -32,12 +29,38 @@ BSM_ETC_EXEC_FILES= ${OPENBSMDIR}/etc/audit_warn BSM_ETC_DIR= ${DESTDIR}/etc/security +# NB: keep these sorted by MK_* knobs + +.if ${MK_AMD} != "no" +BIN1+= amd.map +.endif + +.if ${MK_APM} != "no" +BIN1+= apmd.conf +.endif + +.if ${MK_BSNMP} != "no" +BIN1+= snmpd.config +.endif + +.if ${MK_FREEBSD_UPDATE} != "no" +BIN1+= freebsd-update.conf +.endif + +.if ${MK_LOCATE} != "no" +BIN1+= ${.CURDIR}/../usr.bin/locate/locate/locate.rc +.endif + .if ${MK_LPR} != "no" -BIN1+= printcap +BIN1+= hosts.lpd printcap +.endif + +.if ${MK_MAIL} != "no" +BIN1+= ${.CURDIR}/../usr.bin/mail/misc/mail.rc .endif -.if ${MK_NS_CACHING} != "no" -BIN1+= nscd.conf +.if ${MK_MAN} != "no" +BIN1+= ${.CURDIR}/../gnu/usr.bin/man/manpath/manpath.config .endif .if ${MK_OPENSSH} != "no" @@ -49,6 +72,22 @@ SSL= ${.CURDIR}/../crypto/openssl/apps/openssl.cnf .endif +.if ${MK_NS_CACHING} != "no" +BIN1+= nscd.conf +.endif + +.if ${MK_PORTSNAP} != "no" +BIN1+= portsnap.conf +.endif + +.if ${MK_PF} != "no" +BIN1+= pf.os +.endif + +.if ${MK_WIRELESS} != "no" +BIN1+= regdomain.xml +.endif + # -rwxr-xr-x root:wheel, for the new cron root:wheel BIN2= netstart pccard_ether rc.suspend rc.resume @@ -112,7 +151,9 @@ master.passwd nsmb.conf opieaccess ${DESTDIR}/etc; \ pwd_mkdb ${PWD_MKDB_ENDIAN} -i -p -d ${DESTDIR}/etc \ ${DESTDIR}/etc/master.passwd +.if ${MK_BLUETOOTH} != "no" ${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install +.endif >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Sep 30 00:54:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 14590106568D; Tue, 30 Sep 2008 00:54:53 +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 B36551065686 for ; Tue, 30 Sep 2008 00:54:52 +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 9FE838FC0A for ; Tue, 30 Sep 2008 00:54:52 +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 m8U0sqFZ056829 for ; Tue, 30 Sep 2008 00:54:52 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8U0sqJp056789 for perforce@freebsd.org; Tue, 30 Sep 2008 00:54:52 GMT (envelope-from pgj@FreeBSD.org) Date: Tue, 30 Sep 2008 00:54:52 GMT Message-Id: <200809300054.m8U0sqJp056789@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 150675 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, 30 Sep 2008 00:54:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=150675 Change 150675 by pgj@kolbasz on 2008/09/30 00:54:50 MFen (doc): 1.109 -> 1.110 hu_HU.ISO8859-2/books/handbook/Makefile 1.172 -> 1.173 hu_HU.ISO8859-2/books/handbook/book.sgml 1.37 -> 1.38 hu_HU.ISO8859-2/books/handbook/chapters.ent 1.153 -> 1.154 hu_HU.ISO8859-2/books/handbook/basics/chapter.sgml 1.186 -> 1.190 hu_HU.ISO8859-2/books/handbook/eresources/chapter.sgml 1.42 -> 1.43 hu_HU.ISO8859-2/books/handbook/geom/chapter.sgml 1.450 -> 1.451 hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml 1.282 -> 1.283 hu_HU.ISO8859-2/books/handbook/ports/chapter.sgml 1.330 -> 1.331 hu_HU.ISO8859-2/books/handbook/security/chapter.sgml 1.61 -> 1.62 hu_HU.ISO8859-2/share/sgml/mailing-lists.ent Note: New chapters (dtrace, filesystems, updating) are not yet translated, they were added to keep things buildable. Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/Makefile#4 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/basics/chapter.sgml#4 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/book.sgml#7 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/chapters.ent#4 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/dtrace/Makefile#1 add .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/dtrace/chapter.sgml#1 add .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/eresources/chapter.sgml#13 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/filesystems/Makefile#1 add .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/filesystems/chapter.sgml#1 add .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/geom/chapter.sgml#6 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#14 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/ports/chapter.sgml#8 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/security/chapter.sgml#13 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/updating/Makefile#1 add .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/updating/chapter.sgml#1 add .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/mailing-lists.ent#14 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/Makefile#4 (text+ko) ==== @@ -4,7 +4,7 @@ # $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/Makefile,v 1.2 2008/06/25 11:28:04 gabor Exp $ # %SOURCE% en_US.ISO8859-1/books/handbook/Makefile -# %SRCID% 1.109 +# %SRCID% 1.110 # # Build the FreeBSD Handbook. # @@ -209,6 +209,7 @@ SRCS+= audit/chapter.sgml SRCS+= book.sgml SRCS+= colophon.sgml +SRCS+= dtrace/chapter.sgml SRCS+= freebsd-glossary.sgml SRCS+= advanced-networking/chapter.sgml SRCS+= basics/chapter.sgml @@ -220,6 +221,7 @@ SRCS+= disks/chapter.sgml SRCS+= eresources/chapter.sgml SRCS+= firewalls/chapter.sgml +SRCS+= filesystems/chapter.sgml SRCS+= geom/chapter.sgml SRCS+= install/chapter.sgml SRCS+= introduction/chapter.sgml @@ -239,6 +241,7 @@ SRCS+= printing/chapter.sgml SRCS+= security/chapter.sgml SRCS+= serialcomms/chapter.sgml +SRCS+= updating/chapter.sgml SRCS+= users/chapter.sgml SRCS+= vinum/chapter.sgml SRCS+= virtualization/chapter.sgml ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/basics/chapter.sgml#4 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -888,7 +888,202 @@ javasoljuk, hogy ezzel kapcsolatban a &man.chflags.1; és &man.chflags.2; man oldalakat tanulmányozzák át. + + + + + + + Tom + Rhodes + Készítette: + + + + + A setuid, setgid és sticky engedélyek + + A korábban említett engedélyeken + kívül létezik még további + három, amelyekkel minden rendszergazdának illik + tisztában lennie. Ezek név szerint a + setuid, setgid és + sticky típusú + engedélyek. + + Ezek a beállítások bizonyos &unix; + mûveletek esetén nagyon fontosak, mivel az + átlagos felhasználók számára + általában el nem érhetõ + funkciók használatát + támogatják. A + megértésükhöz elsõként a + felhasználók valódi és + effektív azonosítója közti + különbségeket kell tisztáznunk. + A valódi azonosító + tulajdonképpen az a felhasználói + azonosító, amellyel a programot indítjuk el + vagy futás elõtt birtokoljuk. A program + futása közben azonban az effektív + felhasználói azonosítóval fut. + Például a &man.passwd.1; segédprogram a + jelszavát megváltoztatni + kívánó felhasználó + valódi azonosítójával indul, + miközben a jelszavakat tároló + adatbázis elérésékor már a + root felhasználó + effektív azonosítójával fut. + Ezáltal a privilegiumokkal nem rendelkezõ + felhasználók is meg tudják + anélkül változtatni a jelszavaikat, hogy a + Permission Denied hibaüzenettel + találkoznának. + + + A &man.mount.8; nosuid + beállításával azonban az ilyen + típusú binárisok minden + különösebb jel nélkül + csõdöt fognak mondani. Mellesleg a &man.mount.8; + man oldala szerint ez az opció nem is teljesen + megbízható, mivel nosuid + wrapperek segítségével meg lehet + kerülni. + + + Ahogy azt az alábbi példa is + szemlélteti, a setuid engedélyt a többi + elé egy négyes (4) + beszúrásával tudjuk + beállítani: + + &prompt.root; chmod 4755 suidexample.sh + + A + suidexample.sh + állomány engedélyei ezt követõen + már így fognak megjelenni: + + -rwsr-xr-x 1 trhodes trhodes 63 Aug 29 06:36 suidexample.sh + + Most már jól látható, hogy az + állomány tulajdonosához tartozó + engedélyek között a + végrehajthatóságot szabályozó + bit lecserélõdött egy s + bitre. Ennek köszönhetõen a + passwd parancshoz hasonló módon + kibõvített engedélyekkel leszünk + képesek futtatni programokat. + + Két terminál megnyitásával + mindezt valós idõben is megvizsgálhatjuk. Az + egyiken indítsuk el normál + felhasználóként a passwd + programot. Miközben a program várakozik az + új jelszó megadására, a másik + terminálon kérdezzük le a programhoz + tartozó felhasználói + információkat. + + Tehát az egyik terminálon a + következõt látjuk: + + &prompt.user; passwd +Changing local password for trhodes +Old Password: + + Eközben pedig a másikon: + + &prompt.root; ps aux | grep passwd +trhodes 5232 0.0 0.2 3420 1608 0 R+ 2:10AM 0:00.00 grep passwd +root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd + + A passwd parancsot egyszerû + felhasználóként adtunk ki, azonban + jól látható valójában a + root felhasználó + azonosítójával fut. + + A setgid a setuid + engedélyhez hasonlóan mûködik, + egyedül annyiban tér el, hogy a csoportra + vonatkozó beállításokat + módosítja. Amikor egy alkalmazást vagy + segédprogramot ilyen engedéllyel futtatunk, akkor + az adott programot birtokló csoport engedélyeit + kapjuk meg. + + Úgy tudjuk állományokon + beállítani a setgid + típusú engedélyt, ha az iménti + példához hasonlóan a + chmod parancs hívásakor + még egy kettest (2) írunk az engedélyek + elé: + + &prompt.root; chmod 2755 suidexample.sh + Az így beállított engedélyek az + elõbbihöz hasonló módon + szemlélhetõek meg, azonban ebben az esetben a + csoporthoz tartozó engedélyeknél jelenik + meg az s bit: + + -rwxr-sr-x 1 trhodes trhodes 44 Aug 31 01:49 suidexample.sh + + + Az elõbb tárgyalt példákkal + kapcsolatban fontos megemlítenünk, hogy habár + a szkriptek is végrehajtható + állományok, nem fognak a valóditól + eltérõ effektív felhasználói + azonosítóval futni. Ennek oka abban + keresendõ, hogy a parancssori szkriptek nem + hívhatják a &man.setuid.2; + rendszerhívást. + + + Ez a két speciális engedély (a + setuid és a setgid) a + programhoz tartozó engedélyek + kiterjesztésével csökkentheti + rendszerünk biztonságát. Ezzel szemben + viszont a harmadik bemutatandó speciális + engedély rendszerünk védelmének + erõsítésére szolgál: ez az + ún. sticky bit. + + Ha a sticky típusú + engedélyt könyvtárra adjuk meg, akkor a benne + levõ állományok törlését + kizárólag azok tulajdonosainak engedi. Ezzel az + engedéllyel lényegében a /tmp könyvtárhoz + hasonló nyilvános, bárki által + elérhetõ könyvtárakban + akadályozhatjuk meg az állományok idegen + felhasználók általi + törlését. Az engedély + beállításához egy egyest (1) kell a + többi elé fûznünk, mint + például: + + &prompt.root; chmod 1777 /tmp + + Most már az ls parancs + segítségével láthatjuk ennek a + hatását: + + &prompt.root; ls -al / | grep tmp +drwxrwxrwt 10 root wheel 512 Aug 31 01:49 tmp + + A sticky bit a + beállítások végén + felbukkanó t révén + azonosítható be. ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/book.sgml#7 (text+ko) ==== @@ -7,7 +7,7 @@ The FreeBSD Hungarian Documentation Project Translated by: PALI, Gabor %SOURCE% en_US.ISO8859-1/books/handbook/book.sgml - %SRCID% 1.172 + %SRCID% 1.173 --> + + + %pgpkeys; ]> @@ -315,10 +318,12 @@ + + @@ -370,6 +375,7 @@ tudjuk. + ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/chapters.ent#4 (text+ko) ==== @@ -11,7 +11,7 @@ $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/chapters.ent,v 1.2 2008/06/25 11:28:04 gabor Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/chapters.ent - %SRCID% 1.37 + %SRCID% 1.38 --> @@ -40,12 +40,15 @@ + + + ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/eresources/chapter.sgml#13 (text+ko) ==== @@ -7,11 +7,11 @@ - Erõforrások az interneten + Források az interneten A &os; gyors ütemû fejlõdése a nyomtatott médiát alkalmatlanná teszi a legfrissebb @@ -125,13 +125,6 @@ - &a.cvsall.name; - Értesítés a &os; - forrásfájában elvégzett - változtatásokról - - - &a.advocacy.name; A &os; igéjének terjesztése @@ -740,9 +733,9 @@ kiválaszthatjuk, hogy kivonatolt formátumban kívánjuk-e kapni a leveleket. - CVS listák: (CVS lists) A - következõ listák a forrásfa - különbözõ részeinek + CVS és SVN listák: (CVS + & SVN lists) A következõ listák a + forrásfa különbözõ részeinek változtatásáról és a hozzájuk tartozó üzenetekrõl adnak értesítést. Ezek a listák @@ -792,7 +785,9 @@ &a.cvs-src.name; /usr/src A rendszer forrásának - változásai + változásai (az svn és cvs + közti importer mûködése + alapján generálódik) @@ -2354,7 +2349,7 @@ ukug.uk.FreeBSD.org Csak továbbítás - freebsd-users@uk.FreeBSD.org + ukfreebsd@uk.FreeBSD.org Lee Johnston lee@uk.FreeBSD.org ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/geom/chapter.sgml#6 (text+ko) ==== @@ -6,7 +6,7 @@ @@ -301,186 +301,157 @@ fizikailag is biztonságosan tárolhatóak. Elõször is szereznünk kell két egyforma - méretû lemezt, valamint ez a példa - feltételezi, hogy ezek a lemezek közvetlen + méretû lemezt, valamint a példák + feltételezik, hogy ezek a lemezek közvetlen elérésû (&man.da.4;) SCSI-lemezek. - Kezdetnek telepítsük fel a &os;-t az elsõ - lemezre, de csak két partícióval. Ezek - egyike legyen a lapozóállományt - tartalmazó partíció, aminek mérete - pedig a fizikailag rendelkezésre álló - memória (RAM) méretének - kétszere legyen. A többi helyet adjuk oda a - gyökérpartíciónak (/). Természetesen a többi - csatolási pontot is kihasználhatjuk, külön - partíciókkal, de ezzel a feladat - nehézsége tízszeresére növekszik, - mivel ekkor manuálisan kell átírnunk a - &man.bsdlabel.8; és &man.fdisk.8; - beállításokat. + + Az elsõdleges lemezek + tükrözése - Indítsuk újra a - számítógépet és várjuk - meg, amíg a rendszer teljesen készen nem áll. - Amint ez a folyamat véget ért, jelentkezzük be - a root felhasználóval. + Tegyük fel, hogy a &os; az elsõ, + da0 nevû lemezmeghajtón + található, és a &man.gmirror.8; + számára ezt szeretnénk megadni az + elsõdleges adatok tárolásához. - Hozzuk létre a /dev/mirror/gm - eszközt és kössük hozzá a - /dev/ad1 eszközhöz: + A tükrözés + létrehozásának megkezdése elõtt a + kern.geom.debugflags &man.sysctl.8; + változó megfelelõ + beállításával + engedélyezzünk további + nyomkövetési információkat és + hozzáférést az eszközhöz: - &prompt.root; gmirror label -vnb round-robin gm0 /dev/da1 + &prompt.root; sysctl kern.geom.debugflags=17 - A rendszernek erre így kell reagálnia: + Most építsük fel a + tükrözést. Kezdjük az egészet a + metaadatok elhelyezésével az elsõdleges + lemezmeghajtón, tehát tulajdonképpen az + alábbi parancs segítségével hozzuk + létre a /dev/mirror/gm + eszközt: - -Metadata value stored on /dev/da1. -Done. + &prompt.root; gmirror label -vb round-robin gm0 /dev/da0 - Keltsük életre a GEOM-ot, aminek során - betöltõdik a - /boot/kernel/geom_mirror.ko modul: + Erre a rendszernek a következõ módon kell + reagálnia: - &prompt.root; gmirror load + Metadata value stored on /dev/da0. +Done. - - Ezzel a paranccsal létre kellett jönnie a - gm0 eszköznek a /dev/mirror - könyvtárban. - + A GEOM inicializálásához + szükségünk lesz a + /boot/kernel/geom_mirror.ko modul + betöltésére: - Helyezzünk el egy partíciós - táblát és rendszerindító - programot az fdisk - segítségével az újonnan - létrehozott gm0 - eszközön: + &prompt.root; gmirror load - &prompt.root; fdisk -vBI /dev/mirror/gm0 + + A parancs sikeres lefutása után a /dev/mirror + könyvtárban létrehoz egy + gm0 + eszközleírót. + - Most pedig tegyünk fel egy általános - címkét a bsdlabel - programmal: + A geom_mirror.ko modul betöltését így + tudjuk engedélyezni a rendszer indításakor: - &prompt.root; bsdlabel -wB /dev/mirror/gm0s1 + &prompt.root; echo 'geom_mirror_load="YES"' >gt; /boot/loader.conf - - Ha több slice-unk és partíciónk is - van, az iménti két parancsban máshogy kell - megadnunk a paramétereket. Meg kell egyezniük a - másik lemezen található slice-al és - a partíciójának - méretével. - + Rendszeradminisztrátorként nyissuk meg az + /etc/fstab állományt, és + cseréljük le benne az összes korábbi + da0 hivatkozást az + újonnan kialakított gm0 + tükrözés + eszközleírójával: - Használjuk a &man.newfs.8; segédprogramot a - gm0s1a eszközön egy - UFS típusú - állományrendszer - létesítésére: + &prompt.root; vi /etc/fstab - &prompt.root; newfs -U /dev/mirror/gm0s1a + A &man.vi.1; indítása után a + :w /etc/fstab.bak kiadásával + készítsünk az fstab + állomány jelenlegi tartalmáról + másolatot. Ezután a + :%s/da/mirror\/gm/g parancs + használatával cseréljük ki az + összes da0 hivatkozást a + gm0 eszköz nevére. - Ennek eredményeképpen kapunk egy halom - számot a képernyõn. Nagyon jó! - Ellenõrizzük, nem látunk-e a - képernyõn valamilyen hibaüzenetet, majd - csatlakoztassuk az eszközt a a /mnt pontra: + Az így keletkezõ fstab + állomány nagyjából következõ + módon fog kinézni. Most teljesen független, + hogy SCSI vagy ATA + meghajtókkal dolgozunk, a RAID + eszköz neve mindig gm lesz: - &prompt.root; mount /dev/mirror/gm0s1a /mnt + # Eszköz Csatlakozási pont Típus Beállítások Dump Menet +/dev/mirror/gm0s2b none swap sw 0 0 +/dev/mirror/gm0s2a / ufs rw 1 1 +#/dev/mirror/gm0s2d /store ufs rw 2 2 +/dev/mirror/gm0s2e /usr ufs rw 2 2 +/dev/acd0 /cdrom cd9660 ro,noauto 0 0 - Ezt követõen pedig mozgassunk át minden - adatot a frissen létrehozott - állományrendszere arról a lemezrõl, - ahonnan elindítottuk a rendszert. Ebben a - példában ezt ugyan a &man.dump.8; és - &man.restore.8; parancsokkal oldjuk meg, erre a célra - viszont a &man.dd.1; is remekül - használható. + Indítsuk újra a rendszert: - &prompt.root; dump -L -0 -f- / |(cd /mnt && restore -r -v -f-) + &prompt.root; shutdown -r now - Ezt el kell végeznünk mindegyik - állományrendszerre. Egyszerûen másoljuk - be az érintett állományrendszert a - megfelelõ helyre az elõbb bemutatott parancsban. + Ennek megfelelõen a rendszer indítása + közben a da0 eszköz helyett a + gm0 eszközt fogjuk + használni. Miután sikeresen + befejezõdött a rendszerindítás, a + mount parancs kiadásával a + saját szemünkkel is meggyõzõdhetünk + az eredményrõl: - Ezután írjuk át a duplikált - /mnt/etc/fstab állományt, - és távolítsuk el vagy csak kommentezzük - ki belõle a lapozóállományt - - Megjegyezzük, hogy az fstab - állományból kiszedett bejegyzés - miatt valószínûleg más módon - kell majd engedélyeznünk a - lapozóállomány használatát. - Errõl bõvebben lásd a . - . - Írjuk felül a másik - állományrendszer adatait is az új - eszköznek megfelelõ beállításokkal, - ahogy a példa is mutatja: + &prompt.root; mount +Filesystem 1K-blocks Used Avail Capacity Mounted on +/dev/mirror/gm0s1a 1012974 224604 707334 24% / +devfs 1 1 0 100% /dev +/dev/mirror/gm0s1f 45970182 28596 42263972 0% /home +/dev/mirror/gm0s1d 6090094 1348356 4254532 24% /usr +/dev/mirror/gm0s1e 3045006 2241420 559986 80% /var +devfs 1 1 0 100% /var/named/dev - # Device Mountpoint FStype Options Dump Pass# -#/dev/da0s2b none swap sw 0 0 -/dev/mirror/gm0s1a / ufs rw 1 1 + A parancs kimenete az elvárásainknak + megfelelõen remekül néz ki. + Zárásképpen a szinkronizálás + megkezdéséhez a következõ paranccsal + illesszük be a da1 eszközt a + tükrözésbe: - Az alábbi paranccsal gondoskodjunk róla, hogy a - geom_mirror.ko modul - betöltõdjön a rendszerindítás - során: + &prompt.root; gmirror insert gm0 /dev/da1 - &prompt.root; echo 'geom_mirror_load="YES"' >> /mnt/boot/loader.conf - &prompt.root; echo 'geom_mirror_load="YES"' >> /boot/loader.conf + A tükrözés állapota a + létrejöttét követõen az alábbi + paranccsal ellenõrizhetõ: - Indítsuk újra a rendszert: + &prompt.root; gmirror status - &prompt.root; shutdown -r now + Az iménti parancs eredményének + nagyjából a következõnek kell lennie + miután a felépítettük a + tükrözést és szinkronizáltuk az + adatokat: - A rendszerindító képernyõn az - egyfelhasználós mód - eléréséhez válasszuk a negyedik (4) - opciót. A konzol használatával - gyõzödjünk meg róla, hogy a rendszer a - gm0s1a eszközrõl indult. Ezt a - &man.df.1; kimenetébõl deríthetjük - ki. + Name Status Components +mirror/gm0 COMPLETE da0 + da1 - Ha minden rendben zajlott, akkor a rendszerünk elindult a - gm0s1a eszközrõl, és a - login vár minket. Innen a lemez a - következõ parancsok kiadásával - törölhetõ és illeszhetõbe a - tükrözések közé: - - &prompt.root; dd if=/dev/zero of=/dev/da0 bs=512 count=79 + Hiba esetén a tükrözés + továbbra is folytatódik, azonban ilyenkor a + példában szereplõ COMPLETE + helyett a DEGRADED jelzést fogjuk + látni. + - &prompt.root; gmirror configure -a gm0 -&prompt.root; gmirror insert gm0 /dev/da0 - - Az paraméter tudatja a - &man.gmirror.8;-al, hogy automatikus szinkronizációt - használjon, tehát az lemezre írást - magától tükrözze. A - hozzátartozó man oldal elmagyarázza, hogyan - építsük át a tömböt és - hogyan cseréljük benne a lemezeket, habár az - data névvel hivatkozik az itt - említett gm0 eszközre. - - A frissen létrehozott tükrözés - állapotát az alábbi paranccsal - ellenõrizhetjük: - - &prompt.root; gmirror status - Hibakeresés @@ -517,8 +488,38 @@ újra és telepítsük. Ezzel várhatóan orvosoltuk a problémát. + + + + + A meghibásodott lemezek cseréje - + A lemezek tükrözésének egyik + legcsodálatosabb elõnye, hogy a menet közben + meghibásodott meghajtókat gond, és + így feltehetõen adatvesztés + nélkül ki tudjuk cserélni. + + Vegyük az iménti RAID-1 + konfigurációt, és tételezzük fel, + hogy a da1 eszköz felmondta a + szolgáltatot és cserére szorul. A + meghajtó leváltásához keressük + meg a hibás eszközt, majd állítsuk le + a rendszert. Tegyük be a helyére az újat + és indítsuk újra a rendszerünket. + Miután elindult az operációs rendszer, a + következõ parancsok kiadásával tujduk + logikailag is lecserélni a meghibásodott + lemezt: + + &prompt.root; gmirror forget gm0 +&prompt.root; gmirror insert gm0 /dev/da1 + + Innen a gmirror + parancsával kísérhetjük figyelemmel a + tükrözés újraszervezésének + menetét. Csupán ennyi az egész. ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#14 (text+ko) ==== @@ -7,7 +7,7 @@ The FreeBSD Hungarian Documentation Project Translated by: PALI, Gabor %SOURCE% en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml - %SRCID% 1.450 + %SRCID% 1.451 --> @@ -2994,252 +2994,6 @@ - - A <application>Portsnap</application> - használata - - - Bevezetés - - A Portsnap a &os; - portfájának biztonságos - terjesztésére megalkotott rendszer. - Hozzávetõleg óránként egyszer a - portfa egy újabb pillanatképe - jön létre, amit ezután - tömörítenek és digitálisan - aláírnak. Az így keletkezõ - állományokat végül HTTP-n - keresztül terjesztik. - - A CVSuphoz hasonlóan a - Portsnap szintén - lehúzással frissít. - Ennek folyamán a becsomagolt és - aláírt portfák egy webszerveren - tároltan várják passzívan a kliensek - kéréseit. A felhasználók így - vagy a &man.portsnap.8; elindításával - azonnal, vagy pedig a &man.cron.8; - segítségével rendszeresen automatikusan - kérhetnek frissítéseket. - - Technikai megfontolásokból a - Portsnap nem közvetlenül a - /usr/ports/ könyvtárban - található éles - portfát változtatja meg. Helyette - alapértelmezés szerint a - /var/db/portsnap/ könyvtárba - kerülõ tömörített - változatával dolgozik. A frissítés - befejeztével ezzel a tömörített - változattal módosítja az éles - portfát. - - - Ha a Portsnapet a &os; - Portgyûjteményébõl - telepítjük, akkor alapértelmezés - szerint a tömörített pillanatképet a - /var/db/portsnap/ könyvtár - helyett a /usr/local/portsnap/ - könyvtárban hozza létre. - - - - - - Telepítés - - A &os; 6.0 vagy késõbbi változataiban - már a Portsnap az alaprendszer - része. A &os; korábbi verzióra a ports-mgmt/portsnap porton - keresztül telepíthetjük. - - - - - A <application>Portsnap</application> - beállítása - - A Portsnap - mûködését az - /etc/portsnap.conf - konfigurációs állomány - vezérli. A felhasználók - többségének a benne helyet kapott - alapbeállítások megfelelõek. Aki - kíváncsi a részletekre, nézze meg a - &man.portsnap.conf.5; man oldalt. - - - Amennyiben a Portsnapet a &os; - Portgyûjteményébõl - telepítettük, a - /etc/portsnap.conf helyett a - /usr/local/etc/portsnap.conf - konfigurációs állományt fogja - használni. Ez az állomány a port - telepítésekor ugyan nem jön létre - automatikusan, de találhatunk belõle egy - mintát, amit a következõ paranccsal tudunk a - helyére másolni: - - &prompt.root; cd /usr/local/etc && cp portsnap.conf.sample portsnap.conf - - - - - - A <application>Portsnap</application> elsõ - futtatása - - A &man.portsnap.8; elsõ futtatásakor le kell - töltenünk a /var/db/portsnap/ - (vagy /usr/local/portsnap/, ha a - Portsnapet a - Portgyûjteménybõl telepítettük) - könyvtárba az egész portfa - tömörített képét. Ez 2006 - elejétõl nagyjából 41 MB - méretûre dagadt. - - &prompt.root; portsnap fetch - - Miután sikerült letöltenünk a - tömörített képet, az - éles portfa egy - példányát tudjuk kibontani a - /usr/ports/ könyvtárba. Ez a - lépés még abban az esetben is - kötelezõ, ha már valamilyen módon - feltöltöttük volna ezt a könyvtárat - (például a CVSup - segítségével), hiszen ekkor hozza - létre a portsnap a - mûködéséhez szükséges - adatokat is, amelyek révén el tudja majd - dönteni, hogy a portfa pontosan mely részeit kell - frissítenie. - - &prompt.root; portsnap extract - - - A telepítés során alapból nem - jön létre a /usr/ports/ könyvtár. - Ha a &os; 6.0-RELEASE kiadását - használjuk, akkor a portsnap - indítása elõtt ezt a könyvtárat - el kell készítenünk. A &os; vagy a - Portsnap újabb - változataiban a portsnap elsõ - használata során ez már azonban - önmagától megtörténik. - - - - - - A portfa frissítése - - Miután letöltöttük a portfa - kiinduló pillanatképét és kibontottuk - a /usr/ports/ könyvtárba, a - frissítése két lépésben - végezhetõ el: elõször - elkérjük (fetch) a - tömörített kép - frissítéseit, majd ezután az így - nyert módosításokat - érvényesítjük az - éles portfán (update). Ez a két - lépés egyetlen portsnap parancs - kiadásával összefoglalható: - - &prompt.root; portsnap fetch update - - - A portsnap némely régebbi - változatai nem támogatják ezt a - típusú felírást. Ha tehát - nem mûködne az iménti parancs, akkor helyette - próbáljuk meg ezt: - - &prompt.root; portsnap fetch -&prompt.root; portsnap update - - - - - - A <application>Portsnap</application> automatikus - futtatása - - A Portsnap szervereken - keletkezõ hirtelen tömeg - elkerülése érdekében a - portsnap fetch nem fog &man.cron.8; - feladatként futni. Ehelyett erre létezik egy - külön portsnap cron parancs, amivel - a frissítések letöltése elõtt - véletlenszerûen vár legfeljebb 3600 - másodpercet. - - Emellett a portsnap update parancs - futtatását sem javasoljuk cron - feladatként, mivel komoly problémákat - képes okozni akkor, amikor egy port - fordítása vagy telepítése - során adjuk ki. Azonban az - kapcsoló megadásával a portok - INDEX állományát - biztonságosan tudjuk frissíteni. (Ebbõl >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Sep 30 02:45:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CEB0F1065689; Tue, 30 Sep 2008 02:45: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 928EB1065691 for ; Tue, 30 Sep 2008 02:45:45 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7FA8A8FC1C for ; Tue, 30 Sep 2008 02:45:45 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8U2jjvo043062 for ; Tue, 30 Sep 2008 02:45:45 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8U2jjv4043060 for perforce@freebsd.org; Tue, 30 Sep 2008 02:45:45 GMT (envelope-from peter-gmail@wemm.org) Date: Tue, 30 Sep 2008 02:45:45 GMT Message-Id: <200809300245.m8U2jjv4043060@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 150677 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, 30 Sep 2008 02:45:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=150677 Change 150677 by peter@peter_overcee on 2008/09/30 02:45:00 Typo fix (G_ instead of V_), add missing include. Affected files ... .. //depot/projects/hammer/sys/kern/kern_shutdown.c#55 edit Differences ... ==== //depot/projects/hammer/sys/kern/kern_shutdown.c#55 (text+ko) ==== @@ -66,6 +66,7 @@ #include #include #include +#include #include @@ -712,7 +713,7 @@ kdh->dumplength = htod64(dumplen); kdh->dumptime = htod64(time_second); kdh->blocksize = htod32(blksz); - strncpy(kdh->hostname, V_hostname, sizeof(kdh->hostname)); + strncpy(kdh->hostname, G_hostname, sizeof(kdh->hostname)); strncpy(kdh->versionstring, version, sizeof(kdh->versionstring)); if (panicstr != NULL) strncpy(kdh->panicstring, panicstr, sizeof(kdh->panicstring)); From owner-p4-projects@FreeBSD.ORG Tue Sep 30 02:45:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AA871106573E; Tue, 30 Sep 2008 02:45: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 CD98E1065687 for ; Tue, 30 Sep 2008 02:45:45 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A1E278FC1E for ; Tue, 30 Sep 2008 02:45:45 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8U2jjUt043083 for ; Tue, 30 Sep 2008 02:45:45 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8U2jjZW043081 for perforce@freebsd.org; Tue, 30 Sep 2008 02:45:45 GMT (envelope-from peter-gmail@wemm.org) Date: Tue, 30 Sep 2008 02:45:45 GMT Message-Id: <200809300245.m8U2jjZW043081@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 150678 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, 30 Sep 2008 02:45:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=150678 Change 150678 by peter@peter_overcee on 2008/09/30 02:45:20 Use correct function name for kludge attach routine. Affected files ... .. //depot/projects/hammer/sys/dev/uart/uart_bus_puc.c#6 edit Differences ... ==== //depot/projects/hammer/sys/dev/uart/uart_bus_puc.c#6 (text+ko) ==== @@ -114,7 +114,7 @@ } static int -uart_bus_attach(device_t dev) +uart_puc_attach(device_t dev) { uart_puc_kludge_unit(dev); From owner-p4-projects@FreeBSD.ORG Tue Sep 30 19:04:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 453B11065697; Tue, 30 Sep 2008 19:04:25 +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 07B8D1065694 for ; Tue, 30 Sep 2008 19:04:25 +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 E89BD8FC1C for ; Tue, 30 Sep 2008 19:04:24 +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 m8UJ4OFU017343 for ; Tue, 30 Sep 2008 19:04:24 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8UJ4OL7017275 for perforce@freebsd.org; Tue, 30 Sep 2008 19:04:24 GMT (envelope-from jhb@freebsd.org) Date: Tue, 30 Sep 2008 19:04:24 GMT Message-Id: <200809301904.m8UJ4OL7017275@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 150717 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, 30 Sep 2008 19:04:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=150717 Change 150717 by jhb@jhb_mutex on 2008/09/30 19:03:32 IFC @150715 Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/mem.c#13 integrate .. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#48 integrate .. //depot/projects/smpng/sys/amd64/include/smp.h#18 integrate .. //depot/projects/smpng/sys/arm/arm/mem.c#6 integrate .. //depot/projects/smpng/sys/arm/arm/pmap.c#44 integrate .. //depot/projects/smpng/sys/arm/at91/at91_mci.c#6 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_pass.c#19 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_sa.c#31 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_ses.c#19 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_sg.c#4 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_target.c#25 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#3 integrate .. //depot/projects/smpng/sys/cddl/dev/dtrace/dtrace_clone.c#2 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#51 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#46 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#46 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#46 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#46 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_util.h#4 integrate .. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#50 integrate .. //depot/projects/smpng/sys/compat/ia32/ia32_sysvec.c#20 integrate .. //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#66 integrate .. //depot/projects/smpng/sys/conf/files.powerpc#41 integrate .. //depot/projects/smpng/sys/conf/files.sparc64#69 integrate .. //depot/projects/smpng/sys/conf/options.sparc64#17 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_compat.h#17 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_ioctl.c#26 integrate .. //depot/projects/smpng/sys/ddb/db_command.c#42 integrate .. //depot/projects/smpng/sys/ddb/db_command.h#5 integrate .. //depot/projects/smpng/sys/ddb/db_main.c#6 integrate .. //depot/projects/smpng/sys/dev/agp/agp.c#3 integrate .. //depot/projects/smpng/sys/dev/amr/amr.c#47 integrate .. //depot/projects/smpng/sys/dev/arcmsr/arcmsr.c#18 integrate .. //depot/projects/smpng/sys/dev/asr/asr.c#39 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#88 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.h#57 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-tape.c#38 integrate .. //depot/projects/smpng/sys/dev/atkbdc/psm.c#12 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_os.c#29 integrate .. //depot/projects/smpng/sys/dev/ce/if_ce.c#11 integrate .. //depot/projects/smpng/sys/dev/cfe/cfe_api.c#1 branch .. //depot/projects/smpng/sys/dev/cfe/cfe_api.h#1 branch .. //depot/projects/smpng/sys/dev/cfe/cfe_api_int.h#1 branch .. //depot/projects/smpng/sys/dev/cfe/cfe_console.c#1 branch .. //depot/projects/smpng/sys/dev/cfe/cfe_error.h#1 branch .. //depot/projects/smpng/sys/dev/cfe/cfe_ioctl.h#1 branch .. //depot/projects/smpng/sys/dev/cfe/cfe_resource.c#1 branch .. //depot/projects/smpng/sys/dev/cp/if_cp.c#23 integrate .. //depot/projects/smpng/sys/dev/cpuctl/cpuctl.c#3 integrate .. //depot/projects/smpng/sys/dev/ctau/if_ct.c#25 integrate .. //depot/projects/smpng/sys/dev/cxgb/sys/mvec.h#6 integrate .. //depot/projects/smpng/sys/dev/cxgb/sys/uipc_mvec.c#7 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_vm.c#3 integrate .. //depot/projects/smpng/sys/dev/drm/drm_drv.c#8 integrate .. //depot/projects/smpng/sys/dev/drm/drm_fops.c#4 integrate .. //depot/projects/smpng/sys/dev/fb/fb.c#14 integrate .. //depot/projects/smpng/sys/dev/fb/vgareg.h#6 integrate .. //depot/projects/smpng/sys/dev/firewire/firewire.h#16 integrate .. //depot/projects/smpng/sys/dev/firewire/fwdev.c#27 integrate .. //depot/projects/smpng/sys/dev/hptiop/hptiop.c#4 integrate .. //depot/projects/smpng/sys/dev/iir/iir_ctrl.c#14 integrate .. //depot/projects/smpng/sys/dev/iscsi/initiator/isc_cam.c#2 integrate .. //depot/projects/smpng/sys/dev/iscsi/initiator/iscsi.c#3 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.c#59 integrate .. //depot/projects/smpng/sys/dev/joy/joy.c#11 integrate .. //depot/projects/smpng/sys/dev/kbd/kbd.c#21 integrate .. //depot/projects/smpng/sys/dev/led/led.c#16 integrate .. //depot/projects/smpng/sys/dev/mii/ciphy.c#10 integrate .. //depot/projects/smpng/sys/dev/mii/e1000phy.c#17 integrate .. //depot/projects/smpng/sys/dev/mii/miidevs#31 integrate .. //depot/projects/smpng/sys/dev/mlx/mlx.c#21 integrate .. //depot/projects/smpng/sys/dev/mly/mly.c#33 integrate .. //depot/projects/smpng/sys/dev/mmc/mmc.c#4 integrate .. //depot/projects/smpng/sys/dev/mmc/mmcbrvar.h#3 integrate .. //depot/projects/smpng/sys/dev/mmc/mmcreg.h#3 integrate .. //depot/projects/smpng/sys/dev/mmc/mmcsd.c#4 integrate .. //depot/projects/smpng/sys/dev/mmc/mmcvar.h#4 integrate .. //depot/projects/smpng/sys/dev/mse/mse.c#8 integrate .. //depot/projects/smpng/sys/dev/msk/if_msk.c#11 integrate .. //depot/projects/smpng/sys/dev/msk/if_mskreg.h#6 integrate .. //depot/projects/smpng/sys/dev/pbio/pbio.c#7 integrate .. //depot/projects/smpng/sys/dev/powermac_nvram/powermac_nvram.c#3 integrate .. //depot/projects/smpng/sys/dev/ppbus/lpt.c#19 integrate .. //depot/projects/smpng/sys/dev/ppbus/pcfclock.c#13 integrate .. //depot/projects/smpng/sys/dev/ppbus/ppi.c#16 integrate .. //depot/projects/smpng/sys/dev/rp/rpvar.h#8 integrate .. //depot/projects/smpng/sys/dev/siba/siba.c#1 branch .. //depot/projects/smpng/sys/dev/siba/siba_ids.h#1 branch .. //depot/projects/smpng/sys/dev/siba/siba_pcib.c#1 branch .. //depot/projects/smpng/sys/dev/siba/siba_pcibvar.h#1 branch .. //depot/projects/smpng/sys/dev/siba/sibareg.h#1 branch .. //depot/projects/smpng/sys/dev/siba/sibavar.h#1 branch .. //depot/projects/smpng/sys/dev/sound/midi/sequencer.c#22 integrate .. //depot/projects/smpng/sys/dev/sound/pci/emu10kx.c#8 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/dsp.c#44 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/mixer.c#29 integrate .. //depot/projects/smpng/sys/dev/speaker/spkr.c#5 integrate .. //depot/projects/smpng/sys/dev/streams/streams.c#36 integrate .. //depot/projects/smpng/sys/dev/tdfx/tdfx_pci.c#22 integrate .. //depot/projects/smpng/sys/dev/twa/tw_osl_freebsd.c#9 integrate .. //depot/projects/smpng/sys/dev/twe/twe_freebsd.c#26 integrate .. //depot/projects/smpng/sys/dev/usb/ubsa.c#25 integrate .. //depot/projects/smpng/sys/dev/usb/ucomvar.h#13 integrate .. //depot/projects/smpng/sys/dev/usb/ufm.c#17 integrate .. //depot/projects/smpng/sys/dev/usb/ugen.c#40 integrate .. //depot/projects/smpng/sys/dev/usb/uhid.c#33 integrate .. //depot/projects/smpng/sys/dev/usb/ulpt.c#25 integrate .. //depot/projects/smpng/sys/dev/usb/umass.c#67 integrate .. //depot/projects/smpng/sys/dev/usb/ums.c#32 integrate .. //depot/projects/smpng/sys/dev/usb/urio.c#24 integrate .. //depot/projects/smpng/sys/dev/usb/usb.c#39 integrate .. //depot/projects/smpng/sys/dev/usb/uscanner.c#39 integrate .. //depot/projects/smpng/sys/dev/vkbd/vkbd.c#13 integrate .. //depot/projects/smpng/sys/dev/xen/blkfront/blkfront.c#2 integrate .. //depot/projects/smpng/sys/dev/xen/console/console.c#2 integrate .. //depot/projects/smpng/sys/dev/xen/netfront/netfront.c#2 integrate .. //depot/projects/smpng/sys/fs/coda/coda_fbsd.c#3 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#72 integrate .. //depot/projects/smpng/sys/geom/geom_dev.c#49 integrate .. //depot/projects/smpng/sys/geom/part/g_part.c#11 integrate .. //depot/projects/smpng/sys/geom/part/g_part_bsd.c#5 integrate .. //depot/projects/smpng/sys/geom/part/g_part_pc98.c#3 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_machdep.c#30 integrate .. //depot/projects/smpng/sys/i386/bios/apm.c#16 integrate .. //depot/projects/smpng/sys/i386/bios/smapi.c#9 integrate .. //depot/projects/smpng/sys/i386/i386/db_trace.c#38 integrate .. //depot/projects/smpng/sys/i386/i386/mem.c#24 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#114 integrate .. //depot/projects/smpng/sys/i386/include/param.h#19 integrate .. //depot/projects/smpng/sys/i386/include/smp.h#26 integrate .. //depot/projects/smpng/sys/i386/include/xen/evtchn.h#2 integrate .. //depot/projects/smpng/sys/i386/xen/mp_machdep.c#3 integrate .. //depot/projects/smpng/sys/i386/xen/pmap.c#3 integrate .. //depot/projects/smpng/sys/i386/xen/xen_machdep.c#3 integrate .. //depot/projects/smpng/sys/ia64/ia64/interrupt.c#43 integrate .. //depot/projects/smpng/sys/ia64/ia64/mem.c#18 integrate .. //depot/projects/smpng/sys/ia64/ia64/mp_machdep.c#38 integrate .. //depot/projects/smpng/sys/ia64/ia64/sal.c#14 integrate .. //depot/projects/smpng/sys/ia64/include/smp.h#9 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#86 integrate .. //depot/projects/smpng/sys/kern/kern_condvar.c#53 integrate .. //depot/projects/smpng/sys/kern/kern_conf.c#56 integrate .. //depot/projects/smpng/sys/kern/kern_shutdown.c#71 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#125 integrate .. //depot/projects/smpng/sys/kern/makesyscalls.sh#26 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#86 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#92 integrate .. //depot/projects/smpng/sys/kern/systrace_args.c#13 integrate .. //depot/projects/smpng/sys/kern/tty.c#77 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#114 integrate .. //depot/projects/smpng/sys/mips/adm5120/if_admsw.c#3 integrate .. //depot/projects/smpng/sys/mips/include/param.h#2 integrate .. //depot/projects/smpng/sys/mips/include/smp.h#2 integrate .. //depot/projects/smpng/sys/mips/mips/mem.c#2 integrate .. //depot/projects/smpng/sys/mips/mips/mp_machdep.c#3 integrate .. //depot/projects/smpng/sys/mips/mips/pmap.c#2 integrate .. //depot/projects/smpng/sys/mips/mips/trap.c#2 integrate .. //depot/projects/smpng/sys/mips/sentry5/s5_machdep.c#3 integrate .. //depot/projects/smpng/sys/net/if.c#102 integrate .. //depot/projects/smpng/sys/net/if_lagg.c#13 integrate .. //depot/projects/smpng/sys/net/if_stf.c#43 integrate .. //depot/projects/smpng/sys/net/if_tap.c#48 integrate .. //depot/projects/smpng/sys/net/if_tun.c#53 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ddb.c#5 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_hostap.c#4 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_scan_sta.c#4 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#9 integrate .. //depot/projects/smpng/sys/netgraph/ng_device.c#19 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#84 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.h#53 integrate .. //depot/projects/smpng/sys/netinet/ip.h#15 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#95 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#89 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#116 integrate .. //depot/projects/smpng/sys/netsmb/smb_dev.c#25 integrate .. //depot/projects/smpng/sys/pc98/cbus/gdc.c#5 integrate .. //depot/projects/smpng/sys/pc98/cbus/olpt.c#4 integrate .. //depot/projects/smpng/sys/powerpc/include/dbdma.h#3 integrate .. //depot/projects/smpng/sys/powerpc/include/smp.h#4 integrate .. //depot/projects/smpng/sys/powerpc/powermac/ata_dbdma.c#1 branch .. //depot/projects/smpng/sys/powerpc/powermac/ata_dbdma.h#1 branch .. //depot/projects/smpng/sys/powerpc/powermac/ata_kauai.c#11 integrate .. //depot/projects/smpng/sys/powerpc/powermac/ata_macio.c#15 integrate .. //depot/projects/smpng/sys/powerpc/powermac/dbdma.c#3 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/cpu.c#11 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/intr_machdep.c#17 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/mem.c#3 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/mp_machdep.c#10 integrate .. //depot/projects/smpng/sys/security/audit/audit_pipe.c#11 integrate .. //depot/projects/smpng/sys/sparc64/pci/schizo.c#1 branch .. //depot/projects/smpng/sys/sparc64/pci/schizoreg.h#1 branch .. //depot/projects/smpng/sys/sparc64/pci/schizovar.h#1 branch .. //depot/projects/smpng/sys/sparc64/sparc64/mem.c#18 integrate .. //depot/projects/smpng/sys/sun4v/include/smp.h#6 integrate .. //depot/projects/smpng/sys/sys/conf.h#53 integrate .. //depot/projects/smpng/sys/sys/pmc.h#10 integrate .. //depot/projects/smpng/sys/sys/syscall.h#85 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#85 integrate .. //depot/projects/smpng/sys/sys/sysent.h#30 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#89 integrate .. //depot/projects/smpng/sys/sys/systm.h#89 integrate .. //depot/projects/smpng/sys/sys/types.h#36 integrate .. //depot/projects/smpng/sys/vm/device_pager.c#25 integrate .. //depot/projects/smpng/sys/vm/swap_pager.c#77 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#100 integrate .. //depot/projects/smpng/sys/vm/vm_page.h#43 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#68 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.h#17 integrate .. //depot/projects/smpng/sys/xen/evtchn/evtchn.c#2 integrate .. //depot/projects/smpng/sys/xen/gnttab.c#2 integrate .. //depot/projects/smpng/sys/xen/gnttab.h#2 integrate .. //depot/projects/smpng/sys/xen/interface/arch-ia64.h#2 integrate .. //depot/projects/smpng/sys/xen/interface/arch-powerpc.h#2 integrate .. //depot/projects/smpng/sys/xen/interface/arch-x86/cpuid.h#1 branch .. //depot/projects/smpng/sys/xen/interface/arch-x86/hvm/save.h#1 branch .. //depot/projects/smpng/sys/xen/interface/arch-x86/xen-mca.h#1 branch .. //depot/projects/smpng/sys/xen/interface/arch-x86/xen-x86_32.h#2 integrate .. //depot/projects/smpng/sys/xen/interface/arch-x86/xen-x86_64.h#2 integrate .. //depot/projects/smpng/sys/xen/interface/arch-x86/xen.h#2 integrate .. //depot/projects/smpng/sys/xen/interface/callback.h#2 integrate .. //depot/projects/smpng/sys/xen/interface/domctl.h#2 integrate .. //depot/projects/smpng/sys/xen/interface/features.h#2 integrate .. //depot/projects/smpng/sys/xen/interface/foreign/mkchecker.py#2 integrate .. //depot/projects/smpng/sys/xen/interface/foreign/mkheader.py#2 integrate .. //depot/projects/smpng/sys/xen/interface/foreign/structs.py#2 integrate .. //depot/projects/smpng/sys/xen/interface/grant_table.h#2 integrate .. //depot/projects/smpng/sys/xen/interface/hvm/hvm_op.h#2 integrate .. //depot/projects/smpng/sys/xen/interface/hvm/ioreq.h#2 integrate .. //depot/projects/smpng/sys/xen/interface/hvm/params.h#2 integrate .. //depot/projects/smpng/sys/xen/interface/hvm/save.h#2 integrate .. //depot/projects/smpng/sys/xen/interface/io/blkif.h#2 integrate .. //depot/projects/smpng/sys/xen/interface/io/fbif.h#2 integrate .. //depot/projects/smpng/sys/xen/interface/io/kbdif.h#2 integrate .. //depot/projects/smpng/sys/xen/interface/io/netif.h#2 integrate .. //depot/projects/smpng/sys/xen/interface/io/pciif.h#2 integrate .. //depot/projects/smpng/sys/xen/interface/io/protocols.h#2 integrate .. //depot/projects/smpng/sys/xen/interface/io/ring.h#2 integrate .. //depot/projects/smpng/sys/xen/interface/io/xenbus.h#2 integrate .. //depot/projects/smpng/sys/xen/interface/io/xs_wire.h#2 integrate .. //depot/projects/smpng/sys/xen/interface/kexec.h#2 integrate .. //depot/projects/smpng/sys/xen/interface/libelf.h#2 integrate .. //depot/projects/smpng/sys/xen/interface/memory.h#2 integrate .. //depot/projects/smpng/sys/xen/interface/physdev.h#2 integrate .. //depot/projects/smpng/sys/xen/interface/platform.h#2 integrate .. //depot/projects/smpng/sys/xen/interface/sysctl.h#2 integrate .. //depot/projects/smpng/sys/xen/interface/trace.h#2 integrate .. //depot/projects/smpng/sys/xen/interface/vcpu.h#2 integrate .. //depot/projects/smpng/sys/xen/interface/xen-compat.h#2 integrate .. //depot/projects/smpng/sys/xen/interface/xen.h#2 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/mem.c#13 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mem.c,v 1.123 2008/06/20 05:22:09 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mem.c,v 1.124 2008/09/27 08:51:18 ed Exp $"); /* * Memory special file @@ -93,7 +93,7 @@ panic("memrw"); continue; } - if (minor(dev) == CDEV_MINOR_MEM) { + if (dev2unit(dev) == CDEV_MINOR_MEM) { v = uio->uio_offset; kmemphys: o = v & PAGE_MASK; @@ -101,7 +101,7 @@ error = uiomove((void *)PHYS_TO_DMAP(v), (int)c, uio); continue; } - else if (minor(dev) == CDEV_MINOR_KMEM) { + else if (dev2unit(dev) == CDEV_MINOR_KMEM) { v = uio->uio_offset; if (v >= DMAP_MIN_ADDRESS && v < DMAP_MAX_ADDRESS) { @@ -147,9 +147,9 @@ memmmap(struct cdev *dev, vm_offset_t offset, vm_paddr_t *paddr, int prot __unused) { - if (minor(dev) == CDEV_MINOR_MEM) + if (dev2unit(dev) == CDEV_MINOR_MEM) *paddr = offset; - else if (minor(dev) == CDEV_MINOR_KMEM) + else if (dev2unit(dev) == CDEV_MINOR_KMEM) *paddr = vtophys(offset); /* else panic! */ return (0); ==== //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#48 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.293 2008/09/08 09:59:05 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.294 2008/09/28 18:34:14 marius Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -1013,21 +1013,6 @@ } /* - * send an IPI INTerrupt containing 'vector' to all CPUs, including myself - */ -void -ipi_all(u_int ipi) -{ - - if (IPI_IS_BITMAPED(ipi) || (ipi == IPI_STOP && stop_cpus_with_nmi)) { - ipi_selected(all_cpus, ipi); - return; - } - CTR2(KTR_SMP, "%s: ipi: %x", __func__, ipi); - lapic_ipi_vectored(ipi, APIC_IPI_DEST_ALL); -} - -/* * send an IPI to all CPUs EXCEPT myself */ void @@ -1042,21 +1027,6 @@ lapic_ipi_vectored(ipi, APIC_IPI_DEST_OTHERS); } -/* - * send an IPI to myself - */ -void -ipi_self(u_int ipi) -{ - - if (IPI_IS_BITMAPED(ipi) || (ipi == IPI_STOP && stop_cpus_with_nmi)) { - ipi_selected(PCPU_GET(cpumask), ipi); - return; - } - CTR2(KTR_SMP, "%s: ipi: %x", __func__, ipi); - lapic_ipi_vectored(ipi, APIC_IPI_DEST_SELF); -} - #ifdef STOP_NMI /* * send NMI IPI to selected CPUs ==== //depot/projects/smpng/sys/amd64/include/smp.h#18 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/amd64/include/smp.h,v 1.92 2008/03/02 07:58:40 jeff Exp $ + * $FreeBSD: src/sys/amd64/include/smp.h,v 1.93 2008/09/28 18:34:14 marius Exp $ * */ @@ -55,9 +55,7 @@ void cpustop_handler(void); void init_secondary(void); void ipi_selected(u_int cpus, u_int ipi); -void ipi_all(u_int ipi); void ipi_all_but_self(u_int ipi); -void ipi_self(u_int ipi); void ipi_bitmap_handler(struct trapframe frame); u_int mp_bootaddress(u_int); int mp_grab_cpu_hlt(void); ==== //depot/projects/smpng/sys/arm/arm/mem.c#6 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/mem.c,v 1.5 2007/02/13 15:35:57 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/mem.c,v 1.6 2008/09/27 08:51:18 ed Exp $"); /* * Memory special file @@ -91,7 +91,7 @@ panic("memrw"); continue; } - if (minor(dev) == CDEV_MINOR_MEM) { + if (dev2unit(dev) == CDEV_MINOR_MEM) { int i; int address_valid = 0; @@ -116,7 +116,7 @@ pmap_qremove((vm_offset_t)_tmppt, 1); continue; } - else if (minor(dev) == CDEV_MINOR_KMEM) { + else if (dev2unit(dev) == CDEV_MINOR_KMEM) { c = iov->iov_len; /* @@ -156,9 +156,9 @@ memmmap(struct cdev *dev, vm_offset_t offset, vm_paddr_t *paddr, int prot __unused) { - if (minor(dev) == CDEV_MINOR_MEM) + if (dev2unit(dev) == CDEV_MINOR_MEM) *paddr = offset; - else if (minor(dev) == CDEV_MINOR_KMEM) + else if (dev2unit(dev) == CDEV_MINOR_KMEM) *paddr = vtophys(offset); /* else panic! */ return (0); ==== //depot/projects/smpng/sys/arm/arm/pmap.c#44 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.101 2008/05/18 04:16:55 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.102 2008/09/28 05:36:25 imp Exp $"); #include #include #include @@ -2592,7 +2592,6 @@ cpu_tlb_flushD(); cpu_cpwait(); kernel_vm_end = pmap_curmaxkvaddr; - } ==== //depot/projects/smpng/sys/arm/at91/at91_mci.c#6 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.5 2008/09/05 22:30:59 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.7 2008/09/30 02:32:41 imp Exp $"); #include #include @@ -455,7 +455,7 @@ static int at91_mci_get_ro(device_t brdev, device_t reqdev) { - return (-1); + return (0); } static int @@ -678,6 +678,7 @@ case MMCBR_IVAR_VDD: sc->host.ios.vdd = value; break; + /* These are read-only */ case MMCBR_IVAR_HOST_OCR: case MMCBR_IVAR_F_MIN: case MMCBR_IVAR_F_MAX: ==== //depot/projects/smpng/sys/cam/scsi/scsi_pass.c#19 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pass.c,v 1.48 2007/05/16 16:54:23 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pass.c,v 1.49 2008/09/26 14:19:52 ed Exp $"); #include #include @@ -265,7 +265,7 @@ mtx_unlock(periph->sim->mtx); no_tags = (cgd->inq_data.flags & SID_CmdQue) == 0; softc->device_stats = devstat_new_entry("pass", - unit2minor(periph->unit_number), 0, + periph->unit_number, 0, DEVSTAT_NO_BLOCKSIZE | (no_tags ? DEVSTAT_NO_ORDERED_TAGS : 0), softc->pd_type | @@ -274,7 +274,7 @@ DEVSTAT_PRIORITY_PASS); /* Register the device */ - softc->dev = make_dev(&pass_cdevsw, unit2minor(periph->unit_number), + softc->dev = make_dev(&pass_cdevsw, periph->unit_number, UID_ROOT, GID_OPERATOR, 0600, "%s%d", periph->periph_name, periph->unit_number); mtx_lock(periph->sim->mtx); ==== //depot/projects/smpng/sys/cam/scsi/scsi_sa.c#31 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.113 2007/06/16 18:20:29 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.114 2008/09/27 08:51:18 ed Exp $"); #include #include @@ -175,11 +175,11 @@ /* units are bits 4-7, 16-21 (1024 units) */ #define SAUNIT(DEV) \ - (((minor(DEV) & 0xF0) >> 4) | ((minor(DEV) & 0x3f0000) >> 16)) + (((dev2unit(DEV) & 0xF0) >> 4) | ((dev2unit(DEV) & 0x3f0000) >> 16)) -#define SAMODE(z) ((minor(z) & 0x3)) -#define SADENSITY(z) (((minor(z) >> 2) & 0x3)) -#define SA_IS_CTRL(z) (minor(z) & (1 << 29)) +#define SAMODE(z) ((dev2unit(z) & 0x3)) +#define SADENSITY(z) (((dev2unit(z) >> 2) & 0x3)) +#define SA_IS_CTRL(z) (dev2unit(z) & (1 << 29)) #define SA_NOT_CTLDEV 0 #define SA_CTLDEV 1 ==== //depot/projects/smpng/sys/cam/scsi/scsi_ses.c#19 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ses.c,v 1.37 2008/03/17 17:18:16 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ses.c,v 1.39 2008/09/27 08:51:18 ed Exp $"); #include #include @@ -155,7 +155,7 @@ #define SES_FLAG_OPEN 0x02 #define SES_FLAG_INITIALIZED 0x04 -#define SESUNIT(x) (minor((x))) +#define SESUNIT(x) (dev2unit((x))) static d_open_t sesopen; static d_close_t sesclose; @@ -343,7 +343,7 @@ } cam_periph_unlock(periph); - softc->ses_dev = make_dev(&ses_cdevsw, unit2minor(periph->unit_number), + softc->ses_dev = make_dev(&ses_cdevsw, periph->unit_number, UID_ROOT, GID_OPERATOR, 0600, "%s%d", periph->periph_name, periph->unit_number); cam_periph_lock(periph); ==== //depot/projects/smpng/sys/cam/scsi/scsi_sg.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sg.c,v 1.9 2007/05/16 16:54:23 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sg.c,v 1.10 2008/09/26 14:19:52 ed Exp $"); #include #include @@ -287,7 +287,7 @@ cam_periph_unlock(periph); no_tags = (cgd->inq_data.flags & SID_CmdQue) == 0; softc->device_stats = devstat_new_entry("sg", - unit2minor(periph->unit_number), 0, + periph->unit_number, 0, DEVSTAT_NO_BLOCKSIZE | (no_tags ? DEVSTAT_NO_ORDERED_TAGS : 0), softc->pd_type | @@ -296,7 +296,7 @@ DEVSTAT_PRIORITY_PASS); /* Register the device */ - softc->dev = make_dev(&sg_cdevsw, unit2minor(periph->unit_number), + softc->dev = make_dev(&sg_cdevsw, periph->unit_number, UID_ROOT, GID_OPERATOR, 0600, "%s%d", periph->periph_name, periph->unit_number); (void)make_dev_alias(softc->dev, "sg%c", 'a' + periph->unit_number); ==== //depot/projects/smpng/sys/cam/scsi/scsi_target.c#25 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.73 2007/04/15 08:49:11 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.75 2008/09/27 08:51:18 ed Exp $"); #include @@ -180,7 +180,7 @@ /* Create the targ device, allocate its softc, initialize it */ if ((dev->si_flags & SI_NAMED) == 0) { - make_dev(&targ_cdevsw, minor(dev), UID_ROOT, GID_WHEEL, 0600, + make_dev(&targ_cdevsw, dev2unit(dev), UID_ROOT, GID_WHEEL, 0600, "targ%d", dev2unit(dev)); } MALLOC(softc, struct targ_softc *, sizeof(*softc), M_TARG, @@ -1031,7 +1031,7 @@ return; if (dev_stdclone(name, NULL, "targ", &u) != 1) return; - *dev = make_dev(&targ_cdevsw, unit2minor(u), UID_ROOT, GID_WHEEL, + *dev = make_dev(&targ_cdevsw, u, UID_ROOT, GID_WHEEL, 0600, "targ%d", u); dev_ref(*dev); (*dev)->si_flags |= SI_CHEAPCLONE; ==== //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#3 (text+ko) ==== @@ -18,7 +18,7 @@ * * CDDL HEADER END * - * $FreeBSD: src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c,v 1.6 2008/08/19 21:28:58 jb Exp $ + * $FreeBSD: src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c,v 1.8 2008/09/27 17:52:48 jb Exp $ */ /* @@ -12815,8 +12815,12 @@ state = ddi_get_soft_state(dtrace_softstate, minor); #else if (dev != NULL) { - cr = dev->si_cred; - m = minor(dev); + /* + * Disable this until we have the ability to set user + * credentials for DTrace. + * cr = dev->si_cred; + */ + m = dev2unit(dev); } /* Allocate memory for the state. */ @@ -15266,7 +15270,7 @@ * The first minor device is the one that is cloned so there is * nothing more to do here. */ - if (minor(dev) == 0) + if (dev2unit(dev) == 0) return 0; /* @@ -15367,7 +15371,7 @@ dtrace_state_t *state = dev->si_drv1; /* Check if this is not a cloned device. */ - if (minor(dev) == 0) + if (dev2unit(dev) == 0) return (0); #endif ==== //depot/projects/smpng/sys/cddl/dev/dtrace/dtrace_clone.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH * DAMAGE. * - * $FreeBSD: src/sys/cddl/dev/dtrace/dtrace_clone.c,v 1.1 2008/05/23 05:59:41 jb Exp $ + * $FreeBSD: src/sys/cddl/dev/dtrace/dtrace_clone.c,v 1.2 2008/09/26 14:19:52 ed Exp $ * */ @@ -52,7 +52,7 @@ /* Clone the device to the new minor number. */ if (clone_create(&dtrace_clones, &dtrace_cdevsw, &u, dev, 0) != 0) /* Create the /dev/dtrace/dtraceNN entry. */ - *dev = make_dev_cred(&dtrace_cdevsw, unit2minor(u), cred, + *dev = make_dev_cred(&dtrace_cdevsw, u, cred, UID_ROOT, GID_WHEEL, 0600, "dtrace/dtrace%d", u); if (*dev != NULL) { dev_ref(*dev); ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#51 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.79 2008/09/19 15:17:32 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.80 2008/09/25 20:50:21 jhb Exp $"); #include "opt_compat.h" @@ -2624,3 +2624,83 @@ return (error); } #endif + +int +syscall32_register(int *offset, struct sysent *new_sysent, + struct sysent *old_sysent) +{ + if (*offset == NO_SYSCALL) { + int i; + + for (i = 1; i < SYS_MAXSYSCALL; ++i) + if (freebsd32_sysent[i].sy_call == + (sy_call_t *)lkmnosys) + break; + if (i == SYS_MAXSYSCALL) + return (ENFILE); + *offset = i; + } else if (*offset < 0 || *offset >= SYS_MAXSYSCALL) + return (EINVAL); + else if (freebsd32_sysent[*offset].sy_call != (sy_call_t *)lkmnosys && + freebsd32_sysent[*offset].sy_call != (sy_call_t *)lkmressys) + return (EEXIST); + + *old_sysent = freebsd32_sysent[*offset]; + freebsd32_sysent[*offset] = *new_sysent; + return 0; +} + +int +syscall32_deregister(int *offset, struct sysent *old_sysent) +{ + + if (*offset) + freebsd32_sysent[*offset] = *old_sysent; + return 0; +} + +int +syscall32_module_handler(struct module *mod, int what, void *arg) +{ + struct syscall_module_data *data = (struct syscall_module_data*)arg; + modspecific_t ms; + int error; + + switch (what) { + case MOD_LOAD: + error = syscall32_register(data->offset, data->new_sysent, + &data->old_sysent); + if (error) { + /* Leave a mark so we know to safely unload below. */ + data->offset = NULL; + return error; + } + ms.intval = *data->offset; + MOD_XLOCK; + module_setspecific(mod, &ms); + MOD_XUNLOCK; + if (data->chainevh) + error = data->chainevh(mod, what, data->chainarg); + return (error); + case MOD_UNLOAD: + /* + * MOD_LOAD failed, so just return without calling the + * chained handler since we didn't pass along the MOD_LOAD + * event. + */ + if (data->offset == NULL) + return (0); + if (data->chainevh) { + error = data->chainevh(mod, what, data->chainarg); + if (error) + return (error); + } + error = syscall_deregister(data->offset, &data->old_sysent); + return (error); + default: + error = EOPNOTSUPP; + if (data->chainevh) + error = data->chainevh(mod, what, data->chainarg); + return (error); + } +} ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#46 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.92 2008/09/22 16:09:43 obrien Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183270 2008-09-22 16:09:16Z obrien + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.93 2008/09/25 20:08:36 jhb Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183361 2008-09-25 20:07:42Z jhb */ #ifndef _FREEBSD32_SYSPROTO_H_ ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#46 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.91 2008/09/22 16:09:43 obrien Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183270 2008-09-22 16:09:16Z obrien + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.92 2008/09/25 20:08:36 jhb Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183361 2008-09-25 20:07:42Z jhb */ #define FREEBSD32_SYS_syscall 0 ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#46 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.82 2008/09/22 16:09:43 obrien Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183270 2008-09-22 16:09:16Z obrien + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.83 2008/09/25 20:08:36 jhb Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183361 2008-09-25 20:07:42Z jhb */ const char *freebsd32_syscallnames[] = { @@ -217,16 +217,16 @@ "getpgid", /* 207 = getpgid */ "#208", /* 208 = newreboot */ "poll", /* 209 = poll */ - "#210", /* 210 = */ - "#211", /* 211 = */ - "#212", /* 212 = */ - "#213", /* 213 = */ - "#214", /* 214 = */ - "#215", /* 215 = */ - "#216", /* 216 = */ - "#217", /* 217 = */ - "#218", /* 218 = */ - "#219", /* 219 = */ + "lkmnosys", /* 210 = lkmnosys */ + "lkmnosys", /* 211 = lkmnosys */ + "lkmnosys", /* 212 = lkmnosys */ + "lkmnosys", /* 213 = lkmnosys */ + "lkmnosys", /* 214 = lkmnosys */ + "lkmnosys", /* 215 = lkmnosys */ + "lkmnosys", /* 216 = lkmnosys */ + "lkmnosys", /* 217 = lkmnosys */ + "lkmnosys", /* 218 = lkmnosys */ + "lkmnosys", /* 219 = lkmnosys */ "freebsd32_semctl", /* 220 = freebsd32_semctl */ "semget", /* 221 = semget */ "semop", /* 222 = semop */ @@ -377,7 +377,7 @@ "#367", /* 367 = __cap_get_file */ "#368", /* 368 = __cap_set_fd */ "#369", /* 369 = __cap_set_file */ - "#370", /* 370 = lkmressys */ + "#370", /* 370 = nosys */ "extattr_set_fd", /* 371 = extattr_set_fd */ "extattr_get_fd", /* 372 = extattr_get_fd */ "extattr_delete_fd", /* 373 = extattr_delete_fd */ ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#46 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.92 2008/09/22 16:09:43 obrien Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183270 2008-09-22 16:09:16Z obrien + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.93 2008/09/25 20:08:36 jhb Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183361 2008-09-25 20:07:42Z jhb */ #include "opt_compat.h" @@ -248,16 +248,16 @@ { AS(getpgid_args), (sy_call_t *)getpgid, AUE_GETPGID, NULL, 0, 0 }, /* 207 = getpgid */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 208 = newreboot */ { AS(poll_args), (sy_call_t *)poll, AUE_POLL, NULL, 0, 0 }, /* 209 = poll */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 210 = */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 211 = */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 212 = */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 213 = */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 214 = */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 215 = */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 216 = */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 217 = */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 218 = */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 219 = */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 210 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 211 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 212 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 213 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 214 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 215 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 216 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 217 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 218 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 219 = lkmnosys */ { AS(freebsd32_semctl_args), (sy_call_t *)freebsd32_semctl, AUE_SEMCTL, NULL, 0, 0 }, /* 220 = freebsd32_semctl */ { AS(semget_args), (sy_call_t *)semget, AUE_SEMGET, NULL, 0, 0 }, /* 221 = semget */ { AS(semop_args), (sy_call_t *)semop, AUE_SEMOP, NULL, 0, 0 }, /* 222 = semop */ @@ -408,7 +408,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 367 = __cap_get_file */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 368 = __cap_set_fd */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 369 = __cap_set_file */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 370 = lkmressys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 370 = nosys */ { AS(extattr_set_fd_args), (sy_call_t *)extattr_set_fd, AUE_EXTATTR_SET_FD, NULL, 0, 0 }, /* 371 = extattr_set_fd */ { AS(extattr_get_fd_args), (sy_call_t *)extattr_get_fd, AUE_EXTATTR_GET_FD, NULL, 0, 0 }, /* 372 = extattr_get_fd */ { AS(extattr_delete_fd_args), (sy_call_t *)extattr_delete_fd, AUE_EXTATTR_DELETE_FD, NULL, 0, 0 }, /* 373 = extattr_delete_fd */ ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_util.h#4 (text+ko) ==== @@ -25,18 +25,20 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_util.h,v 1.10 2005/06/29 15:16:20 jhb Exp $ + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_util.h,v 1.12 2008/09/25 20:50:21 jhb Exp $ */ +#ifndef _COMPAT_FREEBSD32_FREEBSD32_UTIL_H_ +#define _COMPAT_FREEBSD32_FREEBSD32_UTIL_H_ + +#include +#include +#include + #include #include #include - -#include -#include -#include - struct freebsd32_ps_strings { u_int32_t ps_argvstr; /* first of 0 or more argument strings */ int ps_nargvstr; /* the number of argument strings */ @@ -50,3 +52,35 @@ #define FREEBSD32_PS_STRINGS \ (FREEBSD32_USRSTACK - sizeof(struct freebsd32_ps_strings)) + +extern struct sysent freebsd32_sysent[]; + +#define SYSCALL32_MODULE(name, offset, new_sysent, evh, arg) \ +static struct syscall_module_data name##_syscall32_mod = { \ + evh, arg, offset, new_sysent, { 0, NULL } \ +}; \ + \ +static moduledata_t name##32_mod = { \ + #name, \ + syscall32_module_handler, \ + &name##_syscall32_mod \ +}; \ +DECLARE_MODULE(name##32, name##32_mod, SI_SUB_SYSCALLS, SI_ORDER_MIDDLE) + +#define SYSCALL32_MODULE_HELPER(syscallname) \ +static int syscallname##_syscall32 = FREEBSD32_SYS_##syscallname; \ +static struct sysent syscallname##_sysent32 = { \ + (sizeof(struct syscallname ## _args ) \ + / sizeof(register_t)), \ + (sy_call_t *)& syscallname \ +}; \ +SYSCALL32_MODULE(syscallname, \ + & syscallname##_syscall32, & syscallname##_sysent32,\ + NULL, NULL); + +int syscall32_register(int *offset, struct sysent *new_sysent, + struct sysent *old_sysent); +int syscall32_deregister(int *offset, struct sysent *old_sysent); +int syscall32_module_handler(struct module *mod, int what, void *arg); + +#endif /* !_COMPAT_FREEBSD32_FREEBSD32_UTIL_H_ */ ==== //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#50 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.107 2008/09/22 16:09:16 obrien Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.108 2008/09/25 20:07:42 jhb Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -33,7 +33,7 @@ ; so the SYSCALL_MODULE macro works ; NOARGS same as STD except do not create structure in sys/sysproto.h ; NODEF same as STD except only have the entry in the syscall table -; added. Meaning - do do not create structure or function +; added. Meaning - do not create structure or function ; prototype in sys/sysproto.h ; NOPROTO same as STD except do not create structure or ; function prototype in sys/sysproto.h. Does add a @@ -388,16 +388,16 @@ ; ; The following are reserved for loadable syscalls ; -210 AUE_NULL UNIMPL -211 AUE_NULL UNIMPL -212 AUE_NULL UNIMPL -213 AUE_NULL UNIMPL -214 AUE_NULL UNIMPL -215 AUE_NULL UNIMPL >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Sep 30 19:04:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B8A4106573F; Tue, 30 Sep 2008 19:04:25 +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 35FE81065695 for ; Tue, 30 Sep 2008 19:04:25 +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 251748FC21 for ; Tue, 30 Sep 2008 19:04:25 +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 m8UJ4O1w017371 for ; Tue, 30 Sep 2008 19:04:24 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8UJ4O1j017365 for perforce@freebsd.org; Tue, 30 Sep 2008 19:04:24 GMT (envelope-from jhb@freebsd.org) Date: Tue, 30 Sep 2008 19:04:24 GMT Message-Id: <200809301904.m8UJ4O1j017365@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 150718 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, 30 Sep 2008 19:04:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=150718 Change 150718 by jhb@jhb_mutex on 2008/09/30 19:04:15 IFC @150716 Affected files ... .. //depot/projects/smpng/sys/dev/fatm/if_fatm.c#20 integrate Differences ... ==== //depot/projects/smpng/sys/dev/fatm/if_fatm.c#20 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fatm/if_fatm.c,v 1.24 2008/03/25 09:38:57 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fatm/if_fatm.c,v 1.25 2008/09/30 18:52:43 marius Exp $"); #include "opt_inet.h" #include "opt_natm.h" @@ -2880,7 +2880,7 @@ * restrictions for the controller (and PCI bus) and is never used * to do anything. */ - if (bus_dma_tag_create(NULL, 1, 0, + if (bus_dma_tag_create(bus_get_dma_tag(dev), 1, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, BUS_SPACE_MAXSIZE_32BIT, MAXDMASEGS, BUS_SPACE_MAXSIZE_32BIT, 0, NULL, NULL, From owner-p4-projects@FreeBSD.ORG Tue Sep 30 19:06:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D585F1065696; Tue, 30 Sep 2008 19:06: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 990461065691 for ; Tue, 30 Sep 2008 19:06:27 +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 883698FC23 for ; Tue, 30 Sep 2008 19:06:27 +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 m8UJ6R39029398 for ; Tue, 30 Sep 2008 19:06:27 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8UJ6RnA029376 for perforce@freebsd.org; Tue, 30 Sep 2008 19:06:27 GMT (envelope-from jhb@freebsd.org) Date: Tue, 30 Sep 2008 19:06:27 GMT Message-Id: <200809301906.m8UJ6RnA029376@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 150719 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, 30 Sep 2008 19:06:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=150719 Change 150719 by jhb@jhb_mutex on 2008/09/30 19:05:42 Drop these diffs. I think the critical section fixes this already. Affected files ... .. //depot/projects/smpng/sys/kern/kern_shutdown.c#72 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_shutdown.c#72 (text+ko) ==== @@ -495,7 +495,7 @@ } #ifdef SMP -static volatile uintptr_t panic_thread; +static u_int panic_cpu = NOCPU; #endif /* @@ -510,23 +510,20 @@ int bootopt, newpanic; va_list ap; static char buf[256]; -#ifdef SMP - uintptr_t tid; -#endif critical_enter(); #ifdef SMP /* * We don't want multiple CPU's to panic at the same time, so we - * use panic_thread as a simple spinlock. We have to keep checking - * panic_thread if we are spinning in case the panic on the first + * use panic_cpu as a simple spinlock. We have to keep checking + * panic_cpu if we are spinning in case the panic on the first * CPU is canceled. */ - tid = (uintptr_t)td; - if (panic_thread != tid) - while (atomic_cmpset_ptr(&panic_thread, 0, tid) == 0) - while (panic_thread != 0) - cpu_spinwait(); + if (panic_cpu != PCPU_GET(cpuid)) + while (atomic_cmpset_int(&panic_cpu, NOCPU, + PCPU_GET(cpuid)) == 0) + while (panic_cpu != NOCPU) + ; /* nothing */ #endif bootopt = RB_AUTOBOOT | RB_DUMP; @@ -562,7 +559,7 @@ /* See if the user aborted the panic, in which case we continue. */ if (panicstr == NULL) { #ifdef SMP - atomic_store_rel_ptr(&panic_thread, 0); + atomic_store_rel_int(&panic_cpu, NOCPU); #endif return; } From owner-p4-projects@FreeBSD.ORG Tue Sep 30 20:13:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EEA291065699; Tue, 30 Sep 2008 20:13: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 AE4861065693 for ; Tue, 30 Sep 2008 20:13:36 +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 9D2DD8FC15 for ; Tue, 30 Sep 2008 20:13:36 +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 m8UKDaL3049888 for ; Tue, 30 Sep 2008 20:13:36 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8UKDa5n049886 for perforce@freebsd.org; Tue, 30 Sep 2008 20:13:36 GMT (envelope-from pgj@FreeBSD.org) Date: Tue, 30 Sep 2008 20:13:36 GMT Message-Id: <200809302013.m8UKDa5n049886@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 150721 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, 30 Sep 2008 20:13:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=150721 Change 150721 by pgj@kolbasz on 2008/09/30 20:12:36 MFen: 1.3 -> 1.4 articles/gjournal-desktop/article.sgml Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/gjournal-desktop/article.sgml#5 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/gjournal-desktop/article.sgml#5 (text+ko) ==== @@ -11,7 +11,7 @@ + + A cikkben javasolt naplóméretek + használatával nagyon + valószínûtlen, hogy hétköznapi + feladataink (böngészés az interneten, + szövegszerkesztés, különbözõ + multimédia anyagok lejátszása) közben + bármilyen problémát + észlelnénk. Ha viszont a lemezünk + tartósabb terhelés alatt van, a + következõ szabály betartásával + érhetjük el a legjobb eredményt: a + számítógépünkben levõ + központi memória teljes tartalmának mindig el + kell tudnia férni a naplóterület + egyharmadán. Tehát például ha a + rendszerünk 1 GB memóriával rendelkezik, + akkor egy közel 3,3 GB méretû + naplóterület ajánlott. + (Általánosan: Úgy kapjuk meg a + naplóterület méretét, ha megszorozzuk + a memória méretet 3,3-mal.) + + A naplózásról részleteiben a &man.gjournal.8; man oldalon olvashatunk. @@ -790,7 +814,9 @@ terheltségével. Ha tehát a lemezeink nagyobb terhelés alatt vannak, akkor egy nagyobb területet kell hozzárendelnünk a - naplóhoz. + naplóhoz. Ezzel kapcsolatban lásd a Naplózás + &os; alatt szakaszt. From owner-p4-projects@FreeBSD.ORG Tue Sep 30 20:54:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B4861065692; Tue, 30 Sep 2008 20:54:22 +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 4E802106568B for ; Tue, 30 Sep 2008 20:54:22 +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 3DCD08FC16 for ; Tue, 30 Sep 2008 20:54:22 +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 m8UKsMht045228 for ; Tue, 30 Sep 2008 20:54:22 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8UKsM1e045222 for perforce@freebsd.org; Tue, 30 Sep 2008 20:54:22 GMT (envelope-from pgj@FreeBSD.org) Date: Tue, 30 Sep 2008 20:54:22 GMT Message-Id: <200809302054.m8UKsM1e045222@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 150723 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, 30 Sep 2008 20:54:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=150723 Change 150723 by pgj@kolbasz on 2008/09/30 20:54:02 Minor nits Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/gjournal-desktop/article.sgml#6 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/gjournal-desktop/article.sgml#6 (text+ko) ==== @@ -291,7 +291,7 @@ összeomlásával jár. - A cikkben javasolt naplóméretek + A cikkben javasolt méretek használatával nagyon valószínûtlen, hogy hétköznapi feladataink (böngészés az interneten, @@ -816,7 +816,7 @@ területet kell hozzárendelnünk a naplóhoz. Ezzel kapcsolatban lásd a Naplózás - &os; alatt szakaszt. + &os; alatt címû szakaszt. From owner-p4-projects@FreeBSD.ORG Tue Sep 30 21:44:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 658D01065699; Tue, 30 Sep 2008 21:44: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 29EA91065696 for ; Tue, 30 Sep 2008 21:44:14 +0000 (UTC) (envelope-from rfrench@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 15B748FC28 for ; Tue, 30 Sep 2008 21:44:14 +0000 (UTC) (envelope-from rfrench@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 m8ULiD1N048407 for ; Tue, 30 Sep 2008 21:44:13 GMT (envelope-from rfrench@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8ULiDEF048403 for perforce@freebsd.org; Tue, 30 Sep 2008 21:44:13 GMT (envelope-from rfrench@FreeBSD.org) Date: Tue, 30 Sep 2008 21:44:13 GMT Message-Id: <200809302144.m8ULiDEF048403@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rfrench@FreeBSD.org using -f From: Ryan French To: Perforce Change Reviews Cc: Subject: PERFORCE change 150728 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, 30 Sep 2008 21:44:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=150728 Change 150728 by rfrench@rfrench_mpls on 2008/09/30 21:44:01 Receiving of MPLS packets now work as far as I can tell. When a packet is received it is correctly taken off the queue and decoded. I have to setup routing tables now so that the packet can be forwarded appropriately. Affected files ... .. //depot/projects/soc2008/rfrench_mpls/net/if_ethersubr.c#9 edit .. //depot/projects/soc2008/rfrench_mpls/net/netisr.c#2 edit .. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_input.c#7 edit Differences ... ==== //depot/projects/soc2008/rfrench_mpls/net/if_ethersubr.c#9 (text+ko) ==== @@ -869,6 +869,11 @@ #endif /* NETATALK */ goto discard; } +#ifdef MPLS_DEBUG + if(isr == NETISR_MPLS) { + printf("calling netisr_dispatch\n"); + } +#endif netisr_dispatch(isr, m); return; ==== //depot/projects/soc2008/rfrench_mpls/net/netisr.c#2 (text+ko) ==== @@ -150,8 +150,18 @@ void netisr_dispatch(int num, struct mbuf *m) { +#ifdef MPLS_DEBUG + if(num == 4) + printf("entered dispatch\n"); +#endif + struct netisr *ni; +#ifdef MPLS_DEBUG + if(num == 4 || num == 5) + printf("netisr num = %d\n", num); +#endif + isrstat.isrs_count++; /* XXX redundant */ KASSERT(!(num < 0 || num >= (sizeof(netisrs)/sizeof(*netisrs))), ("bad isr %d", num)); @@ -185,6 +195,10 @@ ni->ni_handler(m); } else { isrstat.isrs_deferred++; +#ifdef MPLS_DEBUG + if (m == NULL) + printf("m is NULL\n"); +#endif if (IF_HANDOFF(ni->ni_queue, m, NULL)) schednetisr(num); } @@ -265,6 +279,5 @@ if (swi_add(NULL, "net", swi_net, NULL, SWI_NET, INTR_MPSAFE, &net_ih)) panic("start_netisr"); - printf("Welcome to Ryan's Fucking Kernel\n"); } SYSINIT(start_netisr, SI_SUB_SOFTINTR, SI_ORDER_FIRST, start_netisr, NULL) ==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_input.c#7 (text+ko) ==== @@ -42,7 +42,8 @@ mpls_init(void) { mplsintrq.ifq_maxlen = mplsqmaxlen; - netisr_register(NETISR_MPLS, mpls_input, &mplsintrq, 0); + mtx_init(&mplsintrq.ifq_mtx, "mpls_inq", NULL, MTX_DEF); + netisr_register(NETISR_MPLS, mpls_input, &mplsintrq, 0); #ifdef MPLS_DEBUG printf("mpls initialised\n"); #endif From owner-p4-projects@FreeBSD.ORG Tue Sep 30 22:01:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 49F8F1065694; Tue, 30 Sep 2008 22:01: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 0E4A81065691 for ; Tue, 30 Sep 2008 22:01:32 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F12D48FC34 for ; Tue, 30 Sep 2008 22:01:31 +0000 (UTC) (envelope-from julian@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 m8UM1VrU092926 for ; Tue, 30 Sep 2008 22:01:31 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8UM1VMu092904 for perforce@freebsd.org; Tue, 30 Sep 2008 22:01:31 GMT (envelope-from julian@freebsd.org) Date: Tue, 30 Sep 2008 22:01:31 GMT Message-Id: <200809302201.m8UM1VMu092904@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 150729 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, 30 Sep 2008 22:01:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=150729 Change 150729 by julian@julian_trafmon1 on 2008/09/30 22:00:56 Fix apparent mismerge Affected files ... .. //depot/projects/vimage/src/sys/netgraph/netgraph.h#12 edit Differences ... ==== //depot/projects/vimage/src/sys/netgraph/netgraph.h#12 (text+ko) ==== @@ -1187,7 +1187,8 @@ #define ng_copy_meta(meta) NULL /* Hash related definitions */ -#define NG_ID_HASH_SIZE 128 /* most systems wont need even this many */ +#define NG_ID_HASH_SIZE 32 /* most systems wont need even this many */ +#define NG_NAME_HASH_SIZE 128 /* most systems wont need even this many */ /* Virtualization macros */ #define INIT_VNET_NETGRAPH(vnet) \ @@ -1196,6 +1197,18 @@ #define VNET_NETGRAPH(sym) VSYM(vnet_netgraph, sym) +#ifdef VIMAGE +struct vnet_netgraph { + LIST_HEAD(, ng_node) _ng_ID_hash[NG_ID_HASH_SIZE]; + LIST_HEAD(, ng_node) _ng_name_hash[NG_NAME_HASH_SIZE]; + LIST_HEAD(, ng_node) _ng_nodelist; + ng_ID_t _nextID; + struct unrhdr *_ng_iface_unit; + struct unrhdr *_ng_eiface_unit; + struct unrhdr *_ng_wormhole_unit; +}; +#endif + /* Symbol translation macros */ #define V_nextID VNET_NETGRAPH(nextID) #define V_ng_ID_hash VNET_NETGRAPH(ng_ID_hash) From owner-p4-projects@FreeBSD.ORG Tue Sep 30 22:08:40 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 57408106568C; Tue, 30 Sep 2008 22:08:40 +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 DAD281065689 for ; Tue, 30 Sep 2008 22:08:39 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C7B7C8FC08 for ; Tue, 30 Sep 2008 22:08:39 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8UM8dAp046976 for ; Tue, 30 Sep 2008 22:08:39 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8UM8ddM046959 for perforce@freebsd.org; Tue, 30 Sep 2008 22:08:39 GMT (envelope-from peter-gmail@wemm.org) Date: Tue, 30 Sep 2008 22:08:39 GMT Message-Id: <200809302208.m8UM8ddM046959@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 150730 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, 30 Sep 2008 22:08:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=150730 Change 150730 by peter@peter_overcee on 2008/09/30 22:08:18 IFC @150727 Affected files ... .. //depot/projects/hammer/bin/pkill/pkill.1#3 integrate .. //depot/projects/hammer/bin/pkill/pkill.c#3 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry.c#36 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry.h#26 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry_copy_stat.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry_private.h#6 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry_stat.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_tar.c#44 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_disk.c#18 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_pax.c#36 integrate .. //depot/projects/hammer/lib/libarchive/config_freebsd.h#11 integrate .. //depot/projects/hammer/lib/libarchive/test/Makefile#14 integrate .. //depot/projects/hammer/lib/libarchive/test/test_entry.c#6 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_disk.c#8 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_disk_times.c#1 branch .. //depot/projects/hammer/lib/libarchive/test/test_write_format_pax.c#1 branch .. //depot/projects/hammer/lib/libc/gen/getosreldate.3#4 integrate .. //depot/projects/hammer/sbin/bsdlabel/bsdlabel.c#24 integrate .. //depot/projects/hammer/sbin/fdisk/fdisk.c#23 integrate .. //depot/projects/hammer/share/examples/FreeBSD_version/FreeBSD_version.c#2 integrate .. //depot/projects/hammer/share/man/man4/wpi.4#3 integrate .. //depot/projects/hammer/sys/arm/at91/at91_mci.c#6 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_main.c#26 integrate .. //depot/projects/hammer/sys/dev/dc/dcphy.c#6 integrate .. //depot/projects/hammer/sys/dev/dc/pnphy.c#4 integrate .. //depot/projects/hammer/sys/dev/fatm/if_fatm.c#18 integrate .. //depot/projects/hammer/sys/dev/mii/ciphy.c#9 integrate .. //depot/projects/hammer/sys/dev/mii/e1000phy.c#14 integrate .. //depot/projects/hammer/sys/dev/mii/miidevs#27 integrate .. //depot/projects/hammer/sys/dev/mmc/mmcsd.c#5 integrate .. //depot/projects/hammer/sys/dev/msk/if_msk.c#13 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#86 integrate .. //depot/projects/hammer/sys/net/if_lagg.c#17 integrate .. //depot/projects/hammer/usr.sbin/boot0cfg/boot0cfg.c#11 integrate Differences ... ==== //depot/projects/hammer/bin/pkill/pkill.1#3 (text+ko) ==== @@ -1,6 +1,6 @@ .\" $NetBSD: pkill.1,v 1.8 2003/02/14 15:59:18 grant Exp $ .\" -.\" $FreeBSD: src/bin/pkill/pkill.1,v 1.2 2008/09/28 16:44:15 ed Exp $ +.\" $FreeBSD: src/bin/pkill/pkill.1,v 1.3 2008/09/30 17:30:39 ed Exp $ .\" .\" Copyright (c) 2002 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -179,9 +179,10 @@ Restrict matches to processes associated with a terminal in the comma-separated list .Ar tty . -The -.Pa /dev/ -prefix of the terminal names must be omitted. +Terminal names may be of the form +.Pa tty Ns Ar xx +or the shortened form +.Ar xx . A single dash .Pq Ql - matches processes not associated with a terminal. ==== //depot/projects/hammer/bin/pkill/pkill.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.2 2008/09/28 16:44:15 ed Exp $"); +__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.3 2008/09/30 17:30:39 ed Exp $"); #include #include @@ -675,16 +675,18 @@ } snprintf(buf, sizeof(buf), _PATH_DEV "%s", cp); + if (stat(buf, &st) != -1) + goto foundtty; + + snprintf(buf, sizeof(buf), _PATH_DEV "tty%s", cp); + if (stat(buf, &st) != -1) + goto foundtty; - if (stat(buf, &st) == -1) { - if (errno == ENOENT) { - errx(STATUS_BADUSAGE, - "No such tty: `%s'", sp); - } - err(STATUS_ERROR, "Cannot access `%s'", sp); - } + if (errno == ENOENT) + errx(STATUS_BADUSAGE, "No such tty: `%s'", sp); + err(STATUS_ERROR, "Cannot access `%s'", sp); - if ((st.st_mode & S_IFCHR) == 0) +foundtty: if ((st.st_mode & S_IFCHR) == 0) errx(STATUS_BADUSAGE, "Not a tty: `%s'", sp); li->li_number = st.st_rdev; ==== //depot/projects/hammer/lib/libarchive/archive_entry.c#36 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.53 2008/09/01 04:54:29 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.54 2008/09/30 03:53:03 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -461,6 +461,24 @@ } time_t +archive_entry_birthtime(struct archive_entry *entry) +{ + return (entry->ae_stat.aest_birthtime); +} + +long +archive_entry_birthtime_nsec(struct archive_entry *entry) +{ + return (entry->ae_stat.aest_birthtime_nsec); +} + +int +archive_entry_birthtime_is_set(struct archive_entry *entry) +{ + return (entry->ae_set & AE_SET_BIRTHTIME); +} + +time_t archive_entry_ctime(struct archive_entry *entry) { return (entry->ae_stat.aest_ctime); @@ -838,6 +856,22 @@ } void +archive_entry_set_birthtime(struct archive_entry *entry, time_t m, long ns) +{ + entry->stat_valid = 0; + entry->ae_set |= AE_SET_BIRTHTIME; + entry->ae_stat.aest_birthtime = m; + entry->ae_stat.aest_birthtime_nsec = ns; +} + +void +archive_entry_unset_birthtime(struct archive_entry *entry) +{ + archive_entry_set_birthtime(entry, 0, 0); + entry->ae_set &= ~AE_SET_BIRTHTIME; +} + +void archive_entry_set_ctime(struct archive_entry *entry, time_t t, long ns) { entry->stat_valid = 0; ==== //depot/projects/hammer/lib/libarchive/archive_entry.h#26 (text+ko) ==== @@ -22,7 +22,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. * - * $FreeBSD: src/lib/libarchive/archive_entry.h,v 1.29 2008/09/18 04:19:06 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_entry.h,v 1.30 2008/09/30 03:53:03 kientzle Exp $ */ #ifndef ARCHIVE_ENTRY_H_INCLUDED @@ -174,6 +174,9 @@ __LA_DECL time_t archive_entry_atime(struct archive_entry *); __LA_DECL long archive_entry_atime_nsec(struct archive_entry *); __LA_DECL int archive_entry_atime_is_set(struct archive_entry *); +__LA_DECL time_t archive_entry_birthtime(struct archive_entry *); +__LA_DECL long archive_entry_birthtime_nsec(struct archive_entry *); +__LA_DECL int archive_entry_birthtime_is_set(struct archive_entry *); __LA_DECL time_t archive_entry_ctime(struct archive_entry *); __LA_DECL long archive_entry_ctime_nsec(struct archive_entry *); __LA_DECL int archive_entry_ctime_is_set(struct archive_entry *); @@ -224,6 +227,8 @@ __LA_DECL void archive_entry_set_atime(struct archive_entry *, time_t, long); __LA_DECL void archive_entry_unset_atime(struct archive_entry *); +__LA_DECL void archive_entry_set_birthtime(struct archive_entry *, time_t, long); +__LA_DECL void archive_entry_unset_birthtime(struct archive_entry *); __LA_DECL void archive_entry_set_ctime(struct archive_entry *, time_t, long); __LA_DECL void archive_entry_unset_ctime(struct archive_entry *); __LA_DECL void archive_entry_set_dev(struct archive_entry *, dev_t); ==== //depot/projects/hammer/lib/libarchive/archive_entry_copy_stat.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_copy_stat.c,v 1.1 2007/05/29 01:00:18 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_copy_stat.c,v 1.2 2008/09/30 03:53:03 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -47,6 +47,12 @@ archive_entry_set_atime(entry, st->st_atime, 0); archive_entry_set_ctime(entry, st->st_ctime, 0); archive_entry_set_mtime(entry, st->st_mtime, 0); +#if HAVE_STRUCT_STAT_ST_BIRTHTIME + archive_entry_set_birthtime(entry, st->st_birthtime, 0); +#endif +#endif +#if HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC + archive_entry_set_birthtime(entry, st->st_birthtime, st->st_birthtimespec.tv_nsec); #endif archive_entry_set_dev(entry, st->st_dev); archive_entry_set_gid(entry, st->st_gid); ==== //depot/projects/hammer/lib/libarchive/archive_entry_private.h#6 (text+ko) ==== @@ -22,7 +22,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. * - * $FreeBSD: src/lib/libarchive/archive_entry_private.h,v 1.5 2008/09/01 04:54:29 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_entry_private.h,v 1.6 2008/09/30 03:53:03 kientzle Exp $ */ #ifndef ARCHIVE_ENTRY_PRIVATE_H_INCLUDED @@ -112,6 +112,8 @@ uint32_t aest_ctime_nsec; int64_t aest_mtime; uint32_t aest_mtime_nsec; + int64_t aest_birthtime; + uint32_t aest_birthtime_nsec; gid_t aest_gid; ino_t aest_ino; mode_t aest_mode; @@ -142,6 +144,7 @@ #define AE_SET_ATIME 4 #define AE_SET_CTIME 8 #define AE_SET_MTIME 16 +#define AE_SET_BIRTHTIME 32 #define AE_SET_SIZE 64 /* ==== //depot/projects/hammer/lib/libarchive/archive_entry_stat.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_stat.c,v 1.1 2007/05/29 01:00:18 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_stat.c,v 1.2 2008/09/30 03:53:03 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -64,6 +64,9 @@ * the appropriate conversions get invoked. */ st->st_atime = archive_entry_atime(entry); +#if HAVE_STRUCT_STAT_ST_BIRTHTIME + st->st_birthtime = archive_entry_birthtime(entry); +#endif st->st_ctime = archive_entry_ctime(entry); st->st_mtime = archive_entry_mtime(entry); st->st_dev = archive_entry_dev(entry); @@ -88,6 +91,9 @@ st->st_ctim.tv_nsec = archive_entry_ctime_nsec(entry); st->st_mtim.tv_nsec = archive_entry_mtime_nsec(entry); #endif +#if HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC + st->st_birthtimespec.tv_nsec = archive_entry_birthtime_nsec(entry); +#endif /* * TODO: On Linux, store 32 or 64 here depending on whether ==== //depot/projects/hammer/lib/libarchive/archive_read_support_format_tar.c#44 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.70 2008/07/10 09:50:55 cperciva Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.71 2008/09/30 03:57:07 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include @@ -1451,6 +1451,10 @@ if (strcmp(key, "LIBARCHIVE.xxxxxxx")==0) archive_entry_set_xxxxxx(entry, value); */ + if (strcmp(key, "LIBARCHIVE.creationtime")==0) { + pax_time(value, &s, &n); + archive_entry_set_birthtime(entry, s, n); + } if (strncmp(key, "LIBARCHIVE.xattr.", 17)==0) pax_attribute_xattr(entry, key, value); break; ==== //depot/projects/hammer/lib/libarchive/archive_write_disk.c#18 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.39 2008/09/14 05:51:25 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.40 2008/09/30 04:02:36 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include @@ -96,10 +96,12 @@ struct fixup_entry { struct fixup_entry *next; mode_t mode; + int64_t atime; + int64_t birthtime; int64_t mtime; - int64_t atime; + unsigned long atime_nanos; + unsigned long birthtime_nanos; unsigned long mtime_nanos; - unsigned long atime_nanos; unsigned long fflags_set; int fixup; /* bitmask of what needs fixing */ char *name; @@ -227,7 +229,8 @@ unsigned long fflags_set, unsigned long fflags_clear); static int set_ownership(struct archive_write_disk *); static int set_mode(struct archive_write_disk *, int mode); -static int set_time(struct archive_write_disk *); +static int set_time(int, int, const char *, time_t, long, time_t, long); +static int set_times(struct archive_write_disk *); static struct fixup_entry *sort_dir_list(struct fixup_entry *p); static gid_t trivial_lookup_gid(void *, const char *, gid_t); static uid_t trivial_lookup_uid(void *, const char *, uid_t); @@ -448,19 +451,29 @@ || archive_entry_atime_is_set(entry))) { fe = current_fixup(a, archive_entry_pathname(entry)); fe->fixup |= TODO_TIMES; + if (archive_entry_atime_is_set(entry)) { + fe->atime = archive_entry_atime(entry); + fe->atime_nanos = archive_entry_atime_nsec(entry); + } else { + /* If atime is unset, use start time. */ + fe->atime = a->start_time; + fe->atime_nanos = 0; + } if (archive_entry_mtime_is_set(entry)) { fe->mtime = archive_entry_mtime(entry); fe->mtime_nanos = archive_entry_mtime_nsec(entry); } else { + /* If mtime is unset, use start time. */ fe->mtime = a->start_time; fe->mtime_nanos = 0; } - if (archive_entry_atime_is_set(entry)) { - fe->atime = archive_entry_atime(entry); - fe->atime_nanos = archive_entry_atime_nsec(entry); + if (archive_entry_birthtime_is_set(entry)) { + fe->birthtime = archive_entry_birthtime(entry); + fe->birthtime_nanos = archive_entry_birthtime_nsec(entry); } else { - fe->atime = a->start_time; - fe->atime_nanos = 0; + /* If birthtime is unset, use mtime. */ + fe->birthtime = fe->mtime; + fe->birthtime_nanos = fe->mtime_nanos; } } @@ -698,7 +711,7 @@ if (r2 < ret) ret = r2; } if (a->todo & TODO_TIMES) { - int r2 = set_time(a); + int r2 = set_times(a); if (r2 < ret) ret = r2; } if (a->todo & TODO_ACLS) { @@ -1170,10 +1183,19 @@ #ifdef HAVE_UTIMES /* {f,l,}utimes() are preferred, when available. */ struct timeval times[2]; + times[0].tv_sec = p->atime; + times[0].tv_usec = p->atime_nanos / 1000; +#ifdef HAVE_STRUCT_STAT_ST_BIRTHTIME + /* if it's valid and not mtime, push the birthtime first */ + if (((times[1].tv_sec = p->birthtime) < p->mtime) && + (p->birthtime > 0)) + { + times[1].tv_usec = p->birthtime_nanos / 1000; + utimes(p->name, times); + } +#endif times[1].tv_sec = p->mtime; times[1].tv_usec = p->mtime_nanos / 1000; - times[0].tv_sec = p->atime; - times[0].tv_usec = p->atime_nanos / 1000; #ifdef HAVE_LUTIMES lutimes(p->name, times); #else @@ -1687,61 +1709,31 @@ * when they're available. */ static int -set_time(struct archive_write_disk *a) +set_time(int fd, int mode, const char *name, + time_t atime, long atime_nsec, + time_t mtime, long mtime_nsec) { struct timeval times[2]; - /* If no time was provided, we're done. */ - if (!archive_entry_atime_is_set(a->entry) - && !archive_entry_mtime_is_set(a->entry)) - return (ARCHIVE_OK); - - /* We know at least one is set, so... */ - if (archive_entry_mtime_is_set(a->entry)) { - times[1].tv_sec = archive_entry_mtime(a->entry); - times[1].tv_usec = archive_entry_mtime_nsec(a->entry) / 1000; - } else { - times[1].tv_sec = a->start_time; - times[1].tv_usec = 0; - } + times[0].tv_sec = atime; + times[0].tv_usec = atime_nsec / 1000; + times[1].tv_sec = mtime; + times[1].tv_usec = mtime_nsec / 1000; - /* If no atime was specified, use start time instead. */ - /* In theory, it would be marginally more correct to use - * time(NULL) here, but that would cost us an extra syscall - * for little gain. */ - if (archive_entry_atime_is_set(a->entry)) { - times[0].tv_sec = archive_entry_atime(a->entry); - times[0].tv_usec = archive_entry_atime_nsec(a->entry) / 1000; - } else { - times[0].tv_sec = a->start_time; - times[0].tv_usec = 0; - } - #ifdef HAVE_FUTIMES - if (a->fd >= 0 && futimes(a->fd, times) == 0) { - return (ARCHIVE_OK); - } + if (fd >= 0) + return (futimes(fd, times)); +#else + (void)fd; /* UNUSED */ #endif - #ifdef HAVE_LUTIMES - if (lutimes(a->name, times) != 0) + (void)mode; /* UNUSED */ + return (lutimes(name, times)); #else - if (!S_ISLNK(a->mode) && utimes(a->name, times) != 0) + if (S_ISLNK(mode)) + return (0); + return (utimes(name, times)); #endif - { - archive_set_error(&a->archive, errno, "Can't update time for %s", - a->name); - return (ARCHIVE_WARN); - } - - /* - * Note: POSIX does not provide a portable way to restore ctime. - * (Apart from resetting the system clock, which is distasteful.) - * So, any restoration of ctime will necessarily be OS-specific. - */ - - /* XXX TODO: Can FreeBSD restore ctime? XXX */ - return (ARCHIVE_OK); } #elif defined(HAVE_UTIME) /* @@ -1749,47 +1741,93 @@ * if utimes() isn't available. */ static int -set_time(struct archive_write_disk *a) +set_time(int fd, int mode, const char *name, + time_t atime, long atime_nsec, + time_t mtime, long mtime_nsec) { struct utimbuf times; + (void)fd; /* UNUSED */ + (void)name; /* UNUSED */ + (void)atime_nsec; /* UNUSED */ + (void)mtime_nsec; /* UNUSED */ + times.actime = atime; + times.modtime = mtime; + if (S_ISLINK(mode)) + return (ARCHIVE_OK); + return (utime(name, ×)); +} +#else +static int +set_time(int fd, int mode, const char *name, + time_t atime, long atime_nsec, + time_t mtime, long mtime_nsec) +{ + return (ARCHIVE_WARN); +} +#endif +static int +set_times(struct archive_write_disk *a) +{ + time_t atime = a->start_time, mtime = a->start_time; + long atime_nsec = 0, mtime_nsec = 0; + /* If no time was provided, we're done. */ if (!archive_entry_atime_is_set(a->entry) +#if HAVE_STRUCT_STAT_ST_BIRTHTIME + && !archive_entry_birthtime_is_set(a->entry) +#endif && !archive_entry_mtime_is_set(a->entry)) return (ARCHIVE_OK); - /* We know at least one is set, so... */ - /* Set mtime from mtime if set, else start time. */ - if (archive_entry_mtime_is_set(a->entry)) - times.modtime = archive_entry_mtime(a->entry); - else - times.modtime = a->start_time; + /* If no atime was specified, use start time instead. */ + /* In theory, it would be marginally more correct to use + * time(NULL) here, but that would cost us an extra syscall + * for little gain. */ + if (archive_entry_atime_is_set(a->entry)) { + atime = archive_entry_atime(a->entry); + atime_nsec = archive_entry_atime_nsec(a->entry); + } - /* Set atime from provided atime, else mtime. */ - if (archive_entry_atime_is_set(a->entry)) - times.actime = archive_entry_atime(a->entry); - else - times.actime = a->start_time; + /* + * If you have struct stat.st_birthtime, we assume BSD birthtime + * semantics, in which {f,l,}utimes() updates birthtime to earliest + * mtime. So we set the time twice, first using the birthtime, + * then using the mtime. + */ +#if HAVE_STRUCT_STAT_ST_BIRTHTIME + /* If birthtime is set, flush that through to disk first. */ + if (archive_entry_birthtime_is_set(a->entry)) + if (set_time(a->fd, a->mode, a->name, atime, atime_nsec, + archive_entry_birthtime(a->entry), + archive_entry_birthtime_nsec(a->entry))) { + archive_set_error(&a->archive, errno, + "Can't update time for %s", + a->name); + return (ARCHIVE_WARN); + } +#endif - if (!S_ISLNK(a->mode) && utime(a->name, ×) != 0) { + if (archive_entry_mtime_is_set(a->entry)) { + mtime = archive_entry_mtime(a->entry); + mtime_nsec = archive_entry_mtime_nsec(a->entry); + } + if (set_time(a->fd, a->mode, a->name, + atime, atime_nsec, mtime, mtime_nsec)) { archive_set_error(&a->archive, errno, - "Can't update time for %s", a->name); + "Can't update time for %s", + a->name); return (ARCHIVE_WARN); } + + /* + * Note: POSIX does not provide a portable way to restore ctime. + * (Apart from resetting the system clock, which is distasteful.) + * So, any restoration of ctime will necessarily be OS-specific. + */ + return (ARCHIVE_OK); } -#else -/* This platform doesn't give us a way to restore the time. */ -static int -set_time(struct archive_write_disk *a) -{ - (void)a; /* UNUSED */ - archive_set_error(&a->archive, errno, - "Can't update time for %s", a->name); - return (ARCHIVE_WARN); -} -#endif - static int set_mode(struct archive_write_disk *a, int mode) ==== //depot/projects/hammer/lib/libarchive/archive_write_set_format_pax.c#36 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_pax.c,v 1.48 2008/08/10 02:06:28 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_pax.c,v 1.49 2008/09/30 03:57:07 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include @@ -762,6 +762,15 @@ archive_entry_atime(entry_main), archive_entry_atime_nsec(entry_main)); + /* Store birth/creationtime only if it's earlier than mtime */ + if (archive_entry_birthtime_is_set(entry_main) && + archive_entry_birthtime(entry_main) + < archive_entry_mtime(entry_main)) + add_pax_attr_time(&(pax->pax_header), + "LIBARCHIVE.creationtime", + archive_entry_birthtime(entry_main), + archive_entry_birthtime_nsec(entry_main)); + /* I use a star-compatible file flag attribute. */ p = archive_entry_fflags_text(entry_main); if (p != NULL && *p != '\0') ==== //depot/projects/hammer/lib/libarchive/config_freebsd.h#11 (text+ko) ==== @@ -22,7 +22,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. * - * $FreeBSD: src/lib/libarchive/config_freebsd.h,v 1.14 2008/09/14 05:51:25 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/config_freebsd.h,v 1.15 2008/09/30 03:53:03 kientzle Exp $ */ /* FreeBSD 5.0 and later have ACL support. */ @@ -89,6 +89,8 @@ #define HAVE_STRING_H 1 #define HAVE_STRRCHR 1 #define HAVE_STRUCT_STAT_ST_BLKSIZE 1 +#define HAVE_STRUCT_STAT_ST_BIRTHTIME 1 +#define HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC 1 #define HAVE_STRUCT_STAT_ST_FLAGS 1 #define HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC 1 #define HAVE_SYS_ACL_H 1 ==== //depot/projects/hammer/lib/libarchive/test/Makefile#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.25 2008/09/08 00:58:12 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.27 2008/09/30 04:02:36 kientzle Exp $ # Where to find the libarchive sources LA_SRCDIR=${.CURDIR}/.. @@ -57,11 +57,13 @@ test_write_disk_hardlink.c \ test_write_disk_perms.c \ test_write_disk_secure.c \ + test_write_disk_times.c \ test_write_format_ar.c \ test_write_format_cpio.c \ test_write_format_cpio_empty.c \ test_write_format_cpio_newc.c \ test_write_format_cpio_odc.c \ + test_write_format_pax.c \ test_write_format_shar_empty.c \ test_write_format_tar.c \ test_write_format_tar_empty.c \ ==== //depot/projects/hammer/lib/libarchive/test/test_entry.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_entry.c,v 1.8 2008/09/01 05:38:33 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_entry.c,v 1.10 2008/09/30 04:13:21 kientzle Exp $"); #include @@ -79,6 +79,15 @@ assertEqualInt(archive_entry_atime_nsec(e), 0); assert(!archive_entry_atime_is_set(e)); + /* birthtime */ + archive_entry_set_birthtime(e, 17579, 24990); + assertEqualInt(archive_entry_birthtime(e), 17579); + assertEqualInt(archive_entry_birthtime_nsec(e), 24990); + archive_entry_unset_birthtime(e); + assertEqualInt(archive_entry_birthtime(e), 0); + assertEqualInt(archive_entry_birthtime_nsec(e), 0); + assert(!archive_entry_birthtime_is_set(e)); + /* ctime */ archive_entry_set_ctime(e, 13580, 24681); assertEqualInt(archive_entry_ctime(e), 13580); @@ -312,6 +321,7 @@ /* Set values in 'e' */ archive_entry_clear(e); archive_entry_set_atime(e, 13579, 24680); + archive_entry_set_birthtime(e, 13779, 24990); archive_entry_set_ctime(e, 13580, 24681); #if ARCHIVE_VERSION_NUMBER >= 1009000 archive_entry_set_dev(e, 235); @@ -348,6 +358,8 @@ /* Clone should have same contents. */ assertEqualInt(archive_entry_atime(e2), 13579); assertEqualInt(archive_entry_atime_nsec(e2), 24680); + assertEqualInt(archive_entry_birthtime(e2), 13779); + assertEqualInt(archive_entry_birthtime_nsec(e2), 24990); assertEqualInt(archive_entry_ctime(e2), 13580); assertEqualInt(archive_entry_ctime_nsec(e2), 24681); #if ARCHIVE_VERSION_NUMBER >= 1009000 @@ -435,6 +447,7 @@ /* Change the original */ archive_entry_set_atime(e, 13580, 24690); + archive_entry_set_birthtime(e, 13980, 24999); archive_entry_set_ctime(e, 13590, 24691); #if ARCHIVE_VERSION_NUMBER >= 1009000 archive_entry_set_dev(e, 245); @@ -468,6 +481,8 @@ /* Clone should still have same contents. */ assertEqualInt(archive_entry_atime(e2), 13579); assertEqualInt(archive_entry_atime_nsec(e2), 24680); + assertEqualInt(archive_entry_birthtime(e2), 13779); + assertEqualInt(archive_entry_birthtime_nsec(e2), 24990); assertEqualInt(archive_entry_ctime(e2), 13580); assertEqualInt(archive_entry_ctime_nsec(e2), 24681); #if ARCHIVE_VERSION_NUMBER >= 1009000 @@ -561,6 +576,8 @@ archive_entry_clear(e); assertEqualInt(archive_entry_atime(e), 0); assertEqualInt(archive_entry_atime_nsec(e), 0); + assertEqualInt(archive_entry_birthtime(e), 0); + assertEqualInt(archive_entry_birthtime_nsec(e), 0); assertEqualInt(archive_entry_ctime(e), 0); assertEqualInt(archive_entry_ctime_nsec(e), 0); assertEqualInt(archive_entry_dev(e), 0); @@ -612,6 +629,7 @@ st.st_atimespec.tv_nsec = 6543210; st.st_ctimespec.tv_nsec = 5432109; st.st_mtimespec.tv_nsec = 3210987; + st.st_birthtimespec.tv_nsec = 7459386; #endif /* Copy them into the entry. */ archive_entry_copy_stat(e, &st); @@ -633,6 +651,7 @@ assertEqualInt(archive_entry_atime_nsec(e), 6543210); assertEqualInt(archive_entry_ctime_nsec(e), 5432109); assertEqualInt(archive_entry_mtime_nsec(e), 3210987); + assertEqualInt(archive_entry_birthtime_nsec(e), 7459386); #endif /* ==== //depot/projects/hammer/lib/libarchive/test/test_write_disk.c#8 (text+ko) ==== @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk.c,v 1.14 2008/09/05 06:13:11 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk.c,v 1.15 2008/09/30 04:02:36 kientzle Exp $"); #if ARCHIVE_VERSION_NUMBER >= 1009000 @@ -99,6 +99,7 @@ st.st_mode, archive_entry_mode(ae)); assertEqualInt(st.st_mode, (archive_entry_mode(ae) & ~UMASK)); assertEqualInt(st.st_size, sizeof(data)); + /* test_write_disk_times has more detailed tests of this area. */ assertEqualInt(st.st_mtime, 123456789); failure("No atime was specified, so atime should get set to current time"); now = time(NULL); ==== //depot/projects/hammer/lib/libc/gen/getosreldate.3#4 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/getosreldate.3,v 1.4 2008/09/20 21:12:54 rodrigc Exp $ +.\" $FreeBSD: src/lib/libc/gen/getosreldate.3,v 1.5 2008/09/30 11:25:55 kib Exp $ .\" -.Dd December 2, 2005 +.Dd September 30, 2008 .Dt GETOSRELDATE 3 .Os .Sh NAME @@ -34,6 +34,7 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS +.In unistd.h .Ft int .Fn getosreldate void .Sh DESCRIPTION ==== //depot/projects/hammer/sbin/bsdlabel/bsdlabel.c#24 (text+ko) ==== @@ -53,7 +53,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/bsdlabel/bsdlabel.c,v 1.115 2008/09/18 14:04:02 lulf Exp $"); +__FBSDID("$FreeBSD: src/sbin/bsdlabel/bsdlabel.c,v 1.117 2008/09/30 11:46:14 lulf Exp $"); #include #include @@ -236,11 +236,12 @@ return(1); } pname = g_providername(fd); - close(fd); if (pname == NULL) { - warnx("error getting providername for %s", specname); + warn("error getting providername for %s", specname); + close(fd); return(1); } + close(fd); } if (installboot && op == UNSPEC) ==== //depot/projects/hammer/sbin/fdisk/fdisk.c#23 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/fdisk/fdisk.c,v 1.86 2008/09/07 13:58:35 lulf Exp $"); +__FBSDID("$FreeBSD: src/sbin/fdisk/fdisk.c,v 1.87 2008/09/30 07:18:49 lulf Exp $"); #include #include @@ -770,7 +770,7 @@ gctl_ro_param(grq, "class", -1, "MBR"); pname = g_providername(fd); if (pname == NULL) { - warnx("Error getting providername for %s\n", disk); + warn("Error getting providername for %s", disk); return (-1); } gctl_ro_param(grq, "geom", -1, pname); ==== //depot/projects/hammer/share/examples/FreeBSD_version/FreeBSD_version.c#2 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD: src/share/examples/FreeBSD_version/FreeBSD_version.c,v 1.3 2008/09/30 11:25:55 kib Exp $ */ #if __FreeBSD__ == 0 /* 1.0 did not define __FreeBSD__ */ #define __FreeBSD_version 199401 #elif __FreeBSD__ == 1 /* 1.1 defined it to be 1 */ @@ -5,13 +6,16 @@ #else /* 2.0 and higher define it to be 2 */ #include /* and this works */ #endif +#include +#include -int main(void) { - extern int getosreldate(void); - printf("Compilation release date: %d\n", __FreeBSD_version); +int +main(void) { + printf("Compilation release date: %d\n", __FreeBSD_version); #if __FreeBSD_version >= 199408 - printf("Execution environment release date: %d\n", getosreldate()); + printf("Execution environment release date: %d\n", getosreldate()); #else - printf("Execution environment release date: can't tell\n"); + printf("Execution environment release date: can't tell\n"); #endif + return (0); } ==== //depot/projects/hammer/share/man/man4/wpi.4#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/share/man/man4/wpi.4,v 1.4 2008/04/20 20:35:46 sam Exp $ +.\" $FreeBSD: src/share/man/man4/wpi.4,v 1.5 2008/09/30 14:24:03 glebius Exp $ .\" .Dd Apri 13, 2008 .Os @@ -94,24 +94,24 @@ Join an existing BSS network (i.e., connect to an access point): .Pp .Bd -literal -offset indent -ifconfig wlan create wlandev wpi0 inet 192.168.0.20 \e +ifconfig wlan0 create wlandev wpi0 inet 192.168.0.20 \e netmask 0xffffff00 .Ed .Pp Join a specific BSS network with network name .Dq Li my_net : .Pp -.Dl "ifconfig wlan create wlandev wpi0 ssid my_net up" +.Dl "ifconfig wlan0 create wlandev wpi0 ssid my_net up" .Pp Join a specific BSS network with 64-bit WEP encryption: .Bd -literal -offset indent -ifconfig wlan create wlandev wpi0 ssid my_net \e +ifconfig wlan0 create wlandev wpi0 ssid my_net \e wepmode on wepkey 0x1234567890 weptxkey 1 up .Ed .Pp Join a specific BSS network with 128-bit WEP encryption: .Bd -literal -offset indent -ifconfig wlan create wlandev wpi0 wlanmode adhoc ssid my_net \e +ifconfig wlan0 create wlandev wpi0 wlanmode adhoc ssid my_net \e wepmode on wepkey 0x01020304050607080910111213 weptxkey 1 .Ed .Sh DIAGNOSTICS ==== //depot/projects/hammer/sys/arm/at91/at91_mci.c#6 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.6 2008/09/28 23:37:56 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.7 2008/09/30 02:32:41 imp Exp $"); #include #include @@ -455,7 +455,7 @@ static int at91_mci_get_ro(device_t brdev, device_t reqdev) { - return (-1); + return (0); } static int @@ -642,9 +642,6 @@ case MMCBR_IVAR_VDD: *(int *)result = sc->host.ios.vdd; break; - case MMCBR_IVAR_CAPS: - *(int *)result = sc->host.ios.caps; - break; } return (0); } @@ -685,7 +682,6 @@ case MMCBR_IVAR_HOST_OCR: case MMCBR_IVAR_F_MIN: case MMCBR_IVAR_F_MAX: - case MMCBR_IVAR_CAPS: return (EINVAL); } return (0); ==== //depot/projects/hammer/sys/dev/cxgb/cxgb_main.c#26 (text+ko) ==== @@ -28,7 +28,7 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_main.c,v 1.67 2008/09/23 03:16:54 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_main.c,v 1.68 2008/09/30 21:21:52 kmacy Exp $"); #include #include @@ -981,6 +981,12 @@ ifmedia_add(&p->media, IFM_ETHER | IFM_1000_T | IFM_FDX, 0, NULL); media_flags = 0; + } else if (!strcmp(p->phy.desc, "1000BASE-X")) { + /* + * XXX: This is not very accurate. Fix when common code + * returns more specific value - eg 1000BASE-SX, LX, etc. + */ + media_flags = IFM_ETHER | IFM_1000_SX | IFM_FDX; } else { printf("unsupported media type %s\n", p->phy.desc); return (ENXIO); ==== //depot/projects/hammer/sys/dev/dc/dcphy.c#6 (text+ko) ==== @@ -31,13 +31,13 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/dc/dcphy.c,v 1.33 2007/11/16 10:25:36 yongari Exp $"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Oct 1 00:00:34 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4681910656A4; Wed, 1 Oct 2008 00:00: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 09FAC10656A3 for ; Wed, 1 Oct 2008 00:00:34 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id ECA118FC1A for ; Wed, 1 Oct 2008 00:00:33 +0000 (UTC) (envelope-from julian@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 m9100XJ3007427 for ; Wed, 1 Oct 2008 00:00:33 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9100Xxh007419 for perforce@freebsd.org; Wed, 1 Oct 2008 00:00:33 GMT (envelope-from julian@freebsd.org) Date: Wed, 1 Oct 2008 00:00:33 GMT Message-Id: <200810010000.m9100Xxh007419@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 150734 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, 01 Oct 2008 00:00:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=150734 Change 150734 by julian@julian_trafmon1 on 2008/09/30 23:59:56 slight mismerges and ommisions Affected files ... .. //depot/projects/vimage/src/sys/netinet/ip_fw.h#18 edit .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#47 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/ip_fw.h#18 (text+ko) ==== @@ -564,6 +564,34 @@ */ #ifdef _KERNEL +/* + * Data structure to cache our ucred related + * information. This structure only gets used if + * the user specified UID/GID based constraints in + * a firewall rule. + */ +struct ip_fw_ugid { + gid_t fw_groups[NGROUPS]; + int fw_ngroups; + uid_t fw_uid; + int fw_prid; +}; + +#define IPFW_TABLES_MAX 128 +struct ip_fw_chain { + struct ip_fw *rules; /* list of rules */ + struct ip_fw *reap; /* list of rules to reap */ + LIST_HEAD(, cfg_nat) nat; /* list of nat entries */ + struct radix_node_head *tables[IPFW_TABLES_MAX]; + struct rwlock rwmtx; +}; + +struct table_entry { + struct radix_node rn[2]; + struct sockaddr_in addr, mask; + u_int32_t value; +}; + /* Return values from ipfw_chk() */ enum { IP_FW_PASS = 0, @@ -648,14 +676,6 @@ extern ip_fw_chk_t *ip_fw_chk_ptr; #define IPFW_LOADED (ip_fw_chk_ptr != NULL) -struct ip_fw_chain { - struct ip_fw *rules; /* list of rules */ - struct ip_fw *reap; /* list of rules to reap */ - LIST_HEAD(, cfg_nat) nat; /* list of nat entries */ - struct radix_node_head *tables[IPFW_TABLES_MAX]; - struct rwlock rwmtx; -}; - #ifdef IPFW_INTERNAL #define IPFW_LOCK_INIT(_chain) \ @@ -714,6 +734,7 @@ u_int64_t _norule_counter; struct callout _ipfw_timeout; eventhandler_tag _ifaddr_event_tag; + struct ip_fw_ugid _fw_ugid_cache; }; #endif @@ -753,7 +774,9 @@ #define V_dyn_max VNET_IPFW(dyn_max) #define V_norule_counter VNET_IPFW(norule_counter) #define V_ipfw_timeout VNET_IPFW(ipfw_timeout) +#define V_ipfw_timeout VNET_IPFW(ipfw_timeout) #define V_ifaddr_event_tag VNET_IPFW(ifaddr_event_tag) +#define V_fw_ugid_cache VNET_IPFW(fw_ugid_cache) #endif /* _KERNEL */ #endif /* _IPFW2_H */ ==== //depot/projects/vimage/src/sys/netinet/ip_fw2.c#47 (text+ko) ==== @@ -74,7 +74,6 @@ #define IPFW_INTERNAL /* Access to protected data structures in ip_fw.h. */ -#include #include #include #include @@ -94,6 +93,7 @@ #include #include #include +#include #include #include @@ -2162,7 +2162,7 @@ * these types of constraints, as well as decrease contention * on pcb related locks. */ -#if 0 +#ifndef VIMAGE struct ip_fw_ugid fw_ugid_cache; /* XXX Marko revisit this */ #endif int ugid_lookup = 0; @@ -2623,7 +2623,8 @@ (ipfw_insn_u32 *)cmd, proto, oif, dst_ip, dst_port, - src_ip, src_port, &fw_ugid_cache, + src_ip, src_port, + &V_fw_ugid_cache, &ugid_lookup, args->inp); break; From owner-p4-projects@FreeBSD.ORG Wed Oct 1 01:37:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B4F12106569D; Wed, 1 Oct 2008 01:37: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 797A21065694 for ; Wed, 1 Oct 2008 01:37:12 +0000 (UTC) (envelope-from rfrench@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 684818FC08 for ; Wed, 1 Oct 2008 01:37:12 +0000 (UTC) (envelope-from rfrench@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 m911bCe5022803 for ; Wed, 1 Oct 2008 01:37:12 GMT (envelope-from rfrench@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m911bCnu022791 for perforce@freebsd.org; Wed, 1 Oct 2008 01:37:12 GMT (envelope-from rfrench@FreeBSD.org) Date: Wed, 1 Oct 2008 01:37:12 GMT Message-Id: <200810010137.m911bCnu022791@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rfrench@FreeBSD.org using -f From: Ryan French To: Perforce Change Reviews Cc: Subject: PERFORCE change 150736 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, 01 Oct 2008 01:37:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=150736 Change 150736 by rfrench@rfrench_mpls on 2008/10/01 01:36:30 Added socket.h so I can add a AF_MPLS family. Added a route structure type to mpls.h. Will probably just add static routes to the initialisation as I have to start writing up a dissertation paper for this in the next 2 weeks. Affected files ... .. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls.h#6 edit .. //depot/projects/soc2008/rfrench_mpls/sys/socket.h#1 add Differences ... ==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls.h#6 (text+ko) ==== @@ -99,6 +99,11 @@ //#endif }; +struct route_mpls { + struct rtentry *ro_rt; + struct sockaddr_mpls ro_dst; +}; + #define MPLS_OP_POP 1 #define MPLS_OP_PUSH 2 #define MPLS_OP_SWAP 3 From owner-p4-projects@FreeBSD.ORG Wed Oct 1 03:10:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 19EB41065688; Wed, 1 Oct 2008 03:10:48 +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 C9EDF1065686 for ; Wed, 1 Oct 2008 03:10:47 +0000 (UTC) (envelope-from rfrench@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B850C8FC1A for ; Wed, 1 Oct 2008 03:10:47 +0000 (UTC) (envelope-from rfrench@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 m913AlTU085245 for ; Wed, 1 Oct 2008 03:10:47 GMT (envelope-from rfrench@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m913Al3n085181 for perforce@freebsd.org; Wed, 1 Oct 2008 03:10:47 GMT (envelope-from rfrench@FreeBSD.org) Date: Wed, 1 Oct 2008 03:10:47 GMT Message-Id: <200810010310.m913Al3n085181@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rfrench@FreeBSD.org using -f From: Ryan French To: Perforce Change Reviews Cc: Subject: PERFORCE change 150737 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, 01 Oct 2008 03:10:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=150737 Change 150737 by rfrench@rfrench_mpls on 2008/10/01 03:10:33 Added the AF_MPLS type to socket.h I replaced AF_VENDOR00, which I hope was the right thing to do. Changed code to use this value as well as cleaned up the domain code. Affected files ... .. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_input.c#8 edit .. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_proto.c#7 edit .. //depot/projects/soc2008/rfrench_mpls/sys/socket.h#2 edit Differences ... ==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_input.c#8 (text+ko) ==== @@ -125,7 +125,7 @@ for (i = 0; i < mpls_inkloop; i++) { bzero(&sa_mpls, sizeof(sa_mpls)); smpls = &sa_mpls; - smpls->smpls_family = NETISR_MPLS; + smpls->smpls_family = AF_MPLS; smpls->smpls_len = sizeof(*smpls); smpls->smpls_in_ifindex = ifp->if_index; smpls->smpls_in_label = shim->shim_label & MPLS_LABEL_MASK; ==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_proto.c#7 (text+ko) ==== @@ -75,11 +75,12 @@ }; struct domain mplsdomain = { - NETISR_MPLS, "mpls", mpls_init, 0, 0, - mplssw, - &mplssw[sizeof(mplssw)/sizeof(mplssw[0])], 0, - rn_inithead, - offsetof(struct sockaddr_mpls, smpls_in_ifindex) << 3, + .dom_family = AF_MPLS, + .dom_name = "mpls", + .dom_protosw = mplssw, + .dom_protoswNPROTOSW = &mplssw[sizeof(mplssw)/sizeof(mplssw[0])], 0, + .dom_rtattach = rn_inithead, + .dom_rtoffset = offsetof(struct sockaddr_mpls, smpls_in_ifindex) << 3, sizeof(struct sockaddr_mpls) }; ==== //depot/projects/soc2008/rfrench_mpls/sys/socket.h#2 (text+ko) ==== @@ -215,7 +215,7 @@ * even numbered constants for FreeBSD until 134 as odd numbered AF_ * constants 39-133 are now reserved for vendors. */ -#define AF_VENDOR00 39 +#define AF_MPLS 39 /* MPLS protocol family */ #define AF_VENDOR01 41 #define AF_VENDOR02 43 #define AF_VENDOR03 45 From owner-p4-projects@FreeBSD.ORG Wed Oct 1 07:25:07 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E63831065695; Wed, 1 Oct 2008 07:25: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 AA61A1065693 for ; Wed, 1 Oct 2008 07:25:06 +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 98DAF8FC20 for ; Wed, 1 Oct 2008 07:25:06 +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 m917P6il062821 for ; Wed, 1 Oct 2008 07:25:06 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m917P6nl062808 for perforce@freebsd.org; Wed, 1 Oct 2008 07:25:06 GMT (envelope-from pgj@FreeBSD.org) Date: Wed, 1 Oct 2008 07:25:06 GMT Message-Id: <200810010725.m917P6nl062808@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 150740 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, 01 Oct 2008 07:25:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=150740 Change 150740 by pgj@kolbasz on 2008/10/01 07:24:49 IFC Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/Makefile#9 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/gjournal-desktop/Makefile#2 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/gjournal-desktop/article.sgml#7 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/trademarks.ent#6 integrate .. //depot/projects/docproj_hu/www/hu/search/search.sgml#15 integrate Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/Makefile#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: doc/hu_HU.ISO8859-2/articles/Makefile,v 1.6 2008/06/25 11:28:03 gabor Exp $ +# $FreeBSD: doc/hu_HU.ISO8859-2/articles/Makefile,v 1.7 2008/09/30 21:02:25 pgj Exp $ # # The FreeBSD Hungarian Documentation Project ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/gjournal-desktop/Makefile#2 (text+ko) ==== ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/gjournal-desktop/article.sgml#7 (text+ko) ==== ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/trademarks.ent#6 (text+ko) ==== @@ -8,7 +8,7 @@ Please keep this file sorted. - $FreeBSD: doc/hu_HU.ISO8859-2/share/sgml/trademarks.ent,v 1.3 2008/06/25 11:28:10 gabor Exp $ + $FreeBSD: doc/hu_HU.ISO8859-2/share/sgml/trademarks.ent,v 1.4 2008/09/30 20:47:33 pgj Exp $ --> - In versies voor &os; 5.3 bestond de parameter - add niet. In die gevallen dient in - plaats daarvan set gebruikt te worden - als in het onderstaande voorbeeld. - - Dit is een slecht idee, omdat het voorkomt dat alle gebruikers ook maar het meest eenvoudige commando kunnen uitvoeren, zoals ls. Een betere lijst met @@ -1534,7 +1527,7 @@ instellingen zijn. De meest onwaarschijnlijke plaats zou een persoonlijk werkstation met slechts twee of drie gebruikers zijn. - + @@ -1865,7 +1858,7 @@ /dev biba/equal /dev/* biba/equal -/var biba/equal +/var biba/equal /var/spool biba/equal /var/spool/* biba/equal @@ -1999,8 +1992,8 @@ met &man.mac.seeotheruids.4; naast elkaar bestaan en zowel toegang tot systeemobjecten als tot gebruikersprocessen ontzeggen. - Begin door de volgende regels aan - /boot/loader.conf toe te voegen: + Begin door de volgende regel aan + /boot/loader.conf toe te voegen: mac_seeotheruids_enabled="YES" @@ -2142,7 +2135,7 @@ Bij het wisselen van root naar een andere gebruiker in het systeem, verschijnt de foutmelding - _secure_path: unable to state .login_conf. + _secure_path: unable to state .login_conf. Deze melding komt meestal voor als de gebruiker een hogere labelinstelling heeft dan de gebruiker waarnaar wordt From owner-p4-projects@FreeBSD.ORG Thu Oct 2 21:08:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5FCFF1065691; Thu, 2 Oct 2008 21:08: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 22013106568F for ; Thu, 2 Oct 2008 21:08:13 +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 0FD4D8FC1C for ; Thu, 2 Oct 2008 21:08:13 +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 m92L8CbQ067639 for ; Thu, 2 Oct 2008 21:08:12 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m92L8CYx067637 for perforce@freebsd.org; Thu, 2 Oct 2008 21:08:12 GMT (envelope-from rene@FreeBSD.org) Date: Thu, 2 Oct 2008 21:08:12 GMT Message-Id: <200810022108.m92L8CYx067637@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 150817 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, 02 Oct 2008 21:08:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=150817 Change 150817 by rene@rene_self on 2008/10/02 21:08:02 MFen basics/chapter.sgml 1.153 -> 1.154 Checked build, spelling (diff only), whitespace Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/basics/chapter.sgml#5 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/basics/chapter.sgml#5 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/basics/chapter.sgml,v 1.17 2008/09/14 22:32:27 remko Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/basics/chapter.sgml - %SRCID% 1.153 + %SRCID% 1.154 --> @@ -760,6 +760,150 @@ Meer informatie voor beheerders staat in &man.chflags.1; en &man.chflags.2;. + + + + + + Tom + Rhodes + Bijgedragen door + + + + + De setuid-, setgid-, en klevende toestemmingen + + Buiten de toestemmingen die reeds besproken zijn, zijn er + nog drie specifieke instellingen waarvan alle beheerders kennis + dienen te hebben. Dit zijn de setuid-, + setgid-, en sticky + toestemmingen. + + Deze instellingen zijn belangrijk voor sommige + &unix;-bewerkingen omdat ze functionaliteit bieden die + normaliter niet aan normale gebruikers wordt gegeven. Om ze te + begrijpen, dient ook het verschil tussen de echte gebruikers-ID + en de effectieve gebruikers-ID opgemerkt te worden. + + De echte gebruikers-ID is de UID die het + proces start of bezit. De effectieve UID is + de gebruikers-ID waaronder het proces draait. Bijvoorbeeld, het + gereedschap &man.passwd.1; draait met de echte gebruikers-ID van + de gebruiker die het wachtwoord verandert; echter, om de + database met wachtwoorden te manipuleren, draait het met de + effectieve ID van de gebruiker root. Dit + is wat normale gebruikers in staat stelt om hun wachtwoorden te + veranderen zonder een fout Permission + Denied te zien. + + + De &man.mount.8;-optie nosuid zorgt + ervoor dat deze binairen zwijgend falen. Dit houdt in dat ze + niet worden uitgevoerd zonder ooit de gebruiker op de hoogte + te stellen. Deze optie is ook niet geheel betrouwbaar + aangezien een nosuid-wrapper dit volgens de + handleidingpagina &man.mount.8; kan omzeilen. + + + De setuid-toestemming kan aangezet worden door het cijfer + vier (4) voor een toestemmingenverzameling te plaatsen zoals te + zien is in het volgende voorbeeld: + + &prompt.root; chmod 4755 suidvoorbeeld.sh + + De toestemmingen op het bestand + suidvoorbeeld.sh dienen er nu als volgt uit + te zien: + + -rwsr-xr-x 1 trhodes trhodes 63 Aug 29 06:36 suidvoorbeeld.sh + + Het zou in dit voorbeeld te zien moeten zijn dat een + s nu deel is van de toestemmingenverzameling + bestemd voor de bestandseigenaar, en de uitvoerbare bit + vervangt. Dit staat gereedschappen toe die verhoogde + toestemmingen nodig hebben, zoals passwd. + + Open twee terminals om dit in real-time te zien. Start op + het ene het proces passwd als een normale + gebruiker. Controleer de procestabel terwijl het op een nieuw + wachtwoord wacht en kijk naar de gebruikersinformatie van het + commando passwd. + + In terminal A: + + Changing local password for trhodes +Old Password: + + In terminal B: + + &prompt.root; ps aux | grep passwd + + trhodes 5232 0.0 0.2 3420 1608 0 R+ 2:10AM 0:00.00 grep passwd +root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 + + Zoals boven vermeld, wordt passwd door + een normale gebruiker gedraaid, maar gebruikt het de effectieve + UID van root. + + De setgid-toestemming voert dezelfde + functie uit als de setuid-toestemming; + behalve dat het de groepsinstellingen verandert. Wanneer een + applicatie of gereedschap met deze instelling wordt gedraaid, + krijgt het de toestemmingen gebaseerd op de groep die het + bestand bezit, niet op de gebruiker die het proces startte. + + Om de setgid-toestemming op een bestand + aan te zetten, dient een voorlopende twee (2) aan het commando + chmod gegeven te worden zoals in het volgende + voorbeeld: + + &prompt.root; chmod 2755 suidvoorbeeld.sh + + De nieuwe instelling kan zoals hierboven bekeken worden, + merk op dat de s nu in het veld bestemd voor + de instellingen van de groepstoestemmingen staat: + + -rwxr-sr-x 1 trhodes trhodes 44 Aug 31 01:49 suidvoorbeeld.sh + + + In deze voorbeelden zal het shellscript niet met een + andere EUID of effectief gebruikers-ID + draaien, zelfs al is het shellscript uitvoerbaar. Dit is + omdat shellscripts geen toegang hebben tot de + &man.setuid.2;-systeemaanroepen. + + + De eerste twee speciale toestemmingsbits die we besproken + hebben (de toestemmingsbits setuid en + setgid) kunnen de systeemveiligheid verlagen, + door verhoogde toestemmingen toe te staan. Er is een derde bit + voor speciale toestemmingen die de veiligheid van een systeem + kan verhogen: de klevende bit. + + De klevende bit, wanneer deze op een map + is ingesteld, staat alleen het verwijderen van bestanden toe + door de eigenaar van die bestanden. Deze + toestemmingenverzameling is nuttig om het verwijderen van + bestanden in publieke mappen, zoals /tmp, door gebruikers die het + bestand niet bezitten te voorkomen. Zet een één + (1) voor de toestemming om deze toestemming te gebruiken. + Bijvoorbeeld: + + &prompt.root; chmod 1777 /tmp + + Het effect kan nu met het commando ls + bekeken worden: + + &prompt.root; ls -al / | grep tmp + + drwxrwxrwt 10 root wheel 512 Aug 31 01:49 tmp + + De toestemming klevende bit is te + onderscheiden met de t aan het einde van de + verzameling. + @@ -1400,7 +1544,7 @@ d Partitie d had vroeger een - speciale betekenis, maar die is verdwenen. + speciale betekenis, maar die is verdwenen. d zou nu kunnen werken als een normale partitie. From owner-p4-projects@FreeBSD.ORG Thu Oct 2 21:12:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AA7D01065688; Thu, 2 Oct 2008 21:12:17 +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 6E6FD1065690 for ; Thu, 2 Oct 2008 21:12:17 +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 5D0E28FC1A for ; Thu, 2 Oct 2008 21:12:17 +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 m92LCHZk068495 for ; Thu, 2 Oct 2008 21:12:17 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m92LCHRY068493 for perforce@freebsd.org; Thu, 2 Oct 2008 21:12:17 GMT (envelope-from rene@FreeBSD.org) Date: Thu, 2 Oct 2008 21:12:17 GMT Message-Id: <200810022112.m92LCHRY068493@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 150818 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, 02 Oct 2008 21:12:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=150818 Change 150818 by rene@rene_self on 2008/10/02 21:12:09 Propose a small change (suidexample.sh -> sgidexample.sh when setting the setgid permission). Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#3 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/basics/chapter.sgml#6 edit Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#3 (text+ko) ==== @@ -748,13 +748,13 @@ file, provide the chmod command with a leading two (2) as in the following example: - &prompt.root; chmod 2755 suidexample.sh + &prompt.root; chmod 2755 sgidexample.sh The new setting may be viewed as before, notice the s is now in the field designated for the group permission settings: - -rwxr-sr-x 1 trhodes trhodes 44 Aug 31 01:49 suidexample.sh + -rwxr-sr-x 1 trhodes trhodes 44 Aug 31 01:49 sgidexample.sh In these examples, even though the shell script in ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/basics/chapter.sgml#6 (text+ko) ==== @@ -858,13 +858,13 @@ chmod gegeven te worden zoals in het volgende voorbeeld: - &prompt.root; chmod 2755 suidvoorbeeld.sh + &prompt.root; chmod 2755 sgidvoorbeeld.sh De nieuwe instelling kan zoals hierboven bekeken worden, merk op dat de s nu in het veld bestemd voor de instellingen van de groepstoestemmingen staat: - -rwxr-sr-x 1 trhodes trhodes 44 Aug 31 01:49 suidvoorbeeld.sh + -rwxr-sr-x 1 trhodes trhodes 44 Aug 31 01:49 sgidvoorbeeld.sh In deze voorbeelden zal het shellscript niet met een From owner-p4-projects@FreeBSD.ORG Thu Oct 2 23:44:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 97433106568D; Thu, 2 Oct 2008 23:44:52 +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 5B75D106568B for ; Thu, 2 Oct 2008 23:44:52 +0000 (UTC) (envelope-from rfrench@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4A59B8FC1C for ; Thu, 2 Oct 2008 23:44:52 +0000 (UTC) (envelope-from rfrench@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 m92NiqM9086135 for ; Thu, 2 Oct 2008 23:44:52 GMT (envelope-from rfrench@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m92Niqt4086133 for perforce@freebsd.org; Thu, 2 Oct 2008 23:44:52 GMT (envelope-from rfrench@FreeBSD.org) Date: Thu, 2 Oct 2008 23:44:52 GMT Message-Id: <200810022344.m92Niqt4086133@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rfrench@FreeBSD.org using -f From: Ryan French To: Perforce Change Reviews Cc: Subject: PERFORCE change 150822 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, 02 Oct 2008 23:44:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=150822 Change 150822 by rfrench@rfrench_mpls on 2008/10/02 23:44:34 Made a few more changes to the psuedo routing entry creater. Managed to stop the kernel from page faulting when an MPLS packet is received, but the interface is now saying it cannot handle to af type. I will be hopefully getting this working by the end of the day. Affected files ... .. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_input.c#11 edit Differences ... ==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_input.c#11 (text+ko) ==== @@ -159,13 +159,13 @@ #ifdef MPLS_DEBUG printf("smpls af %d len %d in_label %d in_ifindex %d\n", smpls->smpls_family, smpls->smpls_len, - MPLS_LABEL_GET(smpls->smpls_in_label), + MPLS_LABEL_GET(smpls->smpls_in_label), smpls->smpls_in_ifindex); #endif - - rt = rtalloc1(smplstosa(smpls),1, 0); +/* uncomment below once routing is implemented */ + //rt = rtalloc1(smplstosa(smpls),1, 0); -//Uncoment this section when routing has been setup +//Uncomment this section when routing has been setup // if (rt == NULL) { // /* no entry for this label */ // #ifdef MPLS_DEBUG @@ -174,12 +174,12 @@ // m_freem(m); // goto done; // } - - rt->rt_use++; - smpls = satosmpls(rt_key(rt)); +// +// rt->rt_use++; +// smpls = satosmpls(rt_key(rt)); #ifdef MPLS_DEBUG /* Remove this once routing has been setup */ - create_fake_entry(smpls); + create_fake_entry(smpls); #endif #ifdef MPLS_DEBUG @@ -219,13 +219,15 @@ /* refetch label */ shim = mtod(m, struct shim_hdr *); - ifp = rt->rt_ifp; + + /* Remove once routing is implemented */ + // ifp = rt->rt_ifp; if (smpls->smpls_out_ifindex) break; - - RTFREE(rt); - rt = NULL; +/* Remove comments when routing has been implemented */ +// RTFREE(rt); +// rt = NULL; } /* write back TTL */ @@ -239,7 +241,8 @@ #endif (*ifp->if_output)(ifp, m, smplstosa(smpls), rt); + done: - if (rt) - RTFREE(rt); + if (rt) + RTFREE(rt); } From owner-p4-projects@FreeBSD.ORG Fri Oct 3 04:27:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 313F6106568F; Fri, 3 Oct 2008 04:27: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 E9A6C106568B for ; Fri, 3 Oct 2008 04:27:44 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D789F8FC14 for ; Fri, 3 Oct 2008 04:27:44 +0000 (UTC) (envelope-from thompsa@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 m934RiFn028625 for ; Fri, 3 Oct 2008 04:27:44 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m934Rifq028623 for perforce@freebsd.org; Fri, 3 Oct 2008 04:27:44 GMT (envelope-from thompsa@freebsd.org) Date: Fri, 3 Oct 2008 04:27:44 GMT Message-Id: <200810030427.m934Rifq028623@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 150829 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, 03 Oct 2008 04:27:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=150829 Change 150829 by thompsa@thompsa_burger on 2008/10/03 04:26:56 Update comment on ng_tty and set the outq to a reasonable size. Affected files ... .. //depot/projects/mpsafetty/sys/netgraph/ng_tty.c#8 edit Differences ... ==== //depot/projects/mpsafetty/sys/netgraph/ng_tty.c#8 (text+ko) ==== @@ -42,16 +42,19 @@ */ /* - * This file implements a terminal line discipline that is also a - * netgraph node. Installing this line discipline on a terminal device - * instantiates a new netgraph node of this type, which allows access - * to the device via the "hook" hook of the node. + * This file implements TTY hooks to link in to the netgraph system. The node + * is created and then passed the callers opened TTY file descriptor number to + * NGM_TTY_SET_TTY, this will hook the tty via ttyhook_register(). + * + * Incoming data is delivered directly to ng_tty via the TTY bypass hook as a + * buffer pointer and length, this is converted to a mbuf and passed to the + * peer. * - * Incoming characters are delievered to the hook one at a time, each - * in its own mbuf. You may optionally define a ``hotchar,'' which causes - * incoming characters to be buffered up until either the hotchar is - * seen or the mbuf is full (MHLEN bytes). Then all buffered characters - * are immediately delivered. + * If the TTY device does not support bypass then incoming characters are + * delivered to the hook one at a time, each in its own mbuf. You may + * optionally define a ``hotchar,'' which causes incoming characters to be + * buffered up until either the hotchar is seen or the mbuf is full (MHLEN + * bytes). Then all buffered characters are immediately delivered. */ #include @@ -76,10 +79,6 @@ #include #include -/* Misc defs */ -#define MAX_MBUFQ 3 /* Max number of queued mbufs */ -#define NGT_HIWATER 400 /* High water mark on output */ - /* Per-node private info */ struct ngt_softc { struct tty *tp; /* Terminal device */ @@ -167,7 +166,7 @@ sc->node = node; mtx_init(&sc->outq.ifq_mtx, "ng_tty node+queue", NULL, MTX_DEF); - IFQ_SET_MAXLEN(&sc->outq, MAX_MBUFQ); + IFQ_SET_MAXLEN(&sc->outq, IFQ_MAXLEN); atomic_add_int(&ngt_unit, 1); snprintf(name, sizeof(name), "%s%d", typestruct.name, ngt_unit); From owner-p4-projects@FreeBSD.ORG Fri Oct 3 04:32:02 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 25B8810656A8; Fri, 3 Oct 2008 04:32: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 DB179106569E for ; Fri, 3 Oct 2008 04:32:01 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C72FB8FC17 for ; Fri, 3 Oct 2008 04:32:01 +0000 (UTC) (envelope-from sam@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 m934W1q8028942 for ; Fri, 3 Oct 2008 04:32:01 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m934Vnbm028921 for perforce@freebsd.org; Fri, 3 Oct 2008 04:31:49 GMT (envelope-from sam@freebsd.org) Date: Fri, 3 Oct 2008 04:31:49 GMT Message-Id: <200810030431.m934Vnbm028921@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 150830 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, 03 Oct 2008 04:32:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=150830 Change 150830 by sam@sam_ebb on 2008/10/03 04:30:51 IFC @ 150825 Affected files ... .. //depot/projects/vap/ObsoleteFiles.inc#20 integrate .. //depot/projects/vap/bin/pkill/pkill.1#2 integrate .. //depot/projects/vap/bin/pkill/pkill.c#2 integrate .. //depot/projects/vap/crypto/openssh/moduli.5#2 integrate .. //depot/projects/vap/crypto/openssh/scp.1#4 integrate .. //depot/projects/vap/crypto/openssh/sftp-server.8#4 integrate .. //depot/projects/vap/crypto/openssh/sftp.1#4 integrate .. //depot/projects/vap/crypto/openssh/ssh-add.1#4 integrate .. //depot/projects/vap/crypto/openssh/ssh-agent.1#4 integrate .. //depot/projects/vap/crypto/openssh/ssh-keygen.1#4 integrate .. //depot/projects/vap/crypto/openssh/ssh-keyscan.1#4 integrate .. //depot/projects/vap/crypto/openssh/ssh-keysign.8#4 integrate .. //depot/projects/vap/crypto/openssh/ssh.1#4 integrate .. //depot/projects/vap/crypto/openssh/ssh_config.5#4 integrate .. //depot/projects/vap/crypto/openssh/sshd.8#4 integrate .. //depot/projects/vap/crypto/openssh/sshd_config.5#4 integrate .. //depot/projects/vap/etc/network.subr#14 integrate .. //depot/projects/vap/gnu/lib/csu/Makefile#6 integrate .. //depot/projects/vap/gnu/usr.bin/gdb/kgdb/kld.c#6 integrate .. //depot/projects/vap/lib/libarchive/archive_entry.c#8 integrate .. //depot/projects/vap/lib/libarchive/archive_entry.h#8 integrate .. //depot/projects/vap/lib/libarchive/archive_entry_copy_stat.c#3 integrate .. //depot/projects/vap/lib/libarchive/archive_entry_private.h#7 integrate .. //depot/projects/vap/lib/libarchive/archive_entry_stat.c#3 integrate .. //depot/projects/vap/lib/libarchive/archive_read_support_format_tar.c#8 integrate .. //depot/projects/vap/lib/libarchive/archive_write_disk.c#16 integrate .. //depot/projects/vap/lib/libarchive/archive_write_set_format_pax.c#7 integrate .. //depot/projects/vap/lib/libarchive/config_freebsd.h#9 integrate .. //depot/projects/vap/lib/libarchive/test/Makefile#13 integrate .. //depot/projects/vap/lib/libarchive/test/test_entry.c#7 integrate .. //depot/projects/vap/lib/libarchive/test/test_write_disk.c#7 integrate .. //depot/projects/vap/lib/libarchive/test/test_write_disk_times.c#1 branch .. //depot/projects/vap/lib/libarchive/test/test_write_format_pax.c#1 branch .. //depot/projects/vap/lib/libc/gen/getosreldate.3#4 integrate .. //depot/projects/vap/lib/libc/sys/cpuset.2#3 integrate .. //depot/projects/vap/lib/libc/sys/cpuset_getaffinity.2#3 integrate .. //depot/projects/vap/lib/libpmc/pmc.k7.3#2 integrate .. //depot/projects/vap/lib/libpmc/pmc.k8.3#2 integrate .. //depot/projects/vap/lib/libpmc/pmc.p5.3#2 integrate .. //depot/projects/vap/lib/libpmc/pmc.p6.3#2 integrate .. //depot/projects/vap/sbin/bsdlabel/bsdlabel.c#6 integrate .. //depot/projects/vap/sbin/fdisk/fdisk.c#5 integrate .. //depot/projects/vap/sbin/ifconfig/ifconfig.c#12 integrate .. //depot/projects/vap/sbin/ifconfig/ifvlan.c#8 integrate .. //depot/projects/vap/sbin/setkey/setkey.8#3 integrate .. //depot/projects/vap/share/examples/FreeBSD_version/FreeBSD_version.c#3 integrate .. //depot/projects/vap/share/man/man3/Makefile#6 integrate .. //depot/projects/vap/share/man/man3/makedev.3#1 branch .. //depot/projects/vap/share/man/man4/nfe.4#4 integrate .. //depot/projects/vap/share/man/man4/wpi.4#5 integrate .. //depot/projects/vap/share/man/man9/Makefile#15 integrate .. //depot/projects/vap/share/man/man9/device_ids.9#3 delete .. //depot/projects/vap/share/man/man9/make_dev.9#5 integrate .. //depot/projects/vap/share/man/man9/spl.9#3 integrate .. //depot/projects/vap/share/zoneinfo/southamerica#8 integrate .. //depot/projects/vap/sys/amd64/amd64/dump_machdep.c#8 integrate .. //depot/projects/vap/sys/amd64/amd64/minidump_machdep.c#8 integrate .. //depot/projects/vap/sys/amd64/amd64/mp_machdep.c#11 integrate .. //depot/projects/vap/sys/amd64/include/param.h#9 integrate .. //depot/projects/vap/sys/amd64/include/smp.h#7 integrate .. //depot/projects/vap/sys/arm/arm/dump_machdep.c#7 integrate .. //depot/projects/vap/sys/arm/arm/pmap.c#12 integrate .. //depot/projects/vap/sys/arm/at91/at91_mci.c#4 integrate .. //depot/projects/vap/sys/arm/xscale/ixp425/avila_machdep.c#6 integrate .. //depot/projects/vap/sys/compat/linprocfs/linprocfs.c#11 integrate .. //depot/projects/vap/sys/compat/linux/linux_ioctl.c#8 integrate .. //depot/projects/vap/sys/compat/linux/linux_misc.c#18 integrate .. //depot/projects/vap/sys/compat/linux/linux_socket.c#8 integrate .. //depot/projects/vap/sys/compat/svr4/svr4_sockio.c#6 integrate .. //depot/projects/vap/sys/conf/files.sparc64#12 integrate .. //depot/projects/vap/sys/conf/kmod.mk#7 integrate .. //depot/projects/vap/sys/conf/newvers.sh#8 integrate .. //depot/projects/vap/sys/conf/options.sparc64#7 integrate .. //depot/projects/vap/sys/contrib/ipfilter/netinet/ip_auth.c#6 integrate .. //depot/projects/vap/sys/contrib/pf/net/pf.c#11 integrate .. //depot/projects/vap/sys/contrib/pf/net/pf_if.c#8 integrate .. //depot/projects/vap/sys/contrib/pf/net/pf_ioctl.c#12 integrate .. //depot/projects/vap/sys/contrib/pf/net/pf_subr.c#6 integrate .. //depot/projects/vap/sys/contrib/pf/net/pfvar.h#6 integrate .. //depot/projects/vap/sys/contrib/rdma/rdma_cma.c#3 integrate .. //depot/projects/vap/sys/ddb/db_textdump.c#4 integrate .. //depot/projects/vap/sys/dev/agp/agp_i810.c#6 integrate .. //depot/projects/vap/sys/dev/agp/agpreg.h#3 integrate .. //depot/projects/vap/sys/dev/ata/ata-chipset.c#17 integrate .. //depot/projects/vap/sys/dev/ata/ata-pci.h#12 integrate .. //depot/projects/vap/sys/dev/cfe/cfe_console.c#2 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_main.c#15 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_sge.c#13 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#4 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#12 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#11 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#7 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_vm.c#3 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_vm.h#2 integrate .. //depot/projects/vap/sys/dev/dc/dcphy.c#3 integrate .. //depot/projects/vap/sys/dev/dc/pnphy.c#3 integrate .. //depot/projects/vap/sys/dev/fatm/if_fatm.c#7 integrate .. //depot/projects/vap/sys/dev/firewire/firewire.c#7 integrate .. //depot/projects/vap/sys/dev/hwpmc/pmc_events.h#4 integrate .. //depot/projects/vap/sys/dev/mii/ciphy.c#7 integrate .. //depot/projects/vap/sys/dev/mii/e1000phy.c#6 integrate .. //depot/projects/vap/sys/dev/mii/miidevs#14 integrate .. //depot/projects/vap/sys/dev/mmc/mmc.c#3 integrate .. //depot/projects/vap/sys/dev/mmc/mmcbrvar.h#3 integrate .. //depot/projects/vap/sys/dev/mmc/mmcreg.h#3 integrate .. //depot/projects/vap/sys/dev/mmc/mmcsd.c#3 integrate .. //depot/projects/vap/sys/dev/mmc/mmcvar.h#3 integrate .. //depot/projects/vap/sys/dev/msk/if_msk.c#10 integrate .. //depot/projects/vap/sys/dev/mxge/eth_z8e.h#4 integrate .. //depot/projects/vap/sys/dev/mxge/ethp_z8e.h#4 integrate .. //depot/projects/vap/sys/dev/mxge/mxge_mcp.h#4 integrate .. //depot/projects/vap/sys/dev/mxge/rss_eth_z8e.h#3 integrate .. //depot/projects/vap/sys/dev/mxge/rss_ethp_z8e.h#3 integrate .. //depot/projects/vap/sys/dev/nfe/if_nfe.c#7 integrate .. //depot/projects/vap/sys/dev/nfe/if_nfereg.h#5 integrate .. //depot/projects/vap/sys/dev/nfe/if_nfevar.h#4 integrate .. //depot/projects/vap/sys/dev/pccbb/pccbb_pci.c#6 integrate .. //depot/projects/vap/sys/fs/cd9660/cd9660_rrip.c#5 integrate .. //depot/projects/vap/sys/geom/part/g_part.c#11 integrate .. //depot/projects/vap/sys/geom/part/g_part_bsd.c#6 integrate .. //depot/projects/vap/sys/geom/vinum/geom_vinum.h#5 integrate .. //depot/projects/vap/sys/geom/vinum/geom_vinum_drive.c#9 integrate .. //depot/projects/vap/sys/geom/vinum/geom_vinum_rm.c#5 integrate .. //depot/projects/vap/sys/geom/vinum/geom_vinum_var.h#6 integrate .. //depot/projects/vap/sys/i386/i386/dump_machdep.c#8 integrate .. //depot/projects/vap/sys/i386/i386/minidump_machdep.c#6 integrate .. //depot/projects/vap/sys/i386/i386/mp_machdep.c#12 integrate .. //depot/projects/vap/sys/i386/include/param.h#7 integrate .. //depot/projects/vap/sys/i386/include/smp.h#8 integrate .. //depot/projects/vap/sys/i386/xen/mp_machdep.c#3 integrate .. //depot/projects/vap/sys/ia64/ia64/dump_machdep.c#7 integrate .. //depot/projects/vap/sys/ia64/ia64/interrupt.c#11 integrate .. //depot/projects/vap/sys/ia64/ia64/mp_machdep.c#8 integrate .. //depot/projects/vap/sys/ia64/ia64/sal.c#6 integrate .. //depot/projects/vap/sys/ia64/include/smp.h#5 integrate .. //depot/projects/vap/sys/kern/kern_jail.c#14 integrate .. //depot/projects/vap/sys/kern/kern_mib.c#12 integrate .. //depot/projects/vap/sys/kern/kern_shutdown.c#12 integrate .. //depot/projects/vap/sys/kern/kern_uuid.c#6 integrate .. //depot/projects/vap/sys/kern/kern_xxx.c#7 integrate .. //depot/projects/vap/sys/kern/uipc_socket.c#15 integrate .. //depot/projects/vap/sys/kern/vfs_lookup.c#12 integrate .. //depot/projects/vap/sys/mips/adm5120/if_admsw.c#3 integrate .. //depot/projects/vap/sys/mips/include/param.h#2 integrate .. //depot/projects/vap/sys/mips/include/smp.h#2 integrate .. //depot/projects/vap/sys/mips/mips/mp_machdep.c#3 integrate .. //depot/projects/vap/sys/mips/mips/pmap.c#6 integrate .. //depot/projects/vap/sys/mips/mips/trap.c#3 integrate .. //depot/projects/vap/sys/net/bridgestp.c#5 integrate .. //depot/projects/vap/sys/net/if.c#17 integrate .. //depot/projects/vap/sys/net/if_bridge.c#9 integrate .. //depot/projects/vap/sys/net/if_ef.c#8 integrate .. //depot/projects/vap/sys/net/if_ethersubr.c#12 integrate .. //depot/projects/vap/sys/net/if_faith.c#10 integrate .. //depot/projects/vap/sys/net/if_gif.c#11 integrate .. //depot/projects/vap/sys/net/if_gif.h#6 integrate .. //depot/projects/vap/sys/net/if_gre.c#13 integrate .. //depot/projects/vap/sys/net/if_lagg.c#9 integrate .. //depot/projects/vap/sys/net/if_loop.c#14 integrate .. //depot/projects/vap/sys/net/if_mib.c#7 integrate .. //depot/projects/vap/sys/net/if_spppsubr.c#6 integrate .. //depot/projects/vap/sys/net/if_stf.c#12 integrate .. //depot/projects/vap/sys/net/if_tun.c#9 integrate .. //depot/projects/vap/sys/net/if_var.h#12 integrate .. //depot/projects/vap/sys/net/if_vlan.c#12 integrate .. //depot/projects/vap/sys/net/raw_cb.c#10 integrate .. //depot/projects/vap/sys/net/raw_usrreq.c#8 integrate .. //depot/projects/vap/sys/net/route.c#14 integrate .. //depot/projects/vap/sys/net/rtsock.c#12 integrate .. //depot/projects/vap/sys/net/vnet.h#1 branch .. //depot/projects/vap/sys/net80211/ieee80211_ddb.c#29 integrate .. //depot/projects/vap/sys/netgraph/atm/ng_atm.c#7 integrate .. //depot/projects/vap/sys/netgraph/netgraph.h#11 integrate .. //depot/projects/vap/sys/netgraph/ng_base.c#23 integrate .. //depot/projects/vap/sys/netgraph/ng_eiface.c#7 integrate .. //depot/projects/vap/sys/netgraph/ng_gif.c#7 integrate .. //depot/projects/vap/sys/netgraph/ng_iface.c#9 integrate .. //depot/projects/vap/sys/netinet/if_ether.c#13 integrate .. //depot/projects/vap/sys/netinet/igmp.c#7 integrate .. //depot/projects/vap/sys/netinet/in.c#9 integrate .. //depot/projects/vap/sys/netinet/in.h#8 integrate .. //depot/projects/vap/sys/netinet/in_gif.c#7 integrate .. //depot/projects/vap/sys/netinet/in_mcast.c#6 integrate .. //depot/projects/vap/sys/netinet/in_pcb.c#19 integrate .. //depot/projects/vap/sys/netinet/in_pcb.h#13 integrate .. //depot/projects/vap/sys/netinet/in_rmx.c#9 integrate .. //depot/projects/vap/sys/netinet/ip6.h#6 integrate .. //depot/projects/vap/sys/netinet/ip_carp.c#9 integrate .. //depot/projects/vap/sys/netinet/ip_divert.c#9 integrate .. //depot/projects/vap/sys/netinet/ip_fastfwd.c#8 integrate .. //depot/projects/vap/sys/netinet/ip_fw.h#13 integrate .. //depot/projects/vap/sys/netinet/ip_fw2.c#19 integrate .. //depot/projects/vap/sys/netinet/ip_fw_nat.c#4 integrate .. //depot/projects/vap/sys/netinet/ip_icmp.c#10 integrate .. //depot/projects/vap/sys/netinet/ip_input.c#12 integrate .. //depot/projects/vap/sys/netinet/ip_ipsec.c#6 integrate .. //depot/projects/vap/sys/netinet/ip_mroute.c#8 integrate .. //depot/projects/vap/sys/netinet/ip_options.c#8 integrate .. //depot/projects/vap/sys/netinet/raw_ip.c#13 integrate .. //depot/projects/vap/sys/netinet/tcp_hostcache.c#7 integrate .. //depot/projects/vap/sys/netinet/tcp_input.c#14 integrate .. //depot/projects/vap/sys/netinet/tcp_offload.c#5 integrate .. //depot/projects/vap/sys/netinet/tcp_output.c#15 integrate .. //depot/projects/vap/sys/netinet/tcp_reass.c#5 integrate .. //depot/projects/vap/sys/netinet/tcp_sack.c#8 integrate .. //depot/projects/vap/sys/netinet/tcp_subr.c#14 integrate .. //depot/projects/vap/sys/netinet/tcp_syncache.c#16 integrate .. //depot/projects/vap/sys/netinet/tcp_timer.c#9 integrate .. //depot/projects/vap/sys/netinet/tcp_timewait.c#6 integrate .. //depot/projects/vap/sys/netinet/tcp_usrreq.c#12 integrate .. //depot/projects/vap/sys/netinet/udp_usrreq.c#14 integrate .. //depot/projects/vap/sys/netinet/vinet.h#1 branch .. //depot/projects/vap/sys/netinet6/dest6.c#7 integrate .. //depot/projects/vap/sys/netinet6/frag6.c#8 integrate .. //depot/projects/vap/sys/netinet6/icmp6.c#14 integrate .. //depot/projects/vap/sys/netinet6/in6.c#11 integrate .. //depot/projects/vap/sys/netinet6/in6.h#6 integrate .. //depot/projects/vap/sys/netinet6/in6_gif.c#7 integrate .. //depot/projects/vap/sys/netinet6/in6_ifattach.c#10 integrate .. //depot/projects/vap/sys/netinet6/in6_pcb.c#11 integrate .. //depot/projects/vap/sys/netinet6/in6_proto.c#9 integrate .. //depot/projects/vap/sys/netinet6/in6_rmx.c#9 integrate .. //depot/projects/vap/sys/netinet6/in6_src.c#11 integrate .. //depot/projects/vap/sys/netinet6/ip6_forward.c#8 integrate .. //depot/projects/vap/sys/netinet6/ip6_input.c#11 integrate .. //depot/projects/vap/sys/netinet6/ip6_ipsec.c#7 integrate .. //depot/projects/vap/sys/netinet6/ip6_mroute.c#7 integrate .. //depot/projects/vap/sys/netinet6/ip6_output.c#13 integrate .. //depot/projects/vap/sys/netinet6/mld6.c#10 integrate .. //depot/projects/vap/sys/netinet6/nd6.c#8 integrate .. //depot/projects/vap/sys/netinet6/nd6.h#7 integrate .. //depot/projects/vap/sys/netinet6/nd6_nbr.c#9 integrate .. //depot/projects/vap/sys/netinet6/nd6_rtr.c#8 integrate .. //depot/projects/vap/sys/netinet6/raw_ip6.c#15 integrate .. //depot/projects/vap/sys/netinet6/route6.c#7 integrate .. //depot/projects/vap/sys/netinet6/scope6.c#7 integrate .. //depot/projects/vap/sys/netinet6/udp6_usrreq.c#15 integrate .. //depot/projects/vap/sys/netinet6/vinet6.h#1 branch .. //depot/projects/vap/sys/netipsec/ipsec.c#11 integrate .. //depot/projects/vap/sys/netipsec/ipsec.h#9 integrate .. //depot/projects/vap/sys/netipsec/ipsec_input.c#8 integrate .. //depot/projects/vap/sys/netipsec/ipsec_mbuf.c#6 integrate .. //depot/projects/vap/sys/netipsec/ipsec_output.c#9 integrate .. //depot/projects/vap/sys/netipsec/key.c#11 integrate .. //depot/projects/vap/sys/netipsec/keysock.c#7 integrate .. //depot/projects/vap/sys/netipsec/vipsec.h#1 branch .. //depot/projects/vap/sys/netipsec/xform_ah.c#7 integrate .. //depot/projects/vap/sys/netipsec/xform_esp.c#7 integrate .. //depot/projects/vap/sys/netipsec/xform_ipcomp.c#7 integrate .. //depot/projects/vap/sys/netipsec/xform_ipip.c#7 integrate .. //depot/projects/vap/sys/nfsclient/nfs_diskless.c#9 integrate .. //depot/projects/vap/sys/nfsclient/nfs_vfsops.c#18 integrate .. //depot/projects/vap/sys/nfsclient/nfs_vnops.c#17 integrate .. //depot/projects/vap/sys/powerpc/include/smp.h#5 integrate .. //depot/projects/vap/sys/powerpc/powerpc/cpu.c#10 integrate .. //depot/projects/vap/sys/powerpc/powerpc/intr_machdep.c#12 integrate .. //depot/projects/vap/sys/powerpc/powerpc/mp_machdep.c#9 integrate .. //depot/projects/vap/sys/rpc/authunix_prot.c#4 integrate .. //depot/projects/vap/sys/sparc64/pci/schizo.c#1 branch .. //depot/projects/vap/sys/sparc64/pci/schizoreg.h#1 branch .. //depot/projects/vap/sys/sparc64/pci/schizovar.h#1 branch .. //depot/projects/vap/sys/sparc64/sparc64/dump_machdep.c#5 integrate .. //depot/projects/vap/sys/sun4v/include/smp.h#3 integrate .. //depot/projects/vap/sys/sun4v/sun4v/dump_machdep.c#5 integrate .. //depot/projects/vap/sys/sys/conf.h#13 integrate .. //depot/projects/vap/sys/sys/kerneldump.h#6 integrate .. //depot/projects/vap/sys/sys/pmc.h#6 integrate .. //depot/projects/vap/sys/sys/protosw.h#6 integrate .. //depot/projects/vap/sys/sys/sysctl.h#11 integrate .. //depot/projects/vap/sys/sys/vimage.h#2 integrate .. //depot/projects/vap/sys/vm/swap_pager.c#11 integrate .. //depot/projects/vap/sys/vm/vm_pageout.c#9 integrate .. //depot/projects/vap/sys/vm/vm_pageout.h#5 integrate .. //depot/projects/vap/usr.bin/cpuset/cpuset.1#4 integrate .. //depot/projects/vap/usr.bin/make/job.c#5 integrate .. //depot/projects/vap/usr.bin/top/machine.c#8 integrate .. //depot/projects/vap/usr.sbin/Makefile#15 integrate .. //depot/projects/vap/usr.sbin/boot0cfg/boot0cfg.c#4 integrate .. //depot/projects/vap/usr.sbin/bsnmpd/modules/Makefile#3 integrate Differences ... ==== //depot/projects/vap/ObsoleteFiles.inc#20 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.162 2008/09/21 16:11:11 antoine Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.163 2008/09/28 20:15:45 ed 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,12 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20080928: removal of inaccurate device_ids(9) manual page +OLD_FILES+=usr/share/man/man9/device_ids.9.gz +OLD_FILES+=usr/share/man/man9/major.9.gz +OLD_FILES+=usr/share/man/man9/minor.9.gz +OLD_FILES+=usr/share/man/man9/umajor.9.gz +OLD_FILES+=usr/share/man/man9/uminor.9.gz # 20080917: removal of manpage for axed kernel primitive suser(9) OLD_FILES+=usr/share/man/man9/suser.9.gz OLD_FILES+=usr/share/man/man9/suser_cred.9.gz ==== //depot/projects/vap/bin/pkill/pkill.1#2 (text+ko) ==== @@ -1,6 +1,6 @@ .\" $NetBSD: pkill.1,v 1.8 2003/02/14 15:59:18 grant Exp $ .\" -.\" $FreeBSD: src/bin/pkill/pkill.1,v 1.1 2008/08/31 14:27:59 yar Exp $ +.\" $FreeBSD: src/bin/pkill/pkill.1,v 1.3 2008/09/30 17:30:39 ed Exp $ .\" .\" Copyright (c) 2002 The NetBSD Foundation, Inc. .\" All rights reserved. ==== //depot/projects/vap/bin/pkill/pkill.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.1 2008/08/31 14:27:59 yar Exp $"); +__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.3 2008/09/30 17:30:39 ed Exp $"); #include #include @@ -607,12 +607,11 @@ struct passwd *pw; struct group *gr; struct stat st; - const char *cp, *prefix; + const char *cp; char *sp, *ep, buf[MAXPATHLEN]; int empty; empty = 1; - prefix = _PATH_DEV; while ((sp = strsep(&src, ",")) != NULL) { if (*sp == '\0') @@ -673,21 +672,21 @@ cp = "console"; } else { cp = sp; - if (strncmp(sp, "tty", 3) != 0) - prefix = _PATH_TTY; } - snprintf(buf, sizeof(buf), "%s%s", prefix, cp); + snprintf(buf, sizeof(buf), _PATH_DEV "%s", cp); + if (stat(buf, &st) != -1) + goto foundtty; + + snprintf(buf, sizeof(buf), _PATH_DEV "tty%s", cp); + if (stat(buf, &st) != -1) + goto foundtty; - if (stat(buf, &st) == -1) { - if (errno == ENOENT) { - errx(STATUS_BADUSAGE, - "No such tty: `%s'", sp); - } - err(STATUS_ERROR, "Cannot access `%s'", sp); - } + if (errno == ENOENT) + errx(STATUS_BADUSAGE, "No such tty: `%s'", sp); + err(STATUS_ERROR, "Cannot access `%s'", sp); - if ((st.st_mode & S_IFCHR) == 0) +foundtty: if ((st.st_mode & S_IFCHR) == 0) errx(STATUS_BADUSAGE, "Not a tty: `%s'", sp); li->li_number = st.st_rdev; ==== //depot/projects/vap/crypto/openssh/moduli.5#2 (text+ko) ==== @@ -13,7 +13,7 @@ .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -.Dd $Mdocdate: June 26 2008 $ +.Dd June 26 2008 .Dt MODULI 5 .Os .Sh NAME ==== //depot/projects/vap/crypto/openssh/scp.1#4 (text+ko) ==== @@ -11,7 +11,7 @@ .\" .\" $OpenBSD: scp.1,v 1.46 2008/07/12 05:33:41 djm Exp $ .\" -.Dd $Mdocdate: July 12 2008 $ +.Dd July 12 2008 .Dt SCP 1 .Os .Sh NAME ==== //depot/projects/vap/crypto/openssh/sftp-server.8#4 (text+ko) ==== @@ -22,7 +22,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. .\" -.Dd $Mdocdate: July 18 2008 $ +.Dd July 18 2008 .Dt SFTP-SERVER 8 .Os .Sh NAME ==== //depot/projects/vap/crypto/openssh/sftp.1#4 (text+ko) ==== @@ -22,7 +22,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. .\" -.Dd $Mdocdate: July 15 2008 $ +.Dd July 15 2008 .Dt SFTP 1 .Os .Sh NAME ==== //depot/projects/vap/crypto/openssh/ssh-add.1#4 (text+ko) ==== @@ -37,7 +37,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. .\" -.Dd $Mdocdate: June 12 2007 $ +.Dd June 12 2007 .Dt SSH-ADD 1 .Os .Sh NAME ==== //depot/projects/vap/crypto/openssh/ssh-agent.1#4 (text+ko) ==== @@ -34,7 +34,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. .\" -.Dd $Mdocdate: June 5 2007 $ +.Dd June 5 2007 .Dt SSH-AGENT 1 .Os .Sh NAME ==== //depot/projects/vap/crypto/openssh/ssh-keygen.1#4 (text+ko) ==== @@ -37,7 +37,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. .\" -.Dd $Mdocdate: June 12 2008 $ +.Dd June 12 2008 .Dt SSH-KEYGEN 1 .Os .Sh NAME ==== //depot/projects/vap/crypto/openssh/ssh-keyscan.1#4 (text+ko) ==== @@ -6,7 +6,7 @@ .\" permitted provided that due credit is given to the author and the .\" OpenBSD project by leaving this copyright notice intact. .\" -.Dd $Mdocdate: April 30 2008 $ +.Dd April 30 2008 .Dt SSH-KEYSCAN 1 .Os .Sh NAME ==== //depot/projects/vap/crypto/openssh/ssh-keysign.8#4 (text+ko) ==== @@ -22,7 +22,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. .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd May 31 2007 .Dt SSH-KEYSIGN 8 .Os .Sh NAME ==== //depot/projects/vap/crypto/openssh/ssh.1#4 (text+ko) ==== @@ -35,8 +35,8 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: ssh.1,v 1.277 2008/07/02 13:47:39 djm Exp $ -.\" $FreeBSD: src/crypto/openssh/ssh.1,v 1.36 2008/08/01 02:48:36 des Exp $ -.Dd $Mdocdate: July 2 2008 $ +.\" $FreeBSD: src/crypto/openssh/ssh.1,v 1.37 2008/09/29 10:53:05 des Exp $ +.Dd July 2 2008 .Dt SSH 1 .Os .Sh NAME ==== //depot/projects/vap/crypto/openssh/ssh_config.5#4 (text+ko) ==== @@ -35,8 +35,8 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: ssh_config.5,v 1.111 2008/06/26 11:46:31 grunk Exp $ -.\" $FreeBSD: src/crypto/openssh/ssh_config.5,v 1.24 2008/08/01 02:48:36 des Exp $ -.Dd $Mdocdate: June 26 2008 $ +.\" $FreeBSD: src/crypto/openssh/ssh_config.5,v 1.25 2008/09/29 10:53:05 des Exp $ +.Dd June 26 2008 .Dt SSH_CONFIG 5 .Os .Sh NAME ==== //depot/projects/vap/crypto/openssh/sshd.8#4 (text+ko) ==== @@ -35,8 +35,8 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: sshd.8,v 1.246 2008/07/02 02:24:18 djm Exp $ -.\" $FreeBSD: src/crypto/openssh/sshd.8,v 1.35 2008/08/01 02:48:36 des Exp $ -.Dd $Mdocdate: July 2 2008 $ +.\" $FreeBSD: src/crypto/openssh/sshd.8,v 1.36 2008/09/29 10:53:05 des Exp $ +.Dd July 2 2008 .Dt SSHD 8 .Os .Sh NAME ==== //depot/projects/vap/crypto/openssh/sshd_config.5#4 (text+ko) ==== @@ -35,8 +35,8 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: sshd_config.5,v 1.96 2008/07/02 02:24:18 djm Exp $ -.\" $FreeBSD: src/crypto/openssh/sshd_config.5,v 1.30 2008/08/01 02:48:36 des Exp $ -.Dd $Mdocdate: July 2 2008 $ +.\" $FreeBSD: src/crypto/openssh/sshd_config.5,v 1.31 2008/09/29 10:53:05 des Exp $ +.Dd July 2 2008 .Dt SSHD_CONFIG 5 .Os .Sh NAME ==== //depot/projects/vap/etc/network.subr#14 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/network.subr,v 1.190 2008/06/23 20:50:11 mtm Exp $ +# $FreeBSD: src/etc/network.subr,v 1.191 2008/10/01 18:46:46 brooks Exp $ # # @@ -506,15 +506,9 @@ # Create wireless interfaces child_wlans=`get_if_var $ifn wlans_IF` - if [ -z "${child_wlans}" ]; then - child_wlans=`get_if_var $ifn vaps_IF` - if [ -n "${child_wlans}" ]; then - warn "soon to be deleted vaps_$ifn variable defined use wlans_$ifn" - fi - fi for child in ${child_wlans}; do - create_args="wlandev $ifn `get_if_var $child create_args_IF` `get_if_var $child vap_create_IF`" + create_args="wlandev $ifn `get_if_var $child create_args_IF`" if expr $child : 'wlan[0-9][0-9]*$' >/dev/null 2>&1; then ifconfig $child create ${create_args} && cfg=0 else ==== //depot/projects/vap/gnu/lib/csu/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.30 2008/09/26 15:00:18 marcel Exp $ +# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.31 2008/09/28 19:17:54 marcel Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../contrib/gcclibs @@ -25,7 +25,7 @@ BEGINSRC= crtbegin.asm ENDSRC= crtend.asm CFLAGS+= -x assembler-with-cpp # Ugly hack -CFLAGS+= -D_OSRELDATE_H -include osreldate.h +CFLAGS+= -include osreldate.h .undef SRCS # hack for 'make depend' .endif .if ${MACHINE_ARCH} == "powerpc" ==== //depot/projects/vap/gnu/usr.bin/gdb/kgdb/kld.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kld.c,v 1.10 2008/09/25 19:32:03 jhb Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kld.c,v 1.11 2008/10/02 20:42:10 jhb Exp $"); #include #include @@ -201,7 +201,7 @@ load_kld (char *path, CORE_ADDR base_addr, int from_tty) { struct section_addr_info *sap; - struct section_table *sections, *sections_end, *s; + struct section_table *sections = NULL, *sections_end = NULL, *s; struct cleanup *cleanup; bfd *bfd; int i; ==== //depot/projects/vap/lib/libarchive/archive_entry.c#8 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.53 2008/09/01 04:54:29 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.54 2008/09/30 03:53:03 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -461,6 +461,24 @@ } time_t +archive_entry_birthtime(struct archive_entry *entry) +{ + return (entry->ae_stat.aest_birthtime); +} + +long +archive_entry_birthtime_nsec(struct archive_entry *entry) +{ + return (entry->ae_stat.aest_birthtime_nsec); +} + +int +archive_entry_birthtime_is_set(struct archive_entry *entry) +{ + return (entry->ae_set & AE_SET_BIRTHTIME); +} + +time_t archive_entry_ctime(struct archive_entry *entry) { return (entry->ae_stat.aest_ctime); @@ -838,6 +856,22 @@ } void +archive_entry_set_birthtime(struct archive_entry *entry, time_t m, long ns) +{ + entry->stat_valid = 0; + entry->ae_set |= AE_SET_BIRTHTIME; + entry->ae_stat.aest_birthtime = m; + entry->ae_stat.aest_birthtime_nsec = ns; +} + +void +archive_entry_unset_birthtime(struct archive_entry *entry) +{ + archive_entry_set_birthtime(entry, 0, 0); + entry->ae_set &= ~AE_SET_BIRTHTIME; +} + +void archive_entry_set_ctime(struct archive_entry *entry, time_t t, long ns) { entry->stat_valid = 0; ==== //depot/projects/vap/lib/libarchive/archive_entry.h#8 (text+ko) ==== @@ -22,7 +22,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. * - * $FreeBSD: src/lib/libarchive/archive_entry.h,v 1.29 2008/09/18 04:19:06 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_entry.h,v 1.30 2008/09/30 03:53:03 kientzle Exp $ */ #ifndef ARCHIVE_ENTRY_H_INCLUDED @@ -174,6 +174,9 @@ __LA_DECL time_t archive_entry_atime(struct archive_entry *); __LA_DECL long archive_entry_atime_nsec(struct archive_entry *); __LA_DECL int archive_entry_atime_is_set(struct archive_entry *); +__LA_DECL time_t archive_entry_birthtime(struct archive_entry *); +__LA_DECL long archive_entry_birthtime_nsec(struct archive_entry *); +__LA_DECL int archive_entry_birthtime_is_set(struct archive_entry *); __LA_DECL time_t archive_entry_ctime(struct archive_entry *); __LA_DECL long archive_entry_ctime_nsec(struct archive_entry *); __LA_DECL int archive_entry_ctime_is_set(struct archive_entry *); @@ -224,6 +227,8 @@ __LA_DECL void archive_entry_set_atime(struct archive_entry *, time_t, long); __LA_DECL void archive_entry_unset_atime(struct archive_entry *); +__LA_DECL void archive_entry_set_birthtime(struct archive_entry *, time_t, long); +__LA_DECL void archive_entry_unset_birthtime(struct archive_entry *); __LA_DECL void archive_entry_set_ctime(struct archive_entry *, time_t, long); __LA_DECL void archive_entry_unset_ctime(struct archive_entry *); __LA_DECL void archive_entry_set_dev(struct archive_entry *, dev_t); ==== //depot/projects/vap/lib/libarchive/archive_entry_copy_stat.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_copy_stat.c,v 1.1 2007/05/29 01:00:18 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_copy_stat.c,v 1.2 2008/09/30 03:53:03 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -47,6 +47,12 @@ archive_entry_set_atime(entry, st->st_atime, 0); archive_entry_set_ctime(entry, st->st_ctime, 0); archive_entry_set_mtime(entry, st->st_mtime, 0); +#if HAVE_STRUCT_STAT_ST_BIRTHTIME + archive_entry_set_birthtime(entry, st->st_birthtime, 0); +#endif +#endif +#if HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC + archive_entry_set_birthtime(entry, st->st_birthtime, st->st_birthtimespec.tv_nsec); #endif archive_entry_set_dev(entry, st->st_dev); archive_entry_set_gid(entry, st->st_gid); ==== //depot/projects/vap/lib/libarchive/archive_entry_private.h#7 (text+ko) ==== @@ -22,7 +22,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. * - * $FreeBSD: src/lib/libarchive/archive_entry_private.h,v 1.5 2008/09/01 04:54:29 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_entry_private.h,v 1.6 2008/09/30 03:53:03 kientzle Exp $ */ #ifndef ARCHIVE_ENTRY_PRIVATE_H_INCLUDED @@ -112,6 +112,8 @@ uint32_t aest_ctime_nsec; int64_t aest_mtime; uint32_t aest_mtime_nsec; + int64_t aest_birthtime; + uint32_t aest_birthtime_nsec; gid_t aest_gid; ino_t aest_ino; mode_t aest_mode; @@ -142,6 +144,7 @@ #define AE_SET_ATIME 4 #define AE_SET_CTIME 8 #define AE_SET_MTIME 16 +#define AE_SET_BIRTHTIME 32 #define AE_SET_SIZE 64 /* ==== //depot/projects/vap/lib/libarchive/archive_entry_stat.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_stat.c,v 1.1 2007/05/29 01:00:18 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_stat.c,v 1.2 2008/09/30 03:53:03 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -64,6 +64,9 @@ * the appropriate conversions get invoked. */ st->st_atime = archive_entry_atime(entry); +#if HAVE_STRUCT_STAT_ST_BIRTHTIME + st->st_birthtime = archive_entry_birthtime(entry); +#endif st->st_ctime = archive_entry_ctime(entry); st->st_mtime = archive_entry_mtime(entry); st->st_dev = archive_entry_dev(entry); @@ -88,6 +91,9 @@ st->st_ctim.tv_nsec = archive_entry_ctime_nsec(entry); st->st_mtim.tv_nsec = archive_entry_mtime_nsec(entry); #endif +#if HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC + st->st_birthtimespec.tv_nsec = archive_entry_birthtime_nsec(entry); +#endif /* * TODO: On Linux, store 32 or 64 here depending on whether ==== //depot/projects/vap/lib/libarchive/archive_read_support_format_tar.c#8 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.70 2008/07/10 09:50:55 cperciva Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.71 2008/09/30 03:57:07 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include @@ -1451,6 +1451,10 @@ if (strcmp(key, "LIBARCHIVE.xxxxxxx")==0) archive_entry_set_xxxxxx(entry, value); */ + if (strcmp(key, "LIBARCHIVE.creationtime")==0) { + pax_time(value, &s, &n); + archive_entry_set_birthtime(entry, s, n); + } if (strncmp(key, "LIBARCHIVE.xattr.", 17)==0) pax_attribute_xattr(entry, key, value); break; ==== //depot/projects/vap/lib/libarchive/archive_write_disk.c#16 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.39 2008/09/14 05:51:25 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.40 2008/09/30 04:02:36 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include @@ -96,10 +96,12 @@ struct fixup_entry { struct fixup_entry *next; mode_t mode; + int64_t atime; + int64_t birthtime; int64_t mtime; - int64_t atime; + unsigned long atime_nanos; + unsigned long birthtime_nanos; unsigned long mtime_nanos; - unsigned long atime_nanos; unsigned long fflags_set; int fixup; /* bitmask of what needs fixing */ char *name; @@ -227,7 +229,8 @@ unsigned long fflags_set, unsigned long fflags_clear); static int set_ownership(struct archive_write_disk *); static int set_mode(struct archive_write_disk *, int mode); -static int set_time(struct archive_write_disk *); +static int set_time(int, int, const char *, time_t, long, time_t, long); +static int set_times(struct archive_write_disk *); static struct fixup_entry *sort_dir_list(struct fixup_entry *p); static gid_t trivial_lookup_gid(void *, const char *, gid_t); static uid_t trivial_lookup_uid(void *, const char *, uid_t); @@ -448,19 +451,29 @@ || archive_entry_atime_is_set(entry))) { fe = current_fixup(a, archive_entry_pathname(entry)); fe->fixup |= TODO_TIMES; + if (archive_entry_atime_is_set(entry)) { + fe->atime = archive_entry_atime(entry); + fe->atime_nanos = archive_entry_atime_nsec(entry); + } else { + /* If atime is unset, use start time. */ + fe->atime = a->start_time; + fe->atime_nanos = 0; + } if (archive_entry_mtime_is_set(entry)) { fe->mtime = archive_entry_mtime(entry); fe->mtime_nanos = archive_entry_mtime_nsec(entry); } else { + /* If mtime is unset, use start time. */ fe->mtime = a->start_time; fe->mtime_nanos = 0; } - if (archive_entry_atime_is_set(entry)) { - fe->atime = archive_entry_atime(entry); - fe->atime_nanos = archive_entry_atime_nsec(entry); + if (archive_entry_birthtime_is_set(entry)) { + fe->birthtime = archive_entry_birthtime(entry); + fe->birthtime_nanos = archive_entry_birthtime_nsec(entry); } else { - fe->atime = a->start_time; - fe->atime_nanos = 0; + /* If birthtime is unset, use mtime. */ + fe->birthtime = fe->mtime; + fe->birthtime_nanos = fe->mtime_nanos; } } @@ -698,7 +711,7 @@ if (r2 < ret) ret = r2; } if (a->todo & TODO_TIMES) { - int r2 = set_time(a); + int r2 = set_times(a); if (r2 < ret) ret = r2; } if (a->todo & TODO_ACLS) { @@ -1170,10 +1183,19 @@ #ifdef HAVE_UTIMES /* {f,l,}utimes() are preferred, when available. */ struct timeval times[2]; + times[0].tv_sec = p->atime; + times[0].tv_usec = p->atime_nanos / 1000; +#ifdef HAVE_STRUCT_STAT_ST_BIRTHTIME + /* if it's valid and not mtime, push the birthtime first */ + if (((times[1].tv_sec = p->birthtime) < p->mtime) && + (p->birthtime > 0)) + { + times[1].tv_usec = p->birthtime_nanos / 1000; + utimes(p->name, times); + } +#endif times[1].tv_sec = p->mtime; times[1].tv_usec = p->mtime_nanos / 1000; - times[0].tv_sec = p->atime; - times[0].tv_usec = p->atime_nanos / 1000; #ifdef HAVE_LUTIMES lutimes(p->name, times); #else @@ -1687,61 +1709,31 @@ * when they're available. */ static int -set_time(struct archive_write_disk *a) +set_time(int fd, int mode, const char *name, + time_t atime, long atime_nsec, + time_t mtime, long mtime_nsec) { struct timeval times[2]; - /* If no time was provided, we're done. */ - if (!archive_entry_atime_is_set(a->entry) - && !archive_entry_mtime_is_set(a->entry)) - return (ARCHIVE_OK); - - /* We know at least one is set, so... */ - if (archive_entry_mtime_is_set(a->entry)) { - times[1].tv_sec = archive_entry_mtime(a->entry); - times[1].tv_usec = archive_entry_mtime_nsec(a->entry) / 1000; - } else { - times[1].tv_sec = a->start_time; - times[1].tv_usec = 0; - } + times[0].tv_sec = atime; + times[0].tv_usec = atime_nsec / 1000; + times[1].tv_sec = mtime; + times[1].tv_usec = mtime_nsec / 1000; - /* If no atime was specified, use start time instead. */ - /* In theory, it would be marginally more correct to use - * time(NULL) here, but that would cost us an extra syscall - * for little gain. */ - if (archive_entry_atime_is_set(a->entry)) { - times[0].tv_sec = archive_entry_atime(a->entry); - times[0].tv_usec = archive_entry_atime_nsec(a->entry) / 1000; - } else { - times[0].tv_sec = a->start_time; - times[0].tv_usec = 0; - } - #ifdef HAVE_FUTIMES - if (a->fd >= 0 && futimes(a->fd, times) == 0) { - return (ARCHIVE_OK); - } + if (fd >= 0) + return (futimes(fd, times)); +#else + (void)fd; /* UNUSED */ #endif - #ifdef HAVE_LUTIMES - if (lutimes(a->name, times) != 0) + (void)mode; /* UNUSED */ + return (lutimes(name, times)); #else - if (!S_ISLNK(a->mode) && utimes(a->name, times) != 0) + if (S_ISLNK(mode)) + return (0); + return (utimes(name, times)); #endif - { - archive_set_error(&a->archive, errno, "Can't update time for %s", - a->name); - return (ARCHIVE_WARN); - } - - /* - * Note: POSIX does not provide a portable way to restore ctime. - * (Apart from resetting the system clock, which is distasteful.) - * So, any restoration of ctime will necessarily be OS-specific. - */ - - /* XXX TODO: Can FreeBSD restore ctime? XXX */ - return (ARCHIVE_OK); } #elif defined(HAVE_UTIME) /* @@ -1749,47 +1741,93 @@ * if utimes() isn't available. */ static int -set_time(struct archive_write_disk *a) +set_time(int fd, int mode, const char *name, + time_t atime, long atime_nsec, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Oct 3 04:33:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 48A9F106568D; Fri, 3 Oct 2008 04:33:03 +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 0D03C1065688 for ; Fri, 3 Oct 2008 04:33:03 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EFC9E8FC1E for ; Fri, 3 Oct 2008 04:33:02 +0000 (UTC) (envelope-from sam@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 m934X2el029025 for ; Fri, 3 Oct 2008 04:33:02 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m934X2lQ029023 for perforce@freebsd.org; Fri, 3 Oct 2008 04:33:02 GMT (envelope-from sam@freebsd.org) Date: Fri, 3 Oct 2008 04:33:02 GMT Message-Id: <200810030433.m934X2lQ029023@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 150831 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, 03 Oct 2008 04:33:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=150831 Change 150831 by sam@sam_ebb on 2008/10/03 04:32:22 IFC Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_scan_sta.c#25 integrate Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_scan_sta.c#25 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_scan_sta.c,v 1.10 2008/04/20 20:35:44 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_scan_sta.c,v 1.11 2008/09/27 21:18:40 sam Exp $"); /* * IEEE 802.11 station scanning support. @@ -1392,9 +1392,12 @@ */ if (vap->iv_des_chan == IEEE80211_CHAN_ANYC || IEEE80211_IS_CHAN_RADAR(vap->iv_des_chan)) { - chan = ieee80211_ht_adjust_channel(vap->iv_ic, - adhoc_pick_channel(ss, 0), - vap->iv_flags_ext); + struct ieee80211com *ic = vap->iv_ic; + + chan = adhoc_pick_channel(ss, 0); + if (chan != NULL) + chan = ieee80211_ht_adjust_channel(ic, + chan, vap->iv_flags_ext); } else chan = vap->iv_des_chan; if (chan != NULL) { From owner-p4-projects@FreeBSD.ORG Fri Oct 3 04:34:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8AADA1065689; Fri, 3 Oct 2008 04:34:04 +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 4EF4B1065686 for ; Fri, 3 Oct 2008 04:34:04 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 241048FC15 for ; Fri, 3 Oct 2008 04:34:04 +0000 (UTC) (envelope-from sam@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 m934Y4SU029118 for ; Fri, 3 Oct 2008 04:34:04 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m934Y4oR029116 for perforce@freebsd.org; Fri, 3 Oct 2008 04:34:04 GMT (envelope-from sam@freebsd.org) Date: Fri, 3 Oct 2008 04:34:04 GMT Message-Id: <200810030434.m934Y4oR029116@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 150832 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, 03 Oct 2008 04:34:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=150832 Change 150832 by sam@sam_ebb on 2008/10/03 04:34:01 IFC Affected files ... .. //depot/projects/vap/sys/conf/options#28 edit Differences ... ==== //depot/projects/vap/sys/conf/options#28 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.641 2008/08/27 01:31:42 imp Exp $ +# $FreeBSD: src/sys/conf/options,v 1.642 2008/10/01 19:24:16 jhb Exp $ # # On the handling of kernel options # @@ -754,9 +754,6 @@ DCONS_FORCE_CONSOLE opt_dcons.h DCONS_FORCE_GDB opt_dcons.h -# VFS options -LOOKUP_SHARED opt_vfs.h - # HWPMC options HWPMC_HOOKS From owner-p4-projects@FreeBSD.ORG Fri Oct 3 07:48:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1DA5E106568F; Fri, 3 Oct 2008 07:48: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 BC61D1065689 for ; Fri, 3 Oct 2008 07:48:34 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A5A758FC1F for ; Fri, 3 Oct 2008 07:48:34 +0000 (UTC) (envelope-from ed@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 m937mYAi056562 for ; Fri, 3 Oct 2008 07:48:34 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m937mYs9056560 for perforce@freebsd.org; Fri, 3 Oct 2008 07:48:34 GMT (envelope-from ed@FreeBSD.org) Date: Fri, 3 Oct 2008 07:48:34 GMT Message-Id: <200810030748.m937mYs9056560@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 150837 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, 03 Oct 2008 07:48:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=150837 Change 150837 by ed@ed_dull on 2008/10/03 07:48:09 IFC. Affected files ... .. //depot/projects/mpsafetty/gnu/usr.bin/gdb/kgdb/kld.c#3 integrate .. //depot/projects/mpsafetty/lib/libpmc/pmc.k8.3#2 integrate .. //depot/projects/mpsafetty/sbin/ifconfig/ifvlan.c#3 integrate .. //depot/projects/mpsafetty/share/man/man4/ng_tty.4#2 integrate .. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/avila_machdep.c#3 integrate .. //depot/projects/mpsafetty/sys/compat/linprocfs/linprocfs.c#6 integrate .. //depot/projects/mpsafetty/sys/compat/linux/linux_ioctl.c#8 integrate .. //depot/projects/mpsafetty/sys/compat/linux/linux_misc.c#7 integrate .. //depot/projects/mpsafetty/sys/compat/linux/linux_socket.c#4 integrate .. //depot/projects/mpsafetty/sys/compat/svr4/svr4_sockio.c#4 integrate .. //depot/projects/mpsafetty/sys/conf/kmod.mk#2 integrate .. //depot/projects/mpsafetty/sys/contrib/ipfilter/netinet/ip_auth.c#2 integrate .. //depot/projects/mpsafetty/sys/contrib/pf/net/pf.c#4 integrate .. //depot/projects/mpsafetty/sys/contrib/pf/net/pf_if.c#3 integrate .. //depot/projects/mpsafetty/sys/contrib/pf/net/pf_ioctl.c#5 integrate .. //depot/projects/mpsafetty/sys/contrib/pf/net/pf_subr.c#3 integrate .. //depot/projects/mpsafetty/sys/contrib/pf/net/pfvar.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/rdma/rdma_cma.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/agp/agp_i810.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/agp/agpreg.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/ata/ata-chipset.c#8 integrate .. //depot/projects/mpsafetty/sys/dev/ata/ata-pci.h#7 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/cxgb_sge.c#9 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#9 integrate .. //depot/projects/mpsafetty/sys/dev/firewire/firewire.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/nfe/if_nfe.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/nfe/if_nfereg.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/nfe/if_nfevar.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/pccbb/pccbb_pci.c#3 integrate .. //depot/projects/mpsafetty/sys/fs/cd9660/cd9660_rrip.c#3 integrate .. //depot/projects/mpsafetty/sys/geom/vinum/geom_vinum_drive.c#4 integrate .. //depot/projects/mpsafetty/sys/geom/vinum/geom_vinum_rm.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/kern_jail.c#3 integrate .. //depot/projects/mpsafetty/sys/kern/kern_mib.c#4 integrate .. //depot/projects/mpsafetty/sys/kern/kern_uuid.c#3 integrate .. //depot/projects/mpsafetty/sys/kern/kern_xxx.c#3 integrate .. //depot/projects/mpsafetty/sys/net/bridgestp.c#3 integrate .. //depot/projects/mpsafetty/sys/net/if.c#7 integrate .. //depot/projects/mpsafetty/sys/net/if_bridge.c#5 integrate .. //depot/projects/mpsafetty/sys/net/if_ef.c#3 integrate .. //depot/projects/mpsafetty/sys/net/if_ethersubr.c#4 integrate .. //depot/projects/mpsafetty/sys/net/if_faith.c#3 integrate .. //depot/projects/mpsafetty/sys/net/if_gif.c#3 integrate .. //depot/projects/mpsafetty/sys/net/if_gif.h#2 integrate .. //depot/projects/mpsafetty/sys/net/if_gre.c#3 integrate .. //depot/projects/mpsafetty/sys/net/if_loop.c#4 integrate .. //depot/projects/mpsafetty/sys/net/if_mib.c#4 integrate .. //depot/projects/mpsafetty/sys/net/if_spppsubr.c#4 integrate .. //depot/projects/mpsafetty/sys/net/if_stf.c#4 integrate .. //depot/projects/mpsafetty/sys/net/if_tun.c#4 integrate .. //depot/projects/mpsafetty/sys/net/if_var.h#3 integrate .. //depot/projects/mpsafetty/sys/net/if_vlan.c#5 integrate .. //depot/projects/mpsafetty/sys/net/raw_cb.c#4 integrate .. //depot/projects/mpsafetty/sys/net/raw_usrreq.c#4 integrate .. //depot/projects/mpsafetty/sys/net/route.c#7 integrate .. //depot/projects/mpsafetty/sys/net/rtsock.c#4 integrate .. //depot/projects/mpsafetty/sys/net/vnet.h#1 branch .. //depot/projects/mpsafetty/sys/net80211/ieee80211_ddb.c#6 integrate .. //depot/projects/mpsafetty/sys/netgraph/atm/ng_atm.c#3 integrate .. //depot/projects/mpsafetty/sys/netgraph/netgraph.h#3 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_base.c#6 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_eiface.c#3 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_gif.c#3 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_iface.c#5 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_tty.c#9 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_tty.h#3 integrate .. //depot/projects/mpsafetty/sys/netinet/if_ether.c#7 integrate .. //depot/projects/mpsafetty/sys/netinet/igmp.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet/in.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet/in.h#2 integrate .. //depot/projects/mpsafetty/sys/netinet/in_gif.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet/in_mcast.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet/in_pcb.c#8 integrate .. //depot/projects/mpsafetty/sys/netinet/in_rmx.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet/ip6.h#3 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_carp.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_divert.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_fastfwd.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_fw.h#5 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_fw2.c#10 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_fw_nat.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_icmp.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_input.c#6 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_ipsec.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_mroute.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_options.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet/raw_ip.c#7 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_hostcache.c#6 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_input.c#8 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_offload.c#5 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_output.c#7 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_reass.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_sack.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_subr.c#6 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_syncache.c#10 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_timer.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_timewait.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_usrreq.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet/udp_usrreq.c#11 integrate .. //depot/projects/mpsafetty/sys/netinet/vinet.h#1 branch .. //depot/projects/mpsafetty/sys/netinet6/dest6.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet6/frag6.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet6/icmp6.c#6 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6_gif.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6_ifattach.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6_pcb.c#6 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6_proto.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6_rmx.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6_src.c#6 integrate .. //depot/projects/mpsafetty/sys/netinet6/ip6_forward.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet6/ip6_input.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet6/ip6_ipsec.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet6/ip6_mroute.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet6/ip6_output.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet6/mld6.c#5 integrate .. //depot/projects/mpsafetty/sys/netinet6/nd6.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet6/nd6_nbr.c#5 integrate .. //depot/projects/mpsafetty/sys/netinet6/nd6_rtr.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet6/raw_ip6.c#7 integrate .. //depot/projects/mpsafetty/sys/netinet6/route6.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet6/scope6.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet6/udp6_usrreq.c#6 integrate .. //depot/projects/mpsafetty/sys/netinet6/vinet6.h#1 branch .. //depot/projects/mpsafetty/sys/netipsec/ipsec.c#5 integrate .. //depot/projects/mpsafetty/sys/netipsec/ipsec.h#3 integrate .. //depot/projects/mpsafetty/sys/netipsec/ipsec_input.c#4 integrate .. //depot/projects/mpsafetty/sys/netipsec/ipsec_mbuf.c#3 integrate .. //depot/projects/mpsafetty/sys/netipsec/ipsec_output.c#4 integrate .. //depot/projects/mpsafetty/sys/netipsec/key.c#4 integrate .. //depot/projects/mpsafetty/sys/netipsec/keysock.c#4 integrate .. //depot/projects/mpsafetty/sys/netipsec/vipsec.h#1 branch .. //depot/projects/mpsafetty/sys/netipsec/xform_ah.c#3 integrate .. //depot/projects/mpsafetty/sys/netipsec/xform_esp.c#3 integrate .. //depot/projects/mpsafetty/sys/netipsec/xform_ipcomp.c#3 integrate .. //depot/projects/mpsafetty/sys/netipsec/xform_ipip.c#3 integrate .. //depot/projects/mpsafetty/sys/nfsclient/nfs_diskless.c#3 integrate .. //depot/projects/mpsafetty/sys/nfsclient/nfs_vfsops.c#8 integrate .. //depot/projects/mpsafetty/sys/nfsclient/nfs_vnops.c#6 integrate .. //depot/projects/mpsafetty/sys/rpc/authunix_prot.c#3 integrate .. //depot/projects/mpsafetty/sys/sys/protosw.h#2 integrate .. //depot/projects/mpsafetty/sys/sys/sysctl.h#4 integrate .. //depot/projects/mpsafetty/sys/sys/vimage.h#4 integrate .. //depot/projects/mpsafetty/usr.sbin/bsnmpd/modules/Makefile#2 integrate Differences ... ==== //depot/projects/mpsafetty/gnu/usr.bin/gdb/kgdb/kld.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kld.c,v 1.10 2008/09/25 19:32:03 jhb Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kld.c,v 1.11 2008/10/02 20:42:10 jhb Exp $"); #include #include @@ -201,7 +201,7 @@ load_kld (char *path, CORE_ADDR base_addr, int from_tty) { struct section_addr_info *sap; - struct section_table *sections, *sections_end, *s; + struct section_table *sections = NULL, *sections_end = NULL, *s; struct cleanup *cleanup; bfd *bfd; int i; ==== //depot/projects/mpsafetty/lib/libpmc/pmc.k8.3#2 (text+ko) ==== @@ -21,9 +21,9 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD: src/lib/libpmc/pmc.k8.3,v 1.2 2008/09/16 16:53:26 svn Exp $ +.\" $FreeBSD: src/lib/libpmc/pmc.k8.3,v 1.3 2008/10/02 08:53:06 jkoshy Exp $ .\" -.Dd September 17, 2008 +.Dd October 2, 2008 .Os .Dt PMC.K8 3 .Sh NAME @@ -110,9 +110,11 @@ The event specifiers supported on AMD K8 PMCs are: .Bl -tag -width indent .It Li k8-bu-cpu-clk-unhalted +.Pq Event 76H Count the number of clock cycles when the CPU is not in the HLT or STPCLK states. .It Li k8-bu-fill-request-l2-miss Op Li ,mask= Ns Ar qualifier +.Pq Event 7EH Count fill requests that missed in the L2 cache. This event may be further qualified using .Ar qualifier , @@ -130,7 +132,24 @@ .El .Pp The default is to count all types of requests. +.It Li k8-bu-fill-into-l2 Op Li ,mask= Ns Ar qualifier +.Pq Event 7FH +The number of lines written to and from the L2 cache. +The event may be further qualified by using +.Ar qualifier , +which is a +.Ql + +separated set of the following keywords: +.Pp +.Bl -tag -width indent -compact +.It Li dirty-l2-victim +Count lines written into L2 cache due to victim writebacks from the +Icache or Dcache, TLB page table walks or hardware data prefetches. +.It Li victim-from-l2 +Count writebacks of dirty lines from L2 to the system. +.El .It Li k8-bu-internal-l2-request Op Li ,mask= Ns Ar qualifier +.Pq Event 7DH Count internally generated requests to the L2 cache. This event may be further qualified using .Ar qualifier , @@ -153,8 +172,10 @@ .Pp The default is to count all types of requests. .It Li k8-dc-access +.Pq Event 40H Count data cache accesses including microcode scratchpad accesses. .It Li k8-dc-copyback Op Li ,mask= Ns Ar qualifier +.Pq Event 44H Count data cache copyback operations. This event may be further qualified using .Ar qualifier , @@ -188,6 +209,7 @@ The default is to count operations for lines in all the above states. .It Li k8-dc-dcache-accesses-by-locks Op Li ,mask= Ns Ar qualifier +.Pq Event 4CH Count data cache accesses by lock instructions. This event is only available on processors of revision C or later vintage. @@ -206,6 +228,7 @@ .Pp The default is to count all accesses. .It Li k8-dc-dispatched-prefetch-instructions Op Li ,mask= Ns Ar qualifier +.Pq Event 4BH Count the number of dispatched prefetch instructions. This event may be further qualified using .Ar qualifier , @@ -224,18 +247,25 @@ .Pp The default is to count all operations. .It Li k8-dc-l1-dtlb-miss-and-l2-dtlb-hit +.Pq Event 45H Count L1 DTLB misses that are L2 DTLB hits. .It Li k8-dc-l1-dtlb-miss-and-l2-dtlb-miss +.Pq Event 46H Count L1 DTLB misses that are also misses in the L2 DTLB. .It Li k8-dc-microarchitectural-early-cancel-of-an-access +.Pq Event 49H Count microarchitectural early cancels of data cache accesses. .It Li k8-dc-microarchitectural-late-cancel-of-an-access +.Pq Event 48H Count microarchitectural late cancels of data cache accesses. .It Li k8-dc-misaligned-data-reference +.Pq Event 47H Count misaligned data references. .It Li k8-dc-miss +.Pq Event 41H Count data cache misses. .It Li k8-dc-one-bit-ecc-error Op Li ,mask= Ns Ar qualifier +.Pq Event 4AH Count one bit ECC errors found by the scrubber. This event may be further qualified using .Ar qualifier , @@ -252,6 +282,7 @@ .Pp The default is to count both kinds of errors. .It Li k8-dc-refill-from-l2 Op Li ,mask= Ns Ar qualifier +.Pq Event 42H Count data cache refills from L2 cache. This event may be further qualified using .Ar qualifier , @@ -285,6 +316,7 @@ The default is to count operations for lines in all the above states. .It Li k8-dc-refill-from-system Op Li ,mask= Ns Ar qualifier +.Pq Event 43H Count data cache refills from system memory. This event may be further qualified using .Ar qualifier , @@ -317,7 +349,16 @@ .Pp The default is to count operations for lines in all the above states. +.It Li k8-fp-cycles-with-no-fpu-ops-retired +.Pq Event 01H +Count cycles when no FPU ops were retired. +This event is supported in revision B and later CPUs. +.It Li k8-fp-dispatched-fpu-fast-flag-ops +.Pq Event 02H +Count dispatched FPU ops that use the fast flag interface. +This event is supported in revision B and later CPUs. .It Li k8-fp-dispatched-fpu-ops Op Li ,mask= Ns Ar qualifier +.Pq Event 00H Count the number of dispatched FPU ops. This event is supported in revision B and later CPUs. This event may be further qualified using @@ -342,38 +383,44 @@ .El .Pp The default is to count all types of ops. -.It Li k8-fp-cycles-with-no-fpu-ops-retired -Count cycles when no FPU ops were retired. -This event is supported in revision B and later CPUs. -.It Li k8-fp-dispatched-fpu-fast-flag-ops -Count dispatched FPU ops that use the fast flag interface. -This event is supported in revision B and later CPUs. .It Li k8-fr-decoder-empty +.Pq Event D0H Count cycles when there was nothing to dispatch (i.e., the decoder was empty). -.It Li k8-fr-dispatch-stalls -Count all dispatch stalls. .It Li k8-fr-dispatch-stall-for-segment-load +.Pq Event D4H Count dispatch stalls for segment loads. .It Li k8-fr-dispatch-stall-for-serialization +.Pq Event D3H Count dispatch stalls for serialization. .It Li k8-fr-dispatch-stall-from-branch-abort-to-retire +.Pq Event D2H Count dispatch stalls from branch abort to retiral. .It Li k8-fr-dispatch-stall-when-fpu-is-full +.Pq Event D7H Count dispatch stalls when the FPU is full. .It Li k8-fr-dispatch-stall-when-ls-is-full +.Pq Event D8H Count dispatch stalls when the load/store unit is full. .It Li k8-fr-dispatch-stall-when-reorder-buffer-is-full +.Pq Event D5H Count dispatch stalls when the reorder buffer is full. .It Li k8-fr-dispatch-stall-when-reservation-stations-are-full +.Pq Event D6H Count dispatch stalls when reservation stations are full. +.It Li k8-fr-dispatch-stall-when-waiting-far-xfer-or-resync-branch-pending +.Pq Event DAH +Count dispatch stalls when a far control transfer or a resync branch +is pending. .It Li k8-fr-dispatch-stall-when-waiting-for-all-to-be-quiet +.Pq Event D9H Count dispatch stalls when waiting for all to be quiet. .\" XXX What does "waiting for all to be quiet" mean? -.It Li k8-fr-dispatch-stall-when-waiting-far-xfer-or-resync-branch-pending -Count dispatch stalls when a far control transfer or a resync branch -is pending. +.It Li k8-fr-dispatch-stalls +.Pq Event D1H +Count all dispatch stalls. .It Li k8-fr-fpu-exceptions Op Li ,mask= Ns Ar qualifier +.Pq Event DBH Count FPU exceptions. This event is supported in revision B and later CPUs. This event may be further qualified using @@ -395,25 +442,35 @@ .Pp The default is to count all types of exceptions. .It Li k8-fr-interrupts-masked-cycles +.Pq Event CDH Count cycles when interrupts were masked (by CPU RFLAGS field IF was zero). .It Li k8-fr-interrupts-masked-while-pending-cycles +.Pq Event CEH Count cycles while interrupts were masked while pending (i.e., cycles when INTR was asserted while CPU RFLAGS field IF was zero). .It Li k8-fr-number-of-breakpoints-for-dr0 +.Pq Event DCH Count the number of breakpoints for DR0. .It Li k8-fr-number-of-breakpoints-for-dr1 +.Pq Event DDH Count the number of breakpoints for DR1. .It Li k8-fr-number-of-breakpoints-for-dr2 +.Pq Event DEH Count the number of breakpoints for DR2. .It Li k8-fr-number-of-breakpoints-for-dr3 +.Pq Event DFH Count the number of breakpoints for DR3. .It Li k8-fr-retired-branches +.Pq Event C2H Count retired branches including exceptions and interrupts. .It Li k8-fr-retired-branches-mispredicted +.Pq Event C3H Count mispredicted retired branches. .It Li k8-fr-retired-far-control-transfers +.Pq Event C6H Count retired far control transfers (which are always mispredicted). .It Li k8-fr-retired-fastpath-double-op-instructions Op Li ,mask= Ns Ar qualifier +.Pq Event CCH Count retired fastpath double op instructions. This event is supported in revision B and later CPUs. This event may be further qualified using @@ -433,6 +490,7 @@ .Pp The default is to count all types of instructions. .It Li k8-fr-retired-fpu-instructions Op Li ,mask= Ns Ar qualifier +.Pq Event CBH Count retired FPU instructions. This event is supported in revision B and later CPUs. This event may be further qualified using @@ -454,47 +512,68 @@ .Pp The default is to count all types of instructions. .It Li k8-fr-retired-near-returns +.Pq Event C8H Count retired near returns. .It Li k8-fr-retired-near-returns-mispredicted +.Pq Event C9H Count mispredicted near returns. .It Li k8-fr-retired-resyncs +.Pq Event C7H Count retired resyncs (non-control transfer branches). -.It Li k8-fr-retired-taken-hardware-interrupts -Count retired taken hardware interrupts. .It Li k8-fr-retired-taken-branches +.Pq Event C4H Count retired taken branches. .It Li k8-fr-retired-taken-branches-mispredicted +.Pq Event C5H Count retired taken branches that were mispredicted. .It Li k8-fr-retired-taken-branches-mispredicted-by-addr-miscompare +.Pq Event CAH Count retired taken branches that were mispredicted only due to an address miscompare. +.It Li k8-fr-retired-taken-hardware-interrupts +.Pq Event CFH +Count retired taken hardware interrupts. .It Li k8-fr-retired-uops +.Pq Event C1H Count retired uops. .It Li k8-fr-retired-x86-instructions +.Pq Event C0H Count retired x86 instructions including exceptions and interrupts. .It Li k8-ic-fetch +.Pq Event 80H Count instruction cache fetches. .It Li k8-ic-instruction-fetch-stall +.Pq Event 87H Count cycles in stalls due to instruction fetch. .It Li k8-ic-l1-itlb-miss-and-l2-itlb-hit +.Pq Event 84H Count L1 ITLB misses that are L2 ITLB hits. .It Li k8-ic-l1-itlb-miss-and-l2-itlb-miss +.Pq Event 85H Count ITLB misses that miss in both L1 and L2 ITLBs. .It Li k8-ic-microarchitectural-resync-by-snoop +.Pq Event 86H Count microarchitectural resyncs caused by snoops. .It Li k8-ic-miss +.Pq Event 81H Count instruction cache misses. .It Li k8-ic-refill-from-l2 +.Pq Event 82H Count instruction cache refills from L2 cache. .It Li k8-ic-refill-from-system +.Pq Event 83H Count instruction cache refills from system memory. .It Li k8-ic-return-stack-hits +.Pq Event 88H Count hits to the return stack. .It Li k8-ic-return-stack-overflow +.Pq Event 89H Count overflows of the return stack. .It Li k8-ls-buffer2-full +.Pq Event 23H Count load/store buffer2 full events. .It Li k8-ls-locked-operation Op Li ,mask= Ns Ar qualifier +.Pq Event 24H Count locked operations. For revision C and later CPUs, the following qualifiers are supported: .Pp @@ -510,17 +589,23 @@ .Pp The default is to count the number of lock instructions executed. .It Li k8-ls-microarchitectural-late-cancel +.Pq Event 25H Count microarchitectural late cancels of operations in the load/store unit. .It Li k8-ls-microarchitectural-resync-by-self-modifying-code +.Pq Event 21H Count microarchitectural resyncs caused by self-modifying code. .It Li k8-ls-microarchitectural-resync-by-snoop +.Pq Event 22H Count microarchitectural resyncs caused by snoops. .It Li k8-ls-retired-cflush-instructions +.Pq Event 26H Count retired CFLUSH instructions. .It Li k8-ls-retired-cpuid-instructions +.Pq Event 27H Count retired CPUID instructions. .It Li k8-ls-segment-register-load Op Li ,mask= Ns Ar qualifier +.Pq Event 20H Count segment register loads. This event may be further qualified using .Ar qualifier , @@ -546,7 +631,31 @@ .El .Pp The default is to count all types of loads. +.It Li k8-nb-ht-bus0-bandwidth Op Li ,mask= Ns Ar qualifier +.It Li k8-nb-ht-bus1-bandwidth Op Li ,mask= Ns Ar qualifier +.It Li k8-nb-ht-bus2-bandwidth Op Li ,mask= Ns Ar qualifier +.Pq Events F6H, F7H and F8H respectively +Count events on the HyperTransport(tm) buses. +These events may be further qualified using +.Ar qualifier , +which is a +.Ql + +separated set of the following keywords: +.Pp +.Bl -tag -width indent -compact +.It Li buffer-release +Count buffer release messages sent. +.It Li command +Count command messages sent. +.It Li data +Count data messages sent. +.It Li nop +Count nop messages sent. +.El +.Pp +The default is to count all types of messages. .It Li k8-nb-memory-controller-bypass-saturation Op Li ,mask= Ns Ar qualifier +.Pq Event E4H Count memory controller bypass counter saturation events. This event may be further qualified using .Ar qualifier , @@ -566,8 +675,10 @@ .El .Pp .It Li k8-nb-memory-controller-dram-slots-missed +.Pq Event E2H Count memory controller DRAM command slots missed (in MemClks). .It Li k8-nb-memory-controller-page-access-event Op Li ,mask= Ns Ar qualifier +.Pq Event E0H Count memory controller page access events. This event may be further qualified using .Ar qualifier , @@ -586,8 +697,30 @@ .Pp The default is to count all types of events. .It Li k8-nb-memory-controller-page-table-overflow +.Pq Event E1H Count memory control page table overflow events. +.It Li k8-nb-memory-controller-turnaround Op Li ,mask= Ns Ar qualifier +.Pq Event E3H +Count memory control turnaround events. +This event may be further qualified using +.Ar qualifier , +which is a +.Ql + +separated set of the following keywords: +.Pp +.Bl -tag -width indent -compact +.\" XXX doc is unclear whether these are cycle counts or event counts +.It Li dimm-turnaround +Count DIMM turnarounds. +.It Li read-to-write-turnaround +Count read to write turnarounds. +.It Li write-to-read-turnaround +Count write to read turnarounds. +.El +.Pp +The default is to count all types of events. .It Li k8-nb-probe-result Op Li ,mask= Ns Ar qualifier +.Pq Event ECH Count probe events. This event may be further qualified using .Ar qualifier , @@ -606,6 +739,7 @@ Count probe misses. .El .It Li k8-nb-sized-commands Op Li ,mask= Ns Ar qualifier +.Pq Event EBH Count sized commands issued. This event may be further qualified using .Ar qualifier , @@ -624,47 +758,6 @@ .El .Pp The default is to count all types of commands. -.It Li k8-nb-memory-controller-turnaround Op Li ,mask= Ns Ar qualifier -Count memory control turnaround events. -This event may be further qualified using -.Ar qualifier , -which is a -.Ql + -separated set of the following keywords: -.Pp -.Bl -tag -width indent -compact -.\" XXX doc is unclear whether these are cycle counts or event counts -.It Li dimm-turnaround -Count DIMM turnarounds. -.It Li read-to-write-turnaround -Count read to write turnarounds. -.It Li write-to-read-turnaround -Count write to read turnarounds. -.El -.Pp -The default is to count all types of events. -.It Li k8-nb-ht-bus0-bandwidth Op Li ,mask= Ns Ar qualifier -.It Li k8-nb-ht-bus1-bandwidth Op Li ,mask= Ns Ar qualifier -.It Li k8-nb-ht-bus2-bandwidth Op Li ,mask= Ns Ar qualifier -Count events on the HyperTransport(tm) buses. -These events may be further qualified using -.Ar qualifier , -which is a -.Ql + -separated set of the following keywords: -.Pp -.Bl -tag -width indent -compact -.It Li buffer-release -Count buffer release messages sent. -.It Li command -Count command messages sent. -.It Li data -Count data messages sent. -.It Li nop -Count nop messages sent. -.El -.Pp -The default is to count all types of messages. .El .Ss Event Name Aliases The following table shows the mapping between the PMC-independent ==== //depot/projects/mpsafetty/sbin/ifconfig/ifvlan.c#3 (text+ko) ==== @@ -56,7 +56,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sbin/ifconfig/ifvlan.c,v 1.14 2008/08/28 22:13:44 jfv Exp $"; + "$FreeBSD: src/sbin/ifconfig/ifvlan.c,v 1.15 2008/10/02 20:03:41 sam Exp $"; #endif #define NOTAG ((u_short) -1) @@ -174,6 +174,9 @@ static struct cmd vlan_cmds[] = { DEF_CLONE_CMD_ARG("vlan", setvlantag), DEF_CLONE_CMD_ARG("vlandev", setvlandev), + /* NB: non-clone cmds */ + DEF_CMD_ARG("vlan", setvlantag), + DEF_CMD_ARG("vlandev", setvlandev), /* XXX For compatibility. Should become DEF_CMD() some day. */ DEF_CMD_OPTARG("-vlandev", unsetvlandev), DEF_CMD("vlanmtu", IFCAP_VLAN_MTU, setifcap), ==== //depot/projects/mpsafetty/share/man/man4/ng_tty.4#2 (text+ko) ==== @@ -32,15 +32,15 @@ .\" .\" Author: Archie Cobbs .\" -.\" $FreeBSD: src/share/man/man4/ng_tty.4,v 1.17 2005/02/05 11:31:31 ru Exp $ +.\" $FreeBSD: src/share/man/man4/ng_tty.4,v 1.18 2008/10/03 05:14:54 thompsa Exp $ .\" $Whistle: ng_tty.8,v 1.5 1999/01/25 23:46:28 archie Exp $ .\" -.Dd January 19, 1999 +.Dd October 2, 2008 .Dt NG_TTY 4 .Os .Sh NAME .Nm ng_tty -.Nd netgraph node type that is also a line discipline +.Nd netgraph node type that is also a TTY hook .Sh SYNOPSIS .In sys/types.h .In sys/ttycom.h @@ -48,11 +48,7 @@ .Sh DESCRIPTION The .Nm tty -node type is both a netgraph node type and a line discipline. -A new node is created when the corresponding line discipline, -.Dv NETGRAPHDISC , -is registered on a tty device (see -.Xr tty 4 ) . +node type is both a netgraph node type and a TTY hook. .Pp The node has a single hook called .Dv hook . @@ -61,13 +57,18 @@ .Dv hook are transmitted out on the tty device. No modification to the data is performed in either direction. -While the line discipline is installed on a tty, the normal -read and write operations are unavailable, returning +While the hook is installed on a tty, the normal read and write +operations are unavailable, returning .Er EIO . .Pp +Incoming data is delivered directly to ng_tty via the tty bypass hook as a +buffer pointer and length, this is converted to a mbuf and passed to the peer. +.Pp The node supports an optional .Dq hot character . -If set to non-zero, incoming +If the driver can not deliver data directly to the tty bypass hook then each +character is input one at a time. +If set to non-zero and bypass mode is unavailable, incoming data from the tty device is queued until this character is seen. This avoids sending lots of mbufs containing a small number of bytes, but introduces potentially infinite latency. @@ -110,14 +111,12 @@ .It Dv NGM_TTY_GET_HOTCHAR Returns an integer containing the current hot character in the lower eight bits. +.It Dv NGM_TTY_SET_TTY +This command takes an integer pointer to the open file descriptor of the tty +and registers the tty hooks. .El .Sh SHUTDOWN -This node shuts down when the corresponding device is closed -(or the line discipline is uninstalled on the device). -The -.Dv NGM_SHUTDOWN -control message is not valid, and always returns the error -.Er EOPNOTSUPP . +This node shuts down when the corresponding device is closed. .Sh SEE ALSO .Xr ioctl 2 , .Xr netgraph 4 , @@ -131,6 +130,7 @@ .Fx 4.0 . .Sh AUTHORS .An Archie Cobbs Aq archie@FreeBSD.org +.An Andrew Thompson Aq thompsa@FreeBSD.org .Sh BUGS The serial driver code also has a notion of a .Dq hot character . ==== //depot/projects/mpsafetty/sys/arm/xscale/ixp425/avila_machdep.c#3 (text+ko) ==== @@ -48,7 +48,7 @@ #include "opt_msgbuf.h" #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_machdep.c,v 1.11 2008/07/18 06:14:36 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_machdep.c,v 1.12 2008/10/02 22:31:30 bms Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -480,6 +480,11 @@ init_param1(); init_param2(physmem); kdb_init(); + + /* use static kernel environment if so configured */ + if (envmode == 1) + kern_envp = static_env; + return ((void *)(kernelstack.pv_va + USPACE_SVC_STACK_TOP - sizeof(struct pcb))); } ==== //depot/projects/mpsafetty/sys/compat/linprocfs/linprocfs.c#6 (text+ko) ==== @@ -42,7 +42,7 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.123 2008/09/26 15:29:18 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.124 2008/10/02 15:37:58 zec Exp $"); #include #include @@ -1001,6 +1001,7 @@ static int linprocfs_donetdev(PFS_FILL_ARGS) { + INIT_VNET_NET(TD_TO_VNET(curthread)); char ifname[16]; /* XXX LINUX_IFNAMSIZ */ struct ifnet *ifp; ==== //depot/projects/mpsafetty/sys/compat/linux/linux_ioctl.c#8 (text+ko) ==== @@ -29,7 +29,7 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.143 2008/08/25 04:55:29 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.144 2008/10/02 15:37:58 zec Exp $"); #include #include @@ -2051,6 +2051,7 @@ int linux_ifname(struct ifnet *ifp, char *buffer, size_t buflen) { + INIT_VNET_NET(ifp->if_vnet); struct ifnet *ifscan; int ethno; @@ -2084,6 +2085,7 @@ static struct ifnet * ifname_linux_to_bsd(const char *lxname, char *bsdname) { + INIT_VNET_NET(TD_TO_VNET(curthread)); struct ifnet *ifp; int len, unit; char *ep; @@ -2124,6 +2126,7 @@ static int linux_ifconf(struct thread *td, struct ifconf *uifc) { + INIT_VNET_NET(TD_TO_VNET(td)); #ifdef COMPAT_LINUX32 struct l_ifconf ifc; #else ==== //depot/projects/mpsafetty/sys/compat/linux/linux_misc.c#7 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.227 2008/09/22 18:59:24 trasz Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.228 2008/10/02 15:37:58 zec Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -707,6 +707,7 @@ int linux_newuname(struct thread *td, struct linux_newuname_args *args) { + INIT_VPROCG(TD_TO_VPROCG(td)); struct l_new_utsname utsname; char osname[LINUX_MAX_UTSNAME]; char osrelease[LINUX_MAX_UTSNAME]; ==== //depot/projects/mpsafetty/sys/compat/linux/linux_socket.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.76 2008/09/09 13:01:14 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.77 2008/10/02 15:37:58 zec Exp $"); /* XXX we use functions that might not exist. */ #include "opt_compat.h" @@ -546,6 +546,9 @@ static int linux_socket(struct thread *td, struct linux_socket_args *args) { +#ifdef INET6 + INIT_VNET_INET6(curvnet); +#endif struct socket_args /* { int domain; int type; ==== //depot/projects/mpsafetty/sys/compat/svr4/svr4_sockio.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.20 2008/08/25 05:38:18 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.21 2008/10/02 15:37:58 zec Exp $"); #include #include @@ -88,6 +88,7 @@ switch (cmd) { case SVR4_SIOCGIFNUM: { + INIT_VNET_NET(curvnet); struct ifnet *ifp; struct ifaddr *ifa; int ifnum = 0; ==== //depot/projects/mpsafetty/sys/conf/kmod.mk#2 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.222 2008/03/04 16:54:31 jhb Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.223 2008/10/02 14:45:29 bms Exp $ # # The include file handles building and installing loadable # kernel modules. @@ -331,7 +331,8 @@ dev/sound/pcm/feeder_if.m dev/sound/pcm/mixer_if.m \ dev/sound/midi/mpu_if.m dev/sound/midi/mpufoi_if.m \ dev/sound/midi/synth_if.m dev/usb/usb_if.m isa/isa_if.m \ - kern/bus_if.m kern/cpufreq_if.m kern/device_if.m kern/serdev_if.m \ + kern/bus_if.m kern/clock_if.m \ + kern/cpufreq_if.m kern/device_if.m kern/serdev_if.m \ libkern/iconv_converter_if.m opencrypto/cryptodev_if.m \ pc98/pc98/canbus_if.m ==== //depot/projects/mpsafetty/sys/contrib/ipfilter/netinet/ip_auth.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.47 2007/11/26 08:18:19 darrenr Exp $ */ +/* $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.48 2008/10/02 15:37:58 zec Exp $ */ /* * Copyright (C) 1998-2003 by Darren Reed & Guido van Rooij. @@ -70,6 +70,11 @@ #include #include #include +#if !defined(_KERNEL) && defined(__FreeBSD_version) && \ + __FreeBSD_version >= 800049 +# define V_ip_do_randomid ip_do_randomid +# define V_ip_id ip_id +#endif #if !defined(_KERNEL) && !defined(__osf__) && !defined(__sgi) # define KERNEL # define _KERNEL @@ -120,7 +125,7 @@ /* END OF INCLUDES */ #if !defined(lint) -static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.47 2007/11/26 08:18:19 darrenr Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.48 2008/10/02 15:37:58 zec Exp $"; /* static const char rcsid[] = "@(#)$Id: ip_auth.c,v 2.73.2.24 2007/09/09 11:32:04 darrenr Exp $"; */ #endif ==== //depot/projects/mpsafetty/sys/contrib/pf/net/pf.c#4 (text+ko) ==== @@ -41,7 +41,7 @@ #include "opt_inet6.h" #include -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.56 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.57 2008/10/02 15:37:58 zec Exp $"); #endif #ifdef __FreeBSD__ @@ -1759,6 +1759,7 @@ u_int8_t flags, u_int16_t win, u_int16_t mss, u_int8_t ttl, int tag, u_int16_t rtag, struct ether_header *eh, struct ifnet *ifp) { + INIT_VNET_INET(curvnet); struct mbuf *m; int len, tlen; #ifdef INET @@ -2922,6 +2923,7 @@ pf_socket_lookup(int direction, struct pf_pdesc *pd) #endif { + INIT_VNET_INET(curvnet); struct pf_addr *saddr, *daddr; u_int16_t sport, dport; #ifdef __FreeBSD__ @@ -3101,6 +3103,7 @@ u_int16_t pf_get_mss(struct mbuf *m, int off, u_int16_t th_off, sa_family_t af) { + INIT_VNET_INET(curvnet); int hlen; u_int8_t hdr[60]; u_int8_t *opt, optlen; @@ -3140,6 +3143,7 @@ pf_calc_mss(struct pf_addr *addr, sa_family_t af, u_int16_t offer) { #ifdef INET + INIT_VNET_INET(curvnet); struct sockaddr_in *dst; struct route ro; #endif /* INET */ @@ -3242,6 +3246,7 @@ struct ifqueue *ifq) #endif { + INIT_VNET_INET(curvnet); struct pf_rule *nr = NULL; struct pf_addr *saddr = pd->src, *daddr = pd->dst; struct tcphdr *th = pd->hdr.tcp; @@ -6096,6 +6101,7 @@ pf_route(struct mbuf **m, struct pf_rule *r, int dir, struct ifnet *oifp, struct pf_state *s, struct pf_pdesc *pd) { + INIT_VNET_INET(curvnet); struct mbuf *m0, *m1; struct route iproute; struct route *ro = NULL; @@ -6633,18 +6639,30 @@ if (sum) { switch (p) { case IPPROTO_TCP: + { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Oct 3 10:01:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5DD001065678; Fri, 3 Oct 2008 10:01:04 +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 07D6E1065698 for ; Fri, 3 Oct 2008 10:01:04 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B29518FC1C for ; Fri, 3 Oct 2008 10:01:03 +0000 (UTC) (envelope-from zec@tel.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 m93A138N084820 for ; Fri, 3 Oct 2008 10:01:03 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m93A0ok7084798 for perforce@freebsd.org; Fri, 3 Oct 2008 10:00:50 GMT (envelope-from zec@tel.fer.hr) Date: Fri, 3 Oct 2008 10:00:50 GMT Message-Id: <200810031000.m93A0ok7084798@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 150849 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, 03 Oct 2008 10:01:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=150849 Change 150849 by zec@zec_tpx32 on 2008/10/03 10:00:45 IFC @ 150847 (effectively making this branch equal to head) Affected files ... .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/dump_machdep.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/minidump_machdep.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/param.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/arm/arm/dump_machdep.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/avila_machdep.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_ioctl.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_misc.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_socket.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_sockio.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/conf/kmod.mk#2 integrate .. //depot/projects/vimage-commit2/src/sys/conf/newvers.sh#3 integrate .. //depot/projects/vimage-commit2/src/sys/conf/options#10 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_auth.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_if.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_ioctl.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_subr.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pfvar.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/rdma/rdma_cma.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/ddb/db_textdump.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/agp/agp_i810.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/agp/agpreg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-chipset.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-pci.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_sge.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/dev/firewire/firewire.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/hwpmc/pmc_events.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mmc/mmc.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mmc/mmcreg.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mmc/mmcsd.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mmc/mmcvar.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mxge/eth_z8e.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mxge/ethp_z8e.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mxge/mxge_mcp.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mxge/rss_eth_z8e.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mxge/rss_ethp_z8e.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/nfe/if_nfe.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/nfe/if_nfereg.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/nfe/if_nfevar.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pccbb/pccbb_pci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/cd9660/cd9660_rrip.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_drive.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_rm.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_var.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/dump_machdep.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/minidump_machdep.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/param.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/ia64/ia64/dump_machdep.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_jail.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_mib.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_shutdown.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_uuid.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_xxx.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/kern/uipc_socket.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/kern/uipc_usrreq.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_lookup.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/net/bridgestp.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/net/if.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_bridge.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_ef.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_ethersubr.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_faith.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_gif.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_gif.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_gre.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_loop.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_mib.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_spppsubr.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_stf.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_tun.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_var.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_vlan.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/net/raw_cb.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/net/raw_usrreq.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/net/route.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/net/rtsock.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/net/vnet.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ddb.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/atm/ng_atm.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/netgraph.h#11 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_base.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_eiface.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_gif.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_iface.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_tty.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_tty.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_gif.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_mcast.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_rmx.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip6.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_carp.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_divert.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fastfwd.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw.h#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#23 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw_nat.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_icmp.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_ipsec.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_mroute.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_options.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/raw_ip.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_hostcache.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_input.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_offload.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_output.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_reass.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_sack.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.c#20 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_timer.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_timewait.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_usrreq.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/dest6.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/frag6.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/icmp6.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_gif.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_ifattach.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_pcb.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_proto.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_rmx.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_src.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_forward.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_input.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_ipsec.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_mroute.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_output.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/mld6.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_nbr.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_rtr.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/raw_ip6.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/route6.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/scope6.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/udp6_usrreq.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/vinet6.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec_input.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec_mbuf.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec_output.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/key.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/keysock.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/vipsec.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ah.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_esp.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ipcomp.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ipip.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_diskless.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_vfsops.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_vnops.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/rpc/authunix_prot.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/dump_machdep.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/sun4v/sun4v/dump_machdep.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/sys/conf.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/sys/kerneldump.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/protosw.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/sysctl.h#10 integrate .. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#20 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/dump_machdep.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.15 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.16 2008/10/01 22:08:53 peter Exp $"); #include #include @@ -105,27 +105,6 @@ return (mdp); } -/* XXX should be MI */ -static void -mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen, - uint32_t blksz) -{ - - bzero(kdh, sizeof(*kdh)); - strncpy(kdh->magic, KERNELDUMPMAGIC, sizeof(kdh->magic)); - strncpy(kdh->architecture, MACHINE_ARCH, sizeof(kdh->architecture)); - kdh->version = htod32(KERNELDUMPVERSION); - kdh->architectureversion = htod32(archver); - kdh->dumplength = htod64(dumplen); - kdh->dumptime = htod64(time_second); - kdh->blocksize = htod32(blksz); - strncpy(kdh->hostname, G_hostname, sizeof(kdh->hostname)); - strncpy(kdh->versionstring, version, sizeof(kdh->versionstring)); - if (panicstr != NULL) - strncpy(kdh->panicstring, panicstr, sizeof(kdh->panicstring)); - kdh->parity = kerneldump_parity(kdh); -} - static int buf_write(struct dumperinfo *di, char *ptr, size_t sz) { @@ -326,7 +305,7 @@ dumplo = di->mediaoffset + di->mediasize - dumpsize; dumplo -= sizeof(kdh) * 2; - mkdumpheader(&kdh, KERNELDUMP_AMD64_VERSION, dumpsize, di->blocksize); + mkdumpheader(&kdh, KERNELDUMPMAGIC, KERNELDUMP_AMD64_VERSION, dumpsize, di->blocksize); printf("Dumping %llu MB (%d chunks)\n", (long long)dumpsize >> 20, ehdr.e_phnum); ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/minidump_machdep.c#11 (text) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.7 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.8 2008/10/01 22:08:53 peter Exp $"); #include #include @@ -81,27 +81,6 @@ return (0); } -/* XXX should be MI */ -static void -mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen, - uint32_t blksz) -{ - - bzero(kdh, sizeof(*kdh)); - strncpy(kdh->magic, KERNELDUMPMAGIC, sizeof(kdh->magic)); - strncpy(kdh->architecture, MACHINE_ARCH, sizeof(kdh->architecture)); - kdh->version = htod32(KERNELDUMPVERSION); - kdh->architectureversion = htod32(archver); - kdh->dumplength = htod64(dumplen); - kdh->dumptime = htod64(time_second); - kdh->blocksize = htod32(blksz); - strncpy(kdh->hostname, G_hostname, sizeof(kdh->hostname)); - strncpy(kdh->versionstring, version, sizeof(kdh->versionstring)); - if (panicstr != NULL) - strncpy(kdh->panicstring, panicstr, sizeof(kdh->panicstring)); - kdh->parity = kerneldump_parity(kdh); -} - #define PG2MB(pgs) (((pgs) + (1 << 8) - 1) >> 8) static int @@ -284,7 +263,7 @@ mdhdr.dmapbase = DMAP_MIN_ADDRESS; mdhdr.dmapend = DMAP_MAX_ADDRESS; - mkdumpheader(&kdh, KERNELDUMP_AMD64_VERSION, dumpsize, di->blocksize); + mkdumpheader(&kdh, KERNELDUMPMAGIC, KERNELDUMP_AMD64_VERSION, dumpsize, di->blocksize); printf("Physical memory: %ju MB\n", ptoa((uintmax_t)physmem) / 1048576); printf("Dumping %llu MB:", (long long)dumpsize >> 20); ==== //depot/projects/vimage-commit2/src/sys/amd64/include/param.h#4 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/amd64/include/param.h,v 1.23 2008/08/01 04:55:38 alc Exp $ + * $FreeBSD: src/sys/amd64/include/param.h,v 1.24 2008/10/01 21:59:04 jhb Exp $ */ /* @@ -80,7 +80,7 @@ #endif #if defined(SMP) || defined(KLD_MODULE) -#define MAXCPU 16 +#define MAXCPU 32 #else #define MAXCPU 1 #endif ==== //depot/projects/vimage-commit2/src/sys/arm/arm/dump_machdep.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.4 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.5 2008/10/01 22:08:53 peter Exp $"); #include #include @@ -103,27 +103,6 @@ return (mdp); } -/* XXX should be MI */ -static void -mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen, - uint32_t blksz) -{ - - bzero(kdh, sizeof(*kdh)); - strncpy(kdh->magic, KERNELDUMPMAGIC, sizeof(kdh->magic)); - strncpy(kdh->architecture, MACHINE_ARCH, sizeof(kdh->architecture)); - kdh->version = htod32(KERNELDUMPVERSION); - kdh->architectureversion = htod32(archver); - kdh->dumplength = htod64(dumplen); - kdh->dumptime = htod64(time_second); - kdh->blocksize = htod32(blksz); - strncpy(kdh->hostname, G_hostname, sizeof(kdh->hostname)); - strncpy(kdh->versionstring, version, sizeof(kdh->versionstring)); - if (panicstr != NULL) - strncpy(kdh->panicstring, panicstr, sizeof(kdh->panicstring)); - kdh->parity = kerneldump_parity(kdh); -} - static int buf_write(struct dumperinfo *di, char *ptr, size_t sz) { @@ -325,7 +304,7 @@ dumplo = di->mediaoffset + di->mediasize - dumpsize; dumplo -= sizeof(kdh) * 2; - mkdumpheader(&kdh, KERNELDUMP_ARM_VERSION, dumpsize, di->blocksize); + mkdumpheader(&kdh, KERNELDUMPMAGIC, KERNELDUMP_ARM_VERSION, dumpsize, di->blocksize); printf("Dumping %llu MB (%d chunks)\n", (long long)dumpsize >> 20, ehdr.e_phnum); ==== //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/avila_machdep.c#3 (text+ko) ==== @@ -48,7 +48,7 @@ #include "opt_msgbuf.h" #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_machdep.c,v 1.11 2008/07/18 06:14:36 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_machdep.c,v 1.12 2008/10/02 22:31:30 bms Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -480,6 +480,11 @@ init_param1(); init_param2(physmem); kdb_init(); + + /* use static kernel environment if so configured */ + if (envmode == 1) + kern_envp = static_env; + return ((void *)(kernelstack.pv_va + USPACE_SVC_STACK_TOP - sizeof(struct pcb))); } ==== //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#11 (text+ko) ==== @@ -42,7 +42,7 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.123 2008/09/26 15:29:18 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.124 2008/10/02 15:37:58 zec Exp $"); #include #include ==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_ioctl.c#12 (text+ko) ==== @@ -29,7 +29,7 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.143 2008/08/25 04:55:29 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.144 2008/10/02 15:37:58 zec Exp $"); #include #include ==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_misc.c#12 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.227 2008/09/22 18:59:24 trasz Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.228 2008/10/02 15:37:58 zec Exp $"); #include "opt_compat.h" #include "opt_mac.h" ==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_socket.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.76 2008/09/09 13:01:14 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.77 2008/10/02 15:37:58 zec Exp $"); /* XXX we use functions that might not exist. */ #include "opt_compat.h" ==== //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_sockio.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.20 2008/08/25 05:38:18 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.21 2008/10/02 15:37:58 zec Exp $"); #include #include ==== //depot/projects/vimage-commit2/src/sys/conf/kmod.mk#2 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.222 2008/03/04 16:54:31 jhb Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.223 2008/10/02 14:45:29 bms Exp $ # # The include file handles building and installing loadable # kernel modules. @@ -331,7 +331,8 @@ dev/sound/pcm/feeder_if.m dev/sound/pcm/mixer_if.m \ dev/sound/midi/mpu_if.m dev/sound/midi/mpufoi_if.m \ dev/sound/midi/synth_if.m dev/usb/usb_if.m isa/isa_if.m \ - kern/bus_if.m kern/cpufreq_if.m kern/device_if.m kern/serdev_if.m \ + kern/bus_if.m kern/clock_if.m \ + kern/cpufreq_if.m kern/device_if.m kern/serdev_if.m \ libkern/iconv_converter_if.m opencrypto/cryptodev_if.m \ pc98/pc98/canbus_if.m ==== //depot/projects/vimage-commit2/src/sys/conf/newvers.sh#3 (text+ko) ==== @@ -28,7 +28,7 @@ # SUCH DAMAGE. # # @(#)newvers.sh 8.1 (Berkeley) 4/20/94 -# $FreeBSD: src/sys/conf/newvers.sh,v 1.76 2008/07/13 20:08:38 dougb Exp $ +# $FreeBSD: src/sys/conf/newvers.sh,v 1.77 2008/10/01 22:52:20 peter Exp $ TYPE="FreeBSD" REVISION="8.0" @@ -97,7 +97,7 @@ done if [ -n "$svnversion" -a -d "${SRCDIR}/.svn" ] ; then - svn=" r`cd $SRCDIR && $svnversion`" + svn=" r`cd $SRCDIR/sys && $svnversion`" else svn="" fi ==== //depot/projects/vimage-commit2/src/sys/conf/options#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.641 2008/08/27 01:31:42 imp Exp $ +# $FreeBSD: src/sys/conf/options,v 1.642 2008/10/01 19:24:16 jhb Exp $ # # On the handling of kernel options # @@ -741,9 +741,6 @@ DCONS_FORCE_CONSOLE opt_dcons.h DCONS_FORCE_GDB opt_dcons.h -# VFS options -LOOKUP_SHARED opt_vfs.h - # HWPMC options HWPMC_HOOKS ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_auth.c#7 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.47 2007/11/26 08:18:19 darrenr Exp $ */ +/* $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.48 2008/10/02 15:37:58 zec Exp $ */ /* * Copyright (C) 1998-2003 by Darren Reed & Guido van Rooij. @@ -125,7 +125,7 @@ /* END OF INCLUDES */ #if !defined(lint) -static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.47 2007/11/26 08:18:19 darrenr Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.48 2008/10/02 15:37:58 zec Exp $"; /* static const char rcsid[] = "@(#)$Id: ip_auth.c,v 2.73.2.24 2007/09/09 11:32:04 darrenr Exp $"; */ #endif ==== //depot/projects/vimage-commit2/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.56 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.57 2008/10/02 15:37:58 zec Exp $"); #endif #ifdef __FreeBSD__ ==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_if.c#7 (text+ko) ==== @@ -37,7 +37,7 @@ #include "opt_inet6.h" #include -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_if.c,v 1.16 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_if.c,v 1.17 2008/10/02 15:37:58 zec Exp $"); #endif #include ==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_ioctl.c#10 (text+ko) ==== @@ -40,7 +40,7 @@ #include "opt_inet6.h" #include -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.36 2008/09/27 08:51:18 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.37 2008/10/02 15:37:58 zec Exp $"); #endif #ifdef __FreeBSD__ ==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_subr.c#6 (text+ko) ==== @@ -32,7 +32,7 @@ #include "opt_inet6.h" #include -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_subr.c,v 1.5 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_subr.c,v 1.6 2008/10/02 15:37:58 zec Exp $"); #include #include ==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pfvar.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/pfvar.h,v 1.17 2008/03/29 00:24:36 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/pfvar.h,v 1.18 2008/10/02 15:37:58 zec Exp $ */ /* $OpenBSD: pfvar.h,v 1.244 2007/02/23 21:31:51 deraadt Exp $ */ /* ==== //depot/projects/vimage-commit2/src/sys/contrib/rdma/rdma_cma.c#9 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/contrib/rdma/rdma_cma.c,v 1.2 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/rdma/rdma_cma.c,v 1.3 2008/10/02 15:37:58 zec Exp $"); #include #include ==== //depot/projects/vimage-commit2/src/sys/ddb/db_textdump.c#8 (text+ko) ==== @@ -57,7 +57,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ddb/db_textdump.c,v 1.4 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_textdump.c,v 1.5 2008/10/01 22:08:53 peter Exp $"); #include "opt_config.h" @@ -177,30 +177,6 @@ static struct kerneldumpheader kdh; /* - * Text dumps are prefixed with a normal kernel dump header but with a - * different magic number to allow them to be uniquely identified. - */ -static void -mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, - uint64_t dumplen, uint32_t blksz) -{ - - bzero(kdh, sizeof(*kdh)); - strncpy(kdh->magic, TEXTDUMPMAGIC, sizeof(kdh->magic)); - strncpy(kdh->architecture, MACHINE_ARCH, sizeof(kdh->architecture)); - kdh->version = htod32(KERNELDUMPVERSION); - kdh->architectureversion = htod32(archver); - kdh->dumplength = htod64(dumplen); - kdh->dumptime = htod64(time_second); - kdh->blocksize = htod32(blksz); - strncpy(kdh->hostname, G_hostname, sizeof(kdh->hostname)); - strncpy(kdh->versionstring, version, sizeof(kdh->versionstring)); - if (panicstr != NULL) - strncpy(kdh->panicstring, panicstr, sizeof(kdh->panicstring)); - kdh->parity = kerneldump_parity(kdh); -} - -/* * Calculate and fill in the checksum for a ustar header. */ static void @@ -468,7 +444,7 @@ */ textdump_offset = di->mediasize - sizeof(kdh); textdump_saveoff(&trailer_offset); - mkdumpheader(&kdh, KERNELDUMP_TEXT_VERSION, 0, TEXTDUMP_BLOCKSIZE); + mkdumpheader(&kdh, TEXTDUMPMAGIC, KERNELDUMP_TEXT_VERSION, 0, TEXTDUMP_BLOCKSIZE); (void)textdump_writenextblock(di, (char *)&kdh); /* @@ -493,7 +469,7 @@ * size. */ dumplen = trailer_offset - (textdump_offset + TEXTDUMP_BLOCKSIZE); - mkdumpheader(&kdh, KERNELDUMP_TEXT_VERSION, dumplen, + mkdumpheader(&kdh, TEXTDUMPMAGIC, KERNELDUMP_TEXT_VERSION, dumplen, TEXTDUMP_BLOCKSIZE); (void)textdump_writenextblock(di, (char *)&kdh); textdump_restoreoff(trailer_offset); ==== //depot/projects/vimage-commit2/src/sys/dev/agp/agp_i810.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/agp/agp_i810.c,v 1.47 2008/08/01 13:11:23 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/agp/agp_i810.c,v 1.48 2008/10/02 20:29:45 rnoland Exp $"); #include "opt_bus.h" @@ -70,6 +70,7 @@ CHIP_I915, /* 915G/915GM */ CHIP_I965, /* G965 */ CHIP_G33, /* G33/Q33/Q35 */ + CHIP_G4X, /* G45/Q45 */ }; /* The i810 through i855 have the registers at BAR 1, and the GATT gets @@ -133,7 +134,7 @@ {0x25628086, CHIP_I830, 0x00020000, "Intel 82845M (845M GMCH) SVGA controller"}, {0x35828086, CHIP_I855, 0x00020000, - "Intel 82852/5"}, + "Intel 82852/855GM SVGA controller"}, {0x25728086, CHIP_I855, 0x00020000, "Intel 82865G (865G GMCH) SVGA controller"}, {0x25828086, CHIP_I915, 0x00020000, @@ -154,18 +155,26 @@ "Intel G965 SVGA controller"}, {0x29928086, CHIP_I965, 0x00020000, "Intel Q965 SVGA controller"}, - {0x29a28086, CHIP_I965, 0x00020000, + {0x29A28086, CHIP_I965, 0x00020000, "Intel G965 SVGA controller"}, - {0x29b28086, CHIP_G33, 0x00020000, + {0x29B28086, CHIP_G33, 0x00020000, "Intel Q35 SVGA controller"}, - {0x29c28086, CHIP_G33, 0x00020000, + {0x29C28086, CHIP_G33, 0x00020000, "Intel G33 SVGA controller"}, - {0x29d28086, CHIP_G33, 0x00020000, + {0x29D28086, CHIP_G33, 0x00020000, "Intel Q33 SVGA controller"}, - {0x2a028086, CHIP_I965, 0x00020000, + {0x2A028086, CHIP_I965, 0x00020000, "Intel GM965 SVGA controller"}, - {0x2a128086, CHIP_I965, 0x00020000, + {0x2A128086, CHIP_I965, 0x00020000, "Intel GME965 SVGA controller"}, + {0x2A428086, CHIP_I965, 0x00020000, + "Intel GM45 SVGA controller"}, + {0x2E028086, CHIP_G4X, 0x00020000, + "Intel 4 Series SVGA controller"}, + {0x2E128086, CHIP_G4X, 0x00020000, + "Intel Q45 SVGA controller"}, + {0x2E228086, CHIP_G4X, 0x00020000, + "Intel G45 SVGA controller"}, {0, 0, 0, NULL} }; @@ -377,6 +386,7 @@ agp_set_aperture_resource(dev, AGP_I915_GMADR); break; case CHIP_I965: + case CHIP_G4X: sc->sc_res_spec = agp_i965_res_spec; agp_set_aperture_resource(dev, AGP_I915_GMADR); break; @@ -476,7 +486,8 @@ gatt->ag_physical = pgtblctl & ~1; } else if (sc->chiptype == CHIP_I855 || sc->chiptype == CHIP_I915 || - sc->chiptype == CHIP_I965 || sc->chiptype == CHIP_G33) { + sc->chiptype == CHIP_I965 || sc->chiptype == CHIP_G33 || + sc->chiptype == CHIP_G4X) { unsigned int gcc1, pgtblctl, stolen, gtt_size; /* Stolen memory is set up at the beginning of the aperture by @@ -491,7 +502,6 @@ gtt_size = 256; break; case CHIP_I965: - case CHIP_G33: switch (bus_read_4(sc->sc_res[0], AGP_I810_PGTBL_CTL) & AGP_I810_PGTBL_SIZE_MASK) { case AGP_I810_PGTBL_SIZE_128KB: @@ -503,6 +513,15 @@ case AGP_I810_PGTBL_SIZE_512KB: gtt_size = 512; break; + case AGP_I965_PGTBL_SIZE_1MB: + gtt_size = 1024; + break; + case AGP_I965_PGTBL_SIZE_2MB: + gtt_size = 2048; + break; + case AGP_I965_PGTBL_SIZE_1_5MB: + gtt_size = 1024 + 512; + break; default: device_printf(dev, "Bad PGTBL size\n"); bus_release_resources(dev, sc->sc_res_spec, @@ -512,6 +531,27 @@ return EINVAL; } break; + case CHIP_G33: + gcc1 = pci_read_config(sc->bdev, AGP_I855_GCC1, 2); + switch (gcc1 & AGP_G33_MGGC_GGMS_MASK) { + case AGP_G33_MGGC_GGMS_SIZE_1M: + gtt_size = 1024; + break; + case AGP_G33_MGGC_GGMS_SIZE_2M: + gtt_size = 2048; + break; + default: + device_printf(dev, "Bad PGTBL size\n"); + bus_release_resources(dev, sc->sc_res_spec, + sc->sc_res); + free(gatt, M_AGP); + agp_generic_detach(dev); + return EINVAL; + } + break; + case CHIP_G4X: + gtt_size = 0; + break; default: device_printf(dev, "Bad chiptype\n"); bus_release_resources(dev, sc->sc_res_spec, @@ -528,28 +568,86 @@ stolen = 1024; break; case AGP_I855_GCC1_GMS_STOLEN_4M: - stolen = 4096; + stolen = 4 * 1024; break; case AGP_I855_GCC1_GMS_STOLEN_8M: - stolen = 8192; + stolen = 8 * 1024; break; case AGP_I855_GCC1_GMS_STOLEN_16M: - stolen = 16384; + stolen = 16 * 1024; break; case AGP_I855_GCC1_GMS_STOLEN_32M: - stolen = 32768; + stolen = 32 * 1024; break; case AGP_I915_GCC1_GMS_STOLEN_48M: - stolen = 49152; + if (sc->chiptype == CHIP_I915 || + sc->chiptype == CHIP_I965 || + sc->chiptype == CHIP_G33 || + sc->chiptype == CHIP_G4X) { + stolen = 48 * 1024; + } else { + stolen = 0; + } break; case AGP_I915_GCC1_GMS_STOLEN_64M: - stolen = 65536; + if (sc->chiptype == CHIP_I915 || + sc->chiptype == CHIP_I965 || + sc->chiptype == CHIP_G33 || + sc->chiptype == CHIP_G4X) { + stolen = 64 * 1024; + } else { + stolen = 0; + } break; case AGP_G33_GCC1_GMS_STOLEN_128M: - stolen = 128 * 1024; + if (sc->chiptype == CHIP_I965 || + sc->chiptype == CHIP_G33 || + sc->chiptype == CHIP_G4X) { + stolen = 128 * 1024; + } else { + stolen = 0; + } break; case AGP_G33_GCC1_GMS_STOLEN_256M: - stolen = 256 * 1024; + if (sc->chiptype == CHIP_I965 || + sc->chiptype == CHIP_G33 || + sc->chiptype == CHIP_G4X) { + stolen = 256 * 1024; + } else { + stolen = 0; + } + break; + case AGP_G4X_GCC1_GMS_STOLEN_96M: + if (sc->chiptype == CHIP_I965 || + sc->chiptype == CHIP_G4X) { + stolen = 96 * 1024; + } else { + stolen = 0; + } + break; + case AGP_G4X_GCC1_GMS_STOLEN_160M: + if (sc->chiptype == CHIP_I965 || + sc->chiptype == CHIP_G4X) { + stolen = 160 * 1024; + } else { + stolen = 0; + } + break; + case AGP_G4X_GCC1_GMS_STOLEN_224M: + if (sc->chiptype == CHIP_I965 || + sc->chiptype == CHIP_G4X) { + stolen = 224 * 1024; + } else { + stolen = 0; + } + break; + case AGP_G4X_GCC1_GMS_STOLEN_352M: + if (sc->chiptype == CHIP_I965 || + sc->chiptype == CHIP_G4X) { + stolen = 352 * 1024; + } else { + stolen = 0; + } break; default: device_printf(dev, "unknown memory configuration, " @@ -560,7 +658,11 @@ agp_generic_detach(dev); return EINVAL; } - sc->stolen = (stolen - gtt_size - 4) * 1024 / 4096; + + if (sc->chiptype != CHIP_G4X) + gtt_size += 4; + + sc->stolen = (stolen - gtt_size) * 1024 / 4096; if (sc->stolen > 0) device_printf(dev, "detected %dk stolen memory\n", sc->stolen * 4); device_printf(dev, "aperture size is %dM\n", sc->initial_aperture / 1024 / 1024); ==== //depot/projects/vimage-commit2/src/sys/dev/agp/agpreg.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/agp/agpreg.h,v 1.19 2007/07/13 16:28:12 anholt Exp $ + * $FreeBSD: src/sys/dev/agp/agpreg.h,v 1.20 2008/10/02 20:29:45 rnoland Exp $ */ #ifndef _PCI_AGPREG_H_ @@ -215,7 +215,7 @@ #define AGP_I855_GCC1_DEV2 0x08 #define AGP_I855_GCC1_DEV2_ENABLED 0x00 #define AGP_I855_GCC1_DEV2_DISABLED 0x08 -#define AGP_I855_GCC1_GMS 0x70 +#define AGP_I855_GCC1_GMS 0xf0 /* Top bit reserved pre-G33 */ #define AGP_I855_GCC1_GMS_STOLEN_0M 0x00 #define AGP_I855_GCC1_GMS_STOLEN_1M 0x10 #define AGP_I855_GCC1_GMS_STOLEN_4M 0x20 @@ -259,14 +259,28 @@ #define AGP_I965_MSAC_GMASIZE_128 0x00 #define AGP_I965_MSAC_GMASIZE_256 0x02 #define AGP_I965_MSAC_GMASIZE_512 0x06 +#define AGP_I965_PGTBL_SIZE_1MB (3 << 1) +#define AGP_I965_PGTBL_SIZE_2MB (4 << 1) +#define AGP_I965_PGTBL_SIZE_1_5MB (5 << 1) /* * G33 registers */ +#define AGP_G33_MGGC_GGMS_MASK (3 << 8) +#define AGP_G33_MGGC_GGMS_SIZE_1M (1 << 8) +#define AGP_G33_MGGC_GGMS_SIZE_2M (2 << 8) #define AGP_G33_GCC1_GMS_STOLEN_128M 0x80 #define AGP_G33_GCC1_GMS_STOLEN_256M 0x90 /* + * G4X registers + */ +#define AGP_G4X_GCC1_GMS_STOLEN_96M 0xa0 +#define AGP_G4X_GCC1_GMS_STOLEN_160M 0xb0 +#define AGP_G4X_GCC1_GMS_STOLEN_224M 0xc0 +#define AGP_G4X_GCC1_GMS_STOLEN_352M 0xd0 + +/* * NVIDIA nForce/nForce2 registers */ #define AGP_NVIDIA_0_APBASE 0x10 ==== //depot/projects/vimage-commit2/src/sys/dev/ata/ata-chipset.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.228 2008/09/26 07:29:48 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.229 2008/10/02 19:18:28 sos Exp $"); #include "opt_ata.h" #include @@ -2124,59 +2124,66 @@ { struct ata_pci_controller *ctlr = device_get_softc(dev); static struct ata_chip_id ids[] = - {{ ATA_I82371FB, 0, 0, 0x00, ATA_WDMA2, "PIIX" }, - { ATA_I82371SB, 0, 0, 0x00, ATA_WDMA2, "PIIX3" }, - { ATA_I82371AB, 0, 0, 0x00, ATA_UDMA2, "PIIX4" }, - { ATA_I82443MX, 0, 0, 0x00, ATA_UDMA2, "PIIX4" }, - { ATA_I82451NX, 0, 0, 0x00, ATA_UDMA2, "PIIX4" }, - { ATA_I82801AB, 0, 0, 0x00, ATA_UDMA2, "ICH0" }, - { ATA_I82801AA, 0, 0, 0x00, ATA_UDMA4, "ICH" }, - { ATA_I82372FB, 0, 0, 0x00, ATA_UDMA4, "ICH" }, - { ATA_I82801BA, 0, 0, 0x00, ATA_UDMA5, "ICH2" }, - { ATA_I82801BA_1, 0, 0, 0x00, ATA_UDMA5, "ICH2" }, - { ATA_I82801CA, 0, 0, 0x00, ATA_UDMA5, "ICH3" }, - { ATA_I82801CA_1, 0, 0, 0x00, ATA_UDMA5, "ICH3" }, - { ATA_I82801DB, 0, 0, 0x00, ATA_UDMA5, "ICH4" }, - { ATA_I82801DB_1, 0, 0, 0x00, ATA_UDMA5, "ICH4" }, - { ATA_I82801EB, 0, 0, 0x00, ATA_UDMA5, "ICH5" }, - { ATA_I82801EB_S1, 0, 0, 0x00, ATA_SA150, "ICH5" }, - { ATA_I82801EB_R1, 0, 0, 0x00, ATA_SA150, "ICH5" }, - { ATA_I6300ESB, 0, 0, 0x00, ATA_UDMA5, "6300ESB" }, - { ATA_I6300ESB_S1, 0, 0, 0x00, ATA_SA150, "6300ESB" }, - { ATA_I6300ESB_R1, 0, 0, 0x00, ATA_SA150, "6300ESB" }, - { ATA_I82801FB, 0, 0, 0x00, ATA_UDMA5, "ICH6" }, - { ATA_I82801FB_S1, 0, AHCI, 0x00, ATA_SA150, "ICH6" }, - { ATA_I82801FB_R1, 0, AHCI, 0x00, ATA_SA150, "ICH6" }, - { ATA_I82801FBM, 0, AHCI, 0x00, ATA_SA150, "ICH6M" }, - { ATA_I82801GB, 0, 0, 0x00, ATA_UDMA5, "ICH7" }, - { ATA_I82801GB_S1, 0, AHCI, 0x00, ATA_SA300, "ICH7" }, - { ATA_I82801GB_R1, 0, AHCI, 0x00, ATA_SA300, "ICH7" }, - { ATA_I82801GB_AH, 0, AHCI, 0x00, ATA_SA300, "ICH7" }, - { ATA_I82801GBM_S1, 0, AHCI, 0x00, ATA_SA300, "ICH7M" }, - { ATA_I82801GBM_R1, 0, AHCI, 0x00, ATA_SA300, "ICH7M" }, - { ATA_I82801GBM_AH, 0, AHCI, 0x00, ATA_SA300, "ICH7M" }, - { ATA_I63XXESB2, 0, 0, 0x00, ATA_UDMA5, "63XXESB2" }, - { ATA_I63XXESB2_S1, 0, AHCI, 0x00, ATA_SA300, "63XXESB2" }, - { ATA_I63XXESB2_S2, 0, AHCI, 0x00, ATA_SA300, "63XXESB2" }, - { ATA_I63XXESB2_R1, 0, AHCI, 0x00, ATA_SA300, "63XXESB2" }, - { ATA_I63XXESB2_R2, 0, AHCI, 0x00, ATA_SA300, "63XXESB2" }, - { ATA_I82801HB_S1, 0, AHCI, 0x00, ATA_SA300, "ICH8" }, - { ATA_I82801HB_S2, 0, AHCI, 0x00, ATA_SA300, "ICH8" }, - { ATA_I82801HB_R1, 2, AHCI, 0x00, ATA_SA300, "ICH9R" }, - { ATA_I82801HB_R1, 0, AHCI, 0x00, ATA_SA300, "ICH8" }, - { ATA_I82801HB_AH4, 0, AHCI, 0x00, ATA_SA300, "ICH8" }, - { ATA_I82801HB_AH6, 0, AHCI, 0x00, ATA_SA300, "ICH8" }, - { ATA_I82801HBM, 0, 0, 0x00, ATA_UDMA5, "ICH8M" }, - { ATA_I82801HBM_S1, 0, 0, 0x00, ATA_SA150, "ICH8M" }, - { ATA_I82801HBM_S2, 0, AHCI, 0x00, ATA_SA300, "ICH8M" }, - { ATA_I82801HBM_S3, 0, AHCI, 0x00, ATA_SA300, "ICH8M" }, - { ATA_I82801IB_S1, 0, AHCI, 0x00, ATA_SA300, "ICH9" }, - { ATA_I82801IB_S2, 0, AHCI, 0x00, ATA_SA300, "ICH9" }, - { ATA_I82801IB_AH2, 0, AHCI, 0x00, ATA_SA300, "ICH9" }, - { ATA_I82801IB_AH4, 0, AHCI, 0x00, ATA_SA300, "ICH9" }, - { ATA_I82801IB_AH6, 0, AHCI, 0x00, ATA_SA300, "ICH9" }, - { ATA_I82801IB_R1, 0, AHCI, 0x00, ATA_SA300, "ICH9" }, - { ATA_I31244, 0, 0, 0x00, ATA_SA150, "31244" }, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Oct 3 10:10:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F15B1065694; Fri, 3 Oct 2008 10:10: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 3F38E106568B for ; Fri, 3 Oct 2008 10:10:13 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2BBE68FC2B for ; Fri, 3 Oct 2008 10:10:13 +0000 (UTC) (envelope-from zec@tel.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 m93AAD0I086645 for ; Fri, 3 Oct 2008 10:10:13 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m93AADUm086643 for perforce@freebsd.org; Fri, 3 Oct 2008 10:10:13 GMT (envelope-from zec@tel.fer.hr) Date: Fri, 3 Oct 2008 10:10:13 GMT Message-Id: <200810031010.m93AADUm086643@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 150851 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, 03 Oct 2008 10:10:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=150851 Change 150851 by zec@zec_tca51 on 2008/10/03 10:09:14 Fix misintegrations. Affected files ... .. //depot/projects/vimage-commit2/src/sys/net/vnet.h#5 edit .. //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#6 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/vinet6.h#6 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/vipsec.h#4 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/net/vnet.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$ + * $FreeBSD: src/sys/net/vnet.h,v 1.1 2008/10/02 15:37:58 zec Exp $ */ #ifndef _NET_VNET_H_ ==== //depot/projects/vimage-commit2/src/sys/netinet/vinet.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$ + * $FreeBSD: src/sys/netinet/vinet.h,v 1.1 2008/10/02 15:37:58 zec Exp $ */ #ifndef _NETINET_VINET_H_ ==== //depot/projects/vimage-commit2/src/sys/netinet6/vinet6.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$ + * $FreeBSD: src/sys/netinet6/vinet6.h,v 1.1 2008/10/02 15:37:58 zec Exp $ */ #ifndef _NETINET6_VINET6_H_ ==== //depot/projects/vimage-commit2/src/sys/netipsec/vipsec.h#4 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/netipsec/vipsec.h,v 1.1 2008/10/02 15:37:58 zec Exp $ */ #ifndef _NETIPSEC_VIPSEC_H_ From owner-p4-projects@FreeBSD.ORG Fri Oct 3 10:24:40 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A29A0106568C; Fri, 3 Oct 2008 10:24:40 +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 6590D106568A for ; Fri, 3 Oct 2008 10:24:40 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 51AB08FC1B for ; Fri, 3 Oct 2008 10:24:40 +0000 (UTC) (envelope-from zec@tel.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 m93AOeUN087713 for ; Fri, 3 Oct 2008 10:24:40 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m93AORJN087703 for perforce@freebsd.org; Fri, 3 Oct 2008 10:24:27 GMT (envelope-from zec@tel.fer.hr) Date: Fri, 3 Oct 2008 10:24:27 GMT Message-Id: <200810031024.m93AORJN087703@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 150853 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, 03 Oct 2008 10:24:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=150853 Change 150853 by zec@zec_tpx32 on 2008/10/03 10:23:38 IFC @ 150847, temporarily causing messa nd havoc... Affected files ... .. //depot/projects/vimage/src/sys/amd64/amd64/dump_machdep.c#10 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/minidump_machdep.c#12 integrate .. //depot/projects/vimage/src/sys/amd64/include/param.h#5 integrate .. //depot/projects/vimage/src/sys/arm/arm/dump_machdep.c#9 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/avila_machdep.c#9 integrate .. //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#24 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_ioctl.c#14 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_misc.c#25 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_socket.c#12 integrate .. //depot/projects/vimage/src/sys/compat/svr4/svr4_sockio.c#8 integrate .. //depot/projects/vimage/src/sys/conf/kmod.mk#7 integrate .. //depot/projects/vimage/src/sys/conf/newvers.sh#5 integrate .. //depot/projects/vimage/src/sys/conf/options#33 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_auth.c#6 integrate .. //depot/projects/vimage/src/sys/contrib/pf/net/pf.c#16 integrate .. //depot/projects/vimage/src/sys/contrib/pf/net/pf_if.c#11 integrate .. //depot/projects/vimage/src/sys/contrib/pf/net/pf_ioctl.c#18 integrate .. //depot/projects/vimage/src/sys/contrib/pf/net/pf_subr.c#9 integrate .. //depot/projects/vimage/src/sys/contrib/pf/net/pfvar.h#8 integrate .. //depot/projects/vimage/src/sys/contrib/rdma/rdma_cma.c#5 integrate .. //depot/projects/vimage/src/sys/ddb/db_textdump.c#7 integrate .. //depot/projects/vimage/src/sys/dev/agp/agp_i810.c#5 integrate .. //depot/projects/vimage/src/sys/dev/agp/agpreg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-chipset.c#19 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-pci.h#14 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_sge.c#17 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#7 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#15 integrate .. //depot/projects/vimage/src/sys/dev/firewire/firewire.c#17 integrate .. //depot/projects/vimage/src/sys/dev/hwpmc/pmc_events.h#3 integrate .. //depot/projects/vimage/src/sys/dev/mmc/mmc.c#6 integrate .. //depot/projects/vimage/src/sys/dev/mmc/mmcreg.h#5 integrate .. //depot/projects/vimage/src/sys/dev/mmc/mmcsd.c#7 integrate .. //depot/projects/vimage/src/sys/dev/mmc/mmcvar.h#5 integrate .. //depot/projects/vimage/src/sys/dev/mxge/eth_z8e.h#4 integrate .. //depot/projects/vimage/src/sys/dev/mxge/ethp_z8e.h#4 integrate .. //depot/projects/vimage/src/sys/dev/mxge/mxge_mcp.h#7 integrate .. //depot/projects/vimage/src/sys/dev/mxge/rss_eth_z8e.h#2 integrate .. //depot/projects/vimage/src/sys/dev/mxge/rss_ethp_z8e.h#2 integrate .. //depot/projects/vimage/src/sys/dev/nfe/if_nfe.c#10 integrate .. //depot/projects/vimage/src/sys/dev/nfe/if_nfereg.h#5 integrate .. //depot/projects/vimage/src/sys/dev/nfe/if_nfevar.h#5 integrate .. //depot/projects/vimage/src/sys/dev/pccbb/pccbb_pci.c#6 integrate .. //depot/projects/vimage/src/sys/fs/cd9660/cd9660_rrip.c#9 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum.h#3 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_drive.c#7 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_rm.c#3 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_var.h#2 integrate .. //depot/projects/vimage/src/sys/i386/i386/dump_machdep.c#12 integrate .. //depot/projects/vimage/src/sys/i386/i386/minidump_machdep.c#12 integrate .. //depot/projects/vimage/src/sys/i386/include/param.h#4 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/dump_machdep.c#9 integrate .. //depot/projects/vimage/src/sys/kern/kern_jail.c#14 integrate .. //depot/projects/vimage/src/sys/kern/kern_mib.c#16 integrate .. //depot/projects/vimage/src/sys/kern/kern_shutdown.c#9 integrate .. //depot/projects/vimage/src/sys/kern/kern_uuid.c#10 integrate .. //depot/projects/vimage/src/sys/kern/kern_xxx.c#12 integrate .. //depot/projects/vimage/src/sys/kern/uipc_socket.c#23 integrate .. //depot/projects/vimage/src/sys/kern/uipc_usrreq.c#18 integrate .. //depot/projects/vimage/src/sys/kern/vfs_lookup.c#15 integrate .. //depot/projects/vimage/src/sys/net/bridgestp.c#14 integrate .. //depot/projects/vimage/src/sys/net/if.c#41 integrate .. //depot/projects/vimage/src/sys/net/if_bridge.c#19 integrate .. //depot/projects/vimage/src/sys/net/if_ef.c#8 integrate .. //depot/projects/vimage/src/sys/net/if_ethersubr.c#26 integrate .. //depot/projects/vimage/src/sys/net/if_faith.c#6 integrate .. //depot/projects/vimage/src/sys/net/if_gif.c#17 integrate .. //depot/projects/vimage/src/sys/net/if_gif.h#7 integrate .. //depot/projects/vimage/src/sys/net/if_gre.c#10 integrate .. //depot/projects/vimage/src/sys/net/if_loop.c#26 integrate .. //depot/projects/vimage/src/sys/net/if_mib.c#9 integrate .. //depot/projects/vimage/src/sys/net/if_spppsubr.c#10 integrate .. //depot/projects/vimage/src/sys/net/if_stf.c#13 integrate .. //depot/projects/vimage/src/sys/net/if_tun.c#9 integrate .. //depot/projects/vimage/src/sys/net/if_var.h#18 integrate .. //depot/projects/vimage/src/sys/net/if_vlan.c#12 integrate .. //depot/projects/vimage/src/sys/net/raw_cb.c#10 integrate .. //depot/projects/vimage/src/sys/net/raw_usrreq.c#9 integrate .. //depot/projects/vimage/src/sys/net/route.c#28 integrate .. //depot/projects/vimage/src/sys/net/rtsock.c#17 integrate .. //depot/projects/vimage/src/sys/net/vnet.h#14 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_ddb.c#12 integrate .. //depot/projects/vimage/src/sys/netgraph/atm/ng_atm.c#8 integrate .. //depot/projects/vimage/src/sys/netgraph/netgraph.h#13 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_base.c#39 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_eiface.c#16 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_gif.c#9 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_iface.c#13 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_tty.c#2 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_tty.h#2 integrate .. //depot/projects/vimage/src/sys/netinet/if_ether.c#24 integrate .. //depot/projects/vimage/src/sys/netinet/igmp.c#18 integrate .. //depot/projects/vimage/src/sys/netinet/in.c#17 integrate .. //depot/projects/vimage/src/sys/netinet/in.h#7 integrate .. //depot/projects/vimage/src/sys/netinet/in_gif.c#13 integrate .. //depot/projects/vimage/src/sys/netinet/in_mcast.c#12 integrate .. //depot/projects/vimage/src/sys/netinet/in_pcb.c#33 integrate .. //depot/projects/vimage/src/sys/netinet/in_rmx.c#21 integrate .. //depot/projects/vimage/src/sys/netinet/ip6.h#5 integrate .. //depot/projects/vimage/src/sys/netinet/ip_carp.c#13 integrate .. //depot/projects/vimage/src/sys/netinet/ip_divert.c#15 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fastfwd.c#13 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw.h#19 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#48 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw_nat.c#8 integrate .. //depot/projects/vimage/src/sys/netinet/ip_icmp.c#19 integrate .. //depot/projects/vimage/src/sys/netinet/ip_input.c#36 integrate .. //depot/projects/vimage/src/sys/netinet/ip_ipsec.c#14 integrate .. //depot/projects/vimage/src/sys/netinet/ip_mroute.c#14 integrate .. //depot/projects/vimage/src/sys/netinet/ip_options.c#15 integrate .. //depot/projects/vimage/src/sys/netinet/raw_ip.c#28 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#26 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_input.c#37 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_offload.c#9 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_output.c#24 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_reass.c#8 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_sack.c#12 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#52 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#41 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_timer.c#22 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_timewait.c#18 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_usrreq.c#24 integrate .. //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#34 integrate .. //depot/projects/vimage/src/sys/netinet/vinet.h#30 integrate .. //depot/projects/vimage/src/sys/netinet6/dest6.c#9 integrate .. //depot/projects/vimage/src/sys/netinet6/frag6.c#19 integrate .. //depot/projects/vimage/src/sys/netinet6/icmp6.c#30 integrate .. //depot/projects/vimage/src/sys/netinet6/in6.c#22 integrate .. //depot/projects/vimage/src/sys/netinet6/in6.h#8 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_gif.c#14 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_ifattach.c#25 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_pcb.c#22 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_proto.c#29 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_rmx.c#21 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_src.c#23 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_forward.c#15 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_input.c#35 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_ipsec.c#13 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_mroute.c#17 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_output.c#20 integrate .. //depot/projects/vimage/src/sys/netinet6/mld6.c#16 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6.c#32 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6.h#8 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6_nbr.c#21 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6_rtr.c#19 integrate .. //depot/projects/vimage/src/sys/netinet6/raw_ip6.c#25 integrate .. //depot/projects/vimage/src/sys/netinet6/route6.c#10 integrate .. //depot/projects/vimage/src/sys/netinet6/scope6.c#17 integrate .. //depot/projects/vimage/src/sys/netinet6/udp6_usrreq.c#30 integrate .. //depot/projects/vimage/src/sys/netinet6/vinet6.h#21 integrate .. //depot/projects/vimage/src/sys/netipsec/ipsec.c#27 integrate .. //depot/projects/vimage/src/sys/netipsec/ipsec.h#10 integrate .. //depot/projects/vimage/src/sys/netipsec/ipsec_input.c#17 integrate .. //depot/projects/vimage/src/sys/netipsec/ipsec_mbuf.c#7 integrate .. //depot/projects/vimage/src/sys/netipsec/ipsec_output.c#18 integrate .. //depot/projects/vimage/src/sys/netipsec/key.c#23 integrate .. //depot/projects/vimage/src/sys/netipsec/keysock.c#14 integrate .. //depot/projects/vimage/src/sys/netipsec/vipsec.h#14 integrate .. //depot/projects/vimage/src/sys/netipsec/xform_ah.c#16 integrate .. //depot/projects/vimage/src/sys/netipsec/xform_esp.c#16 integrate .. //depot/projects/vimage/src/sys/netipsec/xform_ipcomp.c#13 integrate .. //depot/projects/vimage/src/sys/netipsec/xform_ipip.c#17 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_diskless.c#11 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_vfsops.c#22 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_vnops.c#19 integrate .. //depot/projects/vimage/src/sys/rpc/authunix_prot.c#9 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/dump_machdep.c#9 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/dump_machdep.c#9 integrate .. //depot/projects/vimage/src/sys/sys/conf.h#13 integrate .. //depot/projects/vimage/src/sys/sys/kerneldump.h#3 integrate .. //depot/projects/vimage/src/sys/sys/protosw.h#6 integrate .. //depot/projects/vimage/src/sys/sys/sysctl.h#27 integrate .. //depot/projects/vimage/src/sys/sys/vimage.h#66 integrate Differences ... ==== //depot/projects/vimage/src/sys/amd64/amd64/dump_machdep.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.15 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.16 2008/10/01 22:08:53 peter Exp $"); #include #include @@ -105,27 +105,6 @@ return (mdp); } -/* XXX should be MI */ -static void -mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen, - uint32_t blksz) -{ - - bzero(kdh, sizeof(*kdh)); - strncpy(kdh->magic, KERNELDUMPMAGIC, sizeof(kdh->magic)); - strncpy(kdh->architecture, MACHINE_ARCH, sizeof(kdh->architecture)); - kdh->version = htod32(KERNELDUMPVERSION); - kdh->architectureversion = htod32(archver); - kdh->dumplength = htod64(dumplen); - kdh->dumptime = htod64(time_second); - kdh->blocksize = htod32(blksz); - strncpy(kdh->hostname, G_hostname, sizeof(kdh->hostname)); - strncpy(kdh->versionstring, version, sizeof(kdh->versionstring)); - if (panicstr != NULL) - strncpy(kdh->panicstring, panicstr, sizeof(kdh->panicstring)); - kdh->parity = kerneldump_parity(kdh); -} - static int buf_write(struct dumperinfo *di, char *ptr, size_t sz) { @@ -326,7 +305,7 @@ dumplo = di->mediaoffset + di->mediasize - dumpsize; dumplo -= sizeof(kdh) * 2; - mkdumpheader(&kdh, KERNELDUMP_AMD64_VERSION, dumpsize, di->blocksize); + mkdumpheader(&kdh, KERNELDUMPMAGIC, KERNELDUMP_AMD64_VERSION, dumpsize, di->blocksize); printf("Dumping %llu MB (%d chunks)\n", (long long)dumpsize >> 20, ehdr.e_phnum); ==== //depot/projects/vimage/src/sys/amd64/amd64/minidump_machdep.c#12 (text) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.7 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.8 2008/10/01 22:08:53 peter Exp $"); #include #include @@ -81,27 +81,6 @@ return (0); } -/* XXX should be MI */ -static void -mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen, - uint32_t blksz) -{ - - bzero(kdh, sizeof(*kdh)); - strncpy(kdh->magic, KERNELDUMPMAGIC, sizeof(kdh->magic)); - strncpy(kdh->architecture, MACHINE_ARCH, sizeof(kdh->architecture)); - kdh->version = htod32(KERNELDUMPVERSION); - kdh->architectureversion = htod32(archver); - kdh->dumplength = htod64(dumplen); - kdh->dumptime = htod64(time_second); - kdh->blocksize = htod32(blksz); - strncpy(kdh->hostname, G_hostname, sizeof(kdh->hostname)); - strncpy(kdh->versionstring, version, sizeof(kdh->versionstring)); - if (panicstr != NULL) - strncpy(kdh->panicstring, panicstr, sizeof(kdh->panicstring)); - kdh->parity = kerneldump_parity(kdh); -} - #define PG2MB(pgs) (((pgs) + (1 << 8) - 1) >> 8) static int @@ -284,7 +263,7 @@ mdhdr.dmapbase = DMAP_MIN_ADDRESS; mdhdr.dmapend = DMAP_MAX_ADDRESS; - mkdumpheader(&kdh, KERNELDUMP_AMD64_VERSION, dumpsize, di->blocksize); + mkdumpheader(&kdh, KERNELDUMPMAGIC, KERNELDUMP_AMD64_VERSION, dumpsize, di->blocksize); printf("Physical memory: %ju MB\n", ptoa((uintmax_t)physmem) / 1048576); printf("Dumping %llu MB:", (long long)dumpsize >> 20); ==== //depot/projects/vimage/src/sys/amd64/include/param.h#5 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/amd64/include/param.h,v 1.23 2008/08/01 04:55:38 alc Exp $ + * $FreeBSD: src/sys/amd64/include/param.h,v 1.24 2008/10/01 21:59:04 jhb Exp $ */ /* @@ -80,7 +80,7 @@ #endif #if defined(SMP) || defined(KLD_MODULE) -#define MAXCPU 16 +#define MAXCPU 32 #else #define MAXCPU 1 #endif ==== //depot/projects/vimage/src/sys/arm/arm/dump_machdep.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.4 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.5 2008/10/01 22:08:53 peter Exp $"); #include #include @@ -103,27 +103,6 @@ return (mdp); } -/* XXX should be MI */ -static void -mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen, - uint32_t blksz) -{ - - bzero(kdh, sizeof(*kdh)); - strncpy(kdh->magic, KERNELDUMPMAGIC, sizeof(kdh->magic)); - strncpy(kdh->architecture, MACHINE_ARCH, sizeof(kdh->architecture)); - kdh->version = htod32(KERNELDUMPVERSION); - kdh->architectureversion = htod32(archver); - kdh->dumplength = htod64(dumplen); - kdh->dumptime = htod64(time_second); - kdh->blocksize = htod32(blksz); - strncpy(kdh->hostname, G_hostname, sizeof(kdh->hostname)); - strncpy(kdh->versionstring, version, sizeof(kdh->versionstring)); - if (panicstr != NULL) - strncpy(kdh->panicstring, panicstr, sizeof(kdh->panicstring)); - kdh->parity = kerneldump_parity(kdh); -} - static int buf_write(struct dumperinfo *di, char *ptr, size_t sz) { @@ -325,7 +304,7 @@ dumplo = di->mediaoffset + di->mediasize - dumpsize; dumplo -= sizeof(kdh) * 2; - mkdumpheader(&kdh, KERNELDUMP_ARM_VERSION, dumpsize, di->blocksize); + mkdumpheader(&kdh, KERNELDUMPMAGIC, KERNELDUMP_ARM_VERSION, dumpsize, di->blocksize); printf("Dumping %llu MB (%d chunks)\n", (long long)dumpsize >> 20, ehdr.e_phnum); ==== //depot/projects/vimage/src/sys/arm/xscale/ixp425/avila_machdep.c#9 (text+ko) ==== @@ -48,7 +48,7 @@ #include "opt_msgbuf.h" #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_machdep.c,v 1.11 2008/07/18 06:14:36 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_machdep.c,v 1.12 2008/10/02 22:31:30 bms Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -480,6 +480,11 @@ init_param1(); init_param2(physmem); kdb_init(); + + /* use static kernel environment if so configured */ + if (envmode == 1) + kern_envp = static_env; + return ((void *)(kernelstack.pv_va + USPACE_SVC_STACK_TOP - sizeof(struct pcb))); } ==== //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#24 (text+ko) ==== @@ -42,7 +42,7 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.123 2008/09/26 15:29:18 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.124 2008/10/02 15:37:58 zec Exp $"); #include "opt_compat.h" ==== //depot/projects/vimage/src/sys/compat/linux/linux_ioctl.c#14 (text+ko) ==== @@ -29,7 +29,7 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.143 2008/08/25 04:55:29 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.144 2008/10/02 15:37:58 zec Exp $"); #include "opt_compat.h" ==== //depot/projects/vimage/src/sys/compat/linux/linux_misc.c#25 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.227 2008/09/22 18:59:24 trasz Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.228 2008/10/02 15:37:58 zec Exp $"); #include "opt_compat.h" #include "opt_mac.h" ==== //depot/projects/vimage/src/sys/compat/linux/linux_socket.c#12 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.76 2008/09/09 13:01:14 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.77 2008/10/02 15:37:58 zec Exp $"); /* XXX we use functions that might not exist. */ #include "opt_compat.h" ==== //depot/projects/vimage/src/sys/compat/svr4/svr4_sockio.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.20 2008/08/25 05:38:18 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.21 2008/10/02 15:37:58 zec Exp $"); #include #include ==== //depot/projects/vimage/src/sys/conf/kmod.mk#7 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.222 2008/03/04 16:54:31 jhb Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.223 2008/10/02 14:45:29 bms Exp $ # # The include file handles building and installing loadable # kernel modules. @@ -331,7 +331,8 @@ dev/sound/pcm/feeder_if.m dev/sound/pcm/mixer_if.m \ dev/sound/midi/mpu_if.m dev/sound/midi/mpufoi_if.m \ dev/sound/midi/synth_if.m dev/usb/usb_if.m isa/isa_if.m \ - kern/bus_if.m kern/cpufreq_if.m kern/device_if.m kern/serdev_if.m \ + kern/bus_if.m kern/clock_if.m \ + kern/cpufreq_if.m kern/device_if.m kern/serdev_if.m \ libkern/iconv_converter_if.m opencrypto/cryptodev_if.m \ pc98/pc98/canbus_if.m ==== //depot/projects/vimage/src/sys/conf/newvers.sh#5 (text+ko) ==== @@ -28,7 +28,7 @@ # SUCH DAMAGE. # # @(#)newvers.sh 8.1 (Berkeley) 4/20/94 -# $FreeBSD: src/sys/conf/newvers.sh,v 1.76 2008/07/13 20:08:38 dougb Exp $ +# $FreeBSD: src/sys/conf/newvers.sh,v 1.77 2008/10/01 22:52:20 peter Exp $ TYPE="FreeBSD" REVISION="8.0" @@ -97,7 +97,7 @@ done if [ -n "$svnversion" -a -d "${SRCDIR}/.svn" ] ; then - svn=" r`cd $SRCDIR && $svnversion`" + svn=" r`cd $SRCDIR/sys && $svnversion`" else svn="" fi ==== //depot/projects/vimage/src/sys/conf/options#33 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.641 2008/08/27 01:31:42 imp Exp $ +# $FreeBSD: src/sys/conf/options,v 1.642 2008/10/01 19:24:16 jhb Exp $ # # On the handling of kernel options # @@ -743,9 +743,6 @@ DCONS_FORCE_CONSOLE opt_dcons.h DCONS_FORCE_GDB opt_dcons.h -# VFS options -LOOKUP_SHARED opt_vfs.h - # HWPMC options HWPMC_HOOKS ==== //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_auth.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.47 2007/11/26 08:18:19 darrenr Exp $ */ +/* $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.48 2008/10/02 15:37:58 zec Exp $ */ /* * Copyright (C) 1998-2003 by Darren Reed & Guido van Rooij. @@ -70,6 +70,11 @@ #include #include #include +#if !defined(_KERNEL) && defined(__FreeBSD_version) && \ + __FreeBSD_version >= 800049 +# define V_ip_do_randomid ip_do_randomid +# define V_ip_id ip_id +#endif #if !defined(_KERNEL) && !defined(__osf__) && !defined(__sgi) # define KERNEL # define _KERNEL @@ -120,7 +125,7 @@ /* END OF INCLUDES */ #if !defined(lint) -static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.47 2007/11/26 08:18:19 darrenr Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.48 2008/10/02 15:37:58 zec Exp $"; /* static const char rcsid[] = "@(#)$Id: ip_auth.c,v 2.73.2.24 2007/09/09 11:32:04 darrenr Exp $"; */ #endif ==== //depot/projects/vimage/src/sys/contrib/pf/net/pf.c#16 (text+ko) ==== @@ -41,7 +41,7 @@ #include "opt_inet6.h" #include -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.56 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.57 2008/10/02 15:37:58 zec Exp $"); #endif #ifdef __FreeBSD__ ==== //depot/projects/vimage/src/sys/contrib/pf/net/pf_if.c#11 (text+ko) ==== @@ -37,7 +37,7 @@ #include "opt_inet6.h" #include -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_if.c,v 1.16 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_if.c,v 1.17 2008/10/02 15:37:58 zec Exp $"); #endif #include ==== //depot/projects/vimage/src/sys/contrib/pf/net/pf_ioctl.c#18 (text+ko) ==== @@ -40,7 +40,7 @@ #include "opt_inet6.h" #include -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.36 2008/09/27 08:51:18 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.37 2008/10/02 15:37:58 zec Exp $"); #endif #ifdef __FreeBSD__ ==== //depot/projects/vimage/src/sys/contrib/pf/net/pf_subr.c#9 (text+ko) ==== @@ -32,7 +32,7 @@ #include "opt_inet6.h" #include -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_subr.c,v 1.5 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_subr.c,v 1.6 2008/10/02 15:37:58 zec Exp $"); #include #include ==== //depot/projects/vimage/src/sys/contrib/pf/net/pfvar.h#8 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/pfvar.h,v 1.17 2008/03/29 00:24:36 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/pfvar.h,v 1.18 2008/10/02 15:37:58 zec Exp $ */ /* $OpenBSD: pfvar.h,v 1.244 2007/02/23 21:31:51 deraadt Exp $ */ /* ==== //depot/projects/vimage/src/sys/contrib/rdma/rdma_cma.c#5 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/contrib/rdma/rdma_cma.c,v 1.2 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/rdma/rdma_cma.c,v 1.3 2008/10/02 15:37:58 zec Exp $"); #include #include ==== //depot/projects/vimage/src/sys/ddb/db_textdump.c#7 (text+ko) ==== @@ -57,7 +57,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ddb/db_textdump.c,v 1.4 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_textdump.c,v 1.5 2008/10/01 22:08:53 peter Exp $"); #include "opt_config.h" @@ -177,30 +177,6 @@ static struct kerneldumpheader kdh; /* - * Text dumps are prefixed with a normal kernel dump header but with a - * different magic number to allow them to be uniquely identified. - */ -static void -mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, - uint64_t dumplen, uint32_t blksz) -{ - - bzero(kdh, sizeof(*kdh)); - strncpy(kdh->magic, TEXTDUMPMAGIC, sizeof(kdh->magic)); - strncpy(kdh->architecture, MACHINE_ARCH, sizeof(kdh->architecture)); - kdh->version = htod32(KERNELDUMPVERSION); - kdh->architectureversion = htod32(archver); - kdh->dumplength = htod64(dumplen); - kdh->dumptime = htod64(time_second); - kdh->blocksize = htod32(blksz); - strncpy(kdh->hostname, G_hostname, sizeof(kdh->hostname)); - strncpy(kdh->versionstring, version, sizeof(kdh->versionstring)); - if (panicstr != NULL) - strncpy(kdh->panicstring, panicstr, sizeof(kdh->panicstring)); - kdh->parity = kerneldump_parity(kdh); -} - -/* * Calculate and fill in the checksum for a ustar header. */ static void @@ -468,7 +444,7 @@ */ textdump_offset = di->mediasize - sizeof(kdh); textdump_saveoff(&trailer_offset); - mkdumpheader(&kdh, KERNELDUMP_TEXT_VERSION, 0, TEXTDUMP_BLOCKSIZE); + mkdumpheader(&kdh, TEXTDUMPMAGIC, KERNELDUMP_TEXT_VERSION, 0, TEXTDUMP_BLOCKSIZE); (void)textdump_writenextblock(di, (char *)&kdh); /* @@ -493,7 +469,7 @@ * size. */ dumplen = trailer_offset - (textdump_offset + TEXTDUMP_BLOCKSIZE); - mkdumpheader(&kdh, KERNELDUMP_TEXT_VERSION, dumplen, + mkdumpheader(&kdh, TEXTDUMPMAGIC, KERNELDUMP_TEXT_VERSION, dumplen, TEXTDUMP_BLOCKSIZE); (void)textdump_writenextblock(di, (char *)&kdh); textdump_restoreoff(trailer_offset); ==== //depot/projects/vimage/src/sys/dev/agp/agp_i810.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/agp/agp_i810.c,v 1.47 2008/08/01 13:11:23 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/agp/agp_i810.c,v 1.48 2008/10/02 20:29:45 rnoland Exp $"); #include "opt_bus.h" @@ -70,6 +70,7 @@ CHIP_I915, /* 915G/915GM */ CHIP_I965, /* G965 */ CHIP_G33, /* G33/Q33/Q35 */ + CHIP_G4X, /* G45/Q45 */ }; /* The i810 through i855 have the registers at BAR 1, and the GATT gets @@ -133,7 +134,7 @@ {0x25628086, CHIP_I830, 0x00020000, "Intel 82845M (845M GMCH) SVGA controller"}, {0x35828086, CHIP_I855, 0x00020000, - "Intel 82852/5"}, + "Intel 82852/855GM SVGA controller"}, {0x25728086, CHIP_I855, 0x00020000, "Intel 82865G (865G GMCH) SVGA controller"}, {0x25828086, CHIP_I915, 0x00020000, @@ -154,18 +155,26 @@ "Intel G965 SVGA controller"}, {0x29928086, CHIP_I965, 0x00020000, "Intel Q965 SVGA controller"}, - {0x29a28086, CHIP_I965, 0x00020000, + {0x29A28086, CHIP_I965, 0x00020000, "Intel G965 SVGA controller"}, - {0x29b28086, CHIP_G33, 0x00020000, + {0x29B28086, CHIP_G33, 0x00020000, "Intel Q35 SVGA controller"}, - {0x29c28086, CHIP_G33, 0x00020000, + {0x29C28086, CHIP_G33, 0x00020000, "Intel G33 SVGA controller"}, - {0x29d28086, CHIP_G33, 0x00020000, + {0x29D28086, CHIP_G33, 0x00020000, "Intel Q33 SVGA controller"}, - {0x2a028086, CHIP_I965, 0x00020000, + {0x2A028086, CHIP_I965, 0x00020000, "Intel GM965 SVGA controller"}, - {0x2a128086, CHIP_I965, 0x00020000, + {0x2A128086, CHIP_I965, 0x00020000, "Intel GME965 SVGA controller"}, + {0x2A428086, CHIP_I965, 0x00020000, + "Intel GM45 SVGA controller"}, + {0x2E028086, CHIP_G4X, 0x00020000, + "Intel 4 Series SVGA controller"}, + {0x2E128086, CHIP_G4X, 0x00020000, + "Intel Q45 SVGA controller"}, + {0x2E228086, CHIP_G4X, 0x00020000, + "Intel G45 SVGA controller"}, {0, 0, 0, NULL} }; @@ -377,6 +386,7 @@ agp_set_aperture_resource(dev, AGP_I915_GMADR); break; case CHIP_I965: + case CHIP_G4X: sc->sc_res_spec = agp_i965_res_spec; agp_set_aperture_resource(dev, AGP_I915_GMADR); break; @@ -476,7 +486,8 @@ gatt->ag_physical = pgtblctl & ~1; } else if (sc->chiptype == CHIP_I855 || sc->chiptype == CHIP_I915 || - sc->chiptype == CHIP_I965 || sc->chiptype == CHIP_G33) { + sc->chiptype == CHIP_I965 || sc->chiptype == CHIP_G33 || + sc->chiptype == CHIP_G4X) { unsigned int gcc1, pgtblctl, stolen, gtt_size; /* Stolen memory is set up at the beginning of the aperture by @@ -491,7 +502,6 @@ gtt_size = 256; break; case CHIP_I965: - case CHIP_G33: switch (bus_read_4(sc->sc_res[0], AGP_I810_PGTBL_CTL) & AGP_I810_PGTBL_SIZE_MASK) { case AGP_I810_PGTBL_SIZE_128KB: @@ -503,6 +513,15 @@ case AGP_I810_PGTBL_SIZE_512KB: gtt_size = 512; break; + case AGP_I965_PGTBL_SIZE_1MB: + gtt_size = 1024; + break; + case AGP_I965_PGTBL_SIZE_2MB: + gtt_size = 2048; + break; + case AGP_I965_PGTBL_SIZE_1_5MB: + gtt_size = 1024 + 512; + break; default: device_printf(dev, "Bad PGTBL size\n"); bus_release_resources(dev, sc->sc_res_spec, @@ -512,6 +531,27 @@ return EINVAL; } break; + case CHIP_G33: + gcc1 = pci_read_config(sc->bdev, AGP_I855_GCC1, 2); + switch (gcc1 & AGP_G33_MGGC_GGMS_MASK) { + case AGP_G33_MGGC_GGMS_SIZE_1M: + gtt_size = 1024; + break; + case AGP_G33_MGGC_GGMS_SIZE_2M: + gtt_size = 2048; + break; + default: + device_printf(dev, "Bad PGTBL size\n"); + bus_release_resources(dev, sc->sc_res_spec, + sc->sc_res); + free(gatt, M_AGP); + agp_generic_detach(dev); + return EINVAL; + } + break; + case CHIP_G4X: + gtt_size = 0; + break; default: device_printf(dev, "Bad chiptype\n"); bus_release_resources(dev, sc->sc_res_spec, @@ -528,28 +568,86 @@ stolen = 1024; break; case AGP_I855_GCC1_GMS_STOLEN_4M: - stolen = 4096; + stolen = 4 * 1024; break; case AGP_I855_GCC1_GMS_STOLEN_8M: - stolen = 8192; + stolen = 8 * 1024; break; case AGP_I855_GCC1_GMS_STOLEN_16M: - stolen = 16384; + stolen = 16 * 1024; break; case AGP_I855_GCC1_GMS_STOLEN_32M: - stolen = 32768; + stolen = 32 * 1024; break; case AGP_I915_GCC1_GMS_STOLEN_48M: - stolen = 49152; + if (sc->chiptype == CHIP_I915 || + sc->chiptype == CHIP_I965 || + sc->chiptype == CHIP_G33 || + sc->chiptype == CHIP_G4X) { + stolen = 48 * 1024; + } else { + stolen = 0; + } break; case AGP_I915_GCC1_GMS_STOLEN_64M: - stolen = 65536; + if (sc->chiptype == CHIP_I915 || + sc->chiptype == CHIP_I965 || + sc->chiptype == CHIP_G33 || + sc->chiptype == CHIP_G4X) { + stolen = 64 * 1024; + } else { + stolen = 0; + } break; case AGP_G33_GCC1_GMS_STOLEN_128M: - stolen = 128 * 1024; + if (sc->chiptype == CHIP_I965 || + sc->chiptype == CHIP_G33 || + sc->chiptype == CHIP_G4X) { + stolen = 128 * 1024; + } else { + stolen = 0; + } break; case AGP_G33_GCC1_GMS_STOLEN_256M: - stolen = 256 * 1024; + if (sc->chiptype == CHIP_I965 || + sc->chiptype == CHIP_G33 || + sc->chiptype == CHIP_G4X) { + stolen = 256 * 1024; + } else { + stolen = 0; + } + break; + case AGP_G4X_GCC1_GMS_STOLEN_96M: + if (sc->chiptype == CHIP_I965 || + sc->chiptype == CHIP_G4X) { + stolen = 96 * 1024; + } else { + stolen = 0; + } + break; + case AGP_G4X_GCC1_GMS_STOLEN_160M: + if (sc->chiptype == CHIP_I965 || + sc->chiptype == CHIP_G4X) { + stolen = 160 * 1024; + } else { + stolen = 0; + } + break; + case AGP_G4X_GCC1_GMS_STOLEN_224M: + if (sc->chiptype == CHIP_I965 || + sc->chiptype == CHIP_G4X) { + stolen = 224 * 1024; + } else { + stolen = 0; + } + break; + case AGP_G4X_GCC1_GMS_STOLEN_352M: + if (sc->chiptype == CHIP_I965 || + sc->chiptype == CHIP_G4X) { + stolen = 352 * 1024; + } else { + stolen = 0; + } break; default: device_printf(dev, "unknown memory configuration, " @@ -560,7 +658,11 @@ agp_generic_detach(dev); return EINVAL; } - sc->stolen = (stolen - gtt_size - 4) * 1024 / 4096; + + if (sc->chiptype != CHIP_G4X) + gtt_size += 4; + + sc->stolen = (stolen - gtt_size) * 1024 / 4096; if (sc->stolen > 0) device_printf(dev, "detected %dk stolen memory\n", sc->stolen * 4); device_printf(dev, "aperture size is %dM\n", sc->initial_aperture / 1024 / 1024); ==== //depot/projects/vimage/src/sys/dev/agp/agpreg.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/agp/agpreg.h,v 1.19 2007/07/13 16:28:12 anholt Exp $ + * $FreeBSD: src/sys/dev/agp/agpreg.h,v 1.20 2008/10/02 20:29:45 rnoland Exp $ */ #ifndef _PCI_AGPREG_H_ @@ -215,7 +215,7 @@ #define AGP_I855_GCC1_DEV2 0x08 #define AGP_I855_GCC1_DEV2_ENABLED 0x00 #define AGP_I855_GCC1_DEV2_DISABLED 0x08 -#define AGP_I855_GCC1_GMS 0x70 +#define AGP_I855_GCC1_GMS 0xf0 /* Top bit reserved pre-G33 */ #define AGP_I855_GCC1_GMS_STOLEN_0M 0x00 #define AGP_I855_GCC1_GMS_STOLEN_1M 0x10 #define AGP_I855_GCC1_GMS_STOLEN_4M 0x20 @@ -259,14 +259,28 @@ #define AGP_I965_MSAC_GMASIZE_128 0x00 #define AGP_I965_MSAC_GMASIZE_256 0x02 #define AGP_I965_MSAC_GMASIZE_512 0x06 +#define AGP_I965_PGTBL_SIZE_1MB (3 << 1) +#define AGP_I965_PGTBL_SIZE_2MB (4 << 1) +#define AGP_I965_PGTBL_SIZE_1_5MB (5 << 1) /* * G33 registers */ +#define AGP_G33_MGGC_GGMS_MASK (3 << 8) +#define AGP_G33_MGGC_GGMS_SIZE_1M (1 << 8) +#define AGP_G33_MGGC_GGMS_SIZE_2M (2 << 8) #define AGP_G33_GCC1_GMS_STOLEN_128M 0x80 #define AGP_G33_GCC1_GMS_STOLEN_256M 0x90 /* + * G4X registers + */ +#define AGP_G4X_GCC1_GMS_STOLEN_96M 0xa0 +#define AGP_G4X_GCC1_GMS_STOLEN_160M 0xb0 +#define AGP_G4X_GCC1_GMS_STOLEN_224M 0xc0 +#define AGP_G4X_GCC1_GMS_STOLEN_352M 0xd0 + +/* * NVIDIA nForce/nForce2 registers */ #define AGP_NVIDIA_0_APBASE 0x10 ==== //depot/projects/vimage/src/sys/dev/ata/ata-chipset.c#19 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.228 2008/09/26 07:29:48 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.229 2008/10/02 19:18:28 sos Exp $"); #include "opt_ata.h" #include @@ -2124,59 +2124,66 @@ { struct ata_pci_controller *ctlr = device_get_softc(dev); static struct ata_chip_id ids[] = - {{ ATA_I82371FB, 0, 0, 0x00, ATA_WDMA2, "PIIX" }, - { ATA_I82371SB, 0, 0, 0x00, ATA_WDMA2, "PIIX3" }, - { ATA_I82371AB, 0, 0, 0x00, ATA_UDMA2, "PIIX4" }, - { ATA_I82443MX, 0, 0, 0x00, ATA_UDMA2, "PIIX4" }, - { ATA_I82451NX, 0, 0, 0x00, ATA_UDMA2, "PIIX4" }, - { ATA_I82801AB, 0, 0, 0x00, ATA_UDMA2, "ICH0" }, - { ATA_I82801AA, 0, 0, 0x00, ATA_UDMA4, "ICH" }, - { ATA_I82372FB, 0, 0, 0x00, ATA_UDMA4, "ICH" }, - { ATA_I82801BA, 0, 0, 0x00, ATA_UDMA5, "ICH2" }, - { ATA_I82801BA_1, 0, 0, 0x00, ATA_UDMA5, "ICH2" }, - { ATA_I82801CA, 0, 0, 0x00, ATA_UDMA5, "ICH3" }, - { ATA_I82801CA_1, 0, 0, 0x00, ATA_UDMA5, "ICH3" }, - { ATA_I82801DB, 0, 0, 0x00, ATA_UDMA5, "ICH4" }, - { ATA_I82801DB_1, 0, 0, 0x00, ATA_UDMA5, "ICH4" }, - { ATA_I82801EB, 0, 0, 0x00, ATA_UDMA5, "ICH5" }, - { ATA_I82801EB_S1, 0, 0, 0x00, ATA_SA150, "ICH5" }, - { ATA_I82801EB_R1, 0, 0, 0x00, ATA_SA150, "ICH5" }, - { ATA_I6300ESB, 0, 0, 0x00, ATA_UDMA5, "6300ESB" }, - { ATA_I6300ESB_S1, 0, 0, 0x00, ATA_SA150, "6300ESB" }, - { ATA_I6300ESB_R1, 0, 0, 0x00, ATA_SA150, "6300ESB" }, - { ATA_I82801FB, 0, 0, 0x00, ATA_UDMA5, "ICH6" }, - { ATA_I82801FB_S1, 0, AHCI, 0x00, ATA_SA150, "ICH6" }, - { ATA_I82801FB_R1, 0, AHCI, 0x00, ATA_SA150, "ICH6" }, - { ATA_I82801FBM, 0, AHCI, 0x00, ATA_SA150, "ICH6M" }, - { ATA_I82801GB, 0, 0, 0x00, ATA_UDMA5, "ICH7" }, - { ATA_I82801GB_S1, 0, AHCI, 0x00, ATA_SA300, "ICH7" }, - { ATA_I82801GB_R1, 0, AHCI, 0x00, ATA_SA300, "ICH7" }, - { ATA_I82801GB_AH, 0, AHCI, 0x00, ATA_SA300, "ICH7" }, - { ATA_I82801GBM_S1, 0, AHCI, 0x00, ATA_SA300, "ICH7M" }, - { ATA_I82801GBM_R1, 0, AHCI, 0x00, ATA_SA300, "ICH7M" }, - { ATA_I82801GBM_AH, 0, AHCI, 0x00, ATA_SA300, "ICH7M" }, - { ATA_I63XXESB2, 0, 0, 0x00, ATA_UDMA5, "63XXESB2" }, - { ATA_I63XXESB2_S1, 0, AHCI, 0x00, ATA_SA300, "63XXESB2" }, - { ATA_I63XXESB2_S2, 0, AHCI, 0x00, ATA_SA300, "63XXESB2" }, - { ATA_I63XXESB2_R1, 0, AHCI, 0x00, ATA_SA300, "63XXESB2" }, - { ATA_I63XXESB2_R2, 0, AHCI, 0x00, ATA_SA300, "63XXESB2" }, - { ATA_I82801HB_S1, 0, AHCI, 0x00, ATA_SA300, "ICH8" }, - { ATA_I82801HB_S2, 0, AHCI, 0x00, ATA_SA300, "ICH8" }, - { ATA_I82801HB_R1, 2, AHCI, 0x00, ATA_SA300, "ICH9R" }, - { ATA_I82801HB_R1, 0, AHCI, 0x00, ATA_SA300, "ICH8" }, - { ATA_I82801HB_AH4, 0, AHCI, 0x00, ATA_SA300, "ICH8" }, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Oct 3 17:40:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8BCA71065696; Fri, 3 Oct 2008 17:40:33 +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 4E2901065692 for ; Fri, 3 Oct 2008 17:40:33 +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 3B1F08FC12 for ; Fri, 3 Oct 2008 17:40:33 +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 m93HeVYv056786 for ; Fri, 3 Oct 2008 17:40:31 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m93HeTkx056778 for perforce@freebsd.org; Fri, 3 Oct 2008 17:40:29 GMT (envelope-from pgj@FreeBSD.org) Date: Fri, 3 Oct 2008 17:40:29 GMT Message-Id: <200810031740.m93HeTkx056778@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 150872 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, 03 Oct 2008 17:40:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=150872 Change 150872 by pgj@kolbasz on 2008/10/03 17:40:18 Add Hungarian translation of DTrace chapter from Handbook Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/dtrace/chapter.sgml#2 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/dtrace/chapter.sgml#2 (text+ko) ==== @@ -14,258 +14,359 @@ Tom Rhodes - Written by + Írta: DTrace - DTrace, also known as Dynamic Tracing, was developed by - &sun; as a tool for locating performance bottlenecks - in production and pre-production systems. It is not, in any way, - a debugging tool, but a tool for real time system analysis to - locate performance and other issues. + A DTrace, vagy más néven Dynamic Tracing + technológiát a &sun; dolgozta ki szerverek + teljesítményében jelentkezõ szûk + keresztmetszetek felderítésének + megkönnyítésére. Ez nem egy + nyomkövetésre szolgáló megoldást + takar, hanem inkább a rendszer valós idejû + elemzését és + teljesítményének vizsgálatát + elõsegítõ eszközt. - DTrace is a remarkable profiling tool, with an impressive - array of features for diagnosing system issues. It may also be - used to run pre-written scripts to take advantage of its - capabilities. Users may even author their own utilities using - the DTrace D Language, allowing them to customize their profiling - based on specific needs. + A DTrace figyelemre méltó elemzõeszköz, + rengeteg rendkívül hasznos képességgel + rendelkezik a rendszerben felbukkanó problémák + diagnosztizálására. Elõre programozott + szkriptek segítségével pedig ezen + képességek további elõnyeit tudjuk + kihasználni, ugyanis a DTrace programozható egy + ún. D nyelven, amelynek révén a + különbözõ vizsgálatokat könnyen a + saját igényeink szerint tudjuk + alakítani. - Synopsis + Áttekintés DTrace - DTrace support + DTrace támogatás DTrace - After reading this chapter, you will know: + A fejezet elolvasása során + megismerjük: - What DTrace is and what features it provides. + mi is az a DTrace és milyen lehetõségei + vannak; - Differences between the &solaris; DTrace implementation - and the one provided by &os;. + a &solaris; és &os; operációs + rendszereken megtalálható DTrace + implementációk közti + eltéréseket; - How to enable and use DTrace on &os;. + a DTrace &os; alatt hogyan engedélyezhetõ + és használható. - Before reading this chapter, you should: + A fejezet elolvasásához ajánlott: - Understand &unix; and &os; basics - (). + a &unix; és &os; alapvetõ ismerete (); - Be familiar with - the basics of kernel configuration/compilation - (). + a rendszermag konfigurációjának + és fordításának alapvetõ + ismerete (); - Have some familiarity with security and how it - pertains to &os; (). + az operációs rendszerek és azon + belül a &os; biztonsági fogalmainak minimális + ismerete (); - Understand how to obtain and rebuild the &os; sources + a &os; forrásainak megszerzésének + és azok lefordításának ismerete (). - - - This feature is considered experimental. Some options - may be lacking in functionality, other parts may not work - at all. In time, this feature will be considered production - ready and this documentation will be altered to fit that - situation. + + Ez a funkció még folyamatos tesztelés + alatt áll. Bizonyos részei még + egyáltalán nem, vagy csak korlátozottan + érhetõek el. A dokumentáció annak + megfelelõen fog majd változni, hogy ezek az elemek + fokozatosan elérik az éles + felhasználáshoz szükséges + szintet. - Implementation Differences + Eltérések az + implementációban - While the DTrace in &os; is very similar to that found - in &solaris;, differences exist that should be explained before - continuing. The primary difference users will notice is that - on &os;, DTrace needs to be specifically enabled. There are - kernel options and modules which must be enabled for DTrace to - work properly. These will be explained later. + Noha a &os; alatt megtalálható DTrace + implementáció nagyon hasonló az eredeti, + &solaris; alatt futó változathoz, tartalmaz bizonyos + különbségeket, amelyeket a + továbblépés elõtt mindenképpen + érdemes megemlítenünk. Az egyik legfontosabb + ilyen szembetûnõ különbség, hogy a &os; + esetén a DTrace használatát külön + engedélyezni kell. A DTrace megfelelõ + mûködéséhez tehát a rendszermag + konfigurációs állományában meg + kell adnunk bizonyos beállításokat és + modulokat kell betöltenünk. Ezekrõl hamarosan + szó lesz. - There is a DDB_CTF kernel option which - is used to enable support for loading the CTF - data from kernel modules and the kernel itself. - CTF is the &solaris; Compressed C Type format - which encapsulates a reduced form of debugging information - similar to DWARF and the venerable stabs. - This CTF data is added to the binaries by the - ctfconvert and ctfmerge - build tools. The ctfconvert utility parses - DWARF debug ELF sections - created by the compiler and ctfmerge merges - CTF ELF sections from - objects into either executables or shared libraries. More on - how to enable this for the kernel and &os; build is - forthcoming. + A rendszermag konfigurációs + állományában a DDB_CTF + opció segítségével tudjuk + engedélyezni ún. CTF adatok + betöltését mind a rendszermag + moduljaiból, mind pedig magából a + rendszermagból egyaránt. A CTF a + &solaris; Compressed Type Format + elnevezésû formátumára utal, amellyel + például a DWARF + megoldásához hasonló módon + tárolhatunk tömörített alakban + különbözõ típusú + nyomkövetési információkat. Ilyen + CTF adatok többek közt a + ctfconvert és a + ctfmerge használatával + rendelhetõek hozzá bináris + állományokhoz. A ctfconvert + segédprogram a fordítóprogram által az + ELF állományokban szereplõ + DWARF típusú szakaszokban + tárolt információkat képes beolvasni, + és a ctfmerge a + tárgykódban található + CTF típusú ELF + szakaszokat tudja végrehajtható + állományokká vagy osztott + könyvtárakka összefûzni. Röviden + beszélni fogunk arról, hogyan lehet mindezeket a + &os; alaprendszerébe és rendszermagjába is + beépíteni. - Some different providers exist for &os; than for &solaris;. - Most notable is the dtmalloc provider, which - allows tracing malloc() by type in the - &os; kernel. + &os; és &solaris; esetén elõfordulhat, hogy + más fajta providerek állnak + rendelkezésünkre. Ezek közül talán a + legfontosabb a dtmalloc, amely a &os; + rendszermagjában típus szerint teszi + lehetõvé a malloc() + függvény követését. - Only root may use DTrace on &os;. - This is related to security differences, &solaris; has a few - low level security checks which do not yet exist in &os;. As - such, the /dev/dtrace/dtrace is strictly - limited to root users only. + &os; alatt kizárólag csak a + root tudja használni a DTrace-t. Ennek + oka a két operációs rendszer + biztonsági megoldásai közti + különbségekben keresendõ, mivel a &solaris; + esetén létezik néhány olyan + alacsonyszintû ellenõrzés, amely a + &os;-nél még nincs. Ezért + például a /dev/dtrace/dtrace + eszköz szigorúan csak a root + számára érhetõ el. - Finally, the DTrace software falls under &sun;'s - CDDL license. The Common Development - and Distribution License comes with &os;, see the + Végezetül megemlítjük, hogy a DTrace + felhasználására a &sun; CDDL + licence vonatkozik. A Common Development and + Distribution License &os; a /usr/src/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE - or view it online at - - http://www.opensolaris.org/os/licensing. + állományban található, vagy interneten + keresztül a + címen. - This license means that a &os; kernel with the DTrace options - is still BSD licensed; however the - CDDL kicks in when the modules are distributed - in binary form, or the binaries are loaded. + Ezen licenc értelmében a DTrace + támogatással készített &os; + rendszermagok továbbra is BSD + licencûek maradnak, azonban a rendszerrel terjesztett + binárisok futtatásakor vagy a modulok + betöltésekor már a CDDL + érvényesül. - Enabling DTrace Support + A DTrace támogatásának + engedélyezése - To enable support for DTrace, add the following lines to - the kernel configuration file: + A DTrace által felkínált + lehetõségeket a következõ sorok + hozzáadásával tudjuk engedélyezni a + rendszermag konfigurációs + állományában: options KDTRACE_HOOKS options DDB_CTF - Users of the AMD64 architecture will want to add the - following line to their kernel configuration file: + AMD64 architektúrán ezeken kívül + még az alábbi sor is kelleni fog: options KDTRACE_FRAME - This option provides support for the FBT - feature. DTrace will work without this option; however, there - will be limited support for function boundary tracing. + Ezzel a beállítással az + FBT (function boundary tracing) + részére nyújtunk támogatást. + A DTrace ugyan enélkül is képes lesz + mûködni, de akkor csak korlátozott + mértékben tudunk ilyen típusú + vizsgálatokat végezni. - All sources must be rebuilt and installed with CTF options. - To accomplish this task, rebuild the &os; sources using: + Az egész rendszert újra kell fordítanunk + a CTF használatával. Ennek + elvégzéséhez a következõ + parancsokat kell kiadnunk: &prompt.root; cd /usr/src - &prompt.root; make WITH_CTF=1 buildworld - &prompt.root; make WITH_CFT=1 kernel - &prompt.root; make WITH_CFT=1 installworld - &prompt.root; mergemaster -Ui +&prompt.root; make WITH_CTF=1 buildworld +&prompt.root; make WITH_CFT=1 kernel +&prompt.root; make WITH_CFT=1 installworld +&prompt.root; mergemaster -Ui - The system will need to be restarted. + A fordítás befejezõdése után + indítsuk újra a rendszerünket. - After rebooting and allowing the new kernel to be loaded - into memory, support for the Korn shell should be added. This - is needed as the DTrace toolkit has several utilities written - in ksh. Install the - shells/ksh93. It is also - possible to run these tools under - shells/pdksh or - shells/mksh. + A rendszer újraindulása és az új + rendszermag betöltõdése után + szükségünk lesz egy Korn-féle + parancsértelmezõre is, mivel a DTrace + eszköztárában rengeteg, a + ksh programra épülõ + eszközt fogunk találni. Ezért tehát + telepítsük a shells/ksh93 csomagot, de + megjegyezzük, hogy ugyanezen eszközök + számára a shells/pdksh vagy shells/mksh csomagok is + megfelelnek. - Finally, obtain the current DTrace toolkit. The current - version is available at - - http://www.opensolaris.org/os/community/dtrace/dtracetoolkit/. - There is an install mechanism included; however, installation - is not required to make use of the bundled utilities. + Végül töltsük le a DTrace + eszköztárának legfrissebb + változatát. Az aktuális verzió a + címen érhetõ el. Képes + önmagát telepíteni, de a benne + található eszközök + használatához nem kötelezõ ezt + elvégezni. - Using DTrace + A DTrace használata - Before making use of DTrace functionality, the DTrace device - must exist. To load the device, issue the following - command: + A DTrace funkcióinak alkalmazásához + léteznie kell egy DTrace eszköznek. Ennek + létrehozásához be kell töltenünk a + megfelelõ modult: &prompt.root; kldload dtraceall - DTrace support should now be available. To view all probes - the administrator may now execute the following command: + Innentõl már mûködésre + kész a DTrace. Rendszeradminisztrátorként a + következõ módon kérdezhetjük le a + rendelkezésre álló + vizsgálatokat: &prompt.root; dtrace -l | more - All output is passed to the more - utility as it will quickly overflow the screen buffer. At - this point, DTrace should be considered working. It is now - time to review the toolkit. + Mivel lekérdezés eredménye pillanatok + alatt betöltené az egész képernyõt, + ezért az egészet még + átirányítjuk a more + parancshoz. Ha ez rendesen lefut, akkor a DTrace + ténylegesen használhatónak tekinthetõ. + Ezt követõen tekintsük át a + hozzátartozó eszközkészletet. - The toolkit is a collection of ready-made scripts to run - with DTrace to collect system information. There are scripts - to check open files, memory, CPU usage and - a lot more. Extract the scripts with the following - command: + Ez a mellékelt eszközkészlet + lényegében a rendszerrel kapcsolatos + információk összegyûjtésére + alkalmas szkripteket tartalmaz. Vannak szkriptek, amelyekkel a + megnyitott állományokat, a memóriát, a + processzorhasználatot és még sok minden + mást kérdezhetünk le. A szkriptek a + következõ parancs segítségével + tömöríthetõek ki: &prompt.root; gunzip -c DTraceToolkit* | tar xvf - - Change into that directory with the cd - and change the execution permissions on all files, designated - as those files with lower case names, to - 755. + A cd parancs + segítségével lépjünk be az + így keletkezõ könyvtárba, és a + kisbetûs névvel rendelkezõ + állományok engedélyeit állítsuk + be a 755 módra. - All of these scripts will need modifications to their - contents. The ones which refer to - /usr/bin/ksh need that changed to - /usr/local/bin/ksh, the others which - use /usr/bin/sh need to be altered to use - /bin/sh, and finally the ones which - use /usr/bin/perl will need altered to - use /usr/local/bin/perl. + Mindegyik szkriptben el kell végeznünk némi + módosítást: a /usr/bin/ksh + hivatkozásokat írjuk át mindenhol a + /usr/local/bin/ksh névre, illetve a + /usr/bin/sh hivatkozásokat + /bin/sh névre, majd + végezetül pedig a /usr/bin/perl + hivatkozásokat a /usr/local/bin/perl + névre. - At this point it is prudent to remind the reader that - DTrace support in &os; is incomplete - and experimental. Many of these scripts - will not work as they are either too &solaris;-specific or - use probes which are unsupported at this time. + Itt még egyszer kiemelnénk, hogy a &os;-ben + jelenleg megtalálható DTrace támogatás + még nem teljes és + kísérleti jelleggel szerepel. + Ezért bizonyos szkriptek nem fognak mûködni, + vagy azért, mert túlságosan &solaris; + lehetõségeihez igazodnak, vagy pedig azért, + mert a jelenlegi implementáció által + még nem ismert vizsgálatokra + támaszkodnak. - At the time of this writing only two of the scripts of the - DTrace Toolkit are fully supported in &os;: - the hotkernel - and procsystime scripts. These are the two - we will explore in the following parts of this section. + Jelenlegi ismereteink szerint a &os; egyelõre csak + két szkriptet támogat teljes mértékben, + ezek a hotkernel és a + procsystime. A szakasz további + részében ezzel a kettõvel fogunk + részletesebben foglalkozni. - The hotkernel is designed to identify - which function is using the most kernel time. Run normally, it - will produce output similar to the following: + A hotkernel feladata segíteni + beazonosítani azokat a függvényeket, amelyek a + legtöbb idõt veszik igénybe a rendszermagon + belül. A szkript futtatásakor nagyjából + a következõt csinálja: &prompt.root; ./hotkernel -localhost# ./hotkernel Sampling... Hit Ctrl-C to end. - The system administrator must use the - CtrlC - key combination to stop the process. Upon - termination, the script will display a list of kernel functions and - timing information, sorting the output in increasing order of - time: + A folyamat CtrlC + billentyûkombináció hatására + állítható meg. A szkript + futásának befejezõdésekor + különbözõ rendszermagbeli + függvények és a hozzájuk tartozó + idõk jelennek meg, az utóbbi szerint növekvõ + sorrendben: kernel`_thread_lock_flags 2 0.0% 0xc1097063 2 0.0% @@ -294,16 +395,11 @@ kernel`sched_idletd 137 0.3% 0xc10981a5 42139 99.3% - + Ez a szkript modulok esetén is alkalmazható. + Ezt a módját a kapcsoló + megadásával aktiválhatjuk: - This script will also work with kernel modules. To use this - feature, run the script with the flag: - - &prompt.root; ./hotkernel -m - - localhost# ./hotkernel -m + &prompt.root; ./hotkernel -m Sampling... Hit Ctrl-C to end. ^C MODULE COUNT PCNT @@ -320,19 +416,19 @@ kernel 874 0.4% 0xc10981a5 213781 99.6% - + A procsystime szkript egy adott + azonosítóval vagy névvel rendelkezõ + programhoz tudja megadni az általa kezdeményezett + rendszerhívások által felhasznált + idõt. A most következõ példában + elindítjuk a /bin/csh egy újabb + példányát. A + procsystime elindul, majd megvárja, + amíg kiadunk néhány parancsot a + csh frissen indított + másolatában. A teszt eredményei tehát + a következõk lesznek: - The procsystime script captures and - prints the system call time usage for a given - PID or process name. In the following - example, a new instance of /bin/csh - was spawned. The procsystime was executed - and remained waiting while a few commands were typed on the - other incarnation of csh. These are the - results of this test: - &prompt.root; ./procsystime -n csh Tracing... Hit Ctrl-C to end... ^C @@ -359,24 +455,25 @@ sigsuspend 6985124 read 3988049784 - As shown, the read system call seems to use the - most time in nanoseconds with the getpid() - system call used the least amount of time. + Jól megfigyelhetõ, hogy (nanomásodpercekben + mérve) a legtöbb idõt a + read(), a legkevesebb idõt pedig a + getpid() rendszerhívás vette + igénybe. - The D Language + A D nyelv - The DTrace Toolkit includes many scripts in the special language of - DTrace. This language is called the D language by &sun; - documentation, and it is very similar to C++. An in depth - discussion of the language is beyond the scope of this document. It is - extensively discussed - at . + A DTrace eszköztárában + megtalálható számos szkript a DTrace + saját programozási nyelvén + íródott. Ezt a nyelvet nevezik a &sun; + implementációjában a D + nyelvnek. Ennek ismertetésére itt most + külön nem térünk ki, azonban a + címen igen részletesen olvashatunk + róla. - - From owner-p4-projects@FreeBSD.ORG Fri Oct 3 21:18:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3355110656B6; Fri, 3 Oct 2008 21:18:58 +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 EB73C10656A5 for ; Fri, 3 Oct 2008 21:18:57 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DA3A58FC16 for ; Fri, 3 Oct 2008 21:18:57 +0000 (UTC) (envelope-from sam@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 m93LIvh0090019 for ; Fri, 3 Oct 2008 21:18:57 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m93LIvNi090017 for perforce@freebsd.org; Fri, 3 Oct 2008 21:18:57 GMT (envelope-from sam@freebsd.org) Date: Fri, 3 Oct 2008 21:18:57 GMT Message-Id: <200810032118.m93LIvNi090017@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 150896 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, 03 Oct 2008 21:18:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=150896 Change 150896 by sam@sam_ebb on 2008/10/03 21:18:56 expand the ie blob before calling match_bss so it can potentially use the enumerated ie's Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_scan_sta.c#26 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_scan_sta.c#26 (text+ko) ==== @@ -107,16 +107,16 @@ * contents explains why. The following flags are or'd to to this * mask and can be used to figure out why the entry was rejected. */ -#define MATCH_CHANNEL 0x001 /* channel mismatch */ -#define MATCH_CAPINFO 0x002 /* capabilities mismatch, e.g. no ess */ -#define MATCH_PRIVACY 0x004 /* privacy mismatch */ -#define MATCH_RATE 0x008 /* rate set mismatch */ -#define MATCH_SSID 0x010 /* ssid mismatch */ -#define MATCH_BSSID 0x020 /* bssid mismatch */ -#define MATCH_FAILS 0x040 /* too many failed auth attempts */ -#define MATCH_NOTSEEN 0x080 /* not seen in recent scans */ -#define MATCH_RSSI 0x100 /* rssi deemed too low to use */ -#define MATCH_CC 0x200 /* country code mismatch */ +#define MATCH_CHANNEL 0x0001 /* channel mismatch */ +#define MATCH_CAPINFO 0x0002 /* capabilities mismatch, e.g. no ess */ +#define MATCH_PRIVACY 0x0004 /* privacy mismatch */ +#define MATCH_RATE 0x0008 /* rate set mismatch */ +#define MATCH_SSID 0x0010 /* ssid mismatch */ +#define MATCH_BSSID 0x0020 /* bssid mismatch */ +#define MATCH_FAILS 0x0040 /* too many failed auth attempts */ +#define MATCH_NOTSEEN 0x0080 /* not seen in recent scans */ +#define MATCH_RSSI 0x0100 /* rssi deemed too low to use */ +#define MATCH_CC 0x0200 /* country code mismatch */ static int match_bss(struct ieee80211vap *, const struct ieee80211_scan_state *, struct sta_entry *, int); static void adhoc_age(struct ieee80211_scan_state *); @@ -992,8 +992,8 @@ "macaddr bssid chan rssi rate flag wep essid"); mtx_lock(&st->st_lock); TAILQ_FOREACH(se, &st->st_entry, se_list) { + ieee80211_ies_expand(&se->base.se_ies); if (match_bss(vap, ss, se, debug) == 0) { - ieee80211_ies_expand(&se->base.se_ies); if (selbs == NULL) selbs = se; else if (sta_compare(se, selbs) > 0) From owner-p4-projects@FreeBSD.ORG Fri Oct 3 21:21:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 22D18106568E; Fri, 3 Oct 2008 21:21:04 +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 DA9DE1065686 for ; Fri, 3 Oct 2008 21:21:03 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C95498FC17 for ; Fri, 3 Oct 2008 21:21:03 +0000 (UTC) (envelope-from sam@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 m93LL3JV090245 for ; Fri, 3 Oct 2008 21:21:03 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m93LL335090243 for perforce@freebsd.org; Fri, 3 Oct 2008 21:21:03 GMT (envelope-from sam@freebsd.org) Date: Fri, 3 Oct 2008 21:21:03 GMT Message-Id: <200810032121.m93LL335090243@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 150897 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, 03 Oct 2008 21:21:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=150897 Change 150897 by sam@sam_ebb on 2008/10/03 21:20:04 improve debug support for station inactivity processing Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_node.c#48 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_node.c#48 (text+ko) ==== @@ -135,6 +135,11 @@ vap->iv_inact_auth = IEEE80211_INACT_AUTH; vap->iv_inact_run = IEEE80211_INACT_RUN; vap->iv_inact_probe = IEEE80211_INACT_PROBE; + + IEEE80211_DPRINTF(vap, IEEE80211_MSG_INACT, + "%s: init %u auth %u run %u probe %u\n", __func__, + vap->iv_inact_init, vap->iv_inact_auth, + vap->iv_inact_run, vap->iv_inact_probe); } void @@ -187,18 +192,29 @@ void ieee80211_node_authorize(struct ieee80211_node *ni) { + struct ieee80211vap *vap = ni->ni_vap; + ni->ni_flags |= IEEE80211_NODE_AUTH; - ni->ni_inact_reload = ni->ni_vap->iv_inact_run; + ni->ni_inact_reload = vap->iv_inact_run; ni->ni_inact = ni->ni_inact_reload; + + IEEE80211_NOTE(vap, IEEE80211_MSG_INACT, ni, + "%s: inact_reload %u", __func__, ni->ni_inact_reload); } void ieee80211_node_unauthorize(struct ieee80211_node *ni) { + struct ieee80211vap *vap = ni->ni_vap; + ni->ni_flags &= ~IEEE80211_NODE_AUTH; - ni->ni_inact_reload = ni->ni_vap->iv_inact_auth; + ni->ni_inact_reload = vap->iv_inact_auth; if (ni->ni_inact > ni->ni_inact_reload) ni->ni_inact = ni->ni_inact_reload; + + IEEE80211_NOTE(vap, IEEE80211_MSG_INACT, ni, + "%s: inact_reload %u inact %u", __func__, + ni->ni_inact_reload, ni->ni_inact); } /* @@ -1022,6 +1038,9 @@ ni->ni_ic = ic; IEEE80211_NODE_UNLOCK(nt); + IEEE80211_NOTE(vap, IEEE80211_MSG_INACT, ni, + "%s: inact_reload %u", __func__, ni->ni_inact_reload); + return ni; } @@ -1902,8 +1921,13 @@ m_freem(ni->ni_rxfrag[0]); ni->ni_rxfrag[0] = NULL; } - if (ni->ni_inact > 0) + if (ni->ni_inact > 0) { ni->ni_inact--; + IEEE80211_NOTE(vap, IEEE80211_MSG_INACT, ni, + "%s: inact %u inact_reload %u nrates %u", + __func__, ni->ni_inact, ni->ni_inact_reload, + ni->ni_rates.rs_nrates); + } /* * Special case ourself; we may be idle for extended periods * of time and regardless reclaiming our state is wrong. @@ -2118,8 +2142,8 @@ ether_sprintf(ni->ni_bssid), ni->ni_esslen, ni->ni_essid, ni->ni_chan->ic_freq, ni->ni_chan->ic_flags); - printf("\tinact %u txrate %u\n", - ni->ni_inact, ni->ni_txrate); + printf("\tinact %u inact_reload %u txrate %u\n", + ni->ni_inact, ni->ni_inact_reload, ni->ni_txrate); printf("\thtcap %x htparam %x htctlchan %u ht2ndchan %u\n", ni->ni_htcap, ni->ni_htparam, ni->ni_htctlchan, ni->ni_ht2ndchan); From owner-p4-projects@FreeBSD.ORG Fri Oct 3 21:21:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1AC99106571E; Fri, 3 Oct 2008 21:21:04 +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 1FE68106568C for ; Fri, 3 Oct 2008 21:21:04 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E9CBB8FC26 for ; Fri, 3 Oct 2008 21:21:03 +0000 (UTC) (envelope-from sam@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 m93LL3ci090250 for ; Fri, 3 Oct 2008 21:21:03 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m93LL3ZB090248 for perforce@freebsd.org; Fri, 3 Oct 2008 21:21:03 GMT (envelope-from sam@freebsd.org) Date: Fri, 3 Oct 2008 21:21:03 GMT Message-Id: <200810032121.m93LL3ZB090248@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 150898 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, 03 Oct 2008 21:21:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=150898 Change 150898 by sam@sam_ebb on 2008/10/03 21:20:51 add IEEE80211_ELEMID_PWRCNSTR to the set of ie's explicitly ignored so it doesn't get flagged as an unknown ie in wlanstats Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_input.c#33 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_input.c#33 (text+ko) ==== @@ -603,6 +603,7 @@ break; case IEEE80211_ELEMID_IBSSPARMS: case IEEE80211_ELEMID_CFPARMS: + case IEEE80211_ELEMID_PWRCNSTR: /* NB: avoid debugging complaints */ break; case IEEE80211_ELEMID_XRATES: From owner-p4-projects@FreeBSD.ORG Fri Oct 3 21:22:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F465106568F; Fri, 3 Oct 2008 21:22:05 +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 2FD1A1065689 for ; Fri, 3 Oct 2008 21:22:05 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1EC2E8FC15 for ; Fri, 3 Oct 2008 21:22:05 +0000 (UTC) (envelope-from sam@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 m93LM5h0090327 for ; Fri, 3 Oct 2008 21:22:05 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m93LM4cf090325 for perforce@freebsd.org; Fri, 3 Oct 2008 21:22:04 GMT (envelope-from sam@freebsd.org) Date: Fri, 3 Oct 2008 21:22:04 GMT Message-Id: <200810032122.m93LM4cf090325@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 150899 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, 03 Oct 2008 21:22:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=150899 Change 150899 by sam@sam_ebb on 2008/10/03 21:21:28 honor IEEE80211_CLONE_NOBEACONS for any vap, not just sta vaps Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211.c#51 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211.c#51 (text+ko) ==== @@ -350,11 +350,6 @@ vap->iv_opmode = opmode; vap->iv_caps |= ieee80211_opcap[opmode]; switch (opmode) { - case IEEE80211_M_STA: - /* auto-enable s/w beacon miss support */ - if (flags & IEEE80211_CLONE_NOBEACONS) - vap->iv_flags_ext |= IEEE80211_FEXT_SWBMISS; - break; case IEEE80211_M_WDS: /* * WDS links must specify the bssid of the far end. @@ -370,6 +365,9 @@ vap->iv_flags_ext |= IEEE80211_FEXT_WDSLEGACY; break; } + /* auto-enable s/w beacon miss support */ + if (flags & IEEE80211_CLONE_NOBEACONS) + vap->iv_flags_ext |= IEEE80211_FEXT_SWBMISS; /* * Enable various functionality by default if we're * capable; the driver can override us if it knows better. From owner-p4-projects@FreeBSD.ORG Fri Oct 3 21:24:07 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B34E71065688; Fri, 3 Oct 2008 21:24: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 5EC231065686 for ; Fri, 3 Oct 2008 21:24:07 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4D8A58FC17 for ; Fri, 3 Oct 2008 21:24:07 +0000 (UTC) (envelope-from sam@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 m93LO7w8090452 for ; Fri, 3 Oct 2008 21:24:07 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m93LO77b090450 for perforce@freebsd.org; Fri, 3 Oct 2008 21:24:07 GMT (envelope-from sam@freebsd.org) Date: Fri, 3 Oct 2008 21:24:07 GMT Message-Id: <200810032124.m93LO77b090450@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 150900 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, 03 Oct 2008 21:24:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=150900 Change 150900 by sam@sam_ebb on 2008/10/03 21:23:19 o add ahdemo vap mgt frame handler instead of using inline code so it's possible to override o add debug msgs for frame discard cases Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_adhoc.c#16 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_adhoc.c#16 (text+ko) ==== @@ -66,6 +66,8 @@ int rssi, int noise, uint32_t rstamp); static void adhoc_recv_mgmt(struct ieee80211_node *, struct mbuf *, int subtype, int rssi, int noise, uint32_t rstamp); +static void ahdemo_recv_mgmt(struct ieee80211_node *, struct mbuf *, + int subtype, int rssi, int noise, uint32_t rstamp); void ieee80211_adhoc_attach(struct ieee80211com *ic) @@ -89,7 +91,10 @@ { vap->iv_newstate = adhoc_newstate; vap->iv_input = adhoc_input; - vap->iv_recv_mgmt = adhoc_recv_mgmt; + if (vap->iv_opmode == IEEE80211_M_IBSS) + vap->iv_recv_mgmt = adhoc_recv_mgmt; + else + vap->iv_recv_mgmt = ahdemo_recv_mgmt; vap->iv_opdetach = adhoc_vdetach; } @@ -609,9 +614,7 @@ } if (bpf_peers_present(vap->iv_rawbpf)) bpf_mtap(vap->iv_rawbpf, m); - /* NB: only IBSS mode gets mgt frames */ - if (vap->iv_opmode == IEEE80211_M_IBSS) - vap->iv_recv_mgmt(ni, m, subtype, rssi, noise, rstamp); + vap->iv_recv_mgmt(ni, m, subtype, rssi, noise, rstamp); m_freem(m); return IEEE80211_FC0_TYPE_MGT; @@ -735,11 +738,16 @@ case IEEE80211_FC0_SUBTYPE_PROBE_REQ: if (vap->iv_state != IEEE80211_S_RUN) { + IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, + wh, NULL, "wrong state %s", + ieee80211_state_name[vap->iv_state]); vap->iv_stats.is_rx_mgtdiscard++; return; } if (IEEE80211_IS_MULTICAST(wh->i_addr2)) { /* frame must be directed */ + IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, + wh, NULL, "%s", "not unicast"); vap->iv_stats.is_rx_mgtdiscard++; /* XXX stat */ return; } @@ -798,6 +806,9 @@ const struct ieee80211_action *ia; if (vap->iv_state != IEEE80211_S_RUN) { + IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, + wh, NULL, "wrong state %s", + ieee80211_state_name[vap->iv_state]); vap->iv_stats.is_rx_mgtdiscard++; return; } @@ -857,6 +868,8 @@ case IEEE80211_FC0_SUBTYPE_REASSOC_RESP: case IEEE80211_FC0_SUBTYPE_DEAUTH: case IEEE80211_FC0_SUBTYPE_DISASSOC: + IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, + wh, NULL, "%s", "not handled"); vap->iv_stats.is_rx_mgtdiscard++; return; @@ -869,3 +882,20 @@ } #undef IEEE80211_VERIFY_LENGTH #undef IEEE80211_VERIFY_ELEMENT + +static void +ahdemo_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m0, + int subtype, int rssi, int noise, uint32_t rstamp) +{ + struct ieee80211vap *vap = ni->ni_vap; + struct ieee80211com *ic = ni->ni_ic; + + /* + * Process management frames when scanning; useful for doing + * a site-survey. + */ + if (ic->ic_flags & IEEE80211_F_SCAN) + adhoc_recv_mgmt(ni, m0, subtype, rssi, noise, rstamp); + else + vap->iv_stats.is_rx_mgtdiscard++; +} From owner-p4-projects@FreeBSD.ORG Fri Oct 3 21:26:10 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E42AD1065687; Fri, 3 Oct 2008 21:26:09 +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 9000A106568B for ; Fri, 3 Oct 2008 21:26:09 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7E4598FC08 for ; Fri, 3 Oct 2008 21:26:09 +0000 (UTC) (envelope-from sam@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 m93LQ9tc090640 for ; Fri, 3 Oct 2008 21:26:09 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m93LQ9fD090638 for perforce@freebsd.org; Fri, 3 Oct 2008 21:26:09 GMT (envelope-from sam@freebsd.org) Date: Fri, 3 Oct 2008 21:26:09 GMT Message-Id: <200810032126.m93LQ9fD090638@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 150901 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, 03 Oct 2008 21:26:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=150901 Change 150901 by sam@sam_ebb on 2008/10/03 21:25:09 make ieee80211_send_nulldata send a QoS null data frame when a station is setup w/ QoS; the spec says we should not be sending non-QoS frames Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_output.c#61 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_output.c#61 (text+ko) ==== @@ -406,15 +406,14 @@ /* * Set the direction field and address fields of an outgoing - * non-QoS frame. Note this should be called early on in - * constructing a frame as it sets i_fc[1]; other bits can - * then be or'd in. + * frame. Note this should be called early on in constructing + * a frame as it sets i_fc[1]; other bits can then be or'd in. */ static void ieee80211_send_setup( struct ieee80211_node *ni, struct ieee80211_frame *wh, - int type, + int type, int tid, const uint8_t sa[IEEE80211_ADDR_LEN], const uint8_t da[IEEE80211_ADDR_LEN], const uint8_t bssid[IEEE80211_ADDR_LEN]) @@ -462,11 +461,9 @@ IEEE80211_ADDR_COPY(wh->i_addr3, bssid); } *(uint16_t *)&wh->i_dur[0] = 0; - /* XXX probe response use per-vap seq#? */ - /* NB: use non-QoS tid */ *(uint16_t *)&wh->i_seq[0] = - htole16(ni->ni_txseqs[IEEE80211_NONQOS_TID] << IEEE80211_SEQ_SEQ_SHIFT); - ni->ni_txseqs[IEEE80211_NONQOS_TID]++; + htole16(ni->ni_txseqs[tid] << IEEE80211_SEQ_SEQ_SHIFT); + ni->ni_txseqs[tid]++; #undef WH4 } @@ -507,9 +504,9 @@ } wh = mtod(m, struct ieee80211_frame *); - ieee80211_send_setup(ni, wh, - IEEE80211_FC0_TYPE_MGT | type, - vap->iv_myaddr, ni->ni_macaddr, ni->ni_bssid); + ieee80211_send_setup(ni, wh, + IEEE80211_FC0_TYPE_MGT | type, IEEE80211_NONQOS_TID, + vap->iv_myaddr, ni->ni_macaddr, ni->ni_bssid); if (params->ibp_flags & IEEE80211_BPF_CRYPTO) { IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_AUTH, wh->i_addr1, "encrypting frame (%s)", __func__); @@ -538,7 +535,9 @@ } /* - * Send a null data frame to the specified node. + * Send a null data frame to the specified node. If the station + * is setup for QoS then a QoS Null Data frame is constructed. + * If this is a WDS station then a 4-address frame is constructed. * * NB: the caller is assumed to have setup a node reference * for use; this is necessary to deal with a race condition @@ -565,10 +564,16 @@ return EIO; /* XXX */ } - if (vap->iv_opmode == IEEE80211_M_WDS) - hdrlen = sizeof(struct ieee80211_frame_addr4); + if (ni->ni_flags & (IEEE80211_NODE_QOS|IEEE80211_NODE_HT)) + hdrlen = sizeof(struct ieee80211_qosframe); else hdrlen = sizeof(struct ieee80211_frame); + /* NB: only WDS vap's get 4-address frames */ + if (vap->iv_opmode == IEEE80211_M_WDS) + hdrlen += IEEE80211_ADDR_LEN; + if (ic->ic_flags & IEEE80211_F_DATAPAD) + hdrlen = roundup(hdrlen, sizeof(uint32_t)); + m = ieee80211_getmgtframe(&frm, ic->ic_headroom + hdrlen, 0); if (m == NULL) { /* XXX debug msg */ @@ -586,9 +591,28 @@ } wh = mtod(m, struct ieee80211_frame *); /* NB: a little lie */ - ieee80211_send_setup(ni, wh, - IEEE80211_FC0_TYPE_DATA | IEEE80211_FC0_SUBTYPE_NODATA, - vap->iv_myaddr, ni->ni_macaddr, ni->ni_bssid); + if (ni->ni_flags & IEEE80211_NODE_QOS) { + const int tid = WME_AC_TO_TID(WME_AC_BE); + uint8_t *qos; + + ieee80211_send_setup(ni, wh, + IEEE80211_FC0_TYPE_DATA | IEEE80211_FC0_SUBTYPE_QOS_NULL, + tid, vap->iv_myaddr, ni->ni_macaddr, ni->ni_bssid); + + if (vap->iv_opmode == IEEE80211_M_WDS) + qos = ((struct ieee80211_qosframe_addr4 *) wh)->i_qos; + else + qos = ((struct ieee80211_qosframe *) wh)->i_qos; + qos[0] = tid & IEEE80211_QOS_TID; + if (ic->ic_wme.wme_wmeChanParams.cap_wmeParams[WME_AC_BE].wmep_noackPolicy) + qos[0] |= IEEE80211_QOS_ACKPOLICY_NOACK; + qos[1] = 0; + } else { + ieee80211_send_setup(ni, wh, + IEEE80211_FC0_TYPE_DATA | IEEE80211_FC0_SUBTYPE_NODATA, + IEEE80211_NONQOS_TID, + vap->iv_myaddr, ni->ni_macaddr, ni->ni_bssid); + } if (vap->iv_opmode != IEEE80211_M_WDS) { /* NB: power management bit is never sent by an AP */ if ((ni->ni_flags & IEEE80211_NODE_PWR_MGT) && @@ -603,7 +627,8 @@ IEEE80211_NODE_STAT(ni, tx_data); IEEE80211_NOTE(vap, IEEE80211_MSG_DEBUG | IEEE80211_MSG_DUMPPKTS, ni, - "send null data frame on channel %u, pwr mgt %s", + "send %snull data frame on channel %u, pwr mgt %s", + ni->ni_flags & IEEE80211_NODE_QOS ? "QoS " : "", ieee80211_chan2ieee(ic, ic->ic_curchan), wh->i_fc[1] & IEEE80211_FC1_PWR_MGT ? "ena" : "dis"); @@ -1751,8 +1776,8 @@ wh = mtod(m, struct ieee80211_frame *); ieee80211_send_setup(ni, wh, - IEEE80211_FC0_TYPE_MGT | IEEE80211_FC0_SUBTYPE_PROBE_REQ, - sa, da, bssid); + IEEE80211_FC0_TYPE_MGT | IEEE80211_FC0_SUBTYPE_PROBE_REQ, + IEEE80211_NONQOS_TID, sa, da, bssid); /* XXX power management? */ m->m_flags |= M_ENCAP; /* mark encapsulated */ @@ -2341,8 +2366,8 @@ wh = mtod(m, struct ieee80211_frame *); ieee80211_send_setup(bss, wh, - IEEE80211_FC0_TYPE_MGT | IEEE80211_FC0_SUBTYPE_PROBE_RESP, - vap->iv_myaddr, da, bss->ni_bssid); + IEEE80211_FC0_TYPE_MGT | IEEE80211_FC0_SUBTYPE_PROBE_RESP, + IEEE80211_NONQOS_TID, vap->iv_myaddr, da, bss->ni_bssid); /* XXX power management? */ m->m_flags |= M_ENCAP; /* mark encapsulated */ From owner-p4-projects@FreeBSD.ORG Fri Oct 3 21:40:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 56EBF106569A; Fri, 3 Oct 2008 21:40:24 +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 1A3611065693 for ; Fri, 3 Oct 2008 21:40:24 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 088E08FC22 for ; Fri, 3 Oct 2008 21:40:24 +0000 (UTC) (envelope-from gonzo@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 m93LeNHu091886 for ; Fri, 3 Oct 2008 21:40:23 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m93LeNcc091884 for perforce@freebsd.org; Fri, 3 Oct 2008 21:40:23 GMT (envelope-from gonzo@FreeBSD.org) Date: Fri, 3 Oct 2008 21:40:23 GMT Message-Id: <200810032140.m93LeNcc091884@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 150902 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, 03 Oct 2008 21:40:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=150902 Change 150902 by gonzo@gonzo_jeeves on 2008/10/03 21:40:09 Print all the noisy messages only if debugging has been requested Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/nexus.c#14 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/nexus.c#14 (text+ko) ==== @@ -58,6 +58,12 @@ #include #include +#ifdef NEXUS_DEBUG +#define dprintf printf +#else +#define dprintf(x, arg...) +#endif /* NEXUS_DEBUG */ + static MALLOC_DEFINE(M_NEXUSDEV, "nexusdev", "Nexus device"); struct nexus_device { @@ -253,7 +259,7 @@ resource_long_value(dname, dunit, "maddr", &maddr); resource_int_value(dname, dunit, "msize", &msize); - printf("%s: discovered hinted child %s at maddr %p(%d)\n", + dprintf("%s: discovered hinted child %s at maddr %p(%d)\n", __func__, device_get_nameunit(child), (void *)(intptr_t)maddr, msize); @@ -298,10 +304,10 @@ struct rman *rm; int isdefault, needactivate, passthrough; - printf("%s: entry (%p, %p, %d, %p, %p, %p, %ld, %d)\n", + dprintf("%s: entry (%p, %p, %d, %p, %p, %p, %ld, %d)\n", __func__, bus, child, type, rid, (void *)(intptr_t)start, (void *)(intptr_t)end, count, flags); - printf("%s: requested rid is %d\n", __func__, *rid); + dprintf("%s: requested rid is %d\n", __func__, *rid); isdefault = (start == 0UL && end == ~0UL && count == 1); needactivate = flags & RF_ACTIVE; @@ -408,7 +414,7 @@ struct resource_list *rl = &ndev->nx_resources; struct resource_list_entry *rle; - printf("%s: entry (%p, %p, %d, %d, %p, %ld)\n", + dprintf("%s: entry (%p, %p, %d, %d, %p, %ld)\n", __func__, dev, child, type, rid, (void *)(intptr_t)start, count); rle = resource_list_add(rl, type, rid, start, start + count - 1, @@ -443,7 +449,7 @@ struct nexus_device *ndev = DEVTONX(child); struct resource_list *rl = &ndev->nx_resources; - printf("%s: entry\n", __func__); + dprintf("%s: entry\n", __func__); resource_list_delete(rl, type, rid); } @@ -452,7 +458,7 @@ nexus_release_resource(device_t bus, device_t child, int type, int rid, struct resource *r) { - printf("%s: entry\n", __func__); + dprintf("%s: entry\n", __func__); if (rman_get_flags(r) & RF_ACTIVE) { int error = bus_deactivate_resource(child, type, rid, r); From owner-p4-projects@FreeBSD.ORG Fri Oct 3 21:42:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C523810656AE; Fri, 3 Oct 2008 21:42:26 +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 6B1AC106568A for ; Fri, 3 Oct 2008 21:42:26 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5A0BF8FC13 for ; Fri, 3 Oct 2008 21:42:26 +0000 (UTC) (envelope-from gonzo@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 m93LgQ7b092034 for ; Fri, 3 Oct 2008 21:42:26 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m93LgQKf092032 for perforce@freebsd.org; Fri, 3 Oct 2008 21:42:26 GMT (envelope-from gonzo@FreeBSD.org) Date: Fri, 3 Oct 2008 21:42:26 GMT Message-Id: <200810032142.m93LgQKf092032@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 150904 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, 03 Oct 2008 21:42:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=150904 Change 150904 by gonzo@gonzo_jeeves on 2008/10/03 21:42:02 Hide debug output under condition Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/intr_machdep.c#10 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/intr_machdep.c#10 (text+ko) ==== @@ -44,6 +44,12 @@ #include #include +#ifdef INTR_DEBUG +#define dprintf printf +#else +#define dprintf(x, arg...) +#endif /* INTR_DEBUG */ + static struct intr_event *hardintr_events[NHARD_IRQS]; static struct intr_event *softintr_events[NSOFT_IRQS]; @@ -72,7 +78,7 @@ struct intr_event *event; int error; - printf("Establish HARD IRQ %d: filt %p handler %p arg %p\n", + dprintf("Establishing HARD IRQ %d: filt %p handler %p arg %p\n", irq, filt, handler, arg); /* * We have 6 levels, but thats 0 - 5 (not including 6) @@ -112,7 +118,7 @@ struct intr_event *event; int error; - printf("Establish SOFT IRQ %d: filt %p handler %p arg %p\n", + dprintf("Establishing SOFT IRQ %d: filt %p handler %p arg %p\n", irq, filt, handler, arg); if (irq < 0 || irq > NSOFT_IRQS) panic("%s called for unknown hard intr %d", __func__, irq); From owner-p4-projects@FreeBSD.ORG Fri Oct 3 21:43:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D0947106568C; Fri, 3 Oct 2008 21:43: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 946E61065687 for ; Fri, 3 Oct 2008 21:43:27 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8342E8FC1E for ; Fri, 3 Oct 2008 21:43:27 +0000 (UTC) (envelope-from gonzo@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 m93LhRCu092097 for ; Fri, 3 Oct 2008 21:43:27 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m93LhRbD092095 for perforce@freebsd.org; Fri, 3 Oct 2008 21:43:27 GMT (envelope-from gonzo@FreeBSD.org) Date: Fri, 3 Oct 2008 21:43:27 GMT Message-Id: <200810032143.m93LhRbD092095@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 150905 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, 03 Oct 2008 21:43:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=150905 Change 150905 by gonzo@gonzo_jeeves on 2008/10/03 21:43:01 Set root to whole device. This way it's easier to work with md devices. Affected files ... .. //depot/projects/mips2/src/sys/mips/conf/MALTA#22 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/conf/MALTA#22 (text+ko) ==== @@ -52,7 +52,7 @@ options SOFTUPDATES #Enable FFS soft updates support options UFS_ACL #Support for access control lists options UFS_DIRHASH #Improve performance on big directories -options ROOTDEVNAME=\"ufs:ad0s1a\" +options ROOTDEVNAME=\"ufs:ad0\" # Debugging for use in -current From owner-p4-projects@FreeBSD.ORG Sat Oct 4 00:54:07 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 782F31065692; Sat, 4 Oct 2008 00:54: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 3B29C1065688 for ; Sat, 4 Oct 2008 00:54:07 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2728D8FC12 for ; Sat, 4 Oct 2008 00:54:07 +0000 (UTC) (envelope-from nwhitehorn@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 m940s7Ih022629 for ; Sat, 4 Oct 2008 00:54:07 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m940s71A022627 for perforce@freebsd.org; Sat, 4 Oct 2008 00:54:07 GMT (envelope-from nwhitehorn@freebsd.org) Date: Sat, 4 Oct 2008 00:54:07 GMT Message-Id: <200810040054.m940s71A022627@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nwhitehorn@freebsd.org using -f From: Nathan Whitehorn To: Perforce Change Reviews Cc: Subject: PERFORCE change 150915 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, 04 Oct 2008 00:54:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=150915 Change 150915 by nwhitehorn@nwhitehorn_trantor on 2008/10/04 00:53:24 Make PCI buses into OFW buses. This fixes the weird interrupt problems with Apple ATA controllers, and decreases the general level of hackery. Changes should be harmless. MFP4 after: 2 weeks Affected files ... .. //depot/projects/ppc-g5/sys/powerpc/aim/ofw_machdep.c#3 edit .. //depot/projects/ppc-g5/sys/powerpc/ofw/ofw_pci.c#3 delete .. //depot/projects/ppc-g5/sys/powerpc/ofw/ofw_pci.h#2 delete .. //depot/projects/ppc-g5/sys/powerpc/ofw/ofw_pcib_pci.c#2 edit .. //depot/projects/ppc-g5/sys/powerpc/ofw/ofw_pcibus.c#1 add .. //depot/projects/ppc-g5/sys/powerpc/powermac/ata_kauai.c#4 edit .. //depot/projects/ppc-g5/sys/powerpc/powermac/cpcht.c#2 edit .. //depot/projects/ppc-g5/sys/powerpc/powermac/grackle.c#2 edit .. //depot/projects/ppc-g5/sys/powerpc/powermac/macio.c#3 edit .. //depot/projects/ppc-g5/sys/powerpc/powermac/uninorth.c#3 edit .. //depot/projects/ppc-g5/sys/powerpc/powermac/uninorthvar.h#3 edit Differences ... ==== //depot/projects/ppc-g5/sys/powerpc/aim/ofw_machdep.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/aim/ofw_machdep.c,v 1.20 2008/02/12 20:55:51 marcel Exp $"); +__FBSDID("$FreeBSD: head/sys/powerpc/aim/ofw_machdep.c 176222 2008-02-12 20:55:51Z marcel $"); #include #include @@ -47,6 +47,7 @@ #include #include +#include #include #include @@ -56,7 +57,6 @@ #include #include #include -#include #define OFMEM_REGIONS 32 static struct mem_region OFmem[OFMEM_REGIONS + 1], OFavail[OFMEM_REGIONS + 3]; @@ -310,7 +310,7 @@ { phandle_t node; - node = ofw_pci_find_node(dev); + node = ofw_bus_get_node(dev); OF_getprop(node, "local-mac-address", addr, ETHER_ADDR_LEN); } ==== //depot/projects/ppc-g5/sys/powerpc/ofw/ofw_pcib_pci.c#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/powerpc/ofw/ofw_pcib_pci.c,v 1.5 2006/01/06 19:22:19 jhb Exp $ + * $FreeBSD: head/sys/powerpc/ofw/ofw_pcib_pci.c 154079 2006-01-06 19:22:19Z jhb $ */ #include @@ -35,8 +35,7 @@ #include #include - -#include +#include #include #include @@ -46,6 +45,7 @@ static int ofw_pcib_pci_probe(device_t bus); static int ofw_pcib_pci_attach(device_t bus); +static phandle_t ofw_pcib_pci_get_node(device_t bus, device_t dev); static device_method_t ofw_pcib_pci_methods[] = { /* Device interface */ @@ -72,6 +72,9 @@ DEVMETHOD(pcib_write_config, pcib_write_config), DEVMETHOD(pcib_route_interrupt, pcib_route_interrupt), + /* ofw_bus interface */ + DEVMETHOD(ofw_bus_get_node, ofw_pcib_pci_get_node), + {0, 0} }; @@ -89,29 +92,29 @@ (pci_get_subclass(dev) != PCIS_BRIDGE_PCI)) { return (ENXIO); } - if (ofw_pci_find_node(dev) == 0) { + + if (ofw_bus_get_node(dev) == 0) return (ENXIO); - } - device_set_desc(dev, "Open Firmware PCI-PCI bridge"); - return (-1000); + device_set_desc(dev, "OFW PCI-PCI bridge"); + return (0); } static int ofw_pcib_pci_attach(device_t dev) { - phandle_t node; - uint32_t busrange[2]; - - node = ofw_pci_find_node(dev); - if (OF_getprop(node, "bus-range", busrange, sizeof(busrange)) != 8) - return (ENXIO); - pcib_attach_common(dev); - ofw_pci_fixup(dev, busrange[0], node); - device_add_child(dev, "pci", -1); return (bus_generic_attach(dev)); } + +phandle_t +ofw_pcib_pci_get_node(device_t bridge, device_t dev) +{ + /* We have only one child, the PCI bus, so pass it our node */ + + return (ofw_bus_get_node(bridge)); +} + ==== //depot/projects/ppc-g5/sys/powerpc/powermac/ata_kauai.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ * */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/powermac/ata_kauai.c,v 1.15 2008/09/27 15:13:44 nwhitehorn Exp $"); +__FBSDID("$FreeBSD: head/sys/powerpc/powermac/ata_kauai.c 183409 2008-09-27 15:13:44Z nwhitehorn $"); /* * Mac 'Kauai' PCI ATA controller @@ -50,7 +50,7 @@ #include #include -#include +#include #include #include @@ -194,11 +194,10 @@ { struct ata_channel *ch; struct ata_kauai_softc *sc; - u_long startp, countp; u_int32_t devid; phandle_t node; char *compatstring = NULL; - int i, found, rid, status; + int i, found, rid; found = 0; devid = pci_get_devid(dev); @@ -212,60 +211,15 @@ if (!found) return (ENXIO); - node = ofw_pci_find_node(dev); + node = ofw_bus_get_node(dev); sc = device_get_softc(dev); bzero(sc, sizeof(struct ata_kauai_softc)); ch = &sc->sc_ch.sc_ch; - OF_getprop_alloc(node, "compatible", 1, (void **)&compatstring); - if (strcmp(compatstring,"shasta-ata") == 0) + compatstring = ofw_bus_get_compatible(node); + if (compatstring != NULL && strcmp(compatstring,"shasta-ata") == 0) sc->shasta = 1; - free(compatstring, M_OFWPROP); - - - /* - * This device seems to ignore writes to the interrupt - * config register, resulting in interrupt resources - * not being attached. If this is the case, use - * Open Firmware to determine the irq, and then attach - * the resource. This allows the ATA common code to - * allocate the irq. - */ - status = bus_get_resource(dev, SYS_RES_IRQ, 0, &startp, &countp); - if (status == ENOENT) { - int *irq; - phandle_t iparent; - int icells, nintr, i; - - /* - * Horrible hack to handle Kauai devices that have their IRQs - * set up in an utterly wrong way - */ - if (!sc->shasta) - bus_set_resource(dev, SYS_RES_IRQ, 0, 39, 1); - - /* - * For the rest of the interrupts, and the main Shasta - * interrupt, get the IRQs from firmware. - */ - if (OF_getprop(node, "interrupt-parent", &iparent, - sizeof(iparent)) == sizeof(iparent)) { - OF_getprop(iparent, "#interrupt-cells", &icells, - sizeof(icells)) ; - } - - nintr = OF_getprop_alloc(node, "interrupts", sizeof(*irq), - (void **)&irq); - - for (i = 0; i < nintr; i += icells) - bus_set_resource(dev, SYS_RES_IRQ, - i/icells + !sc->shasta, irq[i], 1); - - free(irq, M_OFWPROP); - } - - rid = PCIR_BARS; sc->sc_memr = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE); ==== //depot/projects/ppc-g5/sys/powerpc/powermac/cpcht.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (C) 2002 Benno Rice. + * Copyright (C) 2008 Nathan Whitehorn * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -46,7 +46,6 @@ #include -#include #include #include #include @@ -194,6 +193,12 @@ static int cpcpci_route_interrupt(device_t, device_t, int); /* + * ofw_bus interface + */ + +static phandle_t cpcpci_get_node(device_t bus, device_t child); + +/* * Driver methods. */ static device_method_t cpcpci_methods[] = { @@ -215,6 +220,8 @@ DEVMETHOD(pcib_write_config, cpcpci_write_config), DEVMETHOD(pcib_route_interrupt, cpcpci_route_interrupt), + /* ofw_bus interface */ + DEVMETHOD(ofw_bus_get_node, cpcpci_get_node), { 0, 0 } }; @@ -345,13 +352,16 @@ } } +#if 0 /* * Write out the correct PIC interrupt values to config space * of all devices on the bus. */ ofw_pci_fixup(dev, sc->sc_bus, node); +#endif device_add_child(dev, "pci", device_get_unit(dev)); + return (bus_generic_attach(dev)); } @@ -413,13 +423,6 @@ } static int -cpcpci_route_interrupt(device_t bus, device_t dev, int pin) -{ - - return (0); -} - -static int cpcpci_read_ivar(device_t dev, device_t child, int which, uintptr_t *result) { struct cpcpci_softc *sc; @@ -533,4 +536,19 @@ return (rman_activate_resource(res)); } +static phandle_t +cpcpci_get_node(device_t bus, device_t dev) +{ + struct cpcpci_softc *sc; + + sc = device_get_softc(bus); + /* We only have one child, the PCI bus, which needs our own node. */ + return (sc->sc_node); +} + +static int +cpcpci_route_interrupt(device_t bus, device_t dev, int pin) +{ + return (0); +} ==== //depot/projects/ppc-g5/sys/powerpc/powermac/grackle.c#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/powerpc/powermac/grackle.c,v 1.13 2008/06/12 02:28:58 kevlo Exp $ + * $FreeBSD: head/sys/powerpc/powermac/grackle.c 179746 2008-06-12 02:28:58Z kevlo $ */ #include @@ -36,6 +36,7 @@ #include #include +#include #include #include @@ -48,7 +49,6 @@ #include -#include #include #include @@ -92,6 +92,11 @@ static int grackle_route_interrupt(device_t, device_t, int); /* + * ofw_bus interface + */ +static phandle_t grackle_get_node(device_t bus, device_t dev); + +/* * Local routines. */ static int grackle_enable_config(struct grackle_softc *, u_int, @@ -122,6 +127,9 @@ DEVMETHOD(pcib_write_config, grackle_write_config), DEVMETHOD(pcib_route_interrupt, grackle_route_interrupt), + /* ofw_bus interface */ + DEVMETHOD(ofw_bus_get_node, grackle_get_node), + { 0, 0 } }; @@ -244,12 +252,6 @@ } } - /* - * Write out the correct PIC interrupt values to config space - * of all devices on the bus. - */ - ofw_pci_fixup(dev, sc->sc_bus, sc->sc_node); - device_add_child(dev, "pci", device_get_unit(dev)); return (bus_generic_attach(dev)); } @@ -511,6 +513,17 @@ out32rb(sc->sc_addr, 0); } +static phandle_t +grackle_get_node(device_t bus, device_t dev) +{ + struct grackle_softc *sc; + + sc = device_get_softc(bus); + /* We only have one child, the PCI bus, which needs our own node. */ + + return sc->sc_node; +} + /* * Driver to swallow Grackle host bridges from the PCI bus side. */ ==== //depot/projects/ppc-g5/sys/powerpc/powermac/macio.c#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/powerpc/powermac/macio.c,v 1.25 2008/06/12 02:28:58 kevlo Exp $ + * $FreeBSD: head/sys/powerpc/powermac/macio.c 179746 2008-06-12 02:28:58Z kevlo $ */ /* @@ -272,7 +272,7 @@ int error, quirks; sc = device_get_softc(dev); - root = sc->sc_node = OF_finddevice("mac-io"); + root = sc->sc_node = ofw_bus_get_node(dev); /* * Locate the device node and it's base address ==== //depot/projects/ppc-g5/sys/powerpc/powermac/uninorth.c#3 (text+ko) ==== @@ -22,7 +22,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/powerpc/powermac/uninorth.c,v 1.20 2008/06/12 02:28:58 kevlo Exp $ + * $FreeBSD: head/sys/powerpc/powermac/uninorth.c 179746 2008-06-12 02:28:58Z kevlo $ */ #include @@ -34,6 +34,7 @@ #include #include +#include #include #include @@ -46,7 +47,6 @@ #include -#include #include #include @@ -84,6 +84,12 @@ static int uninorth_route_interrupt(device_t, device_t, int); /* + * OFW Bus interface + */ + +static phandle_t uninorth_get_node(device_t bus, device_t dev); + +/* * Local routines. */ static int uninorth_enable_config(struct uninorth_softc *, u_int, @@ -112,6 +118,9 @@ DEVMETHOD(pcib_write_config, uninorth_write_config), DEVMETHOD(pcib_route_interrupt, uninorth_route_interrupt), + /* ofw_bus interface */ + DEVMETHOD(ofw_bus_get_node, uninorth_get_node), + { 0, 0 } }; @@ -154,12 +163,12 @@ uninorth_attach(device_t dev) { struct uninorth_softc *sc; + char *compatible; phandle_t node; phandle_t child; u_int32_t reg[2], busrange[2]; struct uninorth_range *rp, *io, *mem[2]; int nmem, i, error; - u_int32_t cells; node = nexus_get_node(dev); sc = device_get_softc(dev); @@ -170,18 +179,24 @@ if (OF_getprop(node, "bus-range", busrange, sizeof(busrange)) != 8) return (ENXIO); - cells = 1; - OF_getprop(node,"#size-cells",&cells,sizeof(cells)); - cells--; + sc->sc_agp = 0; + compatible = nexus_get_compatible(dev); + if (strcmp(compatible,"u3-agp") == 0) + sc->sc_agp = 1; sc->sc_dev = dev; sc->sc_node = node; - sc->sc_addr = (vm_offset_t)pmap_mapdev(reg[cells] + 0x800000, PAGE_SIZE); - sc->sc_data = (vm_offset_t)pmap_mapdev(reg[cells] + 0xc00000, PAGE_SIZE); + if (sc->sc_agp) { + sc->sc_addr = (vm_offset_t)pmap_mapdev(reg[1] + 0x800000, PAGE_SIZE); + sc->sc_data = (vm_offset_t)pmap_mapdev(reg[1] + 0xc00000, PAGE_SIZE); + } else { + sc->sc_addr = (vm_offset_t)pmap_mapdev(reg[0] + 0x800000, PAGE_SIZE); + sc->sc_data = (vm_offset_t)pmap_mapdev(reg[0] + 0xc00000, PAGE_SIZE); + } sc->sc_bus = busrange[0]; bzero(sc->sc_range, sizeof(sc->sc_range)); - if (cells > 0) { + if (sc->sc_agp) { /* * On Apple U3 systems, we have an otherwise standard * Uninorth controller driving AGP. The one difference @@ -245,13 +260,6 @@ panic("uninorth_attach: failed to set up I/O rman"); } -#if 0 - printf("I/O Size: %d bytes\n",io->size_lo); - printf("I/O Mapped at: %#x\n",io->pci_lo); - printf("I/O Start: %#x\n",io->host); - panic("Observe!"); -#endif - if (nmem == 0) { device_printf(dev, "can't find mem ranges\n"); return (ENXIO); @@ -287,13 +295,6 @@ } } - /* - * Write out the correct PIC interrupt values to config space - * of all devices on the bus. This has to be done after the GEM - * cell is enabled above. - */ - ofw_pci_fixup(dev, sc->sc_bus, node); - device_add_child(dev, "pci", device_get_unit(dev)); return (bus_generic_attach(dev)); } @@ -317,7 +318,7 @@ if (uninorth_enable_config(sc, bus, slot, func, reg) != 0) { switch (width) { - case 1: + case 1: return (in8rb(caoff)); break; case 2: @@ -509,6 +510,17 @@ return (1); } +static phandle_t +uninorth_get_node(device_t bus, device_t dev) +{ + struct uninorth_softc *sc; + + sc = device_get_softc(bus); + /* We only have one child, the PCI bus, which needs our own node. */ + + return sc->sc_node; +} + /* * Driver to swallow UniNorth host bridges from the PCI bus side. */ ==== //depot/projects/ppc-g5/sys/powerpc/powermac/uninorthvar.h#3 (text+ko) ==== @@ -22,7 +22,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/powerpc/powermac/uninorthvar.h,v 1.4 2005/01/07 02:29:20 imp Exp $ + * $FreeBSD: head/sys/powerpc/powermac/uninorthvar.h 139825 2005-01-07 02:29:27Z imp $ */ #ifndef _POWERPC_POWERMAC_UNINORTHVAR_H_ @@ -61,6 +61,8 @@ bus_space_tag_t sc_iot; bus_space_tag_t sc_memt; bus_dma_tag_t sc_dmat; + + int sc_agp; }; struct unin_chip_softc { From owner-p4-projects@FreeBSD.ORG Sat Oct 4 00:55:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9FE2C106568A; Sat, 4 Oct 2008 00:55: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 63D5A1065688 for ; Sat, 4 Oct 2008 00:55:08 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 51D8B8FC08 for ; Sat, 4 Oct 2008 00:55:08 +0000 (UTC) (envelope-from nwhitehorn@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 m940t8Rv022739 for ; Sat, 4 Oct 2008 00:55:08 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m940t8ZF022737 for perforce@freebsd.org; Sat, 4 Oct 2008 00:55:08 GMT (envelope-from nwhitehorn@freebsd.org) Date: Sat, 4 Oct 2008 00:55:08 GMT Message-Id: <200810040055.m940t8ZF022737@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nwhitehorn@freebsd.org using -f From: Nathan Whitehorn To: Perforce Change Reviews Cc: Subject: PERFORCE change 150916 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, 04 Oct 2008 00:55:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=150916 Change 150916 by nwhitehorn@nwhitehorn_trantor on 2008/10/04 00:54:43 Fix K2 SATA to actually work. Should be harmless to other Serverworks controllers, will ask for review. Affected files ... .. //depot/projects/ppc-g5/sys/dev/ata/ata-chipset.c#4 edit Differences ... ==== //depot/projects/ppc-g5/sys/dev/ata/ata-chipset.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.228 2008/09/26 07:29:48 sos Exp $"); +__FBSDID("$FreeBSD: head/sys/dev/ata/ata-chipset.c 183380 2008-09-26 07:29:48Z sos $"); #include "opt_ata.h" #include @@ -4806,6 +4806,16 @@ } static int +ata_serverworks_k2status(device_t dev) +{ + struct ata_channel *ch = device_get_softc(dev); + + ATA_IDX_INL(ch,ATA_STATUS); + + return ata_pci_status(dev); +} + +static int ata_serverworks_chipinit(device_t dev) { struct ata_pci_controller *ctlr = device_get_softc(dev); @@ -4894,6 +4904,10 @@ /* chip does not reliably do 64K DMA transfers */ ch->dma.max_iosize = 126 * DEV_BSIZE; + /* For K2, we need to do a 4-byte read on the status reg */ + if (ctlr->chip->chipid == ATA_K2) + ch->hw.status = ata_serverworks_k2status; + return 0; } From owner-p4-projects@FreeBSD.ORG Sat Oct 4 00:56:10 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0B6F11065690; Sat, 4 Oct 2008 00:56: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 C3290106568E for ; Sat, 4 Oct 2008 00:56:09 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B0B338FC15 for ; Sat, 4 Oct 2008 00:56:09 +0000 (UTC) (envelope-from nwhitehorn@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 m940u9aL022830 for ; Sat, 4 Oct 2008 00:56:09 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m940u95O022828 for perforce@freebsd.org; Sat, 4 Oct 2008 00:56:09 GMT (envelope-from nwhitehorn@freebsd.org) Date: Sat, 4 Oct 2008 00:56:09 GMT Message-Id: <200810040056.m940u95O022828@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nwhitehorn@freebsd.org using -f From: Nathan Whitehorn To: Perforce Change Reviews Cc: Subject: PERFORCE change 150917 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, 04 Oct 2008 00:56:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=150917 Change 150917 by nwhitehorn@nwhitehorn_trantor on 2008/10/04 00:55:52 Change mmu_oea64 to pass around vsids instead of srs. This is in preparation for a future 64-bit port. Affected files ... .. //depot/projects/ppc-g5/sys/powerpc/aim/mmu_oea64.c#5 edit Differences ... ==== //depot/projects/ppc-g5/sys/powerpc/aim/mmu_oea64.c#5 (text+ko) ==== @@ -166,10 +166,10 @@ return b; } -static __inline int -va_to_sr(u_int *sr, vm_offset_t va) +static __inline uint64_t +va_to_vsid(pmap_t pm, vm_offset_t va) { - return (sr[(uintptr_t)va >> ADDR_SR_SHFT]); + return ((pm->pm_sr[(uintptr_t)va >> ADDR_SR_SHFT]) & SR_VSID_MASK); } #define TLBSYNC() __asm __volatile("tlbsync; ptesync"); @@ -201,8 +201,7 @@ vpn = (uint64_t)(va & ADDR_PIDX); if (pmap != NULL) - vpn |= ((uint64_t)(va_to_sr(pmap->pm_sr,va) & SR_VSID_MASK) - << 28); + vpn |= (va_to_vsid(pmap,va) << 28); #else vpn = va; #endif @@ -466,11 +465,11 @@ MMU_DEF(oea64_bridge_mmu); static __inline u_int -va_to_pteg(u_int sr, vm_offset_t addr) +va_to_pteg(uint64_t vsid, vm_offset_t addr) { u_int hash; - hash = (sr & SR_VSID_MASK) ^ (((u_int)addr & ADDR_PIDX) >> + hash = vsid ^ (((uint64_t)addr & ADDR_PIDX) >> ADDR_PIDX_SHFT); return (hash & moea64_pteg_mask); } @@ -531,15 +530,16 @@ } static __inline int -moea64_pte_match(struct lpte *pt, u_int sr, vm_offset_t va, int which) +moea64_pte_match(struct lpte *pt, uint64_t vsid, vm_offset_t va, int which) { return (pt->pte_hi & ~LPTE_VALID) == - (((uint64_t)(sr & SR_VSID_MASK) << LPTE_VSID_SHIFT) | + ((vsid << LPTE_VSID_SHIFT) | ((uint64_t)(va >> ADDR_API_SHFT64) & LPTE_API) | which); } static __inline void -moea64_pte_create(struct lpte *pt, u_int sr, vm_offset_t va, uint64_t pte_lo) +moea64_pte_create(struct lpte *pt, uint64_t vsid, vm_offset_t va, + uint64_t pte_lo) { ASSERT_TABLE_LOCK(); @@ -549,7 +549,7 @@ * * Note: Don't set the valid bit for correct operation of tlb update. */ - pt->pte_hi = ((uint64_t)(sr & SR_VSID_MASK) << LPTE_VSID_SHIFT) | + pt->pte_hi = (vsid << LPTE_VSID_SHIFT) | (((uint64_t)(va & ADDR_PIDX) >> ADDR_API_SHFT64) & LPTE_API); pt->pte_lo = pte_lo; @@ -1990,12 +1990,12 @@ moea64_pvo_enter(pmap_t pm, uma_zone_t zone, struct pvo_head *pvo_head, vm_offset_t va, vm_offset_t pa, uint64_t pte_lo, int flags, int recurse) { - struct pvo_entry *pvo; - u_int sr; - int first; - u_int ptegidx; - int i; - int bootstrap; + struct pvo_entry *pvo; + uint64_t vsid; + int first; + u_int ptegidx; + int i; + int bootstrap; /* * One nasty thing that can happen here is that the UMA calls to @@ -2017,8 +2017,8 @@ * Compute the PTE Group index. */ va &= ~ADDR_POFF; - sr = va_to_sr(pm->pm_sr, va); - ptegidx = va_to_pteg(sr, va); + vsid = va_to_vsid(pm, va); + ptegidx = va_to_pteg(vsid, va); /* * Remove any existing mapping for this page. Reuse the pvo entry if @@ -2080,7 +2080,8 @@ if (flags & PVO_FAKE) pvo->pvo_vaddr |= PVO_FAKE; - moea64_pte_create(&pvo->pvo_pte.lpte, sr, va, (uint64_t)(pa) | pte_lo); + moea64_pte_create(&pvo->pvo_pte.lpte, vsid, va, + (uint64_t)(pa) | pte_lo); /* * Remember if the list was empty and therefore will be the first @@ -2188,13 +2189,13 @@ static struct pvo_entry * moea64_pvo_find_va(pmap_t pm, vm_offset_t va, int *pteidx_p) { - struct pvo_entry *pvo; - int ptegidx; - u_int sr; + struct pvo_entry *pvo; + int ptegidx; + uint64_t vsid; va &= ~ADDR_POFF; - sr = va_to_sr(pm->pm_sr, va); - ptegidx = va_to_pteg(sr, va); + vsid = va_to_vsid(pm, va); + ptegidx = va_to_pteg(vsid, va); LOCK_TABLE(); LIST_FOREACH(pvo, &moea64_pvo_table[ptegidx], pvo_olink) { @@ -2218,11 +2219,11 @@ * If we haven't been supplied the ptegidx, calculate it. */ if (pteidx == -1) { - int ptegidx; - u_int sr; + int ptegidx; + uint64_t vsid; - sr = va_to_sr(pvo->pvo_pmap->pm_sr, pvo->pvo_vaddr); - ptegidx = va_to_pteg(sr, pvo->pvo_vaddr); + vsid = va_to_vsid(pvo->pvo_pmap, pvo->pvo_vaddr); + ptegidx = va_to_pteg(vsid, pvo->pvo_vaddr); pteidx = moea64_pvo_pte_index(pvo, ptegidx); } From owner-p4-projects@FreeBSD.ORG Sat Oct 4 00:57:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F0B5D1065688; Sat, 4 Oct 2008 00:57: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 B519F1065686 for ; Sat, 4 Oct 2008 00:57:10 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A32198FC13 for ; Sat, 4 Oct 2008 00:57:10 +0000 (UTC) (envelope-from nwhitehorn@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 m940vA2h022895 for ; Sat, 4 Oct 2008 00:57:10 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m940vAVc022893 for perforce@freebsd.org; Sat, 4 Oct 2008 00:57:10 GMT (envelope-from nwhitehorn@freebsd.org) Date: Sat, 4 Oct 2008 00:57:10 GMT Message-Id: <200810040057.m940vAVc022893@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nwhitehorn@freebsd.org using -f From: Nathan Whitehorn To: Perforce Change Reviews Cc: Subject: PERFORCE change 150918 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, 04 Oct 2008 00:57:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=150918 Change 150918 by nwhitehorn@nwhitehorn_trantor on 2008/10/04 00:57:03 Missed files.powerpc changes corresponding to the OFW PCI import. Obtained from: sparc64 Affected files ... .. //depot/projects/ppc-g5/sys/conf/files.powerpc#4 edit Differences ... ==== //depot/projects/ppc-g5/sys/conf/files.powerpc#4 (text+ko) ==== @@ -105,7 +105,7 @@ powerpc/mpc85xx/ocpbus.c optional mpc85xx powerpc/mpc85xx/opic.c optional mpc85xx powerpc/mpc85xx/pci_ocp.c optional pci mpc85xx -powerpc/ofw/ofw_pci.c optional pci aim +powerpc/ofw/ofw_pcibus.c optional pci aim powerpc/ofw/ofw_pcib_pci.c optional pci aim powerpc/ofw/ofw_syscons.c optional sc aim powerpc/powermac/ata_kauai.c optional powermac ata From owner-p4-projects@FreeBSD.ORG Sat Oct 4 01:36:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 70CBB1065692; Sat, 4 Oct 2008 01:36: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 340CA106568B for ; Sat, 4 Oct 2008 01:36:51 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0778C8FC35 for ; Sat, 4 Oct 2008 01:36:51 +0000 (UTC) (envelope-from nwhitehorn@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 m941ao4k027009 for ; Sat, 4 Oct 2008 01:36:50 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m941aovq027007 for perforce@freebsd.org; Sat, 4 Oct 2008 01:36:50 GMT (envelope-from nwhitehorn@freebsd.org) Date: Sat, 4 Oct 2008 01:36:50 GMT Message-Id: <200810040136.m941aovq027007@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nwhitehorn@freebsd.org using -f From: Nathan Whitehorn To: Perforce Change Reviews Cc: Subject: PERFORCE change 150920 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, 04 Oct 2008 01:36:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=150920 Change 150920 by nwhitehorn@nwhitehorn_trantor on 2008/10/04 01:35:58 Remove an #if 0 that I missed. Affected files ... .. //depot/projects/ppc-g5/sys/powerpc/powermac/cpcht.c#3 edit Differences ... ==== //depot/projects/ppc-g5/sys/powerpc/powermac/cpcht.c#3 (text+ko) ==== @@ -352,14 +352,6 @@ } } -#if 0 - /* - * Write out the correct PIC interrupt values to config space - * of all devices on the bus. - */ - ofw_pci_fixup(dev, sc->sc_bus, node); -#endif - device_add_child(dev, "pci", device_get_unit(dev)); return (bus_generic_attach(dev)); From owner-p4-projects@FreeBSD.ORG Sat Oct 4 02:10:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2A5F41065696; Sat, 4 Oct 2008 02:10: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 E11C81065693 for ; Sat, 4 Oct 2008 02:10:37 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CCB958FC1B for ; Sat, 4 Oct 2008 02:10:37 +0000 (UTC) (envelope-from nwhitehorn@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 m942Ab75030790 for ; Sat, 4 Oct 2008 02:10:37 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m942AOaE030780 for perforce@freebsd.org; Sat, 4 Oct 2008 02:10:24 GMT (envelope-from nwhitehorn@freebsd.org) Date: Sat, 4 Oct 2008 02:10:24 GMT Message-Id: <200810040210.m942AOaE030780@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nwhitehorn@freebsd.org using -f From: Nathan Whitehorn To: Perforce Change Reviews Cc: Subject: PERFORCE change 150921 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, 04 Oct 2008 02:10:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=150921 Change 150921 by nwhitehorn@nwhitehorn_trantor on 2008/10/04 02:10:18 IFC Affected files ... .. //depot/projects/ppc-g5/ObsoleteFiles.inc#4 integrate .. //depot/projects/ppc-g5/bin/pkill/pkill.1#2 integrate .. //depot/projects/ppc-g5/bin/pkill/pkill.c#2 integrate .. //depot/projects/ppc-g5/crypto/openssh/moduli.5#2 integrate .. //depot/projects/ppc-g5/crypto/openssh/scp.1#2 integrate .. //depot/projects/ppc-g5/crypto/openssh/sftp-server.8#2 integrate .. //depot/projects/ppc-g5/crypto/openssh/sftp.1#2 integrate .. //depot/projects/ppc-g5/crypto/openssh/ssh-add.1#2 integrate .. //depot/projects/ppc-g5/crypto/openssh/ssh-agent.1#2 integrate .. //depot/projects/ppc-g5/crypto/openssh/ssh-keygen.1#2 integrate .. //depot/projects/ppc-g5/crypto/openssh/ssh-keyscan.1#2 integrate .. //depot/projects/ppc-g5/crypto/openssh/ssh-keysign.8#2 integrate .. //depot/projects/ppc-g5/crypto/openssh/ssh.1#2 integrate .. //depot/projects/ppc-g5/crypto/openssh/ssh_config.5#2 integrate .. //depot/projects/ppc-g5/crypto/openssh/sshd.8#2 integrate .. //depot/projects/ppc-g5/crypto/openssh/sshd_config.5#2 integrate .. //depot/projects/ppc-g5/etc/network.subr#2 integrate .. //depot/projects/ppc-g5/gnu/lib/csu/Makefile#3 integrate .. //depot/projects/ppc-g5/gnu/usr.bin/gdb/kgdb/kld.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_entry.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_entry.h#4 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_entry_copy_stat.c#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_entry_private.h#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_entry_stat.c#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_read_support_format_tar.c#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_write_disk.c#4 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_write_set_format_pax.c#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/config_freebsd.h#4 integrate .. //depot/projects/ppc-g5/lib/libarchive/test/Makefile#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/test/test_entry.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/test/test_write_disk.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/test/test_write_disk_times.c#1 branch .. //depot/projects/ppc-g5/lib/libarchive/test/test_write_format_pax.c#1 branch .. //depot/projects/ppc-g5/lib/libc/gen/getosreldate.3#3 integrate .. //depot/projects/ppc-g5/lib/libc/sys/cpuset.2#2 integrate .. //depot/projects/ppc-g5/lib/libc/sys/cpuset_getaffinity.2#2 integrate .. //depot/projects/ppc-g5/lib/libpmc/pmc.k7.3#2 integrate .. //depot/projects/ppc-g5/lib/libpmc/pmc.k8.3#2 integrate .. //depot/projects/ppc-g5/lib/libpmc/pmc.p5.3#2 integrate .. //depot/projects/ppc-g5/lib/libpmc/pmc.p6.3#2 integrate .. //depot/projects/ppc-g5/lib/libutil/pty.c#2 integrate .. //depot/projects/ppc-g5/sbin/bsdlabel/bsdlabel.c#3 integrate .. //depot/projects/ppc-g5/sbin/fdisk/fdisk.c#3 integrate .. //depot/projects/ppc-g5/sbin/ifconfig/ifconfig.c#3 integrate .. //depot/projects/ppc-g5/sbin/ifconfig/ifvlan.c#3 integrate .. //depot/projects/ppc-g5/sbin/setkey/setkey.8#2 integrate .. //depot/projects/ppc-g5/share/examples/FreeBSD_version/FreeBSD_version.c#2 integrate .. //depot/projects/ppc-g5/share/man/man3/Makefile#2 integrate .. //depot/projects/ppc-g5/share/man/man3/makedev.3#1 branch .. //depot/projects/ppc-g5/share/man/man4/ata.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/nfe.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/ng_tty.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/snd_hda.4#4 integrate .. //depot/projects/ppc-g5/share/man/man4/wpi.4#2 integrate .. //depot/projects/ppc-g5/share/man/man9/Makefile#4 integrate .. //depot/projects/ppc-g5/share/man/man9/device_ids.9#2 delete .. //depot/projects/ppc-g5/share/man/man9/make_dev.9#4 integrate .. //depot/projects/ppc-g5/share/zoneinfo/southamerica#3 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/dump_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/minidump_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/mp_machdep.c#3 integrate .. //depot/projects/ppc-g5/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/ppc-g5/sys/amd64/include/param.h#2 integrate .. //depot/projects/ppc-g5/sys/amd64/include/smp.h#2 integrate .. //depot/projects/ppc-g5/sys/arm/arm/dump_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/arm/at91/at91_mci.c#3 integrate .. //depot/projects/ppc-g5/sys/arm/xscale/ixp425/avila_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/compat/linprocfs/linprocfs.c#4 integrate .. //depot/projects/ppc-g5/sys/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/ppc-g5/sys/compat/linux/linux_misc.c#4 integrate .. //depot/projects/ppc-g5/sys/compat/linux/linux_socket.c#3 integrate .. //depot/projects/ppc-g5/sys/compat/svr4/svr4_sockio.c#2 integrate .. //depot/projects/ppc-g5/sys/conf/NOTES#3 integrate .. //depot/projects/ppc-g5/sys/conf/files#3 integrate .. //depot/projects/ppc-g5/sys/conf/kmod.mk#2 integrate .. //depot/projects/ppc-g5/sys/conf/newvers.sh#2 integrate .. //depot/projects/ppc-g5/sys/conf/options#3 integrate .. //depot/projects/ppc-g5/sys/contrib/ipfilter/netinet/ip_auth.c#2 integrate .. //depot/projects/ppc-g5/sys/contrib/pf/net/pf.c#2 integrate .. //depot/projects/ppc-g5/sys/contrib/pf/net/pf_if.c#2 integrate .. //depot/projects/ppc-g5/sys/contrib/pf/net/pf_ioctl.c#3 integrate .. //depot/projects/ppc-g5/sys/contrib/pf/net/pf_subr.c#2 integrate .. //depot/projects/ppc-g5/sys/contrib/pf/net/pfvar.h#2 integrate .. //depot/projects/ppc-g5/sys/contrib/rdma/rdma_cma.c#2 integrate .. //depot/projects/ppc-g5/sys/ddb/db_textdump.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ae/if_ae.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ae/if_aereg.h#1 branch .. //depot/projects/ppc-g5/sys/dev/ae/if_aevar.h#1 branch .. //depot/projects/ppc-g5/sys/dev/agp/agp_i810.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/agp/agpreg.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/ata/ata-chipset.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/ata/ata-pci.h#4 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/cxgb_main.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/cxgb_sge.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/tom/cxgb_vm.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/tom/cxgb_vm.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/dc/dcphy.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/dc/pnphy.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drmP.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_agpsupport.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_atomic.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_auth.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_bufs.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_context.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_dma.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_drawable.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_drv.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_fops.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_ioctl.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_irq.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_lock.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_memory.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_pci.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_scatter.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_sysctl.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_vm.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/i915_dma.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/drm/i915_drm.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/i915_drv.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/i915_drv.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/i915_irq.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/i915_suspend.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/mach64_drv.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/mga_drv.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/r128_drv.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/radeon_cp.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/radeon_drv.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/savage_drv.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/sis_drv.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/tdfx_drv.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/fatm/if_fatm.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/firewire/firewire.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/hwpmc/pmc_events.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/mii/atphy.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/mii/ciphy.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/mii/e1000phy.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/mii/miidevs#3 integrate .. //depot/projects/ppc-g5/sys/dev/mmc/mmc.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/mmc/mmcbrvar.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/mmc/mmcreg.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/mmc/mmcsd.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/mmc/mmcvar.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/msk/if_msk.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/mxge/eth_z8e.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/mxge/ethp_z8e.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/mxge/mxge_mcp.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/mxge/rss_eth_z8e.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/mxge/rss_ethp_z8e.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/nfe/if_nfe.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/nfe/if_nfereg.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/nfe/if_nfevar.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/pccbb/pccbb_pci.c#2 integrate .. //depot/projects/ppc-g5/sys/fs/cd9660/cd9660_node.c#2 integrate .. //depot/projects/ppc-g5/sys/fs/cd9660/cd9660_rrip.c#2 integrate .. //depot/projects/ppc-g5/sys/fs/fdescfs/fdesc_vnops.c#4 integrate .. //depot/projects/ppc-g5/sys/geom/part/g_part.c#4 integrate .. //depot/projects/ppc-g5/sys/geom/part/g_part_bsd.c#3 integrate .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum.h#2 integrate .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_drive.c#2 integrate .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_rm.c#2 integrate .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_var.h#2 integrate .. //depot/projects/ppc-g5/sys/i386/conf/GENERIC#3 integrate .. //depot/projects/ppc-g5/sys/i386/i386/dump_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/i386/i386/minidump_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/i386/i386/mp_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/i386/include/param.h#3 integrate .. //depot/projects/ppc-g5/sys/i386/include/smp.h#3 integrate .. //depot/projects/ppc-g5/sys/i386/xen/mp_machdep.c#3 integrate .. //depot/projects/ppc-g5/sys/ia64/ia64/dump_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/ia64/ia64/interrupt.c#2 integrate .. //depot/projects/ppc-g5/sys/ia64/ia64/mp_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/ia64/ia64/sal.c#3 integrate .. //depot/projects/ppc-g5/sys/ia64/include/smp.h#2 integrate .. //depot/projects/ppc-g5/sys/kern/kern_jail.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/kern_mib.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/kern_shutdown.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/kern_uuid.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/kern_xxx.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/subr_witness.c#4 integrate .. //depot/projects/ppc-g5/sys/kern/uipc_socket.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/uipc_usrreq.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/vfs_lookup.c#3 integrate .. //depot/projects/ppc-g5/sys/mips/include/param.h#2 integrate .. //depot/projects/ppc-g5/sys/mips/include/smp.h#2 integrate .. //depot/projects/ppc-g5/sys/mips/mips/mp_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/mips/mips/pmap.c#3 integrate .. //depot/projects/ppc-g5/sys/modules/Makefile#3 integrate .. //depot/projects/ppc-g5/sys/modules/ae/Makefile#1 branch .. //depot/projects/ppc-g5/sys/net/bridgestp.c#2 integrate .. //depot/projects/ppc-g5/sys/net/if.c#3 integrate .. //depot/projects/ppc-g5/sys/net/if_bridge.c#3 integrate .. //depot/projects/ppc-g5/sys/net/if_ef.c#2 integrate .. //depot/projects/ppc-g5/sys/net/if_ethersubr.c#3 integrate .. //depot/projects/ppc-g5/sys/net/if_faith.c#2 integrate .. //depot/projects/ppc-g5/sys/net/if_gif.c#2 integrate .. //depot/projects/ppc-g5/sys/net/if_gif.h#2 integrate .. //depot/projects/ppc-g5/sys/net/if_gre.c#2 integrate .. //depot/projects/ppc-g5/sys/net/if_lagg.c#3 integrate .. //depot/projects/ppc-g5/sys/net/if_loop.c#2 integrate .. //depot/projects/ppc-g5/sys/net/if_mib.c#3 integrate .. //depot/projects/ppc-g5/sys/net/if_spppsubr.c#2 integrate .. //depot/projects/ppc-g5/sys/net/if_stf.c#3 integrate .. //depot/projects/ppc-g5/sys/net/if_tun.c#3 integrate .. //depot/projects/ppc-g5/sys/net/if_var.h#2 integrate .. //depot/projects/ppc-g5/sys/net/if_vlan.c#3 integrate .. //depot/projects/ppc-g5/sys/net/raw_cb.c#2 integrate .. //depot/projects/ppc-g5/sys/net/raw_usrreq.c#2 integrate .. //depot/projects/ppc-g5/sys/net/route.c#4 integrate .. //depot/projects/ppc-g5/sys/net/rtsock.c#2 integrate .. //depot/projects/ppc-g5/sys/net/vnet.h#1 branch .. //depot/projects/ppc-g5/sys/net80211/ieee80211_ddb.c#4 integrate .. //depot/projects/ppc-g5/sys/netgraph/atm/ng_atm.c#2 integrate .. //depot/projects/ppc-g5/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#2 integrate .. //depot/projects/ppc-g5/sys/netgraph/netgraph.h#3 integrate .. //depot/projects/ppc-g5/sys/netgraph/ng_base.c#4 integrate .. //depot/projects/ppc-g5/sys/netgraph/ng_eiface.c#2 integrate .. //depot/projects/ppc-g5/sys/netgraph/ng_gif.c#2 integrate .. //depot/projects/ppc-g5/sys/netgraph/ng_iface.c#2 integrate .. //depot/projects/ppc-g5/sys/netgraph/ng_tty.c#2 integrate .. //depot/projects/ppc-g5/sys/netgraph/ng_tty.h#2 integrate .. //depot/projects/ppc-g5/sys/netinet/if_ether.c#4 integrate .. //depot/projects/ppc-g5/sys/netinet/igmp.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/in.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/in.h#2 integrate .. //depot/projects/ppc-g5/sys/netinet/in_gif.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/in_mcast.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/in_pcb.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/in_pcb.h#2 integrate .. //depot/projects/ppc-g5/sys/netinet/in_rmx.c#3 integrate .. //depot/projects/ppc-g5/sys/netinet/ip6.h#2 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_carp.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_divert.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_fastfwd.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_fw.h#4 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_fw2.c#4 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_fw_nat.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_icmp.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_input.c#3 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_ipsec.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_mroute.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_options.c#3 integrate .. //depot/projects/ppc-g5/sys/netinet/raw_ip.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/tcp_hostcache.c#3 integrate .. //depot/projects/ppc-g5/sys/netinet/tcp_input.c#4 integrate .. //depot/projects/ppc-g5/sys/netinet/tcp_offload.c#3 integrate .. //depot/projects/ppc-g5/sys/netinet/tcp_output.c#3 integrate .. //depot/projects/ppc-g5/sys/netinet/tcp_reass.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/tcp_sack.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/tcp_subr.c#3 integrate .. //depot/projects/ppc-g5/sys/netinet/tcp_syncache.c#3 integrate .. //depot/projects/ppc-g5/sys/netinet/tcp_timer.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/tcp_timewait.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/tcp_usrreq.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/udp_usrreq.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/vinet.h#1 branch .. //depot/projects/ppc-g5/sys/netinet6/dest6.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet6/frag6.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet6/icmp6.c#3 integrate .. //depot/projects/ppc-g5/sys/netinet6/in6.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet6/in6.h#2 integrate .. //depot/projects/ppc-g5/sys/netinet6/in6_gif.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet6/in6_ifattach.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet6/in6_pcb.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet6/in6_proto.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet6/in6_rmx.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet6/in6_src.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet6/ip6_forward.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet6/ip6_input.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet6/ip6_ipsec.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet6/ip6_mroute.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet6/ip6_output.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet6/mld6.c#3 integrate .. //depot/projects/ppc-g5/sys/netinet6/nd6.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet6/nd6.h#2 integrate .. //depot/projects/ppc-g5/sys/netinet6/nd6_nbr.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet6/nd6_rtr.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet6/raw_ip6.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet6/route6.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet6/scope6.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet6/udp6_usrreq.c#4 integrate .. //depot/projects/ppc-g5/sys/netinet6/vinet6.h#1 branch .. //depot/projects/ppc-g5/sys/netipsec/ipsec.c#2 integrate .. //depot/projects/ppc-g5/sys/netipsec/ipsec.h#2 integrate .. //depot/projects/ppc-g5/sys/netipsec/ipsec_input.c#2 integrate .. //depot/projects/ppc-g5/sys/netipsec/ipsec_mbuf.c#2 integrate .. //depot/projects/ppc-g5/sys/netipsec/ipsec_output.c#2 integrate .. //depot/projects/ppc-g5/sys/netipsec/key.c#2 integrate .. //depot/projects/ppc-g5/sys/netipsec/keysock.c#2 integrate .. //depot/projects/ppc-g5/sys/netipsec/vipsec.h#1 branch .. //depot/projects/ppc-g5/sys/netipsec/xform_ah.c#2 integrate .. //depot/projects/ppc-g5/sys/netipsec/xform_esp.c#2 integrate .. //depot/projects/ppc-g5/sys/netipsec/xform_ipcomp.c#2 integrate .. //depot/projects/ppc-g5/sys/netipsec/xform_ipip.c#2 integrate .. //depot/projects/ppc-g5/sys/nfsclient/nfs_diskless.c#2 integrate .. //depot/projects/ppc-g5/sys/nfsclient/nfs_vfsops.c#3 integrate .. //depot/projects/ppc-g5/sys/nfsclient/nfs_vnops.c#4 integrate .. //depot/projects/ppc-g5/sys/powerpc/include/smp.h#3 integrate .. //depot/projects/ppc-g5/sys/powerpc/powerpc/intr_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/powerpc/powerpc/mp_machdep.c#3 integrate .. //depot/projects/ppc-g5/sys/rpc/authunix_prot.c#2 integrate .. //depot/projects/ppc-g5/sys/sparc64/sparc64/dump_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/sun4v/include/smp.h#2 integrate .. //depot/projects/ppc-g5/sys/sun4v/sun4v/dump_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/sys/conf.h#3 integrate .. //depot/projects/ppc-g5/sys/sys/kerneldump.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/protosw.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/sysctl.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/un.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/vimage.h#2 integrate .. //depot/projects/ppc-g5/sys/vm/swap_pager.c#3 integrate .. //depot/projects/ppc-g5/sys/vm/vm_pageout.c#3 integrate .. //depot/projects/ppc-g5/sys/vm/vm_pageout.h#2 integrate .. //depot/projects/ppc-g5/usr.bin/cpuset/cpuset.1#2 integrate .. //depot/projects/ppc-g5/usr.bin/make/job.c#2 integrate .. //depot/projects/ppc-g5/usr.bin/top/machine.c#3 integrate .. //depot/projects/ppc-g5/usr.sbin/boot0cfg/boot0cfg.c#3 integrate .. //depot/projects/ppc-g5/usr.sbin/bsnmpd/modules/Makefile#2 integrate Differences ... ==== //depot/projects/ppc-g5/ObsoleteFiles.inc#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.162 2008/09/21 16:11:11 antoine Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.163 2008/09/28 20:15:45 ed 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,12 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20080928: removal of inaccurate device_ids(9) manual page +OLD_FILES+=usr/share/man/man9/device_ids.9.gz +OLD_FILES+=usr/share/man/man9/major.9.gz +OLD_FILES+=usr/share/man/man9/minor.9.gz +OLD_FILES+=usr/share/man/man9/umajor.9.gz +OLD_FILES+=usr/share/man/man9/uminor.9.gz # 20080917: removal of manpage for axed kernel primitive suser(9) OLD_FILES+=usr/share/man/man9/suser.9.gz OLD_FILES+=usr/share/man/man9/suser_cred.9.gz ==== //depot/projects/ppc-g5/bin/pkill/pkill.1#2 (text+ko) ==== @@ -1,6 +1,6 @@ .\" $NetBSD: pkill.1,v 1.8 2003/02/14 15:59:18 grant Exp $ .\" -.\" $FreeBSD: src/bin/pkill/pkill.1,v 1.1 2008/08/31 14:27:59 yar Exp $ +.\" $FreeBSD: src/bin/pkill/pkill.1,v 1.3 2008/09/30 17:30:39 ed Exp $ .\" .\" Copyright (c) 2002 The NetBSD Foundation, Inc. .\" All rights reserved. ==== //depot/projects/ppc-g5/bin/pkill/pkill.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.1 2008/08/31 14:27:59 yar Exp $"); +__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.3 2008/09/30 17:30:39 ed Exp $"); #include #include @@ -607,12 +607,11 @@ struct passwd *pw; struct group *gr; struct stat st; - const char *cp, *prefix; + const char *cp; char *sp, *ep, buf[MAXPATHLEN]; int empty; empty = 1; - prefix = _PATH_DEV; while ((sp = strsep(&src, ",")) != NULL) { if (*sp == '\0') @@ -673,21 +672,21 @@ cp = "console"; } else { cp = sp; - if (strncmp(sp, "tty", 3) != 0) - prefix = _PATH_TTY; } - snprintf(buf, sizeof(buf), "%s%s", prefix, cp); + snprintf(buf, sizeof(buf), _PATH_DEV "%s", cp); + if (stat(buf, &st) != -1) + goto foundtty; + + snprintf(buf, sizeof(buf), _PATH_DEV "tty%s", cp); + if (stat(buf, &st) != -1) + goto foundtty; - if (stat(buf, &st) == -1) { - if (errno == ENOENT) { - errx(STATUS_BADUSAGE, - "No such tty: `%s'", sp); - } - err(STATUS_ERROR, "Cannot access `%s'", sp); - } + if (errno == ENOENT) + errx(STATUS_BADUSAGE, "No such tty: `%s'", sp); + err(STATUS_ERROR, "Cannot access `%s'", sp); - if ((st.st_mode & S_IFCHR) == 0) +foundtty: if ((st.st_mode & S_IFCHR) == 0) errx(STATUS_BADUSAGE, "Not a tty: `%s'", sp); li->li_number = st.st_rdev; ==== //depot/projects/ppc-g5/crypto/openssh/moduli.5#2 (text+ko) ==== @@ -13,7 +13,7 @@ .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -.Dd $Mdocdate: June 26 2008 $ +.Dd June 26 2008 .Dt MODULI 5 .Os .Sh NAME ==== //depot/projects/ppc-g5/crypto/openssh/scp.1#2 (text+ko) ==== @@ -11,7 +11,7 @@ .\" .\" $OpenBSD: scp.1,v 1.46 2008/07/12 05:33:41 djm Exp $ .\" -.Dd $Mdocdate: July 12 2008 $ +.Dd July 12 2008 .Dt SCP 1 .Os .Sh NAME ==== //depot/projects/ppc-g5/crypto/openssh/sftp-server.8#2 (text+ko) ==== @@ -22,7 +22,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. .\" -.Dd $Mdocdate: July 18 2008 $ +.Dd July 18 2008 .Dt SFTP-SERVER 8 .Os .Sh NAME ==== //depot/projects/ppc-g5/crypto/openssh/sftp.1#2 (text+ko) ==== @@ -22,7 +22,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. .\" -.Dd $Mdocdate: July 15 2008 $ +.Dd July 15 2008 .Dt SFTP 1 .Os .Sh NAME ==== //depot/projects/ppc-g5/crypto/openssh/ssh-add.1#2 (text+ko) ==== @@ -37,7 +37,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. .\" -.Dd $Mdocdate: June 12 2007 $ +.Dd June 12 2007 .Dt SSH-ADD 1 .Os .Sh NAME ==== //depot/projects/ppc-g5/crypto/openssh/ssh-agent.1#2 (text+ko) ==== @@ -34,7 +34,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. .\" -.Dd $Mdocdate: June 5 2007 $ +.Dd June 5 2007 .Dt SSH-AGENT 1 .Os .Sh NAME ==== //depot/projects/ppc-g5/crypto/openssh/ssh-keygen.1#2 (text+ko) ==== @@ -37,7 +37,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. .\" -.Dd $Mdocdate: June 12 2008 $ +.Dd June 12 2008 .Dt SSH-KEYGEN 1 .Os .Sh NAME ==== //depot/projects/ppc-g5/crypto/openssh/ssh-keyscan.1#2 (text+ko) ==== @@ -6,7 +6,7 @@ .\" permitted provided that due credit is given to the author and the .\" OpenBSD project by leaving this copyright notice intact. .\" -.Dd $Mdocdate: April 30 2008 $ +.Dd April 30 2008 .Dt SSH-KEYSCAN 1 .Os .Sh NAME ==== //depot/projects/ppc-g5/crypto/openssh/ssh-keysign.8#2 (text+ko) ==== @@ -22,7 +22,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. .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd May 31 2007 .Dt SSH-KEYSIGN 8 .Os .Sh NAME ==== //depot/projects/ppc-g5/crypto/openssh/ssh.1#2 (text+ko) ==== @@ -35,8 +35,8 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: ssh.1,v 1.277 2008/07/02 13:47:39 djm Exp $ -.\" $FreeBSD: src/crypto/openssh/ssh.1,v 1.36 2008/08/01 02:48:36 des Exp $ -.Dd $Mdocdate: July 2 2008 $ +.\" $FreeBSD: src/crypto/openssh/ssh.1,v 1.37 2008/09/29 10:53:05 des Exp $ +.Dd July 2 2008 .Dt SSH 1 .Os .Sh NAME ==== //depot/projects/ppc-g5/crypto/openssh/ssh_config.5#2 (text+ko) ==== @@ -35,8 +35,8 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: ssh_config.5,v 1.111 2008/06/26 11:46:31 grunk Exp $ -.\" $FreeBSD: src/crypto/openssh/ssh_config.5,v 1.24 2008/08/01 02:48:36 des Exp $ -.Dd $Mdocdate: June 26 2008 $ +.\" $FreeBSD: src/crypto/openssh/ssh_config.5,v 1.25 2008/09/29 10:53:05 des Exp $ +.Dd June 26 2008 .Dt SSH_CONFIG 5 .Os .Sh NAME ==== //depot/projects/ppc-g5/crypto/openssh/sshd.8#2 (text+ko) ==== @@ -35,8 +35,8 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: sshd.8,v 1.246 2008/07/02 02:24:18 djm Exp $ -.\" $FreeBSD: src/crypto/openssh/sshd.8,v 1.35 2008/08/01 02:48:36 des Exp $ -.Dd $Mdocdate: July 2 2008 $ +.\" $FreeBSD: src/crypto/openssh/sshd.8,v 1.36 2008/09/29 10:53:05 des Exp $ +.Dd July 2 2008 .Dt SSHD 8 .Os .Sh NAME ==== //depot/projects/ppc-g5/crypto/openssh/sshd_config.5#2 (text+ko) ==== @@ -35,8 +35,8 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: sshd_config.5,v 1.96 2008/07/02 02:24:18 djm Exp $ -.\" $FreeBSD: src/crypto/openssh/sshd_config.5,v 1.30 2008/08/01 02:48:36 des Exp $ -.Dd $Mdocdate: July 2 2008 $ +.\" $FreeBSD: src/crypto/openssh/sshd_config.5,v 1.31 2008/09/29 10:53:05 des Exp $ +.Dd July 2 2008 .Dt SSHD_CONFIG 5 .Os .Sh NAME ==== //depot/projects/ppc-g5/etc/network.subr#2 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/network.subr,v 1.190 2008/06/23 20:50:11 mtm Exp $ +# $FreeBSD: src/etc/network.subr,v 1.191 2008/10/01 18:46:46 brooks Exp $ # # @@ -506,15 +506,9 @@ # Create wireless interfaces child_wlans=`get_if_var $ifn wlans_IF` - if [ -z "${child_wlans}" ]; then - child_wlans=`get_if_var $ifn vaps_IF` - if [ -n "${child_wlans}" ]; then - warn "soon to be deleted vaps_$ifn variable defined use wlans_$ifn" - fi - fi for child in ${child_wlans}; do - create_args="wlandev $ifn `get_if_var $child create_args_IF` `get_if_var $child vap_create_IF`" + create_args="wlandev $ifn `get_if_var $child create_args_IF`" if expr $child : 'wlan[0-9][0-9]*$' >/dev/null 2>&1; then ifconfig $child create ${create_args} && cfg=0 else ==== //depot/projects/ppc-g5/gnu/lib/csu/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.30 2008/09/26 15:00:18 marcel Exp $ +# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.31 2008/09/28 19:17:54 marcel Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../contrib/gcclibs @@ -25,7 +25,7 @@ BEGINSRC= crtbegin.asm ENDSRC= crtend.asm CFLAGS+= -x assembler-with-cpp # Ugly hack -CFLAGS+= -D_OSRELDATE_H -include osreldate.h +CFLAGS+= -include osreldate.h .undef SRCS # hack for 'make depend' .endif .if ${MACHINE_ARCH} == "powerpc" ==== //depot/projects/ppc-g5/gnu/usr.bin/gdb/kgdb/kld.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kld.c,v 1.10 2008/09/25 19:32:03 jhb Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kld.c,v 1.11 2008/10/02 20:42:10 jhb Exp $"); #include #include @@ -201,7 +201,7 @@ load_kld (char *path, CORE_ADDR base_addr, int from_tty) { struct section_addr_info *sap; - struct section_table *sections, *sections_end, *s; + struct section_table *sections = NULL, *sections_end = NULL, *s; struct cleanup *cleanup; bfd *bfd; int i; ==== //depot/projects/ppc-g5/lib/libarchive/archive_entry.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.53 2008/09/01 04:54:29 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.54 2008/09/30 03:53:03 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -461,6 +461,24 @@ } time_t +archive_entry_birthtime(struct archive_entry *entry) +{ + return (entry->ae_stat.aest_birthtime); +} + +long +archive_entry_birthtime_nsec(struct archive_entry *entry) +{ + return (entry->ae_stat.aest_birthtime_nsec); +} + +int +archive_entry_birthtime_is_set(struct archive_entry *entry) +{ + return (entry->ae_set & AE_SET_BIRTHTIME); +} + +time_t archive_entry_ctime(struct archive_entry *entry) { return (entry->ae_stat.aest_ctime); @@ -838,6 +856,22 @@ } void +archive_entry_set_birthtime(struct archive_entry *entry, time_t m, long ns) +{ + entry->stat_valid = 0; + entry->ae_set |= AE_SET_BIRTHTIME; + entry->ae_stat.aest_birthtime = m; + entry->ae_stat.aest_birthtime_nsec = ns; +} + +void +archive_entry_unset_birthtime(struct archive_entry *entry) +{ + archive_entry_set_birthtime(entry, 0, 0); + entry->ae_set &= ~AE_SET_BIRTHTIME; +} + +void archive_entry_set_ctime(struct archive_entry *entry, time_t t, long ns) { entry->stat_valid = 0; ==== //depot/projects/ppc-g5/lib/libarchive/archive_entry.h#4 (text+ko) ==== @@ -22,7 +22,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. * - * $FreeBSD: src/lib/libarchive/archive_entry.h,v 1.29 2008/09/18 04:19:06 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_entry.h,v 1.30 2008/09/30 03:53:03 kientzle Exp $ */ #ifndef ARCHIVE_ENTRY_H_INCLUDED @@ -174,6 +174,9 @@ __LA_DECL time_t archive_entry_atime(struct archive_entry *); __LA_DECL long archive_entry_atime_nsec(struct archive_entry *); __LA_DECL int archive_entry_atime_is_set(struct archive_entry *); +__LA_DECL time_t archive_entry_birthtime(struct archive_entry *); +__LA_DECL long archive_entry_birthtime_nsec(struct archive_entry *); +__LA_DECL int archive_entry_birthtime_is_set(struct archive_entry *); __LA_DECL time_t archive_entry_ctime(struct archive_entry *); __LA_DECL long archive_entry_ctime_nsec(struct archive_entry *); __LA_DECL int archive_entry_ctime_is_set(struct archive_entry *); @@ -224,6 +227,8 @@ __LA_DECL void archive_entry_set_atime(struct archive_entry *, time_t, long); __LA_DECL void archive_entry_unset_atime(struct archive_entry *); +__LA_DECL void archive_entry_set_birthtime(struct archive_entry *, time_t, long); +__LA_DECL void archive_entry_unset_birthtime(struct archive_entry *); __LA_DECL void archive_entry_set_ctime(struct archive_entry *, time_t, long); __LA_DECL void archive_entry_unset_ctime(struct archive_entry *); __LA_DECL void archive_entry_set_dev(struct archive_entry *, dev_t); ==== //depot/projects/ppc-g5/lib/libarchive/archive_entry_copy_stat.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_copy_stat.c,v 1.1 2007/05/29 01:00:18 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_copy_stat.c,v 1.2 2008/09/30 03:53:03 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -47,6 +47,12 @@ archive_entry_set_atime(entry, st->st_atime, 0); archive_entry_set_ctime(entry, st->st_ctime, 0); archive_entry_set_mtime(entry, st->st_mtime, 0); +#if HAVE_STRUCT_STAT_ST_BIRTHTIME + archive_entry_set_birthtime(entry, st->st_birthtime, 0); +#endif +#endif +#if HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC + archive_entry_set_birthtime(entry, st->st_birthtime, st->st_birthtimespec.tv_nsec); #endif archive_entry_set_dev(entry, st->st_dev); archive_entry_set_gid(entry, st->st_gid); ==== //depot/projects/ppc-g5/lib/libarchive/archive_entry_private.h#3 (text+ko) ==== @@ -22,7 +22,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. * - * $FreeBSD: src/lib/libarchive/archive_entry_private.h,v 1.5 2008/09/01 04:54:29 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_entry_private.h,v 1.6 2008/09/30 03:53:03 kientzle Exp $ */ #ifndef ARCHIVE_ENTRY_PRIVATE_H_INCLUDED @@ -112,6 +112,8 @@ uint32_t aest_ctime_nsec; int64_t aest_mtime; uint32_t aest_mtime_nsec; + int64_t aest_birthtime; + uint32_t aest_birthtime_nsec; gid_t aest_gid; ino_t aest_ino; mode_t aest_mode; @@ -142,6 +144,7 @@ #define AE_SET_ATIME 4 #define AE_SET_CTIME 8 #define AE_SET_MTIME 16 +#define AE_SET_BIRTHTIME 32 #define AE_SET_SIZE 64 /* ==== //depot/projects/ppc-g5/lib/libarchive/archive_entry_stat.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_stat.c,v 1.1 2007/05/29 01:00:18 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_stat.c,v 1.2 2008/09/30 03:53:03 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -64,6 +64,9 @@ * the appropriate conversions get invoked. */ st->st_atime = archive_entry_atime(entry); +#if HAVE_STRUCT_STAT_ST_BIRTHTIME + st->st_birthtime = archive_entry_birthtime(entry); +#endif st->st_ctime = archive_entry_ctime(entry); st->st_mtime = archive_entry_mtime(entry); st->st_dev = archive_entry_dev(entry); @@ -88,6 +91,9 @@ st->st_ctim.tv_nsec = archive_entry_ctime_nsec(entry); st->st_mtim.tv_nsec = archive_entry_mtime_nsec(entry); #endif +#if HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC + st->st_birthtimespec.tv_nsec = archive_entry_birthtime_nsec(entry); +#endif /* * TODO: On Linux, store 32 or 64 here depending on whether ==== //depot/projects/ppc-g5/lib/libarchive/archive_read_support_format_tar.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.70 2008/07/10 09:50:55 cperciva Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.71 2008/09/30 03:57:07 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include @@ -1451,6 +1451,10 @@ if (strcmp(key, "LIBARCHIVE.xxxxxxx")==0) archive_entry_set_xxxxxx(entry, value); */ + if (strcmp(key, "LIBARCHIVE.creationtime")==0) { + pax_time(value, &s, &n); + archive_entry_set_birthtime(entry, s, n); + } if (strncmp(key, "LIBARCHIVE.xattr.", 17)==0) pax_attribute_xattr(entry, key, value); break; ==== //depot/projects/ppc-g5/lib/libarchive/archive_write_disk.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.39 2008/09/14 05:51:25 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.40 2008/09/30 04:02:36 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include @@ -96,10 +96,12 @@ struct fixup_entry { struct fixup_entry *next; mode_t mode; + int64_t atime; + int64_t birthtime; int64_t mtime; - int64_t atime; + unsigned long atime_nanos; + unsigned long birthtime_nanos; unsigned long mtime_nanos; - unsigned long atime_nanos; unsigned long fflags_set; int fixup; /* bitmask of what needs fixing */ char *name; @@ -227,7 +229,8 @@ unsigned long fflags_set, unsigned long fflags_clear); static int set_ownership(struct archive_write_disk *); static int set_mode(struct archive_write_disk *, int mode); -static int set_time(struct archive_write_disk *); +static int set_time(int, int, const char *, time_t, long, time_t, long); +static int set_times(struct archive_write_disk *); static struct fixup_entry *sort_dir_list(struct fixup_entry *p); static gid_t trivial_lookup_gid(void *, const char *, gid_t); static uid_t trivial_lookup_uid(void *, const char *, uid_t); @@ -448,19 +451,29 @@ || archive_entry_atime_is_set(entry))) { fe = current_fixup(a, archive_entry_pathname(entry)); fe->fixup |= TODO_TIMES; + if (archive_entry_atime_is_set(entry)) { + fe->atime = archive_entry_atime(entry); + fe->atime_nanos = archive_entry_atime_nsec(entry); + } else { + /* If atime is unset, use start time. */ + fe->atime = a->start_time; + fe->atime_nanos = 0; + } if (archive_entry_mtime_is_set(entry)) { fe->mtime = archive_entry_mtime(entry); fe->mtime_nanos = archive_entry_mtime_nsec(entry); } else { + /* If mtime is unset, use start time. */ fe->mtime = a->start_time; fe->mtime_nanos = 0; } - if (archive_entry_atime_is_set(entry)) { - fe->atime = archive_entry_atime(entry); - fe->atime_nanos = archive_entry_atime_nsec(entry); + if (archive_entry_birthtime_is_set(entry)) { + fe->birthtime = archive_entry_birthtime(entry); + fe->birthtime_nanos = archive_entry_birthtime_nsec(entry); } else { - fe->atime = a->start_time; - fe->atime_nanos = 0; + /* If birthtime is unset, use mtime. */ + fe->birthtime = fe->mtime; + fe->birthtime_nanos = fe->mtime_nanos; } } @@ -698,7 +711,7 @@ if (r2 < ret) ret = r2; } if (a->todo & TODO_TIMES) { - int r2 = set_time(a); + int r2 = set_times(a); if (r2 < ret) ret = r2; } if (a->todo & TODO_ACLS) { @@ -1170,10 +1183,19 @@ #ifdef HAVE_UTIMES /* {f,l,}utimes() are preferred, when available. */ struct timeval times[2]; + times[0].tv_sec = p->atime; + times[0].tv_usec = p->atime_nanos / 1000; +#ifdef HAVE_STRUCT_STAT_ST_BIRTHTIME + /* if it's valid and not mtime, push the birthtime first */ + if (((times[1].tv_sec = p->birthtime) < p->mtime) && + (p->birthtime > 0)) + { + times[1].tv_usec = p->birthtime_nanos / 1000; + utimes(p->name, times); + } +#endif times[1].tv_sec = p->mtime; times[1].tv_usec = p->mtime_nanos / 1000; - times[0].tv_sec = p->atime; - times[0].tv_usec = p->atime_nanos / 1000; #ifdef HAVE_LUTIMES lutimes(p->name, times); #else @@ -1687,61 +1709,31 @@ * when they're available. */ static int -set_time(struct archive_write_disk *a) +set_time(int fd, int mode, const char *name, + time_t atime, long atime_nsec, + time_t mtime, long mtime_nsec) { struct timeval times[2]; - /* If no time was provided, we're done. */ - if (!archive_entry_atime_is_set(a->entry) - && !archive_entry_mtime_is_set(a->entry)) - return (ARCHIVE_OK); - - /* We know at least one is set, so... */ - if (archive_entry_mtime_is_set(a->entry)) { - times[1].tv_sec = archive_entry_mtime(a->entry); - times[1].tv_usec = archive_entry_mtime_nsec(a->entry) / 1000; - } else { - times[1].tv_sec = a->start_time; - times[1].tv_usec = 0; - } + times[0].tv_sec = atime; + times[0].tv_usec = atime_nsec / 1000; + times[1].tv_sec = mtime; + times[1].tv_usec = mtime_nsec / 1000; - /* If no atime was specified, use start time instead. */ - /* In theory, it would be marginally more correct to use - * time(NULL) here, but that would cost us an extra syscall - * for little gain. */ - if (archive_entry_atime_is_set(a->entry)) { - times[0].tv_sec = archive_entry_atime(a->entry); - times[0].tv_usec = archive_entry_atime_nsec(a->entry) / 1000; - } else { - times[0].tv_sec = a->start_time; - times[0].tv_usec = 0; - } - #ifdef HAVE_FUTIMES >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Oct 4 03:24:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 268171065689; Sat, 4 Oct 2008 03:24:54 +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 CEAF81065699 for ; Sat, 4 Oct 2008 03:24:53 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BA12B8FC28 for ; Sat, 4 Oct 2008 03:24:53 +0000 (UTC) (envelope-from nwhitehorn@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 m943Orth037705 for ; Sat, 4 Oct 2008 03:24:53 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m943OrJQ037703 for perforce@freebsd.org; Sat, 4 Oct 2008 03:24:53 GMT (envelope-from nwhitehorn@freebsd.org) Date: Sat, 4 Oct 2008 03:24:53 GMT Message-Id: <200810040324.m943OrJQ037703@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nwhitehorn@freebsd.org using -f From: Nathan Whitehorn To: Perforce Change Reviews Cc: Subject: PERFORCE change 150922 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, 04 Oct 2008 03:24:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=150922 Change 150922 by nwhitehorn@nwhitehorn_trantor on 2008/10/04 03:23:58 Remove accidentally added junk. Affected files ... .. //depot/projects/ppc-g5/ports/CHANGES#2 delete .. //depot/projects/ppc-g5/ports/COPYRIGHT#2 delete .. //depot/projects/ppc-g5/ports/GIDs#2 delete .. //depot/projects/ppc-g5/ports/KNOBS#2 delete .. //depot/projects/ppc-g5/ports/LEGAL#2 delete .. //depot/projects/ppc-g5/ports/MOVED#2 delete .. //depot/projects/ppc-g5/ports/Makefile#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.apache.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.autotools.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.cmake.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.commands.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.database.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.destdir.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.efl.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.emacs.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.fpc.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.gcc.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.gecko.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.gnome.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.gnustep.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.gstreamer.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.java.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.kde.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.kde4.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.ldap.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.linux-rpm.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.local.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.lua.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.mail.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.ocaml.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.openssl.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.perl.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.php.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.port.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.port.options.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.port.post.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.port.pre.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.port.subdir.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.python.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.qt.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.ruby.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.scons.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.sdl.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.sites.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.tcl.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.wx.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.xfce.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.xorg.mk#2 delete .. //depot/projects/ppc-g5/ports/README#2 delete .. //depot/projects/ppc-g5/ports/Templates/BSD.local.dist#2 delete .. //depot/projects/ppc-g5/ports/Templates/README.category#2 delete .. //depot/projects/ppc-g5/ports/Templates/README.port#2 delete .. //depot/projects/ppc-g5/ports/Templates/README.top#2 delete .. //depot/projects/ppc-g5/ports/Templates/config.guess#2 delete .. //depot/projects/ppc-g5/ports/Templates/config.sub#2 delete .. //depot/projects/ppc-g5/ports/Tools/make_index#2 delete .. //depot/projects/ppc-g5/ports/Tools/make_readmes#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/4/bindist/README#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/4/bindist/delete#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/4/bindist/dirlist#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/4/bindist/files/usr/bin/uname#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/4/mkbindist.conf#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/5/bindist/files/usr/bin/uname#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/5/mkbindist.conf#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/errorlogs/index.shtml#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/mlist#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/portbuild.conf#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/allgohans#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/bothlogs#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/build#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/buildenv#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/buildfailure#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/buildproxy#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/buildproxy-client#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/buildscript#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/buildsuccess#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/checkmachines#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/checkmachines.sh#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/chopindex#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/claim-chroot#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/clean-chroot#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/cleanup-chroots#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/client-metrics#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/comparelogs#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/cpdistfiles#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/cppackages#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/docppackages#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/dodistfiles#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/dologs#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/dopackages#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/dopackages.wrapper#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/dopackages2#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/dopackagestats#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/dosetupnode#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/flushsquid#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/getmachine#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/keeprestr#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/makeduds#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/makeindex#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/makeparallel#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/makerestr#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/makeworld#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/mkbindist#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/packagebuild#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/pdispatch#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/pnohang.c#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/pollmachine#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/portbuild#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/processfail#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/processlogs#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/processlogs2#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/processonelog#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/prunebad#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/prunefailure#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/prunepkgs#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/ptimeout.c#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/releasemachine#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/reportload#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/reportload.sh#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/setupnode#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/showrunning#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/stats#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/straslivy.py#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/updatesnap#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/zbackup#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/zexpire#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/MOVEDlint.awk#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/README#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/README.patchtool#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/README.portsearch#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/addport#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/ardiff#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/bad-pkgdescrs.sh#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/bump_revision.pl#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/check-latest-link#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/checkcats.py#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/checknewver.sh#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/checksize.sh#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/checksum.sh#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/chkdepschain.py#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/chkorigin.sh#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/chkversion.pl#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/close-pr#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/consistency-check#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/distclean.sh#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/distinfochecker#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/domakedescribe#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/doportlint#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/explicit_lib_depends.sh#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/getpr#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/gnomedepends.py#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/mergebase.sh#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/mkptools/mkpbuild#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/mkptools/mkpclean#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/mkptools/mkpextr#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/mkptools/mkpinstall#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/mkptools/mkpmerge#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/mkptools/mkppackage#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/mkptools/mkpskel#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/modules/Makefile#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/modules/buildmodules.pl#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/modules/modules.head#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/modules/update.sh#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/neededlibs.sh#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/parse-kdump.tcl#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/patchtool.py#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/pkg-stash/pkg-list.sh#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/pkg-stash/pkg-stash.pl#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/plist#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/portsearch#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/portsvar.sh#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/prdone#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/prpatch#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/release/Makefile#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/release/README#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/release/checkdeps.pl#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/release/config#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/release/doit.sh#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/release/oneshot.pl#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/release/scrubindex.pl#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/release/setup.sh#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/resolveportsfromlibs.sh#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/rmport#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/security-check.awk#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/splitpatch.pl#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/sunshar.rb#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/sunshar/Makefile#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/sunshar/sunshar.1#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/tindex#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/update-patches#2 delete .. //depot/projects/ppc-g5/ports/UIDs#2 delete .. //depot/projects/ppc-g5/ports/UPDATING#2 delete .. //depot/projects/ppc-g5/src/COPYRIGHT#2 delete .. //depot/projects/ppc-g5/src/LOCKS#2 delete .. //depot/projects/ppc-g5/src/MAINTAINERS#2 delete .. //depot/projects/ppc-g5/src/Makefile#2 delete .. //depot/projects/ppc-g5/src/Makefile.inc1#2 delete .. //depot/projects/ppc-g5/src/ObsoleteFiles.inc#2 delete .. //depot/projects/ppc-g5/src/README#2 delete .. //depot/projects/ppc-g5/src/UPDATING#2 delete .. //depot/projects/ppc-g5/src/bin/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/Makefile.inc#2 delete .. //depot/projects/ppc-g5/src/bin/cat/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/cat/cat.1#2 delete .. //depot/projects/ppc-g5/src/bin/cat/cat.c#2 delete .. //depot/projects/ppc-g5/src/bin/chflags/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/chflags/chflags.1#2 delete .. //depot/projects/ppc-g5/src/bin/chflags/chflags.c#2 delete .. //depot/projects/ppc-g5/src/bin/chio/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/chio/chio.1#2 delete .. //depot/projects/ppc-g5/src/bin/chio/chio.c#2 delete .. //depot/projects/ppc-g5/src/bin/chio/defs.h#2 delete .. //depot/projects/ppc-g5/src/bin/chio/pathnames.h#2 delete .. //depot/projects/ppc-g5/src/bin/chmod/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/chmod/chmod.1#2 delete .. //depot/projects/ppc-g5/src/bin/chmod/chmod.c#2 delete .. //depot/projects/ppc-g5/src/bin/cp/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/cp/cp.1#2 delete .. //depot/projects/ppc-g5/src/bin/cp/cp.c#2 delete .. //depot/projects/ppc-g5/src/bin/cp/extern.h#2 delete .. //depot/projects/ppc-g5/src/bin/cp/utils.c#2 delete .. //depot/projects/ppc-g5/src/bin/csh/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/csh/USD.doc/csh.1#2 delete .. //depot/projects/ppc-g5/src/bin/csh/USD.doc/csh.2#2 delete .. //depot/projects/ppc-g5/src/bin/csh/USD.doc/csh.3#2 delete .. //depot/projects/ppc-g5/src/bin/csh/USD.doc/csh.4#2 delete .. //depot/projects/ppc-g5/src/bin/csh/USD.doc/csh.a#2 delete .. //depot/projects/ppc-g5/src/bin/csh/USD.doc/csh.g#2 delete .. //depot/projects/ppc-g5/src/bin/csh/USD.doc/tabs#2 delete .. //depot/projects/ppc-g5/src/bin/csh/config.h#2 delete .. //depot/projects/ppc-g5/src/bin/csh/config_p.h#2 delete .. //depot/projects/ppc-g5/src/bin/csh/host.defs#2 delete .. //depot/projects/ppc-g5/src/bin/csh/iconv.h#2 delete .. //depot/projects/ppc-g5/src/bin/csh/iconv_stub.c#2 delete .. //depot/projects/ppc-g5/src/bin/date/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/date/date.1#2 delete .. //depot/projects/ppc-g5/src/bin/date/date.c#2 delete .. //depot/projects/ppc-g5/src/bin/date/extern.h#2 delete .. //depot/projects/ppc-g5/src/bin/date/netdate.c#2 delete .. //depot/projects/ppc-g5/src/bin/date/vary.c#2 delete .. //depot/projects/ppc-g5/src/bin/date/vary.h#2 delete .. //depot/projects/ppc-g5/src/bin/dd/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/dd/args.c#2 delete .. //depot/projects/ppc-g5/src/bin/dd/conv.c#2 delete .. //depot/projects/ppc-g5/src/bin/dd/conv_tab.c#2 delete .. //depot/projects/ppc-g5/src/bin/dd/dd.1#2 delete .. //depot/projects/ppc-g5/src/bin/dd/dd.c#2 delete .. //depot/projects/ppc-g5/src/bin/dd/dd.h#2 delete .. //depot/projects/ppc-g5/src/bin/dd/extern.h#2 delete .. //depot/projects/ppc-g5/src/bin/dd/gen.c#2 delete .. //depot/projects/ppc-g5/src/bin/dd/misc.c#2 delete .. //depot/projects/ppc-g5/src/bin/dd/position.c#2 delete .. //depot/projects/ppc-g5/src/bin/dd/ref.ascii#2 delete .. //depot/projects/ppc-g5/src/bin/dd/ref.ebcdic#2 delete .. //depot/projects/ppc-g5/src/bin/dd/ref.ibm#2 delete .. //depot/projects/ppc-g5/src/bin/dd/ref.lcase#2 delete .. //depot/projects/ppc-g5/src/bin/dd/ref.oldascii#2 delete .. //depot/projects/ppc-g5/src/bin/dd/ref.oldebcdic#2 delete .. //depot/projects/ppc-g5/src/bin/dd/ref.oldibm#2 delete .. //depot/projects/ppc-g5/src/bin/dd/ref.pareven#2 delete .. //depot/projects/ppc-g5/src/bin/dd/ref.parnone#2 delete .. //depot/projects/ppc-g5/src/bin/dd/ref.parodd#2 delete .. //depot/projects/ppc-g5/src/bin/dd/ref.parset#2 delete .. //depot/projects/ppc-g5/src/bin/dd/ref.swab#2 delete .. //depot/projects/ppc-g5/src/bin/dd/ref.ucase#2 delete .. //depot/projects/ppc-g5/src/bin/df/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/df/df.1#2 delete .. //depot/projects/ppc-g5/src/bin/df/df.c#2 delete .. //depot/projects/ppc-g5/src/bin/domainname/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/domainname/domainname.1#2 delete .. //depot/projects/ppc-g5/src/bin/domainname/domainname.c#2 delete .. //depot/projects/ppc-g5/src/bin/echo/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/echo/echo.1#2 delete .. //depot/projects/ppc-g5/src/bin/echo/echo.c#2 delete .. //depot/projects/ppc-g5/src/bin/ed/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/ed/POSIX#2 delete .. //depot/projects/ppc-g5/src/bin/ed/README#2 delete .. //depot/projects/ppc-g5/src/bin/ed/buf.c#2 delete .. //depot/projects/ppc-g5/src/bin/ed/cbc.c#2 delete .. //depot/projects/ppc-g5/src/bin/ed/ed.1#2 delete .. //depot/projects/ppc-g5/src/bin/ed/ed.h#2 delete .. //depot/projects/ppc-g5/src/bin/ed/glbl.c#2 delete .. //depot/projects/ppc-g5/src/bin/ed/io.c#2 delete .. //depot/projects/ppc-g5/src/bin/ed/main.c#2 delete .. //depot/projects/ppc-g5/src/bin/ed/re.c#2 delete .. //depot/projects/ppc-g5/src/bin/ed/sub.c#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/=.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/README#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/TODO#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/a.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/a.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/a.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/a1.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/a2.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/addr.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/addr.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/addr.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/addr1.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/addr2.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/ascii.d.uu#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/ascii.r.uu#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/ascii.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/bang1.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/bang1.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/bang1.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/bang1.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/bang2.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/c.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/c.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/c.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/c1.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/c2.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/ckscripts.sh#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/d.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/d.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/d.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/d.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/e1.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/e1.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/e1.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/e1.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/e2.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/e2.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/e2.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/e2.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/e3.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/e3.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/e3.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/e3.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/e4.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/e4.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/e4.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/f1.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/f2.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/g1.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/g1.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/g1.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/g1.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/g2.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/g2.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/g2.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/g2.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/g3.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/g3.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/g3.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/g3.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/g4.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/g4.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/g4.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/g5.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/g5.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/g5.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/h.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/i.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/i.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/i.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/i1.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/i2.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/i3.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/j.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/j.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/j.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/k.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/k.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/k.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/k1.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/k2.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/k3.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/k4.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/l.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/l.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/l.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/m.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/m.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/m.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/m.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/mkscripts.sh#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/n.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/n.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/n.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/nl.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/nl1.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/nl1.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/nl1.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/nl2.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/nl2.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/nl2.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/p.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/p.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/p.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/q.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/q.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/q.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/q1.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/r1.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/r1.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/r1.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/r1.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/r2.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/r2.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/r2.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/r2.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/r3.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/r3.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/r3.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/s1.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/s1.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/s1.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/s1.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/s10.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/s2.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/s2.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/s2.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/s2.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/s3.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/s3.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/s3.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/s3.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/s4.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/s5.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/s6.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/s7.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/s8.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/s9.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/t.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/t.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/t1.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/t1.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/t1.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/t1.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/t2.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/t2.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/t2.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/t2.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/u.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/u.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/u.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/u.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/v.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/v.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/v.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/w.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/w.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/w.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/w1.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/w2.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/w3.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/x.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/z.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/undo.c#2 delete .. //depot/projects/ppc-g5/src/bin/expr/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/expr/expr.1#2 delete .. //depot/projects/ppc-g5/src/bin/expr/expr.y#2 delete .. //depot/projects/ppc-g5/src/bin/getfacl/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/getfacl/getfacl.1#2 delete .. //depot/projects/ppc-g5/src/bin/getfacl/getfacl.c#2 delete .. //depot/projects/ppc-g5/src/bin/hostname/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/hostname/hostname.1#2 delete .. //depot/projects/ppc-g5/src/bin/hostname/hostname.c#2 delete .. //depot/projects/ppc-g5/src/bin/kenv/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/kenv/kenv.1#2 delete .. //depot/projects/ppc-g5/src/bin/kenv/kenv.c#2 delete .. //depot/projects/ppc-g5/src/bin/kill/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/kill/kill.1#2 delete .. //depot/projects/ppc-g5/src/bin/kill/kill.c#2 delete .. //depot/projects/ppc-g5/src/bin/ln/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/ln/ln.1#2 delete .. //depot/projects/ppc-g5/src/bin/ln/ln.c#2 delete .. //depot/projects/ppc-g5/src/bin/ln/symlink.7#2 delete .. //depot/projects/ppc-g5/src/bin/ls/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/ls/cmp.c#2 delete .. //depot/projects/ppc-g5/src/bin/ls/extern.h#2 delete .. //depot/projects/ppc-g5/src/bin/ls/ls.1#2 delete .. //depot/projects/ppc-g5/src/bin/ls/ls.c#2 delete .. //depot/projects/ppc-g5/src/bin/ls/ls.h#2 delete .. //depot/projects/ppc-g5/src/bin/ls/print.c#2 delete .. //depot/projects/ppc-g5/src/bin/ls/util.c#2 delete .. //depot/projects/ppc-g5/src/bin/mkdir/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/mkdir/mkdir.1#2 delete .. //depot/projects/ppc-g5/src/bin/mkdir/mkdir.c#2 delete .. //depot/projects/ppc-g5/src/bin/mv/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/mv/mv.1#2 delete .. //depot/projects/ppc-g5/src/bin/mv/mv.c#2 delete .. //depot/projects/ppc-g5/src/bin/pax/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/pax/ar_io.c#2 delete .. //depot/projects/ppc-g5/src/bin/pax/ar_subs.c#2 delete .. //depot/projects/ppc-g5/src/bin/pax/buf_subs.c#2 delete .. //depot/projects/ppc-g5/src/bin/pax/cache.c#2 delete .. //depot/projects/ppc-g5/src/bin/pax/cache.h#2 delete .. //depot/projects/ppc-g5/src/bin/pax/cpio.1#2 delete .. //depot/projects/ppc-g5/src/bin/pax/cpio.c#2 delete .. //depot/projects/ppc-g5/src/bin/pax/cpio.h#2 delete .. //depot/projects/ppc-g5/src/bin/pax/extern.h#2 delete .. //depot/projects/ppc-g5/src/bin/pax/file_subs.c#2 delete .. //depot/projects/ppc-g5/src/bin/pax/ftree.c#2 delete .. //depot/projects/ppc-g5/src/bin/pax/ftree.h#2 delete .. //depot/projects/ppc-g5/src/bin/pax/gen_subs.c#2 delete .. //depot/projects/ppc-g5/src/bin/pax/getoldopt.c#2 delete .. //depot/projects/ppc-g5/src/bin/pax/options.c#2 delete .. //depot/projects/ppc-g5/src/bin/pax/options.h#2 delete .. //depot/projects/ppc-g5/src/bin/pax/pat_rep.c#2 delete .. //depot/projects/ppc-g5/src/bin/pax/pat_rep.h#2 delete .. //depot/projects/ppc-g5/src/bin/pax/pax.1#2 delete .. //depot/projects/ppc-g5/src/bin/pax/pax.c#2 delete .. //depot/projects/ppc-g5/src/bin/pax/pax.h#2 delete .. //depot/projects/ppc-g5/src/bin/pax/sel_subs.c#2 delete .. //depot/projects/ppc-g5/src/bin/pax/sel_subs.h#2 delete .. //depot/projects/ppc-g5/src/bin/pax/tables.c#2 delete .. //depot/projects/ppc-g5/src/bin/pax/tables.h#2 delete .. //depot/projects/ppc-g5/src/bin/pax/tar.1#2 delete .. //depot/projects/ppc-g5/src/bin/pax/tar.c#2 delete .. //depot/projects/ppc-g5/src/bin/pax/tar.h#2 delete .. //depot/projects/ppc-g5/src/bin/pax/tty_subs.c#2 delete .. //depot/projects/ppc-g5/src/bin/ps/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/ps/extern.h#2 delete .. //depot/projects/ppc-g5/src/bin/ps/fmt.c#2 delete .. //depot/projects/ppc-g5/src/bin/ps/keyword.c#2 delete .. //depot/projects/ppc-g5/src/bin/ps/nlist.c#2 delete .. //depot/projects/ppc-g5/src/bin/ps/print.c#2 delete .. //depot/projects/ppc-g5/src/bin/ps/ps.1#2 delete .. //depot/projects/ppc-g5/src/bin/ps/ps.c#2 delete .. //depot/projects/ppc-g5/src/bin/ps/ps.h#2 delete .. //depot/projects/ppc-g5/src/bin/pwd/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/pwd/pwd.1#2 delete .. //depot/projects/ppc-g5/src/bin/pwd/pwd.c#2 delete .. //depot/projects/ppc-g5/src/bin/rcp/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/rcp/extern.h#2 delete .. //depot/projects/ppc-g5/src/bin/rcp/rcp.1#2 delete .. //depot/projects/ppc-g5/src/bin/rcp/rcp.c#2 delete .. //depot/projects/ppc-g5/src/bin/rcp/util.c#2 delete .. //depot/projects/ppc-g5/src/bin/realpath/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/realpath/realpath.1#2 delete .. //depot/projects/ppc-g5/src/bin/realpath/realpath.c#2 delete .. //depot/projects/ppc-g5/src/bin/rm/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/rm/rm.1#2 delete .. //depot/projects/ppc-g5/src/bin/rm/rm.c#2 delete .. //depot/projects/ppc-g5/src/bin/rmail/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/rmdir/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/rmdir/rmdir.1#2 delete .. //depot/projects/ppc-g5/src/bin/rmdir/rmdir.c#2 delete .. //depot/projects/ppc-g5/src/bin/setfacl/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/setfacl/file.c#2 delete .. //depot/projects/ppc-g5/src/bin/setfacl/mask.c#2 delete .. //depot/projects/ppc-g5/src/bin/setfacl/merge.c#2 delete .. //depot/projects/ppc-g5/src/bin/setfacl/remove.c#2 delete .. //depot/projects/ppc-g5/src/bin/setfacl/setfacl.1#2 delete .. //depot/projects/ppc-g5/src/bin/setfacl/setfacl.c#2 delete .. //depot/projects/ppc-g5/src/bin/setfacl/setfacl.h#2 delete .. //depot/projects/ppc-g5/src/bin/setfacl/util.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/sh/TOUR#2 delete .. //depot/projects/ppc-g5/src/bin/sh/alias.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/alias.h#2 delete .. //depot/projects/ppc-g5/src/bin/sh/arith.h#2 delete .. //depot/projects/ppc-g5/src/bin/sh/arith.y#2 delete .. //depot/projects/ppc-g5/src/bin/sh/arith_lex.l#2 delete .. //depot/projects/ppc-g5/src/bin/sh/bltin/bltin.h#2 delete .. //depot/projects/ppc-g5/src/bin/sh/bltin/echo.1#2 delete .. //depot/projects/ppc-g5/src/bin/sh/bltin/echo.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/builtins.def#2 delete .. //depot/projects/ppc-g5/src/bin/sh/cd.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/cd.h#2 delete .. //depot/projects/ppc-g5/src/bin/sh/error.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/error.h#2 delete .. //depot/projects/ppc-g5/src/bin/sh/eval.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/eval.h#2 delete .. //depot/projects/ppc-g5/src/bin/sh/exec.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/exec.h#2 delete .. //depot/projects/ppc-g5/src/bin/sh/expand.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/expand.h#2 delete .. //depot/projects/ppc-g5/src/bin/sh/funcs/cmv#2 delete .. //depot/projects/ppc-g5/src/bin/sh/funcs/dirs#2 delete .. //depot/projects/ppc-g5/src/bin/sh/funcs/kill#2 delete .. //depot/projects/ppc-g5/src/bin/sh/funcs/login#2 delete .. //depot/projects/ppc-g5/src/bin/sh/funcs/newgrp#2 delete .. //depot/projects/ppc-g5/src/bin/sh/funcs/popd#2 delete .. //depot/projects/ppc-g5/src/bin/sh/funcs/pushd#2 delete .. //depot/projects/ppc-g5/src/bin/sh/funcs/suspend#2 delete .. //depot/projects/ppc-g5/src/bin/sh/histedit.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/init.h#2 delete .. //depot/projects/ppc-g5/src/bin/sh/input.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/input.h#2 delete .. //depot/projects/ppc-g5/src/bin/sh/jobs.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/jobs.h#2 delete .. //depot/projects/ppc-g5/src/bin/sh/mail.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/mail.h#2 delete .. //depot/projects/ppc-g5/src/bin/sh/main.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/main.h#2 delete .. //depot/projects/ppc-g5/src/bin/sh/memalloc.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/memalloc.h#2 delete .. //depot/projects/ppc-g5/src/bin/sh/miscbltin.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/mkbuiltins#2 delete .. //depot/projects/ppc-g5/src/bin/sh/mkinit.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/mknodes.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/mksyntax.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/mktokens#2 delete .. //depot/projects/ppc-g5/src/bin/sh/myhistedit.h#2 delete .. //depot/projects/ppc-g5/src/bin/sh/mystring.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/mystring.h#2 delete .. //depot/projects/ppc-g5/src/bin/sh/nodes.c.pat#2 delete .. //depot/projects/ppc-g5/src/bin/sh/nodetypes#2 delete .. //depot/projects/ppc-g5/src/bin/sh/options.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/options.h#2 delete .. //depot/projects/ppc-g5/src/bin/sh/output.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/output.h#2 delete .. //depot/projects/ppc-g5/src/bin/sh/parser.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/parser.h#2 delete .. //depot/projects/ppc-g5/src/bin/sh/redir.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/redir.h#2 delete .. //depot/projects/ppc-g5/src/bin/sh/sh.1#2 delete .. //depot/projects/ppc-g5/src/bin/sh/shell.h#2 delete .. //depot/projects/ppc-g5/src/bin/sh/show.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/show.h#2 delete .. //depot/projects/ppc-g5/src/bin/sh/trap.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/trap.h#2 delete .. //depot/projects/ppc-g5/src/bin/sh/var.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/var.h#2 delete .. //depot/projects/ppc-g5/src/bin/sleep/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/sleep/sleep.1#2 delete .. //depot/projects/ppc-g5/src/bin/sleep/sleep.c#2 delete .. //depot/projects/ppc-g5/src/bin/stty/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/stty/cchar.c#2 delete .. //depot/projects/ppc-g5/src/bin/stty/extern.h#2 delete .. //depot/projects/ppc-g5/src/bin/stty/gfmt.c#2 delete .. //depot/projects/ppc-g5/src/bin/stty/key.c#2 delete .. //depot/projects/ppc-g5/src/bin/stty/modes.c#2 delete .. //depot/projects/ppc-g5/src/bin/stty/print.c#2 delete .. //depot/projects/ppc-g5/src/bin/stty/stty.1#2 delete .. //depot/projects/ppc-g5/src/bin/stty/stty.c#2 delete .. //depot/projects/ppc-g5/src/bin/stty/stty.h#2 delete .. //depot/projects/ppc-g5/src/bin/stty/util.c#2 delete .. //depot/projects/ppc-g5/src/bin/sync/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/sync/sync.8#2 delete .. //depot/projects/ppc-g5/src/bin/sync/sync.c#2 delete .. //depot/projects/ppc-g5/src/bin/test/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/test/TEST.README#2 delete .. //depot/projects/ppc-g5/src/bin/test/TEST.csh#2 delete .. //depot/projects/ppc-g5/src/bin/test/TEST.sh#2 delete .. //depot/projects/ppc-g5/src/bin/test/test.1#2 delete .. //depot/projects/ppc-g5/src/bin/test/test.c#2 delete .. //depot/projects/ppc-g5/src/bin/uuidgen/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/uuidgen/uuidgen.1#2 delete .. //depot/projects/ppc-g5/src/bin/uuidgen/uuidgen.c#2 delete .. //depot/projects/ppc-g5/src/cddl/Makefile#2 delete .. //depot/projects/ppc-g5/src/cddl/Makefile.inc#2 delete .. //depot/projects/ppc-g5/src/cddl/compat/opensolaris/include/alloca.h#2 delete .. //depot/projects/ppc-g5/src/cddl/compat/opensolaris/include/devid.h#2 delete .. //depot/projects/ppc-g5/src/cddl/compat/opensolaris/include/dtrace.h#2 delete .. //depot/projects/ppc-g5/src/cddl/compat/opensolaris/include/fcntl.h#2 delete .. //depot/projects/ppc-g5/src/cddl/compat/opensolaris/include/fsshare.h#2 delete .. //depot/projects/ppc-g5/src/cddl/compat/opensolaris/include/libintl.h#2 delete .. //depot/projects/ppc-g5/src/cddl/compat/opensolaris/include/libproc.h#2 delete .. //depot/projects/ppc-g5/src/cddl/compat/opensolaris/include/mnttab.h#2 delete .. //depot/projects/ppc-g5/src/cddl/compat/opensolaris/include/priv.h#2 delete .. //depot/projects/ppc-g5/src/cddl/compat/opensolaris/include/solaris.h#2 delete .. //depot/projects/ppc-g5/src/cddl/compat/opensolaris/include/stdio.h#2 delete .. //depot/projects/ppc-g5/src/cddl/compat/opensolaris/include/stdlib.h#2 delete .. //depot/projects/ppc-g5/src/cddl/compat/opensolaris/include/strings.h#2 delete .. //depot/projects/ppc-g5/src/cddl/compat/opensolaris/include/unistd.h#2 delete .. //depot/projects/ppc-g5/src/cddl/compat/opensolaris/include/zone.h#2 delete .. //depot/projects/ppc-g5/src/cddl/compat/opensolaris/lib/libumem/umem.c#2 delete .. //depot/projects/ppc-g5/src/cddl/compat/opensolaris/lib/libumem/umem.h#2 delete .. //depot/projects/ppc-g5/src/cddl/compat/opensolaris/misc/deviceid.c#2 delete .. //depot/projects/ppc-g5/src/cddl/compat/opensolaris/misc/fsshare.c#2 delete .. //depot/projects/ppc-g5/src/cddl/compat/opensolaris/misc/mkdirp.c#2 delete .. //depot/projects/ppc-g5/src/cddl/compat/opensolaris/misc/mnttab.c#2 delete .. //depot/projects/ppc-g5/src/cddl/compat/opensolaris/misc/zmount.c#2 delete .. //depot/projects/ppc-g5/src/cddl/compat/opensolaris/misc/zone.c#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/README#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/baddof.c#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/badioctl/badioctl.c#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/chkargs.c#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/Getopt.java#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/JDTrace.java#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/jdtrace.c#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/manifest/jdtrace.jar-manifest#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_FUNC.bad.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_MDIM.bad.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_NULL.bad.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_REDEF.redef.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.avgtoofew.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.maxnoarg.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.mintoofew.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.quantizetoofew.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.sumtoofew.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_AGGARG.bad.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_PROTO.bad.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_IDENT.bad.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_UNDEF.badaggfunc.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badexpr.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badkey3.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.noeffect.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey1.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey2.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey4.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqbad1.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqshort.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASEVAL.bad.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMTYPE.lqbad1.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMVAL.bad.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.order.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.order.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHSTEP.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MISMATCH.lqbadarg.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPLARGE.lqtoofew.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPSMALL.bad.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPTYPE.lqbadinc.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPVAL.bad.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_AGGARG.bad.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_PROTO.bad.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_SCALAR.bad.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_ARG.lquantizetoofew.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgnoarg.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgtoomany.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.counttoomany.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizenoarg.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizetoomany.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxnoarg.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxtoomany.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.minnoarg.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.mintoomany.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizenoarg.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizetoomany.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumnoarg.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumtoomany.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_AGGARG.bad.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badmany.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badnone.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_SCALAR.bad.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg_neg.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg_neg.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count3.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.goodkey.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max_neg.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max_neg.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min_neg.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min_neg.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs1.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signature.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.subr.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_1.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_2.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.modby0.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.addmin.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.divmin.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muladd.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muldiv.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.basics.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.complex.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_ARR_BADREF.bad.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRBIG.toobig.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRNULL.bad.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRSUB.bad.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_PROTO_TYPE.badtuple.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_IDENT_UNDEF.badureg.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic1.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic2.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic3.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic4.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic5.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic6.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.uregsarray.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.this.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_ARG.badsig.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toofew.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toomany.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_SYNTAX.errassign.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.tupoflow.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.cpyarray.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.diffprofile.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.initialize.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.invalidref.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.misc.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.orthogonality.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.this.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.valassign.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.begin.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.tick.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_ADDROF_BITFIELD.BitfieldAddress.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.NegBitField.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.ZeroBitField.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.ExceedBaseType.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.GreaterThan64.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFTYPE.badtype.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_OFFSETOF_BITFIELD.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_SIZEOF_BITFIELD.SizeofBitfield.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.BitFieldPromotion.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.SizeofBitField.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.end.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize1.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize2.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize3.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.zerobuf.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.alignring.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.cputime.ksh#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.dynvarsize.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize1.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize2.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize3.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring1.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.smallring.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.cpuusage.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.nice.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.priority.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.prsize.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.rssize.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0clause.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8clause.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller1.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid1.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno1.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.execname.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.hpriority.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id1.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl1.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo1.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid1.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo1.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid1.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.timestamp.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.vtimestamp.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggfun.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggtup.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.arrtup.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.body.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.both.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.pred.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.nopred.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.pred.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predfirst.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predlast.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LOCASSC.NonLocalAssoc.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LONGINT.LongStruct.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PARMCLASS.BadStorageClass.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_NAME.VoidName.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_TYPE.Dyn.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VARARGS.VarLenArgs.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VOID.NonSoleVoid.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_SIGNINT.UnsignedStruct.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_VOIDATTR.ShortVoidDecl.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.arrays.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.basics.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.funcs.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.pointers.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.varargsfuncs.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/badptr.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/countdown.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/counter.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/errorpath.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/hello.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/kstat.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/ksyms.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/renormalize.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rtime.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rw.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwinfo.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwtime.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/specopen.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/truss.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/trussrw.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/userfunc.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_AGGREGATION.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DBLERROR.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DYNAMIC.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.end.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPEC.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPECUNAVAIL.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_STKSTROVERFLOW.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/err.D_PDESC_ZERO.InvalidDescription1.d#2 delete >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Oct 4 03:25:55 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E8A8106568B; Sat, 4 Oct 2008 03:25:55 +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 D71761065691 for ; Sat, 4 Oct 2008 03:25:54 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AC0388FC19 for ; Sat, 4 Oct 2008 03:25:54 +0000 (UTC) (envelope-from nwhitehorn@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 m943Pss9037814 for ; Sat, 4 Oct 2008 03:25:54 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m943PsJY037812 for perforce@freebsd.org; Sat, 4 Oct 2008 03:25:54 GMT (envelope-from nwhitehorn@freebsd.org) Date: Sat, 4 Oct 2008 03:25:54 GMT Message-Id: <200810040325.m943PsJY037812@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nwhitehorn@freebsd.org using -f From: Nathan Whitehorn To: Perforce Change Reviews Cc: Subject: PERFORCE change 150923 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, 04 Oct 2008 03:25:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=150923 Change 150923 by nwhitehorn@nwhitehorn_trantor on 2008/10/04 03:25:04 And one more deletion. Affected files ... .. //depot/projects/ppc-g5/ports/.cvsignore#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sat Oct 4 03:58:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A89931065688; Sat, 4 Oct 2008 03:58: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 6C92F1065686 for ; Sat, 4 Oct 2008 03:58:28 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5A80A8FC18 for ; Sat, 4 Oct 2008 03:58:28 +0000 (UTC) (envelope-from nwhitehorn@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 m943wSiY040400 for ; Sat, 4 Oct 2008 03:58:28 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m943wSOS040398 for perforce@freebsd.org; Sat, 4 Oct 2008 03:58:28 GMT (envelope-from nwhitehorn@freebsd.org) Date: Sat, 4 Oct 2008 03:58:28 GMT Message-Id: <200810040358.m943wSOS040398@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nwhitehorn@freebsd.org using -f From: Nathan Whitehorn To: Perforce Change Reviews Cc: Subject: PERFORCE change 150927 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, 04 Oct 2008 03:58:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=150927 Change 150927 by nwhitehorn@nwhitehorn_trantor on 2008/10/04 03:58:11 Fix miscellaneous mismerges and misimports. Affected files ... .. //depot/projects/ppc-g5/sys/dev/powermac_nvram/powermac_nvram.c#3 edit .. //depot/projects/ppc-g5/sys/powerpc/aim/machdep.c#5 edit .. //depot/projects/ppc-g5/sys/powerpc/powermac/ata_kauai.c#5 edit Differences ... ==== //depot/projects/ppc-g5/sys/dev/powermac_nvram/powermac_nvram.c#3 (text+ko) ==== @@ -45,7 +45,6 @@ #include -#include #include #include ==== //depot/projects/ppc-g5/sys/powerpc/aim/machdep.c#5 (text+ko) ==== @@ -139,7 +139,6 @@ char machine[] = "powerpc"; SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD, machine, 0, ""); -extern int cacheline_size; static void cpu_startup(void *); SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL); ==== //depot/projects/ppc-g5/sys/powerpc/powermac/ata_kauai.c#5 (text+ko) ==== @@ -196,7 +196,7 @@ struct ata_kauai_softc *sc; u_int32_t devid; phandle_t node; - char *compatstring = NULL; + const char *compatstring = NULL; int i, found, rid; found = 0; @@ -216,7 +216,7 @@ bzero(sc, sizeof(struct ata_kauai_softc)); ch = &sc->sc_ch.sc_ch; - compatstring = ofw_bus_get_compatible(node); + compatstring = ofw_bus_get_compat(dev); if (compatstring != NULL && strcmp(compatstring,"shasta-ata") == 0) sc->shasta = 1; From owner-p4-projects@FreeBSD.ORG Sat Oct 4 10:04:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EFEF51065699; Sat, 4 Oct 2008 10:04: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 99A5110656A3 for ; Sat, 4 Oct 2008 10:04:51 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8608D8FC0C for ; Sat, 4 Oct 2008 10:04:51 +0000 (UTC) (envelope-from raj@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 m94A4p5E095090 for ; Sat, 4 Oct 2008 10:04:51 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m94A4cpJ095080 for perforce@freebsd.org; Sat, 4 Oct 2008 10:04:38 GMT (envelope-from raj@freebsd.org) Date: Sat, 4 Oct 2008 10:04:38 GMT Message-Id: <200810041004.m94A4cpJ095080@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 150941 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, 04 Oct 2008 10:04:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=150941 Change 150941 by raj@raj_mimi on 2008/10/04 10:03:53 IFC @150939 Affected files ... .. //depot/projects/arm/src/ObsoleteFiles.inc#42 integrate .. //depot/projects/arm/src/bin/pkill/pkill.1#2 integrate .. //depot/projects/arm/src/bin/pkill/pkill.c#2 integrate .. //depot/projects/arm/src/crypto/openssh/moduli.5#2 integrate .. //depot/projects/arm/src/crypto/openssh/scp.1#4 integrate .. //depot/projects/arm/src/crypto/openssh/sftp-server.8#4 integrate .. //depot/projects/arm/src/crypto/openssh/sftp.1#3 integrate .. //depot/projects/arm/src/crypto/openssh/ssh-add.1#3 integrate .. //depot/projects/arm/src/crypto/openssh/ssh-agent.1#4 integrate .. //depot/projects/arm/src/crypto/openssh/ssh-keygen.1#3 integrate .. //depot/projects/arm/src/crypto/openssh/ssh-keyscan.1#4 integrate .. //depot/projects/arm/src/crypto/openssh/ssh-keysign.8#4 integrate .. //depot/projects/arm/src/crypto/openssh/ssh.1#5 integrate .. //depot/projects/arm/src/crypto/openssh/ssh_config.5#6 integrate .. //depot/projects/arm/src/crypto/openssh/sshconnect2.c#4 integrate .. //depot/projects/arm/src/crypto/openssh/sshd.8#4 integrate .. //depot/projects/arm/src/crypto/openssh/sshd_config.5#6 integrate .. //depot/projects/arm/src/etc/network.subr#13 integrate .. //depot/projects/arm/src/etc/rc.d/jail#7 integrate .. //depot/projects/arm/src/gnu/lib/csu/Makefile#6 integrate .. //depot/projects/arm/src/gnu/usr.bin/gdb/kgdb/kld.c#4 integrate .. //depot/projects/arm/src/gnu/usr.bin/gdb/kgdb/trgt_i386.c#6 integrate .. //depot/projects/arm/src/include/Makefile#15 integrate .. //depot/projects/arm/src/include/unistd.h#8 integrate .. //depot/projects/arm/src/lib/libarchive/archive_entry.c#15 integrate .. //depot/projects/arm/src/lib/libarchive/archive_entry.h#11 integrate .. //depot/projects/arm/src/lib/libarchive/archive_entry_copy_stat.c#2 integrate .. //depot/projects/arm/src/lib/libarchive/archive_entry_private.h#6 integrate .. //depot/projects/arm/src/lib/libarchive/archive_entry_stat.c#2 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_support_format_tar.c#18 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write_disk.c#18 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write_set_format_pax.c#12 integrate .. //depot/projects/arm/src/lib/libarchive/config_freebsd.h#9 integrate .. //depot/projects/arm/src/lib/libarchive/test/Makefile#13 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_entry.c#7 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_write_disk.c#9 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_write_disk_times.c#1 branch .. //depot/projects/arm/src/lib/libarchive/test/test_write_format_pax.c#1 branch .. //depot/projects/arm/src/lib/libc/gen/getosreldate.3#3 integrate .. //depot/projects/arm/src/lib/libc/powerpc/gen/syncicache.c#3 integrate .. //depot/projects/arm/src/lib/libc/sys/cpuset.2#3 integrate .. //depot/projects/arm/src/lib/libc/sys/cpuset_getaffinity.2#3 integrate .. //depot/projects/arm/src/lib/libpmc/pmc.k7.3#2 integrate .. //depot/projects/arm/src/lib/libpmc/pmc.k8.3#2 integrate .. //depot/projects/arm/src/lib/libpmc/pmc.p5.3#2 integrate .. //depot/projects/arm/src/lib/libpmc/pmc.p6.3#2 integrate .. //depot/projects/arm/src/lib/libutil/pty.c#4 integrate .. //depot/projects/arm/src/release/i386/fixit_crunch.conf#4 integrate .. //depot/projects/arm/src/release/pc98/fixit-small_crunch.conf#4 integrate .. //depot/projects/arm/src/release/pc98/fixit_crunch.conf#4 integrate .. //depot/projects/arm/src/sbin/bsdlabel/Makefile#3 integrate .. //depot/projects/arm/src/sbin/bsdlabel/bsdlabel.c#6 integrate .. //depot/projects/arm/src/sbin/fdisk/Makefile#2 integrate .. //depot/projects/arm/src/sbin/fdisk/fdisk.c#6 integrate .. //depot/projects/arm/src/sbin/ifconfig/ifconfig.c#16 integrate .. //depot/projects/arm/src/sbin/ifconfig/ifvlan.c#4 integrate .. //depot/projects/arm/src/sbin/init/init.c#4 integrate .. //depot/projects/arm/src/sbin/ipfw/ipfw.8#16 integrate .. //depot/projects/arm/src/sbin/ipfw/ipfw2.c#19 integrate .. //depot/projects/arm/src/sbin/setkey/setkey.8#4 integrate .. //depot/projects/arm/src/share/examples/FreeBSD_version/FreeBSD_version.c#2 integrate .. //depot/projects/arm/src/share/examples/drivers/make_pseudo_driver.sh#5 integrate .. //depot/projects/arm/src/share/man/man3/Makefile#7 integrate .. //depot/projects/arm/src/share/man/man3/makedev.3#1 branch .. //depot/projects/arm/src/share/man/man4/ata.4#11 integrate .. //depot/projects/arm/src/share/man/man4/nfe.4#8 integrate .. //depot/projects/arm/src/share/man/man4/ng_tty.4#2 integrate .. //depot/projects/arm/src/share/man/man4/snd_hda.4#14 integrate .. //depot/projects/arm/src/share/man/man4/wpi.4#3 integrate .. //depot/projects/arm/src/share/man/man5/rc.conf.5#24 integrate .. //depot/projects/arm/src/share/man/man5/src.conf.5#16 integrate .. //depot/projects/arm/src/share/man/man9/Makefile#25 integrate .. //depot/projects/arm/src/share/man/man9/device_ids.9#2 delete .. //depot/projects/arm/src/share/man/man9/make_dev.9#5 integrate .. //depot/projects/arm/src/share/man/man9/spl.9#2 integrate .. //depot/projects/arm/src/share/misc/committers-src.dot#12 integrate .. //depot/projects/arm/src/share/zoneinfo/southamerica#10 integrate .. //depot/projects/arm/src/sys/amd64/amd64/dump_machdep.c#6 integrate .. //depot/projects/arm/src/sys/amd64/amd64/elf_machdep.c#6 integrate .. //depot/projects/arm/src/sys/amd64/amd64/mem.c#4 integrate .. //depot/projects/arm/src/sys/amd64/amd64/minidump_machdep.c#5 integrate .. //depot/projects/arm/src/sys/amd64/amd64/mp_machdep.c#22 integrate .. //depot/projects/arm/src/sys/amd64/conf/GENERIC#32 integrate .. //depot/projects/arm/src/sys/amd64/include/param.h#8 integrate .. //depot/projects/arm/src/sys/amd64/include/smp.h#11 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_sysvec.c#21 integrate .. //depot/projects/arm/src/sys/arm/arm/dump_machdep.c#5 integrate .. //depot/projects/arm/src/sys/arm/arm/elf_machdep.c#5 integrate .. //depot/projects/arm/src/sys/arm/arm/mem.c#6 integrate .. //depot/projects/arm/src/sys/arm/arm/pmap.c#43 integrate .. //depot/projects/arm/src/sys/arm/at91/at91_mci.c#34 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/avila_machdep.c#18 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_pass.c#7 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_sa.c#9 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_ses.c#8 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_sg.c#6 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_target.c#7 integrate .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#2 integrate .. //depot/projects/arm/src/sys/cddl/dev/dtrace/dtrace_clone.c#2 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_misc.c#25 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_proto.h#31 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscall.h#31 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscalls.c#31 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_sysent.c#31 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_util.h#3 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/syscalls.master#32 integrate .. //depot/projects/arm/src/sys/compat/ia32/ia32_sysvec.c#9 integrate .. //depot/projects/arm/src/sys/compat/linprocfs/linprocfs.c#27 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_ioctl.c#11 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_misc.c#37 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_socket.c#17 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_sockio.c#5 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_sysvec.c#8 integrate .. //depot/projects/arm/src/sys/conf/NOTES#67 integrate .. //depot/projects/arm/src/sys/conf/files#92 integrate .. //depot/projects/arm/src/sys/conf/files.i386#38 integrate .. //depot/projects/arm/src/sys/conf/files.powerpc#22 integrate .. //depot/projects/arm/src/sys/conf/files.sparc64#19 integrate .. //depot/projects/arm/src/sys/conf/kern.pre.mk#16 integrate .. //depot/projects/arm/src/sys/conf/kmod.mk#21 integrate .. //depot/projects/arm/src/sys/conf/newvers.sh#5 integrate .. //depot/projects/arm/src/sys/conf/options#62 integrate .. //depot/projects/arm/src/sys/conf/options.sparc64#6 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_auth.c#9 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_compat.h#10 integrate .. //depot/projects/arm/src/sys/contrib/pf/net/pf.c#16 integrate .. //depot/projects/arm/src/sys/contrib/pf/net/pf_if.c#9 integrate .. //depot/projects/arm/src/sys/contrib/pf/net/pf_ioctl.c#14 integrate .. //depot/projects/arm/src/sys/contrib/pf/net/pf_subr.c#6 integrate .. //depot/projects/arm/src/sys/contrib/pf/net/pfvar.h#7 integrate .. //depot/projects/arm/src/sys/contrib/rdma/rdma_cma.c#2 integrate .. //depot/projects/arm/src/sys/ddb/db_command.c#14 integrate .. //depot/projects/arm/src/sys/ddb/db_command.h#3 integrate .. //depot/projects/arm/src/sys/ddb/db_main.c#4 integrate .. //depot/projects/arm/src/sys/ddb/db_textdump.c#3 integrate .. //depot/projects/arm/src/sys/dev/ae/if_ae.c#1 branch .. //depot/projects/arm/src/sys/dev/ae/if_aereg.h#1 branch .. //depot/projects/arm/src/sys/dev/ae/if_aevar.h#1 branch .. //depot/projects/arm/src/sys/dev/agp/agp.c#3 integrate .. //depot/projects/arm/src/sys/dev/agp/agp_i810.c#4 integrate .. //depot/projects/arm/src/sys/dev/agp/agpreg.h#2 integrate .. //depot/projects/arm/src/sys/dev/amr/amr.c#15 integrate .. //depot/projects/arm/src/sys/dev/arcmsr/arcmsr.c#15 integrate .. //depot/projects/arm/src/sys/dev/asr/asr.c#15 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-chipset.c#50 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-pci.h#33 integrate .. //depot/projects/arm/src/sys/dev/ata/atapi-tape.c#10 integrate .. //depot/projects/arm/src/sys/dev/atkbdc/psm.c#12 integrate .. //depot/projects/arm/src/sys/dev/bktr/bktr_os.c#7 integrate .. //depot/projects/arm/src/sys/dev/bm/if_bm.c#3 integrate .. //depot/projects/arm/src/sys/dev/ce/if_ce.c#10 integrate .. //depot/projects/arm/src/sys/dev/cfe/cfe_api.c#1 branch .. //depot/projects/arm/src/sys/dev/cfe/cfe_api.h#1 branch .. //depot/projects/arm/src/sys/dev/cfe/cfe_api_int.h#1 branch .. //depot/projects/arm/src/sys/dev/cfe/cfe_console.c#1 branch .. //depot/projects/arm/src/sys/dev/cfe/cfe_error.h#1 branch .. //depot/projects/arm/src/sys/dev/cfe/cfe_ioctl.h#1 branch .. //depot/projects/arm/src/sys/dev/cfe/cfe_resource.c#1 branch .. //depot/projects/arm/src/sys/dev/cp/if_cp.c#11 integrate .. //depot/projects/arm/src/sys/dev/cpuctl/cpuctl.c#3 integrate .. //depot/projects/arm/src/sys/dev/ctau/if_ct.c#12 integrate .. //depot/projects/arm/src/sys/dev/cxgb/common/cxgb_ael1002.c#7 integrate .. //depot/projects/arm/src/sys/dev/cxgb/common/cxgb_common.h#10 integrate .. //depot/projects/arm/src/sys/dev/cxgb/common/cxgb_mc5.c#7 integrate .. //depot/projects/arm/src/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#5 integrate .. //depot/projects/arm/src/sys/dev/cxgb/common/cxgb_t3_hw.c#11 integrate .. //depot/projects/arm/src/sys/dev/cxgb/common/cxgb_tn1010.c#2 integrate .. //depot/projects/arm/src/sys/dev/cxgb/common/cxgb_vsc7323.c#4 integrate .. //depot/projects/arm/src/sys/dev/cxgb/common/cxgb_vsc8211.c#6 integrate .. //depot/projects/arm/src/sys/dev/cxgb/common/cxgb_xgmac.c#9 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_adapter.h#14 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_config.h#8 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_include.h#5 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_main.c#21 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_multiq.c#2 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_offload.c#7 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_offload.h#10 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_osdep.h#11 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_sge.c#18 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_t3fw.c#3 integrate .. //depot/projects/arm/src/sys/dev/cxgb/sys/cxgb_support.c#4 integrate .. //depot/projects/arm/src/sys/dev/cxgb/sys/mvec.h#6 integrate .. //depot/projects/arm/src/sys/dev/cxgb/sys/uipc_mvec.c#7 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#3 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#2 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c#2 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_dbg.c#2 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c#2 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c#2 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c#2 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c#2 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c#2 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c#2 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/toecore/toedev.c#3 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#8 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#7 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#6 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/tom/cxgb_l2t.c#3 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/tom/cxgb_l2t.h#2 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/tom/cxgb_listen.c#4 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#3 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c#3 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#3 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/tom/cxgb_tom.c#6 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/tom/cxgb_tom.h#2 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#4 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/tom/cxgb_vm.c#2 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/tom/cxgb_vm.h#2 integrate .. //depot/projects/arm/src/sys/dev/dc/dcphy.c#5 integrate .. //depot/projects/arm/src/sys/dev/dc/pnphy.c#3 integrate .. //depot/projects/arm/src/sys/dev/drm/drm.h#7 integrate .. //depot/projects/arm/src/sys/dev/drm/drmP.h#9 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_agpsupport.c#8 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_atomic.h#3 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_auth.c#4 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_bufs.c#5 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_context.c#4 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_dma.c#4 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_drawable.c#4 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_drv.c#9 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_fops.c#4 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_ioctl.c#4 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_irq.c#5 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_lock.c#5 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_memory.c#4 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_pci.c#5 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_scatter.c#5 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_sysctl.c#4 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_vm.c#4 integrate .. //depot/projects/arm/src/sys/dev/drm/i915_dma.c#10 integrate .. //depot/projects/arm/src/sys/dev/drm/i915_drm.h#6 integrate .. //depot/projects/arm/src/sys/dev/drm/i915_drv.c#7 integrate .. //depot/projects/arm/src/sys/dev/drm/i915_drv.h#6 integrate .. //depot/projects/arm/src/sys/dev/drm/i915_irq.c#6 integrate .. //depot/projects/arm/src/sys/dev/drm/i915_suspend.c#2 integrate .. //depot/projects/arm/src/sys/dev/drm/mach64_drv.c#5 integrate .. //depot/projects/arm/src/sys/dev/drm/mga_drv.c#7 integrate .. //depot/projects/arm/src/sys/dev/drm/r128_drv.c#6 integrate .. //depot/projects/arm/src/sys/dev/drm/radeon_cp.c#7 integrate .. //depot/projects/arm/src/sys/dev/drm/radeon_drv.c#6 integrate .. //depot/projects/arm/src/sys/dev/drm/savage_drv.c#5 integrate .. //depot/projects/arm/src/sys/dev/drm/sis_drv.c#6 integrate .. //depot/projects/arm/src/sys/dev/drm/tdfx_drv.c#6 integrate .. //depot/projects/arm/src/sys/dev/fatm/if_fatm.c#7 integrate .. //depot/projects/arm/src/sys/dev/fb/fb.c#4 integrate .. //depot/projects/arm/src/sys/dev/fb/vgareg.h#3 integrate .. //depot/projects/arm/src/sys/dev/firewire/firewire.c#12 integrate .. //depot/projects/arm/src/sys/dev/firewire/firewire.h#3 integrate .. //depot/projects/arm/src/sys/dev/firewire/fwdev.c#8 integrate .. //depot/projects/arm/src/sys/dev/hptiop/hptiop.c#4 integrate .. //depot/projects/arm/src/sys/dev/hwpmc/pmc_events.h#3 integrate .. //depot/projects/arm/src/sys/dev/if_ndis/if_ndis.c#17 integrate .. //depot/projects/arm/src/sys/dev/if_ndis/if_ndisvar.h#7 integrate .. //depot/projects/arm/src/sys/dev/iir/iir_ctrl.c#3 integrate .. //depot/projects/arm/src/sys/dev/iscsi/initiator/isc_cam.c#2 integrate .. //depot/projects/arm/src/sys/dev/iscsi/initiator/iscsi.c#3 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_freebsd.c#34 integrate .. //depot/projects/arm/src/sys/dev/joy/joy.c#3 integrate .. //depot/projects/arm/src/sys/dev/kbd/kbd.c#7 integrate .. //depot/projects/arm/src/sys/dev/kbdmux/kbdmux.c#10 integrate .. //depot/projects/arm/src/sys/dev/le/if_le_cbus.c#5 integrate .. //depot/projects/arm/src/sys/dev/le/if_le_isa.c#4 integrate .. //depot/projects/arm/src/sys/dev/le/if_le_lebuffer.c#3 integrate .. //depot/projects/arm/src/sys/dev/le/if_le_pci.c#6 integrate .. //depot/projects/arm/src/sys/dev/le/lebuffer_sbus.c#2 integrate .. //depot/projects/arm/src/sys/dev/led/led.c#5 integrate .. //depot/projects/arm/src/sys/dev/mii/atphy.c#2 integrate .. //depot/projects/arm/src/sys/dev/mii/ciphy.c#9 integrate .. //depot/projects/arm/src/sys/dev/mii/e1000phy.c#7 integrate .. //depot/projects/arm/src/sys/dev/mii/miidevs#25 integrate .. //depot/projects/arm/src/sys/dev/mlx/mlx.c#5 integrate .. //depot/projects/arm/src/sys/dev/mly/mly.c#9 integrate .. //depot/projects/arm/src/sys/dev/mmc/mmc.c#26 integrate .. //depot/projects/arm/src/sys/dev/mmc/mmcbrvar.h#6 integrate .. //depot/projects/arm/src/sys/dev/mmc/mmcreg.h#18 integrate .. //depot/projects/arm/src/sys/dev/mmc/mmcsd.c#15 integrate .. //depot/projects/arm/src/sys/dev/mmc/mmcvar.h#5 integrate .. //depot/projects/arm/src/sys/dev/mse/mse.c#6 integrate .. //depot/projects/arm/src/sys/dev/msk/if_msk.c#12 integrate .. //depot/projects/arm/src/sys/dev/msk/if_mskreg.h#6 integrate .. //depot/projects/arm/src/sys/dev/mxge/eth_z8e.h#4 integrate .. //depot/projects/arm/src/sys/dev/mxge/ethp_z8e.h#4 integrate .. //depot/projects/arm/src/sys/dev/mxge/mxge_mcp.h#9 integrate .. //depot/projects/arm/src/sys/dev/mxge/rss_eth_z8e.h#2 integrate .. //depot/projects/arm/src/sys/dev/mxge/rss_ethp_z8e.h#2 integrate .. //depot/projects/arm/src/sys/dev/nfe/if_nfe.c#16 integrate .. //depot/projects/arm/src/sys/dev/nfe/if_nfereg.h#9 integrate .. //depot/projects/arm/src/sys/dev/nfe/if_nfevar.h#7 integrate .. //depot/projects/arm/src/sys/dev/pbio/pbio.c#4 integrate .. //depot/projects/arm/src/sys/dev/pccbb/pccbb_pci.c#13 integrate .. //depot/projects/arm/src/sys/dev/powermac_nvram/powermac_nvram.c#3 integrate .. //depot/projects/arm/src/sys/dev/ppbus/lpt.c#8 integrate .. //depot/projects/arm/src/sys/dev/ppbus/pcfclock.c#2 integrate .. //depot/projects/arm/src/sys/dev/ppbus/ppi.c#6 integrate .. //depot/projects/arm/src/sys/dev/rp/rpvar.h#4 integrate .. //depot/projects/arm/src/sys/dev/siba/siba.c#1 branch .. //depot/projects/arm/src/sys/dev/siba/siba_ids.h#1 branch .. //depot/projects/arm/src/sys/dev/siba/siba_pcib.c#1 branch .. //depot/projects/arm/src/sys/dev/siba/siba_pcibvar.h#1 branch .. //depot/projects/arm/src/sys/dev/siba/sibareg.h#1 branch .. //depot/projects/arm/src/sys/dev/siba/sibavar.h#1 branch .. //depot/projects/arm/src/sys/dev/sound/midi/sequencer.c#12 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/emu10kx.c#9 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/dsp.c#19 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/mixer.c#10 integrate .. //depot/projects/arm/src/sys/dev/speaker/spkr.c#6 integrate .. //depot/projects/arm/src/sys/dev/streams/streams.c#6 integrate .. //depot/projects/arm/src/sys/dev/tdfx/tdfx_pci.c#6 integrate .. //depot/projects/arm/src/sys/dev/twa/tw_osl_freebsd.c#6 integrate .. //depot/projects/arm/src/sys/dev/twe/twe_freebsd.c#6 integrate .. //depot/projects/arm/src/sys/dev/usb/ubsa.c#15 integrate .. //depot/projects/arm/src/sys/dev/usb/ucomvar.h#7 integrate .. //depot/projects/arm/src/sys/dev/usb/ufm.c#6 integrate .. //depot/projects/arm/src/sys/dev/usb/ugen.c#9 integrate .. //depot/projects/arm/src/sys/dev/usb/uhid.c#11 integrate .. //depot/projects/arm/src/sys/dev/usb/ulpt.c#7 integrate .. //depot/projects/arm/src/sys/dev/usb/umass.c#22 integrate .. //depot/projects/arm/src/sys/dev/usb/ums.c#16 integrate .. //depot/projects/arm/src/sys/dev/usb/urio.c#6 integrate .. //depot/projects/arm/src/sys/dev/usb/usb.c#12 integrate .. //depot/projects/arm/src/sys/dev/usb/uscanner.c#16 integrate .. //depot/projects/arm/src/sys/dev/vkbd/vkbd.c#8 integrate .. //depot/projects/arm/src/sys/dev/xen/blkfront/blkfront.c#2 integrate .. //depot/projects/arm/src/sys/dev/xen/console/console.c#2 integrate .. //depot/projects/arm/src/sys/dev/xen/netfront/netfront.c#2 integrate .. //depot/projects/arm/src/sys/fs/cd9660/cd9660_node.c#2 integrate .. //depot/projects/arm/src/sys/fs/cd9660/cd9660_rrip.c#3 integrate .. //depot/projects/arm/src/sys/fs/coda/coda_fbsd.c#3 integrate .. //depot/projects/arm/src/sys/fs/devfs/devfs_vnops.c#26 integrate .. //depot/projects/arm/src/sys/fs/fdescfs/fdesc_vnops.c#14 integrate .. //depot/projects/arm/src/sys/fs/tmpfs/tmpfs.h#9 integrate .. //depot/projects/arm/src/sys/fs/tmpfs/tmpfs_subr.c#10 integrate .. //depot/projects/arm/src/sys/fs/tmpfs/tmpfs_vnops.c#12 integrate .. //depot/projects/arm/src/sys/geom/geom_dev.c#11 integrate .. //depot/projects/arm/src/sys/geom/part/g_part.c#14 integrate .. //depot/projects/arm/src/sys/geom/part/g_part_bsd.c#5 integrate .. //depot/projects/arm/src/sys/geom/part/g_part_pc98.c#5 integrate .. //depot/projects/arm/src/sys/geom/vinum/geom_vinum.h#5 integrate .. //depot/projects/arm/src/sys/geom/vinum/geom_vinum_drive.c#11 integrate .. //depot/projects/arm/src/sys/geom/vinum/geom_vinum_rm.c#6 integrate .. //depot/projects/arm/src/sys/geom/vinum/geom_vinum_var.h#5 integrate .. //depot/projects/arm/src/sys/i386/acpica/acpi_machdep.c#12 integrate .. //depot/projects/arm/src/sys/i386/bios/apm.c#8 integrate .. //depot/projects/arm/src/sys/i386/bios/apm.h#3 integrate .. //depot/projects/arm/src/sys/i386/bios/smapi.c#3 integrate .. //depot/projects/arm/src/sys/i386/conf/GENERIC#33 integrate .. //depot/projects/arm/src/sys/i386/i386/bios.c#4 integrate .. //depot/projects/arm/src/sys/i386/i386/db_trace.c#12 integrate .. //depot/projects/arm/src/sys/i386/i386/dump_machdep.c#6 integrate .. //depot/projects/arm/src/sys/i386/i386/elf_machdep.c#4 integrate .. //depot/projects/arm/src/sys/i386/i386/mem.c#3 integrate .. //depot/projects/arm/src/sys/i386/i386/minidump_machdep.c#6 integrate .. //depot/projects/arm/src/sys/i386/i386/mp_machdep.c#24 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_sysvec.c#4 integrate .. //depot/projects/arm/src/sys/i386/include/param.h#6 integrate .. //depot/projects/arm/src/sys/i386/include/smp.h#11 integrate .. //depot/projects/arm/src/sys/i386/include/xen/evtchn.h#2 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_sysvec.c#17 integrate .. //depot/projects/arm/src/sys/i386/xen/mp_machdep.c#3 integrate .. //depot/projects/arm/src/sys/i386/xen/pmap.c#3 integrate .. //depot/projects/arm/src/sys/i386/xen/xen_machdep.c#5 integrate .. //depot/projects/arm/src/sys/ia64/ia64/dump_machdep.c#5 integrate .. //depot/projects/arm/src/sys/ia64/ia64/efi.c#2 integrate .. //depot/projects/arm/src/sys/ia64/ia64/elf_machdep.c#8 integrate .. //depot/projects/arm/src/sys/ia64/ia64/interrupt.c#16 integrate .. //depot/projects/arm/src/sys/ia64/ia64/mem.c#2 integrate .. //depot/projects/arm/src/sys/ia64/ia64/mp_machdep.c#13 integrate .. //depot/projects/arm/src/sys/ia64/ia64/sal.c#3 integrate .. //depot/projects/arm/src/sys/ia64/include/smp.h#3 integrate .. //depot/projects/arm/src/sys/kern/imgact_aout.c#6 integrate .. //depot/projects/arm/src/sys/kern/init_main.c#24 integrate .. //depot/projects/arm/src/sys/kern/init_sysent.c#29 integrate .. //depot/projects/arm/src/sys/kern/kern_condvar.c#12 integrate .. //depot/projects/arm/src/sys/kern/kern_conf.c#17 integrate .. //depot/projects/arm/src/sys/kern/kern_intr.c#24 integrate .. //depot/projects/arm/src/sys/kern/kern_jail.c#15 integrate .. //depot/projects/arm/src/sys/kern/kern_mib.c#11 integrate .. //depot/projects/arm/src/sys/kern/kern_shutdown.c#13 integrate .. //depot/projects/arm/src/sys/kern/kern_synch.c#30 integrate .. //depot/projects/arm/src/sys/kern/kern_uuid.c#7 integrate .. //depot/projects/arm/src/sys/kern/kern_xxx.c#5 integrate .. //depot/projects/arm/src/sys/kern/makesyscalls.sh#10 integrate .. //depot/projects/arm/src/sys/kern/subr_witness.c#33 integrate .. //depot/projects/arm/src/sys/kern/sys_generic.c#15 integrate .. //depot/projects/arm/src/sys/kern/syscalls.c#29 integrate .. //depot/projects/arm/src/sys/kern/syscalls.master#32 integrate .. //depot/projects/arm/src/sys/kern/systrace_args.c#17 integrate .. //depot/projects/arm/src/sys/kern/tty.c#26 integrate .. //depot/projects/arm/src/sys/kern/tty_pts.c#14 integrate .. //depot/projects/arm/src/sys/kern/uipc_socket.c#46 integrate .. //depot/projects/arm/src/sys/kern/uipc_usrreq.c#32 integrate .. //depot/projects/arm/src/sys/kern/vfs_cache.c#18 integrate .. //depot/projects/arm/src/sys/kern/vfs_lookup.c#26 integrate .. //depot/projects/arm/src/sys/libkern/memcmp.c#1 branch .. //depot/projects/arm/src/sys/mips/adm5120/if_admsw.c#3 integrate .. //depot/projects/arm/src/sys/mips/include/param.h#2 integrate .. //depot/projects/arm/src/sys/mips/include/smp.h#2 integrate .. //depot/projects/arm/src/sys/mips/mips/elf_machdep.c#2 integrate .. //depot/projects/arm/src/sys/mips/mips/mem.c#2 integrate .. //depot/projects/arm/src/sys/mips/mips/mp_machdep.c#3 integrate .. //depot/projects/arm/src/sys/mips/mips/pmap.c#4 integrate .. //depot/projects/arm/src/sys/mips/mips/support.S#2 integrate .. //depot/projects/arm/src/sys/mips/mips/trap.c#3 integrate .. //depot/projects/arm/src/sys/mips/sentry5/s5_machdep.c#3 integrate .. //depot/projects/arm/src/sys/modules/Makefile#61 integrate .. //depot/projects/arm/src/sys/modules/ae/Makefile#1 branch .. //depot/projects/arm/src/sys/modules/cxgb/Makefile#11 integrate .. //depot/projects/arm/src/sys/modules/cxgb/cxgb/Makefile#6 integrate .. //depot/projects/arm/src/sys/modules/cxgb/cxgb_t3fw/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/cxgb/iw_cxgb/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/cxgb/toecore/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/cxgb/tom/Makefile#3 integrate .. //depot/projects/arm/src/sys/net/bridgestp.c#22 integrate .. //depot/projects/arm/src/sys/net/if.c#29 integrate .. //depot/projects/arm/src/sys/net/if_bridge.c#41 integrate .. //depot/projects/arm/src/sys/net/if_ef.c#7 integrate .. //depot/projects/arm/src/sys/net/if_ethersubr.c#34 integrate .. //depot/projects/arm/src/sys/net/if_faith.c#8 integrate .. //depot/projects/arm/src/sys/net/if_gif.c#15 integrate .. //depot/projects/arm/src/sys/net/if_gif.h#6 integrate .. //depot/projects/arm/src/sys/net/if_gre.c#13 integrate .. //depot/projects/arm/src/sys/net/if_lagg.c#16 integrate .. //depot/projects/arm/src/sys/net/if_loop.c#14 integrate .. //depot/projects/arm/src/sys/net/if_mib.c#6 integrate .. //depot/projects/arm/src/sys/net/if_spppsubr.c#9 integrate .. //depot/projects/arm/src/sys/net/if_stf.c#12 integrate .. //depot/projects/arm/src/sys/net/if_tap.c#15 integrate .. //depot/projects/arm/src/sys/net/if_tun.c#12 integrate .. //depot/projects/arm/src/sys/net/if_var.h#14 integrate .. //depot/projects/arm/src/sys/net/if_vlan.c#25 integrate .. //depot/projects/arm/src/sys/net/raw_cb.c#6 integrate .. //depot/projects/arm/src/sys/net/raw_usrreq.c#8 integrate .. //depot/projects/arm/src/sys/net/route.c#15 integrate .. //depot/projects/arm/src/sys/net/rtsock.c#15 integrate .. //depot/projects/arm/src/sys/net/vnet.h#1 branch .. //depot/projects/arm/src/sys/net80211/ieee80211_ddb.c#5 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_hostap.c#4 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_scan_sta.c#7 integrate .. //depot/projects/arm/src/sys/netgraph/atm/ng_atm.c#4 integrate .. //depot/projects/arm/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#9 integrate .. //depot/projects/arm/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#6 integrate .. //depot/projects/arm/src/sys/netgraph/netgraph.h#14 integrate .. //depot/projects/arm/src/sys/netgraph/ng_base.c#25 integrate .. //depot/projects/arm/src/sys/netgraph/ng_device.c#5 integrate .. //depot/projects/arm/src/sys/netgraph/ng_eiface.c#11 integrate .. //depot/projects/arm/src/sys/netgraph/ng_gif.c#4 integrate .. //depot/projects/arm/src/sys/netgraph/ng_iface.c#7 integrate .. //depot/projects/arm/src/sys/netgraph/ng_tty.c#4 integrate .. //depot/projects/arm/src/sys/netgraph/ng_tty.h#2 integrate .. //depot/projects/arm/src/sys/netinet/if_ether.c#24 integrate .. //depot/projects/arm/src/sys/netinet/igmp.c#9 integrate .. //depot/projects/arm/src/sys/netinet/in.c#14 integrate .. //depot/projects/arm/src/sys/netinet/in.h#12 integrate .. //depot/projects/arm/src/sys/netinet/in_gif.c#10 integrate .. //depot/projects/arm/src/sys/netinet/in_mcast.c#6 integrate .. //depot/projects/arm/src/sys/netinet/in_pcb.c#32 integrate .. //depot/projects/arm/src/sys/netinet/in_pcb.h#18 integrate .. //depot/projects/arm/src/sys/netinet/in_rmx.c#9 integrate .. //depot/projects/arm/src/sys/netinet/ip.h#6 integrate .. //depot/projects/arm/src/sys/netinet/ip6.h#4 integrate .. //depot/projects/arm/src/sys/netinet/ip_carp.c#18 integrate .. //depot/projects/arm/src/sys/netinet/ip_divert.c#17 integrate .. //depot/projects/arm/src/sys/netinet/ip_fastfwd.c#12 integrate .. //depot/projects/arm/src/sys/netinet/ip_fw.h#18 integrate .. //depot/projects/arm/src/sys/netinet/ip_fw2.c#48 integrate .. //depot/projects/arm/src/sys/netinet/ip_fw_nat.c#3 integrate .. //depot/projects/arm/src/sys/netinet/ip_icmp.c#15 integrate .. //depot/projects/arm/src/sys/netinet/ip_input.c#27 integrate .. //depot/projects/arm/src/sys/netinet/ip_ipsec.c#11 integrate .. //depot/projects/arm/src/sys/netinet/ip_mroute.c#18 integrate .. //depot/projects/arm/src/sys/netinet/ip_options.c#9 integrate .. //depot/projects/arm/src/sys/netinet/raw_ip.c#21 integrate .. //depot/projects/arm/src/sys/netinet/tcp_hostcache.c#10 integrate .. //depot/projects/arm/src/sys/netinet/tcp_input.c#45 integrate .. //depot/projects/arm/src/sys/netinet/tcp_offload.c#4 integrate .. //depot/projects/arm/src/sys/netinet/tcp_output.c#30 integrate .. //depot/projects/arm/src/sys/netinet/tcp_reass.c#5 integrate .. //depot/projects/arm/src/sys/netinet/tcp_sack.c#16 integrate .. //depot/projects/arm/src/sys/netinet/tcp_subr.c#40 integrate .. //depot/projects/arm/src/sys/netinet/tcp_syncache.c#33 integrate .. //depot/projects/arm/src/sys/netinet/tcp_timer.c#23 integrate .. //depot/projects/arm/src/sys/netinet/tcp_timewait.c#8 integrate .. //depot/projects/arm/src/sys/netinet/tcp_usrreq.c#28 integrate .. //depot/projects/arm/src/sys/netinet/udp_usrreq.c#29 integrate .. //depot/projects/arm/src/sys/netinet/vinet.h#1 branch .. //depot/projects/arm/src/sys/netinet6/dest6.c#5 integrate .. //depot/projects/arm/src/sys/netinet6/frag6.c#10 integrate .. //depot/projects/arm/src/sys/netinet6/icmp6.c#18 integrate .. //depot/projects/arm/src/sys/netinet6/in6.c#16 integrate .. //depot/projects/arm/src/sys/netinet6/in6.h#9 integrate .. //depot/projects/arm/src/sys/netinet6/in6_gif.c#11 integrate .. //depot/projects/arm/src/sys/netinet6/in6_ifattach.c#13 integrate .. //depot/projects/arm/src/sys/netinet6/in6_pcb.c#21 integrate .. //depot/projects/arm/src/sys/netinet6/in6_proto.c#15 integrate .. //depot/projects/arm/src/sys/netinet6/in6_rmx.c#7 integrate .. //depot/projects/arm/src/sys/netinet6/in6_src.c#16 integrate .. //depot/projects/arm/src/sys/netinet6/ip6_forward.c#12 integrate .. //depot/projects/arm/src/sys/netinet6/ip6_input.c#15 integrate .. //depot/projects/arm/src/sys/netinet6/ip6_ipsec.c#7 integrate .. //depot/projects/arm/src/sys/netinet6/ip6_mroute.c#12 integrate .. //depot/projects/arm/src/sys/netinet6/ip6_output.c#15 integrate .. //depot/projects/arm/src/sys/netinet6/mld6.c#12 integrate .. //depot/projects/arm/src/sys/netinet6/nd6.c#21 integrate .. //depot/projects/arm/src/sys/netinet6/nd6.h#5 integrate .. //depot/projects/arm/src/sys/netinet6/nd6_nbr.c#13 integrate .. //depot/projects/arm/src/sys/netinet6/nd6_rtr.c#9 integrate .. //depot/projects/arm/src/sys/netinet6/raw_ip6.c#15 integrate .. //depot/projects/arm/src/sys/netinet6/route6.c#7 integrate .. //depot/projects/arm/src/sys/netinet6/scope6.c#7 integrate .. //depot/projects/arm/src/sys/netinet6/udp6_usrreq.c#24 integrate .. //depot/projects/arm/src/sys/netinet6/vinet6.h#1 branch .. //depot/projects/arm/src/sys/netipsec/ipsec.c#15 integrate .. //depot/projects/arm/src/sys/netipsec/ipsec.h#8 integrate .. //depot/projects/arm/src/sys/netipsec/ipsec_input.c#10 integrate .. //depot/projects/arm/src/sys/netipsec/ipsec_mbuf.c#6 integrate .. //depot/projects/arm/src/sys/netipsec/ipsec_output.c#10 integrate .. //depot/projects/arm/src/sys/netipsec/key.c#11 integrate .. //depot/projects/arm/src/sys/netipsec/keysock.c#9 integrate .. //depot/projects/arm/src/sys/netipsec/vipsec.h#1 branch .. //depot/projects/arm/src/sys/netipsec/xform_ah.c#9 integrate .. //depot/projects/arm/src/sys/netipsec/xform_esp.c#10 integrate .. //depot/projects/arm/src/sys/netipsec/xform_ipcomp.c#6 integrate .. //depot/projects/arm/src/sys/netipsec/xform_ipip.c#8 integrate .. //depot/projects/arm/src/sys/netsmb/smb_dev.c#7 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_diskless.c#10 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_vfsops.c#25 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_vnops.c#25 integrate .. //depot/projects/arm/src/sys/pc98/cbus/gdc.c#4 integrate .. //depot/projects/arm/src/sys/pc98/cbus/olpt.c#4 integrate .. //depot/projects/arm/src/sys/powerpc/aim/machdep.c#7 integrate .. //depot/projects/arm/src/sys/powerpc/aim/mmu_oea.c#6 integrate .. //depot/projects/arm/src/sys/powerpc/booke/machdep.c#6 integrate .. //depot/projects/arm/src/sys/powerpc/include/dbdma.h#2 integrate .. //depot/projects/arm/src/sys/powerpc/include/md_var.h#7 integrate .. //depot/projects/arm/src/sys/powerpc/include/pmap.h#6 integrate .. //depot/projects/arm/src/sys/powerpc/include/pte.h#4 integrate .. //depot/projects/arm/src/sys/powerpc/include/smp.h#4 integrate .. //depot/projects/arm/src/sys/powerpc/ofw/ofw_syscons.c#5 integrate .. //depot/projects/arm/src/sys/powerpc/powermac/ata_dbdma.c#1 branch .. //depot/projects/arm/src/sys/powerpc/powermac/ata_dbdma.h#1 branch .. //depot/projects/arm/src/sys/powerpc/powermac/ata_kauai.c#4 integrate .. //depot/projects/arm/src/sys/powerpc/powermac/ata_macio.c#3 integrate .. //depot/projects/arm/src/sys/powerpc/powermac/dbdma.c#2 integrate .. //depot/projects/arm/src/sys/powerpc/powermac/dbdmavar.h#2 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/cpu.c#8 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/elf_machdep.c#4 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/intr_machdep.c#15 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/mem.c#3 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/mp_machdep.c#6 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/syncicache.c#3 integrate .. //depot/projects/arm/src/sys/rpc/authunix_prot.c#4 integrate .. //depot/projects/arm/src/sys/security/audit/audit_pipe.c#12 integrate .. //depot/projects/arm/src/sys/sparc64/pci/schizo.c#1 branch .. //depot/projects/arm/src/sys/sparc64/pci/schizoreg.h#1 branch .. //depot/projects/arm/src/sys/sparc64/pci/schizovar.h#1 branch .. //depot/projects/arm/src/sys/sparc64/sparc64/dump_machdep.c#4 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/elf_machdep.c#7 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/mem.c#6 integrate .. //depot/projects/arm/src/sys/sun4v/include/smp.h#6 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/dump_machdep.c#4 integrate .. //depot/projects/arm/src/sys/sys/conf.h#13 integrate .. //depot/projects/arm/src/sys/sys/kerneldump.h#4 integrate .. //depot/projects/arm/src/sys/sys/libkern.h#8 integrate .. //depot/projects/arm/src/sys/sys/pmc.h#5 integrate .. //depot/projects/arm/src/sys/sys/protosw.h#10 integrate .. //depot/projects/arm/src/sys/sys/syscall.h#29 integrate .. //depot/projects/arm/src/sys/sys/syscall.mk#29 integrate .. //depot/projects/arm/src/sys/sys/sysctl.h#21 integrate .. //depot/projects/arm/src/sys/sys/sysent.h#12 integrate .. //depot/projects/arm/src/sys/sys/sysproto.h#30 integrate .. //depot/projects/arm/src/sys/sys/systm.h#33 integrate .. //depot/projects/arm/src/sys/sys/tty.h#8 integrate .. //depot/projects/arm/src/sys/sys/types.h#8 integrate .. //depot/projects/arm/src/sys/sys/un.h#3 integrate .. //depot/projects/arm/src/sys/sys/vimage.h#2 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_vfsops.c#35 integrate .. //depot/projects/arm/src/sys/vm/device_pager.c#8 integrate .. //depot/projects/arm/src/sys/vm/swap_pager.c#20 integrate .. //depot/projects/arm/src/sys/vm/vm_page.c#39 integrate .. //depot/projects/arm/src/sys/vm/vm_page.h#17 integrate .. //depot/projects/arm/src/sys/vm/vm_pageout.c#19 integrate .. //depot/projects/arm/src/sys/vm/vm_pageout.h#3 integrate .. //depot/projects/arm/src/sys/xen/evtchn/evtchn.c#2 integrate .. //depot/projects/arm/src/sys/xen/gnttab.c#2 integrate .. //depot/projects/arm/src/sys/xen/gnttab.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/arch-ia64.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/arch-powerpc.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/arch-x86/cpuid.h#1 branch .. //depot/projects/arm/src/sys/xen/interface/arch-x86/hvm/save.h#1 branch .. //depot/projects/arm/src/sys/xen/interface/arch-x86/xen-mca.h#1 branch .. //depot/projects/arm/src/sys/xen/interface/arch-x86/xen-x86_32.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/arch-x86/xen-x86_64.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/arch-x86/xen.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/callback.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/domctl.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/features.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/foreign/mkchecker.py#2 integrate .. //depot/projects/arm/src/sys/xen/interface/foreign/mkheader.py#2 integrate .. //depot/projects/arm/src/sys/xen/interface/foreign/structs.py#2 integrate .. //depot/projects/arm/src/sys/xen/interface/grant_table.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/hvm/hvm_op.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/hvm/ioreq.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/hvm/params.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/hvm/save.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/io/blkif.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/io/fbif.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/io/kbdif.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/io/netif.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/io/pciif.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/io/protocols.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/io/ring.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/io/xenbus.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/io/xs_wire.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/kexec.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/libelf.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/memory.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/physdev.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/platform.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/sysctl.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/trace.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/vcpu.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/xen-compat.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/xen.h#2 integrate .. //depot/projects/arm/src/tools/build/options/WITHOUT_BSNMP#1 branch .. //depot/projects/arm/src/tools/build/options/WITHOUT_FLOPPY#1 branch .. //depot/projects/arm/src/tools/build/options/WITHOUT_NETGRAPH_SUPPORT#1 branch .. //depot/projects/arm/src/tools/build/options/WITHOUT_WIRELESS_SUPPORT#1 branch .. //depot/projects/arm/src/tools/tools/nanobsd/nanobsd.sh#16 integrate .. //depot/projects/arm/src/usr.bin/Makefile#17 integrate .. //depot/projects/arm/src/usr.bin/cpuset/cpuset.1#4 integrate .. //depot/projects/arm/src/usr.bin/make/job.c#5 integrate .. //depot/projects/arm/src/usr.bin/top/machine.c#9 integrate .. //depot/projects/arm/src/usr.sbin/Makefile#23 integrate .. //depot/projects/arm/src/usr.sbin/boot0cfg/boot0cfg.c#3 integrate .. //depot/projects/arm/src/usr.sbin/bsnmpd/modules/Makefile#3 integrate .. //depot/projects/arm/src/usr.sbin/syslogd/syslogd.8#3 integrate .. //depot/projects/arm/src/usr.sbin/syslogd/syslogd.c#6 integrate .. //depot/projects/arm/src/usr.sbin/timed/timed/globals.h#3 integrate Differences ... ==== //depot/projects/arm/src/ObsoleteFiles.inc#42 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.162 2008/09/21 16:11:11 antoine Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.163 2008/09/28 20:15:45 ed 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,12 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20080928: removal of inaccurate device_ids(9) manual page +OLD_FILES+=usr/share/man/man9/device_ids.9.gz +OLD_FILES+=usr/share/man/man9/major.9.gz +OLD_FILES+=usr/share/man/man9/minor.9.gz +OLD_FILES+=usr/share/man/man9/umajor.9.gz +OLD_FILES+=usr/share/man/man9/uminor.9.gz # 20080917: removal of manpage for axed kernel primitive suser(9) OLD_FILES+=usr/share/man/man9/suser.9.gz OLD_FILES+=usr/share/man/man9/suser_cred.9.gz ==== //depot/projects/arm/src/bin/pkill/pkill.1#2 (text+ko) ==== @@ -1,6 +1,6 @@ .\" $NetBSD: pkill.1,v 1.8 2003/02/14 15:59:18 grant Exp $ .\" -.\" $FreeBSD: src/bin/pkill/pkill.1,v 1.1 2008/08/31 14:27:59 yar Exp $ +.\" $FreeBSD: src/bin/pkill/pkill.1,v 1.3 2008/09/30 17:30:39 ed Exp $ .\" .\" Copyright (c) 2002 The NetBSD Foundation, Inc. .\" All rights reserved. ==== //depot/projects/arm/src/bin/pkill/pkill.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.1 2008/08/31 14:27:59 yar Exp $"); +__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.3 2008/09/30 17:30:39 ed Exp $"); #include #include @@ -607,12 +607,11 @@ struct passwd *pw; struct group *gr; struct stat st; - const char *cp, *prefix; + const char *cp; char *sp, *ep, buf[MAXPATHLEN]; int empty; empty = 1; - prefix = _PATH_DEV; while ((sp = strsep(&src, ",")) != NULL) { if (*sp == '\0') @@ -673,21 +672,21 @@ cp = "console"; } else { cp = sp; - if (strncmp(sp, "tty", 3) != 0) - prefix = _PATH_TTY; } - snprintf(buf, sizeof(buf), "%s%s", prefix, cp); + snprintf(buf, sizeof(buf), _PATH_DEV "%s", cp); + if (stat(buf, &st) != -1) + goto foundtty; + + snprintf(buf, sizeof(buf), _PATH_DEV "tty%s", cp); + if (stat(buf, &st) != -1) + goto foundtty; - if (stat(buf, &st) == -1) { - if (errno == ENOENT) { - errx(STATUS_BADUSAGE, - "No such tty: `%s'", sp); - } - err(STATUS_ERROR, "Cannot access `%s'", sp); - } + if (errno == ENOENT) + errx(STATUS_BADUSAGE, "No such tty: `%s'", sp); + err(STATUS_ERROR, "Cannot access `%s'", sp); - if ((st.st_mode & S_IFCHR) == 0) +foundtty: if ((st.st_mode & S_IFCHR) == 0) errx(STATUS_BADUSAGE, "Not a tty: `%s'", sp); li->li_number = st.st_rdev; ==== //depot/projects/arm/src/crypto/openssh/moduli.5#2 (text+ko) ==== @@ -13,7 +13,7 @@ .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -.Dd $Mdocdate: June 26 2008 $ +.Dd June 26 2008 .Dt MODULI 5 .Os .Sh NAME ==== //depot/projects/arm/src/crypto/openssh/scp.1#4 (text+ko) ==== @@ -11,7 +11,7 @@ .\" .\" $OpenBSD: scp.1,v 1.46 2008/07/12 05:33:41 djm Exp $ .\" -.Dd $Mdocdate: July 12 2008 $ +.Dd July 12 2008 .Dt SCP 1 .Os .Sh NAME ==== //depot/projects/arm/src/crypto/openssh/sftp-server.8#4 (text+ko) ==== @@ -22,7 +22,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. .\" -.Dd $Mdocdate: July 18 2008 $ +.Dd July 18 2008 .Dt SFTP-SERVER 8 .Os .Sh NAME ==== //depot/projects/arm/src/crypto/openssh/sftp.1#3 (text+ko) ==== @@ -22,7 +22,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. .\" -.Dd $Mdocdate: July 15 2008 $ +.Dd July 15 2008 .Dt SFTP 1 .Os .Sh NAME ==== //depot/projects/arm/src/crypto/openssh/ssh-add.1#3 (text+ko) ==== @@ -37,7 +37,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. .\" -.Dd $Mdocdate: June 12 2007 $ +.Dd June 12 2007 .Dt SSH-ADD 1 .Os .Sh NAME ==== //depot/projects/arm/src/crypto/openssh/ssh-agent.1#4 (text+ko) ==== @@ -34,7 +34,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. .\" -.Dd $Mdocdate: June 5 2007 $ +.Dd June 5 2007 .Dt SSH-AGENT 1 .Os .Sh NAME ==== //depot/projects/arm/src/crypto/openssh/ssh-keygen.1#3 (text+ko) ==== @@ -37,7 +37,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. .\" -.Dd $Mdocdate: June 12 2008 $ +.Dd June 12 2008 .Dt SSH-KEYGEN 1 .Os .Sh NAME ==== //depot/projects/arm/src/crypto/openssh/ssh-keyscan.1#4 (text+ko) ==== @@ -6,7 +6,7 @@ .\" permitted provided that due credit is given to the author and the .\" OpenBSD project by leaving this copyright notice intact. .\" -.Dd $Mdocdate: April 30 2008 $ +.Dd April 30 2008 .Dt SSH-KEYSCAN 1 .Os .Sh NAME ==== //depot/projects/arm/src/crypto/openssh/ssh-keysign.8#4 (text+ko) ==== @@ -22,7 +22,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. .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd May 31 2007 .Dt SSH-KEYSIGN 8 .Os .Sh NAME ==== //depot/projects/arm/src/crypto/openssh/ssh.1#5 (text+ko) ==== @@ -35,8 +35,8 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: ssh.1,v 1.277 2008/07/02 13:47:39 djm Exp $ -.\" $FreeBSD: src/crypto/openssh/ssh.1,v 1.36 2008/08/01 02:48:36 des Exp $ -.Dd $Mdocdate: July 2 2008 $ +.\" $FreeBSD: src/crypto/openssh/ssh.1,v 1.37 2008/09/29 10:53:05 des Exp $ +.Dd July 2 2008 .Dt SSH 1 .Os .Sh NAME ==== //depot/projects/arm/src/crypto/openssh/ssh_config.5#6 (text+ko) ==== @@ -35,8 +35,8 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: ssh_config.5,v 1.111 2008/06/26 11:46:31 grunk Exp $ -.\" $FreeBSD: src/crypto/openssh/ssh_config.5,v 1.24 2008/08/01 02:48:36 des Exp $ -.Dd $Mdocdate: June 26 2008 $ +.\" $FreeBSD: src/crypto/openssh/ssh_config.5,v 1.25 2008/09/29 10:53:05 des Exp $ +.Dd June 26 2008 .Dt SSH_CONFIG 5 .Os .Sh NAME ==== //depot/projects/arm/src/crypto/openssh/sshconnect2.c#4 (text+ko) ==== @@ -386,8 +386,9 @@ if (options.log_level >= SYSLOG_LEVEL_INFO) { if (len > 65536) len = 65536; - msg = xmalloc(len * 4); /* max expansion from strnvis() */ + msg = xmalloc(len * 4 + 1); /* max expansion from strnvis() */ strnvis(msg, raw, len * 4, VIS_SAFE|VIS_OCTAL); + msg[len*4] = '\0'; fprintf(stderr, "%s", msg); xfree(msg); } ==== //depot/projects/arm/src/crypto/openssh/sshd.8#4 (text+ko) ==== @@ -35,8 +35,8 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: sshd.8,v 1.246 2008/07/02 02:24:18 djm Exp $ -.\" $FreeBSD: src/crypto/openssh/sshd.8,v 1.35 2008/08/01 02:48:36 des Exp $ -.Dd $Mdocdate: July 2 2008 $ +.\" $FreeBSD: src/crypto/openssh/sshd.8,v 1.36 2008/09/29 10:53:05 des Exp $ +.Dd July 2 2008 .Dt SSHD 8 .Os .Sh NAME ==== //depot/projects/arm/src/crypto/openssh/sshd_config.5#6 (text+ko) ==== @@ -35,8 +35,8 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: sshd_config.5,v 1.96 2008/07/02 02:24:18 djm Exp $ -.\" $FreeBSD: src/crypto/openssh/sshd_config.5,v 1.30 2008/08/01 02:48:36 des Exp $ -.Dd $Mdocdate: July 2 2008 $ +.\" $FreeBSD: src/crypto/openssh/sshd_config.5,v 1.31 2008/09/29 10:53:05 des Exp $ +.Dd July 2 2008 .Dt SSHD_CONFIG 5 .Os .Sh NAME ==== //depot/projects/arm/src/etc/network.subr#13 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/network.subr,v 1.190 2008/06/23 20:50:11 mtm Exp $ +# $FreeBSD: src/etc/network.subr,v 1.191 2008/10/01 18:46:46 brooks Exp $ # # @@ -506,15 +506,9 @@ # Create wireless interfaces child_wlans=`get_if_var $ifn wlans_IF` - if [ -z "${child_wlans}" ]; then - child_wlans=`get_if_var $ifn vaps_IF` - if [ -n "${child_wlans}" ]; then - warn "soon to be deleted vaps_$ifn variable defined use wlans_$ifn" - fi - fi for child in ${child_wlans}; do - create_args="wlandev $ifn `get_if_var $child create_args_IF` `get_if_var $child vap_create_IF`" + create_args="wlandev $ifn `get_if_var $child create_args_IF`" if expr $child : 'wlan[0-9][0-9]*$' >/dev/null 2>&1; then ifconfig $child create ${create_args} && cfg=0 else ==== //depot/projects/arm/src/etc/rc.d/jail#7 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/jail,v 1.39 2008/09/16 20:18:25 thompsa Exp $ +# $FreeBSD: src/etc/rc.d/jail,v 1.40 2008/09/24 15:18:27 ru Exp $ # # PROVIDE: jail @@ -39,6 +39,7 @@ _procdir="${_rootdir}/proc" eval _hostname=\"\$jail_${_j}_hostname\" eval _ip=\"\$jail_${_j}_ip\" + eval _netmask=\"\${jail_${_j}_netmask:-255.255.255.255}\" eval _interface=\"\${jail_${_j}_interface:-${jail_interface}}\" eval _exec=\"\$jail_${_j}_exec\" eval _exec_start=\"\${jail_${_j}_exec_start:-${jail_exec_start}}\" @@ -93,6 +94,7 @@ debug "$_j mount enable: $_mount" debug "$_j hostname: $_hostname" debug "$_j ip: $_ip" + debug "$_j netmask: $_netmask" debug "$_j interface: $_interface" debug "$_j fib: $_fib" debug "$_j root: $_rootdir" @@ -297,7 +299,7 @@ continue; fi if [ -n "${_interface}" ]; then - ifconfig ${_interface} alias ${_ip} netmask 255.255.255.255 + ifconfig ${_interface} alias ${_ip} netmask ${_netmask} fi if [ -n "${_fib}" ]; then _setfib="setfib -F '${_fib}'" ==== //depot/projects/arm/src/gnu/lib/csu/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.29 2008/06/25 21:33:28 ru Exp $ +# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.31 2008/09/28 19:17:54 marcel Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../contrib/gcclibs ==== //depot/projects/arm/src/gnu/usr.bin/gdb/kgdb/kld.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kld.c,v 1.9 2008/04/29 20:32:45 jhb Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kld.c,v 1.11 2008/10/02 20:42:10 jhb Exp $"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Oct 4 10:05:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 378921065693; Sat, 4 Oct 2008 10:05:53 +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 D7476106568C for ; Sat, 4 Oct 2008 10:05:52 +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 C4B238FC13 for ; Sat, 4 Oct 2008 10:05:52 +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 m94A5qGn095280 for ; Sat, 4 Oct 2008 10:05:52 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m94A5qdR095278 for perforce@freebsd.org; Sat, 4 Oct 2008 10:05:52 GMT (envelope-from rene@FreeBSD.org) Date: Sat, 4 Oct 2008 10:05:52 GMT Message-Id: <200810041005.m94A5qdR095278@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 150942 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, 04 Oct 2008 10:05:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=150942 Change 150942 by rene@rene_self on 2008/10/04 10:05:01 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#8 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/gjournal-desktop/article.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#9 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/book.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/filesystems/chapter.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#6 integrate .. //depot/projects/docproj_nl/share/sgml/man-refs.ent#6 integrate .. //depot/projects/docproj_nl/www/share/sgml/advisories.xml#4 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#8 (text+ko) ==== @@ -1,4 +1,4 @@ - + 2004 2005 2006 + 2007 + 2008 DocEng - $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v 1.29 2006/05/28 17:08:45 blackend Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v 1.31 2008/10/02 12:14:31 pgj Exp $ - $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v 1.29 2006/05/28 17:08:45 blackend Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v 1.31 2008/10/02 12:14:31 pgj Exp $ &bookinfo.legalnotice; @@ -155,10 +157,9 @@ Manual page references. - Use - su - 1 - to change user names. + Use + &man.su.1; + to change user names. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#3 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -860,17 +860,18 @@ owned by that user as /mnt/username (replace username by the login name of - the actual user): + the actual user and usergroup by the + user's primary group): &prompt.root; mkdir /mnt/username -&prompt.root; chown user:user /mnt/user +&prompt.root; chown username:usergroup /mnt/username Suppose a USB thumbdrive is plugged in, and a device /dev/da0s1 appears. Since these devices usually come preformatted with a FAT file system, one can mount them like this: - &prompt.user; mount -t msdosfs -m 644 -M 755 /dev/da0s1 /mnt/username + &prompt.user; mount -t msdosfs -o -m=644,-M=755 /dev/da0s1 /mnt/username If you unplug the device (the disk must be unmounted before), you should see, in the system message buffer, ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/filesystems/chapter.sgml#2 (text+ko) ==== @@ -1,6 +1,6 @@ @@ -388,7 +388,7 @@ Note that the snapshot option will only capture a real file system, not a home directory or a file. The @ character is a delimiter used between - the file system name or the volume name. when a user's + the file system name or the volume name. When a user's home directory gets trashed, restore it with: &prompt.root; zfs rollback storage/home@08-30-08 @@ -564,7 +564,7 @@ period of time. There are many more options for the Z file system, - reading the &man.zfs.1; and &man.zpool.1; manual + see the &man.zfs.8; and &man.zpool.8; manual pages. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#6 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -2648,8 +2648,8 @@ flags to dhclient, also include the following (editing as necessary): - dhcp_program="/sbin/dhclient" -dhcp_flags="" + dhclient_program="/sbin/dhclient" +dhclient_flags="" ==== //depot/projects/docproj_nl/share/sgml/man-refs.ent#6 (text+ko) ==== @@ -20,7 +20,7 @@ lexicographical order by the entity (i.e., the dots used in place of special characters should not be expanded when comparing). - $FreeBSD: doc/share/sgml/man-refs.ent,v 1.468 2008/09/28 13:14:38 trhodes Exp $ + $FreeBSD: doc/share/sgml/man-refs.ent,v 1.469 2008/09/28 19:09:35 danger Exp $ --> @@ -3441,6 +3441,7 @@ + ==== //depot/projects/docproj_nl/www/share/sgml/advisories.xml#4 (text+ko) ==== @@ -2,7 +2,7 @@ - $FreeBSD: www/share/sgml/advisories.xml,v 1.221 2008/09/03 20:16:30 simon Exp $ + $FreeBSD: www/share/sgml/advisories.xml,v 1.222 2008/10/02 00:41:02 cperciva Exp $ @@ -10,6 +10,18 @@ 2008 + 10 + + + 2 + + + FreeBSD-SA-08:10.nd6 + + + + + 9 From owner-p4-projects@FreeBSD.ORG Sat Oct 4 10:33:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E10BE106568B; Sat, 4 Oct 2008 10:33: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 A444C1065688 for ; Sat, 4 Oct 2008 10:33:20 +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 91C8E8FC21 for ; Sat, 4 Oct 2008 10:33:20 +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 m94AXKBI097333 for ; Sat, 4 Oct 2008 10:33:20 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m94AXKtO097331 for perforce@freebsd.org; Sat, 4 Oct 2008 10:33:20 GMT (envelope-from rene@FreeBSD.org) Date: Sat, 4 Oct 2008 10:33:20 GMT Message-Id: <200810041033.m94AXKtO097331@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 150943 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, 04 Oct 2008 10:33:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=150943 Change 150943 by rene@rene_self on 2008/10/04 10:32:32 MFen disks/chapter.sgml 1.286 -> 1.287 (plus local fixes). Checked build, whitespace. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml#5 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml#5 (text+ko) ==== @@ -5,7 +5,7 @@ $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.35 2006/01/05 21:21:23 siebrand Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/disks/chapter.sgml - %SRCID% 1.286 + %SRCID% 1.287 --> @@ -221,7 +221,7 @@ /var/run/dmesg.boot bekeken te worden om er zeker van te zijn dat de nieuwe schijf is gevonden. Volgens het voorbeeld heet de nieuw toegevoegde schijf - da1 en die wordt gemount op + da1 en die wordt aangekoppeld op /1 (als er een IDE-schijf wordt toegevoegd, is de apparaatnaam ad1). @@ -342,18 +342,18 @@ Labelbewerker dient een enkel bestandssysteem te worden aangemaakt door op C te drukken. Kies FS wanneer gevraagd wordt of dit een FS - (file system) of swap wordt, en geef een mountpunt in + (file system) of swap wordt, en geef een koppelpunt in (bijvoorbeeld /mnt). Wanneer een schijf in post-installatie-modus wordt toegevoegd, maakt sysinstall geen ingangen aan in /etc/fstab, dus dan is het opgegeven - mountpunt niet van belang. + koppelpunt niet van belang. Nu kan het nieuwe label naar de schijf worden geschreven en er een bestandssysteem op aangemaakt worden. Dit kan gedaan worden door op W te drukken. Fouten van sysinstall - dat de nieuwe partitie niet gemount kon worden kunnen + dat de nieuwe partitie niet aankoppeld kon worden kunnen genegeerd worden. De Labelbewerker en sysinstall kunnen nu volledig verlaten worden. @@ -664,21 +664,21 @@ /etc/rc ccdconfig -C indien /etc/ccd.conf bestaat. Dit stelt automatisch de &man.ccd.4; in, zodat die kan worden - gemount. + aangekoppeld. Indien er in enkele-gebruiker-modus wordt opgestart, dient het volgende commando te worden uitgevoerd om de - rij in te stellen voordat de &man.ccd.4; gemount kan + rij in te stellen voordat de &man.ccd.4; aangekoppeld kan worden: ccdconfig -C - Om de &man.ccd.4; automatisch te mounten, kan er een - regel voor de &man.ccd.4; in + Om de &man.ccd.4; automatisch aan te koppelen, kan er + een regel voor de &man.ccd.4; in /etc/fstab geplaatst worden, zodat die - tijdens het opstarten gemount wordt: + tijdens het opstarten aangekoppeld wordt: /dev/ccd0c /media ufs rw 2 2 @@ -943,7 +943,7 @@ <Generic Traveling Disk 1.11> at scbus0 target 0 lun 0 (da0,pass0) Indien er een bestandssysteem op de schijf aanwezig is, kan - dat gemount worden. biedt + dat aangekoppeld worden. biedt indien nodig hulp bij het formatteren en aanmaken van partities op de USB-drive. @@ -992,29 +992,31 @@ start van het systeem. Als alternatief kan ook &man.sysctl.8; gebruikt worden om deze variabele te zetten. - De laatste stap is het creeeren van de directory waar het - bestandssysteem gekoppeld wordt. Deze directory moet eigendom - zijn van de gebruiker die het bestandssysteem gaat koppelen. - Een manier om dat te bewerkstelligen is door met de gebruiker - root een subdirectory aan te maken die - eigendom is van de gebruiker als + De laatste stap is het creëeren van de map waar het + bestandssysteem gekoppeld wordt. Deze map moet eigendom zijn + van de gebruiker die het bestandssysteem gaat koppelen. Een + manier om dat te bewerkstelligen is door met de gebruiker + root een submap aan te maken die eigendom + is van de gebruiker als /mntgebruikersnaam (verander gebruikersnaam door de - loginnaam van de daadwerkelijke gebruiker): + loginnaam van de daadwerkelijke gebruiker en + gebruikersgroep door de primaire + groep van de gebruiker): &prompt.root; mkdir /mnt/gebruikersnaam -&prompt.root; chown gebruiker:gebruiker /mnt/gebruiker +&prompt.root; chown gebruikersnaam:gebruikersgroep /mnt/gebruikersnaam - Stel dat er vervolgens een USB stick ingeplugged wordt - en er een /dev/da0s1 aangemaakt wordt. - Omdat deze apparaatjes meestal voorgeformatteerd met een - FAT bestandssysteem komen, kan deze als volgende gekoppeld + Stel dat er vervolgens een USB-stick ingeplugged wordt en er + een /dev/da0s1 aangemaakt wordt. Omdat + deze apparaten meestal voorgeformatteerd met een + FAT-bestandssysteem komen, kan deze als volgende gekoppeld worden: - &prompt.user; mount -t msdosfs -m 644 -M 755 /dev/da0s1 /mnt/gebruikersnaam + &prompt.user; mount -t msdosfs -o -m=644,-M=755 /dev/da0s1 /mnt/gebruikersnaam Indien het apparaat losgekoppeld wordt (nadat de schijf - gedismount is), dient in de buffer voor systeemmeldingen iets + afgekoppeld is), dient in de buffer voor systeemmeldingen iets als het volgende te zien te zijn: umass0: at uhub0 port 1 (addr2) disconnected @@ -1029,8 +1031,8 @@ Naast de onderdelen Schijven toevoegen en Bestandssystemen mounten en - unmounten, kunnen de volgende hulppagina's ook nuttig + linkend="mount-unmount">Bestandssystemen aan- en + afkoppelen, kunnen de volgende hulppagina's ook nuttig zijn: &man.umass.4;, &man.camcontrol.8; en &man.usbdevs.8;. @@ -1427,23 +1429,23 @@ Gegevens-CD's gebruiken Nu er een standaard gegevens-CD-ROM is aangemaakt moet deze - waarschijnlijk gemount worden om de gegevens die er op staan te - lezen. Normaalgesproken neemt &man.mount.8; aan dat een - bestandssysteem van het soort ufs is. Als - zoiets als onderstaande geprobeerd wordt komt er een klacht - over Incorrect super block en geen - mount: + waarschijnlijk aangekoppeld worden om de gegevens die er op + staan te lezen. Normaalgesproken neemt &man.mount.8; aan dat + een bestandssysteem van het soort ufs is. + Als zoiets als onderstaande geprobeerd wordt komt er een klacht + over Incorrect super block en wordt er + niet aangekoppeld: &prompt.root; mount /dev/cd0 /mnt De CD-ROM bevat geen - UFS-bestandssysteem, dus pogingen om zo te - mounten mislukken. Er dient aan &man.mount.8; verteld te + UFS-bestandssysteem, dus pogingen om zo aan + te koppelen mislukken. Er dient aan &man.mount.8; verteld te worden dat het bestandssysteem van het soort ISO9660 is en dan werkt alles. Dit kan door de optie van &man.mount.8; op te geven. Het CD-ROM-apparaat /dev/cd0 - onder /mnt mounten kan zo: + onder /mnt aankoppelen kan zo: &prompt.root; mount -t cd9660 /dev/cd0 /mnt @@ -1482,11 +1484,11 @@ Zo nu en dan kan Device not configured verschijnen als geprobeerd wordt om een - CD-ROM te mounten. Dit betekent meestal dat het CD-ROM-station - denkt dat er geen schijf in de lade ligt of dat het station - niet zichtbaar is op de bus. Omdat het enkele seconden kan - duren voordat een CD-ROM-station doorheeft dat er een CD-ROM - in ligt, is geduld geboden. + CD-ROM aan te koppelen. Dit betekent meestal dat het + CD-ROM-station denkt dat er geen schijf in de lade ligt of dat + het station niet zichtbaar is op de bus. Omdat het enkele + seconden kan duren voordat een CD-ROM-station doorheeft dat er + een CD-ROM in ligt, is geduld geboden. Soms wordt een SCSI CD-ROM gemist omdat het station niet genoeg tijd had om antwoord te geven op de busreset. Indien er @@ -1518,12 +1520,12 @@ &prompt.root; tar xzvf /dev/acd1 - Het is niet mogelijk om deze schijf te mounten zoals dat - voor een normale CD-ROM gedaan wordt. Zo'n CD-ROM kan onder + Het is niet mogelijk om deze schijf aan te koppelen zoals + dat voor een normale CD-ROM gedaan wordt. Zo'n CD-ROM kan onder geen enkel besturingssysteem, behalve &os;, gelezen worden. - Om de CD te kunnen mounten of gegevens te delen met een ander - besturingssysteem, dient &man.mkisofs.8; gebruikt te worden, - zoals boven beschreven is. + Om de CD aan te kunnen koppelen of gegevens te delen met een + ander besturingssysteem, dient &man.mkisofs.8; gebruikt te + worden, zoals boven beschreven is. @@ -1591,7 +1593,7 @@ Het station is nu toegankelijk via de apparaatnaam /dev/cd0. Om bijvoorbeeld een CD-ROM op - /mnt te mounten: + /mnt aan te koppelen: &prompt.root; mount -t cd9660 /dev/cd0 /mnt @@ -2187,8 +2189,8 @@ Diskettes gebruiken Om de diskette te gebruiken kan &man.mount.msdosfs.8; - gebruikt worden om het medium te mounten. Ook kan emulators/mtools uit de + gebruikt worden om het medium aan te koppelen. Ook kan + emulators/mtools uit de Portscollectie worden gebruikt. @@ -2695,7 +2697,7 @@ Indien dump op een hoofdmap wordt gebruikt, wordt er geen back-up gemaakt van /home , /usr of van de vele andere - mappen, aangezien dit typisch mountpunten voor andere + mappen, aangezien dit typisch koppelpunten voor andere bestandssystemen of symbolische koppelingen binnen deze bestandssystemen zijn. @@ -2997,9 +2999,9 @@ In het andere geval dienen twee eigen opstartbare diskettes aangemaakt te worden die een kernel bevatten die - alle gewenste schijven kan mounten en toegang heeft tot het - bandstation. Deze diskettes dienen het volgende te bevatten: - fdisk, newfs, + alle gewenste schijven kan aankoppelen en toegang heeft tot + het bandstation. Deze diskettes dienen het volgende te + bevatten: fdisk, newfs, mount en het gebruikte back-upprogramma. Deze programma's dienen statisch gelinkt te worden. Als dump gebruikt wordt, moet de diskette @@ -3063,7 +3065,7 @@ newfs -t 2 -u 18 -l 1 -c 40 -i 5120 -m 5 -o space /dev/fd0a # -# mount de nieuwe diskette +# koppel de nieuwe diskette aan # mount /dev/fd0a /mnt @@ -3171,7 +3173,7 @@ /usr/sbin/pwd_mkdb -d/mnt/etc /mnt/etc/master.passwd # -# umount de diskette en informeer de gebruiker +# koppel de diskette af en informeer de gebruiker # /sbin/umount /mnt echo "De diskette is ontkoppeld en is nu klaar."]]> @@ -3219,21 +3221,21 @@ newfs - Probeer de rootpartitie van de eerste schijf te mounten - (bijvoorbeeld mount /dev/da0a /mnt). Als - het schijflabel beschadigd is, gebruik dan - bsdlabel om de schijf opnieuw te + Probeer de rootpartitie van de eerste schijf aan te + koppelen (bijvoorbeeld mount /dev/da0a + /mnt). Als het schijflabel beschadigd is, gebruik + dan bsdlabel om de schijf opnieuw te partitioneren en te labelen zodat deze overeenkomt met het afgedrukte en bewaarde label. Gebruik voor het opnieuw aanmaken van de bestandssystemen newfs. - Hermount de rootpartitie van de diskette voor lezen en - schrijven (mount -u -o rw /mnt). Gebruik - voor het herstellen van de gegevens van dit bestandssysteem - het back-upprogramma en de back-upbanden (bijvoorbeeld - restore vrf /dev/sa0). Dismount nu het - bestandssysteem (bijvoorbeeld umount - /mnt). Herhaal dit voor elk beschadigd - bestandssysteem. + Koppel de rootpartitie van de diskette opnieuw aan voor lezen + en schrijven (mount -u -o rw /mnt). + Gebruik voor het herstellen van de gegevens van dit + bestandssysteem het back-upprogramma en de back-upbanden + (bijvoorbeeld restore vrf /dev/sa0). + Koppel nu het bestandssysteem af (bijvoorbeeld + umount /mnt). Herhaal dit voor elk + beschadigd bestandssysteem. Back-up de gegevens naar nieuwe banden als het systeem weer draait. De omstandigheden die verantwoordelijk waren @@ -3326,16 +3328,16 @@ geheugen-gebaseerde virtuele schijven: geheugenschijven die met &man.malloc.9; toegewezen zijn, geheugenschijven die een bestand als basis gebruiken en geheugenschijven die swapruimte - als basis gebruiken. Een mogelijk gebruik is het mounten van - een beeld van een diskette of CD dat in een bestand bewaard + als basis gebruiken. Een mogelijk gebruik is het aankoppelen + van een beeld van een diskette of CD dat in een bestand bewaard wordt. - Om een bestaand beeld van een bestandssysteem te - mounten: + Om een bestaand beeld van een bestandssysteem aan te + koppelen: <command>mdconfig</command> gebruiken om een bestaand - beeld van een bestandssysteem te mounten + beeld van een bestandssysteem aan te koppelen &prompt.root; mdconfig -a -t vnode -f schijfbeeld -u 0 &prompt.root; mount /dev/md0 /mnt @@ -3372,19 +3374,18 @@ md4. Meer details staan in de hulppagina van &man.mdconfig.8;. - Het commando &man.mdconfig.8; is erg nuttig, hoewel het veel opdrachten vergt om een bestandsgebaseerd bestandssysteem aan te maken. &os; wordt met &man.mdmfs.8; geleverd. Dit - programma stelt een &man.md.4;-schijf in door gebruik te maken van - &man.mdconfig.8;, zet er een bestandssysteem op door gebruik te - maken van &man.newfs.8; en mount het door gebruik te maken van - &man.mount.8;. Om hetzelfde bestandssysteembeeld als hierboven - aan te maken en te mounten: + programma stelt een &man.md.4;-schijf in door gebruik te maken + van &man.mdconfig.8;, zet er een bestandssysteem op door gebruik + te maken van &man.newfs.8; en koppel het aan door gebruik te + maken van &man.mount.8;. Om hetzelfde bestandssysteembeeld als + hierboven aan te maken en aan te koppelen: - Instellen en mounten van een bestandsgebaseerde schijf - met <command>mdmfs</command> + Instellen en aankoppelen van een bestandsgebaseerde + schijf met <command>mdmfs</command> &prompt.root; dd if=/dev/zero of=nieuwbeeld bs=1k count=5k 5120+0 records in @@ -3460,10 +3461,9 @@ Als een geheugen- of bestandsgebaseerd bestandssysteem niet gebruikt wordt, dienen alle bronnen aan het systeem - vrijgegeven te worden. Dismount als eerste het - bestandssysteem, gebruikt daarna &man.mdconfig.8; om de schijf - van een systeem los te koppelen en de bronnen vrij te - geven. + vrijgegeven te worden. Koppel als eerste het bestandssysteem + af, gebruikt daarna &man.mdconfig.8; om de schijf van een + systeem los te koppelen en de bronnen vrij te geven. Om bijvoorbeeld alle bronnen die door /dev/md4 gebruikt worden los te koppelen @@ -3508,10 +3508,10 @@ bestandssysteem waarop de handeling wordt uitgevoerd en er mogen niet meer dan 20 snapshots per bestandssysteem worden aangemaakt. Actieve snapshots worden opgeslagen in het superblok zodat ze - persistent zijn met dismount- en hermountbewerkingen en met het - opnieuw opstarten van het systeem. Als een snapshot niet langer - nodig is, kan het met het standaardcommando &man.rm.1; worden - verwijderd. Snapshots kunnen in elke volgorde verwijderd + persistent zijn met afkoppel- en heraankoppelbewerkingen en met + het opnieuw opstarten van het systeem. Als een snapshot niet + langer nodig is, kan het met het standaardcommando &man.rm.1; + worden verwijderd. Snapshots kunnen in elke volgorde verwijderd worden, alhoewel misschien niet alle gebruikte ruimte teruggewonnen wordt omdat sommige vrijgegeven blokken mogelijk door een ander snapshot geclaimd worden. @@ -3552,7 +3552,7 @@ De bestandssysteem integriteit controle, &man.fsck.8; kan gebruikt worden op het snapshot. Ervan uitgaande dat het - bestandssysteem schoon was toen het werd gemount, zou dit + bestandssysteem schoon was toen het werd aangekoppeld, zou dit altijd een schoon (en onveranderlijk) resultaat moeten opleveren. Dit is in principe wat het &man.fsck.8;-achtergrondsproces doet; @@ -3570,8 +3570,8 @@ Het snapshot kan met &man.mount.8; als bevroren beeld van - het bestandssysteem worden gemount. Om het snapshot - /var/snapshot/snap te mounten: + het bestandssysteem worden aangekoppeld. Om het snapshot + /var/snapshot/snap aan te koppelen: &prompt.root; mdconfig -a -t vnode -f /var/snapshot/snap -u 4 &prompt.root; mount -r /dev/md4 /mnt @@ -3579,12 +3579,12 @@ Het is nu mogelijk om door de structuur van het bevroren - bestandssysteem /var te lopen dat gemount is - op /mnt. Alles zal initieel in dezelfde - toestand verkeren als op het moment dat het snapshot werd - aangemaakt. De enige uitzondering hierop is dat eerdere + bestandssysteem /var te lopen dat + aangekoppeld is op /mnt. Alles zal initieel + in dezelfde toestand verkeren als op het moment dat het snapshot + werd aangemaakt. De enige uitzondering hierop is dat eerdere snapshots als bestanden met lengte nul verschijnen. Als een - snapshot niet meer nodig is, kan het als volgt gedismount + snapshot niet meer nodig is, kan het als volgt afgekoppeld worden: &prompt.root; umount /mnt @@ -3978,7 +3978,7 @@ In het volgende voorbeeld wordt aangenomen dat er een nieuwe harde schijf aan het systeem wordt toegevoegd die een enkele versleutelde partitie zal bevatten. Deze partitie - wordt gemount als /private. + wordt aangekoppeld als /private. gbde kan ook gebruikt worden om /home en /var/mail te versleutelen, maar daarvoor zijn complexere instructies @@ -4130,7 +4130,7 @@ Mount de versleutelde partitie - Maak een mountpunt voor het versleutelde + Maak een koppelpunt voor het versleutelde bestandssysteem aan: &prompt.root; mkdir /private @@ -4160,7 +4160,7 @@ - Bestaande versleutelde bestandssystemen mounten + Bestaande versleutelde bestandssystemen aankoppelen Elke keer nadat het systeem is opgestart dient elk versleuteld bestandssysteem opnieuw aan de kernel gekoppeld @@ -4186,7 +4186,7 @@ Aangezien het nog niet mogelijk is om versleutelde bestandssystemen op te nemen in /etc/fstab voor automatische controle, - dienen de bestandssystemen voordat ze gemount worden + dienen de bestandssystemen voordat ze aangekoppeld worden handmatig op fouten gecontroleerd te worden door &man.fsck.8; uit te voeren: @@ -4204,11 +4204,11 @@ - Versleutelde partities automatisch mounten + Versleutelde partities automatisch aankoppelen Het is mogelijk om een script aan te maken om automatisch een versleutelde partitie aan te koppelen, op - fouten te controleren en te mounten, maar vanwege + fouten te controleren en aan te koppelen, maar vanwege veiligheidsredenen dient het script niet het wachtwoord voor &man.gbde.8; te bevatten. In plaats hiervan wordt het aangeraden om zulke scripts handmatig uit te voeren en het @@ -4226,8 +4226,8 @@ gbde bij het starten wordt ingegeven. Na het invoeren van de juiste wachtwoordzin wordt de met gbde versleutelde - partitie automatisch gemount. Dit kan erg handig zijn bij - het gebruik van gbde op + partitie automatisch aangekoppeld. Dit kan erg handig zijn + bij het gebruik van gbde op notebooks. @@ -4377,15 +4377,15 @@ Het volgende voorbeeld beschrijft hoe een sleutelbestand te maken, dat wordt gebruikt als onderdeel van de Master Key voor de versleutelde dienst die wordt - gemount onder /private. Het sleutelbestand zorgt voor wat willekeurige gegevens die worden gebruikt om de Master Key te versleutelen. De Master Key wordt ook door een wachtwoordzin beschermd. De sectorgrootte van de dienst wordt 4 kB. Ook wordt beschreven hoe de geli-dienst te koppelen, er een - bestandsysteem op te maken, dat te mounten, hoe ermee te - werken en tenslotte hoe te ontkoppelen. + bestandsysteem op te maken, dat aan te koppelen, hoe ermee + te werken en tenslotte hoe te ontkoppelen. Het wordt aangeraden een grotere sectorgrootte in te stellen (zoals 4 kB) voor betere prestaties. @@ -4448,14 +4448,14 @@ - De dienst unmounten en afkoppelen + De dienst afkoppelen Als het werk met de versleutelde partitie is afgehandeld en de /private-partitie is niet - langer nodig, dan is het verstandig te overwegen de met - geli versleutelde partitie te unmounten - en af te koppelen van de kernel. + class="directory">/private-partitie niet langer + nodig is, dan is het verstandig te overwegen de met + geli versleutelde partitie af te koppelen + van het bestandssysteem en de kernel. &prompt.root; umount /private &prompt.root; geli detach da2.eli From owner-p4-projects@FreeBSD.ORG Sat Oct 4 11:02:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EE6F81065697; Sat, 4 Oct 2008 11:02: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 B1581106568B for ; Sat, 4 Oct 2008 11:02:50 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A02B58FC29 for ; Sat, 4 Oct 2008 11:02:50 +0000 (UTC) (envelope-from raj@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 m94B2oID099542 for ; Sat, 4 Oct 2008 11:02:50 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m94B2oAM099540 for perforce@freebsd.org; Sat, 4 Oct 2008 11:02:50 GMT (envelope-from raj@freebsd.org) Date: Sat, 4 Oct 2008 11:02:50 GMT Message-Id: <200810041102.m94B2oAM099540@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 150945 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, 04 Oct 2008 11:02:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=150945 Change 150945 by raj@raj_mimi on 2008/10/04 11:02:11 U-Boot includes cosmetics. Affected files ... .. //depot/projects/arm/src/sys/arm/include/bootinfo.h#2 edit .. //depot/projects/arm/src/sys/arm/include/metadata.h#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/include/bootinfo.h#2 (text+ko) ==== @@ -10,8 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -24,7 +22,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/powerpc/include/bootinfo.h,v 1.11 2008/03/12 16:32:07 raj Exp $ + * $FreeBSD$ */ #ifndef _MACHINE_BOOTINFO_H_ ==== //depot/projects/arm/src/sys/arm/include/metadata.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/metadata.h,v 1.2 2005/01/05 21:58:48 imp Exp $ + * $FreeBSD$ */ #ifndef _MACHINE_METADATA_H_ From owner-p4-projects@FreeBSD.ORG Sat Oct 4 11:03:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 226401065693; Sat, 4 Oct 2008 11:03:52 +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 DA5371065688 for ; Sat, 4 Oct 2008 11:03:51 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C91528FC14 for ; Sat, 4 Oct 2008 11:03:51 +0000 (UTC) (envelope-from raj@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 m94B3pvA000844 for ; Sat, 4 Oct 2008 11:03:51 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m94B3pkJ000842 for perforce@freebsd.org; Sat, 4 Oct 2008 11:03:51 GMT (envelope-from raj@freebsd.org) Date: Sat, 4 Oct 2008 11:03:51 GMT Message-Id: <200810041103.m94B3pkJ000842@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 150946 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, 04 Oct 2008 11:03:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=150946 Change 150946 by raj@raj_mimi on 2008/10/04 11:03:34 Adjust Marvell headers for better Discovery support. Affected files ... .. //depot/projects/arm/src/sys/arm/mv/mvreg.h#4 edit .. //depot/projects/arm/src/sys/arm/mv/mvvar.h#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/mv/mvreg.h#4 (text+ko) ==== @@ -98,11 +98,7 @@ #define MV_INTREGS_BASE (MV_MBUS_BRIDGE_BASE + 0x80) #define MV_CPU_CONTROL_BASE (MV_MBUS_BRIDGE_BASE + 0x100) #define MV_IC_BASE (MV_MBUS_BRIDGE_BASE + 0x200) -#if defined(SOC_MV_DISCOVERY) #define MV_IC_SIZE 0x3C -#else -#define MV_IC_SIZE 0x20 -#endif #define MV_TIMERS_BASE (MV_MBUS_BRIDGE_BASE + 0x300) #define MV_TIMERS_SIZE 0x30 #define MV_PCI_BASE (MV_BASE + 0x30000) @@ -444,11 +440,15 @@ /* * Decode windows definitions and macros */ -#define MV_WIN_CPU_CTRL(n) (0x10 * (n) + 0x0) -#define MV_WIN_CPU_BASE(n) (0x10 * (n) + 0x4) -#define MV_WIN_CPU_REMAP_LO(n) (0x10 * (n) + 0x8) -#define MV_WIN_CPU_REMAP_HI(n) (0x10 * (n) + 0xc) +#define MV_WIN_CPU_CTRL(n) (0x10 * (n) + (((n) < 8) ? 0x000 : 0x880)) +#define MV_WIN_CPU_BASE(n) (0x10 * (n) + (((n) < 8) ? 0x004 : 0x884)) +#define MV_WIN_CPU_REMAP_LO(n) (0x10 * (n) + (((n) < 8) ? 0x008 : 0x888)) +#define MV_WIN_CPU_REMAP_HI(n) (0x10 * (n) + (((n) < 8) ? 0x00C : 0x88C)) +#if defined(SOC_MV_DISCOVERY) +#define MV_WIN_CPU_MAX 14 +#else #define MV_WIN_CPU_MAX 8 +#endif #define MV_WIN_DDR_BASE(n) (0x8 * (n) + 0x0) #define MV_WIN_DDR_SIZE(n) (0x8 * (n) + 0x4) @@ -470,12 +470,12 @@ #define MV_WIN_IDMA_MAX 8 #define MV_IDMA_CHAN_MAX 4 -#define MV_WIN_PCIE_CTRL(n) (0x10 * (((n) < 5) ? (n) : (n) + 1) + \ - 0x1820) -#define MV_WIN_PCIE_BASE(n) (0x10 * (((n) < 5) ? (n) : (n) + 1) + \ - 0x1824) -#define MV_WIN_PCIE_REMAP(n) (0x10 * (((n) < 5) ? (n) : (n) + 1) + \ - 0x182C) +#define MV_WIN_PCIE_CTRL(n) (0x10 * (((n) < 5) ? (n) : \ + (n) + 1) + 0x1820) +#define MV_WIN_PCIE_BASE(n) (0x10 * (((n) < 5) ? (n) : \ + (n) + 1) + 0x1824) +#define MV_WIN_PCIE_REMAP(n) (0x10 * (((n) < 5) ? (n) : \ + (n) + 1) + 0x182C) #define MV_WIN_PCIE_MAX 6 #define MV_PCIE_BAR(n) (0x04 * (n) + 0x1804) ==== //depot/projects/arm/src/sys/arm/mv/mvvar.h#3 (text+ko) ==== @@ -84,7 +84,6 @@ uint8_t mv_gpio_in(uint32_t pin); int platform_pmap_init(void); -long platform_ramsize(void); int soc_decode_win(void); void soc_id(uint32_t *dev, uint32_t *rev); void soc_identify(void); From owner-p4-projects@FreeBSD.ORG Sat Oct 4 11:04:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 552F2106568F; Sat, 4 Oct 2008 11:04:54 +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 189B61065688 for ; Sat, 4 Oct 2008 11:04:53 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F1C208FC15 for ; Sat, 4 Oct 2008 11:04:52 +0000 (UTC) (envelope-from raj@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 m94B4qEW000920 for ; Sat, 4 Oct 2008 11:04:52 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m94B4qVG000918 for perforce@freebsd.org; Sat, 4 Oct 2008 11:04:52 GMT (envelope-from raj@freebsd.org) Date: Sat, 4 Oct 2008 11:04:52 GMT Message-Id: <200810041104.m94B4qVG000918@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 150947 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, 04 Oct 2008 11:04:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=150947 Change 150947 by raj@raj_mimi on 2008/10/04 11:04:46 Change linking addr range for DB-78XX system. Same reasons and comments apply as for the DB-88F6XXX systems. Affected files ... .. //depot/projects/arm/src/sys/arm/mv/discovery/std.db78xxx#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/mv/discovery/std.db78xxx#3 (text+ko) ==== @@ -3,11 +3,11 @@ include "../mv/std.mv" files "../mv/discovery/files.db78xxx" -makeoptions KERNPHYSADDR=0x00200000 -makeoptions KERNVIRTADDR=0xc0200000 +makeoptions KERNPHYSADDR=0x00900000 +makeoptions KERNVIRTADDR=0xc0900000 -options KERNPHYSADDR=0x00200000 -options KERNVIRTADDR=0xc0200000 +options KERNPHYSADDR=0x00900000 +options KERNVIRTADDR=0xc0900000 options PHYSADDR=0x00000000 options PHYSMEM_SIZE=0x20000000 options STARTUP_PAGETABLE_ADDR=0x00100000 From owner-p4-projects@FreeBSD.ORG Sat Oct 4 11:06:55 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9384C1065689; Sat, 4 Oct 2008 11:06:55 +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 57DCE1065686 for ; Sat, 4 Oct 2008 11:06:55 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2D6AF8FC0A for ; Sat, 4 Oct 2008 11:06:55 +0000 (UTC) (envelope-from raj@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 m94B6tNO001129 for ; Sat, 4 Oct 2008 11:06:55 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m94B6tfe001127 for perforce@freebsd.org; Sat, 4 Oct 2008 11:06:55 GMT (envelope-from raj@freebsd.org) Date: Sat, 4 Oct 2008 11:06:55 GMT Message-Id: <200810041106.m94B6tfe001127@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 150948 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, 04 Oct 2008 11:06:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=150948 Change 150948 by raj@raj_mimi on 2008/10/04 11:06:12 Fix Discovery IDMA decode window settings. Affected files ... .. //depot/projects/arm/src/sys/arm/mv/discovery/discovery.c#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/mv/discovery/discovery.c#3 (text+ko) ==== @@ -151,7 +151,7 @@ */ const struct decode_win idma_win_tbl[] = { /* PCIE MEM */ - { 4, 0x59, MV_PCIE_MEM_PHYS_BASE, -1 }, + { 4, 0x59, MV_PCIE_MEM_PHYS_BASE, MV_PCIE_MEM_SIZE, -1 }, }; const struct decode_win *idma_wins = idma_win_tbl; int idma_wins_no = sizeof(idma_win_tbl) / sizeof(struct decode_win); From owner-p4-projects@FreeBSD.ORG Sat Oct 4 12:25:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 14332106569E; Sat, 4 Oct 2008 12:25:15 +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 B2EC6106568A for ; Sat, 4 Oct 2008 12:25:14 +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 A01A48FC17 for ; Sat, 4 Oct 2008 12:25:14 +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 m94CPEAa008241 for ; Sat, 4 Oct 2008 12:25:14 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m94CPEWm008239 for perforce@freebsd.org; Sat, 4 Oct 2008 12:25:14 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 4 Oct 2008 12:25:14 GMT Message-Id: <200810041225.m94CPEWm008239@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 150951 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, 04 Oct 2008 12:25:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=150951 Change 150951 by pgj@kolbasz on 2008/10/04 12:25:03 Add Hungarian translation of chapter "File Systems Support" from Handbook Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/filesystems/chapter.sgml#2 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/filesystems/chapter.sgml#2 (text+ko) ==== @@ -4,8 +4,9 @@ --> @@ -14,460 +15,619 @@ Tom Rhodes - Written by + Írta: - File Systems Support + Támogatott állományrendszerek - Synopsis + Áttekintés - File Systems + állományrendszerek - File Systems Support - File Systems + támogatott + állományrendszerek + állományrendszerek - File systems are an integral part of any operating system. - They allow for users to upload and store files, provide access - to data, and of course, make hard drives useful. Different - operating systems usually have one major aspect in common, that - is their native file system. On &os; this file system is known - as the Fast File System or FFS which is built - on the original Unix™ File System, also known as - UFS. This is the native file system on &os; - which is placed on hard disks for access to data. + Az állományrendszerek szerves + részét képezik napjaink operációs + rendszereinek. Segítségükkel a + felhasználók adatokat tölthetnek fel és + tárolhatnak a számítógépen, + szabályozhatják a + hozzáférésüket, és + természetesen mûködtethetik a merevlemezeiket. A + különféle operációs rendszerekben + általában azért annyi közös, hogy + mindannyiukhoz tartozik egy natív, vagyis általuk + alapból ismert állományrendszer. A &os; + esetében ezt konkrétan a Fast File System vagy + röviden FFS, amely az eredeti Unix™ + File System, vagy más néven UFS + megoldásain alapszik. A &os; tehát a merevlemezeken + ebben a natív állományrendszerben + tárol adatokat. - &os; also supports a multitude of different file systems to - provide support for accessing data from other operating systems - locally, i.e. data stored on locally attached - USB storage devices, flash drives, and hard - disks. There is also support for some non-native file systems. - These are file systems developed on other - operating systems, like the &linux; Extended File System - (EXT), and the &sun; Z File System + A &os; természetesen ezen kívül még + ismer számos egyéb állományrendszert, + ezáltal képes adatokat olvasni más + operációs rendszerek részérõl is + kezelhetõ partíciókról, + például helyi + USB-eszközökrõl, + flashkártyákról és + merevlemezekrõl. Továbbá ismeri + néhány más operációs rendszer + natív állományrendszerét, mint + például a &linux; Extended File System + (EXT) vagy éppen a &sun; Z File System (ZFS). - There are different levels of support for the various file - systems in &os;. Some will require a kernel module to be loaded, - others may require a toolset to be installed. This chapter is - designed to help users of &os; access other file systems on their - systems, starting with the &sun; Z file - system. + &os; alatt az egyes állományrendszerek ismerete + változó. Bizonyos esetekben elegendõ + csupán egy megfelelõ modul betöltése, + máskor viszont egy komplett eszközkészlet + segítségével tudunk velük dolgozni. Ez + a fejezet igyekszik a &sun;-féle Z + állományrendszerrel kezdõdõen bemutatni a + &os; felhasználói számára más + állományrendszerek használatát. - After reading this chapter, you will know: + A fejezet elolvasása során + megismerjük: - The difference between native and supported file systems. + a natív és támogatott + állományrendszerek közti + különbségeket; - What file systems are supported by &os;. + a &os; által ismert + állományrendszereket; - How to enable, configure, access and make use of - non-native file systems. + hogyan engedélyezzünk, állítsunk + be és érjünk el nem natív + állományrendszereket. - Before reading this chapter, you should: + A fejezet elolvasásához ajánlott: - Understand &unix; and &os; basics - (). + a &unix; és &os; alapjainak ismerete (); - Be familiar with - the basics of kernel configuration/compilation - (). + a rendszermag konfigurációjának + és fordításának alapvetõ + fogásainak ismerete (); - Feel comfortable installing third party software - in &os; (). + a különbözõ külsõ + fejlesztésû szoftverek + telepítésének ismerete (); - Have some familiarity with disks, storage and - device names in &os; (). + a lemezek és egyéb + tárolóeszközök, valamint a &os; alatt az + eszközök elnevezésének + minimális ismerete (). - - The ZFS feature is considered - experimental. Some options may be lacking in functionality, - other parts may not work at all. In time, this feature will - be considered production ready and this documentation will be - altered to fit that situation. + Jelenleg a ZFS támogatása + még nem tekinthetõ hétköznapi + használatra alkalmasnak. Ennek + következményeképpen bizonyos funkciók + nem megfelelõen vagy egyáltalán nem + mûködnek. Ahogy ez a támogatás + megbízhatóvá válik, úgy + fogjuk tovább finomítani a + dokumentációt. - The Z File System + A Z állományrendszer - The Z file system, developed by &sun;, is a new - technology designed to use a pooled storage method. This means - that space is only used as it is needed for data storage. It - has also been designed for maximum data integrity, supporting - data snapshots, multiple copies, and data checksums. A new - data replication model, known as RAID-Z has - been added. The RAID-Z model is similar - to RAID5 but is designed to prevent data - write corruption. + A &sun; Z állományrendszere egy új, + közös tárolási módszeren + nyugvó technológia. Ez annyit jelent a + gyakorlatban, hogy mindig csak annyi helyet foglal, amennyire az + adatoknak közvetlenül szüksége van. + Emellett úgy alakították ki, hogy az adatok + épségét minél inkább + védje, ezért például + megtalálhatjuk benne a pillanatképek + készítését, a másolatok + létrehozását és az adatok + sértetlenségének + ellenõrzését. Továbbá egy + RAID-Z néven bemutatott új + replikációs modellt is támogat. A + RAID-Z alapvetõen a + RAID-5 megoldásához + hasonlít, azonban írás során + keletkezõ hibák ellen igyekszik védelmet + nyújtani. - ZFS Tuning + A ZFS finomhangolása - The ZFS subsystem utilizes much of - the system resources, so some tuning may be required to provide - maximum efficiency during every-day use. As an experimental - feature in &os; this may change in the near future; however, - at this time, the following steps are recommended. + A ZFS funkcióit + megvalósító alrendszer + alapértelmezés szerint meglehetõsen sok + erõforrást kíván, ezért nem + árt a legjobb hatékonyságra behangolnunk a + mindennapokban felmerülõ igények mentén. + Mivel ez még egy fejlesztés és + tesztelés alatt álló része a + &os;-nek, elképzelhetõ, hogy ez a jövõben + változik, viszont jelen pillanatban a következõ + lépéseket javasoljuk. - Memory + Memória - The total system memory should be at least one gigabyte, - with two gigabytes or more recommended. In all of the - examples here, the system has one gigabyte of memory with - several other tuning mechanisms in place. + Hasznos, ha a rendszerünkben legalább + 1 GB memória található, de + inkább 2 vagy több az ajánlott. Az itt + szereplõ példákban ehelyett azonban + mindenhol csupán 1 GB-ot + feltételezünk. - Some people have had luck using fewer than one gigabyte - of memory, but with such a limited amount of physical memory, - when the system is under heavy load, it is very plausible - that &os; will panic due to memory exhaustion. + Néhányaknak sikerült + 1 GB-nál kevesebb központi + memóriával is használni ezt az + állományrendszert, azonban ilyenkor nagyon + könnyen elõfordulhat, hogy komolyabb terhelés + esetén a &os; a memória elfogyása miatt + egyszerûen összeomlik. - Kernel Configuration + A rendszermag beállításai - It is recommended that unused drivers and options - be removed from the kernel configuration file. Since most - devices are available as modules, they may simply be loaded - using the /boot/loader.conf file. + A rendszermag konfigurációs + állományából javasolt + eltávolítani az összes nem használt + meghajtót és funkciót. A legtöbb + meghajtó egyébként is + elérhetõ modul formájában, és + a /boot/loader.conf + állományon keresztül minden gond + nélkül betölthetõek. - Users of the i386 architecture should add the following - option to their kernel configuration file, rebuild their - kernel, and reboot: + Az i386 architektúránál + szükségünk lesz az alábbi + konfigurációs beállítás + megadására, majd a rendszermag + újrafordítására, végül + a rendszer újraindítására: options KVA_PAGES=512 - This option will expand the kernel address space, thus - allowing the vm.kvm_size tunable to be - pushed beyond the currently imposed limit of 1 GB - (2 GB for PAE). To find the most - suitable value for this option, divide the desired address - space in megabytes by four (4). In this case, it is - 512 for 2 GB. + Ezzel az opcióval a rendszermag + címterét növeljük meg, aminek + eredményeképpen a vm.kvm_size + változót immáron az eredetileg + 1 GB-os (PAE használata + esetén pedig 2 GB-os) határ felé + tudjuk állítani. Az itt megadandó + értéket úgy tudjuk meghatározni, + ha a beállítani kívánt + méret MB-okban számolt + értékét elosztjuk néggyel. A + példában tehát az 512 + egy 2 GB nagyságú címteret ad + meg. - Loader Tunables + A rendszertöltõ + beállításai - The kmem address space should be - increased on all &os; architectures. On the test system with - one gigabyte of physical memory, success was achieved with the - following options which should be placed in - the /boot/loader.conf file and the system - restarted: + A kmem címterét az + összes &os; által ismert architektúra + esetében érdemes megnövelnünk. A + teszteléshez használt rendszeren 1 GB + fizikai memória állt rendelkezésre, itt a + /boot/loader.conf + állományban a következõ + értékek megadásával minden + remekül mûködött: vm.kmem_slze="330M" vm.kmem_size_max="330M" vfs.zfs.arc_max="40M" vfs.zfs.vdev.cache.size="5M" - For a more detailed list of recommendations for ZFS-related - tuning, see - . + A ZFS finomhangolásával kapcsolatos + további javasolatokat a + címen olvashatunk. - Using <acronym>ZFS</acronym> + A <acronym>ZFS</acronym> használata - There is a start up mechanism that allows &os; to - mount ZFS pools during system - initialization. To set it, issue the following - commands: + A Z állományrendszerhez létezik egy + olyan mechanizmus, amelyen keresztül már a &os; + indítása során el tudjuk végezni a + közös tárolók + csatlakoztatását: &prompt.root; echo 'zfs_enable="YES"' >> /etc/rc.conf &prompt.root; /etc/rc.d/zfs start - The remainder of this document assumes two - SCSI disks are available, and their device names - are da0 - and da1 - respectively. Users of IDE hardware may - use the ad - devices in place of SCSI hardware. + A leírás fennmaradó + részében feltételezzük, hogy + két SCSI-lemezünk van, + amelyeket rendre a + da0 + és + da1 + eszközök formájában tudunk + elérni. Az IDE lemezek + tulajdonosainak értelemszerûen itt majd az + ad + eszközneveket kell használniuk a + SCSI-eszközök hivatkozásai + helyett. - Single Disk Pool + Egyetlen közös tároló + használata - To create a ZFS over a single disk - device, use the zpool command: + A zpool kiadásával + egyetlen lemezen is létre tudunk hozni + ZFS partíciót: - &prompt.root; zpool create example /dev/da0 + &prompt.root; zpool create minta /dev/da0 - To view the new pool, review the output of the - df: + Az új közös tárterület a + df parancs + felhasználásával rögtön + láthatóvá válik: &prompt.root; df Filesystem 1K-blocks Used Avail Capacity Mounted on /dev/ad0s1a 2026030 235230 1628718 13% / devfs 1 1 0 100% /dev /dev/ad0s1d 54098308 1032846 48737598 2% /usr -example 17547136 0 17547136 0% /example +minta 17547136 0 17547136 0% /minta - This output clearly shows the example - pool has not only been created but - mounted as well. It is also accessible - just like a normal file system, files may be created on it - and users are able to browse it as in the - following example: + A parancs kimenetében tisztán + láthatjuk, hogy a minta nevû + tároló nem csak egyszerûen + elkészült, hanem egyúttal + csatolódott. Innentõl + már a többi állományrendszerhez + hasonlóan tetszõlegesen elérhetõ, az + alábbi példához hasonlóan + állományok hozhatóak rajta létre + vagy listázható a tartalma: - &prompt.root cd /example + &prompt.root cd /minta &prompt.root; ls -&prompt.root; touch testfile +&prompt.root; touch proba &prompt.root; ls -al total 4 drwxr-xr-x 2 root wheel 3 Aug 29 23:15 . drwxr-xr-x 21 root wheel 512 Aug 29 23:12 .. --rw-r--r-- 1 root wheel 0 Aug 29 23:15 testfile +-rw-r--r-- 1 root wheel 0 Aug 29 23:15 proba - Unfortunately this pool is not taking advantage of - any ZFS features. Create a file system - on this pool, and enable compression on it: + Sajnos azonban ez a tároló még ki sem + használja a ZFS által + felkínált lehetõségeket. + Ezért most hozzunk létre egy + állományrendszert ezen a tárolón + belül és engedélyezzük rajta a + tömörítést: - &prompt.root; zfs create example/compressed -&prompt.root; zfs set compression=gzip example/compressed + &prompt.root; zfs create minta/tomoritett +&prompt.root; zfs set compression=gzip minta/tomoritett - The example/compressed is now a - ZFS compressed file system. Try copying - some large files to it by copying them to - /example/compressed. + A minta/tomoritett most már egy + tömörített Z állományrendszer. + Próbáljuk ki mit tud, és másoljunk + néhány nagyobb méretû + állományt a /minta/tomoritett + könyvtárba. - The compression may now be disabled with: + Ezután a tömörítés + akár ki is kapcsolható: - &prompt.root; zfs set compression=off example/compressed + &prompt.root; zfs set compression=off minta/tomoritett - To unmount the file system, issue the following command - and then verify by using the df - utility: + Az állományrendszer + leválasztásához adjuk ki a lenti parancsot, + majd ellenõrizzük az eredményét a + df használatával: - &prompt.root; zfs umount example/compressed + &prompt.root; zfs umount minta/tomoritett &prompt.root; df Filesystem 1K-blocks Used Avail Capacity Mounted on /dev/ad0s1a 2026030 235232 1628716 13% / devfs 1 1 0 100% /dev /dev/ad0s1d 54098308 1032864 48737580 2% /usr -example 17547008 0 17547008 0% /example +minta 17547008 0 17547008 0% /minta - Re-mount the file system to make it accessible - again, and verify with df: + Tegyük ismét elérhetõvé + és csatlakoztassuk újra az + állományrendszert, majd nézzük meg + az eredményt a df paranccsal: - &prompt.root; zfs mount example/compressed + &prompt.root; zfs mount minta/tomoritett &prompt.root; df Filesystem 1K-blocks Used Avail Capacity Mounted on /dev/ad0s1a 2026030 235234 1628714 13% / devfs 1 1 0 100% /dev /dev/ad0s1d 54098308 1032864 48737580 2% /usr -example 17547008 0 17547008 0% /example -example/compressed 17547008 0 17547008 0% /example/compressed +minta 17547008 0 17547008 0% /minta +minta/tomoritett 17547008 0 17547008 0% /minta/tomoritett - The pool and file system may also be observed by viewing - the output from mount: + A közös terület és az + állományrendszer mellesleg a + mount parancs kimenetébõl is + megfigyelhetõ: &prompt.root; mount /dev/ad0s1a on / (ufs, local) devfs on /dev (devfs, local) /dev/ad0s1d on /usr (ufs, local, soft-updates) -example on /example (zfs, local) -example/data on /example/data (zfs, local) -example/compressed on /example/compressed (zfs, local) +minta on /minta (zfs, local) +minta/tomoritett on /minta/tomoritett (zfs, local) - As observed, ZFS file systems, after - creation, may be used like ordinary file systems; however, - many other features are also available. In the following - example, a new file system, data is - created. Important files will be stored here, so the file - system is set to keep two copies of each data block: + Látható, hogy a létrehozásuk + után a Z állományrendszerek teljesen + hétköznapi módon viselkednek, de + természetesen további lehetõségek is + elérhetõek hozzájuk. A következõ + példában adat néven + készítünk egy új + állományrendszert. Mivel ide majd nagyon fontos + állományokat akarunk elhelyezni, + állítsuk be, hogy minden adatblokkból + két példány legyen: - &prompt.root; zfs create example/data -&prompt.root; zfs set copies=2 example/data + &prompt.root; zfs create minta/adat +&prompt.root; zfs set copies=2 minta/adat - It is now possible to see the data and space utilization - by issuing the df again: + A df újbóli + kiadásával most már látható + is ez az állományrendszer és annak + tárfoglalása: &prompt.root; df Filesystem 1K-blocks Used Avail Capacity Mounted on /dev/ad0s1a 2026030 235234 1628714 13% / devfs 1 1 0 100% /dev /dev/ad0s1d 54098308 1032864 48737580 2% /usr -example 17547008 0 17547008 0% /example -example/compressed 17547008 0 17547008 0% /example/compressed -example/data 17547008 0 17547008 0% /example/data +minta 17547008 0 17547008 0% /minta +minta/tomoritett 17547008 0 17547008 0% /minta/tomoritett +minta/adat 17547008 0 17547008 0% /minta/adat - Notice that each file system on the pool has the same - amount of available space. This is the reason for using - the df through these examples, to show - that the file systems are using only the amount of space - they need and will all draw from the same pool. - The ZFS file system does away with concepts - such as volumes and partitions, and allows for several file - systems to occupy the same pool. Destroy the file systems, - and then destroy the pool as they are no longer - needed: + Vegyük észre, hogy a közös + területen levõ állományrendszerek + mindegyikén ugyanannyi szabad terület van. A + df segítségével a + késõbbiekben remekül megfigyelhetõ lesz, + hogy az egyes állományrendszerek mindig csak + annyi területet foglalnak el a közös + területbõl, amennyire abban a pillanatban + ténylegesen szükségünk van. A Z + állományrendszerek esetén megszûnik + a partíciók és kötetek fogalma, + és több állományrendszer + tárolódik egyazon közös + területen. Ha már nem akarjuk használni, + egyszerûen csak töröljük le az + állományrendszereket és ezt a + közös tárolót: - &prompt.root; zfs destroy example/compressed -&prompt.root; zfs destroy example/data -&prompt.root; zpool destroy example + &prompt.root; zfs destroy minta/tomoritett +&prompt.root; zfs destroy minta/adat +&prompt.root; zpool destroy minta - Disks go bad and fail, an unavoidable trait. When - this disk goes bad, the data will be lost. One method of - avoiding data loss due to a failed hard disk is to implement - a RAID. ZFS supports - this feature in its pool design which is covered in - the next section. + Nyilván tapasztalhattunk már, hogy a + lemezeink olykor menthetetlenül meghibásodnak. + Amikor egy lemezes meghajtó tönkremegy, a rajta + tárolt adatok általában elvesznek. Az + ilyen jellegû kellemetlenségek + elkerülésének egyik módja az + ún. RAID-tömbök + építése. A következõ + szakaszban bemutatjuk, hogy a Z + állományrendszerek esetén hogyan tudunk + ilyen tömböket készíteni. - <acronym>ZFS</acronym> RAID-Z + <acronym>RAID</acronym>-Z tömbök - As previously noted, this section will assume that - two SCSI exists as devices - da0 and - da1. To create a - RAID-Z pool, issue the following - command: + Korábban már utaltunk rá, hogy ebben + a szakaszban két SCSI-lemez, vagyis a + da0 és + da1 eszközök + használatát feltételezzük. Egy + RAID-Z formátumú + közös tároló + készítéséhez a következõ + parancsot kell kiadni: - &prompt.root; zpool create storage raidz da0 da1 + &prompt.root; zpool create tarolo raidz da0 da1 - The storage zpool should have been - created. This may be verified by using the &man.mount.8; and - &man.df.1; commands as before. More disk devices may have - been allocated by adding them to the end of the list above. - Make a new file system in the pool, called - home where user files will eventually be - placed: + Ennek hatására tehát keletkezik egy + tarolo nevû Z-tároló. + Ez a korábbiakhoz hasonló módon + ellenõrizhetõ is a &man.mount.8; és + &man.df.1; parancsokon keresztül. Természetesen + az iménti listába további + lemezeszközök tetszõlegesen felvehetõek. + Most hozzunk létre ezen a közös + területen egy felhasznalok nevû + állományrendszert, ahová majd a + felhasználók adatait fogjuk tenni: - &prompt.root; zfs create storage/home + &prompt.root; zfs create tarolo/felhasznalok - It is now possible to enable compression and keep extra - copies of the user's home directories and files. This may - be accomplished just as before using the following - commands: + Miután ezzel megvagyunk, az imént + létrehozott állományrendszerre nyugodtan + beállíthatunk tömörítést + és biztonsági másolatokat. Ebben az + alábbi parancsok lesznek a + segítségünkre: - &prompt.root; zfs set copies=2 storage/home -&prompt.root; zfs set compression=gzip storage/home + &prompt.root; zfs set copies=2 tarolo/felhasznalok +&prompt.root; zfs set compression=gzip tarolo/felhasznalok - To make this the new home directory for users, copy the - user data to this directory, and create the appropriate - symbolic links: + Ezt követõen költöztessük + át a felhasználókat, vagyis másoljuk + át az adataikat ide és hozzuk létre a + megfelelõ szimbolikus linkeket: - &prompt.root; cp -rp /home/* /storage/home + &prompt.root; cp -rp /home/* /tarolo/felhasznalok &prompt.root; rm -rf /home /usr/home -&prompt.root; ln -s /storage/home /home -&prompt.root; ln -s /storage/home /usr/home +&prompt.root; ln -s /tarolo/felhasznalok /home +&prompt.root; ln -s /tarolo/felhasznalok /usr/home - Users should now have their data stored on the freshly - created /storage/home - file system. Test by adding a new user and logging in as - that user. + A felhasználók adatai immáron a + frissen létrehozott /tarolo/felhasznalok + állományrendszeren tárolódnak. + Próbáljuk ki, hozzunk létre egy új + felhasználót és jelentkezzünk be + vele. - Try creating a snapshot which may be rolled back - later: + Készítsünk most egy + pillanatképet is, amelyet aztán késõbb + szükség esetén vissza tudunk + állítani: - &prompt.root; zfs snapshot storage/home@08-30-08 + &prompt.root; zfs snapshot tarolo/felhasznalok@08-08-30 - Note that the snapshot option will only capture a real - file system, not a home directory or a file. The - @ character is a delimiter used between - the file system name or the volume name. When a user's - home directory gets trashed, restore it with: + A snapshot csak valós + állományrendszerekkel mûködik, + könyvtárakra vagy állományokra nem. + A nevében a @ karakter + választja el egymástól a + hozzátartozó címkét az + állományrendszer vagy kötet + nevétõl. Ha netalán a + felhasználói könyvtárak + valamiért megsérültek volna, a + következõ paranccsal + állíthatóak vissza: - &prompt.root; zfs rollback storage/home@08-30-08 + &prompt.root; zfs rollback tarolo/felhasznalok@08-08-30 - To get a list of all available snapshots, run the - ls in the file system's + Az adott idõpontban aktív + pillanatképeket az adott állományrendszer .zfs/snapshot - directory. For example, to see the previously taken - snapshot, perform the following command: + könyvtárában találhatjuk meg. + Például az elõbb készített + pillanatkép az alábbi paranccsal + nézhetõ meg: - &prompt.root; ls /storage/home/.zfs/snapshot + &prompt.root; ls /tarolo/felhasznalok/.zfs/snapshot - It is possible to write a script to perform monthly - snapshots on user data; however, over time, snapshots - may consume a great deal of disk space. The previous - snapshot may be removed using the following command: + Ha ebbõl elindulunk, akkor pillanatok alatt + írható egy olyan szkript, amely a + felhasználók adatairól havonta + készít egy pillanatképet. Ilyenkor + azonban fontos számításba vennünk, + hogy az idõvel felgyülemlõ pillanatképek + rengeteg helyet el tudnak foglalni. A korábbi + pillanatkép így távolítható + el: - &prompt.root; zfs destroy storage/home@08-30-08 + &prompt.root; zfs destroy tarolo/felhasznalok@08-08-30 - There is no reason, after all of this testing, we should - keep /storage/home - around in its present state. Make it the real - /home file - system: + Miután alaposan kipróbáltuk a + /tarolo/felhasznalok + néven létrehozott + állományrendszerünket, + állítsuk be véglegesen ez eddigi + /home + állományrendszer helyére: - &prompt.root; zfs set mountpoint=/home storage/home + &prompt.root; zfs set mountpoint=/home tarolo/felhasznalok - Issuing the df and - mount commands will show that the system - now treats our file system as the real - /home: + Ekkor a df és + mount parancsok használatával + meggyõzõdhetünk róla, hogy ezt az + állományrendszert innentõl már + valóban a /home + könyvtárnak tekintjük: &prompt.root; mount /dev/ad0s1a on / (ufs, local) devfs on /dev (devfs, local) /dev/ad0s1d on /usr (ufs, local, soft-updates) -storage on /storage (zfs, local) -storage/home on /home (zfs, local) +tarolo on /tarolo (zfs, local) +tarolo/felhasznalok on /home (zfs, local) &prompt.root; df -Filesystem 1K-blocks Used Avail Capacity Mounted on -/dev/ad0s1a 2026030 235240 1628708 13% / -devfs 1 1 0 100% /dev -/dev/ad0s1d 54098308 1032826 48737618 2% /usr -storage 17547008 0 17547008 0% /storage -storage/home 17547008 0 17547008 0% /home +Filesystem 1K-blocks Used Avail Capacity Mounted on +/dev/ad0s1a 2026030 235240 1628708 13% / +devfs 1 1 0 100% /dev +/dev/ad0s1d 54098308 1032826 48737618 2% /usr +tarolo 17547008 0 17547008 0% /tarolo +tarolo/felhasznalok 17547008 0 17547008 0% /home - This completes the RAID-Z - configuration. To get status updates about the file systems - created during the nightly &man.periodic.8; runs, issue the - following command: + Ezzel lényegében befejeztük a + RAID-Z tömb + konfigurációját. Az + állományrendszerek állapotára + vonatkozóan a &man.periodic.8; + alkalmazásával akár naponta + kérhetünk ellenõrzést: &prompt.root; echo 'daily_status_zfs_enable="YES"' >> /etc/periodic.conf - Recovering <acronym>RAID</acronym>-Z + A <acronym>RAID</acronym>-Z + helyreállítása - Every software RAID has a method of - monitoring their state. - ZFS is no exception. The status of - RAID-Z devices may be viewed with the - following command: + Minden szoftveres RAID + implementáció kínál valamilyen + megoldást az állapotának + ellenõrzésére, ez alól + tulajdonképpen a ZFS sem + kivétel. A RAID-Z + eszközök állapota a következõ + paranccsal kérdezhetõ le: &prompt.root; zpool status -x - If all pools are healthy and everything is normal, the - following message will be returned: + Ezt az üzenetet láthatjuk, amikor minden + tároló kifogástalanul mûködik + és semmilyen probléma sincs: all pools are healthy - If there is an issue, perhaps a disk has gone offline, - the pool state will be returned and look similar to: + Ha viszont valamilyen gond lenne valamelyik lemezzel, + például leállt, akkor az elõbbi + parancs eredménye ehhez lesz hasonló: - pool: storage + pool: tarolo state: DEGRADED status: One or more devices has been taken offline by the administrator. Sufficient replicas exist for the pool to continue functioning in a @@ -478,147 +638,119 @@ config: NAME STATE READ WRITE CKSUM - storage DEGRADED 0 0 0 + tarolo DEGRADED 0 0 0 raidz1 DEGRADED 0 0 0 da0 ONLINE 0 0 0 da1 OFFLINE 0 0 0 errors: No known data errors - This states that the device was taken offline by the - administrator. This is true for this particular example. - To take the disk offline, the following command was - used: + A válasz szerint az eszközt az + adminisztrátor állította le. Ez + ennél a példánál valóban + igaz. Lemezeket a következõ módon lehet + leállítani: - &prompt.root; zpool offline storage da1 + &prompt.root; zpool offline tarolo da1 - It is now possible to replace the - da1 after the system has been - powered down. When the system is back online, the following - command may issued to replace the disk: + Így miután leállítottuk a + rendszert, a da1 eszköz + cserélhetõ. A rendszer soron következõ + indításakor ezzel a paranccsal tudjuk jelezni + logikailag is a lemez cseréjét: - &prompt.root; zpool replace storage da1 + &prompt.root; zpool replace tarolo da1 - From here, the status may be checked again, this time - without the flag to get state - information: + Nézzük meg újra a tömb + állapotát, de ezúttal a + kapcsoló megadása nélkül, mivel csak + így fogjuk látni: - &prompt.root; zpool status storage - pool: storage + &prompt.root; zpool status tarolo + pool: tarolo state: ONLINE scrub: resilver completed with 0 errors on Sat Aug 30 19:44:11 2008 config: NAME STATE READ WRITE CKSUM - storage ONLINE 0 0 0 + tarolo ONLINE 0 0 0 raidz1 ONLINE 0 0 0 da0 ONLINE 0 0 0 da1 ONLINE 0 0 0 errors: No known data errors - As shown from this example, everything appears to be - normal. + A példa szerint minden megfelelõen + mûködik. - Data Verification + Az adatok ellenõrzése - As previously mentioned, ZFS uses - checksums to verify the integrity of - stored data. They are enabled automatically upon creation - of file systems and may be disabled using the following - command: + Elõzetesen már szó esett róla, + hogy a ZFS képes a tárolt + adatok sértetlenségének + ellenõrzésére. Az új + állományrendszerek + létrehozásánál ez a >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Oct 4 13:26:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A564F1065691; Sat, 4 Oct 2008 13:26: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 68A19106568B for ; Sat, 4 Oct 2008 13:26:12 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 558428FC16 for ; Sat, 4 Oct 2008 13:26:12 +0000 (UTC) (envelope-from raj@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 m94DQC7l023686 for ; Sat, 4 Oct 2008 13:26:12 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m94DQCNs023684 for perforce@freebsd.org; Sat, 4 Oct 2008 13:26:12 GMT (envelope-from raj@freebsd.org) Date: Sat, 4 Oct 2008 13:26:12 GMT Message-Id: <200810041326.m94DQCNs023684@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 150959 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, 04 Oct 2008 13:26:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=150959 Change 150959 by raj@raj_mimi on 2008/10/04 13:26:08 IFC @150957 Affected files ... .. //depot/projects/arm/src/lib/libpmc/Makefile#4 integrate .. //depot/projects/arm/src/lib/libpmc/pmc.3#8 integrate .. //depot/projects/arm/src/lib/libpmc/pmc.atom.3#1 branch .. //depot/projects/arm/src/lib/libpmc/pmc.core.3#1 branch .. //depot/projects/arm/src/lib/libpmc/pmc.core2.3#1 branch .. //depot/projects/arm/src/lib/libpmc/pmc.iaf.3#1 branch .. //depot/projects/arm/src/sys/boot/forth/loader.conf#21 integrate .. //depot/projects/arm/src/sys/boot/uboot/lib/api_public.h#3 integrate .. //depot/projects/arm/src/sys/boot/uboot/lib/glue.c#6 integrate .. //depot/projects/arm/src/sys/boot/uboot/lib/glue.h#4 integrate .. //depot/projects/arm/src/sys/boot/uboot/lib/net.c#5 integrate .. //depot/projects/arm/src/sys/conf/files#93 integrate .. //depot/projects/arm/src/sys/dev/hptiop/hptiop.h#3 integrate .. //depot/projects/arm/src/usr.sbin/sysinstall/devices.c#9 integrate Differences ... ==== //depot/projects/arm/src/lib/libpmc/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libpmc/Makefile,v 1.11 2008/09/16 16:57:14 jkoshy Exp $ +# $FreeBSD: src/lib/libpmc/Makefile,v 1.12 2008/10/04 12:27:49 jkoshy Exp $ LIB= pmc @@ -24,6 +24,10 @@ MAN+= pmclog.3 # PMC-dependent manual pages +MAN+= pmc.atom.3 +MAN+= pmc.core.3 +MAN+= pmc.core2.3 +MAN+= pmc.iaf.3 MAN+= pmc.k7.3 MAN+= pmc.k8.3 MAN+= pmc.p4.3 ==== //depot/projects/arm/src/lib/libpmc/pmc.3#8 (text+ko) ==== @@ -21,7 +21,7 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD: src/lib/libpmc/pmc.3,v 1.22 2008/09/22 14:31:24 jkoshy Exp $ +.\" $FreeBSD: src/lib/libpmc/pmc.3,v 1.23 2008/10/04 12:35:02 jkoshy Exp $ .\" .Dd September 16, 2008 .Os @@ -185,15 +185,15 @@ .Vt enum pmc_class enumeration. Supported PMC kinds include: -.Bl -tag -width "Li PMC_CLASS_IA_FIXED" -compact -.It Li PMC_CLASS_IA +.Bl -tag -width "Li PMC_CLASS_IAF" -compact +.It Li PMC_CLASS_IAF +Fixed function hardwre counters presents in CPUs conforming to the +.Tn Intel +performance measurement architecture version 2 and later. +.It Li PMC_CLASS_IAP Programmable hardware counters present in CPUs conforming to the .Tn Intel performance measurement architecture version 1 and later. -.It Li PMC_CLASS_IA_FIXED -Fixed function hardwre counters presents in CPUs conforming to the -.Tn Intel -performance measurement architecture version 2 and later. .It Li PMC_CLASS_K7 Programmable hardware counters present in .Tn "AMD Athlon" @@ -474,10 +474,12 @@ .El .Pp .Ss PMC Architecture Dependent Events -PMC architecture dependent event specifiers are described in their own -individual manual pages: +PMC architecture dependent event specifiers are described in the +following manual pages: .Bl -column " PMC_CLASS_TSC " "MANUAL PAGE " .It Em "PMC Class" Ta Em "Manual Page" +.It Li PMC_CLASS_IAF Ta Xr pmc.iaf 3 +.It Li PMC_CLASS_IAP Ta Xr pmc.atom 3 , Xr pmc.core 3 , Xr pmc.core2 3 .It Li PMC_CLASS_K7 Ta Xr pmc.k7 3 .It Li PMC_CLASS_K8 Ta Xr pmc.k8 3 .It Li PMC_CLASS_P4 Ta Xr pmc.p4 3 @@ -503,6 +505,10 @@ API is .Ud .Sh SEE ALSO +.Xr pmc.atom 3 , +.Xr pmc.core 3 , +.Xr pmc.core2 3 , +.Xr pmc.iaf 3 , .Xr pmc.k7 3 , .Xr pmc.k8 3 , .Xr pmc.p4 3 , ==== //depot/projects/arm/src/sys/boot/forth/loader.conf#21 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.133 2008/09/10 18:36:58 jhb Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.134 2008/10/04 11:49:53 stas Exp $ ############################################################## ### Basic configuration options ############################ @@ -208,6 +208,7 @@ ############################################################## miibus_load="NO" # miibus support, needed for some drivers +if_ae_load="NO" # Attansic/Atheros L2 FastEthernet if_age_load="NO" # Attansic/Atheros L1 Gigabit Ethernet if_an_load="NO" # Aironet 4500/4800 802.11 wireless NICs if_ar_load="NO" # Digi SYNC/570i ==== //depot/projects/arm/src/sys/boot/uboot/lib/api_public.h#3 (text+ko) ==== @@ -48,7 +48,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/uboot/lib/api_public.h,v 1.3 2008/03/13 17:54:21 obrien Exp $ + * $FreeBSD: src/sys/boot/uboot/lib/api_public.h,v 1.5 2008/10/04 13:19:15 raj Exp $ * * This file needs to be kept in sync with U-Boot reference: * http://www.denx.de/cgi-bin/gitweb.cgi?p=u-boot.git;a=blob;f=include/api_public.h @@ -62,6 +62,7 @@ #define API_ENOMEM 3 /* no memory */ #define API_EBUSY 4 /* busy, occupied etc. */ #define API_EIO 5 /* I/O error */ +#define API_ESYSC 6 /* syscall error */ typedef int (*scp_t)(int, int *, ...); @@ -117,7 +118,7 @@ #undef CFG_64BIT_LBA #ifdef CFG_64BIT_LBA -typedef u_int64_t lbasize_t; +typedef uint64_t lbasize_t; #else typedef unsigned long lbasize_t; #endif ==== //depot/projects/arm/src/sys/boot/uboot/lib/glue.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/glue.c,v 1.5 2008/09/03 17:48:41 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/glue.c,v 1.7 2008/10/04 13:19:15 raj Exp $"); #include #include "api_public.h" @@ -216,9 +216,7 @@ syscall(API_RESET, NULL); } - -#define MR_MAX 5 -static struct mem_region mr[MR_MAX]; +static struct mem_region mr[UB_MAX_MR]; static struct sys_info si; struct sys_info * @@ -228,7 +226,7 @@ memset(&si, 0, sizeof(struct sys_info)); si.mr = mr; - si.mr_no = MR_MAX; + si.mr_no = UB_MAX_MR; memset(&mr, 0, sizeof(mr)); if (!syscall(API_GET_SYS_INFO, &err, (u_int32_t)&si)) @@ -267,19 +265,17 @@ * * devices * - * Devices are identified by handles: numbers 0, 1, 2, ..., MAX_DEVS-1 + * Devices are identified by handles: numbers 0, 1, 2, ..., UB_MAX_DEV-1 * ***************************************************************************/ -#define MAX_DEVS 6 - -static struct device_info devices[MAX_DEVS]; +static struct device_info devices[UB_MAX_DEV]; struct device_info * ub_dev_get(int i) { - return ((i < 0 || i >= MAX_DEVS) ? NULL : &devices[i]); + return ((i < 0 || i >= UB_MAX_DEV) ? NULL : &devices[i]); } /* @@ -294,7 +290,7 @@ struct device_info *di; int n = 0; - memset(&devices, 0, sizeof(struct device_info) * MAX_DEVS); + memset(&devices, 0, sizeof(struct device_info) * UB_MAX_DEV); di = &devices[0]; if (!syscall(API_DEV_ENUM, NULL, di)) @@ -302,7 +298,7 @@ while (di->cookie != NULL) { - if (++n >= MAX_DEVS) + if (++n >= UB_MAX_DEV) break; /* take another device_info */ @@ -330,7 +326,7 @@ struct device_info *di; int err = 0; - if (handle < 0 || handle >= MAX_DEVS) + if (handle < 0 || handle >= UB_MAX_DEV) return (API_EINVAL); di = &devices[handle]; @@ -345,7 +341,7 @@ { struct device_info *di; - if (handle < 0 || handle >= MAX_DEVS) + if (handle < 0 || handle >= UB_MAX_DEV) return (API_EINVAL); di = &devices[handle]; @@ -367,7 +363,7 @@ dev_valid(int handle) { - if (handle < 0 || handle >= MAX_DEVS) + if (handle < 0 || handle >= UB_MAX_DEV) return (0); if (devices[handle].state != DEV_STA_OPEN) @@ -390,7 +386,8 @@ } int -ub_dev_read(int handle, void *buf, lbasize_t len, lbastart_t start) +ub_dev_read(int handle, void *buf, lbasize_t len, lbastart_t start, + lbasize_t *rlen) { struct device_info *di; lbasize_t act_len; @@ -401,15 +398,12 @@ di = &devices[handle]; if (!syscall(API_DEV_READ, &err, di, buf, &len, &start, &act_len)) - return (-1); + return (API_ESYSC); - if (err) - return (err); + if (!err && rlen) + *rlen = act_len; - if (act_len != len) - return (API_EIO); - - return (0); + return (err); } static int @@ -426,7 +420,7 @@ } int -ub_dev_recv(int handle, void *buf, int len) +ub_dev_recv(int handle, void *buf, int len, int *rlen) { struct device_info *di; int err = 0, act_len; @@ -436,12 +430,12 @@ di = &devices[handle]; if (!syscall(API_DEV_READ, &err, di, buf, &len, &act_len)) - return (-1); + return (API_ESYSC); - if (err) - return (-1); + if (!err) + *rlen = act_len; - return (act_len); + return (err); } int @@ -455,7 +449,7 @@ di = &devices[handle]; if (!syscall(API_DEV_WRITE, &err, di, buf, &len)) - return (-1); + return (API_ESYSC); return (err); } @@ -483,7 +477,7 @@ ub_mem_type(int flags) { - switch(flags & 0x000F) { + switch (flags & 0x000F) { case MR_ATTR_FLASH: return ("FLASH"); case MR_ATTR_DRAM: ==== //depot/projects/arm/src/sys/boot/uboot/lib/glue.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/uboot/lib/glue.h,v 1.4 2008/09/03 17:48:41 raj Exp $ + * $FreeBSD: src/sys/boot/uboot/lib/glue.h,v 1.6 2008/10/04 13:19:15 raj Exp $ */ /* @@ -40,6 +40,9 @@ int api_search_sig(struct api_signature **sig); +#define UB_MAX_MR 5 /* max mem regions number */ +#define UB_MAX_DEV 6 /* max devices number */ + /* * The ub_ library calls are part of the application, not U-Boot code! They * are front-end wrappers that are used by the consumer application: they @@ -50,8 +53,8 @@ /* console */ int ub_getc(void); int ub_tstc(void); -void ub_putc(char c); -void ub_puts(const char *s); +void ub_putc(char); +void ub_puts(const char *); /* system */ void ub_reset(void); @@ -62,19 +65,18 @@ unsigned long ub_get_timer(unsigned long); /* env vars */ -char *ub_env_get(const char *name); -void ub_env_set(const char *name, char *value); -const char *ub_env_enum(const char *last); +char *ub_env_get(const char *); +void ub_env_set(const char *, char *); +const char *ub_env_enum(const char *); /* devices */ int ub_dev_enum(void); -int ub_dev_open(int handle); -int ub_dev_close(int handle); -int ub_dev_read(int handle, void *buf, lbasize_t len, lbastart_t start); -int ub_dev_send(int handle, void *buf, int len); -int ub_dev_recv(int handle, void *buf, int len); - -struct device_info * ub_dev_get(int); +int ub_dev_open(int); +int ub_dev_close(int); +int ub_dev_read(int, void *, lbasize_t, lbastart_t, lbasize_t *); +int ub_dev_send(int, void *, int); +int ub_dev_recv(int, void *, int, int *); +struct device_info *ub_dev_get(int); void ub_dump_di(int); void ub_dump_si(struct sys_info *); ==== //depot/projects/arm/src/sys/boot/uboot/lib/net.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/net.c,v 1.4 2008/09/03 15:39:50 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/net.c,v 1.6 2008/10/04 13:19:15 raj Exp $"); #include #include @@ -59,8 +59,8 @@ static int net_put(struct iodesc *, void *, size_t); static void net_end(struct netif *); -extern int devs_no; -extern struct netif_stats net_stats[]; +extern int devs_no; +extern struct netif_stats net_stats[]; struct netif_dif net_ifs[] = { /* dif_unit dif_nsel dif_stats dif_private */ @@ -82,10 +82,10 @@ }; struct uboot_softc { - u_int32_t sc_pad; - u_int8_t sc_rxbuf[ETHER_MAX_LEN]; - u_int8_t sc_txbuf[ETHER_MAX_LEN + PKTALIGN]; - u_int8_t *sc_txbufp; + uint32_t sc_pad; + uint8_t sc_rxbuf[ETHER_MAX_LEN]; + uint8_t sc_txbuf[ETHER_MAX_LEN + PKTALIGN]; + uint8_t *sc_txbufp; int sc_handle; /* device handle for ub_dev_xxx */ }; @@ -170,38 +170,43 @@ static int net_get(struct iodesc *desc, void *pkt, size_t len, time_t timeout) { - struct netif *nif = desc->io_netif; - struct uboot_softc *sc = nif->nif_devdata; - time_t t; - int length; + struct netif *nif = desc->io_netif; + struct uboot_softc *sc = nif->nif_devdata; + time_t t; + int err, rlen; #if defined(NETIF_DEBUG) printf("net_get: pkt %x, len %d, timeout %d\n", pkt, len, timeout); #endif t = getsecs(); do { - length = ub_dev_recv(sc->sc_handle, sc->sc_rxbuf, len); - } while ((length == -1 || length == 0) && - (getsecs() - t < timeout)); + err = ub_dev_recv(sc->sc_handle, sc->sc_rxbuf, len, &rlen); + + if (err != 0) { + printf("net_get: ub_dev_recv() failed, error=%d\n", + err); + rlen = 0; + break; + } + } while ((rlen == -1 || rlen == 0) && (getsecs() - t < timeout)); #if defined(NETIF_DEBUG) - printf("net_get: received len %d (%x)\n", length, length); + printf("net_get: received len %d (%x)\n", rlen, rlen); #endif - if (length > 0) { - memcpy(pkt, sc->sc_rxbuf, MIN(len, length)); - if (length != len) { + if (rlen > 0) { + memcpy(pkt, sc->sc_rxbuf, MIN(len, rlen)); + if (rlen != len) { #if defined(NETIF_DEBUG) - printf("net_get: len %x, length %x\n", len, length); + printf("net_get: len %x, rlen %x\n", len, rlen); #endif } - return (length); + return (rlen); } return (-1); } - static void net_init(struct iodesc *desc, void *machdep_hint) { @@ -236,7 +241,6 @@ (unsigned long)sc->sc_txbufp % PKTALIGN; } - static void net_end(struct netif *nif) { ==== //depot/projects/arm/src/sys/conf/files#93 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1335 2008/10/03 10:31:31 stas Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1336 2008/10/04 10:39:31 antoine Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -697,7 +697,7 @@ dev/hme/if_hme.c optional hme dev/hme/if_hme_pci.c optional hme pci dev/hme/if_hme_sbus.c optional hme sbus -dev/hptiop/hptiop.c optional hptiop cam +dev/hptiop/hptiop.c optional hptiop scbus dev/hwpmc/hwpmc_logging.c optional hwpmc dev/hwpmc/hwpmc_mod.c optional hwpmc dev/ichsmb/ichsmb.c optional ichsmb ==== //depot/projects/arm/src/sys/dev/hptiop/hptiop.h#3 (text+ko) ==== @@ -27,13 +27,13 @@ #define _HPTIOP_H #include -__FBSDID("$FreeBSD: src/sys/dev/hptiop/hptiop.h,v 1.2 2008/02/03 16:07:12 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/hptiop/hptiop.h,v 1.3 2008/10/04 10:39:31 antoine Exp $"); #define DBG 0 #ifdef DBG -int hpt_dbg_level = 0; -#define KdPrint(x) do { if (hpt_dbg_level) printf x; } while (0) +int hpt_iop_dbg_level = 0; +#define KdPrint(x) do { if (hpt_iop_dbg_level) printf x; } while (0) #define HPT_ASSERT(x) assert(x) #else #define KdPrint(x) ==== //depot/projects/arm/src/usr.sbin/sysinstall/devices.c#9 (text+ko) ==== @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $FreeBSD: src/usr.sbin/sysinstall/devices.c,v 1.177 2008/08/11 04:58:06 weongyo Exp $ + * $FreeBSD: src/usr.sbin/sysinstall/devices.c,v 1.178 2008/10/04 11:49:26 stas Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -93,6 +93,7 @@ DISK("mfid%d", "LSI MegaRAID SAS array", 4), FLOPPY("fd%d", "floppy drive unit A", 4), SERIAL("cuad%d", "%s on device %s (COM%d)", 16), + NETWORK("ae", "Attansic/Atheros L2 FastEthernet"), NETWORK("age", "Attansic/Atheros L1 Gigabit Ethernet"), NETWORK("an", "Aironet 4500/4800 802.11 wireless adapter"), NETWORK("ath", "Atheros IEEE 802.11 wireless adapter"), From owner-p4-projects@FreeBSD.ORG Sat Oct 4 13:29:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F303A1065690; Sat, 4 Oct 2008 13:29:15 +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 9EDC7106568D for ; Sat, 4 Oct 2008 13:29:15 +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 8B3F78FC1B for ; Sat, 4 Oct 2008 13:29:15 +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 m94DTFOG023868 for ; Sat, 4 Oct 2008 13:29:15 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 m94DTFxx023866 for perforce@freebsd.org; Sat, 4 Oct 2008 13:29:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Oct 2008 13:29:15 GMT Message-Id: <200810041329.m94DTFxx023866@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 150960 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, 04 Oct 2008 13:29:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=150960 Change 150960 by rwatson@rwatson_cinnamon on 2008/10/04 13:28:52 Update and clean up audit.log(5) some: Synchronize definitions of in_addr and in_addr_ex tokens to our implementation. Comment out definition of expanded IP token as we don't support it currently. The BUGS entry likely applies only to in_addr_ex, where there's a confusion about type vs. length on addresses. Affected files ... .. //depot/projects/trustedbsd/openbsm/man/audit.log.5#18 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/man/audit.log.5#18 (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/man/audit.log.5#17 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.log.5#18 $ .\" .Dd November 5, 2006 .Dt AUDIT.LOG 5 @@ -176,29 +176,27 @@ .Ss in_addr Token The .Dq in_addr -token holds a network byte order IPv4 or IPv6 address. +token holds a network byte order IPv4 address. An .Dq in_addr token can be created using .Xr au_to_in_addr 3 -for an IPv4 address, or -.Xr au_to_in_addr_ex 3 -for an IPv6 address. -.Pp -See the -.Sx BUGS -section for information on the storage of this token. +for an IPv4 address. .Pp .Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" .It Sy "Field Bytes Description" .It "Token ID 1 byte Token ID" -.It "IP Address Type 1 byte Type of address" -.It "IP Address 4/16 bytes IPv4 or IPv6 address" +.It "IP Address 4 bytes IPv4 address" .El .Ss Expanded in_addr Token The -.Dq expanded in_addr -token ... +.Dq in_addr_ex +token holds a network byte order IPv4 or IPv6 address. +An +.Dq in_addr_ex +token can be created using +.Xr au_to_in_addr_ex 3 +for an IPv6 address. .Pp See the .Sx BUGS @@ -206,7 +204,8 @@ .Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" .It Sy "Field Bytes Description" .It "Token ID 1 byte Token ID" -.It XXXX +.It "IP Address Type 1 byte Type of address" +.It "IP Address 4/16 bytes IPv4 or IPv6 address" .El .Ss ip Token The @@ -230,15 +229,15 @@ .It "Source Address 4 bytes IPv4 source address" .It "Destination Address 4 bytes IPv4 destination address" .El -.Ss Expanded ip Token -The -.Dq expanded ip -token ... -.Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" -.It Sy "Field Bytes Description" -.It "Token ID 1 byte Token ID" -.It XXXX -.El +.\" .Ss Expanded ip Token +.\" The +.\" .Dq expanded ip +.\" token ... +.\" .Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" +.\" .It Sy "Field Bytes Description" +.\" .It "Token ID 1 byte Token ID" +.\" .It XXXX +.\" .El .Ss iport Token The .Dq iport @@ -677,7 +676,5 @@ .Dq in_addr_ex token layout documented here appears to be in conflict with the .Xr libbsm 3 -implementations of -.Xr au_to_in_addr 3 -and +implementation of .Xr au_to_in_addr_ex 3 . From owner-p4-projects@FreeBSD.ORG Sat Oct 4 14:25:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E026106569B; Sat, 4 Oct 2008 14:25:15 +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 DBB0A106568D for ; Sat, 4 Oct 2008 14:25:14 +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 C78778FC1B for ; Sat, 4 Oct 2008 14:25:14 +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 m94EPDQW029699 for ; Sat, 4 Oct 2008 14:25:13 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 m94EPCjL029696 for perforce@freebsd.org; Sat, 4 Oct 2008 14:25:12 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Oct 2008 14:25:12 GMT Message-Id: <200810041425.m94EPCjL029696@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 150964 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, 04 Oct 2008 14:25:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=150964 Change 150964 by rwatson@rwatson_fledge on 2008/10/04 14:24:43 Remove (and don't use) compatibility token constant names that were inherited from Darwin; always prefer the BSM token names (AUT_*). Synchronize our token type list to the BSM token type list -- add one or two we didn't have, replace one that was in conflict, remove one or two Trusted Solaris ones that don't appear to be mainstream (and that we didn't implement anyway). Affected files ... .. //depot/projects/trustedbsd/openbsm/NEWS#7 edit .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#28 edit .. //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.c#14 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#70 edit .. //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/NEWS#7 (text+ko) ==== @@ -15,6 +15,8 @@ Submitted by Stacey Son. - Various strcpy()'s/strcat()'s have been changed to strlcpy()'s/strlcat()'s or asprintf(). Added compat/strlcpy.h for Linux. +- Remove compatibility defines for old Darwin token constant names; now only + BSM token names are provided and used. OpenBSM 1.1 alpha 1 @@ -339,4 +341,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/NEWS#6 $ +$P4: //depot/projects/trustedbsd/openbsm/NEWS#7 $ ==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#28 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2004 Apple Inc. + * Copyright (c) 2004-2008 Apple Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#27 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#28 $ */ /* @@ -514,62 +514,39 @@ * selection criteria. */ switch(tok.id) { - case AU_HEADER_32_TOKEN: + case AUT_HEADER32: selected = select_hdr32(tok, &optchkd); bcopy(&tok, &tok_hdr32_copy, sizeof(tok)); break; - case AU_PROCESS_32_TOKEN: + case AUT_PROCESS32: selected = select_proc32(tok, &optchkd); break; - case AU_SUBJECT_32_TOKEN: + case AUT_SUBJECT32: selected = select_subj32(tok, &optchkd); break; - case AU_IPC_TOKEN: + case AUT_IPC: selected = select_ipcobj( tok.tt.ipc.type, tok.tt.ipc.id, &optchkd); break; - case AU_FILE_TOKEN: - selected = select_filepath( - tok.tt.file.name, &optchkd); - break; - - case AU_PATH_TOKEN: + case AUT_PATH: selected = select_filepath( tok.tt.path.path, &optchkd); break; - case AU_RETURN_32_TOKEN: + case AUT_RETURN32: selected = select_return32(tok, tok_hdr32_copy, &optchkd); break; - /* - * The following tokens dont have any relevant - * attributes that we can select upon. - */ - case AU_TRAILER_TOKEN: - case AU_ARG32_TOKEN: - case AU_ATTR32_TOKEN: - case AU_EXIT_TOKEN: - case AU_NEWGROUPS_TOKEN: - case AU_IN_ADDR_TOKEN: - case AU_IP_TOKEN: - case AU_IPCPERM_TOKEN: - case AU_IPORT_TOKEN: - case AU_OPAQUE_TOKEN: - case AU_SEQ_TOKEN: - case AU_TEXT_TOKEN: - case AU_ARB_TOKEN: - case AU_SOCK_TOKEN: default: break; } ==== //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.c#14 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2004 Apple Inc. + * Copyright (c) 2004-2008 Apple Inc. * Copyright (c) 2006 Martin Voros * All rights reserved. * @@ -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/bin/praudit/praudit.c#13 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.c#14 $ */ /* @@ -80,7 +80,7 @@ /* Record must begin with a header token. */ do { type = fgetc(fp); - } while(type != AU_HEADER_32_TOKEN); + } while(type != AUT_HEADER32); ungetc(type, fp); } ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#70 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#69 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#70 $ */ #include @@ -912,7 +912,7 @@ if (t == NULL) return (NULL); - ADD_U_CHAR(dptr, AU_SOCK_UNIX_TOKEN); + ADD_U_CHAR(dptr, AUT_SOCKUNIX); /* BSM token has two bytes for family */ ADD_U_CHAR(dptr, 0); ADD_U_CHAR(dptr, so->sun_family); ==== //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2005 Apple Inc. + * Copyright (c) 2005-2008 Apple Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -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_record.h#1 $ + * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#2 $ */ #ifndef _BSM_AUDIT_RECORD_H_ @@ -47,7 +47,7 @@ #define AUT_IPC 0x22 #define AUT_PATH 0x23 #define AUT_SUBJECT32 0x24 -#define AUT_SERVER32 0x25 +#define AUT_XATPATH 0x25 #define AUT_PROCESS32 0x26 #define AUT_RETURN32 0x27 #define AUT_TEXT 0x28 @@ -63,9 +63,7 @@ #define AUT_IPC_PERM 0x32 #define AUT_LABEL 0x33 #define AUT_GROUPS 0x34 -#define AUT_ILABEL 0x35 -#define AUT_SLABEL 0x36 -#define AUT_CLEAR 0x37 +#define AUT_ACE 0x35 #define AUT_PRIV 0x38 #define AUT_UPRIV 0x39 #define AUT_LIAISON 0x3a @@ -73,22 +71,28 @@ #define AUT_EXEC_ARGS 0x3c #define AUT_EXEC_ENV 0x3d #define AUT_ATTR32 0x3e -/* #define AUT_???? 0x3f */ +#define AUT_UNAUTH 0x3f #define AUT_XATOM 0x40 #define AUT_XOBJ 0x41 #define AUT_XPROTO 0x42 #define AUT_XSELECT 0x43 -/* XXXRW: Additional X11 tokens not defined? */ +#define AUT_XCOLORMAP 0x44 +#define AUT_XCURSOR 0x45 +#define AUT_XFONT 0x46 +#define AUT_XGC 0x47 +#define AUT_XPIXMAP 0x48 +#define AUT_XPROPERTY 0x49 +#define AUT_XWINDOW 0x4a +#define AUT_XCLIENT 0x4b #define AUT_CMD 0x51 #define AUT_EXIT 0x52 #define AUT_ZONENAME 0x60 -/* XXXRW: OpenBSM AUT_HOST 0x70? */ +#define AUT_HOST 0x70 #define AUT_ARG64 0x71 #define AUT_RETURN64 0x72 #define AUT_ATTR64 0x73 #define AUT_HEADER64 0x74 #define AUT_SUBJECT64 0x75 -#define AUT_SERVER64 0x76 #define AUT_PROCESS64 0x77 #define AUT_OTHER_FILE64 0x78 #define AUT_HEADER64_EX 0x79 @@ -107,55 +111,10 @@ #define AUT_ARG AUT_ARG32 #define AUT_RETURN AUT_RETURN32 #define AUT_SUBJECT AUT_SUBJECT32 -#define AUT_SERVER AUT_SERVER32 #define AUT_PROCESS AUT_PROCESS32 #define AUT_OTHER_FILE AUT_OTHER_FILE32 /* - * Darwin's bsm distribution uses the following non-BSM token name defines. - * We provide them for a single OpenBSM release for compatibility reasons. - */ -#define AU_FILE_TOKEN AUT_OTHER_FILE32 -#define AU_TRAILER_TOKEN AUT_TRAILER -#define AU_HEADER_32_TOKEN AUT_HEADER32 -#define AU_DATA_TOKEN AUT_DATA -#define AU_ARB_TOKEN AUT_DATA -#define AU_IPC_TOKEN AUT_IPC -#define AU_PATH_TOKEN AUT_PATH -#define AU_SUBJECT_32_TOKEN AUT_SUBJECT32 -#define AU_PROCESS_32_TOKEN AUT_PROCESS32 -#define AU_RETURN_32_TOKEN AUT_RETURN32 -#define AU_TEXT_TOKEN AUT_TEXT -#define AU_OPAQUE_TOKEN AUT_OPAQUE -#define AU_IN_ADDR_TOKEN AUT_IN_ADDR -#define AU_IP_TOKEN AUT_IP -#define AU_IPORT_TOKEN AUT_IPORT -#define AU_ARG32_TOKEN AUT_ARG32 -#define AU_SOCK_TOKEN AUT_SOCKET -#define AU_SEQ_TOKEN AUT_SEQ -#define AU_ATTR_TOKEN AUT_ATTR -#define AU_IPCPERM_TOKEN AUT_IPC_PERM -#define AU_NEWGROUPS_TOKEN AUT_NEWGROUPS -#define AU_EXEC_ARG_TOKEN AUT_EXEC_ARGS -#define AU_EXEC_ENV_TOKEN AUT_EXEC_ENV -#define AU_ATTR32_TOKEN AUT_ATTR32 -#define AU_CMD_TOKEN AUT_CMD -#define AU_EXIT_TOKEN AUT_EXIT -#define AU_ARG64_TOKEN AUT_ARG64 -#define AU_RETURN_64_TOKEN AUT_RETURN64 -#define AU_ATTR64_TOKEN AUT_ATTR64 -#define AU_HEADER_64_TOKEN AUT_HEADER64 -#define AU_SUBJECT_64_TOKEN AUT_SUBJECT64 -#define AU_PROCESS_64_TOKEN AUT_PROCESS64 -#define AU_HEADER_64_EX_TOKEN AUT_HEADER64_EX -#define AU_SUBJECT_32_EX_TOKEN AUT_SUBJECT32_EX -#define AU_PROCESS_32_EX_TOKEN AUT_PROCESS32_EX -#define AU_SUBJECT_64_EX_TOKEN AUT_SUBJECT64_EX -#define AU_PROCESS_64_EX_TOKEN AUT_PROCESS64_EX -#define AU_IN_ADDR_EX_TOKEN AUT_IN_ADDR_EX -#define AU_SOCK_32_EX_TOKEN AUT_SOCKET_EX - -/* * The values for the following token ids are not defined by BSM. * * XXXRW: Not sure how to handle these in OpenBSM yet, but I'll give them @@ -165,9 +124,6 @@ #define AUT_SOCKINET32 0x80 /* XXX */ #define AUT_SOCKINET128 0x81 /* XXX */ #define AUT_SOCKUNIX 0x82 /* XXX */ -#define AU_SOCK_INET_32_TOKEN AUT_SOCKINET32 -#define AU_SOCK_INET_128_TOKEN AUT_SOCKINET128 -#define AU_SOCK_UNIX_TOKEN AUT_SOCKUNIX /* print values for the arbitrary token */ #define AUP_BINARY 0 From owner-p4-projects@FreeBSD.ORG Sat Oct 4 14:47:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 771941065690; Sat, 4 Oct 2008 14:47: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 3A3781065688 for ; Sat, 4 Oct 2008 14:47:38 +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 D242C8FC13 for ; Sat, 4 Oct 2008 14:47: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 m94ElbVU031408 for ; Sat, 4 Oct 2008 14:47: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 m94Elbgp031406 for perforce@freebsd.org; Sat, 4 Oct 2008 14:47:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Oct 2008 14:47:37 GMT Message-Id: <200810041447.m94Elbgp031406@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 150967 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, 04 Oct 2008 14:47:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=150967 Change 150967 by rwatson@rwatson_lethe on 2008/10/04 14:47:17 __unused isn't defined on some Linuxes, so include audit_inernal.h so it gets #define'd away. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#13 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#13 (text+ko) ==== @@ -25,7 +25,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.c#12 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#13 $ */ /* @@ -54,6 +54,7 @@ #include #include +#include #include #include From owner-p4-projects@FreeBSD.ORG Sat Oct 4 15:20:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C7449106569B; Sat, 4 Oct 2008 15:20: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 8AC221065689 for ; Sat, 4 Oct 2008 15:20:11 +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 76DAE8FC1D for ; Sat, 4 Oct 2008 15:20:11 +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 m94FKBGw035271 for ; Sat, 4 Oct 2008 15:20:11 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 m94FKB8w035269 for perforce@freebsd.org; Sat, 4 Oct 2008 15:20:11 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Oct 2008 15:20:11 GMT Message-Id: <200810041520.m94FKB8w035269@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 150972 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, 04 Oct 2008 15:20:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=150972 Change 150972 by rwatson@rwatson_cinnamon on 2008/10/04 15:19:48 Remove commented out expanded ip token -- there isn't one. Expand description of socket_ex token. Describe zonename token. Affected files ... .. //depot/projects/trustedbsd/openbsm/man/audit.log.5#19 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/man/audit.log.5#19 (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/man/audit.log.5#18 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.log.5#19 $ .\" .Dd November 5, 2006 .Dt AUDIT.LOG 5 @@ -229,15 +229,6 @@ .It "Source Address 4 bytes IPv4 source address" .It "Destination Address 4 bytes IPv4 destination address" .El -.\" .Ss Expanded ip Token -.\" The -.\" .Dq expanded ip -.\" token ... -.\" .Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" -.\" .It Sy "Field Bytes Description" -.\" .It "Token ID 1 byte Token ID" -.\" .It XXXX -.\" .El .Ss iport Token The .Dq iport @@ -583,7 +574,7 @@ .Ss Expanded Socket Token The .Dq expanded socket -token ... +token contains information about IPv4 and IPv6 sockets. .Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" .It Sy "Field Bytes Description" .It "Token ID 1 byte Token ID" @@ -639,11 +630,18 @@ .Ss Zonename Token The .Dq zonename -token ... +token holds a NUL-terminated string with the name of the zone or jail from +which the record originated. +A +.Dz zonename +token can be created using +.Xr au_to_zonename 3 . +.Pp .Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" .It Sy "Field Bytes Description" .It "Token ID 1 byte Token ID" -.It XXXXX +.It "Zonename length 2 bytes Length of zonename string including NUL" +.It "Zonename N bytes + 1 NUL Zonename string including NUL" .El .Sh SEE ALSO .Xr auditreduce 1 , From owner-p4-projects@FreeBSD.ORG Sat Oct 4 18:07:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B75B1106569B; Sat, 4 Oct 2008 18:07:25 +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 7966E1065699 for ; Sat, 4 Oct 2008 18:07:25 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 67F2F8FC08 for ; Sat, 4 Oct 2008 18:07:25 +0000 (UTC) (envelope-from sam@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 m94I7PXC097784 for ; Sat, 4 Oct 2008 18:07:25 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m94I7Pbc097782 for perforce@freebsd.org; Sat, 4 Oct 2008 18:07:25 GMT (envelope-from sam@freebsd.org) Date: Sat, 4 Oct 2008 18:07:25 GMT Message-Id: <200810041807.m94I7Pbc097782@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 150981 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, 04 Oct 2008 18:07:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=150981 Change 150981 by sam@sam_ebb on 2008/10/04 18:07:12 remove an_tp; the net80211 layer calculates the same thing but does a better job--just use it Affected files ... .. //depot/projects/vap/sys/dev/ath/ath_rate/amrr/amrr.c#10 edit .. //depot/projects/vap/sys/dev/ath/ath_rate/onoe/onoe.c#13 edit .. //depot/projects/vap/sys/dev/ath/ath_rate/sample/sample.c#13 edit .. //depot/projects/vap/sys/dev/ath/if_ath.c#95 edit .. //depot/projects/vap/sys/dev/ath/if_athvar.h#31 edit Differences ... ==== //depot/projects/vap/sys/dev/ath/ath_rate/amrr/amrr.c#10 (text+ko) ==== @@ -277,8 +277,7 @@ ath_rate_ctl_start(struct ath_softc *sc, struct ieee80211_node *ni) { #define RATE(_ix) (ni->ni_rates.rs_rates[(_ix)] & IEEE80211_RATE_VAL) - struct ath_node *an = ATH_NODE(ni); - const struct ieee80211_txparam *tp = an->an_tp; + const struct ieee80211_txparam *tp = ni->ni_txparms; int srate; KASSERT(ni->ni_rates.rs_nrates > 0, ("no rates")); ==== //depot/projects/vap/sys/dev/ath/ath_rate/onoe/onoe.c#13 (text+ko) ==== @@ -251,8 +251,7 @@ ath_rate_ctl_start(struct ath_softc *sc, struct ieee80211_node *ni) { #define RATE(_ix) (ni->ni_rates.rs_rates[(_ix)] & IEEE80211_RATE_VAL) - struct ath_node *an = ATH_NODE(ni); - const struct ieee80211_txparam *tp = an->an_tp; + const struct ieee80211_txparam *tp = ni->ni_txparms; int srate; KASSERT(ni->ni_rates.rs_nrates > 0, ("no rates")); ==== //depot/projects/vap/sys/dev/ath/ath_rate/sample/sample.c#13 (text+ko) ==== @@ -656,7 +656,7 @@ { #define RATE(_ix) (ni->ni_rates.rs_rates[(_ix)] & IEEE80211_RATE_VAL) struct ath_node *an = ATH_NODE(ni); - const struct ieee80211_txparam *tp = an->an_tp; + const struct ieee80211_txparam *tp = ni->ni_txparms; struct sample_node *sn = ATH_NODE_SAMPLE(an); const HAL_RATE_TABLE *rt = sc->sc_currates; int x, y, srate; ==== //depot/projects/vap/sys/dev/ath/if_ath.c#95 (text+ko) ==== @@ -5864,29 +5864,10 @@ struct ath_node *an = ATH_NODE(ni); struct ieee80211vap *vap = ni->ni_vap; struct ath_softc *sc = vap->iv_ic->ic_ifp->if_softc; - const struct ieee80211_txparam *tp; - enum ieee80211_phymode mode; + const struct ieee80211_txparam *tp = ni->ni_txparms; - /* - * Deduce netband of station to simplify setting up xmit - * parameters. Note this allows us to assign different - * parameters to each station in a mixed bss (b/g, n/[abg]). - */ - if (ni->ni_flags & IEEE80211_NODE_HT) { - if (IEEE80211_IS_CHAN_5GHZ(ni->ni_chan)) - mode = IEEE80211_MODE_11NA; - else - mode = IEEE80211_MODE_11NG; - } else if (IEEE80211_IS_CHAN_A(ni->ni_chan)) - mode = IEEE80211_MODE_11A; - else if (ni->ni_flags & IEEE80211_NODE_ERP) - mode = IEEE80211_MODE_11G; - else - mode = IEEE80211_MODE_11B; - tp = &vap->iv_txparms[mode]; - an->an_tp = tp; - an->an_mcastrix = ath_tx_findrix(sc->sc_rates[mode], tp->mcastrate); - an->an_mgmtrix = ath_tx_findrix(sc->sc_rates[mode], tp->mgmtrate); + an->an_mcastrix = ath_tx_findrix(sc->sc_currates, tp->mcastrate); + an->an_mgmtrix = ath_tx_findrix(sc->sc_currates, tp->mgmtrate); ath_rate_newassoc(sc, an, isnew); if (isnew && ==== //depot/projects/vap/sys/dev/ath/if_athvar.h#31 (text+ko) ==== @@ -82,7 +82,6 @@ /* driver-specific node state */ struct ath_node { struct ieee80211_node an_node; /* base class */ - const struct ieee80211_txparam *an_tp; u_int8_t an_mgmtrix; /* min h/w rate index */ u_int8_t an_mcastrix; /* mcast h/w rate index */ struct ath_buf *an_ff_buf[WME_NUM_AC]; /* ff staging area */