From owner-p4-projects@FreeBSD.ORG Sun Aug 31 00:17:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E711106568B; Sun, 31 Aug 2008 00:17: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 31F4A106567F for ; Sun, 31 Aug 2008 00:17:00 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1FE988FC17 for ; Sun, 31 Aug 2008 00:17:00 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7V0H06h026740 for ; Sun, 31 Aug 2008 00:17:00 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7V0GxN0026738 for perforce@freebsd.org; Sun, 31 Aug 2008 00:16:59 GMT (envelope-from rpaulo@FreeBSD.org) Date: Sun, 31 Aug 2008 00:16:59 GMT Message-Id: <200808310016.m7V0GxN0026738@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 148879 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Aug 2008 00:17:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=148879 Change 148879 by rpaulo@rpaulo_alpha on 2008/08/31 00:16:54 Err, cast the sum not the first term. While there, intialize stack variables. Affected files ... .. //depot/projects/efi/boot/i386/efi/reloc.c#3 edit Differences ... ==== //depot/projects/efi/boot/i386/efi/reloc.c#3 (text+ko) ==== @@ -46,6 +46,8 @@ /* * Find the relocation address, its size and the relocation entry. */ + relsz = 0; + relent = 0; for (dynp = dynamic; dynp->d_tag != DT_NULL; dynp++) { switch (dynp->d_tag) { case DT_REL: @@ -73,7 +75,7 @@ break; case R_386_RELATIVE: /* Address relative to the base address. */ - newaddr = (unsigned long) ImageBase + rel->r_offset; + newaddr = (unsigned long *)(ImageBase + rel->r_offset); *newaddr += ImageBase; break; default: From owner-p4-projects@FreeBSD.ORG Sun Aug 31 00:18:01 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 96E101065679; Sun, 31 Aug 2008 00:18: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 5AA021065676 for ; Sun, 31 Aug 2008 00:18:01 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4883E8FC24 for ; Sun, 31 Aug 2008 00:18:01 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7V0I10M026853 for ; Sun, 31 Aug 2008 00:18:01 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7V0I1LF026851 for perforce@freebsd.org; Sun, 31 Aug 2008 00:18:01 GMT (envelope-from rpaulo@FreeBSD.org) Date: Sun, 31 Aug 2008 00:18:01 GMT Message-Id: <200808310018.m7V0I1LF026851@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 148880 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Aug 2008 00:18:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=148880 Change 148880 by rpaulo@rpaulo_alpha on 2008/08/31 00:17:48 Add a _start function based on gnu-efi. Affected files ... .. //depot/projects/efi/boot/i386/efi/start.S#2 edit Differences ... ==== //depot/projects/efi/boot/i386/efi/start.S#2 (text+ko) ==== @@ -32,9 +32,34 @@ #define EFI_SUCCESS 0 +/* + * EFI entry point. + * _start(EFI_IMAGE image_handle, EFI_SYSTEM_TABLE *system_table); + * + * We calculate the base address along with _DYNAMIC, relocate us and finally + * pass control to efi_main. + */ + ENTRY(_start) - // TBD - leave + pushl %ebp + movl %esp, %ebp + + pushl 12(%ebp) /* image_handle */ + pushl 8(%ebp) /* system_table */ + call 0f +0: popl %eax + movl %eax, %ebx + addl $ImageBase-0b, %eax + addl $_DYNAMIC-0b, %ebx + pushl %ebx /* dynamic */ + pushl %eax /* ImageBase */ + call _reloc + cmpl $EFI_SUCCESS, %eax + jne 1f + popl %ebx /* remove ImageBase from the stack */ + popl %ebx /* remove dynamic from the stack */ + call efi_main +1: leave ret END(_start) @@ -42,4 +67,4 @@ .section .reloc, "a" .long 0 .long 10 - .word (0 << 12) + .word 0 From owner-p4-projects@FreeBSD.ORG Sun Aug 31 08:59:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A8ACA1065766; Sun, 31 Aug 2008 08:59:18 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 691A11065756 for ; Sun, 31 Aug 2008 08:59:17 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4F5DF8FC17 for ; Sun, 31 Aug 2008 08:59:17 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7V8xHkk007510 for ; Sun, 31 Aug 2008 08:59:17 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7V8xH2m007508 for perforce@freebsd.org; Sun, 31 Aug 2008 08:59:17 GMT (envelope-from rpaulo@FreeBSD.org) Date: Sun, 31 Aug 2008 08:59:17 GMT Message-Id: <200808310859.m7V8xH2m007508@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 148894 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Aug 2008 08:59:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=148894 Change 148894 by rpaulo@rpaulo_alpha on 2008/08/31 08:58:34 Disable SSP. Affected files ... .. //depot/projects/efi/boot/i386/efi/Makefile#2 edit Differences ... ==== //depot/projects/efi/boot/i386/efi/Makefile#2 (text+ko) ==== @@ -1,6 +1,7 @@ # $FreeBSD$ NO_MAN= +WITHOUT_SSP= .include From owner-p4-projects@FreeBSD.ORG Sun Aug 31 09:39:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D316B1065682; Sun, 31 Aug 2008 09:39:59 +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 956C71065671 for ; Sun, 31 Aug 2008 09:39:59 +0000 (UTC) (envelope-from remko@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 831648FC14 for ; Sun, 31 Aug 2008 09:39:59 +0000 (UTC) (envelope-from remko@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7V9dxU0012029 for ; Sun, 31 Aug 2008 09:39:59 GMT (envelope-from remko@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7V9dxwd012027 for perforce@freebsd.org; Sun, 31 Aug 2008 09:39:59 GMT (envelope-from remko@freebsd.org) Date: Sun, 31 Aug 2008 09:39:59 GMT Message-Id: <200808310939.m7V9dxwd012027@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to remko@freebsd.org using -f From: Remko Lodder To: Perforce Change Reviews Cc: Subject: PERFORCE change 148899 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Aug 2008 09:40:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=148899 Change 148899 by remko@remko_nakur on 2008/08/31 09:39:57 More Work in Progress for the advanced-networking chapter. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#9 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#9 (text+ko) ==== @@ -3428,6 +3428,225 @@ + + + + + Andrew + Thompson + Geschreven door + + + + + Verbindingsaggregatie en failover + + lagg + + failover + + fec + + lacp + + loadbalance + + roundrobin + + + Introductie + + De interface &man.lagg.4; maakt het mogelijk om meerdere + netwerkinterfaces te aggregeren in één virtueel + interface voor het bieden van fout-tolerante en zeer snelle + verbindingen. + + + + Werkmodi + + + + failover + + + Zendt en ontvangt vekeer alleen door de meesterpoort. + Wanneer de meesterpoort niet beschikbaar is, wordt de + volgende actieve poort gebruikt. De eerste toegevoegde + interface is de meesterpoort; alle interfaces die hierna + zijn toegevoegd worden gebruikt als failover-apparaten. + + + + + + fec + + + Ondersteunt Cisco EtherChannel. Dit is een statische + installatie en onderhandelt niet over aggregatie met de + peer noch wisselt het frames uit om de verbinding te + monitoren, indien de switch LACP ondersteunt dient dat + gebruikt te worden. + + Balanceert uitgaand verkeer over de actieve poorten + gebaseerd op gehashde informatie over protocolheaders en + accepteert inkomend verkeer van elke actieve poort. De + hash bevat het Ethernet bron- en doeladres, en indien + beschikbaar, de VLAN-tag, en de IPv4/IPv6 bron- en + doeladressen. + + + + + lacp + + + Ondersteunt het IEEE 802.3ad Link Aggregation Control + Protocol (LACP) en het Marker Protocol. LACP onderhandelt + met de peer over een verzameling aggregeerbare + verbindingen in een of meerdere Link Aggregated Groups. + Elke LAG is opgebouwd uit poorten die dezelfde snelheid + hebben, ingesteld op full-duplex werking. Het verkeer zal + over de poorten in de LAG gebalanceerd worden met de + hoogste totaalsnelheid, in de meeste gevallen zal er + slechts één LAG zijn die alle poorten bevat. + Wanneer er fysieke verbindingen veranderen, zal Link + Aggregation snel naar een nieuwe opstelling convergeren. + + + Balanceert uitgaand verkeer over de actieve poorten + gebaseerd op gehashde informatie over protocolheaders en + accepteert inkomend verkeer van elke actieve poort. De + hash bevat het Ethernet bron- en doeladres, en indien + beschikbaar, de VLAN-tag, en de IPv4/IPv6 bron- en + doeladressen. + + + + + loadbalance + + + Dit is een alias van de fec + modus. + + + + + roundrobin + + + Distribueert uitgaand verkeer door middel van een + round-robin scheduler over alle actieve poorten en + accepteert inkomend verkeer van elke actieve poort. Deze + modus schendt Ethernet frame-ordering en dient met zorg + gebruikt te worden. + + + + + + + Voorbeelden + + + LACP aggregatie met een Cisco switch + + Dit voorbeeld verbindt twee interfaces op een &os;-machine + met de switch als een enkele loadgebalanceerde en + fout-tolerante verbinding. Er kunnen meer interfaces worden + toegevoegd om de doorvoer en fout-tolerantie te verhogen. + Aangezien frame-ordering verplicht is op Ethernet-verbindingen + stroomt al het verkeer tussen twee stations altijd over + dezelfde fysieke verbinding zodat de maximum snelheid beperkt + wordt tot die van één interface. Het + verzendalgoritme probeert zoveel mogelijk informatie te + gebruiken voor het onderscheiden van verschillende + verkeersstromen en deze over de beschikbare interfaces te + balanceren. + + Voeg op de Cisco switch de interfaces aan de kanaalgroep + toe. + + interface FastEthernet0/1 + channel-group 1 mode active + channel-protocol lacp +! +interface FastEthernet0/2 + channel-group 1 mode active + channel-protocol lacp +! + + Maak op de &os;-machine de lagg-interface aan. + + &prompt.root; ifconfig lagg0 create +&prompt.root; ifconfig lagg0 up laggproto lacp laggport fxp0 laggport fxp1 + + Bekijk de interfacestatus van ifconfig; poorten die als + ACTIVE zijn gemarkeerd zijn lid van de + actieve aggregatiegroep waarover onderhandeld is met de verre + switch en waarover verkeer zal worden verzonden en ontvangen. + Gebruik de uitgebreide uitvoer van &man.ifconfig.8; om de + LAG-identifiers te bekijken. + + lagg0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500 + options=8<VLAN_MTU> + ether 00:05:5d:71:8d:b8 + media: Ethernet autoselect + status: active + laggproto lacp + laggport: fxp1 flags=1c<ACTIVE,COLLECTING,DISTRIBUTING> + laggport: fxp0 flags=1c<ACTIVE,COLLECTING,DISTRIBUTING> + + De switch zal laten zien welke poorten actief zijn. + Gebruik voor meer detail + show lacp neighbor detail. + + switch# show lacp neighbor +Flags: S - Device is requesting Slow LACPDUs + F - Device is requesting Fast LACPDUs + A - Device is in Active mode P - Device is in Passive mode + +Channel group 1 neighbors + +Partner's information: + + LACP port Oper Port Port +Port Flags Priority Dev ID Age Key Number State +Fa0/1 SA 32768 0005.5d71.8db8 29s 0x146 0x3 0x3D +Fa0/2 SA 32768 0005.5d71.8db8 29s 0x146 0x4 0x3D + + + + Failover-modus + + Failover-modus kan worden gebruikt om op een ander + interface over te schakelen wanneer de verbinding op de + meester verloren is. + + &prompt.root; ifconfig lagg0 create +&prompt.root; ifconfig lagg0 up laggproto failover laggport fxp0 laggport fxp1 + + lagg0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500 + options=8<VLAN_MTU> + ether 00:05:5d:71:8d:b8 + media: Ethernet autoselect + status: active + laggproto failover + laggport: fxp1 flags=0<> + laggport: fxp0 flags=5<MASTER,ACTIVE> + + Het verkeer zal worden verzonden en ontvangen op + fxp0. Indien de verbinding op + fxp0 verloren is, zal + fxp1 de actieve verbinding worden. + Indien de verbinding op de meesterinterface hersteld is, zal + het weer de actieve verbinding worden. + + + + @@ -3450,7 +3669,7 @@ schijfloos werkstation - schijfloze operatie + schijfloos werken Een &os;-machine kan over het netwerk opstarten en zonder een plaatselijke schijf werken, door gebruik te maken van @@ -3464,13 +3683,13 @@ Er zijn minstens twee manieren om de kernel over het netwerk te laden: + PXE: De &intel; Preboot eXecution - Environment is een vorm een ROM dat zichzelf kan opstarten - en dat in sommige netwerkkaarten en moederborden is - ingebouwd. Bekijk de hulppagina &man.pxeboot.8; voor meer - informatie. + Environment is een vorm een smart boot ROM dat in sommige + netwerkkaarten en moederborden is ingebouwd. Bekijk de + hulppagina &man.pxeboot.8; voor meer informatie. @@ -3489,7 +3708,7 @@ Een voorbeeldscript - (/usr/share/examples/diskless/cone_root) + (/usr/share/examples/diskless/clone_root) vergemakkelijkt het aanmaken en beheren van het root bestandssysteem van het werkstation op de server. Het kan nodig zijn dat het script wat aangepast moet worden, maar het @@ -3519,19 +3738,19 @@ - Het schijfloze werkstation gebruikt een gedeeld + De schijfloze werkstations gebruiken een gedeeld bestandssysteem voor /, dat alleen gelezen kan worden, en een gedeeld bestandssysteem voor /usr, dat eveneens alleen gelezen kan worden. - Het root bestandssysteem is een kopie van een standaard + Het root-bestandssysteem is een kopie van een standaard root-bestandssysteem voor &os; (typisch van een server), - waarbij enkele instellingsbestanden zijn overschreven door + waarbij enkele instellingenbestanden zijn overschreven door versies die specifiek zijn voor een schijfloos systeem of, - mogelijk, door versies die bij het werkstation horen. + mogelijk, door het werkstation horen waar ze bij horen. - De delen van het root bestandssysteem die schrijfbaar + De delen van het root-bestandssysteem die schrijfbaar moeten zijn, zijn overdekt met &man.md.4; bestandssystemen. Alle veranderingen gaan verloren indien het systeem opnieuw wordt opgestart. @@ -3541,21 +3760,22 @@ De kernel is overgedragen en òfwel met Etherboot òfwel met PXE geladen, aangezien sommige situaties - het gebruik van één van de methodes kan eisen. + het gebruik van één van de methodes kan eisen. + Het systeem zoals hierboven beschreven is onveilig. Het dient in een beschermd gebied van een netwerk te functioneren, en - niet vertrouwd te worden door andere computers. + niet vertrouwd te worden door andere hosts. Alle informatie in deze sectie is getest met &os; 5.2.1-RELEASE. - Achtergrond informatie + Achtergrondinformatie Het installeren van schijfloze werkstations is zowel vrij rechttoe-rechtaan als foutgevoelig. Deze fouten zijn soms @@ -3569,7 +3789,8 @@ - Foutmeldingen zijn vaak cryptisch of gheel afwezig. + Foutmeldingen zijn vaak cryptisch of gheel afwezig. + @@ -3588,14 +3809,14 @@ gedaan door gebruik te maken van de DHCP of BOOTP protocollen. DHCP is een compatible uitbreiding van BOOTP, het gebruikt dezelfde - poorten en hetzelfde gemeenschappelijke pakketformaat. + poorten en het pakketformaat heeft dezelfde basis. Het is mogelijk om een systeem in te stellen zodat het alleen BOOTP gebruikt. Het serverprogramma &man.bootpd.8; wordt met het basissysteem van &os; meegeleverd. DHCP biedt echter een aantal - voordelen boven BOOTP (fijnere instellingsbestanden, + voordelen boven BOOTP (fijnere instellingenbestanden, mogelijkheid om PXE te gebruiken, en vele anderen die niet direct verband houden met schijfloos werken), er zal hoofdzakelijk een opstelling met @@ -3609,15 +3830,16 @@ De machine moet één of meerdere programma's naar het plaatselijke geheugen versturen. - Eén van TFTP of NFS - wordt gebruikt. De keuze tussen TFTP en - NFS is op verschillende plaatsen een - optie tijdens het compileren. Een veelgemaakte fout is het - opgeven van bestandsnamen voor het verkeerde protocol: - TFTP verstuurd typisch alle bestanden - vanuit één map op de server, en verwacht dat - alle bestandsnamen relatief aan deze map zijn; - NFS verwacht absolute bestandspaden. + Eén van TFTP of + NFS wordt gebruikt. De keuze tussen + TFTP en NFS is op + verschillende plaatsen een optie tijdens het compileren. + Een veelgemaakte fout is het opgeven van bestandsnamen voor + het verkeerde protocol: TFTP verstuurd + typisch alle bestanden vanuit één map op de + server, en verwacht dat alle bestandsnamen relatief aan + deze map zijn; NFS verwacht absolute + bestandspaden. @@ -3680,7 +3902,8 @@ De ISC DHCP server kan zowel - verzoeken voor BOOTP en DHCP beantwoorden. + verzoeken voor BOOTP als DHCP beantwoorden. + ISC DHCP 3.0 maakt geen deel uit van het basissysteem. Eerst dient de poort Wanneer ISC DHCP is geïnstalleerd, heeft het een instellingenbestand nodig om - te draaien (normaliter /usr/local/etc/dhcpd.conf - genoemd). Hieronder volgt een voorbeeld met commentaar, - waarbij computer margaux gebruik maakt van - Etherboot en corbieres - gebruik maakt van PXE: + te draaien (normaliter + /usr/local/etc/dhcpd.conf genoemd). + Hieronder volgt een voorbeeld met commentaar, waarbij host + margaux gebruik maakt van + Etherboot en + corbieres gebruik maakt van + PXE: default-lease-time 600; @@ -3729,10 +3954,11 @@ Deze optie vertelt dhcpd - om de waarde die in de verklaringen voor host - staan te versturen als de computernaam voor de schijfloze - computer. Een andere mogelijkheid is om option - host-name margaux + om de waarde die in de verklaringen voor + host staan te versturen als de hostnaam + voor de schijfloze host. Een andere mogelijkheid is om + option + host-name margaux binnen de verklaringen voor host op te nemen. @@ -3741,8 +3967,8 @@ De aanwijzing next-server bepaalt de TFTP of NFS server die gebruikt moet worden voor het laden van het - lader- of kernelbestand (standaard wordt dezelfde computer - als voor de DHCP-server gebruikt). + lader- of kernelbestand (standaard wordt dezelfde host als + voor de DHCP-server gebruikt). @@ -3775,8 +4001,8 @@ pad naar het root-bestandssysteem, in de gebruikelijke notatie van NFS. Indien PXE gebruikt wordt, is het mogelijk om - het IP-adres van de computer weg te laten zolang de - kerneloptie BOOTP niet gebruikt wordt. De + het IP-adres van de host weg te laten zolang de + kerneloptie BOOTP niet geactiveerd is. De NFS-server is dan dezelfde als die van TFTP. @@ -3817,7 +4043,6 @@ margaux:ha=0123456789ab:tc=.def100 - @@ -3880,11 +4105,12 @@ /usr/share/examples/etc/make.conf voor instructies. - Er zijn nog twee andere ongedocumenteerde opties voor + Er zijn nog twee andere opties voor make.conf die nuttig kunnen zijn bij het - opzetten van schijfloze machine die als seriële console - gebruikt wordt: BOOT_PXELDR_PROBE_KEYBOARD, - en BOOT_PXELDR_ALWAYS_SERIAL. + opzetten van een schijfloze machine die als seriële + console gebruikt wordt: + BOOT_PXELDR_PROBE_KEYBOARD, en + BOOT_PXELDR_ALWAYS_SERIAL. Om PXE bij het opstarten van de machine te gebruiken, is het gewoonlijk nodig om de optie @@ -3940,7 +4166,7 @@ inetd dient de - instellingsbestanden opnieuw te lezen. De regel + instellingenbestanden opnieuw te lezen. De regel dient in het bestand /etc/rc.conf aanwezig te zijn voor de juiste werking van deze opdracht: @@ -3957,7 +4183,7 @@ In alle gevallen dient er ook voor gezorgd te worden dat NFS aanstaat en dat het juiste bestandssysteem op de NFS-server - ge-exporteerd wordt. + geëxporteerd wordt. @@ -3968,8 +4194,8 @@ - Exporteer het bestandssysteem naar de plaats waar de - schijfloze root-map zich bevindt door het volgende aan + Exporteer het bestandssysteem waar de schijfloze + root-map zich bevindt door het volgende aan /etc/exports toe te voegen (pas het mountpunt van het volume aan en vervang margaux corbieres door de namen @@ -3980,11 +4206,12 @@ mountd dient het - instellingsbestand opnieuw te lezen. Indien het gewenst - is om NFS in + instellingenbestand opnieuw te lezen. Indien het nodig + was om NFS in /etc/rc.conf - tijdens de eerste stap aan te zetten, is het nodig om - opnieuw op te starten. + tijdens de eerste stap aan te zetten, is het + waarschijnlijk gewenst om in plaats hiervan opnieuw op te + starten. &prompt.root; /etc/rc.d/mountd restart @@ -4000,24 +4227,31 @@ kernelinstellingen - Indien Etherboot gebruikt wordt, - is het nodig om een kernelinstellingenbestand voor de + Indien Etherboot gebruikt wordt + , is het nodig om een kernelinstellingenbestand voor de schijfloze cliënt met de volgende opties (naast de gebruikelijke) aan te maken: -options BOOTP # Gebruik BOOTP om het IP-adres en de naam te verkrijgen +options BOOTP # Gebruik BOOTP om het IP-adres en de hostnaam te verkrijgen options BOOTP_NFSROOT # NFS-mount het root-bestandssysteem door gebruik te maken van de informatie van BOOTP - Het kan ook gewenst zijn om BOOTP_NFSV3, - BOOT_COMPAT, en + Het kan ook gewenst zijn om BOOTP_NFSV3 + , BOOT_COMPAT, en BOOTP_WIRED_TO te gebruiken (raadpleeg hiervoor NOTES). + De namen van deze opties zijn historisch en enigszins + misleidend aangezien ze eigenlijk onverschillig gebruik van + DHCP en BOOTP in de kernel mogelijk maken + (het is ook mogelijk om strict gebruik van BOOTP of + DHCP te forceren). + De kernel dient gebouwd te worden (zie ) en gekopieerd te worden naar de - plaats die in dhcpd.conf is aangegeven. + plaats die in dhcpd.conf is aangegeven. + Indien PXE gebruikt wordt, is het @@ -4025,13 +4259,14 @@ noodzakelijk (maar wel aangeraden). Door deze opties aan te zetten zullen er meer verzoeken voor DHCP tijdens het opstarten van de kernel verstuurd worden, met in - sommige gevallen een klein risico op inconsistentie tussen - de nieuwe waarden en degenen die door &man.pxeboot.8; zijn - ontvangen. Het voordeel van het gebruik van deze opties is - dat de computernaam als een bijverschijnsel wordt ingesteld. - In de andere gevallen dient de computernaam op een andere - manier ingesteld te worden, bijvoorbeeld in een bestand - rc.conf specifiek voor elke cliënt. + sommige speciale gevallen een klein risico op inconsistentie + tussen de nieuwe waarden en degenen die door &man.pxeboot.8; + zijn ontvangen. Het voordeel van het gebruik van deze + opties is dat de hostnaam als een bijverschijnsel wordt + ingesteld. In de andere gevallen dient de hostnaam op een + andere manier ingesteld te worden, bijvoorbeeld in een + cliënt-specifiek bestand rc.conf. + @@ -4040,9 +4275,10 @@ apparaataanwijzingen in de kenel gecompileerd te worden. Normaalgesporekn wordt hiervoor de volgende optie in het instellingenbestand gebruikt (zie het - instellingencommentaarbestand NOTES): + instellingencommentaarbestand NOTES): + - hints "GENERIC.hints" + hints "GENERIC.hints" @@ -4097,12 +4333,14 @@ De swapruimte moet door de opstartscripts worden aangezet, door een beschrijfbaar bestandssysteem te mounten en een wisselbestand aan te maken en aan te zetten. De volgende - opdracht maakt een wisselbestand van de juiste grootte aan: + opdracht maakt een wisselbestand van de juiste grootte aan: + &prompt.root; dd if=/dev/zero of=/pad/naar/wisselbestand bs=1k count=1 oseek=100000 Om het aan te zetten dient de volgende regel aan - /etc/rc.conf te worden toegevoegd: + /etc/rc.conf te worden toegevoegd: + swapfile=/pad/naar/wisselbestand @@ -4118,13 +4356,14 @@ schijfloos werken - alleen-lezen /usr + /usr alleen-lezen Indien het schijfloze werkstation is ingesteld om X te draaien, is het nodig om het instellingenbestand van XDM te wijzigen, dat standaard - het foutenlogboek in /usr plaatst. + het foutenlogboek in /usr plaatst. + @@ -4159,7 +4398,8 @@ Dan Kegel's ISDN Page. - Hieronder staat een snelle en korte handleiding voor ISDN: + Hieronder staat een snelle eenvoudige handleiding voor ISDN: + @@ -4170,16 +4410,16 @@ Indien het plan is om ISDN hoofdzakelijk te gebruiken om via een niet-toegewijde inbellijn een verbinding met het - Internet te maken, is het raadzaam om de sectie over Terminal - Adapters te bestuderen. Dit biedt de meeste flexibiliteit, - en de minste problemen bij het wisselen van provider. + Internet te maken, zijn Terminal Adapters wellicht een optie. + Dit biedt de meeste flexibiliteit, en de minste problemen bij + het wisselen van providers. Indien twee LANs met elkaar verbonden worden, of indien er een toegewijde ISDN-verbinding wordt gebruikt om met het - Internet te verbinden, is het raadzaam om de mogelijkheid om - een zelfstandige router/bridge te gebruiken te overwegen. + Internet te verbinden, is het gebruik van een zelfstandige + router/bridge te overwegen. @@ -4200,6 +4440,12 @@ ISDN-kaarten + + ISDN + + kaarten + + De ISDN-implementatie in &os; biedt alleen ondersteuning voor de DSS1/Q.931 (of Euro-ISDN) standaard indien passieve kaarten gebruikt worden. Sommige actieve kaarten worden @@ -4212,16 +4458,17 @@ òfwel IP over rauwe HDLC òfwel synchrone PPP te gebruiken: òfwel via kernel-PPP met isppp, een aangepast stuurprogramma voor - &man.sppp.4;; òfwel via het gebruikersprogramma - &man.ppp.8;. Door gebruik te maken van het gebruikersprogramma - &man.ppp.8;, is het combineren van twee of meer ISDN B-kanalen - mogelijk. Ook is een toepassing die de telefoon beantwoordt - alsook vele hulpdiensten zoals een 300 Baud-modem in software - mogelijk. + &man.sppp.4;, òfwel via het gebruikersprogramma + &man.ppp.8;. Door het gebruikersprogramma &man.ppp.8; te + gebruiken, is het combineren van twee of meer ISDN B-kanalen + mogelijk. Ook zijn een toepassing die de telefoon beantwoordt + en vele gereedschappen zoals een 300 Baud-modem in software + beschikbaar. Een groeiend aantal ISDN-kaarten voor de PC wordt door &os; ondersteund en volgens de rapportages wordt het succesvol in - heel Europa en in vele andere delen van de wereld gebruikt. + heel Europa en in vele andere delen van de wereld gebruikt. + De ondersteunde passieve ISDN-kaarten zijn meestal uitgerust met de Infineon (voormalig Siemens) ISAC/HSCX/IPAC ISDN-chipsets @@ -4230,11 +4477,11 @@ enkele kaarten met combinaties van Tiger300/320/ISAC chipsets en enkele kaarten die gebaseerd zijn op fabrikantspecifieke chipsets zoals de AVM Fritz!Card PCI V.1.0 en de AVM Fritz!Card - PNP. + PnP. - Momenteel worden zijn de actieve ISDN-kaarten die - ondersteund worden de AVM B1 (ISA en PCI) BRI-kaarten en de AVM - T1 PCI PRI-kaarten. + Momenteel zijn de actieve ISDN-kaarten die ondersteund + worden de AVM B1 (ISA en PCI) BRI-kaarten en de AVM T1 PCI + PRI-kaarten. Kijk voor documentatie over isdn4bsd in de map @@ -4242,7 +4489,7 @@ &os;-systeem of op de homepage van isdn4bsd, welke ook verwijzingen naar tips, errata, en - meer documentatie zoals het isdn4bsd handboek bevat. @@ -4265,24 +4512,230 @@ modem - De meeste TA's gebruiken de opdrachtenverzameling van de - standaard Hayes-modem, en kunnen direct als vervanging van een + De meeste TA's gebruiken de standaard opdrachtenverzameling + van de Hayes-modem, en kunnen direct als vervanging van een modem gebruikt worden. Een TA zal als een gewoon modem werken behalve dat de - verbindings- en doorvoersnelheden veel hoger zullen zijn. Het - is noodzakelijk om PPP precies - hetzelfde als voor het modem in te stellen. Zorg ervoor dat de - seriële snelheid zo hoog mogelijk is. + verbindings- en doorvoersnelheden veel hoger zullen zijn dan van + het oude modem. Het is noodzakelijk om PPP precies hetzelfde als voor het modem + in te stellen. Zorg ervoor dat de seriële snelheid zo hoog + mogelijk wordt ingesteld. PPP + Het grootste voordeel van met een TA met een + internetprovider te verbinden is de mogelijkheid tot dynamisch + PPP. Aangezien IP-adresruimte steeds schaarser wordt, zijn de + meeste providers niet meer bereid om een statisch IP te geven. + De meeste zelfstandige routers zijn niet in staat tot dynamische + IP-toewijzing. + + TA's zijn geheel afhankelijk van het PPP-daemon dat gedraaid + wordt voor hun mogelijkheden en stabiliteit van de verbinding. + Dit maakt het mogelijk om gemakkelijk om op een &os;-machine van + een modem naar ISDN over te gaan, indien PPP reeds is ingesteld. + Echter, dezelfde probolemen die er waren met het PPP-programma + zullen blijven voorkomen. + + Indien maximale stabiliteit gewenst is, dient de kernel + PPP-, niet de gebruikers-PPP-optie gebruikt te + worden. + + Van de volgende TA's is bekend dat ze met &os; werken: + + + + + Motorola BitSurfer en BitSurfer Pro + + + + Adtran + + + + De meeste andere TA's zullen waarschijnlijk ook werken, + TA-verkopers proberen er zeker van te zijn dat hun product het + meeste van de AT-opdrachtverzameling van het standaardmodem + accepteert. + + Het echte probleem met externe TA's is dat, net zoals bij + modems, een goede seriële kaart in de computer nodig is. + + + Voor een goed begrip van seriële apparaten dient de + tutorial &os; + Serial Hardware en de verschillen tussen asynchrone en + synchrone seriële poorten gelezen te worden. + + Een TA die op een standaard seriële poort (asynchroon) + van een PC draait beperkt de snelheid tot 115.2 Kbps, zelfs + als er een 128 Kbps-verbinding beschikbaar is. Om de + volledige 128 Kbps waartoe ISDN in staat is te gebruiken, + dient de TA op een synchrone seriële kaart overgeplaatst te + worden. + + Het kopen van een interne TA voorkomt het probleem van + synchroon/asynchroon niet. Interne TA's hebben simpelweg een + seriële poortchip van een standaard PC ingebouwd. Dit + ontlast de gebruiker alleen van het kopen van nog een + seriële kabel en het vinden van nog een leeg electronisch + uitbreidingsslot. + + Een synchrone kaart met een TA is minstens zo snel als een + zelfstandige router, en wanneer het door een eenvoudige + 386 met &os; erop wordt aangestuurd, waarschijnlijk flexibeler. + + + De keuze tussen synchrone kaart/TA en zelfstandige router is + grotendeels religieus. Hierover zijn wat discussies in de + mailinglijsten gevoerd. Het wordt aangeraden om de archieven te + doorzoeken voor de volledige discussie. - * Stand-alone ISDN Bridges/Routers + Zelfstandige ISDN bridges/routers + + + ISDN + + zelfstandige bridges/routers + + + ISDN-bridges of -routers zijn in het geheel niet specifiek + voor &os; of enig ander besturingssysteem. Raadpleeg voor een + volledigere beschrijving van de technologie van routing en + bridging een referentieboek over netwerken. + + In deze sectie zullen de termen router en bridge door elkaar + worden gebruikt. + + Aangezien de prijzen van eenvoudige ISDN-routers/-bridges + zakken, zal dit waarshijnlijk een steeds populairdere keuze + worden. Een ISDN-router is en kleine doos die direct in het + plaatselijke Ethernet-netwerk geprikt wordt, en zijn eigen + verbinding met de andere bridge/router beheert. Het heeft + ingebouwde software om via PPP en andere populaire protocollen + te communiceren. + + Een router staat veel snellere doorvoer dan een standaard-TA + toe, aangezien het een volledig synchrone ISDN-verbinding zal + gebruiken. + + Het grootste probleem met ISDN-routers en -bridges is dat + samenwerking tussen fabrikanten nog steeds een probleem kan zijn + . Indien er plannen zijn om met een internetprovider te + verbinden, is het raadzaam de wensen met hen te bespreken. + + + Indien er gepland is om twee LAN-segmenten met elkaar te + verbinden, zoals het thuis-LAN en het kantoor-LAN, is dit de + eenvoudigste en onderhoudarmste oplossing. Aangezien de + apparatuur voor beide kanten van de verbinding wordt gekocht is + het zeker dat de verbinding zal werken. + + De volgende installatie kan worden gebruikt om bijvoorbeeld + een thuiscomputer of een netwerk van een afdelingskantoor met + een netwerk van het hoofdkantoor te verbinden: + + + Netwerk van afdelingskantoor of thuis + + 10 base 2 + + Het netwerk gebruikt een topologie gebaseerd op een bus + met een 10 base 2 Ethernet (thinnet). Verbind + indien nodig de router met de netwerkkabel met een AUI/10BT + transceiver. + + + + + + + + ---Sun werkstation +| +---FreeBSD computer +| +---Windows 95 +| +Zelfstandige router + | +ISDN BRI lijn + + + + 10 Base 2 Ethernet + + + + Wanneer het thuis-/afdelingskantoornetwerk uit slechts + één computer bestaat kan een twisted-pair + crossover-kabel geruikt worden om direct met de zelfstandige + router te verbinden. + + + + Hoofdkantoor- of ander LAN + + 10 base T + + Het netwerk gebruikt een stertopologie met 10 base T + Ethernet (Twisted Pair). + + + + + + + + -------Novell Server + | H | + | ---Sun + | | + | U ---FreeBSD + | | + | ---Windows 95 + | B | + |___---Zelfstandige router + | + ISDN BRI lijn + + + + ISDN Netwerkdiagram + + + + + Een groot voordeel van de meeste routers/bridges is dat ze + gelijktijdig 2 gescheiden + onafhankelijke PPP-verbindingen met 2 gescheiden + sites toestaan. Dit wordt door de meeste TA's niet ondersteund, + behalve voor specifieke (gewoonlijk dure) modellen die twee + seriële poorten hebben. Dit dient niet met kanaalbinding, + MPP, etc. verward te worden. + + Dit kan een erg handige eigenschap zijn indien, bijvoorbeeld + , er een toegewijdige ISDN-verbinding op kantoor is en het + gewenst is om deze af te tappen, maar een andere ISDN-lijn op + het werk ongewenst is. Een router op kantoor kan een toegewijde + B-kanaalverbinding (64 Kbps) met het Internet beheren en + het andere B-kanaal voor een gescheiden gegevensverbinding + gebruiken. Het tweede B-kanaal kan voor inbellen, uitbellen, of + dynamisch binden (MPP, etc.) gebruikt worden met het eerste + B-kanaal voor meer bandbreedte. + + IPX/SPX - + Een Ethernet-bridge staat ook toe om meer dan alleen + IP-verkeer te verzenden. Het is ook mogelijk om IPX/SPX of + enig ander protol te gebruiken. @@ -4297,56 +4750,547 @@ - * Network Address Translation (NAT) + Network Address Translation + + + Overzicht + + + natd + + + Het Network Adress Translation daemon van &os;, in het + algemeen bekend als &man.natd.8;, is een daeomon dat rauwe + binnenkomende IP-pakketten accepteert, de bron naar die van de + plaatselijke machine verandert en de pakketten terug in de + uitgaande IP-pakketstroom injecteert. &man.natd.8; doet dit + door het IP-adres en de poort van de bron zo te veranderen dat + wanneer de gegevens weer ontvangen worden, het in staat is om + de originele plaats van de gegevens te achterhalen en ze door + te sturen naar de originele aanvrager. - + Internetverbinding delen - - * Overzicht + NAT - + NAT wordt het meest gebruikt wat in het algemeen bekend is + als het delen van een Internetverbinding. - * Installatie + Installatie + + Wegens de krimpende IP-ruimte in IPv4, en het groeind aantal + gebruikers van consumentenlijnen op hoge snelheid zoals kabel of + DSL, hebben steeds meer mensen een oplossing als het delen van >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Aug 31 10:52:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 07A951065672; Sun, 31 Aug 2008 10:52: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 C02A0106566C for ; Sun, 31 Aug 2008 10:52:12 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AFC2A8FC13 for ; Sun, 31 Aug 2008 10:52:12 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7VAqCAR020503 for ; Sun, 31 Aug 2008 10:52:12 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7VAqCQZ020501 for perforce@freebsd.org; Sun, 31 Aug 2008 10:52:12 GMT (envelope-from rpaulo@FreeBSD.org) Date: Sun, 31 Aug 2008 10:52:12 GMT Message-Id: <200808311052.m7VAqCQZ020501@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 148903 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Aug 2008 10:52:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=148903 Change 148903 by rpaulo@rpaulo_alpha on 2008/08/31 10:51:32 The proper return is EFI_STATUS. Add the necessary changes for amd64 relocations. Affected files ... .. //depot/projects/efi/boot/i386/Makefile.inc#3 edit .. //depot/projects/efi/boot/i386/efi/Makefile#3 edit .. //depot/projects/efi/boot/i386/efi/reloc.c#4 edit Differences ... ==== //depot/projects/efi/boot/i386/Makefile.inc#3 (text+ko) ==== @@ -5,15 +5,16 @@ BINDIR?= /boot LOADER_ADDRESS?=0x200000 -CFLAGS+= -ffreestanding -mpreferred-stack-boundary=2 \ +# -mpreferred-stack-boundary=2 \ +CFLAGS+= -ffreestanding -fPIC \ -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 LDFLAGS+= -nostdlib -.if ${MACHINE_ARCH} == "amd64" -CFLAGS+= -m32 -march=i386 -LDFLAGS+= -m elf_i386_fbsd -AFLAGS+= --32 -.endif +#.if ${MACHINE_ARCH} == "amd64" +#CFLAGS+= -m32 -march=i386 +#LDFLAGS+= -m elf_i386_fbsd +#AFLAGS+= --32 +#.endif # BTX components .if exists(${.OBJDIR}/../btx) ==== //depot/projects/efi/boot/i386/efi/Makefile#3 (text+ko) ==== @@ -2,6 +2,7 @@ NO_MAN= WITHOUT_SSP= +BUILDING_EFI= .include @@ -33,14 +34,16 @@ FILES= loader.efi FILESMODE_loader.efi= ${BINMODE} -LDSCRIPT= ${.CURDIR}/ldscript.ia32 +LDSCRIPT.i386= ${.CURDIR}/ldscript.ia32 +LDSCRIPT.amd64= ${.CURDIR}/ldscript.ia32-64 +LDSCRIPT= ${LDSCRIPT.${MACHINE_ARCH}} LDFLAGS= -Wl,-T${LDSCRIPT} -shared -symbolic ${PROG}: ${LDSCRIPT} CLEANFILES= vers.c loader.efi -NEWVERSWHAT= "EFI loader" ia32 +NEWVERSWHAT= "EFI loader" ${MACHINE_ARCH} vers.c: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT} ==== //depot/projects/efi/boot/i386/efi/reloc.c#4 (text+ko) ==== @@ -34,7 +34,7 @@ /* * A simple relocator for IA32 EFI binaries. */ -int +EFI_STATUS _reloc(unsigned long ImageBase, Elf32_Dyn *dynamic, EFI_HANDLE image_handle, EFI_SYSTEM_TABLE *system_table) { @@ -67,7 +67,11 @@ /* * Perform the actual relocation. + * XXX: We are reusing code for the amd64 version of this, but + * we must make sure the relocation types are the same. */ + CTASSERT(R_386_NONE == R_x86_64_NONE); + CTASSERT(R_386_RELATIVE == R_X86_64_RELATIVE); for (; relsz > 0; relsz -= relent) { switch (ELF32_R_TYPE(rel->r_info)) { case R_386_NONE: From owner-p4-projects@FreeBSD.ORG Sun Aug 31 11:02:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 66433106567B; Sun, 31 Aug 2008 11:02: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 29EBB1065672 for ; Sun, 31 Aug 2008 11:02:23 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1A1958FC19 for ; Sun, 31 Aug 2008 11:02:23 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7VB2M6e021317 for ; Sun, 31 Aug 2008 11:02:22 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7VB2Mjp021315 for perforce@freebsd.org; Sun, 31 Aug 2008 11:02:22 GMT (envelope-from rpaulo@FreeBSD.org) Date: Sun, 31 Aug 2008 11:02:22 GMT Message-Id: <200808311102.m7VB2Mjp021315@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 148904 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Aug 2008 11:02:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=148904 Change 148904 by rpaulo@rpaulo_alpha on 2008/08/31 11:01:25 Undo something that sneaked in. Affected files ... .. //depot/projects/efi/boot/i386/Makefile.inc#4 edit Differences ... ==== //depot/projects/efi/boot/i386/Makefile.inc#4 (text+ko) ==== @@ -5,16 +5,15 @@ BINDIR?= /boot LOADER_ADDRESS?=0x200000 -# -mpreferred-stack-boundary=2 \ -CFLAGS+= -ffreestanding -fPIC \ +CFLAGS+= -ffreestanding -mpreferred-stack-boundary=2 \ -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 LDFLAGS+= -nostdlib -#.if ${MACHINE_ARCH} == "amd64" -#CFLAGS+= -m32 -march=i386 -#LDFLAGS+= -m elf_i386_fbsd -#AFLAGS+= --32 -#.endif +.if ${MACHINE_ARCH} == "amd64" +CFLAGS+= -m32 -march=i386 +LDFLAGS+= -m elf_i386_fbsd +AFLAGS+= --32 +.endif # BTX components .if exists(${.OBJDIR}/../btx) From owner-p4-projects@FreeBSD.ORG Sun Aug 31 11:04:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B05591065673; Sun, 31 Aug 2008 11: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 741541065671 for ; Sun, 31 Aug 2008 11:04:25 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 482998FC13 for ; Sun, 31 Aug 2008 11:04:25 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7VB4P7U022590 for ; Sun, 31 Aug 2008 11:04:25 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7VB4PW0022588 for perforce@freebsd.org; Sun, 31 Aug 2008 11:04:25 GMT (envelope-from rpaulo@FreeBSD.org) Date: Sun, 31 Aug 2008 11:04:25 GMT Message-Id: <200808311104.m7VB4PW0022588@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 148905 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Aug 2008 11:04:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=148905 Change 148905 by rpaulo@rpaulo_alpha on 2008/08/31 11:04:06 ld script for amd64. Not tested. Affected files ... .. //depot/projects/efi/boot/i386/efi/ldscript.ia32-64#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Aug 31 11:11:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 20B441065680; Sun, 31 Aug 2008 11:11: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 D15951065678 for ; Sun, 31 Aug 2008 11:11:32 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A724F8FC1E for ; Sun, 31 Aug 2008 11:11:32 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7VBBWRR023243 for ; Sun, 31 Aug 2008 11:11:32 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7VBBWdJ023241 for perforce@freebsd.org; Sun, 31 Aug 2008 11:11:32 GMT (envelope-from rpaulo@FreeBSD.org) Date: Sun, 31 Aug 2008 11:11:32 GMT Message-Id: <200808311111.m7VBBWdJ023241@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 148907 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Aug 2008 11:11:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=148907 Change 148907 by rpaulo@rpaulo_alpha on 2008/08/31 11:10:59 Add missing files to the build. Affected files ... .. //depot/projects/efi/boot/i386/efi/Makefile#4 edit Differences ... ==== //depot/projects/efi/boot/i386/efi/Makefile#4 (text+ko) ==== @@ -10,7 +10,7 @@ INTERNALPROG= # architecture-specific loader code -SRCS= main.c exec.c conf.c vers.c +SRCS= main.c exec.c conf.c vers.c reloc.c start.S CFLAGS+= -I${.CURDIR}/../../efi/include CFLAGS+= -I${.CURDIR}/../../efi/include/i386 From owner-p4-projects@FreeBSD.ORG Sun Aug 31 11:12:34 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 40215106567D; Sun, 31 Aug 2008 11:12: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 048761065671 for ; Sun, 31 Aug 2008 11:12:34 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CEE738FC16 for ; Sun, 31 Aug 2008 11:12:33 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7VBCXng023317 for ; Sun, 31 Aug 2008 11:12:33 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7VBCXjt023315 for perforce@freebsd.org; Sun, 31 Aug 2008 11:12:33 GMT (envelope-from rpaulo@FreeBSD.org) Date: Sun, 31 Aug 2008 11:12:33 GMT Message-Id: <200808311112.m7VBCXjt023315@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 148908 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Aug 2008 11:12:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=148908 Change 148908 by rpaulo@rpaulo_alpha on 2008/08/31 11:12:09 Capitalize. Affected files ... .. //depot/projects/efi/boot/i386/efi/reloc.c#5 edit Differences ... ==== //depot/projects/efi/boot/i386/efi/reloc.c#5 (text+ko) ==== @@ -70,7 +70,7 @@ * XXX: We are reusing code for the amd64 version of this, but * we must make sure the relocation types are the same. */ - CTASSERT(R_386_NONE == R_x86_64_NONE); + CTASSERT(R_386_NONE == R_X86_64_NONE); CTASSERT(R_386_RELATIVE == R_X86_64_RELATIVE); for (; relsz > 0; relsz -= relent) { switch (ELF32_R_TYPE(rel->r_info)) { From owner-p4-projects@FreeBSD.ORG Sun Aug 31 11:18:40 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6FE1F106567B; Sun, 31 Aug 2008 11:18: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 318ED1065670 for ; Sun, 31 Aug 2008 11:18:40 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 219348FC15 for ; Sun, 31 Aug 2008 11:18:40 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7VBIeMs023775 for ; Sun, 31 Aug 2008 11:18:40 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7VBId44023773 for perforce@freebsd.org; Sun, 31 Aug 2008 11:18:39 GMT (envelope-from rpaulo@FreeBSD.org) Date: Sun, 31 Aug 2008 11:18:39 GMT Message-Id: <200808311118.m7VBId44023773@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 148909 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Aug 2008 11:18:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=148909 Change 148909 by rpaulo@rpaulo_alpha on 2008/08/31 11:18:34 Add definition of CTASSERT. We can't include sys/systm.h. Affected files ... .. //depot/projects/efi/boot/i386/efi/reloc.c#6 edit Differences ... ==== //depot/projects/efi/boot/i386/efi/reloc.c#6 (text+ko) ==== @@ -32,6 +32,16 @@ #include /* + * XXX: we can't include sys/systm.h. + */ +#ifndef CTASSERT /* Allow lint to override */ +#define CTASSERT(x) _CTASSERT(x, __LINE__) +#define _CTASSERT(x, y) __CTASSERT(x, y) +#define __CTASSERT(x, y) typedef char __assert ## y[(x) ? 1 : -1] +#endif + + +/* * A simple relocator for IA32 EFI binaries. */ EFI_STATUS From owner-p4-projects@FreeBSD.ORG Sun Aug 31 18:00:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 08F641065680; Sun, 31 Aug 2008 18:00:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A8CA21065671 for ; Sun, 31 Aug 2008 18:00:05 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8B2428FC21 for ; Sun, 31 Aug 2008 18:00:05 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7VI05aM085343 for ; Sun, 31 Aug 2008 18:00:05 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7VI05lJ085341 for perforce@freebsd.org; Sun, 31 Aug 2008 18:00:05 GMT (envelope-from trasz@freebsd.org) Date: Sun, 31 Aug 2008 18:00:05 GMT Message-Id: <200808311800.m7VI05lJ085341@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 148923 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Aug 2008 18:00:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=148923 Change 148923 by trasz@trasz_traszkan on 2008/08/31 17:59:20 Fix buildworld. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/Makefile.inc#10 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_compat.c#2 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#11 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/stack_protector.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#31 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_stack_protector.c#1 add Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/Makefile.inc#10 (text+ko) ==== @@ -1,6 +1,6 @@ # $FreeBSD: src/lib/libc/posix1e/Makefile.inc,v 1.19 2006/07/07 14:02:17 rwatson Exp $ -.PATH: ${.CURDIR}/posix1e +.PATH: ${.CURDIR}/posix1e ${.CURDIR}/../../sys/kern/ SRCS+= acl_branding.c \ acl_calc_mask.c \ @@ -28,7 +28,7 @@ mac_exec.c \ mac_get.c \ mac_set.c \ - ${.CURDIR/../../sys/kern/subr_acl_nfs4.c + subr_acl_nfs4.c SYM_MAPS+=${.CURDIR}/posix1e/Symbol.map ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_compat.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ int __oldacl_get_perm_np(acl_permset_t permset_d, oldacl_perm_t perm) { - return (acl_get_perm_np(permset_p, perm)); + return (acl_get_perm_np(permset_d, perm)); } int ==== //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#11 (text+ko) ==== @@ -1612,7 +1612,7 @@ kern/sched_4bsd.c optional sched_4bsd kern/sched_ule.c optional sched_ule kern/serdev_if.m standard -kern/stack_protector.c standard \ +kern/subr_stack_protector.c standard \ compile-with "${NORMAL_C:N-fstack-protector*}" kern/subr_acl_posix1e.c standard kern/subr_acl_nfs4.c standard ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#31 (text+ko) ==== @@ -44,7 +44,8 @@ #include #else #include -#include +#include +#include #include #define KASSERT(a, b) assert(a) #define CTASSERT(a) From owner-p4-projects@FreeBSD.ORG Sun Aug 31 18:16:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 911C11065751; Sun, 31 Aug 2008 18:16: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 55393106574D for ; Sun, 31 Aug 2008 18:16:27 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 417AF8FC13 for ; Sun, 31 Aug 2008 18:16:27 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7VIGRw0088027 for ; Sun, 31 Aug 2008 18:16:27 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7VIGMIx088021 for perforce@freebsd.org; Sun, 31 Aug 2008 18:16:22 GMT (envelope-from rpaulo@FreeBSD.org) Date: Sun, 31 Aug 2008 18:16:22 GMT Message-Id: <200808311816.m7VIGMIx088021@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 148925 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Aug 2008 18:16:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=148925 Change 148925 by rpaulo@rpaulo_phi on 2008/08/31 18:16:00 Rename the ldscript files to match MACHINE_ARCH. Affected files ... .. //depot/projects/efi/boot/i386/efi/Makefile#5 edit .. //depot/projects/efi/boot/i386/efi/ldscript.amd64#1 branch .. //depot/projects/efi/boot/i386/efi/ldscript.i386#1 branch .. //depot/projects/efi/boot/i386/efi/ldscript.ia32#3 delete .. //depot/projects/efi/boot/i386/efi/ldscript.ia32-64#2 delete Differences ... ==== //depot/projects/efi/boot/i386/efi/Makefile#5 (text+ko) ==== @@ -34,9 +34,7 @@ FILES= loader.efi FILESMODE_loader.efi= ${BINMODE} -LDSCRIPT.i386= ${.CURDIR}/ldscript.ia32 -LDSCRIPT.amd64= ${.CURDIR}/ldscript.ia32-64 -LDSCRIPT= ${LDSCRIPT.${MACHINE_ARCH}} +LDSCRIPT= ${.CURDIR}/ldscript.${MACHINE_ARCH} LDFLAGS= -Wl,-T${LDSCRIPT} -shared -symbolic ${PROG}: ${LDSCRIPT} From owner-p4-projects@FreeBSD.ORG Sun Aug 31 20:01:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 712D51065679; Sun, 31 Aug 2008 20:01: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 34858106566B for ; Sun, 31 Aug 2008 20:01:14 +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 20B298FC22 for ; Sun, 31 Aug 2008 20:01:14 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7VK1EHv098117 for ; Sun, 31 Aug 2008 20:01:14 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7VK1E5B098115 for perforce@freebsd.org; Sun, 31 Aug 2008 20:01:14 GMT (envelope-from nwhitehorn@freebsd.org) Date: Sun, 31 Aug 2008 20:01:14 GMT Message-Id: <200808312001.m7VK1E5B098115@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 148931 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Aug 2008 20:01:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=148931 Change 148931 by nwhitehorn@nwhitehorn_trantor on 2008/08/31 20:00:22 Remove some poorly motivated code in pmap_kremove() that could cause panics and accomplished nothing. Affected files ... .. //depot/projects/ppc-g5/sys/powerpc/aim/mmu_oea64.c#3 edit Differences ... ==== //depot/projects/ppc-g5/sys/powerpc/aim/mmu_oea64.c#3 (text+ko) ==== @@ -1559,26 +1559,6 @@ void moea64_kremove(mmu_t mmu, vm_offset_t va) { - struct pvo_entry *pvo; - struct lpte *pt; - - PMAP_LOCK(kernel_pmap); - pvo = moea64_pvo_find_va(kernel_pmap, va & ~ADDR_POFF, NULL); - KASSERT(pvo != NULL, ("moea64_kextract: no addr found")); - - LOCK_TABLE(); - pt = moea64_pvo_to_pte(pvo, -1); - if (pt != NULL) { - moea64_pte_synch(pt, &pvo->pvo_pte.lpte); - if (((pvo->pvo_pte.lpte.pte_lo & (LPTE_I | LPTE_G)) == 0) - && (pvo->pvo_pte.lpte.pte_lo & LPTE_CHG)) { - __syncicache((void *)va, PAGE_SIZE); - } - } - UNLOCK_TABLE(); - - PMAP_UNLOCK(kernel_pmap); - moea64_remove(mmu, kernel_pmap, va, va + PAGE_SIZE); } From owner-p4-projects@FreeBSD.ORG Sun Aug 31 20:50:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E92C31065679; Sun, 31 Aug 2008 20:50: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 ACC311065674 for ; Sun, 31 Aug 2008 20:50:04 +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 97AE98FC24 for ; Sun, 31 Aug 2008 20:50:04 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7VKo4e1013123 for ; Sun, 31 Aug 2008 20:50:04 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7VKo4D5013121 for perforce@freebsd.org; Sun, 31 Aug 2008 20:50:04 GMT (envelope-from ed@FreeBSD.org) Date: Sun, 31 Aug 2008 20:50:04 GMT Message-Id: <200808312050.m7VKo4D5013121@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 148937 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Aug 2008 20:50:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=148937 Change 148937 by ed@ed_dull on 2008/08/31 20:49:21 IFC (so I can test `make universe'). Affected files ... .. //depot/projects/mpsafetty/ObsoleteFiles.inc#9 integrate .. //depot/projects/mpsafetty/bin/Makefile#2 integrate .. //depot/projects/mpsafetty/bin/pkill/Makefile#1 branch .. //depot/projects/mpsafetty/bin/pkill/pkill.1#1 branch .. //depot/projects/mpsafetty/bin/pkill/pkill.c#1 branch .. //depot/projects/mpsafetty/bin/sh/sh.1#2 integrate .. //depot/projects/mpsafetty/etc/sendmail/freebsd.submit.mc#2 integrate .. //depot/projects/mpsafetty/gnu/usr.bin/binutils/libbfd/Makefile.amd64#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/Makefile#3 integrate .. //depot/projects/mpsafetty/lib/libarchive/archive.h#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/archive_write_set_format.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/archive_write_set_format_by_name.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/archive_write_set_format_mtree.c#1 branch .. //depot/projects/mpsafetty/lib/libarchive/archive_write_set_format_shar.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/main.c#2 integrate .. //depot/projects/mpsafetty/rescue/rescue/Makefile#2 integrate .. //depot/projects/mpsafetty/sbin/gpt/Makefile#2 delete .. //depot/projects/mpsafetty/sbin/gpt/add.c#2 delete .. //depot/projects/mpsafetty/sbin/gpt/boot.c#2 delete .. //depot/projects/mpsafetty/sbin/gpt/create.c#2 delete .. //depot/projects/mpsafetty/sbin/gpt/destroy.c#2 delete .. //depot/projects/mpsafetty/sbin/gpt/gpt.8#2 delete .. //depot/projects/mpsafetty/sbin/gpt/gpt.c#2 delete .. //depot/projects/mpsafetty/sbin/gpt/gpt.h#2 delete .. //depot/projects/mpsafetty/sbin/gpt/label.c#2 delete .. //depot/projects/mpsafetty/sbin/gpt/map.c#2 delete .. //depot/projects/mpsafetty/sbin/gpt/map.h#2 delete .. //depot/projects/mpsafetty/sbin/gpt/migrate.c#2 delete .. //depot/projects/mpsafetty/sbin/gpt/recover.c#2 delete .. //depot/projects/mpsafetty/sbin/gpt/remove.c#2 delete .. //depot/projects/mpsafetty/sbin/gpt/show.c#2 delete .. //depot/projects/mpsafetty/sbin/mount/mount.c#2 integrate .. //depot/projects/mpsafetty/share/man/man4/witness.4#2 integrate .. //depot/projects/mpsafetty/share/man/man9/vfs_busy.9#2 integrate .. //depot/projects/mpsafetty/share/man/man9/vfs_unbusy.9#2 integrate .. //depot/projects/mpsafetty/sys/arm/at91/if_ate.c#2 integrate .. //depot/projects/mpsafetty/sys/boot/sparc64/loader/main.c#4 integrate .. //depot/projects/mpsafetty/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/syscons/syscons.c#6 integrate .. //depot/projects/mpsafetty/sys/dev/usb/ehci_pci.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/usb/ohci_pci.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb/ufoma.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb/uipaq.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/usb/umodem.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb/uplcom.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb/uvscom.c#2 integrate .. //depot/projects/mpsafetty/sys/geom/journal/g_journal.c#2 integrate .. //depot/projects/mpsafetty/sys/gnu/fs/ext2fs/ext2_vfsops.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/subr_witness.c#5 integrate .. //depot/projects/mpsafetty/sys/kern/vfs_lookup.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/vfs_mount.c#7 integrate .. //depot/projects/mpsafetty/sys/kern/vfs_subr.c#7 integrate .. //depot/projects/mpsafetty/sys/kern/vfs_syscalls.c#3 integrate .. //depot/projects/mpsafetty/sys/modules/usb/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/netinet/if_ether.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet/libalias/alias_db.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet6/udp6_usrreq.c#4 integrate .. //depot/projects/mpsafetty/sys/nfsclient/nfs_vfsops.c#6 integrate .. //depot/projects/mpsafetty/sys/powerpc/aim/clock.c#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/aim/machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/aim/vm_machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/include/cpufunc.h#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/powerpc/db_interface.c#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/powerpc/pmap_dispatch.c#2 integrate .. //depot/projects/mpsafetty/sys/sys/mount.h#2 integrate .. //depot/projects/mpsafetty/sys/ufs/ffs/ffs_softdep.c#3 integrate .. //depot/projects/mpsafetty/sys/ufs/ufs/ufs_vfsops.c#2 integrate .. //depot/projects/mpsafetty/tools/regression/atm/README#2 integrate .. //depot/projects/mpsafetty/usr.bin/Makefile#2 integrate .. //depot/projects/mpsafetty/usr.bin/pkill/Makefile#2 delete .. //depot/projects/mpsafetty/usr.bin/pkill/pkill.1#2 delete .. //depot/projects/mpsafetty/usr.bin/pkill/pkill.c#2 delete Differences ... ==== //depot/projects/mpsafetty/ObsoleteFiles.inc#9 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.156 2008/08/24 10:01:22 ed Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.157 2008/08/31 08:33:41 antoine Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -16,6 +16,24 @@ # 20080823: removal of unneeded pt_chown, to implement grantpt(3) OLD_FILES+=usr/libexec/pt_chown +# 20080822: ntp 4.2.4p5 import +OLD_FILES+=usr/share/doc/ntp/driver23.html +OLD_FILES+=usr/share/doc/ntp/driver24.html +# 20080821: several man pages moved from man4.i386 to man4 +.if ${TARGET_ARCH} == "i386" +OLD_FILES+=usr/share/man/man4/i386/acpi_aiboost.4.gz +OLD_FILES+=usr/share/man/man4/i386/acpi_asus.4.gz +OLD_FILES+=usr/share/man/man4/i386/acpi_fujitsu.4.gz +OLD_FILES+=usr/share/man/man4/i386/acpi_ibm.4.gz +OLD_FILES+=usr/share/man/man4/i386/acpi_panasonic.4.gz +OLD_FILES+=usr/share/man/man4/i386/acpi_sony.4.gz +OLD_FILES+=usr/share/man/man4/i386/acpi_toshiba.4.gz +OLD_FILES+=usr/share/man/man4/i386/ichwd.4.gz +OLD_FILES+=usr/share/man/man4/i386/if_ndis.4.gz +OLD_FILES+=usr/share/man/man4/i386/io.4.gz +OLD_FILES+=usr/share/man/man4/i386/linux.4.gz +OLD_FILES+=usr/share/man/man4/i386/ndis.4.gz +.endif # 20080820: MPSAFE TTY layer integrated OLD_FILES+=usr/include/sys/linedisc.h OLD_FILES+=usr/share/man/man3/posix_openpt.3.gz ==== //depot/projects/mpsafetty/bin/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/Makefile,v 1.27 2008/03/13 17:38:06 obrien Exp $ +# $FreeBSD: src/bin/Makefile,v 1.28 2008/08/31 14:27:59 yar Exp $ .include @@ -25,6 +25,7 @@ mkdir \ mv \ pax \ + pkill \ ps \ pwd \ ${_rcp} \ ==== //depot/projects/mpsafetty/bin/sh/sh.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.126 2007/12/05 12:29:26 ru Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.127 2008/08/30 22:35:21 ed Exp $ .\" .Dd October 7, 2006 .Dt SH 1 @@ -2118,7 +2118,7 @@ For aliases the alias expansion is printed; for commands and tracked aliases the complete pathname of the command is printed. -.It Ic ulimit Oo Fl HSabcdflmnstuv Oc Op Ar limit +.It Ic ulimit Oo Fl HSabcdflmnpstuv Oc Op Ar limit Set or display resource limits (see .Xr getrlimit 2 ) . If @@ -2172,6 +2172,8 @@ The maximal resident set size of a process, in kilobytes. .It Fl n Ar nofiles The maximal number of descriptors that could be opened by a process. +.It Fl p Ar pseudoterminals +The maximal number of pseudo-terminals for this user ID. .It Fl s Ar stacksize The maximal size of the stack segment, in kilobytes. .It Fl t Ar time ==== //depot/projects/mpsafetty/etc/sendmail/freebsd.submit.mc#2 (text+ko) ==== @@ -13,10 +13,9 @@ # This is the FreeBSD configuration for a set-group-ID sm-msp sendmail # that acts as a initial mail submission program. # -# divert(0)dnl -VERSIONID(`$FreeBSD: src/etc/sendmail/freebsd.submit.mc,v 1.6 2007/11/05 00:18:06 gshapiro Exp $') +VERSIONID(`$FreeBSD: src/etc/sendmail/freebsd.submit.mc,v 1.7 2008/08/31 18:21:15 gshapiro Exp $') define(`confCF_VERSION', `Submit')dnl define(`__OSTYPE__',`')dnl dirty hack to keep proto.m4 from complaining define(`_USE_DECNET_SYNTAX_', `1')dnl support DECnet ==== //depot/projects/mpsafetty/gnu/usr.bin/binutils/libbfd/Makefile.amd64#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.amd64,v 1.4 2004/07/08 17:05:32 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.amd64,v 1.5 2008/08/31 09:17:27 rpaulo Exp $ .include "${.CURDIR}/Makefile.i386" @@ -8,11 +8,13 @@ DEFAULT_VECTOR= bfd_elf64_x86_64_vec SRCS+= elf64-amd64-fbsd.c \ + efi-app-ia32.c \ elf64.c \ elf64-gen.c \ elf64-target.h -VECS= bfd_elf64_x86_64_vec \ +VECS= ${DEFAULT_VECTOR} \ + bfd_efi_app_ia32_vec \ ${I386_VECS} CLEANFILES+= elf64-amd64-fbsd.c ==== //depot/projects/mpsafetty/lib/libarchive/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/Makefile,v 1.87 2008/08/24 05:54:28 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/Makefile,v 1.88 2008/08/31 07:21:46 kientzle Exp $ LIB= archive DPADD= ${LIBBZ2} ${LIBZ} @@ -65,6 +65,7 @@ archive_write_set_format_by_name.c \ archive_write_set_format_cpio.c \ archive_write_set_format_cpio_newc.c \ + archive_write_set_format_mtree.c \ archive_write_set_format_pax.c \ archive_write_set_format_shar.c \ archive_write_set_format_ustar.c \ ==== //depot/projects/mpsafetty/lib/libarchive/archive.h#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. * - * $FreeBSD: src/lib/libarchive/archive.h,v 1.18 2008/07/05 01:50:40 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive.h,v 1.19 2008/08/31 07:21:46 kientzle Exp $ */ #ifndef ARCHIVE_H_INCLUDED @@ -465,6 +465,7 @@ __LA_DECL int archive_write_set_format_ar_svr4(struct archive *); __LA_DECL int archive_write_set_format_cpio(struct archive *); __LA_DECL int archive_write_set_format_cpio_newc(struct archive *); +__LA_DECL int archive_write_set_format_mtree(struct archive *); /* TODO: int archive_write_set_format_old_tar(struct archive *); */ __LA_DECL int archive_write_set_format_pax(struct archive *); __LA_DECL int archive_write_set_format_pax_restricted(struct archive *); ==== //depot/projects/mpsafetty/lib/libarchive/archive_write_set_format.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format.c,v 1.5 2007/06/22 05:47:00 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format.c,v 1.6 2008/08/31 07:21:46 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include @@ -44,6 +44,7 @@ { ARCHIVE_FORMAT_CPIO, archive_write_set_format_cpio }, { ARCHIVE_FORMAT_CPIO_SVR4_NOCRC, archive_write_set_format_cpio_newc }, { ARCHIVE_FORMAT_CPIO_POSIX, archive_write_set_format_cpio }, + { ARCHIVE_FORMAT_MTREE, archive_write_set_format_mtree }, { ARCHIVE_FORMAT_SHAR, archive_write_set_format_shar }, { ARCHIVE_FORMAT_SHAR_BASE, archive_write_set_format_shar }, { ARCHIVE_FORMAT_SHAR_DUMP, archive_write_set_format_shar_dump }, ==== //depot/projects/mpsafetty/lib/libarchive/archive_write_set_format_by_name.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_by_name.c,v 1.7 2007/06/22 05:47:00 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_by_name.c,v 1.8 2008/08/31 07:21:46 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include @@ -49,6 +49,7 @@ { "argnu", archive_write_set_format_ar_svr4 }, { "arsvr4", archive_write_set_format_ar_svr4 }, { "cpio", archive_write_set_format_cpio }, + { "mtree", archive_write_set_format_mtree }, { "newc", archive_write_set_format_cpio_newc }, { "odc", archive_write_set_format_cpio }, { "pax", archive_write_set_format_pax }, ==== //depot/projects/mpsafetty/lib/libarchive/archive_write_set_format_shar.c#2 (text+ko) ==== @@ -1,5 +1,6 @@ /*- * Copyright (c) 2003-2007 Tim Kientzle + * Copyright (c) 2008 Joerg Sonnenberger * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -24,12 +25,11 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_shar.c,v 1.19 2008/03/15 11:04:45 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_shar.c,v 1.20 2008/08/31 07:10:40 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include #endif -#include #include #ifdef HAVE_STDLIB_H #include @@ -49,13 +49,14 @@ struct archive_entry *entry; int has_data; char *last_dir; - char outbuff[1024]; - size_t outbytes; + + /* Line buffer for uuencoded dump format */ + char outbuff[45]; size_t outpos; - int uuavail; - char uubuffer[3]; + int wrote_header; struct archive_string work; + struct archive_string quoted_name; }; static int archive_write_shar_finish(struct archive_write *); @@ -67,23 +68,33 @@ static ssize_t archive_write_shar_data_uuencode(struct archive_write *, const void * buff, size_t); static int archive_write_shar_finish_entry(struct archive_write *); -static int shar_printf(struct archive_write *, const char *fmt, ...); -static void uuencode_group(struct shar *); -static int -shar_printf(struct archive_write *a, const char *fmt, ...) +/* + * Copy the given string to the buffer, quoting all shell meta characters + * found. + */ +static void +shar_quote(struct archive_string *buf, const char *str, int in_shell) { - struct shar *shar; - va_list ap; - int ret; + static const char meta[] = "\n \t'`\";&<>()|*?{}[]\\$!#^~"; + size_t len; - shar = (struct shar *)a->format_data; - va_start(ap, fmt); - archive_string_empty(&(shar->work)); - archive_string_vsprintf(&(shar->work), fmt, ap); - ret = ((a->compressor.write)(a, shar->work.s, strlen(shar->work.s))); - va_end(ap); - return (ret); + while (*str != '\0') { + if ((len = strcspn(str, meta)) != 0) { + archive_strncat(buf, str, len); + str += len; + } else if (*str == '\n') { + if (in_shell) + archive_strcat(buf, "\"\n\""); + else + archive_strcat(buf, "\\n"); + ++str; + } else { + archive_strappend_char(buf, '\\'); + archive_strappend_char(buf, *str); + ++str; + } + } } /* @@ -105,6 +116,8 @@ return (ARCHIVE_FATAL); } memset(shar, 0, sizeof(*shar)); + archive_string_init(&shar->work); + archive_string_init(&shar->quoted_name); a->format_data = shar; a->pad_uncompressed = 0; @@ -146,16 +159,11 @@ const char *name; char *p, *pp; struct shar *shar; - int ret; shar = (struct shar *)a->format_data; if (!shar->wrote_header) { - ret = shar_printf(a, "#!/bin/sh\n"); - if (ret != ARCHIVE_OK) - return (ret); - ret = shar_printf(a, "# This is a shell archive\n"); - if (ret != ARCHIVE_OK) - return (ret); + archive_strcat(&shar->work, "#!/bin/sh\n"); + archive_strcat(&shar->work, "# This is a shell archive\n"); shar->wrote_header = 1; } @@ -192,10 +200,11 @@ } } + archive_string_empty(&shar->quoted_name); + shar_quote(&shar->quoted_name, name, 1); + /* Stock preparation for all file types. */ - ret = shar_printf(a, "echo x %s\n", name); - if (ret != ARCHIVE_OK) - return (ret); + archive_string_sprintf(&shar->work, "echo x %s\n", shar->quoted_name.s); if (archive_entry_filetype(entry) != AE_IFDIR) { /* Try to create the dir. */ @@ -210,12 +219,10 @@ /* Don't try to "mkdir ." */ free(p); } else if (shar->last_dir == NULL) { - ret = shar_printf(a, - "mkdir -p %s > /dev/null 2>&1\n", p); - if (ret != ARCHIVE_OK) { - free(p); - return (ret); - } + archive_strcat(&shar->work, "mkdir -p "); + shar_quote(&shar->work, p, 1); + archive_strcat(&shar->work, + " > /dev/null 2>&1\n"); shar->last_dir = p; } else if (strcmp(p, shar->last_dir) == 0) { /* We've already created this exact dir. */ @@ -225,13 +232,10 @@ /* We've already created a subdir. */ free(p); } else { - ret = shar_printf(a, - "mkdir -p %s > /dev/null 2>&1\n", p); - if (ret != ARCHIVE_OK) { - free(p); - return (ret); - } - free(shar->last_dir); + archive_strcat(&shar->work, "mkdir -p "); + shar_quote(&shar->work, p, 1); + archive_strcat(&shar->work, + " > /dev/null 2>&1\n"); shar->last_dir = p; } } else { @@ -242,51 +246,47 @@ /* Handle file-type specific issues. */ shar->has_data = 0; if ((linkname = archive_entry_hardlink(entry)) != NULL) { - ret = shar_printf(a, "ln -f %s %s\n", linkname, name); - if (ret != ARCHIVE_OK) - return (ret); + archive_strcat(&shar->work, "ln -f "); + shar_quote(&shar->work, linkname, 1); + archive_string_sprintf(&shar->work, " %s\n", + shar->quoted_name.s); } else if ((linkname = archive_entry_symlink(entry)) != NULL) { - ret = shar_printf(a, "ln -fs %s %s\n", linkname, name); - if (ret != ARCHIVE_OK) - return (ret); + archive_strcat(&shar->work, "ln -fs "); + shar_quote(&shar->work, linkname, 1); + archive_string_sprintf(&shar->work, " %s\n", + shar->quoted_name.s); } else { switch(archive_entry_filetype(entry)) { case AE_IFREG: if (archive_entry_size(entry) == 0) { /* More portable than "touch." */ - ret = shar_printf(a, "test -e \"%s\" || :> \"%s\"\n", name, name); - if (ret != ARCHIVE_OK) - return (ret); + archive_string_sprintf(&shar->work, + "test -e \"%s\" || :> \"%s\"\n", + shar->quoted_name.s, shar->quoted_name.s); } else { if (shar->dump) { - ret = shar_printf(a, - "uudecode -o %s << 'SHAR_END'\n", - name); - if (ret != ARCHIVE_OK) - return (ret); - ret = shar_printf(a, "begin %o %s\n", - archive_entry_mode(entry) & 0777, - name); - if (ret != ARCHIVE_OK) - return (ret); + archive_string_sprintf(&shar->work, + "uudecode -p > %s << 'SHAR_END'\n", + shar->quoted_name.s); + archive_string_sprintf(&shar->work, + "begin %o ", + archive_entry_mode(entry) & 0777); + shar_quote(&shar->work, name, 0); + archive_strcat(&shar->work, "\n"); } else { - ret = shar_printf(a, + archive_string_sprintf(&shar->work, "sed 's/^X//' > %s << 'SHAR_END'\n", - name); - if (ret != ARCHIVE_OK) - return (ret); + shar->quoted_name.s); } shar->has_data = 1; shar->end_of_line = 1; shar->outpos = 0; - shar->outbytes = 0; } break; case AE_IFDIR: - ret = shar_printf(a, "mkdir -p %s > /dev/null 2>&1\n", - name); - if (ret != ARCHIVE_OK) - return (ret); + archive_string_sprintf(&shar->work, + "mkdir -p %s > /dev/null 2>&1\n", + shar->quoted_name.s); /* Record that we just created this directory. */ if (shar->last_dir != NULL) free(shar->last_dir); @@ -302,23 +302,20 @@ */ break; case AE_IFIFO: - ret = shar_printf(a, "mkfifo %s\n", name); - if (ret != ARCHIVE_OK) - return (ret); + archive_string_sprintf(&shar->work, + "mkfifo %s\n", shar->quoted_name.s); break; case AE_IFCHR: - ret = shar_printf(a, "mknod %s c %d %d\n", name, + archive_string_sprintf(&shar->work, + "mknod %s c %d %d\n", shar->quoted_name.s, archive_entry_rdevmajor(entry), archive_entry_rdevminor(entry)); - if (ret != ARCHIVE_OK) - return (ret); break; case AE_IFBLK: - ret = shar_printf(a, "mknod %s b %d %d\n", name, + archive_string_sprintf(&shar->work, + "mknod %s b %d %d\n", shar->quoted_name.s, archive_entry_rdevmajor(entry), archive_entry_rdevminor(entry)); - if (ret != ARCHIVE_OK) - return (ret); break; default: return (ARCHIVE_WARN); @@ -328,69 +325,119 @@ return (ARCHIVE_OK); } -/* XXX TODO: This could be more efficient XXX */ static ssize_t archive_write_shar_data_sed(struct archive_write *a, const void *buff, size_t n) { + static const size_t ensured = 65533; struct shar *shar; const char *src; + char *buf, *buf_end; int ret; size_t written = n; shar = (struct shar *)a->format_data; - if (!shar->has_data) + if (!shar->has_data || n == 0) return (0); src = (const char *)buff; - ret = ARCHIVE_OK; - shar->outpos = 0; - while (n-- > 0) { - if (shar->end_of_line) { - shar->outbuff[shar->outpos++] = 'X'; - shar->end_of_line = 0; + + /* + * ensure is the number of bytes in buffer before expanding the + * current character. Each operation writes the current character + * and optionally the start-of-new-line marker. This can happen + * twice before entering the loop, so make sure three additional + * bytes can be written. + */ + if (archive_string_ensure(&shar->work, ensured + 3) == NULL) + __archive_errx(1, "Out of memory"); + + if (shar->work.length > ensured) { + ret = (*a->compressor.write)(a, shar->work.s, + shar->work.length); + if (ret != ARCHIVE_OK) + return (ARCHIVE_FATAL); + archive_string_empty(&shar->work); + } + buf = shar->work.s + shar->work.length; + buf_end = shar->work.s + ensured; + + if (shar->end_of_line) { + *buf++ = 'X'; + shar->end_of_line = 0; + } + + while (n-- != 0) { + if ((*buf++ = *src++) == '\n') { + if (n == 0) + shar->end_of_line = 1; + else + *buf++ = 'X'; } - if (*src == '\n') - shar->end_of_line = 1; - shar->outbuff[shar->outpos++] = *src++; - if (shar->outpos > sizeof(shar->outbuff) - 2) { - ret = (a->compressor.write)(a, shar->outbuff, - shar->outpos); + if (buf >= buf_end) { + shar->work.length = buf - shar->work.s; + ret = (*a->compressor.write)(a, shar->work.s, + shar->work.length); if (ret != ARCHIVE_OK) - return (ret); - shar->outpos = 0; + return (ARCHIVE_FATAL); + archive_string_empty(&shar->work); + buf = shar->work.s; } } - if (shar->outpos > 0) - ret = (a->compressor.write)(a, shar->outbuff, shar->outpos); - if (ret != ARCHIVE_OK) - return (ret); + shar->work.length = buf - shar->work.s; + return (written); } #define UUENC(c) (((c)!=0) ? ((c) & 077) + ' ': '`') -/* XXX This could be a lot more efficient. XXX */ +static void +uuencode_group(const char _in[3], char out[4]) +{ + const unsigned char *in = (const unsigned char *)_in; + int t; + + t = (in[0] << 16) | (in[1] << 8) | in[2]; + out[0] = UUENC( 0x3f & (t >> 18) ); + out[1] = UUENC( 0x3f & (t >> 12) ); + out[2] = UUENC( 0x3f & (t >> 6) ); + out[3] = UUENC( 0x3f & t ); +} + static void -uuencode_group(struct shar *shar) +uuencode_line(struct shar *shar, const char *inbuf, size_t len) { - int t; + char tmp_buf[3], *buf; + size_t alloc_len; + + /* len <= 45 -> expanded to 60 + len byte + new line */ + alloc_len = shar->work.length + 62; + if (archive_string_ensure(&shar->work, alloc_len) == NULL) + __archive_errx(1, "Out of memory"); - t = 0; - if (shar->uuavail > 0) - t = 0xff0000 & (shar->uubuffer[0] << 16); - if (shar->uuavail > 1) - t |= 0x00ff00 & (shar->uubuffer[1] << 8); - if (shar->uuavail > 2) - t |= 0x0000ff & (shar->uubuffer[2]); - shar->outbuff[shar->outpos++] = UUENC( 0x3f & (t>>18) ); - shar->outbuff[shar->outpos++] = UUENC( 0x3f & (t>>12) ); - shar->outbuff[shar->outpos++] = UUENC( 0x3f & (t>>6) ); - shar->outbuff[shar->outpos++] = UUENC( 0x3f & (t) ); - shar->uuavail = 0; - shar->outbytes += shar->uuavail; - shar->outbuff[shar->outpos] = 0; + buf = shar->work.s + shar->work.length; + *buf++ = UUENC(len); + while (len >= 3) { + uuencode_group(inbuf, buf); + len -= 3; + inbuf += 3; + buf += 4; + } + if (len != 0) { + tmp_buf[0] = inbuf[0]; + if (len == 1) + tmp_buf[1] = '\0'; + else + tmp_buf[1] = inbuf[1]; + tmp_buf[2] = '\0'; + uuencode_group(inbuf, buf); + buf += 4; + } + *buf++ = '\n'; + if ((buf - shar->work.s) > (ptrdiff_t)(shar->work.length + 62)) + __archive_errx(1, "Buffer overflow"); + shar->work.length = buf - shar->work.s; } static ssize_t @@ -406,21 +453,39 @@ if (!shar->has_data) return (ARCHIVE_OK); src = (const char *)buff; - n = length; - while (n-- > 0) { - if (shar->uuavail == 3) - uuencode_group(shar); - if (shar->outpos >= 60) { - ret = shar_printf(a, "%c%s\n", UUENC(shar->outbytes), - shar->outbuff); - if (ret != ARCHIVE_OK) - return (ret); - shar->outpos = 0; - shar->outbytes = 0; + + if (shar->outpos != 0) { + n = 45 - shar->outpos; + if (n > length) + n = length; + memcpy(shar->outbuff + shar->outpos, src, n); + if (shar->outpos + n < 45) { + shar->outpos += n; + return length; } + uuencode_line(shar, shar->outbuff, 45); + src += n; + n = length - n; + } else { + n = length; + } - shar->uubuffer[shar->uuavail++] = *src++; - shar->outbytes++; + while (n >= 45) { + uuencode_line(shar, src, 45); + src += 45; + n -= 45; + + if (shar->work.length < 65536) + continue; + ret = (*a->compressor.write)(a, shar->work.s, + shar->work.length); + if (ret != ARCHIVE_OK) + return (ARCHIVE_FATAL); + archive_string_empty(&shar->work); + } + if (n != 0) { + memcpy(shar->outbuff, src, n); + shar->outpos = n; } return (length); } @@ -439,54 +504,43 @@ if (shar->dump) { /* Finish uuencoded data. */ if (shar->has_data) { - if (shar->uuavail > 0) - uuencode_group(shar); - if (shar->outpos > 0) { - ret = shar_printf(a, "%c%s\n", - UUENC(shar->outbytes), shar->outbuff); - if (ret != ARCHIVE_OK) - return (ret); - shar->outpos = 0; - shar->uuavail = 0; - shar->outbytes = 0; - } - ret = shar_printf(a, "%c\n", UUENC(0)); - if (ret != ARCHIVE_OK) - return (ret); - ret = shar_printf(a, "end\n", UUENC(0)); - if (ret != ARCHIVE_OK) - return (ret); - ret = shar_printf(a, "SHAR_END\n"); - if (ret != ARCHIVE_OK) - return (ret); + if (shar->outpos > 0) + uuencode_line(shar, shar->outbuff, + shar->outpos); + archive_strcat(&shar->work, "`\nend\n"); + archive_strcat(&shar->work, "SHAR_END\n"); } /* Restore file mode, owner, flags. */ /* * TODO: Don't immediately restore mode for * directories; defer that to end of script. */ - ret = shar_printf(a, "chmod %o %s\n", - archive_entry_mode(shar->entry) & 07777, - archive_entry_pathname(shar->entry)); - if (ret != ARCHIVE_OK) - return (ret); + archive_string_sprintf(&shar->work, "chmod %o ", + archive_entry_mode(shar->entry) & 07777); + shar_quote(&shar->work, archive_entry_pathname(shar->entry), 1); + archive_strcat(&shar->work, "\n"); u = archive_entry_uname(shar->entry); g = archive_entry_gname(shar->entry); if (u != NULL || g != NULL) { - ret = shar_printf(a, "chown %s%s%s %s\n", - (u != NULL) ? u : "", - (g != NULL) ? ":" : "", (g != NULL) ? g : "", - archive_entry_pathname(shar->entry)); - if (ret != ARCHIVE_OK) - return (ret); + archive_strcat(&shar->work, "chown "); + if (u != NULL) + shar_quote(&shar->work, u, 1); + if (g != NULL) { + archive_strcat(&shar->work, ":"); + shar_quote(&shar->work, g, 1); + } + shar_quote(&shar->work, + archive_entry_pathname(shar->entry), 1); + archive_strcat(&shar->work, "\n"); } if ((p = archive_entry_fflags_text(shar->entry)) != NULL) { - ret = shar_printf(a, "chflags %s %s\n", p, - archive_entry_pathname(shar->entry)); - if (ret != ARCHIVE_OK) - return (ret); + archive_string_sprintf(&shar->work, "chflags %s ", + p, archive_entry_pathname(shar->entry)); + shar_quote(&shar->work, + archive_entry_pathname(shar->entry), 1); + archive_strcat(&shar->work, "\n"); } /* TODO: restore ACLs */ @@ -494,20 +548,24 @@ } else { if (shar->has_data) { /* Finish sed-encoded data: ensure last line ends. */ - if (!shar->end_of_line) { - ret = shar_printf(a, "\n"); - if (ret != ARCHIVE_OK) - return (ret); - } - ret = shar_printf(a, "SHAR_END\n"); - if (ret != ARCHIVE_OK) - return (ret); + if (!shar->end_of_line) + archive_strappend_char(&shar->work, '\n'); + archive_strcat(&shar->work, "SHAR_END\n"); } } archive_entry_free(shar->entry); shar->entry = NULL; - return (0); + + if (shar->work.length < 65536) + return (ARCHIVE_OK); + + ret = (*a->compressor.write)(a, shar->work.s, shar->work.length); + if (ret != ARCHIVE_OK) + return (ARCHIVE_FATAL); + archive_string_empty(&shar->work); + + return (ARCHIVE_OK); } static int @@ -529,17 +587,22 @@ * shar format, then sets another format (which would invoke * shar_finish to free the format-specific data). */ - if (shar->wrote_header) { - ret = shar_printf(a, "exit\n"); - if (ret != ARCHIVE_OK) - return (ret); - /* Shar output is never padded. */ - archive_write_set_bytes_in_last_block(&a->archive, 1); - /* - * TODO: shar should also suppress padding of - * uncompressed data within gzip/bzip2 streams. - */ - } + if (shar->wrote_header == 0) + return (ARCHIVE_OK); + + archive_strcat(&shar->work, "exit\n"); + + ret = (*a->compressor.write)(a, shar->work.s, shar->work.length); + if (ret != ARCHIVE_OK) + return (ARCHIVE_FATAL); + + /* Shar output is never padded. */ + archive_write_set_bytes_in_last_block(&a->archive, 1); + /* + * TODO: shar should also suppress padding of + * uncompressed data within gzip/bzip2 streams. + */ + return (ARCHIVE_OK); } @@ -549,11 +612,13 @@ struct shar *shar; shar = (struct shar *)a->format_data; - if (shar->entry != NULL) - archive_entry_free(shar->entry); - if (shar->last_dir != NULL) - free(shar->last_dir); + if (shar == NULL) + return (ARCHIVE_OK); + + archive_entry_free(shar->entry); + free(shar->last_dir); archive_string_free(&(shar->work)); + archive_string_free(&(shar->quoted_name)); free(shar); a->format_data = NULL; return (ARCHIVE_OK); ==== //depot/projects/mpsafetty/lib/libarchive/test/main.c#2 (text+ko) ==== @@ -40,10 +40,12 @@ * The next few lines are the only differences. */ #undef PROGRAM /* Testing a library, not a program. */ +#define LIBRARY "libarchive" #define ENVBASE "LIBARCHIVE" /* Prefix for environment variables. */ #define EXTRA_DUMP(x) archive_error_string((struct archive *)(x)) #define EXTRA_VERSION archive_version() -__FBSDID("$FreeBSD: src/lib/libarchive/test/main.c,v 1.13 2008/06/15 10:35:22 kientzle Exp $"); +#define KNOWNREF "test_compat_gtar_1.tgz.uu" +__FBSDID("$FreeBSD: src/lib/libarchive/test/main.c,v 1.14 2008/08/31 07:06:02 kientzle Exp $"); /* * "list.h" is simply created by "grep DEFINE_TEST"; it has @@ -841,7 +843,53 @@ fclose(in); } +static char * +get_refdir(const char *tmpdir) +{ + char *ref, *p; + /* Get the current dir. */ + systemf("/bin/pwd > %s/refdir", tmpdir); + ref = slurpfile(NULL, "%s/refdir", tmpdir); + p = ref + strlen(ref); + while (p[-1] == '\n') { + --p; + *p = '\0'; + } + systemf("rm %s/refdir", tmpdir); + /* Look for a known file. */ + p = slurpfile(NULL, "%s/%s", ref, KNOWNREF); + if (p != NULL) { + free(p); + return (ref); + } + p = slurpfile(NULL, "%s/test/%s", ref, KNOWNREF); + if (p != NULL) { + free(p); + p = malloc(strlen(ref) + strlen("/test") + 1); + strcpy(p, ref); + strcat(p, "/test"); + free(ref); + return (p); + } + p = slurpfile(NULL, "%s/%s/test/%s", ref, LIBRARY, KNOWNREF); + if (p != NULL) { + free(p); + p = malloc(strlen(ref) + 1 + strlen(LIBRARY) + strlen("/test") + 1); + strcpy(p, ref); + strcat(p, "/"); + strcat(p, LIBRARY); + strcat(p, "/test"); + free(ref); + return (p); + } + printf("Unable to locate known reference file %s\n", KNOWNREF); + printf(" Checked directory %s\n", ref); + printf(" Checked directory %s/test\n", ref); + printf(" Checked directory %s/%s/test\n", ref, LIBRARY); + exit(1); +} + int main(int argc, char **argv) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Aug 31 21:23:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BD48F106567C; Sun, 31 Aug 2008 21:23: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 814F81065678 for ; Sun, 31 Aug 2008 21:23:51 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6DFE08FC16 for ; Sun, 31 Aug 2008 21:23:51 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7VLNpRi016986 for ; Sun, 31 Aug 2008 21:23:51 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7VLNp0T016984 for perforce@freebsd.org; Sun, 31 Aug 2008 21:23:51 GMT (envelope-from trasz@freebsd.org) Date: Sun, 31 Aug 2008 21:23:51 GMT Message-Id: <200808312123.m7VLNp0T016984@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 148945 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Aug 2008 21:23:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=148945 Change 148945 by trasz@trasz_traszkan on 2008/08/31 21:23:35 Bring back files generated by "make sysent". Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/init_sysent.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/syscalls.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/systrace_args.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/syscall.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/syscall.mk#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/sysproto.h#3 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/init_sysent.c#3 (text+ko) ==== ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/syscalls.c#3 (text+ko) ==== ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/systrace_args.c#3 (text+ko) ==== ==== //depot/projects/soc2008/trasz_nfs4acl/sys/sys/syscall.h#3 (text+ko) ==== ==== //depot/projects/soc2008/trasz_nfs4acl/sys/sys/syscall.mk#3 (text+ko) ==== ==== //depot/projects/soc2008/trasz_nfs4acl/sys/sys/sysproto.h#3 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sun Aug 31 22:03:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 65B99106568E; Sun, 31 Aug 2008 22:03: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 109BE106567F for ; Sun, 31 Aug 2008 22:03:32 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EF8EB8FC13 for ; Sun, 31 Aug 2008 22:03:31 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7VM3V2c021307 for ; Sun, 31 Aug 2008 22:03:31 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7VM3VDr021305 for perforce@freebsd.org; Sun, 31 Aug 2008 22:03:31 GMT (envelope-from trasz@freebsd.org) Date: Sun, 31 Aug 2008 22:03:31 GMT Message-Id: <200808312203.m7VM3VDr021305@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 148948 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Aug 2008 22:03:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=148948 Change 148948 by trasz@trasz_traszkan on 2008/08/31 22:02:50 IFC. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/pkill/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/bin/pkill/pkill.1#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/bin/pkill/pkill.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/sh.1#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/sendmail/freebsd.submit.mc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/gnu/usr.bin/binutils/libbfd/Makefile.amd64#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/Makefile#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write_set_format.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write_set_format_by_name.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write_set_format_mtree.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write_set_format_shar.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/main.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/rescue/rescue/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount/mount.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/vfs_busy.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/vfs_unbusy.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/if_ate.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/syscons.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/ufoma.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/uipaq.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/umodem.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/uplcom.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/uvscom.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/journal/g_journal.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/gnu/fs/ext2fs/ext2_vfsops.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_lookup.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_mount.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_subr.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_syscalls.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/if_ether.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/libalias/alias_db.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/udp6_usrreq.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_vfsops.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/aim/clock.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/aim/machdep.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/aim/mmu_oea.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/aim/vm_machdep.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/include/cpufunc.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powerpc/db_interface.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powerpc/pmap_dispatch.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/mount.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_softdep.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_vfsops.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/atm/README#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/pkill/Makefile#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/pkill/pkill.1#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/pkill/pkill.c#2 delete Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#9 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.156 2008/08/24 10:01:22 ed Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.157 2008/08/31 08:33:41 antoine Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -16,6 +16,24 @@ # 20080823: removal of unneeded pt_chown, to implement grantpt(3) OLD_FILES+=usr/libexec/pt_chown +# 20080822: ntp 4.2.4p5 import +OLD_FILES+=usr/share/doc/ntp/driver23.html +OLD_FILES+=usr/share/doc/ntp/driver24.html +# 20080821: several man pages moved from man4.i386 to man4 +.if ${TARGET_ARCH} == "i386" +OLD_FILES+=usr/share/man/man4/i386/acpi_aiboost.4.gz +OLD_FILES+=usr/share/man/man4/i386/acpi_asus.4.gz +OLD_FILES+=usr/share/man/man4/i386/acpi_fujitsu.4.gz +OLD_FILES+=usr/share/man/man4/i386/acpi_ibm.4.gz +OLD_FILES+=usr/share/man/man4/i386/acpi_panasonic.4.gz +OLD_FILES+=usr/share/man/man4/i386/acpi_sony.4.gz +OLD_FILES+=usr/share/man/man4/i386/acpi_toshiba.4.gz +OLD_FILES+=usr/share/man/man4/i386/ichwd.4.gz +OLD_FILES+=usr/share/man/man4/i386/if_ndis.4.gz +OLD_FILES+=usr/share/man/man4/i386/io.4.gz +OLD_FILES+=usr/share/man/man4/i386/linux.4.gz +OLD_FILES+=usr/share/man/man4/i386/ndis.4.gz +.endif # 20080820: MPSAFE TTY layer integrated OLD_FILES+=usr/include/sys/linedisc.h OLD_FILES+=usr/share/man/man3/posix_openpt.3.gz ==== //depot/projects/soc2008/trasz_nfs4acl/bin/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/Makefile,v 1.27 2008/03/13 17:38:06 obrien Exp $ +# $FreeBSD: src/bin/Makefile,v 1.28 2008/08/31 14:27:59 yar Exp $ .include @@ -25,6 +25,7 @@ mkdir \ mv \ pax \ + pkill \ ps \ pwd \ ${_rcp} \ ==== //depot/projects/soc2008/trasz_nfs4acl/bin/sh/sh.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.126 2007/12/05 12:29:26 ru Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.127 2008/08/30 22:35:21 ed Exp $ .\" .Dd October 7, 2006 .Dt SH 1 @@ -2118,7 +2118,7 @@ For aliases the alias expansion is printed; for commands and tracked aliases the complete pathname of the command is printed. -.It Ic ulimit Oo Fl HSabcdflmnstuv Oc Op Ar limit +.It Ic ulimit Oo Fl HSabcdflmnpstuv Oc Op Ar limit Set or display resource limits (see .Xr getrlimit 2 ) . If @@ -2172,6 +2172,8 @@ The maximal resident set size of a process, in kilobytes. .It Fl n Ar nofiles The maximal number of descriptors that could be opened by a process. +.It Fl p Ar pseudoterminals +The maximal number of pseudo-terminals for this user ID. .It Fl s Ar stacksize The maximal size of the stack segment, in kilobytes. .It Fl t Ar time ==== //depot/projects/soc2008/trasz_nfs4acl/etc/sendmail/freebsd.submit.mc#2 (text+ko) ==== @@ -13,10 +13,9 @@ # This is the FreeBSD configuration for a set-group-ID sm-msp sendmail # that acts as a initial mail submission program. # -# divert(0)dnl -VERSIONID(`$FreeBSD: src/etc/sendmail/freebsd.submit.mc,v 1.6 2007/11/05 00:18:06 gshapiro Exp $') +VERSIONID(`$FreeBSD: src/etc/sendmail/freebsd.submit.mc,v 1.7 2008/08/31 18:21:15 gshapiro Exp $') define(`confCF_VERSION', `Submit')dnl define(`__OSTYPE__',`')dnl dirty hack to keep proto.m4 from complaining define(`_USE_DECNET_SYNTAX_', `1')dnl support DECnet ==== //depot/projects/soc2008/trasz_nfs4acl/gnu/usr.bin/binutils/libbfd/Makefile.amd64#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.amd64,v 1.4 2004/07/08 17:05:32 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.amd64,v 1.5 2008/08/31 09:17:27 rpaulo Exp $ .include "${.CURDIR}/Makefile.i386" @@ -8,11 +8,13 @@ DEFAULT_VECTOR= bfd_elf64_x86_64_vec SRCS+= elf64-amd64-fbsd.c \ + efi-app-ia32.c \ elf64.c \ elf64-gen.c \ elf64-target.h -VECS= bfd_elf64_x86_64_vec \ +VECS= ${DEFAULT_VECTOR} \ + bfd_efi_app_ia32_vec \ ${I386_VECS} CLEANFILES+= elf64-amd64-fbsd.c ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/Makefile,v 1.87 2008/08/24 05:54:28 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/Makefile,v 1.88 2008/08/31 07:21:46 kientzle Exp $ LIB= archive DPADD= ${LIBBZ2} ${LIBZ} @@ -65,6 +65,7 @@ archive_write_set_format_by_name.c \ archive_write_set_format_cpio.c \ archive_write_set_format_cpio_newc.c \ + archive_write_set_format_mtree.c \ archive_write_set_format_pax.c \ archive_write_set_format_shar.c \ archive_write_set_format_ustar.c \ ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive.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.h,v 1.18 2008/07/05 01:50:40 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive.h,v 1.19 2008/08/31 07:21:46 kientzle Exp $ */ #ifndef ARCHIVE_H_INCLUDED @@ -465,6 +465,7 @@ __LA_DECL int archive_write_set_format_ar_svr4(struct archive *); __LA_DECL int archive_write_set_format_cpio(struct archive *); __LA_DECL int archive_write_set_format_cpio_newc(struct archive *); +__LA_DECL int archive_write_set_format_mtree(struct archive *); /* TODO: int archive_write_set_format_old_tar(struct archive *); */ __LA_DECL int archive_write_set_format_pax(struct archive *); __LA_DECL int archive_write_set_format_pax_restricted(struct archive *); ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write_set_format.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format.c,v 1.5 2007/06/22 05:47:00 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format.c,v 1.6 2008/08/31 07:21:46 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include @@ -44,6 +44,7 @@ { ARCHIVE_FORMAT_CPIO, archive_write_set_format_cpio }, { ARCHIVE_FORMAT_CPIO_SVR4_NOCRC, archive_write_set_format_cpio_newc }, { ARCHIVE_FORMAT_CPIO_POSIX, archive_write_set_format_cpio }, + { ARCHIVE_FORMAT_MTREE, archive_write_set_format_mtree }, { ARCHIVE_FORMAT_SHAR, archive_write_set_format_shar }, { ARCHIVE_FORMAT_SHAR_BASE, archive_write_set_format_shar }, { ARCHIVE_FORMAT_SHAR_DUMP, archive_write_set_format_shar_dump }, ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write_set_format_by_name.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_by_name.c,v 1.7 2007/06/22 05:47:00 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_by_name.c,v 1.8 2008/08/31 07:21:46 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include @@ -49,6 +49,7 @@ { "argnu", archive_write_set_format_ar_svr4 }, { "arsvr4", archive_write_set_format_ar_svr4 }, { "cpio", archive_write_set_format_cpio }, + { "mtree", archive_write_set_format_mtree }, { "newc", archive_write_set_format_cpio_newc }, { "odc", archive_write_set_format_cpio }, { "pax", archive_write_set_format_pax }, ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write_set_format_shar.c#2 (text+ko) ==== @@ -1,5 +1,6 @@ /*- * Copyright (c) 2003-2007 Tim Kientzle + * Copyright (c) 2008 Joerg Sonnenberger * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -24,12 +25,11 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_shar.c,v 1.19 2008/03/15 11:04:45 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_shar.c,v 1.20 2008/08/31 07:10:40 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include #endif -#include #include #ifdef HAVE_STDLIB_H #include @@ -49,13 +49,14 @@ struct archive_entry *entry; int has_data; char *last_dir; - char outbuff[1024]; - size_t outbytes; + + /* Line buffer for uuencoded dump format */ + char outbuff[45]; size_t outpos; - int uuavail; - char uubuffer[3]; + int wrote_header; struct archive_string work; + struct archive_string quoted_name; }; static int archive_write_shar_finish(struct archive_write *); @@ -67,23 +68,33 @@ static ssize_t archive_write_shar_data_uuencode(struct archive_write *, const void * buff, size_t); static int archive_write_shar_finish_entry(struct archive_write *); -static int shar_printf(struct archive_write *, const char *fmt, ...); -static void uuencode_group(struct shar *); -static int -shar_printf(struct archive_write *a, const char *fmt, ...) +/* + * Copy the given string to the buffer, quoting all shell meta characters + * found. + */ +static void +shar_quote(struct archive_string *buf, const char *str, int in_shell) { - struct shar *shar; - va_list ap; - int ret; + static const char meta[] = "\n \t'`\";&<>()|*?{}[]\\$!#^~"; + size_t len; - shar = (struct shar *)a->format_data; - va_start(ap, fmt); - archive_string_empty(&(shar->work)); - archive_string_vsprintf(&(shar->work), fmt, ap); - ret = ((a->compressor.write)(a, shar->work.s, strlen(shar->work.s))); - va_end(ap); - return (ret); + while (*str != '\0') { + if ((len = strcspn(str, meta)) != 0) { + archive_strncat(buf, str, len); + str += len; + } else if (*str == '\n') { + if (in_shell) + archive_strcat(buf, "\"\n\""); + else + archive_strcat(buf, "\\n"); + ++str; + } else { + archive_strappend_char(buf, '\\'); + archive_strappend_char(buf, *str); + ++str; + } + } } /* @@ -105,6 +116,8 @@ return (ARCHIVE_FATAL); } memset(shar, 0, sizeof(*shar)); + archive_string_init(&shar->work); + archive_string_init(&shar->quoted_name); a->format_data = shar; a->pad_uncompressed = 0; @@ -146,16 +159,11 @@ const char *name; char *p, *pp; struct shar *shar; - int ret; shar = (struct shar *)a->format_data; if (!shar->wrote_header) { - ret = shar_printf(a, "#!/bin/sh\n"); - if (ret != ARCHIVE_OK) - return (ret); - ret = shar_printf(a, "# This is a shell archive\n"); - if (ret != ARCHIVE_OK) - return (ret); + archive_strcat(&shar->work, "#!/bin/sh\n"); + archive_strcat(&shar->work, "# This is a shell archive\n"); shar->wrote_header = 1; } @@ -192,10 +200,11 @@ } } + archive_string_empty(&shar->quoted_name); + shar_quote(&shar->quoted_name, name, 1); + /* Stock preparation for all file types. */ - ret = shar_printf(a, "echo x %s\n", name); - if (ret != ARCHIVE_OK) - return (ret); + archive_string_sprintf(&shar->work, "echo x %s\n", shar->quoted_name.s); if (archive_entry_filetype(entry) != AE_IFDIR) { /* Try to create the dir. */ @@ -210,12 +219,10 @@ /* Don't try to "mkdir ." */ free(p); } else if (shar->last_dir == NULL) { - ret = shar_printf(a, - "mkdir -p %s > /dev/null 2>&1\n", p); - if (ret != ARCHIVE_OK) { - free(p); - return (ret); - } + archive_strcat(&shar->work, "mkdir -p "); + shar_quote(&shar->work, p, 1); + archive_strcat(&shar->work, + " > /dev/null 2>&1\n"); shar->last_dir = p; } else if (strcmp(p, shar->last_dir) == 0) { /* We've already created this exact dir. */ @@ -225,13 +232,10 @@ /* We've already created a subdir. */ free(p); } else { - ret = shar_printf(a, - "mkdir -p %s > /dev/null 2>&1\n", p); - if (ret != ARCHIVE_OK) { - free(p); - return (ret); - } - free(shar->last_dir); + archive_strcat(&shar->work, "mkdir -p "); + shar_quote(&shar->work, p, 1); + archive_strcat(&shar->work, + " > /dev/null 2>&1\n"); shar->last_dir = p; } } else { @@ -242,51 +246,47 @@ /* Handle file-type specific issues. */ shar->has_data = 0; if ((linkname = archive_entry_hardlink(entry)) != NULL) { - ret = shar_printf(a, "ln -f %s %s\n", linkname, name); - if (ret != ARCHIVE_OK) - return (ret); + archive_strcat(&shar->work, "ln -f "); + shar_quote(&shar->work, linkname, 1); + archive_string_sprintf(&shar->work, " %s\n", + shar->quoted_name.s); } else if ((linkname = archive_entry_symlink(entry)) != NULL) { - ret = shar_printf(a, "ln -fs %s %s\n", linkname, name); - if (ret != ARCHIVE_OK) - return (ret); + archive_strcat(&shar->work, "ln -fs "); + shar_quote(&shar->work, linkname, 1); + archive_string_sprintf(&shar->work, " %s\n", + shar->quoted_name.s); } else { switch(archive_entry_filetype(entry)) { case AE_IFREG: if (archive_entry_size(entry) == 0) { /* More portable than "touch." */ - ret = shar_printf(a, "test -e \"%s\" || :> \"%s\"\n", name, name); - if (ret != ARCHIVE_OK) - return (ret); + archive_string_sprintf(&shar->work, + "test -e \"%s\" || :> \"%s\"\n", + shar->quoted_name.s, shar->quoted_name.s); } else { if (shar->dump) { - ret = shar_printf(a, - "uudecode -o %s << 'SHAR_END'\n", - name); - if (ret != ARCHIVE_OK) - return (ret); - ret = shar_printf(a, "begin %o %s\n", - archive_entry_mode(entry) & 0777, - name); - if (ret != ARCHIVE_OK) - return (ret); + archive_string_sprintf(&shar->work, + "uudecode -p > %s << 'SHAR_END'\n", + shar->quoted_name.s); + archive_string_sprintf(&shar->work, + "begin %o ", + archive_entry_mode(entry) & 0777); + shar_quote(&shar->work, name, 0); + archive_strcat(&shar->work, "\n"); } else { - ret = shar_printf(a, + archive_string_sprintf(&shar->work, "sed 's/^X//' > %s << 'SHAR_END'\n", - name); - if (ret != ARCHIVE_OK) - return (ret); + shar->quoted_name.s); } shar->has_data = 1; shar->end_of_line = 1; shar->outpos = 0; - shar->outbytes = 0; } break; case AE_IFDIR: - ret = shar_printf(a, "mkdir -p %s > /dev/null 2>&1\n", - name); - if (ret != ARCHIVE_OK) - return (ret); + archive_string_sprintf(&shar->work, + "mkdir -p %s > /dev/null 2>&1\n", + shar->quoted_name.s); /* Record that we just created this directory. */ if (shar->last_dir != NULL) free(shar->last_dir); @@ -302,23 +302,20 @@ */ break; case AE_IFIFO: - ret = shar_printf(a, "mkfifo %s\n", name); - if (ret != ARCHIVE_OK) - return (ret); + archive_string_sprintf(&shar->work, + "mkfifo %s\n", shar->quoted_name.s); break; case AE_IFCHR: - ret = shar_printf(a, "mknod %s c %d %d\n", name, + archive_string_sprintf(&shar->work, + "mknod %s c %d %d\n", shar->quoted_name.s, archive_entry_rdevmajor(entry), archive_entry_rdevminor(entry)); - if (ret != ARCHIVE_OK) - return (ret); break; case AE_IFBLK: - ret = shar_printf(a, "mknod %s b %d %d\n", name, + archive_string_sprintf(&shar->work, + "mknod %s b %d %d\n", shar->quoted_name.s, archive_entry_rdevmajor(entry), archive_entry_rdevminor(entry)); - if (ret != ARCHIVE_OK) - return (ret); break; default: return (ARCHIVE_WARN); @@ -328,69 +325,119 @@ return (ARCHIVE_OK); } -/* XXX TODO: This could be more efficient XXX */ static ssize_t archive_write_shar_data_sed(struct archive_write *a, const void *buff, size_t n) { + static const size_t ensured = 65533; struct shar *shar; const char *src; + char *buf, *buf_end; int ret; size_t written = n; shar = (struct shar *)a->format_data; - if (!shar->has_data) + if (!shar->has_data || n == 0) return (0); src = (const char *)buff; - ret = ARCHIVE_OK; - shar->outpos = 0; - while (n-- > 0) { - if (shar->end_of_line) { - shar->outbuff[shar->outpos++] = 'X'; - shar->end_of_line = 0; + + /* + * ensure is the number of bytes in buffer before expanding the + * current character. Each operation writes the current character + * and optionally the start-of-new-line marker. This can happen + * twice before entering the loop, so make sure three additional + * bytes can be written. + */ + if (archive_string_ensure(&shar->work, ensured + 3) == NULL) + __archive_errx(1, "Out of memory"); + + if (shar->work.length > ensured) { + ret = (*a->compressor.write)(a, shar->work.s, + shar->work.length); + if (ret != ARCHIVE_OK) + return (ARCHIVE_FATAL); + archive_string_empty(&shar->work); + } + buf = shar->work.s + shar->work.length; + buf_end = shar->work.s + ensured; + + if (shar->end_of_line) { + *buf++ = 'X'; + shar->end_of_line = 0; + } + + while (n-- != 0) { + if ((*buf++ = *src++) == '\n') { + if (n == 0) + shar->end_of_line = 1; + else + *buf++ = 'X'; } - if (*src == '\n') - shar->end_of_line = 1; - shar->outbuff[shar->outpos++] = *src++; - if (shar->outpos > sizeof(shar->outbuff) - 2) { - ret = (a->compressor.write)(a, shar->outbuff, - shar->outpos); + if (buf >= buf_end) { + shar->work.length = buf - shar->work.s; + ret = (*a->compressor.write)(a, shar->work.s, + shar->work.length); if (ret != ARCHIVE_OK) - return (ret); - shar->outpos = 0; + return (ARCHIVE_FATAL); + archive_string_empty(&shar->work); + buf = shar->work.s; } } - if (shar->outpos > 0) - ret = (a->compressor.write)(a, shar->outbuff, shar->outpos); - if (ret != ARCHIVE_OK) - return (ret); + shar->work.length = buf - shar->work.s; + return (written); } #define UUENC(c) (((c)!=0) ? ((c) & 077) + ' ': '`') -/* XXX This could be a lot more efficient. XXX */ +static void +uuencode_group(const char _in[3], char out[4]) +{ + const unsigned char *in = (const unsigned char *)_in; + int t; + + t = (in[0] << 16) | (in[1] << 8) | in[2]; + out[0] = UUENC( 0x3f & (t >> 18) ); + out[1] = UUENC( 0x3f & (t >> 12) ); + out[2] = UUENC( 0x3f & (t >> 6) ); + out[3] = UUENC( 0x3f & t ); +} + static void -uuencode_group(struct shar *shar) +uuencode_line(struct shar *shar, const char *inbuf, size_t len) { - int t; + char tmp_buf[3], *buf; + size_t alloc_len; + + /* len <= 45 -> expanded to 60 + len byte + new line */ + alloc_len = shar->work.length + 62; + if (archive_string_ensure(&shar->work, alloc_len) == NULL) + __archive_errx(1, "Out of memory"); - t = 0; - if (shar->uuavail > 0) - t = 0xff0000 & (shar->uubuffer[0] << 16); - if (shar->uuavail > 1) - t |= 0x00ff00 & (shar->uubuffer[1] << 8); - if (shar->uuavail > 2) - t |= 0x0000ff & (shar->uubuffer[2]); - shar->outbuff[shar->outpos++] = UUENC( 0x3f & (t>>18) ); - shar->outbuff[shar->outpos++] = UUENC( 0x3f & (t>>12) ); - shar->outbuff[shar->outpos++] = UUENC( 0x3f & (t>>6) ); - shar->outbuff[shar->outpos++] = UUENC( 0x3f & (t) ); - shar->uuavail = 0; - shar->outbytes += shar->uuavail; - shar->outbuff[shar->outpos] = 0; + buf = shar->work.s + shar->work.length; + *buf++ = UUENC(len); + while (len >= 3) { + uuencode_group(inbuf, buf); + len -= 3; + inbuf += 3; + buf += 4; + } + if (len != 0) { + tmp_buf[0] = inbuf[0]; + if (len == 1) + tmp_buf[1] = '\0'; + else + tmp_buf[1] = inbuf[1]; + tmp_buf[2] = '\0'; + uuencode_group(inbuf, buf); + buf += 4; + } + *buf++ = '\n'; + if ((buf - shar->work.s) > (ptrdiff_t)(shar->work.length + 62)) + __archive_errx(1, "Buffer overflow"); + shar->work.length = buf - shar->work.s; } static ssize_t @@ -406,21 +453,39 @@ if (!shar->has_data) return (ARCHIVE_OK); src = (const char *)buff; - n = length; - while (n-- > 0) { - if (shar->uuavail == 3) - uuencode_group(shar); - if (shar->outpos >= 60) { - ret = shar_printf(a, "%c%s\n", UUENC(shar->outbytes), - shar->outbuff); - if (ret != ARCHIVE_OK) - return (ret); - shar->outpos = 0; - shar->outbytes = 0; + + if (shar->outpos != 0) { + n = 45 - shar->outpos; + if (n > length) + n = length; + memcpy(shar->outbuff + shar->outpos, src, n); + if (shar->outpos + n < 45) { + shar->outpos += n; + return length; } + uuencode_line(shar, shar->outbuff, 45); + src += n; + n = length - n; + } else { + n = length; + } - shar->uubuffer[shar->uuavail++] = *src++; - shar->outbytes++; + while (n >= 45) { + uuencode_line(shar, src, 45); + src += 45; + n -= 45; + + if (shar->work.length < 65536) + continue; + ret = (*a->compressor.write)(a, shar->work.s, + shar->work.length); + if (ret != ARCHIVE_OK) + return (ARCHIVE_FATAL); + archive_string_empty(&shar->work); + } + if (n != 0) { + memcpy(shar->outbuff, src, n); + shar->outpos = n; } return (length); } @@ -439,54 +504,43 @@ if (shar->dump) { /* Finish uuencoded data. */ if (shar->has_data) { - if (shar->uuavail > 0) - uuencode_group(shar); - if (shar->outpos > 0) { - ret = shar_printf(a, "%c%s\n", - UUENC(shar->outbytes), shar->outbuff); - if (ret != ARCHIVE_OK) - return (ret); - shar->outpos = 0; - shar->uuavail = 0; - shar->outbytes = 0; - } - ret = shar_printf(a, "%c\n", UUENC(0)); - if (ret != ARCHIVE_OK) - return (ret); - ret = shar_printf(a, "end\n", UUENC(0)); - if (ret != ARCHIVE_OK) - return (ret); - ret = shar_printf(a, "SHAR_END\n"); - if (ret != ARCHIVE_OK) - return (ret); + if (shar->outpos > 0) + uuencode_line(shar, shar->outbuff, + shar->outpos); + archive_strcat(&shar->work, "`\nend\n"); + archive_strcat(&shar->work, "SHAR_END\n"); } /* Restore file mode, owner, flags. */ /* * TODO: Don't immediately restore mode for * directories; defer that to end of script. */ - ret = shar_printf(a, "chmod %o %s\n", - archive_entry_mode(shar->entry) & 07777, - archive_entry_pathname(shar->entry)); - if (ret != ARCHIVE_OK) - return (ret); + archive_string_sprintf(&shar->work, "chmod %o ", + archive_entry_mode(shar->entry) & 07777); + shar_quote(&shar->work, archive_entry_pathname(shar->entry), 1); + archive_strcat(&shar->work, "\n"); u = archive_entry_uname(shar->entry); g = archive_entry_gname(shar->entry); if (u != NULL || g != NULL) { - ret = shar_printf(a, "chown %s%s%s %s\n", - (u != NULL) ? u : "", - (g != NULL) ? ":" : "", (g != NULL) ? g : "", - archive_entry_pathname(shar->entry)); - if (ret != ARCHIVE_OK) - return (ret); + archive_strcat(&shar->work, "chown "); + if (u != NULL) + shar_quote(&shar->work, u, 1); + if (g != NULL) { + archive_strcat(&shar->work, ":"); + shar_quote(&shar->work, g, 1); + } + shar_quote(&shar->work, + archive_entry_pathname(shar->entry), 1); + archive_strcat(&shar->work, "\n"); } if ((p = archive_entry_fflags_text(shar->entry)) != NULL) { - ret = shar_printf(a, "chflags %s %s\n", p, - archive_entry_pathname(shar->entry)); - if (ret != ARCHIVE_OK) - return (ret); + archive_string_sprintf(&shar->work, "chflags %s ", + p, archive_entry_pathname(shar->entry)); + shar_quote(&shar->work, + archive_entry_pathname(shar->entry), 1); + archive_strcat(&shar->work, "\n"); } /* TODO: restore ACLs */ @@ -494,20 +548,24 @@ } else { if (shar->has_data) { /* Finish sed-encoded data: ensure last line ends. */ - if (!shar->end_of_line) { - ret = shar_printf(a, "\n"); - if (ret != ARCHIVE_OK) - return (ret); - } - ret = shar_printf(a, "SHAR_END\n"); - if (ret != ARCHIVE_OK) - return (ret); + if (!shar->end_of_line) + archive_strappend_char(&shar->work, '\n'); + archive_strcat(&shar->work, "SHAR_END\n"); } } archive_entry_free(shar->entry); shar->entry = NULL; - return (0); + + if (shar->work.length < 65536) + return (ARCHIVE_OK); + + ret = (*a->compressor.write)(a, shar->work.s, shar->work.length); + if (ret != ARCHIVE_OK) + return (ARCHIVE_FATAL); + archive_string_empty(&shar->work); + + return (ARCHIVE_OK); } static int @@ -529,17 +587,22 @@ * shar format, then sets another format (which would invoke * shar_finish to free the format-specific data). */ - if (shar->wrote_header) { - ret = shar_printf(a, "exit\n"); - if (ret != ARCHIVE_OK) - return (ret); - /* Shar output is never padded. */ - archive_write_set_bytes_in_last_block(&a->archive, 1); - /* - * TODO: shar should also suppress padding of - * uncompressed data within gzip/bzip2 streams. - */ - } + if (shar->wrote_header == 0) + return (ARCHIVE_OK); + + archive_strcat(&shar->work, "exit\n"); + + ret = (*a->compressor.write)(a, shar->work.s, shar->work.length); + if (ret != ARCHIVE_OK) + return (ARCHIVE_FATAL); + + /* Shar output is never padded. */ + archive_write_set_bytes_in_last_block(&a->archive, 1); + /* + * TODO: shar should also suppress padding of + * uncompressed data within gzip/bzip2 streams. + */ + return (ARCHIVE_OK); } @@ -549,11 +612,13 @@ struct shar *shar; shar = (struct shar *)a->format_data; - if (shar->entry != NULL) - archive_entry_free(shar->entry); - if (shar->last_dir != NULL) - free(shar->last_dir); + if (shar == NULL) + return (ARCHIVE_OK); + + archive_entry_free(shar->entry); + free(shar->last_dir); archive_string_free(&(shar->work)); + archive_string_free(&(shar->quoted_name)); free(shar); a->format_data = NULL; return (ARCHIVE_OK); ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/main.c#3 (text+ko) ==== @@ -40,10 +40,12 @@ * The next few lines are the only differences. */ #undef PROGRAM /* Testing a library, not a program. */ +#define LIBRARY "libarchive" #define ENVBASE "LIBARCHIVE" /* Prefix for environment variables. */ #define EXTRA_DUMP(x) archive_error_string((struct archive *)(x)) #define EXTRA_VERSION archive_version() -__FBSDID("$FreeBSD: src/lib/libarchive/test/main.c,v 1.13 2008/06/15 10:35:22 kientzle Exp $"); +#define KNOWNREF "test_compat_gtar_1.tgz.uu" +__FBSDID("$FreeBSD: src/lib/libarchive/test/main.c,v 1.14 2008/08/31 07:06:02 kientzle Exp $"); /* * "list.h" is simply created by "grep DEFINE_TEST"; it has @@ -841,7 +843,53 @@ fclose(in); } +static char * +get_refdir(const char *tmpdir) +{ + char *ref, *p; + /* Get the current dir. */ + systemf("/bin/pwd > %s/refdir", tmpdir); + ref = slurpfile(NULL, "%s/refdir", tmpdir); + p = ref + strlen(ref); + while (p[-1] == '\n') { + --p; + *p = '\0'; + } + systemf("rm %s/refdir", tmpdir); + /* Look for a known file. */ + p = slurpfile(NULL, "%s/%s", ref, KNOWNREF); + if (p != NULL) { + free(p); + return (ref); + } + p = slurpfile(NULL, "%s/test/%s", ref, KNOWNREF); + if (p != NULL) { + free(p); + p = malloc(strlen(ref) + strlen("/test") + 1); + strcpy(p, ref); + strcat(p, "/test"); + free(ref); + return (p); + } + p = slurpfile(NULL, "%s/%s/test/%s", ref, LIBRARY, KNOWNREF); + if (p != NULL) { + free(p); + p = malloc(strlen(ref) + 1 + strlen(LIBRARY) + strlen("/test") + 1); + strcpy(p, ref); + strcat(p, "/"); + strcat(p, LIBRARY); + strcat(p, "/test"); + free(ref); + return (p); + } + printf("Unable to locate known reference file %s\n", KNOWNREF); + printf(" Checked directory %s\n", ref); + printf(" Checked directory %s/test\n", ref); + printf(" Checked directory %s/%s/test\n", ref, LIBRARY); + exit(1); +} + int main(int argc, char **argv) { static const int limit = sizeof(tests) / sizeof(tests[0]); @@ -940,18 +988,11 @@ /* * If the user didn't specify a directory for locating - * reference files, use the current directory for that. + * reference files, try to find the reference files in + * the "usual places." */ - if (refdir == NULL) { - systemf("/bin/pwd > %s/refdir", tmpdir); - refdir = refdir_alloc = slurpfile(NULL, "%s/refdir", tmpdir); - p = refdir + strlen(refdir); - while (p[-1] == '\n') { - --p; - *p = '\0'; - } - systemf("rm %s/refdir", tmpdir); - } + if (refdir == NULL) + refdir = refdir_alloc = get_refdir(tmpdir); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Sep 1 05:40:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 467B51065672; Mon, 1 Sep 2008 05: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 0A35A106566C for ; Mon, 1 Sep 2008 05:40:24 +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 EED2B8FC1F for ; Mon, 1 Sep 2008 05:40:23 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m815eNrv086191 for ; Mon, 1 Sep 2008 05:40:23 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m815eM2V086189 for perforce@freebsd.org; Mon, 1 Sep 2008 05:40:22 GMT (envelope-from nwhitehorn@freebsd.org) Date: Mon, 1 Sep 2008 05:40:22 GMT Message-Id: <200809010540.m815eM2V086189@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 148968 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Sep 2008 05:40:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=148968 Change 148968 by nwhitehorn@nwhitehorn_trantor on 2008/09/01 05:39:38 Fix WITNESS builds for good. This sacrifices some of our KVA space, and there are still some LORs, but my machine will now boot multiuser with WITNESS and INVARIANTS enabled. This is also my first G5 kernel build built on the G5... Affected files ... .. //depot/projects/ppc-g5/sys/powerpc/aim/mmu_oea64.c#4 edit Differences ... ==== //depot/projects/ppc-g5/sys/powerpc/aim/mmu_oea64.c#4 (text+ko) ==== @@ -193,20 +193,19 @@ SYNC(); -#if 0 +#if 1 /* * CPU documentation says that tlbie takes the VPN, not the - * VA. However, my attempts to compute the VPN don't work, and - * all implementations I have seen pass tlbie the VA, so disable - * this for now. + * VA. I think the code below does this correctly. We will see. */ - vpn = (uint64_t)((va & ADDR_PIDX) >> ADDR_PIDX_SHFT); + vpn = (uint64_t)(va & ADDR_PIDX); if (pmap != NULL) vpn |= ((uint64_t)(va_to_sr(pmap->pm_sr,va) & SR_VSID_MASK) - << 16); + << 28); +#else + vpn = va; #endif - vpn = va; vpn_hi = (uint32_t)(vpn >> 32); vpn_lo = (uint32_t)vpn; @@ -305,6 +304,9 @@ uma_zone_t moea64_upvo_zone; /* zone for pvo entries for unmanaged pages */ uma_zone_t moea64_mpvo_zone; /* zone for pvo entries for managed pages */ +vm_offset_t pvo_allocator_start; +vm_offset_t pvo_allocator_end; + #define BPVO_POOL_SIZE 327680 static struct pvo_entry *moea64_bpvo_pool; static int moea64_bpvo_pool_index = 0; @@ -352,7 +354,7 @@ * PVO calls. */ static int moea64_pvo_enter(pmap_t, uma_zone_t, struct pvo_head *, - vm_offset_t, vm_offset_t, uint64_t, int); + vm_offset_t, vm_offset_t, uint64_t, int, int); static void moea64_pvo_remove(struct pvo_entry *, int); static struct pvo_entry *moea64_pvo_find_va(pmap_t, vm_offset_t, int *); static struct lpte *moea64_pvo_to_pte(const struct pvo_entry *, int); @@ -971,6 +973,14 @@ virtual_end = VM_MAX_KERNEL_ADDRESS; /* + * Allocate some stupid buffer regions. + */ + + pvo_allocator_start = virtual_avail; + virtual_avail += SEGMENT_LENGTH/4; + pvo_allocator_end = virtual_avail; + + /* * Allocate some things for page zeroing */ @@ -1123,10 +1133,9 @@ moea64_scratchpage_pte[which]->pte_lo = moea64_scratchpage_pvo[which]->pvo_pte.lpte.pte_lo; + moea64_scratchpage_pte[which]->pte_hi |= LPTE_VALID; - EIEIO(); - TLBIE(kernel_pmap, moea64_scratchpage_va[which]); } @@ -1253,7 +1262,7 @@ pvo_flags |= PVO_FAKE; error = moea64_pvo_enter(pmap, zone, pvo_head, va, VM_PAGE_TO_PHYS(m), - pte_lo, pvo_flags); + pte_lo, pvo_flags, 0); if (pmap == kernel_pmap) TLBIE(pmap, va); @@ -1383,6 +1392,66 @@ return (m); } +static void * +moea64_uma_page_alloc(uma_zone_t zone, int bytes, u_int8_t *flags, int wait) +{ + /* + * This entire routine is a horrible hack to avoid bothering kmem + * for new KVA addresses. Because this can get called from inside + * kmem allocation routines, calling kmem for a new address here + * can lead to multiply locking non-recursive mutexes. + */ + static vm_pindex_t color; + vm_offset_t va; + + vm_page_t m; + int pflags, needed_lock; + + *flags = UMA_SLAB_PRIV; + needed_lock = !PMAP_LOCKED(kernel_pmap); + + if (needed_lock) + PMAP_LOCK(kernel_pmap); + + if ((wait & (M_NOWAIT|M_USE_RESERVE)) == M_NOWAIT) + pflags = VM_ALLOC_INTERRUPT | VM_ALLOC_WIRED; + else + pflags = VM_ALLOC_SYSTEM | VM_ALLOC_WIRED; + if (wait & M_ZERO) + pflags |= VM_ALLOC_ZERO; + + for (;;) { + m = vm_page_alloc(NULL, color++, pflags | VM_ALLOC_NOOBJ); + if (m == NULL) { + if (wait & M_NOWAIT) + return (NULL); + VM_WAIT; + } else + break; + } + + va = pvo_allocator_start; + pvo_allocator_start += PAGE_SIZE; + + if (pvo_allocator_start >= pvo_allocator_end) + panic("Ran out of PVO allocator buffer space!"); + + /* Now call pvo_enter in recursive mode */ + moea64_pvo_enter(kernel_pmap, moea64_upvo_zone, + &moea64_pvo_kunmanaged, va, VM_PAGE_TO_PHYS(m), LPTE_M, + PVO_WIRED | PVO_BOOTSTRAP, 1); + + TLBIE(kernel_pmap, va); + + if (needed_lock) + PMAP_UNLOCK(kernel_pmap); + + if ((wait & M_ZERO) && (m->flags & PG_ZERO) == 0) + bzero((void *)va, PAGE_SIZE); + + return (void *)va; +} + void moea64_init(mmu_t mmu) { @@ -1395,6 +1464,12 @@ moea64_mpvo_zone = uma_zcreate("MPVO entry", sizeof(struct pvo_entry), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM | UMA_ZONE_NOFREE); + + if (!hw_direct_map) { + uma_zone_set_allocf(moea64_upvo_zone,moea64_uma_page_alloc); + uma_zone_set_allocf(moea64_mpvo_zone,moea64_uma_page_alloc); + } + moea64_initialized = TRUE; } @@ -1518,7 +1593,7 @@ PMAP_LOCK(kernel_pmap); error = moea64_pvo_enter(kernel_pmap, moea64_upvo_zone, &moea64_pvo_kunmanaged, va, pa, pte_lo, - PVO_WIRED | VM_PROT_EXECUTE); + PVO_WIRED | VM_PROT_EXECUTE, 0); TLBIE(kernel_pmap, va); @@ -1641,7 +1716,6 @@ int i, mask; u_int entropy; - KASSERT((int)pmap < VM_MIN_KERNEL_ADDRESS, ("moea64_pinit: virt pmap")); PMAP_LOCK_INIT(pmap); entropy = 0; @@ -1914,7 +1988,7 @@ static int 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) + vm_offset_t va, vm_offset_t pa, uint64_t pte_lo, int flags, int recurse) { struct pvo_entry *pvo; u_int sr; @@ -1934,7 +2008,10 @@ moea64_pvo_enter_calls++; first = 0; - bootstrap = 0; + bootstrap = (flags & PVO_BOOTSTRAP); + + if (!moea64_initialized) + bootstrap = 1; /* * Compute the PTE Group index. @@ -1947,14 +2024,16 @@ * Remove any existing mapping for this page. Reuse the pvo entry if * there is a mapping. */ - LOCK_TABLE(); + if (!recurse) + LOCK_TABLE(); LIST_FOREACH(pvo, &moea64_pvo_table[ptegidx], pvo_olink) { if (pvo->pvo_pmap == pm && PVO_VADDR(pvo) == va) { if ((pvo->pvo_pte.lpte.pte_lo & LPTE_RPGN) == pa && (pvo->pvo_pte.lpte.pte_lo & LPTE_PP) == (pte_lo & LPTE_PP)) { - UNLOCK_TABLE(); + if (!recurse) + UNLOCK_TABLE(); return (0); } moea64_pvo_remove(pvo, -1); @@ -1965,9 +2044,7 @@ /* * If we aren't overwriting a mapping, try to allocate. */ - if (moea64_initialized && !mtx_recursed(&moea64_table_mutex)) { - pvo = uma_zalloc(zone, M_NOWAIT); - } else { + if (bootstrap) { if (moea64_bpvo_pool_index >= BPVO_POOL_SIZE) { panic("moea64_enter: bpvo pool exhausted, %d, %d, %d", moea64_bpvo_pool_index, BPVO_POOL_SIZE, @@ -1976,10 +2053,13 @@ pvo = &moea64_bpvo_pool[moea64_bpvo_pool_index]; moea64_bpvo_pool_index++; bootstrap = 1; + } else { + pvo = uma_zalloc(zone, M_NOWAIT); } if (pvo == NULL) { - UNLOCK_TABLE(); + if (!recurse) + UNLOCK_TABLE(); return (ENOMEM); } @@ -2024,7 +2104,9 @@ panic("moea64_pvo_enter: overflow"); moea64_pte_overflow++; } - UNLOCK_TABLE(); + + if (!recurse) + UNLOCK_TABLE(); return (first ? ENOENT : 0); } From owner-p4-projects@FreeBSD.ORG Mon Sep 1 09:20:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E5C81065676; Mon, 1 Sep 2008 09:20: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 326FC1065672 for ; Mon, 1 Sep 2008 09:20:44 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0BB198FC24 for ; Mon, 1 Sep 2008 09:20:44 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m819KhGa018478 for ; Mon, 1 Sep 2008 09:20:43 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m819KhQa018476 for perforce@freebsd.org; Mon, 1 Sep 2008 09:20:43 GMT (envelope-from trasz@freebsd.org) Date: Mon, 1 Sep 2008 09:20:43 GMT Message-Id: <200809010920.m819KhQa018476@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 148974 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Sep 2008 09:20:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=148974 Change 148974 by trasz@trasz_traszkan on 2008/09/01 09:20:15 kern/vfs_default.c wasn't really modified; integrate. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_default.c#5 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_default.c#5 (text+ko) ==== @@ -513,7 +513,7 @@ return (error); } - + /* XXX Needs good comment and more info in the manpage (VOP_GETPAGES(9)). */ int vop_stdgetpages(ap) From owner-p4-projects@FreeBSD.ORG Mon Sep 1 11:22:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E05771065680; Mon, 1 Sep 2008 11:22:47 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A2DE4106567C for ; Mon, 1 Sep 2008 11:22:47 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 930E48FC1E for ; Mon, 1 Sep 2008 11:22:47 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m81BMlho030918 for ; Mon, 1 Sep 2008 11:22:47 GMT (envelope-from konrad@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m81BMlRF030916 for perforce@freebsd.org; Mon, 1 Sep 2008 11:22:47 GMT (envelope-from konrad@FreeBSD.org) Date: Mon, 1 Sep 2008 11:22:47 GMT Message-Id: <200809011122.m81BMlRF030916@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to konrad@FreeBSD.org using -f From: Konrad Jankowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 148978 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Sep 2008 11:22:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=148978 Change 148978 by konrad@vspredator on 2008/09/01 11:22:34 Colldef with proper expansion support added. This is not a production version. It will go through a process of space optimisation. Affected files ... .. //depot/projects/soc2008/konrad_collation/colldef.apple/collate.h#7 edit .. //depot/projects/soc2008/konrad_collation/colldef.apple/parse.y#9 edit Differences ... ==== //depot/projects/soc2008/konrad_collation/colldef.apple/collate.h#7 (text+ko) ==== @@ -33,6 +33,8 @@ #include #ifndef __LIBC__ #include +#else +#include /* for ENCODING_LEN */ #endif /* !__LIBC__ */ #include @@ -46,6 +48,7 @@ #define COLLATE_VERSION1_1A "1.1A\n" #define COLLATE_VERSION1_2 "1.2\n" #define COLLATE_VERSION1_3 "1.3\n" +#define COLLATE_VERSION1_4 "1.4\n" /* see discussion in string/FreeBSD/strxfrm for this value */ #define COLLATE_MAX_PRIORITY ((1 << 24) - 1) @@ -63,7 +66,7 @@ struct __collate_st_info { __uint8_t directive[COLL_WEIGHTS_MAX]; __uint8_t flags; -#if __DARWIN_BYTE_ORDER == __DARWIN_LITTLE_ENDIAN +#if _BYTE_ORDER == _LITTLE_ENDIAN unsigned int directive_count:4; unsigned int chain_max_len:4; #else @@ -76,10 +79,18 @@ __int32_t large_pri_count; }; +struct weight_map_struct +{ + unsigned int v:4; +}; + +#define COLL_WEIGHTS_REAL (COLL_WEIGHTS_MAX * 4) struct __collate_st_char_pri { - __int32_t pri[COLL_WEIGHTS_MAX]; + struct weight_map_struct map[COLL_WEIGHTS_MAX]; + __int32_t pri[COLL_WEIGHTS_REAL]; }; struct __collate_st_chain_pri { + struct weight_map_struct map[COLL_WEIGHTS_MAX]; wchar_t str[STR_LEN]; __int32_t pri[COLL_WEIGHTS_MAX]; }; @@ -92,29 +103,34 @@ wchar_t str[STR_LEN]; }; -#ifndef __LIBC__ +#ifdef __LIBC__ +struct __locale_st_collate { + char __encoding[ENCODING_LEN + 1]; + struct __collate_st_info __info; + struct __collate_st_subst *__substitute_table[COLL_WEIGHTS_MAX]; + struct __collate_st_chain_pri *__chain_pri_table; + struct __collate_st_large_char_pri *__large_char_pri_table; + struct __collate_st_char_pri __char_pri_table[UCHAR_MAX + 1]; +}; +#endif + extern int __collate_load_error; extern int __collate_substitute_nontrivial; -#define __collate_char_pri_table (*__collate_char_pri_table_ptr) -extern struct __collate_st_char_pri __collate_char_pri_table[UCHAR_MAX + 1]; -extern struct __collate_st_chain_pri *__collate_chain_pri_table; -extern __int32_t *__collate_chain_equiv_table; -extern struct __collate_st_info __collate_info; -#endif /* !__LIBC__ */ +extern struct __locale_st_collate *__collate_data; __BEGIN_DECLS #ifdef __LIBC__ -wchar_t *__collate_mbstowcs(const char *, locale_t); +wchar_t *__collate_mbstowcs(const char *); wchar_t *__collate_wcsdup(const wchar_t *); -wchar_t *__collate_substitute(const wchar_t *, int, locale_t); -int __collate_load_tables(const char *, locale_t); -void __collate_lookup_l(const wchar_t *, int *, int *, int *, locale_t); -void __collate_lookup_which(const wchar_t *, int *, int *, int, locale_t); -void __collate_xfrm(const wchar_t *, wchar_t **, locale_t); -int __collate_range_cmp(wchar_t, wchar_t, locale_t); -size_t __collate_collating_symbol(wchar_t *, size_t, const char *, size_t, mbstate_t *, locale_t); -int __collate_equiv_class(const char *, size_t, mbstate_t *, locale_t); -size_t __collate_equiv_match(int, wchar_t *, size_t, wchar_t, const char *, size_t, mbstate_t *, size_t *, locale_t); +wchar_t *__collate_substitute(const wchar_t *, int); +int __collate_load_tables(const char *); +void __collate_lookup_l(const wchar_t *, int *, int *, int *); +void __collate_lookup_which(const wchar_t *, int *, int *, int); +void __collate_xfrm(const wchar_t *, wchar_t **); +int __collate_range_cmp(wchar_t, wchar_t); +size_t __collate_collating_symbol(wchar_t *, size_t, const char *, size_t, mbstate_t *); +int __collate_equiv_class(const char *, size_t, mbstate_t *); +size_t __collate_equiv_match(int, wchar_t *, size_t, wchar_t, const char *, size_t, mbstate_t *, size_t *); #else /* !__LIBC__ */ void __collate_lookup(const unsigned char *, int *, int *, int *); #endif /* __LIBC__ */ ==== //depot/projects/soc2008/konrad_collation/colldef.apple/parse.y#9 (text+ko) ==== @@ -29,6 +29,7 @@ #include __FBSDID("$FreeBSD: src/usr.bin/colldef/parse.y,v 1.31 2002/10/16 12:56:22 charnier Exp $"); +#include #include #include #include @@ -89,12 +90,19 @@ static DB *chaindb; static int nchain = 0; static DB *stringdb; -static struct symbol prev_weight_table[COLL_WEIGHTS_MAX]; -static struct symbol prev2_weight_table[COLL_WEIGHTS_MAX]; -static struct symbol weight_table[COLL_WEIGHTS_MAX]; + +static struct symbol prev_weight_table[COLL_WEIGHTS_REAL]; +static struct symbol prev2_weight_table[COLL_WEIGHTS_REAL]; +static struct symbol weight_table[COLL_WEIGHTS_REAL]; + +struct weight_map_struct weight_map[COLL_WEIGHTS_MAX]; +struct weight_map_struct prev_weight_map[COLL_WEIGHTS_MAX]; +struct weight_map_struct prev2_weight_map[COLL_WEIGHTS_MAX]; + static int prev_line = LINE_NONE; static struct symbol *prev_elem; static int weight_index = 0; +static int map_idx = 0; static int allow_ellipsis = 0; static struct symbol sym_ellipsis = {SYMBOL_ELLIPSIS, PRI_UNDEFINED, L"", {0}}; static struct symbol sym_ignore = {SYMBOL_IGNORE, PRI_IGNORE, L"", {0}}; @@ -113,7 +121,6 @@ #endif struct __collate_st_info info = {{DIRECTIVE_FORWARD, DIRECTIVE_FORWARD}, 0, 0, 0, {PRI_UNDEFINED, PRI_UNDEFINED}, {PRI_UNDEFINED}, 0, 0}; -/* Some of the code expects COLL_WEIGHTS_MAX == 2 */ int directive_count = COLL_WEIGHTS_MAX; const char *out_file = "LC_COLLATE"; @@ -209,8 +216,10 @@ /* we don't set the byte order of t->val, since we * need it for sorting */ t->val = cval; - for(z = 0; z < directive_count; z++) + for(z = 0; z < COLL_WEIGHTS_REAL; z++) t->pri.pri[z] = htonl(p->pri[z]); + for (z = 0; z < directive_count; z++) + t->pri.map[z].v = p->map[z].v; t++; flags = R_NEXT; } @@ -232,17 +241,20 @@ int flags = R_FIRST; DBT key, val; struct symbol *v; + while((ret = charmapdb->seq(charmapdb, &key, &val, flags)) == 0) { memcpy(&v, val.data, sizeof(struct symbol *)); switch(v->type) { case SYMBOL_CHAR: { struct __collate_st_char_pri *p = haspri(v->u.wc); + if (!p || p->pri[0] == PRI_UNDEFINED) warnx("<%s> was not defined", showwcs((const wchar_t *)key.data, key.size / sizeof(wchar_t))); break; } case SYMBOL_CHAIN: { struct __collate_st_chain_pri *p = getchain(v->u.str, EXISTS); + if (p->pri[0] == PRI_UNDEFINED) warnx("<%s> was not defined", showwcs((const wchar_t *)key.data, key.size / sizeof(wchar_t))); break; @@ -307,34 +319,34 @@ err(EX_UNAVAILABLE, "can't open destination file %s", out_file); - strcpy(__collate_version, COLLATE_VERSION1_3); + strcpy(__collate_version, COLLATE_VERSION1_4); if (fwrite(__collate_version, sizeof(__collate_version), 1, fp) != 1) err(EX_IOERR, "IO error writting collate version to destination file %s", out_file); -#if __DARWIN_BYTE_ORDER == __DARWIN_LITTLE_ENDIAN +#if _BYTE_ORDER == _LITTLE_ENDIAN for(z = 0; z < directive_count; z++) { info.undef_pri[z] = htonl(info.undef_pri[z]); info.subst_count[z] = htonl(info.subst_count[z]); } info.chain_count = htonl(info.chain_count); info.large_pri_count = htonl(info.large_pri_count); -#endif /* __DARWIN_BYTE_ORDER == __DARWIN_LITTLE_ENDIAN */ +#endif /* _BYTE_ORDER == _LITTLE_ENDIAN */ if (fwrite(&info, sizeof(info), 1, fp) != 1) err(EX_IOERR, "IO error writting collate info to destination file %s", out_file); -#if __DARWIN_BYTE_ORDER == __DARWIN_LITTLE_ENDIAN +#if _BYTE_ORDER == _LITTLE_ENDIAN { int i, z; struct __collate_st_char_pri *p = __collate_char_pri_table; for(i = UCHAR_MAX + 1; i-- > 0; p++) { - for(z = 0; z < directive_count; z++) + for(z = 0; z < COLL_WEIGHTS_REAL; z++) p->pri[z] = htonl(p->pri[z]); } } -#endif /* __DARWIN_BYTE_ORDER == __DARWIN_LITTLE_ENDIAN */ +#endif /* _BYTE_ORDER == _LITTLE_ENDIAN */ if (fwrite(__collate_char_pri_table, sizeof(__collate_char_pri_table), 1, fp) != 1) err(EX_IOERR, @@ -342,14 +354,15 @@ out_file); for(z = 0; z < directive_count; z++) { if (nsubst[z] > 0) { -#if __DARWIN_BYTE_ORDER == __DARWIN_LITTLE_ENDIAN +#if _BYTE_ORDER == _LITTLE_ENDIAN struct __collate_st_subst *t = __collate_substitute_table[z]; int i; + for(i = nsubst[z]; i > 0; i--) { t->val = htonl(t->val); t++; } -#endif /* __DARWIN_BYTE_ORDER == __DARWIN_LITTLE_ENDIAN */ +#endif /* _BYTE_ORDER == _LITTLE_ENDIAN */ if ((int)fwrite(__collate_substitute_table[z], sizeof(struct __collate_st_subst), nsubst[z], fp) != nsubst[z]) err(EX_IOERR, "IO error writting large substprim table %d to destination file %s", @@ -357,7 +370,7 @@ } } if (nchain > 0) { -#if __DARWIN_BYTE_ORDER == __DARWIN_LITTLE_ENDIAN +#if _BYTE_ORDER == _LITTLE_ENDIAN int i, j, z; struct __collate_st_chain_pri *p = __collate_chain_pri_table; wchar_t *w; @@ -368,7 +381,7 @@ for(z = 0; z < directive_count; z++) p->pri[z] = htonl(p->pri[z]); } -#endif /* __DARWIN_BYTE_ORDER == __DARWIN_LITTLE_ENDIAN */ +#endif /* _BYTE_ORDER == _LITTLE_ENDIAN */ if (fwrite(__collate_chain_pri_table, sizeof(*__collate_chain_pri_table), nchain, fp) != (size_t)nchain) @@ -378,14 +391,14 @@ } if (nlargemap > 0) { -#if __DARWIN_BYTE_ORDER == __DARWIN_LITTLE_ENDIAN +#if _BYTE_ORDER == _LITTLE_ENDIAN struct __collate_st_large_char_pri *t = __collate_large_char_pri_table; int i; for(i = 0; i < nlargemap; i++) { t->val = htonl(t->val); t++; } -#endif /* __DARWIN_BYTE_ORDER == __DARWIN_LITTLE_ENDIAN */ +#endif /* _BYTE_ORDER == _LITTLE_ENDIAN */ if ((int)fwrite(__collate_large_char_pri_table, sizeof(struct __collate_st_large_char_pri), nlargemap, fp) != nlargemap) err(EX_IOERR, "IO error writting large pri tables to destination file %s", @@ -396,7 +409,6 @@ err(EX_IOERR, "IO error closing destination file %s", out_file); #ifdef COLLATE_DEBUG - /* Do it first, before conversion to network byte order. */ if (debug) collate_print_tables(); #endif @@ -511,7 +523,7 @@ | ELEM { struct symbol *s = getsymbol($1, EXISTS); -#ifdef VSDEBUG +#ifdef VSDEBUG2 printf("\n%s(%d) ", showwcs(s->name, CHARMAP_SYMBOL_LEN), s->u.wc); #endif if (s->val != PRI_UNDEFINED) @@ -540,6 +552,7 @@ s->val = prim_pri; prim_pri = s->val + 1; weight_index = 0; + map_idx = 0; } weights2 { int i; struct symbol *s = getsymbol($1, EXISTS); @@ -547,16 +560,21 @@ if (weight_index != 0) yyerror("Can't specify weights for collating symbol <%s>", showwcs($1, CHARMAP_SYMBOL_LEN)); } else if (weight_index == 0) { - for(i = 0; i < directive_count; i++) + for(i = 0; i < directive_count; i++) { weight_table[i] = *s; - } else if (weight_index != directive_count) + /* Store the end, inclusive. */ + weight_map[i].v = i; + } + } else if (map_idx != directive_count) yyerror("Not enough weights specified"); memcpy(prev_weight_table, weight_table, sizeof(weight_table)); + memcpy(prev_weight_map, weight_map, sizeof(weight_map)); prev_line = LINE_NORMAL; prev_elem = s; } - | ELLIPSIS { weight_index = 0; allow_ellipsis = 1; } weights { + | ELLIPSIS { weight_index = 0; allow_ellipsis = 1; map_idx = 0; } weights { int i; + if (prev_line == LINE_ELLIPSIS) yyerror("Illegal sequential ellipsis lines"); if (prev_line == LINE_UNDEFINED) @@ -564,11 +582,13 @@ if (prev_line == LINE_NONE) yyerror("Ellipsis line must follow a collating identifier lines"); if (weight_index == 0) { - for(i = 0; i < directive_count; i++) + for(i = 0; i < directive_count; i++) { weight_table[i] = sym_ellipsis; - } else if (weight_index != directive_count) + weight_map[i].v = i; + } + } else if (map_idx != directive_count) yyerror("Not enough weights specified"); - for(i = 0; i < directive_count; i++) { + for(i = 0; i < weight_index; i++) { if (weight_table[i].type != SYMBOL_ELLIPSIS) continue; switch (prev_weight_table[i].type) { @@ -584,6 +604,8 @@ } memcpy(prev2_weight_table, prev_weight_table, sizeof(prev_weight_table)); memcpy(prev_weight_table, weight_table, sizeof(weight_table)); + memcpy(prev2_weight_map, prev_weight_map, sizeof(weight_map)); + memcpy(prev_weight_map, weight_map, sizeof(weight_map)); prev_line = LINE_ELLIPSIS; allow_ellipsis = 0; } @@ -592,16 +614,21 @@ yyerror("Multiple UNDEFINED lines not allowed"); sym_undefined.val = prim_pri++; weight_index = 0; + map_idx = 0; allow_ellipsis = 1; } weights { int i; if (weight_index == 0) { weight_table[0] = sym_undefined; - for(i = 1; i < directive_count; i++) + weight_map[0].v = 0; + for(i = 1; i < directive_count; i++) { + weight_map[i].v = i; weight_table[i] = sym_ellipsis; - } else if (weight_index != directive_count) + } + } else if (map_idx != directive_count) yyerror("Not enough weights specified"); memcpy(prev_weight_table, weight_table, sizeof(weight_table)); + memcpy(prev_weight_map, weight_map, sizeof(weight_map)); prev_line = LINE_UNDEFINED; } ; @@ -609,7 +636,7 @@ | order_lines2 order_line2 '\n' ; order_line2 : - | ELEM { weight_index = 0; } weights2 { + | ELEM { weight_index = 0; map_idx = 0; } weights2 { int i; struct symbol *s = getsymbol($1, EXISTS); @@ -619,12 +646,15 @@ if (weight_index != 0) yyerror("Can't specify weights for collating symbol <%s>", showwcs($1, CHARMAP_SYMBOL_LEN)); } else if (weight_index == 0) { - for(i = 0; i < directive_count; i++) + for(i = 0; i < directive_count; i++) { weight_table[i] = *s; - } else if (weight_index != directive_count) + weight_map[i].v = i; + } + } else if (map_idx != directive_count) yyerror("Not enough weights specified"); if (prev_line == LINE_ELLIPSIS) { int w, x; + for(i = 0; i < directive_count; i++) { switch (prev_weight_table[i].type) { case SYMBOL_CHAR: @@ -633,13 +663,13 @@ case SYMBOL_SYMBOL: for (w = prev_elem->u.wc + 1; w < s->u.wc; w++) { struct __collate_st_char_pri *p = getpri(w); + if (p->pri[i] != PRI_UNDEFINED) yyerror("Char 0x%02x previously defined", w); p->pri[i] = prev_weight_table[i].val; } break; case SYMBOL_ELLIPSIS: - switch (weight_table[i].type) { case SYMBOL_STRING: yyerror("Strings can't be endpoints of ellipsis"); @@ -650,11 +680,14 @@ case SYMBOL_SYMBOL: yyerror("Collation symbols can't be endpoints of ellipsis"); } - if (s->val - prev_elem->val != weight_table[i].val - prev2_weight_table[i].val) + if (s->val - prev_elem->val != + weight_table[i].val - + prev2_weight_table[i].val) yyerror("Range mismatch in weight %d", i); x = prev2_weight_table[i].val + 1; for (w = prev_elem->u.wc + 1; w < s->u.wc; w++) { struct __collate_st_char_pri *p = getpri(w); + if (p->pri[i] != PRI_UNDEFINED) yyerror("Char 0x%02x previously defined", w); p->pri[i] = x++; @@ -663,6 +696,7 @@ case SYMBOL_STRING: for (w = prev_elem->u.wc + 1; w < s->u.wc; w++) { struct __collate_st_char_pri *p = getpri(w); + if (p->pri[i] != PRI_UNDEFINED) yyerror("Char 0x%02x previously defined", w); putsubst(w, i, prev_weight_table[i].u.str); @@ -675,7 +709,13 @@ switch(s->type) { case SYMBOL_CHAR: { struct __collate_st_char_pri *p = getpri(s->u.wc); - for(i = 0; i < directive_count; i++) { + +#ifdef VSDEBUG + fprintf(stderr, "%s ", showwcs(s->name, CHARMAP_SYMBOL_LEN)); + fprintf(stderr, "weights=%d ", weight_index); +#endif + /* This is the main piece of code. */ + for(i = 0; i < weight_index; i++) { switch (weight_table[i].type) { case SYMBOL_CHAR: case SYMBOL_CHAIN: @@ -684,6 +724,9 @@ if (p->pri[i] != PRI_UNDEFINED) yyerror("Char 0x%02x previously defined", s->u.wc); p->pri[i] = weight_table[i].val; +#ifdef VSDEBUG + fprintf(stderr, " weight[%d]=%d", i, p->pri[i]); +#endif break; case SYMBOL_STRING: if (p->pri[i] != PRI_UNDEFINED) @@ -692,41 +735,59 @@ p->pri[i] = weight_table[i].val; break; } +#if 0 + default: + errx(1, "unrecognized symbol type: %d", weight_table[i].type); +#endif } +#ifndef NDEBUG + for (i = 0; i < COLL_WEIGHTS_MAX - 1; i++) + assert(weight_map[i].v < weight_map[i + 1].v); +#endif + memcpy(p->map, weight_map, sizeof(p->map)); +#ifdef VSDEBUG + fputc('\n', stderr); +#endif break; } case SYMBOL_CHAIN: { struct __collate_st_chain_pri *p = getchain(s->u.str, EXISTS); - for(i = 0; i < directive_count; i++) { + + for(i = 0; i < weight_index; i++) { switch (weight_table[i].type) { case SYMBOL_CHAR: case SYMBOL_CHAIN: case SYMBOL_IGNORE: case SYMBOL_SYMBOL: if (p->pri[i] != PRI_UNDEFINED) - yyerror("Chain %s previously defined", showwcs(s->u.str, STR_LEN)); + yyerror("Chain %s previously defined", + showwcs(s->u.str, STR_LEN)); p->pri[i] = weight_table[i].val; break; case SYMBOL_STRING : if (wcsncmp(s->u.str, weight_table[i].u.str, STR_LEN) != 0) yyerror("Chain/string mismatch"); if (p->pri[i] != PRI_UNDEFINED) - yyerror("Chain %s previously defined", showwcs(s->u.str, STR_LEN)); + yyerror("Chain %s previously defined", + showwcs(s->u.str, STR_LEN)); /* negative value mean don't substitute * the chain, but it is in an * equivalence class */ p->pri[i] = -weight_table[i].val; } } + memcpy(p->map, weight_map, sizeof(p->map)); break; } } memcpy(prev_weight_table, weight_table, sizeof(weight_table)); + memcpy(prev_weight_map, weight_map, sizeof(weight_map)); prev_line = LINE_NORMAL; prev_elem = s; } - | ELLIPSIS { weight_index = 0; allow_ellipsis = 1; } weights { + | ELLIPSIS { weight_index = 0; map_idx = 0; allow_ellipsis = 1; } weights { int i; + if (prev_line == LINE_ELLIPSIS) yyerror("Illegal sequential ellipsis lines"); if (prev_line == LINE_UNDEFINED) @@ -734,11 +795,13 @@ if (prev_line == LINE_NONE) yyerror("Ellipsis line must follow a collating identifier lines"); if (weight_index == 0) { - for(i = 0; i < directive_count; i++) + for(i = 0; i < directive_count; i++) { weight_table[i] = sym_ellipsis; - } else if (weight_index != directive_count) + weight_map[i].v = i; + } + } else if (map_idx != directive_count) yyerror("Not enough weights specified"); - for(i = 0; i < directive_count; i++) { + for(i = 0; i < weight_index; i++) { if (weight_table[i].type != SYMBOL_ELLIPSIS) continue; switch (prev_weight_table[i].type) { @@ -754,19 +817,23 @@ } memcpy(prev2_weight_table, prev_weight_table, sizeof(prev_weight_table)); memcpy(prev_weight_table, weight_table, sizeof(weight_table)); + memcpy(prev2_weight_map, prev_weight_map, sizeof(prev_weight_map)); + memcpy(prev_weight_map, weight_map, sizeof(weight_map)); prev_line = LINE_ELLIPSIS; allow_ellipsis = 0; } - | UNDEFINED { weight_index = 0; allow_ellipsis = 1; } weights { + | UNDEFINED { weight_index = 0; map_idx = 0; allow_ellipsis = 1; } weights { int i; if (weight_index == 0) { weight_table[0] = sym_undefined; - for(i = 1; i < directive_count; i++) + for(i = 1; i < directive_count; i++) { weight_table[i] = sym_ellipsis; - } else if (weight_index != directive_count) + weight_map[i].v = i; + } + } else if (map_idx != directive_count) yyerror("Not enough weights specified"); - for(i = 0; i < directive_count; i++) { + for(i = 0; i < map_idx; i++) { switch (weight_table[i].type) { case SYMBOL_CHAR: case SYMBOL_CHAIN: @@ -784,7 +851,9 @@ yyerror("Strings can't be used with UNDEFINED"); } } + /* Assume that UNDEFINED has 1->1 mapping. */ memcpy(prev_weight_table, weight_table, sizeof(weight_table)); + memcpy(prev_weight_map, weight_map, sizeof(weight_map)); prev_line = LINE_UNDEFINED; } ; @@ -794,66 +863,70 @@ ; expansion : weight_ex - | expansion weight_ex_null + | expansion weight_ex ; weight2 : weight - | EXPAND expansion EXPAND { -#ifdef VSDEBUG - printf("[%d]=%d ", - weight_index, weight_table[weight_index]->val); -#endif - weight_index++; - } + | EXPAND { +} expansion EXPAND { + /* Store the end (inclusive), not the beginning. */ + weight_map[map_idx].v = weight_index - 1; + map_idx++; +} ; weights : | weight | weights ';' weight ; -weight : weight_ex1 +weight : ELEM { + struct symbol *s; + + assert(weight_index < COLL_WEIGHTS_REAL); + if (map_idx >= directive_count) + yyerror("More weights than specified by order_start (%d >= %d, %s)", map_idx, + directive_count, showwcs($1, CHARMAP_SYMBOL_LEN)); + s = getsymbol($1, EXISTS); + if (order_pass && s->val == PRI_UNDEFINED) + printf("<%s> is undefined\n", showwcs($1, CHARMAP_SYMBOL_LEN)); + weight_map[map_idx++].v = weight_index; + weight_table[weight_index++] = *s; +} | ELLIPSIS { - if (weight_index >= directive_count) + if (map_idx >= directive_count) yyerror("More weights than specified by order_start"); if (!allow_ellipsis) yyerror("Ellipsis weight not allowed"); + /* Mark the end of weights for this level */ + weight_map[map_idx++].v = weight_index; weight_table[weight_index++] = sym_ellipsis; } | IGNORE { - if (weight_index >= directive_count) + if (map_idx >= directive_count) yyerror("More weights than specified by order_start"); + weight_map[map_idx++].v = weight_index; weight_table[weight_index++] = sym_ignore; } | STRING { - if (weight_index >= directive_count) + /* XXX This is broken now, and should be removed. */ + if (map_idx >= directive_count) yyerror("More weights than specified by order_start"); if (wcslen($1) > STR_LEN) yyerror("String '%s' is too long", showwcs($1, STR_LEN)); + /* Store the end, not the beginning. In the simple case it is equivalent. */ + weight_map[map_idx++].v = weight_index; weight_table[weight_index++] = *getstring($1); } ; -weight_ex1 : weight_ex { weight_index++; } -; weight_ex : ELEM { struct symbol *s; - if (weight_index >= directive_count) - yyerror("More weights than specified by order_start (%d >= %d, %s)", weight_index, + assert(weight_index < COLL_WEIGHTS_REAL); + if (map_idx >= directive_count) + yyerror("More weights than specified by order_start (%d >= %d, %s)", map_idx, directive_count, showwcs($1, CHARMAP_SYMBOL_LEN)); s = getsymbol($1, EXISTS); if (order_pass && s->val == PRI_UNDEFINED) printf("<%s> is undefined\n", showwcs($1, CHARMAP_SYMBOL_LEN)); - weight_table[weight_index] = *s; -} -; -weight_ex_null : ELEM { - struct symbol *s; - - if (weight_index >= directive_count) - yyerror("More weights than specified by order_start (%d >= %d, %s)", weight_index, - directive_count, showwcs($1, CHARMAP_SYMBOL_LEN)); - s = getsymbol($1, EXISTS); - if (order_pass && s->val == PRI_UNDEFINED) - printf("<%s> is undefined\n", showwcs($1, CHARMAP_SYMBOL_LEN)); - weight_table[weight_index].val += s->val; + weight_table[weight_index++] = *s; } ; order_end : ORDER_END '\n' @@ -1026,7 +1099,7 @@ for (ch = 0; ch <= UCHAR_MAX; ch++) for(z = 0; z < COLL_WEIGHTS_MAX; z++) __collate_char_pri_table[ch].pri[z] = PRI_UNDEFINED; - if (setlocale(LC_ALL, "en_US.UTF-8") == NULL) + if (setlocale(LC_ALL, "en_US.UTF-8") == NULL) errx(1, "setlocale() failed"); #ifdef COLLATE_DEBUG while((ch = getopt(ac, av, ":do:I:m:")) != -1) { @@ -1077,28 +1150,36 @@ { DBT key, val; struct __collate_st_char_pri *p; - int ret; + int ret, z; + + if (c <= UCHAR_MAX) { + p = &__collate_char_pri_table[c]; + for (z = 0; z < COLL_WEIGHTS_MAX; z++) + p->map[z].v = z; + for(z = 0; z < COLL_WEIGHTS_REAL; z++) + p->pri[z] = PRI_UNDEFINED; - if (c <= UCHAR_MAX) - return &__collate_char_pri_table[c]; + return p; + } key.data = &c; key.size = sizeof(int32_t); if ((ret = largemapdb->get(largemapdb, &key, &val, 0)) < 0) err(1, "getpri: Error getting %s", charname(c)); if (ret != 0) { - struct __collate_st_char_pri *pn; - int z; - if ((pn = (struct __collate_st_char_pri *)malloc(sizeof(struct __collate_st_char_pri))) == NULL) + if ((p = (struct __collate_st_char_pri *) + malloc(sizeof(struct __collate_st_char_pri))) == NULL) err(1, "getpri: malloc"); for(z = 0; z < COLL_WEIGHTS_MAX; z++) - pn->pri[z] = PRI_UNDEFINED; - val.data = &pn; + p->map[z].v = z; + for(z = 0; z < COLL_WEIGHTS_REAL; z++) + p->pri[z] = PRI_UNDEFINED; + val.data = &p; val.size = sizeof(struct __collate_st_char_pri *); if (largemapdb->put(largemapdb, &key, &val, 0) < 0) err(1, "getpri: Error storing %s", charname(c)); nlargemap++; } - memcpy(&p, val.data, sizeof(struct __collate_st_char_pri *)); + return p; } @@ -1137,7 +1218,8 @@ int z; if (exists > 0) errx(1, "getchain: \"%s\" is not defined", showwcs(wcs, STR_LEN)); - if ((pn = (struct __collate_st_chain_pri *)malloc(sizeof(struct __collate_st_chain_pri))) == NULL) + if ((pn = (struct __collate_st_chain_pri *) + malloc(sizeof(struct __collate_st_chain_pri))) == NULL) err(1, "getchain: malloc"); for(z = 0; z < COLL_WEIGHTS_MAX; z++) pn->pri[z] = PRI_UNDEFINED; @@ -1237,6 +1319,7 @@ struct symbol *p; int ret; + errx(1, "internal error: getstring called"); key.data = (void *)wcs; key.size = wcslen(wcs) * sizeof(wchar_t); if ((ret = stringdb->get(stringdb, &key, &val, 0)) < 0) @@ -1254,6 +1337,7 @@ err(1, "getstring: Error storing \"%s\"", showwcs(wcs, STR_LEN)); } memcpy(&p, val.data, sizeof(struct symbol *)); + return p; } @@ -1391,19 +1475,32 @@ static char * show(int c) { - static char buf[5]; + static char buf[40]; + char *p, utfbuf[6]; + int i; if (c >=32 && c <= 126) sprintf(buf, "'%c' ", c); - else + else { sprintf(buf, "\\x{%02x}", c); + } + if ((c = wctomb(utfbuf, c)) != -1) { + p = buf + strlen(buf); + *p++ = '('; + for (i = 0; i < c; i++) { + sprintf(p, "%X ", (unsigned char)utfbuf[i]); + p += strlen(p); + } + sprintf(p, ")"); + } + return buf; } static void collate_print_tables(void) { - int i, z; + int i, z, pos; printf("Info: p=%d s=%d f=0x%02x m=%d dc=%d up=%d us=%d pc=%d sc=%d cc=%d lc=%d\n", info.directive[0], info.directive[1], @@ -1436,25 +1533,65 @@ putchar('\n'); } } - printf("Char priority table:\n"); + printf("Char priority table: (utf8 in parens)\n"); { struct __collate_st_char_pri *p2 = __collate_char_pri_table; + for (i = 0; i < UCHAR_MAX + 1; i++, p2++) { + if (p2->map[1].v == 0) + continue; /* Entry not used. */ printf("\t%s :", show(i)); - for(z = 0; z < info.directive_count; z++) - printf(" %d", ntohl(p2->pri[z])); + for(z = 0, pos = 0; z < info.directive_count; z++) { + /* + * Is the last weight in the sequence on + * this position? The assertion here won't hold if some + * character wasn't used at all. Hence, the additional 'if' + * above. + */ + assert(pos <= p2->map[z].v); + if (pos == p2->map[z].v) { + printf(" %d", ntohl(p2->pri[pos])); + pos++; + continue; + } + printf(" \""); + /* Output all expanded weights in sequence. */ + while (pos <= p2->map[z].v) { + printf("%d%s", ntohl(p2->pri[pos]), + pos < p2->map[z].v ? " " : ""); + pos++; + } + printf("\""); + } putchar('\n'); } } if (info.large_pri_count > 0) { struct __collate_st_large_char_pri *p2 = __collate_large_char_pri_table; - printf("Large priority table:\n"); + + printf("Large priority table: (utf8 in parens)\n"); for (i = info.large_pri_count; i-- > 0; p2++) { if (p2->val == 0) break; printf("\t%s :", show(ntohl(p2->val))); - for(z = 0; z < info.directive_count; z++) - printf(" %d", ntohl(p2->pri.pri[z])); + for(z = 0, pos = 0; z < info.directive_count; z++) { + /* Is the last weight in the sequence on + * this position? */ + assert(pos <= p2->pri.map[z].v); + if (pos == p2->pri.map[z].v) { + printf(" %d", ntohl(p2->pri.pri[pos])); + pos++; + continue; + } + printf(" \""); + /* Output all expanded weights in sequence. */ + while (pos <= p2->pri.map[z].v) { + printf("%d%s", ntohl(p2->pri.pri[pos]), + pos < p2->pri.map[z].v ? " " : ""); + pos++; + } + printf("\""); + } putchar('\n'); } } From owner-p4-projects@FreeBSD.ORG Mon Sep 1 17:35:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 04A3A1065670; Mon, 1 Sep 2008 17:35: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 B5D5C106566B for ; Mon, 1 Sep 2008 17:35:22 +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 A17128FC15 for ; Mon, 1 Sep 2008 17:35:22 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m81HZMGU086641 for ; Mon, 1 Sep 2008 17:35:22 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m81HZM6X086634 for perforce@freebsd.org; Mon, 1 Sep 2008 17:35:22 GMT (envelope-from thompsa@freebsd.org) Date: Mon, 1 Sep 2008 17:35:22 GMT Message-Id: <200809011735.m81HZM6X086634@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 148988 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Sep 2008 17:35:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=148988 Change 148988 by thompsa@thompsa_burger on 2008/09/01 17:34:23 Fix build with cloning changes. Affected files ... .. //depot/projects/vap/sys/contrib/pf/net/if_pflog.c#6 edit .. //depot/projects/vap/sys/net/if_disc.c#8 edit .. //depot/projects/vap/sys/net/if_edsc.c#4 edit .. //depot/projects/vap/sys/net/if_enc.c#7 edit .. //depot/projects/vap/sys/net/if_faith.c#9 edit .. //depot/projects/vap/sys/net/if_gif.c#10 edit .. //depot/projects/vap/sys/net/if_gre.c#12 edit .. //depot/projects/vap/sys/net/if_lagg.c#7 edit .. //depot/projects/vap/sys/net/if_ppp.c#8 edit .. //depot/projects/vap/sys/net/if_stf.c#10 edit .. //depot/projects/vap/sys/net/if_vlan.c#10 edit Differences ... ==== //depot/projects/vap/sys/contrib/pf/net/if_pflog.c#6 (text+ko) ==== @@ -70,6 +70,7 @@ #include #include #include +#include #else #include #endif @@ -117,7 +118,7 @@ int pflogioctl(struct ifnet *, u_long, caddr_t); void pflogstart(struct ifnet *); #ifdef __FreeBSD__ -static int pflog_clone_create(struct if_clone *, int, caddr_t); +static int pflog_clone_create(struct if_clone *, int, enum uio_seg, caddr_t); static void pflog_clone_destroy(struct ifnet *); #else int pflog_clone_create(struct if_clone *, int); @@ -153,7 +154,7 @@ #ifdef __FreeBSD__ static int -pflog_clone_create(struct if_clone *ifc, int unit, caddr_t param) +pflog_clone_create(struct if_clone *ifc, int unit, enum uio_seg as, caddr_t param) #else int pflog_clone_create(struct if_clone *ifc, int unit) ==== //depot/projects/vap/sys/net/if_disc.c#8 (text+ko) ==== @@ -43,6 +43,7 @@ #include #include #include +#include #include #include ==== //depot/projects/vap/sys/net/if_edsc.c#4 (text+ko) ==== @@ -42,6 +42,7 @@ #include /* mbuf(9) */ #include /* struct ifreq */ #include /* socket ioctl's */ +#include /* #include if you need printf(9) or other all-purpose globals */ #include /* bpf(9) */ ==== //depot/projects/vap/sys/net/if_enc.c#7 (text+ko) ==== @@ -38,6 +38,7 @@ #include #include #include +#include #include #include ==== //depot/projects/vap/sys/net/if_faith.c#9 (text+ko) ==== @@ -54,6 +54,7 @@ #include #include #include +#include #include #include ==== //depot/projects/vap/sys/net/if_gif.c#10 (text+ko) ==== @@ -49,6 +49,7 @@ #include #include #include +#include #include #include ==== //depot/projects/vap/sys/net/if_gre.c#12 (text+ko) ==== @@ -64,6 +64,7 @@ #include #include #include +#include #include #include ==== //depot/projects/vap/sys/net/if_lagg.c#7 (text+ko) ==== @@ -39,6 +39,7 @@ #include #include #include +#include #include #include ==== //depot/projects/vap/sys/net/if_ppp.c#8 (text+ko) ==== @@ -98,6 +98,7 @@ #include #include #include +#include #include #include ==== //depot/projects/vap/sys/net/if_stf.c#10 (text+ko) ==== @@ -89,6 +89,7 @@ #include #include #include +#include #include #include ==== //depot/projects/vap/sys/net/if_vlan.c#10 (text+ko) ==== @@ -55,6 +55,7 @@ #include #include #include +#include #include #include From owner-p4-projects@FreeBSD.ORG Mon Sep 1 18:29:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3706F1065674; Mon, 1 Sep 2008 18:29:18 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EDFE61065670 for ; Mon, 1 Sep 2008 18:29:17 +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 D7BAA8FC13 for ; Mon, 1 Sep 2008 18:29:17 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m81ITHKC092353 for ; Mon, 1 Sep 2008 18:29:17 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m81ITHe2092351 for perforce@freebsd.org; Mon, 1 Sep 2008 18:29:17 GMT (envelope-from ed@FreeBSD.org) Date: Mon, 1 Sep 2008 18:29:17 GMT Message-Id: <200809011829.m81ITHe2092351@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 148992 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Sep 2008 18:29:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=148992 Change 148992 by ed@ed_dull on 2008/09/01 18:28:30 IFC. Affected files ... .. //depot/projects/mpsafetty/contrib/gcc/config/i386/freebsd64.h#2 integrate .. //depot/projects/mpsafetty/crypto/openssh/config.h#3 integrate .. //depot/projects/mpsafetty/crypto/openssh/openbsd-compat/fake-queue.h#2 delete .. //depot/projects/mpsafetty/crypto/openssh/openbsd-compat/tree.h#2 delete .. //depot/projects/mpsafetty/gnu/usr.bin/cc/Makefile.tgt#2 integrate .. //depot/projects/mpsafetty/gnu/usr.bin/cc/cc_tools/Makefile#2 integrate .. //depot/projects/mpsafetty/gnu/usr.bin/cc/cc_tools/freebsd64-fix.h#2 delete .. //depot/projects/mpsafetty/lib/libarchive/archive_entry.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/archive_entry.h#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/archive_entry_private.h#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/archive_write_disk.c#4 integrate .. //depot/projects/mpsafetty/lib/libarchive/archive_write_set_format_by_name.c#3 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/read_open_memory.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_acl_basic.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_acl_pax.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_bad_fd.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_compat_gtar.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_compat_zip.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_empty_write.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_entry.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_read_compress_program.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_read_data_large.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_read_extract.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_read_format_ar.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_read_format_cpio_bin.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_read_format_cpio_bin_Z.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_read_format_cpio_bin_bz2.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_read_format_cpio_bin_gz.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_read_format_cpio_odc.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_read_format_cpio_svr4_gzip.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_read_format_cpio_svr4c_Z.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_read_format_empty.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_read_format_gtar_gz.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_read_format_gtar_sparse.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_read_format_iso_gz.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_read_format_isorr_bz2.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_read_format_mtree.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_read_format_pax_bz2.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_read_format_tar.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_read_format_tar_empty_filename.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_read_format_tbz.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_read_format_tgz.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_read_format_tz.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_read_format_zip.c#3 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_read_large.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_read_pax_truncated.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_read_position.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_read_truncated.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_tar_filenames.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_tar_large.c#3 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_write_compress.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_write_compress_program.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_write_disk.c#4 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_write_disk_hardlink.c#3 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_write_disk_perms.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_write_disk_secure.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_write_format_ar.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_write_format_cpio.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_write_format_cpio_empty.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_write_format_cpio_newc.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_write_format_cpio_odc.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_write_format_shar_empty.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_write_format_tar.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_write_format_tar_empty.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_write_open_memory.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/toecore/toedev.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/msdosfs/msdosfs_fat.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/vfs_syscalls.c#4 integrate .. //depot/projects/mpsafetty/sys/net/route.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_offload.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet/toedev.h#3 integrate .. //depot/projects/mpsafetty/sys/powerpc/aim/interrupt.c#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/aim/mmu_oea.c#2 integrate .. //depot/projects/mpsafetty/tools/tools/cd2dvd/cd2dvd.sh#1 branch .. //depot/projects/mpsafetty/usr.bin/netstat/inet.c#4 integrate .. //depot/projects/mpsafetty/usr.bin/netstat/main.c#2 integrate .. //depot/projects/mpsafetty/usr.bin/netstat/netstat.h#2 integrate .. //depot/projects/mpsafetty/usr.bin/netstat/route.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/cxgbtool/cxgbtool.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/cxgbtool/reg_defs_t3.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/cxgbtool/reg_defs_t3b.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/cxgbtool/version.h#2 integrate .. //depot/projects/mpsafetty/usr.sbin/lpr/lpd/recvjob.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/syslogd/syslogd.c#3 integrate Differences ... ==== //depot/projects/mpsafetty/contrib/gcc/config/i386/freebsd64.h#2 (text+ko) ==== @@ -19,11 +19,11 @@ the Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* $FreeBSD: src/contrib/gcc/config/i386/freebsd64.h,v 1.10 2007/05/19 02:30:20 kan Exp $ */ +/* $FreeBSD: src/contrib/gcc/config/i386/freebsd64.h,v 1.11 2008/08/31 23:38:28 obrien Exp $ */ #undef TARGET_VERSION -#define TARGET_VERSION fprintf (stderr, " (FreeBSD/x86-64 ELF)"); +#define TARGET_VERSION fprintf (stderr, " (FreeBSD/amd64 ELF)"); #undef FBSD_TARGET_CPU_CPP_BUILTINS #define FBSD_TARGET_CPU_CPP_BUILTINS() \ ==== //depot/projects/mpsafetty/crypto/openssh/config.h#3 (text+ko) ==== @@ -1268,10 +1268,10 @@ #define SIZEOF_INT 4 /* The size of `long int', as computed by sizeof. */ -#define SIZEOF_LONG_INT 8 +#define SIZEOF_LONG_INT 4 /* The size of `long long int', as computed by sizeof. */ -#define SIZEOF_LONG_LONG_INT 4 +#define SIZEOF_LONG_LONG_INT 8 /* The size of `short int', as computed by sizeof. */ #define SIZEOF_SHORT_INT 2 ==== //depot/projects/mpsafetty/gnu/usr.bin/cc/Makefile.tgt#2 (text+ko) ==== @@ -1,17 +1,20 @@ -# $FreeBSD: src/gnu/usr.bin/cc/Makefile.tgt,v 1.11 2007/05/19 04:25:56 kan Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/Makefile.tgt,v 1.12 2008/08/31 23:38:28 obrien Exp $ TARGET_ARCH?= ${MACHINE_ARCH} -.if ${TARGET_ARCH} == "arm" -GCC_CPU= arm -.elif ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64" +.if ${TARGET_ARCH} == "amd64" GCC_CPU= i386 -.elif ${TARGET_ARCH} == "ia64" -TARGET_CPU_DEFAULT= MASK_GNU_AS|MASK_GNU_LD -GCC_CPU= ia64 .elif ${TARGET_ARCH} == "powerpc" GCC_CPU= rs6000 .elif ${TARGET_ARCH} == "sparc64" GCC_CPU= sparc +.else +GCC_CPU= ${TARGET_ARCH} +.endif + +.if ${TARGET_ARCH} == "ia64" +TARGET_CPU_DEFAULT= MASK_GNU_AS|MASK_GNU_LD +.endif +.if ${TARGET_ARCH} == "sparc64" TARGET_CPU_DEFAULT= TARGET_CPU_ultrasparc .endif ==== //depot/projects/mpsafetty/gnu/usr.bin/cc/cc_tools/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.89 2007/11/18 11:59:44 ache Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.90 2008/08/31 23:38:28 obrien Exp $ .include @@ -38,22 +38,25 @@ TARGET_INC+= freebsd-spec.h TARGET_INC+= freebsd.h .if ${TARGET_ARCH} != "i386" && ${TARGET_ARCH} != "amd64" -.if exists(${GCCDIR}/config/${GCC_CPU}/sysv4.h) +. if exists(${GCCDIR}/config/${GCC_CPU}/sysv4.h) TARGET_INC+= ${GCC_CPU}/sysv4.h -.endif +. endif .endif .if ${TARGET_ARCH} == "amd64" TARGET_INC+= ${GCC_CPU}/x86-64.h -TARGET_INC+= ${GCC_CPU}/freebsd.h -TARGET_INC+= ${GCC_CPU}/freebsd64.h -TARGET_INC+= freebsd64-fix.h -.elif ${TARGET_ARCH} == "arm" +.endif +.if ${TARGET_ARCH} == "arm" TARGET_INC+= ${GCC_CPU}/elf.h +.endif +.if ${TARGET_ARCH} == "arm" TARGET_INC+= ${GCC_CPU}/aout.h +.endif TARGET_INC+= ${GCC_CPU}/freebsd.h +.if ${TARGET_ARCH} == "amd64" +TARGET_INC+= ${GCC_CPU}/freebsd64.h +.endif +.if ${TARGET_ARCH} == "arm" TARGET_INC+= ${GCC_CPU}/arm.h -.else -TARGET_INC+= ${GCC_CPU}/freebsd.h .endif TARGET_INC+= defaults.h ==== //depot/projects/mpsafetty/lib/libarchive/archive_entry.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.52 2008/05/26 17:00:22 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.53 2008/09/01 04:54:29 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -395,8 +395,7 @@ aes_copy(&entry2->ae_hardlink, &entry->ae_hardlink); aes_copy(&entry2->ae_pathname, &entry->ae_pathname); aes_copy(&entry2->ae_symlink, &entry->ae_symlink); - entry2->ae_hardlinkset = entry->ae_hardlinkset; - entry2->ae_symlinkset = entry->ae_symlinkset; + entry2->ae_set = entry->ae_set; aes_copy(&entry2->ae_uname, &entry->ae_uname); /* Copy ACL data over. */ @@ -455,12 +454,24 @@ return (entry->ae_stat.aest_atime_nsec); } +int +archive_entry_atime_is_set(struct archive_entry *entry) +{ + return (entry->ae_set & AE_SET_ATIME); +} + time_t archive_entry_ctime(struct archive_entry *entry) { return (entry->ae_stat.aest_ctime); } +int +archive_entry_ctime_is_set(struct archive_entry *entry) +{ + return (entry->ae_set & AE_SET_CTIME); +} + long archive_entry_ctime_nsec(struct archive_entry *entry) { @@ -562,17 +573,17 @@ const char * archive_entry_hardlink(struct archive_entry *entry) { - if (!entry->ae_hardlinkset) - return (NULL); - return (aes_get_mbs(&entry->ae_hardlink)); + if (entry->ae_set & AE_SET_HARDLINK) + return (aes_get_mbs(&entry->ae_hardlink)); + return (NULL); } const wchar_t * archive_entry_hardlink_w(struct archive_entry *entry) { - if (!entry->ae_hardlinkset) - return (NULL); - return (aes_get_wcs(&entry->ae_hardlink)); + if (entry->ae_set & AE_SET_HARDLINK) + return (aes_get_wcs(&entry->ae_hardlink)); + return (NULL); } ino_t @@ -599,6 +610,12 @@ return (entry->ae_stat.aest_mtime_nsec); } +int +archive_entry_mtime_is_set(struct archive_entry *entry) +{ + return (entry->ae_set & AE_SET_MTIME); +} + unsigned int archive_entry_nlink(struct archive_entry *entry) { @@ -651,6 +668,12 @@ return (entry->ae_stat.aest_size); } +int +archive_entry_size_is_set(struct archive_entry *entry) +{ + return (entry->ae_set & AE_SET_SIZE); +} + const char * archive_entry_sourcepath(struct archive_entry *entry) { @@ -660,17 +683,17 @@ const char * archive_entry_symlink(struct archive_entry *entry) { - if (!entry->ae_symlinkset) - return (NULL); - return (aes_get_mbs(&entry->ae_symlink)); + if (entry->ae_set & AE_SET_SYMLINK) + return (aes_get_mbs(&entry->ae_symlink)); + return (NULL); } const wchar_t * archive_entry_symlink_w(struct archive_entry *entry) { - if (!entry->ae_symlinkset) - return (NULL); - return (aes_get_wcs(&entry->ae_symlink)); + if (entry->ae_set & AE_SET_SYMLINK) + return (aes_get_wcs(&entry->ae_symlink)); + return (NULL); } uid_t @@ -773,7 +796,9 @@ { aes_set_mbs(&entry->ae_hardlink, target); if (target != NULL) - entry->ae_hardlinkset = 1; + entry->ae_set |= AE_SET_HARDLINK; + else + entry->ae_set &= ~AE_SET_HARDLINK; } void @@ -781,7 +806,9 @@ { aes_copy_mbs(&entry->ae_hardlink, target); if (target != NULL) - entry->ae_hardlinkset = 1; + entry->ae_set |= AE_SET_HARDLINK; + else + entry->ae_set &= ~AE_SET_HARDLINK; } void @@ -789,26 +816,44 @@ { aes_copy_wcs(&entry->ae_hardlink, target); if (target != NULL) - entry->ae_hardlinkset = 1; + entry->ae_set |= AE_SET_HARDLINK; + else + entry->ae_set &= ~AE_SET_HARDLINK; } void archive_entry_set_atime(struct archive_entry *entry, time_t t, long ns) { entry->stat_valid = 0; + entry->ae_set |= AE_SET_ATIME; entry->ae_stat.aest_atime = t; entry->ae_stat.aest_atime_nsec = ns; } void +archive_entry_unset_atime(struct archive_entry *entry) +{ + archive_entry_set_atime(entry, 0, 0); + entry->ae_set &= ~AE_SET_ATIME; +} + +void archive_entry_set_ctime(struct archive_entry *entry, time_t t, long ns) { entry->stat_valid = 0; + entry->ae_set |= AE_SET_CTIME; entry->ae_stat.aest_ctime = t; entry->ae_stat.aest_ctime_nsec = ns; } void +archive_entry_unset_ctime(struct archive_entry *entry) +{ + archive_entry_set_ctime(entry, 0, 0); + entry->ae_set &= ~AE_SET_CTIME; +} + +void archive_entry_set_dev(struct archive_entry *entry, dev_t d) { entry->stat_valid = 0; @@ -836,7 +881,7 @@ void archive_entry_set_link(struct archive_entry *entry, const char *target) { - if (entry->ae_symlinkset) + if (entry->ae_set & AE_SET_SYMLINK) aes_set_mbs(&entry->ae_symlink, target); else aes_set_mbs(&entry->ae_hardlink, target); @@ -846,7 +891,7 @@ void archive_entry_copy_link(struct archive_entry *entry, const char *target) { - if (entry->ae_symlinkset) + if (entry->ae_set & AE_SET_SYMLINK) aes_copy_mbs(&entry->ae_symlink, target); else aes_copy_mbs(&entry->ae_hardlink, target); @@ -856,7 +901,7 @@ void archive_entry_copy_link_w(struct archive_entry *entry, const wchar_t *target) { - if (entry->ae_symlinkset) + if (entry->ae_set & AE_SET_SYMLINK) aes_copy_wcs(&entry->ae_symlink, target); else aes_copy_wcs(&entry->ae_hardlink, target); @@ -865,7 +910,7 @@ int archive_entry_update_link_utf8(struct archive_entry *entry, const char *target) { - if (entry->ae_symlinkset) + if (entry->ae_set & AE_SET_SYMLINK) return (aes_update_utf8(&entry->ae_symlink, target)); else return (aes_update_utf8(&entry->ae_hardlink, target)); @@ -882,11 +927,19 @@ archive_entry_set_mtime(struct archive_entry *entry, time_t m, long ns) { entry->stat_valid = 0; + entry->ae_set |= AE_SET_MTIME; entry->ae_stat.aest_mtime = m; entry->ae_stat.aest_mtime_nsec = ns; } void +archive_entry_unset_mtime(struct archive_entry *entry) +{ + archive_entry_set_mtime(entry, 0, 0); + entry->ae_set &= ~AE_SET_MTIME; +} + +void archive_entry_set_nlink(struct archive_entry *entry, unsigned int nlink) { entry->stat_valid = 0; @@ -954,9 +1007,17 @@ { entry->stat_valid = 0; entry->ae_stat.aest_size = s; + entry->ae_set |= AE_SET_SIZE; } void +archive_entry_unset_size(struct archive_entry *entry) +{ + archive_entry_set_size(entry, 0); + entry->ae_set &= ~AE_SET_SIZE; +} + +void archive_entry_copy_sourcepath(struct archive_entry *entry, const char *path) { aes_set_mbs(&entry->ae_sourcepath, path); @@ -967,7 +1028,9 @@ { aes_set_mbs(&entry->ae_symlink, linkname); if (linkname != NULL) - entry->ae_symlinkset = 1; + entry->ae_set |= AE_SET_SYMLINK; + else + entry->ae_set &= ~AE_SET_SYMLINK; } void @@ -975,7 +1038,9 @@ { aes_copy_mbs(&entry->ae_symlink, linkname); if (linkname != NULL) - entry->ae_symlinkset = 1; + entry->ae_set |= AE_SET_SYMLINK; + else + entry->ae_set &= ~AE_SET_SYMLINK; } void @@ -983,7 +1048,9 @@ { aes_copy_wcs(&entry->ae_symlink, linkname); if (linkname != NULL) - entry->ae_symlinkset = 1; + entry->ae_set |= AE_SET_SYMLINK; + else + entry->ae_set &= ~AE_SET_SYMLINK; } void ==== //depot/projects/mpsafetty/lib/libarchive/archive_entry.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2003-2007 Tim Kientzle + * Copyright (c) 2003-2008 Tim Kientzle * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -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.27 2008/05/26 17:00:22 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_entry.h,v 1.28 2008/09/01 04:54:29 kientzle Exp $ */ #ifndef ARCHIVE_ENTRY_H_INCLUDED @@ -152,12 +152,29 @@ /* * Retrieve fields from an archive_entry. + * + * There are a number of implicit conversions among these fields. For + * example, if a regular string field is set and you read the _w wide + * character field, the entry will implicitly convert narrow-to-wide + * using the current locale. Similarly, dev values are automatically + * updated when you write devmajor or devminor and vice versa. + * + * In addition, fields can be "set" or "unset." Unset string fields + * return NULL, non-string fields have _is_set() functions to test + * whether they've been set. You can "unset" a string field by + * assigning NULL; non-string fields have _unset() functions to + * unset them. + * + * Note: There is one ambiguity in the above; string fields will + * also return NULL when implicit character set conversions fail. + * This is usually what you want. */ - __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_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 *); __LA_DECL dev_t archive_entry_dev(struct archive_entry *); __LA_DECL dev_t archive_entry_devmajor(struct archive_entry *); __LA_DECL dev_t archive_entry_devminor(struct archive_entry *); @@ -175,6 +192,7 @@ __LA_DECL __LA_MODE_T archive_entry_mode(struct archive_entry *); __LA_DECL time_t archive_entry_mtime(struct archive_entry *); __LA_DECL long archive_entry_mtime_nsec(struct archive_entry *); +__LA_DECL int archive_entry_mtime_is_set(struct archive_entry *); __LA_DECL unsigned int archive_entry_nlink(struct archive_entry *); __LA_DECL const char *archive_entry_pathname(struct archive_entry *); __LA_DECL const wchar_t *archive_entry_pathname_w(struct archive_entry *); @@ -183,6 +201,7 @@ __LA_DECL dev_t archive_entry_rdevminor(struct archive_entry *); __LA_DECL const char *archive_entry_sourcepath(struct archive_entry *); __LA_DECL int64_t archive_entry_size(struct archive_entry *); +__LA_DECL int archive_entry_size_is_set(struct archive_entry *); __LA_DECL const char *archive_entry_strmode(struct archive_entry *); __LA_DECL const char *archive_entry_symlink(struct archive_entry *); __LA_DECL const wchar_t *archive_entry_symlink_w(struct archive_entry *); @@ -195,10 +214,16 @@ * * Note that string 'set' functions do not copy the string, only the pointer. * In contrast, 'copy' functions do copy the object pointed to. + * + * Note: As of libarchive 2.4, 'set' functions do copy the string and + * are therefore exact synonyms for the 'copy' versions. The 'copy' + * names will be retired in libarchive 3.0. */ __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_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); __LA_DECL void archive_entry_set_devmajor(struct archive_entry *, dev_t); __LA_DECL void archive_entry_set_devminor(struct archive_entry *, dev_t); @@ -226,6 +251,7 @@ __LA_DECL int archive_entry_update_link_utf8(struct archive_entry *, const char *); __LA_DECL void archive_entry_set_mode(struct archive_entry *, __LA_MODE_T); __LA_DECL void archive_entry_set_mtime(struct archive_entry *, time_t, long); +__LA_DECL void archive_entry_unset_mtime(struct archive_entry *); __LA_DECL void archive_entry_set_nlink(struct archive_entry *, unsigned int); __LA_DECL void archive_entry_set_pathname(struct archive_entry *, const char *); __LA_DECL void archive_entry_copy_pathname(struct archive_entry *, const char *); @@ -236,6 +262,7 @@ __LA_DECL void archive_entry_set_rdevmajor(struct archive_entry *, dev_t); __LA_DECL void archive_entry_set_rdevminor(struct archive_entry *, dev_t); __LA_DECL void archive_entry_set_size(struct archive_entry *, int64_t); +__LA_DECL void archive_entry_unset_size(struct archive_entry *); __LA_DECL void archive_entry_copy_sourcepath(struct archive_entry *, const char *); __LA_DECL void archive_entry_set_symlink(struct archive_entry *, const char *); __LA_DECL void archive_entry_copy_symlink(struct archive_entry *, const char *); @@ -257,6 +284,7 @@ __LA_DECL const struct stat *archive_entry_stat(struct archive_entry *); __LA_DECL void archive_entry_copy_stat(struct archive_entry *, const struct stat *); + /* * ACL routines. This used to simply store and return text-format ACL * strings, but that proved insufficient for a number of reasons: ==== //depot/projects/mpsafetty/lib/libarchive/archive_entry_private.h#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. * - * $FreeBSD: src/lib/libarchive/archive_entry_private.h,v 1.4 2008/05/26 17:00:22 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_entry_private.h,v 1.5 2008/09/01 04:54:29 kientzle Exp $ */ #ifndef ARCHIVE_ENTRY_PRIVATE_H_INCLUDED @@ -136,6 +136,14 @@ dev_t aest_rdevminor; } ae_stat; + int ae_set; /* bitmap of fields that are currently set */ +#define AE_SET_HARDLINK 1 +#define AE_SET_SYMLINK 2 +#define AE_SET_ATIME 4 +#define AE_SET_CTIME 8 +#define AE_SET_MTIME 16 +#define AE_SET_SIZE 64 + /* * Use aes here so that we get transparent mbs<->wcs conversions. */ @@ -147,8 +155,6 @@ struct aes ae_pathname; /* Name of entry */ struct aes ae_symlink; /* symlink contents */ struct aes ae_uname; /* Name of owner */ - unsigned char ae_hardlinkset; - unsigned char ae_symlinkset; /* Not used within libarchive; useful for some clients. */ struct aes ae_sourcepath; /* Path this entry is sourced from. */ ==== //depot/projects/mpsafetty/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.32 2008/08/28 06:40:22 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.33 2008/09/01 02:50:24 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include @@ -140,6 +140,7 @@ uid_t user_uid; dev_t skip_file_dev; ino_t skip_file_ino; + time_t start_time; gid_t (*lookup_gid)(void *private, const char *gname, gid_t gid); void (*cleanup_gid)(void *private); @@ -445,6 +446,8 @@ fe->mtime_nanos = archive_entry_mtime_nsec(entry); fe->atime = archive_entry_atime(entry); fe->atime_nanos = archive_entry_atime_nsec(entry); + if (fe->atime == 0 && fe->atime_nanos == 0) + fe->atime = a->start_time; } if (a->deferred & TODO_FFLAGS) { @@ -720,6 +723,7 @@ a->archive.vtable = archive_write_disk_vtable(); a->lookup_uid = trivial_lookup_uid; a->lookup_gid = trivial_lookup_gid; + a->start_time = time(NULL); #ifdef HAVE_GETEUID a->user_uid = geteuid(); #endif /* HAVE_GETEUID */ @@ -1625,11 +1629,13 @@ times[0].tv_sec = archive_entry_atime(a->entry); times[0].tv_usec = archive_entry_atime_nsec(a->entry) / 1000; - /* If no atime was specified, use mtime instead. */ - if (times[0].tv_sec == 0 && times[0].tv_usec == 0) { - times[0].tv_sec = times[1].tv_sec; - times[0].tv_usec = times[1].tv_usec; - } + /* 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 (times[0].tv_sec == 0 && times[0].tv_usec == 0) + times[0].tv_sec = a->start_time; + #ifdef HAVE_FUTIMES if (a->fd >= 0 && futimes(a->fd, times) == 0) { return (ARCHIVE_OK); @@ -1668,6 +1674,8 @@ times.modtime = archive_entry_mtime(a->entry); times.actime = archive_entry_atime(a->entry); + if (times.actime == 0) + times.actime = a->start_time; if (!S_ISLNK(a->mode) && utime(a->name, ×) != 0) { archive_set_error(&a->archive, errno, "Can't update time for %s", a->name); ==== //depot/projects/mpsafetty/lib/libarchive/archive_write_set_format_by_name.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_by_name.c,v 1.8 2008/08/31 07:21:46 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_by_name.c,v 1.9 2008/09/01 02:50:53 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include @@ -44,8 +44,8 @@ static struct { const char *name; int (*setter)(struct archive *); } names[] = { + { "ar", archive_write_set_format_ar_bsd }, { "arbsd", archive_write_set_format_ar_bsd }, - { "ar", archive_write_set_format_ar_bsd }, { "argnu", archive_write_set_format_ar_svr4 }, { "arsvr4", archive_write_set_format_ar_svr4 }, { "cpio", archive_write_set_format_cpio }, ==== //depot/projects/mpsafetty/lib/libarchive/test/read_open_memory.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/read_open_memory.c,v 1.2 2008/01/01 22:28:04 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/read_open_memory.c,v 1.3 2008/09/01 05:38:33 kientzle Exp $"); #include #include @@ -48,7 +48,7 @@ static int memory_read_close(struct archive *, void *); static int memory_read_open(struct archive *, void *); -#if ARCHIVE_API_VERSION < 2 +#if ARCHIVE_VERSION_NUMBER < 2000000 static ssize_t memory_read_skip(struct archive *, void *, size_t request); #else static off_t memory_read_skip(struct archive *, void *, off_t request); @@ -113,7 +113,7 @@ /* * How mean can a skip() routine be? Let's try to find out. */ -#if ARCHIVE_API_VERSION < 2 +#if ARCHIVE_VERSION_NUMBER < 2000000 static ssize_t memory_read_skip(struct archive *a, void *client_data, size_t skip) #else ==== //depot/projects/mpsafetty/lib/libarchive/test/test_acl_basic.c#2 (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_acl_basic.c,v 1.4 2007/07/06 15:43:11 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_acl_basic.c,v 1.5 2008/09/01 05:38:33 kientzle Exp $"); /* * Exercise the system-independent portion of the ACL support. @@ -165,7 +165,7 @@ assert(matched == 1); } } -#if ARCHIVE_VERSION_STAMP < 1009000 +#if ARCHIVE_VERSION_NUMBER < 1009000 /* Known broken before 1.9.0. */ skipping("archive_entry_acl_next() exits with ARCHIVE_EOF"); #else ==== //depot/projects/mpsafetty/lib/libarchive/test/test_acl_pax.c#2 (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_acl_pax.c,v 1.5 2008/05/26 17:00:24 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_acl_pax.c,v 1.6 2008/09/01 05:38:33 kientzle Exp $"); /* * Exercise the system-independent portion of the ACL support. @@ -386,7 +386,7 @@ assert(matched == 1); } } -#if ARCHIVE_VERSION_STAMP < 1009000 +#if ARCHIVE_VERSION_NUMBER < 1009000 /* Known broken before 1.9.0. */ skipping("archive_entry_acl_next() exits with ARCHIVE_EOF"); #else @@ -446,10 +446,10 @@ /* Close out the archive. */ assertA(0 == archive_write_close(a)); -#if ARCHIVE_API_VERSION > 1 +#if ARCHIVE_VERSION_NUMBER < 2000000 + archive_write_finish(a); +#else assertA(0 == archive_write_finish(a)); -#else - archive_write_finish(a); #endif /* Write out the data we generated to a file for manual inspection. */ @@ -509,9 +509,9 @@ /* Close the archive. */ assertA(0 == archive_read_close(a)); -#if ARCHIVE_API_VERSION > 1 - assert(0 == archive_read_finish(a)); +#if ARCHIVE_VERSION_NUMBER < 2000000 + archive_read_finish(a); #else - archive_read_finish(a); + assertA(0 == archive_read_finish(a)); #endif } ==== //depot/projects/mpsafetty/lib/libarchive/test/test_bad_fd.c#2 (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_bad_fd.c,v 1.1 2007/03/03 07:37:37 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_bad_fd.c,v 1.2 2008/09/01 05:38:33 kientzle Exp $"); /* Verify that attempting to open an invalid fd returns correct error. */ DEFINE_TEST(test_bad_fd) @@ -33,9 +33,9 @@ assertA(0 == archive_read_support_compression_all(a)); assertA(ARCHIVE_FATAL == archive_read_open_fd(a, -1, 1024)); assertA(0 == archive_read_close(a)); -#if ARCHIVE_API_VERSION > 1 - assert(0 == archive_read_finish(a)); +#if ARCHIVE_VERSION_NUMBER < 2000000 + archive_read_finish(a); #else - archive_read_finish(a); + assertA(0 == archive_read_finish(a)); #endif } ==== //depot/projects/mpsafetty/lib/libarchive/test/test_compat_gtar.c#2 (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_compat_gtar.c,v 1.2 2008/03/12 05:12:23 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_compat_gtar.c,v 1.3 2008/09/01 05:38:33 kientzle Exp $"); /* * Verify our ability to read sample files created by GNU tar. @@ -94,10 +94,10 @@ assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_GNUTAR); assertEqualInt(ARCHIVE_OK, archive_read_close(a)); -#if ARCHIVE_API_VERSION > 1 +#if ARCHIVE_VERSION_NUMBER < 2000000 + archive_read_finish(a); +#else assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); -#else - archive_read_finish(a); #endif } ==== //depot/projects/mpsafetty/lib/libarchive/test/test_compat_zip.c#2 (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_compat_zip.c,v 1.2 2008/03/12 05:12:23 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_compat_zip.c,v 1.3 2008/09/01 05:38:33 kientzle Exp $"); /* Copy this function for each test file and adjust it accordingly. */ static void @@ -53,10 +53,10 @@ assertEqualInt(archive_format(a), ARCHIVE_FORMAT_ZIP); assertEqualInt(ARCHIVE_OK, archive_read_close(a)); -#if ARCHIVE_API_VERSION > 1 +#if ARCHIVE_VERSION_NUMBER < 2000000 + archive_read_finish(a); +#else assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); -#else - archive_read_finish(a); #endif } ==== //depot/projects/mpsafetty/lib/libarchive/test/test_empty_write.c#2 (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_empty_write.c,v 1.2 2008/03/15 11:06:15 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_empty_write.c,v 1.3 2008/09/01 05:38:33 kientzle Exp $"); DEFINE_TEST(test_empty_write) { @@ -55,13 +55,12 @@ /* Close out the archive. */ assertA(0 == archive_write_close(a)); -#if ARCHIVE_API_VERSION > 1 +#if ARCHIVE_VERSION_NUMBER < 2000000 + archive_write_finish(a); +#else assertA(0 == archive_write_finish(a)); -#else - archive_write_finish(a); #endif - /* * Again, with bzip2 compression. */ @@ -84,10 +83,10 @@ /* Close out the archive. */ assertA(0 == archive_write_close(a)); -#if ARCHIVE_API_VERSION > 1 +#if ARCHIVE_VERSION_NUMBER < 2000000 + archive_write_finish(a); +#else assertA(0 == archive_write_finish(a)); -#else - archive_write_finish(a); #endif @@ -113,9 +112,9 @@ /* Close out the archive. */ assertA(0 == archive_write_close(a)); -#if ARCHIVE_API_VERSION > 1 +#if ARCHIVE_VERSION_NUMBER < 2000000 + archive_write_finish(a); +#else assertA(0 == archive_write_finish(a)); -#else - archive_write_finish(a); #endif } ==== //depot/projects/mpsafetty/lib/libarchive/test/test_entry.c#2 (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.6 2008/05/26 17:00:24 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_entry.c,v 1.8 2008/09/01 05:38:33 kientzle Exp $"); #include @@ -69,15 +69,26 @@ * The following tests are ordered alphabetically by the * name of the field. */ + /* atime */ archive_entry_set_atime(e, 13579, 24680); assertEqualInt(archive_entry_atime(e), 13579); assertEqualInt(archive_entry_atime_nsec(e), 24680); + archive_entry_unset_atime(e); + assertEqualInt(archive_entry_atime(e), 0); + assertEqualInt(archive_entry_atime_nsec(e), 0); + assert(!archive_entry_atime_is_set(e)); + /* ctime */ archive_entry_set_ctime(e, 13580, 24681); assertEqualInt(archive_entry_ctime(e), 13580); assertEqualInt(archive_entry_ctime_nsec(e), 24681); -#if ARCHIVE_VERSION_STAMP >= 1009000 + archive_entry_unset_ctime(e); + assertEqualInt(archive_entry_ctime(e), 0); + assertEqualInt(archive_entry_ctime_nsec(e), 0); + assert(!archive_entry_ctime_is_set(e)); + +#if ARCHIVE_VERSION_NUMBER >= 1009000 /* dev */ archive_entry_set_dev(e, 235); assertEqualInt(archive_entry_dev(e), 235); @@ -85,17 +96,21 @@ skipping("archive_entry_dev()"); #endif >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Sep 1 18:34:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BC20F1065674; Mon, 1 Sep 2008 18:34: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 7D488106566B for ; Mon, 1 Sep 2008 18:34:23 +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 6610E8FC0C for ; Mon, 1 Sep 2008 18:34:23 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m81IYNSJ092933 for ; Mon, 1 Sep 2008 18:34:23 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m81IYNvg092931 for perforce@freebsd.org; Mon, 1 Sep 2008 18:34:23 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 1 Sep 2008 18:34:23 GMT Message-Id: <200809011834.m81IYNvg092931@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 148993 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Sep 2008 18:34:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=148993 Change 148993 by hselasky@hselasky_laptop001 on 2008/09/01 18:33:43 Fix FreeBSD ID tags. The patch was done by Alfred Perlstein. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/bluetooth/TODO.TXT#3 edit .. //depot/projects/usb/src/sys/dev/usb2/bluetooth/ng_ubt2.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/bluetooth/ng_ubt2_var.h#3 edit .. //depot/projects/usb/src/sys/dev/usb2/bluetooth/ubtbcmfw2.c#6 edit .. //depot/projects/usb/src/sys/dev/usb2/bluetooth/usb2_bluetooth.c#2 edit .. //depot/projects/usb/src/sys/dev/usb2/bluetooth/usb2_bluetooth.h#2 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.c#11 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.h#3 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci_atmelarm.c#9 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.c#12 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.h#5 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2_pci.c#9 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.c#9 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.h#4 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#3 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.c#11 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.h#4 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_atmelarm.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_pci.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.c#9 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.h#4 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2_pci.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_bus.h#3 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.c#9 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.h#4 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_pci.h#2 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.c#10 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.h#3 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci_pccard.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/core/README.TXT#3 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_busdma.c#4 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_busdma.h#2 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_compat_linux.c#10 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_compat_linux.h#6 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_config_td.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_config_td.h#2 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_core.c#5 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_core.h#18 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_debug.c#3 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_debug.h#5 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.c#26 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.h#12 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#22 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.h#7 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dynamic.c#3 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dynamic.h#3 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_error.c#2 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#21 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.h#5 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_handle_request.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_handle_request.h#2 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_hid.c#5 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_hid.h#6 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#15 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.h#4 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_if.m#3 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_lookup.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_lookup.h#8 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_mbuf.c#2 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_mbuf.h#2 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_msctest.c#6 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_msctest.h#3 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_parse.c#3 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_parse.h#3 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_process.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_process.h#3 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.c#13 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.h#5 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_sw_transfer.c#5 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_sw_transfer.h#2 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#23 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.h#6 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_util.c#5 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_util.h#4 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usbdevs#5 edit .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_aue2.c#6 edit .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_aue2_reg.h#4 edit .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_axe2.c#6 edit .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_axe2_reg.h#4 edit .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cdce2.c#6 edit .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cdce2_reg.h#3 edit .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cue2.c#6 edit .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cue2_reg.h#4 edit .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kue2.c#6 edit .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kue2_fw.h#3 edit .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kue2_reg.h#4 edit .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_rue2.c#6 edit .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_rue2_reg.h#4 edit .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_udav2.c#6 edit .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_udav2_reg.h#4 edit .. //depot/projects/usb/src/sys/dev/usb2/ethernet/usb2_ethernet.c#3 edit .. //depot/projects/usb/src/sys/dev/usb2/ethernet/usb2_ethernet.h#3 edit .. //depot/projects/usb/src/sys/dev/usb2/image/usb2_image.c#2 edit .. //depot/projects/usb/src/sys/dev/usb2/image/usb2_image.h#2 edit .. //depot/projects/usb/src/sys/dev/usb2/image/uscanner2.c#6 edit .. //depot/projects/usb/src/sys/dev/usb2/include/Makefile#2 edit .. //depot/projects/usb/src/sys/dev/usb2/include/ufm2_ioctl.h#3 edit .. //depot/projects/usb/src/sys/dev/usb2/include/urio2_ioctl.h#3 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_cdc.h#4 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_defs.h#4 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#5 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#5 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_endian.h#3 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_error.h#2 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_hid.h#3 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_ioctl.h#12 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_mfunc.h#2 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_revision.h#3 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_standard.h#5 edit .. //depot/projects/usb/src/sys/dev/usb2/input/uhid2.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/input/ukbd2.c#6 edit .. //depot/projects/usb/src/sys/dev/usb2/input/ums2.c#6 edit .. //depot/projects/usb/src/sys/dev/usb2/input/usb2_input.c#3 edit .. //depot/projects/usb/src/sys/dev/usb2/input/usb2_input.h#4 edit .. //depot/projects/usb/src/sys/dev/usb2/input/usb2_rdesc.h#2 edit .. //depot/projects/usb/src/sys/dev/usb2/misc/udbp2.c#6 edit .. //depot/projects/usb/src/sys/dev/usb2/misc/udbp2.h#3 edit .. //depot/projects/usb/src/sys/dev/usb2/misc/ufm2.c#4 edit .. //depot/projects/usb/src/sys/dev/usb2/misc/usb2_misc.c#2 edit .. //depot/projects/usb/src/sys/dev/usb2/misc/usb2_misc.h#2 edit .. //depot/projects/usb/src/sys/dev/usb2/ndis/if_ndis_usb2.c#3 edit .. //depot/projects/usb/src/sys/dev/usb2/ndis/usb2_ndis.c#2 edit .. //depot/projects/usb/src/sys/dev/usb2/ndis/usb2_ndis.h#2 edit .. //depot/projects/usb/src/sys/dev/usb2/quirk/usb2_quirk.c#5 edit .. //depot/projects/usb/src/sys/dev/usb2/quirk/usb2_quirk.h#4 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/uark2.c#5 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/ubsa2.c#5 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/ubser2.c#5 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/uchcom2.c#5 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/ucycom2.c#6 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/ufoma2.c#6 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/uftdi2.c#5 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/uftdi2_reg.h#2 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/ugensa2.c#5 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/uipaq2.c#6 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/ulpt2.c#5 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/umct2.c#5 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/umodem2.c#5 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/umoscom2.c#5 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/uplcom2.c#6 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.h#4 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/uvisor2.c#5 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/uvscom2.c#5 edit .. //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2.c#11 edit .. //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2.h#3 edit .. //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2_pcm.c#4 edit .. //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2_reg.h#3 edit .. //depot/projects/usb/src/sys/dev/usb2/sound/usb2_sound.c#2 edit .. //depot/projects/usb/src/sys/dev/usb2/sound/usb2_sound.h#2 edit .. //depot/projects/usb/src/sys/dev/usb2/storage/ata-usb2.c#6 edit .. //depot/projects/usb/src/sys/dev/usb2/storage/umass2.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/storage/urio2.c#6 edit .. //depot/projects/usb/src/sys/dev/usb2/storage/usb2_storage.c#2 edit .. //depot/projects/usb/src/sys/dev/usb2/storage/usb2_storage.h#3 edit .. //depot/projects/usb/src/sys/dev/usb2/storage/ustorage2_fs.c#8 edit .. //depot/projects/usb/src/sys/dev/usb2/template/usb2_template.c#8 edit .. //depot/projects/usb/src/sys/dev/usb2/template/usb2_template.h#3 edit .. //depot/projects/usb/src/sys/dev/usb2/template/usb2_template_cdce.c#4 edit .. //depot/projects/usb/src/sys/dev/usb2/template/usb2_template_msc.c#4 edit .. //depot/projects/usb/src/sys/dev/usb2/template/usb2_template_mtp.c#4 edit .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2.c#8 edit .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2_var.h#3 edit .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2.c#9 edit .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2_reg.h#3 edit .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2_var.h#3 edit .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2.c#9 edit .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2_fw.h#3 edit .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2_reg.h#4 edit .. //depot/projects/usb/src/sys/dev/usb2/wlan/usb2_wlan.c#3 edit .. //depot/projects/usb/src/sys/dev/usb2/wlan/usb2_wlan.h#3 edit .. //depot/projects/usb/src/sys/modules/usb2/Makefile#2 edit .. //depot/projects/usb/src/sys/modules/usb2/bluetooth/Makefile#3 edit .. //depot/projects/usb/src/sys/modules/usb2/controller/Makefile#5 edit .. //depot/projects/usb/src/sys/modules/usb2/core/Makefile#6 edit .. //depot/projects/usb/src/sys/modules/usb2/ethernet/Makefile#4 edit .. //depot/projects/usb/src/sys/modules/usb2/image/Makefile#3 edit .. //depot/projects/usb/src/sys/modules/usb2/input/Makefile#4 edit .. //depot/projects/usb/src/sys/modules/usb2/misc/Makefile#3 edit .. //depot/projects/usb/src/sys/modules/usb2/ndis/Makefile#3 edit .. //depot/projects/usb/src/sys/modules/usb2/quirk/Makefile#3 edit .. //depot/projects/usb/src/sys/modules/usb2/serial/Makefile#3 edit .. //depot/projects/usb/src/sys/modules/usb2/sound/Makefile#3 edit .. //depot/projects/usb/src/sys/modules/usb2/storage/Makefile#3 edit .. //depot/projects/usb/src/sys/modules/usb2/template/Makefile#3 edit .. //depot/projects/usb/src/sys/modules/usb2/wlan/Makefile#4 edit .. //depot/projects/usb/src/sys/sys/videodev.h#7 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/bluetooth/TODO.TXT#3 (text+ko) ==== @@ -1,5 +1,5 @@ $Id: TODO,v 1.1 2002/11/24 19:46:56 max Exp $ -$FreeBSD: src/sys/netgraph/bluetooth/drivers/ubt/TODO,v 1.2 2003/05/10 21:44:39 julian Exp $ +$FreeBSD$ 1) SMP/Locking ==== //depot/projects/usb/src/sys/dev/usb2/bluetooth/ng_ubt2.c#7 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $Id: ng_ubt.c,v 1.16 2003/10/10 19:15:06 max Exp $ - * $FreeBSD: src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c,v 1.33 2007/06/23 04:34:38 imp Exp $ + * $FreeBSD$ */ #include ==== //depot/projects/usb/src/sys/dev/usb2/bluetooth/ng_ubt2_var.h#3 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $Id: ng_ubt_var.h,v 1.2 2003/03/22 23:44:36 max Exp $ - * $FreeBSD: src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h,v 1.7 2006/09/07 23:38:09 emax Exp $ + * $FreeBSD$ */ #ifndef _NG_UBT_VAR_H_ ==== //depot/projects/usb/src/sys/dev/usb2/bluetooth/ubtbcmfw2.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $Id: ubtbcmfw.c,v 1.3 2003/10/10 19:15:08 max Exp $ - * $FreeBSD: src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c,v 1.18 2007/06/23 04:34:38 imp Exp $ + * $FreeBSD$ */ #include ==== //depot/projects/usb/src/sys/dev/usb2/bluetooth/usb2_bluetooth.c#2 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/bluetooth/usb2_bluetooth.h#2 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.c#11 (text+ko) ==== @@ -1,5 +1,5 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/at91dci.c $"); +__FBSDID("$FreeBSD$"); /*- * Copyright (c) 2007-2008 Hans Petter Selasky. All rights reserved. ==== //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.h#3 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2006 ATMEL * Copyright (c) 2007 Hans Petter Selasky ==== //depot/projects/usb/src/sys/dev/usb2/controller/at91dci_atmelarm.c#9 (text+ko) ==== @@ -1,5 +1,5 @@ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_udp.c $"); +__FBSDID("$FreeBSD$"); /*- * Copyright (c) 2007-2008 Hans Petter Selasky. All rights reserved. ==== //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.c#12 (text+ko) ==== @@ -44,7 +44,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ehci.c,v 1.64 2008/06/10 02:41:36 kevlo Exp $"); +__FBSDID("$FreeBSD$"); #include #include ==== //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.h#5 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. * All rights reserved. ==== //depot/projects/usb/src/sys/dev/usb2/controller/ehci2_pci.c#9 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ehci_pci.c,v 1.32 2008/04/11 05:50:53 benno Exp $"); +__FBSDID("$FreeBSD$"); /* * USB Enhanced Host Controller Driver, a.k.a. USB 2.0 controller. ==== //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.c#9 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.h#4 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#3 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.c#11 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ohci.c,v 1.172 2008/05/13 20:58:08 marius Exp $"); +__FBSDID("$FreeBSD$"); /* * USB Open Host Controller driver. ==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.h#4 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. ==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_atmelarm.c#7 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/ohci_atmelarm.c,v 1.4 2007/10/29 21:01:50 imp Exp $"); +__FBSDID("$FreeBSD$"); #include #include ==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_pci.c#7 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ohci_pci.c,v 1.50 2007/06/21 14:42:33 imp Exp $"); +__FBSDID("$FreeBSD$"); /* * USB Open Host Controller driver. ==== //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.c#9 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/uhci.c,v 1.175 2007/06/14 16:23:31 imp Exp $"); +__FBSDID("$FreeBSD$"); /* * USB Universal Host Controller driver. ==== //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.h#4 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. ==== //depot/projects/usb/src/sys/dev/usb2/controller/uhci2_pci.c#7 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/uhci_pci.c,v 1.64 2008/04/11 05:50:53 benno Exp $"); +__FBSDID("$FreeBSD$"); /* Universal Host Controller Interface * ==== //depot/projects/usb/src/sys/dev/usb2/controller/usb2_bus.h#3 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.c#9 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.h#4 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/controller/usb2_pci.h#2 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.c#10 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky * All rights reserved. ==== //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.h#3 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2007 Hans Petter Selasky * All rights reserved. ==== //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci_pccard.c#7 (text+ko) ==== @@ -1,5 +1,5 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/uss820dci_pccard.c $"); +__FBSDID("$FreeBSD$"); /*- * Copyright (c) 2008 Hans Petter Selasky ==== //depot/projects/usb/src/sys/dev/usb2/core/README.TXT#3 (text+ko) ==== @@ -1,3 +1,5 @@ +$FreeBSD$ + DESCRIPTION OF THE NEW USB API The new USB 2.0 API consists of 5 functions. All transfer types are ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_busdma.c#4 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_busdma.h#2 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_compat_linux.c#10 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2007 Luigi Rizzo - Universita` di Pisa. All rights reserved. * Copyright (c) 2007 Hans Petter Selasky. All rights reserved. ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_compat_linux.h#6 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2007 Luigi Rizzo - Universita` di Pisa. All rights reserved. * Copyright (c) 2007 Hans Petter Selasky. All rights reserved. ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_config_td.c#7 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_config_td.h#2 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_core.c#5 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_core.h#18 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_debug.c#3 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_debug.h#5 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.c#26 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2006-2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.h#12 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#22 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.h#7 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_dynamic.c#3 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_dynamic.h#3 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_error.c#2 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#21 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.h#5 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_handle_request.c#7 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_handle_request.h#2 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_hid.c#5 (text+ko) ==== @@ -2,7 +2,7 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/hid.c,v 1.26 2006/03/22 02:04:12 iedowse Exp $"); +__FBSDID("$FreeBSD$"); /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_hid.h#6 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved. ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#15 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved. * Copyright (c) 1998 Lennart Augustsson. All rights reserved. ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.h#4 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_if.m#3 (text+ko) ==== @@ -24,6 +24,8 @@ # (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$ +# # USB interface description # ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_lookup.c#7 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_lookup.h#8 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_mbuf.c#2 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_mbuf.h#2 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_msctest.c#6 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_msctest.h#3 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_parse.c#3 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_parse.h#3 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_process.c#7 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_process.h#3 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.c#13 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved. * Copyright (c) 1998 Lennart Augustsson. All rights reserved. ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.h#5 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_sw_transfer.c#5 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_sw_transfer.h#2 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#23 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.h#6 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_util.c#5 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_util.h#4 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usbdevs#5 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.364 2008/08/11 03:57:31 weongyo Exp $ +$FreeBSD$ /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */ /*- ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_aue2.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_aue.c,v 1.118 2008/04/16 16:47:14 kris Exp $"); +__FBSDID("$FreeBSD$"); /* * ADMtek AN986 Pegasus and AN8511 Pegasus II USB to ethernet driver. ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_aue2_reg.h#4 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/usb/if_auereg.h,v 1.27 2007/01/08 23:24:21 alfred Exp $ + * $FreeBSD$ */ /* ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_axe2.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_axe.c,v 1.58 2008/05/13 14:00:09 cognet Exp $"); +__FBSDID("$FreeBSD$"); /* * ASIX Electronics AX88172/AX88178/AX88778 USB 2.0 ethernet driver. Used in the ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_axe2_reg.h#4 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/usb/if_axereg.h,v 1.17 2007/11/10 16:23:38 sam Exp $ + * $FreeBSD$ */ /* ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cdce2.c#6 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_cdce.c,v 1.25 2007/06/30 20:18:44 imp Exp $"); +__FBSDID("$FreeBSD$"); #include #include ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cdce2_reg.h#3 (text+ko) ==== @@ -29,7 +29,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/dev/usb/if_cdcereg.h,v 1.8 2007/06/10 07:33:48 imp Exp $ + * $FreeBSD$ */ #ifndef _USB_IF_CDCEREG_H_ ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cue2.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_cue.c,v 1.72 2007/06/23 06:29:19 imp Exp $"); +__FBSDID("$FreeBSD$"); /* * CATC USB-EL1210A USB to ethernet driver. Used in the CATC Netmate ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cue2_reg.h#4 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/usb/if_cuereg.h,v 1.20 2007/06/11 05:42:47 imp Exp $ + * $FreeBSD$ */ /* ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kue2.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_kue.c,v 1.82 2007/06/23 06:47:43 imp Exp $"); +__FBSDID("$FreeBSD$"); /* * Kawasaki LSI KL5KUSB101B USB to ethernet adapter driver. ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kue2_fw.h#3 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/usb/kue_fw.h,v 1.3 2005/01/06 01:43:27 imp Exp $ + * $FreeBSD$ */ /* ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kue2_reg.h#4 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/usb/if_kuereg.h,v 1.20 2007/06/11 05:50:47 imp Exp $ + * $FreeBSD$ */ /* ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_rue2.c#6 (text+ko) ==== @@ -57,7 +57,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_rue.c,v 1.40 2007/07/09 16:58:07 imp Exp $"); +__FBSDID("$FreeBSD$"); /* * RealTek RTL8150 USB to fast ethernet controller driver. ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_rue2_reg.h#4 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Sep 1 19:12:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 271121065685; Mon, 1 Sep 2008 19:12: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 DF75C106567D for ; Mon, 1 Sep 2008 19:12:02 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CA3B98FC1B for ; Mon, 1 Sep 2008 19:12:02 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m81JC2oo097591 for ; Mon, 1 Sep 2008 19:12:02 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m81JC2dT097589 for perforce@freebsd.org; Mon, 1 Sep 2008 19:12:02 GMT (envelope-from brooks@freebsd.org) Date: Mon, 1 Sep 2008 19:12:02 GMT Message-Id: <200809011912.m81JC2dT097589@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis To: Perforce Change Reviews Cc: Subject: PERFORCE change 149002 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Sep 2008 19:12:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=149002 Change 149002 by brooks@brooks_coredump on 2008/09/01 19:11:58 Don't make a non-style(9) compliant attempt to wrap a line that only gets the line to 80 chars. Affected files ... .. //depot/projects/vimage-commit2/src/sys/net/rtsock.c#10 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/net/rtsock.c#10 (text+ko) ==== @@ -415,8 +415,7 @@ case RTM_GET: case RTM_CHANGE: case RTM_LOCK: - rnh = - V_rt_tables[so->so_fibnum][info.rti_info[RTAX_DST]->sa_family]; + rnh = V_rt_tables[so->so_fibnum][info.rti_info[RTAX_DST]->sa_family]; if (rnh == NULL) senderr(EAFNOSUPPORT); RADIX_NODE_HEAD_LOCK(rnh); From owner-p4-projects@FreeBSD.ORG Mon Sep 1 19:31:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3681F1065673; Mon, 1 Sep 2008 19:31: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 EED2E1065670 for ; Mon, 1 Sep 2008 19:31:22 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D99968FC1C for ; Mon, 1 Sep 2008 19:31:22 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m81JVMmX099783 for ; Mon, 1 Sep 2008 19:31:22 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m81JVMtm099781 for perforce@freebsd.org; Mon, 1 Sep 2008 19:31:22 GMT (envelope-from brooks@freebsd.org) Date: Mon, 1 Sep 2008 19:31:22 GMT Message-Id: <200809011931.m81JVMtm099781@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis To: Perforce Change Reviews Cc: Subject: PERFORCE change 149005 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Sep 2008 19:31:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=149005 Change 149005 by brooks@brooks_coredump on 2008/09/01 19:30:59 Restore the origional locations of variable declerations. Affected files ... .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_input.c#12 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_input.c#12 (text+ko) ==== @@ -130,13 +130,11 @@ tcp_do_rfc3390, 0, "Enable RFC 3390 (Increasing TCP's Initial Congestion Window)"); +int tcp_do_ecn = 0; +int tcp_ecn_maxretries = 1; SYSCTL_NODE(_net_inet_tcp, OID_AUTO, ecn, CTLFLAG_RW, 0, "TCP ECN"); - -int tcp_do_ecn = 0; SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_ecn, OID_AUTO, enable, CTLFLAG_RW, tcp_do_ecn, 0, "TCP ECN support"); - -int tcp_ecn_maxretries = 1; SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_ecn, OID_AUTO, maxretries, CTLFLAG_RW, tcp_ecn_maxretries, 0, "Max retries before giving up on ECN"); From owner-p4-projects@FreeBSD.ORG Mon Sep 1 19:36:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D37AA1065670; Mon, 1 Sep 2008 19:36: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 810D31065695 for ; Mon, 1 Sep 2008 19:36:28 +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 6AA668FC18 for ; Mon, 1 Sep 2008 19:36:28 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m81JaS50000303 for ; Mon, 1 Sep 2008 19:36:28 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m81JaS60000301 for perforce@freebsd.org; Mon, 1 Sep 2008 19:36:28 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 1 Sep 2008 19:36:28 GMT Message-Id: <200809011936.m81JaS60000301@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 149007 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Sep 2008 19:36:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=149007 Change 149007 by hselasky@hselasky_laptop001 on 2008/09/01 19:36:21 Fix function name consistency. Change "stop" into "drain" because the "usb2_config_td_drain" will block/sleep until it is done. This gives the programmer some hints that this function should not be called with any mutexes locked. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2_pci.c#10 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_pci.c#8 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2_pci.c#8 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_config_td.c#8 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_config_td.h#3 edit .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_aue2.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_axe2.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cue2.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kue2.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_rue2.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_udav2.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.c#8 edit .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2.c#9 edit .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2.c#10 edit .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2.c#10 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/controller/ehci2_pci.c#10 (text+ko) ==== @@ -377,7 +377,7 @@ ehci_softc_t *sc = device_get_softc(self); device_t bdev; - usb2_config_td_stop(&sc->sc_config_td); + usb2_config_td_drain(&sc->sc_config_td); if (sc->sc_bus.bdev) { bdev = sc->sc_bus.bdev; ==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_pci.c#8 (text+ko) ==== @@ -321,7 +321,7 @@ ohci_softc_t *sc = device_get_softc(self); device_t bdev; - usb2_config_td_stop(&sc->sc_config_td); + usb2_config_td_drain(&sc->sc_config_td); if (sc->sc_bus.bdev) { bdev = sc->sc_bus.bdev; ==== //depot/projects/usb/src/sys/dev/usb2/controller/uhci2_pci.c#8 (text+ko) ==== @@ -374,7 +374,7 @@ uhci_softc_t *sc = device_get_softc(self); device_t bdev; - usb2_config_td_stop(&sc->sc_config_td); + usb2_config_td_drain(&sc->sc_config_td); if (sc->sc_bus.bdev) { bdev = sc->sc_bus.bdev; ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_config_td.c#8 (text+ko) ==== @@ -103,7 +103,7 @@ } /*------------------------------------------------------------------------* - * usb2_config_td_stop + * usb2_config_td_drain * * This function will tear down an USB config thread, waiting for the * currently executing command to return. @@ -112,7 +112,7 @@ * this function does nothing. *------------------------------------------------------------------------*/ void -usb2_config_td_stop(struct usb2_config_td *ctd) +usb2_config_td_drain(struct usb2_config_td *ctd) { DPRINTF("\n"); if (ctd->p_msgs) { @@ -132,7 +132,7 @@ { DPRINTF("\n"); - usb2_config_td_stop(ctd); + usb2_config_td_drain(ctd); if (ctd->p_msgs) { usb2_proc_unsetup(&ctd->usb2_proc); ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_config_td.h#3 (text+ko) ==== @@ -59,7 +59,7 @@ /* prototypes */ uint8_t usb2_config_td_setup(struct usb2_config_td *ctd, void *priv_sc, struct mtx *priv_mtx, usb2_config_td_end_of_commands_t *p_func_eoc, uint16_t item_size, uint16_t item_count); -void usb2_config_td_stop(struct usb2_config_td *ctd); +void usb2_config_td_drain(struct usb2_config_td *ctd); void usb2_config_td_unsetup(struct usb2_config_td *ctd); void usb2_config_td_queue_command(struct usb2_config_td *ctd, usb2_config_td_command_t *pre_func, usb2_config_td_command_t *post_func, uint16_t command_qcount, uint16_t command_ref); uint8_t usb2_config_td_is_gone(struct usb2_config_td *ctd); ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_aue2.c#7 (text+ko) ==== @@ -905,7 +905,7 @@ struct aue_softc *sc = device_get_softc(dev); struct ifnet *ifp; - usb2_config_td_stop(&sc->sc_config_td); + usb2_config_td_drain(&sc->sc_config_td); mtx_lock(&sc->sc_mtx); ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_axe2.c#7 (text+ko) ==== @@ -861,7 +861,7 @@ struct axe_softc *sc = device_get_softc(dev); struct ifnet *ifp; - usb2_config_td_stop(&sc->sc_config_td); + usb2_config_td_drain(&sc->sc_config_td); mtx_lock(&sc->sc_mtx); ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cue2.c#7 (text+ko) ==== @@ -509,7 +509,7 @@ struct cue_softc *sc = device_get_softc(dev); struct ifnet *ifp; - usb2_config_td_stop(&sc->sc_config_td); + usb2_config_td_drain(&sc->sc_config_td); mtx_lock(&sc->sc_mtx); ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kue2.c#7 (text+ko) ==== @@ -578,7 +578,7 @@ struct kue_softc *sc = device_get_softc(dev); struct ifnet *ifp; - usb2_config_td_stop(&sc->sc_config_td); + usb2_config_td_drain(&sc->sc_config_td); mtx_lock(&sc->sc_mtx); ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_rue2.c#7 (text+ko) ==== @@ -784,7 +784,7 @@ struct rue_softc *sc = device_get_softc(dev); struct ifnet *ifp; - usb2_config_td_stop(&sc->sc_config_td); + usb2_config_td_drain(&sc->sc_config_td); mtx_lock(&sc->sc_mtx); ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_udav2.c#7 (text+ko) ==== @@ -400,7 +400,7 @@ struct udav_softc *sc = device_get_softc(dev); struct ifnet *ifp; - usb2_config_td_stop(&sc->sc_config_td); + usb2_config_td_drain(&sc->sc_config_td); mtx_lock(&sc->sc_mtx); ==== //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.c#8 (text+ko) ==== @@ -278,7 +278,7 @@ { uint32_t n; - usb2_config_td_stop(&ssc->sc_config_td); + usb2_config_td_drain(&ssc->sc_config_td); for (n = 0; n < sub_units; n++, sc++) { if (sc->sc_flag & UCOM_FLAG_ATTACHED) { ==== //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2.c#9 (text+ko) ==== @@ -500,7 +500,7 @@ struct ieee80211com *ic; struct ifnet *ifp; - usb2_config_td_stop(&sc->sc_config_td); + usb2_config_td_drain(&sc->sc_config_td); mtx_lock(&sc->sc_mtx); ==== //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2.c#10 (text+ko) ==== @@ -495,7 +495,7 @@ struct ieee80211com *ic; struct ifnet *ifp; - usb2_config_td_stop(&sc->sc_config_td); + usb2_config_td_drain(&sc->sc_config_td); mtx_lock(&sc->sc_mtx); ==== //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2.c#10 (text+ko) ==== @@ -2032,7 +2032,7 @@ struct ieee80211com *ic; struct ifnet *ifp; - usb2_config_td_stop(&sc->sc_config_td); + usb2_config_td_drain(&sc->sc_config_td); mtx_lock(&sc->sc_mtx); From owner-p4-projects@FreeBSD.ORG Mon Sep 1 19:37:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0A85A1065673; Mon, 1 Sep 2008 19:37:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C235F1065687 for ; Mon, 1 Sep 2008 19:37:29 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9268D8FC30 for ; Mon, 1 Sep 2008 19:37:29 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m81JbTvt000378 for ; Mon, 1 Sep 2008 19:37:29 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m81JbTac000376 for perforce@freebsd.org; Mon, 1 Sep 2008 19:37:29 GMT (envelope-from brooks@freebsd.org) Date: Mon, 1 Sep 2008 19:37:29 GMT Message-Id: <200809011937.m81JbTac000376@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis To: Perforce Change Reviews Cc: Subject: PERFORCE change 149008 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Sep 2008 19:37:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=149008 Change 149008 by brooks@brooks_coredump on 2008/09/01 19:37:23 Fix mis-merge. Don't include socket.h twice. Affected files ... .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_diskless.c#7 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_diskless.c#7 (text+ko) ==== @@ -45,7 +45,6 @@ #include #include -#include #include #include #include From owner-p4-projects@FreeBSD.ORG Mon Sep 1 19:39:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 214CF1065678; Mon, 1 Sep 2008 19:39: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 D75B71065680 for ; Mon, 1 Sep 2008 19:39:31 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C1B5B8FC1D for ; Mon, 1 Sep 2008 19:39:31 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m81JdVcW000510 for ; Mon, 1 Sep 2008 19:39:31 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m81JdVc8000508 for perforce@freebsd.org; Mon, 1 Sep 2008 19:39:31 GMT (envelope-from brooks@freebsd.org) Date: Mon, 1 Sep 2008 19:39:31 GMT Message-Id: <200809011939.m81JdVc8000508@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis To: Perforce Change Reviews Cc: Subject: PERFORCE change 149009 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Sep 2008 19:39:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=149009 Change 149009 by brooks@brooks_coredump on 2008/09/01 19:39:05 Don't remove style(9) required blank line after declerations when there aren't any. Affected files ... .. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#12 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#9 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#12 (text+ko) ==== @@ -1213,6 +1213,7 @@ void ipport_tick(void *xtp) { + VNET_ITERLOOP_BEGIN(); INIT_VNET_INET(curvnet); if (V_ipport_tcpallocs <= V_ipport_tcplastcount + V_ipport_randomcps) { ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#9 (text+ko) ==== @@ -808,6 +808,7 @@ void tcp_drain(void) { + if (do_tcpdrain) { VNET_ITERLOOP_BEGIN(); INIT_VNET_INET(vnet_iter); From owner-p4-projects@FreeBSD.ORG Mon Sep 1 19:40:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 57BAF106567C; Mon, 1 Sep 2008 19: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 1B8C31065675 for ; Mon, 1 Sep 2008 19:40:33 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 05FCE8FC1B for ; Mon, 1 Sep 2008 19:40:33 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m81JeWNI000634 for ; Mon, 1 Sep 2008 19:40:32 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m81JeW3j000631 for perforce@freebsd.org; Mon, 1 Sep 2008 19:40:32 GMT (envelope-from brooks@freebsd.org) Date: Mon, 1 Sep 2008 19:40:32 GMT Message-Id: <200809011940.m81JeW3j000631@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis To: Perforce Change Reviews Cc: Subject: PERFORCE change 149010 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Sep 2008 19:40:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=149010 Change 149010 by brooks@brooks_coredump on 2008/09/01 19:39:47 Avoid unnecssicary white space changes. Affected files ... .. //depot/projects/vimage-commit2/src/sys/net/if_gif.c#8 edit .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211.c#7 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#16 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_src.c#8 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/net/if_gif.c#8 (text+ko) ==== @@ -50,7 +50,6 @@ #include #include #include - #include #include @@ -147,7 +146,7 @@ static int parallel_tunnels = 0; #endif SYSCTL_V_INT(V_NET, vnet_gif, _net_link_gif, OID_AUTO, parallel_tunnels, - CTLFLAG_RW, parallel_tunnels, 0, "Allow parallel tunnels?"); + CTLFLAG_RW, parallel_tunnels, 0, "Allow parallel tunnels?"); /* copy from src/sys/net/if_ethersubr.c */ static const u_char etherbroadcastaddr[ETHER_ADDR_LEN] = ==== //depot/projects/vimage-commit2/src/sys/net80211/ieee80211.c#7 (text+ko) ==== @@ -35,6 +35,7 @@ #include #include #include + #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#16 (text+ko) ==== @@ -65,7 +65,6 @@ #include #include #include - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet6/in6_src.c#8 (text+ko) ==== @@ -95,7 +95,6 @@ #include #include #include - #include #include #include From owner-p4-projects@FreeBSD.ORG Mon Sep 1 20:18:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 908371065685; Mon, 1 Sep 2008 20:18: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 54B08106567D for ; Mon, 1 Sep 2008 20:18:12 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3E48E8FC17 for ; Mon, 1 Sep 2008 20:18:12 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m81KICbu006229 for ; Mon, 1 Sep 2008 20:18:12 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m81KICKF006227 for perforce@freebsd.org; Mon, 1 Sep 2008 20:18:12 GMT (envelope-from trasz@freebsd.org) Date: Mon, 1 Sep 2008 20:18:12 GMT Message-Id: <200809012018.m81KICKF006227@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 149014 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Sep 2008 20:18:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=149014 Change 149014 by trasz@trasz_traszkan on 2008/09/01 20:18:09 Update comments. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#25 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#25 (text+ko) ==== @@ -50,6 +50,7 @@ #define NFS4_ACL_EXTATTR_NAMESPACE EXTATTR_NAMESPACE_SYSTEM #define NFS4_ACL_EXTATTR_NAME "nfs4.acl" #define OLDACL_MAX_ENTRIES 32 + /* * With 204 entries, "struct acl" is exactly one page big. * Note that with NFS4 ACLs, the maximum number of ACL entries one @@ -78,7 +79,6 @@ }; typedef struct oldacl_entry *oldacl_entry_t; -/* internal ACL structure */ struct oldacl { int acl_cnt; struct oldacl_entry acl_entry[OLDACL_MAX_ENTRIES]; @@ -106,16 +106,30 @@ }; typedef struct acl_entry *acl_entry_t; -/* internal ACL structure */ +/* + * Internal ACL structure, used in libc, kernel APIs and for on-disk + * storage of NFS4 ACLs. POSIX.1e ACLs use "struct oldacl" for on-disk + * storage. + */ struct acl { int acl_magic; int acl_cnt; int acl_length; + /* + * acl_brand is for libc internal bookkeeping only. + * Applications should use acl_get_brand_np(3). + * Kernel code should use the "type" argument passed + * to VOP_SETACL, VOP_GETACL or VOP_ACLCHECK calls; + * ACL_TYPE_ACCESS or ACL_TYPE_DEFAULT mean POSIX.1e + * ACL, ACL_TYPE_NFS4 means NFS4 ACL. + */ int acl_brand; struct acl_entry acl_entry[ACL_MAX_ENTRIES]; }; -/* external ACL structure */ +/* + * External ACL structure, used in API for userland applications (acl(3)). + */ struct acl_t_struct { struct acl ats_acl; int ats_cur_entry; @@ -132,7 +146,7 @@ #define ACL_BRAND_NFS4 2 /* - * Possible valid values for ae_tag field. + * Possible valid values for ae_tag field. For explanation, see acl(9). */ #define ACL_UNDEFINED_TAG 0x00000000 #define ACL_USER_OBJ 0x00000001 @@ -153,7 +167,8 @@ #define ACL_EXTENDED_ALARM 0x00000800 /* - * Possible valid values for acl_type_t arguments. + * Possible valid values for acl_type_t arguments. First two + * are provided only for backwards binary compatibility. */ #define ACL_TYPE_ACCESS_OLD 0x00000000 #define ACL_TYPE_DEFAULT_OLD 0x00000001 @@ -223,8 +238,8 @@ */ #define ACL_ENTRY_FILE_INHERIT 0x00000001 #define ACL_ENTRY_DIRECTORY_INHERIT 0x00000002 -#define ACL_ENTRY_LIMIT_INHERIT 0x00000004 /* NO_PROPAGATE_INHERIT */ -#define ACL_ENTRY_ONLY_INHERIT 0x00000008 /* INHERIT_ONLY */ +#define ACL_ENTRY_LIMIT_INHERIT 0x00000004 /* "NO_PROPAGATE_INHERIT" */ +#define ACL_ENTRY_ONLY_INHERIT 0x00000008 /* "INHERIT_ONLY" */ #define ACL_ENTRY_SUCCESSFUL_ACCESS 0x00000010 #define ACL_ENTRY_FAILED_ACCESS 0x00000020 #define ACL_ENTRY_INHERITED 0x00000080 /* Currently unused. */ @@ -234,7 +249,8 @@ ACL_ENTRY_FAILED_ACCESS) /* - * Undefined value in ae_id field + * Undefined value in ae_id field. ae_id should be set to this value + * iff ae_tag is ACL_USER_OBJ, ACL_GROUP_OBJ, ACL_OTHER or ACL_EVERYONE. */ #define ACL_UNDEFINED_ID ((uid_t)-1) @@ -256,7 +272,7 @@ #ifdef _KERNEL /* - * File system independent code to move back and forth between POSIX mode and + * Filesystem-independent code to move back and forth between POSIX mode and * POSIX.1e ACL representations. */ acl_perm_t acl_posix1e_mode_to_perm(acl_tag_t tag, mode_t mode); @@ -286,7 +302,7 @@ struct oldacl *dest); /* - * File system independent syntax check for a POSIX.1e ACL. + * Filesystem-independent syntax check for a POSIX.1e ACL. */ int acl_posix1e_check(struct acl *acl); int acl_nfs4_check(const struct acl *aclp, int is_directory); @@ -298,7 +314,7 @@ /* * Syscall interface -- use the library calls instead as the syscalls have - * strict acl entry ordering requirements. + * strict ACL entry ordering requirements. */ __BEGIN_DECLS int __acl_aclcheck_fd(int _filedes, acl_type_t _type, struct acl *_aclp); From owner-p4-projects@FreeBSD.ORG Mon Sep 1 20:39:34 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 85C7C1065679; Mon, 1 Sep 2008 20:39:34 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 485DB1065671 for ; Mon, 1 Sep 2008 20:39:34 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3220C8FC17 for ; Mon, 1 Sep 2008 20:39:34 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m81KdYTU008215 for ; Mon, 1 Sep 2008 20:39:34 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m81KdY7F008213 for perforce@freebsd.org; Mon, 1 Sep 2008 20:39:34 GMT (envelope-from trasz@freebsd.org) Date: Mon, 1 Sep 2008 20:39:34 GMT Message-Id: <200809012039.m81KdY7F008213@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 149016 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Sep 2008 20:39:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=149016 Change 149016 by trasz@trasz_traszkan on 2008/09/01 20:39:02 Wrap too long lines. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#32 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#32 (text+ko) ==== @@ -238,13 +238,15 @@ !priv_check_cred(cred, PRIV_VFS_WRITE, 0)) priv_granted |= (VWRITE | VAPPEND | VDELETE_CHILD); - if ((acc_mode & VADMIN_PERMS) && !priv_check_cred(cred, PRIV_VFS_ADMIN, 0)) + if ((acc_mode & VADMIN_PERMS) && + !priv_check_cred(cred, PRIV_VFS_ADMIN, 0)) priv_granted |= VADMIN_PERMS; /* * XXX: PRIV_VFS_STAT? */ - if ((acc_mode & VSTAT_PERMS) && !priv_check_cred(cred, PRIV_VFS_READ, 0)) + if ((acc_mode & VSTAT_PERMS) && + !priv_check_cred(cred, PRIV_VFS_READ, 0)) priv_granted |= VSTAT_PERMS; if ((acc_mode & priv_granted) == acc_mode) { @@ -392,7 +394,8 @@ * ACL_ENTRY_LIMIT_INHERIT. */ copy->ae_flags &= ~(ACL_ENTRY_FILE_INHERIT | - ACL_ENTRY_DIRECTORY_INHERIT | ACL_ENTRY_LIMIT_INHERIT); + ACL_ENTRY_DIRECTORY_INHERIT | + ACL_ENTRY_LIMIT_INHERIT); /* * The algorithm continues on with the second ACE. From owner-p4-projects@FreeBSD.ORG Mon Sep 1 21:08:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D47241065672; Mon, 1 Sep 2008 21:08: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 9798D106566C for ; Mon, 1 Sep 2008 21:08:03 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7F1DD8FC1E for ; Mon, 1 Sep 2008 21:08:03 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m81L83at020961 for ; Mon, 1 Sep 2008 21:08:03 GMT (envelope-from konrad@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m81L83GC020959 for perforce@freebsd.org; Mon, 1 Sep 2008 21:08:03 GMT (envelope-from konrad@FreeBSD.org) Date: Mon, 1 Sep 2008 21:08:03 GMT Message-Id: <200809012108.m81L83GC020959@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to konrad@FreeBSD.org using -f From: Konrad Jankowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 149020 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Sep 2008 21:08:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=149020 Change 149020 by konrad@vspredator on 2008/09/01 21:07:06 ifc Affected files ... .. //depot/projects/soc2008/konrad_collation/libc/include/libc_private.h#5 integrate .. //depot/projects/soc2008/konrad_collation/libc/locale/collate.c#9 edit .. //depot/projects/soc2008/konrad_collation/libc/stdlib/Makefile.inc#5 integrate .. //depot/projects/soc2008/konrad_collation/libc/stdlib/Symbol.map#5 integrate .. //depot/projects/soc2008/konrad_collation/libc/stdlib/malloc.3#5 integrate .. //depot/projects/soc2008/konrad_collation/libc/stdlib/malloc.c#6 integrate .. //depot/projects/soc2008/konrad_collation/libc/stdlib/ptsname.3#1 branch .. //depot/projects/soc2008/konrad_collation/libc/stdlib/ptsname.c#1 branch .. //depot/projects/soc2008/konrad_collation/libc/sys/Makefile.inc#5 integrate .. //depot/projects/soc2008/konrad_collation/libc/sys/Symbol.map#5 integrate .. //depot/projects/soc2008/konrad_collation/libc/sys/execve.2#5 integrate .. //depot/projects/soc2008/konrad_collation/libc/sys/getrlimit.2#5 integrate .. //depot/projects/soc2008/konrad_collation/libc/sys/posix_openpt.2#1 branch .. //depot/projects/soc2008/konrad_collation/libc/sys/wait.2#5 integrate Differences ... ==== //depot/projects/soc2008/konrad_collation/libc/include/libc_private.h#5 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/include/libc_private.h,v 1.19 2008/06/23 05:22:06 ed Exp $ + * $FreeBSD: src/lib/libc/include/libc_private.h,v 1.20 2008/08/27 02:00:53 jasone Exp $ * * Private definitions for libc, libc_r and libpthread. * @@ -158,6 +158,12 @@ extern const char *__progname; /* + * This function is used by the threading libraries to notify malloc that a + * thread is exiting. + */ +void _malloc_thread_cleanup(void); + +/* * These functions are used by the threading libraries in order to protect * malloc across fork(). */ ==== //depot/projects/soc2008/konrad_collation/libc/locale/collate.c#9 (text+ko) ==== @@ -128,7 +128,7 @@ } #if _BYTE_ORDER == _LITTLE_ENDIAN for(z = 0; z < info.directive_count; z++) { - info.undef_pri[z] = ntohl(info.undef_pri[z]); + info.undef_pri.pri[z] = ntohl(info.undef_pri.pri[z]); info.subst_count[z] = ntohl(info.subst_count[z]); } info.chain_count = ntohl(info.chain_count); @@ -220,10 +220,11 @@ } { struct __collate_st_chain_pri *p = TMP->__chain_pri_table; + for(i = chains; i-- > 0; p++) { wntohl(p->str, STR_LEN); for(z = 0; z < info.directive_count; z++) - p->pri[z] = ntohl(p->pri[z]); + p->pri.pri[z] = ntohl(p->pri.pri[z]); } } if (info.large_pri_count > 0) { @@ -239,7 +240,7 @@ (void)strcpy(TMP->__encoding, encoding); (void)memcpy(&TMP->__info, &info, sizeof(info)); __collate_data = TMP; - + __collate_load_error = (info.subst_count[0] > 0 || info.subst_count[1] > 0); __collate_load_error = 0; @@ -328,6 +329,7 @@ s++; } dest_str[len] = 0; + return (dest_str); } @@ -357,9 +359,11 @@ else high = next - 1; } + return NULL; } +/* XXX maybe just return struct __collate_st_char_pri? */ static struct __collate_st_large_char_pri * largesearch(const wchar_t key) { @@ -381,15 +385,21 @@ else high = next - 1; } + return NULL; } +#if 0 void __collate_lookup(const wchar_t *t, int *len, int *prim, int *sec) { struct __collate_st_chain_pri *p2; int l; + /* + * I didn't fix this function, as it is anyway uselesess in multiple + * weight collation. + */ *len = 1; *prim = *sec = 0; p2 = chainsearch(t, &l); @@ -417,38 +427,52 @@ *prim = (l = __collate_info->undef_pri[0]) >= 0 ? l : *t - l; *sec = (l = __collate_info->undef_pri[1]) >= 0 ? l : *t - l; } +#endif -void -__collate_lookup_which(const wchar_t *t, int *len, int *pri, int which) +struct __collate_st_char_pri * +__collate_lookup(const wchar_t *t, int *len) { struct __collate_st_chain_pri *p2; - int p, l; + struct __collate_st_large_char_pri *match; + int l; *len = 1; - *pri = 0; p2 = chainsearch(t, &l); if (p2) { + fprintf(stderr, "vsdebug: chainsearch succeeded"); + *len = l; + + return &p2->pri; +#if 0 + int p; + p = p2->pri[which]; /* use the chain if pri >= 0 */ if (p >= 0) { *len = l; *pri = p; + return; } +#endif } if (*t <= UCHAR_MAX) { +#if 0 *pri = __collate_char_pri_table[*t].pri[which]; - return; +#endif + return &__collate_char_pri_table[*t]; } if (__collate_info->large_pri_count > 0) { - struct __collate_st_large_char_pri *match; + match = largesearch(*t); if (match) { - *pri = match->pri.pri[which]; - return; + return &match->pri; } } +#if 0 *pri = (l = __collate_info->undef_pri[which]) >= 0 ? l : *t - l; +#endif + return &__collate_info->undef_pri; } wchar_t * @@ -482,6 +506,7 @@ if ((wcs = (wchar_t *)malloc(len * sizeof(wchar_t))) == NULL) __collate_err(EX_OSERR, __func__); wcscpy(wcs, s); + return (wcs); } @@ -722,9 +747,10 @@ if (__collate_info->chain_count > 0) { struct __collate_st_chain_pri *match; int ll; + match = chainsearch(wname, &ll); if (match) { - e = match->pri[0]; + e = match->pri.pri[0]; if (e == 0) return IGNORE_EQUIV_CLASS; return e < 0 ? -e : e; @@ -786,7 +812,8 @@ } *wp = 0; if (len > 1 && (ch = chainsearch(buf, &i)) != NULL) { - int e = ch->pri[0]; + int e = ch->pri.pri[0]; + if (e < 0) e = -e; if (e == equiv_class) ==== //depot/projects/soc2008/konrad_collation/libc/stdlib/Makefile.inc#5 (text+ko) ==== @@ -1,14 +1,14 @@ # from @(#)Makefile.inc 8.3 (Berkeley) 2/4/95 -# $FreeBSD: src/lib/libc/stdlib/Makefile.inc,v 1.54 2007/07/04 00:00:39 scf Exp $ +# $FreeBSD: src/lib/libc/stdlib/Makefile.inc,v 1.55 2008/08/20 08:31:58 ed Exp $ # machine-independent stdlib sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/stdlib ${.CURDIR}/stdlib MISRCS+=_Exit.c a64l.c abort.c abs.c atexit.c atof.c atoi.c atol.c atoll.c \ bsearch.c div.c exit.c getenv.c getopt.c getopt_long.c \ - getsubopt.c grantpt.c hcreate.c heapsort.c imaxabs.c imaxdiv.c \ + getsubopt.c hcreate.c heapsort.c imaxabs.c imaxdiv.c \ insque.c l64a.c labs.c ldiv.c llabs.c lldiv.c lsearch.c malloc.c \ - merge.c qsort.c qsort_r.c radixsort.c rand.c random.c \ + merge.c ptsname.c qsort.c qsort_r.c radixsort.c rand.c random.c \ reallocf.c realpath.c remque.c strfmon.c strtoimax.c \ strtol.c strtoll.c strtoq.c strtoul.c strtonum.c strtoull.c \ strtoumax.c strtouq.c system.c tdelete.c tfind.c tsearch.c twalk.c @@ -21,10 +21,10 @@ .endif MAN+= a64l.3 abort.3 abs.3 alloca.3 atexit.3 atof.3 atoi.3 atol.3 bsearch.3 \ - div.3 exit.3 getenv.3 getopt.3 getopt_long.3 getsubopt.3 grantpt.3 \ + div.3 exit.3 getenv.3 getopt.3 getopt_long.3 getsubopt.3 \ hcreate.3 imaxabs.3 imaxdiv.3 insque.3 labs.3 ldiv.3 llabs.3 lldiv.3 \ - lsearch.3 malloc.3 memory.3 posix_memalign.3 qsort.3 radixsort.3 \ - rand.3 random.3 \ + lsearch.3 malloc.3 memory.3 posix_memalign.3 ptsname.3 qsort.3 \ + radixsort.3 rand.3 random.3 \ realpath.3 strfmon.3 strtod.3 strtol.3 strtonum.3 strtoul.3 system.3 \ tsearch.3 @@ -33,10 +33,10 @@ MLINKS+=exit.3 _Exit.3 MLINKS+=getenv.3 putenv.3 getenv.3 setenv.3 getenv.3 unsetenv.3 MLINKS+=getopt_long.3 getopt_long_only.3 -MLINKS+=grantpt.3 posix_openpt.3 grantpt.3 ptsname.3 grantpt.3 unlockpt.3 MLINKS+=hcreate.3 hdestroy.3 hcreate.3 hsearch.3 MLINKS+=insque.3 remque.3 MLINKS+=lsearch.3 lfind.3 +MLINKS+=ptsname.3 grantpt.3 ptsname.3 unlockpt.3 MLINKS+=qsort.3 heapsort.3 qsort.3 mergesort.3 qsort.3 qsort_r.3 MLINKS+=rand.3 rand_r.3 rand.3 srand.3 rand.3 sranddev.3 MLINKS+=random.3 initstate.3 random.3 setstate.3 random.3 srandom.3 \ ==== //depot/projects/soc2008/konrad_collation/libc/stdlib/Symbol.map#5 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/stdlib/Symbol.map,v 1.7 2008/06/17 14:05:03 ed Exp $ + * $FreeBSD: src/lib/libc/stdlib/Symbol.map,v 1.9 2008/08/27 02:00:53 jasone Exp $ */ FBSD_1.0 { @@ -30,7 +30,6 @@ suboptarg; getsubopt; grantpt; - posix_openpt; ptsname; unlockpt; hcreate; @@ -94,6 +93,7 @@ }; FBSDprivate_1.0 { + _malloc_thread_cleanup; _malloc_prefork; _malloc_postfork; __system; ==== //depot/projects/soc2008/konrad_collation/libc/stdlib/malloc.3#5 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)malloc.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdlib/malloc.3,v 1.78 2008/02/17 17:09:24 jasone Exp $ +.\" $FreeBSD: src/lib/libc/stdlib/malloc.3,v 1.79 2008/08/27 02:00:53 jasone Exp $ .\" -.Dd February 17, 2008 +.Dd August 26, 2008 .Dt MALLOC 3 .Os .Sh NAME @@ -154,7 +154,7 @@ implementation-dependent. .Sh TUNING Once, when the first call is made to one of these memory allocation -routines, various flags will be set or reset, which affect the +routines, various flags will be set or reset, which affects the workings of this allocator implementation. .Pp The @@ -196,6 +196,11 @@ Therefore, some applications may benefit from increasing or decreasing this threshold parameter. This option is not available for some configurations (non-PIC). +.It C +Double/halve the size of the maximum size class that is a multiple of the +cacheline size (64). +Above this size, subpage spacing (256 bytes) is used for size classes. +The default value is 512 bytes. .It D Use .Xr sbrk 2 @@ -214,6 +219,16 @@ The default is 512 pages per arena; .Ev MALLOC_OPTIONS=10f will prevent any dirty unused pages from accumulating. +.It G +When there are multiple threads, use thread-specific caching for objects that +are smaller than one page. +This option is enabled by default. +Thread-specific caching allows many allocations to be satisfied without +performing any thread synchronization, at the cost of increased memory use. +See the +.Dq R +option for related tuning information. +This option is not available for some configurations (non-PIC). .It J Each byte of new memory allocated by .Fn malloc , @@ -248,7 +263,7 @@ acquiring memory. .It N Double/halve the number of arenas. -The default number of arenas is four times the number of CPUs, or one if there +The default number of arenas is two times the number of CPUs, or one if there is a single CPU. .It P Various statistics are printed at program exit via an @@ -259,14 +274,18 @@ Therefore, this option should only be used with care; it is primarily intended as a performance tuning aid during application development. .It Q -Double/halve the size of the allocation quantum. -The default quantum is the minimum allowed by the architecture (typically 8 or -16 bytes). -.It S Double/halve the size of the maximum size class that is a multiple of the -quantum. -Above this size, power-of-two spacing is used for size classes. -The default value is 512 bytes. +quantum (8 or 16 bytes, depending on architecture). +Above this size, cacheline spacing is used for size classes. +The default value is 128 bytes. +.It R +Double/halve magazine size, which approximately doubles/halves the number of +rounds in each magazine. +Magazines are used by the thread-specific caching machinery to acquire and +release objects in bulk. +Increasing the magazine size decreases locking overhead, at the expense of +increased memory usage. +This option is not available for some configurations (non-PIC). .It U Generate .Dq utrace @@ -358,6 +377,13 @@ However, it may make sense to reduce the number of arenas if an application does not make much use of the allocation functions. .Pp +In addition to multiple arenas, this allocator supports thread-specific +caching for small objects (smaller than one page), in order to make it +possible to completely avoid synchronization for most small allocation requests. +Such caching allows very fast allocation in the common case, but it increases +memory usage and fragmentation, since a bounded number of objects can remain +allocated in each thread cache. +.Pp Memory is conceptually broken into equal-sized chunks, where the chunk size is a power of two that is greater than the page size. Chunks are always aligned to multiples of the chunk size. @@ -366,7 +392,7 @@ .Pp User objects are broken into three categories according to size: small, large, and huge. -Small objects are no larger than one half of a page. +Small objects are smaller than one page. Large objects are smaller than the chunk size. Huge objects are a multiple of the chunk size. Small and large objects are managed by arenas; huge objects are managed @@ -378,23 +404,24 @@ contiguous pages (unused, backing a set of small objects, or backing one large object). The combination of chunk alignment and chunk page maps makes it possible to -determine all metadata regarding small and large allocations in -constant and logarithmic time, respectively. +determine all metadata regarding small and large allocations in constant time. .Pp Small objects are managed in groups by page runs. Each run maintains a bitmap that tracks which regions are in use. -Allocation requests that are no more than half the quantum (see the +Allocation requests that are no more than half the quantum (8 or 16, depending +on architecture) are rounded up to the nearest power of two. +Allocation requests that are more than half the quantum, but no more than the +minimum cacheline-multiple size class (see the .Dq Q -option) are rounded up to the nearest power of two (typically 2, 4, or 8). -Allocation requests that are more than half the quantum, but no more than the -maximum quantum-multiple size class (see the -.Dq S option) are rounded up to the nearest multiple of the quantum. -Allocation requests that are larger than the maximum quantum-multiple size -class, but no larger than one half of a page, are rounded up to the nearest -power of two. -Allocation requests that are larger than half of a page, but small enough to -fit in an arena-managed chunk (see the +Allocation requests that are more than the minumum cacheline-multiple size +class, but no more than the minimum subpage-multiple size class (see the +.Dq C +option) are rounded up to the nearest multiple of the cacheline size (64). +Allocation requests that are more than the minimum subpage-multiple size class +are rounded up to the nearest multiple of the subpage size (256). +Allocation requests that are more than one page, but small enough to fit in +an arena-managed chunk (see the .Dq K option), are rounded up to the nearest run size. Allocation requests that are too large to fit in an arena-managed chunk are @@ -402,8 +429,8 @@ .Pp Allocations are packed tightly together, which can be an issue for multi-threaded applications. -If you need to assure that allocations do not suffer from cache line sharing, -round your allocation requests up to the nearest multiple of the cache line +If you need to assure that allocations do not suffer from cacheline sharing, +round your allocation requests up to the nearest multiple of the cacheline size. .Sh DEBUGGING MALLOC PROBLEMS The first thing to do is to set the ==== //depot/projects/soc2008/konrad_collation/libc/stdlib/malloc.c#6 (text+ko) ==== @@ -35,6 +35,9 @@ * + Multiple arenas are used if there are multiple CPUs, which reduces lock * contention and cache sloshing. * + * + Thread-specific caching is used if there are multiple threads, which + * reduces the amount of locking. + * * + Cache line sharing between arenas is avoided for internal data * structures. * @@ -48,37 +51,49 @@ * and a 16 byte quantum on a 32-bit system, the size classes in each category * are as follows: * - * |=====================================| - * | Category | Subcategory | Size | - * |=====================================| - * | Small | Tiny | 2 | - * | | | 4 | - * | | | 8 | - * | |----------------+---------| - * | | Quantum-spaced | 16 | - * | | | 32 | - * | | | 48 | - * | | | ... | - * | | | 480 | - * | | | 496 | - * | | | 512 | - * | |----------------+---------| - * | | Sub-page | 1 kB | - * | | | 2 kB | - * |=====================================| - * | Large | 4 kB | - * | | 8 kB | - * | | 12 kB | - * | | ... | - * | | 1012 kB | - * | | 1016 kB | - * | | 1020 kB | - * |=====================================| - * | Huge | 1 MB | - * | | 2 MB | - * | | 3 MB | - * | | ... | - * |=====================================| + * |=======================================| + * | Category | Subcategory | Size | + * |=======================================| + * | Small | Tiny | 2 | + * | | | 4 | + * | | | 8 | + * | |------------------+---------| + * | | Quantum-spaced | 16 | + * | | | 32 | + * | | | 48 | + * | | | ... | + * | | | 96 | + * | | | 112 | + * | | | 128 | + * | |------------------+---------| + * | | Cacheline-spaced | 192 | + * | | | 256 | + * | | | 320 | + * | | | 384 | + * | | | 448 | + * | | | 512 | + * | |------------------+---------| + * | | Sub-page | 760 | + * | | | 1024 | + * | | | 1280 | + * | | | ... | + * | | | 3328 | + * | | | 3584 | + * | | | 3840 | + * |=======================================| + * | Large | 4 kB | + * | | 8 kB | + * | | 12 kB | + * | | ... | + * | | 1012 kB | + * | | 1016 kB | + * | | 1020 kB | + * |=======================================| + * | Huge | 1 MB | + * | | 2 MB | + * | | 3 MB | + * | | ... | + * |=======================================| * * A different mechanism is used for each category: * @@ -113,6 +128,19 @@ #endif /* + * MALLOC_TINY enables support for tiny objects, which are smaller than one + * quantum. + */ +#define MALLOC_TINY + +/* + * MALLOC_MAG enables a magazine-based thread-specific caching layer for small + * objects. This makes it possible to allocate/deallocate objects without any + * locking when the cache is in the steady state. + */ +#define MALLOC_MAG + +/* * MALLOC_BALANCE enables monitoring of arena lock contention and dynamically * re-balances arena load if exponentially averaged contention exceeds a * certain threshold. @@ -128,7 +156,7 @@ #define MALLOC_DSS #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.176 2008/08/14 17:31:42 jasone Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.177 2008/08/27 02:00:53 jasone Exp $"); #include "libc_private.h" #ifdef MALLOC_DEBUG @@ -184,46 +212,63 @@ /* Size of stack-allocated buffer passed to strerror_r(). */ #define STRERROR_BUF 64 -/* Minimum alignment of allocations is 2^QUANTUM_2POW_MIN bytes. */ +/* + * The const_size2bin table is sized according to PAGESIZE_2POW, but for + * correctness reasons, we never assume that + * (pagesize == (1U << * PAGESIZE_2POW)). + * + * Minimum alignment of allocations is 2^QUANTUM_2POW bytes. + */ #ifdef __i386__ -# define QUANTUM_2POW_MIN 4 +# define PAGESIZE_2POW 12 +# define QUANTUM_2POW 4 # define SIZEOF_PTR_2POW 2 # define CPU_SPINWAIT __asm__ volatile("pause") #endif #ifdef __ia64__ -# define QUANTUM_2POW_MIN 4 +# define PAGESIZE_2POW 12 +# define QUANTUM_2POW 4 # define SIZEOF_PTR_2POW 3 #endif #ifdef __alpha__ -# define QUANTUM_2POW_MIN 4 +# define PAGESIZE_2POW 13 +# define QUANTUM_2POW 4 # define SIZEOF_PTR_2POW 3 # define NO_TLS #endif #ifdef __sparc64__ -# define QUANTUM_2POW_MIN 4 +# define PAGESIZE_2POW 13 +# define QUANTUM_2POW 4 # define SIZEOF_PTR_2POW 3 # define NO_TLS #endif #ifdef __amd64__ -# define QUANTUM_2POW_MIN 4 +# define PAGESIZE_2POW 12 +# define QUANTUM_2POW 4 # define SIZEOF_PTR_2POW 3 # define CPU_SPINWAIT __asm__ volatile("pause") #endif #ifdef __arm__ -# define QUANTUM_2POW_MIN 3 +# define PAGESIZE_2POW 12 +# define QUANTUM_2POW 3 # define SIZEOF_PTR_2POW 2 # define NO_TLS #endif #ifdef __mips__ -# define QUANTUM_2POW_MIN 3 +# define PAGESIZE_2POW 12 +# define QUANTUM_2POW 3 # define SIZEOF_PTR_2POW 2 # define NO_TLS #endif #ifdef __powerpc__ -# define QUANTUM_2POW_MIN 4 +# define PAGESIZE_2POW 12 +# define QUANTUM_2POW 4 # define SIZEOF_PTR_2POW 2 #endif +#define QUANTUM ((size_t)(1U << QUANTUM_2POW)) +#define QUANTUM_MASK (QUANTUM - 1) + #define SIZEOF_PTR (1U << SIZEOF_PTR_2POW) /* sizeof(int) == (1U << SIZEOF_INT_2POW). */ @@ -237,6 +282,10 @@ #endif #ifdef NO_TLS + /* MALLOC_MAG requires TLS. */ +# ifdef MALLOC_MAG +# undef MALLOC_MAG +# endif /* MALLOC_BALANCE requires TLS. */ # ifdef MALLOC_BALANCE # undef MALLOC_BALANCE @@ -253,23 +302,42 @@ #define DIRTY_MAX_DEFAULT (1U << 9) /* - * Maximum size of L1 cache line. This is used to avoid cache line aliasing, - * so over-estimates are okay (up to a point), but under-estimates will - * negatively affect performance. + * Maximum size of L1 cache line. This is used to avoid cache line aliasing. + * In addition, this controls the spacing of cacheline-spaced size classes. */ #define CACHELINE_2POW 6 #define CACHELINE ((size_t)(1U << CACHELINE_2POW)) +#define CACHELINE_MASK (CACHELINE - 1) -/* Smallest size class to support. */ -#define TINY_MIN_2POW 1 +/* + * Subpages are an artificially designated partitioning of pages. Their only + * purpose is to support subpage-spaced size classes. + * + * There must be at least 4 subpages per page, due to the way size classes are + * handled. + */ +#define SUBPAGE_2POW 8 +#define SUBPAGE ((size_t)(1U << SUBPAGE_2POW)) +#define SUBPAGE_MASK (SUBPAGE - 1) + +#ifdef MALLOC_TINY + /* Smallest size class to support. */ +# define TINY_MIN_2POW 1 +#endif /* * Maximum size class that is a multiple of the quantum, but not (necessarily) * a power of 2. Above this size, allocations are rounded up to the nearest * power of 2. */ -#define SMALL_MAX_2POW_DEFAULT 9 -#define SMALL_MAX_DEFAULT (1U << SMALL_MAX_2POW_DEFAULT) +#define QSPACE_MAX_2POW_DEFAULT 7 + +/* + * Maximum size class that is a multiple of the cacheline, but not (necessarily) + * a power of 2. Above this size, allocations are rounded up to the nearest + * power of 2. + */ +#define CSPACE_MAX_2POW_DEFAULT 9 /* * RUN_MAX_OVRHD indicates maximum desired run header overhead. Runs are sized @@ -293,8 +361,7 @@ #define RUN_MAX_OVRHD_RELAX 0x00001800U /* Put a cap on small object run size. This overrides RUN_MAX_OVRHD. */ -#define RUN_MAX_SMALL_2POW 15 -#define RUN_MAX_SMALL (1U << RUN_MAX_SMALL_2POW) +#define RUN_MAX_SMALL (12 * pagesize) /* * Hyper-threaded CPUs may need a special instruction inside spin loops in @@ -319,6 +386,15 @@ */ #define BLOCK_COST_2POW 4 +#ifdef MALLOC_MAG + /* + * Default magazine size, in bytes. max_rounds is calculated to make + * optimal use of the space, leaving just enough room for the magazine + * header. + */ +# define MAG_SIZE_2POW_DEFAULT 9 +#endif + #ifdef MALLOC_BALANCE /* * We use an exponential moving average to track recent lock contention, @@ -369,6 +445,11 @@ */ uint64_t nrequests; +#ifdef MALLOC_MAG + /* Number of magazine reloads from this bin. */ + uint64_t nmags; +#endif + /* Total number of runs created for this bin's size class. */ uint64_t nruns; @@ -678,6 +759,35 @@ /******************************************************************************/ /* + * Magazine data structures. + */ + +#ifdef MALLOC_MAG +typedef struct mag_s mag_t; +struct mag_s { + size_t binind; /* Index of associated bin. */ + size_t nrounds; + void *rounds[1]; /* Dynamically sized. */ +}; + +/* + * Magazines are lazily allocated, but once created, they remain until the + * associated mag_rack is destroyed. + */ +typedef struct bin_mags_s bin_mags_t; +struct bin_mags_s { + mag_t *curmag; + mag_t *sparemag; +}; + +typedef struct mag_rack_s mag_rack_t; +struct mag_rack_s { + bin_mags_t bin_mags[1]; /* Dynamically sized. */ +}; +#endif + +/******************************************************************************/ +/* * Data. */ @@ -690,16 +800,147 @@ static size_t pagesize_2pow; /* Various bin-related settings. */ -static size_t bin_maxclass; /* Max size class for bins. */ -static unsigned ntbins; /* Number of (2^n)-spaced tiny bins. */ +#ifdef MALLOC_TINY /* Number of (2^n)-spaced tiny bins. */ +# define ntbins ((unsigned)(QUANTUM_2POW - TINY_MIN_2POW)) +#else +# define ntbins 0 +#endif static unsigned nqbins; /* Number of quantum-spaced bins. */ -static unsigned nsbins; /* Number of (2^n)-spaced sub-page bins. */ -static size_t small_min; -static size_t small_max; +static unsigned ncbins; /* Number of cacheline-spaced bins. */ +static unsigned nsbins; /* Number of subpage-spaced bins. */ +static unsigned nbins; +#ifdef MALLOC_TINY +# define tspace_max ((size_t)(QUANTUM >> 1)) +#endif +#define qspace_min QUANTUM +static size_t qspace_max; +static size_t cspace_min; +static size_t cspace_max; +static size_t sspace_min; +static size_t sspace_max; +#define bin_maxclass sspace_max + +static uint8_t const *size2bin; +/* + * const_size2bin is a static constant lookup table that in the common case can + * be used as-is for size2bin. For dynamically linked programs, this avoids + * a page of memory overhead per process. + */ +#define S2B_1(i) i, +#define S2B_2(i) S2B_1(i) S2B_1(i) +#define S2B_4(i) S2B_2(i) S2B_2(i) +#define S2B_8(i) S2B_4(i) S2B_4(i) +#define S2B_16(i) S2B_8(i) S2B_8(i) +#define S2B_32(i) S2B_16(i) S2B_16(i) +#define S2B_64(i) S2B_32(i) S2B_32(i) +#define S2B_128(i) S2B_64(i) S2B_64(i) +#define S2B_256(i) S2B_128(i) S2B_128(i) +static const uint8_t const_size2bin[(1U << PAGESIZE_2POW) - 255] = { + S2B_1(0xffU) /* 0 */ +#if (QUANTUM_2POW == 4) +/* 64-bit system ************************/ +# ifdef MALLOC_TINY + S2B_2(0) /* 2 */ + S2B_2(1) /* 4 */ + S2B_4(2) /* 8 */ + S2B_8(3) /* 16 */ +# define S2B_QMIN 3 +# else + S2B_16(0) /* 16 */ +# define S2B_QMIN 0 +# endif + S2B_16(S2B_QMIN + 1) /* 32 */ + S2B_16(S2B_QMIN + 2) /* 48 */ + S2B_16(S2B_QMIN + 3) /* 64 */ + S2B_16(S2B_QMIN + 4) /* 80 */ + S2B_16(S2B_QMIN + 5) /* 96 */ + S2B_16(S2B_QMIN + 6) /* 112 */ + S2B_16(S2B_QMIN + 7) /* 128 */ +# define S2B_CMIN (S2B_QMIN + 8) +#else +/* 32-bit system ************************/ +# ifdef MALLOC_TINY + S2B_2(0) /* 2 */ + S2B_2(1) /* 4 */ + S2B_4(2) /* 8 */ +# define S2B_QMIN 2 +# else + S2B_8(0) /* 8 */ +# define S2B_QMIN 0 +# endif + S2B_8(S2B_QMIN + 1) /* 16 */ + S2B_8(S2B_QMIN + 2) /* 24 */ + S2B_8(S2B_QMIN + 3) /* 32 */ + S2B_8(S2B_QMIN + 4) /* 40 */ + S2B_8(S2B_QMIN + 5) /* 48 */ + S2B_8(S2B_QMIN + 6) /* 56 */ + S2B_8(S2B_QMIN + 7) /* 64 */ + S2B_8(S2B_QMIN + 8) /* 72 */ + S2B_8(S2B_QMIN + 9) /* 80 */ + S2B_8(S2B_QMIN + 10) /* 88 */ + S2B_8(S2B_QMIN + 11) /* 96 */ + S2B_8(S2B_QMIN + 12) /* 104 */ + S2B_8(S2B_QMIN + 13) /* 112 */ + S2B_8(S2B_QMIN + 14) /* 120 */ + S2B_8(S2B_QMIN + 15) /* 128 */ +# define S2B_CMIN (S2B_QMIN + 16) +#endif +/****************************************/ + S2B_64(S2B_CMIN + 0) /* 192 */ + S2B_64(S2B_CMIN + 1) /* 256 */ + S2B_64(S2B_CMIN + 2) /* 320 */ + S2B_64(S2B_CMIN + 3) /* 384 */ + S2B_64(S2B_CMIN + 4) /* 448 */ + S2B_64(S2B_CMIN + 5) /* 512 */ +# define S2B_SMIN (S2B_CMIN + 6) + S2B_256(S2B_SMIN + 0) /* 768 */ + S2B_256(S2B_SMIN + 1) /* 1024 */ + S2B_256(S2B_SMIN + 2) /* 1280 */ + S2B_256(S2B_SMIN + 3) /* 1536 */ + S2B_256(S2B_SMIN + 4) /* 1792 */ + S2B_256(S2B_SMIN + 5) /* 2048 */ + S2B_256(S2B_SMIN + 6) /* 2304 */ + S2B_256(S2B_SMIN + 7) /* 2560 */ + S2B_256(S2B_SMIN + 8) /* 2816 */ + S2B_256(S2B_SMIN + 9) /* 3072 */ + S2B_256(S2B_SMIN + 10) /* 3328 */ + S2B_256(S2B_SMIN + 11) /* 3584 */ + S2B_256(S2B_SMIN + 12) /* 3840 */ +#if (PAGESIZE_2POW == 13) + S2B_256(S2B_SMIN + 13) /* 4096 */ + S2B_256(S2B_SMIN + 14) /* 4352 */ + S2B_256(S2B_SMIN + 15) /* 4608 */ + S2B_256(S2B_SMIN + 16) /* 4864 */ + S2B_256(S2B_SMIN + 17) /* 5120 */ + S2B_256(S2B_SMIN + 18) /* 5376 */ + S2B_256(S2B_SMIN + 19) /* 5632 */ + S2B_256(S2B_SMIN + 20) /* 5888 */ + S2B_256(S2B_SMIN + 21) /* 6144 */ + S2B_256(S2B_SMIN + 22) /* 6400 */ + S2B_256(S2B_SMIN + 23) /* 6656 */ + S2B_256(S2B_SMIN + 24) /* 6912 */ + S2B_256(S2B_SMIN + 25) /* 7168 */ + S2B_256(S2B_SMIN + 26) /* 7424 */ + S2B_256(S2B_SMIN + 27) /* 7680 */ + S2B_256(S2B_SMIN + 28) /* 7936 */ +#endif +}; +#undef S2B_1 +#undef S2B_2 +#undef S2B_4 +#undef S2B_8 +#undef S2B_16 +#undef S2B_32 +#undef S2B_64 +#undef S2B_128 +#undef S2B_256 +#undef S2B_QMIN +#undef S2B_CMIN +#undef S2B_SMIN -/* Various quantum-related settings. */ -static size_t quantum; -static size_t quantum_mask; /* (quantum - 1). */ +#ifdef MALLOC_MAG +static size_t max_rounds; +#endif /* Various chunk-related settings. */ static size_t chunksize; @@ -796,6 +1037,14 @@ static __thread arena_t *arenas_map; #endif +#ifdef MALLOC_MAG +/* + * Map of thread-specific magazine racks, used for thread-specific object + * caching. + */ +static __thread mag_rack_t *mag_rack; +#endif + #ifdef MALLOC_STATS /* Chunk statistics. */ static chunk_stats_t stats_chunks; @@ -818,13 +1067,17 @@ static bool opt_dss = true; static bool opt_mmap = true; #endif +#ifdef MALLOC_MAG +static bool opt_mag = true; +static size_t opt_mag_size_2pow = MAG_SIZE_2POW_DEFAULT; +#endif static size_t opt_dirty_max = DIRTY_MAX_DEFAULT; #ifdef MALLOC_BALANCE static uint64_t opt_balance_threshold = BALANCE_THRESHOLD_DEFAULT; #endif static bool opt_print_stats = false; -static size_t opt_quantum_2pow = QUANTUM_2POW_MIN; -static size_t opt_small_max_2pow = SMALL_MAX_2POW_DEFAULT; +static size_t opt_qspace_max_2pow = QSPACE_MAX_2POW_DEFAULT; +static size_t opt_cspace_max_2pow = CSPACE_MAX_2POW_DEFAULT; static size_t opt_chunk_2pow = CHUNK_2POW_DEFAULT; static bool opt_utrace = false; static bool opt_sysv = false; @@ -902,15 +1155,21 @@ static void arena_run_trim_tail(arena_t *arena, arena_chunk_t *chunk, arena_run_t *run, size_t oldsize, size_t newsize, bool dirty); static arena_run_t *arena_bin_nonfull_run_get(arena_t *arena, arena_bin_t *bin); -static void *arena_bin_malloc_hard(arena_t *arena, arena_bin_t *bin); -static size_t arena_bin_run_size_calc(arena_bin_t *bin, size_t min_run_size); +static void *arena_bin_malloc_hard(arena_t *arena, arena_bin_t *bin); +static size_t arena_bin_run_size_calc(arena_bin_t *bin, size_t min_run_size); #ifdef MALLOC_BALANCE static void arena_lock_balance_hard(arena_t *arena); #endif +#ifdef MALLOC_MAG +static void mag_load(mag_t *mag); +#endif static void *arena_malloc_large(arena_t *arena, size_t size, bool zero); static void *arena_palloc(arena_t *arena, size_t alignment, size_t size, size_t alloc_size); static size_t arena_salloc(const void *ptr); +#ifdef MALLOC_MAG +static void mag_unload(mag_t *mag); +#endif static void arena_dalloc_large(arena_t *arena, arena_chunk_t *chunk, void *ptr); static void arena_ralloc_large_shrink(arena_t *arena, arena_chunk_t *chunk, @@ -921,11 +1180,22 @@ static void *arena_ralloc(void *ptr, size_t size, size_t oldsize); static bool arena_new(arena_t *arena); static arena_t *arenas_extend(unsigned ind); +#ifdef MALLOC_MAG +static mag_t *mag_create(arena_t *arena, size_t binind); +static void mag_destroy(mag_t *mag); +static mag_rack_t *mag_rack_create(arena_t *arena); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Sep 1 23:13:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C7B01065672; Mon, 1 Sep 2008 23:13: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 F350C106568F for ; Mon, 1 Sep 2008 23:13:10 +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 DCA5E8FC08 for ; Mon, 1 Sep 2008 23:13:10 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m81NDAPJ034652 for ; Mon, 1 Sep 2008 23:13:10 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m81NDAIF034648 for perforce@freebsd.org; Mon, 1 Sep 2008 23:13:10 GMT (envelope-from sam@freebsd.org) Date: Mon, 1 Sep 2008 23:13:10 GMT Message-Id: <200809012313.m81NDAIF034648@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 149025 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Sep 2008 23:13:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=149025 Change 149025 by sam@sam_ebb on 2008/09/01 23:12:14 handle abi change Affected files ... .. //depot/projects/vap/sys/dev/ath/ah_osdep.c#5 edit Differences ... ==== //depot/projects/vap/sys/dev/ath/ah_osdep.c#5 (text+ko) ==== @@ -71,8 +71,12 @@ int lineno, const char* msg); #endif #ifdef AH_DEBUG +#if HAL_ABI_VERSION >= 0x08090101 +extern void HALDEBUG(struct ath_hal *ah, u_int mask, const char* fmt, ...); +#else extern void HALDEBUG(struct ath_hal *ah, const char* fmt, ...); extern void HALDEBUGn(struct ath_hal *ah, u_int level, const char* fmt, ...); +#endif #endif /* AH_DEBUG */ /* NB: put this here instead of the driver to avoid circular references */ @@ -139,7 +143,19 @@ } #ifdef AH_DEBUG +#if HAL_ABI_VERSION >= 0x08090101 void +HALDEBUG(struct ath_hal *ah, u_int mask, const char* fmt, ...) +{ + if (ath_hal_debug & mask) { + __va_list ap; + va_start(ap, fmt); + ath_hal_vprintf(ah, fmt, ap); + va_end(ap); + } +} +#else +void HALDEBUG(struct ath_hal *ah, const char* fmt, ...) { if (ath_hal_debug) { @@ -160,6 +176,7 @@ va_end(ap); } } +#endif #endif /* AH_DEBUG */ #ifdef AH_DEBUG_ALQ From owner-p4-projects@FreeBSD.ORG Tue Sep 2 08:09:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C48AA1065680; Tue, 2 Sep 2008 08:09: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 861CC10656DB for ; Tue, 2 Sep 2008 08:09:32 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 718CF8FC1B for ; Tue, 2 Sep 2008 08:09:32 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m8289Wge038232 for ; Tue, 2 Sep 2008 08:09:32 GMT (envelope-from konrad@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m8289Wwt038230 for perforce@freebsd.org; Tue, 2 Sep 2008 08:09:32 GMT (envelope-from konrad@FreeBSD.org) Date: Tue, 2 Sep 2008 08:09:32 GMT Message-Id: <200809020809.m8289Wwt038230@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to konrad@FreeBSD.org using -f From: Konrad Jankowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 149050 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Sep 2008 08:09:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=149050 Change 149050 by konrad@vspredator on 2008/09/02 08:09:04 Some bugfixes to the debug printing functions. Affected files ... .. //depot/projects/soc2008/konrad_collation/libc/locale/lmessages.c#5 edit .. //depot/projects/soc2008/konrad_collation/libc/locale/lmonetary.c#5 edit .. //depot/projects/soc2008/konrad_collation/libc/locale/lnumeric.c#5 edit Differences ... ==== //depot/projects/soc2008/konrad_collation/libc/locale/lmessages.c#5 (text+ko) ==== @@ -31,6 +31,9 @@ #include "ldpart.h" #include "lmessages.h" +#ifdef LOCALE_DEBUG +#include +#endif #define LCMESSAGES_SIZE_FULL (sizeof(struct lc_messages_T) / sizeof(char *)) #define LCMESSAGES_SIZE_MIN \ ==== //depot/projects/soc2008/konrad_collation/libc/locale/lmonetary.c#5 (text+ko) ==== @@ -30,6 +30,9 @@ #include #include #include +#ifdef LOCALE_DEBUG +#include +#endif #include "ldpart.h" #include "lmonetary.h" @@ -159,13 +162,14 @@ "n_cs_precedes = %d\n" "n_sep_by_space = %d\n" "p_sign_posn = %d\n" - "n_sign_posn = %d\n", + "n_sign_posn = %d\n" "int_p_cs_precedes = %d\n" "int_p_sep_by_space = %d\n" "int_n_cs_precedes = %d\n" "int_n_sep_by_space = %d\n" "int_p_sign_posn = %d\n" "int_n_sign_posn = %d\n", + _monetary_locale.int_curr_symbol, _monetary_locale.currency_symbol, _monetary_locale.mon_decimal_point, ==== //depot/projects/soc2008/konrad_collation/libc/locale/lnumeric.c#5 (text+ko) ==== @@ -31,6 +31,9 @@ #include "ldpart.h" #include "lnumeric.h" +#ifdef LOCALE_DEBUG +#include +#endif extern int __nlocale_changed; extern const char *__fix_locale_grouping_str(const char *); From owner-p4-projects@FreeBSD.ORG Tue Sep 2 08:29:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AD8C31065676; Tue, 2 Sep 2008 08:29: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 713571065674 for ; Tue, 2 Sep 2008 08:29:53 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5CDE48FC18 for ; Tue, 2 Sep 2008 08:29:53 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m828TrfR039963 for ; Tue, 2 Sep 2008 08:29:53 GMT (envelope-from konrad@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m828TrpM039961 for perforce@freebsd.org; Tue, 2 Sep 2008 08:29:53 GMT (envelope-from konrad@FreeBSD.org) Date: Tue, 2 Sep 2008 08:29:53 GMT Message-Id: <200809020829.m828TrpM039961@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to konrad@FreeBSD.org using -f From: Konrad Jankowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 149051 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Sep 2008 08:29:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=149051 Change 149051 by konrad@vspredator on 2008/09/02 08:29:17 Incremental changes to collate.c for new expansion support. Also a cleanup of __collate_load_tables. Affected files ... .. //depot/projects/soc2008/konrad_collation/libc/locale/collate.c#10 edit Differences ... ==== //depot/projects/soc2008/konrad_collation/libc/locale/collate.c#10 (text+ko) ==== @@ -70,7 +70,7 @@ FILE *fp; int i, saverr, chains, z; char strbuf[STR_LEN], buf[PATH_MAX]; - struct __locale_st_collate *TMP; + struct __locale_st_collate *TMP = NULL; struct __collate_st_info info; void *vp; @@ -104,64 +104,44 @@ if ((fp = fopen(buf, "r")) == NULL) return (_LDP_ERROR); - if (fread(strbuf, sizeof(strbuf), 1, fp) != 1) { - saverr = errno; - (void)fclose(fp); - errno = saverr; - return (_LDP_ERROR); - } - chains = -1; - if (strcmp(strbuf, COLLATE_VERSION1_3) == 0) - chains = 1; - if (chains < 0) { + if (fread(strbuf, sizeof(strbuf), 1, fp) != 1) + goto error_close_and_return; + if (strcmp(strbuf, COLLATE_VERSION1_4) != 0) { fprintf(stderr, "__collate_load_tables: wrong signature: %s\n", strbuf); - (void)fclose(fp); errno = EFTYPE; - return (_LDP_ERROR); + goto error_close_and_return; } - if (chains) { - if (fread(&info, sizeof(info), 1, fp) != 1) { - saverr = errno; - (void)fclose(fp); - errno = saverr; - return (_LDP_ERROR); - } + if (fread(&info, sizeof(info), 1, fp) != 1) + goto error_close_and_return; #if _BYTE_ORDER == _LITTLE_ENDIAN - for(z = 0; z < info.directive_count; z++) { - info.undef_pri.pri[z] = ntohl(info.undef_pri.pri[z]); - info.subst_count[z] = ntohl(info.subst_count[z]); - } - info.chain_count = ntohl(info.chain_count); - info.large_pri_count = ntohl(info.large_pri_count); + for(z = 0; z < info.directive_count; z++) { + info.undef_pri.pri[z] = ntohl(info.undef_pri.pri[z]); + info.subst_count[z] = ntohl(info.subst_count[z]); + } + info.chain_count = ntohl(info.chain_count); + info.large_pri_count = ntohl(info.large_pri_count); #endif /* _BYTE_ORDER == _LITTLE_ENDIAN */ - if ((chains = info.chain_count) < 0) { - (void)fclose(fp); - errno = EFTYPE; - return (_LDP_ERROR); - } - } else - chains = TABLE_SIZE; + if ((chains = info.chain_count) < 0) { +#ifdef LOCALE_DEBUG + fprintf(stderr, "__collate_load_tables: wrong chain count (%d)\n", + chains); +#endif + errno = EFTYPE; + goto error_close_and_return; + } i = sizeof(struct __locale_st_collate) + sizeof(struct __collate_st_chain_pri) * chains + sizeof(struct __collate_st_large_char_pri) * info.large_pri_count; for(z = 0; z < info.directive_count; z++) i += sizeof(struct __collate_st_subst) * info.subst_count[z]; - if ((TMP = (struct __locale_st_collate *)malloc(i)) == NULL) { - saverr = errno; - (void)fclose(fp); - errno = saverr; - return (_LDP_ERROR); - } + if ((TMP = (struct __locale_st_collate *)malloc(i)) == NULL) + goto error_close_and_return; #define FREAD(a, b, c, d) \ { \ if (fread(a, b, c, d) != c) { \ - saverr = errno; \ - free(TMP); \ - (void)fclose(d); \ - errno = saverr; \ - return (_LDP_ERROR); \ + goto error_close_and_return; \ } \ } @@ -251,6 +231,15 @@ __collate_info->directive_count = COLL_WEIGHTS_MAX; return (_LDP_LOADED); + + error_close_and_return: + saverr = errno; + (void)fclose(fp); + if (TMP) + free(TMP); + errno = saverr; + + return (_LDP_ERROR); } static int @@ -564,7 +553,7 @@ xfp = xf[pass]; if (direc & DIRECTIVE_POSITION) { while(*t) { - __collate_lookup_which(t, &len, &pri, pass); + pri = __collate_lookup(t, &len)->pri[pass]; t += len; if (pri <= 0) { if (pri < 0) { @@ -578,7 +567,7 @@ } } else { while(*t) { - __collate_lookup_which(t, &len, &pri, pass); + pri = __collate_lookup(t, &len)->pri[pass]; t += len; if (pri <= 0) { if (pri < 0) { From owner-p4-projects@FreeBSD.ORG Tue Sep 2 09:16:47 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B0FB106567F; Tue, 2 Sep 2008 09: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 3E03F1065675 for ; Tue, 2 Sep 2008 09:16:46 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 28B768FC16 for ; Tue, 2 Sep 2008 09:16:46 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m829GkTd054648 for ; Tue, 2 Sep 2008 09:16:46 GMT (envelope-from konrad@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m829GkTm054646 for perforce@freebsd.org; Tue, 2 Sep 2008 09:16:46 GMT (envelope-from konrad@FreeBSD.org) Date: Tue, 2 Sep 2008 09:16:46 GMT Message-Id: <200809020916.m829GkTm054646@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to konrad@FreeBSD.org using -f From: Konrad Jankowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 149054 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Sep 2008 09:16:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=149054 Change 149054 by konrad@vspredator on 2008/09/02 09:15:58 Throw out all the endianness dance. I was making using mmap impossible. Also, minor changes to the struct __collate_st_info. Affected files ... .. //depot/projects/soc2008/konrad_collation/colldef.apple/collate.h#8 edit .. //depot/projects/soc2008/konrad_collation/colldef.apple/parse.y#10 edit Differences ... ==== //depot/projects/soc2008/konrad_collation/colldef.apple/collate.h#8 (text+ko) ==== @@ -63,36 +63,31 @@ #define IGNORE_EQUIV_CLASS 1 +struct weight_map_struct +{ + unsigned int v:4; +}; + +#define COLL_WEIGHTS_REAL (COLL_WEIGHTS_MAX * 4) +struct __collate_st_char_pri { + struct weight_map_struct map[COLL_WEIGHTS_MAX]; + __int32_t pri[COLL_WEIGHTS_REAL]; +}; + struct __collate_st_info { __uint8_t directive[COLL_WEIGHTS_MAX]; __uint8_t flags; -#if _BYTE_ORDER == _LITTLE_ENDIAN - unsigned int directive_count:4; unsigned int chain_max_len:4; -#else - unsigned int chain_max_len:4; unsigned int directive_count:4; -#endif - __int32_t undef_pri[COLL_WEIGHTS_MAX]; + struct __collate_st_char_pri undef_pri; __int32_t subst_count[COLL_WEIGHTS_MAX]; __int32_t chain_count; __int32_t large_pri_count; }; -struct weight_map_struct -{ - unsigned int v:4; -}; - -#define COLL_WEIGHTS_REAL (COLL_WEIGHTS_MAX * 4) -struct __collate_st_char_pri { - struct weight_map_struct map[COLL_WEIGHTS_MAX]; - __int32_t pri[COLL_WEIGHTS_REAL]; -}; struct __collate_st_chain_pri { - struct weight_map_struct map[COLL_WEIGHTS_MAX]; + struct __collate_st_char_pri pri; wchar_t str[STR_LEN]; - __int32_t pri[COLL_WEIGHTS_MAX]; }; struct __collate_st_large_char_pri { __int32_t val; @@ -124,15 +119,12 @@ wchar_t *__collate_wcsdup(const wchar_t *); wchar_t *__collate_substitute(const wchar_t *, int); int __collate_load_tables(const char *); -void __collate_lookup_l(const wchar_t *, int *, int *, int *); -void __collate_lookup_which(const wchar_t *, int *, int *, int); void __collate_xfrm(const wchar_t *, wchar_t **); int __collate_range_cmp(wchar_t, wchar_t); size_t __collate_collating_symbol(wchar_t *, size_t, const char *, size_t, mbstate_t *); int __collate_equiv_class(const char *, size_t, mbstate_t *); size_t __collate_equiv_match(int, wchar_t *, size_t, wchar_t, const char *, size_t, mbstate_t *, size_t *); -#else /* !__LIBC__ */ -void __collate_lookup(const unsigned char *, int *, int *, int *); +struct __collate_st_char_pri *__collate_lookup(const wchar_t *, int *); #endif /* __LIBC__ */ #ifdef COLLATE_DEBUG void __collate_print_tables(void); ==== //depot/projects/soc2008/konrad_collation/colldef.apple/parse.y#10 (text+ko) ==== @@ -119,7 +119,8 @@ #ifdef COLLATE_DEBUG int debug; #endif -struct __collate_st_info info = {{DIRECTIVE_FORWARD, DIRECTIVE_FORWARD}, 0, 0, 0, {PRI_UNDEFINED, PRI_UNDEFINED}, {PRI_UNDEFINED}, 0, 0}; +struct __collate_st_info info = {{DIRECTIVE_FORWARD, DIRECTIVE_FORWARD}, 0, + 0, 0, {{{0}, {1}, {2}, {3}}, {PRI_UNDEFINED, PRI_UNDEFINED}}, {PRI_UNDEFINED}, 0, 0}; int directive_count = COLL_WEIGHTS_MAX; @@ -151,7 +152,8 @@ struct __collate_st_chain_pri *t, *v; int flags, i, len; - if ((__collate_chain_pri_table = (struct __collate_st_chain_pri *)malloc(nchain * sizeof(struct __collate_st_chain_pri))) == NULL) + if ((__collate_chain_pri_table = (struct __collate_st_chain_pri *) + malloc(nchain * sizeof(struct __collate_st_chain_pri))) == NULL) err(1, "chain malloc"); flags = R_FIRST; t = __collate_chain_pri_table; @@ -166,7 +168,8 @@ } if (chaindb->seq(chaindb, &key, &val, flags) == 0) err(1, "More in chaindb after retrieving %d", nchain); - qsort(__collate_chain_pri_table, nchain, sizeof(struct __collate_st_chain_pri), chainpricompar); + qsort(__collate_chain_pri_table, nchain, sizeof(struct __collate_st_chain_pri), + chainpricompar); } for(z = 0; z < directive_count; z++) { if (nsubst[z] > 0) { @@ -176,7 +179,8 @@ int flags, i, j; int32_t cval; - if ((__collate_substitute_table[z] = (struct __collate_st_subst *)calloc(nsubst[z], sizeof(struct __collate_st_subst))) == NULL) + if ((__collate_substitute_table[z] = (struct __collate_st_subst *) + calloc(nsubst[z], sizeof(struct __collate_st_subst))) == NULL) err(1, "__collate_substitute_table[%d] calloc", z); flags = R_FIRST; t = __collate_substitute_table[z]; @@ -188,7 +192,7 @@ * need it for sorting */ t->val = cval; for(wp = (wchar_t *)val.data, tp = t->str, j = STR_LEN; *wp && j-- > 0;) - *tp++ = htonl(*wp++); + *tp++ = *wp++; t++; flags = R_NEXT; } @@ -217,7 +221,7 @@ * need it for sorting */ t->val = cval; for(z = 0; z < COLL_WEIGHTS_REAL; z++) - t->pri.pri[z] = htonl(p->pri[z]); + t->pri.pri[z] = p->pri[z]; for (z = 0; z < directive_count; z++) t->pri.map[z].v = p->map[z].v; t++; @@ -228,11 +232,11 @@ qsort(__collate_large_char_pri_table, nlargemap, sizeof(struct __collate_st_large_char_pri), charpricompar); } - if (info.undef_pri[0] == PRI_UNDEFINED) { + if (info.undef_pri.pri[0] == PRI_UNDEFINED) { int i; - info.undef_pri[0] = prim_pri; + info.undef_pri.pri[0] = prim_pri; for(i = 1; i < directive_count; i++) - info.undef_pri[i] = -prim_pri; + info.undef_pri.pri[i] = -prim_pri; } if (localedef) { @@ -249,14 +253,18 @@ struct __collate_st_char_pri *p = haspri(v->u.wc); if (!p || p->pri[0] == PRI_UNDEFINED) - warnx("<%s> was not defined", showwcs((const wchar_t *)key.data, key.size / sizeof(wchar_t))); + warnx("<%s> was not defined", + showwcs((const wchar_t *)key.data, + key.size / sizeof(wchar_t))); break; } case SYMBOL_CHAIN: { struct __collate_st_chain_pri *p = getchain(v->u.str, EXISTS); - if (p->pri[0] == PRI_UNDEFINED) - warnx("<%s> was not defined", showwcs((const wchar_t *)key.data, key.size / sizeof(wchar_t))); + if (p->pri.pri[0] == PRI_UNDEFINED) + warnx("<%s> was not defined", + showwcs((const wchar_t *)key.data, + key.size / sizeof(wchar_t))); break; } } @@ -268,12 +276,17 @@ for (ch = 1; ch < UCHAR_MAX + 1; ch++) { for(z = 0; z < directive_count; z++) if (__collate_char_pri_table[ch].pri[z] == PRI_UNDEFINED) - __collate_char_pri_table[ch].pri[z] = (info.undef_pri[z] >= 0) ? info.undef_pri[z] : (ch - info.undef_pri[z]); + __collate_char_pri_table[ch].pri[z] = + (info.undef_pri.pri[z] >= 0) ? info.undef_pri.pri[z] : + (ch - info.undef_pri.pri[z]); } for (ch = 0; ch < nlargemap; ch++) { for(z = 0; z < directive_count; z++) if (__collate_large_char_pri_table[ch].pri.pri[z] == PRI_UNDEFINED) - __collate_large_char_pri_table[ch].pri.pri[z] = (info.undef_pri[z] >= 0) ? info.undef_pri[z] : (__collate_large_char_pri_table[ch].val - info.undef_pri[z]); + __collate_large_char_pri_table[ch].pri.pri[z] = + (info.undef_pri.pri[z] >= 0) ? info.undef_pri.pri[z] : + (__collate_large_char_pri_table[ch].val - + info.undef_pri.pri[z]); } } else { int ch, substed, ordered; @@ -324,29 +337,10 @@ err(EX_IOERR, "IO error writting collate version to destination file %s", out_file); -#if _BYTE_ORDER == _LITTLE_ENDIAN - for(z = 0; z < directive_count; z++) { - info.undef_pri[z] = htonl(info.undef_pri[z]); - info.subst_count[z] = htonl(info.subst_count[z]); - } - info.chain_count = htonl(info.chain_count); - info.large_pri_count = htonl(info.large_pri_count); -#endif /* _BYTE_ORDER == _LITTLE_ENDIAN */ if (fwrite(&info, sizeof(info), 1, fp) != 1) err(EX_IOERR, "IO error writting collate info to destination file %s", out_file); -#if _BYTE_ORDER == _LITTLE_ENDIAN - { - int i, z; - struct __collate_st_char_pri *p = __collate_char_pri_table; - - for(i = UCHAR_MAX + 1; i-- > 0; p++) { - for(z = 0; z < COLL_WEIGHTS_REAL; z++) - p->pri[z] = htonl(p->pri[z]); - } - } -#endif /* _BYTE_ORDER == _LITTLE_ENDIAN */ if (fwrite(__collate_char_pri_table, sizeof(__collate_char_pri_table), 1, fp) != 1) err(EX_IOERR, @@ -354,34 +348,14 @@ out_file); for(z = 0; z < directive_count; z++) { if (nsubst[z] > 0) { -#if _BYTE_ORDER == _LITTLE_ENDIAN - struct __collate_st_subst *t = __collate_substitute_table[z]; - int i; - - for(i = nsubst[z]; i > 0; i--) { - t->val = htonl(t->val); - t++; - } -#endif /* _BYTE_ORDER == _LITTLE_ENDIAN */ - if ((int)fwrite(__collate_substitute_table[z], sizeof(struct __collate_st_subst), nsubst[z], fp) != nsubst[z]) + if ((int)fwrite(__collate_substitute_table[z], + sizeof(struct __collate_st_subst), nsubst[z], fp) != nsubst[z]) err(EX_IOERR, "IO error writting large substprim table %d to destination file %s", z, out_file); } } if (nchain > 0) { -#if _BYTE_ORDER == _LITTLE_ENDIAN - int i, j, z; - struct __collate_st_chain_pri *p = __collate_chain_pri_table; - wchar_t *w; - - for(i = nchain; i-- > 0; p++) { - for(j = STR_LEN, w = p->str; *w && j-- > 0; w++) - *w = htonl(*w); - for(z = 0; z < directive_count; z++) - p->pri[z] = htonl(p->pri[z]); - } -#endif /* _BYTE_ORDER == _LITTLE_ENDIAN */ if (fwrite(__collate_chain_pri_table, sizeof(*__collate_chain_pri_table), nchain, fp) != (size_t)nchain) @@ -391,14 +365,6 @@ } if (nlargemap > 0) { -#if _BYTE_ORDER == _LITTLE_ENDIAN - struct __collate_st_large_char_pri *t = __collate_large_char_pri_table; - int i; - for(i = 0; i < nlargemap; i++) { - t->val = htonl(t->val); - t++; - } -#endif /* _BYTE_ORDER == _LITTLE_ENDIAN */ if ((int)fwrite(__collate_large_char_pri_table, sizeof(struct __collate_st_large_char_pri), nlargemap, fp) != nlargemap) err(EX_IOERR, "IO error writting large pri tables to destination file %s", @@ -759,24 +725,24 @@ case SYMBOL_CHAIN: case SYMBOL_IGNORE: case SYMBOL_SYMBOL: - if (p->pri[i] != PRI_UNDEFINED) + if (p->pri.pri[i] != PRI_UNDEFINED) yyerror("Chain %s previously defined", showwcs(s->u.str, STR_LEN)); - p->pri[i] = weight_table[i].val; + p->pri.pri[i] = weight_table[i].val; break; case SYMBOL_STRING : if (wcsncmp(s->u.str, weight_table[i].u.str, STR_LEN) != 0) yyerror("Chain/string mismatch"); - if (p->pri[i] != PRI_UNDEFINED) + if (p->pri.pri[i] != PRI_UNDEFINED) yyerror("Chain %s previously defined", showwcs(s->u.str, STR_LEN)); /* negative value mean don't substitute * the chain, but it is in an * equivalence class */ - p->pri[i] = -weight_table[i].val; + p->pri.pri[i] = -weight_table[i].val; } } - memcpy(p->map, weight_map, sizeof(p->map)); + memcpy(p->pri.map, weight_map, sizeof(p->pri.map)); break; } } @@ -839,12 +805,12 @@ case SYMBOL_CHAIN: case SYMBOL_IGNORE: case SYMBOL_SYMBOL: - info.undef_pri[i] = weight_table[i].val; + info.undef_pri.pri[i] = weight_table[i].val; break; case SYMBOL_ELLIPSIS : /* Negative values mean that the priority is * relative to the lexical value */ - info.undef_pri[i] = -sym_undefined.val; + info.undef_pri.pri[i] = -sym_undefined.val; prim_pri = UNDEFINED_PRI; break; case SYMBOL_STRING : @@ -984,7 +950,7 @@ } | chain { struct __collate_st_chain_pri *c = getchain(curr_chain, NOTEXISTS); - c->pri[0] = c->pri[1] = prim_pri; + c->pri.pri[0] = c->pri.pri[1] = prim_pri; sec_pri = ++prim_pri; } | CHAR RANGE CHAR { @@ -1017,10 +983,10 @@ } ; mixed_sub_list : mixed_sub_item - | mixed_sub_list ',' mixed_sub_item + | mixed_sub_list ',' mixed_sub_item ; sec_order_list : sec_sub_item - | sec_order_list ',' sec_sub_item + | sec_order_list ',' sec_sub_item ; mixed_sub_item : CHAR { struct __collate_st_char_pri *p = getpri($1); @@ -1047,8 +1013,8 @@ } | chain { struct __collate_st_chain_pri *c = getchain(curr_chain, NOTEXISTS); - c->pri[0] = prim_pri; - c->pri[1] = sec_pri; + c->pri.pri[0] = prim_pri; + c->pri.pri[1] = sec_pri; } sec_sub_item : CHAR { struct __collate_st_char_pri *p = getpri($1); @@ -1075,8 +1041,8 @@ } | chain { struct __collate_st_chain_pri *c = getchain(curr_chain, NOTEXISTS); - c->pri[0] = prim_pri; - c->pri[1] = sec_pri++; + c->pri.pri[0] = prim_pri; + c->pri.pri[1] = sec_pri++; } ; %% @@ -1222,7 +1188,7 @@ malloc(sizeof(struct __collate_st_chain_pri))) == NULL) err(1, "getchain: malloc"); for(z = 0; z < COLL_WEIGHTS_MAX; z++) - pn->pri[z] = PRI_UNDEFINED; + pn->pri.pri[z] = PRI_UNDEFINED; bzero(pn->str, sizeof(pn->str)); wcsncpy(pn->str, wcs, STR_LEN); val.data = &pn; @@ -1498,7 +1464,7 @@ } static void -collate_print_tables(void) +collate_print_tables(/*struct __locale_st_collate *collate_data*/) { int i, z, pos; @@ -1506,7 +1472,7 @@ info.directive[0], info.directive[1], info.flags, info.chain_max_len, info.directive_count, - info.undef_pri[0], info.undef_pri[1], + info.undef_pri.pri[0], info.undef_pri.pri[1], info.subst_count[0], info.subst_count[1], info.chain_count, info.large_pri_count); for(z = 0; z < info.directive_count; z++) { @@ -1529,7 +1495,7 @@ for (i = info.chain_count; i-- > 0; p2++) { printf("\t\"%s\" :", showwcs(p2->str, STR_LEN)); for(z = 0; z < info.directive_count; z++) - printf(" %d", p2->pri[z]); + printf(" %d", p2->pri.pri[z]); putchar('\n'); } } From owner-p4-projects@FreeBSD.ORG Tue Sep 2 09:25:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D2C951065682; Tue, 2 Sep 2008 09: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 965711065675 for ; Tue, 2 Sep 2008 09:25:55 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 821008FC12 for ; Tue, 2 Sep 2008 09:25:55 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m829PtAF055376 for ; Tue, 2 Sep 2008 09:25:55 GMT (envelope-from konrad@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m829PtFU055374 for perforce@freebsd.org; Tue, 2 Sep 2008 09:25:55 GMT (envelope-from konrad@FreeBSD.org) Date: Tue, 2 Sep 2008 09:25:55 GMT Message-Id: <200809020925.m829PtFU055374@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to konrad@FreeBSD.org using -f From: Konrad Jankowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 149055 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Sep 2008 09:25:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=149055 Change 149055 by konrad@vspredator on 2008/09/02 09:25:40 Throw out the endianness dance from libc's collate.c Affected files ... .. //depot/projects/soc2008/konrad_collation/libc/locale/collate.c#11 edit Differences ... ==== //depot/projects/soc2008/konrad_collation/libc/locale/collate.c#11 (text+ko) ==== @@ -54,9 +54,6 @@ #include "libc_private.h" -#if _BYTE_ORDER == _LITTLE_ENDIAN -static void wntohl(wchar_t *, int); -#endif /* _BYTE_ORDER == _LITTLE_ENDIAN */ void __collate_err(int ex, const char *f) __dead2; #undef __collate_load_error @@ -113,14 +110,6 @@ } if (fread(&info, sizeof(info), 1, fp) != 1) goto error_close_and_return; -#if _BYTE_ORDER == _LITTLE_ENDIAN - for(z = 0; z < info.directive_count; z++) { - info.undef_pri.pri[z] = ntohl(info.undef_pri.pri[z]); - info.subst_count[z] = ntohl(info.subst_count[z]); - } - info.chain_count = ntohl(info.chain_count); - info.large_pri_count = ntohl(info.large_pri_count); -#endif /* _BYTE_ORDER == _LITTLE_ENDIAN */ if ((chains = info.chain_count) < 0) { #ifdef LOCALE_DEBUG fprintf(stderr, "__collate_load_tables: wrong chain count (%d)\n", @@ -181,42 +170,6 @@ else TMP->__large_char_pri_table = NULL; -#if _BYTE_ORDER == _LITTLE_ENDIAN - { - struct __collate_st_char_pri *p = TMP->__char_pri_table; - for(i = UCHAR_MAX + 1; i-- > 0; p++) { - for(z = 0; z < info.directive_count; z++) - p->pri[z] = ntohl(p->pri[z]); - } - } - for(z = 0; z < info.directive_count; z++) - if (info.subst_count[z] > 0) { - struct __collate_st_subst *p = - TMP->__substitute_table[z]; - for(i = info.subst_count[z]; i-- > 0; p++) { - p->val = ntohl(p->val); - wntohl(p->str, STR_LEN); - } - } - { - struct __collate_st_chain_pri *p = TMP->__chain_pri_table; - - for(i = chains; i-- > 0; p++) { - wntohl(p->str, STR_LEN); - for(z = 0; z < info.directive_count; z++) - p->pri.pri[z] = ntohl(p->pri.pri[z]); - } - } - if (info.large_pri_count > 0) { - struct __collate_st_large_char_pri *p = - TMP->__large_char_pri_table; - for(i = info.large_pri_count; i-- > 0; p++) { - p->val = ntohl(p->val); - for(z = 0; z < info.directive_count; z++) - p->pri.pri[z] = ntohl(p->pri.pri[z]); - } - } -#endif /* _BYTE_ORDER == _LITTLE_ENDIAN */ (void)strcpy(TMP->__encoding, encoding); (void)memcpy(&TMP->__info, &info, sizeof(info)); __collate_data = TMP; @@ -854,15 +807,6 @@ return len; } -#if _BYTE_ORDER == _LITTLE_ENDIAN -static void -wntohl(wchar_t *str, int len) -{ - for(; *str && len > 0; str++, len--) - *str = ntohl(*str); -} -#endif /* _BYTE_ORDER == _LITTLE_ENDIAN */ - #ifdef COLLATE_DEBUG static char * show(int c) @@ -898,7 +842,6 @@ __collate_print_tables() { int i, z; - locale_t loc = __current_locale(); printf("Info: p=%d s=%d f=0x%02x m=%d dc=%d up=%d us=%d pc=%d " "sc=%d cc=%d lc=%d\n", From owner-p4-projects@FreeBSD.ORG Tue Sep 2 13:55:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 665271065672; Tue, 2 Sep 2008 13:55: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 279241065670 for ; Tue, 2 Sep 2008 13:55:29 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 160E18FC14 for ; Tue, 2 Sep 2008 13:55:29 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m82DtS3l096286 for ; Tue, 2 Sep 2008 13:55:28 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m82DtSQR096284 for perforce@freebsd.org; Tue, 2 Sep 2008 13:55:28 GMT (envelope-from trasz@freebsd.org) Date: Tue, 2 Sep 2008 13:55:28 GMT Message-Id: <200809021355.m82DtSQR096284@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 149058 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Sep 2008 13:55:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=149058 Change 149058 by trasz@trasz_traszkan on 2008/09/02 13:54:31 Backoff kern/stack_protector.c renaming. Instead, do it as suggested by Ruslan Ermilov. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/Makefile.inc#11 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/stack_protector.c#3 add .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_stack_protector.c#2 delete Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/Makefile.inc#11 (text+ko) ==== @@ -1,6 +1,10 @@ # $FreeBSD: src/lib/libc/posix1e/Makefile.inc,v 1.19 2006/07/07 14:02:17 rwatson Exp $ -.PATH: ${.CURDIR}/posix1e ${.CURDIR}/../../sys/kern/ +.PATH: ${.CURDIR}/posix1e + +# Copy kern/subr_acl_nfs4.c to the libc object directory. +subr_acl_nfs4.c: ${.CURDIR}/../../sys/kern/subr_acl_nfs4.c + cat ${.ALLSRC} > ${.TARGET} SRCS+= acl_branding.c \ acl_calc_mask.c \ ==== //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#12 (text+ko) ==== @@ -1612,7 +1612,7 @@ kern/sched_4bsd.c optional sched_4bsd kern/sched_ule.c optional sched_ule kern/serdev_if.m standard -kern/subr_stack_protector.c standard \ +kern/stack_protector.c standard \ compile-with "${NORMAL_C:N-fstack-protector*}" kern/subr_acl_posix1e.c standard kern/subr_acl_nfs4.c standard From owner-p4-projects@FreeBSD.ORG Tue Sep 2 15:00:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6581B106566C; Tue, 2 Sep 2008 15:00:36 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 284F6106564A for ; Tue, 2 Sep 2008 15:00:36 +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 163898FC1B for ; Tue, 2 Sep 2008 15:00:36 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m82F0ZLt008184 for ; Tue, 2 Sep 2008 15:00:35 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m82F0ZZn008181 for perforce@freebsd.org; Tue, 2 Sep 2008 15:00:35 GMT (envelope-from raj@freebsd.org) Date: Tue, 2 Sep 2008 15:00:35 GMT Message-Id: <200809021500.m82F0ZZn008181@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 149061 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Sep 2008 15:00:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=149061 Change 149061 by raj@raj_mimi on 2008/09/02 14:59:45 IFC @149048 Affected files ... .. //depot/projects/arm/src/ObsoleteFiles.inc#38 integrate .. //depot/projects/arm/src/UPDATING#29 integrate .. //depot/projects/arm/src/bin/Makefile#3 integrate .. //depot/projects/arm/src/bin/pkill/Makefile#1 branch .. //depot/projects/arm/src/bin/pkill/pkill.1#1 branch .. //depot/projects/arm/src/bin/pkill/pkill.c#1 branch .. //depot/projects/arm/src/bin/sh/sh.1#8 integrate .. //depot/projects/arm/src/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#3 integrate .. //depot/projects/arm/src/contrib/bind9/CHANGES#10 integrate .. //depot/projects/arm/src/contrib/bind9/COPYRIGHT#5 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dig/dighost.c#5 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/client.c#7 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/config.c#5 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/controlconf.c#4 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/interfacemgr.c#4 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/lwresd.c#4 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/named.conf.docbook#5 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/server.c#7 integrate .. //depot/projects/arm/src/contrib/bind9/bin/rndc/rndc.c#4 integrate .. //depot/projects/arm/src/contrib/bind9/configure.in#6 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM-book.xml#7 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/configure.in#5 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind9/check.c#6 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/api#7 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/dispatch.c#7 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/dispatch.h#6 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/request.c#4 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/resolver.c#9 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/xfrin.c#5 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/api#5 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/resource.h#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/socket.h#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/timer.h#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/timer.c#5 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/app.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/resource.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/socket.c#5 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/socket_p.h#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isccfg/api#4 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isccfg/namedconf.c#4 integrate .. //depot/projects/arm/src/contrib/bind9/version#10 integrate .. //depot/projects/arm/src/contrib/gcc/config/freebsd-spec.h#3 integrate .. //depot/projects/arm/src/contrib/gcc/config/freebsd.h#3 integrate .. //depot/projects/arm/src/contrib/gcc/config/i386/freebsd64.h#3 integrate .. //depot/projects/arm/src/contrib/gcc/config/mips/freebsd.h#1 branch .. //depot/projects/arm/src/contrib/sendmail/libmilter/main.c#5 integrate .. //depot/projects/arm/src/contrib/telnet/telnetd/telnetd.8#2 integrate .. //depot/projects/arm/src/crypto/openssh/config.h#5 integrate .. //depot/projects/arm/src/crypto/openssh/openbsd-compat/fake-queue.h#2 delete .. //depot/projects/arm/src/crypto/openssh/openbsd-compat/tree.h#2 delete .. //depot/projects/arm/src/etc/defaults/rc.conf#25 integrate .. //depot/projects/arm/src/etc/rc.d/savecore#4 integrate .. //depot/projects/arm/src/etc/sendmail/freebsd.submit.mc#5 integrate .. //depot/projects/arm/src/gnu/lib/libgcc/Makefile#7 integrate .. //depot/projects/arm/src/gnu/lib/libgomp/Makefile#2 integrate .. //depot/projects/arm/src/gnu/lib/libgomp/config.h#2 integrate .. //depot/projects/arm/src/gnu/usr.bin/Makefile#9 integrate .. //depot/projects/arm/src/gnu/usr.bin/binutils/libbfd/Makefile.amd64#2 integrate .. //depot/projects/arm/src/gnu/usr.bin/cc/Makefile.tgt#6 integrate .. //depot/projects/arm/src/gnu/usr.bin/cc/cc_tools/Makefile#8 integrate .. //depot/projects/arm/src/gnu/usr.bin/cc/cc_tools/elfos-undef.h#1 branch .. //depot/projects/arm/src/gnu/usr.bin/cc/cc_tools/freebsd64-fix.h#2 delete .. //depot/projects/arm/src/lib/bind/config.h#6 integrate .. //depot/projects/arm/src/lib/libarchive/Makefile#20 integrate .. //depot/projects/arm/src/lib/libarchive/archive.h#2 integrate .. //depot/projects/arm/src/lib/libarchive/archive_entry.c#14 integrate .. //depot/projects/arm/src/lib/libarchive/archive_entry.h#9 integrate .. //depot/projects/arm/src/lib/libarchive/archive_entry_private.h#5 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write_disk.c#14 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write_set_format.c#5 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write_set_format_by_name.c#6 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write_set_format_mtree.c#1 branch .. //depot/projects/arm/src/lib/libarchive/archive_write_set_format_shar.c#8 integrate .. //depot/projects/arm/src/lib/libarchive/test/main.c#10 integrate .. //depot/projects/arm/src/lib/libarchive/test/read_open_memory.c#3 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_acl_basic.c#5 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_acl_pax.c#6 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_bad_fd.c#2 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_compat_gtar.c#3 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_compat_zip.c#3 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_empty_write.c#3 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_entry.c#6 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_read_compress_program.c#3 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_read_data_large.c#4 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_read_extract.c#5 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_read_format_ar.c#6 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_read_format_cpio_bin.c#2 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_read_format_cpio_bin_Z.c#2 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_read_format_cpio_bin_bz2.c#2 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_read_format_cpio_bin_gz.c#2 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_read_format_cpio_odc.c#3 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_read_format_cpio_svr4_gzip.c#2 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_read_format_cpio_svr4c_Z.c#2 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_read_format_empty.c#2 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_read_format_gtar_gz.c#2 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_read_format_gtar_sparse.c#6 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_read_format_iso_gz.c#2 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_read_format_isorr_bz2.c#5 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_read_format_mtree.c#3 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_read_format_pax_bz2.c#2 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_read_format_tar.c#4 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_read_format_tar_empty_filename.c#2 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_read_format_tbz.c#2 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_read_format_tgz.c#2 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_read_format_tz.c#2 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_read_format_zip.c#5 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_read_large.c#4 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_read_pax_truncated.c#3 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_read_position.c#4 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_read_truncated.c#4 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_tar_filenames.c#7 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_tar_large.c#3 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_write_compress.c#2 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_write_compress_program.c#3 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_write_disk.c#7 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_write_disk_hardlink.c#3 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_write_disk_perms.c#9 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_write_disk_secure.c#5 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_write_format_ar.c#8 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_write_format_cpio.c#5 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_write_format_cpio_empty.c#3 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_write_format_cpio_newc.c#2 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_write_format_cpio_odc.c#2 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_write_format_shar_empty.c#3 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_write_format_tar.c#4 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_write_format_tar_empty.c#4 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_write_open_memory.c#4 integrate .. //depot/projects/arm/src/lib/libpcap/Makefile#4 integrate .. //depot/projects/arm/src/lib/libthread_db/arch/mips/libpthread_md.c#1 branch .. //depot/projects/arm/src/rescue/rescue/Makefile#12 integrate .. //depot/projects/arm/src/sbin/geom/class/eli/geli.8#7 integrate .. //depot/projects/arm/src/sbin/geom/class/eli/geom_eli.c#11 integrate .. //depot/projects/arm/src/sbin/gpt/Makefile#3 delete .. //depot/projects/arm/src/sbin/gpt/add.c#4 delete .. //depot/projects/arm/src/sbin/gpt/boot.c#3 delete .. //depot/projects/arm/src/sbin/gpt/create.c#2 delete .. //depot/projects/arm/src/sbin/gpt/destroy.c#2 delete .. //depot/projects/arm/src/sbin/gpt/gpt.8#4 delete .. //depot/projects/arm/src/sbin/gpt/gpt.c#5 delete .. //depot/projects/arm/src/sbin/gpt/gpt.h#3 delete .. //depot/projects/arm/src/sbin/gpt/label.c#3 delete .. //depot/projects/arm/src/sbin/gpt/map.c#2 delete .. //depot/projects/arm/src/sbin/gpt/map.h#2 delete .. //depot/projects/arm/src/sbin/gpt/migrate.c#3 delete .. //depot/projects/arm/src/sbin/gpt/recover.c#2 delete .. //depot/projects/arm/src/sbin/gpt/remove.c#3 delete .. //depot/projects/arm/src/sbin/gpt/show.c#4 delete .. //depot/projects/arm/src/sbin/ifconfig/ifconfig.8#22 integrate .. //depot/projects/arm/src/sbin/ifconfig/ifconfig.c#15 integrate .. //depot/projects/arm/src/sbin/ifconfig/ifvlan.c#3 integrate .. //depot/projects/arm/src/sbin/md5/md5.c#3 integrate .. //depot/projects/arm/src/sbin/mount/mount.c#10 integrate .. //depot/projects/arm/src/share/man/man4/witness.4#2 integrate .. //depot/projects/arm/src/share/man/man9/Makefile#22 integrate .. //depot/projects/arm/src/share/man/man9/VOP_ATTRIB.9#2 integrate .. //depot/projects/arm/src/share/man/man9/vfs_busy.9#2 integrate .. //depot/projects/arm/src/share/man/man9/vfs_unbusy.9#2 integrate .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#75 integrate .. //depot/projects/arm/src/sys/boot/sparc64/loader/main.c#7 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_da.c#25 integrate .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#3 integrate .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/cpuvar.h#4 integrate .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#2 integrate .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 integrate .. //depot/projects/arm/src/sys/compat/linprocfs/linprocfs.c#26 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_getcwd.c#11 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_misc.c#34 integrate .. //depot/projects/arm/src/sys/compat/ndis/subr_ndis.c#11 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_fcntl.c#10 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#6 integrate .. //depot/projects/arm/src/sys/dev/bm/if_bm.c#2 integrate .. //depot/projects/arm/src/sys/dev/ciss/ciss.c#21 integrate .. //depot/projects/arm/src/sys/dev/ciss/cissreg.h#4 integrate .. //depot/projects/arm/src/sys/dev/cpuctl/cpuctl.c#2 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_ioctl.h#8 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_main.c#17 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_sge.c#15 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/toecore/toedev.c#2 integrate .. //depot/projects/arm/src/sys/dev/dc/if_dc.c#18 integrate .. //depot/projects/arm/src/sys/dev/dc/if_dcreg.h#10 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_drv.c#8 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_lock.c#4 integrate .. //depot/projects/arm/src/sys/dev/e1000/if_igb.c#2 integrate .. //depot/projects/arm/src/sys/dev/e1000/if_igb.h#2 integrate .. //depot/projects/arm/src/sys/dev/ic/ns16550.h#3 integrate .. //depot/projects/arm/src/sys/dev/ipmi/ipmi.c#10 integrate .. //depot/projects/arm/src/sys/dev/ipmi/ipmi_kcs.c#3 integrate .. //depot/projects/arm/src/sys/dev/ipmi/ipmivars.h#3 integrate .. //depot/projects/arm/src/sys/dev/md/md.c#14 integrate .. //depot/projects/arm/src/sys/dev/ppc/ppc_isa.c#3 integrate .. //depot/projects/arm/src/sys/dev/syscons/syscons.c#19 integrate .. //depot/projects/arm/src/sys/dev/usb/ehci_pci.c#15 integrate .. //depot/projects/arm/src/sys/dev/usb/ohci_pci.c#11 integrate .. //depot/projects/arm/src/sys/dev/usb/ufoma.c#8 integrate .. //depot/projects/arm/src/sys/dev/usb/uhci_pci.c#9 integrate .. //depot/projects/arm/src/sys/dev/usb/uipaq.c#8 integrate .. //depot/projects/arm/src/sys/dev/usb/umodem.c#9 integrate .. //depot/projects/arm/src/sys/dev/usb/uplcom.c#18 integrate .. //depot/projects/arm/src/sys/dev/usb/uvscom.c#11 integrate .. //depot/projects/arm/src/sys/dev/xen/blkback/blkback.c#2 integrate .. //depot/projects/arm/src/sys/fs/cd9660/cd9660_vnops.c#3 integrate .. //depot/projects/arm/src/sys/fs/coda/coda_venus.c#3 integrate .. //depot/projects/arm/src/sys/fs/coda/coda_venus.h#3 integrate .. //depot/projects/arm/src/sys/fs/coda/coda_vnops.c#3 integrate .. //depot/projects/arm/src/sys/fs/devfs/devfs_vnops.c#24 integrate .. //depot/projects/arm/src/sys/fs/fdescfs/fdesc_vnops.c#12 integrate .. //depot/projects/arm/src/sys/fs/hpfs/hpfs_vnops.c#10 integrate .. //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_fat.c#8 integrate .. //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_vnops.c#19 integrate .. //depot/projects/arm/src/sys/fs/nwfs/nwfs_io.c#7 integrate .. //depot/projects/arm/src/sys/fs/nwfs/nwfs_vnops.c#5 integrate .. //depot/projects/arm/src/sys/fs/portalfs/portal_vnops.c#7 integrate .. //depot/projects/arm/src/sys/fs/pseudofs/pseudofs_vnops.c#10 integrate .. //depot/projects/arm/src/sys/fs/smbfs/smbfs_io.c#9 integrate .. //depot/projects/arm/src/sys/fs/smbfs/smbfs_node.c#12 integrate .. //depot/projects/arm/src/sys/fs/smbfs/smbfs_vnops.c#11 integrate .. //depot/projects/arm/src/sys/fs/tmpfs/tmpfs_vfsops.c#8 integrate .. //depot/projects/arm/src/sys/fs/tmpfs/tmpfs_vnops.c#9 integrate .. //depot/projects/arm/src/sys/fs/unionfs/union_subr.c#15 integrate .. //depot/projects/arm/src/sys/fs/unionfs/union_vfsops.c#13 integrate .. //depot/projects/arm/src/sys/fs/unionfs/union_vnops.c#14 integrate .. //depot/projects/arm/src/sys/geom/journal/g_journal.c#8 integrate .. //depot/projects/arm/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#14 integrate .. //depot/projects/arm/src/sys/gnu/fs/ext2fs/ext2_vnops.c#8 integrate .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#8 integrate .. //depot/projects/arm/src/sys/i386/cpufreq/powernow.c#5 integrate .. //depot/projects/arm/src/sys/i386/cpufreq/smist.c#4 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/imgact_coff.c#7 integrate .. //depot/projects/arm/src/sys/i386/xen/xen_machdep.c#2 integrate .. //depot/projects/arm/src/sys/kern/imgact_shell.c#5 integrate .. //depot/projects/arm/src/sys/kern/kern_exec.c#27 integrate .. //depot/projects/arm/src/sys/kern/kern_exit.c#31 integrate .. //depot/projects/arm/src/sys/kern/kern_linker.c#18 integrate .. //depot/projects/arm/src/sys/kern/kern_mib.c#10 integrate .. //depot/projects/arm/src/sys/kern/kern_sig.c#32 integrate .. //depot/projects/arm/src/sys/kern/kern_subr.c#8 integrate .. //depot/projects/arm/src/sys/kern/subr_witness.c#30 integrate .. //depot/projects/arm/src/sys/kern/tty.c#22 integrate .. //depot/projects/arm/src/sys/kern/tty_inq.c#2 integrate .. //depot/projects/arm/src/sys/kern/tty_outq.c#2 integrate .. //depot/projects/arm/src/sys/kern/tty_ttydisc.c#2 integrate .. //depot/projects/arm/src/sys/kern/uipc_mqueue.c#18 integrate .. //depot/projects/arm/src/sys/kern/vfs_default.c#17 integrate .. //depot/projects/arm/src/sys/kern/vfs_lookup.c#25 integrate .. //depot/projects/arm/src/sys/kern/vfs_mount.c#41 integrate .. //depot/projects/arm/src/sys/kern/vfs_subr.c#48 integrate .. //depot/projects/arm/src/sys/kern/vfs_syscalls.c#38 integrate .. //depot/projects/arm/src/sys/kern/vfs_vnops.c#22 integrate .. //depot/projects/arm/src/sys/kern/vnode_if.src#13 integrate .. //depot/projects/arm/src/sys/modules/aha/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/ahb/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/an/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/ar/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/ath_rate_amrr/Makefile#8 integrate .. //depot/projects/arm/src/sys/modules/ath_rate_onoe/Makefile#7 integrate .. //depot/projects/arm/src/sys/modules/ath_rate_sample/Makefile#7 integrate .. //depot/projects/arm/src/sys/modules/ce/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/cp/Makefile#4 integrate .. //depot/projects/arm/src/sys/modules/ctau/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/cx/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/digi/digi/Makefile#4 integrate .. //depot/projects/arm/src/sys/modules/fatm/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/hatm/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/hifn/Makefile#4 integrate .. //depot/projects/arm/src/sys/modules/if_tap/Makefile#4 integrate .. //depot/projects/arm/src/sys/modules/linux/Makefile#10 integrate .. //depot/projects/arm/src/sys/modules/netgraph/sync_ar/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/netgraph/sync_sr/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/patm/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/pf/Makefile#7 integrate .. //depot/projects/arm/src/sys/modules/pflog/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/rp/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/safe/Makefile#4 integrate .. //depot/projects/arm/src/sys/modules/sppp/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/sr/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/svr4/Makefile#5 integrate .. //depot/projects/arm/src/sys/modules/trm/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/ubsec/Makefile#4 integrate .. //depot/projects/arm/src/sys/modules/usb/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/wlan/Makefile#6 integrate .. //depot/projects/arm/src/sys/modules/wlan_acl/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/wlan_amrr/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/wlan_ccmp/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/wlan_rssadapt/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/wlan_tkip/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/wlan_wep/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/wlan_xauth/Makefile#3 integrate .. //depot/projects/arm/src/sys/net/bpf.c#31 integrate .. //depot/projects/arm/src/sys/net/bpf_filter.c#10 integrate .. //depot/projects/arm/src/sys/net/bpf_jitter.c#3 integrate .. //depot/projects/arm/src/sys/net/if.h#15 integrate .. //depot/projects/arm/src/sys/net/if_vlan.c#24 integrate .. //depot/projects/arm/src/sys/net/route.c#12 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211.c#20 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_crypto_tkip.c#8 integrate .. //depot/projects/arm/src/sys/netgraph/ng_bpf.c#5 integrate .. //depot/projects/arm/src/sys/netinet/if_ether.c#21 integrate .. //depot/projects/arm/src/sys/netinet/libalias/alias_db.c#7 integrate .. //depot/projects/arm/src/sys/netinet/sctp_indata.c#26 integrate .. //depot/projects/arm/src/sys/netinet/sctp_lock_bsd.h#10 integrate .. //depot/projects/arm/src/sys/netinet/sctp_output.c#28 integrate .. //depot/projects/arm/src/sys/netinet/sctp_sysctl.h#9 integrate .. //depot/projects/arm/src/sys/netinet/sctp_timer.c#19 integrate .. //depot/projects/arm/src/sys/netinet/sctp_timer.h#8 integrate .. //depot/projects/arm/src/sys/netinet/sctp_var.h#18 integrate .. //depot/projects/arm/src/sys/netinet/sctputil.c#30 integrate .. //depot/projects/arm/src/sys/netinet/tcp_hostcache.c#9 integrate .. //depot/projects/arm/src/sys/netinet/tcp_offload.c#3 integrate .. //depot/projects/arm/src/sys/netinet/toedev.h#3 integrate .. //depot/projects/arm/src/sys/netinet6/udp6_usrreq.c#22 integrate .. //depot/projects/arm/src/sys/nfs4client/nfs4_vnops.c#14 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_bio.c#14 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_vfsops.c#23 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_vnops.c#23 integrate .. //depot/projects/arm/src/sys/nfsserver/nfs_serv.c#21 integrate .. //depot/projects/arm/src/sys/nfsserver/nfs_srvsubs.c#16 integrate .. //depot/projects/arm/src/sys/powerpc/aim/clock.c#4 integrate .. //depot/projects/arm/src/sys/powerpc/aim/interrupt.c#2 integrate .. //depot/projects/arm/src/sys/powerpc/aim/machdep.c#6 integrate .. //depot/projects/arm/src/sys/powerpc/aim/mmu_oea.c#4 integrate .. //depot/projects/arm/src/sys/powerpc/aim/vm_machdep.c#5 integrate .. //depot/projects/arm/src/sys/powerpc/booke/pmap.c#4 integrate .. //depot/projects/arm/src/sys/powerpc/include/cpufunc.h#3 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/db_interface.c#4 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/pmap_dispatch.c#11 integrate .. //depot/projects/arm/src/sys/security/audit/audit_arg.c#20 integrate .. //depot/projects/arm/src/sys/security/audit/audit_worker.c#12 integrate .. //depot/projects/arm/src/sys/security/mac_bsdextended/mac_bsdextended.c#16 integrate .. //depot/projects/arm/src/sys/security/mac_lomac/mac_lomac.c#14 integrate .. //depot/projects/arm/src/sys/sys/ioccom.h#3 integrate .. //depot/projects/arm/src/sys/sys/mount.h#24 integrate .. //depot/projects/arm/src/sys/sys/ttydisc.h#2 integrate .. //depot/projects/arm/src/sys/sys/ttyqueue.h#2 integrate .. //depot/projects/arm/src/sys/sys/vnode.h#28 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_alloc.c#12 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_extern.h#8 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_snapshot.c#23 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_softdep.c#27 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_vfsops.c#33 integrate .. //depot/projects/arm/src/sys/ufs/ufs/ufs_vfsops.c#6 integrate .. //depot/projects/arm/src/sys/ufs/ufs/ufs_vnops.c#23 integrate .. //depot/projects/arm/src/sys/vm/swap_pager.c#19 integrate .. //depot/projects/arm/src/sys/vm/vm_mmap.c#17 integrate .. //depot/projects/arm/src/sys/vm/vnode_pager.c#15 integrate .. //depot/projects/arm/src/tools/regression/atm/README#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/Makefile#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/bpf_test.c#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0001.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0002.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0003.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0004.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0005.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0006.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0007.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0008.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0009.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0010.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0011.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0012.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0013.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0014.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0015.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0016.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0017.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0018.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0019.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0020.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0021.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0022.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0023.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0024.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0025.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0026.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0027.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0028.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0029.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0030.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0031.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0032.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0033.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0034.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0035.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0036.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0037.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0038.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0039.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0040.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0041.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0042.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0043.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0044.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0045.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0046.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0047.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0048.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0049.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0050.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0051.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0052.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0053.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0054.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0055.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0056.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0057.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0058.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0059.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0060.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0061.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0062.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0063.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0064.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0065.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0066.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0067.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0068.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0069.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0070.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0071.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0072.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0073.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0074.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0075.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0076.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0077.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0078.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0079.h#2 integrate .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0080.h#1 branch .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0081.h#1 branch .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0082.h#1 branch .. //depot/projects/arm/src/tools/regression/bpf/bpf_filter/tests/test0083.h#1 branch .. //depot/projects/arm/src/tools/regression/geom_eli/attach-d.t#2 integrate .. //depot/projects/arm/src/tools/regression/geom_eli/configure-b-B.t#2 integrate .. //depot/projects/arm/src/tools/regression/geom_eli/delkey.t#2 integrate .. //depot/projects/arm/src/tools/regression/geom_eli/detach-l.t#2 integrate .. //depot/projects/arm/src/tools/regression/geom_eli/init-B.t#1 branch .. //depot/projects/arm/src/tools/regression/geom_eli/init-a.t#4 integrate .. //depot/projects/arm/src/tools/regression/geom_eli/init-i-P.t#2 integrate .. //depot/projects/arm/src/tools/regression/geom_eli/init.t#4 integrate .. //depot/projects/arm/src/tools/regression/geom_eli/integrity-copy.t#4 integrate .. //depot/projects/arm/src/tools/regression/geom_eli/integrity-data.t#4 integrate .. //depot/projects/arm/src/tools/regression/geom_eli/integrity-hmac.t#4 integrate .. //depot/projects/arm/src/tools/regression/geom_eli/kill.t#2 integrate .. //depot/projects/arm/src/tools/regression/geom_eli/nokey.t#2 integrate .. //depot/projects/arm/src/tools/regression/geom_eli/readonly.t#2 integrate .. //depot/projects/arm/src/tools/regression/geom_eli/setkey.t#2 integrate .. //depot/projects/arm/src/tools/tools/cd2dvd/cd2dvd.sh#1 branch .. //depot/projects/arm/src/usr.bin/Makefile#14 integrate .. //depot/projects/arm/src/usr.bin/locate/locate/locate.c#2 integrate .. //depot/projects/arm/src/usr.bin/netstat/inet.c#11 integrate .. //depot/projects/arm/src/usr.bin/netstat/main.c#8 integrate .. //depot/projects/arm/src/usr.bin/netstat/netstat.h#8 integrate .. //depot/projects/arm/src/usr.bin/netstat/route.c#8 integrate .. //depot/projects/arm/src/usr.bin/pkill/Makefile#3 delete .. //depot/projects/arm/src/usr.bin/pkill/pkill.1#4 delete .. //depot/projects/arm/src/usr.bin/pkill/pkill.c#3 delete .. //depot/projects/arm/src/usr.bin/sed/sed.1#5 integrate .. //depot/projects/arm/src/usr.sbin/cxgbtool/cxgbtool.c#2 integrate .. //depot/projects/arm/src/usr.sbin/cxgbtool/reg_defs_t3.c#2 integrate .. //depot/projects/arm/src/usr.sbin/cxgbtool/reg_defs_t3b.c#2 integrate .. //depot/projects/arm/src/usr.sbin/cxgbtool/version.h#2 integrate .. //depot/projects/arm/src/usr.sbin/lpr/lpd/recvjob.c#3 integrate .. //depot/projects/arm/src/usr.sbin/syslogd/syslogd.c#5 integrate Differences ... ==== //depot/projects/arm/src/ObsoleteFiles.inc#38 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.156 2008/08/24 10:01:22 ed Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.157 2008/08/31 08:33:41 antoine Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -16,6 +16,24 @@ # 20080823: removal of unneeded pt_chown, to implement grantpt(3) OLD_FILES+=usr/libexec/pt_chown +# 20080822: ntp 4.2.4p5 import +OLD_FILES+=usr/share/doc/ntp/driver23.html +OLD_FILES+=usr/share/doc/ntp/driver24.html +# 20080821: several man pages moved from man4.i386 to man4 +.if ${TARGET_ARCH} == "i386" +OLD_FILES+=usr/share/man/man4/i386/acpi_aiboost.4.gz +OLD_FILES+=usr/share/man/man4/i386/acpi_asus.4.gz +OLD_FILES+=usr/share/man/man4/i386/acpi_fujitsu.4.gz +OLD_FILES+=usr/share/man/man4/i386/acpi_ibm.4.gz +OLD_FILES+=usr/share/man/man4/i386/acpi_panasonic.4.gz +OLD_FILES+=usr/share/man/man4/i386/acpi_sony.4.gz +OLD_FILES+=usr/share/man/man4/i386/acpi_toshiba.4.gz +OLD_FILES+=usr/share/man/man4/i386/ichwd.4.gz +OLD_FILES+=usr/share/man/man4/i386/if_ndis.4.gz +OLD_FILES+=usr/share/man/man4/i386/io.4.gz +OLD_FILES+=usr/share/man/man4/i386/linux.4.gz +OLD_FILES+=usr/share/man/man4/i386/ndis.4.gz +.endif # 20080820: MPSAFE TTY layer integrated OLD_FILES+=usr/include/sys/linedisc.h OLD_FILES+=usr/share/man/man3/posix_openpt.3.gz ==== //depot/projects/arm/src/UPDATING#29 (text+ko) ==== @@ -41,6 +41,21 @@ Adding these drivers to your kernel configuration file shall cause compilation to fail. +20080801: + OpenSSH has been upgraded to 5.1p1. + + For many years, FreeBSD's version of OpenSSH preferred DSA + over RSA for host and user authentication keys. With this + upgrade, we've switched to the vendor's default of RSA over + DSA. This may cause upgraded clients to warn about unknown + host keys even for previously known hosts. Users should + follow the usual procedure for verifying host keys before + accepting the RSA key. + + This can be circumvented by setting the "HostKeyAlgorithms" + option to "ssh-dss,ssh-rsa" in ~/.ssh/config or on the ssh + command line. + 20080713: The sio(4) driver has been removed from the i386 and amd64 kernel configuration files. This means uart(4) is now the @@ -1108,4 +1123,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.539 2008/08/20 08:31:58 ed Exp $ +$FreeBSD: src/UPDATING,v 1.540 2008/09/01 23:50:56 des Exp $ ==== //depot/projects/arm/src/bin/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/Makefile,v 1.27 2008/03/13 17:38:06 obrien Exp $ +# $FreeBSD: src/bin/Makefile,v 1.28 2008/08/31 14:27:59 yar Exp $ .include @@ -25,6 +25,7 @@ mkdir \ mv \ pax \ + pkill \ ps \ pwd \ ${_rcp} \ ==== //depot/projects/arm/src/bin/sh/sh.1#8 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.126 2007/12/05 12:29:26 ru Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.127 2008/08/30 22:35:21 ed Exp $ .\" .Dd October 7, 2006 .Dt SH 1 @@ -2118,7 +2118,7 @@ For aliases the alias expansion is printed; for commands and tracked aliases the complete pathname of the command is printed. -.It Ic ulimit Oo Fl HSabcdflmnstuv Oc Op Ar limit +.It Ic ulimit Oo Fl HSabcdflmnpstuv Oc Op Ar limit Set or display resource limits (see .Xr getrlimit 2 ) . If @@ -2172,6 +2172,8 @@ The maximal resident set size of a process, in kilobytes. .It Fl n Ar nofiles The maximal number of descriptors that could be opened by a process. +.It Fl p Ar pseudoterminals +The maximal number of pseudo-terminals for this user ID. .It Fl s Ar stacksize The maximal size of the stack segment, in kilobytes. .It Fl t Ar time ==== //depot/projects/arm/src/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#3 (text+ko) ==== @@ -356,7 +356,7 @@ #define VOP_CLOSE(vp, f, c, o, cr) 0 #define VOP_PUTPAGE(vp, of, sz, fl, cr) 0 -#define VOP_GETATTR(vp, vap, fl, cr) ((vap)->va_size = (vp)->v_size, 0) +#define VOP_GETATTR(vp, vap, fl) ((vap)->va_size = (vp)->v_size, 0) #define VOP_FSYNC(vp, f, cr) fsync((vp)->v_fd) ==== //depot/projects/arm/src/contrib/bind9/CHANGES#10 (text+ko) ==== @@ -1,3 +1,47 @@ + --- 9.4.2-P2 released --- + +2406. [bug] Some operating systems have FD_SETSIZE set to a + low value by default, which can cause resource + exhaustion when many simultaneous connections are + open. Linux in particular makes it difficult to + increase this value. To use more sockets with + select(), set ISC_SOCKET_FDSETSIZE. Example: + STD_CDEFINES="-DISC_SOCKET_FDSETSIZE=4096" ./configure + (This should not be necessary in most cases, and + never for an authoritative-only server.) [RT #18328] + +2404. [port] hpux: files unlimited support. + +2403. [bug] TSIG context leak. [RT #18341] + +2402. [port] Support Solaris 2.11 and over. [RT #18362] + +2401. [bug] Expect to get E[MN]FILE errno internal_accept() + (from accept() or fcntl() system calls). [RT #18358] + +2399. [bug] Abort timeout queries to reduce the number of open + UDP sockets. [RT #18367] + +2398. [bug] Improve file descriptor management. New, + temporary, named.conf option reserved-sockets, + default 512. [RT #18344] + +2396. [bug] Don't set SO_REUSEADDR for randomized ports. + [RT #18336] + +2395. [port] Avoid warning and no effect from "files unlimited" + on Linux when running as root. [RT #18335] + +2394. [bug] Default configuration options set the limit for + open files to 'unlimited' as described in the + documentation. [RT #18331] + +2392. [bug] remove 'grep -q' from acl test script, some platforms + don't support it. [RT #18253] + +2322. [port] MacOS: work around the limitation of setrlimit() + for RLIMIT_NOFILE. [RT #17526] + --- 9.4.2-P1 released --- 2375. [security] Fully randomize UDP query ports to improve @@ -33,7 +77,7 @@ [RT #17113] 2249. [bug] Only set Authentic Data bit if client requested - DNSSEC, per RFC 3655 [RT #17175] + DNSSEC, per RFC 3655 [RT #17175] 2248. [cleanup] Fix several errors reported by Coverity. [RT #17160] ==== //depot/projects/arm/src/contrib/bind9/COPYRIGHT#5 (text+ko) ==== @@ -1,4 +1,4 @@ -Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") +Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") Copyright (C) 1996-2003 Internet Software Consortium. Permission to use, copy, modify, and/or distribute this software for any @@ -13,7 +13,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -$Id: COPYRIGHT,v 1.9.18.4 2007/08/28 07:19:54 tbox Exp $ +$Id: COPYRIGHT,v 1.9.18.4.10.1 2008/07/23 07:28:54 tbox Exp $ Portions Copyright (C) 1996-2001 Nominum, Inc. ==== //depot/projects/arm/src/contrib/bind9/bin/dig/dighost.c#5 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dighost.c,v 1.259.18.43 2007/08/28 07:19:55 tbox Exp $ */ +/* $Id: dighost.c,v 1.259.18.43.10.3 2008/07/23 23:16:43 marka Exp $ */ /*! \file * \note @@ -2217,14 +2217,15 @@ sockcount++; debug("sockcount=%d", sockcount); if (specified_source) - result = isc_socket_bind(query->sock, &bind_address); + result = isc_socket_bind(query->sock, &bind_address, + ISC_SOCKET_REUSEADDRESS); else { if ((isc_sockaddr_pf(&query->sockaddr) == AF_INET) && have_ipv4) isc_sockaddr_any(&bind_any); else isc_sockaddr_any6(&bind_any); - result = isc_socket_bind(query->sock, &bind_any); + result = isc_socket_bind(query->sock, &bind_any, 0); } check_result(result, "isc_socket_bind"); bringup_timer(query, TCP_TIMEOUT); @@ -2271,11 +2272,12 @@ sockcount++; debug("sockcount=%d", sockcount); if (specified_source) { - result = isc_socket_bind(query->sock, &bind_address); + result = isc_socket_bind(query->sock, &bind_address, + ISC_SOCKET_REUSEADDRESS); } else { isc_sockaddr_anyofpf(&bind_any, isc_sockaddr_pf(&query->sockaddr)); - result = isc_socket_bind(query->sock, &bind_any); + result = isc_socket_bind(query->sock, &bind_any, 0); } check_result(result, "isc_socket_bind"); ==== //depot/projects/arm/src/contrib/bind9/bin/named/client.c#7 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: client.c,v 1.219.18.28.10.1 2008/05/22 21:28:04 each Exp $ */ +/* $Id: client.c,v 1.219.18.28.10.2 2008/07/23 07:28:54 tbox Exp $ */ #include ==== //depot/projects/arm/src/contrib/bind9/bin/named/config.c#5 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2001-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: config.c,v 1.47.18.32 2007/09/13 05:04:01 each Exp $ */ +/* $Id: config.c,v 1.47.18.32.10.3 2008/07/23 23:48:17 tbox Exp $ */ /*! \file */ @@ -52,7 +52,7 @@ #ifndef WIN32 " coresize default;\n\ datasize default;\n\ - files default;\n\ + files unlimited;\n\ stacksize default;\n" #endif " deallocate-on-exit true;\n\ @@ -99,6 +99,7 @@ use-ixfr true;\n\ edns-udp-size 4096;\n\ max-udp-size 4096;\n\ + reserved-sockets 512;\n\ \n\ /* view */\n\ allow-notify {none;};\n\ ==== //depot/projects/arm/src/contrib/bind9/bin/named/controlconf.c#4 (text+ko) ==== @@ -1,8 +1,8 @@ /* - * Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2006, 2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2001-2003 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: controlconf.c,v 1.40.18.10 2006/12/07 04:53:02 marka Exp $ */ +/* $Id: controlconf.c,v 1.40.18.10.40.3 2008/07/23 23:16:43 marka Exp $ */ /*! \file */ @@ -1151,8 +1151,8 @@ type, &listener->sock); if (result == ISC_R_SUCCESS) - result = isc_socket_bind(listener->sock, - &listener->address); + result = isc_socket_bind(listener->sock, &listener->address, + ISC_SOCKET_REUSEADDRESS); if (result == ISC_R_SUCCESS && type == isc_sockettype_unix) { listener->perm = cfg_obj_asuint32(cfg_tuple_get(control, ==== //depot/projects/arm/src/contrib/bind9/bin/named/interfacemgr.c#4 (text+ko) ==== @@ -1,8 +1,8 @@ /* - * Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2006, 2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2002 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: interfacemgr.c,v 1.76.18.8 2006/07/20 01:10:30 marka Exp $ */ +/* $Id: interfacemgr.c,v 1.76.18.8.44.3 2008/07/23 23:16:43 marka Exp $ */ /*! \file */ @@ -307,7 +307,8 @@ #ifndef ISC_ALLOW_MAPPED isc_socket_ipv6only(ifp->tcpsocket, ISC_TRUE); #endif - result = isc_socket_bind(ifp->tcpsocket, &ifp->addr); + result = isc_socket_bind(ifp->tcpsocket, &ifp->addr, + ISC_SOCKET_REUSEADDRESS); if (result != ISC_R_SUCCESS) { isc_log_write(IFMGR_COMMON_LOGARGS, ISC_LOG_ERROR, "binding TCP socket: %s", ==== //depot/projects/arm/src/contrib/bind9/bin/named/lwresd.c#4 (text+ko) ==== @@ -1,8 +1,8 @@ /* - * Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2006, 2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000-2003 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: lwresd.c,v 1.46.18.7 2006/03/02 00:37:21 marka Exp $ */ +/* $Id: lwresd.c,v 1.46.18.7.52.3 2008/07/23 23:16:43 marka Exp $ */ /*! \file * \brief @@ -576,7 +576,8 @@ return (result); } - result = isc_socket_bind(sock, &listener->address); + result = isc_socket_bind(sock, &listener->address, + ISC_SOCKET_REUSEADDRESS); if (result != ISC_R_SUCCESS) { char socktext[ISC_SOCKADDR_FORMATSIZE]; isc_sockaddr_format(&listener->address, socktext, ==== //depot/projects/arm/src/contrib/bind9/bin/named/named.conf.docbook#5 (text+ko) ==== @@ -2,7 +2,7 @@ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" []> - + Aug 13, 2004 @@ -40,6 +40,7 @@ 2005 2006 2007 + 2008 Internet Systems Consortium, Inc. ("ISC") @@ -201,6 +202,7 @@ port integer; querylog boolean; recursing-file quoted_string; + reserved-sockets integer; random-device quoted_string; recursive-clients integer; serial-query-rate integer; ==== //depot/projects/arm/src/contrib/bind9/bin/named/server.c#7 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: server.c,v 1.419.18.57.10.1 2008/05/22 21:28:04 each Exp $ */ +/* $Id: server.c,v 1.419.18.57.10.3 2008/07/23 12:04:32 marka Exp $ */ /*! \file */ @@ -2696,27 +2696,29 @@ load_configuration(const char *filename, ns_server_t *server, isc_boolean_t first_time) { - isc_result_t result; - isc_interval_t interval; + cfg_aclconfctx_t aclconfctx; + cfg_obj_t *config; cfg_parser_t *parser = NULL; - cfg_obj_t *config; + const cfg_listelt_t *element; + const cfg_obj_t *builtin_views; + const cfg_obj_t *maps[3]; + const cfg_obj_t *obj; const cfg_obj_t *options; + const cfg_obj_t *v4ports, *v6ports; const cfg_obj_t *views; - const cfg_obj_t *obj; - const cfg_obj_t *v4ports, *v6ports; - const cfg_obj_t *maps[3]; - const cfg_obj_t *builtin_views; - const cfg_listelt_t *element; dns_view_t *view = NULL; dns_view_t *view_next; + dns_viewlist_t tmpviewlist; dns_viewlist_t viewlist; - dns_viewlist_t tmpviewlist; - cfg_aclconfctx_t aclconfctx; + in_port_t listen_port; + int i; + isc_interval_t interval; + isc_resourcevalue_t files; + isc_result_t result; + isc_uint32_t heartbeat_interval; isc_uint32_t interface_interval; - isc_uint32_t heartbeat_interval; + isc_uint32_t reserved; isc_uint32_t udpsize; - in_port_t listen_port; - int i; cfg_aclconfctx_init(&aclconfctx); ISC_LIST_INIT(viewlist); @@ -2797,6 +2799,43 @@ set_limits(maps); /* + * Sanity check on "files" limit. + */ + result = isc_resource_curlimit(isc_resource_openfiles, &files); + if (result == ISC_R_SUCCESS && files < FD_SETSIZE) { + isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, + NS_LOGMODULE_SERVER, ISC_LOG_WARNING, + "the 'files' limit (%" ISC_PRINT_QUADFORMAT "u) " + "is less than FD_SETSIZE (%d), increase " + "'files' in named.conf or recompile with a " + "smaller FD_SETSIZE.", files, FD_SETSIZE); + if (files > FD_SETSIZE) + files = FD_SETSIZE; + } else >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Sep 2 16:35:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AFB3A1065674; Tue, 2 Sep 2008 16:35: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 7262A106568D for ; Tue, 2 Sep 2008 16:35:16 +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 62BBC8FC2D for ; Tue, 2 Sep 2008 16:35:16 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m82GZGpe020019 for ; Tue, 2 Sep 2008 16:35:16 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m82GZF2Q020017 for perforce@freebsd.org; Tue, 2 Sep 2008 16:35:15 GMT (envelope-from ed@FreeBSD.org) Date: Tue, 2 Sep 2008 16:35:15 GMT Message-Id: <200809021635.m82GZF2Q020017@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 149064 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Sep 2008 16:35:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=149064 Change 149064 by ed@ed_dull on 2008/09/02 16:34:26 IFC. Affected files ... .. //depot/projects/mpsafetty/UPDATING#8 integrate .. //depot/projects/mpsafetty/contrib/bind9/CHANGES#3 integrate .. //depot/projects/mpsafetty/contrib/bind9/COPYRIGHT#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/dig/dighost.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/named/client.c#3 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/named/config.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/named/controlconf.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/named/interfacemgr.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/named/lwresd.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/named/named.conf.docbook#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/named/server.c#3 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/rndc/rndc.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/configure.in#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/doc/arm/Bv9ARM-book.xml#3 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/bind/configure.in#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/bind9/check.c#3 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/dns/api#3 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/dns/dispatch.c#3 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/dns/include/dns/dispatch.h#3 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/dns/request.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/dns/resolver.c#3 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/dns/xfrin.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/isc/api#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/isc/include/isc/resource.h#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/isc/include/isc/socket.h#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/isc/include/isc/timer.h#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/isc/timer.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/isc/unix/app.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/isc/unix/resource.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/isc/unix/socket.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/isc/unix/socket_p.h#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/isccfg/api#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/isccfg/namedconf.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/version#3 integrate .. //depot/projects/mpsafetty/contrib/gcc/config/freebsd-spec.h#2 integrate .. //depot/projects/mpsafetty/contrib/gcc/config/freebsd.h#2 integrate .. //depot/projects/mpsafetty/contrib/gcc/config/mips/freebsd.h#1 branch .. //depot/projects/mpsafetty/contrib/sendmail/libmilter/main.c#2 integrate .. //depot/projects/mpsafetty/gnu/lib/libgcc/Makefile#2 integrate .. //depot/projects/mpsafetty/gnu/lib/libgomp/Makefile#2 integrate .. //depot/projects/mpsafetty/gnu/lib/libgomp/config.h#2 integrate .. //depot/projects/mpsafetty/gnu/usr.bin/Makefile#2 integrate .. //depot/projects/mpsafetty/gnu/usr.bin/cc/Makefile.tgt#3 integrate .. //depot/projects/mpsafetty/gnu/usr.bin/cc/cc_tools/Makefile#3 integrate .. //depot/projects/mpsafetty/gnu/usr.bin/cc/cc_tools/elfos-undef.h#1 branch .. //depot/projects/mpsafetty/lib/bind/config.h#2 integrate .. //depot/projects/mpsafetty/sbin/md5/md5.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/bm/if_bm.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/cpuctl/cpuctl.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/cxgb_ioctl.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/cxgb_main.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/cxgb_sge.c#5 integrate .. //depot/projects/mpsafetty/sys/i386/xen/xen_machdep.c#6 integrate .. //depot/projects/mpsafetty/sys/modules/aha/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/ahb/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/an/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/ar/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/ath_rate_amrr/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/ath_rate_onoe/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/ath_rate_sample/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/ce/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/cp/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/ctau/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/cx/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/digi/digi/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/fatm/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/hatm/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/hifn/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/if_tap/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/linux/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/netgraph/sync_ar/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/netgraph/sync_sr/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/patm/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/pf/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/pflog/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/rp/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/safe/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/sppp/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/sr/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/svr4/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/trm/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/ubsec/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/wlan/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/wlan_acl/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/wlan_amrr/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/wlan_ccmp/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/wlan_rssadapt/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/wlan_tkip/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/wlan_wep/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/wlan_xauth/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_hostcache.c#5 integrate .. //depot/projects/mpsafetty/usr.bin/Makefile#3 integrate .. //depot/projects/mpsafetty/usr.bin/gprof/mips.h#1 branch .. //depot/projects/mpsafetty/usr.bin/locate/locate/locate.c#2 integrate .. //depot/projects/mpsafetty/usr.bin/sed/sed.1#3 integrate .. //depot/projects/mpsafetty/usr.sbin/ntp/config.h#3 integrate Differences ... ==== //depot/projects/mpsafetty/UPDATING#8 (text+ko) ==== @@ -41,6 +41,21 @@ Adding these drivers to your kernel configuration file shall cause compilation to fail. +20080801: + OpenSSH has been upgraded to 5.1p1. + + For many years, FreeBSD's version of OpenSSH preferred DSA + over RSA for host and user authentication keys. With this + upgrade, we've switched to the vendor's default of RSA over + DSA. This may cause upgraded clients to warn about unknown + host keys even for previously known hosts. Users should + follow the usual procedure for verifying host keys before + accepting the RSA key. + + This can be circumvented by setting the "HostKeyAlgorithms" + option to "ssh-dss,ssh-rsa" in ~/.ssh/config or on the ssh + command line. + 20080713: The sio(4) driver has been removed from the i386 and amd64 kernel configuration files. This means uart(4) is now the @@ -1108,4 +1123,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.539 2008/08/20 08:31:58 ed Exp $ +$FreeBSD: src/UPDATING,v 1.540 2008/09/01 23:50:56 des Exp $ ==== //depot/projects/mpsafetty/contrib/bind9/CHANGES#3 (text+ko) ==== @@ -1,3 +1,47 @@ + --- 9.4.2-P2 released --- + +2406. [bug] Some operating systems have FD_SETSIZE set to a + low value by default, which can cause resource + exhaustion when many simultaneous connections are + open. Linux in particular makes it difficult to + increase this value. To use more sockets with + select(), set ISC_SOCKET_FDSETSIZE. Example: + STD_CDEFINES="-DISC_SOCKET_FDSETSIZE=4096" ./configure + (This should not be necessary in most cases, and + never for an authoritative-only server.) [RT #18328] + +2404. [port] hpux: files unlimited support. + +2403. [bug] TSIG context leak. [RT #18341] + +2402. [port] Support Solaris 2.11 and over. [RT #18362] + +2401. [bug] Expect to get E[MN]FILE errno internal_accept() + (from accept() or fcntl() system calls). [RT #18358] + +2399. [bug] Abort timeout queries to reduce the number of open + UDP sockets. [RT #18367] + +2398. [bug] Improve file descriptor management. New, + temporary, named.conf option reserved-sockets, + default 512. [RT #18344] + +2396. [bug] Don't set SO_REUSEADDR for randomized ports. + [RT #18336] + +2395. [port] Avoid warning and no effect from "files unlimited" + on Linux when running as root. [RT #18335] + +2394. [bug] Default configuration options set the limit for + open files to 'unlimited' as described in the + documentation. [RT #18331] + +2392. [bug] remove 'grep -q' from acl test script, some platforms + don't support it. [RT #18253] + +2322. [port] MacOS: work around the limitation of setrlimit() + for RLIMIT_NOFILE. [RT #17526] + --- 9.4.2-P1 released --- 2375. [security] Fully randomize UDP query ports to improve @@ -33,7 +77,7 @@ [RT #17113] 2249. [bug] Only set Authentic Data bit if client requested - DNSSEC, per RFC 3655 [RT #17175] + DNSSEC, per RFC 3655 [RT #17175] 2248. [cleanup] Fix several errors reported by Coverity. [RT #17160] ==== //depot/projects/mpsafetty/contrib/bind9/COPYRIGHT#2 (text+ko) ==== @@ -1,4 +1,4 @@ -Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") +Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") Copyright (C) 1996-2003 Internet Software Consortium. Permission to use, copy, modify, and/or distribute this software for any @@ -13,7 +13,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -$Id: COPYRIGHT,v 1.9.18.4 2007/08/28 07:19:54 tbox Exp $ +$Id: COPYRIGHT,v 1.9.18.4.10.1 2008/07/23 07:28:54 tbox Exp $ Portions Copyright (C) 1996-2001 Nominum, Inc. ==== //depot/projects/mpsafetty/contrib/bind9/bin/dig/dighost.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dighost.c,v 1.259.18.43 2007/08/28 07:19:55 tbox Exp $ */ +/* $Id: dighost.c,v 1.259.18.43.10.3 2008/07/23 23:16:43 marka Exp $ */ /*! \file * \note @@ -2217,14 +2217,15 @@ sockcount++; debug("sockcount=%d", sockcount); if (specified_source) - result = isc_socket_bind(query->sock, &bind_address); + result = isc_socket_bind(query->sock, &bind_address, + ISC_SOCKET_REUSEADDRESS); else { if ((isc_sockaddr_pf(&query->sockaddr) == AF_INET) && have_ipv4) isc_sockaddr_any(&bind_any); else isc_sockaddr_any6(&bind_any); - result = isc_socket_bind(query->sock, &bind_any); + result = isc_socket_bind(query->sock, &bind_any, 0); } check_result(result, "isc_socket_bind"); bringup_timer(query, TCP_TIMEOUT); @@ -2271,11 +2272,12 @@ sockcount++; debug("sockcount=%d", sockcount); if (specified_source) { - result = isc_socket_bind(query->sock, &bind_address); + result = isc_socket_bind(query->sock, &bind_address, + ISC_SOCKET_REUSEADDRESS); } else { isc_sockaddr_anyofpf(&bind_any, isc_sockaddr_pf(&query->sockaddr)); - result = isc_socket_bind(query->sock, &bind_any); + result = isc_socket_bind(query->sock, &bind_any, 0); } check_result(result, "isc_socket_bind"); ==== //depot/projects/mpsafetty/contrib/bind9/bin/named/client.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: client.c,v 1.219.18.28.10.1 2008/05/22 21:28:04 each Exp $ */ +/* $Id: client.c,v 1.219.18.28.10.2 2008/07/23 07:28:54 tbox Exp $ */ #include ==== //depot/projects/mpsafetty/contrib/bind9/bin/named/config.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2001-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: config.c,v 1.47.18.32 2007/09/13 05:04:01 each Exp $ */ +/* $Id: config.c,v 1.47.18.32.10.3 2008/07/23 23:48:17 tbox Exp $ */ /*! \file */ @@ -52,7 +52,7 @@ #ifndef WIN32 " coresize default;\n\ datasize default;\n\ - files default;\n\ + files unlimited;\n\ stacksize default;\n" #endif " deallocate-on-exit true;\n\ @@ -99,6 +99,7 @@ use-ixfr true;\n\ edns-udp-size 4096;\n\ max-udp-size 4096;\n\ + reserved-sockets 512;\n\ \n\ /* view */\n\ allow-notify {none;};\n\ ==== //depot/projects/mpsafetty/contrib/bind9/bin/named/controlconf.c#2 (text+ko) ==== @@ -1,8 +1,8 @@ /* - * Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2006, 2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2001-2003 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: controlconf.c,v 1.40.18.10 2006/12/07 04:53:02 marka Exp $ */ +/* $Id: controlconf.c,v 1.40.18.10.40.3 2008/07/23 23:16:43 marka Exp $ */ /*! \file */ @@ -1151,8 +1151,8 @@ type, &listener->sock); if (result == ISC_R_SUCCESS) - result = isc_socket_bind(listener->sock, - &listener->address); + result = isc_socket_bind(listener->sock, &listener->address, + ISC_SOCKET_REUSEADDRESS); if (result == ISC_R_SUCCESS && type == isc_sockettype_unix) { listener->perm = cfg_obj_asuint32(cfg_tuple_get(control, ==== //depot/projects/mpsafetty/contrib/bind9/bin/named/interfacemgr.c#2 (text+ko) ==== @@ -1,8 +1,8 @@ /* - * Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2006, 2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2002 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: interfacemgr.c,v 1.76.18.8 2006/07/20 01:10:30 marka Exp $ */ +/* $Id: interfacemgr.c,v 1.76.18.8.44.3 2008/07/23 23:16:43 marka Exp $ */ /*! \file */ @@ -307,7 +307,8 @@ #ifndef ISC_ALLOW_MAPPED isc_socket_ipv6only(ifp->tcpsocket, ISC_TRUE); #endif - result = isc_socket_bind(ifp->tcpsocket, &ifp->addr); + result = isc_socket_bind(ifp->tcpsocket, &ifp->addr, + ISC_SOCKET_REUSEADDRESS); if (result != ISC_R_SUCCESS) { isc_log_write(IFMGR_COMMON_LOGARGS, ISC_LOG_ERROR, "binding TCP socket: %s", ==== //depot/projects/mpsafetty/contrib/bind9/bin/named/lwresd.c#2 (text+ko) ==== @@ -1,8 +1,8 @@ /* - * Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2006, 2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000-2003 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: lwresd.c,v 1.46.18.7 2006/03/02 00:37:21 marka Exp $ */ +/* $Id: lwresd.c,v 1.46.18.7.52.3 2008/07/23 23:16:43 marka Exp $ */ /*! \file * \brief @@ -576,7 +576,8 @@ return (result); } - result = isc_socket_bind(sock, &listener->address); + result = isc_socket_bind(sock, &listener->address, + ISC_SOCKET_REUSEADDRESS); if (result != ISC_R_SUCCESS) { char socktext[ISC_SOCKADDR_FORMATSIZE]; isc_sockaddr_format(&listener->address, socktext, ==== //depot/projects/mpsafetty/contrib/bind9/bin/named/named.conf.docbook#2 (text+ko) ==== @@ -2,7 +2,7 @@ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" []> - + Aug 13, 2004 @@ -40,6 +40,7 @@ 2005 2006 2007 + 2008 Internet Systems Consortium, Inc. ("ISC") @@ -201,6 +202,7 @@ port integer; querylog boolean; recursing-file quoted_string; + reserved-sockets integer; random-device quoted_string; recursive-clients integer; serial-query-rate integer; ==== //depot/projects/mpsafetty/contrib/bind9/bin/named/server.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: server.c,v 1.419.18.57.10.1 2008/05/22 21:28:04 each Exp $ */ +/* $Id: server.c,v 1.419.18.57.10.3 2008/07/23 12:04:32 marka Exp $ */ /*! \file */ @@ -2696,27 +2696,29 @@ load_configuration(const char *filename, ns_server_t *server, isc_boolean_t first_time) { - isc_result_t result; - isc_interval_t interval; + cfg_aclconfctx_t aclconfctx; + cfg_obj_t *config; cfg_parser_t *parser = NULL; - cfg_obj_t *config; + const cfg_listelt_t *element; + const cfg_obj_t *builtin_views; + const cfg_obj_t *maps[3]; + const cfg_obj_t *obj; const cfg_obj_t *options; + const cfg_obj_t *v4ports, *v6ports; const cfg_obj_t *views; - const cfg_obj_t *obj; - const cfg_obj_t *v4ports, *v6ports; - const cfg_obj_t *maps[3]; - const cfg_obj_t *builtin_views; - const cfg_listelt_t *element; dns_view_t *view = NULL; dns_view_t *view_next; + dns_viewlist_t tmpviewlist; dns_viewlist_t viewlist; - dns_viewlist_t tmpviewlist; - cfg_aclconfctx_t aclconfctx; + in_port_t listen_port; + int i; + isc_interval_t interval; + isc_resourcevalue_t files; + isc_result_t result; + isc_uint32_t heartbeat_interval; isc_uint32_t interface_interval; - isc_uint32_t heartbeat_interval; + isc_uint32_t reserved; isc_uint32_t udpsize; - in_port_t listen_port; - int i; cfg_aclconfctx_init(&aclconfctx); ISC_LIST_INIT(viewlist); @@ -2797,6 +2799,43 @@ set_limits(maps); /* + * Sanity check on "files" limit. + */ + result = isc_resource_curlimit(isc_resource_openfiles, &files); + if (result == ISC_R_SUCCESS && files < FD_SETSIZE) { + isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, + NS_LOGMODULE_SERVER, ISC_LOG_WARNING, + "the 'files' limit (%" ISC_PRINT_QUADFORMAT "u) " + "is less than FD_SETSIZE (%d), increase " + "'files' in named.conf or recompile with a " + "smaller FD_SETSIZE.", files, FD_SETSIZE); + if (files > FD_SETSIZE) + files = FD_SETSIZE; + } else + files = FD_SETSIZE; + + /* + * Set the number of socket reserved for TCP, stdio etc. + */ + obj = NULL; + result = ns_config_get(maps, "reserved-sockets", &obj); + INSIST(result == ISC_R_SUCCESS); + reserved = cfg_obj_asuint32(obj); + if (files < 128U) /* Prevent underflow. */ + reserved = 0; + else if (reserved > files - 128U) /* Mimimum UDP space. */ + reserved = files - 128; + if (reserved < 128U) /* Mimimum TCP/stdio space. */ + reserved = 128; + if (reserved + 128U > files) { + isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, + NS_LOGMODULE_SERVER, ISC_LOG_WARNING, + "less than 128 UDP sockets available after " + "applying 'reserved-sockets' and 'files'"); + } + isc__socketmgr_setreserved(ns_g_socketmgr, reserved); + + /* * Configure various server options. */ configure_server_quota(maps, "transfers-out", &server->xfroutquota); ==== //depot/projects/mpsafetty/contrib/bind9/bin/rndc/rndc.c#2 (text+ko) ==== @@ -1,8 +1,8 @@ /* - * Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2006, 2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000-2003 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: rndc.c,v 1.96.18.17 2006/08/04 03:03:41 marka Exp $ */ +/* $Id: rndc.c,v 1.96.18.17.42.3 2008/07/23 23:16:43 marka Exp $ */ /*! \file */ @@ -400,10 +400,10 @@ DO("create socket", isc_socket_create(socketmgr, pf, type, &sock)); switch (isc_sockaddr_pf(addr)) { case AF_INET: - DO("bind socket", isc_socket_bind(sock, &local4)); + DO("bind socket", isc_socket_bind(sock, &local4, 0)); break; case AF_INET6: - DO("bind socket", isc_socket_bind(sock, &local6)); + DO("bind socket", isc_socket_bind(sock, &local6, 0)); break; default: break; ==== //depot/projects/mpsafetty/contrib/bind9/configure.in#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 1998-2003 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any @@ -18,7 +18,7 @@ esyscmd([sed "s/^/# /" COPYRIGHT])dnl AC_DIVERT_POP()dnl -AC_REVISION($Revision: 1.355.18.71 $) +AC_REVISION($Revision: 1.355.18.71.8.2 $) AC_INIT(lib/dns/name.c) AC_PREREQ(2.59) @@ -1839,7 +1839,7 @@ [*-solaris2.[89]]) hack_shutup_pthreadonceinit=yes ;; - *-solaris2.10) + *-solaris2.1[0-9]) hack_shutup_pthreadonceinit=yes ;; esac ==== //depot/projects/mpsafetty/contrib/bind9/doc/arm/Bv9ARM-book.xml#3 (text+ko) ==== @@ -2,7 +2,7 @@ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" []> - + BIND 9 Administrator Reference Manual @@ -28,6 +28,7 @@ 2005 2006 2007 + 2008 Internet Systems Consortium, Inc. ("ISC") @@ -4441,6 +4442,7 @@ max-transfer-idle-in number; max-transfer-idle-out number; tcp-clients number; + reserved-sockets number; recursive-clients number; serial-query-rate number; serial-queries number; @@ -6606,6 +6608,23 @@ + reserved-sockets + + + The number of file descriptors reserved for TCP, stdio, + etc. This needs to be big enough to cover the number of + interfaces named listens on, tcp-clients as well as + to provide room for outgoing TCP queries and incoming zone + transfers. The default is 512. + The minimum value is 128 and the + maximum value is 128 less than + 'files' or FD_SETSIZE (whichever is smaller). This + option may be removed in the future. + + + + + max-cache-size ==== //depot/projects/mpsafetty/contrib/bind9/lib/bind/configure.in#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2001, 2003 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any @@ -13,7 +13,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -AC_REVISION($Revision: 1.90.18.34 $) +AC_REVISION($Revision: 1.90.18.34.10.2 $) AC_INIT(resolv/herror.c) AC_PREREQ(2.13) @@ -2590,7 +2590,7 @@ *-solaris2.9) hack_shutup_in6addr_init_macros=yes ;; - *-solaris2.10) + *-solaris2.1[0-9]) hack_shutup_in6addr_init_macros=yes ;; esac ==== //depot/projects/mpsafetty/contrib/bind9/lib/bind9/check.c#3 (text+ko) ==== @@ -1015,10 +1015,10 @@ isc_buffer_add(&b, strlen(zname)); tresult = dns_name_fromtext(dns_fixedname_name(&fixedname), &b, dns_rootname, ISC_TRUE, NULL); - if (tresult != ISC_R_SUCCESS) { + if (result != ISC_R_SUCCESS) { cfg_obj_log(zconfig, logctx, ISC_LOG_ERROR, "zone '%s': is not a valid name", zname); - result = ISC_R_FAILURE; + tresult = ISC_R_FAILURE; } else { char namebuf[DNS_NAME_FORMATSIZE]; ==== //depot/projects/mpsafetty/contrib/bind9/lib/dns/api#3 (text+ko) ==== @@ -1,3 +1,3 @@ LIBINTERFACE = 35 -LIBREVISION = 0 +LIBREVISION = 1 LIBAGE = 0 ==== //depot/projects/mpsafetty/contrib/bind9/lib/dns/dispatch.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dispatch.c,v 1.116.18.19.12.1 2008/05/22 21:28:06 each Exp $ */ +/* $Id: dispatch.c,v 1.116.18.19.12.5 2008/07/23 23:16:43 marka Exp $ */ /*! \file */ @@ -276,7 +276,26 @@ } /* - * ARC4 random number generator obtained from OpenBSD + * ARC4 random number generator derived from OpenBSD. + * Only dispatch_arc4random() and dispatch_arc4uniformrandom() are expected + * to be called from general dispatch routines; the rest of them are subroutines + * for these two. + * + * The original copyright follows: + * Copyright (c) 1996, David Mazieres + * Copyright (c) 2008, Damien Miller + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ static void dispatch_arc4init(arc4ctx_t *actx) { @@ -1172,7 +1191,7 @@ static isc_result_t create_socket(isc_socketmgr_t *mgr, isc_sockaddr_t *local, - isc_socket_t **sockp) + unsigned int options, isc_socket_t **sockp) { isc_socket_t *sock; isc_result_t result; @@ -1186,7 +1205,7 @@ #ifndef ISC_ALLOW_MAPPED isc_socket_ipv6only(sock, ISC_TRUE); #endif - result = isc_socket_bind(sock, local); + result = isc_socket_bind(sock, local, options); if (result != ISC_R_SUCCESS) { isc_socket_detach(&sock); return (result); @@ -1917,7 +1936,7 @@ attributes &= ~DNS_DISPATCHATTR_RANDOMPORT; goto getsocket; } - result = create_socket(sockmgr, &localaddr_bound, &sock); + result = create_socket(sockmgr, &localaddr_bound, 0, &sock); if (result == ISC_R_ADDRINUSE) { if (++k == 1024) attributes &= ~DNS_DISPATCHATTR_RANDOMPORT; @@ -1925,7 +1944,8 @@ } localport = prt; } else - result = create_socket(sockmgr, localaddr, &sock); + result = create_socket(sockmgr, localaddr, + ISC_SOCKET_REUSEADDRESS, &sock); if (result != ISC_R_SUCCESS) goto deallocate_dispatch; if ((attributes & DNS_DISPATCHATTR_RANDOMPORT) == 0 && ==== //depot/projects/mpsafetty/contrib/bind9/lib/dns/include/dns/dispatch.h#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dispatch.h,v 1.48.18.5.12.1 2008/05/22 21:28:06 each Exp $ */ +/* $Id: dispatch.h,v 1.48.18.5.12.2 2008/07/23 07:28:56 tbox Exp $ */ #ifndef DNS_DISPATCH_H #define DNS_DISPATCH_H 1 ==== //depot/projects/mpsafetty/contrib/bind9/lib/dns/request.c#2 (text+ko) ==== @@ -1,8 +1,8 @@ /* - * Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2006, 2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000-2002 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: request.c,v 1.72.18.5 2006/08/21 00:40:53 marka Exp $ */ +/* $Id: request.c,v 1.72.18.5.42.2 2008/07/23 07:28:56 tbox Exp $ */ /*! \file */ @@ -518,11 +518,11 @@ if (srcaddr == NULL) { isc_sockaddr_anyofpf(&bind_any, isc_sockaddr_pf(destaddr)); - result = isc_socket_bind(socket, &bind_any); + result = isc_socket_bind(socket, &bind_any, 0); } else { src = *srcaddr; isc_sockaddr_setport(&src, 0); - result = isc_socket_bind(socket, &src); + result = isc_socket_bind(socket, &src, 0); } if (result != ISC_R_SUCCESS) goto cleanup; ==== //depot/projects/mpsafetty/contrib/bind9/lib/dns/resolver.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: resolver.c,v 1.284.18.66.8.1 2008/05/22 21:28:06 each Exp $ */ +/* $Id: resolver.c,v 1.284.18.66.8.4 2008/07/24 05:00:48 jinmei Exp $ */ /*! \file */ @@ -1123,7 +1123,7 @@ goto cleanup_query; #ifndef BROKEN_TCP_BIND_BEFORE_CONNECT - result = isc_socket_bind(query->tcpsocket, &addr); + result = isc_socket_bind(query->tcpsocket, &addr, 0); if (result != ISC_R_SUCCESS) goto cleanup_socket; #endif @@ -2689,6 +2689,8 @@ static void fctx_timeout(isc_task_t *task, isc_event_t *event) { fetchctx_t *fctx = event->ev_arg; + isc_timerevent_t *tevent = (isc_timerevent_t *)event; + resquery_t *query; REQUIRE(VALID_FCTX(fctx)); @@ -2704,8 +2706,18 @@ fctx->timeouts++; /* * We could cancel the running queries here, or we could let - * them keep going. Right now we choose the latter... + * them keep going. Since we normally use separate sockets for + * different queries, we adopt the former approach to reduce + * the number of open sockets: cancel the oldest query if it + * expired after the query had started (this is usually the + * case but is not always so, depending on the task schedule + * timing). */ + query = ISC_LIST_HEAD(fctx->queries); + if (query != NULL && + isc_time_compare(&tevent->due, &query->start) >= 0) { + fctx_cancelquery(&query, NULL, NULL, ISC_TRUE); + } fctx->attributes &= ~FCTX_ATTR_ADDRWAIT; /* * Our timer has triggered. Reestablish the fctx lifetime ==== //depot/projects/mpsafetty/contrib/bind9/lib/dns/xfrin.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: xfrin.c,v 1.135.18.16 2007/10/31 01:59:47 marka Exp $ */ +/* $Id: xfrin.c,v 1.135.18.16.10.3 2008/07/23 23:16:43 marka Exp $ */ /*! \file */ @@ -862,7 +862,8 @@ isc_sockettype_tcp, &xfr->socket)); #ifndef BROKEN_TCP_BIND_BEFORE_CONNECT - CHECK(isc_socket_bind(xfr->socket, &xfr->sourceaddr)); + CHECK(isc_socket_bind(xfr->socket, &xfr->sourceaddr, + ISC_SOCKET_REUSEADDRESS)); #endif CHECK(isc_socket_connect(xfr->socket, &xfr->masteraddr, xfr->task, xfrin_connect_done, xfr)); ==== //depot/projects/mpsafetty/contrib/bind9/lib/isc/api#2 (text+ko) ==== @@ -1,3 +1,3 @@ -LIBINTERFACE = 32 -LIBREVISION = 5 +LIBINTERFACE = 35 +LIBREVISION = 0 LIBAGE = 0 ==== //depot/projects/mpsafetty/contrib/bind9/lib/isc/include/isc/resource.h#2 (text+ko) ==== @@ -1,8 +1,8 @@ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000, 2001 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: resource.h,v 1.5.18.2 2005/04/29 00:17:02 marka Exp $ */ +/* $Id: resource.h,v 1.5.18.2.52.2 2008/07/23 23:48:17 tbox Exp $ */ #ifndef ISC_RESOURCE_H #define ISC_RESOURCE_H 1 @@ -81,6 +81,19 @@ *\li #ISC_R_NOTIMPLEMENTED 'resource' is not a type known by the OS. */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Sep 2 17:18:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 94DEA106567D; Tue, 2 Sep 2008 17:18: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 57AF81065671 for ; Tue, 2 Sep 2008 17:18:00 +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 4ACD08FC25 for ; Tue, 2 Sep 2008 17:18:00 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m82HI0fj034272 for ; Tue, 2 Sep 2008 17:18:00 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m82HI0NO034270 for perforce@freebsd.org; Tue, 2 Sep 2008 17:18:00 GMT (envelope-from ed@FreeBSD.org) Date: Tue, 2 Sep 2008 17:18:00 GMT Message-Id: <200809021718.m82HI0NO034270@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 149067 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Sep 2008 17:18:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=149067 Change 149067 by ed@ed_dull on 2008/09/02 17:17:00 IFC my ttydisc fix. Affected files ... .. //depot/projects/mpsafetty/sys/kern/tty_ttydisc.c#19 integrate .. //depot/projects/mpsafetty/sys/kern/uipc_socket.c#3 integrate Differences ... ==== //depot/projects/mpsafetty/sys/kern/tty_ttydisc.c#19 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/tty_ttydisc.c,v 1.2 2008/08/29 15:02:50 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/tty_ttydisc.c,v 1.3 2008/09/02 17:13:11 ed Exp $"); #include #include @@ -1100,6 +1100,7 @@ ttyhook_getc_capture(tp, buf, len); ttydisc_wakeup_watermark(tp); + atomic_add_long(&tty_nout, len); return (len); ==== //depot/projects/mpsafetty/sys/kern/uipc_socket.c#3 (text+ko) ==== @@ -95,7 +95,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.313 2008/07/21 00:49:34 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.314 2008/09/02 16:55:21 rwatson Exp $"); #include "opt_inet.h" #include "opt_mac.h" @@ -1857,7 +1857,6 @@ int flags, len, error, offset; struct protosw *pr = so->so_proto; struct mbuf *nextrecord; - int orig_resid = uio->uio_resid; if (psa != NULL) *psa = NULL; @@ -1935,7 +1934,6 @@ SBLASTRECORDCHK(&so->so_rcv); SBLASTMBUFCHK(&so->so_rcv); - /* XXXRW: sbwait() may not be as happy without sblock(). */ error = sbwait(&so->so_rcv); SOCKBUF_UNLOCK(&so->so_rcv); if (error) @@ -1968,7 +1966,6 @@ if (pr->pr_flags & PR_ADDR) { KASSERT(m->m_type == MT_SONAME, ("m->m_type == %d", m->m_type)); - orig_resid = 0; if (psa != NULL) *psa = sodupsockaddr(mtod(m, struct sockaddr *), M_NOWAIT); @@ -2048,13 +2045,11 @@ else m_freem(cm); if (controlp != NULL) { - orig_resid = 0; while (*controlp != NULL) controlp = &(*controlp)->m_next; } cm = cmn; } - orig_resid = 0; /* XXXRW: why this? */ } KASSERT(m->m_type == MT_DATA, ("soreceive_dgram: !data")); From owner-p4-projects@FreeBSD.ORG Tue Sep 2 18:26:10 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 27DA41065687; Tue, 2 Sep 2008 18:26: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 DDE7D106567F for ; Tue, 2 Sep 2008 18:26:09 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CFC5B8FC0C for ; Tue, 2 Sep 2008 18:26:09 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m82IQ9W0055397 for ; Tue, 2 Sep 2008 18:26:09 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m82IQ9CR055395 for perforce@freebsd.org; Tue, 2 Sep 2008 18:26:09 GMT (envelope-from rpaulo@FreeBSD.org) Date: Tue, 2 Sep 2008 18:26:09 GMT Message-Id: <200809021826.m82IQ9CR055395@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 149070 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Sep 2008 18:26:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=149070 Change 149070 by rpaulo@rpaulo_phi on 2008/09/02 18:25:35 We really need a separate section for the Xcommand_set. I understood that we needed this, but I failed to see if the section was being copied to loader.efi by objcopy. Now we have a working EFI boot loader for ia32 (tested on a MacBook). objcopy tip thanks to: Marcel Affected files ... .. //depot/projects/efi/boot/i386/efi/Makefile#6 edit .. //depot/projects/efi/boot/i386/efi/ldscript.amd64#2 edit .. //depot/projects/efi/boot/i386/efi/ldscript.i386#2 edit Differences ... ==== //depot/projects/efi/boot/i386/efi/Makefile#6 (text+ko) ==== @@ -55,7 +55,7 @@ exit 1; \ fi ${OBJCOPY} -j .data -j .dynamic -j .dynstr -j .dynsym -j .hash \ - -j .rel.dyn -j .reloc -j .sdata -j .text \ + -j .rel.dyn -j .reloc -j .sdata -j .text -j set_Xcommand_set \ --target=efi-app-ia32 ${.ALLSRC} ${.TARGET} LIBEFI= ${.OBJDIR}/../../efi/libefi/libefi.a ==== //depot/projects/efi/boot/i386/efi/ldscript.amd64#2 (text+ko) ==== @@ -22,9 +22,6 @@ *(.sdata2 .sdata2.* .gnu.linkonce.s2.*) *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*) *(.opd) - __start_set_Xcommand_set = .; - *(set_Xcommand_set) - __stop_set_Xcommand_set = .; *(.data .data.* .gnu.linkonce.d.*) *(.data1) *(.plabel) @@ -33,6 +30,12 @@ *(COMMON) } . = ALIGN(4096); + set_Xcommand_set : { + __start_set_Xcommand_set = .; + *(set_Xcommand_set) + __stop_set_Xcommand_set = .; + } + . = ALIGN(4096); __gp = .; .sdata : { *(.got.plt .got) ==== //depot/projects/efi/boot/i386/efi/ldscript.i386#2 (text+ko) ==== @@ -22,9 +22,6 @@ *(.sdata2 .sdata2.* .gnu.linkonce.s2.*) *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*) *(.opd) - __start_set_Xcommand_set = .; - *(set_Xcommand_set) - __stop_set_Xcommand_set = .; *(.data .data.* .gnu.linkonce.d.*) *(.data1) *(.plabel) @@ -33,6 +30,12 @@ *(COMMON) } . = ALIGN(4096); + set_Xcommand_set : { + __start_set_Xcommand_set = .; + *(set_Xcommand_set) + __stop_set_Xcommand_set = .; + } + . = ALIGN(4096); __gp = .; .sdata : { *(.got.plt .got) From owner-p4-projects@FreeBSD.ORG Tue Sep 2 18:44:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E44C21065672; Tue, 2 Sep 2008 18:44: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 A6433106567D for ; Tue, 2 Sep 2008 18:44:28 +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 968B08FC20 for ; Tue, 2 Sep 2008 18:44:28 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m82IiSZm056935 for ; Tue, 2 Sep 2008 18:44:28 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m82IiSis056933 for perforce@freebsd.org; Tue, 2 Sep 2008 18:44:28 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 2 Sep 2008 18:44:28 GMT Message-Id: <200809021844.m82IiSis056933@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 149072 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Sep 2008 18:44:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=149072 Change 149072 by hselasky@hselasky_laptop001 on 2008/09/02 18:43:52 Fix two bugs. 1) The system factored out clear-stall function was not iterating the USB pipes correctly. 2) When re-enumerating an USB device, the device address must be restored a little bit earlier. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.c#14 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.c#14 (text+ko) ==== @@ -96,7 +96,7 @@ struct usb2_pipe *pipe; struct usb2_pipe *pipe_end; struct usb2_pipe *pipe_first; - struct usb2_pipe *pipe_start; + uint8_t to = USB_EP_MAX; mtx_lock(xfer->usb2_mtx); @@ -107,9 +107,6 @@ pipe_first = xfer->udev->pipes; if (pipe == NULL) { pipe = pipe_first; - pipe_start = pipe_first; - } else { - pipe_start = pipe; } switch (USB_GET_STATE(xfer)) { @@ -126,14 +123,9 @@ case USB_ST_SETUP: tr_setup: - while (1) { if (pipe == pipe_end) { pipe = pipe_first; } - if (pipe == pipe_start) { - /* nothing to do */ - break; - } if (pipe->edesc && pipe->is_stalled) { @@ -161,7 +153,8 @@ break; } pipe++; - } + if (--to) + goto tr_setup; break; default: @@ -1312,6 +1305,9 @@ old_addr); err = 0; } + /* restore device address */ + udev->address = old_addr; + /* allow device time to set new address */ usb2_pause_mtx(mtx, USB_SET_ADDRESS_SETTLE); From owner-p4-projects@FreeBSD.ORG Tue Sep 2 18:45:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C02A1065672; Tue, 2 Sep 2008 18:45:30 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F39EC106564A for ; Tue, 2 Sep 2008 18:45:29 +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 E40108FC27 for ; Tue, 2 Sep 2008 18:45:29 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m82IjTd3057071 for ; Tue, 2 Sep 2008 18:45:29 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m82IjTVB057069 for perforce@freebsd.org; Tue, 2 Sep 2008 18:45:29 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 2 Sep 2008 18:45:29 GMT Message-Id: <200809021845.m82IjTVB057069@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 149073 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Sep 2008 18:45:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=149073 Change 149073 by hselasky@hselasky_laptop001 on 2008/09/02 18:45:23 Style change by "usb_style.sh". Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.c#15 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.c#15 (text+ko) ==== @@ -108,7 +108,6 @@ if (pipe == NULL) { pipe = pipe_first; } - switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: if (pipe->edesc && @@ -123,38 +122,38 @@ case USB_ST_SETUP: tr_setup: - if (pipe == pipe_end) { - pipe = pipe_first; - } - if (pipe->edesc && - pipe->is_stalled) { + if (pipe == pipe_end) { + pipe = pipe_first; + } + if (pipe->edesc && + pipe->is_stalled) { - /* setup a clear-stall packet */ + /* setup a clear-stall packet */ - req.bmRequestType = UT_WRITE_ENDPOINT; - req.bRequest = UR_CLEAR_FEATURE; - USETW(req.wValue, UF_ENDPOINT_HALT); - req.wIndex[0] = pipe->edesc->bEndpointAddress; - req.wIndex[1] = 0; - USETW(req.wLength, 0); + req.bmRequestType = UT_WRITE_ENDPOINT; + req.bRequest = UR_CLEAR_FEATURE; + USETW(req.wValue, UF_ENDPOINT_HALT); + req.wIndex[0] = pipe->edesc->bEndpointAddress; + req.wIndex[1] = 0; + USETW(req.wLength, 0); - /* copy in the transfer */ + /* copy in the transfer */ - usb2_copy_in(xfer->frbuffers, 0, &req, sizeof(req)); + usb2_copy_in(xfer->frbuffers, 0, &req, sizeof(req)); - /* set length */ - xfer->frlengths[0] = sizeof(req); - xfer->nframes = 1; - mtx_unlock(xfer->usb2_mtx); + /* set length */ + xfer->frlengths[0] = sizeof(req); + xfer->nframes = 1; + mtx_unlock(xfer->usb2_mtx); - usb2_start_hardware(xfer); + usb2_start_hardware(xfer); - mtx_lock(xfer->usb2_mtx); - break; - } - pipe++; - if (--to) - goto tr_setup; + mtx_lock(xfer->usb2_mtx); + break; + } + pipe++; + if (--to) + goto tr_setup; break; default: From owner-p4-projects@FreeBSD.ORG Tue Sep 2 19:49:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B3D7A106567D; Tue, 2 Sep 2008 19:49: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 76E8D1065673 for ; Tue, 2 Sep 2008 19:49: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 644678FC19 for ; Tue, 2 Sep 2008 19:49:35 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m82JnZLH031028 for ; Tue, 2 Sep 2008 19:49:35 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m82JnZBC031022 for perforce@freebsd.org; Tue, 2 Sep 2008 19:49:35 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 2 Sep 2008 19:49:35 GMT Message-Id: <200809021949.m82JnZBC031022@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 149076 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Sep 2008 19:49:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=149076 Change 149076 by hselasky@hselasky_laptop001 on 2008/09/02 19:49:33 Optimisation: Extend "usb2_do_request_flags" functionality so that it can operate on a userland data pointer. This make USB requests from userland quicker, hence there is no more need to allocate a separate buffer for temporarily storing the data. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_busdma.c#5 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_busdma.h#3 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#22 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.c#16 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#24 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_ioctl.h#13 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_busdma.c#5 (text+ko) ==== @@ -135,6 +135,38 @@ } /*------------------------------------------------------------------------* + * usb2_copy_in_user - copy directly to DMA-able memory from userland + * + * Return values: + * 0: Success + * Else: Failure + *------------------------------------------------------------------------*/ +int +usb2_copy_in_user(struct usb2_page_cache *cache, uint32_t offset, + const void *ptr, uint32_t len) +{ + struct usb2_page_search buf_res; + int error; + + while (len != 0) { + + usb2_get_page(cache, offset, &buf_res); + + if (buf_res.length > len) { + buf_res.length = len; + } + error = copyin(ptr, buf_res.buffer, buf_res.length); + if (error) + return (error); + + offset += buf_res.length; + len -= buf_res.length; + ptr = USB_ADD_BYTES(ptr, buf_res.length); + } + return (0); /* success */ +} + +/*------------------------------------------------------------------------* * usb2_m_copy_in - copy a mbuf chain directly into DMA-able memory *------------------------------------------------------------------------*/ struct usb2_m_copy_in_arg { @@ -225,6 +257,38 @@ } /*------------------------------------------------------------------------* + * usb2_copy_out_user - copy directly from DMA-able memory to userland + * + * Return values: + * 0: Success + * Else: Failure + *------------------------------------------------------------------------*/ +int +usb2_copy_out_user(struct usb2_page_cache *cache, uint32_t offset, + void *ptr, uint32_t len) +{ + struct usb2_page_search res; + int error; + + while (len != 0) { + + usb2_get_page(cache, offset, &res); + + if (res.length > len) { + res.length = len; + } + error = copyout(res.buffer, ptr, res.length); + if (error) + return (error); + + offset += res.length; + len -= res.length; + ptr = USB_ADD_BYTES(ptr, res.length); + } + return (0); /* success */ +} + +/*------------------------------------------------------------------------* * usb2_bzero - zero DMA-able memory *------------------------------------------------------------------------*/ void ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_busdma.h#3 (text+ko) ==== @@ -154,7 +154,9 @@ void usb2_bdma_work_loop(struct usb2_xfer_queue *pq); void usb2_bzero(struct usb2_page_cache *cache, uint32_t offset, uint32_t len); void usb2_copy_in(struct usb2_page_cache *cache, uint32_t offset, const void *ptr, uint32_t len); +int usb2_copy_in_user(struct usb2_page_cache *cache, uint32_t offset, const void *ptr, uint32_t len); void usb2_copy_out(struct usb2_page_cache *cache, uint32_t offset, void *ptr, uint32_t len); +int usb2_copy_out_user(struct usb2_page_cache *cache, uint32_t offset, void *ptr, uint32_t len); void usb2_dma_tag_setup(struct usb2_dma_parent_tag *udpt, struct usb2_dma_tag *udt, bus_dma_tag_t dmat, struct mtx *mtx, usb2_dma_callback_t *func, struct usb2_xfer_root *info, uint8_t ndmabits, uint8_t nudt); void usb2_dma_tag_unsetup(struct usb2_dma_parent_tag *udpt); void usb2_get_page(struct usb2_page_cache *pc, uint32_t offset, struct usb2_page_search *res); ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#22 (text+ko) ==== @@ -901,8 +901,6 @@ int error; uint16_t len; uint16_t actlen; - uint8_t isread; - void *data = NULL; if (f->flag_no_uref) { /* control endpoint only */ @@ -912,44 +910,24 @@ return (EPERM); } len = UGETW(ur->ucr_request.wLength); - isread = (ur->ucr_request.bmRequestType & UT_READ) ? 1 : 0; + /* check if "ucr_data" is valid */ if (len != 0) { if (ur->ucr_data == NULL) { - return (EINVAL); - } - data = malloc(len, M_USBDEV, M_WAITOK); - if (data == NULL) { - error = ENOMEM; - goto done; - } - if (!(ur->ucr_request.bmRequestType & UT_READ)) { - error = copyin(ur->ucr_data, data, len); - if (error) { - goto done; - } + return (EFAULT); } } + /* do the USB request */ error = usb2_do_request_flags - (f->udev, NULL, &ur->ucr_request, data, - (ur->ucr_flags & USB_SHORT_XFER_OK), &actlen, + (f->udev, NULL, &ur->ucr_request, ur->ucr_data, + (ur->ucr_flags & USB_SHORT_XFER_OK) | + USB_USER_DATA_PTR, &actlen, USB_DEFAULT_TIMEOUT); ur->ucr_actlen = actlen; if (error) { error = EIO; - goto done; - } - if ((len != 0) && (ur->ucr_request.bmRequestType & UT_READ)) { - error = copyout(data, ur->ucr_data, len); - if (error) { - goto done; - } - } -done: - if (data) { - free(data, M_USBDEV); } return (error); } ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.c#16 (text+ko) ==== @@ -206,6 +206,9 @@ * at a later point in time. This is tunable by the "hw.usb.ss_delay" * sysctl. This flag is mostly useful for debugging. * + * o USB_USER_DATA_PTR: treat the "data" pointer like a userland + * pointer. + * * "actlen" - if non-NULL the actual transfer length will be stored in * the 16-bit unsigned integer pointed to by "actlen". This * information is mostly useful when the "USB_SHORT_XFER_OK" flag is @@ -232,12 +235,12 @@ { struct usb2_xfer *xfer; const void *desc; + int err = 0; uint32_t start_ticks; uint32_t delta_ticks; uint32_t max_ticks; uint16_t length; uint16_t temp; - usb2_error_t err = 0; if (timeout < 50) { /* timeout is too small */ @@ -276,7 +279,13 @@ *actlen = length; } if (length > 0) { - bcopy(desc, data, length); + if (flags & USB_USER_DATA_PTR) { + if (copyout(desc, data, length)) { + return (USB_ERR_INVAL); + } + } else { + bcopy(desc, data, length); + } } return (0); /* success */ } @@ -332,7 +341,18 @@ if (temp > 0) { if (!(req->bmRequestType & UT_READ)) { - usb2_copy_in(xfer->frbuffers + 1, 0, data, temp); + if (flags & USB_USER_DATA_PTR) { + mtx_unlock(xfer->priv_mtx); + err = usb2_copy_in_user(xfer->frbuffers + 1, + 0, data, temp); + mtx_lock(xfer->priv_mtx); + if (err) { + err = USB_ERR_INVAL; + break; + } + } else { + usb2_copy_in(xfer->frbuffers + 1, 0, data, temp); + } } xfer->nframes = 2; } else { @@ -392,7 +412,19 @@ } if (temp > 0) { if (req->bmRequestType & UT_READ) { - usb2_copy_out(xfer->frbuffers + 1, 0, data, temp); + if (flags & USB_USER_DATA_PTR) { + mtx_unlock(xfer->priv_mtx); + err = usb2_copy_out_user(xfer->frbuffers + 1, + 0, data, temp); + mtx_lock(xfer->priv_mtx); + if (err) { + err = USB_ERR_INVAL; + break; + } + } else { + usb2_copy_out(xfer->frbuffers + 1, + 0, data, temp); + } } } /* @@ -421,6 +453,13 @@ } } + if (err) { + /* + * Make sure that the control endpoint is no longer + * blocked in case of a non-transfer related error: + */ + usb2_transfer_stop(xfer); + } mtx_unlock(xfer->priv_mtx); done: @@ -429,7 +468,7 @@ if (mtx) { mtx_lock(mtx); } - return (err); + return ((usb2_error_t)err); } /*------------------------------------------------------------------------* ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#24 (text+ko) ==== @@ -1496,6 +1496,8 @@ void usb2_transfer_stop(struct usb2_xfer *xfer) { + struct usb2_pipe *pipe; + if (xfer == NULL) { /* transfer is gone */ return; @@ -1527,6 +1529,10 @@ if (xfer->flags_int.can_cancel_immed && (!xfer->flags_int.did_close)) { DPRINTF("close\n"); + /* + * The following will lead to an USB_ERR_CANCELLED + * error code being passed to the USB callback. + */ (xfer->pipe->methods->close) (xfer); /* only close once */ xfer->flags_int.did_close = 1; @@ -1543,6 +1549,20 @@ * Any additional DMA delay is done by * "usb2_transfer_unsetup()". */ + + /* + * Special case. Check if we need to restart a blocked + * pipe. + */ + pipe = xfer->pipe; + + /* + * If the current USB transfer is completing we need + * to start the next one: + */ + if (pipe->pipe_q.curr == xfer) { + usb2_command_wrapper(&pipe->pipe_q, NULL); + } } mtx_unlock(xfer->usb2_mtx); ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_ioctl.h#13 (text+ko) ==== @@ -45,6 +45,7 @@ #define USB_USE_POLLING 0x0001 /* internal flag */ #define USB_SHORT_XFER_OK 0x0004 /* allow short reads */ #define USB_DELAY_STATUS_STAGE 0x0010 /* insert delay before STATUS stage */ +#define USB_USER_DATA_PTR 0x0020 /* internal flag */ uint16_t ucr_actlen; /* actual length transferred */ uint8_t ucr_addr; /* zero - currently not used */ struct usb2_device_request ucr_request; From owner-p4-projects@FreeBSD.ORG Tue Sep 2 20:04:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4133D1065675; Tue, 2 Sep 2008 20: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 043DB1065670 for ; Tue, 2 Sep 2008 20:04:51 +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 E5E418FC19 for ; Tue, 2 Sep 2008 20:04:50 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m82K4oe3034099 for ; Tue, 2 Sep 2008 20:04:50 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m82K4oDI034097 for perforce@freebsd.org; Tue, 2 Sep 2008 20:04:50 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 2 Sep 2008 20:04:50 GMT Message-Id: <200809022004.m82K4oDI034097@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 149077 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Sep 2008 20:04:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=149077 Change 149077 by hselasky@hselasky_laptop001 on 2008/09/02 20:04:07 Fix some clear stall bugs in "if_cdce" and add support for the Mobile Direct Line Model, which means USB ethernet for cellphones. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cdce2.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cdce2_reg.h#4 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_standard.h#6 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cdce2.c#7 (text+ko) ==== @@ -76,11 +76,8 @@ static device_resume_t cdce_resume; static usb2_handle_request_t cdce_handle_request; -static usb2_callback_t cdce_bulk_write_clear_stall_callback; static usb2_callback_t cdce_bulk_write_callback; -static usb2_callback_t cdce_bulk_read_clear_stall_callback; static usb2_callback_t cdce_bulk_read_callback; -static usb2_callback_t cdce_intr_read_clear_stall_callback; static usb2_callback_t cdce_intr_read_callback; static usb2_callback_t cdce_intr_write_callback; @@ -145,32 +142,6 @@ }, [2] = { - .type = UE_CONTROL, - .endpoint = 0x00, /* Control pipe */ - .direction = UE_DIR_ANY, - .if_index = 0, - /* Host Mode Only */ - .mh.bufsize = sizeof(struct usb2_device_request), - .mh.interval = 50, /* 50ms */ - .mh.flags = {}, - .mh.callback = &cdce_bulk_write_clear_stall_callback, - .mh.timeout = 1000, /* 1 second */ - }, - - [3] = { - .type = UE_CONTROL, - .endpoint = 0x00, /* Control pipe */ - .direction = UE_DIR_ANY, - .if_index = 0, - /* Host Mode Only */ - .mh.bufsize = sizeof(struct usb2_device_request), - .mh.interval = 50, /* 50ms */ - .mh.flags = {}, - .mh.callback = &cdce_bulk_read_clear_stall_callback, - .mh.timeout = 1000, /* 1 second */ - }, - - [4] = { .type = UE_INTERRUPT, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, @@ -186,19 +157,6 @@ .md.callback = &cdce_intr_write_callback, .md.timeout = 10000, /* 10 seconds */ }, - - [5] = { - .type = UE_CONTROL, - .endpoint = 0x00, /* Control pipe */ - .direction = UE_DIR_ANY, - .if_index = 1, - /* Host Mode Only */ - .mh.bufsize = sizeof(struct usb2_device_request), - .mh.interval = 50, /* 50ms */ - .mh.flags = {}, - .mh.callback = &cdce_intr_read_clear_stall_callback, - .mh.timeout = 1000, /* 1 second */ - }, }; static device_method_t cdce_methods[] = { @@ -225,12 +183,13 @@ static devclass_t cdce_devclass; DRIVER_MODULE(cdce, ushub, cdce_driver, cdce_devclass, NULL, 0); -MODULE_VERSION(cdce, 0); +MODULE_VERSION(cdce, 1); MODULE_DEPEND(cdce, usb2_core, 1, 1, 1); MODULE_DEPEND(cdce, ether, 1, 1, 1); static const struct usb2_device_id cdce_devs[] = { {USB_IF_CSI(UICLASS_CDC, UISUBCLASS_ETHERNET_NETWORKING_CONTROL_MODEL, 0)}, + {USB_IF_CSI(UICLASS_CDC, UISUBCLASS_MOBILE_DIRECT_LINE_MODEL, 0)}, {USB_VPI(USB_VENDOR_ACERLABS, USB_PRODUCT_ACERLABS_M5632, CDCE_FLAG_NO_UNION)}, {USB_VPI(USB_VENDOR_AMBIT, USB_PRODUCT_AMBIT_NTL_250, CDCE_FLAG_NO_UNION)}, @@ -514,7 +473,7 @@ /* start the interrupt transfer, if any */ mtx_lock(&sc->sc_mtx); - usb2_transfer_start(sc->sc_xfer[4]); + usb2_transfer_start(sc->sc_xfer[2]); mtx_unlock(&sc->sc_mtx); return (0); /* success */ @@ -640,19 +599,6 @@ } static void -cdce_bulk_write_clear_stall_callback(struct usb2_xfer *xfer) -{ - struct cdce_softc *sc = xfer->priv_sc; - struct usb2_xfer *xfer_other = sc->sc_xfer[0]; - - if (usb2_clear_stall_callback(xfer, xfer_other)) { - DPRINTF("stall cleared\n"); - usb2_transfer_start(xfer_other); - } - return; -} - -static void cdce_bulk_write_512x4_callback(struct usb2_xfer *xfer) { struct cdce_softc *sc = xfer->priv_sc; @@ -677,12 +623,6 @@ case USB_ST_SETUP: tr_setup: - if (xfer->flags.stall_pipe && - (xfer->flags_int.usb2_mode == USB_MODE_HOST)) { - /* try to clear stall */ - usb2_transfer_start(sc->sc_xfer[2]); - break; - } x = 0; /* number of frames */ y = 1; /* number of fragments */ @@ -784,6 +724,8 @@ struct mbuf *mt; uint32_t crc; + DPRINTFN(1, "\n"); + switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: DPRINTFN(11, "transfer complete: " @@ -797,11 +739,6 @@ case USB_ST_SETUP: tr_setup: - if (xfer->flags.stall_pipe && - (xfer->flags_int.usb2_mode == USB_MODE_HOST)) { - usb2_transfer_start(sc->sc_xfer[2]); - break; - } IFQ_DRV_DEQUEUE(&ifp->if_snd, m); if (m == NULL) { @@ -925,8 +862,6 @@ */ usb2_transfer_stop(sc->sc_xfer[0]); usb2_transfer_stop(sc->sc_xfer[1]); - usb2_transfer_stop(sc->sc_xfer[2]); - usb2_transfer_stop(sc->sc_xfer[3]); return; } @@ -1023,19 +958,6 @@ } static void -cdce_bulk_read_clear_stall_callback(struct usb2_xfer *xfer) -{ - struct cdce_softc *sc = xfer->priv_sc; - struct usb2_xfer *xfer_other = sc->sc_xfer[1]; - - if (usb2_clear_stall_callback(xfer, xfer_other)) { - DPRINTF("stall cleared\n"); - usb2_transfer_start(xfer_other); - } - return; -} - -static void cdce_bulk_read_512x4_callback(struct usb2_xfer *xfer) { struct cdce_softc *sc = xfer->priv_sc; @@ -1089,15 +1011,8 @@ case USB_ST_SETUP: tr_setup: if (xfer->flags.stall_pipe) { - /* we are done */ sc->sc_flags &= ~CDCE_FLAG_RX_DATA; - - if (xfer->flags_int.usb2_mode == USB_MODE_HOST) { - usb2_transfer_start(sc->sc_xfer[3]); - free_mq = 1; - break; - } } /* we expect a Multi Frame Ethernet Header */ if (!(sc->sc_flags & CDCE_FLAG_RX_DATA)) { @@ -1292,13 +1207,6 @@ } case USB_ST_SETUP: tr_setup: - if (xfer->flags.stall_pipe) { - - if (xfer->flags_int.usb2_mode == USB_MODE_HOST) { - usb2_transfer_start(sc->sc_xfer[3]); - break; - } - } m = usb2_ether_get_mbuf(); if (m == NULL) { @@ -1381,23 +1289,9 @@ } static void -cdce_intr_read_clear_stall_callback(struct usb2_xfer *xfer) -{ - struct cdce_softc *sc = xfer->priv_sc; - struct usb2_xfer *xfer_other = sc->sc_xfer[4]; - - if (usb2_clear_stall_callback(xfer, xfer_other)) { - DPRINTF("stall cleared\n"); - usb2_transfer_start(xfer_other); - } - return; -} - -static void cdce_intr_read_callback(struct usb2_xfer *xfer) { - struct cdce_softc *sc = xfer->priv_sc; - + ; /* style fix */ switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: @@ -1408,13 +1302,8 @@ case USB_ST_SETUP: tr_setup: - if (xfer->flags.stall_pipe && - (xfer->flags_int.usb2_mode == USB_MODE_HOST)) { - usb2_transfer_start(sc->sc_xfer[5]); - } else { - xfer->frlengths[0] = xfer->max_data_length; - usb2_start_hardware(xfer); - } + xfer->frlengths[0] = xfer->max_data_length; + usb2_start_hardware(xfer); break; default: /* Error */ @@ -1431,8 +1320,7 @@ static void cdce_intr_write_callback(struct usb2_xfer *xfer) { - struct cdce_softc *sc = xfer->priv_sc; - + ; /* style fix */ switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: @@ -1440,15 +1328,10 @@ case USB_ST_SETUP: tr_setup: - if (xfer->flags.stall_pipe && - (xfer->flags_int.usb2_mode == USB_MODE_HOST)) { - usb2_transfer_start(sc->sc_xfer[5]); - } else { #if 0 - xfer->frlengths[0] = XXX; - usb2_start_hardware(xfer); + xfer->frlengths[0] = XXX; + usb2_start_hardware(xfer); #endif - } break; default: /* Error */ ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cdce2_reg.h#4 (text+ko) ==== @@ -35,7 +35,7 @@ #ifndef _USB_IF_CDCEREG_H_ #define _USB_IF_CDCEREG_H_ -#define CDCE_N_TRANSFER 6 /* units */ +#define CDCE_N_TRANSFER 3 /* units */ #define CDCE_IND_SIZE_MAX 32 /* bytes */ #define CDCE_512X4_IFQ_MAXLEN MAX((2*CDCE_512X4_FRAMES_MAX), IFQ_MAXLEN) ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_standard.h#6 (text+ko) ==== @@ -267,6 +267,12 @@ #define UISUBCLASS_CAPI_CONTROLMODEL 5 #define UISUBCLASS_ETHERNET_NETWORKING_CONTROL_MODEL 6 #define UISUBCLASS_ATM_NETWORKING_CONTROL_MODEL 7 +#define UISUBCLASS_WIRELESS_HANDSET_CM 8 +#define UISUBCLASS_DEVICE_MGMT 9 +#define UISUBCLASS_MOBILE_DIRECT_LINE_MODEL 10 +#define UISUBCLASS_OBEX 11 +#define UISUBCLASS_ETHERNET_EMULATION_MODEL 12 + #define UIPROTO_CDC_AT 1 #define UIPROTO_CDC_ETH_512X4 0x76 /* FreeBSD specific */ From owner-p4-projects@FreeBSD.ORG Tue Sep 2 20:21:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0CCC910656BD; Tue, 2 Sep 2008 20:21: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 C4B0A10656BA for ; Tue, 2 Sep 2008 20:21:07 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B356F8FC1C for ; Tue, 2 Sep 2008 20:21:07 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m82KL7wj055069 for ; Tue, 2 Sep 2008 20:21:07 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.1/Submit) id m82KL7RR055067 for perforce@freebsd.org; Tue, 2 Sep 2008 20:21:07 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 2 Sep 2008 20:21:07 GMT Message-Id: <200809022021.m82KL7RR055067@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 149079 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Sep 2008 20:21:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=149079 Change 149079 by hselasky@hselasky_laptop001 on 2008/09/02 20:20:26 Fix the CDC ethernet USB template. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/template/usb2_template_cdce.c#5 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/template/usb2_template_cdce.c#5 (text+ko) ==== @@ -231,17 +231,27 @@ NULL, }; +static const struct usb2_temp_interface_desc eth_data_null_interface = { + .ppEndpoints = NULL, /* no endpoints */ + .bInterfaceClass = UICLASS_CDC_DATA, + .bInterfaceSubClass = 0, + .bInterfaceProtocol = 0, + .iInterface = STRING_ETH_DATA_INDEX, +}; + static const struct usb2_temp_interface_desc eth_data_interface = { .ppEndpoints = eth_data_endpoints, .bInterfaceClass = UICLASS_CDC_DATA, .bInterfaceSubClass = UISUBCLASS_DATA, .bInterfaceProtocol = 0, .iInterface = STRING_ETH_DATA_INDEX, + .isAltInterface = 1, /* this is an alternate setting */ }; static const struct usb2_temp_interface_desc *eth_interfaces[] = { ð_control_interface, ð_control_if_512x4, + ð_data_null_interface, ð_data_interface, NULL, }; From owner-p4-projects@FreeBSD.ORG Tue Sep 2 21:15:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 912F91065680; Tue, 2 Sep 2008 21:15: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 36C9510656AD for ; Tue, 2 Sep 2008 21:15:08 +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 23EA88FC16 for ; Tue, 2 Sep 2008 21:15:08 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m82LF8e8074349 for ; Tue, 2 Sep 2008 21:15:08 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.1/Submit) id m82LEFRr074258 for perforce@freebsd.org; Tue, 2 Sep 2008 21:14:15 GMT (envelope-from gonzo@FreeBSD.org) Date: Tue, 2 Sep 2008 21:14:15 GMT Message-Id: <200809022114.m82LEFRr074258@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 149081 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Sep 2008 21:15:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=149081 Change 149081 by gonzo@gonzo_jeeves on 2008/09/02 21:14:15 IFC NB: bfe(4) needs some attention for it's out of sync with HEAD version of the driver. Affected files ... .. //depot/projects/mips2/src/Makefile.inc1#21 integrate .. //depot/projects/mips2/src/ObsoleteFiles.inc#21 integrate .. //depot/projects/mips2/src/UPDATING#17 integrate .. //depot/projects/mips2/src/bin/Makefile#3 integrate .. //depot/projects/mips2/src/bin/cp/utils.c#4 integrate .. //depot/projects/mips2/src/bin/echo/echo.c#2 integrate .. //depot/projects/mips2/src/bin/mv/mv.c#3 integrate .. //depot/projects/mips2/src/bin/pkill/Makefile#1 branch .. //depot/projects/mips2/src/bin/pkill/pkill.1#1 branch .. //depot/projects/mips2/src/bin/pkill/pkill.c#1 branch .. //depot/projects/mips2/src/bin/ps/ps.c#4 integrate .. //depot/projects/mips2/src/bin/sh/eval.c#3 integrate .. //depot/projects/mips2/src/bin/sh/miscbltin.c#2 integrate .. //depot/projects/mips2/src/bin/sh/mknodes.c#2 integrate .. //depot/projects/mips2/src/bin/sh/options.c#3 integrate .. //depot/projects/mips2/src/bin/sh/sh.1#6 integrate .. //depot/projects/mips2/src/bin/stty/gfmt.c#2 integrate .. //depot/projects/mips2/src/bin/stty/modes.c#2 integrate .. //depot/projects/mips2/src/bin/stty/print.c#2 integrate .. //depot/projects/mips2/src/bin/stty/stty.1#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#3 integrate .. //depot/projects/mips2/src/contrib/cvs/doc/HACKING.DOCS#2 integrate .. //depot/projects/mips2/src/contrib/gcc/common.opt#3 integrate .. //depot/projects/mips2/src/contrib/gcc/config/i386/freebsd.h#4 integrate .. //depot/projects/mips2/src/contrib/gcc/doc/invoke.texi#4 integrate .. //depot/projects/mips2/src/contrib/ipfilter/ip_fil.c#5 integrate .. //depot/projects/mips2/src/contrib/ipfilter/ipsend/iptests.c#5 integrate .. //depot/projects/mips2/src/contrib/ipfilter/ipsend/sock.c#5 integrate .. //depot/projects/mips2/src/contrib/ipfilter/lib/printnat.c#4 integrate .. //depot/projects/mips2/src/contrib/ipfilter/test/regress/n12#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/test/regress/n2#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/test/regress/n5#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/test/regress/ni1.nat#3 integrate .. //depot/projects/mips2/src/contrib/ipfilter/test/regress/ni2.nat#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/test/regress/ni4.nat#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/tools/ipnat_y.y#5 integrate .. //depot/projects/mips2/src/contrib/ntp/COPYRIGHT#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ChangeLog#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ChangeLog-4.1.0#2 delete .. //depot/projects/mips2/src/contrib/ntp/CommitLog#1 branch .. //depot/projects/mips2/src/contrib/ntp/CommitLog-4.1.0#1 branch .. //depot/projects/mips2/src/contrib/ntp/FREEBSD-Xlist#2 delete .. //depot/projects/mips2/src/contrib/ntp/FREEBSD-upgrade#2 delete .. //depot/projects/mips2/src/contrib/ntp/INSTALL#2 integrate .. //depot/projects/mips2/src/contrib/ntp/Makefile.am#2 integrate .. //depot/projects/mips2/src/contrib/ntp/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/ntp/NEWS#2 integrate .. //depot/projects/mips2/src/contrib/ntp/README#2 integrate .. //depot/projects/mips2/src/contrib/ntp/README.bk#2 integrate .. //depot/projects/mips2/src/contrib/ntp/README.patches#2 integrate .. //depot/projects/mips2/src/contrib/ntp/README.refclocks#2 integrate .. //depot/projects/mips2/src/contrib/ntp/README.versions#2 integrate .. //depot/projects/mips2/src/contrib/ntp/TODO#2 integrate .. //depot/projects/mips2/src/contrib/ntp/WHERE-TO-START#2 integrate .. //depot/projects/mips2/src/contrib/ntp/acinclude.m4#2 delete .. //depot/projects/mips2/src/contrib/ntp/aclocal.m4#2 integrate .. //depot/projects/mips2/src/contrib/ntp/adjtimed/Makefile.am#2 integrate .. //depot/projects/mips2/src/contrib/ntp/adjtimed/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/ntp/arlib/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/ntp/arlib/aclocal.m4#2 integrate .. //depot/projects/mips2/src/contrib/ntp/arlib/configure#2 integrate .. //depot/projects/mips2/src/contrib/ntp/arlib/depcomp#2 integrate .. //depot/projects/mips2/src/contrib/ntp/arlib/install-sh#2 integrate .. //depot/projects/mips2/src/contrib/ntp/arlib/missing#2 integrate .. //depot/projects/mips2/src/contrib/ntp/arlib/mkinstalldirs#2 delete .. //depot/projects/mips2/src/contrib/ntp/bincheck.mf#1 branch .. //depot/projects/mips2/src/contrib/ntp/bootstrap#1 branch .. //depot/projects/mips2/src/contrib/ntp/build#2 integrate .. //depot/projects/mips2/src/contrib/ntp/clockstuff/Makefile.am#2 integrate .. //depot/projects/mips2/src/contrib/ntp/clockstuff/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/ntp/clockstuff/clktest.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/clockstuff/propdelay.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/compile#2 integrate .. //depot/projects/mips2/src/contrib/ntp/config.guess#2 integrate .. //depot/projects/mips2/src/contrib/ntp/config.h.in#2 integrate .. //depot/projects/mips2/src/contrib/ntp/config.sub#2 integrate .. //depot/projects/mips2/src/contrib/ntp/configure#2 integrate .. //depot/projects/mips2/src/contrib/ntp/configure.ac#1 branch .. //depot/projects/mips2/src/contrib/ntp/configure.in#2 delete .. //depot/projects/mips2/src/contrib/ntp/depcomp#2 integrate .. //depot/projects/mips2/src/contrib/ntp/flock-build#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/accopt.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/assoc.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/audio.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/authopt.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/build.html#2 delete .. //depot/projects/mips2/src/contrib/ntp/html/build/build.html#1 branch .. //depot/projects/mips2/src/contrib/ntp/html/build/config.html#1 branch .. //depot/projects/mips2/src/contrib/ntp/html/build/hints.html#1 branch .. //depot/projects/mips2/src/contrib/ntp/html/build/hints/a-ux#1 branch .. //depot/projects/mips2/src/contrib/ntp/html/build/hints/aix#1 branch .. //depot/projects/mips2/src/contrib/ntp/html/build/hints/bsdi#1 branch .. //depot/projects/mips2/src/contrib/ntp/html/build/hints/changes#1 branch .. //depot/projects/mips2/src/contrib/ntp/html/build/hints/decosf1#1 branch .. //depot/projects/mips2/src/contrib/ntp/html/build/hints/decosf2#1 branch .. //depot/projects/mips2/src/contrib/ntp/html/build/hints/freebsd#1 branch .. //depot/projects/mips2/src/contrib/ntp/html/build/hints/hpux#1 branch .. //depot/projects/mips2/src/contrib/ntp/html/build/hints/linux#1 branch .. //depot/projects/mips2/src/contrib/ntp/html/build/hints/mpeix#1 branch .. //depot/projects/mips2/src/contrib/ntp/html/build/hints/netbsd#1 branch .. //depot/projects/mips2/src/contrib/ntp/html/build/hints/notes-xntp-v3#1 branch .. //depot/projects/mips2/src/contrib/ntp/html/build/hints/parse#1 branch .. //depot/projects/mips2/src/contrib/ntp/html/build/hints/refclocks#1 branch .. //depot/projects/mips2/src/contrib/ntp/html/build/hints/rs6000#1 branch .. //depot/projects/mips2/src/contrib/ntp/html/build/hints/sco.html#1 branch .. //depot/projects/mips2/src/contrib/ntp/html/build/hints/sgi#1 branch .. //depot/projects/mips2/src/contrib/ntp/html/build/hints/solaris-dosynctodr.html#1 branch .. //depot/projects/mips2/src/contrib/ntp/html/build/hints/solaris.html#1 branch .. //depot/projects/mips2/src/contrib/ntp/html/build/hints/solaris.xtra.4023118#1 branch .. //depot/projects/mips2/src/contrib/ntp/html/build/hints/solaris.xtra.S99ntpd#1 branch .. //depot/projects/mips2/src/contrib/ntp/html/build/hints/solaris.xtra.patchfreq#1 branch .. //depot/projects/mips2/src/contrib/ntp/html/build/hints/sun4#1 branch .. //depot/projects/mips2/src/contrib/ntp/html/build/hints/svr4-dell#1 branch .. //depot/projects/mips2/src/contrib/ntp/html/build/hints/svr4_package#1 branch .. //depot/projects/mips2/src/contrib/ntp/html/build/hints/todo#1 branch .. //depot/projects/mips2/src/contrib/ntp/html/build/hints/vxworks.html#1 branch .. //depot/projects/mips2/src/contrib/ntp/html/build/hints/winnt.html#1 branch .. //depot/projects/mips2/src/contrib/ntp/html/build/patches.html#1 branch .. //depot/projects/mips2/src/contrib/ntp/html/build/porting.html#1 branch .. //depot/projects/mips2/src/contrib/ntp/html/build/quick.html#1 branch .. //depot/projects/mips2/src/contrib/ntp/html/build/scripts/footer.txt#1 branch .. //depot/projects/mips2/src/contrib/ntp/html/build/scripts/links10.txt#1 branch .. //depot/projects/mips2/src/contrib/ntp/html/build/scripts/links11.txt#1 branch .. //depot/projects/mips2/src/contrib/ntp/html/build/scripts/links12.txt#1 branch .. //depot/projects/mips2/src/contrib/ntp/html/build/scripts/links7.txt#1 branch .. //depot/projects/mips2/src/contrib/ntp/html/build/scripts/links8.txt#1 branch .. //depot/projects/mips2/src/contrib/ntp/html/build/scripts/links9.txt#1 branch .. //depot/projects/mips2/src/contrib/ntp/html/build/scripts/style.css#1 branch .. //depot/projects/mips2/src/contrib/ntp/html/clockopt.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/config.html#2 delete .. //depot/projects/mips2/src/contrib/ntp/html/confopt.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/copyright.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/debug.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/drivers/driver1.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/drivers/driver10.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/drivers/driver11.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/drivers/driver12.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/drivers/driver16.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/drivers/driver18.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/drivers/driver19.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/drivers/driver2.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/drivers/driver20.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/drivers/driver22.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/drivers/driver23.html#2 delete .. //depot/projects/mips2/src/contrib/ntp/html/drivers/driver24.html#2 delete .. //depot/projects/mips2/src/contrib/ntp/html/drivers/driver26.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/drivers/driver27.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/drivers/driver28.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/drivers/driver29.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/drivers/driver3.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/drivers/driver30.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/drivers/driver31.html#1 branch .. //depot/projects/mips2/src/contrib/ntp/html/drivers/driver32.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/drivers/driver33.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/drivers/driver34.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/drivers/driver35.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/drivers/driver36.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/drivers/driver37.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/drivers/driver38.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/drivers/driver39.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/drivers/driver4.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/drivers/driver40.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/drivers/driver42.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/drivers/driver43.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/drivers/driver44.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/drivers/driver5.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/drivers/driver6.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/drivers/driver7.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/drivers/driver8.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/drivers/driver9.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/drivers/oncore-shmem.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/drivers/scripts/footer.txt#1 branch .. //depot/projects/mips2/src/contrib/ntp/html/drivers/scripts/style.css#1 branch .. //depot/projects/mips2/src/contrib/ntp/html/drivers/tf582_4.html#1 branch .. //depot/projects/mips2/src/contrib/ntp/html/extern.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/gadget.html#1 branch .. //depot/projects/mips2/src/contrib/ntp/html/groups.html#1 branch .. //depot/projects/mips2/src/contrib/ntp/html/hints.html#2 delete .. //depot/projects/mips2/src/contrib/ntp/html/hints/a-ux#2 delete .. //depot/projects/mips2/src/contrib/ntp/html/hints/aix#2 delete .. //depot/projects/mips2/src/contrib/ntp/html/hints/bsdi#2 delete .. //depot/projects/mips2/src/contrib/ntp/html/hints/changes#2 delete .. //depot/projects/mips2/src/contrib/ntp/html/hints/decosf1#2 delete .. //depot/projects/mips2/src/contrib/ntp/html/hints/decosf2#2 delete .. //depot/projects/mips2/src/contrib/ntp/html/hints/freebsd#2 delete .. //depot/projects/mips2/src/contrib/ntp/html/hints/hpux#2 delete .. //depot/projects/mips2/src/contrib/ntp/html/hints/linux#2 delete .. //depot/projects/mips2/src/contrib/ntp/html/hints/mpeix#2 delete .. //depot/projects/mips2/src/contrib/ntp/html/hints/netbsd#2 delete .. //depot/projects/mips2/src/contrib/ntp/html/hints/notes-xntp-v3#2 delete .. //depot/projects/mips2/src/contrib/ntp/html/hints/parse#2 delete .. //depot/projects/mips2/src/contrib/ntp/html/hints/refclocks#2 delete .. //depot/projects/mips2/src/contrib/ntp/html/hints/rs6000#2 delete .. //depot/projects/mips2/src/contrib/ntp/html/hints/sco.html#2 delete .. //depot/projects/mips2/src/contrib/ntp/html/hints/sgi#2 delete .. //depot/projects/mips2/src/contrib/ntp/html/hints/solaris-dosynctodr.html#2 delete .. //depot/projects/mips2/src/contrib/ntp/html/hints/solaris.html#2 delete .. //depot/projects/mips2/src/contrib/ntp/html/hints/solaris.xtra.4023118#2 delete .. //depot/projects/mips2/src/contrib/ntp/html/hints/solaris.xtra.4095849#2 delete .. //depot/projects/mips2/src/contrib/ntp/html/hints/solaris.xtra.S99ntpd#2 delete .. //depot/projects/mips2/src/contrib/ntp/html/hints/solaris.xtra.patchfreq#2 delete .. //depot/projects/mips2/src/contrib/ntp/html/hints/sun4#2 delete .. //depot/projects/mips2/src/contrib/ntp/html/hints/svr4-dell#2 delete .. //depot/projects/mips2/src/contrib/ntp/html/hints/svr4_package#2 delete .. //depot/projects/mips2/src/contrib/ntp/html/hints/todo#2 delete .. //depot/projects/mips2/src/contrib/ntp/html/hints/vxworks.html#2 delete .. //depot/projects/mips2/src/contrib/ntp/html/hints/winnt.html#2 delete .. //depot/projects/mips2/src/contrib/ntp/html/howto.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/index.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/kern.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/keygen.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/ldisc.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/manyopt.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/measure.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/miscopt.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/monopt.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/msyslog.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/mx4200data.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/notes.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/ntp_conf.html#1 branch .. //depot/projects/mips2/src/contrib/ntp/html/ntpd.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/ntpdate.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/ntpdc.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/ntpdsim.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/ntpdsim_new.html#1 branch .. //depot/projects/mips2/src/contrib/ntp/html/ntpq.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/ntptime.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/ntptrace.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/parsedata.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/parsenew.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/patches.html#2 delete .. //depot/projects/mips2/src/contrib/ntp/html/porting.html#2 delete .. //depot/projects/mips2/src/contrib/ntp/html/pps.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/prefer.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/quick.html#2 delete .. //depot/projects/mips2/src/contrib/ntp/html/rdebug.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/refclock.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/release.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/scripts/links11.txt#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/scripts/links7.txt#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/scripts/links8.txt#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/scripts/links9.txt#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/sntp.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/html/tickadj.html#2 integrate .. //depot/projects/mips2/src/contrib/ntp/include/Makefile.am#2 integrate .. //depot/projects/mips2/src/contrib/ntp/include/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/ntp/include/adjtime.h#2 integrate .. //depot/projects/mips2/src/contrib/ntp/include/ascii.h#2 integrate .. //depot/projects/mips2/src/contrib/ntp/include/autogen-version.def#1 branch .. //depot/projects/mips2/src/contrib/ntp/include/binio.h#2 integrate .. //depot/projects/mips2/src/contrib/ntp/include/copyright.def#1 branch .. //depot/projects/mips2/src/contrib/ntp/include/debug-opt.def#1 branch .. //depot/projects/mips2/src/contrib/ntp/include/homerc.def#1 branch .. //depot/projects/mips2/src/contrib/ntp/include/ieee754io.h#2 integrate .. //depot/projects/mips2/src/contrib/ntp/include/isc/Makefile.am#2 integrate .. //depot/projects/mips2/src/contrib/ntp/include/isc/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/ntp/include/isc/buffer.h#1 branch .. //depot/projects/mips2/src/contrib/ntp/include/isc/interfaceiter.h#2 integrate .. //depot/projects/mips2/src/contrib/ntp/include/isc/ipv6.h#2 integrate .. //depot/projects/mips2/src/contrib/ntp/include/isc/msgs.h#2 integrate .. //depot/projects/mips2/src/contrib/ntp/include/isc/net.h#2 integrate .. //depot/projects/mips2/src/contrib/ntp/include/isc/netaddr.h#2 integrate .. //depot/projects/mips2/src/contrib/ntp/include/isc/netscope.h#1 branch .. //depot/projects/mips2/src/contrib/ntp/include/isc/region.h#1 branch .. //depot/projects/mips2/src/contrib/ntp/include/isc/result.h#2 integrate .. //depot/projects/mips2/src/contrib/ntp/include/isc/sockaddr.h#2 integrate .. //depot/projects/mips2/src/contrib/ntp/include/l_stdlib.h#2 integrate .. //depot/projects/mips2/src/contrib/ntp/include/mbg_gps166.h#2 integrate .. //depot/projects/mips2/src/contrib/ntp/include/ntp.h#2 integrate .. //depot/projects/mips2/src/contrib/ntp/include/ntp_config.h#2 integrate .. //depot/projects/mips2/src/contrib/ntp/include/ntp_control.h#2 integrate .. //depot/projects/mips2/src/contrib/ntp/include/ntp_crypto.h#2 integrate .. //depot/projects/mips2/src/contrib/ntp/include/ntp_debug.h#1 branch .. //depot/projects/mips2/src/contrib/ntp/include/ntp_filegen.h#2 integrate .. //depot/projects/mips2/src/contrib/ntp/include/ntp_fp.h#2 integrate .. //depot/projects/mips2/src/contrib/ntp/include/ntp_machine.h#2 integrate .. //depot/projects/mips2/src/contrib/ntp/include/ntp_random.h#1 branch .. //depot/projects/mips2/src/contrib/ntp/include/ntp_refclock.h#2 integrate .. //depot/projects/mips2/src/contrib/ntp/include/ntp_request.h#2 integrate .. //depot/projects/mips2/src/contrib/ntp/include/ntp_rfc2553.h#2 integrate .. //depot/projects/mips2/src/contrib/ntp/include/ntp_stdlib.h#3 integrate .. //depot/projects/mips2/src/contrib/ntp/include/ntp_tty.h#2 integrate .. //depot/projects/mips2/src/contrib/ntp/include/ntp_types.h#2 integrate .. //depot/projects/mips2/src/contrib/ntp/include/ntpd.h#3 integrate .. //depot/projects/mips2/src/contrib/ntp/include/parse.h#2 integrate .. //depot/projects/mips2/src/contrib/ntp/include/parse_conf.h#2 integrate .. //depot/projects/mips2/src/contrib/ntp/include/recvbuff.h#2 integrate .. //depot/projects/mips2/src/contrib/ntp/include/timepps-SCO.h#1 branch .. //depot/projects/mips2/src/contrib/ntp/include/timepps-Solaris.h#1 branch .. //depot/projects/mips2/src/contrib/ntp/include/timepps-SunOS.h#1 branch .. //depot/projects/mips2/src/contrib/ntp/include/trimble.h#2 integrate .. //depot/projects/mips2/src/contrib/ntp/include/version.def#1 branch .. //depot/projects/mips2/src/contrib/ntp/install-sh#2 integrate .. //depot/projects/mips2/src/contrib/ntp/kernel/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/ntp/kernel/chuinit.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/kernel/clkinit.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/kernel/sys/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/ntp/kernel/sys/parsestreams.h#2 integrate .. //depot/projects/mips2/src/contrib/ntp/libisc/ifiter_getifaddrs.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/libisc/ifiter_ioctl.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/libisc/ifiter_sysctl.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/libisc/inet_aton.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/libisc/inet_pton.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/libisc/interfaceiter.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/libisc/net.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/libisc/netaddr.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/libisc/netscope.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/libisc/sockaddr.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/libntp/Makefile.am#2 integrate .. //depot/projects/mips2/src/contrib/ntp/libntp/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/ntp/libntp/a_md5encrypt.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/libntp/adjtime.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/libntp/audio.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/libntp/binio.c#2 delete .. //depot/projects/mips2/src/contrib/ntp/libntp/buftvtots.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/libntp/caljulian.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/libntp/calleapwhen.c#2 delete .. //depot/projects/mips2/src/contrib/ntp/libntp/clocktypes.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/libntp/decodenetnum.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/libntp/dolfptoa.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/libntp/gpstolfp.c#2 delete .. //depot/projects/mips2/src/contrib/ntp/libntp/humandate.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/libntp/icom.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/libntp/ieee754io.c#2 delete .. //depot/projects/mips2/src/contrib/ntp/libntp/iosignal.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/libntp/lib_strbuf.h#2 integrate .. //depot/projects/mips2/src/contrib/ntp/libntp/log.c#2 delete .. //depot/projects/mips2/src/contrib/ntp/libntp/log.h#2 delete .. //depot/projects/mips2/src/contrib/ntp/libntp/machines.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/libntp/mfp_mul.c#2 delete .. //depot/projects/mips2/src/contrib/ntp/libntp/mktime.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/libntp/msyslog.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/libntp/ntp_random.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/libntp/ntp_rfc2553.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/libntp/numtohost.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/libntp/prettydate.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/libntp/random.c#2 delete .. //depot/projects/mips2/src/contrib/ntp/libntp/ranny.c#2 delete .. //depot/projects/mips2/src/contrib/ntp/libntp/recvbuff.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/libntp/socktoa.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/libntp/socktohost.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/libntp/statestr.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/libntp/systime.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/libopts/COPYING.lgpl#1 branch .. //depot/projects/mips2/src/contrib/ntp/libopts/COPYING.mbsd#1 branch .. //depot/projects/mips2/src/contrib/ntp/libopts/MakeDefs.inc#1 branch .. //depot/projects/mips2/src/contrib/ntp/libopts/Makefile.am#1 branch .. //depot/projects/mips2/src/contrib/ntp/libopts/Makefile.in#1 branch .. //depot/projects/mips2/src/contrib/ntp/libopts/README#1 branch .. //depot/projects/mips2/src/contrib/ntp/libopts/autoopts.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/libopts/autoopts.h#1 branch .. //depot/projects/mips2/src/contrib/ntp/libopts/autoopts/options.h#1 branch .. //depot/projects/mips2/src/contrib/ntp/libopts/autoopts/usage-txt.h#1 branch .. //depot/projects/mips2/src/contrib/ntp/libopts/boolean.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/libopts/compat/compat.h#1 branch .. //depot/projects/mips2/src/contrib/ntp/libopts/compat/pathfind.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/libopts/compat/snprintf.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/libopts/compat/strchr.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/libopts/compat/strdup.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/libopts/compat/windows-config.h#1 branch .. //depot/projects/mips2/src/contrib/ntp/libopts/configfile.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/libopts/cook.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/libopts/enumeration.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/libopts/environment.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/libopts/genshell.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/libopts/genshell.h#1 branch .. //depot/projects/mips2/src/contrib/ntp/libopts/libopts.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/libopts/load.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/libopts/m4/libopts.m4#1 branch .. //depot/projects/mips2/src/contrib/ntp/libopts/m4/liboptschk.m4#1 branch .. //depot/projects/mips2/src/contrib/ntp/libopts/makeshell.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/libopts/nested.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/libopts/numeric.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/libopts/pgusage.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/libopts/proto.h#1 branch .. //depot/projects/mips2/src/contrib/ntp/libopts/putshell.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/libopts/restore.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/libopts/save.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/libopts/sort.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/libopts/stack.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/libopts/streqvcmp.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/libopts/text_mmap.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/libopts/tokenize.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/libopts/usage.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/libopts/version.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/libparse/Makefile.am#2 integrate .. //depot/projects/mips2/src/contrib/ntp/libparse/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/ntp/libparse/README#2 integrate .. //depot/projects/mips2/src/contrib/ntp/libparse/binio.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/libparse/clk_computime.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/libparse/clk_dcf7000.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/libparse/clk_hopf6021.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/libparse/clk_meinberg.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/libparse/clk_rawdcf.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/libparse/clk_rcc8000.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/libparse/clk_schmid.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/libparse/clk_trimtaip.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/libparse/clk_trimtsip.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/libparse/clk_varitext.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/libparse/clk_wharton.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/libparse/data_mbg.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/libparse/gpstolfp.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/libparse/ieee754io.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/libparse/info_trimble.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/libparse/mfp_mul.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/libparse/parse.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/libparse/parse_conf.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/libparse/parsesolaris.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/libparse/parsestreams.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/libparse/trim_info.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ltmain.sh#1 branch .. //depot/projects/mips2/src/contrib/ntp/m4/define_dir.m4#1 branch .. //depot/projects/mips2/src/contrib/ntp/m4/hs_ulong_const.m4#1 branch .. //depot/projects/mips2/src/contrib/ntp/m4/os_cflags.m4#1 branch .. //depot/projects/mips2/src/contrib/ntp/missing#2 integrate .. //depot/projects/mips2/src/contrib/ntp/mkinstalldirs#2 delete .. //depot/projects/mips2/src/contrib/ntp/ntpd/Makefile.am#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/cmd_args.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/map_vme.c#2 delete .. //depot/projects/mips2/src/contrib/ntp/ntpd/ntp_config.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/ntp_control.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/ntp_crypto.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/ntp_filegen.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/ntp_intres.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/ntp_io.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/ntp_loopfilter.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/ntp_monitor.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/ntp_peer.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/ntp_proto.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/ntp_refclock.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/ntp_request.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/ntp_restrict.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/ntp_timer.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/ntp_util.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/ntpd-opts.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/ntpd/ntpd-opts.def#1 branch .. //depot/projects/mips2/src/contrib/ntp/ntpd/ntpd-opts.h#1 branch .. //depot/projects/mips2/src/contrib/ntp/ntpd/ntpd-opts.menu#1 branch .. //depot/projects/mips2/src/contrib/ntp/ntpd/ntpd-opts.texi#1 branch .. //depot/projects/mips2/src/contrib/ntp/ntpd/ntpd.1#1 branch .. //depot/projects/mips2/src/contrib/ntp/ntpd/ntpd.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/ntpdbase-opts.def#1 branch .. //depot/projects/mips2/src/contrib/ntp/ntpd/ntpdsim-opts.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/ntpd/ntpdsim-opts.def#1 branch .. //depot/projects/mips2/src/contrib/ntp/ntpd/ntpdsim-opts.h#1 branch .. //depot/projects/mips2/src/contrib/ntp/ntpd/ntpdsim-opts.menu#1 branch .. //depot/projects/mips2/src/contrib/ntp/ntpd/ntpdsim-opts.texi#1 branch .. //depot/projects/mips2/src/contrib/ntp/ntpd/ntpdsim.1#1 branch .. //depot/projects/mips2/src/contrib/ntp/ntpd/ntpsim.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/ppsapi_timepps.h#1 branch .. //depot/projects/mips2/src/contrib/ntp/ntpd/refclock_acts.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/refclock_arbiter.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/refclock_arc.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/refclock_atom.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/refclock_bancomm.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/refclock_chu.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/refclock_conf.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/refclock_datum.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/refclock_fg.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/refclock_gpsvme.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/refclock_heath.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/refclock_hopfpci.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/refclock_hopfser.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/refclock_hpgps.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/refclock_irig.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/refclock_jjy.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/refclock_jupiter.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/refclock_leitch.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/refclock_local.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/refclock_msfees.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/refclock_mx4200.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/refclock_neoclock4x.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/refclock_nmea.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/refclock_oncore.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/refclock_palisade.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/refclock_palisade.h#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/refclock_parse.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/refclock_pst.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/refclock_ptbacts.c#2 delete .. //depot/projects/mips2/src/contrib/ntp/ntpd/refclock_ripencc.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/refclock_shm.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/refclock_ulink.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/refclock_usno.c#2 delete .. //depot/projects/mips2/src/contrib/ntp/ntpd/refclock_wwv.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/refclock_wwvb.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpdate/Makefile.am#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpdate/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpdate/ntpdate.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpdate/ntptimeset.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpdc/Makefile.am#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpdc/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpdc/layout.std#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpdc/nl.pl#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpdc/nl.pl.in#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpdc/ntpdc-opts.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/ntpdc/ntpdc-opts.def#1 branch .. //depot/projects/mips2/src/contrib/ntp/ntpdc/ntpdc-opts.h#1 branch .. //depot/projects/mips2/src/contrib/ntp/ntpdc/ntpdc-opts.menu#1 branch .. //depot/projects/mips2/src/contrib/ntp/ntpdc/ntpdc-opts.texi#1 branch .. //depot/projects/mips2/src/contrib/ntp/ntpdc/ntpdc.1#1 branch .. //depot/projects/mips2/src/contrib/ntp/ntpdc/ntpdc.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpdc/ntpdc.h#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpdc/ntpdc_ops.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpq/Makefile.am#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpq/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpq/ntpq-opts.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/ntpq/ntpq-opts.def#1 branch .. //depot/projects/mips2/src/contrib/ntp/ntpq/ntpq-opts.h#1 branch .. //depot/projects/mips2/src/contrib/ntp/ntpq/ntpq-opts.menu#1 branch .. //depot/projects/mips2/src/contrib/ntp/ntpq/ntpq-opts.texi#1 branch .. //depot/projects/mips2/src/contrib/ntp/ntpq/ntpq-subs.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/ntpq/ntpq.1#1 branch .. //depot/projects/mips2/src/contrib/ntp/ntpq/ntpq.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpq/ntpq.h#2 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpq/ntpq_ops.c#2 delete .. //depot/projects/mips2/src/contrib/ntp/packageinfo.sh#1 branch .. //depot/projects/mips2/src/contrib/ntp/parseutil/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/ntp/parseutil/dcfd.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/parseutil/testdcf.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/scripts/Makefile.am#2 integrate .. //depot/projects/mips2/src/contrib/ntp/scripts/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/ntp/scripts/VersionName#1 branch .. //depot/projects/mips2/src/contrib/ntp/scripts/genCommitLog#1 branch .. //depot/projects/mips2/src/contrib/ntp/scripts/genver#1 branch .. //depot/projects/mips2/src/contrib/ntp/scripts/html2man.in#1 branch .. //depot/projects/mips2/src/contrib/ntp/scripts/mkver.in#2 integrate .. //depot/projects/mips2/src/contrib/ntp/scripts/monitoring/lr.pl#2 integrate .. //depot/projects/mips2/src/contrib/ntp/scripts/monitoring/ntploopwatch#2 integrate .. //depot/projects/mips2/src/contrib/ntp/scripts/ntpsweep.in#2 integrate .. //depot/projects/mips2/src/contrib/ntp/scripts/ntptrace.in#2 integrate .. //depot/projects/mips2/src/contrib/ntp/scripts/support/README#2 delete .. //depot/projects/mips2/src/contrib/ntp/scripts/support/bin/monl#2 delete .. //depot/projects/mips2/src/contrib/ntp/scripts/support/bin/mvstats#2 delete .. //depot/projects/mips2/src/contrib/ntp/scripts/support/conf/hp300.hp300#2 delete .. //depot/projects/mips2/src/contrib/ntp/scripts/support/conf/hp700.hp700#2 delete .. //depot/projects/mips2/src/contrib/ntp/scripts/support/conf/hp700.hp700.faui47#2 delete .. //depot/projects/mips2/src/contrib/ntp/scripts/support/conf/hp800.hp800#2 delete .. //depot/projects/mips2/src/contrib/ntp/scripts/support/conf/ntp.conf#2 delete .. //depot/projects/mips2/src/contrib/ntp/scripts/support/conf/sun3.sun3#2 delete .. //depot/projects/mips2/src/contrib/ntp/scripts/support/conf/sun4.sun4.faui01#2 delete .. //depot/projects/mips2/src/contrib/ntp/scripts/support/conf/sun4.sun4.faui10#2 delete .. //depot/projects/mips2/src/contrib/ntp/scripts/support/conf/sun4.sun4.faui45#2 delete .. //depot/projects/mips2/src/contrib/ntp/scripts/support/conf/sun4.sun4c#2 delete .. //depot/projects/mips2/src/contrib/ntp/scripts/support/conf/sun4.sun4c.Lucifer#2 delete .. //depot/projects/mips2/src/contrib/ntp/scripts/support/conf/sun4.sun4m#2 delete .. //depot/projects/mips2/src/contrib/ntp/scripts/support/conf/sun4.sun4m.faui42#2 delete .. //depot/projects/mips2/src/contrib/ntp/scripts/support/conf/sun4.sun4m.faui45m#2 delete .. //depot/projects/mips2/src/contrib/ntp/scripts/support/conf/tickconf#2 delete .. //depot/projects/mips2/src/contrib/ntp/scripts/support/etc/cron#2 delete .. //depot/projects/mips2/src/contrib/ntp/scripts/support/etc/crontab#2 delete .. //depot/projects/mips2/src/contrib/ntp/scripts/support/etc/install#2 delete .. //depot/projects/mips2/src/contrib/ntp/scripts/support/etc/rc#2 delete .. //depot/projects/mips2/src/contrib/ntp/scripts/support/etc/setup#2 delete .. //depot/projects/mips2/src/contrib/ntp/sntp/COPYRIGHT#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/Makefile.am#2 integrate .. //depot/projects/mips2/src/contrib/ntp/sntp/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/ntp/sntp/README#2 integrate .. //depot/projects/mips2/src/contrib/ntp/sntp/aclocal.m4#2 integrate .. //depot/projects/mips2/src/contrib/ntp/sntp/autogen-version.def#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/bincheck.mf#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/compile#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/config.guess#2 integrate .. //depot/projects/mips2/src/contrib/ntp/sntp/config.h.in#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/config.sub#2 integrate .. //depot/projects/mips2/src/contrib/ntp/sntp/configure#2 integrate .. //depot/projects/mips2/src/contrib/ntp/sntp/configure.ac#2 integrate .. //depot/projects/mips2/src/contrib/ntp/sntp/depcomp#2 integrate .. //depot/projects/mips2/src/contrib/ntp/sntp/header.h#2 integrate .. //depot/projects/mips2/src/contrib/ntp/sntp/install-sh#2 integrate .. //depot/projects/mips2/src/contrib/ntp/sntp/internet.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/sntp/internet.h#2 integrate .. //depot/projects/mips2/src/contrib/ntp/sntp/libopts/COPYING.lgpl#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/libopts/COPYING.mbsd#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/libopts/MakeDefs.inc#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/libopts/Makefile.am#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/libopts/Makefile.in#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/libopts/README#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/libopts/autoopts.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/libopts/autoopts.h#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/libopts/autoopts/options.h#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/libopts/autoopts/usage-txt.h#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/libopts/boolean.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/libopts/compat/compat.h#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/libopts/compat/pathfind.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/libopts/compat/snprintf.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/libopts/compat/strchr.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/libopts/compat/strdup.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/libopts/compat/windows-config.h#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/libopts/configfile.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/libopts/cook.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/libopts/enumeration.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/libopts/environment.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/libopts/genshell.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/libopts/genshell.h#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/libopts/libopts.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/libopts/load.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/libopts/m4/libopts.m4#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/libopts/m4/liboptschk.m4#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/libopts/makeshell.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/libopts/nested.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/libopts/numeric.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/libopts/pgusage.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/libopts/proto.h#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/libopts/putshell.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/libopts/restore.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/libopts/save.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/libopts/sort.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/libopts/stack.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/libopts/streqvcmp.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/libopts/text_mmap.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/libopts/tokenize.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/libopts/usage.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/libopts/version.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/ltmain.sh#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/main.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/sntp/missing#2 integrate .. //depot/projects/mips2/src/contrib/ntp/sntp/mkinstalldirs#2 delete .. //depot/projects/mips2/src/contrib/ntp/sntp/sntp-opts.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/sntp-opts.def#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/sntp-opts.h#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/sntp-opts.menu#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/sntp-opts.texi#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/sntp.1#1 branch .. //depot/projects/mips2/src/contrib/ntp/sntp/socket.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/sntp/timing.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/sntp/version.def#1 branch .. //depot/projects/mips2/src/contrib/ntp/util/Makefile.am#2 integrate .. //depot/projects/mips2/src/contrib/ntp/util/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/ntp/util/ansi2knr.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/util/hist.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/util/jitter.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/util/jitter.h#1 branch .. //depot/projects/mips2/src/contrib/ntp/util/ntp-keygen-opts.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/util/ntp-keygen-opts.def#1 branch .. //depot/projects/mips2/src/contrib/ntp/util/ntp-keygen-opts.h#1 branch .. //depot/projects/mips2/src/contrib/ntp/util/ntp-keygen-opts.menu#1 branch .. //depot/projects/mips2/src/contrib/ntp/util/ntp-keygen-opts.texi#1 branch .. //depot/projects/mips2/src/contrib/ntp/util/ntp-keygen.1#1 branch .. //depot/projects/mips2/src/contrib/ntp/util/ntp-keygen.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/util/ntptime.c#2 integrate .. //depot/projects/mips2/src/contrib/ntp/util/tg.c#1 branch .. //depot/projects/mips2/src/contrib/ntp/version#2 integrate .. //depot/projects/mips2/src/contrib/ntp/version.m4#1 branch .. //depot/projects/mips2/src/contrib/sendmail/FREEBSD-upgrade#5 integrate .. //depot/projects/mips2/src/contrib/sendmail/KNOWNBUGS#3 integrate .. //depot/projects/mips2/src/contrib/sendmail/PGPKEYS#3 integrate .. //depot/projects/mips2/src/contrib/sendmail/README#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/RELEASE_NOTES#5 integrate .. //depot/projects/mips2/src/contrib/sendmail/cf/README#3 integrate .. //depot/projects/mips2/src/contrib/sendmail/cf/cf/submit.cf#5 integrate .. //depot/projects/mips2/src/contrib/sendmail/cf/m4/proto.m4#4 integrate .. //depot/projects/mips2/src/contrib/sendmail/cf/m4/version.m4#5 integrate .. //depot/projects/mips2/src/contrib/sendmail/include/libmilter/mfapi.h#3 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/Makefile.m4#3 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/docs/smfi_opensocket.html#3 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/docs/smfi_version.html#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/engine.c#5 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/worker.c#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/mail.local/mail.local.c#3 integrate .. //depot/projects/mips2/src/contrib/sendmail/makemap/makemap.8#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/makemap/makemap.c#3 integrate .. //depot/projects/mips2/src/contrib/sendmail/smrsh/README#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/smrsh/smrsh.c#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/Makefile.m4#4 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/README#3 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/collect.c#3 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/conf.c#4 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/conf.h#3 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/daemon.c#3 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/envelope.c#4 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/err.c#3 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/headers.c#4 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/mailq.1#3 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/main.c#5 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/mci.c#3 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/parseaddr.c#4 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/queue.c#5 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/ratectrl.c#3 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/readcf.c#4 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/savemail.c#3 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/sendmail.h#4 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/sfsasl.c#2 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/sm_resolve.c#4 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/srvrsmtp.c#5 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/usersmtp.c#4 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/util.c#4 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/version.c#5 integrate .. //depot/projects/mips2/src/contrib/tcsh/tc.func.c#3 integrate .. //depot/projects/mips2/src/contrib/telnet/telnetd/state.c#2 integrate .. //depot/projects/mips2/src/contrib/telnet/telnetd/telnetd.8#2 integrate .. //depot/projects/mips2/src/contrib/telnet/telnetd/telnetd.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/ChangeLog#3 integrate .. //depot/projects/mips2/src/crypto/openssh/FREEBSD-Xlist#3 delete .. //depot/projects/mips2/src/crypto/openssh/FREEBSD-tricks#2 integrate .. //depot/projects/mips2/src/crypto/openssh/FREEBSD-upgrade#4 integrate .. //depot/projects/mips2/src/crypto/openssh/FREEBSD-vendor#2 integrate .. //depot/projects/mips2/src/crypto/openssh/INSTALL#3 integrate .. //depot/projects/mips2/src/crypto/openssh/LICENCE#3 integrate .. //depot/projects/mips2/src/crypto/openssh/Makefile.in#3 delete .. //depot/projects/mips2/src/crypto/openssh/Makefile.inc#2 delete .. //depot/projects/mips2/src/crypto/openssh/PROTOCOL#1 branch .. //depot/projects/mips2/src/crypto/openssh/PROTOCOL.agent#1 branch .. //depot/projects/mips2/src/crypto/openssh/README#3 integrate .. //depot/projects/mips2/src/crypto/openssh/README.platform#3 integrate .. //depot/projects/mips2/src/crypto/openssh/RFC.nroff#2 delete .. //depot/projects/mips2/src/crypto/openssh/addrmatch.c#1 branch .. //depot/projects/mips2/src/crypto/openssh/atomicio.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/audit-bsm.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/auth-bsdauth.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/auth-chall.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/auth-krb5.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/auth-options.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/auth-options.h#3 integrate .. //depot/projects/mips2/src/crypto/openssh/auth-pam.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/auth-pam.h#2 integrate .. //depot/projects/mips2/src/crypto/openssh/auth-passwd.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/auth-rhosts.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/auth-rsa.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/auth-shadow.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/auth-sia.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/auth-skey.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/auth.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/auth.h#3 integrate .. //depot/projects/mips2/src/crypto/openssh/auth1.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/auth2-chall.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/auth2-gss.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/auth2-hostbased.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/auth2-kbdint.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/auth2-none.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/auth2-pubkey.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/auth2.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/bufaux.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/bufbn.c#2 integrate .. //depot/projects/mips2/src/crypto/openssh/buffer.h#3 integrate .. //depot/projects/mips2/src/crypto/openssh/buildpkg.sh.in#3 delete .. //depot/projects/mips2/src/crypto/openssh/canohost.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/channels.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/channels.h#3 integrate .. //depot/projects/mips2/src/crypto/openssh/cipher-3des1.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/cipher-bf1.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/cipher-ctr.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/clientloop.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/clientloop.h#3 integrate .. //depot/projects/mips2/src/crypto/openssh/compat.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/compat.h#3 integrate .. //depot/projects/mips2/src/crypto/openssh/config.h#3 integrate .. //depot/projects/mips2/src/crypto/openssh/config.h.in#1 branch .. //depot/projects/mips2/src/crypto/openssh/config.sub#2 delete .. //depot/projects/mips2/src/crypto/openssh/configure.ac#3 delete .. //depot/projects/mips2/src/crypto/openssh/defines.h#3 integrate .. //depot/projects/mips2/src/crypto/openssh/dh.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/dh.h#3 integrate .. //depot/projects/mips2/src/crypto/openssh/dns.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/entropy.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/groupaccess.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/groupaccess.h#3 integrate .. //depot/projects/mips2/src/crypto/openssh/gss-genr.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/gss-serv.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/includes.h#3 integrate .. //depot/projects/mips2/src/crypto/openssh/install-sh#2 delete .. //depot/projects/mips2/src/crypto/openssh/kex.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/kex.h#3 integrate .. //depot/projects/mips2/src/crypto/openssh/key.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/key.h#3 integrate .. //depot/projects/mips2/src/crypto/openssh/log.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/log.h#3 integrate .. //depot/projects/mips2/src/crypto/openssh/loginrec.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/mac.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/mac.h#3 integrate .. //depot/projects/mips2/src/crypto/openssh/match.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/match.h#3 integrate .. //depot/projects/mips2/src/crypto/openssh/mdoc2man.awk#2 delete .. //depot/projects/mips2/src/crypto/openssh/misc.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/misc.h#3 integrate .. //depot/projects/mips2/src/crypto/openssh/moduli#2 integrate .. //depot/projects/mips2/src/crypto/openssh/moduli.5#1 branch .. //depot/projects/mips2/src/crypto/openssh/moduli.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/monitor.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/monitor.h#3 integrate .. //depot/projects/mips2/src/crypto/openssh/monitor_fdpass.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/monitor_fdpass.h#3 integrate .. //depot/projects/mips2/src/crypto/openssh/monitor_mm.h#3 integrate .. //depot/projects/mips2/src/crypto/openssh/monitor_wrap.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/monitor_wrap.h#3 integrate .. //depot/projects/mips2/src/crypto/openssh/mux.c#1 branch .. //depot/projects/mips2/src/crypto/openssh/myproposal.h#3 integrate .. //depot/projects/mips2/src/crypto/openssh/nchan.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/nchan.ms#2 delete .. //depot/projects/mips2/src/crypto/openssh/nchan2.ms#2 delete .. //depot/projects/mips2/src/crypto/openssh/openbsd-compat/Makefile.in#3 delete .. //depot/projects/mips2/src/crypto/openssh/openbsd-compat/base64.c#2 integrate .. //depot/projects/mips2/src/crypto/openssh/openbsd-compat/bindresvport.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/openbsd-compat/bsd-arc4random.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/openbsd-compat/bsd-asprintf.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/openbsd-compat/bsd-cray.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/openbsd-compat/bsd-getpeereid.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/openbsd-compat/bsd-misc.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/openbsd-compat/bsd-poll.c#1 branch .. //depot/projects/mips2/src/crypto/openssh/openbsd-compat/bsd-poll.h#1 branch .. //depot/projects/mips2/src/crypto/openssh/openbsd-compat/bsd-snprintf.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/openbsd-compat/bsd-statvfs.c#1 branch .. //depot/projects/mips2/src/crypto/openssh/openbsd-compat/bsd-statvfs.h#1 branch .. //depot/projects/mips2/src/crypto/openssh/openbsd-compat/fake-rfc2553.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/openbsd-compat/fake-rfc2553.h#3 integrate .. //depot/projects/mips2/src/crypto/openssh/openbsd-compat/fmt_scaled.c#1 branch .. //depot/projects/mips2/src/crypto/openssh/openbsd-compat/getrrsetbyname.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/openbsd-compat/getrrsetbyname.h#2 integrate .. //depot/projects/mips2/src/crypto/openssh/openbsd-compat/glob.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/openbsd-compat/glob.h#3 integrate .. //depot/projects/mips2/src/crypto/openssh/openbsd-compat/openbsd-compat.h#3 integrate .. //depot/projects/mips2/src/crypto/openssh/openbsd-compat/openssl-compat.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/openbsd-compat/openssl-compat.h#3 integrate .. //depot/projects/mips2/src/crypto/openssh/openbsd-compat/port-aix.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/openbsd-compat/port-aix.h#3 integrate .. //depot/projects/mips2/src/crypto/openssh/openbsd-compat/port-linux.c#2 integrate .. //depot/projects/mips2/src/crypto/openssh/openbsd-compat/port-linux.h#2 integrate .. //depot/projects/mips2/src/crypto/openssh/openbsd-compat/port-tun.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/openbsd-compat/port-uw.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/openbsd-compat/port-uw.h#2 integrate .. //depot/projects/mips2/src/crypto/openssh/openbsd-compat/regress/Makefile.in#2 delete .. //depot/projects/mips2/src/crypto/openssh/openbsd-compat/regress/closefromtest.c#2 delete .. //depot/projects/mips2/src/crypto/openssh/openbsd-compat/regress/snprintftest.c#2 delete .. //depot/projects/mips2/src/crypto/openssh/openbsd-compat/regress/strduptest.c#2 delete .. //depot/projects/mips2/src/crypto/openssh/openbsd-compat/regress/strtonumtest.c#2 delete .. //depot/projects/mips2/src/crypto/openssh/openbsd-compat/rresvport.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/openbsd-compat/setenv.c#2 integrate .. //depot/projects/mips2/src/crypto/openssh/openbsd-compat/setproctitle.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/openbsd-compat/sigact.c#2 integrate .. //depot/projects/mips2/src/crypto/openssh/openbsd-compat/sys-queue.h#2 integrate .. //depot/projects/mips2/src/crypto/openssh/openbsd-compat/sys-tree.h#2 integrate .. //depot/projects/mips2/src/crypto/openssh/openbsd-compat/xcrypt.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/openbsd-compat/xmmap.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/openssh.xml.in#2 delete .. //depot/projects/mips2/src/crypto/openssh/opensshd.init.in#2 delete .. //depot/projects/mips2/src/crypto/openssh/packet.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/packet.h#3 integrate .. //depot/projects/mips2/src/crypto/openssh/readconf.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/readconf.h#3 integrate .. //depot/projects/mips2/src/crypto/openssh/regress/Makefile#3 delete .. //depot/projects/mips2/src/crypto/openssh/regress/README.regress#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/agent-getpeereid.sh#3 delete .. //depot/projects/mips2/src/crypto/openssh/regress/agent-ptrace.sh#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/agent-timeout.sh#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/agent.sh#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/banner.sh#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/broken-pipe.sh#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/brokenkeys.sh#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/bsd.regress.mk#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/cfgmatch.sh#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/cipher-speed.sh#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/connect-privsep.sh#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/connect.sh#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/copy.1#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/copy.2#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/dsa_ssh2.prv#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/dsa_ssh2.pub#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/dynamic-forward.sh#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/envpass.sh#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/exit-status.sh#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/forcecommand.sh#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/forwarding.sh#3 delete .. //depot/projects/mips2/src/crypto/openssh/regress/keygen-change.sh#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/keyscan.sh#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/login-timeout.sh#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/multiplex.sh#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/proto-mismatch.sh#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/proto-version.sh#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/proxy-connect.sh#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/reconfigure.sh#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/reexec.sh#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/rekey.sh#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/rsa_openssh.prv#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/rsa_openssh.pub#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/rsa_ssh2.prv#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/runtests.sh#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/scp-ssh-wrapper.sh#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/scp.sh#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/sftp-badcmds.sh#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/sftp-batch.sh#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/sftp-cmds.sh#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/sftp-glob.sh#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/sftp.sh#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/ssh-com-client.sh#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/ssh-com-keygen.sh#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/ssh-com-sftp.sh#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/ssh-com.sh#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/sshd-log-wrapper.sh#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/stderr-after-eof.sh#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/stderr-data.sh#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/t4.ok#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/t5.ok#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/test-exec.sh#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/transfer.sh#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/try-ciphers.sh#2 delete .. //depot/projects/mips2/src/crypto/openssh/regress/yes-head.sh#2 delete .. //depot/projects/mips2/src/crypto/openssh/scard-opensc.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/scard/Makefile.in#3 delete .. //depot/projects/mips2/src/crypto/openssh/scard/Ssh.bin#2 delete .. //depot/projects/mips2/src/crypto/openssh/scard/Ssh.bin.uu#2 delete .. //depot/projects/mips2/src/crypto/openssh/scard/Ssh.java#2 delete .. //depot/projects/mips2/src/crypto/openssh/scp.1#3 integrate .. //depot/projects/mips2/src/crypto/openssh/scp.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/servconf.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/servconf.h#3 integrate .. //depot/projects/mips2/src/crypto/openssh/serverloop.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/session.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/session.h#3 integrate .. //depot/projects/mips2/src/crypto/openssh/sftp-client.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/sftp-client.h#2 integrate .. //depot/projects/mips2/src/crypto/openssh/sftp-server-main.c#1 branch .. //depot/projects/mips2/src/crypto/openssh/sftp-server.8#3 integrate .. //depot/projects/mips2/src/crypto/openssh/sftp-server.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/sftp.1#2 integrate .. //depot/projects/mips2/src/crypto/openssh/sftp.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/sftp.h#3 integrate .. //depot/projects/mips2/src/crypto/openssh/ssh-add.1#2 integrate .. //depot/projects/mips2/src/crypto/openssh/ssh-add.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/ssh-agent.1#3 integrate .. //depot/projects/mips2/src/crypto/openssh/ssh-agent.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/ssh-gss.h#3 integrate .. //depot/projects/mips2/src/crypto/openssh/ssh-keygen.1#2 integrate .. //depot/projects/mips2/src/crypto/openssh/ssh-keygen.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/ssh-keyscan.1#3 integrate .. //depot/projects/mips2/src/crypto/openssh/ssh-keyscan.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/ssh-keysign.8#3 integrate .. //depot/projects/mips2/src/crypto/openssh/ssh-rand-helper.8#2 integrate .. //depot/projects/mips2/src/crypto/openssh/ssh-rand-helper.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/ssh.1#3 integrate .. //depot/projects/mips2/src/crypto/openssh/ssh.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/ssh_config#3 integrate .. //depot/projects/mips2/src/crypto/openssh/ssh_config.5#4 integrate .. //depot/projects/mips2/src/crypto/openssh/ssh_namespace.h#3 integrate .. //depot/projects/mips2/src/crypto/openssh/ssh_prng_cmds.in#2 delete .. //depot/projects/mips2/src/crypto/openssh/sshconnect.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/sshconnect.h#3 integrate .. //depot/projects/mips2/src/crypto/openssh/sshconnect2.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/sshd.8#3 integrate .. //depot/projects/mips2/src/crypto/openssh/sshd.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/sshd_config#3 integrate .. //depot/projects/mips2/src/crypto/openssh/sshd_config.5#4 integrate .. //depot/projects/mips2/src/crypto/openssh/sshlogin.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/sshpty.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/sshpty.h#3 integrate .. //depot/projects/mips2/src/crypto/openssh/sshtty.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/survey.sh.in#2 delete .. //depot/projects/mips2/src/crypto/openssh/ttymodes.c#3 integrate .. //depot/projects/mips2/src/crypto/openssh/umac.c#1 branch .. //depot/projects/mips2/src/crypto/openssh/umac.h#1 branch .. //depot/projects/mips2/src/crypto/openssh/version.c#2 integrate .. //depot/projects/mips2/src/crypto/openssh/version.h#3 integrate .. //depot/projects/mips2/src/etc/defaults/devfs.rules#3 integrate .. //depot/projects/mips2/src/etc/defaults/rc.conf#12 integrate .. //depot/projects/mips2/src/etc/etc.amd64/ttys#5 integrate .. //depot/projects/mips2/src/etc/etc.arm/ttys#5 integrate .. //depot/projects/mips2/src/etc/etc.i386/ttys#5 integrate .. //depot/projects/mips2/src/etc/etc.ia64/ttys#4 integrate .. //depot/projects/mips2/src/etc/etc.mips/ttys#3 integrate .. //depot/projects/mips2/src/etc/etc.powerpc/ttys#5 integrate .. //depot/projects/mips2/src/etc/etc.sparc64/ttys#4 integrate .. //depot/projects/mips2/src/etc/freebsd-update.conf#5 integrate .. //depot/projects/mips2/src/etc/login.conf#3 integrate .. //depot/projects/mips2/src/etc/mtree/BSD.usr.dist#7 integrate .. //depot/projects/mips2/src/etc/periodic/security/550.ipfwlimit#2 integrate .. //depot/projects/mips2/src/etc/ppp/ppp.conf#2 integrate .. //depot/projects/mips2/src/etc/rc.d/Makefile#10 integrate .. //depot/projects/mips2/src/etc/rc.d/amd#5 integrate .. //depot/projects/mips2/src/etc/rc.d/apmd#3 integrate .. //depot/projects/mips2/src/etc/rc.d/bluetooth#3 integrate .. //depot/projects/mips2/src/etc/rc.d/bsnmpd#2 integrate .. //depot/projects/mips2/src/etc/rc.d/bthidd#2 integrate .. //depot/projects/mips2/src/etc/rc.d/devd#3 integrate .. //depot/projects/mips2/src/etc/rc.d/ftp-proxy#3 integrate .. //depot/projects/mips2/src/etc/rc.d/ftpd#2 integrate .. //depot/projects/mips2/src/etc/rc.d/hcsecd#3 integrate .. //depot/projects/mips2/src/etc/rc.d/idmapd#2 integrate .. //depot/projects/mips2/src/etc/rc.d/kernel#3 delete .. //depot/projects/mips2/src/etc/rc.d/keyserv#3 integrate .. //depot/projects/mips2/src/etc/rc.d/lockd#6 integrate .. //depot/projects/mips2/src/etc/rc.d/lpd#4 integrate .. //depot/projects/mips2/src/etc/rc.d/mountd#4 integrate .. //depot/projects/mips2/src/etc/rc.d/moused#5 integrate .. //depot/projects/mips2/src/etc/rc.d/named#3 integrate .. //depot/projects/mips2/src/etc/rc.d/nfsd#3 integrate .. //depot/projects/mips2/src/etc/rc.d/nscd#3 integrate .. //depot/projects/mips2/src/etc/rc.d/ntpd#3 integrate .. //depot/projects/mips2/src/etc/rc.d/powerd#3 integrate .. //depot/projects/mips2/src/etc/rc.d/rpcbind#3 integrate .. //depot/projects/mips2/src/etc/rc.d/rtadvd#3 integrate .. //depot/projects/mips2/src/etc/rc.d/rwho#3 integrate .. //depot/projects/mips2/src/etc/rc.d/savecore#4 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Sep 2 21:25:19 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6EA161065672; Tue, 2 Sep 2008 21:25:19 +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 31156106564A for ; Tue, 2 Sep 2008 21:25:19 +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 1E7448FC12 for ; Tue, 2 Sep 2008 21:25:19 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m82LPIoE075307 for ; Tue, 2 Sep 2008 21:25:19 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.1/Submit) id m82LPISX075305 for perforce@freebsd.org; Tue, 2 Sep 2008 21:25:18 GMT (envelope-from gonzo@FreeBSD.org) Date: Tue, 2 Sep 2008 21:25:18 GMT Message-Id: <200809022125.m82LPISX075305@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 149084 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Sep 2008 21:25:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=149084 Change 149084 by gonzo@gonzo_jeeves on 2008/09/02 21:24:46 IFC @149082 Affected files ... .. //depot/projects/mips2/src/UPDATING#18 integrate .. //depot/projects/mips2/src/contrib/bind9/CHANGES#7 integrate .. //depot/projects/mips2/src/contrib/bind9/COPYRIGHT#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dig/dighost.c#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/client.c#7 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/config.c#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/controlconf.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/interfacemgr.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/lwresd.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/named.conf.docbook#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/server.c#7 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/rndc/rndc.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/configure.in#5 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM-book.xml#7 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/configure.in#5 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind9/check.c#6 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/api#6 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/dispatch.c#7 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/dispatch.h#6 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/request.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/resolver.c#6 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/xfrin.c#5 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/api#5 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/resource.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/socket.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/timer.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/timer.c#5 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/app.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/resource.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/socket.c#5 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/socket_p.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isccfg/api#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isccfg/namedconf.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/version#7 integrate .. //depot/projects/mips2/src/contrib/gcc/config/freebsd-spec.h#3 integrate .. //depot/projects/mips2/src/contrib/gcc/config/freebsd.h#3 integrate .. //depot/projects/mips2/src/contrib/gcc/config/i386/freebsd64.h#3 integrate .. //depot/projects/mips2/src/contrib/sendmail/libmilter/main.c#5 integrate .. //depot/projects/mips2/src/crypto/openssh/config.h#4 integrate .. //depot/projects/mips2/src/crypto/openssh/openbsd-compat/fake-queue.h#2 delete .. //depot/projects/mips2/src/crypto/openssh/openbsd-compat/tree.h#2 delete .. //depot/projects/mips2/src/gnu/lib/libgcc/Makefile#7 integrate .. //depot/projects/mips2/src/gnu/lib/libgomp/Makefile#3 integrate .. //depot/projects/mips2/src/gnu/lib/libgomp/config.h#3 integrate .. //depot/projects/mips2/src/gnu/usr.bin/Makefile#8 integrate .. //depot/projects/mips2/src/gnu/usr.bin/cc/Makefile.tgt#6 integrate .. //depot/projects/mips2/src/gnu/usr.bin/cc/cc_tools/Makefile#8 integrate .. //depot/projects/mips2/src/gnu/usr.bin/cc/cc_tools/elfos-undef.h#1 branch .. //depot/projects/mips2/src/gnu/usr.bin/cc/cc_tools/freebsd64-fix.h#2 delete .. //depot/projects/mips2/src/lib/bind/config.h#5 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_entry.c#9 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_entry.h#7 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_entry_private.h#5 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_write_disk.c#11 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_write_set_format_by_name.c#6 integrate .. //depot/projects/mips2/src/lib/libarchive/test/read_open_memory.c#3 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_acl_basic.c#4 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_acl_pax.c#5 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_bad_fd.c#2 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_compat_gtar.c#3 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_compat_zip.c#3 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_empty_write.c#3 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_entry.c#5 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_read_compress_program.c#2 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_read_data_large.c#4 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_read_extract.c#5 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_ar.c#5 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_cpio_bin.c#2 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_cpio_bin_Z.c#2 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_cpio_bin_bz2.c#2 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_cpio_bin_gz.c#2 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_cpio_odc.c#3 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_cpio_svr4_gzip.c#2 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_cpio_svr4c_Z.c#2 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_empty.c#2 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_gtar_gz.c#2 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_gtar_sparse.c#6 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_iso_gz.c#2 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_isorr_bz2.c#5 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_mtree.c#3 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_pax_bz2.c#2 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_tar.c#4 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_tar_empty_filename.c#2 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_tbz.c#2 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_tgz.c#2 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_tz.c#2 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_zip.c#6 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_read_large.c#4 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_read_pax_truncated.c#3 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_read_position.c#4 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_read_truncated.c#4 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_tar_filenames.c#5 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_tar_large.c#4 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_write_compress.c#2 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_write_compress_program.c#2 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_write_disk.c#7 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_write_disk_hardlink.c#4 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_write_disk_perms.c#7 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_write_disk_secure.c#5 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_write_format_ar.c#6 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_write_format_cpio.c#4 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_write_format_cpio_empty.c#3 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_write_format_cpio_newc.c#2 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_write_format_cpio_odc.c#2 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_write_format_shar_empty.c#3 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_write_format_tar.c#4 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_write_format_tar_empty.c#3 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_write_open_memory.c#4 integrate .. //depot/projects/mips2/src/sbin/md5/md5.c#3 integrate .. //depot/projects/mips2/src/sys/amd64/amd64/cpu_switch.S#7 integrate .. //depot/projects/mips2/src/sys/amd64/amd64/machdep.c#13 integrate .. //depot/projects/mips2/src/sys/amd64/ia32/ia32_signal.c#6 integrate .. //depot/projects/mips2/src/sys/dev/bfe/if_bfe.c#10 integrate .. //depot/projects/mips2/src/sys/dev/bm/if_bm.c#2 integrate .. //depot/projects/mips2/src/sys/dev/cpuctl/cpuctl.c#2 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/cxgb_ioctl.h#6 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/cxgb_main.c#16 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/cxgb_sge.c#14 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/ulp/toecore/toedev.c#2 integrate .. //depot/projects/mips2/src/sys/fs/msdosfs/msdosfs_fat.c#6 integrate .. //depot/projects/mips2/src/sys/i386/xen/xen_machdep.c#2 integrate .. //depot/projects/mips2/src/sys/kern/tty_ttydisc.c#2 integrate .. //depot/projects/mips2/src/sys/kern/uipc_socket.c#12 integrate .. //depot/projects/mips2/src/sys/kern/vfs_syscalls.c#12 integrate .. //depot/projects/mips2/src/sys/modules/aha/Makefile#2 integrate .. //depot/projects/mips2/src/sys/modules/ahb/Makefile#2 integrate .. //depot/projects/mips2/src/sys/modules/an/Makefile#2 integrate .. //depot/projects/mips2/src/sys/modules/ar/Makefile#2 integrate .. //depot/projects/mips2/src/sys/modules/ath_rate_amrr/Makefile#6 integrate .. //depot/projects/mips2/src/sys/modules/ath_rate_onoe/Makefile#6 integrate .. //depot/projects/mips2/src/sys/modules/ath_rate_sample/Makefile#5 integrate .. //depot/projects/mips2/src/sys/modules/ce/Makefile#2 integrate .. //depot/projects/mips2/src/sys/modules/cp/Makefile#2 integrate .. //depot/projects/mips2/src/sys/modules/ctau/Makefile#2 integrate .. //depot/projects/mips2/src/sys/modules/cx/Makefile#2 integrate .. //depot/projects/mips2/src/sys/modules/digi/digi/Makefile#3 integrate .. //depot/projects/mips2/src/sys/modules/fatm/Makefile#2 integrate .. //depot/projects/mips2/src/sys/modules/hatm/Makefile#2 integrate .. //depot/projects/mips2/src/sys/modules/hifn/Makefile#3 integrate .. //depot/projects/mips2/src/sys/modules/if_tap/Makefile#3 integrate .. //depot/projects/mips2/src/sys/modules/linux/Makefile#4 integrate .. //depot/projects/mips2/src/sys/modules/netgraph/sync_ar/Makefile#2 integrate .. //depot/projects/mips2/src/sys/modules/netgraph/sync_sr/Makefile#2 integrate .. //depot/projects/mips2/src/sys/modules/patm/Makefile#2 integrate .. //depot/projects/mips2/src/sys/modules/pf/Makefile#4 integrate .. //depot/projects/mips2/src/sys/modules/pflog/Makefile#2 integrate .. //depot/projects/mips2/src/sys/modules/rp/Makefile#2 integrate .. //depot/projects/mips2/src/sys/modules/safe/Makefile#3 integrate .. //depot/projects/mips2/src/sys/modules/sppp/Makefile#2 integrate .. //depot/projects/mips2/src/sys/modules/sr/Makefile#2 integrate .. //depot/projects/mips2/src/sys/modules/svr4/Makefile#2 integrate .. //depot/projects/mips2/src/sys/modules/trm/Makefile#2 integrate .. //depot/projects/mips2/src/sys/modules/ubsec/Makefile#3 integrate .. //depot/projects/mips2/src/sys/modules/wlan/Makefile#5 integrate .. //depot/projects/mips2/src/sys/modules/wlan_acl/Makefile#3 integrate .. //depot/projects/mips2/src/sys/modules/wlan_amrr/Makefile#3 integrate .. //depot/projects/mips2/src/sys/modules/wlan_ccmp/Makefile#3 integrate .. //depot/projects/mips2/src/sys/modules/wlan_rssadapt/Makefile#2 integrate .. //depot/projects/mips2/src/sys/modules/wlan_tkip/Makefile#3 integrate .. //depot/projects/mips2/src/sys/modules/wlan_wep/Makefile#3 integrate .. //depot/projects/mips2/src/sys/modules/wlan_xauth/Makefile#3 integrate .. //depot/projects/mips2/src/sys/net/route.c#10 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211.c#10 integrate .. //depot/projects/mips2/src/sys/netinet/tcp_hostcache.c#6 integrate .. //depot/projects/mips2/src/sys/netinet/tcp_offload.c#3 integrate .. //depot/projects/mips2/src/sys/netinet/toedev.h#3 integrate .. //depot/projects/mips2/src/sys/powerpc/aim/interrupt.c#2 integrate .. //depot/projects/mips2/src/sys/sparc64/include/cache.h#4 integrate .. //depot/projects/mips2/src/sys/sparc64/include/pcpu.h#5 integrate .. //depot/projects/mips2/src/sys/sparc64/sparc64/autoconf.c#4 integrate .. //depot/projects/mips2/src/sys/sparc64/sparc64/cache.c#3 integrate .. //depot/projects/mips2/src/sys/sparc64/sparc64/cheetah.c#4 integrate .. //depot/projects/mips2/src/sys/sparc64/sparc64/genassym.c#4 integrate .. //depot/projects/mips2/src/sys/sparc64/sparc64/machdep.c#8 integrate .. //depot/projects/mips2/src/sys/sparc64/sparc64/mp_exception.S#3 integrate .. //depot/projects/mips2/src/sys/sparc64/sparc64/mp_machdep.c#8 integrate .. //depot/projects/mips2/src/sys/sparc64/sparc64/spitfire.c#4 integrate .. //depot/projects/mips2/src/tools/tools/cd2dvd/cd2dvd.sh#1 branch .. //depot/projects/mips2/src/usr.bin/Makefile#15 integrate .. //depot/projects/mips2/src/usr.bin/limits/limits.1#2 integrate .. //depot/projects/mips2/src/usr.bin/limits/limits.c#3 integrate .. //depot/projects/mips2/src/usr.bin/locate/locate/locate.c#2 integrate .. //depot/projects/mips2/src/usr.bin/netstat/inet.c#8 integrate .. //depot/projects/mips2/src/usr.bin/netstat/main.c#6 integrate .. //depot/projects/mips2/src/usr.bin/netstat/netstat.h#6 integrate .. //depot/projects/mips2/src/usr.bin/netstat/route.c#7 integrate .. //depot/projects/mips2/src/usr.bin/sed/sed.1#5 integrate .. //depot/projects/mips2/src/usr.sbin/cxgbtool/cxgbtool.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/cxgbtool/reg_defs_t3.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/cxgbtool/reg_defs_t3b.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/cxgbtool/version.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/lpr/lpd/recvjob.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/ntp/config.h#3 integrate .. //depot/projects/mips2/src/usr.sbin/syslogd/syslogd.c#7 integrate Differences ... ==== //depot/projects/mips2/src/UPDATING#18 (text+ko) ==== @@ -41,6 +41,21 @@ Adding these drivers to your kernel configuration file shall cause compilation to fail. +20080801: + OpenSSH has been upgraded to 5.1p1. + + For many years, FreeBSD's version of OpenSSH preferred DSA + over RSA for host and user authentication keys. With this + upgrade, we've switched to the vendor's default of RSA over + DSA. This may cause upgraded clients to warn about unknown + host keys even for previously known hosts. Users should + follow the usual procedure for verifying host keys before + accepting the RSA key. + + This can be circumvented by setting the "HostKeyAlgorithms" + option to "ssh-dss,ssh-rsa" in ~/.ssh/config or on the ssh + command line. + 20080713: The sio(4) driver has been removed from the i386 and amd64 kernel configuration files. This means uart(4) is now the @@ -1108,4 +1123,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.539 2008/08/20 08:31:58 ed Exp $ +$FreeBSD: src/UPDATING,v 1.540 2008/09/01 23:50:56 des Exp $ ==== //depot/projects/mips2/src/contrib/bind9/CHANGES#7 (text+ko) ==== @@ -1,3 +1,47 @@ + --- 9.4.2-P2 released --- + +2406. [bug] Some operating systems have FD_SETSIZE set to a + low value by default, which can cause resource + exhaustion when many simultaneous connections are + open. Linux in particular makes it difficult to + increase this value. To use more sockets with + select(), set ISC_SOCKET_FDSETSIZE. Example: + STD_CDEFINES="-DISC_SOCKET_FDSETSIZE=4096" ./configure + (This should not be necessary in most cases, and + never for an authoritative-only server.) [RT #18328] + +2404. [port] hpux: files unlimited support. + +2403. [bug] TSIG context leak. [RT #18341] + +2402. [port] Support Solaris 2.11 and over. [RT #18362] + +2401. [bug] Expect to get E[MN]FILE errno internal_accept() + (from accept() or fcntl() system calls). [RT #18358] + +2399. [bug] Abort timeout queries to reduce the number of open + UDP sockets. [RT #18367] + +2398. [bug] Improve file descriptor management. New, + temporary, named.conf option reserved-sockets, + default 512. [RT #18344] + +2396. [bug] Don't set SO_REUSEADDR for randomized ports. + [RT #18336] + +2395. [port] Avoid warning and no effect from "files unlimited" + on Linux when running as root. [RT #18335] + +2394. [bug] Default configuration options set the limit for + open files to 'unlimited' as described in the + documentation. [RT #18331] + +2392. [bug] remove 'grep -q' from acl test script, some platforms + don't support it. [RT #18253] + +2322. [port] MacOS: work around the limitation of setrlimit() + for RLIMIT_NOFILE. [RT #17526] + --- 9.4.2-P1 released --- 2375. [security] Fully randomize UDP query ports to improve @@ -33,7 +77,7 @@ [RT #17113] 2249. [bug] Only set Authentic Data bit if client requested - DNSSEC, per RFC 3655 [RT #17175] + DNSSEC, per RFC 3655 [RT #17175] 2248. [cleanup] Fix several errors reported by Coverity. [RT #17160] ==== //depot/projects/mips2/src/contrib/bind9/COPYRIGHT#5 (text+ko) ==== @@ -1,4 +1,4 @@ -Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") +Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") Copyright (C) 1996-2003 Internet Software Consortium. Permission to use, copy, modify, and/or distribute this software for any @@ -13,7 +13,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -$Id: COPYRIGHT,v 1.9.18.4 2007/08/28 07:19:54 tbox Exp $ +$Id: COPYRIGHT,v 1.9.18.4.10.1 2008/07/23 07:28:54 tbox Exp $ Portions Copyright (C) 1996-2001 Nominum, Inc. ==== //depot/projects/mips2/src/contrib/bind9/bin/dig/dighost.c#5 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dighost.c,v 1.259.18.43 2007/08/28 07:19:55 tbox Exp $ */ +/* $Id: dighost.c,v 1.259.18.43.10.3 2008/07/23 23:16:43 marka Exp $ */ /*! \file * \note @@ -2217,14 +2217,15 @@ sockcount++; debug("sockcount=%d", sockcount); if (specified_source) - result = isc_socket_bind(query->sock, &bind_address); + result = isc_socket_bind(query->sock, &bind_address, + ISC_SOCKET_REUSEADDRESS); else { if ((isc_sockaddr_pf(&query->sockaddr) == AF_INET) && have_ipv4) isc_sockaddr_any(&bind_any); else isc_sockaddr_any6(&bind_any); - result = isc_socket_bind(query->sock, &bind_any); + result = isc_socket_bind(query->sock, &bind_any, 0); } check_result(result, "isc_socket_bind"); bringup_timer(query, TCP_TIMEOUT); @@ -2271,11 +2272,12 @@ sockcount++; debug("sockcount=%d", sockcount); if (specified_source) { - result = isc_socket_bind(query->sock, &bind_address); + result = isc_socket_bind(query->sock, &bind_address, + ISC_SOCKET_REUSEADDRESS); } else { isc_sockaddr_anyofpf(&bind_any, isc_sockaddr_pf(&query->sockaddr)); - result = isc_socket_bind(query->sock, &bind_any); + result = isc_socket_bind(query->sock, &bind_any, 0); } check_result(result, "isc_socket_bind"); ==== //depot/projects/mips2/src/contrib/bind9/bin/named/client.c#7 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: client.c,v 1.219.18.28.10.1 2008/05/22 21:28:04 each Exp $ */ +/* $Id: client.c,v 1.219.18.28.10.2 2008/07/23 07:28:54 tbox Exp $ */ #include ==== //depot/projects/mips2/src/contrib/bind9/bin/named/config.c#5 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2001-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: config.c,v 1.47.18.32 2007/09/13 05:04:01 each Exp $ */ +/* $Id: config.c,v 1.47.18.32.10.3 2008/07/23 23:48:17 tbox Exp $ */ /*! \file */ @@ -52,7 +52,7 @@ #ifndef WIN32 " coresize default;\n\ datasize default;\n\ - files default;\n\ + files unlimited;\n\ stacksize default;\n" #endif " deallocate-on-exit true;\n\ @@ -99,6 +99,7 @@ use-ixfr true;\n\ edns-udp-size 4096;\n\ max-udp-size 4096;\n\ + reserved-sockets 512;\n\ \n\ /* view */\n\ allow-notify {none;};\n\ ==== //depot/projects/mips2/src/contrib/bind9/bin/named/controlconf.c#4 (text+ko) ==== @@ -1,8 +1,8 @@ /* - * Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2006, 2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2001-2003 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: controlconf.c,v 1.40.18.10 2006/12/07 04:53:02 marka Exp $ */ +/* $Id: controlconf.c,v 1.40.18.10.40.3 2008/07/23 23:16:43 marka Exp $ */ /*! \file */ @@ -1151,8 +1151,8 @@ type, &listener->sock); if (result == ISC_R_SUCCESS) - result = isc_socket_bind(listener->sock, - &listener->address); + result = isc_socket_bind(listener->sock, &listener->address, + ISC_SOCKET_REUSEADDRESS); if (result == ISC_R_SUCCESS && type == isc_sockettype_unix) { listener->perm = cfg_obj_asuint32(cfg_tuple_get(control, ==== //depot/projects/mips2/src/contrib/bind9/bin/named/interfacemgr.c#4 (text+ko) ==== @@ -1,8 +1,8 @@ /* - * Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2006, 2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2002 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: interfacemgr.c,v 1.76.18.8 2006/07/20 01:10:30 marka Exp $ */ +/* $Id: interfacemgr.c,v 1.76.18.8.44.3 2008/07/23 23:16:43 marka Exp $ */ /*! \file */ @@ -307,7 +307,8 @@ #ifndef ISC_ALLOW_MAPPED isc_socket_ipv6only(ifp->tcpsocket, ISC_TRUE); #endif - result = isc_socket_bind(ifp->tcpsocket, &ifp->addr); + result = isc_socket_bind(ifp->tcpsocket, &ifp->addr, + ISC_SOCKET_REUSEADDRESS); if (result != ISC_R_SUCCESS) { isc_log_write(IFMGR_COMMON_LOGARGS, ISC_LOG_ERROR, "binding TCP socket: %s", ==== //depot/projects/mips2/src/contrib/bind9/bin/named/lwresd.c#4 (text+ko) ==== @@ -1,8 +1,8 @@ /* - * Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2006, 2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000-2003 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: lwresd.c,v 1.46.18.7 2006/03/02 00:37:21 marka Exp $ */ +/* $Id: lwresd.c,v 1.46.18.7.52.3 2008/07/23 23:16:43 marka Exp $ */ /*! \file * \brief @@ -576,7 +576,8 @@ return (result); } - result = isc_socket_bind(sock, &listener->address); + result = isc_socket_bind(sock, &listener->address, + ISC_SOCKET_REUSEADDRESS); if (result != ISC_R_SUCCESS) { char socktext[ISC_SOCKADDR_FORMATSIZE]; isc_sockaddr_format(&listener->address, socktext, ==== //depot/projects/mips2/src/contrib/bind9/bin/named/named.conf.docbook#5 (text+ko) ==== @@ -2,7 +2,7 @@ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" []> - + Aug 13, 2004 @@ -40,6 +40,7 @@ 2005 2006 2007 + 2008 Internet Systems Consortium, Inc. ("ISC") @@ -201,6 +202,7 @@ port integer; querylog boolean; recursing-file quoted_string; + reserved-sockets integer; random-device quoted_string; recursive-clients integer; serial-query-rate integer; ==== //depot/projects/mips2/src/contrib/bind9/bin/named/server.c#7 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: server.c,v 1.419.18.57.10.1 2008/05/22 21:28:04 each Exp $ */ +/* $Id: server.c,v 1.419.18.57.10.3 2008/07/23 12:04:32 marka Exp $ */ /*! \file */ @@ -2696,27 +2696,29 @@ load_configuration(const char *filename, ns_server_t *server, isc_boolean_t first_time) { - isc_result_t result; - isc_interval_t interval; + cfg_aclconfctx_t aclconfctx; + cfg_obj_t *config; cfg_parser_t *parser = NULL; - cfg_obj_t *config; + const cfg_listelt_t *element; + const cfg_obj_t *builtin_views; + const cfg_obj_t *maps[3]; + const cfg_obj_t *obj; const cfg_obj_t *options; + const cfg_obj_t *v4ports, *v6ports; const cfg_obj_t *views; - const cfg_obj_t *obj; - const cfg_obj_t *v4ports, *v6ports; - const cfg_obj_t *maps[3]; - const cfg_obj_t *builtin_views; - const cfg_listelt_t *element; dns_view_t *view = NULL; dns_view_t *view_next; + dns_viewlist_t tmpviewlist; dns_viewlist_t viewlist; - dns_viewlist_t tmpviewlist; - cfg_aclconfctx_t aclconfctx; + in_port_t listen_port; + int i; + isc_interval_t interval; + isc_resourcevalue_t files; + isc_result_t result; + isc_uint32_t heartbeat_interval; isc_uint32_t interface_interval; - isc_uint32_t heartbeat_interval; + isc_uint32_t reserved; isc_uint32_t udpsize; - in_port_t listen_port; - int i; cfg_aclconfctx_init(&aclconfctx); ISC_LIST_INIT(viewlist); @@ -2797,6 +2799,43 @@ set_limits(maps); /* + * Sanity check on "files" limit. + */ + result = isc_resource_curlimit(isc_resource_openfiles, &files); + if (result == ISC_R_SUCCESS && files < FD_SETSIZE) { + isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, + NS_LOGMODULE_SERVER, ISC_LOG_WARNING, + "the 'files' limit (%" ISC_PRINT_QUADFORMAT "u) " + "is less than FD_SETSIZE (%d), increase " + "'files' in named.conf or recompile with a " + "smaller FD_SETSIZE.", files, FD_SETSIZE); + if (files > FD_SETSIZE) + files = FD_SETSIZE; + } else + files = FD_SETSIZE; + + /* + * Set the number of socket reserved for TCP, stdio etc. + */ + obj = NULL; + result = ns_config_get(maps, "reserved-sockets", &obj); + INSIST(result == ISC_R_SUCCESS); + reserved = cfg_obj_asuint32(obj); + if (files < 128U) /* Prevent underflow. */ + reserved = 0; + else if (reserved > files - 128U) /* Mimimum UDP space. */ + reserved = files - 128; + if (reserved < 128U) /* Mimimum TCP/stdio space. */ + reserved = 128; + if (reserved + 128U > files) { + isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, + NS_LOGMODULE_SERVER, ISC_LOG_WARNING, + "less than 128 UDP sockets available after " + "applying 'reserved-sockets' and 'files'"); + } + isc__socketmgr_setreserved(ns_g_socketmgr, reserved); + + /* * Configure various server options. */ configure_server_quota(maps, "transfers-out", &server->xfroutquota); ==== //depot/projects/mips2/src/contrib/bind9/bin/rndc/rndc.c#4 (text+ko) ==== @@ -1,8 +1,8 @@ /* - * Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2006, 2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000-2003 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: rndc.c,v 1.96.18.17 2006/08/04 03:03:41 marka Exp $ */ +/* $Id: rndc.c,v 1.96.18.17.42.3 2008/07/23 23:16:43 marka Exp $ */ /*! \file */ @@ -400,10 +400,10 @@ DO("create socket", isc_socket_create(socketmgr, pf, type, &sock)); switch (isc_sockaddr_pf(addr)) { case AF_INET: - DO("bind socket", isc_socket_bind(sock, &local4)); + DO("bind socket", isc_socket_bind(sock, &local4, 0)); break; case AF_INET6: - DO("bind socket", isc_socket_bind(sock, &local6)); + DO("bind socket", isc_socket_bind(sock, &local6, 0)); break; default: break; ==== //depot/projects/mips2/src/contrib/bind9/configure.in#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 1998-2003 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any @@ -18,7 +18,7 @@ esyscmd([sed "s/^/# /" COPYRIGHT])dnl AC_DIVERT_POP()dnl -AC_REVISION($Revision: 1.355.18.71 $) +AC_REVISION($Revision: 1.355.18.71.8.2 $) AC_INIT(lib/dns/name.c) AC_PREREQ(2.59) @@ -1839,7 +1839,7 @@ [*-solaris2.[89]]) hack_shutup_pthreadonceinit=yes ;; - *-solaris2.10) + *-solaris2.1[0-9]) hack_shutup_pthreadonceinit=yes ;; esac ==== //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM-book.xml#7 (text+ko) ==== @@ -2,7 +2,7 @@ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" []> - + BIND 9 Administrator Reference Manual @@ -28,6 +28,7 @@ 2005 2006 2007 + 2008 Internet Systems Consortium, Inc. ("ISC") @@ -4441,6 +4442,7 @@ max-transfer-idle-in number; max-transfer-idle-out number; tcp-clients number; + reserved-sockets number; recursive-clients number; serial-query-rate number; serial-queries number; @@ -6606,6 +6608,23 @@ + reserved-sockets + + + The number of file descriptors reserved for TCP, stdio, + etc. This needs to be big enough to cover the number of + interfaces named listens on, tcp-clients as well as + to provide room for outgoing TCP queries and incoming zone + transfers. The default is 512. + The minimum value is 128 and the + maximum value is 128 less than + 'files' or FD_SETSIZE (whichever is smaller). This + option may be removed in the future. + + + + + max-cache-size ==== //depot/projects/mips2/src/contrib/bind9/lib/bind/configure.in#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2001, 2003 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any @@ -13,7 +13,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -AC_REVISION($Revision: 1.90.18.34 $) +AC_REVISION($Revision: 1.90.18.34.10.2 $) AC_INIT(resolv/herror.c) AC_PREREQ(2.13) @@ -2590,7 +2590,7 @@ *-solaris2.9) hack_shutup_in6addr_init_macros=yes ;; - *-solaris2.10) + *-solaris2.1[0-9]) hack_shutup_in6addr_init_macros=yes ;; esac ==== //depot/projects/mips2/src/contrib/bind9/lib/bind9/check.c#6 (text+ko) ==== @@ -1015,10 +1015,10 @@ isc_buffer_add(&b, strlen(zname)); tresult = dns_name_fromtext(dns_fixedname_name(&fixedname), &b, dns_rootname, ISC_TRUE, NULL); - if (tresult != ISC_R_SUCCESS) { + if (result != ISC_R_SUCCESS) { cfg_obj_log(zconfig, logctx, ISC_LOG_ERROR, "zone '%s': is not a valid name", zname); - result = ISC_R_FAILURE; + tresult = ISC_R_FAILURE; } else { char namebuf[DNS_NAME_FORMATSIZE]; ==== //depot/projects/mips2/src/contrib/bind9/lib/dns/api#6 (text+ko) ==== @@ -1,3 +1,3 @@ LIBINTERFACE = 35 -LIBREVISION = 0 +LIBREVISION = 1 LIBAGE = 0 ==== //depot/projects/mips2/src/contrib/bind9/lib/dns/dispatch.c#7 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dispatch.c,v 1.116.18.19.12.1 2008/05/22 21:28:06 each Exp $ */ +/* $Id: dispatch.c,v 1.116.18.19.12.5 2008/07/23 23:16:43 marka Exp $ */ /*! \file */ @@ -276,7 +276,26 @@ } /* - * ARC4 random number generator obtained from OpenBSD + * ARC4 random number generator derived from OpenBSD. + * Only dispatch_arc4random() and dispatch_arc4uniformrandom() are expected + * to be called from general dispatch routines; the rest of them are subroutines + * for these two. + * + * The original copyright follows: + * Copyright (c) 1996, David Mazieres + * Copyright (c) 2008, Damien Miller + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ static void dispatch_arc4init(arc4ctx_t *actx) { @@ -1172,7 +1191,7 @@ static isc_result_t create_socket(isc_socketmgr_t *mgr, isc_sockaddr_t *local, - isc_socket_t **sockp) + unsigned int options, isc_socket_t **sockp) { isc_socket_t *sock; isc_result_t result; @@ -1186,7 +1205,7 @@ #ifndef ISC_ALLOW_MAPPED isc_socket_ipv6only(sock, ISC_TRUE); #endif - result = isc_socket_bind(sock, local); + result = isc_socket_bind(sock, local, options); if (result != ISC_R_SUCCESS) { isc_socket_detach(&sock); return (result); @@ -1917,7 +1936,7 @@ attributes &= ~DNS_DISPATCHATTR_RANDOMPORT; goto getsocket; } - result = create_socket(sockmgr, &localaddr_bound, &sock); + result = create_socket(sockmgr, &localaddr_bound, 0, &sock); if (result == ISC_R_ADDRINUSE) { if (++k == 1024) attributes &= ~DNS_DISPATCHATTR_RANDOMPORT; @@ -1925,7 +1944,8 @@ } localport = prt; } else - result = create_socket(sockmgr, localaddr, &sock); + result = create_socket(sockmgr, localaddr, + ISC_SOCKET_REUSEADDRESS, &sock); if (result != ISC_R_SUCCESS) goto deallocate_dispatch; if ((attributes & DNS_DISPATCHATTR_RANDOMPORT) == 0 && ==== //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/dispatch.h#6 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dispatch.h,v 1.48.18.5.12.1 2008/05/22 21:28:06 each Exp $ */ +/* $Id: dispatch.h,v 1.48.18.5.12.2 2008/07/23 07:28:56 tbox Exp $ */ #ifndef DNS_DISPATCH_H #define DNS_DISPATCH_H 1 ==== //depot/projects/mips2/src/contrib/bind9/lib/dns/request.c#4 (text+ko) ==== @@ -1,8 +1,8 @@ /* - * Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2006, 2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000-2002 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: request.c,v 1.72.18.5 2006/08/21 00:40:53 marka Exp $ */ +/* $Id: request.c,v 1.72.18.5.42.2 2008/07/23 07:28:56 tbox Exp $ */ /*! \file */ @@ -518,11 +518,11 @@ if (srcaddr == NULL) { isc_sockaddr_anyofpf(&bind_any, isc_sockaddr_pf(destaddr)); - result = isc_socket_bind(socket, &bind_any); + result = isc_socket_bind(socket, &bind_any, 0); } else { src = *srcaddr; isc_sockaddr_setport(&src, 0); - result = isc_socket_bind(socket, &src); + result = isc_socket_bind(socket, &src, 0); } if (result != ISC_R_SUCCESS) goto cleanup; ==== //depot/projects/mips2/src/contrib/bind9/lib/dns/resolver.c#6 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: resolver.c,v 1.284.18.66.8.1 2008/05/22 21:28:06 each Exp $ */ +/* $Id: resolver.c,v 1.284.18.66.8.4 2008/07/24 05:00:48 jinmei Exp $ */ /*! \file */ @@ -1123,7 +1123,7 @@ goto cleanup_query; #ifndef BROKEN_TCP_BIND_BEFORE_CONNECT - result = isc_socket_bind(query->tcpsocket, &addr); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Sep 3 00:48:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6D74910659B8; Wed, 3 Sep 2008 00:48: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 2735510659AF for ; Wed, 3 Sep 2008 00:48:25 +0000 (UTC) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 15AA48FC15 for ; Wed, 3 Sep 2008 00:48:25 +0000 (UTC) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m830mPVk017651 for ; Wed, 3 Sep 2008 00:48:25 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m830lm8a017603 for perforce@freebsd.org; Wed, 3 Sep 2008 00:47:48 GMT (envelope-from wsalamon@computer.org) Date: Wed, 3 Sep 2008 00:47:48 GMT Message-Id: <200809030047.m830lm8a017603@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 149097 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Sep 2008 00:48:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=149097 Change 149097 by wsalamon@vh2 on 2008/09/03 00:47:43 Integrate Audit->MAC development branch from parent. Affected files ... .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/bpf_jit_machdep.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/bpf_jit_machdep.h#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/cpu_switch.S#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/local_apic.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/machdep.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/conf/GENERIC#7 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/ia32/ia32_signal.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/pci_cfgreg.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/pcpu.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/pci/pci_cfgreg.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/at91.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/at91_pio.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/at91_piovar.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/at91_pmc.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/if_ate.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/endian.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/pcpu.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/forth/loader.conf#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/sparc64/loader/main.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/bsm/audit_kevents.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/scsi/scsi_da.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/cpuvar.h#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/freebsd32/freebsd32_proto.h#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/freebsd32/freebsd32_syscall.h#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/freebsd32/freebsd32_syscalls.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/freebsd32/freebsd32_sysent.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/freebsd32/syscalls.master#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linprocfs/linprocfs.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_getcwd.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_ioctl.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_misc.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_stats.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/ndis/subr_ndis.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/svr4/svr4_fcntl.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/svr4/svr4_sockio.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/conf/NOTES#8 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/conf/files#10 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/conf/files.i386#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/conf/files.mips#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/conf/files.powerpc#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/conf/files.sparc64#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/conf/options#8 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/conf/options.sparc64#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/altq/altq/altq_subr.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/COPYRIGHT#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/README#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/ah.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/ah_desc.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/ah_devid.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/ah_soc.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/alpha-elf.inc#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/alpha-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/ap30.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/ap30.inc#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/ap43.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/ap43.inc#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/ap51.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/ap51.inc#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/ap61.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/ap61.inc#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/armv4-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/armv4-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/i386-elf.inc#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/mips-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/mips-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/mips1-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/mips1-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/powerpc-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/sh4-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/sparc-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/sparc-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/sparc64-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/wackelf.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/x86_64-elf.inc#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/xscale-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/xscale-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/version.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/acpi_support/acpi_asus.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/acpica/acpi.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/agp/agp.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/bce/if_bce.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/bce/if_bcereg.h#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/bfe/if_bfe.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/bfe/if_bfereg.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/bm/if_bm.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ciss/ciss.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ciss/cissreg.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cpuctl/cpuctl.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/cxgb_ioctl.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/cxgb_main.c#7 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/cxgb_sge.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/toecore/toedev.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/dc/if_dc.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/dc/if_dcreg.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/dcons/dcons.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/dcons/dcons_os.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/ati_pcigart.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/drm-subprocess.pl#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/drm.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/drmP.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/drm_agpsupport.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/drm_auth.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/drm_bufs.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/drm_context.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/drm_dma.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/drm_drawable.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/drm_drv.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/drm_fops.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/drm_internal.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/drm_ioctl.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/drm_irq.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/drm_lock.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/drm_memory.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/drm_pci.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/drm_pciids.h#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/drm_sarea.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/drm_scatter.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/drm_sysctl.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/drm_vm.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/i915_dma.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/i915_drm.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/i915_drv.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/i915_drv.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/i915_irq.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/i915_mem.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/i915_suspend.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/mach64_dma.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/mach64_drm.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/mach64_drv.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/mach64_drv.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/mach64_irq.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/mach64_state.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/mga_dma.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/mga_drm.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/mga_drv.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/mga_drv.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/mga_irq.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/mga_state.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/mga_warp.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/r128_cce.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/r128_drm.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/r128_drv.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/r128_drv.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/r128_irq.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/r128_state.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/r300_cmdbuf.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/r300_reg.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/radeon_cp.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/radeon_drm.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/radeon_drv.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/radeon_drv.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/radeon_irq.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/radeon_mem.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/radeon_microcode.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/radeon_state.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/savage_bci.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/savage_drm.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/savage_drv.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/savage_drv.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/savage_state.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/sis_drv.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/sis_drv.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/sis_mm.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/tdfx_drv.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/e1000/if_igb.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/e1000/if_igb.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ex/if_ex.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ex/if_ex_isa.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ex/if_ex_pccard.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ex/if_exvar.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/gem/if_gem.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ic/ns16550.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ichwd/ichwd.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ichwd/ichwd.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/iicbus/iiconf.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ipmi/ipmi.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ipmi/ipmi_kcs.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ipmi/ipmivars.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/lmc/if_lmc.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/md/md.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mfi/mfi.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mii/mii.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mii/mlphy.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mii/tlphy.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mxge/if_mxge_var.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/nmdm/nmdm.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ofw/ofw_console.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/pccard/pccard_cis.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/pccard/pccard_cis_quirks.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/pccard/pccarddevs#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/pci/pci.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/pci/pci_pci.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/pci/pcireg.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ppbus/if_plip.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ppbus/ppbconf.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ppc/ppc.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ppc/ppc_acpi.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ppc/ppc_isa.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ppc/ppcreg.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/puc/pucdata.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/sis/if_sis.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/sound/midi/sequencer.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/sound/pci/csa.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/sound/pcm/sound.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/sound/usb/uaudio.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/syscons/schistory.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/syscons/scmouse.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/syscons/scterm-sc.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/syscons/scvesactl.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/syscons/scvidctl.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/syscons/syscons.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/syscons/syscons.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/syscons/sysmouse.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/tsec/if_tsec.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/tsec/if_tsec.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/tsec/if_tsec_ocp.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/uart/uart.h#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/uart/uart_bus_isa.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/uart/uart_core.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/uart/uart_cpu_pc98.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/uart/uart_tty.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/ehci_pci.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/ohci_pci.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/ubsa.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/ucom.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/ucomvar.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/ufoma.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/uftdi.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/uhci_pci.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/uipaq.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/umass.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/umodem.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/uplcom.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/usbdevs#8 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/uvisor.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/uvscom.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/vx/if_vx_eisa.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/wi/if_wi_pccard.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/wpi/if_wpi.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/xen/blkback/blkback.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/xen/blkfront/blkfront.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/xen/console/console.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/xen/netfront/netfront.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/cd9660/cd9660_vnops.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/coda/coda_venus.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/coda/coda_venus.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/coda/coda_vnops.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/devfs/devfs_vnops.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/fdescfs/fdesc_vnops.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/hpfs/hpfs_vnops.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/msdosfs/msdosfs_fat.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/msdosfs/msdosfs_vnops.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/nwfs/nwfs_io.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/nwfs/nwfs_vnops.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/portalfs/portal_vnops.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/smbfs/smbfs_io.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/smbfs/smbfs_node.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/smbfs/smbfs_vnops.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/tmpfs/tmpfs_vfsops.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/tmpfs/tmpfs_vnops.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/unionfs/union_subr.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/unionfs/union_vfsops.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/unionfs/union_vnops.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/geom/journal/g_journal.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/gnu/fs/ext2fs/ext2_vnops.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/conf/GENERIC#7 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/conf/NOTES#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/conf/XBOX#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/conf/XEN#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/cpufreq/est.c#7 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/cpufreq/powernow.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/cpufreq/smist.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/bpf_jit_machdep.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/bpf_jit_machdep.h#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/local_apic.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/machdep.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/vm_machdep.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/ibcs2/ibcs2_ioctl.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/ibcs2/imgact_coff.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/include/cpufunc.h#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/include/pci_cfgreg.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/include/pcpu.h#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/isa/dpms.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/pci/pci_cfgreg.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/xen/pmap.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/xen/xen_machdep.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/ia64/conf/GENERIC#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/ia64/conf/SKI#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/ia64/ia64/ssc.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/ia64/include/pcpu.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/isa/isa_common.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/isa/isavar.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/imgact_shell.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/init_main.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/init_sysent.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_acct.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_conf.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_descrip.c#7 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_exec.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_exit.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_intr.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_linker.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_lock.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_mib.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_proc.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_resource.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_sig.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_subr.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_synch.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_thread.c#7 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/subr_prf.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/subr_rman.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/subr_smp.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/subr_witness.c#8 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/syscalls.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/syscalls.master#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/systrace_args.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/tty.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/tty_compat.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/tty_conf.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/tty_cons.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/tty_info.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/tty_inq.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/tty_outq.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/tty_pts.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/tty_pty.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/tty_ttydisc.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/uipc_mqueue.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/uipc_socket.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/vfs_cache.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/vfs_default.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/vfs_lookup.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/vfs_mount.c#7 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/vfs_subr.c#8 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/vfs_syscalls.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/vfs_vnops.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/vnode_if.src#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/pcpu.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/mp_machdep.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/Makefile#8 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/aha/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ahb/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/an/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ar/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ath_rate_amrr/Makefile#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ath_rate_onoe/Makefile#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ath_rate_sample/Makefile#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ce/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/cp/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ctau/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/cx/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/digi/digi/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/dpms/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/drm/i915/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/fatm/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/hatm/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/hifn/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/if_tap/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/linux/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/netgraph/sync_ar/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/netgraph/sync_sr/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/nmdm/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/patm/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/pf/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/pflog/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/rc/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/rp/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/safe/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/sppp/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/sr/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/svr4/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/trm/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ubsec/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/usb/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/wi/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/wlan/Makefile#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/wlan_acl/Makefile#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/wlan_amrr/Makefile#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/wlan_ccmp/Makefile#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/wlan_rssadapt/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/wlan_tkip/Makefile#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/wlan_wep/Makefile#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/wlan_xauth/Makefile#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/bpf.c#7 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/bpf.h#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/bpf_filter.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/bpf_jitter.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/bpf_jitter.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/ethernet.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/if.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/if.h#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_ethersubr.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_spppsubr.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_var.h#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_vlan.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/route.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_crypto_tkip.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_ddb.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_base.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_bpf.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/if_ether.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/ip_fw2.c#7 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/ip_input.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/ip_mroute.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/ip_options.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/ip_output.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/ip_var.h#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/libalias/alias_db.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/raw_ip.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/sctp_indata.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/sctp_lock_bsd.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/sctp_output.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/sctp_pcb.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/sctp_sysctl.h#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/sctp_timer.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/sctp_timer.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/sctp_var.h#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/sctputil.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/tcp_hostcache.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/tcp_input.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/tcp_lro.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/tcp_offload.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/tcp_subr.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/tcp_syncache.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/tcp_syncache.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/toedev.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/udp_usrreq.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet6/in6.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet6/in6_gif.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet6/in6_ifattach.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet6/in6_pcb.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet6/nd6.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet6/nd6_nbr.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet6/nd6_rtr.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet6/udp6_usrreq.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/nfs4client/nfs4_vnops.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/nfsclient/nfs_bio.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/nfsclient/nfs_vfsops.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/nfsclient/nfs_vnops.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/nfsserver/nfs_serv.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/nfsserver/nfs_srvsubs.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/nlm/nlm_prot_impl.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/nlm/nlm_prot_server.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/pc98/cbus/scterm-sck.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/pc98/conf/GENERIC#7 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/pc98/conf/GENERIC.hints#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/pc98/conf/NOTES#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/aim/clock.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/aim/interrupt.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/aim/machdep.c#7 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/aim/mmu_oea.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/aim/vm_machdep.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/booke/locore.S#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/booke/machdep.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/booke/pmap.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/conf/GENERIC#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/include/cpufunc.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/include/pcpu.h#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/powerpc/db_interface.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/powerpc/pmap_dispatch.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/rpc/pmap_prot.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/rpc/rpcb_prot.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/security/audit/audit_arg.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/security/audit/audit_bsm.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/security/audit/audit_bsm_klib.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/security/audit/audit_syscalls.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/security/audit/audit_worker.c#7 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac/mac_framework.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac/mac_framework.h#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac/mac_inet.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac/mac_internal.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac/mac_net.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac/mac_pipe.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac/mac_policy.h#8 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac/mac_posix_sem.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac/mac_posix_shm.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac/mac_process.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac/mac_socket.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac/mac_syscalls.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac/mac_sysv_msg.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac/mac_sysv_sem.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac/mac_sysv_shm.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac/mac_vfs.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac_biba/mac_biba.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac_bsdextended/mac_bsdextended.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac_ifoff/mac_ifoff.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac_lomac/mac_lomac.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac_mls/mac_mls.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac_none/mac_none.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac_partition/mac_partition.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac_portacl/mac_portacl.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac_stub/mac_stub.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac_test/mac_test.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/central/central.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/conf/GENERIC#7 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/conf/NOTES#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/ebus/ebus.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/fhc/fhc.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/include/cache.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/include/cpufunc.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/include/pcpu.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/pci/ofw_pci.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/pci/ofw_pcibus.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/pci/psycho.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/sbus/dma_sbus.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/sbus/sbus.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/sparc64/autoconf.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/sparc64/cache.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/sparc64/cheetah.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/sparc64/exception.S#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/sparc64/genassym.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/sparc64/locore.S#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/sparc64/machdep.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/sparc64/mp_exception.S#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/sparc64/mp_machdep.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/sparc64/spitfire.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/sparc64/stack_machdep.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/sparc64/trap.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sun4v/conf/GENERIC#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sun4v/include/pcpu.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sun4v/sun4v/clock.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/sun4v/sun4v/hvcons.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sys/conf.h#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sys/copyright.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sys/file.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sys/ioccom.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sys/kernel.h#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sys/linedisc.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/sys/mount.h#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sys/param.h#7 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sys/pcpu.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sys/proc.h#8 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sys/resource.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sys/resourcevar.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sys/syscall.h#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sys/syscall.mk#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sys/sysctl.h#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sys/sysproto.h#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sys/termios.h#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sys/tty.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sys/ttycom.h#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sys/ttydefaults.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sys/ttydevsw.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/sys/ttydisc.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/sys/ttyqueue.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/sys/types.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sys/user.h#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sys/vimage.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sys/vnode.h#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sys/wait.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/ufs/ffs/ffs_alloc.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/ufs/ffs/ffs_extern.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/ufs/ffs/ffs_snapshot.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/ufs/ffs/ffs_softdep.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/ufs/ffs/ffs_vfsops.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/ufs/ufs/ufs_vfsops.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/ufs/ufs/ufs_vnops.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/vm/swap_pager.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/vm/uma_core.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/vm/vm_meter.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/vm/vm_mmap.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/vm/vnode_pager.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/xen/xenbus/xenbus_client.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/xen/xenbus/xenbus_comms.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/xen/xenbus/xenbus_comms.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/xen/xenbus/xenbus_dev.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/xen/xenbus/xenbus_probe.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/xen/xenbus/xenbus_probe_backend.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/xen/xenbus/xenbus_xs.c#2 integrate Differences ... ==== //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/bpf_jit_machdep.c#4 (text+ko) ==== @@ -23,14 +23,14 @@ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS intERRUPTION) HOWEVER CAUSED AND ON ANY + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.12 2008/08/18 19:14:26 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.14 2008/08/26 21:06:31 jkim Exp $"); #ifdef _KERNEL #include "opt_bpf.h" @@ -107,10 +107,6 @@ */ emit_func emitm; - /* Do not compile an empty filter. */ - if (nins == 0) - return (NULL); - /* Allocate the reference table for the jumps */ #ifdef _KERNEL stream.refs = (u_int *)malloc((nins + 1) * sizeof(u_int), ==== //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/bpf_jit_machdep.h#4 (text+ko) ==== @@ -23,12 +23,12 @@ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS intERRUPTION) HOWEVER CAUSED AND ON ANY + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.h,v 1.9 2008/08/18 19:14:26 jkim Exp $ + * $FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.h,v 1.10 2008/08/25 20:43:13 jkim Exp $ */ #ifndef _BPF_JIT_MACHDEP_H_ ==== //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/cpu_switch.S#4 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.162 2008/07/30 11:30:55 kib Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.163 2008/09/02 17:52:11 kib Exp $ */ #include @@ -109,8 +109,24 @@ movq %rsp,PCB_RSP(%r8) movq %rbx,PCB_RBX(%r8) movq %rax,PCB_RIP(%r8) - movq PCB_FSBASE(%r8),%r9 - movq PCB_GSBASE(%r8),%r10 + + /* + * Reread fs and gs bases. Explicit fs segment register load + * by the usermode code may change actual fs base without + * updating pcb_{fs,gs}base. + * + * %rdx still contains the mtx, save %rdx around rdmsr. + */ + movq %rdx,%r11 + movl $MSR_FSBASE,%ecx + rdmsr + shlq $32,%rdx + leaq (%rax,%rdx),%r9 + movl $MSR_KGSBASE,%ecx + rdmsr + shlq $32,%rdx + leaq (%rax,%rdx),%r10 + movq %r11,%rdx testl $PCB_32BIT,PCB_FLAGS(%r8) jnz store_seg ==== //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/local_apic.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.45 2008/05/24 06:32:26 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.46 2008/08/23 12:35:43 jhb Exp $"); #include "opt_hwpmc_hooks.h" #include "opt_kdtrace.h" @@ -77,10 +77,6 @@ CTASSERT(APIC_LOCAL_INTS == 240); CTASSERT(IPI_STOP < APIC_SPURIOUS_INT); -#define LAPIC_TIMER_HZ_DIVIDER 2 -#define LAPIC_TIMER_STATHZ_DIVIDER 15 -#define LAPIC_TIMER_PROFHZ_DIVIDER 3 - /* Magic IRQ values for the timer and syscalls. */ #define IRQ_TIMER (NUM_IO_INTS + 1) #define IRQ_SYSCALL (NUM_IO_INTS + 2) @@ -389,13 +385,24 @@ lapic_timer_divisor, value); /* - * We will drive the timer at a small multiple of hz and drive - * both of the other timers with similarly small but relatively - * prime divisors. + * We want to run stathz in the neighborhood of 128hz. We would + * like profhz to run as often as possible, so we let it run on + * each clock tick. We try to honor the requested 'hz' value as + * much as possible. + * + * If 'hz' is above 1500, then we just let the lapic timer + * (and profhz) run at hz. If 'hz' is below 1500 but above + * 750, then we let the lapic timer run at 2 * 'hz'. If 'hz' + * is below 750 then we let the lapic timer run at 4 * 'hz'. */ - lapic_timer_hz = hz * LAPIC_TIMER_HZ_DIVIDER; - stathz = lapic_timer_hz / LAPIC_TIMER_STATHZ_DIVIDER; - profhz = lapic_timer_hz / LAPIC_TIMER_PROFHZ_DIVIDER; + if (hz >= 1500) + lapic_timer_hz = hz; + else if (hz >= 750) + lapic_timer_hz = hz * 2; + else + lapic_timer_hz = hz * 4; + stathz = lapic_timer_hz / (lapic_timer_hz / 128); + profhz = lapic_timer_hz; lapic_timer_period = value / lapic_timer_hz; /* ==== //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/machdep.c#6 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.687 2008/07/09 19:44:37 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.688 2008/09/02 17:52:11 kib Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -734,6 +734,7 @@ pcb->pcb_fsbase = 0; pcb->pcb_gsbase = 0; critical_exit(); + pcb->pcb_flags &= ~(PCB_32BIT | PCB_GS32BIT); load_ds(_udatasel); load_es(_udatasel); load_fs(_udatasel); ==== //depot/projects/trustedbsd/audit_mac/src/sys/amd64/conf/GENERIC#7 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.506 2008/08/03 10:32:17 ed Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.507 2008/08/20 08:31:58 ed Exp $ cpu HAMMER ident GENERIC @@ -257,7 +257,7 @@ device random # Entropy device device ether # Ethernet support device tun # Packet tunnel. -device pty # Pseudo-ttys (telnet etc) +device pty # BSD-style compatibility pseudo ttys device md # Memory "disks" device gif # IPv6 and IPv4 tunneling device faith # IPv6-to-IPv4 relaying (translation) ==== //depot/projects/trustedbsd/audit_mac/src/sys/amd64/ia32/ia32_signal.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.18 2008/07/30 11:30:55 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.19 2008/09/02 17:52:11 kib Exp $"); #include "opt_compat.h" @@ -742,5 +742,6 @@ /* Return via doreti so that we can change to a different %cs */ pcb->pcb_flags |= PCB_FULLCTX | PCB_32BIT; + pcb->pcb_flags &= ~PCB_GS32BIT; td->td_retval[1] = 0; } ==== //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/pci_cfgreg.h#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/sys/amd64/include/pci_cfgreg.h,v 1.14 2007/11/28 22:20:07 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/pci_cfgreg.h,v 1.15 2008/08/22 02:14:23 jhb Exp $ * */ @@ -37,6 +37,7 @@ #define CONF1_ENABLE_MSK1 0x80000001ul #define CONF1_ENABLE_RES1 0x80000000ul +int pcie_cfgregopen(uint64_t base, uint8_t minbus, uint8_t maxbus); int pci_cfgregopen(void); u_int32_t pci_cfgregread(int bus, int slot, int func, int reg, int bytes); void pci_cfgregwrite(int bus, int slot, int func, int reg, u_int32_t data, int bytes); ==== //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/pcpu.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/amd64/include/pcpu.h,v 1.49 2008/04/25 05:18:48 jeff Exp $ + * $FreeBSD: src/sys/amd64/include/pcpu.h,v 1.50 2008/08/19 19:53:52 jhb Exp $ */ #ifndef _MACHINE_PCPU_H_ @@ -33,8 +33,6 @@ #error "sys/cdefs.h is a prerequisite for this file" #endif -#ifdef _KERNEL - /* * The SMP parts are setup in pmap.c and locore.s for the BSP, and * mp_machdep.c sets up the data for the AP's to "see" when they awake. @@ -52,6 +50,8 @@ u_int pc_apic_id; \ u_int pc_acpi_id /* ACPI CPU id */ +#ifdef _KERNEL + #ifdef lint extern struct pcpu *pcpup; ==== //depot/projects/trustedbsd/audit_mac/src/sys/amd64/pci/pci_cfgreg.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_cfgreg.c,v 1.110 2007/11/28 22:20:08 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_cfgreg.c,v 1.111 2008/08/22 02:14:23 jhb Exp $"); #include #include @@ -36,11 +36,26 @@ #include #include #include +#include +#include #include +enum { + CFGMECH_NONE = 0, + CFGMECH_1, + CFGMECH_PCIE, +}; + +static int pciereg_cfgread(int bus, unsigned slot, unsigned func, + unsigned reg, unsigned bytes); +static void pciereg_cfgwrite(int bus, unsigned slot, unsigned func, + unsigned reg, int data, unsigned bytes); static int pcireg_cfgread(int bus, int slot, int func, int reg, int bytes); static void pcireg_cfgwrite(int bus, int slot, int func, int reg, int data, int bytes); +static int cfgmech; +static vm_offset_t pcie_base; +static int pcie_minbus, pcie_maxbus; static struct mtx pcicfg_mtx; /* @@ -49,12 +64,42 @@ int pci_cfgregopen(void) { - static int opened = 0; + uint64_t pciebar; + uint16_t did, vid; - if (opened) + if (cfgmech != CFGMECH_NONE) return (1); mtx_init(&pcicfg_mtx, "pcicfg", NULL, MTX_SPIN); - opened = 1; + cfgmech = CFGMECH_1; + + /* + * Grope around in the PCI config space to see if this is a + * chipset that is capable of doing memory-mapped config cycles. + * This also implies that it can do PCIe extended config cycles. + */ + + /* Check for supported chipsets */ + vid = pci_cfgregread(0, 0, 0, PCIR_VENDOR, 2); + did = pci_cfgregread(0, 0, 0, PCIR_DEVICE, 2); + switch (vid) { + case 0x8086: + switch (did) { + case 0x3590: + case 0x3592: + /* Intel 7520 or 7320 */ + pciebar = pci_cfgregread(0, 0, 0, 0xce, 2) << 16; + pcie_cfgregopen(pciebar, 0, 255); + break; + case 0x2580: + case 0x2584: + case 0x2590: + /* Intel 915, 925, or 915GM */ + pciebar = pci_cfgregread(0, 0, 0, 0x48, 4); + pcie_cfgregopen(pciebar, 0, 255); + break; + } + } + return (1); } @@ -130,6 +175,11 @@ int data = -1; int port; + if (cfgmech == CFGMECH_PCIE) { + data = pciereg_cfgread(bus, slot, func, reg, bytes); + return (data); + } + mtx_lock_spin(&pcicfg_mtx); port = pci_cfgenable(bus, slot, func, reg, bytes); if (port != 0) { @@ -155,6 +205,11 @@ { int port; + if (cfgmech == CFGMECH_PCIE) { + pciereg_cfgwrite(bus, slot, func, reg, data, bytes); + return; + } + mtx_lock_spin(&pcicfg_mtx); port = pci_cfgenable(bus, slot, func, reg, bytes); if (port != 0) { @@ -173,3 +228,82 @@ } mtx_unlock_spin(&pcicfg_mtx); } + +int >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Sep 3 10:56:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7842F1065676; Wed, 3 Sep 2008 10:56: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 087E01065670 for ; Wed, 3 Sep 2008 10:56:51 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E7DDE8FC0A for ; Wed, 3 Sep 2008 10:56:50 +0000 (UTC) (envelope-from rpaulo@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 m83Auooc001967 for ; Wed, 3 Sep 2008 10:56:50 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m83AuoF7001965 for perforce@freebsd.org; Wed, 3 Sep 2008 10:56:50 GMT (envelope-from rpaulo@FreeBSD.org) Date: Wed, 3 Sep 2008 10:56:50 GMT Message-Id: <200809031056.m83AuoF7001965@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 149108 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Sep 2008 10:56:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=149108 Change 149108 by rpaulo@rpaulo_phi on 2008/09/03 10:56:25 Implement the reboot command. Affected files ... .. //depot/projects/efi/boot/i386/efi/main.c#2 edit Differences ... ==== //depot/projects/efi/boot/i386/efi/main.c#2 (text+ko) ==== @@ -115,6 +115,22 @@ return (EFI_SUCCESS); /* keep compiler happy */ } +COMMAND_SET(reboot, "reboot", "reboot the system", command_reboot); + +static int +command_reboot(int argc, char *argv[]) +{ + int i; + + for (i = 0; devsw[i] != NULL; ++i) + if (devsw[i]->dv_cleanup != NULL) + (devsw[i]->dv_cleanup)(); + + RS->ResetSystem(EfiResetCold, EFI_SUCCESS, 23, + (CHAR16 *)"Reboot from the loader"); + exit(0); +} + COMMAND_SET(quit, "quit", "exit the loader", command_quit); static int From owner-p4-projects@FreeBSD.ORG Wed Sep 3 13:30:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4B3C51065673; Wed, 3 Sep 2008 13:30: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 0F51B1065670 for ; Wed, 3 Sep 2008 13:30:27 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id ED7868FC1C for ; Wed, 3 Sep 2008 13:30:26 +0000 (UTC) (envelope-from rpaulo@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 m83DUQFN032148 for ; Wed, 3 Sep 2008 13:30:26 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m83DUQwV032146 for perforce@freebsd.org; Wed, 3 Sep 2008 13:30:26 GMT (envelope-from rpaulo@FreeBSD.org) Date: Wed, 3 Sep 2008 13:30:26 GMT Message-Id: <200809031330.m83DUQwV032146@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 149113 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Sep 2008 13:30:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=149113 Change 149113 by rpaulo@rpaulo_phi on 2008/09/03 13:30:20 Add the 'col' command with the same purpose as the EFI shell command with the same name: change the text mode resolution. This allows the boot loader to switch to the native LCD resolution if the system supports it. (I can change the screen resolution to 1280x800 on my MacBook). While there, add my copyright. Keep the loader version in sync with loader MBR because loader.4th on i386 fails if the version is < 1.1. Affected files ... .. //depot/projects/efi/boot/i386/efi/main.c#3 edit .. //depot/projects/efi/boot/i386/efi/version#2 edit Differences ... ==== //depot/projects/efi/boot/i386/efi/main.c#3 (text+ko) ==== @@ -1,4 +1,5 @@ /*- + * Copyright (c) 2008 Rui Paulo * Copyright (c) 2006 Marcel Moolenaar * All rights reserved. * @@ -255,3 +256,52 @@ return CMD_OK; } + + +COMMAND_SET(col, "col", "change or display text modes", command_col); + +static int +command_col(int argc, char *argv[]) +{ + unsigned int cols, rows, mode; + int i, status; + char *cp; + char rowenv[8]; + SIMPLE_TEXT_OUTPUT_INTERFACE *conout; + + conout = ST->ConOut; + + if (argc > 1) { + mode = strtol(argv[1], &cp, 0); + if (cp[0] != '\0') { + printf("Invalid mode\n"); + return (CMD_ERROR); + } + status = conout->QueryMode(conout, mode, &cols, &rows); + if (EFI_ERROR(status)) { + printf("invalid mode %d\n", mode); + return (CMD_ERROR); + } + status = conout->SetMode(conout, mode); + if (EFI_ERROR(status)) { + printf("couldn't set mode %d\n", mode); + return (CMD_ERROR); + } + sprintf(rowenv, "%d", rows); + setenv("LINES", rowenv, 1); + + return (CMD_OK); + } + + for (i = 0; ; i++) { + status = conout->QueryMode(conout, i, &cols, &rows); + if (EFI_ERROR(status)) + break; + printf("Mode %d: %d columns, %d rows\n", i, cols, rows); + } + + if (i != 0) + printf("Choose the mode with \"col \"\n"); + + return (CMD_OK); +} ==== //depot/projects/efi/boot/i386/efi/version#2 (text+ko) ==== @@ -3,4 +3,5 @@ NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE. The format of this file is important. Make sure the current version number is on line 6. +1.1: Keep in sync with i386 version. 0.1: Initial i386 version. Derived from ia64. From owner-p4-projects@FreeBSD.ORG Wed Sep 3 15:20:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B50511065672; Wed, 3 Sep 2008 15:20: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 70F681065670 for ; Wed, 3 Sep 2008 15:20:32 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5D2818FC1E for ; Wed, 3 Sep 2008 15:20:32 +0000 (UTC) (envelope-from trasz@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 m83FKWUO073199 for ; Wed, 3 Sep 2008 15:20:32 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m83FKWOB073195 for perforce@freebsd.org; Wed, 3 Sep 2008 15:20:32 GMT (envelope-from trasz@freebsd.org) Date: Wed, 3 Sep 2008 15:20:32 GMT Message-Id: <200809031520.m83FKWOB073195@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 149116 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Sep 2008 15:20:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=149116 Change 149116 by trasz@trasz_traszkan on 2008/09/03 15:19:37 Update manual pages. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/vaccess.9#2 edit .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/vaccess_acl_nfs4.9#2 edit .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/vaccess_acl_posix1e.9#2 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/vaccess.9#2 (text+ko) ==== @@ -40,7 +40,7 @@ .Fa "mode_t file_mode" .Fa "uid_t file_uid" .Fa "gid_t file_gid" -.Fa "mode_t acc_mode" +.Fa "vaccess_t acc_mode" .Fa "struct ucred *cred" .Fa "int *privused" .Fc ==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/vaccess_acl_nfs4.9#2 (text+ko) ==== @@ -41,7 +41,7 @@ .Fa "uid_t file_uid" .Fa "gid_t file_gid" .Fa "struct acl *acl" -.Fa "mode_t acc_mode" +.Fa "vaccess_t acc_mode" .Fa "struct ucred *cred" .Fa "int *privused" .Fc ==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/vaccess_acl_posix1e.9#2 (text+ko) ==== @@ -41,7 +41,7 @@ .Fa "uid_t file_uid" .Fa "gid_t file_gid" .Fa "struct acl *acl" -.Fa "mode_t acc_mode" +.Fa "vaccess_t acc_mode" .Fa "struct ucred *cred" .Fa "int *privused" .Fc From owner-p4-projects@FreeBSD.ORG Wed Sep 3 15:49:02 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C22FC1067B29; Wed, 3 Sep 2008 15:49: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 86A471067B21 for ; Wed, 3 Sep 2008 15:49: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 73F268FC20 for ; Wed, 3 Sep 2008 15:49: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 m83Fn1Dp001345 for ; Wed, 3 Sep 2008 15:49:01 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m83Fn1x2001343 for perforce@freebsd.org; Wed, 3 Sep 2008 15:49:01 GMT (envelope-from sam@freebsd.org) Date: Wed, 3 Sep 2008 15:49:01 GMT Message-Id: <200809031549.m83Fn1x2001343@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 149118 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Sep 2008 15:49:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=149118 Change 149118 by sam@sam_ebb on 2008/09/03 15:48:06 return the negotiated ampdu density only for sta mode; for others we use the local configuration Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#62 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#62 (text+ko) ==== @@ -995,7 +995,8 @@ ireq->i_val = vap->iv_ampdu_limit; break; case IEEE80211_IOC_AMPDU_DENSITY: - if (vap->iv_state == IEEE80211_S_RUN) + if (vap->iv_opmode == IEEE80211_M_STA && + vap->iv_state == IEEE80211_S_RUN) ireq->i_val = MS(vap->iv_bss->ni_htparam, IEEE80211_HTCAP_MPDUDENSITY); else From owner-p4-projects@FreeBSD.ORG Wed Sep 3 15:50:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 16F0E1067CCD; Wed, 3 Sep 2008 15:50: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 CB4451067CC8 for ; Wed, 3 Sep 2008 15:50:02 +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 9EFF58FC17 for ; Wed, 3 Sep 2008 15:50: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 m83Fo2ZB001519 for ; Wed, 3 Sep 2008 15:50:02 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m83Fo2HV001517 for perforce@freebsd.org; Wed, 3 Sep 2008 15:50:02 GMT (envelope-from sam@freebsd.org) Date: Wed, 3 Sep 2008 15:50:02 GMT Message-Id: <200809031550.m83Fo2HV001517@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 149119 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Sep 2008 15:50:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=149119 Change 149119 by sam@sam_ebb on 2008/09/03 15:49:54 don't propagate ht bss occupancy changes to legacy vaps; they won't have an htinfo ie to update Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_ht.c#40 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_ht.c#40 (text+ko) ==== @@ -989,6 +989,8 @@ TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) { if (vap->iv_opmode != IEEE80211_M_HOSTAP) continue; + if (!IEEE80211_IS_CHAN_HT(vap->iv_bss->ni_chan)) + continue; if (first) { IEEE80211_NOTE(vap, IEEE80211_MSG_ASSOC | IEEE80211_MSG_11N, From owner-p4-projects@FreeBSD.ORG Wed Sep 3 15:58:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D8EEA1067190; Wed, 3 Sep 2008 15:58: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 8409E1067131 for ; Wed, 3 Sep 2008 15:58:11 +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 6EC9D8FC1B for ; Wed, 3 Sep 2008 15:58:11 +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 m83FwBi2054212 for ; Wed, 3 Sep 2008 15:58:11 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m83FwBk5054210 for perforce@freebsd.org; Wed, 3 Sep 2008 15:58:11 GMT (envelope-from sam@freebsd.org) Date: Wed, 3 Sep 2008 15:58:11 GMT Message-Id: <200809031558.m83FwBk5054210@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 149121 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Sep 2008 15:58:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=149121 Change 149121 by sam@sam_ebb on 2008/09/03 15:57:56 switch to c99 initializations; fixes complaints by picky compilers Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_phy.c#9 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_phy.c#9 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_phy.c,v 1.2 2008/05/12 00:32:51 sam Exp $"); +__FBSDID("$FreeBSD$"); /* * IEEE 802.11 PHY-related support. @@ -59,127 +59,122 @@ #define CCK IEEE80211_T_CCK #define TURBO IEEE80211_T_TURBO #define PBCC (IEEE80211_T_HT+1) /* XXX */ +#define B(r) (0x80 | r) +#define Mb(x) (x*1000) static struct ieee80211_rate_table ieee80211_11b_table = { - 4, /* number of rates, XXX no PBCC */ - { 0 }, - { -/* short ctrl */ -/* Preamble dot11Rate Rate */ -/* 1 Mb */ { CCK, 1000, 0x00, (0x80| 2), 0 }, -/* 2 Mb */ { CCK, 2000, 0x04, (0x80| 4), 1 }, -/* 5.5 Mb */ { CCK, 5500, 0x04, (0x80|11), 1 }, -/* 11 Mb */ { CCK, 11000, 0x04, (0x80|22), 1 }, -/* 22 Mb */ { PBCC, 22000, 0x04, 44, 3 } - }, + .rateCount = 4, /* XXX no PBCC */ + .info = { +/* short ctrl */ +/* Preamble dot11Rate Rate */ + [0] = { .phy = CCK, 1000, 0x00, B(2), 0 },/* 1 Mb */ + [1] = { .phy = CCK, 2000, 0x04, B(4), 1 },/* 2 Mb */ + [2] = { .phy = CCK, 5500, 0x04, B(11), 1 },/* 5.5 Mb */ + [3] = { .phy = CCK, 11000, 0x04, B(22), 1 },/* 11 Mb */ + [4] = { .phy = PBCC, 22000, 0x04, 44, 3 } /* 22 Mb */ + }, }; - static struct ieee80211_rate_table ieee80211_11g_table = { - 12, /* number of rates */ - { 0 }, - { -/* short ctrl */ -/* Preamble dot11Rate Rate */ -/* 1 Mb */ { CCK, 1000, 0x00, (0x80| 2), 0 }, -/* 2 Mb */ { CCK, 2000, 0x04, (0x80| 4), 1 }, -/* 5.5 Mb */ { CCK, 5500, 0x04, (0x80|11), 2 }, -/* 11 Mb */ { CCK, 11000, 0x04, (0x80|22), 3 }, -/* 6 Mb */ { OFDM, 6000, 0x00, 12, 4 }, -/* 9 Mb */ { OFDM, 9000, 0x00, 18, 4 }, -/* 12 Mb */ { OFDM, 12000, 0x00, 24, 6 }, -/* 18 Mb */ { OFDM, 18000, 0x00, 36, 6 }, -/* 24 Mb */ { OFDM, 24000, 0x00, 48, 8 }, -/* 36 Mb */ { OFDM, 36000, 0x00, 72, 8 }, -/* 48 Mb */ { OFDM, 48000, 0x00, 96, 8 }, -/* 54 Mb */ { OFDM, 54000, 0x00, 108, 8 } - }, + .rateCount = 12, + .info = { +/* short ctrl */ +/* Preamble dot11Rate Rate */ + [0] = { .phy = CCK, 1000, 0x00, B(2), 0 }, + [1] = { .phy = CCK, 2000, 0x04, B(4), 1 }, + [2] = { .phy = CCK, 5500, 0x04, B(11), 2 }, + [3] = { .phy = CCK, 11000, 0x04, B(22), 3 }, + [4] = { .phy = OFDM, 6000, 0x00, 12, 4 }, + [5] = { .phy = OFDM, 9000, 0x00, 18, 4 }, + [6] = { .phy = OFDM, 12000, 0x00, 24, 6 }, + [7] = { .phy = OFDM, 18000, 0x00, 36, 6 }, + [8] = { .phy = OFDM, 24000, 0x00, 48, 8 }, + [9] = { .phy = OFDM, 36000, 0x00, 72, 8 }, + [10] = { .phy = OFDM, 48000, 0x00, 96, 8 }, + [11] = { .phy = OFDM, 54000, 0x00, 108, 8 } + }, }; static struct ieee80211_rate_table ieee80211_11a_table = { - 8, /* number of rates */ - { 0 }, - { -/* short ctrl */ -/* Preamble dot11Rate Rate */ -/* 6 Mb */ { OFDM, 6000, 0x00, (0x80|12), 0 }, -/* 9 Mb */ { OFDM, 9000, 0x00, 18, 0 }, -/* 12 Mb */ { OFDM, 12000, 0x00, (0x80|24), 2 }, -/* 18 Mb */ { OFDM, 18000, 0x00, 36, 2 }, -/* 24 Mb */ { OFDM, 24000, 0x00, (0x80|48), 4 }, -/* 36 Mb */ { OFDM, 36000, 0x00, 72, 4 }, -/* 48 Mb */ { OFDM, 48000, 0x00, 96, 4 }, -/* 54 Mb */ { OFDM, 54000, 0x00, 108, 4 } - }, + .rateCount = 8, + .info = { +/* short ctrl */ +/* Preamble dot11Rate Rate */ + [0] = { .phy = OFDM, 6000, 0x00, B(12), 0 }, + [1] = { .phy = OFDM, 9000, 0x00, 18, 0 }, + [2] = { .phy = OFDM, 12000, 0x00, B(24), 2 }, + [3] = { .phy = OFDM, 18000, 0x00, 36, 2 }, + [4] = { .phy = OFDM, 24000, 0x00, B(48), 4 }, + [5] = { .phy = OFDM, 36000, 0x00, 72, 4 }, + [6] = { .phy = OFDM, 48000, 0x00, 96, 4 }, + [7] = { .phy = OFDM, 54000, 0x00, 108, 4 } + }, }; static struct ieee80211_rate_table ieee80211_half_table = { - 8, /* number of rates */ - { 0 }, - { -/* short ctrl */ -/* Preamble dot11Rate Rate */ -/* 6 Mb */ { OFDM, 3000, 0x00, (0x80| 6), 0 }, -/* 9 Mb */ { OFDM, 4500, 0x00, 9, 0 }, -/* 12 Mb */ { OFDM, 6000, 0x00, (0x80|12), 2 }, -/* 18 Mb */ { OFDM, 9000, 0x00, 18, 2 }, -/* 24 Mb */ { OFDM, 12000, 0x00, (0x80|24), 4 }, -/* 36 Mb */ { OFDM, 18000, 0x00, 36, 4 }, -/* 48 Mb */ { OFDM, 24000, 0x00, 48, 4 }, -/* 54 Mb */ { OFDM, 27000, 0x00, 54, 4 } - }, + .rateCount = 8, + .info = { +/* short ctrl */ +/* Preamble dot11Rate Rate */ + [0] = { .phy = OFDM, 3000, 0x00, B(6), 0 }, + [1] = { .phy = OFDM, 4500, 0x00, 9, 0 }, + [2] = { .phy = OFDM, 6000, 0x00, B(12), 2 }, + [3] = { .phy = OFDM, 9000, 0x00, 18, 2 }, + [4] = { .phy = OFDM, 12000, 0x00, B(24), 4 }, + [5] = { .phy = OFDM, 18000, 0x00, 36, 4 }, + [6] = { .phy = OFDM, 24000, 0x00, 48, 4 }, + [7] = { .phy = OFDM, 27000, 0x00, 54, 4 } + }, }; static struct ieee80211_rate_table ieee80211_quarter_table = { - 8, /* number of rates */ - { 0 }, - { -/* short ctrl */ -/* Preamble dot11Rate Rate */ -/* 6 Mb */ { OFDM, 1500, 0x00, (0x80| 3), 0 }, -/* 9 Mb */ { OFDM, 2250, 0x00, 4, 0 }, -/* 12 Mb */ { OFDM, 3000, 0x00, (0x80| 6), 2 }, -/* 18 Mb */ { OFDM, 4500, 0x00, 9, 2 }, -/* 24 Mb */ { OFDM, 6000, 0x00, (0x80|12), 4 }, -/* 36 Mb */ { OFDM, 9000, 0x00, 18, 4 }, -/* 48 Mb */ { OFDM, 12000, 0x00, 24, 4 }, -/* 54 Mb */ { OFDM, 13500, 0x00, 27, 4 } - }, + .rateCount = 8, + .info = { +/* short ctrl */ +/* Preamble dot11Rate Rate */ + [0] = { .phy = OFDM, 1500, 0x00, B(3), 0 }, + [1] = { .phy = OFDM, 2250, 0x00, 4, 0 }, + [2] = { .phy = OFDM, 3000, 0x00, B(9), 2 }, + [3] = { .phy = OFDM, 4500, 0x00, 9, 2 }, + [4] = { .phy = OFDM, 6000, 0x00, B(12), 4 }, + [5] = { .phy = OFDM, 9000, 0x00, 18, 4 }, + [6] = { .phy = OFDM, 12000, 0x00, 24, 4 }, + [7] = { .phy = OFDM, 13500, 0x00, 27, 4 } + }, }; static struct ieee80211_rate_table ieee80211_turbog_table = { - 7, /* number of rates */ - { 0 }, - { -/* short ctrl */ -/* Preamble dot11Rate Rate */ -/* 6 Mb */ { TURBO, 6000, 0x00, (0x80|12), 0 }, -/* 12 Mb */ { TURBO, 12000, 0x00, (0x80|24), 1 }, -/* 18 Mb */ { TURBO, 18000, 0x00, 36, 1 }, -/* 24 Mb */ { TURBO, 24000, 0x00, (0x80|48), 3 }, -/* 36 Mb */ { TURBO, 36000, 0x00, 72, 3 }, -/* 48 Mb */ { TURBO, 48000, 0x00, 96, 3 }, -/* 54 Mb */ { TURBO, 54000, 0x00, 108, 3 } - }, + .rateCount = 7, + .info = { +/* short ctrl */ +/* Preamble dot11Rate Rate */ + [0] = { .phy = TURBO, 12000, 0x00, B(12), 0 }, + [1] = { .phy = TURBO, 24000, 0x00, B(24), 1 }, + [2] = { .phy = TURBO, 36000, 0x00, 36, 1 }, + [3] = { .phy = TURBO, 48000, 0x00, B(48), 3 }, + [4] = { .phy = TURBO, 72000, 0x00, 72, 3 }, + [5] = { .phy = TURBO, 96000, 0x00, 96, 3 }, + [6] = { .phy = TURBO, 108000, 0x00, 108, 3 } + }, }; static struct ieee80211_rate_table ieee80211_turboa_table = { - 8, /* number of rates */ - { 0 }, - { -/* short ctrl */ -/* Preamble dot11Rate Rate */ -/* 6 Mb */ { TURBO, 6000, 0x00, (0x80|12), 0 }, -/* 9 Mb */ { TURBO, 9000, 0x00, 18, 0 }, -/* 12 Mb */ { TURBO, 12000, 0x00, (0x80|24), 2 }, -/* 18 Mb */ { TURBO, 18000, 0x00, 36, 2 }, -/* 24 Mb */ { TURBO, 24000, 0x00, (0x80|48), 4 }, -/* 36 Mb */ { TURBO, 36000, 0x00, 72, 4 }, -/* 48 Mb */ { TURBO, 48000, 0x00, 96, 4 }, -/* 54 Mb */ { TURBO, 54000, 0x00, 108, 4 } - }, + .rateCount = 8, + .info = { +/* short ctrl */ +/* Preamble dot11Rate Rate */ + [0] = { .phy = TURBO, 12000, 0x00, B(12), 0 }, + [1] = { .phy = TURBO, 18000, 0x00, 18, 0 }, + [2] = { .phy = TURBO, 24000, 0x00, B(24), 2 }, + [3] = { .phy = TURBO, 36000, 0x00, 36, 2 }, + [4] = { .phy = TURBO, 48000, 0x00, B(48), 4 }, + [5] = { .phy = TURBO, 72000, 0x00, 72, 4 }, + [6] = { .phy = TURBO, 96000, 0x00, 96, 4 }, + [7] = { .phy = TURBO, 108000, 0x00, 108, 4 } + }, }; +#undef B #undef OFDM #undef CCK #undef TURBO From owner-p4-projects@FreeBSD.ORG Wed Sep 3 16:02:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 82BAF1068869; Wed, 3 Sep 2008 16:02: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 441281068863 for ; Wed, 3 Sep 2008 16:02:20 +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 2EB028FC3C for ; Wed, 3 Sep 2008 16:02:20 +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 m83G2JlX078474 for ; Wed, 3 Sep 2008 16:02:19 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m83G2FSA078106 for perforce@freebsd.org; Wed, 3 Sep 2008 16:02:15 GMT (envelope-from sam@freebsd.org) Date: Wed, 3 Sep 2008 16:02:15 GMT Message-Id: <200809031602.m83G2FSA078106@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 149122 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Sep 2008 16:02:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=149122 Change 149122 by sam@sam_ebb on 2008/09/03 16:01:51 IFC @ 149120 Affected files ... .. //depot/projects/vap/ObsoleteFiles.inc#17 integrate .. //depot/projects/vap/UPDATING#18 integrate .. //depot/projects/vap/bin/Makefile#4 integrate .. //depot/projects/vap/bin/pkill/Makefile#1 branch .. //depot/projects/vap/bin/pkill/pkill.1#1 branch .. //depot/projects/vap/bin/pkill/pkill.c#1 branch .. //depot/projects/vap/bin/sh/options.c#4 integrate .. //depot/projects/vap/bin/sh/sh.1#4 integrate .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#3 integrate .. //depot/projects/vap/contrib/bind9/CHANGES#5 integrate .. //depot/projects/vap/contrib/bind9/COPYRIGHT#4 integrate .. //depot/projects/vap/contrib/bind9/bin/dig/dighost.c#4 integrate .. //depot/projects/vap/contrib/bind9/bin/named/client.c#5 integrate .. //depot/projects/vap/contrib/bind9/bin/named/config.c#4 integrate .. //depot/projects/vap/contrib/bind9/bin/named/controlconf.c#3 integrate .. //depot/projects/vap/contrib/bind9/bin/named/interfacemgr.c#3 integrate .. //depot/projects/vap/contrib/bind9/bin/named/lwresd.c#3 integrate .. //depot/projects/vap/contrib/bind9/bin/named/named.conf.docbook#4 integrate .. //depot/projects/vap/contrib/bind9/bin/named/server.c#5 integrate .. //depot/projects/vap/contrib/bind9/bin/rndc/rndc.c#3 integrate .. //depot/projects/vap/contrib/bind9/configure.in#4 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/Bv9ARM-book.xml#5 integrate .. //depot/projects/vap/contrib/bind9/lib/bind/configure.in#4 integrate .. //depot/projects/vap/contrib/bind9/lib/bind9/check.c#5 integrate .. //depot/projects/vap/contrib/bind9/lib/dns/api#5 integrate .. //depot/projects/vap/contrib/bind9/lib/dns/dispatch.c#5 integrate .. //depot/projects/vap/contrib/bind9/lib/dns/include/dns/dispatch.h#5 integrate .. //depot/projects/vap/contrib/bind9/lib/dns/request.c#3 integrate .. //depot/projects/vap/contrib/bind9/lib/dns/resolver.c#5 integrate .. //depot/projects/vap/contrib/bind9/lib/dns/xfrin.c#4 integrate .. //depot/projects/vap/contrib/bind9/lib/isc/api#4 integrate .. //depot/projects/vap/contrib/bind9/lib/isc/include/isc/resource.h#3 integrate .. //depot/projects/vap/contrib/bind9/lib/isc/include/isc/socket.h#3 integrate .. //depot/projects/vap/contrib/bind9/lib/isc/include/isc/timer.h#3 integrate .. //depot/projects/vap/contrib/bind9/lib/isc/timer.c#4 integrate .. //depot/projects/vap/contrib/bind9/lib/isc/unix/app.c#3 integrate .. //depot/projects/vap/contrib/bind9/lib/isc/unix/resource.c#3 integrate .. //depot/projects/vap/contrib/bind9/lib/isc/unix/socket.c#4 integrate .. //depot/projects/vap/contrib/bind9/lib/isc/unix/socket_p.h#3 integrate .. //depot/projects/vap/contrib/bind9/lib/isccfg/api#4 integrate .. //depot/projects/vap/contrib/bind9/lib/isccfg/namedconf.c#3 integrate .. //depot/projects/vap/contrib/bind9/version#5 integrate .. //depot/projects/vap/contrib/gcc/config/freebsd-spec.h#3 integrate .. //depot/projects/vap/contrib/gcc/config/freebsd.h#3 integrate .. //depot/projects/vap/contrib/gcc/config/i386/freebsd64.h#3 integrate .. //depot/projects/vap/contrib/gcc/config/mips/freebsd.h#1 branch .. //depot/projects/vap/contrib/gdtoa/README#3 integrate .. //depot/projects/vap/contrib/gdtoa/dtoa.c#3 integrate .. //depot/projects/vap/contrib/gdtoa/gdtoa.h#3 integrate .. //depot/projects/vap/contrib/gdtoa/gdtoaimp.h#4 integrate .. //depot/projects/vap/contrib/gdtoa/gethex.c#4 integrate .. //depot/projects/vap/contrib/gdtoa/strtoIg.c#3 integrate .. //depot/projects/vap/contrib/gdtoa/strtod.c#4 integrate .. //depot/projects/vap/contrib/gdtoa/strtodg.c#3 integrate .. //depot/projects/vap/contrib/gdtoa/strtof.c#4 integrate .. //depot/projects/vap/contrib/gdtoa/test/README#3 integrate .. //depot/projects/vap/contrib/gdtoa/test/f.out#3 integrate .. //depot/projects/vap/contrib/gdtoa/test/getround.c#3 integrate .. //depot/projects/vap/contrib/gdtoa/test/xsum0.out#3 integrate .. //depot/projects/vap/contrib/gdtoa/xsum0.out#3 integrate .. //depot/projects/vap/contrib/sendmail/FREEBSD-upgrade#3 integrate .. //depot/projects/vap/contrib/sendmail/KNOWNBUGS#3 integrate .. //depot/projects/vap/contrib/sendmail/PGPKEYS#3 integrate .. //depot/projects/vap/contrib/sendmail/README#3 integrate .. //depot/projects/vap/contrib/sendmail/RELEASE_NOTES#3 integrate .. //depot/projects/vap/contrib/sendmail/cf/README#3 integrate .. //depot/projects/vap/contrib/sendmail/cf/cf/submit.cf#3 integrate .. //depot/projects/vap/contrib/sendmail/cf/m4/proto.m4#3 integrate .. //depot/projects/vap/contrib/sendmail/cf/m4/version.m4#3 integrate .. //depot/projects/vap/contrib/sendmail/include/libmilter/mfapi.h#3 integrate .. //depot/projects/vap/contrib/sendmail/libmilter/Makefile.m4#3 integrate .. //depot/projects/vap/contrib/sendmail/libmilter/docs/smfi_opensocket.html#3 integrate .. //depot/projects/vap/contrib/sendmail/libmilter/docs/smfi_version.html#3 integrate .. //depot/projects/vap/contrib/sendmail/libmilter/engine.c#3 integrate .. //depot/projects/vap/contrib/sendmail/libmilter/main.c#3 integrate .. //depot/projects/vap/contrib/sendmail/libmilter/worker.c#3 integrate .. //depot/projects/vap/contrib/sendmail/mail.local/mail.local.c#3 integrate .. //depot/projects/vap/contrib/sendmail/makemap/makemap.8#3 integrate .. //depot/projects/vap/contrib/sendmail/makemap/makemap.c#3 integrate .. //depot/projects/vap/contrib/sendmail/smrsh/README#3 integrate .. //depot/projects/vap/contrib/sendmail/smrsh/smrsh.c#3 integrate .. //depot/projects/vap/contrib/sendmail/src/Makefile.m4#3 integrate .. //depot/projects/vap/contrib/sendmail/src/README#3 integrate .. //depot/projects/vap/contrib/sendmail/src/collect.c#3 integrate .. //depot/projects/vap/contrib/sendmail/src/conf.c#3 integrate .. //depot/projects/vap/contrib/sendmail/src/conf.h#3 integrate .. //depot/projects/vap/contrib/sendmail/src/daemon.c#3 integrate .. //depot/projects/vap/contrib/sendmail/src/envelope.c#3 integrate .. //depot/projects/vap/contrib/sendmail/src/err.c#3 integrate .. //depot/projects/vap/contrib/sendmail/src/headers.c#3 integrate .. //depot/projects/vap/contrib/sendmail/src/mailq.1#3 integrate .. //depot/projects/vap/contrib/sendmail/src/main.c#3 integrate .. //depot/projects/vap/contrib/sendmail/src/mci.c#3 integrate .. //depot/projects/vap/contrib/sendmail/src/parseaddr.c#3 integrate .. //depot/projects/vap/contrib/sendmail/src/queue.c#3 integrate .. //depot/projects/vap/contrib/sendmail/src/ratectrl.c#3 integrate .. //depot/projects/vap/contrib/sendmail/src/readcf.c#3 integrate .. //depot/projects/vap/contrib/sendmail/src/savemail.c#3 integrate .. //depot/projects/vap/contrib/sendmail/src/sendmail.h#3 integrate .. //depot/projects/vap/contrib/sendmail/src/sfsasl.c#3 integrate .. //depot/projects/vap/contrib/sendmail/src/sm_resolve.c#3 integrate .. //depot/projects/vap/contrib/sendmail/src/srvrsmtp.c#3 integrate .. //depot/projects/vap/contrib/sendmail/src/usersmtp.c#3 integrate .. //depot/projects/vap/contrib/sendmail/src/util.c#3 integrate .. //depot/projects/vap/contrib/sendmail/src/version.c#3 integrate .. //depot/projects/vap/contrib/telnet/telnetd/telnetd.8#3 integrate .. //depot/projects/vap/crypto/openssh/config.h#4 integrate .. //depot/projects/vap/crypto/openssh/openbsd-compat/fake-queue.h#3 delete .. //depot/projects/vap/crypto/openssh/openbsd-compat/tree.h#3 delete .. //depot/projects/vap/etc/defaults/rc.conf#20 integrate .. //depot/projects/vap/etc/rc.d/savecore#6 integrate .. //depot/projects/vap/etc/sendmail/freebsd.mc#4 integrate .. //depot/projects/vap/etc/sendmail/freebsd.submit.mc#3 integrate .. //depot/projects/vap/gnu/lib/libgcc/Makefile#4 integrate .. //depot/projects/vap/gnu/lib/libgomp/Makefile#3 integrate .. //depot/projects/vap/gnu/lib/libgomp/config.h#3 integrate .. //depot/projects/vap/gnu/usr.bin/Makefile#6 integrate .. //depot/projects/vap/gnu/usr.bin/binutils/libbfd/Makefile.amd64#3 integrate .. //depot/projects/vap/gnu/usr.bin/cc/Makefile.tgt#3 integrate .. //depot/projects/vap/gnu/usr.bin/cc/cc_tools/Makefile#3 integrate .. //depot/projects/vap/gnu/usr.bin/cc/cc_tools/elfos-undef.h#1 branch .. //depot/projects/vap/gnu/usr.bin/cc/cc_tools/freebsd64-fix.h#3 delete .. //depot/projects/vap/lib/bind/config.h#4 integrate .. //depot/projects/vap/lib/libarchive/Makefile#10 integrate .. //depot/projects/vap/lib/libarchive/archive.h#3 integrate .. //depot/projects/vap/lib/libarchive/archive_entry.c#7 integrate .. //depot/projects/vap/lib/libarchive/archive_entry.h#6 integrate .. //depot/projects/vap/lib/libarchive/archive_entry_private.h#6 integrate .. //depot/projects/vap/lib/libarchive/archive_write_disk.c#12 integrate .. //depot/projects/vap/lib/libarchive/archive_write_set_format.c#3 integrate .. //depot/projects/vap/lib/libarchive/archive_write_set_format_by_name.c#3 integrate .. //depot/projects/vap/lib/libarchive/archive_write_set_format_mtree.c#1 branch .. //depot/projects/vap/lib/libarchive/archive_write_set_format_shar.c#4 integrate .. //depot/projects/vap/lib/libarchive/test/main.c#8 integrate .. //depot/projects/vap/lib/libarchive/test/read_open_memory.c#4 integrate .. //depot/projects/vap/lib/libarchive/test/test_acl_basic.c#3 integrate .. //depot/projects/vap/lib/libarchive/test/test_acl_pax.c#4 integrate .. //depot/projects/vap/lib/libarchive/test/test_bad_fd.c#3 integrate .. //depot/projects/vap/lib/libarchive/test/test_compat_gtar.c#3 integrate .. //depot/projects/vap/lib/libarchive/test/test_compat_zip.c#3 integrate .. //depot/projects/vap/lib/libarchive/test/test_empty_write.c#3 integrate .. //depot/projects/vap/lib/libarchive/test/test_entry.c#6 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_compress_program.c#3 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_data_large.c#3 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_extract.c#4 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_ar.c#4 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_cpio_bin.c#3 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_cpio_bin_Z.c#3 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_cpio_bin_bz2.c#3 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_cpio_bin_gz.c#3 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_cpio_odc.c#4 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_cpio_svr4_gzip.c#3 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_cpio_svr4c_Z.c#3 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_empty.c#3 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_gtar_gz.c#3 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_gtar_sparse.c#5 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_iso_gz.c#3 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_isorr_bz2.c#5 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_mtree.c#3 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_pax_bz2.c#3 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_tar.c#4 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_tar_empty_filename.c#2 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_tbz.c#3 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_tgz.c#3 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_tz.c#3 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_zip.c#6 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_large.c#3 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_pax_truncated.c#4 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_position.c#3 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_truncated.c#3 integrate .. //depot/projects/vap/lib/libarchive/test/test_tar_filenames.c#5 integrate .. //depot/projects/vap/lib/libarchive/test/test_tar_large.c#4 integrate .. //depot/projects/vap/lib/libarchive/test/test_write_compress.c#2 integrate .. //depot/projects/vap/lib/libarchive/test/test_write_compress_program.c#3 integrate .. //depot/projects/vap/lib/libarchive/test/test_write_disk.c#5 integrate .. //depot/projects/vap/lib/libarchive/test/test_write_disk_hardlink.c#4 integrate .. //depot/projects/vap/lib/libarchive/test/test_write_disk_perms.c#5 integrate .. //depot/projects/vap/lib/libarchive/test/test_write_disk_secure.c#4 integrate .. //depot/projects/vap/lib/libarchive/test/test_write_format_ar.c#5 integrate .. //depot/projects/vap/lib/libarchive/test/test_write_format_cpio.c#4 integrate .. //depot/projects/vap/lib/libarchive/test/test_write_format_cpio_empty.c#3 integrate .. //depot/projects/vap/lib/libarchive/test/test_write_format_cpio_newc.c#3 integrate .. //depot/projects/vap/lib/libarchive/test/test_write_format_cpio_odc.c#2 integrate .. //depot/projects/vap/lib/libarchive/test/test_write_format_shar_empty.c#3 integrate .. //depot/projects/vap/lib/libarchive/test/test_write_format_tar.c#3 integrate .. //depot/projects/vap/lib/libarchive/test/test_write_format_tar_empty.c#3 integrate .. //depot/projects/vap/lib/libarchive/test/test_write_open_memory.c#3 integrate .. //depot/projects/vap/lib/libc/include/libc_private.h#5 integrate .. //depot/projects/vap/lib/libc/stdlib/Symbol.map#5 integrate .. //depot/projects/vap/lib/libc/stdlib/malloc.3#5 integrate .. //depot/projects/vap/lib/libc/stdlib/malloc.c#14 integrate .. //depot/projects/vap/lib/libpcap/Makefile#3 integrate .. //depot/projects/vap/lib/libstand/mips/_setjmp.S#1 branch .. //depot/projects/vap/lib/libthr/thread/thr_exit.c#9 integrate .. //depot/projects/vap/lib/libthread_db/arch/mips/libpthread_md.c#1 branch .. //depot/projects/vap/libexec/rtld-elf/rtld.c#5 integrate .. //depot/projects/vap/rescue/rescue/Makefile#7 integrate .. //depot/projects/vap/sbin/geom/class/eli/geli.8#4 integrate .. //depot/projects/vap/sbin/geom/class/eli/geom_eli.c#4 integrate .. //depot/projects/vap/sbin/gpt/Makefile#3 delete .. //depot/projects/vap/sbin/gpt/add.c#3 delete .. //depot/projects/vap/sbin/gpt/boot.c#3 delete .. //depot/projects/vap/sbin/gpt/create.c#3 delete .. //depot/projects/vap/sbin/gpt/destroy.c#3 delete .. //depot/projects/vap/sbin/gpt/gpt.8#4 delete .. //depot/projects/vap/sbin/gpt/gpt.c#5 delete .. //depot/projects/vap/sbin/gpt/gpt.h#3 delete .. //depot/projects/vap/sbin/gpt/label.c#3 delete .. //depot/projects/vap/sbin/gpt/map.c#3 delete .. //depot/projects/vap/sbin/gpt/map.h#3 delete .. //depot/projects/vap/sbin/gpt/migrate.c#4 delete .. //depot/projects/vap/sbin/gpt/recover.c#3 delete .. //depot/projects/vap/sbin/gpt/remove.c#3 delete .. //depot/projects/vap/sbin/gpt/show.c#4 delete .. //depot/projects/vap/sbin/ifconfig/ifconfig.8#16 integrate .. //depot/projects/vap/sbin/ifconfig/ifconfig.c#11 integrate .. //depot/projects/vap/sbin/ifconfig/ifvlan.c#7 integrate .. //depot/projects/vap/sbin/ipfw/ipfw.8#8 integrate .. //depot/projects/vap/sbin/md5/md5.c#4 integrate .. //depot/projects/vap/sbin/mount/mount.c#5 integrate .. //depot/projects/vap/sbin/ping6/ping6.8#5 integrate .. //depot/projects/vap/sbin/ping6/ping6.c#6 integrate .. //depot/projects/vap/share/man/man4/wi.4#8 integrate .. //depot/projects/vap/share/man/man4/witness.4#3 integrate .. //depot/projects/vap/share/man/man9/Makefile#12 integrate .. //depot/projects/vap/share/man/man9/VOP_ATTRIB.9#3 integrate .. //depot/projects/vap/share/man/man9/vfs_busy.9#3 integrate .. //depot/projects/vap/share/man/man9/vfs_unbusy.9#3 integrate .. //depot/projects/vap/sys/amd64/amd64/cpu_switch.S#7 integrate .. //depot/projects/vap/sys/amd64/amd64/machdep.c#13 integrate .. //depot/projects/vap/sys/amd64/ia32/ia32_signal.c#8 integrate .. //depot/projects/vap/sys/arm/at91/if_ate.c#5 integrate .. //depot/projects/vap/sys/boot/sparc64/loader/main.c#7 integrate .. //depot/projects/vap/sys/boot/uboot/common/main.c#4 integrate .. //depot/projects/vap/sys/boot/uboot/lib/Makefile#4 integrate .. //depot/projects/vap/sys/boot/uboot/lib/console.c#3 integrate .. //depot/projects/vap/sys/boot/uboot/lib/elf_freebsd.c#3 integrate .. //depot/projects/vap/sys/boot/uboot/lib/glue.h#3 integrate .. //depot/projects/vap/sys/boot/uboot/lib/net.c#4 integrate .. //depot/projects/vap/sys/boot/uboot/lib/reboot.c#3 integrate .. //depot/projects/vap/sys/boot/uboot/lib/time.c#3 integrate .. //depot/projects/vap/sys/cam/scsi/scsi_da.c#8 integrate .. //depot/projects/vap/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate .. //depot/projects/vap/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#3 integrate .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/cpuvar.h#4 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 integrate .. //depot/projects/vap/sys/compat/linprocfs/linprocfs.c#9 integrate .. //depot/projects/vap/sys/compat/linux/linux_getcwd.c#7 integrate .. //depot/projects/vap/sys/compat/linux/linux_misc.c#15 integrate .. //depot/projects/vap/sys/compat/ndis/subr_ndis.c#10 integrate .. //depot/projects/vap/sys/compat/svr4/svr4_fcntl.c#9 integrate .. //depot/projects/vap/sys/conf/files.mips#2 integrate .. //depot/projects/vap/sys/conf/options#27 edit .. //depot/projects/vap/sys/contrib/dev/ath/COPYRIGHT#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/README#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/ah.h#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/ah_desc.h#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/ah_devid.h#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/ah_soc.h#4 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#4 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/alpha-elf.inc#4 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/alpha-elf.opt_ah.h#4 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/ap30.hal.o.uu#4 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/ap30.inc#4 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/ap43.hal.o.uu#4 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/ap43.inc#4 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/ap51.hal.o.uu#4 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/ap51.inc#4 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/ap61.hal.o.uu#4 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/ap61.inc#4 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/armv4-be-elf.inc#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/armv4-le-elf.inc#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/i386-elf.inc#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/mips-be-elf.inc#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/mips-le-elf.inc#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/mips1-be-elf.inc#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/mips1-le-elf.inc#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#4 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/powerpc-be-elf.inc#4 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#4 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/sh4-le-elf.inc#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#4 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/sparc-be-elf.inc#4 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/sparc-be-elf.opt_ah.h#4 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#4 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/sparc64-be-elf.inc#4 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h#4 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/wackelf.c#4 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/x86_64-elf.inc#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/xscale-be-elf.inc#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/xscale-le-elf.inc#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/version.h#6 integrate .. //depot/projects/vap/sys/dev/bce/if_bce.c#9 integrate .. //depot/projects/vap/sys/dev/bce/if_bcereg.h#6 integrate .. //depot/projects/vap/sys/dev/bm/if_bm.c#3 integrate .. //depot/projects/vap/sys/dev/ciss/ciss.c#12 integrate .. //depot/projects/vap/sys/dev/ciss/cissreg.h#8 integrate .. //depot/projects/vap/sys/dev/cpuctl/cpuctl.c#2 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_ioctl.h#5 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_main.c#12 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_sge.c#10 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/toecore/toedev.c#2 integrate .. //depot/projects/vap/sys/dev/dc/if_dc.c#6 integrate .. //depot/projects/vap/sys/dev/dc/if_dcreg.h#4 integrate .. //depot/projects/vap/sys/dev/drm/drm_drv.c#7 integrate .. //depot/projects/vap/sys/dev/drm/drm_lock.c#6 integrate .. //depot/projects/vap/sys/dev/e1000/if_igb.c#2 integrate .. //depot/projects/vap/sys/dev/e1000/if_igb.h#2 integrate .. //depot/projects/vap/sys/dev/ex/if_ex_pccard.c#7 integrate .. //depot/projects/vap/sys/dev/ic/ns16550.h#5 integrate .. //depot/projects/vap/sys/dev/ipmi/ipmi.c#3 integrate .. //depot/projects/vap/sys/dev/ipmi/ipmi_kcs.c#3 integrate .. //depot/projects/vap/sys/dev/ipmi/ipmivars.h#3 integrate .. //depot/projects/vap/sys/dev/k8temp/k8temp.c#7 integrate .. //depot/projects/vap/sys/dev/md/md.c#9 integrate .. //depot/projects/vap/sys/dev/pccard/pccard_cis.c#7 integrate .. //depot/projects/vap/sys/dev/pccard/pccarddevs#10 integrate .. //depot/projects/vap/sys/dev/pci/pci_pci.c#8 integrate .. //depot/projects/vap/sys/dev/ppc/ppc_isa.c#4 integrate .. //depot/projects/vap/sys/dev/syscons/syscons.c#12 integrate .. //depot/projects/vap/sys/dev/usb/ehci_pci.c#11 integrate .. //depot/projects/vap/sys/dev/usb/ohci_pci.c#6 integrate .. //depot/projects/vap/sys/dev/usb/ufoma.c#4 integrate .. //depot/projects/vap/sys/dev/usb/uhci_pci.c#8 integrate .. //depot/projects/vap/sys/dev/usb/uipaq.c#8 integrate .. //depot/projects/vap/sys/dev/usb/umodem.c#7 integrate .. //depot/projects/vap/sys/dev/usb/uplcom.c#8 integrate .. //depot/projects/vap/sys/dev/usb/uvscom.c#6 integrate .. //depot/projects/vap/sys/dev/wi/if_wi_pccard.c#9 integrate .. //depot/projects/vap/sys/dev/xen/blkback/blkback.c#2 integrate .. //depot/projects/vap/sys/fs/cd9660/cd9660_vnops.c#4 integrate .. //depot/projects/vap/sys/fs/coda/coda_venus.c#4 integrate .. //depot/projects/vap/sys/fs/coda/coda_venus.h#4 integrate .. //depot/projects/vap/sys/fs/coda/coda_vnops.c#6 integrate .. //depot/projects/vap/sys/fs/devfs/devfs_vnops.c#13 integrate .. //depot/projects/vap/sys/fs/fdescfs/fdesc_vnops.c#10 integrate .. //depot/projects/vap/sys/fs/hpfs/hpfs_vnops.c#7 integrate .. //depot/projects/vap/sys/fs/msdosfs/msdosfs_fat.c#5 integrate .. //depot/projects/vap/sys/fs/msdosfs/msdosfs_vnops.c#10 integrate .. //depot/projects/vap/sys/fs/nwfs/nwfs_io.c#6 integrate .. //depot/projects/vap/sys/fs/nwfs/nwfs_vnops.c#7 integrate .. //depot/projects/vap/sys/fs/portalfs/portal_vnops.c#7 integrate .. //depot/projects/vap/sys/fs/pseudofs/pseudofs_vnops.c#7 integrate .. //depot/projects/vap/sys/fs/smbfs/smbfs_io.c#8 integrate .. //depot/projects/vap/sys/fs/smbfs/smbfs_node.c#11 integrate .. //depot/projects/vap/sys/fs/smbfs/smbfs_vnops.c#9 integrate .. //depot/projects/vap/sys/fs/tmpfs/tmpfs_vfsops.c#5 integrate .. //depot/projects/vap/sys/fs/tmpfs/tmpfs_vnops.c#7 integrate .. //depot/projects/vap/sys/fs/unionfs/union_subr.c#11 integrate .. //depot/projects/vap/sys/fs/unionfs/union_vfsops.c#9 integrate .. //depot/projects/vap/sys/fs/unionfs/union_vnops.c#9 integrate .. //depot/projects/vap/sys/geom/journal/g_journal.c#4 integrate .. //depot/projects/vap/sys/gnu/fs/ext2fs/ext2_vfsops.c#6 integrate .. //depot/projects/vap/sys/gnu/fs/ext2fs/ext2_vnops.c#5 integrate .. //depot/projects/vap/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#5 integrate .. //depot/projects/vap/sys/i386/cpufreq/powernow.c#6 integrate .. //depot/projects/vap/sys/i386/cpufreq/smist.c#6 integrate .. //depot/projects/vap/sys/i386/ibcs2/imgact_coff.c#8 integrate .. //depot/projects/vap/sys/i386/xen/locore.s#3 integrate .. //depot/projects/vap/sys/i386/xen/xen_machdep.c#4 integrate .. //depot/projects/vap/sys/kern/imgact_shell.c#7 integrate .. //depot/projects/vap/sys/kern/kern_exec.c#14 integrate .. //depot/projects/vap/sys/kern/kern_exit.c#12 integrate .. //depot/projects/vap/sys/kern/kern_linker.c#11 integrate .. //depot/projects/vap/sys/kern/kern_mib.c#11 integrate .. //depot/projects/vap/sys/kern/kern_sig.c#13 integrate .. //depot/projects/vap/sys/kern/kern_subr.c#6 integrate .. //depot/projects/vap/sys/kern/subr_smp.c#11 integrate .. //depot/projects/vap/sys/kern/subr_witness.c#17 integrate .. //depot/projects/vap/sys/kern/tty.c#12 integrate .. //depot/projects/vap/sys/kern/tty_inq.c#2 integrate .. //depot/projects/vap/sys/kern/tty_outq.c#2 integrate .. //depot/projects/vap/sys/kern/tty_ttydisc.c#2 integrate .. //depot/projects/vap/sys/kern/uipc_mqueue.c#5 integrate .. //depot/projects/vap/sys/kern/uipc_socket.c#14 integrate .. //depot/projects/vap/sys/kern/vfs_default.c#12 integrate .. //depot/projects/vap/sys/kern/vfs_lookup.c#11 integrate .. //depot/projects/vap/sys/kern/vfs_mount.c#20 integrate .. //depot/projects/vap/sys/kern/vfs_subr.c#22 integrate .. //depot/projects/vap/sys/kern/vfs_syscalls.c#12 integrate .. //depot/projects/vap/sys/kern/vfs_vnops.c#10 integrate .. //depot/projects/vap/sys/kern/vnode_if.src#9 integrate .. //depot/projects/vap/sys/modules/aha/Makefile#5 integrate .. //depot/projects/vap/sys/modules/ahb/Makefile#5 integrate .. //depot/projects/vap/sys/modules/an/Makefile#5 integrate .. //depot/projects/vap/sys/modules/ar/Makefile#5 integrate .. //depot/projects/vap/sys/modules/ath_rate_amrr/Makefile#8 integrate .. //depot/projects/vap/sys/modules/ath_rate_onoe/Makefile#8 integrate .. //depot/projects/vap/sys/modules/ath_rate_sample/Makefile#9 integrate .. //depot/projects/vap/sys/modules/ce/Makefile#3 integrate .. //depot/projects/vap/sys/modules/cp/Makefile#5 integrate .. //depot/projects/vap/sys/modules/ctau/Makefile#5 integrate .. //depot/projects/vap/sys/modules/cx/Makefile#5 integrate .. //depot/projects/vap/sys/modules/digi/digi/Makefile#5 integrate .. //depot/projects/vap/sys/modules/fatm/Makefile#5 integrate .. //depot/projects/vap/sys/modules/hatm/Makefile#5 integrate .. //depot/projects/vap/sys/modules/hifn/Makefile#5 integrate .. //depot/projects/vap/sys/modules/if_tap/Makefile#5 integrate .. //depot/projects/vap/sys/modules/linux/Makefile#5 integrate .. //depot/projects/vap/sys/modules/netgraph/sync_ar/Makefile#5 integrate .. //depot/projects/vap/sys/modules/netgraph/sync_sr/Makefile#5 integrate .. //depot/projects/vap/sys/modules/patm/Makefile#5 integrate .. //depot/projects/vap/sys/modules/pf/Makefile#5 integrate .. //depot/projects/vap/sys/modules/pflog/Makefile#3 integrate .. //depot/projects/vap/sys/modules/rp/Makefile#5 integrate .. //depot/projects/vap/sys/modules/safe/Makefile#5 integrate .. //depot/projects/vap/sys/modules/sppp/Makefile#5 integrate .. //depot/projects/vap/sys/modules/sr/Makefile#5 integrate .. //depot/projects/vap/sys/modules/svr4/Makefile#5 integrate .. //depot/projects/vap/sys/modules/trm/Makefile#5 integrate .. //depot/projects/vap/sys/modules/ubsec/Makefile#5 integrate .. //depot/projects/vap/sys/modules/usb/Makefile#5 integrate .. //depot/projects/vap/sys/modules/wi/Makefile#5 integrate .. //depot/projects/vap/sys/modules/wlan/Makefile#11 integrate .. //depot/projects/vap/sys/modules/wlan_acl/Makefile#5 integrate .. //depot/projects/vap/sys/modules/wlan_amrr/Makefile#5 integrate .. //depot/projects/vap/sys/modules/wlan_ccmp/Makefile#5 integrate .. //depot/projects/vap/sys/modules/wlan_rssadapt/Makefile#3 integrate .. //depot/projects/vap/sys/modules/wlan_tkip/Makefile#5 integrate .. //depot/projects/vap/sys/modules/wlan_wep/Makefile#5 integrate .. //depot/projects/vap/sys/modules/wlan_xauth/Makefile#5 integrate .. //depot/projects/vap/sys/net/bpf.c#20 integrate .. //depot/projects/vap/sys/net/bpf_filter.c#8 integrate .. //depot/projects/vap/sys/net/bpf_jitter.c#4 integrate .. //depot/projects/vap/sys/net/ethernet.h#6 integrate .. //depot/projects/vap/sys/net/if.h#9 integrate .. //depot/projects/vap/sys/net/if_ethersubr.c#11 integrate .. //depot/projects/vap/sys/net/if_vlan.c#11 integrate .. //depot/projects/vap/sys/net/route.c#11 integrate .. //depot/projects/vap/sys/net80211/ieee80211.c#49 integrate .. //depot/projects/vap/sys/net80211/ieee80211_crypto_tkip.c#16 integrate .. //depot/projects/vap/sys/netgraph/ng_bpf.c#7 integrate .. //depot/projects/vap/sys/netinet/if_ether.c#10 integrate .. //depot/projects/vap/sys/netinet/ip_options.c#7 integrate .. //depot/projects/vap/sys/netinet/libalias/alias_db.c#8 integrate .. //depot/projects/vap/sys/netinet/sctp_indata.c#8 integrate .. //depot/projects/vap/sys/netinet/sctp_lock_bsd.h#5 integrate .. //depot/projects/vap/sys/netinet/sctp_output.c#12 integrate .. //depot/projects/vap/sys/netinet/sctp_pcb.c#11 integrate .. //depot/projects/vap/sys/netinet/sctp_sysctl.h#6 integrate .. //depot/projects/vap/sys/netinet/sctp_timer.c#7 integrate .. //depot/projects/vap/sys/netinet/sctp_timer.h#4 integrate .. //depot/projects/vap/sys/netinet/sctp_var.h#9 integrate .. //depot/projects/vap/sys/netinet/sctputil.c#11 integrate .. //depot/projects/vap/sys/netinet/tcp_hostcache.c#6 integrate .. //depot/projects/vap/sys/netinet/tcp_offload.c#4 integrate .. //depot/projects/vap/sys/netinet/toedev.h#3 integrate .. //depot/projects/vap/sys/netinet6/mld6.c#8 integrate .. //depot/projects/vap/sys/netinet6/udp6_usrreq.c#13 integrate .. //depot/projects/vap/sys/nfs4client/nfs4_vnops.c#13 integrate .. //depot/projects/vap/sys/nfsclient/nfs_bio.c#7 integrate .. //depot/projects/vap/sys/nfsclient/nfs_vfsops.c#16 integrate .. //depot/projects/vap/sys/nfsclient/nfs_vnops.c#15 integrate .. //depot/projects/vap/sys/nfsserver/nfs_serv.c#11 integrate .. //depot/projects/vap/sys/nfsserver/nfs_srvsubs.c#9 integrate .. //depot/projects/vap/sys/powerpc/aim/clock.c#5 integrate .. //depot/projects/vap/sys/powerpc/aim/interrupt.c#2 integrate .. //depot/projects/vap/sys/powerpc/aim/machdep.c#10 integrate .. //depot/projects/vap/sys/powerpc/aim/mmu_oea.c#5 integrate .. //depot/projects/vap/sys/powerpc/aim/vm_machdep.c#5 integrate .. //depot/projects/vap/sys/powerpc/booke/pmap.c#6 integrate .. //depot/projects/vap/sys/powerpc/include/cpufunc.h#5 integrate .. //depot/projects/vap/sys/powerpc/powerpc/db_interface.c#5 integrate .. //depot/projects/vap/sys/powerpc/powerpc/pmap_dispatch.c#6 integrate .. //depot/projects/vap/sys/security/audit/audit_arg.c#10 integrate .. //depot/projects/vap/sys/security/audit/audit_worker.c#12 integrate .. //depot/projects/vap/sys/security/mac_bsdextended/mac_bsdextended.c#8 integrate .. //depot/projects/vap/sys/security/mac_lomac/mac_lomac.c#9 integrate .. //depot/projects/vap/sys/sparc64/conf/GENERIC#18 integrate .. //depot/projects/vap/sys/sparc64/include/cache.h#6 integrate .. //depot/projects/vap/sys/sparc64/include/pcpu.h#8 integrate .. //depot/projects/vap/sys/sparc64/sparc64/autoconf.c#7 integrate .. //depot/projects/vap/sys/sparc64/sparc64/cache.c#4 integrate .. //depot/projects/vap/sys/sparc64/sparc64/cheetah.c#5 integrate .. //depot/projects/vap/sys/sparc64/sparc64/genassym.c#6 integrate .. //depot/projects/vap/sys/sparc64/sparc64/machdep.c#9 integrate .. //depot/projects/vap/sys/sparc64/sparc64/mp_exception.S#5 integrate .. //depot/projects/vap/sys/sparc64/sparc64/mp_machdep.c#11 integrate .. //depot/projects/vap/sys/sparc64/sparc64/spitfire.c#5 integrate .. //depot/projects/vap/sys/sun4v/sun4v/clock.c#1 branch .. //depot/projects/vap/sys/sys/ioccom.h#5 integrate .. //depot/projects/vap/sys/sys/mount.h#9 integrate .. //depot/projects/vap/sys/sys/ttydisc.h#2 integrate .. //depot/projects/vap/sys/sys/ttyqueue.h#2 integrate .. //depot/projects/vap/sys/sys/vnode.h#14 integrate .. //depot/projects/vap/sys/ufs/ffs/ffs_alloc.c#6 integrate .. //depot/projects/vap/sys/ufs/ffs/ffs_extern.h#6 integrate .. //depot/projects/vap/sys/ufs/ffs/ffs_snapshot.c#10 integrate .. //depot/projects/vap/sys/ufs/ffs/ffs_softdep.c#12 integrate .. //depot/projects/vap/sys/ufs/ffs/ffs_vfsops.c#16 integrate .. //depot/projects/vap/sys/ufs/ffs/ffs_vnops.c#12 integrate .. //depot/projects/vap/sys/ufs/ufs/ufs_extattr.c#9 integrate .. //depot/projects/vap/sys/ufs/ufs/ufs_vfsops.c#6 integrate .. //depot/projects/vap/sys/ufs/ufs/ufs_vnops.c#10 integrate .. //depot/projects/vap/sys/vm/swap_pager.c#10 integrate .. //depot/projects/vap/sys/vm/vm_mmap.c#13 integrate .. //depot/projects/vap/sys/vm/vnode_pager.c#10 integrate .. //depot/projects/vap/tools/regression/atm/README#3 integrate .. //depot/projects/vap/tools/regression/bin/sh/builtins/getopts2.0#1 branch .. //depot/projects/vap/tools/regression/bin/sh/builtins/getopts2.0.stdout#1 branch .. //depot/projects/vap/tools/regression/bpf/bpf_filter/Makefile#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/bpf_test.c#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0001.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0002.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0003.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0004.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0005.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0006.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0007.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0008.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0009.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0010.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0011.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0012.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0013.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0014.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0015.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0016.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0017.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0018.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0019.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0020.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0021.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0022.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0023.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0024.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0025.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0026.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0027.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0028.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0029.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0030.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0031.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0032.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0033.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0034.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0035.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0036.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0037.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0038.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0039.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0040.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0041.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0042.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0043.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0044.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0045.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0046.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0047.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0048.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0049.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0050.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0051.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0052.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0053.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0054.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0055.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0056.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0057.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0058.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0059.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0060.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0061.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0062.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0063.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0064.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0065.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0066.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0067.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0068.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0069.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0070.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0071.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0072.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0073.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0074.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0075.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0076.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0077.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0078.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0079.h#2 integrate .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0080.h#1 branch .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0081.h#1 branch .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0082.h#1 branch .. //depot/projects/vap/tools/regression/bpf/bpf_filter/tests/test0083.h#1 branch .. //depot/projects/vap/tools/regression/geom_eli/attach-d.t#3 integrate .. //depot/projects/vap/tools/regression/geom_eli/configure-b-B.t#3 integrate .. //depot/projects/vap/tools/regression/geom_eli/delkey.t#3 integrate .. //depot/projects/vap/tools/regression/geom_eli/detach-l.t#3 integrate .. //depot/projects/vap/tools/regression/geom_eli/init-B.t#1 branch .. //depot/projects/vap/tools/regression/geom_eli/init-a.t#3 integrate .. //depot/projects/vap/tools/regression/geom_eli/init-i-P.t#3 integrate .. //depot/projects/vap/tools/regression/geom_eli/init.t#3 integrate .. //depot/projects/vap/tools/regression/geom_eli/integrity-copy.t#3 integrate .. //depot/projects/vap/tools/regression/geom_eli/integrity-data.t#3 integrate .. //depot/projects/vap/tools/regression/geom_eli/integrity-hmac.t#3 integrate .. //depot/projects/vap/tools/regression/geom_eli/kill.t#3 integrate .. //depot/projects/vap/tools/regression/geom_eli/nokey.t#3 integrate .. //depot/projects/vap/tools/regression/geom_eli/readonly.t#3 integrate .. //depot/projects/vap/tools/regression/geom_eli/setkey.t#3 integrate .. //depot/projects/vap/tools/regression/lib/libc/stdio/test-scanfloat.c#5 integrate .. //depot/projects/vap/tools/tools/cd2dvd/cd2dvd.sh#1 branch .. //depot/projects/vap/tools/tools/nanobsd/nanobsd.sh#7 integrate .. //depot/projects/vap/usr.bin/Makefile#10 integrate .. //depot/projects/vap/usr.bin/gprof/mips.h#1 branch .. //depot/projects/vap/usr.bin/limits/limits.1#3 integrate .. //depot/projects/vap/usr.bin/limits/limits.c#3 integrate .. //depot/projects/vap/usr.bin/locate/locate/locate.c#3 integrate .. //depot/projects/vap/usr.bin/netstat/inet.c#7 integrate .. //depot/projects/vap/usr.bin/netstat/main.c#5 integrate .. //depot/projects/vap/usr.bin/netstat/netstat.h#6 integrate .. //depot/projects/vap/usr.bin/netstat/route.c#6 integrate .. //depot/projects/vap/usr.bin/pkill/Makefile#3 delete .. //depot/projects/vap/usr.bin/pkill/pkill.1#3 delete .. //depot/projects/vap/usr.bin/pkill/pkill.c#3 delete .. //depot/projects/vap/usr.bin/sed/sed.1#4 integrate .. //depot/projects/vap/usr.sbin/cxgbtool/cxgbtool.c#3 integrate .. //depot/projects/vap/usr.sbin/cxgbtool/reg_defs_t3.c#3 integrate .. //depot/projects/vap/usr.sbin/cxgbtool/reg_defs_t3b.c#3 integrate .. //depot/projects/vap/usr.sbin/cxgbtool/reg_defs_t3c.c#1 branch .. //depot/projects/vap/usr.sbin/cxgbtool/version.h#3 integrate .. //depot/projects/vap/usr.sbin/lpr/lpd/recvjob.c#3 integrate .. //depot/projects/vap/usr.sbin/ntp/config.h#4 integrate .. //depot/projects/vap/usr.sbin/pciconf/pciconf.c#3 integrate .. //depot/projects/vap/usr.sbin/syslogd/syslogd.c#7 integrate Differences ... ==== //depot/projects/vap/ObsoleteFiles.inc#17 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.156 2008/08/24 10:01:22 ed Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.157 2008/08/31 08:33:41 antoine Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -16,6 +16,24 @@ # 20080823: removal of unneeded pt_chown, to implement grantpt(3) OLD_FILES+=usr/libexec/pt_chown +# 20080822: ntp 4.2.4p5 import +OLD_FILES+=usr/share/doc/ntp/driver23.html +OLD_FILES+=usr/share/doc/ntp/driver24.html +# 20080821: several man pages moved from man4.i386 to man4 +.if ${TARGET_ARCH} == "i386" +OLD_FILES+=usr/share/man/man4/i386/acpi_aiboost.4.gz +OLD_FILES+=usr/share/man/man4/i386/acpi_asus.4.gz +OLD_FILES+=usr/share/man/man4/i386/acpi_fujitsu.4.gz +OLD_FILES+=usr/share/man/man4/i386/acpi_ibm.4.gz +OLD_FILES+=usr/share/man/man4/i386/acpi_panasonic.4.gz +OLD_FILES+=usr/share/man/man4/i386/acpi_sony.4.gz +OLD_FILES+=usr/share/man/man4/i386/acpi_toshiba.4.gz +OLD_FILES+=usr/share/man/man4/i386/ichwd.4.gz +OLD_FILES+=usr/share/man/man4/i386/if_ndis.4.gz +OLD_FILES+=usr/share/man/man4/i386/io.4.gz +OLD_FILES+=usr/share/man/man4/i386/linux.4.gz +OLD_FILES+=usr/share/man/man4/i386/ndis.4.gz +.endif # 20080820: MPSAFE TTY layer integrated OLD_FILES+=usr/include/sys/linedisc.h OLD_FILES+=usr/share/man/man3/posix_openpt.3.gz ==== //depot/projects/vap/UPDATING#18 (text+ko) ==== @@ -41,6 +41,24 @@ Adding these drivers to your kernel configuration file shall cause compilation to fail. +20080818: + ntpd has been upgraded to 4.2.4p5. + +20080801: + OpenSSH has been upgraded to 5.1p1. + + For many years, FreeBSD's version of OpenSSH preferred DSA + over RSA for host and user authentication keys. With this + upgrade, we've switched to the vendor's default of RSA over + DSA. This may cause upgraded clients to warn about unknown + host keys even for previously known hosts. Users should + follow the usual procedure for verifying host keys before + accepting the RSA key. + + This can be circumvented by setting the "HostKeyAlgorithms" + option to "ssh-dss,ssh-rsa" in ~/.ssh/config or on the ssh + command line. + 20080713: The sio(4) driver has been removed from the i386 and amd64 kernel configuration files. This means uart(4) is now the @@ -1108,4 +1126,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.539 2008/08/20 08:31:58 ed Exp $ +$FreeBSD: src/UPDATING,v 1.541 2008/09/03 08:30:17 roberto Exp $ ==== //depot/projects/vap/bin/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/Makefile,v 1.27 2008/03/13 17:38:06 obrien Exp $ +# $FreeBSD: src/bin/Makefile,v 1.28 2008/08/31 14:27:59 yar Exp $ .include @@ -25,6 +25,7 @@ mkdir \ mv \ pax \ + pkill \ ps \ pwd \ ${_rcp} \ ==== //depot/projects/vap/bin/sh/options.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/options.c,v 1.26 2008/03/22 14:06:01 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/options.c,v 1.27 2008/08/27 20:16:06 stefanf Exp $"); #include #include @@ -338,6 +338,7 @@ shellparam.malloc = 1; shellparam.nparam = nparam; shellparam.p = newparam; + shellparam.reset = 1; shellparam.optnext = NULL; } @@ -405,7 +406,6 @@ if (*argptr != NULL) { setparam(argptr); } - shellparam.reset = 1; INTON; return 0; } ==== //depot/projects/vap/bin/sh/sh.1#4 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.126 2007/12/05 12:29:26 ru Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.127 2008/08/30 22:35:21 ed Exp $ .\" .Dd October 7, 2006 .Dt SH 1 @@ -2118,7 +2118,7 @@ For aliases the alias expansion is printed; for commands and tracked aliases the complete pathname of the command is printed. -.It Ic ulimit Oo Fl HSabcdflmnstuv Oc Op Ar limit +.It Ic ulimit Oo Fl HSabcdflmnpstuv Oc Op Ar limit Set or display resource limits (see .Xr getrlimit 2 ) . If @@ -2172,6 +2172,8 @@ The maximal resident set size of a process, in kilobytes. .It Fl n Ar nofiles The maximal number of descriptors that could be opened by a process. +.It Fl p Ar pseudoterminals +The maximal number of pseudo-terminals for this user ID. .It Fl s Ar stacksize The maximal size of the stack segment, in kilobytes. .It Fl t Ar time ==== //depot/projects/vap/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#3 (text+ko) ==== @@ -356,7 +356,7 @@ #define VOP_CLOSE(vp, f, c, o, cr) 0 #define VOP_PUTPAGE(vp, of, sz, fl, cr) 0 -#define VOP_GETATTR(vp, vap, fl, cr) ((vap)->va_size = (vp)->v_size, 0) +#define VOP_GETATTR(vp, vap, fl) ((vap)->va_size = (vp)->v_size, 0) #define VOP_FSYNC(vp, f, cr) fsync((vp)->v_fd) ==== //depot/projects/vap/contrib/bind9/CHANGES#5 (text+ko) ==== @@ -1,3 +1,47 @@ + --- 9.4.2-P2 released --- + +2406. [bug] Some operating systems have FD_SETSIZE set to a + low value by default, which can cause resource + exhaustion when many simultaneous connections are + open. Linux in particular makes it difficult to + increase this value. To use more sockets with + select(), set ISC_SOCKET_FDSETSIZE. Example: + STD_CDEFINES="-DISC_SOCKET_FDSETSIZE=4096" ./configure + (This should not be necessary in most cases, and + never for an authoritative-only server.) [RT #18328] + +2404. [port] hpux: files unlimited support. + +2403. [bug] TSIG context leak. [RT #18341] + +2402. [port] Support Solaris 2.11 and over. [RT #18362] + +2401. [bug] Expect to get E[MN]FILE errno internal_accept() + (from accept() or fcntl() system calls). [RT #18358] + +2399. [bug] Abort timeout queries to reduce the number of open + UDP sockets. [RT #18367] + +2398. [bug] Improve file descriptor management. New, + temporary, named.conf option reserved-sockets, + default 512. [RT #18344] + +2396. [bug] Don't set SO_REUSEADDR for randomized ports. + [RT #18336] + +2395. [port] Avoid warning and no effect from "files unlimited" + on Linux when running as root. [RT #18335] + +2394. [bug] Default configuration options set the limit for + open files to 'unlimited' as described in the + documentation. [RT #18331] + +2392. [bug] remove 'grep -q' from acl test script, some platforms + don't support it. [RT #18253] + +2322. [port] MacOS: work around the limitation of setrlimit() + for RLIMIT_NOFILE. [RT #17526] + --- 9.4.2-P1 released --- 2375. [security] Fully randomize UDP query ports to improve @@ -33,7 +77,7 @@ [RT #17113] 2249. [bug] Only set Authentic Data bit if client requested - DNSSEC, per RFC 3655 [RT #17175] + DNSSEC, per RFC 3655 [RT #17175] 2248. [cleanup] Fix several errors reported by Coverity. [RT #17160] ==== //depot/projects/vap/contrib/bind9/COPYRIGHT#4 (text+ko) ==== @@ -1,4 +1,4 @@ -Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") +Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") Copyright (C) 1996-2003 Internet Software Consortium. Permission to use, copy, modify, and/or distribute this software for any @@ -13,7 +13,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -$Id: COPYRIGHT,v 1.9.18.4 2007/08/28 07:19:54 tbox Exp $ +$Id: COPYRIGHT,v 1.9.18.4.10.1 2008/07/23 07:28:54 tbox Exp $ Portions Copyright (C) 1996-2001 Nominum, Inc. ==== //depot/projects/vap/contrib/bind9/bin/dig/dighost.c#4 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dighost.c,v 1.259.18.43 2007/08/28 07:19:55 tbox Exp $ */ +/* $Id: dighost.c,v 1.259.18.43.10.3 2008/07/23 23:16:43 marka Exp $ */ /*! \file * \note @@ -2217,14 +2217,15 @@ sockcount++; debug("sockcount=%d", sockcount); if (specified_source) - result = isc_socket_bind(query->sock, &bind_address); + result = isc_socket_bind(query->sock, &bind_address, + ISC_SOCKET_REUSEADDRESS); else { if ((isc_sockaddr_pf(&query->sockaddr) == AF_INET) && have_ipv4) isc_sockaddr_any(&bind_any); else isc_sockaddr_any6(&bind_any); - result = isc_socket_bind(query->sock, &bind_any); + result = isc_socket_bind(query->sock, &bind_any, 0); } check_result(result, "isc_socket_bind"); bringup_timer(query, TCP_TIMEOUT); @@ -2271,11 +2272,12 @@ sockcount++; debug("sockcount=%d", sockcount); if (specified_source) { - result = isc_socket_bind(query->sock, &bind_address); + result = isc_socket_bind(query->sock, &bind_address, + ISC_SOCKET_REUSEADDRESS); } else { isc_sockaddr_anyofpf(&bind_any, isc_sockaddr_pf(&query->sockaddr)); - result = isc_socket_bind(query->sock, &bind_any); + result = isc_socket_bind(query->sock, &bind_any, 0); } check_result(result, "isc_socket_bind"); ==== //depot/projects/vap/contrib/bind9/bin/named/client.c#5 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: client.c,v 1.219.18.28.10.1 2008/05/22 21:28:04 each Exp $ */ +/* $Id: client.c,v 1.219.18.28.10.2 2008/07/23 07:28:54 tbox Exp $ */ #include ==== //depot/projects/vap/contrib/bind9/bin/named/config.c#4 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2001-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: config.c,v 1.47.18.32 2007/09/13 05:04:01 each Exp $ */ +/* $Id: config.c,v 1.47.18.32.10.3 2008/07/23 23:48:17 tbox Exp $ */ /*! \file */ @@ -52,7 +52,7 @@ #ifndef WIN32 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Sep 3 16:18:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 954C81069858; Wed, 3 Sep 2008 16:18:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 548F61069855 for ; Wed, 3 Sep 2008 16:18:37 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3F6BB8FC24 for ; Wed, 3 Sep 2008 16:18:37 +0000 (UTC) (envelope-from trasz@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 m83GIboj083970 for ; Wed, 3 Sep 2008 16:18:37 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m83GIaof083920 for perforce@freebsd.org; Wed, 3 Sep 2008 16:18:36 GMT (envelope-from trasz@freebsd.org) Date: Wed, 3 Sep 2008 16:18:36 GMT Message-Id: <200809031618.m83GIaof083920@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 149124 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Sep 2008 16:18:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=149124 Change 149124 by trasz@trasz_traszkan on 2008/09/03 16:18:06 IFC. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/UPDATING#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/CHANGES#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/COPYRIGHT#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dig/dighost.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/client.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/config.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/controlconf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/interfacemgr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/lwresd.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/named.conf.docbook#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/server.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/rndc/rndc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/configure.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/Bv9ARM-book.xml#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/configure.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind9/check.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/api#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/dispatch.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/dispatch.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/request.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/resolver.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/xfrin.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/api#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/resource.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/socket.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/timer.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/timer.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/unix/app.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/unix/resource.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/unix/socket.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/unix/socket_p.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isccfg/api#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isccfg/namedconf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/version#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gcc/config/freebsd-spec.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gcc/config/freebsd.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gcc/config/i386/freebsd64.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gcc/config/mips/freebsd.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/README#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/dtoa.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/gdtoa.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/gdtoaimp.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/gethex.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/strtoIg.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/strtod.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/strtodg.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/strtof.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/test/README#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/test/f.out#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/test/getround.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/test/xsum0.out#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/xsum0.out#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/libmilter/main.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/config.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/openbsd-compat/fake-queue.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/openbsd-compat/tree.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/gnu/lib/libgcc/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/gnu/lib/libgomp/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/gnu/lib/libgomp/config.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/gnu/usr.bin/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/gnu/usr.bin/cc/Makefile.tgt#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/gnu/usr.bin/cc/cc_tools/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/gnu/usr.bin/cc/cc_tools/elfos-undef.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/gnu/usr.bin/cc/cc_tools/freebsd64-fix.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/lib/bind/config.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_entry.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_entry.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_entry_private.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write_disk.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write_set_format_by_name.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/read_open_memory.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_acl_basic.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_acl_pax.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_bad_fd.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_compat_gtar.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_compat_zip.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_empty_write.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_entry.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_compress_program.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_data_large.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_extract.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_ar.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_cpio_bin.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_cpio_bin_Z.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_cpio_bin_bz2.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_cpio_bin_gz.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_cpio_odc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_cpio_svr4_gzip.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_cpio_svr4c_Z.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_empty.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_gtar_gz.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_gtar_sparse.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_iso_gz.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_isorr_bz2.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_mtree.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_pax_bz2.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_tar.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_tar_empty_filename.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_tbz.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_tgz.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_tz.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_zip.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_large.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_pax_truncated.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_position.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_truncated.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_tar_filenames.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_tar_large.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_write_compress.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_write_compress_program.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_write_disk.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_write_disk_hardlink.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_write_disk_perms.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_write_disk_secure.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_write_format_ar.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_write_format_cpio.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_write_format_cpio_empty.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_write_format_cpio_newc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_write_format_cpio_odc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_write_format_shar_empty.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_write_format_tar.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_write_format_tar_empty.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_write_open_memory.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/rtld-elf/rtld.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/md5/md5.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/cpu_switch.S#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/machdep.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/ia32/ia32_signal.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/powerpc/uboot/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/powerpc/uboot/metadata.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/uboot/common/Makefile.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/uboot/common/main.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/uboot/common/metadata.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/uboot/lib/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/uboot/lib/console.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/uboot/lib/elf_freebsd.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/uboot/lib/glue.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/uboot/lib/net.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/uboot/lib/reboot.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/uboot/lib/time.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bm/if_bm.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cpuctl/cpuctl.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/cxgb_ioctl.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/cxgb_main.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/cxgb_sge.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/ulp/toecore/toedev.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/k8temp/k8temp.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pci/pci_pci.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/msdosfs/msdosfs_fat.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/locore.s#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/xen_machdep.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty_ttydisc.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_socket.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_syscalls.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/aha/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/ahb/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/an/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/ar/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/ath_rate_amrr/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/ath_rate_onoe/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/ath_rate_sample/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/ce/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/cp/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/ctau/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/cx/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/digi/digi/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/fatm/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/hatm/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/hifn/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/if_tap/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/linux/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/netgraph/sync_ar/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/netgraph/sync_sr/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/patm/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/pf/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/pflog/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/rp/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/safe/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/sppp/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/sr/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/svr4/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/trm/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/ubsec/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/wlan/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/wlan_acl/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/wlan_amrr/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/wlan_ccmp/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/wlan_rssadapt/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/wlan_tkip/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/wlan_wep/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/wlan_xauth/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/route.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_hostcache.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_offload.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/toedev.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/mld6.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/aim/interrupt.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/conf/GENERIC#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/include/cache.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/include/pcpu.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/autoconf.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/cache.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/cheetah.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/genassym.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/machdep.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/mp_exception.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/mp_machdep.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/spitfire.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sun4v/sun4v/clock.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_vnops.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_extattr.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/lib/libc/stdio/test-scanfloat.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/cd2dvd/cd2dvd.sh#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/nanobsd/nanobsd.sh#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/Makefile#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/gprof/mips.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/limits/limits.1#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/limits/limits.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/locate/locate/locate.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/netstat/inet.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/netstat/main.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/netstat/netstat.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/netstat/route.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/sed/sed.1#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/cxgbtool/cxgbtool.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/cxgbtool/reg_defs_t3.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/cxgbtool/reg_defs_t3b.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/cxgbtool/reg_defs_t3c.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/cxgbtool/version.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/lpr/lpd/recvjob.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ntp/config.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pciconf/pciconf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/syslogd/syslogd.c#3 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/UPDATING#7 (text+ko) ==== @@ -41,6 +41,24 @@ Adding these drivers to your kernel configuration file shall cause compilation to fail. +20080818: + ntpd has been upgraded to 4.2.4p5. + +20080801: + OpenSSH has been upgraded to 5.1p1. + + For many years, FreeBSD's version of OpenSSH preferred DSA + over RSA for host and user authentication keys. With this + upgrade, we've switched to the vendor's default of RSA over + DSA. This may cause upgraded clients to warn about unknown + host keys even for previously known hosts. Users should + follow the usual procedure for verifying host keys before + accepting the RSA key. + + This can be circumvented by setting the "HostKeyAlgorithms" + option to "ssh-dss,ssh-rsa" in ~/.ssh/config or on the ssh + command line. + 20080713: The sio(4) driver has been removed from the i386 and amd64 kernel configuration files. This means uart(4) is now the @@ -1108,4 +1126,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.539 2008/08/20 08:31:58 ed Exp $ +$FreeBSD: src/UPDATING,v 1.541 2008/09/03 08:30:17 roberto Exp $ ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/CHANGES#3 (text+ko) ==== @@ -1,3 +1,47 @@ + --- 9.4.2-P2 released --- + +2406. [bug] Some operating systems have FD_SETSIZE set to a + low value by default, which can cause resource + exhaustion when many simultaneous connections are + open. Linux in particular makes it difficult to + increase this value. To use more sockets with + select(), set ISC_SOCKET_FDSETSIZE. Example: + STD_CDEFINES="-DISC_SOCKET_FDSETSIZE=4096" ./configure + (This should not be necessary in most cases, and + never for an authoritative-only server.) [RT #18328] + +2404. [port] hpux: files unlimited support. + +2403. [bug] TSIG context leak. [RT #18341] + +2402. [port] Support Solaris 2.11 and over. [RT #18362] + +2401. [bug] Expect to get E[MN]FILE errno internal_accept() + (from accept() or fcntl() system calls). [RT #18358] + +2399. [bug] Abort timeout queries to reduce the number of open + UDP sockets. [RT #18367] + +2398. [bug] Improve file descriptor management. New, + temporary, named.conf option reserved-sockets, + default 512. [RT #18344] + +2396. [bug] Don't set SO_REUSEADDR for randomized ports. + [RT #18336] + +2395. [port] Avoid warning and no effect from "files unlimited" + on Linux when running as root. [RT #18335] + +2394. [bug] Default configuration options set the limit for + open files to 'unlimited' as described in the + documentation. [RT #18331] + +2392. [bug] remove 'grep -q' from acl test script, some platforms + don't support it. [RT #18253] + +2322. [port] MacOS: work around the limitation of setrlimit() + for RLIMIT_NOFILE. [RT #17526] + --- 9.4.2-P1 released --- 2375. [security] Fully randomize UDP query ports to improve @@ -33,7 +77,7 @@ [RT #17113] 2249. [bug] Only set Authentic Data bit if client requested - DNSSEC, per RFC 3655 [RT #17175] + DNSSEC, per RFC 3655 [RT #17175] 2248. [cleanup] Fix several errors reported by Coverity. [RT #17160] ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/COPYRIGHT#2 (text+ko) ==== @@ -1,4 +1,4 @@ -Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") +Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") Copyright (C) 1996-2003 Internet Software Consortium. Permission to use, copy, modify, and/or distribute this software for any @@ -13,7 +13,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -$Id: COPYRIGHT,v 1.9.18.4 2007/08/28 07:19:54 tbox Exp $ +$Id: COPYRIGHT,v 1.9.18.4.10.1 2008/07/23 07:28:54 tbox Exp $ Portions Copyright (C) 1996-2001 Nominum, Inc. ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dig/dighost.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dighost.c,v 1.259.18.43 2007/08/28 07:19:55 tbox Exp $ */ +/* $Id: dighost.c,v 1.259.18.43.10.3 2008/07/23 23:16:43 marka Exp $ */ /*! \file * \note @@ -2217,14 +2217,15 @@ sockcount++; debug("sockcount=%d", sockcount); if (specified_source) - result = isc_socket_bind(query->sock, &bind_address); + result = isc_socket_bind(query->sock, &bind_address, + ISC_SOCKET_REUSEADDRESS); else { if ((isc_sockaddr_pf(&query->sockaddr) == AF_INET) && have_ipv4) isc_sockaddr_any(&bind_any); else isc_sockaddr_any6(&bind_any); - result = isc_socket_bind(query->sock, &bind_any); + result = isc_socket_bind(query->sock, &bind_any, 0); } check_result(result, "isc_socket_bind"); bringup_timer(query, TCP_TIMEOUT); @@ -2271,11 +2272,12 @@ sockcount++; debug("sockcount=%d", sockcount); if (specified_source) { - result = isc_socket_bind(query->sock, &bind_address); + result = isc_socket_bind(query->sock, &bind_address, + ISC_SOCKET_REUSEADDRESS); } else { isc_sockaddr_anyofpf(&bind_any, isc_sockaddr_pf(&query->sockaddr)); - result = isc_socket_bind(query->sock, &bind_any); + result = isc_socket_bind(query->sock, &bind_any, 0); } check_result(result, "isc_socket_bind"); ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/client.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: client.c,v 1.219.18.28.10.1 2008/05/22 21:28:04 each Exp $ */ +/* $Id: client.c,v 1.219.18.28.10.2 2008/07/23 07:28:54 tbox Exp $ */ #include ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/config.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2001-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: config.c,v 1.47.18.32 2007/09/13 05:04:01 each Exp $ */ +/* $Id: config.c,v 1.47.18.32.10.3 2008/07/23 23:48:17 tbox Exp $ */ /*! \file */ @@ -52,7 +52,7 @@ #ifndef WIN32 " coresize default;\n\ datasize default;\n\ - files default;\n\ + files unlimited;\n\ stacksize default;\n" #endif " deallocate-on-exit true;\n\ @@ -99,6 +99,7 @@ use-ixfr true;\n\ edns-udp-size 4096;\n\ max-udp-size 4096;\n\ + reserved-sockets 512;\n\ \n\ /* view */\n\ allow-notify {none;};\n\ ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/controlconf.c#2 (text+ko) ==== @@ -1,8 +1,8 @@ /* - * Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2006, 2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2001-2003 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: controlconf.c,v 1.40.18.10 2006/12/07 04:53:02 marka Exp $ */ +/* $Id: controlconf.c,v 1.40.18.10.40.3 2008/07/23 23:16:43 marka Exp $ */ /*! \file */ @@ -1151,8 +1151,8 @@ type, &listener->sock); if (result == ISC_R_SUCCESS) - result = isc_socket_bind(listener->sock, - &listener->address); + result = isc_socket_bind(listener->sock, &listener->address, + ISC_SOCKET_REUSEADDRESS); if (result == ISC_R_SUCCESS && type == isc_sockettype_unix) { listener->perm = cfg_obj_asuint32(cfg_tuple_get(control, ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/interfacemgr.c#2 (text+ko) ==== @@ -1,8 +1,8 @@ /* - * Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2006, 2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2002 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: interfacemgr.c,v 1.76.18.8 2006/07/20 01:10:30 marka Exp $ */ +/* $Id: interfacemgr.c,v 1.76.18.8.44.3 2008/07/23 23:16:43 marka Exp $ */ /*! \file */ @@ -307,7 +307,8 @@ #ifndef ISC_ALLOW_MAPPED isc_socket_ipv6only(ifp->tcpsocket, ISC_TRUE); #endif - result = isc_socket_bind(ifp->tcpsocket, &ifp->addr); + result = isc_socket_bind(ifp->tcpsocket, &ifp->addr, + ISC_SOCKET_REUSEADDRESS); if (result != ISC_R_SUCCESS) { isc_log_write(IFMGR_COMMON_LOGARGS, ISC_LOG_ERROR, "binding TCP socket: %s", ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/lwresd.c#2 (text+ko) ==== @@ -1,8 +1,8 @@ /* - * Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2006, 2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000-2003 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: lwresd.c,v 1.46.18.7 2006/03/02 00:37:21 marka Exp $ */ +/* $Id: lwresd.c,v 1.46.18.7.52.3 2008/07/23 23:16:43 marka Exp $ */ /*! \file * \brief @@ -576,7 +576,8 @@ return (result); } - result = isc_socket_bind(sock, &listener->address); + result = isc_socket_bind(sock, &listener->address, + ISC_SOCKET_REUSEADDRESS); if (result != ISC_R_SUCCESS) { char socktext[ISC_SOCKADDR_FORMATSIZE]; isc_sockaddr_format(&listener->address, socktext, ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/named.conf.docbook#2 (text+ko) ==== @@ -2,7 +2,7 @@ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" []> - + Aug 13, 2004 @@ -40,6 +40,7 @@ 2005 2006 2007 + 2008 Internet Systems Consortium, Inc. ("ISC") @@ -201,6 +202,7 @@ port integer; querylog boolean; recursing-file quoted_string; + reserved-sockets integer; random-device quoted_string; recursive-clients integer; serial-query-rate integer; ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/server.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: server.c,v 1.419.18.57.10.1 2008/05/22 21:28:04 each Exp $ */ +/* $Id: server.c,v 1.419.18.57.10.3 2008/07/23 12:04:32 marka Exp $ */ /*! \file */ @@ -2696,27 +2696,29 @@ load_configuration(const char *filename, ns_server_t *server, isc_boolean_t first_time) { - isc_result_t result; - isc_interval_t interval; + cfg_aclconfctx_t aclconfctx; + cfg_obj_t *config; cfg_parser_t *parser = NULL; - cfg_obj_t *config; + const cfg_listelt_t *element; + const cfg_obj_t *builtin_views; + const cfg_obj_t *maps[3]; + const cfg_obj_t *obj; const cfg_obj_t *options; + const cfg_obj_t *v4ports, *v6ports; const cfg_obj_t *views; - const cfg_obj_t *obj; - const cfg_obj_t *v4ports, *v6ports; - const cfg_obj_t *maps[3]; - const cfg_obj_t *builtin_views; - const cfg_listelt_t *element; dns_view_t *view = NULL; dns_view_t *view_next; + dns_viewlist_t tmpviewlist; dns_viewlist_t viewlist; - dns_viewlist_t tmpviewlist; - cfg_aclconfctx_t aclconfctx; + in_port_t listen_port; + int i; + isc_interval_t interval; + isc_resourcevalue_t files; + isc_result_t result; + isc_uint32_t heartbeat_interval; isc_uint32_t interface_interval; - isc_uint32_t heartbeat_interval; + isc_uint32_t reserved; isc_uint32_t udpsize; - in_port_t listen_port; - int i; cfg_aclconfctx_init(&aclconfctx); ISC_LIST_INIT(viewlist); @@ -2797,6 +2799,43 @@ set_limits(maps); /* + * Sanity check on "files" limit. + */ + result = isc_resource_curlimit(isc_resource_openfiles, &files); + if (result == ISC_R_SUCCESS && files < FD_SETSIZE) { + isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, + NS_LOGMODULE_SERVER, ISC_LOG_WARNING, + "the 'files' limit (%" ISC_PRINT_QUADFORMAT "u) " + "is less than FD_SETSIZE (%d), increase " + "'files' in named.conf or recompile with a " + "smaller FD_SETSIZE.", files, FD_SETSIZE); + if (files > FD_SETSIZE) + files = FD_SETSIZE; + } else + files = FD_SETSIZE; + + /* + * Set the number of socket reserved for TCP, stdio etc. + */ + obj = NULL; + result = ns_config_get(maps, "reserved-sockets", &obj); + INSIST(result == ISC_R_SUCCESS); + reserved = cfg_obj_asuint32(obj); + if (files < 128U) /* Prevent underflow. */ + reserved = 0; + else if (reserved > files - 128U) /* Mimimum UDP space. */ + reserved = files - 128; + if (reserved < 128U) /* Mimimum TCP/stdio space. */ + reserved = 128; + if (reserved + 128U > files) { + isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, + NS_LOGMODULE_SERVER, ISC_LOG_WARNING, + "less than 128 UDP sockets available after " + "applying 'reserved-sockets' and 'files'"); + } + isc__socketmgr_setreserved(ns_g_socketmgr, reserved); + + /* * Configure various server options. */ configure_server_quota(maps, "transfers-out", &server->xfroutquota); ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/rndc/rndc.c#2 (text+ko) ==== @@ -1,8 +1,8 @@ /* - * Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2006, 2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000-2003 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: rndc.c,v 1.96.18.17 2006/08/04 03:03:41 marka Exp $ */ +/* $Id: rndc.c,v 1.96.18.17.42.3 2008/07/23 23:16:43 marka Exp $ */ /*! \file */ @@ -400,10 +400,10 @@ DO("create socket", isc_socket_create(socketmgr, pf, type, &sock)); switch (isc_sockaddr_pf(addr)) { case AF_INET: - DO("bind socket", isc_socket_bind(sock, &local4)); + DO("bind socket", isc_socket_bind(sock, &local4, 0)); break; case AF_INET6: - DO("bind socket", isc_socket_bind(sock, &local6)); + DO("bind socket", isc_socket_bind(sock, &local6, 0)); break; default: break; ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/configure.in#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 1998-2003 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any @@ -18,7 +18,7 @@ esyscmd([sed "s/^/# /" COPYRIGHT])dnl AC_DIVERT_POP()dnl -AC_REVISION($Revision: 1.355.18.71 $) +AC_REVISION($Revision: 1.355.18.71.8.2 $) AC_INIT(lib/dns/name.c) AC_PREREQ(2.59) @@ -1839,7 +1839,7 @@ [*-solaris2.[89]]) hack_shutup_pthreadonceinit=yes ;; - *-solaris2.10) + *-solaris2.1[0-9]) hack_shutup_pthreadonceinit=yes ;; esac ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/Bv9ARM-book.xml#3 (text+ko) ==== @@ -2,7 +2,7 @@ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" []> - + BIND 9 Administrator Reference Manual @@ -28,6 +28,7 @@ 2005 2006 2007 + 2008 Internet Systems Consortium, Inc. ("ISC") @@ -4441,6 +4442,7 @@ max-transfer-idle-in number; max-transfer-idle-out number; tcp-clients number; + reserved-sockets number; recursive-clients number; serial-query-rate number; serial-queries number; @@ -6606,6 +6608,23 @@ + reserved-sockets + + + The number of file descriptors reserved for TCP, stdio, + etc. This needs to be big enough to cover the number of + interfaces named listens on, tcp-clients as well as + to provide room for outgoing TCP queries and incoming zone + transfers. The default is 512. + The minimum value is 128 and the + maximum value is 128 less than + 'files' or FD_SETSIZE (whichever is smaller). This + option may be removed in the future. + + + + + max-cache-size ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/configure.in#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2001, 2003 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any @@ -13,7 +13,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -AC_REVISION($Revision: 1.90.18.34 $) +AC_REVISION($Revision: 1.90.18.34.10.2 $) AC_INIT(resolv/herror.c) AC_PREREQ(2.13) @@ -2590,7 +2590,7 @@ *-solaris2.9) hack_shutup_in6addr_init_macros=yes ;; - *-solaris2.10) + *-solaris2.1[0-9]) hack_shutup_in6addr_init_macros=yes ;; esac ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind9/check.c#3 (text+ko) ==== @@ -1015,10 +1015,10 @@ isc_buffer_add(&b, strlen(zname)); tresult = dns_name_fromtext(dns_fixedname_name(&fixedname), &b, dns_rootname, ISC_TRUE, NULL); - if (tresult != ISC_R_SUCCESS) { + if (result != ISC_R_SUCCESS) { cfg_obj_log(zconfig, logctx, ISC_LOG_ERROR, "zone '%s': is not a valid name", zname); - result = ISC_R_FAILURE; + tresult = ISC_R_FAILURE; } else { char namebuf[DNS_NAME_FORMATSIZE]; ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/api#3 (text+ko) ==== @@ -1,3 +1,3 @@ LIBINTERFACE = 35 -LIBREVISION = 0 +LIBREVISION = 1 LIBAGE = 0 ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/dispatch.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dispatch.c,v 1.116.18.19.12.1 2008/05/22 21:28:06 each Exp $ */ +/* $Id: dispatch.c,v 1.116.18.19.12.5 2008/07/23 23:16:43 marka Exp $ */ /*! \file */ @@ -276,7 +276,26 @@ } /* - * ARC4 random number generator obtained from OpenBSD + * ARC4 random number generator derived from OpenBSD. + * Only dispatch_arc4random() and dispatch_arc4uniformrandom() are expected + * to be called from general dispatch routines; the rest of them are subroutines + * for these two. + * + * The original copyright follows: + * Copyright (c) 1996, David Mazieres + * Copyright (c) 2008, Damien Miller + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ static void dispatch_arc4init(arc4ctx_t *actx) { @@ -1172,7 +1191,7 @@ static isc_result_t create_socket(isc_socketmgr_t *mgr, isc_sockaddr_t *local, - isc_socket_t **sockp) + unsigned int options, isc_socket_t **sockp) { isc_socket_t *sock; isc_result_t result; @@ -1186,7 +1205,7 @@ #ifndef ISC_ALLOW_MAPPED isc_socket_ipv6only(sock, ISC_TRUE); #endif - result = isc_socket_bind(sock, local); + result = isc_socket_bind(sock, local, options); if (result != ISC_R_SUCCESS) { isc_socket_detach(&sock); return (result); @@ -1917,7 +1936,7 @@ attributes &= ~DNS_DISPATCHATTR_RANDOMPORT; goto getsocket; } - result = create_socket(sockmgr, &localaddr_bound, &sock); + result = create_socket(sockmgr, &localaddr_bound, 0, &sock); if (result == ISC_R_ADDRINUSE) { if (++k == 1024) attributes &= ~DNS_DISPATCHATTR_RANDOMPORT; @@ -1925,7 +1944,8 @@ } localport = prt; } else - result = create_socket(sockmgr, localaddr, &sock); + result = create_socket(sockmgr, localaddr, + ISC_SOCKET_REUSEADDRESS, &sock); if (result != ISC_R_SUCCESS) goto deallocate_dispatch; if ((attributes & DNS_DISPATCHATTR_RANDOMPORT) == 0 && ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/dispatch.h#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dispatch.h,v 1.48.18.5.12.1 2008/05/22 21:28:06 each Exp $ */ +/* $Id: dispatch.h,v 1.48.18.5.12.2 2008/07/23 07:28:56 tbox Exp $ */ #ifndef DNS_DISPATCH_H #define DNS_DISPATCH_H 1 ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/request.c#2 (text+ko) ==== @@ -1,8 +1,8 @@ /* - * Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2006, 2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000-2002 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Sep 3 16:25:19 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B7B7010664FB; Wed, 3 Sep 2008 16:25:19 +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 625D710664A5 for ; Wed, 3 Sep 2008 16:25:19 +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 4D4A18FC19 for ; Wed, 3 Sep 2008 16:25:19 +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 m83GPJJB020344 for ; Wed, 3 Sep 2008 16:25:19 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m83GOhMn016801 for perforce@freebsd.org; Wed, 3 Sep 2008 16:24:43 GMT (envelope-from julian@freebsd.org) Date: Wed, 3 Sep 2008 16:24:43 GMT Message-Id: <200809031624.m83GOhMn016801@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 149125 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Sep 2008 16:25:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=149125 Change 149125 by julian@julian_trafmon1 on 2008/09/03 16:24:30 IFC@149123 Affected files ... .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/bpf_jit_machdep.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/bpf_jit_machdep.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/cpu_switch.S#3 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/machdep.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/ia32/ia32_signal.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/if_ate.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/forth/loader.conf#5 integrate .. //depot/projects/vimage-commit2/src/sys/boot/powerpc/uboot/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/powerpc/uboot/metadata.c#2 delete .. //depot/projects/vimage-commit2/src/sys/boot/sparc64/loader/main.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/boot/uboot/common/Makefile.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/uboot/common/main.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/uboot/common/metadata.c#1 branch .. //depot/projects/vimage-commit2/src/sys/boot/uboot/lib/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/uboot/lib/console.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/uboot/lib/elf_freebsd.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/uboot/lib/glue.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/uboot/lib/net.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/uboot/lib/reboot.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/uboot/lib/time.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/cam/scsi/scsi_da.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/sys/cpuvar.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_getcwd.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_misc.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/subr_ndis.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_fcntl.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.mips#2 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.powerpc#2 integrate .. //depot/projects/vimage-commit2/src/sys/conf/options#9 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/altq/altq/altq_subr.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/COPYRIGHT#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/README#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/ah.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/ah_desc.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/ah_devid.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/ah_soc.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/alpha-elf.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/alpha-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/ap30.hal.o.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/ap30.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/ap43.hal.o.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/ap43.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/ap51.hal.o.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/ap51.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/ap61.hal.o.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/ap61.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/armv4-be-elf.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/armv4-le-elf.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/i386-elf.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/mips-be-elf.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/mips-le-elf.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/mips1-be-elf.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/mips1-le-elf.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/powerpc-be-elf.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/sh4-le-elf.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/sparc-be-elf.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/sparc-be-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/sparc64-be-elf.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/wackelf.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/x86_64-elf.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/xscale-be-elf.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/xscale-le-elf.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/version.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/bce/if_bce.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/bce/if_bcereg.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/bm/if_bm.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ciss/ciss.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ciss/cissreg.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cpuctl/cpuctl.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_ioctl.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_main.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_sge.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/toecore/toedev.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/dc/if_dc.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/dc/if_dcreg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_drv.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_lock.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/e1000/if_igb.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/e1000/if_igb.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ex/if_ex_pccard.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ic/ns16550.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ichwd/ichwd.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ichwd/ichwd.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ipmi/ipmi.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ipmi/ipmi_kcs.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ipmi/ipmivars.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/k8temp/k8temp.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/md/md.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pccard/pccard_cis.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pccard/pccarddevs#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pci/pci_pci.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ppc/ppc_isa.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/syscons/syscons.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/tsec/if_tsec.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/tsec/if_tsec.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/tsec/if_tsec_ocp.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/uart/uart.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/uart/uart_bus_isa.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/uart/uart_cpu_pc98.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/ehci_pci.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/ohci_pci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/ufoma.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/uipaq.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/umodem.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/uplcom.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/uvscom.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/wi/if_wi_pccard.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/xen/blkback/blkback.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/cd9660/cd9660_vnops.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/fs/coda/coda_venus.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/coda/coda_venus.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/coda/coda_vnops.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/devfs/devfs_vnops.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/fs/fdescfs/fdesc_vnops.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/hpfs/hpfs_vnops.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/msdosfs/msdosfs_fat.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/msdosfs/msdosfs_vnops.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nwfs/nwfs_io.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nwfs/nwfs_vnops.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/portalfs/portal_vnops.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/smbfs/smbfs_io.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/smbfs/smbfs_node.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/fs/smbfs/smbfs_vnops.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/tmpfs/tmpfs_vfsops.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/tmpfs/tmpfs_vnops.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/unionfs/union_subr.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/unionfs/union_vfsops.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/unionfs/union_vnops.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/geom/journal/g_journal.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/gnu/fs/ext2fs/ext2_vnops.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/cpufreq/est.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/i386/cpufreq/powernow.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/i386/cpufreq/smist.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/bpf_jit_machdep.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/bpf_jit_machdep.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/i386/ibcs2/imgact_coff.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/xen/locore.s#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/xen/xen_machdep.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/imgact_shell.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_exec.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_exit.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_linker.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_mib.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_sig.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_subr.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/subr_rman.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/subr_smp.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/subr_witness.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/tty.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/tty_inq.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/tty_outq.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/tty_ttydisc.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/uipc_mqueue.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/uipc_socket.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_default.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_lookup.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_mount.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_subr.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_syscalls.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_vnops.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vnode_if.src#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/aha/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/ahb/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/an/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/ar/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/ath_rate_amrr/Makefile#3 integrate .. //depot/projects/vimage-commit2/src/sys/modules/ath_rate_onoe/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/ath_rate_sample/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/ce/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/cp/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/ctau/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/cx/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/digi/digi/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/fatm/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/hatm/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/hifn/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/if_tap/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/linux/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/netgraph/sync_ar/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/netgraph/sync_sr/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/patm/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/pf/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/pflog/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/rp/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/safe/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/sppp/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/sr/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/svr4/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/trm/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/ubsec/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/usb/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/wi/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/wlan/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/wlan_acl/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/wlan_amrr/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/wlan_ccmp/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/wlan_rssadapt/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/wlan_tkip/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/wlan_wep/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/wlan_xauth/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/net/bpf.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/net/bpf.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/net/bpf_filter.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/net/bpf_jitter.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/net/bpf_jitter.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/net/ethernet.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/net/if.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_ethersubr.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_vlan.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/net/route.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_crypto_tkip.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_bpf.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_options.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/libalias/alias_db.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_indata.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_lock_bsd.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_output.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_pcb.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_sysctl.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_timer.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_timer.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_var.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctputil.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_hostcache.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_offload.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/toedev.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/mld6.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/udp6_usrreq.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/nfs4client/nfs4_vnops.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_bio.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_vfsops.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_vnops.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/nfsserver/nfs_serv.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/nfsserver/nfs_srvsubs.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/nlm/nlm_prot_impl.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/nlm/nlm_prot_server.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/pc98/conf/GENERIC#5 integrate .. //depot/projects/vimage-commit2/src/sys/pc98/conf/GENERIC.hints#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/aim/clock.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/aim/interrupt.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/aim/machdep.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/aim/mmu_oea.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/aim/vm_machdep.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/booke/locore.S#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/booke/machdep.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/booke/pmap.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/include/cpufunc.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/powerpc/db_interface.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/powerpc/pmap_dispatch.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/rpc/pmap_prot.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/rpc/rpcb_prot.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/security/audit/audit_arg.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/security/audit/audit_bsm.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/security/audit/audit_worker.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac_bsdextended/mac_bsdextended.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac_lomac/mac_lomac.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/conf/GENERIC#5 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/include/cache.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/include/pcpu.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/autoconf.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/cache.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/cheetah.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/genassym.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/machdep.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/mp_exception.S#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/mp_machdep.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/spitfire.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/sun4v/sun4v/clock.c#1 branch .. //depot/projects/vimage-commit2/src/sys/sys/ioccom.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/mount.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/ttydisc.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/ttyqueue.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/vnode.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/wait.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ffs/ffs_alloc.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ffs/ffs_extern.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ffs/ffs_snapshot.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ffs/ffs_softdep.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ffs/ffs_vfsops.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ffs/ffs_vnops.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ufs/ufs_extattr.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ufs/ufs_vfsops.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ufs/ufs_vnops.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/vm/swap_pager.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_mmap.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vnode_pager.c#4 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/bpf_jit_machdep.c#5 (text+ko) ==== @@ -23,14 +23,14 @@ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS intERRUPTION) HOWEVER CAUSED AND ON ANY + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.12 2008/08/18 19:14:26 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.14 2008/08/26 21:06:31 jkim Exp $"); #ifdef _KERNEL #include "opt_bpf.h" @@ -107,10 +107,6 @@ */ emit_func emitm; - /* Do not compile an empty filter. */ - if (nins == 0) - return (NULL); - /* Allocate the reference table for the jumps */ #ifdef _KERNEL stream.refs = (u_int *)malloc((nins + 1) * sizeof(u_int), ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/bpf_jit_machdep.h#5 (text+ko) ==== @@ -23,12 +23,12 @@ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS intERRUPTION) HOWEVER CAUSED AND ON ANY + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.h,v 1.9 2008/08/18 19:14:26 jkim Exp $ + * $FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.h,v 1.10 2008/08/25 20:43:13 jkim Exp $ */ #ifndef _BPF_JIT_MACHDEP_H_ ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/cpu_switch.S#3 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.162 2008/07/30 11:30:55 kib Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.163 2008/09/02 17:52:11 kib Exp $ */ #include @@ -109,8 +109,24 @@ movq %rsp,PCB_RSP(%r8) movq %rbx,PCB_RBX(%r8) movq %rax,PCB_RIP(%r8) - movq PCB_FSBASE(%r8),%r9 - movq PCB_GSBASE(%r8),%r10 + + /* + * Reread fs and gs bases. Explicit fs segment register load + * by the usermode code may change actual fs base without + * updating pcb_{fs,gs}base. + * + * %rdx still contains the mtx, save %rdx around rdmsr. + */ + movq %rdx,%r11 + movl $MSR_FSBASE,%ecx + rdmsr + shlq $32,%rdx + leaq (%rax,%rdx),%r9 + movl $MSR_KGSBASE,%ecx + rdmsr + shlq $32,%rdx + leaq (%rax,%rdx),%r10 + movq %r11,%rdx testl $PCB_32BIT,PCB_FLAGS(%r8) jnz store_seg ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/machdep.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.687 2008/07/09 19:44:37 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.688 2008/09/02 17:52:11 kib Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -734,6 +734,7 @@ pcb->pcb_fsbase = 0; pcb->pcb_gsbase = 0; critical_exit(); + pcb->pcb_flags &= ~(PCB_32BIT | PCB_GS32BIT); load_ds(_udatasel); load_es(_udatasel); load_fs(_udatasel); ==== //depot/projects/vimage-commit2/src/sys/amd64/ia32/ia32_signal.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.18 2008/07/30 11:30:55 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.19 2008/09/02 17:52:11 kib Exp $"); #include "opt_compat.h" @@ -742,5 +742,6 @@ /* Return via doreti so that we can change to a different %cs */ pcb->pcb_flags |= PCB_FULLCTX | PCB_32BIT; + pcb->pcb_flags &= ~PCB_GS32BIT; td->td_retval[1] = 0; } ==== //depot/projects/vimage-commit2/src/sys/arm/at91/if_ate.c#2 (text) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.24 2008/06/09 21:51:48 wkoszek Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.28 2008/08/31 18:20:01 imp Exp $"); #include #include @@ -170,7 +170,8 @@ struct sysctl_ctx_list *sctx; struct sysctl_oid *soid; int err; - u_char eaddr[6]; + u_char eaddr[ETHER_ADDR_LEN]; + uint32_t rnd; sc->dev = dev; err = ate_activate(dev); @@ -179,7 +180,7 @@ sc->use_rmii = (RD4(sc, ETH_CFG) & ETH_CFG_RMII) == ETH_CFG_RMII; - /*Sysctls*/ + /* Sysctls */ sctx = device_get_sysctl_ctx(dev); soid = device_get_sysctl_tree(dev); SYSCTL_ADD_UINT(sctx, SYSCTL_CHILDREN(soid), OID_AUTO, "rmii", @@ -191,8 +192,25 @@ callout_init_mtx(&sc->tick_ch, &sc->sc_mtx, 0); if ((err = ate_get_mac(sc, eaddr)) != 0) { - device_printf(dev, "No MAC address set\n"); - goto out; + /* + * No MAC address configured. Generate the random one. + */ + if (bootverbose) + device_printf(dev, + "Generating random ethernet address.\n"); + rnd = arc4random(); + + /* + * Set OUI to convenient locally assigned address. 'b' + * is 0x62, which has the locally assigned bit set, and + * the broadcast/multicast bit clear. + */ + eaddr[0] = 'b'; + eaddr[1] = 's'; + eaddr[2] = 'd'; + eaddr[3] = (rnd >> 16) & 0xff; + eaddr[4] = (rnd >> 8) & 0xff; + eaddr[5] = rnd & 0xff; } ate_set_mac(sc, eaddr); @@ -586,24 +604,29 @@ static int ate_get_mac(struct ate_softc *sc, u_char *eaddr) { + bus_size_t sa_low_reg[] = { ETH_SA1L, ETH_SA2L, ETH_SA3L, ETH_SA4L }; + bus_size_t sa_high_reg[] = { ETH_SA1H, ETH_SA2H, ETH_SA3H, ETH_SA4H }; uint32_t low, high; + int i; /* * The boot loader setup the MAC with an address, if one is set in - * the loader. The TSC loader will also set the MAC address in a - * similar way. Grab the MAC address from the SA1[HL] registers. + * the loader. Grab one MAC address from the SA[1-4][HL] registers. */ - low = RD4(sc, ETH_SA1L); - high = RD4(sc, ETH_SA1H); - if ((low | (high & 0xffff)) == 0) - return (ENXIO); - eaddr[0] = low & 0xff; - eaddr[1] = (low >> 8) & 0xff; - eaddr[2] = (low >> 16) & 0xff; - eaddr[3] = (low >> 24) & 0xff; - eaddr[4] = high & 0xff; - eaddr[5] = (high >> 8) & 0xff; - return (0); + for (i = 0; i < 4; i++) { + low = RD4(sc, sa_low_reg[i]); + high = RD4(sc, sa_high_reg[i]); + if ((low | (high & 0xffff)) != 0) { + eaddr[0] = low & 0xff; + eaddr[1] = (low >> 8) & 0xff; + eaddr[2] = (low >> 16) & 0xff; + eaddr[3] = (low >> 24) & 0xff; + eaddr[4] = high & 0xff; + eaddr[5] = (high >> 8) & 0xff; + return (0); + } + } + return (ENXIO); } static void ==== //depot/projects/vimage-commit2/src/sys/boot/forth/loader.conf#5 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.131 2008/08/11 04:54:43 weongyo Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.132 2008/08/26 13:27:48 matteo Exp $ ############################################################## ### Basic configuration options ############################ @@ -149,6 +149,7 @@ geom_eli_load="NO" # Disk encryption driver (see geli(8)) geom_gate_load="NO" # Userland disk driver (see geom_gate(4), # ggatec(8), ggated(8), ggatel(8)) +geom_journal_load="NO" # Journaled filesystem driver (see gjournal(8)) geom_label_load="NO" # File system labels (see glabel(8)) geom_md_load="NO" # Memory disk driver (vnode/swap/malloc) (see # md(4), mdconfig(8)) ==== //depot/projects/vimage-commit2/src/sys/boot/powerpc/uboot/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/powerpc/uboot/Makefile,v 1.2 2008/02/23 19:45:20 marcel Exp $ +# $FreeBSD: src/sys/boot/powerpc/uboot/Makefile,v 1.3 2008/09/03 15:52:05 raj Exp $ PROG= ubldr NEWVERSWHAT= "U-Boot loader" ${MACHINE_ARCH} @@ -7,7 +7,7 @@ NO_MAN= # Architecture-specific loader code -SRCS= start.S conf.c metadata.c vers.c +SRCS= start.S conf.c vers.c LOADER_DISK_SUPPORT?= no LOADER_UFS_SUPPORT?= no ==== //depot/projects/vimage-commit2/src/sys/boot/sparc64/loader/main.c#4 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.34 2008/08/22 20:28:19 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.35 2008/08/30 16:03:22 marius Exp $"); /* * FreeBSD/sparc64 kernel loader - machine dependent part @@ -36,6 +36,7 @@ #include #include #include +#include #include "bootstrap.h" #include "libofw.h" @@ -57,8 +58,10 @@ typedef void kernel_entry_t(vm_offset_t mdp, u_long o1, u_long o2, u_long o3, void *openfirmware); +static inline u_long dtlb_get_data_sun4u(int slot); static void dtlb_enter_sun4u(u_long vpn, u_long data); static vm_offset_t dtlb_va_to_pa_sun4u(vm_offset_t); +static inline u_long itlb_get_data_sun4u(int slot); static void itlb_enter_sun4u(u_long vpn, u_long data); static vm_offset_t itlb_va_to_pa_sun4u(vm_offset_t); extern vm_offset_t md_load(char *, vm_offset_t *); @@ -92,6 +95,7 @@ struct tlb_entry *itlb_store; int dtlb_slot; int itlb_slot; +int cpu_impl; static int dtlb_slot_max; static int itlb_slot_max; @@ -365,6 +369,30 @@ panic("%s: exec returned", __func__); } +static inline u_long +dtlb_get_data_sun4u(int slot) +{ + + /* + * We read ASI_DTLB_DATA_ACCESS_REG twice in order to work + * around errata of USIII and beyond. + */ + (void)ldxa(TLB_DAR_SLOT(slot), ASI_DTLB_DATA_ACCESS_REG); + return (ldxa(TLB_DAR_SLOT(slot), ASI_DTLB_DATA_ACCESS_REG)); +} + +static inline u_long +itlb_get_data_sun4u(int slot) +{ + + /* + * We read ASI_ITLB_DATA_ACCESS_REG twice in order to work + * around errata of USIII and beyond. + */ + (void)ldxa(TLB_DAR_SLOT(slot), ASI_ITLB_DATA_ACCESS_REG); + return (ldxa(TLB_DAR_SLOT(slot), ASI_ITLB_DATA_ACCESS_REG)); +} + static vm_offset_t dtlb_va_to_pa_sun4u(vm_offset_t va) { @@ -375,7 +403,9 @@ reg = ldxa(TLB_DAR_SLOT(i), ASI_DTLB_TAG_READ_REG); if (TLB_TAR_VA(reg) != va) continue; - reg = ldxa(TLB_DAR_SLOT(i), ASI_DTLB_DATA_ACCESS_REG); + reg = dtlb_get_data_sun4u(i); + if (cpu_impl >= CPU_IMPL_ULTRASPARCIII) + return ((reg & TD_PA_CH_MASK) >> TD_PA_SHIFT); return ((reg & TD_PA_SF_MASK) >> TD_PA_SHIFT); } return (-1); @@ -391,34 +421,38 @@ reg = ldxa(TLB_DAR_SLOT(i), ASI_ITLB_TAG_READ_REG); if (TLB_TAR_VA(reg) != va) continue; - reg = ldxa(TLB_DAR_SLOT(i), ASI_ITLB_DATA_ACCESS_REG); + reg = itlb_get_data_sun4u(i); + if (cpu_impl >= CPU_IMPL_ULTRASPARCIII) + return ((reg & TD_PA_CH_MASK) >> TD_PA_SHIFT); return ((reg & TD_PA_SF_MASK) >> TD_PA_SHIFT); } return (-1); } static void -itlb_enter_sun4u(u_long vpn, u_long data) +dtlb_enter_sun4u(u_long vpn, u_long data) { u_long reg; reg = rdpr(pstate); wrpr(pstate, reg & ~PSTATE_IE, 0); - stxa(AA_IMMU_TAR, ASI_IMMU, vpn); - stxa(0, ASI_ITLB_DATA_IN_REG, data); + stxa(AA_DMMU_TAR, ASI_DMMU, + TLB_TAR_VA(vpn) | TLB_TAR_CTX(TLB_CTX_KERNEL)); + stxa(0, ASI_DTLB_DATA_IN_REG, data); membar(Sync); wrpr(pstate, reg, 0); } static void -dtlb_enter_sun4u(u_long vpn, u_long data) +itlb_enter_sun4u(u_long vpn, u_long data) { u_long reg; reg = rdpr(pstate); wrpr(pstate, reg & ~PSTATE_IE, 0); - stxa(AA_DMMU_TAR, ASI_DMMU, vpn); - stxa(0, ASI_DTLB_DATA_IN_REG, data); + stxa(AA_IMMU_TAR, ASI_IMMU, + TLB_TAR_VA(vpn) | TLB_TAR_CTX(TLB_CTX_KERNEL)); + stxa(0, ASI_ITLB_DATA_IN_REG, data); membar(Sync); wrpr(pstate, reg, 0); } @@ -539,19 +573,18 @@ u_int bootcpu; u_int cpu; + cpu_impl = VER_IMPL(rdpr(ver)); bootcpu = UPA_CR_GET_MID(ldxa(0, ASI_UPA_CONFIG_REG)); for (child = OF_child(root); child != 0; child = OF_peer(child)) { - if (child == -1) - panic("%s: can't get child phandle", __func__); - if (OF_getprop(child, "device_type", buf, sizeof(buf)) > 0 && - strcmp(buf, "cpu") == 0) { - if (OF_getprop(child, "upa-portid", &cpu, - sizeof(cpu)) == -1 && OF_getprop(child, "portid", - &cpu, sizeof(cpu)) == -1) - panic("%s: can't get portid", __func__); - if (cpu == bootcpu) - break; - } + if (OF_getprop(child, "device_type", buf, sizeof(buf)) <= 0) + continue; + if (strcmp(buf, "cpu") != 0) + continue; + if (OF_getprop(child, cpu_impl < CPU_IMPL_ULTRASPARCIII ? + "upa-portid" : "portid", &cpu, sizeof(cpu)) <= 0) + continue; + if (cpu == bootcpu) + break; } if (cpu != bootcpu) panic("%s: no node for bootcpu?!?!", __func__); @@ -712,10 +745,14 @@ pmap_print_tlb_sun4u(void) { tte_t tag, tte; + u_long pstate; int i; + pstate = rdpr(pstate); for (i = 0; i < itlb_slot_max; i++) { - tte = ldxa(TLB_DAR_SLOT(i), ASI_ITLB_DATA_ACCESS_REG); + wrpr(pstate, pstate & ~PSTATE_IE, 0); + tte = itlb_get_data_sun4u(i); + wrpr(pstate, pstate, 0); if (!(tte & TD_V)) continue; tag = ldxa(TLB_DAR_SLOT(i), ASI_ITLB_TAG_READ_REG); @@ -723,7 +760,9 @@ pmap_print_tte_sun4u(tag, tte); } for (i = 0; i < dtlb_slot_max; i++) { - tte = ldxa(TLB_DAR_SLOT(i), ASI_DTLB_DATA_ACCESS_REG); + wrpr(pstate, pstate & ~PSTATE_IE, 0); + tte = dtlb_get_data_sun4u(i); + wrpr(pstate, pstate, 0); if (!(tte & TD_V)) continue; tag = ldxa(TLB_DAR_SLOT(i), ASI_DTLB_TAG_READ_REG); ==== //depot/projects/vimage-commit2/src/sys/boot/uboot/common/Makefile.inc#2 (text+ko) ==== @@ -1,3 +1,3 @@ -# $FreeBSD: src/sys/boot/uboot/common/Makefile.inc,v 1.1 2008/02/16 22:13:11 marcel Exp $ +# $FreeBSD: src/sys/boot/uboot/common/Makefile.inc,v 1.2 2008/09/03 15:52:05 raj Exp $ -SRCS+= main.c +SRCS+= main.c metadata.c ==== //depot/projects/vimage-commit2/src/sys/boot/uboot/common/main.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/uboot/common/main.c,v 1.3 2008/03/13 17:54:20 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/uboot/common/main.c,v 1.4 2008/09/03 15:39:50 raj Exp $"); #include @@ -46,8 +46,6 @@ extern char bootprog_date[]; extern char bootprog_maker[]; -static char bootargs[128]; - extern unsigned char _etext[]; extern unsigned char _edata[]; extern unsigned char __bss_start[]; @@ -110,10 +108,8 @@ int main(void) { - char **bargv; - char *ch; - int bargc, i; struct api_signature *sig = NULL; + int i; if (!api_search_sig(&sig)) return -1; @@ -134,7 +130,7 @@ */ cons_probe(); - printf("Compatible API signature found @%x\n", sig); + printf("Compatible API signature found @%x\n", (uint32_t)sig); dump_sig(sig); dump_addr_info(); @@ -205,7 +201,8 @@ static int command_heap(int argc, char *argv[]) { - printf("heap base at %p, top at %p, used %ld\n", end, sbrk(0), + + printf("heap base at %p, top at %p, used %d\n", end, sbrk(0), sbrk(0) - end); return(CMD_OK); ==== //depot/projects/vimage-commit2/src/sys/boot/uboot/lib/Makefile#2 (text+ko) ==== @@ -1,7 +1,8 @@ -# $FreeBSD: src/sys/boot/uboot/lib/Makefile,v 1.3 2008/03/13 17:54:21 obrien Exp $ +# $FreeBSD: src/sys/boot/uboot/lib/Makefile,v 1.4 2008/09/03 15:39:50 raj Exp $ LIB= uboot INTERNALLIB= +WARNS?= 2 SRCS= devicename.c elf_freebsd.c console.c copy.c disk.c \ module.c net.c reboot.c time.c glue.c ==== //depot/projects/vimage-commit2/src/sys/boot/uboot/lib/console.c#2 (text+ko) ==== @@ -25,10 +25,11 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/console.c,v 1.2 2008/03/12 16:01:34 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/console.c,v 1.3 2008/09/03 15:39:50 raj Exp $"); #include #include "bootstrap.h" +#include "glue.h" int console; @@ -60,7 +61,7 @@ uboot_cons_init(int arg) { - return 0; + return (0); } static void ==== //depot/projects/vimage-commit2/src/sys/boot/uboot/lib/elf_freebsd.c#2 (text+ko) ==== @@ -26,11 +26,12 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/elf_freebsd.c,v 1.2 2008/03/13 17:54:21 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/elf_freebsd.c,v 1.3 2008/09/03 15:39:50 raj Exp $"); #include #include +#include #include #include @@ -38,11 +39,13 @@ #include "bootstrap.h" +extern vm_offset_t md_load(char *, vm_offset_t *); + int __elfN(uboot_load)(char *filename, u_int64_t dest, struct preloaded_file **result) { - int r; + int r; r = __elfN(loadfile)(filename, dest, result); if (r != 0) @@ -62,20 +65,20 @@ int __elfN(uboot_exec)(struct preloaded_file *fp) { - struct file_metadata *fmp; - vm_offset_t mdp; - Elf_Ehdr *e; - int error; + struct file_metadata *fmp; + vm_offset_t mdp; + Elf_Ehdr *e; + int error; - if ((fmp = file_findmetadata(fp, MODINFOMD_ELFHDR)) == NULL) { + if ((fmp = file_findmetadata(fp, MODINFOMD_ELFHDR)) == NULL) return (EFTYPE); - } + e = (Elf_Ehdr *)&fmp->md_data; if ((error = md_load(fp->f_args, &mdp)) != 0) return (error); - printf("Kernel entry at 0x%lx ...\n", e->e_entry); + printf("Kernel entry at 0x%x ...\n", e->e_entry); dev_cleanup(); ==== //depot/projects/vimage-commit2/src/sys/boot/uboot/lib/glue.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/boot/uboot/lib/glue.h,v 1.2 2008/03/13 17:54:21 obrien Exp $ + * $FreeBSD: src/sys/boot/uboot/lib/glue.h,v 1.3 2008/09/03 15:39:50 raj Exp $ */ /* @@ -33,8 +33,10 @@ #ifndef _API_GLUE_H_ #define _API_GLUE_H_ +#include "api_public.h" + int syscall(int, int *, ...); -void * syscall_ptr; +void *syscall_ptr; int api_search_sig(struct api_signature **sig); @@ -53,16 +55,16 @@ /* system */ void ub_reset(void); -struct sys_info * ub_get_sys_info(void); +struct sys_info *ub_get_sys_info(void); /* time */ void ub_udelay(unsigned long); unsigned long ub_get_timer(unsigned long); /* env vars */ -char * ub_env_get(const char *name); +char *ub_env_get(const char *name); void ub_env_set(const char *name, char *value); -const char * ub_env_enum(const char *last); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Sep 3 16:30:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 079891068C87; Wed, 3 Sep 2008 16:30: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 BFC051068C81 for ; Wed, 3 Sep 2008 16:30:24 +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 93C758FC16 for ; Wed, 3 Sep 2008 16:30:24 +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 m83GUOxT048519 for ; Wed, 3 Sep 2008 16:30:24 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m83GUO86048513 for perforce@freebsd.org; Wed, 3 Sep 2008 16:30:24 GMT (envelope-from julian@freebsd.org) Date: Wed, 3 Sep 2008 16:30:24 GMT Message-Id: <200809031630.m83GUO86048513@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 149126 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Sep 2008 16:30:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=149126 Change 149126 by julian@julian_trafmon1 on 2008/09/03 16:29:44 replace code that appears to have been accidentally removed. Affected files ... .. //depot/projects/vimage-commit2/src/sys/kern/tty.c#6 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/kern/tty.c#6 (text+ko) ==== @@ -1495,6 +1495,8 @@ tty_flush(tp, flags); return (0); } + case TIOCDRAIN: + /* Drain TTY output. */ return tty_drain(tp); case TIOCCONS: /* Set terminal as console TTY. */ From owner-p4-projects@FreeBSD.ORG Wed Sep 3 17:58:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E3CA1107BAB5; Wed, 3 Sep 2008 17:58: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 A97C6107BAB3 for ; Wed, 3 Sep 2008 17:58:05 +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 977BF8FC08 for ; Wed, 3 Sep 2008 17:58:05 +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 m83Hw522053104 for ; Wed, 3 Sep 2008 17:58:05 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m83Hw5kp053102 for perforce@freebsd.org; Wed, 3 Sep 2008 17:58:05 GMT (envelope-from julian@freebsd.org) Date: Wed, 3 Sep 2008 17:58:05 GMT Message-Id: <200809031758.m83Hw5kp053102@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 149134 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Sep 2008 17:58:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=149134 Change 149134 by julian@julian_trafmon1 on 2008/09/03 17:57:41 Slightly clean up which files include which files. This may change but for now let's be consistent. Affected files ... .. //depot/projects/vimage-commit2/src/sys/net/if.h#5 edit .. //depot/projects/vimage-commit2/src/sys/net/if_var.h#6 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/netgraph.h#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet/in.h#3 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/net/if.h#5 (text+ko) ==== @@ -458,8 +458,4 @@ #include #endif -#ifdef _KERNEL -#include -#endif - #endif /* !_NET_IF_H_ */ ==== //depot/projects/vimage-commit2/src/sys/net/if_var.h#6 (text+ko) ==== @@ -713,6 +713,8 @@ int ether_poll_deregister(struct ifnet *ifp); #endif /* DEVICE_POLLING */ +#include + #endif /* _KERNEL */ #endif /* !_NET_IF_VAR_H_ */ ==== //depot/projects/vimage-commit2/src/sys/netgraph/netgraph.h#4 (text+ko) ==== @@ -1183,70 +1183,6 @@ #define NGI_GET_META(i,m) #define ng_copy_meta(meta) NULL +#include + #endif /* _NETGRAPH_NETGRAPH_H_ */ -/*- - * Copyright (c) 2006-2008 University of Zagreb - * Copyright (c) 2006-2008 FreeBSD Foundation - * - * This software was developed by the University of Zagreb and the - * FreeBSD Foundation under sponsorship by the Stichting NLnet and the - * FreeBSD Foundation. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef _NETGRAPH_VNETGRPAH_H_ -#define _NETGRAPH_VNETGRAPH_H_ - -#include - -#define INIT_VNET_NETGRAPH(vnet) \ - INIT_FROM_VNET(vnet, VNET_MOD_NETGRAPH, \ - struct vnet_netgraph, vnet_netgraph) - -#define VNET_NETGRAPH(sym) VSYM(vnet_netgraph, sym) - -#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 */ - -#ifdef VIMAGE -struct vnet_netgraph { - LIST_HEAD(, ng_node) _ng_ID_hash[NG_ID_HASH_SIZE]; - LIST_HEAD(, ng_node) _ng_name_hash[NG_ID_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_ng_ID_hash VNET_NETGRAPH(ng_ID_hash) -#define V_ng_name_hash VNET_NETGRAPH(ng_name_hash) -#define V_ng_nodelist VNET_NETGRAPH(ng_nodelist) -#define V_nextID VNET_NETGRAPH(nextID) -#define V_ng_iface_unit VNET_NETGRAPH(ng_iface_unit) -#define V_ng_eiface_unit VNET_NETGRAPH(ng_eiface_unit) -#define V_ng_wormhole_unit VNET_NETGRAPH(ng_wormhole_unit) - -#endif /* !_NETGRAPH_VNETGRAPH_H_ */ ==== //depot/projects/vimage-commit2/src/sys/netinet/in.h#3 (text+ko) ==== @@ -743,7 +743,6 @@ #undef __KAME_NETINET_IN_H_INCLUDED_ #endif - #ifdef _KERNEL #include #endif From owner-p4-projects@FreeBSD.ORG Wed Sep 3 18:29:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9242C1065CC1; Wed, 3 Sep 2008 18: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 4EE1F1065BEE for ; Wed, 3 Sep 2008 18:29:15 +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 3BB538FC13 for ; Wed, 3 Sep 2008 18:29:15 +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 m83ITFcS077268 for ; Wed, 3 Sep 2008 18:29:15 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m83ISdCK077230 for perforce@freebsd.org; Wed, 3 Sep 2008 18:28:39 GMT (envelope-from julian@freebsd.org) Date: Wed, 3 Sep 2008 18:28:39 GMT Message-Id: <200809031828.m83ISdCK077230@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 149138 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Sep 2008 18:29:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=149138 Change 149138 by julian@julian_trafmon1 on 2008/09/03 18:27:48 IFC@149137 Affected files ... .. //depot/projects/vimage/src/sys/amd64/amd64/bpf_jit_machdep.c#5 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/bpf_jit_machdep.h#5 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/cpu_switch.S#9 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/machdep.c#11 integrate .. //depot/projects/vimage/src/sys/amd64/ia32/ia32_signal.c#4 integrate .. //depot/projects/vimage/src/sys/arm/at91/if_ate.c#9 integrate .. //depot/projects/vimage/src/sys/boot/common/dev_net.c#3 integrate .. //depot/projects/vimage/src/sys/boot/common/devopen.c#2 integrate .. //depot/projects/vimage/src/sys/boot/forth/loader.conf#13 integrate .. //depot/projects/vimage/src/sys/boot/powerpc/uboot/Makefile#2 integrate .. //depot/projects/vimage/src/sys/boot/powerpc/uboot/metadata.c#3 delete .. //depot/projects/vimage/src/sys/boot/powerpc/uboot/start.S#2 integrate .. //depot/projects/vimage/src/sys/boot/sparc64/loader/main.c#6 integrate .. //depot/projects/vimage/src/sys/boot/uboot/common/Makefile.inc#2 integrate .. //depot/projects/vimage/src/sys/boot/uboot/common/main.c#3 integrate .. //depot/projects/vimage/src/sys/boot/uboot/common/metadata.c#1 branch .. //depot/projects/vimage/src/sys/boot/uboot/lib/Makefile#3 integrate .. //depot/projects/vimage/src/sys/boot/uboot/lib/console.c#3 integrate .. //depot/projects/vimage/src/sys/boot/uboot/lib/elf_freebsd.c#3 integrate .. //depot/projects/vimage/src/sys/boot/uboot/lib/glue.c#3 integrate .. //depot/projects/vimage/src/sys/boot/uboot/lib/glue.h#3 integrate .. //depot/projects/vimage/src/sys/boot/uboot/lib/net.c#3 integrate .. //depot/projects/vimage/src/sys/boot/uboot/lib/reboot.c#3 integrate .. //depot/projects/vimage/src/sys/boot/uboot/lib/time.c#3 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_da.c#14 integrate .. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate .. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#3 integrate .. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/cpuvar.h#3 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#2 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate .. //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#21 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_getcwd.c#4 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_misc.c#21 integrate .. //depot/projects/vimage/src/sys/compat/ndis/subr_ndis.c#9 integrate .. //depot/projects/vimage/src/sys/compat/svr4/svr4_fcntl.c#6 integrate .. //depot/projects/vimage/src/sys/conf/files.mips#2 integrate .. //depot/projects/vimage/src/sys/conf/files.powerpc#11 integrate .. //depot/projects/vimage/src/sys/conf/files.sun4v#8 integrate .. //depot/projects/vimage/src/sys/conf/options#32 integrate .. //depot/projects/vimage/src/sys/contrib/altq/altq/altq_subr.c#7 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/COPYRIGHT#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/README#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/ah.h#3 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/ah_desc.h#3 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/ah_devid.h#3 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/ah_soc.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#3 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/alpha-elf.inc#3 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/alpha-elf.opt_ah.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/ap30.hal.o.uu#3 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/ap30.inc#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/ap43.hal.o.uu#3 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/ap43.inc#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/ap51.hal.o.uu#3 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/ap51.inc#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/ap61.hal.o.uu#3 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/ap61.inc#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#3 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#3 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#3 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/armv4-be-elf.inc#3 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#3 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/armv4-le-elf.inc#3 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#3 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/i386-elf.inc#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#3 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/mips-be-elf.inc#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#3 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/mips-le-elf.inc#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#3 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/mips1-be-elf.inc#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#3 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/mips1-le-elf.inc#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#3 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#3 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#3 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#3 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/powerpc-be-elf.inc#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#3 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#3 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/sh4-le-elf.inc#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#3 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/sparc-be-elf.inc#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/sparc-be-elf.opt_ah.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#3 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/sparc64-be-elf.inc#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/wackelf.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#3 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/x86_64-elf.inc#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#3 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/xscale-be-elf.inc#3 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#3 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/xscale-le-elf.inc#3 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/version.h#3 integrate .. //depot/projects/vimage/src/sys/dev/bce/if_bce.c#16 integrate .. //depot/projects/vimage/src/sys/dev/bce/if_bcereg.h#11 integrate .. //depot/projects/vimage/src/sys/dev/bm/if_bm.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ciss/ciss.c#14 integrate .. //depot/projects/vimage/src/sys/dev/ciss/cissreg.h#4 integrate .. //depot/projects/vimage/src/sys/dev/cpuctl/cpuctl.c#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_ioctl.h#7 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_main.c#14 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_sge.c#14 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/toecore/toedev.c#2 integrate .. //depot/projects/vimage/src/sys/dev/dc/if_dc.c#10 integrate .. //depot/projects/vimage/src/sys/dev/dc/if_dcreg.h#5 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_drv.c#4 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_lock.c#3 integrate .. //depot/projects/vimage/src/sys/dev/e1000/if_igb.c#2 integrate .. //depot/projects/vimage/src/sys/dev/e1000/if_igb.h#2 integrate .. //depot/projects/vimage/src/sys/dev/ex/if_ex_pccard.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ic/ns16550.h#2 integrate .. //depot/projects/vimage/src/sys/dev/ichwd/ichwd.c#8 integrate .. //depot/projects/vimage/src/sys/dev/ichwd/ichwd.h#6 integrate .. //depot/projects/vimage/src/sys/dev/ipmi/ipmi.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ipmi/ipmi_kcs.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ipmi/ipmivars.h#2 integrate .. //depot/projects/vimage/src/sys/dev/k8temp/k8temp.c#4 integrate .. //depot/projects/vimage/src/sys/dev/md/md.c#8 integrate .. //depot/projects/vimage/src/sys/dev/pccard/pccard_cis.c#4 integrate .. //depot/projects/vimage/src/sys/dev/pccard/pccarddevs#9 integrate .. //depot/projects/vimage/src/sys/dev/pci/pci_pci.c#12 integrate .. //depot/projects/vimage/src/sys/dev/ppc/ppc_isa.c#3 integrate .. //depot/projects/vimage/src/sys/dev/syscons/syscons.c#10 integrate .. //depot/projects/vimage/src/sys/dev/tsec/if_tsec.c#2 integrate .. //depot/projects/vimage/src/sys/dev/tsec/if_tsec.h#2 integrate .. //depot/projects/vimage/src/sys/dev/tsec/if_tsec_ocp.c#1 branch .. //depot/projects/vimage/src/sys/dev/uart/uart.h#4 integrate .. //depot/projects/vimage/src/sys/dev/uart/uart_bus_isa.c#2 integrate .. //depot/projects/vimage/src/sys/dev/uart/uart_cpu_pc98.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/ehci_pci.c#9 integrate .. //depot/projects/vimage/src/sys/dev/usb/ohci_pci.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/ufoma.c#7 integrate .. //depot/projects/vimage/src/sys/dev/usb/uhci_pci.c#7 integrate .. //depot/projects/vimage/src/sys/dev/usb/uipaq.c#8 integrate .. //depot/projects/vimage/src/sys/dev/usb/umodem.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/uplcom.c#8 integrate .. //depot/projects/vimage/src/sys/dev/usb/uvscom.c#6 integrate .. //depot/projects/vimage/src/sys/dev/wi/if_wi_pccard.c#4 integrate .. //depot/projects/vimage/src/sys/dev/xen/blkback/blkback.c#2 integrate .. //depot/projects/vimage/src/sys/fs/cd9660/cd9660_vnops.c#3 integrate .. //depot/projects/vimage/src/sys/fs/coda/coda_venus.c#3 integrate .. //depot/projects/vimage/src/sys/fs/coda/coda_venus.h#3 integrate .. //depot/projects/vimage/src/sys/fs/coda/coda_vnops.c#4 integrate .. //depot/projects/vimage/src/sys/fs/devfs/devfs_vnops.c#17 integrate .. //depot/projects/vimage/src/sys/fs/fdescfs/fdesc_vnops.c#7 integrate .. //depot/projects/vimage/src/sys/fs/hpfs/hpfs_vnops.c#4 integrate .. //depot/projects/vimage/src/sys/fs/msdosfs/msdosfs_fat.c#9 integrate .. //depot/projects/vimage/src/sys/fs/msdosfs/msdosfs_vnops.c#12 integrate .. //depot/projects/vimage/src/sys/fs/nwfs/nwfs_io.c#3 integrate .. //depot/projects/vimage/src/sys/fs/nwfs/nwfs_vnops.c#3 integrate .. //depot/projects/vimage/src/sys/fs/portalfs/portal_vnops.c#4 integrate .. //depot/projects/vimage/src/sys/fs/pseudofs/pseudofs_vnops.c#6 integrate .. //depot/projects/vimage/src/sys/fs/smbfs/smbfs_io.c#5 integrate .. //depot/projects/vimage/src/sys/fs/smbfs/smbfs_node.c#7 integrate .. //depot/projects/vimage/src/sys/fs/smbfs/smbfs_vnops.c#5 integrate .. //depot/projects/vimage/src/sys/fs/tmpfs/tmpfs_vfsops.c#11 integrate .. //depot/projects/vimage/src/sys/fs/tmpfs/tmpfs_vnops.c#11 integrate .. //depot/projects/vimage/src/sys/fs/unionfs/union_subr.c#12 integrate .. //depot/projects/vimage/src/sys/fs/unionfs/union_vfsops.c#7 integrate .. //depot/projects/vimage/src/sys/fs/unionfs/union_vnops.c#11 integrate .. //depot/projects/vimage/src/sys/geom/journal/g_journal.c#8 integrate .. //depot/projects/vimage/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#9 integrate .. //depot/projects/vimage/src/sys/gnu/fs/ext2fs/ext2_vnops.c#6 integrate .. //depot/projects/vimage/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#5 integrate .. //depot/projects/vimage/src/sys/i386/cpufreq/est.c#6 integrate .. //depot/projects/vimage/src/sys/i386/cpufreq/powernow.c#4 integrate .. //depot/projects/vimage/src/sys/i386/cpufreq/smist.c#4 integrate .. //depot/projects/vimage/src/sys/i386/i386/bpf_jit_machdep.c#5 integrate .. //depot/projects/vimage/src/sys/i386/i386/bpf_jit_machdep.h#5 integrate .. //depot/projects/vimage/src/sys/i386/ibcs2/imgact_coff.c#6 integrate .. //depot/projects/vimage/src/sys/i386/xen/locore.s#2 integrate .. //depot/projects/vimage/src/sys/i386/xen/xen_machdep.c#4 integrate .. //depot/projects/vimage/src/sys/kern/imgact_shell.c#2 integrate .. //depot/projects/vimage/src/sys/kern/kern_exec.c#16 integrate .. //depot/projects/vimage/src/sys/kern/kern_exit.c#23 integrate .. //depot/projects/vimage/src/sys/kern/kern_linker.c#17 integrate .. //depot/projects/vimage/src/sys/kern/kern_mib.c#14 integrate .. //depot/projects/vimage/src/sys/kern/kern_sig.c#13 integrate .. //depot/projects/vimage/src/sys/kern/kern_subr.c#7 integrate .. //depot/projects/vimage/src/sys/kern/subr_rman.c#6 integrate .. //depot/projects/vimage/src/sys/kern/subr_smp.c#10 integrate .. //depot/projects/vimage/src/sys/kern/subr_witness.c#13 integrate .. //depot/projects/vimage/src/sys/kern/tty.c#19 integrate .. //depot/projects/vimage/src/sys/kern/tty_inq.c#2 integrate .. //depot/projects/vimage/src/sys/kern/tty_outq.c#2 integrate .. //depot/projects/vimage/src/sys/kern/tty_ttydisc.c#2 integrate .. //depot/projects/vimage/src/sys/kern/uipc_mqueue.c#8 integrate .. //depot/projects/vimage/src/sys/kern/uipc_socket.c#21 integrate .. //depot/projects/vimage/src/sys/kern/vfs_default.c#6 integrate .. //depot/projects/vimage/src/sys/kern/vfs_lookup.c#14 integrate .. //depot/projects/vimage/src/sys/kern/vfs_mount.c#20 integrate .. //depot/projects/vimage/src/sys/kern/vfs_subr.c#16 integrate .. //depot/projects/vimage/src/sys/kern/vfs_syscalls.c#15 integrate .. //depot/projects/vimage/src/sys/kern/vfs_vnops.c#11 integrate .. //depot/projects/vimage/src/sys/kern/vnode_if.src#7 integrate .. //depot/projects/vimage/src/sys/modules/aha/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/ahb/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/an/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/ar/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/ath_rate_amrr/Makefile#5 integrate .. //depot/projects/vimage/src/sys/modules/ath_rate_onoe/Makefile#5 integrate .. //depot/projects/vimage/src/sys/modules/ath_rate_sample/Makefile#5 integrate .. //depot/projects/vimage/src/sys/modules/ce/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/cp/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/ctau/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/cx/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/digi/digi/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/fatm/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/hatm/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/hifn/Makefile#3 integrate .. //depot/projects/vimage/src/sys/modules/if_tap/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/linux/Makefile#3 integrate .. //depot/projects/vimage/src/sys/modules/netgraph/sync_ar/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/netgraph/sync_sr/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/patm/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/pf/Makefile#3 integrate .. //depot/projects/vimage/src/sys/modules/pflog/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/rp/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/safe/Makefile#3 integrate .. //depot/projects/vimage/src/sys/modules/sppp/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/sr/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/svr4/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/trm/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/ubsec/Makefile#3 integrate .. //depot/projects/vimage/src/sys/modules/usb/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/wi/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/wlan/Makefile#4 integrate .. //depot/projects/vimage/src/sys/modules/wlan_acl/Makefile#3 integrate .. //depot/projects/vimage/src/sys/modules/wlan_amrr/Makefile#3 integrate .. //depot/projects/vimage/src/sys/modules/wlan_ccmp/Makefile#3 integrate .. //depot/projects/vimage/src/sys/modules/wlan_rssadapt/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/wlan_tkip/Makefile#3 integrate .. //depot/projects/vimage/src/sys/modules/wlan_wep/Makefile#3 integrate .. //depot/projects/vimage/src/sys/modules/wlan_xauth/Makefile#3 integrate .. //depot/projects/vimage/src/sys/net/bpf.c#25 integrate .. //depot/projects/vimage/src/sys/net/bpf.h#8 integrate .. //depot/projects/vimage/src/sys/net/bpf_filter.c#5 integrate .. //depot/projects/vimage/src/sys/net/bpf_jitter.c#3 integrate .. //depot/projects/vimage/src/sys/net/bpf_jitter.h#3 integrate .. //depot/projects/vimage/src/sys/net/ethernet.h#8 integrate .. //depot/projects/vimage/src/sys/net/if.h#8 integrate .. //depot/projects/vimage/src/sys/net/if_ethersubr.c#23 integrate .. //depot/projects/vimage/src/sys/net/if_vlan.c#10 integrate .. //depot/projects/vimage/src/sys/net/route.c#22 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211.c#20 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_crypto_tkip.c#5 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_bpf.c#4 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_pipe.c#8 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_pipe.h#3 integrate .. //depot/projects/vimage/src/sys/netinet/if_ether.c#21 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#41 integrate .. //depot/projects/vimage/src/sys/netinet/ip_options.c#13 integrate .. //depot/projects/vimage/src/sys/netinet/libalias/alias_db.c#7 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_indata.c#27 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_lock_bsd.h#11 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_output.c#31 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_pcb.c#30 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_sysctl.h#10 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_timer.c#21 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_timer.h#8 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_var.h#21 integrate .. //depot/projects/vimage/src/sys/netinet/sctputil.c#30 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#24 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_offload.c#7 integrate .. //depot/projects/vimage/src/sys/netinet/toedev.h#3 integrate .. //depot/projects/vimage/src/sys/netinet6/mld6.c#13 integrate .. //depot/projects/vimage/src/sys/netinet6/udp6_usrreq.c#27 integrate .. //depot/projects/vimage/src/sys/nfs4client/nfs4_vnops.c#7 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_bio.c#8 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_vfsops.c#19 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_vnops.c#16 integrate .. //depot/projects/vimage/src/sys/nfsserver/nfs_serv.c#8 integrate .. //depot/projects/vimage/src/sys/nfsserver/nfs_srvsubs.c#9 integrate .. //depot/projects/vimage/src/sys/nlm/nlm_prot_impl.c#8 integrate .. //depot/projects/vimage/src/sys/nlm/nlm_prot_server.c#3 integrate .. //depot/projects/vimage/src/sys/pc98/conf/GENERIC#15 integrate .. //depot/projects/vimage/src/sys/pc98/conf/GENERIC.hints#3 integrate .. //depot/projects/vimage/src/sys/powerpc/aim/clock.c#3 integrate .. //depot/projects/vimage/src/sys/powerpc/aim/interrupt.c#2 integrate .. //depot/projects/vimage/src/sys/powerpc/aim/machdep.c#5 integrate .. //depot/projects/vimage/src/sys/powerpc/aim/mmu_oea.c#4 integrate .. //depot/projects/vimage/src/sys/powerpc/aim/vm_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/powerpc/booke/locore.S#2 integrate .. //depot/projects/vimage/src/sys/powerpc/booke/machdep.c#3 integrate .. //depot/projects/vimage/src/sys/powerpc/booke/pmap.c#4 integrate .. //depot/projects/vimage/src/sys/powerpc/include/cpufunc.h#3 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/db_interface.c#3 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/pmap_dispatch.c#7 integrate .. //depot/projects/vimage/src/sys/rpc/pmap_prot.h#2 integrate .. //depot/projects/vimage/src/sys/rpc/rpcb_prot.c#2 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_arg.c#11 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_bsm.c#9 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_worker.c#11 integrate .. //depot/projects/vimage/src/sys/security/mac_bsdextended/mac_bsdextended.c#11 integrate .. //depot/projects/vimage/src/sys/security/mac_lomac/mac_lomac.c#11 integrate .. //depot/projects/vimage/src/sys/sparc64/conf/GENERIC#14 integrate .. //depot/projects/vimage/src/sys/sparc64/include/cache.h#4 integrate .. //depot/projects/vimage/src/sys/sparc64/include/clock.h#3 integrate .. //depot/projects/vimage/src/sys/sparc64/include/cpufunc.h#4 integrate .. //depot/projects/vimage/src/sys/sparc64/include/pcpu.h#6 integrate .. //depot/projects/vimage/src/sys/sparc64/include/smp.h#5 integrate .. //depot/projects/vimage/src/sys/sparc64/include/tick.h#2 integrate .. //depot/projects/vimage/src/sys/sparc64/include/ver.h#3 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/autoconf.c#3 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/cache.c#3 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/cheetah.c#4 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/clock.c#4 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/genassym.c#5 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/locore.S#4 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/machdep.c#11 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/mp_exception.S#3 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/mp_locore.S#4 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/mp_machdep.c#6 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/spitfire.c#4 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/tick.c#4 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/clock.c#1 branch .. //depot/projects/vimage/src/sys/sys/ioccom.h#2 integrate .. //depot/projects/vimage/src/sys/sys/mount.h#10 integrate .. //depot/projects/vimage/src/sys/sys/ttydisc.h#2 integrate .. //depot/projects/vimage/src/sys/sys/ttyqueue.h#2 integrate .. //depot/projects/vimage/src/sys/sys/vnode.h#10 integrate .. //depot/projects/vimage/src/sys/sys/wait.h#2 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_alloc.c#7 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_extern.h#3 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_snapshot.c#9 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_softdep.c#9 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_vfsops.c#11 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_vnops.c#11 integrate .. //depot/projects/vimage/src/sys/ufs/ufs/ufs_extattr.c#5 integrate .. //depot/projects/vimage/src/sys/ufs/ufs/ufs_vfsops.c#3 integrate .. //depot/projects/vimage/src/sys/ufs/ufs/ufs_vnops.c#9 integrate .. //depot/projects/vimage/src/sys/vm/swap_pager.c#14 integrate .. //depot/projects/vimage/src/sys/vm/vm_mmap.c#12 integrate .. //depot/projects/vimage/src/sys/vm/vnode_pager.c#10 integrate Differences ... ==== //depot/projects/vimage/src/sys/amd64/amd64/bpf_jit_machdep.c#5 (text+ko) ==== @@ -23,14 +23,14 @@ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS intERRUPTION) HOWEVER CAUSED AND ON ANY + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.12 2008/08/18 19:14:26 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.14 2008/08/26 21:06:31 jkim Exp $"); #ifdef _KERNEL #include "opt_bpf.h" @@ -107,10 +107,6 @@ */ emit_func emitm; - /* Do not compile an empty filter. */ - if (nins == 0) - return (NULL); - /* Allocate the reference table for the jumps */ #ifdef _KERNEL stream.refs = (u_int *)malloc((nins + 1) * sizeof(u_int), ==== //depot/projects/vimage/src/sys/amd64/amd64/bpf_jit_machdep.h#5 (text+ko) ==== @@ -23,12 +23,12 @@ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS intERRUPTION) HOWEVER CAUSED AND ON ANY + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.h,v 1.9 2008/08/18 19:14:26 jkim Exp $ + * $FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.h,v 1.10 2008/08/25 20:43:13 jkim Exp $ */ #ifndef _BPF_JIT_MACHDEP_H_ ==== //depot/projects/vimage/src/sys/amd64/amd64/cpu_switch.S#9 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.162 2008/07/30 11:30:55 kib Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.163 2008/09/02 17:52:11 kib Exp $ */ #include @@ -109,8 +109,24 @@ movq %rsp,PCB_RSP(%r8) movq %rbx,PCB_RBX(%r8) movq %rax,PCB_RIP(%r8) - movq PCB_FSBASE(%r8),%r9 - movq PCB_GSBASE(%r8),%r10 + + /* + * Reread fs and gs bases. Explicit fs segment register load + * by the usermode code may change actual fs base without + * updating pcb_{fs,gs}base. + * + * %rdx still contains the mtx, save %rdx around rdmsr. + */ + movq %rdx,%r11 + movl $MSR_FSBASE,%ecx + rdmsr + shlq $32,%rdx + leaq (%rax,%rdx),%r9 + movl $MSR_KGSBASE,%ecx + rdmsr + shlq $32,%rdx + leaq (%rax,%rdx),%r10 + movq %r11,%rdx testl $PCB_32BIT,PCB_FLAGS(%r8) jnz store_seg ==== //depot/projects/vimage/src/sys/amd64/amd64/machdep.c#11 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.687 2008/07/09 19:44:37 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.688 2008/09/02 17:52:11 kib Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -734,6 +734,7 @@ pcb->pcb_fsbase = 0; pcb->pcb_gsbase = 0; critical_exit(); + pcb->pcb_flags &= ~(PCB_32BIT | PCB_GS32BIT); load_ds(_udatasel); load_es(_udatasel); load_fs(_udatasel); ==== //depot/projects/vimage/src/sys/amd64/ia32/ia32_signal.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.18 2008/07/30 11:30:55 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.19 2008/09/02 17:52:11 kib Exp $"); #include "opt_compat.h" @@ -742,5 +742,6 @@ /* Return via doreti so that we can change to a different %cs */ pcb->pcb_flags |= PCB_FULLCTX | PCB_32BIT; + pcb->pcb_flags &= ~PCB_GS32BIT; td->td_retval[1] = 0; } ==== //depot/projects/vimage/src/sys/arm/at91/if_ate.c#9 (text) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.24 2008/06/09 21:51:48 wkoszek Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.28 2008/08/31 18:20:01 imp Exp $"); #include #include @@ -170,7 +170,8 @@ struct sysctl_ctx_list *sctx; struct sysctl_oid *soid; int err; - u_char eaddr[6]; + u_char eaddr[ETHER_ADDR_LEN]; + uint32_t rnd; sc->dev = dev; err = ate_activate(dev); @@ -179,7 +180,7 @@ sc->use_rmii = (RD4(sc, ETH_CFG) & ETH_CFG_RMII) == ETH_CFG_RMII; - /*Sysctls*/ + /* Sysctls */ sctx = device_get_sysctl_ctx(dev); soid = device_get_sysctl_tree(dev); SYSCTL_ADD_UINT(sctx, SYSCTL_CHILDREN(soid), OID_AUTO, "rmii", @@ -191,8 +192,25 @@ callout_init_mtx(&sc->tick_ch, &sc->sc_mtx, 0); if ((err = ate_get_mac(sc, eaddr)) != 0) { - device_printf(dev, "No MAC address set\n"); - goto out; + /* + * No MAC address configured. Generate the random one. + */ + if (bootverbose) + device_printf(dev, + "Generating random ethernet address.\n"); + rnd = arc4random(); + + /* + * Set OUI to convenient locally assigned address. 'b' + * is 0x62, which has the locally assigned bit set, and + * the broadcast/multicast bit clear. + */ + eaddr[0] = 'b'; + eaddr[1] = 's'; + eaddr[2] = 'd'; + eaddr[3] = (rnd >> 16) & 0xff; + eaddr[4] = (rnd >> 8) & 0xff; + eaddr[5] = rnd & 0xff; } ate_set_mac(sc, eaddr); @@ -586,24 +604,29 @@ static int ate_get_mac(struct ate_softc *sc, u_char *eaddr) { + bus_size_t sa_low_reg[] = { ETH_SA1L, ETH_SA2L, ETH_SA3L, ETH_SA4L }; + bus_size_t sa_high_reg[] = { ETH_SA1H, ETH_SA2H, ETH_SA3H, ETH_SA4H }; uint32_t low, high; + int i; /* * The boot loader setup the MAC with an address, if one is set in - * the loader. The TSC loader will also set the MAC address in a - * similar way. Grab the MAC address from the SA1[HL] registers. + * the loader. Grab one MAC address from the SA[1-4][HL] registers. */ - low = RD4(sc, ETH_SA1L); - high = RD4(sc, ETH_SA1H); - if ((low | (high & 0xffff)) == 0) - return (ENXIO); - eaddr[0] = low & 0xff; - eaddr[1] = (low >> 8) & 0xff; - eaddr[2] = (low >> 16) & 0xff; - eaddr[3] = (low >> 24) & 0xff; - eaddr[4] = high & 0xff; - eaddr[5] = (high >> 8) & 0xff; - return (0); + for (i = 0; i < 4; i++) { + low = RD4(sc, sa_low_reg[i]); + high = RD4(sc, sa_high_reg[i]); + if ((low | (high & 0xffff)) != 0) { + eaddr[0] = low & 0xff; + eaddr[1] = (low >> 8) & 0xff; + eaddr[2] = (low >> 16) & 0xff; + eaddr[3] = (low >> 24) & 0xff; + eaddr[4] = high & 0xff; + eaddr[5] = (high >> 8) & 0xff; + return (0); + } + } + return (ENXIO); } static void ==== //depot/projects/vimage/src/sys/boot/common/dev_net.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/* * $NetBSD: dev_net.c,v 1.12 1997/12/10 20:38:37 gwr Exp $ */ @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/common/dev_net.c,v 1.16 2008/03/12 16:01:33 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/common/dev_net.c,v 1.17 2008/09/03 17:41:44 raj Exp $"); /*- * This module implements a "raw device" interface suitable for @@ -90,20 +90,21 @@ static int net_getparams(int sock); struct devsw netdev = { - "net", - DEVT_NET, - net_init, - net_strategy, - net_open, - net_close, - noioctl, - net_print + "net", + DEVT_NET, + net_init, + net_strategy, + net_open, + net_close, + noioctl, + net_print }; int net_init(void) { - return 0; + + return (0); } /* @@ -114,75 +115,74 @@ int net_open(struct open_file *f, ...) { - va_list args; - char *devname; /* Device part of file name (or NULL). */ - int error = 0; + va_list args; + char *devname; /* Device part of file name (or NULL). */ + int error = 0; - va_start(args, f); - devname = va_arg(args, char*); - va_end(args); + va_start(args, f); + devname = va_arg(args, char*); + va_end(args); - /* On first open, do netif open, mount, etc. */ - if (netdev_opens == 0) { - /* Find network interface. */ - if (netdev_sock < 0) { - netdev_sock = netif_open(devname); - if (netdev_sock < 0) { - printf("net_open: netif_open() failed\n"); - return (ENXIO); - } - if (debug) - printf("net_open: netif_open() succeeded\n"); - } - if (rootip.s_addr == 0) { - /* Get root IP address, and path, etc. */ - error = net_getparams(netdev_sock); - if (error) { + /* On first open, do netif open, mount, etc. */ + if (netdev_opens == 0) { + /* Find network interface. */ + if (netdev_sock < 0) { + netdev_sock = netif_open(devname); + if (netdev_sock < 0) { + printf("net_open: netif_open() failed\n"); + return (ENXIO); + } + if (debug) + printf("net_open: netif_open() succeeded\n"); + } + if (rootip.s_addr == 0) { + /* Get root IP address, and path, etc. */ + error = net_getparams(netdev_sock); + if (error) { /* getparams makes its own noise */ - netif_close(netdev_sock); - netdev_sock = -1; - return (error); - } + netif_close(netdev_sock); + netdev_sock = -1; + return (error); + } + } } - } - netdev_opens++; - f->f_devdata = &netdev_sock; - return (error); + netdev_opens++; + f->f_devdata = &netdev_sock; + return (error); } int -net_close(f) - struct open_file *f; +net_close(struct open_file *f) { - #ifdef NETIF_DEBUG - if (debug) - printf("net_close: opens=%d\n", netdev_opens); + if (debug) + printf("net_close: opens=%d\n", netdev_opens); #endif - /* On last close, do netif close, etc. */ - f->f_devdata = NULL; - /* Extra close call? */ - if (netdev_opens <= 0) + /* On last close, do netif close, etc. */ + f->f_devdata = NULL; + /* Extra close call? */ + if (netdev_opens <= 0) + return (0); + netdev_opens--; + /* Not last close? */ + if (netdev_opens > 0) + return(0); + rootip.s_addr = 0; + if (netdev_sock >= 0) { + if (debug) + printf("net_close: calling netif_close()\n"); + netif_close(netdev_sock); + netdev_sock = -1; + } return (0); - netdev_opens--; - /* Not last close? */ - if (netdev_opens > 0) - return(0); - rootip.s_addr = 0; - if (netdev_sock >= 0) { - if (debug) - printf("net_close: calling netif_close()\n"); - netif_close(netdev_sock); - netdev_sock = -1; - } - return (0); } int net_strategy() { - return EIO; + + return (EIO); } #define SUPPORT_BOOTP @@ -205,106 +205,118 @@ extern n_long ip_convertaddr(char *p); static int -net_getparams(sock) - int sock; +net_getparams(int sock) { - char buf[MAXHOSTNAMELEN]; - char temp[FNAME_SIZE]; - struct iodesc *d; - int i; - n_long smask; + char buf[MAXHOSTNAMELEN]; + char temp[FNAME_SIZE]; + struct iodesc *d; + int i; + n_long smask; #ifdef SUPPORT_BOOTP - /* - * Try to get boot info using BOOTP. If we succeed, then - * the server IP address, gateway, and root path will all - * be initialized. If any remain uninitialized, we will - * use RARP and RPC/bootparam (the Sun way) to get them. - */ - if (try_bootp) - bootp(sock, BOOTP_NONE); - if (myip.s_addr != 0) - goto exit; - if (debug) - printf("net_open: BOOTP failed, trying RARP/RPC...\n"); + /* + * Try to get boot info using BOOTP. If we succeed, then + * the server IP address, gateway, and root path will all + * be initialized. If any remain uninitialized, we will + * use RARP and RPC/bootparam (the Sun way) to get them. + */ + if (try_bootp) + bootp(sock, BOOTP_NONE); + if (myip.s_addr != 0) + goto exit; + if (debug) + printf("net_open: BOOTP failed, trying RARP/RPC...\n"); #endif - /* - * Use RARP to get our IP address. This also sets our - * netmask to the "natural" default for our address. - */ - if (rarp_getipaddress(sock)) { - printf("net_open: RARP failed\n"); - return (EIO); - } - printf("net_open: client addr: %s\n", inet_ntoa(myip)); + /* + * Use RARP to get our IP address. This also sets our + * netmask to the "natural" default for our address. + */ + if (rarp_getipaddress(sock)) { + printf("net_open: RARP failed\n"); + return (EIO); + } + printf("net_open: client addr: %s\n", inet_ntoa(myip)); - /* Get our hostname, server IP address, gateway. */ - if (bp_whoami(sock)) { - printf("net_open: bootparam/whoami RPC failed\n"); - return (EIO); - } - if (debug) - printf("net_open: client name: %s\n", hostname); + /* Get our hostname, server IP address, gateway. */ + if (bp_whoami(sock)) { + printf("net_open: bootparam/whoami RPC failed\n"); + return (EIO); + } + if (debug) + printf("net_open: client name: %s\n", hostname); - /* - * Ignore the gateway from whoami (unreliable). - * Use the "gateway" parameter instead. - */ - smask = 0; - gateip.s_addr = 0; - if (bp_getfile(sock, "gateway", &gateip, buf) == 0) { - /* Got it! Parse the netmask. */ - smask = ip_convertaddr(buf); - } - if (smask) { - netmask = smask; - if (debug) - printf("net_open: subnet mask: %s\n", intoa(netmask)); - } - if (gateip.s_addr && debug) - printf("net_open: net gateway: %s\n", inet_ntoa(gateip)); + /* + * Ignore the gateway from whoami (unreliable). + * Use the "gateway" parameter instead. + */ + smask = 0; + gateip.s_addr = 0; + if (bp_getfile(sock, "gateway", &gateip, buf) == 0) { + /* Got it! Parse the netmask. */ + smask = ip_convertaddr(buf); + } + if (smask) { + netmask = smask; + if (debug) + printf("net_open: subnet mask: %s\n", intoa(netmask)); + } + if (gateip.s_addr && debug) + printf("net_open: net gateway: %s\n", inet_ntoa(gateip)); - /* Get the root server and pathname. */ - if (bp_getfile(sock, "root", &rootip, rootpath)) { - printf("net_open: bootparam/getfile RPC failed\n"); - return (EIO); - } - exit: - /* - * If present, strip the server's address off of the rootpath - * before passing it along. This allows us to be compatible with - * the kernel's diskless (BOOTP_NFSROOT) booting conventions - */ - for (i = 0; rootpath[i] != '\0' && i < FNAME_SIZE; i++) - if (rootpath[i] == ':') - break; - if (i && i != FNAME_SIZE && rootpath[i] == ':') { - rootpath[i++] = '\0'; - if (inet_addr(&rootpath[0]) != INADDR_NONE) - rootip.s_addr = inet_addr(&rootpath[0]); - bcopy(&rootpath[i], &temp[0], strlen(&rootpath[i])+1); - bcopy(&temp[0], &rootpath[0], strlen(&rootpath[i])+1); - } - if (debug) { - printf("net_open: server addr: %s\n", inet_ntoa(rootip)); - printf("net_open: server path: %s\n", rootpath); - } + /* Get the root server and pathname. */ + if (bp_getfile(sock, "root", &rootip, rootpath)) { + printf("net_open: bootparam/getfile RPC failed\n"); + return (EIO); + } +exit: + /* + * If present, strip the server's address off of the rootpath + * before passing it along. This allows us to be compatible with + * the kernel's diskless (BOOTP_NFSROOT) booting conventions + */ + for (i = 0; rootpath[i] != '\0' && i < FNAME_SIZE; i++) + if (rootpath[i] == ':') + break; + if (i && i != FNAME_SIZE && rootpath[i] == ':') { + rootpath[i++] = '\0'; + if (inet_addr(&rootpath[0]) != INADDR_NONE) + rootip.s_addr = inet_addr(&rootpath[0]); + bcopy(&rootpath[i], &temp[0], strlen(&rootpath[i])+1); + bcopy(&temp[0], &rootpath[0], strlen(&rootpath[i])+1); + } + if (debug) { + printf("net_open: server addr: %s\n", inet_ntoa(rootip)); + printf("net_open: server path: %s\n", rootpath); + } - d = socktodesc(sock); - sprintf(temp, "%6D", d->myea, ":"); - setenv("boot.netif.ip", inet_ntoa(myip), 1); - setenv("boot.netif.netmask", intoa(netmask), 1); - setenv("boot.netif.gateway", inet_ntoa(gateip), 1); - setenv("boot.netif.hwaddr", temp, 1); - setenv("boot.nfsroot.server", inet_ntoa(rootip), 1); - setenv("boot.nfsroot.path", rootpath, 1); + d = socktodesc(sock); + sprintf(temp, "%6D", d->myea, ":"); + setenv("boot.netif.ip", inet_ntoa(myip), 1); + setenv("boot.netif.netmask", intoa(netmask), 1); + setenv("boot.netif.gateway", inet_ntoa(gateip), 1); + setenv("boot.netif.hwaddr", temp, 1); + setenv("boot.nfsroot.server", inet_ntoa(rootip), 1); + setenv("boot.nfsroot.path", rootpath, 1); - return (0); + return (0); } static void net_print(int verbose) { - return; + struct netif_driver *drv; + int i, d, cnt; + + cnt = 0; + for (d = 0; netif_drivers[d]; d++) { + drv = netif_drivers[d]; + for (i = 0; i < drv->netif_nifs; i++) { + printf("\t%s%d:", "net", cnt++); + if (verbose) + printf(" (%s%d)", drv->netif_bname, + drv->netif_ifs[i].dif_unit); + } + } + printf("\n"); } ==== //depot/projects/vimage/src/sys/boot/common/devopen.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/common/devopen.c,v 1.5 2006/11/02 00:02:22 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/common/devopen.c,v 1.6 2008/09/03 17:41:44 raj Exp $"); #include #include @@ -35,32 +35,33 @@ int devopen(struct open_file *f, const char *fname, const char **file) { - struct devdesc *dev; - int result; + struct devdesc *dev; + int result; - result = archsw.arch_getdev((void **)&dev, fname, file); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Sep 3 18:32:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B178C106598A; Wed, 3 Sep 2008 18:32:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7502A1065931 for ; Wed, 3 Sep 2008 18:32:18 +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 622548FC0A for ; Wed, 3 Sep 2008 18:32:18 +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 m83IWI9I092012 for ; Wed, 3 Sep 2008 18:32:18 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m83IWIZ3092010 for perforce@freebsd.org; Wed, 3 Sep 2008 18:32:18 GMT (envelope-from julian@freebsd.org) Date: Wed, 3 Sep 2008 18:32:18 GMT Message-Id: <200809031832.m83IWIZ3092010@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 149139 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Sep 2008 18:32:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=149139 Change 149139 by julian@julian_trafmon1 on 2008/09/03 18:31:55 Loop back ng_pipe and a few nits. @149137 Affected files ... .. //depot/projects/vimage-commit2/src/sys/boot/common/dev_net.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/boot/common/devopen.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/powerpc/uboot/start.S#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/uboot/common/main.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/boot/uboot/lib/glue.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/uboot/lib/glue.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.sun4v#2 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_pipe.c#1 branch .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_pipe.h#1 branch .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/include/clock.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/include/cpufunc.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/include/pcpu.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/include/smp.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/include/tick.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/include/ver.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/clock.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/genassym.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/locore.S#4 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/machdep.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/mp_locore.S#3 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/mp_machdep.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/tick.c#3 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/boot/common/dev_net.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/* * $NetBSD: dev_net.c,v 1.12 1997/12/10 20:38:37 gwr Exp $ */ @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/common/dev_net.c,v 1.16 2008/03/12 16:01:33 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/common/dev_net.c,v 1.17 2008/09/03 17:41:44 raj Exp $"); /*- * This module implements a "raw device" interface suitable for @@ -90,20 +90,21 @@ static int net_getparams(int sock); struct devsw netdev = { - "net", - DEVT_NET, - net_init, - net_strategy, - net_open, - net_close, - noioctl, - net_print + "net", + DEVT_NET, + net_init, + net_strategy, + net_open, + net_close, + noioctl, + net_print }; int net_init(void) { - return 0; + + return (0); } /* @@ -114,75 +115,74 @@ int net_open(struct open_file *f, ...) { - va_list args; - char *devname; /* Device part of file name (or NULL). */ - int error = 0; + va_list args; + char *devname; /* Device part of file name (or NULL). */ + int error = 0; - va_start(args, f); - devname = va_arg(args, char*); - va_end(args); + va_start(args, f); + devname = va_arg(args, char*); + va_end(args); - /* On first open, do netif open, mount, etc. */ - if (netdev_opens == 0) { - /* Find network interface. */ - if (netdev_sock < 0) { - netdev_sock = netif_open(devname); - if (netdev_sock < 0) { - printf("net_open: netif_open() failed\n"); - return (ENXIO); - } - if (debug) - printf("net_open: netif_open() succeeded\n"); - } - if (rootip.s_addr == 0) { - /* Get root IP address, and path, etc. */ - error = net_getparams(netdev_sock); - if (error) { + /* On first open, do netif open, mount, etc. */ + if (netdev_opens == 0) { + /* Find network interface. */ + if (netdev_sock < 0) { + netdev_sock = netif_open(devname); + if (netdev_sock < 0) { + printf("net_open: netif_open() failed\n"); + return (ENXIO); + } + if (debug) + printf("net_open: netif_open() succeeded\n"); + } + if (rootip.s_addr == 0) { + /* Get root IP address, and path, etc. */ + error = net_getparams(netdev_sock); + if (error) { /* getparams makes its own noise */ - netif_close(netdev_sock); - netdev_sock = -1; - return (error); - } + netif_close(netdev_sock); + netdev_sock = -1; + return (error); + } + } } - } - netdev_opens++; - f->f_devdata = &netdev_sock; - return (error); + netdev_opens++; + f->f_devdata = &netdev_sock; + return (error); } int -net_close(f) - struct open_file *f; +net_close(struct open_file *f) { - #ifdef NETIF_DEBUG - if (debug) - printf("net_close: opens=%d\n", netdev_opens); + if (debug) + printf("net_close: opens=%d\n", netdev_opens); #endif - /* On last close, do netif close, etc. */ - f->f_devdata = NULL; - /* Extra close call? */ - if (netdev_opens <= 0) + /* On last close, do netif close, etc. */ + f->f_devdata = NULL; + /* Extra close call? */ + if (netdev_opens <= 0) + return (0); + netdev_opens--; + /* Not last close? */ + if (netdev_opens > 0) + return(0); + rootip.s_addr = 0; + if (netdev_sock >= 0) { + if (debug) + printf("net_close: calling netif_close()\n"); + netif_close(netdev_sock); + netdev_sock = -1; + } return (0); - netdev_opens--; - /* Not last close? */ - if (netdev_opens > 0) - return(0); - rootip.s_addr = 0; - if (netdev_sock >= 0) { - if (debug) - printf("net_close: calling netif_close()\n"); - netif_close(netdev_sock); - netdev_sock = -1; - } - return (0); } int net_strategy() { - return EIO; + + return (EIO); } #define SUPPORT_BOOTP @@ -205,106 +205,118 @@ extern n_long ip_convertaddr(char *p); static int -net_getparams(sock) - int sock; +net_getparams(int sock) { - char buf[MAXHOSTNAMELEN]; - char temp[FNAME_SIZE]; - struct iodesc *d; - int i; - n_long smask; + char buf[MAXHOSTNAMELEN]; + char temp[FNAME_SIZE]; + struct iodesc *d; + int i; + n_long smask; #ifdef SUPPORT_BOOTP - /* - * Try to get boot info using BOOTP. If we succeed, then - * the server IP address, gateway, and root path will all - * be initialized. If any remain uninitialized, we will - * use RARP and RPC/bootparam (the Sun way) to get them. - */ - if (try_bootp) - bootp(sock, BOOTP_NONE); - if (myip.s_addr != 0) - goto exit; - if (debug) - printf("net_open: BOOTP failed, trying RARP/RPC...\n"); + /* + * Try to get boot info using BOOTP. If we succeed, then + * the server IP address, gateway, and root path will all + * be initialized. If any remain uninitialized, we will + * use RARP and RPC/bootparam (the Sun way) to get them. + */ + if (try_bootp) + bootp(sock, BOOTP_NONE); + if (myip.s_addr != 0) + goto exit; + if (debug) + printf("net_open: BOOTP failed, trying RARP/RPC...\n"); #endif - /* - * Use RARP to get our IP address. This also sets our - * netmask to the "natural" default for our address. - */ - if (rarp_getipaddress(sock)) { - printf("net_open: RARP failed\n"); - return (EIO); - } - printf("net_open: client addr: %s\n", inet_ntoa(myip)); + /* + * Use RARP to get our IP address. This also sets our + * netmask to the "natural" default for our address. + */ + if (rarp_getipaddress(sock)) { + printf("net_open: RARP failed\n"); + return (EIO); + } + printf("net_open: client addr: %s\n", inet_ntoa(myip)); - /* Get our hostname, server IP address, gateway. */ - if (bp_whoami(sock)) { - printf("net_open: bootparam/whoami RPC failed\n"); - return (EIO); - } - if (debug) - printf("net_open: client name: %s\n", hostname); + /* Get our hostname, server IP address, gateway. */ + if (bp_whoami(sock)) { + printf("net_open: bootparam/whoami RPC failed\n"); + return (EIO); + } + if (debug) + printf("net_open: client name: %s\n", hostname); - /* - * Ignore the gateway from whoami (unreliable). - * Use the "gateway" parameter instead. - */ - smask = 0; - gateip.s_addr = 0; - if (bp_getfile(sock, "gateway", &gateip, buf) == 0) { - /* Got it! Parse the netmask. */ - smask = ip_convertaddr(buf); - } - if (smask) { - netmask = smask; - if (debug) - printf("net_open: subnet mask: %s\n", intoa(netmask)); - } - if (gateip.s_addr && debug) - printf("net_open: net gateway: %s\n", inet_ntoa(gateip)); + /* + * Ignore the gateway from whoami (unreliable). + * Use the "gateway" parameter instead. + */ + smask = 0; + gateip.s_addr = 0; + if (bp_getfile(sock, "gateway", &gateip, buf) == 0) { + /* Got it! Parse the netmask. */ + smask = ip_convertaddr(buf); + } + if (smask) { + netmask = smask; + if (debug) + printf("net_open: subnet mask: %s\n", intoa(netmask)); + } + if (gateip.s_addr && debug) + printf("net_open: net gateway: %s\n", inet_ntoa(gateip)); - /* Get the root server and pathname. */ - if (bp_getfile(sock, "root", &rootip, rootpath)) { - printf("net_open: bootparam/getfile RPC failed\n"); - return (EIO); - } - exit: - /* - * If present, strip the server's address off of the rootpath - * before passing it along. This allows us to be compatible with - * the kernel's diskless (BOOTP_NFSROOT) booting conventions - */ - for (i = 0; rootpath[i] != '\0' && i < FNAME_SIZE; i++) - if (rootpath[i] == ':') - break; - if (i && i != FNAME_SIZE && rootpath[i] == ':') { - rootpath[i++] = '\0'; - if (inet_addr(&rootpath[0]) != INADDR_NONE) - rootip.s_addr = inet_addr(&rootpath[0]); - bcopy(&rootpath[i], &temp[0], strlen(&rootpath[i])+1); - bcopy(&temp[0], &rootpath[0], strlen(&rootpath[i])+1); - } - if (debug) { - printf("net_open: server addr: %s\n", inet_ntoa(rootip)); - printf("net_open: server path: %s\n", rootpath); - } + /* Get the root server and pathname. */ + if (bp_getfile(sock, "root", &rootip, rootpath)) { + printf("net_open: bootparam/getfile RPC failed\n"); + return (EIO); + } +exit: + /* + * If present, strip the server's address off of the rootpath + * before passing it along. This allows us to be compatible with + * the kernel's diskless (BOOTP_NFSROOT) booting conventions + */ + for (i = 0; rootpath[i] != '\0' && i < FNAME_SIZE; i++) + if (rootpath[i] == ':') + break; + if (i && i != FNAME_SIZE && rootpath[i] == ':') { + rootpath[i++] = '\0'; + if (inet_addr(&rootpath[0]) != INADDR_NONE) + rootip.s_addr = inet_addr(&rootpath[0]); + bcopy(&rootpath[i], &temp[0], strlen(&rootpath[i])+1); + bcopy(&temp[0], &rootpath[0], strlen(&rootpath[i])+1); + } + if (debug) { + printf("net_open: server addr: %s\n", inet_ntoa(rootip)); + printf("net_open: server path: %s\n", rootpath); + } - d = socktodesc(sock); - sprintf(temp, "%6D", d->myea, ":"); - setenv("boot.netif.ip", inet_ntoa(myip), 1); - setenv("boot.netif.netmask", intoa(netmask), 1); - setenv("boot.netif.gateway", inet_ntoa(gateip), 1); - setenv("boot.netif.hwaddr", temp, 1); - setenv("boot.nfsroot.server", inet_ntoa(rootip), 1); - setenv("boot.nfsroot.path", rootpath, 1); + d = socktodesc(sock); + sprintf(temp, "%6D", d->myea, ":"); + setenv("boot.netif.ip", inet_ntoa(myip), 1); + setenv("boot.netif.netmask", intoa(netmask), 1); + setenv("boot.netif.gateway", inet_ntoa(gateip), 1); + setenv("boot.netif.hwaddr", temp, 1); + setenv("boot.nfsroot.server", inet_ntoa(rootip), 1); + setenv("boot.nfsroot.path", rootpath, 1); - return (0); + return (0); } static void net_print(int verbose) { - return; + struct netif_driver *drv; + int i, d, cnt; + + cnt = 0; + for (d = 0; netif_drivers[d]; d++) { + drv = netif_drivers[d]; + for (i = 0; i < drv->netif_nifs; i++) { + printf("\t%s%d:", "net", cnt++); + if (verbose) + printf(" (%s%d)", drv->netif_bname, + drv->netif_ifs[i].dif_unit); + } + } + printf("\n"); } ==== //depot/projects/vimage-commit2/src/sys/boot/common/devopen.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/common/devopen.c,v 1.5 2006/11/02 00:02:22 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/common/devopen.c,v 1.6 2008/09/03 17:41:44 raj Exp $"); #include #include @@ -35,32 +35,33 @@ int devopen(struct open_file *f, const char *fname, const char **file) { - struct devdesc *dev; - int result; + struct devdesc *dev; + int result; - result = archsw.arch_getdev((void **)&dev, fname, file); - if (result) - return (result); + result = archsw.arch_getdev((void **)&dev, fname, file); + if (result) + return (result); - /* point to device-specific data so that device open can use it */ - f->f_devdata = dev; - result = dev->d_dev->dv_open(f, dev); - if (result != 0) { - f->f_devdata = NULL; - free(dev); - return (result); - } + /* point to device-specific data so that device open can use it */ + f->f_devdata = dev; + result = dev->d_dev->dv_open(f, dev); + if (result != 0) { + f->f_devdata = NULL; + free(dev); + return (result); + } - /* reference the devsw entry from the open_file structure */ - f->f_dev = dev->d_dev; - return (0); + /* reference the devsw entry from the open_file structure */ + f->f_dev = dev->d_dev; + return (0); } int devclose(struct open_file *f) { - if (f->f_devdata != NULL) { - free(f->f_devdata); - } - return(0); + + if (f->f_devdata != NULL) { + free(f->f_devdata); + } + return (0); } ==== //depot/projects/vimage-commit2/src/sys/boot/powerpc/uboot/start.S#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/powerpc/uboot/start.S,v 1.3 2008/02/23 18:42:53 marcel Exp $ + * $FreeBSD: src/sys/boot/powerpc/uboot/start.S,v 1.4 2008/09/03 16:38:27 raj Exp $ */ #include @@ -37,7 +37,7 @@ /* Hint where to look for the API signature */ lis %r11, uboot_address@ha addi %r11, %r11, uboot_address@l - stw %r2, 0(%r11) + stw %r1, 0(%r11) /* Save U-Boot's r14 */ lis %r11, saved_regs@ha addi %r11, %r11, saved_regs@l ==== //depot/projects/vimage-commit2/src/sys/boot/uboot/common/main.c#3 (text+ko) ==== @@ -1,7 +1,7 @@ /*- * Copyright (c) 2000 Benno Rice * Copyright (c) 2000 Stephane Potvin - * Copyright (c) 2007 Semihalf, Rafal Jaworowski + * Copyright (c) 2007-2008 Semihalf, Rafal Jaworowski * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/uboot/common/main.c,v 1.4 2008/09/03 15:39:50 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/uboot/common/main.c,v 1.5 2008/09/03 17:48:41 raj Exp $"); #include @@ -36,9 +36,9 @@ #include "glue.h" #include "libuboot.h" -struct uboot_devdesc currdev; -struct arch_switch archsw; /* MI/MD interface boundary */ -int devs_no; +struct uboot_devdesc currdev; +struct arch_switch archsw; /* MI/MD interface boundary */ +int devs_no; extern char end[]; extern char bootprog_name[]; @@ -53,49 +53,37 @@ extern unsigned char __sbss_end[]; extern unsigned char _end[]; -void dump_si(struct sys_info *si) +static void +dump_sig(struct api_signature *sig) { #ifdef DEBUG - printf("sys info:\n"); - printf(" clkbus\t= 0x%08x\n", si->clk_bus); - printf(" clkcpu\t= 0x%08x\n", si->clk_cpu); - printf(" bar\t\t= 0x%08x\n", si->bar); -#endif -} - -static void dump_sig(struct api_signature *sig) -{ -#ifdef DEBUG printf("signature:\n"); printf(" version\t= %d\n", sig->version); printf(" checksum\t= 0x%08x\n", sig->checksum); printf(" sc entry\t= 0x%08x\n", sig->syscall); #endif } + static void dump_addr_info(void) { #ifdef DEBUG printf("\naddresses info:\n"); - printf(" _etext (sdata) = 0x%08x\n", (u_int32_t)_etext); - printf(" _edata = 0x%08x\n", (u_int32_t)_edata); - printf(" __sbss_start = 0x%08x\n", (u_int32_t)__sbss_start); - printf(" __sbss_end = 0x%08x\n", (u_int32_t)__sbss_end); - printf(" __sbss_start = 0x%08x\n", (u_int32_t)__bss_start); - printf(" _end = 0x%08x\n", (u_int32_t)_end); - printf(" syscall entry = 0x%08x\n", (u_int32_t)syscall_ptr); + printf(" _etext (sdata) = 0x%08x\n", (uint32_t)_etext); + printf(" _edata = 0x%08x\n", (uint32_t)_edata); + printf(" __sbss_start = 0x%08x\n", (uint32_t)__sbss_start); + printf(" __sbss_end = 0x%08x\n", (uint32_t)__sbss_end); + printf(" __sbss_start = 0x%08x\n", (uint32_t)__bss_start); + printf(" _end = 0x%08x\n", (uint32_t)_end); + printf(" syscall entry = 0x%08x\n", (uint32_t)syscall_ptr); #endif } static uint64_t -memsize(int flags) +memsize(struct sys_info *si, int flags) { - int i; - struct sys_info *si; - uint64_t size; - - if ((si = ub_get_sys_info()) == NULL) - return 0; + uint64_t size; + int i; size = 0; for (i = 0; i < si->mr_no; i++) @@ -105,6 +93,25 @@ return (size); } +static void +meminfo(void) +{ + uint64_t size; + struct sys_info *si; + int t[3] = { MR_ATTR_DRAM, MR_ATTR_FLASH, MR_ATTR_SRAM }; + int i; + + if ((si = ub_get_sys_info()) == NULL) + panic("could not retrieve system info"); + + for (i = 0; i < 3; i++) { + size = memsize(si, t[i]); + if (size > 0) + printf("%s:\t %lldMB\n", ub_mem_type(t[i]), + size / 1024 / 1024); + } +} + int main(void) { @@ -112,14 +119,14 @@ int i; if (!api_search_sig(&sig)) - return -1; + return (-1); syscall_ptr = sig->syscall; if (syscall_ptr == NULL) - return -2; + return (-2); if (sig->version > API_SIG_VERSION) - return -3; + return (-3); /* Clear BSS sections */ bzero(__sbss_start, __sbss_end - __sbss_start); @@ -146,10 +153,9 @@ * Enumerate U-Boot devices */ if ((devs_no = ub_dev_enum()) == 0) - panic("no devices found"); - printf("Number of U-Boot devices found %d\n", devs_no); + panic("no U-Boot devices found"); + printf("Number of U-Boot devices: %d\n", devs_no); - /* XXX all our dv_init()s currently don't do anything... */ /* * March through the device switch probing for things. */ @@ -160,9 +166,7 @@ printf("\n"); printf("%s, Revision %s\n", bootprog_name, bootprog_rev); printf("(%s, %s)\n", bootprog_maker, bootprog_date); - printf("Memory: %lldMB\n", memsize(MR_ATTR_DRAM) / 1024 / 1024); - printf("FLASH: %lldMB\n", memsize(MR_ATTR_FLASH) / 1024 / 1024); -// printf("SRAM: %lldMB\n", memsize(MR_ATTR_SRAM) / 1024 / 1024); + meminfo(); /* XXX only support netbooting for now */ for (i = 0; devsw[i] != NULL; i++) @@ -193,7 +197,7 @@ interact(); /* doesn't return */ - return 0; + return (0); } @@ -205,7 +209,7 @@ printf("heap base at %p, top at %p, used %d\n", end, sbrk(0), sbrk(0) - end); - return(CMD_OK); + return (CMD_OK); } COMMAND_SET(reboot, "reboot", "reboot the system", command_reboot); @@ -218,3 +222,38 @@ printf("Reset failed!\n"); while(1); } + +COMMAND_SET(devinfo, "devinfo", "show U-Boot devices", command_devinfo); +static int +command_devinfo(int argc, char *argv[]) +{ + int i; + + if ((devs_no = ub_dev_enum()) == 0) { + command_errmsg = "no U-Boot devices found!?"; + return (CMD_ERROR); + } + + printf("U-Boot devices:\n"); + for (i = 0; i < devs_no; i++) { + ub_dump_di(i); + printf("\n"); + } + return (CMD_OK); +} + +COMMAND_SET(sysinfo, "sysinfo", "show U-Boot system info", command_sysinfo); +static int +command_sysinfo(int argc, char *argv[]) +{ + struct sys_info *si; + + if ((si = ub_get_sys_info()) == NULL) { + command_errmsg = "could not retrieve U-Boot sys info!?"; + return (CMD_ERROR); + } + + printf("U-Boot system info:\n"); + ub_dump_si(si); + return (CMD_OK); +} ==== //depot/projects/vimage-commit2/src/sys/boot/uboot/lib/glue.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2007 Semihalf, Rafal Jaworowski + * Copyright (c) 2007-2008 Semihalf, Rafal Jaworowski * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/glue.c,v 1.4 2008/03/13 17:54:21 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/glue.c,v 1.5 2008/09/03 17:48:41 raj Exp $"); #include #include "api_public.h" @@ -41,7 +41,7 @@ #endif /* Some random address used by U-Boot. */ -extern long uboot_address; +extern long uboot_address; /* crc32 stuff stolen from lib/libdisk/write_ia64_disk.c */ static uint32_t crc32_tab[] = { @@ -138,7 +138,6 @@ int api_search_sig(struct api_signature **sig) { - unsigned char *sp, *spend; if (sig == NULL) @@ -176,7 +175,7 @@ if (!syscall(API_GETC, NULL, (uint32_t)&c)) return (-1); - return c; + return (c); } int @@ -187,7 +186,7 @@ if (!syscall(API_TSTC, NULL, (uint32_t)&t)) return (-1); - return t; + return (t); } void @@ -313,7 +312,7 @@ di->cookie = devices[n - 1].cookie; if (!syscall(API_DEV_ENUM, NULL, di)) - return 0; + return (0); } return (n); @@ -461,6 +460,87 @@ return (err); } +static char * +ub_stor_type(int type) +{ + + if (type & DT_STOR_IDE) + return ("IDE"); + + if (type & DT_STOR_SCSI) + return ("SCSI"); + + if (type & DT_STOR_USB) + return ("USB"); + + if (type & DT_STOR_MMC); + return ("MMC"); + + return ("Unknown"); +} + +char * +ub_mem_type(int flags) +{ + + switch(flags & 0x000F) { + case MR_ATTR_FLASH: + return ("FLASH"); + case MR_ATTR_DRAM: + return ("DRAM"); + case MR_ATTR_SRAM: + return ("SRAM"); + default: + return ("Unknown"); + } +} + +void +ub_dump_di(int handle) +{ + struct device_info *di = ub_dev_get(handle); + int i; + + printf("device info (%d):\n", handle); + printf(" cookie\t= 0x%08x\n", (uint32_t)di->cookie); + printf(" type\t\t= 0x%08x\n", di->type); + + if (di->type == DEV_TYP_NET) { + printf(" hwaddr\t= "); + for (i = 0; i < 6; i++) + printf("%02x ", di->di_net.hwaddr[i]); + + printf("\n"); + + } else if (di->type & DEV_TYP_STOR) { + printf(" type\t\t= %s\n", ub_stor_type(di->type)); + printf(" blk size\t\t= %ld\n", di->di_stor.block_size); + printf(" blk count\t\t= %ld\n", di->di_stor.block_count); + } +} + +void +ub_dump_si(struct sys_info *si) +{ + int i; + + printf("sys info:\n"); + printf(" clkbus\t= %ld MHz\n", si->clk_bus / 1000 / 1000); + printf(" clkcpu\t= %ld MHz\n", si->clk_cpu / 1000 / 1000); + printf(" bar\t\t= 0x%08lx\n", si->bar); + + printf("---\n"); + for (i = 0; i < si->mr_no; i++) { + if (si->mr[i].flags == 0) + break; + + printf(" start\t= 0x%08lx\n", si->mr[i].start); + printf(" size\t= 0x%08lx\n", si->mr[i].size); + printf(" type\t= %s\n", ub_mem_type(si->mr[i].flags)); + printf("---\n"); + } +} + /**************************************** * * env vars ==== //depot/projects/vimage-commit2/src/sys/boot/uboot/lib/glue.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/boot/uboot/lib/glue.h,v 1.3 2008/09/03 15:39:50 raj Exp $ + * $FreeBSD: src/sys/boot/uboot/lib/glue.h,v 1.4 2008/09/03 17:48:41 raj Exp $ */ /* @@ -35,10 +35,10 @@ #include "api_public.h" -int syscall(int, int *, ...); -void *syscall_ptr; +int syscall(int, int *, ...); +void *syscall_ptr; -int api_search_sig(struct api_signature **sig); +int api_search_sig(struct api_signature **sig); /* * The ub_ library calls are part of the application, not U-Boot code! They @@ -48,32 +48,36 @@ */ /* console */ -int ub_getc(void); -int ub_tstc(void); -void ub_putc(char c); -void ub_puts(const char *s); +int ub_getc(void); +int ub_tstc(void); +void ub_putc(char c); +void ub_puts(const char *s); /* system */ -void ub_reset(void); +void ub_reset(void); struct sys_info *ub_get_sys_info(void); /* time */ -void ub_udelay(unsigned long); -unsigned long ub_get_timer(unsigned long); +void ub_udelay(unsigned long); +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 *name); +void ub_env_set(const char *name, char *value); +const char *ub_env_enum(const char *last); /* 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); +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); +void ub_dump_di(int); +void ub_dump_si(struct sys_info *); +char *ub_mem_type(int); + #endif /* _API_GLUE_H_ */ ==== //depot/projects/vimage-commit2/src/sys/conf/files.sun4v#2 (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.sun4v,v 1.15 2008/05/02 17:41:52 marius Exp $ +# $FreeBSD: src/sys/conf/files.sun4v,v 1.16 2008/09/03 17:31:13 marius Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -34,7 +34,7 @@ libkern/flsl.c standard sparc64/sparc64/autoconf.c standard sun4v/sun4v/bus_machdep.c standard -sparc64/sparc64/clock.c standard +sun4v/sun4v/clock.c standard sparc64/sparc64/db_disasm.c optional ddb sun4v/sun4v/db_interface.c optional ddb sun4v/sun4v/db_trace.c optional ddb ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#17 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/ip_fw2.c,v 1.190 2008/08/25 05:38:18 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/ip_fw2.c,v 1.191 2008/09/03 18:09:15 julian Exp $"); #define DEB(x) #define DDB(x) x @@ -4484,7 +4484,7 @@ continue; if ( (q->state & BOTH_SYN) != BOTH_SYN) continue; - if (TIME_LEQ( time_uptime + V_dyn_keepalive_interval, + if (TIME_LEQ(time_uptime + V_dyn_keepalive_interval, q->expire)) continue; /* too early */ if (TIME_LEQ(q->expire, time_uptime)) ==== //depot/projects/vimage-commit2/src/sys/sparc64/include/clock.h#2 (text+ko) ==== @@ -23,14 +23,16 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Sep 3 19:14:01 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8C76F1065675; Wed, 3 Sep 2008 19:14: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 506AA106566B for ; Wed, 3 Sep 2008 19:14:01 +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 3FA008FC1D for ; Wed, 3 Sep 2008 19:14:01 +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 m83JE1U7099658 for ; Wed, 3 Sep 2008 19:14:01 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m83JE164099652 for perforce@freebsd.org; Wed, 3 Sep 2008 19:14:01 GMT (envelope-from julian@freebsd.org) Date: Wed, 3 Sep 2008 19:14:01 GMT Message-Id: <200809031914.m83JE164099652@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 149143 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Sep 2008 19:14:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=149143 Change 149143 by julian@julian_trafmon1 on 2008/09/03 19:13:26 Use G_Hostname Affected files ... .. //depot/projects/vimage/src/sys/dev/firewire/firewire.c#15 edit Differences ... ==== //depot/projects/vimage/src/sys/dev/firewire/firewire.c#15 (text+ko) ==== @@ -678,7 +678,6 @@ static void fw_reset_crom(struct firewire_comm *fc) { - INIT_VPROCG(TD_TO_VPROCG(curthread)); /* XXX */ struct crom_src_buf *buf; struct crom_src *src; struct crom_chunk *root; @@ -704,7 +703,7 @@ crom_add_simple_text(src, root, &buf->vendor, "FreeBSD Project"); crom_add_entry(root, CSRKEY_HW, __FreeBSD_version); #endif - crom_add_simple_text(src, root, &buf->hw, V_hostname); + crom_add_simple_text(src, root, &buf->hw, G_hostname); } /* From owner-p4-projects@FreeBSD.ORG Wed Sep 3 19:36:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B60721065674; Wed, 3 Sep 2008 19:36: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 79D03106566B for ; Wed, 3 Sep 2008 19:36:24 +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 690A58FC1D for ; Wed, 3 Sep 2008 19:36:24 +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 m83JaO9N096160 for ; Wed, 3 Sep 2008 19:36:24 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m83JaONu096158 for perforce@freebsd.org; Wed, 3 Sep 2008 19:36:24 GMT (envelope-from julian@freebsd.org) Date: Wed, 3 Sep 2008 19:36:24 GMT Message-Id: <200809031936.m83JaONu096158@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 149146 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Sep 2008 19:36:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=149146 Change 149146 by julian@julian_trafmon1 on 2008/09/03 19:36:12 Remove this from the diff.. we ar enot doing VCPU yet. Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_clock.c#19 integrate Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_clock.c#19 (text+ko) ==== @@ -65,7 +65,6 @@ #include #include #include -#include #ifdef GPROF #include @@ -224,11 +223,6 @@ int ticks; int psratio; -#ifdef VIMAGE -u_int tot_acc_statcalls; -int last_acc_ticks; -#endif - /* * Initialize clock frequencies and start both clocks running. */ @@ -453,11 +447,9 @@ struct proc *p; long rss; long *cp_time; - int sel; td = curthread; p = td->td_proc; - INIT_VCPU(TD_TO_VCPU(td)); cp_time = (long *)PCPU_PTR(cp_time); if (usermode) { @@ -466,9 +458,9 @@ */ td->td_uticks++; if (p->p_nice > NZERO) - sel = CP_NICE; + cp_time[CP_NICE]++; else - sel = CP_USER; + cp_time[CP_USER]++; } else { /* * Came from kernel mode, so we were: @@ -485,53 +477,16 @@ if ((td->td_pflags & TDP_ITHREAD) || td->td_intr_nesting_level >= 2) { td->td_iticks++; - sel = CP_INTR; + cp_time[CP_INTR]++; } else { td->td_pticks++; td->td_sticks++; if (!TD_IS_IDLETHREAD(td)) - sel = CP_SYS; + cp_time[CP_SYS]++; else - sel = CP_IDLE; + cp_time[CP_IDLE]++; } } - cp_time[sel]++; - -#ifdef VIMAGE - if (sel != CP_INTR) - sel = CP_IDLE; - - /* Per-vcpu average accounting */ - mtx_lock_spin(&vcpu_list_mtx); - tot_acc_statcalls++; - if (!TD_IS_IDLETHREAD(td)) - V_acc_statcalls++; - - /* Deccay processing every 1/16 seconds */ - if (last_acc_ticks + (hz >> 4) <= ticks) { - u_int weight_fixp; - u_int avg0; - - last_acc_ticks = ticks; - /* - * avg0, avg1 and avg2 are stored in 16.16 fixed point format. - * weight_fixp is in 1.31 format for better accuracy. - * - * avg1 loses half of its value in roughly 150 ms. - * avg2 loses half of its value in roughly 1350 ms. - */ - weight_fixp = 0x80000000 / tot_acc_statcalls; - /* XXX list locking? */ - LIST_FOREACH(vcpu, &vcpu_head, vcpu_le) { - avg0 = (weight_fixp * V_acc_statcalls) >> 15; - V_avg1_fixp = (3 * V_avg1_fixp + avg0) >> 2; - V_avg2_fixp = (31 * V_avg2_fixp + avg0) >> 5; - V_acc_statcalls = 0; - } - tot_acc_statcalls = 0; - } - mtx_unlock_spin(&vcpu_list_mtx); -#endif /* Update resource usage integrals and maximums. */ MPASS(p->p_vmspace != NULL); From owner-p4-projects@FreeBSD.ORG Wed Sep 3 19:55:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F12BE1065679; Wed, 3 Sep 2008 19:55: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 B53CE1065676 for ; Wed, 3 Sep 2008 19:55:15 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8BDB78FC1B for ; Wed, 3 Sep 2008 19:55:15 +0000 (UTC) (envelope-from brooks@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 m83JtFbS059284 for ; Wed, 3 Sep 2008 19:55:15 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m83JtFfl059282 for perforce@freebsd.org; Wed, 3 Sep 2008 19:55:15 GMT (envelope-from brooks@freebsd.org) Date: Wed, 3 Sep 2008 19:55:15 GMT Message-Id: <200809031955.m83JtFfl059282@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis To: Perforce Change Reviews Cc: Subject: PERFORCE change 149149 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Sep 2008 19:55:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=149149 Change 149149 by brooks@brooks_coredump on 2008/09/03 19:54:52 Remove GENERIC_NODEBUG configs. They are somewhat useful, but bloat the diff slightly and are easily recreated. Approved by: bz Affected files ... .. //depot/projects/vimage-commit2/src/sys/amd64/conf/GENERIC_NODEBUG#4 delete .. //depot/projects/vimage-commit2/src/sys/i386/conf/GENERIC_NODEBUG#4 delete Differences ... From owner-p4-projects@FreeBSD.ORG Wed Sep 3 20:11:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B410A1065672; Wed, 3 Sep 2008 20:11: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 77797106566C for ; Wed, 3 Sep 2008 20:11:32 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4D76E8FC1B for ; Wed, 3 Sep 2008 20:11:32 +0000 (UTC) (envelope-from brooks@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 m83KBWPB030342 for ; Wed, 3 Sep 2008 20:11:32 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m83KBWO8030339 for perforce@freebsd.org; Wed, 3 Sep 2008 20:11:32 GMT (envelope-from brooks@freebsd.org) Date: Wed, 3 Sep 2008 20:11:32 GMT Message-Id: <200809032011.m83KBWO8030339@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis To: Perforce Change Reviews Cc: Subject: PERFORCE change 149150 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Sep 2008 20:11:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=149150 Change 149150 by brooks@brooks_coredump on 2008/09/03 20:11:08 Reduce diff to head. Don't seperate the sys and machine sections of headers for now. Affected files ... .. //depot/projects/vimage-commit2/src/sys/net/if.c#13 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/net/if.c#13 (text+ko) ==== @@ -57,7 +57,6 @@ #include #include #include - #include #include From owner-p4-projects@FreeBSD.ORG Wed Sep 3 20:18:40 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3964B1065696; Wed, 3 Sep 2008 20:18: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 F07E21065692 for ; Wed, 3 Sep 2008 20:18:39 +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 C6F148FC08 for ; Wed, 3 Sep 2008 20:18:39 +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 m83KIdig074500 for ; Wed, 3 Sep 2008 20:18:39 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m83KId3F074494 for perforce@freebsd.org; Wed, 3 Sep 2008 20:18:39 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 3 Sep 2008 20:18:39 GMT Message-Id: <200809032018.m83KId3F074494@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 149152 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Sep 2008 20:18:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=149152 Change 149152 by hselasky@hselasky_laptop001 on 2008/09/03 20:17:46 My first USB manual page. Affected files ... .. //depot/projects/usb/src/share/man/man4/usb2_core.4#1 add .. //depot/projects/usb/src/sys/dev/usb2/core/README.TXT#4 delete Differences ... From owner-p4-projects@FreeBSD.ORG Wed Sep 3 20:26:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 988581065682; Wed, 3 Sep 2008 20:26: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 5C0671065673 for ; Wed, 3 Sep 2008 20:26:48 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4B9A18FC32 for ; Wed, 3 Sep 2008 20:26:48 +0000 (UTC) (envelope-from brooks@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 m83KQmDL085491 for ; Wed, 3 Sep 2008 20:26:48 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m83KQm7I085489 for perforce@freebsd.org; Wed, 3 Sep 2008 20:26:48 GMT (envelope-from brooks@freebsd.org) Date: Wed, 3 Sep 2008 20:26:48 GMT Message-Id: <200809032026.m83KQm7I085489@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis To: Perforce Change Reviews Cc: Subject: PERFORCE change 149154 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Sep 2008 20:26:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=149154 Change 149154 by brooks@brooks_coredump on 2008/09/03 20:26:37 Remove some entierly no-op entries so this is the same as HEAD. If this code were complete, including it might make sense, but we don't want to commit #if 0 code without good reason. Affected files ... .. //depot/projects/vimage-commit2/src/sys/kern/tty.c#7 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/kern/tty.c#7 (text+ko) ==== @@ -61,7 +61,6 @@ #undef TTYDEFCHARS #include #include -#include #include @@ -710,12 +709,6 @@ done: tty_unlock(tp); return (error); } -#if 0 - /* in the old code we did this in the ioctl code.. remember this! */ - CURVNET_SET(TD_TO_VNET(curthread)); - /* fumble line discipline */ - CURVNET_RESTORE(); -#endif static struct cdevsw ttyil_cdevsw = { .d_version = D_VERSION, From owner-p4-projects@FreeBSD.ORG Wed Sep 3 20:28:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CA3DA1065679; Wed, 3 Sep 2008 20:28: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 8D454106564A for ; Wed, 3 Sep 2008 20:28: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 7C8288FC2C for ; Wed, 3 Sep 2008 20:28: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 m83KSo5G085750 for ; Wed, 3 Sep 2008 20:28:50 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m83KSoof085748 for perforce@freebsd.org; Wed, 3 Sep 2008 20:28:50 GMT (envelope-from rene@FreeBSD.org) Date: Wed, 3 Sep 2008 20:28:50 GMT Message-Id: <200809032028.m83KSoof085748@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 149155 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Sep 2008 20:28:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=149155 Change 149155 by rene@rene_self on 2008/09/03 20:28:07 Merge latest update from non-workspace copy which I edited just before my perforce account was activated. Approved by: remko (I guess) Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#10 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#10 (text+ko) ==== @@ -5307,7 +5307,7 @@ Tom Rhodes - * Herstructureerd en toegevoegd door + Geherstructureerd en toegevoegd door @@ -5319,9 +5319,102 @@ - * IPv6 + IPv6 + + IPv6 (ook bekend als IPng IP next generation) + is de nieuwe versie van het welbekende IP-protocol (ook bekend als + IPv4). Net zoals de andere huidige + *BSD-systemen, bevat &os; de referentie-implementatie van KAME + IPv6. Het &os;-systeem wordt dus geleverd met alles wat nodig is + om met IPv6 te experimenteren. Deze sectie richt zich op het + ingesteld en draaiend krijgen van IPv6. + + In de vroege jaren 1990 werden mensen zich bewust van de snel + krimpende adresruimte van IPv4. De uitbreidingssnelheid van het + Internet baarde twee grote zorgen: + + + + Geen adresruimte meer. Tegenwoordig is dit niet zo'n + probleem meer aangezien RFC1918 voor privé-adresruimte + (10.0.0.0/8, + 172.16.0.0/12, en + 192.168.0.0/16) en Network + Address Translation (NAT) worden gebruikt. + + + + De regels in de routertabellen werden te groot. Dit is + tegenwoordig nog steeds een probleem. + + + + IPv6 behandelt deze en vele andere zaken: + + + + 128-bits adresruimte. Met andere woorden, er zijn + theoretisch + 340.282.366.920.938.463.463.374.607.431.768.211.456 adressen + beschikbaar. Dit betekent dat er ongeveer 6,67 * 10^27 + IPv6-adressen per vierkante meter op onze planeet beschikbaar + zijn. + + + + Routers zullen alleen netwerkaggregatie-adressen in hun + routeertabellen opslaan en dus de gemiddelde ruimte van een + routeertabel verkleinen tot 8192 regels. + + + + IPv6 heeft ook vele andere nuttige eigenschappen zoals: + + + + Automatische adresconfiguratie (RFC2462) + + + + + Anycast-adressen + (ééen-van-velen) + + + + Verplichte multicast-adressen + + + + IPsec (IP security) + + + + Versimpelde structuur van de headers + + + + Mobiele IP + + + + Overgangsmechanismen voor IPv6 naar IPv4 + + + + Bekijk voor meer informatie: + + + + IPv6-overzicht op playground.sun.com + - + + KAME.net + + * Achtergrond over IPv6 adressen From owner-p4-projects@FreeBSD.ORG Wed Sep 3 20:47:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A5C161065673; Wed, 3 Sep 2008 20:47: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 4FCDA1065670 for ; Wed, 3 Sep 2008 20:47:46 +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 3D41C8FC22 for ; Wed, 3 Sep 2008 20:47:46 +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 m83KlkRv005630 for ; Wed, 3 Sep 2008 20:47:46 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m83Kl9DN097696 for perforce@freebsd.org; Wed, 3 Sep 2008 20:47:09 GMT (envelope-from julian@freebsd.org) Date: Wed, 3 Sep 2008 20:47:09 GMT Message-Id: <200809032047.m83Kl9DN097696@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 149157 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Sep 2008 20:47:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=149157 Change 149157 by julian@julian_trafmon1 on 2008/09/03 20:46:12 first cut at IFC@149137 Affected files ... .. //depot/projects/vimage-devel/src/sys/amd64/amd64/bpf_jit_machdep.c#4 integrate .. //depot/projects/vimage-devel/src/sys/amd64/amd64/bpf_jit_machdep.h#4 integrate .. //depot/projects/vimage-devel/src/sys/amd64/amd64/cpu_switch.S#3 integrate .. //depot/projects/vimage-devel/src/sys/amd64/amd64/dump_machdep.c#7 integrate .. //depot/projects/vimage-devel/src/sys/amd64/amd64/exception.S#2 integrate .. //depot/projects/vimage-devel/src/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/vimage-devel/src/sys/amd64/amd64/machdep.c#3 integrate .. //depot/projects/vimage-devel/src/sys/amd64/amd64/minidump_machdep.c#9 integrate .. //depot/projects/vimage-devel/src/sys/amd64/conf/GENERIC#6 integrate .. //depot/projects/vimage-devel/src/sys/amd64/ia32/ia32_signal.c#3 integrate .. //depot/projects/vimage-devel/src/sys/amd64/include/pci_cfgreg.h#2 integrate .. //depot/projects/vimage-devel/src/sys/amd64/include/pcpu.h#2 integrate .. //depot/projects/vimage-devel/src/sys/amd64/pci/pci_cfgreg.c#2 integrate .. //depot/projects/vimage-devel/src/sys/arm/arm/dump_machdep.c#7 integrate .. //depot/projects/vimage-devel/src/sys/arm/at91/at91.c#2 integrate .. //depot/projects/vimage-devel/src/sys/arm/at91/at91_pio.c#2 integrate .. //depot/projects/vimage-devel/src/sys/arm/at91/at91_piovar.h#2 integrate .. //depot/projects/vimage-devel/src/sys/arm/at91/at91_pmc.c#3 integrate .. //depot/projects/vimage-devel/src/sys/arm/at91/if_ate.c#2 integrate .. //depot/projects/vimage-devel/src/sys/arm/include/endian.h#2 integrate .. //depot/projects/vimage-devel/src/sys/arm/include/pcpu.h#2 integrate .. //depot/projects/vimage-devel/src/sys/boot/common/dev_net.c#2 integrate .. //depot/projects/vimage-devel/src/sys/boot/common/devopen.c#2 integrate .. //depot/projects/vimage-devel/src/sys/boot/forth/loader.conf#5 integrate .. //depot/projects/vimage-devel/src/sys/boot/powerpc/uboot/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/boot/powerpc/uboot/metadata.c#2 delete .. //depot/projects/vimage-devel/src/sys/boot/powerpc/uboot/start.S#2 integrate .. //depot/projects/vimage-devel/src/sys/boot/sparc64/loader/main.c#3 integrate .. //depot/projects/vimage-devel/src/sys/boot/uboot/common/Makefile.inc#2 integrate .. //depot/projects/vimage-devel/src/sys/boot/uboot/common/main.c#2 integrate .. //depot/projects/vimage-devel/src/sys/boot/uboot/common/metadata.c#1 branch .. //depot/projects/vimage-devel/src/sys/boot/uboot/lib/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/boot/uboot/lib/console.c#2 integrate .. //depot/projects/vimage-devel/src/sys/boot/uboot/lib/elf_freebsd.c#2 integrate .. //depot/projects/vimage-devel/src/sys/boot/uboot/lib/glue.c#2 integrate .. //depot/projects/vimage-devel/src/sys/boot/uboot/lib/glue.h#2 integrate .. //depot/projects/vimage-devel/src/sys/boot/uboot/lib/net.c#2 integrate .. //depot/projects/vimage-devel/src/sys/boot/uboot/lib/reboot.c#2 integrate .. //depot/projects/vimage-devel/src/sys/boot/uboot/lib/time.c#2 integrate .. //depot/projects/vimage-devel/src/sys/bsm/audit_kevents.h#3 integrate .. //depot/projects/vimage-devel/src/sys/cam/scsi/scsi_da.c#3 integrate .. //depot/projects/vimage-devel/src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate .. //depot/projects/vimage-devel/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#3 integrate .. //depot/projects/vimage-devel/src/sys/cddl/compat/opensolaris/sys/cpuvar.h#2 integrate .. //depot/projects/vimage-devel/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#2 integrate .. //depot/projects/vimage-devel/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#2 integrate .. //depot/projects/vimage-devel/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate .. //depot/projects/vimage-devel/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate .. //depot/projects/vimage-devel/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate .. //depot/projects/vimage-devel/src/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#2 integrate .. //depot/projects/vimage-devel/src/sys/compat/freebsd32/freebsd32_proto.h#3 integrate .. //depot/projects/vimage-devel/src/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate .. //depot/projects/vimage-devel/src/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate .. //depot/projects/vimage-devel/src/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate .. //depot/projects/vimage-devel/src/sys/compat/freebsd32/syscalls.master#3 integrate .. //depot/projects/vimage-devel/src/sys/compat/linprocfs/linprocfs.c#5 integrate .. //depot/projects/vimage-devel/src/sys/compat/linux/linux_getcwd.c#2 integrate .. //depot/projects/vimage-devel/src/sys/compat/linux/linux_ioctl.c#5 integrate .. //depot/projects/vimage-devel/src/sys/compat/linux/linux_misc.c#8 integrate .. //depot/projects/vimage-devel/src/sys/compat/linux/linux_socket.c#5 integrate .. //depot/projects/vimage-devel/src/sys/compat/linux/linux_stats.c#2 integrate .. //depot/projects/vimage-devel/src/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/vimage-devel/src/sys/compat/svr4/svr4_fcntl.c#2 integrate .. //depot/projects/vimage-devel/src/sys/compat/svr4/svr4_sockio.c#5 integrate .. //depot/projects/vimage-devel/src/sys/compat/svr4/svr4_stat.c#7 integrate .. //depot/projects/vimage-devel/src/sys/conf/NOTES#7 integrate .. //depot/projects/vimage-devel/src/sys/conf/files#10 integrate .. //depot/projects/vimage-devel/src/sys/conf/files.i386#6 integrate .. //depot/projects/vimage-devel/src/sys/conf/files.mips#2 integrate .. //depot/projects/vimage-devel/src/sys/conf/files.powerpc#2 integrate .. //depot/projects/vimage-devel/src/sys/conf/files.sparc64#2 integrate .. //depot/projects/vimage-devel/src/sys/conf/files.sun4v#2 integrate .. //depot/projects/vimage-devel/src/sys/conf/options#5 integrate .. //depot/projects/vimage-devel/src/sys/conf/options.sparc64#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/altq/altq/altq_subr.c#4 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/COPYRIGHT#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/README#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/ah.h#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/ah_desc.h#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/ah_devid.h#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/ah_soc.h#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/alpha-elf.inc#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/alpha-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/ap30.hal.o.uu#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/ap30.inc#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/ap43.hal.o.uu#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/ap43.inc#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/ap51.hal.o.uu#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/ap51.inc#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/ap61.hal.o.uu#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/ap61.inc#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/armv4-be-elf.inc#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/armv4-le-elf.inc#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/i386-elf.inc#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/mips-be-elf.inc#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/mips-le-elf.inc#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/mips1-be-elf.inc#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/mips1-le-elf.inc#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/powerpc-be-elf.inc#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/sh4-le-elf.inc#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/sparc-be-elf.inc#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/sparc-be-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/sparc64-be-elf.inc#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/wackelf.c#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/x86_64-elf.inc#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/xscale-be-elf.inc#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/xscale-le-elf.inc#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/dev/ath/version.h#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/ipfilter/netinet/fil.c#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#6 integrate .. //depot/projects/vimage-devel/src/sys/contrib/pf/net/pf.c#5 integrate .. //depot/projects/vimage-devel/src/sys/contrib/pf/net/pf_if.c#4 integrate .. //depot/projects/vimage-devel/src/sys/contrib/pf/net/pf_ioctl.c#5 integrate .. //depot/projects/vimage-devel/src/sys/contrib/pf/net/pf_subr.c#2 integrate .. //depot/projects/vimage-devel/src/sys/contrib/rdma/rdma_cma.c#2 integrate .. //depot/projects/vimage-devel/src/sys/ddb/db_output.c#2 integrate .. //depot/projects/vimage-devel/src/sys/ddb/db_textdump.c#4 integrate .. //depot/projects/vimage-devel/src/sys/dev/acpi_support/acpi_asus.c#5 integrate .. //depot/projects/vimage-devel/src/sys/dev/acpica/acpi.c#4 integrate .. //depot/projects/vimage-devel/src/sys/dev/agp/agp.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/bce/if_bce.c#3 integrate .. //depot/projects/vimage-devel/src/sys/dev/bce/if_bcereg.h#3 integrate .. //depot/projects/vimage-devel/src/sys/dev/bfe/if_bfe.c#4 integrate .. //depot/projects/vimage-devel/src/sys/dev/bfe/if_bfereg.h#3 integrate .. //depot/projects/vimage-devel/src/sys/dev/bm/if_bm.c#3 integrate .. //depot/projects/vimage-devel/src/sys/dev/ciss/ciss.c#4 integrate .. //depot/projects/vimage-devel/src/sys/dev/ciss/cissreg.h#4 integrate .. //depot/projects/vimage-devel/src/sys/dev/cpuctl/cpuctl.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/cxgb/cxgb_ioctl.h#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/cxgb/cxgb_main.c#4 integrate .. //depot/projects/vimage-devel/src/sys/dev/cxgb/cxgb_sge.c#4 integrate .. //depot/projects/vimage-devel/src/sys/dev/cxgb/ulp/toecore/toedev.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#7 integrate .. //depot/projects/vimage-devel/src/sys/dev/dc/if_dc.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/dc/if_dcreg.h#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/dcons/dcons.h#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/ati_pcigart.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/drm-subprocess.pl#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/drm.h#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/drmP.h#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/drm_agpsupport.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/drm_auth.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/drm_bufs.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/drm_context.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/drm_dma.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/drm_drawable.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/drm_drv.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/drm_fops.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/drm_internal.h#1 branch .. //depot/projects/vimage-devel/src/sys/dev/drm/drm_ioctl.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/drm_irq.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/drm_lock.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/drm_memory.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/drm_pci.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/drm_pciids.h#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/drm_sarea.h#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/drm_scatter.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/drm_sysctl.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/drm_vm.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/i915_dma.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/i915_drm.h#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/i915_drv.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/i915_drv.h#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/i915_irq.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/i915_mem.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/i915_suspend.c#1 branch .. //depot/projects/vimage-devel/src/sys/dev/drm/mach64_dma.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/mach64_drm.h#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/mach64_drv.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/mach64_drv.h#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/mach64_irq.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/mach64_state.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/mga_dma.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/mga_drm.h#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/mga_drv.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/mga_drv.h#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/mga_irq.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/mga_state.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/mga_warp.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/r128_cce.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/r128_drm.h#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/r128_drv.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/r128_drv.h#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/r128_irq.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/r128_state.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/r300_cmdbuf.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/r300_reg.h#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/radeon_cp.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/radeon_drm.h#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/radeon_drv.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/radeon_drv.h#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/radeon_irq.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/radeon_mem.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/radeon_microcode.h#1 branch .. //depot/projects/vimage-devel/src/sys/dev/drm/radeon_state.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/savage_bci.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/savage_drm.h#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/savage_drv.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/savage_drv.h#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/savage_state.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/sis_drv.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/sis_drv.h#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/sis_mm.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/drm/tdfx_drv.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/e1000/if_igb.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/e1000/if_igb.h#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/ex/if_ex.c#3 integrate .. //depot/projects/vimage-devel/src/sys/dev/ex/if_ex_isa.c#3 integrate .. //depot/projects/vimage-devel/src/sys/dev/ex/if_ex_pccard.c#3 integrate .. //depot/projects/vimage-devel/src/sys/dev/ex/if_exvar.h#3 integrate .. //depot/projects/vimage-devel/src/sys/dev/firewire/firewire.c#5 integrate .. //depot/projects/vimage-devel/src/sys/dev/gem/if_gem.c#3 integrate .. //depot/projects/vimage-devel/src/sys/dev/ic/ns16550.h#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/ichwd/ichwd.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/ichwd/ichwd.h#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/iicbus/iiconf.c#3 integrate .. //depot/projects/vimage-devel/src/sys/dev/ipmi/ipmi.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/ipmi/ipmi_kcs.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/ipmi/ipmivars.h#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/k8temp/k8temp.c#3 integrate .. //depot/projects/vimage-devel/src/sys/dev/lmc/if_lmc.c#4 integrate .. //depot/projects/vimage-devel/src/sys/dev/md/md.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/mfi/mfi.c#3 integrate .. //depot/projects/vimage-devel/src/sys/dev/mii/mii.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/mii/mlphy.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/mii/tlphy.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/mxge/if_mxge_var.h#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/nmdm/nmdm.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/ofw/ofw_console.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/pccard/pccard_cis.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/pccard/pccard_cis_quirks.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/pccard/pccarddevs#5 integrate .. //depot/projects/vimage-devel/src/sys/dev/pci/pci.c#4 integrate .. //depot/projects/vimage-devel/src/sys/dev/pci/pci_pci.c#5 integrate .. //depot/projects/vimage-devel/src/sys/dev/pci/pcireg.h#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/ppbus/if_plip.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/ppbus/ppbconf.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/ppc/ppc.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/ppc/ppc_acpi.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/ppc/ppc_isa.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/ppc/ppcreg.h#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/puc/pucdata.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/sis/if_sis.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/sound/midi/sequencer.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/sound/pci/csa.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/sound/pcm/sound.h#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/sound/usb/uaudio.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/syscons/daemon/daemon_saver.c#7 integrate .. //depot/projects/vimage-devel/src/sys/dev/syscons/schistory.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/syscons/scmouse.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/syscons/scterm-sc.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/syscons/scvesactl.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/syscons/scvidctl.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/syscons/syscons.c#3 integrate .. //depot/projects/vimage-devel/src/sys/dev/syscons/syscons.h#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/syscons/sysmouse.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/tsec/if_tsec.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/tsec/if_tsec.h#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/tsec/if_tsec_ocp.c#1 branch .. //depot/projects/vimage-devel/src/sys/dev/uart/uart.h#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/uart/uart_bus_isa.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/uart/uart_core.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/uart/uart_cpu_pc98.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/uart/uart_tty.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/usb/ehci.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/usb/ehci_pci.c#3 integrate .. //depot/projects/vimage-devel/src/sys/dev/usb/ehcireg.h#3 integrate .. //depot/projects/vimage-devel/src/sys/dev/usb/ehcivar.h#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/usb/hid.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/usb/if_rum.c#4 integrate .. //depot/projects/vimage-devel/src/sys/dev/usb/ohci_pci.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/usb/ubsa.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/usb/ucom.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/usb/ucomvar.h#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/usb/ufoma.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/usb/uftdi.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/usb/uipaq.c#3 integrate .. //depot/projects/vimage-devel/src/sys/dev/usb/umass.c#3 integrate .. //depot/projects/vimage-devel/src/sys/dev/usb/umodem.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/usb/ums.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/usb/uplcom.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/usb/usb.h#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/usb/usbdevs#6 integrate .. //depot/projects/vimage-devel/src/sys/dev/usb/uvisor.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/usb/uvscom.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/vx/if_vx_eisa.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/wi/if_wi_pccard.c#3 integrate .. //depot/projects/vimage-devel/src/sys/dev/wpi/if_wpi.c#3 integrate .. //depot/projects/vimage-devel/src/sys/dev/xen/blkback/blkback.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/xen/blkfront/blkfront.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/xen/console/console.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/xen/netfront/netfront.c#2 integrate .. //depot/projects/vimage-devel/src/sys/fs/cd9660/cd9660_rrip.c#6 integrate .. //depot/projects/vimage-devel/src/sys/fs/cd9660/cd9660_vnops.c#2 integrate .. //depot/projects/vimage-devel/src/sys/fs/coda/coda_venus.c#2 integrate .. //depot/projects/vimage-devel/src/sys/fs/coda/coda_venus.h#2 integrate .. //depot/projects/vimage-devel/src/sys/fs/coda/coda_vnops.c#2 integrate .. //depot/projects/vimage-devel/src/sys/fs/devfs/devfs_vnops.c#4 integrate .. //depot/projects/vimage-devel/src/sys/fs/fdescfs/fdesc_vnops.c#2 integrate .. //depot/projects/vimage-devel/src/sys/fs/hpfs/hpfs_vnops.c#2 integrate .. //depot/projects/vimage-devel/src/sys/fs/msdosfs/msdosfs_fat.c#2 integrate .. //depot/projects/vimage-devel/src/sys/fs/msdosfs/msdosfs_vnops.c#3 integrate .. //depot/projects/vimage-devel/src/sys/fs/nwfs/nwfs_io.c#2 integrate .. //depot/projects/vimage-devel/src/sys/fs/nwfs/nwfs_vnops.c#2 integrate .. //depot/projects/vimage-devel/src/sys/fs/portalfs/portal_vnops.c#2 integrate .. //depot/projects/vimage-devel/src/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate .. //depot/projects/vimage-devel/src/sys/fs/smbfs/smbfs_io.c#2 integrate .. //depot/projects/vimage-devel/src/sys/fs/smbfs/smbfs_node.c#3 integrate .. //depot/projects/vimage-devel/src/sys/fs/smbfs/smbfs_vnops.c#2 integrate .. //depot/projects/vimage-devel/src/sys/fs/tmpfs/tmpfs_vfsops.c#2 integrate .. //depot/projects/vimage-devel/src/sys/fs/tmpfs/tmpfs_vnops.c#2 integrate .. //depot/projects/vimage-devel/src/sys/fs/unionfs/union_subr.c#2 integrate .. //depot/projects/vimage-devel/src/sys/fs/unionfs/union_vfsops.c#2 integrate .. //depot/projects/vimage-devel/src/sys/fs/unionfs/union_vnops.c#2 integrate .. //depot/projects/vimage-devel/src/sys/geom/journal/g_journal.c#3 integrate .. //depot/projects/vimage-devel/src/sys/geom/vinum/geom_vinum_drive.c#4 integrate .. //depot/projects/vimage-devel/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#2 integrate .. //depot/projects/vimage-devel/src/sys/gnu/fs/ext2fs/ext2_vnops.c#2 integrate .. //depot/projects/vimage-devel/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#2 integrate .. //depot/projects/vimage-devel/src/sys/i386/conf/GENERIC#6 integrate .. //depot/projects/vimage-devel/src/sys/i386/conf/NOTES#9 integrate .. //depot/projects/vimage-devel/src/sys/i386/conf/XBOX#2 integrate .. //depot/projects/vimage-devel/src/sys/i386/conf/XEN#2 integrate .. //depot/projects/vimage-devel/src/sys/i386/cpufreq/est.c#3 integrate .. //depot/projects/vimage-devel/src/sys/i386/cpufreq/powernow.c#3 integrate .. //depot/projects/vimage-devel/src/sys/i386/cpufreq/smist.c#3 integrate .. //depot/projects/vimage-devel/src/sys/i386/i386/bpf_jit_machdep.c#4 integrate .. //depot/projects/vimage-devel/src/sys/i386/i386/bpf_jit_machdep.h#4 integrate .. //depot/projects/vimage-devel/src/sys/i386/i386/dump_machdep.c#8 integrate .. //depot/projects/vimage-devel/src/sys/i386/i386/local_apic.c#2 integrate .. //depot/projects/vimage-devel/src/sys/i386/i386/machdep.c#3 integrate .. //depot/projects/vimage-devel/src/sys/i386/i386/minidump_machdep.c#8 integrate .. //depot/projects/vimage-devel/src/sys/i386/i386/vm_machdep.c#3 integrate .. //depot/projects/vimage-devel/src/sys/i386/ibcs2/ibcs2_ioctl.c#2 integrate .. //depot/projects/vimage-devel/src/sys/i386/ibcs2/ibcs2_socksys.c#7 integrate .. //depot/projects/vimage-devel/src/sys/i386/ibcs2/imgact_coff.c#2 integrate .. //depot/projects/vimage-devel/src/sys/i386/include/cpufunc.h#4 integrate .. //depot/projects/vimage-devel/src/sys/i386/include/pci_cfgreg.h#2 integrate .. //depot/projects/vimage-devel/src/sys/i386/include/pcpu.h#3 integrate .. //depot/projects/vimage-devel/src/sys/i386/include/pmap.h#4 integrate .. //depot/projects/vimage-devel/src/sys/i386/include/xen/xenfunc.h#2 integrate .. //depot/projects/vimage-devel/src/sys/i386/include/xen/xenpmap.h#2 integrate .. //depot/projects/vimage-devel/src/sys/i386/include/xen/xenvar.h#2 integrate .. //depot/projects/vimage-devel/src/sys/i386/isa/dpms.c#1 branch .. //depot/projects/vimage-devel/src/sys/i386/pci/pci_cfgreg.c#3 integrate .. //depot/projects/vimage-devel/src/sys/i386/xen/exception.s#2 integrate .. //depot/projects/vimage-devel/src/sys/i386/xen/locore.s#2 integrate .. //depot/projects/vimage-devel/src/sys/i386/xen/pmap.c#2 integrate .. //depot/projects/vimage-devel/src/sys/i386/xen/xen_machdep.c#2 integrate .. //depot/projects/vimage-devel/src/sys/ia64/conf/GENERIC#3 integrate .. //depot/projects/vimage-devel/src/sys/ia64/conf/SKI#2 integrate .. //depot/projects/vimage-devel/src/sys/ia64/ia64/dump_machdep.c#7 integrate .. //depot/projects/vimage-devel/src/sys/ia64/ia64/ssc.c#2 integrate .. //depot/projects/vimage-devel/src/sys/ia64/include/pcpu.h#2 integrate .. //depot/projects/vimage-devel/src/sys/isa/isa_common.c#2 integrate .. //depot/projects/vimage-devel/src/sys/isa/isavar.h#2 integrate .. //depot/projects/vimage-devel/src/sys/kern/imgact_shell.c#2 integrate .. //depot/projects/vimage-devel/src/sys/kern/init_main.c#5 integrate .. //depot/projects/vimage-devel/src/sys/kern/init_sysent.c#2 integrate .. //depot/projects/vimage-devel/src/sys/kern/kern_acct.c#2 integrate .. //depot/projects/vimage-devel/src/sys/kern/kern_conf.c#5 integrate .. //depot/projects/vimage-devel/src/sys/kern/kern_descrip.c#4 integrate .. //depot/projects/vimage-devel/src/sys/kern/kern_exec.c#5 integrate .. //depot/projects/vimage-devel/src/sys/kern/kern_exit.c#7 integrate .. //depot/projects/vimage-devel/src/sys/kern/kern_intr.c#4 integrate .. //depot/projects/vimage-devel/src/sys/kern/kern_jail.c#7 integrate .. //depot/projects/vimage-devel/src/sys/kern/kern_linker.c#6 integrate .. //depot/projects/vimage-devel/src/sys/kern/kern_lock.c#4 integrate .. //depot/projects/vimage-devel/src/sys/kern/kern_mib.c#7 integrate .. //depot/projects/vimage-devel/src/sys/kern/kern_poll.c#6 integrate .. //depot/projects/vimage-devel/src/sys/kern/kern_proc.c#3 integrate .. //depot/projects/vimage-devel/src/sys/kern/kern_resource.c#2 integrate .. //depot/projects/vimage-devel/src/sys/kern/kern_sig.c#3 integrate .. //depot/projects/vimage-devel/src/sys/kern/kern_subr.c#2 integrate .. //depot/projects/vimage-devel/src/sys/kern/kern_synch.c#7 integrate .. //depot/projects/vimage-devel/src/sys/kern/kern_thread.c#5 integrate .. //depot/projects/vimage-devel/src/sys/kern/kern_uuid.c#5 integrate .. //depot/projects/vimage-devel/src/sys/kern/kern_xxx.c#10 integrate .. //depot/projects/vimage-devel/src/sys/kern/subr_prf.c#2 integrate .. //depot/projects/vimage-devel/src/sys/kern/subr_rman.c#2 integrate .. //depot/projects/vimage-devel/src/sys/kern/subr_smp.c#2 integrate .. //depot/projects/vimage-devel/src/sys/kern/subr_witness.c#4 integrate .. //depot/projects/vimage-devel/src/sys/kern/syscalls.c#2 integrate .. //depot/projects/vimage-devel/src/sys/kern/syscalls.master#2 integrate .. //depot/projects/vimage-devel/src/sys/kern/systrace_args.c#2 integrate .. //depot/projects/vimage-devel/src/sys/kern/tty.c#6 integrate .. //depot/projects/vimage-devel/src/sys/kern/tty_compat.c#2 integrate .. //depot/projects/vimage-devel/src/sys/kern/tty_conf.c#2 delete .. //depot/projects/vimage-devel/src/sys/kern/tty_cons.c#2 integrate .. //depot/projects/vimage-devel/src/sys/kern/tty_info.c#3 integrate .. //depot/projects/vimage-devel/src/sys/kern/tty_inq.c#1 branch .. //depot/projects/vimage-devel/src/sys/kern/tty_outq.c#1 branch .. //depot/projects/vimage-devel/src/sys/kern/tty_pts.c#3 integrate .. //depot/projects/vimage-devel/src/sys/kern/tty_pty.c#3 integrate .. //depot/projects/vimage-devel/src/sys/kern/tty_ttydisc.c#1 branch .. //depot/projects/vimage-devel/src/sys/kern/uipc_mqueue.c#2 integrate .. //depot/projects/vimage-devel/src/sys/kern/uipc_socket.c#7 integrate .. //depot/projects/vimage-devel/src/sys/kern/vfs_bio.c#3 integrate .. //depot/projects/vimage-devel/src/sys/kern/vfs_cache.c#4 integrate .. //depot/projects/vimage-devel/src/sys/kern/vfs_default.c#2 integrate .. //depot/projects/vimage-devel/src/sys/kern/vfs_lookup.c#4 integrate .. //depot/projects/vimage-devel/src/sys/kern/vfs_mount.c#4 integrate .. //depot/projects/vimage-devel/src/sys/kern/vfs_subr.c#4 integrate .. //depot/projects/vimage-devel/src/sys/kern/vfs_syscalls.c#3 integrate .. //depot/projects/vimage-devel/src/sys/kern/vfs_vnops.c#3 integrate .. //depot/projects/vimage-devel/src/sys/kern/vnode_if.src#2 integrate .. //depot/projects/vimage-devel/src/sys/mips/include/pcpu.h#2 integrate .. //depot/projects/vimage-devel/src/sys/mips/mips/mp_machdep.c#2 integrate .. //depot/projects/vimage-devel/src/sys/modules/Makefile#8 integrate .. //depot/projects/vimage-devel/src/sys/modules/aha/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/modules/ahb/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/modules/an/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/modules/ar/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/modules/ath_rate_amrr/Makefile#3 integrate .. //depot/projects/vimage-devel/src/sys/modules/ath_rate_onoe/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/modules/ath_rate_sample/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/modules/ce/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/modules/cp/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/modules/ctau/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/modules/cx/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/modules/digi/digi/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/modules/dpms/Makefile#1 branch .. //depot/projects/vimage-devel/src/sys/modules/drm/i915/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/modules/fatm/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/modules/hatm/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/modules/hifn/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/modules/if_tap/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/modules/linux/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/modules/netgraph/sync_ar/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/modules/netgraph/sync_sr/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/modules/nmdm/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/modules/patm/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/modules/pf/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/modules/pflog/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/modules/rc/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/modules/rp/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/modules/safe/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/modules/sppp/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/modules/sr/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/modules/svr4/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/modules/trm/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/modules/ubsec/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/modules/usb/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/modules/wi/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/modules/wlan/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/modules/wlan_acl/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/modules/wlan_amrr/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/modules/wlan_ccmp/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/modules/wlan_rssadapt/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/modules/wlan_tkip/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/modules/wlan_wep/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/modules/wlan_xauth/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/net/bpf.c#9 integrate .. //depot/projects/vimage-devel/src/sys/net/bpf.h#4 integrate .. //depot/projects/vimage-devel/src/sys/net/bpf_filter.c#2 integrate .. //depot/projects/vimage-devel/src/sys/net/bpf_jitter.c#2 integrate .. //depot/projects/vimage-devel/src/sys/net/bpf_jitter.h#2 integrate .. //depot/projects/vimage-devel/src/sys/net/bridgestp.c#5 integrate .. //depot/projects/vimage-devel/src/sys/net/ethernet.h#2 integrate .. //depot/projects/vimage-devel/src/sys/net/if.c#7 integrate .. //depot/projects/vimage-devel/src/sys/net/if.h#3 integrate .. //depot/projects/vimage-devel/src/sys/net/if_bridge.c#5 integrate .. //depot/projects/vimage-devel/src/sys/net/if_ef.c#4 integrate .. //depot/projects/vimage-devel/src/sys/net/if_ethersubr.c#6 integrate .. //depot/projects/vimage-devel/src/sys/net/if_faith.c#4 integrate .. //depot/projects/vimage-devel/src/sys/net/if_gif.c#4 integrate .. //depot/projects/vimage-devel/src/sys/net/if_loop.c#7 integrate .. //depot/projects/vimage-devel/src/sys/net/if_mib.c#5 integrate .. //depot/projects/vimage-devel/src/sys/net/if_spppsubr.c#4 integrate .. //depot/projects/vimage-devel/src/sys/net/if_stf.c#4 integrate .. //depot/projects/vimage-devel/src/sys/net/if_var.h#5 integrate .. //depot/projects/vimage-devel/src/sys/net/if_vlan.c#5 integrate .. //depot/projects/vimage-devel/src/sys/net/raw_cb.c#7 integrate .. //depot/projects/vimage-devel/src/sys/net/raw_usrreq.c#7 integrate .. //depot/projects/vimage-devel/src/sys/net/route.c#7 integrate .. //depot/projects/vimage-devel/src/sys/net/rtsock.c#6 integrate .. //depot/projects/vimage-devel/src/sys/net80211/ieee80211.c#8 integrate .. //depot/projects/vimage-devel/src/sys/net80211/ieee80211_crypto_tkip.c#2 integrate .. //depot/projects/vimage-devel/src/sys/net80211/ieee80211_ddb.c#5 integrate .. //depot/projects/vimage-devel/src/sys/netgraph/atm/ng_atm.c#5 integrate .. //depot/projects/vimage-devel/src/sys/netgraph/ng_base.c#10 integrate .. //depot/projects/vimage-devel/src/sys/netgraph/ng_bpf.c#2 integrate .. //depot/projects/vimage-devel/src/sys/netgraph/ng_bridge.c#7 integrate .. //depot/projects/vimage-devel/src/sys/netgraph/ng_eiface.c#5 integrate .. //depot/projects/vimage-devel/src/sys/netgraph/ng_ether.c#7 integrate .. //depot/projects/vimage-devel/src/sys/netgraph/ng_gif.c#5 integrate .. //depot/projects/vimage-devel/src/sys/netgraph/ng_iface.c#5 integrate .. //depot/projects/vimage-devel/src/sys/netgraph/ng_pipe.c#4 integrate .. //depot/projects/vimage-devel/src/sys/netgraph/ng_pipe.h#3 integrate .. //depot/projects/vimage-devel/src/sys/netgraph/ng_source.c#3 integrate .. //depot/projects/vimage-devel/src/sys/netinet/if_ether.c#5 integrate .. //depot/projects/vimage-devel/src/sys/netinet/igmp.c#4 integrate .. //depot/projects/vimage-devel/src/sys/netinet/in.c#5 integrate .. //depot/projects/vimage-devel/src/sys/netinet/in_gif.c#4 integrate .. //depot/projects/vimage-devel/src/sys/netinet/in_mcast.c#5 integrate .. //depot/projects/vimage-devel/src/sys/netinet/in_pcb.c#13 integrate .. //depot/projects/vimage-devel/src/sys/netinet/in_rmx.c#5 integrate .. //depot/projects/vimage-devel/src/sys/netinet/in_var.h#3 integrate .. //depot/projects/vimage-devel/src/sys/netinet/ip6.h#3 integrate .. //depot/projects/vimage-devel/src/sys/netinet/ip_carp.c#5 integrate .. //depot/projects/vimage-devel/src/sys/netinet/ip_divert.c#5 integrate .. //depot/projects/vimage-devel/src/sys/netinet/ip_fastfwd.c#5 integrate .. //depot/projects/vimage-devel/src/sys/netinet/ip_fw2.c#8 integrate .. //depot/projects/vimage-devel/src/sys/netinet/ip_fw_nat.c#4 integrate .. //depot/projects/vimage-devel/src/sys/netinet/ip_fw_pfil.c#6 integrate .. //depot/projects/vimage-devel/src/sys/netinet/ip_icmp.c#4 integrate .. //depot/projects/vimage-devel/src/sys/netinet/ip_input.c#6 integrate .. //depot/projects/vimage-devel/src/sys/netinet/ip_ipsec.c#4 integrate .. //depot/projects/vimage-devel/src/sys/netinet/ip_mroute.c#4 integrate .. //depot/projects/vimage-devel/src/sys/netinet/ip_options.c#5 integrate .. //depot/projects/vimage-devel/src/sys/netinet/ip_output.c#4 integrate .. //depot/projects/vimage-devel/src/sys/netinet/ip_var.h#3 integrate .. //depot/projects/vimage-devel/src/sys/netinet/libalias/alias_db.c#3 integrate .. //depot/projects/vimage-devel/src/sys/netinet/raw_ip.c#8 integrate .. //depot/projects/vimage-devel/src/sys/netinet/sctp_indata.c#4 integrate .. //depot/projects/vimage-devel/src/sys/netinet/sctp_lock_bsd.h#3 integrate .. //depot/projects/vimage-devel/src/sys/netinet/sctp_os_bsd.h#6 integrate .. //depot/projects/vimage-devel/src/sys/netinet/sctp_output.c#7 integrate .. //depot/projects/vimage-devel/src/sys/netinet/sctp_pcb.c#6 integrate .. //depot/projects/vimage-devel/src/sys/netinet/sctp_sysctl.h#4 integrate .. //depot/projects/vimage-devel/src/sys/netinet/sctp_timer.c#5 integrate .. //depot/projects/vimage-devel/src/sys/netinet/sctp_timer.h#3 integrate .. //depot/projects/vimage-devel/src/sys/netinet/sctp_var.h#6 integrate .. //depot/projects/vimage-devel/src/sys/netinet/sctputil.c#5 integrate .. //depot/projects/vimage-devel/src/sys/netinet/tcp_hostcache.c#4 integrate .. //depot/projects/vimage-devel/src/sys/netinet/tcp_input.c#5 integrate .. //depot/projects/vimage-devel/src/sys/netinet/tcp_lro.c#2 integrate .. //depot/projects/vimage-devel/src/sys/netinet/tcp_offload.c#7 integrate .. //depot/projects/vimage-devel/src/sys/netinet/tcp_output.c#6 integrate .. //depot/projects/vimage-devel/src/sys/netinet/tcp_reass.c#4 integrate .. //depot/projects/vimage-devel/src/sys/netinet/tcp_sack.c#4 integrate .. //depot/projects/vimage-devel/src/sys/netinet/tcp_subr.c#6 integrate .. //depot/projects/vimage-devel/src/sys/netinet/tcp_syncache.c#10 integrate .. //depot/projects/vimage-devel/src/sys/netinet/tcp_syncache.h#8 integrate .. //depot/projects/vimage-devel/src/sys/netinet/tcp_timer.c#5 integrate .. //depot/projects/vimage-devel/src/sys/netinet/tcp_timewait.c#4 integrate .. //depot/projects/vimage-devel/src/sys/netinet/tcp_usrreq.c#5 integrate .. //depot/projects/vimage-devel/src/sys/netinet/toedev.h#3 integrate .. //depot/projects/vimage-devel/src/sys/netinet/udp_usrreq.c#10 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/dest6.c#4 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/frag6.c#6 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/icmp6.c#7 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/in6.c#6 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/in6_gif.c#5 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/in6_ifattach.c#7 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/in6_pcb.c#5 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/in6_proto.c#6 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/in6_rmx.c#7 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/in6_src.c#6 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/ip6_forward.c#5 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/ip6_input.c#7 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/ip6_ipsec.c#6 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/ip6_mroute.c#4 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/ip6_output.c#5 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/mld6.c#4 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/nd6.c#5 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/nd6.h#3 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/nd6_nbr.c#4 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/nd6_rtr.c#4 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/raw_ip6.c#7 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/route6.c#4 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/scope6.c#5 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/udp6_usrreq.c#7 integrate .. //depot/projects/vimage-devel/src/sys/netipsec/ipsec.c#8 integrate .. //depot/projects/vimage-devel/src/sys/netipsec/ipsec.h#3 integrate .. //depot/projects/vimage-devel/src/sys/netipsec/ipsec_input.c#5 integrate .. //depot/projects/vimage-devel/src/sys/netipsec/ipsec_mbuf.c#4 integrate .. //depot/projects/vimage-devel/src/sys/netipsec/ipsec_output.c#5 integrate .. //depot/projects/vimage-devel/src/sys/netipsec/key.c#6 integrate .. //depot/projects/vimage-devel/src/sys/netipsec/key_debug.h#3 integrate .. //depot/projects/vimage-devel/src/sys/netipsec/keysock.c#7 integrate .. //depot/projects/vimage-devel/src/sys/netipsec/xform_ah.c#5 integrate .. //depot/projects/vimage-devel/src/sys/netipsec/xform_esp.c#5 integrate .. //depot/projects/vimage-devel/src/sys/netipsec/xform_ipcomp.c#4 integrate .. //depot/projects/vimage-devel/src/sys/netipsec/xform_ipip.c#4 integrate .. //depot/projects/vimage-devel/src/sys/nfs4client/nfs4_vnops.c#2 integrate .. //depot/projects/vimage-devel/src/sys/nfsclient/bootp_subr.c#6 integrate .. //depot/projects/vimage-devel/src/sys/nfsclient/nfs_bio.c#2 integrate .. //depot/projects/vimage-devel/src/sys/nfsclient/nfs_diskless.c#4 integrate .. //depot/projects/vimage-devel/src/sys/nfsclient/nfs_vfsops.c#9 integrate .. //depot/projects/vimage-devel/src/sys/nfsclient/nfs_vnops.c#5 integrate .. //depot/projects/vimage-devel/src/sys/nfsserver/nfs_serv.c#2 integrate .. //depot/projects/vimage-devel/src/sys/nfsserver/nfs_srvsubs.c#2 integrate .. //depot/projects/vimage-devel/src/sys/nlm/nlm_prot_impl.c#5 integrate .. //depot/projects/vimage-devel/src/sys/nlm/nlm_prot_server.c#3 integrate .. //depot/projects/vimage-devel/src/sys/pc98/cbus/scterm-sck.c#2 integrate .. //depot/projects/vimage-devel/src/sys/pc98/conf/GENERIC#4 integrate .. //depot/projects/vimage-devel/src/sys/pc98/conf/GENERIC.hints#2 integrate .. //depot/projects/vimage-devel/src/sys/pc98/conf/NOTES#5 integrate .. //depot/projects/vimage-devel/src/sys/powerpc/aim/clock.c#2 integrate .. //depot/projects/vimage-devel/src/sys/powerpc/aim/interrupt.c#2 integrate .. //depot/projects/vimage-devel/src/sys/powerpc/aim/machdep.c#2 integrate .. //depot/projects/vimage-devel/src/sys/powerpc/aim/mmu_oea.c#2 integrate .. //depot/projects/vimage-devel/src/sys/powerpc/aim/vm_machdep.c#2 integrate .. //depot/projects/vimage-devel/src/sys/powerpc/booke/locore.S#2 integrate .. //depot/projects/vimage-devel/src/sys/powerpc/booke/machdep.c#2 integrate .. //depot/projects/vimage-devel/src/sys/powerpc/booke/pmap.c#2 integrate .. //depot/projects/vimage-devel/src/sys/powerpc/conf/GENERIC#4 integrate .. //depot/projects/vimage-devel/src/sys/powerpc/include/cpufunc.h#2 integrate .. //depot/projects/vimage-devel/src/sys/powerpc/include/pcpu.h#2 integrate .. //depot/projects/vimage-devel/src/sys/powerpc/powerpc/db_interface.c#2 integrate .. //depot/projects/vimage-devel/src/sys/powerpc/powerpc/pmap_dispatch.c#2 integrate .. //depot/projects/vimage-devel/src/sys/rpc/authunix_prot.c#8 integrate .. //depot/projects/vimage-devel/src/sys/rpc/pmap_prot.h#2 integrate .. //depot/projects/vimage-devel/src/sys/rpc/rpcb_prot.c#2 integrate .. //depot/projects/vimage-devel/src/sys/rpc/rpcclnt.c#3 integrate .. //depot/projects/vimage-devel/src/sys/security/audit/audit_arg.c#4 integrate .. //depot/projects/vimage-devel/src/sys/security/audit/audit_bsm.c#3 integrate .. //depot/projects/vimage-devel/src/sys/security/audit/audit_bsm_klib.c#4 integrate .. //depot/projects/vimage-devel/src/sys/security/audit/audit_syscalls.c#4 integrate .. //depot/projects/vimage-devel/src/sys/security/audit/audit_worker.c#4 integrate .. //depot/projects/vimage-devel/src/sys/security/mac/mac_framework.c#2 integrate .. //depot/projects/vimage-devel/src/sys/security/mac/mac_framework.h#4 integrate .. //depot/projects/vimage-devel/src/sys/security/mac/mac_inet.c#3 integrate .. //depot/projects/vimage-devel/src/sys/security/mac/mac_internal.h#2 integrate .. //depot/projects/vimage-devel/src/sys/security/mac/mac_net.c#2 integrate .. //depot/projects/vimage-devel/src/sys/security/mac/mac_pipe.c#2 integrate .. //depot/projects/vimage-devel/src/sys/security/mac/mac_policy.h#4 integrate .. //depot/projects/vimage-devel/src/sys/security/mac/mac_posix_sem.c#3 integrate .. //depot/projects/vimage-devel/src/sys/security/mac/mac_posix_shm.c#2 integrate .. //depot/projects/vimage-devel/src/sys/security/mac/mac_process.c#2 integrate .. //depot/projects/vimage-devel/src/sys/security/mac/mac_socket.c#2 integrate .. //depot/projects/vimage-devel/src/sys/security/mac/mac_syscalls.c#2 integrate .. //depot/projects/vimage-devel/src/sys/security/mac/mac_sysv_msg.c#2 integrate .. //depot/projects/vimage-devel/src/sys/security/mac/mac_sysv_sem.c#2 integrate .. //depot/projects/vimage-devel/src/sys/security/mac/mac_sysv_shm.c#2 integrate .. //depot/projects/vimage-devel/src/sys/security/mac/mac_vfs.c#2 integrate .. //depot/projects/vimage-devel/src/sys/security/mac_biba/mac_biba.c#5 integrate .. //depot/projects/vimage-devel/src/sys/security/mac_bsdextended/mac_bsdextended.c#3 integrate .. //depot/projects/vimage-devel/src/sys/security/mac_ifoff/mac_ifoff.c#2 integrate .. //depot/projects/vimage-devel/src/sys/security/mac_lomac/mac_lomac.c#4 integrate .. //depot/projects/vimage-devel/src/sys/security/mac_mls/mac_mls.c#5 integrate .. //depot/projects/vimage-devel/src/sys/security/mac_none/mac_none.c#2 integrate .. //depot/projects/vimage-devel/src/sys/security/mac_partition/mac_partition.c#3 integrate .. //depot/projects/vimage-devel/src/sys/security/mac_portacl/mac_portacl.c#3 integrate .. //depot/projects/vimage-devel/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#2 integrate .. //depot/projects/vimage-devel/src/sys/security/mac_stub/mac_stub.c#4 integrate .. //depot/projects/vimage-devel/src/sys/security/mac_test/mac_test.c#4 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/central/central.c#2 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/conf/GENERIC#4 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/conf/NOTES#2 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/ebus/ebus.c#2 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/fhc/fhc.c#2 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/include/cache.h#3 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/include/clock.h#2 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/include/cpufunc.h#3 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/include/pcpu.h#3 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/include/smp.h#2 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/include/tick.h#2 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/include/ver.h#2 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/pci/ofw_pci.h#2 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/pci/ofw_pcibus.c#2 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/pci/psycho.c#2 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/sbus/dma_sbus.c#2 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/sbus/sbus.c#2 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/sparc64/autoconf.c#3 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/sparc64/cache.c#2 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/sparc64/cheetah.c#3 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/sparc64/clock.c#3 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/sparc64/dump_machdep.c#7 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/sparc64/exception.S#3 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/sparc64/genassym.c#2 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/sparc64/locore.S#3 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/sparc64/machdep.c#3 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/sparc64/mp_exception.S#2 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/sparc64/mp_locore.S#3 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/sparc64/mp_machdep.c#3 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/sparc64/spitfire.c#3 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/sparc64/stack_machdep.c#2 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/sparc64/tick.c#3 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/sparc64/trap.c#3 integrate .. //depot/projects/vimage-devel/src/sys/sun4v/conf/GENERIC#4 integrate .. //depot/projects/vimage-devel/src/sys/sun4v/include/pcpu.h#2 integrate .. //depot/projects/vimage-devel/src/sys/sun4v/sun4v/clock.c#1 branch .. //depot/projects/vimage-devel/src/sys/sun4v/sun4v/dump_machdep.c#7 integrate .. //depot/projects/vimage-devel/src/sys/sun4v/sun4v/hvcons.c#2 integrate .. //depot/projects/vimage-devel/src/sys/sys/conf.h#4 integrate .. //depot/projects/vimage-devel/src/sys/sys/copyright.h#2 integrate .. //depot/projects/vimage-devel/src/sys/sys/file.h#3 integrate .. //depot/projects/vimage-devel/src/sys/sys/ioccom.h#2 integrate .. //depot/projects/vimage-devel/src/sys/sys/kernel.h#5 integrate .. //depot/projects/vimage-devel/src/sys/sys/linedisc.h#2 delete .. //depot/projects/vimage-devel/src/sys/sys/mount.h#2 integrate .. //depot/projects/vimage-devel/src/sys/sys/param.h#7 integrate .. //depot/projects/vimage-devel/src/sys/sys/pcpu.h#2 integrate .. //depot/projects/vimage-devel/src/sys/sys/proc.h#5 integrate .. //depot/projects/vimage-devel/src/sys/sys/resource.h#4 integrate .. //depot/projects/vimage-devel/src/sys/sys/resourcevar.h#2 integrate .. //depot/projects/vimage-devel/src/sys/sys/syscall.h#2 integrate .. //depot/projects/vimage-devel/src/sys/sys/syscall.mk#2 integrate .. //depot/projects/vimage-devel/src/sys/sys/sysctl.h#8 integrate .. //depot/projects/vimage-devel/src/sys/sys/sysproto.h#2 integrate .. //depot/projects/vimage-devel/src/sys/sys/termios.h#3 integrate .. //depot/projects/vimage-devel/src/sys/sys/tty.h#2 integrate .. //depot/projects/vimage-devel/src/sys/sys/ttycom.h#3 integrate .. //depot/projects/vimage-devel/src/sys/sys/ttydefaults.h#2 integrate .. //depot/projects/vimage-devel/src/sys/sys/ttydevsw.h#1 branch .. //depot/projects/vimage-devel/src/sys/sys/ttydisc.h#1 branch .. //depot/projects/vimage-devel/src/sys/sys/ttyqueue.h#1 branch .. //depot/projects/vimage-devel/src/sys/sys/types.h#2 integrate .. //depot/projects/vimage-devel/src/sys/sys/user.h#3 integrate .. //depot/projects/vimage-devel/src/sys/sys/vimage.h#11 integrate .. //depot/projects/vimage-devel/src/sys/sys/vnode.h#3 integrate .. //depot/projects/vimage-devel/src/sys/sys/wait.h#2 integrate .. //depot/projects/vimage-devel/src/sys/ufs/ffs/ffs_alloc.c#2 integrate .. //depot/projects/vimage-devel/src/sys/ufs/ffs/ffs_extern.h#2 integrate .. //depot/projects/vimage-devel/src/sys/ufs/ffs/ffs_snapshot.c#2 integrate .. //depot/projects/vimage-devel/src/sys/ufs/ffs/ffs_softdep.c#2 integrate .. //depot/projects/vimage-devel/src/sys/ufs/ffs/ffs_vfsops.c#4 integrate .. //depot/projects/vimage-devel/src/sys/ufs/ffs/ffs_vnops.c#2 integrate .. //depot/projects/vimage-devel/src/sys/ufs/ufs/ufs_extattr.c#2 integrate .. //depot/projects/vimage-devel/src/sys/ufs/ufs/ufs_vfsops.c#2 integrate .. //depot/projects/vimage-devel/src/sys/ufs/ufs/ufs_vnops.c#2 integrate .. //depot/projects/vimage-devel/src/sys/vm/swap_pager.c#4 integrate .. //depot/projects/vimage-devel/src/sys/vm/uma_core.c#2 integrate .. //depot/projects/vimage-devel/src/sys/vm/vm_meter.c#5 integrate .. //depot/projects/vimage-devel/src/sys/vm/vm_mmap.c#3 integrate .. //depot/projects/vimage-devel/src/sys/vm/vm_page.c#2 integrate .. //depot/projects/vimage-devel/src/sys/vm/vnode_pager.c#4 integrate .. //depot/projects/vimage-devel/src/sys/xen/evtchn/evtchn_dev.c#2 integrate .. //depot/projects/vimage-devel/src/sys/xen/gnttab.c#2 integrate .. //depot/projects/vimage-devel/src/sys/xen/xenbus/xenbus_client.c#2 integrate .. //depot/projects/vimage-devel/src/sys/xen/xenbus/xenbus_comms.c#2 integrate .. //depot/projects/vimage-devel/src/sys/xen/xenbus/xenbus_comms.h#2 integrate .. //depot/projects/vimage-devel/src/sys/xen/xenbus/xenbus_dev.c#2 integrate .. //depot/projects/vimage-devel/src/sys/xen/xenbus/xenbus_probe.c#2 integrate .. //depot/projects/vimage-devel/src/sys/xen/xenbus/xenbus_probe_backend.c#2 integrate .. //depot/projects/vimage-devel/src/sys/xen/xenbus/xenbus_xs.c#2 integrate Differences ... ==== //depot/projects/vimage-devel/src/sys/amd64/amd64/bpf_jit_machdep.c#4 (text+ko) ==== @@ -23,25 +23,29 @@ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS intERRUPTION) HOWEVER CAUSED AND ON ANY + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.10 2008/08/13 19:52:00 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.14 2008/08/26 21:06:31 jkim Exp $"); +#ifdef _KERNEL #include "opt_bpf.h" - #include #include #include -#include #include #include +#include +#else +#include +#endif + +#include -#include #include #include @@ -53,7 +57,7 @@ * emit routine to update the jump table */ static void -emit_length(bpf_bin_stream *stream, u_int value, u_int len) +emit_length(bpf_bin_stream *stream, __unused u_int value, u_int len) { (stream->refs)[stream->bpf_pc] += len; @@ -103,13 +107,13 @@ */ emit_func emitm; - /* Do not compile an empty filter. */ - if (nins == 0) - return (NULL); - /* Allocate the reference table for the jumps */ +#ifdef _KERNEL stream.refs = (u_int *)malloc((nins + 1) * sizeof(u_int), M_BPFJIT, M_NOWAIT); +#else + stream.refs = (u_int *)malloc((nins + 1) * sizeof(u_int)); +#endif if (stream.refs == NULL) return (NULL); @@ -141,7 +145,11 @@ switch (ins->code) { default: +#ifdef _KERNEL return (NULL); +#else + abort(); +#endif case BPF_RET|BPF_K: MOVid(ins->k, EAX); @@ -155,11 +163,13 @@ break; case BPF_LD|BPF_W|BPF_ABS: - MOVid(ins->k, ECX); - MOVrd(ECX, ESI); - ADDib(sizeof(int32_t), ECX); - CMPrd(EDI, ECX); - JBEb(6); + MOVid(ins->k, ESI); + CMPrd(EDI, ESI); + JAb(12); + MOVrd(EDI, ECX); + SUBrd(ESI, ECX); + CMPid(sizeof(int32_t), ECX); + JAEb(6); ZEROrd(EAX); MOVrq3(R8, RBX); RET(); @@ -169,11 +179,13 @@ case BPF_LD|BPF_H|BPF_ABS: ZEROrd(EAX); - MOVid(ins->k, ECX); - MOVrd(ECX, ESI); - ADDib(sizeof(int16_t), ECX); - CMPrd(EDI, ECX); - JBEb(4); + MOVid(ins->k, ESI); + CMPrd(EDI, ESI); + JAb(12); + MOVrd(EDI, ECX); + SUBrd(ESI, ECX); + CMPid(sizeof(int16_t), ECX); + JAEb(4); MOVrq3(R8, RBX); RET(); MOVobw(RBX, RSI, AX); @@ -182,12 +194,12 @@ case BPF_LD|BPF_B|BPF_ABS: ZEROrd(EAX); - MOVid(ins->k, ECX); - CMPrd(EDI, ECX); - JBEb(4); + MOVid(ins->k, ESI); + CMPrd(EDI, ESI); + JBb(4); MOVrq3(R8, RBX); RET(); - MOVobb(RBX, RCX, AL); + MOVobb(RBX, RSI, AL); break; case BPF_LD|BPF_W|BPF_LEN: @@ -199,12 +211,18 @@ break; case BPF_LD|BPF_W|BPF_IND: - MOVid(ins->k, ECX); - ADDrd(EDX, ECX); - MOVrd(ECX, ESI); - ADDib(sizeof(int32_t), ECX); - CMPrd(EDI, ECX); - JBEb(6); + CMPrd(EDI, EDX); + JAb(27); + MOVid(ins->k, ESI); + MOVrd(EDI, ECX); + SUBrd(EDX, ECX); + CMPrd(ESI, ECX); + JBb(14); + ADDrd(EDX, ESI); + MOVrd(EDI, ECX); + SUBrd(ESI, ECX); + CMPid(sizeof(int32_t), ECX); + JAEb(6); ZEROrd(EAX); MOVrq3(R8, RBX); RET(); @@ -214,12 +232,18 @@ case BPF_LD|BPF_H|BPF_IND: ZEROrd(EAX); - MOVid(ins->k, ECX); - ADDrd(EDX, ECX); - MOVrd(ECX, ESI); - ADDib(sizeof(int16_t), ECX); - CMPrd(EDI, ECX); - JBEb(4); + CMPrd(EDI, EDX); + JAb(27); + MOVid(ins->k, ESI); + MOVrd(EDI, ECX); + SUBrd(EDX, ECX); + CMPrd(ESI, ECX); + JBb(14); + ADDrd(EDX, ESI); + MOVrd(EDI, ECX); + SUBrd(ESI, ECX); + CMPid(sizeof(int16_t), ECX); + JAEb(4); MOVrq3(R8, RBX); RET(); MOVobw(RBX, RSI, AX); @@ -228,24 +252,28 @@ case BPF_LD|BPF_B|BPF_IND: ZEROrd(EAX); - MOVid(ins->k, ECX); - ADDrd(EDX, ECX); - CMPrd(EDI, ECX); - JBEb(4); + CMPrd(EDI, EDX); + JAEb(13); + MOVid(ins->k, ESI); + MOVrd(EDI, ECX); + SUBrd(EDX, ECX); + CMPrd(ESI, ECX); + JAb(4); MOVrq3(R8, RBX); RET(); - MOVobb(RBX, RCX, AL); + ADDrd(EDX, ESI); + MOVobb(RBX, RSI, AL); break; case BPF_LDX|BPF_MSH|BPF_B: - MOVid(ins->k, ECX); - CMPrd(EDI, ECX); - JBEb(6); + MOVid(ins->k, ESI); + CMPrd(EDI, ESI); + JBb(6); ZEROrd(EAX); MOVrq3(R8, RBX); RET(); ZEROrd(EDX); - MOVobb(RBX, RCX, DL); + MOVobb(RBX, RSI, DL); ANDib(0x0f, DL); SHLib(2, EDX); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Sep 3 21:19:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A42CD106566B; Wed, 3 Sep 2008 21:19:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 676BB1065686 for ; Wed, 3 Sep 2008 21:19:18 +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 50A108FC19 for ; Wed, 3 Sep 2008 21:19:18 +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 m83LJIou004116 for ; Wed, 3 Sep 2008 21:19:18 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m83LJIIe004087 for perforce@freebsd.org; Wed, 3 Sep 2008 21:19:18 GMT (envelope-from julian@freebsd.org) Date: Wed, 3 Sep 2008 21:19:18 GMT Message-Id: <200809032119.m83LJIIe004087@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 149158 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Sep 2008 21:19:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=149158 Change 149158 by julian@julian_trafmon1 on 2008/09/03 21:18:22 Merging between branches Affected files ... .. //depot/projects/vimage-devel/src/sys/conf/options#6 integrate .. //depot/projects/vimage-devel/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#7 integrate .. //depot/projects/vimage-devel/src/sys/contrib/pf/net/pf_subr.c#3 integrate .. //depot/projects/vimage-devel/src/sys/ddb/db_textdump.c#5 integrate .. //depot/projects/vimage-devel/src/sys/dev/firewire/firewire.c#6 integrate .. //depot/projects/vimage-devel/src/sys/kern/kern_xxx.c#11 integrate .. //depot/projects/vimage-devel/src/sys/kern/tty.c#7 integrate .. //depot/projects/vimage-devel/src/sys/net/if.c#8 integrate .. //depot/projects/vimage-devel/src/sys/net/if_bridge.c#6 integrate .. //depot/projects/vimage-devel/src/sys/net/if_ef.c#5 integrate .. //depot/projects/vimage-devel/src/sys/net/if_gif.c#5 edit .. //depot/projects/vimage-devel/src/sys/net/if_loop.c#8 integrate .. //depot/projects/vimage-devel/src/sys/net/route.c#8 integrate .. //depot/projects/vimage-devel/src/sys/net/rtsock.c#7 integrate .. //depot/projects/vimage-devel/src/sys/net80211/ieee80211.c#9 integrate .. //depot/projects/vimage-devel/src/sys/net80211/ieee80211_ddb.c#6 integrate .. //depot/projects/vimage-devel/src/sys/netgraph/atm/ng_atm.c#6 integrate .. //depot/projects/vimage-devel/src/sys/netgraph/ng_base.c#11 integrate .. //depot/projects/vimage-devel/src/sys/netgraph/ng_eiface.c#6 integrate .. //depot/projects/vimage-devel/src/sys/netgraph/ng_ether.c#8 integrate .. //depot/projects/vimage-devel/src/sys/netgraph/ng_iface.c#6 integrate .. //depot/projects/vimage-devel/src/sys/netgraph/ng_source.c#4 integrate .. //depot/projects/vimage-devel/src/sys/netinet/in_rmx.c#6 integrate .. //depot/projects/vimage-devel/src/sys/netinet/in_var.h#4 integrate .. //depot/projects/vimage-devel/src/sys/netinet/ip_divert.c#6 integrate .. //depot/projects/vimage-devel/src/sys/netinet/ip_fw2.c#9 integrate .. //depot/projects/vimage-devel/src/sys/netinet/ip_input.c#7 integrate .. //depot/projects/vimage-devel/src/sys/netinet/ip_mroute.c#5 integrate .. //depot/projects/vimage-devel/src/sys/netinet/raw_ip.c#9 integrate .. //depot/projects/vimage-devel/src/sys/netinet/tcp_input.c#6 integrate .. //depot/projects/vimage-devel/src/sys/netinet/tcp_subr.c#7 integrate .. //depot/projects/vimage-devel/src/sys/netinet/tcp_syncache.c#11 integrate .. //depot/projects/vimage-devel/src/sys/netinet/tcp_syncache.h#9 integrate .. //depot/projects/vimage-devel/src/sys/netinet/tcp_timewait.c#5 integrate .. //depot/projects/vimage-devel/src/sys/netinet/udp_usrreq.c#11 integrate .. //depot/projects/vimage-devel/src/sys/netinet/vinet.h#5 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/frag6.c#7 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/icmp6.c#8 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/in6.c#7 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/in6_ifattach.c#8 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/in6_rmx.c#8 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/ip6_input.c#8 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/nd6_rtr.c#5 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/scope6.c#6 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/vinet6.h#4 integrate .. //depot/projects/vimage-devel/src/sys/netipsec/xform_esp.c#6 integrate .. //depot/projects/vimage-devel/src/sys/nfsclient/nfs_diskless.c#5 integrate .. //depot/projects/vimage-devel/src/sys/sys/sysctl.h#9 integrate .. //depot/projects/vimage-devel/src/sys/sys/vimage.h#12 integrate Differences ... ==== //depot/projects/vimage-devel/src/sys/conf/options#6 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#7 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/contrib/pf/net/pf_subr.c#3 (text+ko) ==== @@ -65,6 +65,8 @@ #include #include #include +#include + #include /* @@ -115,10 +117,12 @@ #define ISN_STATIC_INCREMENT 4096 #define ISN_RANDOM_INCREMENT (4096 - 1) +#ifndef VIMAGE static u_char isn_secret[32]; static int isn_last_reseed; static u_int32_t isn_offset; static MD5_CTX isn_ctx; +#endif u_int32_t pf_new_isn(struct pf_state *s) ==== //depot/projects/vimage-devel/src/sys/ddb/db_textdump.c#5 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/dev/firewire/firewire.c#6 (text+ko) ==== @@ -678,7 +678,6 @@ static void fw_reset_crom(struct firewire_comm *fc) { - INIT_VPROCG(TD_TO_VPROCG(curthread)); /* XXX */ struct crom_src_buf *buf; struct crom_src *src; struct crom_chunk *root; @@ -704,7 +703,7 @@ crom_add_simple_text(src, root, &buf->vendor, "FreeBSD Project"); crom_add_entry(root, CSRKEY_HW, __FreeBSD_version); #endif - crom_add_simple_text(src, root, &buf->hw, V_hostname); + crom_add_simple_text(src, root, &buf->hw, G_hostname); } /* ==== //depot/projects/vimage-devel/src/sys/kern/kern_xxx.c#11 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/kern/tty.c#7 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/net/if.c#8 (text+ko) ==== @@ -374,6 +374,7 @@ static void if_init(void *dummy __unused) { + INIT_VNET_NET(curvnet); #ifdef VIMAGE vnet_mod_register(&vnet_net_modinfo); ==== //depot/projects/vimage-devel/src/sys/net/if_bridge.c#6 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/net/if_ef.c#5 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/net/if_gif.c#5 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/net/if_loop.c#8 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/net/route.c#8 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/net/rtsock.c#7 (text+ko) ==== @@ -416,7 +416,8 @@ case RTM_GET: case RTM_CHANGE: case RTM_LOCK: - rnh = V_rt_tables[so->so_fibnum][info.rti_info[RTAX_DST]->sa_family]; + rnh = + V_rt_tables[so->so_fibnum][info.rti_info[RTAX_DST]->sa_family]; if (rnh == NULL) senderr(EAFNOSUPPORT); RADIX_NODE_HEAD_LOCK(rnh); ==== //depot/projects/vimage-devel/src/sys/net80211/ieee80211.c#9 (text+ko) ==== @@ -35,7 +35,6 @@ #include #include #include - #include #include ==== //depot/projects/vimage-devel/src/sys/net80211/ieee80211_ddb.c#6 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netgraph/atm/ng_atm.c#6 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netgraph/ng_base.c#11 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netgraph/ng_eiface.c#6 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netgraph/ng_ether.c#8 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netgraph/ng_iface.c#6 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netgraph/ng_source.c#4 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netinet/in_rmx.c#6 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netinet/in_var.h#4 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netinet/ip_divert.c#6 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netinet/ip_fw2.c#9 (text+ko) ==== @@ -4522,7 +4522,7 @@ } done: callout_reset(&V_ipfw_timeout, V_dyn_keepalive_period * hz, - ipfw_tick, arg); + ipfw_tick, arg); } static int vnet_ipfw_iattach(const void *unused) ==== //depot/projects/vimage-devel/src/sys/netinet/ip_input.c#7 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netinet/ip_mroute.c#5 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netinet/raw_ip.c#9 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netinet/tcp_input.c#6 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netinet/tcp_subr.c#7 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netinet/tcp_syncache.c#11 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netinet/tcp_syncache.h#9 (text+ko) ==== @@ -126,4 +126,4 @@ }; #endif /* _KERNEL */ -#endif /* !_NETINET_TCP_SYNCACHE_H_ */ +#endif /* _NETINET_TCP_SYNCACHE_H_ */ ==== //depot/projects/vimage-devel/src/sys/netinet/tcp_timewait.c#5 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netinet/udp_usrreq.c#11 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netinet/vinet.h#5 (text+ko) ==== @@ -142,6 +142,7 @@ struct inpcbhead _udb; struct inpcbinfo _udbinfo; struct udpstat _udpstat; + int _udp_blackhole; struct inpcbhead _ripcb; struct inpcbinfo _ripcbinfo; @@ -269,6 +270,7 @@ #define V_tcp_reass_maxqlen VNET_INET(tcp_reass_maxqlen) #define V_tcp_reass_overflows VNET_INET(tcp_reass_overflows) +/* pf needs to get to these (!?) */ #define V_isn_secret VNET_INET(isn_secret) #define V_isn_last_reseed VNET_INET(isn_last_reseed) #define V_isn_offset VNET_INET(isn_offset) @@ -278,6 +280,7 @@ #define V_udb VNET_INET(udb) #define V_udbinfo VNET_INET(udbinfo) #define V_udpstat VNET_INET(udpstat) +#define V_udp_blackhole VNET_INET(udp_blackhole) #define V_ripcb VNET_INET(ripcb) #define V_ripcbinfo VNET_INET(ripcbinfo) ==== //depot/projects/vimage-devel/src/sys/netinet6/frag6.c#7 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netinet6/icmp6.c#8 (text+ko) ==== @@ -2810,7 +2810,7 @@ ret = 0; /* okay to send */ /* PPS limit */ - if (!ppsratecheck(&V_icmp6errppslim_last, &V_icmp6errpps_count, + if (!ppsratecheck(&icmp6errppslim_last, &V_icmp6errpps_count, V_icmp6errppslim)) { /* The packet is subject to rate limit */ ret++; ==== //depot/projects/vimage-devel/src/sys/netinet6/in6.c#7 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netinet6/in6_ifattach.c#8 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netinet6/in6_rmx.c#8 (text+ko) ==== @@ -225,20 +225,20 @@ SYSCTL_DECL(_net_inet6_ip6); -static int rtq_reallyold6 = 60*60; - /* one hour is ``really old'' */ -SYSCTL_INT(_net_inet6_ip6, IPV6CTL_RTEXPIRE, rtexpire, - CTLFLAG_RW, &rtq_reallyold6 , 0, ""); +#ifndef VIMAGE +static int rtq_reallyold6 = 60*60; /* one hour is ``really old'' */ +static int rtq_minreallyold6 = 10; /* never automatically crank down to less */ +static int rtq_toomany6 = 128; /* 128 cached routes is ``too many'' */ +#endif /* VIMAGE */ + +SYSCTL_V_INT(V_NET, vnet_inet6, _net_inet6_ip6, IPV6CTL_RTEXPIRE, + rtexpire, CTLFLAG_RW, rtq_reallyold6 , 0, ""); -static int rtq_minreallyold6 = 10; - /* never automatically crank down to less */ -SYSCTL_INT(_net_inet6_ip6, IPV6CTL_RTMINEXPIRE, rtminexpire, - CTLFLAG_RW, &rtq_minreallyold6 , 0, ""); +SYSCTL_V_INT(V_NET, vnet_inet6, _net_inet6_ip6, IPV6CTL_RTMINEXPIRE, + rtminexpire, CTLFLAG_RW, rtq_minreallyold6 , 0, ""); -static int rtq_toomany6 = 128; - /* 128 cached routes is ``too many'' */ -SYSCTL_INT(_net_inet6_ip6, IPV6CTL_RTMAXCACHE, rtmaxcache, - CTLFLAG_RW, &rtq_toomany6 , 0, ""); +SYSCTL_V_INT(V_NET, vnet_inet6, _net_inet6_ip6, IPV6CTL_RTMAXCACHE, + rtmaxcache, CTLFLAG_RW, rtq_toomany6 , 0, ""); /* @@ -248,6 +248,7 @@ static void in6_clsroute(struct radix_node *rn, struct radix_node_head *head) { + INIT_VNET_INET6(curvnet); struct rtentry *rt = (struct rtentry *)rn; RT_LOCK_ASSERT(rt); @@ -292,6 +293,7 @@ static int in6_rtqkill(struct radix_node *rn, void *rock) { + INIT_VNET_INET6(curvnet); struct rtqk_arg *ap = rock; struct rtentry *rt = (struct rtentry *)rn; int err; ==== //depot/projects/vimage-devel/src/sys/netinet6/ip6_input.c#8 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netinet6/nd6_rtr.c#5 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netinet6/scope6.c#6 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netinet6/vinet6.h#4 (text+ko) ==== @@ -62,6 +62,9 @@ TAILQ_HEAD(, addrsel_policyent) _addrsel_policytab; u_int _in6_maxmtu; int _ip6_auto_linklocal; + int _rtq_minreallyold6; + int _rtq_reallyold6; + int _rtq_toomany6; struct ip6stat _ip6stat; struct rip6stat _rip6stat; @@ -173,6 +176,10 @@ #define V_in6_maxmtu VNET_INET6(in6_maxmtu) #define V_ip6_auto_linklocal VNET_INET6(ip6_auto_linklocal) +#define V_rtq_minreallyold6 VNET_INET6(rtq_minreallyold6) +#define V_rtq_reallyold6 VNET_INET6(rtq_reallyold6) +#define V_rtq_toomany6 VNET_INET6(rtq_toomany6) + #define V_ip6stat VNET_INET6(ip6stat) #define V_rip6stat VNET_INET6(rip6stat) #define V_icmp6stat VNET_INET6(icmp6stat) ==== //depot/projects/vimage-devel/src/sys/netipsec/xform_esp.c#6 (text+ko) ==== @@ -1005,6 +1005,7 @@ #define MAXIV(xform) \ if (xform.blocksize > V_esp_max_ivlen) \ V_esp_max_ivlen = xform.blocksize \ + MAXIV(enc_xform_des); /* SADB_EALG_DESCBC */ MAXIV(enc_xform_3des); /* SADB_EALG_3DESCBC */ MAXIV(enc_xform_rijndael128); /* SADB_X_EALG_AES */ ==== //depot/projects/vimage-devel/src/sys/nfsclient/nfs_diskless.c#5 (text+ko) ==== @@ -45,6 +45,7 @@ #include #include +#include #include #include #include ==== //depot/projects/vimage-devel/src/sys/sys/sysctl.h#9 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/sys/vimage.h#12 (text+ko) ==== @@ -26,7 +26,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * * $FreeBSD$ */ From owner-p4-projects@FreeBSD.ORG Wed Sep 3 22:11:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 101BA1065678; Wed, 3 Sep 2008 22:11: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 C898A1065672 for ; Wed, 3 Sep 2008 22:11:12 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AEB428FC27 for ; Wed, 3 Sep 2008 22:11:12 +0000 (UTC) (envelope-from rpaulo@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 m83MBC1N021434 for ; Wed, 3 Sep 2008 22:11:12 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m83MBCxk021432 for perforce@freebsd.org; Wed, 3 Sep 2008 22:11:12 GMT (envelope-from rpaulo@FreeBSD.org) Date: Wed, 3 Sep 2008 22:11:12 GMT Message-Id: <200809032211.m83MBCxk021432@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 149163 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Sep 2008 22:11:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=149163 Change 149163 by rpaulo@rpaulo_phi on 2008/09/03 22:10:13 Change the command name from 'col' to 'mode'. This is the actual name of the EFI shell command. When printing ImageBase, we can use 32 bit. Print a couple more interesting information when booting up. Add initial version of the nvram command. Affected files ... .. //depot/projects/efi/boot/i386/efi/main.c#4 edit Differences ... ==== //depot/projects/efi/boot/i386/efi/main.c#4 (text+ko) ==== @@ -57,6 +57,7 @@ EFI_STATUS main(int argc, CHAR16 *argv[]) { + char vendor[128]; EFI_LOADED_IMAGE *img; int i; @@ -78,7 +79,14 @@ /* Get our loaded image protocol interface structure. */ BS->HandleProtocol(IH, &imgid, (VOID**)&img); - printf("Image base: 0x%016lx\n", (u_long)img->ImageBase); + printf("Image base: 0x%lx\n", (u_long)img->ImageBase); + printf("EFI version: %d.%02d\n", ST->Hdr.Revision >> 16, + ST->Hdr.Revision & 0xffff); + printf("EFI Firmware: "); + /* printf doesn't understand EFI Unicode */ + ST->ConOut->OutputString(ST->ConOut, ST->FirmwareVendor); + printf(" (rev %d.%02d)\n", ST->FirmwareRevision >> 16, + ST->FirmwareRevision & 0xffff); printf("\n"); printf("%s, Revision %s\n", bootprog_name, bootprog_rev); @@ -129,7 +137,9 @@ RS->ResetSystem(EfiResetCold, EFI_SUCCESS, 23, (CHAR16 *)"Reboot from the loader"); - exit(0); + + /* NOTREACHED */ + return (CMD_ERROR); } COMMAND_SET(quit, "quit", "exit the loader", command_quit); @@ -258,15 +268,16 @@ } -COMMAND_SET(col, "col", "change or display text modes", command_col); +COMMAND_SET(mode, "mode", "change or display text modes", command_mode); static int -command_col(int argc, char *argv[]) +command_mode(int argc, char *argv[]) { unsigned int cols, rows, mode; - int i, status; + int i; char *cp; char rowenv[8]; + EFI_STATUS status; SIMPLE_TEXT_OUTPUT_INTERFACE *conout; conout = ST->ConOut; @@ -305,3 +316,56 @@ return (CMD_OK); } + + +COMMAND_SET(nvram, "nvram", "get or set NVRAM variables", command_nvram); + +static int +command_nvram(int argc, char *argv[]) +{ + CHAR16 var[128]; + CHAR16 *data; + EFI_STATUS status; + EFI_GUID varguid = { 0,0,0,{0,0,0,0,0,0,0,0} }; + unsigned int varsz; + unsigned int datasz; + SIMPLE_TEXT_OUTPUT_INTERFACE *conout; + int i; + + conout = ST->ConOut; + + /* Initiate the search */ + status = RS->GetNextVariableName(&varsz, NULL, NULL); + + for (; status != EFI_NOT_FOUND; ) { + status = RS->GetNextVariableName(&varsz, var, + &varguid); + //if (EFI_ERROR(status)) + //break; + + conout->OutputString(conout, var); + printf("="); + datasz = 0; + status = RS->GetVariable(var, &varguid, NULL, &datasz, + NULL); + /* XXX: check status */ + data = malloc(datasz); + status = RS->GetVariable(var, &varguid, NULL, &datasz, + data); + if (EFI_ERROR(status)) + printf(""); + else { + for (i = 0; i < datasz; i++) { + if (isalnum(data[i]) || isspace(data[i])) + printf("%c", data[i]); + else + printf("\\x%02x", data[i]); + } + } + /* XXX */ + pager_output("\n"); + free(data); + } + + return (CMD_OK); +} From owner-p4-projects@FreeBSD.ORG Wed Sep 3 22:18:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4EC281065687; Wed, 3 Sep 2008 22:18: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 11D001065682 for ; Wed, 3 Sep 2008 22:18:20 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 000208FC1F for ; Wed, 3 Sep 2008 22:18:19 +0000 (UTC) (envelope-from brooks@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 m83MIJc2070548 for ; Wed, 3 Sep 2008 22:18:19 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m83MIJ8R070535 for perforce@freebsd.org; Wed, 3 Sep 2008 22:18:19 GMT (envelope-from brooks@freebsd.org) Date: Wed, 3 Sep 2008 22:18:19 GMT Message-Id: <200809032218.m83MIJ8R070535@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis To: Perforce Change Reviews Cc: Subject: PERFORCE change 149164 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Sep 2008 22:18:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=149164 Change 149164 by brooks@brooks_coredump on 2008/09/03 22:17:46 IFC Affected files ... .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/tmpfs/tmpfs.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/tmpfs/tmpfs_fifoops.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/tmpfs/tmpfs_fifoops.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/tmpfs/tmpfs_subr.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/fs/tmpfs/tmpfs_vfsops.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/fs/tmpfs/tmpfs_vnops.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/fs/tmpfs/tmpfs_vnops.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_mount.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/mips/adm5120/std.adm5120#2 integrate .. //depot/projects/vimage-commit2/src/sys/mips/conf/ADM5120#2 integrate .. //depot/projects/vimage-commit2/src/sys/mips/conf/IDT#2 integrate .. //depot/projects/vimage-commit2/src/sys/mips/conf/MALTA#2 integrate .. //depot/projects/vimage-commit2/src/sys/mips/conf/SENTRY5#2 integrate .. //depot/projects/vimage-commit2/src/sys/mips/idt/std.idt#2 integrate .. //depot/projects/vimage-commit2/src/sys/mips/malta/files.malta#2 integrate .. //depot/projects/vimage-commit2/src/sys/mips/malta/std.malta#2 integrate .. //depot/projects/vimage-commit2/src/sys/mips/mips/in_cksum.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/icmp6.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/exception.S#4 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c,v 1.1 2008/05/05 18:46:18 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c,v 1.2 2008/09/03 19:23:01 julian Exp $"); #include #include @@ -53,6 +53,7 @@ #include #include #include +#include #include #include @@ -237,7 +238,7 @@ /* Register existing TOE interfaces by walking the ifnet chain */ IFNET_RLOCK(); - TAILQ_FOREACH(ifp, &ifnet, if_link) { + TAILQ_FOREACH(ifp, &V_ifnet, if_link) { (void)ifaddr_event_handler(NULL, ifp); } IFNET_RUNLOCK(); ==== //depot/projects/vimage-commit2/src/sys/fs/tmpfs/tmpfs.h#2 (text+ko) ==== @@ -1,6 +1,6 @@ /* $NetBSD: tmpfs.h,v 1.26 2007/02/22 06:37:00 thorpej Exp $ */ -/* +/*- * Copyright (c) 2005, 2006 The NetBSD Foundation, Inc. * All rights reserved. * @@ -16,13 +16,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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED @@ -36,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/tmpfs/tmpfs.h,v 1.13 2008/04/16 11:33:30 kib Exp $ + * $FreeBSD: src/sys/fs/tmpfs/tmpfs.h,v 1.14 2008/09/03 18:53:48 delphij Exp $ */ #ifndef _FS_TMPFS_TMPFS_H_ ==== //depot/projects/vimage-commit2/src/sys/fs/tmpfs/tmpfs_fifoops.c#2 (text+ko) ==== @@ -1,6 +1,6 @@ /* $NetBSD: tmpfs_fifoops.c,v 1.5 2005/12/11 12:24:29 christos Exp $ */ -/* +/*- * Copyright (c) 2005 The NetBSD Foundation, Inc. * All rights reserved. * @@ -16,13 +16,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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED @@ -41,7 +34,7 @@ * tmpfs vnode interface for named pipes. */ #include - __FBSDID("$FreeBSD: src/sys/fs/tmpfs/tmpfs_fifoops.c,v 1.3 2007/06/28 02:39:31 delphij Exp $"); + __FBSDID("$FreeBSD: src/sys/fs/tmpfs/tmpfs_fifoops.c,v 1.4 2008/09/03 18:53:48 delphij Exp $"); #include #include ==== //depot/projects/vimage-commit2/src/sys/fs/tmpfs/tmpfs_fifoops.h#2 (text+ko) ==== @@ -1,6 +1,6 @@ /* $NetBSD: tmpfs_fifoops.h,v 1.4 2005/12/03 17:34:44 christos Exp $ */ -/* +/*- * Copyright (c) 2005 The NetBSD Foundation, Inc. * All rights reserved. * @@ -16,13 +16,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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED @@ -36,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/tmpfs/tmpfs_fifoops.h,v 1.3 2007/06/28 02:36:41 delphij Exp $ + * $FreeBSD: src/sys/fs/tmpfs/tmpfs_fifoops.h,v 1.4 2008/09/03 18:53:48 delphij Exp $ */ #ifndef _FS_TMPFS_TMPFS_FIFOOPS_H_ ==== //depot/projects/vimage-commit2/src/sys/fs/tmpfs/tmpfs_subr.c#3 (text+ko) ==== @@ -1,6 +1,6 @@ /* $NetBSD: tmpfs_subr.c,v 1.35 2007/07/09 21:10:50 ad Exp $ */ -/* +/*- * Copyright (c) 2005 The NetBSD Foundation, Inc. * All rights reserved. * @@ -16,13 +16,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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED @@ -41,7 +34,7 @@ * Efficient memory file system supporting functions. */ #include -__FBSDID("$FreeBSD: src/sys/fs/tmpfs/tmpfs_subr.c,v 1.17 2008/06/15 18:40:58 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/tmpfs/tmpfs_subr.c,v 1.18 2008/09/03 18:53:48 delphij Exp $"); #include #include ==== //depot/projects/vimage-commit2/src/sys/fs/tmpfs/tmpfs_vfsops.c#3 (text+ko) ==== @@ -1,6 +1,6 @@ /* $NetBSD: tmpfs_vfsops.c,v 1.10 2005/12/11 12:24:29 christos Exp $ */ -/* +/*- * Copyright (c) 2005 The NetBSD Foundation, Inc. * All rights reserved. * @@ -16,13 +16,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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED @@ -48,7 +41,7 @@ * allocate and release resources. */ #include -__FBSDID("$FreeBSD: src/sys/fs/tmpfs/tmpfs_vfsops.c,v 1.19 2008/08/28 15:23:18 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/tmpfs/tmpfs_vfsops.c,v 1.20 2008/09/03 18:53:48 delphij Exp $"); #include #include ==== //depot/projects/vimage-commit2/src/sys/fs/tmpfs/tmpfs_vnops.c#3 (text+ko) ==== @@ -1,6 +1,6 @@ /* $NetBSD: tmpfs_vnops.c,v 1.39 2007/07/23 15:41:01 jmmv Exp $ */ -/* +/*- * Copyright (c) 2005, 2006 The NetBSD Foundation, Inc. * All rights reserved. * @@ -16,13 +16,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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED @@ -41,7 +34,7 @@ * tmpfs vnode interface. */ #include -__FBSDID("$FreeBSD: src/sys/fs/tmpfs/tmpfs_vnops.c,v 1.19 2008/08/28 15:23:18 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/tmpfs/tmpfs_vnops.c,v 1.20 2008/09/03 18:53:48 delphij Exp $"); #include #include ==== //depot/projects/vimage-commit2/src/sys/fs/tmpfs/tmpfs_vnops.h#2 (text+ko) ==== @@ -1,6 +1,6 @@ /* $NetBSD: tmpfs_vnops.h,v 1.7 2005/12/03 17:34:44 christos Exp $ */ -/* +/*- * Copyright (c) 2005 The NetBSD Foundation, Inc. * All rights reserved. * @@ -16,13 +16,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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED @@ -36,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/tmpfs/tmpfs_vnops.h,v 1.2 2007/06/28 02:36:41 delphij Exp $ + * $FreeBSD: src/sys/fs/tmpfs/tmpfs_vnops.h,v 1.3 2008/09/03 18:53:48 delphij Exp $ */ #ifndef _FS_TMPFS_TMPFS_VNOPS_H_ ==== //depot/projects/vimage-commit2/src/sys/kern/vfs_mount.c#6 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_mount.c,v 1.290 2008/08/31 14:26:08 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_mount.c,v 1.291 2008/09/03 19:09:47 simon Exp $"); #include #include @@ -1848,7 +1848,8 @@ } if (*t != NULL) continue; - sprintf(errmsg, "mount option <%s> is unknown", p); + snprintf(errmsg, sizeof(errmsg), + "mount option <%s> is unknown", p); printf("%s\n", errmsg); ret = EINVAL; } ==== //depot/projects/vimage-commit2/src/sys/mips/adm5120/std.adm5120#2 (text+ko) ==== @@ -1,8 +1,9 @@ -# $FreeBSD: src/sys/mips/adm5120/std.adm5120,v 1.1 2008/07/06 21:09:29 imp Exp $ +# $FreeBSD: src/sys/mips/adm5120/std.adm5120,v 1.2 2008/09/03 18:49:54 obrien Exp $ # Standard include file for ADM5120 +files "../adm5120/files.adm5120" + cpu CPU_MIPS4KC -files "../mips32/adm5120/files.adm5120" options ISA_MIPS32 # device admpci ==== //depot/projects/vimage-commit2/src/sys/mips/conf/ADM5120#2 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/mips/conf/ADM5120,v 1.3 2008/04/21 10:09:54 phk Exp $ +# $FreeBSD: src/sys/mips/conf/ADM5120,v 1.4 2008/09/03 18:49:54 obrien Exp $ machine mips ident ADM5120 @@ -27,7 +27,7 @@ makeoptions MODULES_OVERRIDE="" options KERNVIRTADDR=0x80100000 -include "../mips32/adm5120/std.adm5120" +include "../adm5120/std.adm5120" hints "ADM5120.hints" #Default places to look for devices. ==== //depot/projects/vimage-commit2/src/sys/mips/conf/IDT#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/mips/conf/IDT,v 1.3 2008/04/21 10:09:54 phk Exp $ +# $FreeBSD: src/sys/mips/conf/IDT,v 1.4 2008/09/03 18:49:54 obrien Exp $ machine mips cpu CPU_MIPS4KC @@ -7,7 +7,7 @@ # Don't build any modules yet. makeoptions MODULES_OVERRIDE="" -include "../mips32/idt/std.idt" +include "../idt/std.idt" hints "IDT.hints" #Default places to look for devices. makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols ==== //depot/projects/vimage-commit2/src/sys/mips/conf/MALTA#2 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/mips/conf/MALTA,v 1.3 2008/04/21 10:09:54 phk Exp $ +# $FreeBSD: src/sys/mips/conf/MALTA,v 1.4 2008/09/03 18:40:29 obrien Exp $ machine mips ident MALTA @@ -32,7 +32,7 @@ options TICK_USE_YAMON_FREQ=defined #options TICK_USE_MALTA_RTC=defined -include "../mips32/malta/std.malta" +include "../malta/std.malta" hints "MALTA.hints" #Default places to look for devices. ==== //depot/projects/vimage-commit2/src/sys/mips/conf/SENTRY5#2 (text) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/sys/mips/conf/SENTRY5,v 1.3 2008/04/21 10:09:54 phk Exp $ +# $FreeBSD: src/sys/mips/conf/SENTRY5,v 1.4 2008/09/03 18:49:54 obrien Exp $ # # The Broadcom Sentry5 series of processors and boards is very commonly # used in COTS hardware including the Netgear WGT634U. @@ -34,7 +34,7 @@ # XXX only siba should be hardwired for now; we will use # bus enumeration there -files "../mips32/sentry5/files.sentry5" +files "../sentry5/files.sentry5" hints "SENTRY5.hints" # sentry5 normally ships with cfe firmware; use the console for now ==== //depot/projects/vimage-commit2/src/sys/mips/idt/std.idt#2 (text+ko) ==== @@ -1,5 +1,6 @@ -# $FreeBSD: src/sys/mips/idt/std.idt,v 1.1 2008/07/06 21:09:29 imp Exp $ +# $FreeBSD: src/sys/mips/idt/std.idt,v 1.2 2008/09/03 18:49:54 obrien Exp $ # Standard include file for IDT -files "../mips32/idt/files.idt" +files "../idt/files.idt" + options ISA_MIPS32 ==== //depot/projects/vimage-commit2/src/sys/mips/malta/files.malta#2 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/sys/mips/malta/files.malta,v 1.1 2008/07/06 21:09:29 imp Exp $ +# $FreeBSD: src/sys/mips/malta/files.malta,v 1.2 2008/09/03 18:40:02 obrien Exp $ mips/malta/gt.c standard mips/malta/gt_pci.c standard mips/malta/obio.c optional uart -mips/malta/uart_cpu_maltausart.c optional uart -mips/malta/uart_bus_maltausart.c optional uart -dev/uart/uart_dev_ns8250.c optional uart +mips/malta/uart_cpu_maltausart.c optional uart +mips/malta/uart_bus_maltausart.c optional uart +dev/uart/uart_dev_ns8250.c optional uart mips/malta/malta_machdep.c standard mips/malta/yamon.c standard ==== //depot/projects/vimage-commit2/src/sys/mips/malta/std.malta#2 (text+ko) ==== @@ -1,5 +1,5 @@ -# $FreeBSD: src/sys/mips/malta/std.malta,v 1.1 2008/07/06 21:09:29 imp Exp $ -files "../mips32/malta/files.malta" +# $FreeBSD: src/sys/mips/malta/std.malta,v 1.2 2008/09/03 18:40:29 obrien Exp $ +files "../malta/files.malta" cpu CPU_MIPS4KC options ISA_MIPS32 ==== //depot/projects/vimage-commit2/src/sys/mips/mips/in_cksum.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/mips/mips/in_cksum.c,v 1.1 2008/04/13 07:27:37 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/mips/mips/in_cksum.c,v 1.2 2008/09/03 18:40:02 obrien Exp $"); #include #include @@ -104,9 +104,9 @@ union q_util q_util; if ((3 & (long) lw) == 0 && len == 20) { - sum = (u_int64_t) lw[0] + lw[1] + lw[2] + lw[3] + lw[4]; - REDUCE32; - return sum; + sum = (u_int64_t) lw[0] + lw[1] + lw[2] + lw[3] + lw[4]; + REDUCE32; + return sum; } if ((offset = 3 & (long) lw) != 0) { @@ -190,7 +190,7 @@ u_int64_t sum; union q_util q_util; union l_util l_util; - + sum = (u_int64_t) a + b + c; REDUCE16; return (sum); @@ -206,16 +206,16 @@ union q_util q_util; union l_util l_util; - len -= skip; - for (; skip && m; m = m->m_next) { - if (m->m_len > skip) { - mlen = m->m_len - skip; + len -= skip; + for (; skip && m; m = m->m_next) { + if (m->m_len > skip) { + mlen = m->m_len - skip; addr = mtod(m, caddr_t) + skip; - goto skip_start; - } else { - skip -= m->m_len; - } - } + goto skip_start; + } else { + skip -= m->m_len; + } + } for (; m && len; m = m->m_next) { if (m->m_len == 0) @@ -227,9 +227,9 @@ mlen = len; if ((clen ^ (int) addr) & 1) - sum += in_cksumdata(addr, mlen) << 8; + sum += in_cksumdata(addr, mlen) << 8; else - sum += in_cksumdata(addr, mlen); + sum += in_cksumdata(addr, mlen); clen += mlen; len -= mlen; @@ -240,9 +240,9 @@ u_int in_cksum_hdr(const struct ip *ip) { - u_int64_t sum = in_cksumdata(ip, sizeof(struct ip)); - union q_util q_util; - union l_util l_util; - REDUCE16; - return (~sum & 0xffff); + u_int64_t sum = in_cksumdata(ip, sizeof(struct ip)); + union q_util q_util; + union l_util l_util; + REDUCE16; + return (~sum & 0xffff); } ==== //depot/projects/vimage-commit2/src/sys/net80211/ieee80211.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211.c,v 1.54 2008/09/02 04:49:35 weongyo Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211.c,v 1.55 2008/09/03 20:33:11 brooks Exp $"); /* * IEEE 802.11 generic handler ==== //depot/projects/vimage-commit2/src/sys/netinet6/icmp6.c#12 (text+ko) ==== @@ -61,7 +61,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet6/icmp6.c,v 1.90 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet6/icmp6.c,v 1.91 2008/09/03 19:09:47 simon Exp $"); #include "opt_inet.h" #include "opt_inet6.h" @@ -1130,6 +1130,15 @@ if (!validated) return; + /* + * In case the suggested mtu is less than IPV6_MMTU, we + * only need to remember that it was for above mentioned + * "alwaysfrag" case. + * Try to be as close to the spec as possible. + */ + if (mtu < IPV6_MMTU) + mtu = IPV6_MMTU - 8; + bzero(&inc, sizeof(inc)); inc.inc_flags = 1; /* IPv6 */ inc.inc6_faddr = *dst; ==== //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/exception.S#4 (text+ko) ==== @@ -54,7 +54,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/exception.S,v 1.77 2008/08/22 20:28:19 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/exception.S,v 1.78 2008/09/03 21:48:12 marius Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -550,7 +550,7 @@ tl ## traplvl ## _intr level, 1 << level #define TICK(traplvl) \ - tl ## traplvl ## _intr PIL_TICK, 1 + tl ## traplvl ## _intr PIL_TICK, 0x10001 #define INTR_LEVEL(tl) \ INTR(1, tl) ; \ From owner-p4-projects@FreeBSD.ORG Wed Sep 3 23:16:19 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8622D1065671; Wed, 3 Sep 2008 23:16:19 +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 4A423106566C for ; Wed, 3 Sep 2008 23:16:19 +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 3B35E8FC18 for ; Wed, 3 Sep 2008 23:16:19 +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 m83NGIab034208 for ; Wed, 3 Sep 2008 23:16:18 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m83NGIb0034206 for perforce@freebsd.org; Wed, 3 Sep 2008 23:16:18 GMT (envelope-from julian@freebsd.org) Date: Wed, 3 Sep 2008 23:16:18 GMT Message-Id: <200809032316.m83NGIb0034206@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 149166 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Sep 2008 23:16:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=149166 Change 149166 by julian@julian_trafmon1 on 2008/09/03 23:15:48 replace accidentally removed field Affected files ... .. //depot/projects/vimage/src/sys/netinet/tcp_syncache.h#16 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/tcp_syncache.h#16 (text+ko) ==== @@ -90,7 +90,7 @@ #ifndef TCP_OFFLOAD_DISABLE struct toe_usrreqs *sc_tu; /* TOE operations */ void *sc_toepcb; /* TOE protocol block */ -#endif +#endif #ifdef MAC struct label *sc_label; /* MAC label reference */ #endif @@ -101,6 +101,7 @@ #define SYNCOOKIE_LIFETIME 16 /* seconds */ struct syncache_head { + struct vnet *sch_vnet; struct mtx sch_mtx; TAILQ_HEAD(sch_head, syncache) sch_bucket; struct callout sch_timer; From owner-p4-projects@FreeBSD.ORG Wed Sep 3 23:29:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0AD951065689; Wed, 3 Sep 2008 23:29: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 BD6A71065680 for ; Wed, 3 Sep 2008 23:29:15 +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 ABB4D8FC17 for ; Wed, 3 Sep 2008 23:29:15 +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 m83NTFO2013336 for ; Wed, 3 Sep 2008 23:29:15 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m83NSV2v009248 for perforce@freebsd.org; Wed, 3 Sep 2008 23:28:31 GMT (envelope-from julian@freebsd.org) Date: Wed, 3 Sep 2008 23:28:31 GMT Message-Id: <200809032328.m83NSV2v009248@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 149167 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Sep 2008 23:29:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=149167 Change 149167 by julian@julian_trafmon1 on 2008/09/03 23:28:04 revert this to -current for more integration work Affected files ... .. //depot/projects/vimage-commit/src/sys/Makefile#5 integrate .. //depot/projects/vimage-commit/src/sys/amd64/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/acpica/acpi_machdep.c#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/acpica/acpi_wakeup.c#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/acpica/madt.c#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/amd64_mem.c#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/apic_vector.S#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/atomic.c#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/autoconf.c#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/bios.c#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/bpf_jit_machdep.c#5 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/bpf_jit_machdep.h#5 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/busdma_machdep.c#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/cpu_switch.S#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/db_disasm.c#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/db_interface.c#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/db_trace.c#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/dump_machdep.c#8 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/elf_machdep.c#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/exception.S#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/fpu.c#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/gdb_machdep.c#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/genassym.c#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/in_cksum.c#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/initcpu.c#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/intr_machdep.c#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/io.c#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/io_apic.c#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/legacy.c#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/local_apic.c#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/locore.S#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/machdep.c#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/mem.c#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/minidump_machdep.c#10 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/mp_machdep.c#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/mp_watchdog.c#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/mpboot.S#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/mptable.c#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/mptable_pci.c#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/msi.c#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/nexus.c#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/pmap.c#8 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/prof_machdep.c#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/sigtramp.S#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/stack_machdep.c#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/support.S#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/sys_machdep.c#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/trap.c#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/tsc.c#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/uio_machdep.c#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/uma_machdep.c#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/vm_machdep.c#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/compile/.cvsignore#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/conf/.cvsignore#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/conf/DEFAULTS#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/conf/GENERIC#7 integrate .. //depot/projects/vimage-commit/src/sys/amd64/conf/GENERIC.hints#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/conf/MAC#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/conf/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/conf/NOTES#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/ia32/ia32_exception.S#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/ia32/ia32_reg.c#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/ia32/ia32_signal.c#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/ia32/ia32_sigtramp.S#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/ia32/ia32_syscall.c#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/_bus.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/_inttypes.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/_limits.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/_stdint.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/_types.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/acpica_machdep.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/apicreg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/apicvar.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/asm.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/asmacros.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/atomic.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/bus.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/bus_dma.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/clock.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/cpu.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/cpufunc.h#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/cputypes.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/db_machdep.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/elf.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/endian.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/exec.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/float.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/floatingpoint.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/fpu.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/frame.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/gdb_machdep.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/ieeefp.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/in_cksum.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/intr_machdep.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/iodev.h#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/kdb.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/legacyvar.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/limits.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/md_var.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/memdev.h#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/metadata.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/minidump.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/mp_watchdog.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/mptable.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/mutex.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/nexusvar.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/param.h#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/pc/bios.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/pc/display.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/pcb.h#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/pci_cfgreg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/pcpu.h#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/pmap.h#6 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/pmc_mdep.h#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/ppireg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/proc.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/profile.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/psl.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/ptrace.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/reg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/reloc.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/resource.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/runq.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/segments.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/setjmp.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/sf_buf.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/sigframe.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/signal.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/smp.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/specialreg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/stack.h#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/stdarg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/sysarch.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/timerreg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/trap.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/tss.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/ucontext.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/varargs.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/vmparam.h#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/isa/atpic.c#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/isa/atpic_vector.S#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/isa/clock.c#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/isa/elcr.c#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/isa/icu.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/isa/isa.c#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/isa/isa.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/isa/isa_dma.c#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/isa/nmi.c#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/linux32/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/linux32/linux.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/linux32/linux32_dummy.c#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/linux32/linux32_genassym.c#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/linux32/linux32_ipc64.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/linux32/linux32_locore.s#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/linux32/linux32_machdep.c#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/linux32/linux32_proto.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/linux32/linux32_support.s#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/linux32/linux32_syscall.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/linux32/linux32_sysent.c#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/linux32/linux32_sysvec.c#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/linux32/syscalls.conf#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/linux32/syscalls.master#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/pci/pci_bus.c#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/pci/pci_cfgreg.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/autoconf.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/bcopy_page.S#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/bcopyinout.S#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/bcopyinout_xscale.S#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/blockio.S#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/bootconfig.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/bus_space_asm_generic.S#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/bus_space_generic.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/busdma_machdep.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/copystr.S#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/cpufunc.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/cpufunc_asm.S#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/cpufunc_asm_arm10.S#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/cpufunc_asm_arm11.S#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/cpufunc_asm_arm7tdmi.S#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/cpufunc_asm_arm8.S#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/cpufunc_asm_arm9.S#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/cpufunc_asm_armv4.S#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/cpufunc_asm_armv5.S#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/cpufunc_asm_armv5_ec.S#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/cpufunc_asm_ixp12x0.S#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/cpufunc_asm_sa1.S#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/cpufunc_asm_sa11x0.S#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/cpufunc_asm_xscale.S#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/cpufunc_asm_xscale_c3.S#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/db_disasm.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/db_interface.c#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/db_trace.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/disassem.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/dump_machdep.c#8 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/elf_machdep.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/elf_trampoline.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/exception.S#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/fiq.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/fiq_subr.S#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/fusu.S#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/gdb_machdep.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/genassym.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/identcpu.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/in_cksum.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/in_cksum_arm.S#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/inckern.S#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/intr.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/irq_dispatch.S#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/locore.S#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/machdep.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/mem.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/nexus.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/setcpsr.S#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/setstack.s#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/stack_machdep.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/support.S#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/swtch.S#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/sys_machdep.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/trap.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/uio_machdep.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/undefined.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/vectors.S#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/vm_machdep.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_mci.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_mcireg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_pdcreg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_pio.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_pio_rm9200.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_pioreg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_piovar.h#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_pmc.c#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_pmcreg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_pmcvar.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_rtc.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_rtcreg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_spi.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_spireg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_ssc.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_sscreg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_st.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_streg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_twi.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_twiio.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_twireg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_usartreg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91rm92reg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91var.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/files.at91#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/files.kb920x#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/hints.at91rm9200#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/hints.at91sam9261#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/if_ate.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/if_atereg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/kb920x_machdep.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/ohci_atmelarm.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/std.at91#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/std.kb920x#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/uart_bus_at91usart.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/uart_dev_at91usart.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/compile/.cvsignore#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/.cvsignore#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/AVILA#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/AVILA.hints#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/BWCT#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/BWCT.hints#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/CRB#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/EP80219#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/GUMSTIX#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/GUMSTIX.hints#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/HL200#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/IQ31244#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/KB920X#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/KB920X.hints#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/NSLU#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/NSLU.hints#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/SIMICS#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/SKYEYE#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/_bus.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/_inttypes.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/_limits.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/_stdint.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/_types.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/armreg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/asm.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/asmacros.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/atomic.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/blockio.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/bootconfig.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/bus.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/bus_dma.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/clock.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/cpu.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/cpuconf.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/cpufunc.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/db_machdep.h#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/disassem.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/elf.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/endian.h#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/exec.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/fiq.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/float.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/floatingpoint.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/fp.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/frame.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/gdb_machdep.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/ieee.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/ieeefp.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/in_cksum.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/intr.h#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/katelib.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/kdb.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/limits.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/machdep.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/md_var.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/memdev.h#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/metadata.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/mutex.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/param.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/pcb.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/pcpu.h#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/pmap.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/pmc_mdep.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/proc.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/profile.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/psl.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/pte.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/ptrace.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/reg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/reloc.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/resource.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/runq.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/setjmp.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/sf_buf.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/sigframe.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/signal.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/smp.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/stack.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/stdarg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/swi.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/sysarch.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/trap.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/ucontext.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/undefined.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/utrap.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/vmparam.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/sa11x0/assabet_machdep.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/sa11x0/files.sa11x0#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/sa11x0/sa11x0.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/sa11x0/sa11x0_dmacreg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/sa11x0/sa11x0_gpioreg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/sa11x0/sa11x0_io.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/sa11x0/sa11x0_io_asm.S#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/sa11x0/sa11x0_irq.S#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/sa11x0/sa11x0_irqhandler.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/sa11x0/sa11x0_ost.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/sa11x0/sa11x0_ostreg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/sa11x0/sa11x0_ppcreg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/sa11x0/sa11x0_reg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/sa11x0/sa11x0_var.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/sa11x0/std.sa11x0#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/sa11x0/uart_bus_sa1110.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/sa11x0/uart_cpu_sa1110.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/sa11x0/uart_dev_sa1110.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/sa11x0/uart_dev_sa1110.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i80321/ep80219_machdep.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i80321/files.ep80219#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i80321/files.i80219#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i80321/files.i80321#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i80321/files.iq31244#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i80321/i80321.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i80321/i80321_aau.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i80321/i80321_dma.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i80321/i80321_intr.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i80321/i80321_mcu.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i80321/i80321_pci.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i80321/i80321_space.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i80321/i80321_timer.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i80321/i80321_wdog.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i80321/i80321reg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i80321/i80321var.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i80321/iq31244_7seg.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i80321/iq31244_machdep.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i80321/iq80321.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i80321/iq80321reg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i80321/iq80321var.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i80321/obio.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i80321/obio_space.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i80321/obiovar.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i80321/std.ep80219#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i80321/std.i80219#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i80321/std.i80321#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i80321/std.iq31244#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i80321/uart_bus_i80321.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i80321/uart_cpu_i80321.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i8134x/crb_machdep.c#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i8134x/files.crb#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i8134x/files.i81342#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i8134x/i81342.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i8134x/i81342_mcu.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i8134x/i81342_pci.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i8134x/i81342_space.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i8134x/i81342reg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i8134x/i81342var.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i8134x/iq81342_7seg.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i8134x/iq81342reg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i8134x/iq81342var.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i8134x/obio.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i8134x/obio_space.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i8134x/obiovar.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i8134x/std.crb#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i8134x/std.i81342#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i8134x/uart_bus_i81342.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i8134x/uart_cpu_i81342.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/avila_ata.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/avila_led.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/avila_machdep.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/files.avila#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/files.ixp425#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/if_npe.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/if_npereg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixdp425_pci.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixdp425reg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixp425.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixp425_a4x_io.S#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixp425_a4x_space.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixp425_iic.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixp425_intr.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixp425_mem.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixp425_npe.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixp425_npereg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixp425_npevar.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixp425_pci.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixp425_pci_asm.S#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixp425_pci_space.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixp425_qmgr.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixp425_space.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixp425_timer.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixp425_wdog.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixp425reg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixp425var.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/std.avila#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/std.ixp425#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/uart_bus_ixp425.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/pxa/files.pxa#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/pxa/if_smc_smi.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/pxa/pxa_gpio.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/pxa/pxa_icu.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/pxa/pxa_machdep.c#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/pxa/pxa_obio.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/pxa/pxa_smi.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/pxa/pxa_space.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/pxa/pxa_timer.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/pxa/pxareg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/pxa/pxavar.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/pxa/std.pxa#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/pxa/uart_bus_pxa.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/pxa/uart_cpu_pxa.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/std.xscale#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/xscalereg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/xscalevar.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/Makefile#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/Makefile.inc#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/README#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/Makefile.inc#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/Makefile.inc#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/boot0/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/boot0/README#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/boot0/linker.cfg#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/boot0/main.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/boot0iic/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/boot0iic/main.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/boot0spi/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/boot0spi/main.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/boot2/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/boot2/board.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/boot2/boot2.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/boot2/bwct_board.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/boot2/centipad_board.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/boot2/kb920x_board.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/bootiic/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/bootiic/README#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/bootiic/env_vars.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/bootiic/env_vars.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/bootiic/loader_prompt.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/bootiic/loader_prompt.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/bootiic/main.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/bootspi/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/bootspi/README#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/bootspi/ee.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/bootspi/ee.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/bootspi/env_vars.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/bootspi/env_vars.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/bootspi/loader_prompt.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/bootspi/loader_prompt.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/bootspi/main.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/libat91/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/libat91/arm_init.S#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/libat91/at91rm9200.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/libat91/delay.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/libat91/eeprom.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/libat91/emac.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/libat91/emac.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/libat91/emac_init.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/libat91/getc.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/libat91/lib.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/libat91/lib_AT91RM9200.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/libat91/mci_device.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/libat91/memcmp.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/libat91/memcpy.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/libat91/memset.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/libat91/p_string.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/libat91/printf.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/libat91/putchar.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/libat91/reset.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/libat91/sd-card.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/libat91/sd-card.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/libat91/spi_flash.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/libat91/spi_flash.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/libat91/strcmp.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/libat91/strcpy.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/libat91/strcvt.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/libat91/strlen.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/libat91/tag_list.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/libat91/tag_list.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/libat91/xmodem.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/linker.cfg#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/common/Makefile.inc#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/common/bcache.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/common/boot.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/common/bootstrap.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/common/commands.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/common/console.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/common/dev_net.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/common/dev_net.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/common/devopen.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/common/help.common#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/common/interp.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/common/interp_backslash.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/common/interp_forth.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/common/interp_parse.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/common/isapnp.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/common/isapnp.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/common/load.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/common/load_elf.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/common/load_elf32.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/common/load_elf32_obj.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/common/load_elf64.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/common/load_elf64_obj.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/common/load_elf_obj.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/common/loader.8#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/common/ls.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/common/merge_help.awk#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/common/misc.c#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/common/module.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/common/newvers.sh#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/common/panic.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/common/pnp.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/common/reloc_elf.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/common/reloc_elf32.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/common/reloc_elf64.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/common/ufsread.c#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/efi/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/efi/Makefile.inc#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/efi/include/README#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/efi/include/efi.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/efi/include/efi_nii.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/efi/include/efiapi.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/efi/include/eficon.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/efi/include/efidebug.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/efi/include/efidef.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/efi/include/efidevp.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/efi/include/efierr.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/efi/include/efifpswa.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/efi/include/efifs.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/efi/include/efilib.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/efi/include/efinet.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/efi/include/efipart.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/efi/include/efiprot.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/efi/include/efipxebc.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/efi/include/efiser.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/efi/include/efistdarg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/efi/include/i386/efibind.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/efi/include/i386/pe.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/efi/include/ia64/efibind.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/efi/include/ia64/pe.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/efi/libefi/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/efi/libefi/delay.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/efi/libefi/efi_console.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/efi/libefi/efifs.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/efi/libefi/efinet.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/efi/libefi/errno.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/efi/libefi/handles.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/efi/libefi/libefi.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/efi/libefi/time.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ficl/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ficl/arm/sysdep.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ficl/arm/sysdep.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ficl/dict.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ficl/ficl.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ficl/ficl.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ficl/fileaccess.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ficl/float.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ficl/i386/sysdep.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ficl/i386/sysdep.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ficl/ia64/sysdep.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ficl/ia64/sysdep.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ficl/loader.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ficl/math64.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ficl/math64.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ficl/powerpc/sysdep.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ficl/powerpc/sysdep.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ficl/prefix.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ficl/search.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ficl/softwords/classes.fr#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ficl/softwords/ficlclass.fr#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ficl/softwords/ficllocal.fr#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ficl/softwords/fileaccess.fr#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ficl/softwords/forml.fr#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ficl/softwords/freebsd.fr#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ficl/softwords/ifbrack.fr#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ficl/softwords/jhlocal.fr#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ficl/softwords/marker.fr#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ficl/softwords/oo.fr#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ficl/softwords/prefix.fr#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ficl/softwords/softcore.awk#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ficl/softwords/softcore.fr#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ficl/softwords/string.fr#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ficl/sparc64/sysdep.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ficl/sparc64/sysdep.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ficl/stack.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ficl/testmain.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ficl/tools.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ficl/unix.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ficl/vm.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ficl/words.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/forth/beastie.4th#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/forth/frames.4th#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/forth/loader.4th#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/forth/loader.4th.8#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/forth/loader.conf#5 integrate .. //depot/projects/vimage-commit/src/sys/boot/forth/loader.conf.5#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/forth/loader.rc#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/forth/pnp.4th#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/forth/screen.4th#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/forth/support.4th#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/Makefile.inc#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/boot0/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/boot0/boot0.S#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/boot0/boot0ext.S#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/boot0ext/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/boot0sio/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/boot2/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/boot2/boot1.S#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/boot2/boot2.c#4 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/boot2/lib.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/boot2/sio.S#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/btx/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/btx/Makefile.inc#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/btx/btx/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/btx/btx/btx.S#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/btx/btxldr/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/btx/btxldr/btxldr.S#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/btx/lib/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/btx/lib/btxcsu.s#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/btx/lib/btxsys.s#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/btx/lib/btxv86.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/btx/lib/btxv86.s#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/cdboot/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/cdboot/cdboot.s#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/gptboot/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/gptboot/gptboot.c#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/gptboot/gptldr.S#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/kgzldr/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/kgzldr/boot.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/kgzldr/crt.s#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/kgzldr/kgzldr.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/kgzldr/lib.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/kgzldr/sio.s#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/kgzldr/start.s#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libfirewire/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libfirewire/dconsole.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libfirewire/firewire.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libfirewire/fwohci.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libfirewire/fwohci.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libfirewire/fwohcireg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/amd64_tramp.S#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/biosacpi.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/bioscd.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/biosdisk.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/biosmem.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/biospci.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/biospnp.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/biossmap.c#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/bootinfo.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/bootinfo32.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/bootinfo64.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/comconsole.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/devicename.c#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/elf32_freebsd.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/elf64_freebsd.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/i386_copy.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/i386_module.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/libi386.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/nullconsole.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/pread.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/pxe.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/pxe.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/pxetramp.s#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/smbios.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/time.c#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/vidconsole.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/loader/Makefile#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/loader/conf.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/loader/help.i386#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/loader/loader.rc#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/loader/main.c#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/loader/version#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/mbr/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/mbr/mbr.s#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/pmbr/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/pmbr/pmbr.s#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/pxeldr/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/pxeldr/pxeboot.8#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/pxeldr/pxeldr.S#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ia64/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ia64/Makefile.inc#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/ia64/common/Makefile#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/ia64/common/autoload.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ia64/common/bootinfo.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ia64/common/copy.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ia64/common/devicename.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ia64/common/exec.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ia64/common/libia64.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ia64/efi/Makefile#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/ia64/efi/conf.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ia64/efi/efimd.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ia64/efi/ldscript.ia64#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ia64/efi/main.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ia64/efi/start.S#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ia64/efi/version#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ia64/ski/Makefile#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/ia64/ski/acpi_stub.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ia64/ski/conf.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ia64/ski/delay.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ia64/ski/efi_stub.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ia64/ski/exit.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ia64/ski/ldscript.ia64#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ia64/ski/libski.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ia64/ski/main.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ia64/ski/pal_stub.S#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ia64/ski/sal_stub.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ia64/ski/skiconsole.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ia64/ski/skifs.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ia64/ski/skiload.cmd#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ia64/ski/skimd.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ia64/ski/ssc.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ia64/ski/start.S#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ia64/ski/time.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ia64/ski/version#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ofw/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ofw/Makefile.inc#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ofw/common/Makefile.inc#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ofw/common/main.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ofw/libofw/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ofw/libofw/devicename.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ofw/libofw/elf_freebsd.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ofw/libofw/libofw.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ofw/libofw/ofw_console.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ofw/libofw/ofw_copy.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ofw/libofw/ofw_disk.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ofw/libofw/ofw_memory.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ofw/libofw/ofw_module.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ofw/libofw/ofw_net.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ofw/libofw/ofw_reboot.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ofw/libofw/ofw_time.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ofw/libofw/openfirm.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ofw/libofw/openfirm.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/Makefile.inc#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/boot0.5/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/boot0.5/boot.s#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/boot0.5/boot0.5.s#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/boot0.5/disk.s#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/boot0.5/ldscript#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/boot0.5/putssjis.s#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/boot0.5/selector.s#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/boot0.5/start.s#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/boot0.5/support.s#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/boot0.5/syscons.s#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/boot0/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/boot0/boot0.s#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/boot2/Makefile#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/boot2/asm.S#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/boot2/asm.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/boot2/bios.S#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/boot2/boot.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/boot2/boot.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/boot2/boot2.S#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/boot2/dinode.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/boot2/disk.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/boot2/fs.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/boot2/inode.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/boot2/io.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/boot2/probe_keyboard.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/boot2/quota.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/boot2/serial.S#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/boot2/serial_16550.S#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/boot2/serial_8251.S#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/boot2/start.S#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/boot2/sys.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/boot2/table.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/btx/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/btx/Makefile.inc#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/btx/btx/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/btx/btx/btx.S#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/btx/btxldr/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/btx/btxldr/btxldr.S#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/btx/lib/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/btx/lib/btxcsu.s#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/btx/lib/btxsys.s#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/btx/lib/btxv86.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/btx/lib/btxv86.s#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/cdboot/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/cdboot/cdboot.s#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/kgzldr/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/kgzldr/crt.s#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/libpc98/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/libpc98/bioscd.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/libpc98/biosdisk.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/libpc98/biosmem.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/libpc98/biossmap.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/libpc98/comconsole.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/libpc98/i386_module.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/libpc98/time.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/libpc98/vidconsole.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/loader/Makefile#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/loader/conf.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/loader/help.pc98#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/loader/main.c#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/powerpc/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/powerpc/Makefile.inc#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/powerpc/ofw/Makefile#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/powerpc/ofw/conf.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/powerpc/ofw/help.ofw#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/powerpc/ofw/ldscript.powerpc#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/powerpc/ofw/metadata.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/powerpc/ofw/start.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/powerpc/ofw/version#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/powerpc/uboot/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/powerpc/uboot/conf.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/powerpc/uboot/help.uboot#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/powerpc/uboot/ldscript.powerpc#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/powerpc/uboot/start.S#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/powerpc/uboot/version#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/sparc64/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/sparc64/Makefile.inc#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/sparc64/boot1/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/sparc64/boot1/_start.s#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/sparc64/boot1/boot1.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/sparc64/loader/Makefile#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/sparc64/loader/help.sparc64#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/sparc64/loader/locore.S#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/sparc64/loader/main.c#4 integrate .. //depot/projects/vimage-commit/src/sys/boot/sparc64/loader/metadata.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/sparc64/loader/version#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/uboot/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/uboot/Makefile.inc#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/uboot/common/Makefile.inc#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/uboot/common/main.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/uboot/common/metadata.c#1 branch .. //depot/projects/vimage-commit/src/sys/boot/uboot/lib/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/uboot/lib/api_public.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/uboot/lib/console.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/uboot/lib/copy.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/uboot/lib/devicename.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/uboot/lib/disk.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/uboot/lib/elf_freebsd.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/uboot/lib/glue.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/uboot/lib/glue.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/uboot/lib/libuboot.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/uboot/lib/module.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/uboot/lib/net.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/uboot/lib/reboot.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/uboot/lib/time.c#2 integrate .. //depot/projects/vimage-commit/src/sys/bsm/audit.h#3 integrate .. //depot/projects/vimage-commit/src/sys/bsm/audit_internal.h#3 integrate .. //depot/projects/vimage-commit/src/sys/bsm/audit_kevents.h#4 integrate .. //depot/projects/vimage-commit/src/sys/bsm/audit_record.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cam/README.quirks#2 integrate .. //depot/projects/vimage-commit/src/sys/cam/cam.c#2 integrate .. //depot/projects/vimage-commit/src/sys/cam/cam.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cam/cam_ccb.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cam/cam_debug.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cam/cam_periph.c#2 integrate .. //depot/projects/vimage-commit/src/sys/cam/cam_periph.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cam/cam_queue.c#2 integrate .. //depot/projects/vimage-commit/src/sys/cam/cam_queue.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cam/cam_sim.c#2 integrate .. //depot/projects/vimage-commit/src/sys/cam/cam_sim.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cam/cam_xpt.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cam/cam_xpt.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cam/cam_xpt_periph.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cam/cam_xpt_sim.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_all.c#4 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_all.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_cd.c#2 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_cd.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_ch.c#2 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_ch.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_da.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_da.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_dvcfg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_iu.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_low.c#2 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_low.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_low_pisa.c#2 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_low_pisa.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_message.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_pass.c#2 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_pass.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_pt.c#2 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_pt.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_sa.c#2 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_sa.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_ses.c#2 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_ses.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_sg.c#2 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_sg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_targ_bh.c#2 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_target.c#2 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_targetio.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/kern/opensolaris.c#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/kern/opensolaris_cmn_err.c#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/kern/opensolaris_kstat.c#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/kern/opensolaris_string.c#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/rpc/xdr.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/acl.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/atomic.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/bitmap.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/byteorder.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/callb.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/cmn_err.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/cpupart.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/cpuvar.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/cpuvar_defs.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/cred.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/cyclic.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/cyclic_impl.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/debug.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/dirent.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/dkio.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/dnlc.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/elf.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/feature_tests.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/kcondvar.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/kmem.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/kobj.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/kstat.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/lock.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/misc.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/mman.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/mntent.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/mnttab.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/modctl.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/mount.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/mutex.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/objfs.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/param.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/pcpu.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/policy.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/proc.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/random.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/rwlock.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/sdt.h#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Sep 4 00:18:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B8FF1066D96; Thu, 4 Sep 2008 00:18: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 6011E1066D7B for ; Thu, 4 Sep 2008 00:18:05 +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 37E8A8FC21 for ; Thu, 4 Sep 2008 00:18:05 +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 m840I5kN009278 for ; Thu, 4 Sep 2008 00:18:05 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m840I5CZ009276 for perforce@freebsd.org; Thu, 4 Sep 2008 00:18:05 GMT (envelope-from julian@freebsd.org) Date: Thu, 4 Sep 2008 00:18:05 GMT Message-Id: <200809040018.m840I5CZ009276@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 149168 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Sep 2008 00:18:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=149168 Change 149168 by julian@julian_trafmon1 on 2008/09/04 00:17:51 IFC@149165 Affected files ... .. //depot/projects/vimage-commit/src/sys/boot/powerpc/uboot/metadata.c#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Thu Sep 4 00:24:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F27B31068569; Thu, 4 Sep 2008 00:24: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 AB16D1068567 for ; Thu, 4 Sep 2008 00:24:11 +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 830E58FC08 for ; Thu, 4 Sep 2008 00:24:11 +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 m840OBui021422 for ; Thu, 4 Sep 2008 00:24:11 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m840OBOs021420 for perforce@freebsd.org; Thu, 4 Sep 2008 00:24:11 GMT (envelope-from julian@freebsd.org) Date: Thu, 4 Sep 2008 00:24:11 GMT Message-Id: <200809040024.m840OBOs021420@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 149169 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Sep 2008 00:24:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=149169 Change 149169 by julian@julian_trafmon1 on 2008/09/04 00:23:37 change my mind about this one Affected files ... .. //depot/doc/obliterate#21 edit Differences ... ==== //depot/doc/obliterate#21 (text+ko) ==== @@ -7,7 +7,6 @@ //depot/projects/kmacy_sun4v/doc/... //depot/projects/kmacy_sun4v/www/... //depot/projects/peter/pmap/... -//depot/projects/vimage-commit/... //depot/projects/vimage-commit3/... //depot/projects/pmap/... //depot/projects/opensolaris/... From owner-p4-projects@FreeBSD.ORG Thu Sep 4 00:25:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E2EE106874E; Thu, 4 Sep 2008 00:25: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 01FB4106874C for ; Thu, 4 Sep 2008 00:25:13 +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 E711B8FC1D for ; Thu, 4 Sep 2008 00:25:12 +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 m840PC0P021527 for ; Thu, 4 Sep 2008 00:25:12 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m840PCG9021525 for perforce@freebsd.org; Thu, 4 Sep 2008 00:25:12 GMT (envelope-from julian@freebsd.org) Date: Thu, 4 Sep 2008 00:25:12 GMT Message-Id: <200809040025.m840PCG9021525@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 149170 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Sep 2008 00:25:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=149170 Change 149170 by julian@julian_trafmon1 on 2008/09/04 00:24:18 some very small un-needed items Affected files ... .. //depot/projects/vimage-commit2/src/sys/ddb/db_textdump.c#7 edit .. //depot/projects/vimage-commit2/src/sys/dev/firewire/firewire.c#7 edit .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#9 edit .. //depot/projects/vimage/src/sys/netinet/ip_fw.h#12 edit .. //depot/projects/vimage/src/sys/netinet/ip_fw_nat.c#6 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/ddb/db_textdump.c#7 (text+ko) ==== @@ -184,7 +184,6 @@ mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen, uint32_t blksz) { - INIT_VPROCG(TD_TO_VPROCG(&thread0)); bzero(kdh, sizeof(*kdh)); strncpy(kdh->magic, TEXTDUMPMAGIC, sizeof(kdh->magic)); ==== //depot/projects/vimage-commit2/src/sys/dev/firewire/firewire.c#7 (text+ko) ==== @@ -678,7 +678,6 @@ static void fw_reset_crom(struct firewire_comm *fc) { - INIT_VPROCG(TD_TO_VPROCG(curthread)); /* XXX */ struct crom_src_buf *buf; struct crom_src *src; struct crom_chunk *root; @@ -704,7 +703,7 @@ crom_add_simple_text(src, root, &buf->vendor, "FreeBSD Project"); crom_add_entry(root, CSRKEY_HW, __FreeBSD_version); #endif - crom_add_simple_text(src, root, &buf->hw, V_hostname); + crom_add_simple_text(src, root, &buf->hw, G_hostname); } /* ==== //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#9 (text+ko) ==== @@ -1207,8 +1207,9 @@ * receive window. */ static __inline int -select_rcv_wscale(int space) +select_rcv_wscale(int space, struct socket *so) { + INIT_VNET_INET(so->so_vnet); int wscale = 0; if (space > MAX_RCV_WND) @@ -1315,7 +1316,7 @@ calc_opt0h(struct socket *so, int mtu_idx) { struct tcpcb *tp = so_sototcpcb(so); - int wscale = select_rcv_wscale(tp->rcv_wnd); + int wscale = select_rcv_wscale(tp->rcv_wnd, so); return V_NAGLE((tp->t_flags & TF_NODELAY) == 0) | V_KEEP_ALIVE((so_options_get(so) & SO_KEEPALIVE) != 0) | F_TCAM_BYPASS | ==== //depot/projects/vimage/src/sys/netinet/ip_fw.h#12 (text+ko) ==== @@ -727,6 +727,7 @@ u_int64_t _norule_counter; struct callout _ipfw_timeout; + eventhandler_tag _ifaddr_event_tag; }; #endif ==== //depot/projects/vimage/src/sys/netinet/ip_fw_nat.c#6 (text+ko) ==== @@ -73,10 +73,9 @@ #ifndef VIMAGE extern struct ip_fw_chain V_layer3_chain; +static eventhandler_tag ifaddr_event_tag; #endif -static eventhandler_tag ifaddr_event_tag; - extern ipfw_nat_t *ipfw_nat_ptr; extern ipfw_nat_cfg_t *ipfw_nat_cfg_ptr; extern ipfw_nat_cfg_t *ipfw_nat_del_ptr; From owner-p4-projects@FreeBSD.ORG Thu Sep 4 00:32:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C214A10685E3; Thu, 4 Sep 2008 00:32: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 8662C10685DF for ; Thu, 4 Sep 2008 00:32:20 +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 5E6AA8FC1F for ; Thu, 4 Sep 2008 00:32:20 +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 m840WKCf034669 for ; Thu, 4 Sep 2008 00:32:20 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m840WKR2034663 for perforce@freebsd.org; Thu, 4 Sep 2008 00:32:20 GMT (envelope-from julian@freebsd.org) Date: Thu, 4 Sep 2008 00:32:20 GMT Message-Id: <200809040032.m840WKR2034663@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 149172 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Sep 2008 00:32:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=149172 Change 149172 by julian@julian_trafmon1 on 2008/09/04 00:31:35 reduce diff by adding missing entry. (not used yet) Affected files ... .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw.h#3 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_fw.h#3 (text+ko) ==== @@ -734,6 +734,7 @@ u_int64_t _norule_counter; struct callout _ipfw_timeout; + eventhandler_tag _ifaddr_event_tag; }; #endif From owner-p4-projects@FreeBSD.ORG Thu Sep 4 07:09:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6842A106567A; Thu, 4 Sep 2008 07:09: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 2B53C1065677; Thu, 4 Sep 2008 07:09:50 +0000 (UTC) (envelope-from olli@fromme.com) Received: from haluter.fromme.com (unknown [IPv6:2a01:170:102f:0:200:e8ff:fe59:a347]) by mx1.freebsd.org (Postfix) with ESMTP id 9C3888FC0A; Thu, 4 Sep 2008 07:09:49 +0000 (UTC) (envelope-from olli@fromme.com) Received: from haluter.fromme.com (irc_sucks@localhost [127.0.0.1]) by haluter.fromme.com (8.14.2/8.14.2) with ESMTP id m8479lSc006277; Thu, 4 Sep 2008 09:09:48 +0200 (CEST) (envelope-from olli@fromme.com) Received: (from olli@localhost) by haluter.fromme.com (8.14.2/8.14.2/Submit) id m8479lZB006275; Thu, 4 Sep 2008 09:09:47 +0200 (CEST) (envelope-from olli) From: Oliver Fromme Message-Id: <200809040709.m8479lZB006275@haluter.fromme.com> To: hselasky@freebsd.org (Hans Petter Selasky) Date: Thu, 4 Sep 2008 09:09:47 +0200 (CEST) In-Reply-To: <200809032018.m83KId3F074494@repoman.freebsd.org> from "Hans Petter Selasky" at Sep 03, 2008 08:18:39 PM X-Mailer: ELM [version 2.5 PL6] MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-2.1.2 (haluter.fromme.com [127.0.0.1]); Thu, 04 Sep 2008 09:09:48 +0200 (CEST) Cc: Perforce Change Reviews Subject: Re: PERFORCE change 149152 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Sep 2008 07:09:50 -0000 Hans Petter Selasky wrote: > http://perforce.freebsd.org/chv.cgi?CH=149152 > > Change 149152 by hselasky@hselasky_laptop001 on 2008/09/03 20:17:46 > > > My first USB manual page. > > Affected files ... > > .. //depot/projects/usb/src/share/man/man4/usb2_core.4#1 add > .. //depot/projects/usb/src/sys/dev/usb2/core/README.TXT#4 delete This is really helpful. Thankyou very much! This almost makes me want to dig out my old DC240 camera which uses a proprietary protocol, and write a FreeBSD driver, just for the fun of it. Back in the old days (before ports/ graphics/gphoto) I wrote a userland tool that used ugen(4), but it was slow like a snail. Best regards Oliver -- Oliver Fromme, Bunsenstr. 13, 81735 Muenchen, Germany ``We are all but compressed light'' (Albert Einstein) From owner-p4-projects@FreeBSD.ORG Thu Sep 4 08:23:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8F0FB1065677; Thu, 4 Sep 2008 08:23: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 527ED1065674 for ; Thu, 4 Sep 2008 08:23:23 +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 3EFEF8FC13 for ; Thu, 4 Sep 2008 08:23:23 +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 m848NNfC082011 for ; Thu, 4 Sep 2008 08:23:23 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m848NNiA081965 for perforce@freebsd.org; Thu, 4 Sep 2008 08:23:23 GMT (envelope-from pgj@FreeBSD.org) Date: Thu, 4 Sep 2008 08:23:23 GMT Message-Id: <200809040823.m848NNiA081965@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 149177 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Sep 2008 08:23:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=149177 Change 149177 by pgj@freefall_pgj on 2008/09/04 08:22:58 MFen: 1.410 -> 1.412 hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml 1.123 -> 1.125 hu_HU.ISO8859-2/books/handbook/introduction/chapter.sgml 1.72 -> 1.73 hu_HU.ISO8859-2/books/handbook/mac/chapter.sgml 1.107 -> 1.108 hu_HU.ISO8859-2/books/handbook/network-servers/chapter.sgml 1.328 -> 1.330 hu_HU.ISO8859-2/books/handbook/security/chapter.sgml Commit me, please! :) Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#13 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/introduction/chapter.sgml#8 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mac/chapter.sgml#8 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/network-servers/chapter.sgml#10 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/security/chapter.sgml#11 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#13 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -1203,10 +1203,21 @@ hálózatok támogatását is be kell töltenünk a rendszermagba. Ez az &man.ath.4; meghajtó esetében a legalább a - &man.wlan.4; modul betöltését jelenti. Ez - a modul automatikusan betöltõdik a vezeték - nélküli eszközmeghajtóval együtt. - Emellett még azokra a modulokra is + &man.wlan.4;, wlan_scan_ap és + wlan_scan_sta modulok + betöltését jelenti. A &man.wlan.4; modul a + vezetéknélküli eszköz + meghajtóprogramjával együtt + töltõdik be, míg a többi modult a + /boot/loader.conf állomány + használatával kell a + rendszerindítás során + betöltenünk: + + wlan_scan_ap_load="YES" +wlan_scan_sta_load="YES" + + Emellett még azokra a modulokra is szükségünk van, amelyek a használni kívánt biztonsági protokollokhoz nyújtanak kriptográfiai @@ -1254,6 +1265,8 @@ device ath_hal # az Atheros meghajtó hardveres rétege device ath_rate_sample # John Bicket "SampleRate" vezérlési algoritmusa device wlan # a 802.11 támogatása (kell!) +device wlan_scan_ap # a 802.11 AP módú keresés +device wlan_scan_sta # a 802.11 STA módú keresés device wlan_wep # WEP titkosítás támogatása a 802.11 eszközök számára device wlan_ccmp # AES-CCMP titkosítás támogatása a 802.11 eszközök számára device wlan_tkip # TKIP és Michael titkosítás támogatása a 802.11 eszközök számára @@ -2299,7 +2312,12 @@ használunk. Itt most egy harmadik kulcsot használtunk, amelynek egyeznie kell a hozzáférési pont - beállításaival. + beállításaival. Ha nem tudjuk + pontosan, hogy milyen kulcsot használ a + hozzáférési pont, akkor + próbálkozzunk az 1 + érték (vagyis az elsõ kulcs) + megadásával. ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/introduction/chapter.sgml#8 (text+ko) ==== @@ -7,7 +7,7 @@ The FreeBSD Hungarian Documentation Project Translated by: PALI, Gabor %SOURCE% en_US.ISO8859-1/books/handbook/introduction/chapter.sgml - %SRCID% 1.123 + %SRCID% 1.125 --> @@ -28,7 +28,7 @@ Áttekintés Köszönjük, hogy érdeklõdik a &os; - iránt! A fejezet a &os; Projektet több + iránt! A fejezet a &os; Projektet több különbözõ vonatkozásban mutatja be: a történetét, a céljait, a fejlesztési modelljét és így @@ -43,10 +43,10 @@ rendszerekhez; - a &os; Projekt történetét; + a &os; Projekt történetét; - a &os; Projekt célkitûzéseit; + a &os; Projekt célkitûzéseit; a &os; nyílt forráskódú @@ -324,7 +324,7 @@ kiadásán alapszik és ápolja a BSD-rendszerek fejlesztésének jellegzetes hagyományait. Túl a kutatócsoport - kivételes munkáján, a &os; Projekt + kivételes munkáján, a &os; Projekt több ezernyi órát szentelt arra, hogy a legtöbbet hozza ki a rendszerbõl mind a teljesítményt, mind pedig a valós @@ -635,7 +635,7 @@ - A &os; Projektrõl + A &os; Projektrõl A most következõ rész egy-két háttérinformációt tár fel a @@ -665,7 +665,7 @@ történet - A &os; Projekt valamikor 1993 kezdetérõl + A &os; Projekt valamikor 1993 kezdetérõl eredeztethetõ, és részben a Nem hivatalos 386BSD Patchkit-bõl nõtt ki, a patchkit 3 legutolsó koordinátorának, Nate @@ -873,8 +873,8 @@ A 2004 augusztusában, a RELENG_5 ág létrehozását a 5.3-RELEASE követte, és egyben a 5-STABLE ág kezdetét is - jelezte. A legújabb &rel2.current;-RELEASE - &rel2.current.date;ában jött ki. A RELENG_5 + jelezte. A legújabb 5.5-RELEASE 2006 + májusában jött ki. A RELENG_5 ágból már nem fog készülni több kiadás. @@ -883,13 +883,20 @@ ezúttal a RELENG_6 ágnak adott életet. A 6.0-RELEASE az 6.X ág elsõ kiadásaként 2005 novemberében jelent meg. A legújabb - &rel.current;-RELEASE &rel.current.date;jában + &rel2.current;-RELEASE &rel2.current.date;jában jelentkezett. A RELENG_6 ágból további kiadások is várhatóak. + A RELENG_7 ág 2007 októberében + jött létre. Ebbõl az ágból a + legújabb kiadás a &rel.current;-RELEASE, amely + &rel.current.date; hónapban jött ki. A RELENG_7 + ágból további kiadások is + várhatóak. + Jelen pillanatban a hosszabb távú - fejlesztések a 7.X-CURRENT (törzs) ágban - kapnak helyet, és a 7.X-bõl készült + fejlesztések a 8.X-CURRENT (törzs) ágban + kapnak helyet, és a 8.X-bõl készült idõközönkénti pillanatkiadások folyamatosan elérhetõek CD-n (és természetesen interneten keresztül is) - A &os; Projekt céljai + A &os; Projekt céljai &os; Projekt célok - A &os; Projekt célja, hogy olyan szoftvereket + A &os; Projekt célja, hogy olyan szoftvereket kínáljon, amelyek tetszõlegesen, bármilyen célra felhasználhatóak, mindenféle megkötések nélkül. @@ -995,15 +1002,15 @@ felhasználót munkájuk fõbb eredményeirõl. - A &os; Projektrõl és annak fejlesztési - modelljérõl hasznos tudni az alábbiakat, - függetlenül attól, hogy egyedül vagy - másokkal szoros együttmûködésben - dolgozunk: + A &os; Projektrõl és annak + fejlesztési modelljérõl hasznos tudni az + alábbiakat, függetlenül attól, hogy + egyedül vagy másokkal szoros + együttmûködésben dolgozunk: - A CVS repositoryAz SVN és CVS repositoryk @@ -1014,27 +1021,62 @@ Concurrent Versions System CVS + + SVN + repository> + + + Subversion + SVN + - A &os; központi forrásfáját - CVS-en - (Concurrent Versions System) keresztül tartják - karban, amely egy, a &os;-vel is érkezõ, - szabadon elérhetõ verziókezelõ - rendszer. Az elsõdleges Sok éven keresztül a &os; központi + forrásfáját CVS-en + (Concurrent Versions System) keresztül + tartották karban, amely egy, a &os;-vel is + érkezõ, szabadon elérhetõ + verziókezelõ rendszer. 2008 + júniusában a Projekt az SVN + (Subversion) használatára váltott. + Ez a váltás szükségszerû + volt, mivel a CVS által okozott technikai + nehézségek gyorsan elõjöttek a + forrásfa és a hozzátartozó + metainformációk szapora + növekedésével. Noha a központi + repository most már + SVN-alapú, a + kliensoldali CVSup és + csup alkalmazások + továbbra is a korábbi + infrastruktúrával dolgoznak, ahogy eddig is + — az SVN respositoryban + végzett változtatások ehhez + automatikusan átkerülnek + CVS alá. Jelen + pillanatban egyedül csak a központi + forrásfa használja ezt a megoldást, a + dokumentáció, a weboldalak és a + Portgyûjtemény forrásai továbbra + is CVS alól + üzemelnek. Az elsõdleges CVS repository egy Santa Clara-i (California, USA) számítógépen található, ahonnan a világban található rengeteg tükörszerverre - másolódik. A CVS-fa, mely tartalmazza a + másolódik. Az + SVN-fa, mely tartalmazza a -CURRENT és -STABLE ágakat, könnyen lemásolható a saját számítógépünkre is. Ennek részleteirõl bõvebben a A forrásfa - szinkronizálása c. szakaszban + szinkronizálása c. szakaszban olvashatunk. @@ -1071,8 +1113,8 @@ Core Team - Ha a &os; Projekt egy vállalat lenne, akkor a - &os; Core Teamje + Ha a &os; Projekt egy vállalat lenne, + akkor a &os; Core Teamje (irányító csoportja) foglalná magában a vezetõséget. Ennek a csoportnak elsõdleges feladata, hogy fenntartsa a @@ -1084,7 +1126,7 @@ és odaadó committerek tömörítése és az új tagok beszervezése, ha a csoportból - kilépne valaki. A jelenlegi Core Team tagjait 2006 + kilépne valaki. A jelenlegi Core Team tagjait 2008 júliusában választották meg. A választásokat kétévente tartják. @@ -1150,7 +1192,7 @@ Nem csak programozással lehet segíteni a Projektet: a megoldandó feladatok listáját megtalálhatjuk a &os; Projekt + url="&url.base;/index.html">&os; Projekt honlapján. ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mac/chapter.sgml#8 (text+ko) ==== @@ -6,7 +6,7 @@ @@ -1278,77 +1278,73 @@ is hívják a tunefs beállítását nek. + - - A seeotheruids MAC-modul + + A seeotheruids MAC-modul - Lássak - másokatMAC-házirend + Lássak + másokatMAC-házirend - A modul neve: - mac_seeotheruids.ko + A modul neve: mac_seeotheruids.ko - A rendszermag konfigurációs - beállítása: options - MAC_SEEOTHERUIDS + A rendszermag konfigurációs + beállítása: options + MAC_SEEOTHERUIDS - Rendszerindítási - beállítás: - mac_seeotheruids_load="YES" + Rendszerindítási beállítás: + mac_seeotheruids_load="YES" - A &man.mac.seeotheruids.4; modul a - security.bsd.see_other_uids és - security.bsd.see_other_gids - sysctl-változókat - utánozza és terjeszti ki. A - használatához semmilyen címkét nem - kell beállítani és transzparens - módon képes együttmûködni a - többi modullal. + A &man.mac.seeotheruids.4; modul a + security.bsd.see_other_uids és + security.bsd.see_other_gids + sysctl-változókat utánozza + és terjeszti ki. A használatához semmilyen + címkét nem kell beállítani és + transzparens módon képes + együttmûködni a többi modullal. - A modult betöltése után az alábbi - sysctl-változókkal tudjuk - vezérelni: + A modult betöltése után az alábbi + sysctl-változókkal tudjuk + vezérelni: - - - A security.mac.seeotheruids.enabled - engedélyezi a modult és az - alapértelmezett beállításokat - használja. Alapértelmezés szerint - egyik felhasználó sem láthatja a - többiek futó programjait és - csatlakozásait. - + + + A security.mac.seeotheruids.enabled + engedélyezi a modult és az + alapértelmezett beállításokat + használja. Alapértelmezés szerint egyik + felhasználó sem láthatja a többiek + futó programjait és + csatlakozásait. + - - A + + A security.mac.seeotheruids.specificgid_enabled - egy adott csoportot mentesít a házirend - szabályozásai alól. Tehát ki - akarunk vonni egy csoportot a házirend - alkalmazásából, akkor - állítsuk be a - security.mac.seeotheruids.specificgid=XXX - sysctl-változót, ahol az - XXX a mentesíteni - kívánt csoport numerikus - azonosítója. - + egy adott csoportot mentesít a házirend + szabályozásai alól. Tehát ki + akarunk vonni egy csoportot a házirend + alkalmazásából, akkor + állítsuk be a + security.mac.seeotheruids.specificgid=XXX + sysctl-változót, ahol az + XXX a mentesíteni + kívánt csoport numerikus + azonosítója. + - - A - security.mac.seeotheruids.primarygroup_enabled - segítségével adott elsõdleges - csoportokat vonhatunk ki a házirend hatálya - alól. Ezt a változót nem - használhatjuk a - security.mac.seeotheruids.specificgid_enabled - változóval együtt. - - - - + + A + security.mac.seeotheruids.primarygroup_enabled + segítségével adott elsõdleges + csoportokat vonhatunk ki a házirend hatálya + alól. Ezt a változót nem + használhatjuk a + security.mac.seeotheruids.specificgid_enabled + változóval együtt. + + ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/network-servers/chapter.sgml#10 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -5107,8 +5107,8 @@ - A BIND GYIK (angolul) + url="http://www.isc.org/index.pl?/sw/bind/FAQ.php"> + A BIND9 GYIK (angolul) ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/security/chapter.sgml#11 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -2287,10 +2287,10 @@ Ha rossz DNS beállításokat használunk, a - PARANOID opcióval súlyosan - mozgásképtelenné tehetjük a - kliensünket vagy szerverünket. Ezért - legyünk óvatosak vele! + PARANOID megadásával + súlyosan mozgásképtelenné + tehetjük a kliensünket vagy szerverünket. + Ezért legyünk óvatosak vele! A helyettesítõ jelekrõl és @@ -4891,7 +4891,7 @@ ipfw add 00201 allow log esp from any to any ipfw add 00202 allow log ah from any to any ipfw add 00203 allow log ipencap from any to any -ipfw add 00204 allow log usp from any 500 to any +ipfw add 00204 allow log udp from any 500 to any A szabályok számozását mindig From owner-p4-projects@FreeBSD.ORG Thu Sep 4 08:24:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C32DB1065675; Thu, 4 Sep 2008 08:24: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 82B9A1065673 for ; Thu, 4 Sep 2008 08:24:24 +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 707328FC16 for ; Thu, 4 Sep 2008 08:24:24 +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 m848OOJa088848 for ; Thu, 4 Sep 2008 08:24:24 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m848OOAg088836 for perforce@freebsd.org; Thu, 4 Sep 2008 08:24:24 GMT (envelope-from pgj@FreeBSD.org) Date: Thu, 4 Sep 2008 08:24:24 GMT Message-Id: <200809040824.m848OOAg088836@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 149178 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Sep 2008 08:24:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=149178 Change 149178 by pgj@freefall_pgj on 2008/09/04 08:24:04 MFen: 1.1098 -> 1.1099 hu_HU.ISO8859-2/books/faq/book.sgml MFP4 after: ASAP Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#22 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#22 (text+ko) ==== @@ -9,7 +9,7 @@ @@ -1291,7 +1291,7 @@ szextõl kezdve a sportokon keresztül a nukleáris fegyverekig éppen úgy, ahogy a &os;-rõl is. Mi szóltunk - elõre! A szerver a irc.chat.org + elõre! A szerver a irc.efnet.org címen érhetõ el. From owner-p4-projects@FreeBSD.ORG Thu Sep 4 08:25:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E934C1065672; Thu, 4 Sep 2008 08:25: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 AD9B31065670 for ; Thu, 4 Sep 2008 08:25:25 +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 9B6F08FC12 for ; Thu, 4 Sep 2008 08:25:25 +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 m848PPR5096567 for ; Thu, 4 Sep 2008 08:25:25 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m848PP5b096560 for perforce@freebsd.org; Thu, 4 Sep 2008 08:25:25 GMT (envelope-from pgj@FreeBSD.org) Date: Thu, 4 Sep 2008 08:25:25 GMT Message-Id: <200809040825.m848PP5b096560@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 149179 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Sep 2008 08:25:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=149179 Change 149179 by pgj@freefall_pgj on 2008/09/04 08:24:49 MFen: 1.18 -> 1.19 hu/administration.sgml MFP4 after: ASAP Affected files ... .. //depot/projects/docproj_hu/www/hu/administration.sgml#10 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/administration.sgml#10 (text+ko) ==== @@ -9,7 +9,7 @@ @@ -445,10 +445,6 @@ href="mailto:remko@FreeBSD.org">remko@FreeBSD.org> -
  • &a.gnn; <gnn@FreeBSD.org> -
    • -
  • &a.simon; <simon@FreeBSD.org> (Officer helyettes)
    • From owner-p4-projects@FreeBSD.ORG Thu Sep 4 08:26:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 596A11065678; Thu, 4 Sep 2008 08:26: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 03C061065673 for ; Thu, 4 Sep 2008 08:26:27 +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 E3FE08FC1E for ; Thu, 4 Sep 2008 08:26: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 m848QQAS004937 for ; Thu, 4 Sep 2008 08:26:26 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m848QQbj004886 for perforce@freebsd.org; Thu, 4 Sep 2008 08:26:26 GMT (envelope-from pgj@FreeBSD.org) Date: Thu, 4 Sep 2008 08:26:26 GMT Message-Id: <200809040826.m848QQbj004886@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 149180 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Sep 2008 08:26:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=149180 Change 149180 by pgj@freefall_pgj on 2008/09/04 08:25:35 IFC Affected files ... .. //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#12 integrate .. //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#4 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/tools/checkupdate/notify#6 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/des.key#2 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/lippe.key#2 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/makc.key#1 branch .. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#9 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#9 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/yar.key#1 branch .. //depot/projects/docproj_hu/doc/share/sgml/mirrors.xml#3 integrate .. //depot/projects/docproj_hu/src_7/release/doc/en_US.ISO8859-1/relnotes/article.sgml#2 integrate .. //depot/projects/docproj_hu/www/en/developers.sgml#10 integrate .. //depot/projects/docproj_hu/www/en/donations/donors.sgml#5 integrate .. //depot/projects/docproj_hu/www/en/donations/wantlist.sgml#3 integrate .. //depot/projects/docproj_hu/www/en/gnome/docs/example-Makefile.sgml#2 integrate .. //depot/projects/docproj_hu/www/en/gnome/docs/gnome2_porting.sgml#2 integrate .. //depot/projects/docproj_hu/www/en/gnome/docs/gnome_porting.sgml#2 integrate .. //depot/projects/docproj_hu/www/en/gnome/docs/porting.sgml#2 integrate .. //depot/projects/docproj_hu/www/en/java/dists/index.sgml#2 integrate .. //depot/projects/docproj_hu/www/en/java/docs/newbies.sgml#2 integrate .. //depot/projects/docproj_hu/www/en/java/index.sgml#2 integrate .. //depot/projects/docproj_hu/www/en/java/news.xml#2 integrate .. //depot/projects/docproj_hu/www/en/multimedia/multimedia-input.xml#4 integrate .. //depot/projects/docproj_hu/www/en/platforms/amd64.sgml#3 integrate .. //depot/projects/docproj_hu/www/en/platforms/amd64/motherboards.sgml#3 integrate .. //depot/projects/docproj_hu/www/en/releases/6.4R/Makefile#1 branch .. //depot/projects/docproj_hu/www/en/releases/6.4R/docbook.css#1 branch .. //depot/projects/docproj_hu/www/en/releases/6.4R/schedule.sgml#1 branch .. //depot/projects/docproj_hu/www/en/releases/7.1R/Makefile#1 branch .. //depot/projects/docproj_hu/www/en/releases/7.1R/docbook.css#1 branch .. //depot/projects/docproj_hu/www/en/releases/7.1R/schedule.sgml#1 branch .. //depot/projects/docproj_hu/www/en/releases/Makefile#2 integrate .. //depot/projects/docproj_hu/www/en/releng/index.sgml#4 integrate .. //depot/projects/docproj_hu/www/share/sgml/advisories.xml#3 integrate .. //depot/projects/docproj_hu/www/share/sgml/commercial.consult.xml#6 integrate .. //depot/projects/docproj_hu/www/share/sgml/commercial.hardware.xml#2 integrate .. //depot/projects/docproj_hu/www/share/sgml/commercial.isp.xml#5 integrate .. //depot/projects/docproj_hu/www/share/sgml/events.xml#5 integrate .. //depot/projects/docproj_hu/www/share/sgml/news.xml#16 integrate .. //depot/projects/docproj_hu/www/share/sgml/press.xml#7 integrate .. //depot/projects/docproj_hu/www/share/sgml/usergroups.xml#3 integrate Differences ... ==== //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#12 (text+ko) ==== @@ -13,7 +13,7 @@ builds for the other languages, and we will poke fun of you in public. - $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.459 2008/08/09 19:21:39 sbruno Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.460 2008/08/25 22:03:59 makc Exp $ --> aaron@FreeBSD.org"> @@ -636,6 +636,8 @@ maho@FreeBSD.org"> +makc@FreeBSD.org"> + manolis@FreeBSD.org"> marcel@FreeBSD.org"> ==== //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#4 (text+ko) ==== @@ -1,5 +1,5 @@ + uid Dag-Erling Smørgrav -uid Dag-Erling Smørgrav uid Dag-Erling Smørgrav uid [jpeg image of size 3315] sub 2048g/920C3313 2006-11-11 [expires: 2008-11-10] @@ -22,144 +22,193 @@ PBq6bMcstlqRn7V4YCndXLRUxUNApg/BAiex3Jk78YUR02Fm8Yn5moKa8aYI+Kg3 q5HbBACF/bIV/T85Jzds6ShS+OpzRXeL/v0640bdoJxjlcCvuF/zldp4ynB7mz5t +JDY4jBi+051uOMNGPsUbeSoc7/SXAoh3KnzO1GpX3hGzgXPg651TiJYSUx5AKvS -h1YsRbkew6JzEdcjSRgEROYNfk1n4Vqy0t8sxxkogaEpT0dVJ7QmRGFnLUVybGlu -ZyBTbcO4cmdyYXYgPGRlc0BmcmVlYnNkLm9yZz6IZgQTEQIAJgIbAwYLCQgHAwIE -FQIIAwQWAgMBAh4BAheABQJFVcxYBQkDwmdqAAoJEDDUOm5k6+IginkAnAhVjjz8 -rtrJGvX072L8g5sR3dCUAJ0QjELqG42pdZuk2vAqxGUfnLthiohGBBARAgAGBQJF -Vc56AAoJEBXWiATKbN+ycOIAoIOoNuBhwUECQ8gLCbZ0UM32KYTuAJsEFe+fTwfm -ke3z1EyqLw6hI9kRT4hGBBARAgAGBQJFVdEHAAoJEKBP+xt9yunTmIwAn2ZYsSEN -JuXc/RtkiyfsHd9V3r+5AKDjk6T44A8yt1rJTxAafISkWnfqz4hGBBARAgAGBQJF -VdLFAAoJEBRll9zcw5nHLMQAn2owiwjKy9KHQPUrxdPLlu+8wzkjAKDTRxKO95jd -q4ciRH3OytDQnNAWX4icBBABAgAGBQJFVdThAAoJEE1WKCF5BQwRljgEAIhEqAWq -ANd9TRbaZusKCbebxj4KwryatvRFnACdf2+QdQPlMWXLFT/o0mOWLfO/ZXp5PR8q -yh5SLS5JzBvtfqQ8CpXlu7d9gQ/huDEYIbfOHeQmURjh0xz7eNeOpo9aI873o988 -ZWY5xerzBLpI2KMOW4D8FE3+3BBRimMJ9PquiEYEEBECAAYFAkVV2iUACgkQMxEk -bVFH3PQ6qACeMcmmhoEdyUWqJD6XFRtoWnGQAqgAmwRlgx/5K9EwGnkVfnUr5rfZ -uEEziJwEEAECAAYFAkVV0YMACgkQH3+pCANY/L3LcgP6AqlGo3DYeCAyAoNM2rZ9 -foI9+4/601jrEmiTMZ9fCc1KQ0bs1vg3Q3iZlz1NaE08zMN6ub14tnCeWSzTMaKz -741lm4ZxuHWnyQdEjUGqcnCSykHsyyZxl4urkWJNO/3Z+o6MT+8Cg1Q8Tsz0iSJ2 -kopIJC+1PYuIV35MR4CFhSW0IURhZy1FcmxpbmcgU23DuHJncmF2IDxkZXNAZGVz -Lm5vPohmBBMRAgAmAhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AFAkVVzFEFCQPC -Z2oACgkQMNQ6bmTr4iCLbwCffkTovf6eg0tYwfDzZG1K4HdeNYAAn2SOy0S1cAXj -k4ci3x00pisEE3U8iEYEEBECAAYFAkVVzn8ACgkQFdaIBMps37Kv6wCglU9/QpZD -u2Hj9UPHjN/0uFLHyqAAnisZb2MNvsS9KAegVN7zUpnJl3itiEYEEBECAAYFAkVV -0REACgkQoE/7G33K6dNA5QCg8aTnAQKQVvazXOU6fdWkxIUumzcAoLyiGBpVQrYw -nWXMccFVtVwW1sDxiEYEEBECAAYFAkVV0tUACgkQFGWX3NzDmcct5gCgw3kM7D69 -rLbMfq25L/Tz+NelmGkAoNZ23I0g7krjj4L5OKVCXZu8mtcIiJwEEAECAAYFAkVV -1OsACgkQTVYoIXkFDBFEbAP/Sojn7y3EoAZxa/5Y6kiXUk6lx9WkZxV/8Q7pf+HK -nMrL6skQPUSjXqYNcM88WAzLR6VGAHhM0YKG0q2cHF3xNzOXyggd60haFYD+iH/8 -3MQc09/rn2oYWtPrzXlmnPpcydmQfKHwd6e9+FIc3213KIchzE1dncNihUmjwPOs -X6iIRgQQEQIABgUCRVXaNgAKCRAzESRtUUfc9KgUAJ4j6eaNQsKeaL6xSBWuv0xl -i10PjwCfYKdih3+QEPKot9zYa+MfzsH38peInAQQAQIABgUCRVXRhwAKCRAff6kI -A1j8vWCjA/9kzjUYKAIk1ZUo3v0IXS0qvFLHr40yNk0CnJPEU/DqMIarg65Y946p -E+GZJ1gTDtnzZga44AE1wcMTQPlX81sWkTBB1osNRU66NurTHf5fPO7gehv/Euzi -BER5FsgnnUk4HuCCbNOxsscpBjkUiYSXVoZQa+XgA5BANmW+IaFU77QkRGFnLUVy -bGluZyBTbcO4cmdyYXYgPGRlc0BsaW5wcm8ubm8+iGYEExECACYCGwMGCwkIBwMC -BBUCCAMEFgIDAQIeAQIXgAUCRVXMWAUJA8JnagAKCRAw1DpuZOviINXPAJwNOWfH -J+QUI+oREvQzD/7X0x/WAgCfVO9uN1bna3u07QRB91J2QSqoRV6IRgQQEQIABgUC -RVXOfwAKCRAV1ogEymzfsu4AAJ9KNsOzSiIbLHJyhvebODRgPiOe9ACfSVHbJWV5 -Gv6j2Ee7uMBqGDmm6VCIRgQQEQIABgUCRVXREQAKCRCgT/sbfcrp0y7FAJ0XWB/r -gkcjG5dZUGaNFvcvBZXgeACgl8FJS3gJP3WCS4mwiQ2YE23IQySIRgQQEQIABgUC -RVXS1QAKCRAUZZfc3MOZx8IOAKCUm2GhELKFMKQf/J0APIu3YjzmQwCg0a7UnQcw -h5Tyqh5tsBP2dIKvVumInAQQAQIABgUCRVXU6wAKCRBNVigheQUMEdbcBACT5jwZ -WMTZApWUXksb+Br/4AJQuyl/ioSM/QKN+ISUoL8z15u3sMyAeRtxRPzdyzM70qF/ -pil2EJ973IGONRbsgDSkxXeEnQ54NaJSgZb43WJu/PgARN5PV0Bv5lovGYW0hbMx -MvlE8nVufXrrJnHLhp7ZMDRvfLXPf1adNBoxJIhGBBARAgAGBQJFVdo2AAoJEDMR -JG1RR9z0MFYAnAmoO/9oTt1qNQfmEvHiMpCwC7MMAJ4/lhNKKx/5PZeIw2AGkG2V -iiu92NHMRsxEARAAAQEAAAAAAAAAAAAAAAD/2P/gABBKRklGAAEBAQBIAEgAAP/h -Af5FeGlmAABNTQAqAAAACAAHAQ8AAgAAAAUAAABiARAAAgAAAAcAAABoARoABQAA -AAEAAABwARsABQAAAAEAAAB4ASgAAwAAAAEAAgAAATIAAgAAABQAAACAh2kABAAA -AAEAAACUAAAAAFNPTlkAAERTQy1WMQAAAAABLAAAAAEAAAEsAAAAATIwMDY6MDg6 -MDkgMTI6NTI6MDcAABWCmgAFAAAAAQAAAZaCnQAFAAAAAQAAAZ6IIgADAAAAAQAC -AACIJwADAAAAAQBkAACQAAAHAAAABDAyMjCQAwACAAAAFAAAAaaQBAACAAAAFAAA -AbqSAQAKAAAAAQAAAc6SAgAFAAAAAQAAAdaSBAAKAAAAAQAAAd6SBQAFAAAAAQAA -AeaSBwADAAAAAQAFAACSCAADAAAAAQAAAACSCQADAAAAAQAAAACSCgAFAAAAAQAA -Ae6jAAAHAAAAAQMAAACjAQAHAAAAAQEAAACkAQADAAAAAQAAAACkAgADAAAAAQAA -AACkAwADAAAAAQAAAACkBgADAAAAAQAAAAAAAAAAAAAAAQAAAB4AAAAcAAAACjIw -MDY6MDg6MDggMTA6MjA6MjIAMjAwNjowODowOCAxMDoyMDoyMgAASt+LAA9CQAAt -VOYAD0JAAAAAAAAAAAoAAAAwAAAAEAAAAEYAAAAK/9sAQwAIBgYHBgUIBwcHCQkI -CgwUDQwLCwwZEhMPFB0aHx4dGhwcICQuJyAiLCMcHCg3KSwwMTQ0NB8nOT04Mjwu -MzQy/9sAQwEJCQkMCwwYDQ0YMiEcITIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy -MjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy/8AAEQgAlgBxAwEiAAIRAQMRAf/EABwA -AAEFAQEBAAAAAAAAAAAAAAABAgMEBgUHCP/EAD8QAAEDAwIEAgYFCgcBAAAAAAEA -AgMEBRESIQYxQWETURQicYGRwQcyobHRFSMkQlJicqLh8BdDVIKSk7Lx/8QAGQEA -AgMBAAAAAAAAAAAAAAAAAQMABAUC/8QAJhEAAgIBBAEEAgMAAAAAAAAAAAECEQME -EiExURMUMkEiI2Fxkf/aAAwDAQACEQMRAD8A9MQhCB0CRCTKhAQmSzMhjL5HBrR1 -K49Td5HgtgHhjzO7v6Lic4xXIyGOU3SO0jIKx8jpJnapZXv9pTGl0Ryx72/wuIVf -3S8FlaOXk2aFmYLpWwD1ZG1DR+rJsf8Al+K69DdaeuJY0lk7Rl0T9nDv3HdOhljL -oRPDOHZfSpoKcE0SCMJUKEEwhLlChByRKmldAEyo5JGxsc9xw1oySnErjXapJmbT -NOwGt/yHz9yXOW1WdwhulRTq6p9TMZH5A/UZ0aPxVNxJKd9bKABnPRZs5uT5NnFj -UVSEa3fn7kx4wd1YHuz5Ic0Y2898pbQ2ylqI3SPb4jmPa8xzMOY5W82n5jsrUjRn -AGVUcMEY23XKk0yOKkjTWm5+mxFkoDamLAkaOR7jsV0wVhfSjQ3GmrAcMBDJf4St -s12QMLTwZN65MfPi2S4JwU5MaU8KwVgQlQiQCmFOKY5QgxxWUM4qJ55wQQ95x7Bs -PsC0dfL4NDUS5xojc7PsCylEP0RuAcFVNRLpFzSx5bJW5OcJWtPtUT6iKPOt4AHM -nokp7tSSO0sLnD9oNOFn8fbNRPwXC0jbt1SYJCfqDwCU5zw1hOM9gmbf5BZWcMHd -RPaNJJ6Jkle8v0+hT+QcBn7lEalzjh0bmjuEqR0iCuj8akkaDzGFqrBWmustNK45 -kDdD/wCJux+5Zx7RLE5oPMbK7wXLmGugzkMmDwfaP6KzpXUq8lPWRThfg1rSpAom -qULSRlschCF0AQpjk8qNy5YSjdGmS2VbAM6oXj+UrL29xfbIXci5uT8VqLkSKCbS -4g6dz5Dqs9Tw+DSRQZyGsDcqnqXyX9LF7WyhWXGjoXFjonTzAatDRn49AqdNxFLO -4n8lSRx4zk7fDbf3LtspI4s6QBk5JPU+abLHCRkkvPQeSrRlFR5XJc2ttV0LTTCU -hxaWgjOlwwUypqDG5xDdWNwAE1mluXO6qOZ7cjGyrudcj1CzmVd4usOiSCmbI07m -MMcSOxwOatQXd8+htXTOgc9oIO+AT0z5roxMjwMAtPXBwpHxRyDBw72qxOcXD8ex -Kg1Jt9FUNIwRyKscIRiKa45IyZQ0d8Z/EJsjA0Bo2wi0UrRXskjOHPlc5x9hOymC -TUk6Oc0FKDTdGuapmqFhUzVqoxWOQjKF0AaVG5SFRuXLCVawA0suRtpKzscgcwOB -zuQPiVpKkaoJG+bT9yydNJGGvYzGGyOAAOf1iqWp7Ro6P4v+y2W685J2VOWoy/wI -dgdnOSV1b6PTEt+sfsWcfdqqXLKalL8bkqhKSujUhG1Zpo2ZIDjt3UVRFh4aDkHq -FlKOpvTKx7pmTaAdwQSPcn3SsvBna2ljm0h2C4NIUaTVHStGmiqHxSFkh1xjqei6 -LWNxqaTgrEQ110gjLp4SATg5HMLQWq4men0jp08kItXtYJp9o6Djk+9MsE2moZGM -n13HPlkkKGomEUbpHO2G6ucNMMzIpXNxoZq95/8Aqdh+aSK2ZpY5N+DVN5qdqgYp -2rYRhMehCEQDConqUqNy5aCQuWFu8brbeahzBpjeGyMHQk7EfEZW6cs5xbRST2s1 -EDczQZOPNpGD+PuVfUY98GWdNk2TV9Mz1yqG1Nuc7qw5wFSbb6qOOGqppXFmMyQN -djPcFcue4NdRlhIwSNXm7yXXtNyJgADMAbAkrIUkpW0bqX48FymrKZ+RJT18Lhnc -Pa7O+3U9ETVVKyIfmq6V+nJBc1u/xCbPcJGE/o0T99i3qom3CR+l/ocYz+2CMJjy -qhixru3/AKQNts1VPJVufLFT7+HDryT3KsWiZlJQmVwBdI7bsMlVrrdnim0McA47 -EN6bLiw3A+hCLVhocXux/fmuHO3aFyi6pmjq6h9aWU0WPzjgzHmScL0Ckp46anZF -E0Na0AYCxPCNL6dcHVcgBjp/qd3H8Pmt41aeix1He/sx9dkuexfRNHyU7VFGFM1X -aKAuEJUIgIymFPKY5SgkUnJVpwDC8EZBByrDzsqlU8Mp5CfJLlxydRVujxniOgdb -6+Ux5ELtx27KCmqsNaAA49Qey2fEFrFypgQMvac4zzXnlQyehqNDmEb7ZG6yJw3c -G/CThyb2lmjbSB7nZPTAzhJXvayFrg869uR5BZKkvM+gsbDr08zqS1l2qzE1zoS0 -A7lxxuk7JfGh/qx7sdcKolhHiYAO3ke6pW+CSeTLi7Q48wMquHTVUwLgQM8lqrJb -5TVBpa0RgZJI69l2ltVfYq/Ulf0egcLUwpbToDQ0lxJA9gXfYuVaNqVw8nfILqMW -zgX60YWof7ZFpilChYpgnCByEmUIkIHOULnrgX3jKzWFrm1dUHTj/Iiw5/vHT34X -k/Ev0kXO9F9PSE0VGdi1jvXeP3nfIfauewnoHEX0j2mzyT0sBNXWx7aWfUafIu7d -s+Wy4nCfGFVxPPViuljZMxrTHBEC1obvkjJJJ3H2LyGR515yprfcKi1V8VZSv0Sx -nLT0PY9kvJDfFpDMWRQmpM990tkaQ4AjyKzd8sPiZkiAH+3kuhw3xFR8QUgkhcGV -DR+dhJ3afMeY7ruviBbnCzXjfTNqORNWujzantWl4zqG+dLTzSTW6WR3rRta1v1d -t1un26IvJA0k88JI7XGD6xc4d1x6bGb0Y+3WTXOBIZNQOcADGVr6WkEDRth3JXIq -ZkQ9RoCc5oBycADmosdAc0Uq+/nh2mbVyR+JSiQCYD6wB2y3z3xstHabxQ3ik9Jo -J2zRZ0kgEEHyIO4XivHnFUVzmbbaCTXTxOzJIOT3duwWetN7r7TVGahqpIJNslp2 -PYjkfetPApRgkzF1LjLI2j6hjdspmkLyPh/6WWksgvlOG9PSYB/6b8x8F6bQXGku -NM2ooqiOeF3J0bsj2HyPZOTEUdLZCh8T+8oRsB8mSSue7c5TM7JqQoEA7pnLYp4R -jKhB1LVVNDUsqKWZ8UrDlr2HBC9Dsn0pFjWw3mmL+njwgZPtafl8F5yRjkmnHUYX -EoKXYyGWUPiz3mk4s4drgHRXWnaT0ld4Z/mwukLpbS3P5RpMefjtx96+csDzTsH9 -pK9BeSx7uX2j3i5cacPWyIl9wimkHKOnPiE9tth7yF5lxJx5X3wPpqcGlozsWNOX -PH7x+X3rJ49qUD3LuOKMeRU9ROXHQDb2qRpwEwDCXKYJJQ8jqula73X2ipFRQVck -EnUsOx7EciOxXJ6JwKgDef4qcS/6iH/pb+CFhMoUoNsYhCEQBhLhCFCAkwhChAwB -0Cdt0CEKBGndAQhAgFJzQhEAqEIUIGUIQgQ//9mIZgQTEQIAJgUCRVXNiwIbAwUJ -A8JnagYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEDDUOm5k6+IgXsAAoIgKM28/ -7QEaj/dniY60Dx05HmGBAJ9wzVU81fZOsy1zhQXjqkXR86SfrohGBBARAgAGBQJF -Vc5/AAoJEBXWiATKbN+y0swAnioDHaWcqqjBIBSN96Sj2Fc9MdKjAKCI/DI2x/9U -S+oLQqbmWuIM+f/WbIhGBBARAgAGBQJFVdERAAoJEKBP+xt9yunThOcAoM0tU4B5 -nYu/BEThw303mx15tQHXAKCxEiYipngcXVCL2SqmEL5yQq4vT4hGBBARAgAGBQJF -VdLVAAoJEBRll9zcw5nHxQ8AoMk8FXQ8FRPZmUmSMrgH/rn1W01dAJ9JoGO73MIJ -qKFyHBU5UYYeomGmOYicBBABAgAGBQJFVdTrAAoJEE1WKCF5BQwRSqMEALRtvzYB -tj697WhppxWqZ5zVV1nAgbdbJ5zHWghMoYiod69OZ/3ZxticAmLEF+yenp4OeItk -3ZjPCBQAI7sT7YPHEkwzp8vCUrqWp5XkA4OvSgI6p2ajuZhREdCvilRPtuIf0jTV -sOK/eklxU1Sd6KUPzBI5o0ac9zQsrY5oFqeiiEYEEBECAAYFAkVV2jYACgkQMxEk -bVFH3PRIfQCeKG8J5xyPZJF3e6b3HovW8eiAVzAAnRCcLkhgrrNA0BYKWUJAKWv3 -deEhuQINBEVVy+wQCACAJNIBtl1krYP2kKBpS7VRAaXUH7kf2FmxKmH51lYBbBwS -JYFHJorMSAWNYZBqY5vrDwy1K6hAxz/B/shQEYWYY9aVEEffmUUxcKF4OZpqUP/j -CcgJOqUcXL9uir9uYHc+tSnGEiAtJZ9HjQ4gwfXQ0qNmrdPTI8PbDR8ELoRYuQLm -4c4HYBO+/C6PRcwHiXSg6uO/NyUthZWz4ODnwPV7dJllPxwJTTgay6sKJ3UhgdFH -pGb5U5OW+fEA2tEsv5sbszDvSgSugWAUCQxb7Js7REY1fcwGFXP9lAzwkUicMJZo -osuqvIrusK9tL4DJWbkIz/5LAsPeRKJNXQ/j6yH7AAMFB/9v1FJtBebXV9PiahIP -W0/fiB5Bcmp2lj7M74a0rPT6fwG+p/NULicBBAPU3p3vPzAsm3BJauOPBDH9XFrM -iaQ64L0ijQoHhZhoD3tVkGihT8L2SHanhGXoFJTHb8CIA8yh1Sq18U2twPZjCK30 -0lD0ba/qrfm3902miKMXYSlCszosjpfqoX3f/WDQXrOgERMdPkZ34Q8bNk5VD+95 -j3f171Lmn08/c8IoUWGvwMhsONJHDQYmxf+dJi8M6zU9HqyTy4KJ7dSufRuOLcpO -zEfBrn/Ii0sxgeONSwUgeYLtjXC00e/XrVGZtJwUVSMwinuwxY7KF/pyaWrEePRr -gp7jiE8EGBECAA8FAkVVy+wCGwwFCQPCZwAACgkQMNQ6bmTr4iB+XgCeJAW1mrjx -/50jTLN0kTiQXnmd5dgAnjGc8V7Ovynb8ZannQ/Q3nYwCFw2 -=R5bv +h1YsRbkew6JzEdcjSRgEROYNfk1n4Vqy0t8sxxkogaEpT0dVJ7QhRGFnLUVybGlu +ZyBTbcO4cmdyYXYgPGRlc0BkZXMubm8+iGkEExECACkCGwMGCwkIBwMCBBUCCAME +FgIDAQIeAQIXgAUJBaNj3wUCSLu0cAIZAQAKCRAw1DpuZOviIL8EAJ45G6ZfXwsi +KDduvXh+o7S8FNDX+gCfTA4zI5sFDJJM4gOaOhoRWY+p6iKIRgQQEQIABgUCRVXO +fwAKCRAV1ogEymzfsq/rAKCVT39ClkO7YeP1Q8eM3/S4UsfKoACeKxlvYw2+xL0o +B6BU3vNSmcmXeK2IRgQQEQIABgUCRVXREQAKCRCgT/sbfcrp00DlAKDxpOcBApBW +9rNc5Tp91aTEhS6bNwCgvKIYGlVCtjCdZcxxwVW1XBbWwPGIRgQQEQIABgUCRVXS +1QAKCRAUZZfc3MOZxy3mAKDDeQzsPr2stsx+rbkv9PP416WYaQCg1nbcjSDuSuOP +gvk4pUJdm7ya1wiInAQQAQIABgUCRVXU6wAKCRBNVigheQUMEURsA/9KiOfvLcSg +BnFr/ljqSJdSTqXH1aRnFX/xDul/4cqcysvqyRA9RKNepg1wzzxYDMtHpUYAeEzR +gobSrZwcXfE3M5fKCB3rSFoVgP6If/zcxBzT3+ufahha0+vNeWac+lzJ2ZB8ofB3 +p734UhzfbXcohyHMTV2dw2KFSaPA86xfqIhGBBARAgAGBQJFVdo2AAoJEDMRJG1R +R9z0qBQAniPp5o1Cwp5ovrFIFa6/TGWLXQ+PAJ9gp2KHf5AQ8qi33Nhr4x/Owffy +l4icBBABAgAGBQJFVdGHAAoJEB9/qQgDWPy9YKMD/2TONRgoAiTVlSje/QhdLSq8 +UsevjTI2TQKck8RT8OowhquDrlj3jqkT4ZknWBMO2fNmBrjgATXBwxNA+VfzWxaR +MEHWiw1FTro26tMd/l887uB6G/8S7OIERHkWyCedSTge4IJs07GyxykGORSJhJdW +hlBr5eADkEA2Zb4hoVTviQJIBBABAgAyBQJFVxrYKxpodHRwOi8vd3d3LnBhZXBz +LmN4L2dwZy9zaWduaW5nLXBvbGljeS5hc2MACgkQJknmKMXTTQVjSRAAp+JK7kcz +FAygdwI/zxi+C7HVuR4VOf3Zbl3u0tyMfLaAjaRTImxuxoA+qQ7luikONLuFIwLr +urSLkjbawlgYpdkaoS+d6gk6hRfvkejpgrC6Uve+vuUnO3XNhlgbEZlEKThxt6x2 +mS/bjJ98q72nDXM0jf7YSpKPvWPugndy6Z3puOdh6pqLJLR62SVp6OQixj3vohsF +49ubMO7F0kbc6GueM3IWIUUHl93rStf8Zeyz6LB4nSIA0xycLynQIt60UerXkvFb +wReN/rPW/C41MzdBKled/aus1B9gcNpv4MnO3+RU9SYpLQkJthvHfsmjMnoBvTWZ +LrEfeGiqlg0pP/TpWE2sdf1wXrrvMgPd/oVRjSUgiEUB8LRojLNHJ9KrxMMm8kjd +g+DhmB/EZny3IUdXYU01xd6MrXgAy+Yw0BH6639fh38/BldJU/bHWimIEQWY3vd2 +r4Uii513sThN6Usf2wBlfO3sQsUFiLHqPMvrgfDWk14xZzVbA3Nq6YqkLa//4AO6 +UdpB+jBbTrh5QOuoOt9OzyDNN/4LcnaI6DzS63XalT7VPBQaX7jva7QjPDcCN76N +yrsj0+qAT6LVfHB+NAaci6C0Wvpi0VzkzVaajmyipa+V+W6Wid1PVI+shgq37Q4W +OCBVUG3Eq1MjlnfLmpBCVOgNQ08V2oyqAQ+0JkRhZy1FcmxpbmcgU23DuHJncmF2 +IDxkZXNAZnJlZWJzZC5vcmc+iGYEExECACYCGwMGCwkIBwMCBBUCCAMEFgIDAQIe +AQIXgAUJBaNj3wUCSLu0bQAKCRAw1DpuZOviINbfAJ9g5L3Jy9bI1LxPBof5h5Wk +kx7bXACfVoDF7ER6lIpYjpl4kNJDLHO1bu6IRgQQEQIABgUCRVXOegAKCRAV1ogE +ymzfsnDiAKCDqDbgYcFBAkPICwm2dFDN9imE7gCbBBXvn08H5pHt89RMqi8OoSPZ +EU+IRgQQEQIABgUCRVXRBwAKCRCgT/sbfcrp05iMAJ9mWLEhDSbl3P0bZIsn7B3f +Vd6/uQCg45Ok+OAPMrdayU8QGnyEpFp36s+IRgQQEQIABgUCRVXSxQAKCRAUZZfc +3MOZxyzEAJ9qMIsIysvSh0D1K8XTy5bvvMM5IwCg00cSjveY3auHIkR9zsrQ0JzQ +Fl+InAQQAQIABgUCRVXU4QAKCRBNVigheQUMEZY4BACIRKgFqgDXfU0W2mbrCgm3 +m8Y+CsK8mrb0RZwAnX9vkHUD5TFlyxU/6NJjli3zv2V6eT0fKsoeUi0uScwb7X6k +PAqV5bu3fYEP4bgxGCG3zh3kJlEY4dMc+3jXjqaPWiPO96PfPGVmOcXq8wS6SNij +DluA/BRN/twQUYpjCfT6rohGBBARAgAGBQJFVdolAAoJEDMRJG1RR9z0OqgAnjHJ +poaBHclFqiQ+lxUbaFpxkAKoAJsEZYMf+SvRMBp5FX51K+a32bhBM4icBBABAgAG +BQJFVdGDAAoJEB9/qQgDWPy9y3ID+gKpRqNw2HggMgKDTNq2fX6CPfuP+tNY6xJo +kzGfXwnNSkNG7Nb4N0N4mZc9TWhNPMzDerm9eLZwnlks0zGis++NZZuGcbh1p8kH +RI1BqnJwkspB7MsmcZeLq5FiTTv92fqOjE/vAoNUPE7M9IkidpKKSCQvtT2LiFd+ +TEeAhYUliQJIBBABAgAyBQJFVxrJKxpodHRwOi8vd3d3LnBhZXBzLmN4L2dwZy9z +aWduaW5nLXBvbGljeS5hc2MACgkQJknmKMXTTQWQhg/+Iw/okbVJbs4m+BXShV9u +O/wbhTUtYSdSYYsd40CW2w+UhbZ4XVVdXDPRTrMSM6XGFTF+QOdvCSrvcETVTWp3 +ZSjjxbruh8DGLNVeV7f2mWmGQHKWr+skdMumxJxdcGVqbjIf5k43jlXo0CGW9IcM +8i1aUX6bgsGe0BatMRxP7FgKNSA7BRN5rCHzYg88/CJQk+pm1LON0Kfuy0Vp7n5m +vB91Z9qDBPlT3+MEvfj6n6oC2mbXPECo/k34sJIj/lZCvVWjgpqGG0dG7XY+Ardj +eGlBP5pbypS0ibPwDXhVxx7DjPJVlxPsRVYvdWkYIYATAsddwlGo54dHfWGojXZw +J/8CWgI9sMclQr10dOc4SurVxV7QaWh/HTZeXLfJ/0NiWg5HKW7PgZjS8swlUz9m +5qbHpsDXr/P3iAfHcJa2EGnU2nqBMJvTwv2XQSdgc7gxmlKaa/n+Y15z7a2AOMz/ +qMIoHmxI7VFtJSXd0ynSmDwXN8UIszup8Wf9kO8tEhNTAtDjGg+BxzCHmtD2f0V4 +b6XV4Oco/4ACykU/T1MUEgXDcGaSyY2hyKqhUmljlHfjPMkZRXCEIft72LNlLfaJ +QlDQfVUCg2yH8nTwUkcGnPU9aQApnf6rPvEmOZuvs2+nzwTF9YLGVOsX/3DjK/e2 +WSm68wul2KaJVVODyOnbAS+0JERhZy1FcmxpbmcgU23DuHJncmF2IDxkZXNAbGlu +cHJvLm5vPohmBBMRAgAmAhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AFAki7s04F +CQWjY98ACgkQMNQ6bmTr4iDXmQCaAtXIiyZmamwNqPGQGfHNJpnlujQAnjuHMK65 +yLLmU5pGdk5wOTlWWcWYiEYEEBECAAYFAkVVzn8ACgkQFdaIBMps37LuAACfSjbD +s0oiGyxycob3mzg0YD4jnvQAn0lR2yVleRr+o9hHu7jAahg5pulQiEYEEBECAAYF +AkVV0REACgkQoE/7G33K6dMuxQCdF1gf64JHIxuXWVBmjRb3LwWV4HgAoJfBSUt4 +CT91gkuJsIkNmBNtyEMkiEYEEBECAAYFAkVV0tUACgkQFGWX3NzDmcfCDgCglJth +oRCyhTCkH/ydADyLt2I85kMAoNGu1J0HMIeU8qoebbAT9nSCr1bpiJwEEAECAAYF +AkVV1OsACgkQTVYoIXkFDBHW3AQAk+Y8GVjE2QKVlF5LG/ga/+ACULspf4qEjP0C +jfiElKC/M9ebt7DMgHkbcUT83cszO9Khf6YpdhCfe9yBjjUW7IA0pMV3hJ0OeDWi +UoGW+N1ibvz4AETeT1dAb+ZaLxmFtIWzMTL5RPJ1bn166yZxy4ae2TA0b3y1z39W +nTQaMSSIRgQQEQIABgUCRVXaNgAKCRAzESRtUUfc9DBWAJwJqDv/aE7dajUH5hLx +4jKQsAuzDACeP5YTSisf+T2XiMNgBpBtlYorvdiJAkgEEAECADIFAkVXGtkrGmh0 +dHA6Ly93d3cucGFlcHMuY3gvZ3BnL3NpZ25pbmctcG9saWN5LmFzYwAKCRAmSeYo +xdNNBbz/D/9+lMr3MrpcBzZSTHUHeoWua3h/wt5By3mOFBkcUwJYQERa08t95WfA +mnZTRR8mGRXaE9Atazkf1wjcdt5AlCe41BaT3mNJd6TO92+BAHaR72PkFr18W4ZP +GQDAKfGToQ9QDyy3CFrPRzlooqhzLMonuDe0/QXe5YD4OQT9jMTeBfq7i0ryRjjd +Z3J4wQ0xcYhOc9pWmJuUIoTEjZkq7rKtU2obddudPTOKz8V6isG5CiPWpjn4rhEf +8/RD9EMfqcANm+FOzMqLQ/xu5hxMiKervjykixhsI40ixDM1FqeVR4K0T/CIEzXQ +JXn5ZWH0LLw8CY17Wo1MIz+TugSmLQjFkGhgddk16LQgaa4laUdTGHp1skN11EBq +4eQLA3126eWi8xCpnMKGt0Vk2/sRatgjalWjFyI0S9ZODrZyicT5v6+mCMCa/y4b +7NYl1ZX8h3MhbvvLAsAxK/DKNIf9ML2Oa4ufYA+fyNaiaeRw1N+98/OfbAEw/IS0 +q+ITzum7ksbCkRHa/i8d8E/VtdQPTPK02pj638N7T11Mik2fZK6y2q4Tz9zwqBxs +UogZCq6cb6H9iFK6ggQhCl5jLBIv4EcbHjgkX9aWERjUgR9DtxBoZPGW7PFkSy0g +eLjQHDOZdOF2xdP5Uoc90CcMq3pXMmjAHSLqbFevAWZLTVS5d2jfSdHMRsxEARAA +AQEAAAAAAAAAAAAAAAD/2P/gABBKRklGAAEBAQBIAEgAAP/hAf5FeGlmAABNTQAq +AAAACAAHAQ8AAgAAAAUAAABiARAAAgAAAAcAAABoARoABQAAAAEAAABwARsABQAA +AAEAAAB4ASgAAwAAAAEAAgAAATIAAgAAABQAAACAh2kABAAAAAEAAACUAAAAAFNP +TlkAAERTQy1WMQAAAAABLAAAAAEAAAEsAAAAATIwMDY6MDg6MDkgMTI6NTI6MDcA +ABWCmgAFAAAAAQAAAZaCnQAFAAAAAQAAAZ6IIgADAAAAAQACAACIJwADAAAAAQBk +AACQAAAHAAAABDAyMjCQAwACAAAAFAAAAaaQBAACAAAAFAAAAbqSAQAKAAAAAQAA +Ac6SAgAFAAAAAQAAAdaSBAAKAAAAAQAAAd6SBQAFAAAAAQAAAeaSBwADAAAAAQAF +AACSCAADAAAAAQAAAACSCQADAAAAAQAAAACSCgAFAAAAAQAAAe6jAAAHAAAAAQMA +AACjAQAHAAAAAQEAAACkAQADAAAAAQAAAACkAgADAAAAAQAAAACkAwADAAAAAQAA +AACkBgADAAAAAQAAAAAAAAAAAAAAAQAAAB4AAAAcAAAACjIwMDY6MDg6MDggMTA6 +MjA6MjIAMjAwNjowODowOCAxMDoyMDoyMgAASt+LAA9CQAAtVOYAD0JAAAAAAAAA +AAoAAAAwAAAAEAAAAEYAAAAK/9sAQwAIBgYHBgUIBwcHCQkICgwUDQwLCwwZEhMP +FB0aHx4dGhwcICQuJyAiLCMcHCg3KSwwMTQ0NB8nOT04MjwuMzQy/9sAQwEJCQkM +CwwYDQ0YMiEcITIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy +MjIyMjIyMjIyMjIy/8AAEQgAlgBxAwEiAAIRAQMRAf/EABwAAAEFAQEBAAAAAAAA +AAAAAAABAgMEBgUHCP/EAD8QAAEDAwIEAgYFCgcBAAAAAAEAAgMEBRESIQYxQWET +URQicYGRwQcyobHRFSMkQlJicqLh8BdDVIKSk7Lx/8QAGQEAAgMBAAAAAAAAAAAA +AAAAAQMABAUC/8QAJhEAAgIBBAEEAgMAAAAAAAAAAAECEQMEEiExURMUMkEiI2Fx +kf/aAAwDAQACEQMRAD8A9MQhCB0CRCTKhAQmSzMhjL5HBrR1K49Td5HgtgHhjzO7 +v6Lic4xXIyGOU3SO0jIKx8jpJnapZXv9pTGl0Ryx72/wuIVf3S8FlaOXk2aFmYLp +WwD1ZG1DR+rJsf8Al+K69DdaeuJY0lk7Rl0T9nDv3HdOhljLoRPDOHZfSpoKcE0S +CMJUKEEwhLlChByRKmldAEyo5JGxsc9xw1oySnErjXapJmbTNOwGt/yHz9yXOW1W +dwhulRTq6p9TMZH5A/UZ0aPxVNxJKd9bKABnPRZs5uT5NnFjUVSEa3fn7kx4wd1Y +Huz5Ic0Y2898pbQ2ylqI3SPb4jmPa8xzMOY5W82n5jsrUjRnAGVUcMEY23XKk0yO +KkjTWm5+mxFkoDamLAkaOR7jsV0wVhfSjQ3GmrAcMBDJf4Sts12QMLTwZN65MfPi +2S4JwU5MaU8KwVgQlQiQCmFOKY5QgxxWUM4qJ55wQQ95x7BsPsC0dfL4NDUS5xoj +c7PsCylEP0RuAcFVNRLpFzSx5bJW5OcJWtPtUT6iKPOt4AHMnokp7tSSO0sLnD9o +NOFn8fbNRPwXC0jbt1SYJCfqDwCU5zw1hOM9gmbf5BZWcMHdRPaNJJ6Jkle8v0+h +T+QcBn7lEalzjh0bmjuEqR0iCuj8akkaDzGFqrBWmustNK45kDdD/wCJux+5Zx7R +LE5oPMbK7wXLmGugzkMmDwfaP6KzpXUq8lPWRThfg1rSpAomqULSRlschCF0AQpj +k8qNy5YSjdGmS2VbAM6oXj+UrL29xfbIXci5uT8VqLkSKCbS4g6dz5Dqs9Tw+DSR +QZyGsDcqnqXyX9LF7WyhWXGjoXFjonTzAatDRn49AqdNxFLO4n8lSRx4zk7fDbf3 +LtspI4s6QBk5JPU+abLHCRkkvPQeSrRlFR5XJc2ttV0LTTCUhxaWgjOlwwUypqDG +5xDdWNwAE1mluXO6qOZ7cjGyrudcj1CzmVd4usOiSCmbI07mMMcSOxwOatQXd8+h +tXTOgc9oIO+AT0z5roxMjwMAtPXBwpHxRyDBw72qxOcXD8exKg1Jt9FUNIwRyKsc +IRiKa45IyZQ0d8Z/EJsjA0Bo2wi0UrRXskjOHPlc5x9hOymCTUk6Oc0FKDTdGuap +mqFhUzVqoxWOQjKF0AaVG5SFRuXLCVawA0suRtpKzscgcwOBzuQPiVpKkaoJG+bT +9yydNJGGvYzGGyOAAOf1iqWp7Ro6P4v+y2W685J2VOWoy/wIdgdnOSV1b6PTEt+s +fsWcfdqqXLKalL8bkqhKSujUhG1Zpo2ZIDjt3UVRFh4aDkHqFlKOpvTKx7pmTaAd +wQSPcn3SsvBna2ljm0h2C4NIUaTVHStGmiqHxSFkh1xjqei6LWNxqaTgrEQ110gj +Lp4SATg5HMLQWq4men0jp08kItXtYJp9o6Djk+9MsE2moZGMn13HPlkkKGomEUbp +HO2G6ucNMMzIpXNxoZq95/8Aqdh+aSK2ZpY5N+DVN5qdqgYp2rYRhMehCEQDConq +UqNy5aCQuWFu8brbeahzBpjeGyMHQk7EfEZW6cs5xbRST2s1EDczQZOPNpGD+PuV +fUY98GWdNk2TV9Mz1yqG1Nuc7qw5wFSbb6qOOGqppXFmMyQNdjPcFcue4NdRlhIw +SNXm7yXXtNyJgADMAbAkrIUkpW0bqX48FymrKZ+RJT18LhncPa7O+3U9ETVVKyIf +mq6V+nJBc1u/xCbPcJGE/o0T99i3qom3CR+l/ocYz+2CMJjyqhixru3/AKQNts1V +PJVufLFT7+HDryT3KsWiZlJQmVwBdI7bsMlVrrdnim0McA47EN6bLiw3A+hCLVho +cXux/fmuHO3aFyi6pmjq6h9aWU0WPzjgzHmScL0Ckp46anZFE0Na0AYCxPCNL6dc +HVcgBjp/qd3H8Pmt41aeix1He/sx9dkuexfRNHyU7VFGFM1XaKAuEJUIgIymFPKY +5SgkUnJVpwDC8EZBByrDzsqlU8Mp5CfJLlxydRVujxniOgdb6+Ux5ELtx27KCmqs +NaAA49Qey2fEFrFypgQMvac4zzXnlQyehqNDmEb7ZG6yJw3cG/CThyb2lmjbSB7n +ZPTAzhJXvayFrg869uR5BZKkvM+gsbDr08zqS1l2qzE1zoS0A7lxxuk7JfGh/qx7 +sdcKolhHiYAO3ke6pW+CSeTLi7Q48wMquHTVUwLgQM8lqrJb5TVBpa0RgZJI69l2 +ltVfYq/Ulf0egcLUwpbToDQ0lxJA9gXfYuVaNqVw8nfILqMWzgX60YWof7ZFpilC +hYpgnCByEmUIkIHOULnrgX3jKzWFrm1dUHTj/Iiw5/vHT34Xk/Ev0kXO9F9PSE0V +Gdi1jvXeP3nfIfauewnoHEX0j2mzyT0sBNXWx7aWfUafIu7ds+Wy4nCfGFVxPPVi +uljZMxrTHBEC1obvkjJJJ3H2LyGR515yprfcKi1V8VZSv0SxnLT0PY9kvJDfFpDM +WRQmpM990tkaQ4AjyKzd8sPiZkiAH+3kuhw3xFR8QUgkhcGVDR+dhJ3afMeY7ruv +iBbnCzXjfTNqORNWujzantWl4zqG+dLTzSTW6WR3rRta1v1dt1un26IvJA0k88JI +7XGD6xc4d1x6bGb0Y+3WTXOBIZNQOcADGVr6WkEDRth3JXIqZkQ9RoCc5oBycADm +osdAc0Uq+/nh2mbVyR+JSiQCYD6wB2y3z3xstHabxQ3ik9JoJ2zRZ0kgEEHyIO4X +ivHnFUVzmbbaCTXTxOzJIOT3duwWetN7r7TVGahqpIJNslp2PYjkfetPApRgkzF1 +LjLI2j6hjdspmkLyPh/6WWksgvlOG9PSYB/6b8x8F6bQXGkuNM2ooqiOeF3J0bsj +2HyPZOTEUdLZCh8T+8oRsB8mSSue7c5TM7JqQoEA7pnLYp4RjKhB1LVVNDUsqKWZ +8UrDlr2HBC9Dsn0pFjWw3mmL+njwgZPtafl8F5yRjkmnHUYXEoKXYyGWUPiz3mk4 +s4drgHRXWnaT0ld4Z/mwukLpbS3P5RpMefjtx96+csDzTsH9pK9BeSx7uX2j3i5c +acPWyIl9wimkHKOnPiE9tth7yF5lxJx5X3wPpqcGlozsWNOXPH7x+X3rJ49qUD3L +uOKMeRU9ROXHQDb2qRpwEwDCXKYJJQ8jqula73X2ipFRQVckEnUsOx7EciOxXJ6J +wKgDef4qcS/6iH/pb+CFhMoUoNsYhCEQBhLhCFCAkwhChAwB0Cdt0CEKBGndAQhA +gFJzQhEAqEIUIGUIQgQ//9mIZgQTEQIAJgIbAwYLCQgHAwIEFQIIAwQWAgMBAh4B +AheABQJIu7NOBQkFo2PfAAoJEDDUOm5k6+IgMKEAn1G0q8tbSMcohVdFlp+UFvCM +Ph68AJ41cHcD6fQTp097sqhaY8DQzushzohGBBARAgAGBQJFVc5/AAoJEBXWiATK +bN+y0swAnioDHaWcqqjBIBSN96Sj2Fc9MdKjAKCI/DI2x/9US+oLQqbmWuIM+f/W +bIhGBBARAgAGBQJFVdERAAoJEKBP+xt9yunThOcAoM0tU4B5nYu/BEThw303mx15 +tQHXAKCxEiYipngcXVCL2SqmEL5yQq4vT4hGBBARAgAGBQJFVdLVAAoJEBRll9zc +w5nHxQ8AoMk8FXQ8FRPZmUmSMrgH/rn1W01dAJ9JoGO73MIJqKFyHBU5UYYeomGm +OYicBBABAgAGBQJFVdTrAAoJEE1WKCF5BQwRSqMEALRtvzYBtj697WhppxWqZ5zV +V1nAgbdbJ5zHWghMoYiod69OZ/3ZxticAmLEF+yenp4OeItk3ZjPCBQAI7sT7YPH +Ekwzp8vCUrqWp5XkA4OvSgI6p2ajuZhREdCvilRPtuIf0jTVsOK/eklxU1Sd6KUP +zBI5o0ac9zQsrY5oFqeiiEYEEBECAAYFAkVV2jYACgkQMxEkbVFH3PRIfQCeKG8J +5xyPZJF3e6b3HovW8eiAVzAAnRCcLkhgrrNA0BYKWUJAKWv3deEhiQJIBBABAgAy +BQJFVxrZKxpodHRwOi8vd3d3LnBhZXBzLmN4L2dwZy9zaWduaW5nLXBvbGljeS5h +c2MACgkQJknmKMXTTQUioQ//T/eTZppZZC81xRDDHf+AQ7z2Zc3Eb2RMl2HQXCDd +CG5iQjxQSjYj+TxfrKWCckRBO6xpvpuNotMtmJptQZqaZfGqIkSxLQJxn8pATUIc +FoGzKTQse6VAshgvU7ehPYVspgJEyaKWpfwav8BhTeWEScrwOIY5smkr/2xPjMRl +n342/RaoE2d2neV3mpv7wP2NWJ6ufuhe1Y3xjX7XXrSuIJaVSqYBPPICvjH/ykBL +3RlNN4fIbdSQ/lNQBXAe1WDNV/hPEipBO5+7pl3aPu9YC1y92lkKYmLmzXr1FmHB ++Bw/5J2wpTD3GG86tdc16IdAkuMFJoRlPojxq4wchFi01DTPsakl3bApJL7RQsvD +mUKc8s5XBcmd3fJrb5omkw1Pt6q5yrOUVOH/7eqacNxQ4t3hZzuwLwxvt/65FNen +X6WSqxM3EzGFKNtr8eDYj/ns0tGvxcTJRCVs1llTVv9g0O12Tcrt4FHxrHmI02PN +s9MtjSvSpilF/jMpqYNTzVOtpp8PxSqzLr3oXPTO8JIwQGSLHcOE1ghUAm5wSzlE +IhBNIih9HUu/KK041IbdqfhzCbhDyWc4gqnW7XZxNCKvXMegCwtDpAZTBlaAXZtN +KyRhs7UXJlOVX6Yv29BQmLsHcLLKTsjuJ+Cc6m+ELyT+ghGTb0OfmzNg/i8zbgc5 +byC5Ag0ERVXL7BAIAIAk0gG2XWStg/aQoGlLtVEBpdQfuR/YWbEqYfnWVgFsHBIl +gUcmisxIBY1hkGpjm+sPDLUrqEDHP8H+yFARhZhj1pUQR9+ZRTFwoXg5mmpQ/+MJ +yAk6pRxcv26Kv25gdz61KcYSIC0ln0eNDiDB9dDSo2at09Mjw9sNHwQuhFi5Aubh +zgdgE778Lo9FzAeJdKDq4783JS2FlbPg4OfA9Xt0mWU/HAlNOBrLqwondSGB0Uek +ZvlTk5b58QDa0Sy/mxuzMO9KBK6BYBQJDFvsmztERjV9zAYVc/2UDPCRSJwwlmii +y6q8iu6wr20vgMlZuQjP/ksCw95Eok1dD+PrIfsAAwUH/2/UUm0F5tdX0+JqEg9b +T9+IHkFyanaWPszvhrSs9Pp/Ab6n81QuJwEEA9Tene8/MCybcElq448EMf1cWsyJ +pDrgvSKNCgeFmGgPe1WQaKFPwvZIdqeEZegUlMdvwIgDzKHVKrXxTa3A9mMIrfTS +UPRtr+qt+bf3TaaIoxdhKUKzOiyOl+qhfd/9YNBes6AREx0+RnfhDxs2TlUP73mP +d/XvUuafTz9zwihRYa/AyGw40kcNBibF/50mLwzrNT0erJPLgont1K59G44tyk7M +R8Guf8iLSzGB441LBSB5gu2NcLTR79etUZm0nBRVIzCKe7DFjsoX+nJpasR49GuC +nuOITwQYEQIADwUCRVXL7AIbDAUJA8JnAAAKCRAw1DpuZOviIH5eAJ4kBbWauPH/ +nSNMs3SROJBeeZ3l2ACeMZzxXs6/KdvxlqedD9DedjAIXDY= +=J9VG -----END PGP PUBLIC KEY BLOCK----- ]]> ==== //depot/projects/docproj_hu/doc/share/pgpkeys/lippe.key#2 (text+ko) ==== @@ -1,28 +1,42 @@ - + +pub 1024D/F2CF7DAE 2008-09-02 [expires: 2010-09-02] + Key fingerprint = 0532 A900 286D DAFD 099D 394D 231B AF20 F2CF 7DAE +uid Felippe de Meirelles Motta (FreeBSD Ports Committer) +sub 2048g/38E8EEF3 2008-09-02 [expires: 2010-09-02] ]]> ==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#9 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -1239,6 +1239,11 @@ &pgpkey.flz; + + &a.yar; + &pgpkey.yar; + + &a.ganbold; &pgpkey.ganbold; ==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#9 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -162,6 +162,7 @@ + @@ -292,6 +293,7 @@ + ==== //depot/projects/docproj_hu/doc/share/sgml/mirrors.xml#3 (text+ko) ==== @@ -2,7 +2,7 @@ - $FreeBSD: doc/share/sgml/mirrors.xml,v 1.72 2008/07/23 19:34:32 erwin Exp $ + $FreeBSD: doc/share/sgml/mirrors.xml,v 1.74 2008/08/29 13:45:35 chinsan Exp $ @@ -236,30 +236,6 @@ cvsup.au.FreeBSD.org - - cvsup2.au.FreeBSD.org - - - - cvsup3.au.FreeBSD.org - - - - cvsup4.au.FreeBSD.org - - - - cvsup5.au.FreeBSD.org - - - - cvsup6.au.FreeBSD.org - - - - cvsup7.au.FreeBSD.org - - hostmaster@au.FreeBSD.org @@ -1843,6 +1819,11 @@ http://www6.tw.FreeBSD.org/ + + www7.tw.FreeBSD.org + http://www7.tw.FreeBSD.org/ + + ftp.tw.FreeBSD.org ftp://ftp.tw.FreeBSD.org/pub/FreeBSD/ ==== //depot/projects/docproj_hu/src_7/release/doc/en_US.ISO8859-1/relnotes/article.sgml#2 (text+ko) ==== @@ -17,7 +17,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1068.2.25 2008/04/17 00:58:50 delphij Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1068.2.26 2008/08/26 10:20:07 marck Exp $ 2000 @@ -245,6 +245,10 @@ a flag to suppress warnings; it now also accepts multiple paths on its command line. + &man.cron.8; now supports a option, + which can help managing cron mails in massive hosting + environment. + &man.ypserv.8; now supports a option to specify the port number on which it should listen. ==== //depot/projects/docproj_hu/www/en/developers.sgml#10 (text+ko) ==== @@ -6,7 +6,7 @@ us to update author names, or the representation of those names (such as adding email addresses), by just editing a single file. -$FreeBSD: www/en/developers.sgml,v 1.202 2008/07/23 00:43:25 pgollucci Exp $ +$FreeBSD: www/en/developers.sgml,v 1.203 2008/08/25 22:28:15 makc Exp $ --> @@ -319,6 +319,7 @@ + ==== //depot/projects/docproj_hu/www/en/donations/donors.sgml#5 (text+ko) ==== @@ -1,6 +1,6 @@ - + %developers; @@ -2488,6 +2488,14 @@ gavin Received + + + Edwin Verplanke <edwin.verplanke@intel.com> + Intel D3C6132 Software Development Platform + jkoshy + Received + + &footer; ==== //depot/projects/docproj_hu/www/en/donations/wantlist.sgml#3 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -147,6 +147,27 @@ + jkoshy + Rishi Valley, India. + 4-port USB KVM switch & USB<->PS/2 adapters + Facilitate working with multiple machines. + + + + jkoshy + Rishi Valley, India. + Unicode 5.0 Standard (book) + Reference material for improving FreeBSD's Unicode support. + + + + jkoshy + Rishi Valley, India. + Solar backed UPS (500W x 4-6 hrs) + Permit work on FreeBSD in the absence of grid power. + + + jmg California, USA Fast multiprocessor AMD64 capable machine (dual core CPU ok). @@ -347,6 +368,17 @@ + rpaulo + Portugal + + IBM ThinkPad T4x laptop. + + + General FreeBSD kernel/userland development/testing. + + + + sam USA crypto devices (pci, pcmcia, cardbus cards, ==== //depot/projects/docproj_hu/www/en/gnome/docs/example-Makefile.sgml#2 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -16,7 +16,7 @@ # Date created: 27 December 2003 # Whom: Some GNOME User <&email;@FreeBSD.org> # -# $FreeBSD: www/en/gnome/docs/example-Makefile.sgml,v 1.14 2008/03/23 05:23:41 mezz Exp $ +# $FreeBSD: www/en/gnome/docs/example-Makefile.sgml,v 1.15 2008/08/23 16:58:06 mezz Exp $ # # For this example, assume there was already a gnomeapp in the tree, and that this @@ -38,7 +38,7 @@ # This is for i18n: CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -USE_GNOME= gnomehack gnometarget gtk20 +USE_GNOME= gnomehack gtk20 # This application can dock in the GNOME panel, or it can not. # But there's no need to build support for it if the GNOME panel ==== //depot/projects/docproj_hu/www/en/gnome/docs/gnome2_porting.sgml#2 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -72,7 +72,7 @@ _glib20 devel/glib20 - gnometarget pkgconfig + pkgconfig ==== //depot/projects/docproj_hu/www/en/gnome/docs/gnome_porting.sgml#2 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -59,15 +59,6 @@ - gnometarget - gnometarget sets - ${CONFIGURE_TARGET} for ports whose - configure script does not figure it out automatically. - -   - - - intlhack intlhack registers a dependency upon textproc/intltool and patches broken ==== //depot/projects/docproj_hu/www/en/gnome/docs/porting.sgml#2 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -45,7 +45,6 @@ the shortest way to define this:

    -USE_XLIB=	yes
 USE_GNOME=	gtk20
    @@ -53,7 +52,6 @@ the shortest way to define this:

    -USE_XLIB=	yes
 USE_GNOME=	gtk12
    @@ -139,10 +137,8 @@ USE_GNOME+= gnomeprefix gnomepanel CONFIGURE_ARGS+= --with-gnome PKGNAMESUFFIX= -gnome - PLIST_SUB= DATADIR="share/gnome" .else CONFIGURE_ARGS+= --without-gnome - PLIST_SUB= DATADIR="share" .endif .include <bsd.port.post.mk> @@ -301,10 +297,10 @@

    Some ports provide MIME definitions in their .desktop files. If your port install .desktop file into - share/gnome/applications and there is a line starting + share/applications and there is a line starting with MimeType in it, you need to update desktop database after install and deinstall. This database is represented - by share/gnome/applications/mimeinfo.cache file. Add + by share/applications/mimeinfo.cache file. Add dependency on GNOME component desktopfileutils and these lines to the end of pkg-plist:

    ==== //depot/projects/docproj_hu/www/en/java/dists/index.sgml#2 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -39,7 +39,7 @@ versions are FreeBSD 4.8 and later (for i386 and amd64 architectures).

    JDK 1.6.x

    -

    JDK 1.6 support is available. Currently supported +

    JDK 1.6 support is available. Currently supported versions are FreeBSD 6.2 and later (for i386 and amd64 architectures).

    Unsupported

    ==== //depot/projects/docproj_hu/www/en/java/docs/newbies.sgml#2 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -12,7 +12,7 @@

    What kind of "Newbie" are you?

    New to FreeBSD's &jdk;? -- Learn how to install the JDK -

    New to &java;? -- Learn Java using a tutorial or from a book. One of the most often recommended books is Bruce Eckel's Thinking in Java. +

    New to &java;? -- Learn Java using a tutorial or from a book. One of the most often recommended books is Bruce Eckel's Thinking in Java. ==== //depot/projects/docproj_hu/www/en/java/index.sgml#2 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -21,10 +21,11 @@ (JRE™) and Java Development Kit (&jdk;).

    The current release of the JDK and JRE available via the FreeBSD - Foundation is 1.5.0-7. These binaries have been tested and - certified to run with &os;/i386 5.5-RELEASE, &os;/i386 6.1-RELEASE - and &os;/amd64 6.1-RELEASE, but may also work on other &os;/i386 5.X - releases as well as on &os;/i386 and &os;/amd64 6.X releases.

    + Foundation is 1.6.0-7. These binaries have been tested and + certified to run with 6.3-RELEASE and 7.0-RELEASE (&os;/i386 and + &os;/amd64) but may also work with other 6.X/7.X releases + (&os;/i386 and &os;/amd64). Packages for JDK/JRE 1.5.0 are still + available for download although they are not supported any longer.

    For further information about downloading the JDK and JRE binaries for FreeBSD, please see the - $FreeBSD: www/en/java/news.xml,v 1.5 2008/02/22 04:53:47 glewis Exp $ + $FreeBSD: www/en/java/news.xml,v 1.7 2008/08/27 13:42:31 jkois Exp $ @@ -28,6 +28,27 @@ 2008 + July + + + 18 + + + The FreeBSD Foundation has announced binary releases + of the JDK 1.6 and JRE 1.6 + +

    The FreeBSD + Foundation has announced binary releases of the JDK + 1.6 and JRE 1.6. For more details, see the + Foundation newsletter and the download + page.

    + + + + + February >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Sep 4 11:27:31 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 883D21065671; Thu, 4 Sep 2008 11:27: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 33529106566C for ; Thu, 4 Sep 2008 11:27:31 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1F20A8FC0A for ; Thu, 4 Sep 2008 11:27:31 +0000 (UTC) (envelope-from gabor@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 m84BRVqT076394 for ; Thu, 4 Sep 2008 11:27:31 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m84BRUP8076383 for perforce@freebsd.org; Thu, 4 Sep 2008 11:27:30 GMT (envelope-from gabor@freebsd.org) Date: Thu, 4 Sep 2008 11:27:30 GMT Message-Id: <200809041127.m84BRUP8076383@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 149185 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Sep 2008 11:27:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=149185 Change 149185 by gabor@gabor_server on 2008/09/04 11:27:30 - Use sys/queue.h to implement queue functions - Fix a bug Submitted by: ed Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/Makefile#14 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.h#42 edit .. //depot/projects/soc2008/gabor_textproc/grep/queue.c#7 edit .. //depot/projects/soc2008/gabor_textproc/grep/util.c#75 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/Makefile#14 (text+ko) ==== ==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#42 (text+ko) ==== @@ -136,7 +136,6 @@ void printline(struct str *line, int sep, regmatch_t *matches, int m); /* queue.c */ -void initqueue(void); void enqueue(struct str *x); void printqueue(void); void clearqueue(void); ==== //depot/projects/soc2008/gabor_textproc/grep/queue.c#7 (text+ko) ==== @@ -40,73 +40,60 @@ #endif /* not lint */ #include +#include #include #include #include "grep.h" -struct queue { - struct queue *next; - struct str data; +struct qentry { + STAILQ_ENTRY(qentry) list; + struct str data; }; -static struct queue *q_head, *q_tail; -static int count; +static STAILQ_HEAD(, qentry) queue = STAILQ_HEAD_INITIALIZER(queue); +static int count; -static struct queue *dequeue(void); - -void -initqueue(void) -{ - q_head = q_tail = NULL; -} +static struct qentry *dequeue(void); void enqueue(struct str *x) { - struct queue *item; + struct qentry *item; - item = grep_malloc(sizeof(struct queue)); + item = grep_malloc(sizeof(struct qentry)); item->data.dat = grep_malloc(sizeof(char) * x->len); item->data.len = x->len; item->data.line_no = x->line_no; item->data.off = x->off; memcpy(item->data.dat, x->dat, x->len); item->data.file = x->file; - item->next = NULL; - if (!q_head) { - q_head = q_tail = item; - } else { - q_tail->next = item; - q_tail = item; - } + STAILQ_INSERT_TAIL(&queue, item, list); if (++count > Bflag) free(dequeue()); } -static struct queue * +static struct qentry * dequeue(void) { - struct queue *item; + struct qentry *item; - if (q_head == NULL) + item = STAILQ_FIRST(&queue); + if (item == NULL) return (NULL); + STAILQ_REMOVE_HEAD(&queue, list); --count; - item = q_head; - q_head = item->next; - if (q_head == NULL) - q_tail = NULL; return (item); } void printqueue(void) { - struct queue *item; + struct qentry *item; while ((item = dequeue()) != NULL) { printline(&item->data, '-', (regmatch_t *)NULL, 0); @@ -117,7 +104,7 @@ void clearqueue(void) { - struct queue *item; + struct qentry *item; while ((item = dequeue()) != NULL) free(item); ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#75 (text+ko) ==== @@ -175,8 +175,6 @@ tail = 0; ln.off = -1; - if (Bflag > 0) - initqueue(); for (c = 0; c == 0 || !(lflag || qflag); ) { ln.off += ln.len + 1; if ((ln.dat = grep_fgetln(f, &ln.len)) == NULL) { @@ -293,7 +291,7 @@ size = mbstowcs(NULL, l->dat, pmatch.rm_so); - if (size = -1) + if (size == -1) r = REG_NOMATCH; else { wbegin = grep_malloc(size); From owner-p4-projects@FreeBSD.ORG Thu Sep 4 17:17:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B4E361065682; Thu, 4 Sep 2008 17:17: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 406781065677 for ; Thu, 4 Sep 2008 17:17:05 +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 2C2638FC19 for ; Thu, 4 Sep 2008 17:17:05 +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 m84HH5kC076355 for ; Thu, 4 Sep 2008 17:17:05 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m84HH4hr076312 for perforce@freebsd.org; Thu, 4 Sep 2008 17:17:04 GMT (envelope-from ed@FreeBSD.org) Date: Thu, 4 Sep 2008 17:17:04 GMT Message-Id: <200809041717.m84HH4hr076312@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 149212 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Sep 2008 17:17:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=149212 Change 149212 by ed@ed_dull on 2008/09/04 17:16:23 IFC. Affected files ... .. //depot/projects/mpsafetty/UPDATING#9 integrate .. //depot/projects/mpsafetty/contrib/gdtoa/README#2 integrate .. //depot/projects/mpsafetty/contrib/gdtoa/dtoa.c#2 integrate .. //depot/projects/mpsafetty/contrib/gdtoa/gdtoa.h#2 integrate .. //depot/projects/mpsafetty/contrib/gdtoa/gdtoaimp.h#2 integrate .. //depot/projects/mpsafetty/contrib/gdtoa/gethex.c#2 integrate .. //depot/projects/mpsafetty/contrib/gdtoa/strtoIg.c#2 integrate .. //depot/projects/mpsafetty/contrib/gdtoa/strtod.c#2 integrate .. //depot/projects/mpsafetty/contrib/gdtoa/strtodg.c#2 integrate .. //depot/projects/mpsafetty/contrib/gdtoa/strtof.c#2 integrate .. //depot/projects/mpsafetty/contrib/gdtoa/test/README#2 integrate .. //depot/projects/mpsafetty/contrib/gdtoa/test/f.out#2 integrate .. //depot/projects/mpsafetty/contrib/gdtoa/test/getround.c#2 integrate .. //depot/projects/mpsafetty/contrib/gdtoa/test/xsum0.out#2 integrate .. //depot/projects/mpsafetty/contrib/gdtoa/xsum0.out#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/archive_write_disk.3#2 integrate .. //depot/projects/mpsafetty/lib/librpcsec_gss/svc_rpcsec_gss.c#2 integrate .. //depot/projects/mpsafetty/lib/libstand/stand.h#2 integrate .. //depot/projects/mpsafetty/lib/libstand/ufs.c#2 integrate .. //depot/projects/mpsafetty/lib/libstand/zalloc_malloc.c#2 integrate .. //depot/projects/mpsafetty/libexec/rtld-elf/rtld.c#2 integrate .. //depot/projects/mpsafetty/sys/amd64/amd64/cpu_switch.S#3 integrate .. //depot/projects/mpsafetty/sys/amd64/amd64/machdep.c#3 integrate .. //depot/projects/mpsafetty/sys/amd64/ia32/ia32_signal.c#3 integrate .. //depot/projects/mpsafetty/sys/boot/common/dev_net.c#2 integrate .. //depot/projects/mpsafetty/sys/boot/common/devopen.c#2 integrate .. //depot/projects/mpsafetty/sys/boot/powerpc/uboot/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/boot/powerpc/uboot/metadata.c#2 delete .. //depot/projects/mpsafetty/sys/boot/powerpc/uboot/start.S#2 integrate .. //depot/projects/mpsafetty/sys/boot/uboot/common/Makefile.inc#2 integrate .. //depot/projects/mpsafetty/sys/boot/uboot/common/main.c#2 integrate .. //depot/projects/mpsafetty/sys/boot/uboot/common/metadata.c#1 branch .. //depot/projects/mpsafetty/sys/boot/uboot/lib/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/boot/uboot/lib/console.c#2 integrate .. //depot/projects/mpsafetty/sys/boot/uboot/lib/elf_freebsd.c#2 integrate .. //depot/projects/mpsafetty/sys/boot/uboot/lib/glue.c#2 integrate .. //depot/projects/mpsafetty/sys/boot/uboot/lib/glue.h#2 integrate .. //depot/projects/mpsafetty/sys/boot/uboot/lib/net.c#2 integrate .. //depot/projects/mpsafetty/sys/boot/uboot/lib/reboot.c#2 integrate .. //depot/projects/mpsafetty/sys/boot/uboot/lib/time.c#2 integrate .. //depot/projects/mpsafetty/sys/conf/files.sun4v#2 integrate .. //depot/projects/mpsafetty/sys/dev/ata/ata-chipset.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/ata/ata-pci.h#4 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/cxgb_main.c#6 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/k8temp/k8temp.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/mii/e1000phy.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/mii/miidevs#2 integrate .. //depot/projects/mpsafetty/sys/dev/pci/pci_pci.c#6 integrate .. //depot/projects/mpsafetty/sys/fs/tmpfs/tmpfs.h#2 integrate .. //depot/projects/mpsafetty/sys/fs/tmpfs/tmpfs_fifoops.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/tmpfs/tmpfs_fifoops.h#2 integrate .. //depot/projects/mpsafetty/sys/fs/tmpfs/tmpfs_subr.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/tmpfs/tmpfs_vfsops.c#3 integrate .. //depot/projects/mpsafetty/sys/fs/tmpfs/tmpfs_vnops.c#3 integrate .. //depot/projects/mpsafetty/sys/fs/tmpfs/tmpfs_vnops.h#2 integrate .. //depot/projects/mpsafetty/sys/i386/xen/locore.s#3 integrate .. //depot/projects/mpsafetty/sys/kern/kern_proc.c#6 integrate .. //depot/projects/mpsafetty/sys/kern/tty.c#37 integrate .. //depot/projects/mpsafetty/sys/kern/tty_compat.c#4 integrate .. //depot/projects/mpsafetty/sys/kern/tty_pts.c#19 integrate .. //depot/projects/mpsafetty/sys/kern/tty_ttydisc.c#20 edit .. //depot/projects/mpsafetty/sys/kern/vfs_mount.c#8 integrate .. //depot/projects/mpsafetty/sys/mips/adm5120/std.adm5120#2 integrate .. //depot/projects/mpsafetty/sys/mips/conf/ADM5120#2 integrate .. //depot/projects/mpsafetty/sys/mips/conf/IDT#2 integrate .. //depot/projects/mpsafetty/sys/mips/conf/MALTA#2 integrate .. //depot/projects/mpsafetty/sys/mips/conf/SENTRY5#2 integrate .. //depot/projects/mpsafetty/sys/mips/idt/std.idt#2 integrate .. //depot/projects/mpsafetty/sys/mips/malta/files.malta#2 integrate .. //depot/projects/mpsafetty/sys/mips/malta/std.malta#2 integrate .. //depot/projects/mpsafetty/sys/mips/mips/in_cksum.c#2 integrate .. //depot/projects/mpsafetty/sys/mips/mips/intr_machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211.c#3 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_pipe.c#1 branch .. //depot/projects/mpsafetty/sys/netgraph/ng_pipe.h#1 branch .. //depot/projects/mpsafetty/sys/netinet/ip_fw2.c#6 integrate .. //depot/projects/mpsafetty/sys/netinet6/icmp6.c#5 integrate .. //depot/projects/mpsafetty/sys/netinet6/mld6.c#3 integrate .. //depot/projects/mpsafetty/sys/security/audit/audit_syscalls.c#6 integrate .. //depot/projects/mpsafetty/sys/sparc64/conf/GENERIC#8 integrate .. //depot/projects/mpsafetty/sys/sparc64/include/cache.h#3 integrate .. //depot/projects/mpsafetty/sys/sparc64/include/clock.h#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/include/cpufunc.h#4 integrate .. //depot/projects/mpsafetty/sys/sparc64/include/pcpu.h#4 integrate .. //depot/projects/mpsafetty/sys/sparc64/include/smp.h#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/include/tick.h#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/include/ver.h#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/autoconf.c#3 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/cache.c#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/cheetah.c#3 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/clock.c#3 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/exception.S#4 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/genassym.c#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/locore.S#4 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/machdep.c#3 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/mp_exception.S#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/mp_locore.S#3 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/mp_machdep.c#4 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/spitfire.c#3 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/tick.c#3 integrate .. //depot/projects/mpsafetty/sys/sun4v/sun4v/clock.c#1 branch .. //depot/projects/mpsafetty/sys/sys/tty.h#15 integrate .. //depot/projects/mpsafetty/sys/sys/ttydevsw.h#7 integrate .. //depot/projects/mpsafetty/sys/ufs/ffs/ffs_vnops.c#2 integrate .. //depot/projects/mpsafetty/sys/ufs/ufs/ufs_extattr.c#2 integrate .. //depot/projects/mpsafetty/tools/regression/lib/libc/stdio/test-scanfloat.c#2 integrate .. //depot/projects/mpsafetty/tools/tools/nanobsd/nanobsd.sh#6 integrate .. //depot/projects/mpsafetty/usr.bin/cpio/cpio.c#6 integrate .. //depot/projects/mpsafetty/usr.bin/limits/limits.1#2 integrate .. //depot/projects/mpsafetty/usr.bin/limits/limits.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/crunch/crunchide/exec_elf32.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/cxgbtool/reg_defs_t3c.c#1 branch .. //depot/projects/mpsafetty/usr.sbin/pciconf/pciconf.c#2 integrate Differences ... ==== //depot/projects/mpsafetty/UPDATING#9 (text+ko) ==== @@ -41,6 +41,9 @@ Adding these drivers to your kernel configuration file shall cause compilation to fail. +20080818: + ntpd has been upgraded to 4.2.4p5. + 20080801: OpenSSH has been upgraded to 5.1p1. @@ -1123,4 +1126,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.540 2008/09/01 23:50:56 des Exp $ +$FreeBSD: src/UPDATING,v 1.541 2008/09/03 08:30:17 roberto Exp $ ==== //depot/projects/mpsafetty/contrib/gdtoa/README#2 (text+ko) ==== @@ -332,5 +332,15 @@ the decimal-point character to be taken from the current locale; otherwise it is '.'. +Source files dtoa.c and strtod.c in this directory are derived from +netlib's "dtoa.c from fp" and are meant to function equivalently. +When compiled with Honor_FLT_ROUNDS #defined (on systems that provide +FLT_ROUNDS and fegetround() as specified in the C99 standard), they +honor the current rounding mode. Because FLT_ROUNDS is buggy on some +(Linux) systems -- not reflecting calls on fesetround(), as the C99 +standard says it should -- when Honor_FLT_ROUNDS is #defined, the +current rounding mode is obtained from fegetround() rather than from +FLT_ROUNDS, unless Trust_FLT_ROUNDS is also #defined. + Please send comments to David M. Gay (dmg at acm dot org, with " at " changed at "@" and " dot " changed to "."). ==== //depot/projects/mpsafetty/contrib/gdtoa/dtoa.c#2 (text+ko) ==== @@ -66,7 +66,6 @@ */ #ifdef Honor_FLT_ROUNDS -#define Rounding rounding #undef Check_FLT_ROUNDS #define Check_FLT_ROUNDS #else @@ -127,12 +126,22 @@ Bigint *b, *b1, *delta, *mlo, *mhi, *S; double d2, ds, eps; char *s, *s0; -#ifdef Honor_FLT_ROUNDS - int rounding; -#endif #ifdef SET_INEXACT int inexact, oldinexact; #endif +#ifdef Honor_FLT_ROUNDS /*{*/ + int Rounding; +#ifdef Trust_FLT_ROUNDS /*{{ only define this if FLT_ROUNDS really works! */ + Rounding = Flt_Rounds; +#else /*}{*/ + Rounding = 1; + switch(fegetround()) { + case FE_TOWARDZERO: Rounding = 0; break; + case FE_UPWARD: Rounding = 2; break; + case FE_DOWNWARD: Rounding = 3; + } +#endif /*}}*/ +#endif /*}*/ #ifndef MULTIPLE_THREADS if (dtoa_result) { @@ -178,12 +187,12 @@ inexact = 1; #endif #ifdef Honor_FLT_ROUNDS - if ((rounding = Flt_Rounds) >= 2) { + if (Rounding >= 2) { if (*sign) - rounding = rounding == 2 ? 0 : 2; + Rounding = Rounding == 2 ? 0 : 2; else - if (rounding != 2) - rounding = 0; + if (Rounding != 2) + Rounding = 0; } #endif @@ -316,7 +325,7 @@ s = s0 = rv_alloc(i); #ifdef Honor_FLT_ROUNDS - if (mode > 1 && rounding != 1) + if (mode > 1 && Rounding != 1) leftright = 0; #endif @@ -453,7 +462,7 @@ if (i == ilim) { #ifdef Honor_FLT_ROUNDS if (mode > 1) - switch(rounding) { + switch(Rounding) { case 0: goto ret1; case 2: goto bump_up; } @@ -521,7 +530,7 @@ spec_case = 0; if ((mode < 2 || leftright) #ifdef Honor_FLT_ROUNDS - && rounding == 1 + && Rounding == 1 #endif ) { if (!word1(d) && !(word0(d) & Bndry_mask) @@ -614,7 +623,7 @@ #ifndef ROUND_BIASED if (j1 == 0 && mode != 1 && !(word1(d) & 1) #ifdef Honor_FLT_ROUNDS - && rounding >= 1 + && Rounding >= 1 #endif ) { if (dig == '9') @@ -642,7 +651,7 @@ } #ifdef Honor_FLT_ROUNDS if (mode > 1) - switch(rounding) { + switch(Rounding) { case 0: goto accept_dig; case 2: goto keep_dig; } @@ -660,7 +669,7 @@ } if (j1 > 0) { #ifdef Honor_FLT_ROUNDS - if (!rounding) + if (!Rounding) goto accept_dig; #endif if (dig == '9') { /* possible if i == 1 */ @@ -703,7 +712,7 @@ /* Round off last digit */ #ifdef Honor_FLT_ROUNDS - switch(rounding) { + switch(Rounding) { case 0: goto trimzeros; case 2: goto roundoff; } ==== //depot/projects/mpsafetty/contrib/gdtoa/gdtoa.h#2 (text+ko) ==== @@ -74,9 +74,9 @@ /* The following may be or-ed into one of the above values. */ - STRTOG_Neg = 0x08, - STRTOG_Inexlo = 0x10, - STRTOG_Inexhi = 0x20, + STRTOG_Neg = 0x08, /* does not affect STRTOG_Inexlo or STRTOG_Inexhi */ + STRTOG_Inexlo = 0x10, /* returned result rounded toward zero */ + STRTOG_Inexhi = 0x20, /* returned result rounded away from zero */ STRTOG_Inexact = 0x30, STRTOG_Underflow= 0x40, STRTOG_Overflow = 0x80 ==== //depot/projects/mpsafetty/contrib/gdtoa/gdtoaimp.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ ****************************************************************/ -/* $FreeBSD: src/contrib/gdtoa/gdtoaimp.h,v 1.9 2007/12/17 00:19:49 das Exp $ */ +/* $FreeBSD: src/contrib/gdtoa/gdtoaimp.h,v 1.10 2008/09/03 07:23:57 das Exp $ */ /* This is a variation on dtoa.c that converts arbitary binary floating-point formats to and from decimal notation. It uses @@ -132,13 +132,16 @@ * Infinity and NaN (case insensitively). * When INFNAN_CHECK is #defined and No_Hex_NaN is not #defined, * strtodg also accepts (case insensitively) strings of the form - * NaN(x), where x is a string of hexadecimal digits and spaces; - * if there is only one string of hexadecimal digits, it is taken - * for the fraction bits of the resulting NaN; if there are two or - * more strings of hexadecimal digits, each string is assigned - * to the next available sequence of 32-bit words of fractions - * bits (starting with the most significant), right-aligned in - * each sequence. + * NaN(x), where x is a string of hexadecimal digits (optionally + * preceded by 0x or 0X) and spaces; if there is only one string + * of hexadecimal digits, it is taken for the fraction bits of the + * resulting NaN; if there are two or more strings of hexadecimal + * digits, each string is assigned to the next available sequence + * of 32-bit words of fractions bits (starting with the most + * significant), right-aligned in each sequence. + * Unless GDTOA_NON_PEDANTIC_NANCHECK is #defined, input "NaN(...)" + * is consumed even when ... has the wrong form (in which case the + * "(...)" is consumed but ignored). * #define MULTIPLE_THREADS if the system offers preemptively scheduled * multiple threads. In this case, you must provide (or suitably * #define) two locks, acquired by ACQUIRE_DTOA_LOCK(n) and freed @@ -150,7 +153,7 @@ * dtoa. You may do so whether or not MULTIPLE_THREADS is #defined. * #define IMPRECISE_INEXACT if you do not care about the setting of * the STRTOG_Inexact bits in the special case of doing IEEE double - * precision conversions (which could also be done by the strtog in + * precision conversions (which could also be done by the strtod in * dtoa.c). * #define NO_HEX_FP to disable recognition of C9x's hexadecimal * floating-point constants. @@ -204,6 +207,7 @@ #define INFNAN_CHECK #define USE_LOCALE #define Honor_FLT_ROUNDS +#define Trust_FLT_ROUNDS #undef IEEE_Arith #undef Avoid_Underflow @@ -597,7 +601,7 @@ extern int cmp ANSI((Bigint*, Bigint*)); extern void copybits ANSI((ULong*, int, Bigint*)); extern Bigint *d2b ANSI((double, int*, int*)); - extern int decrement ANSI((Bigint*)); + extern void decrement ANSI((Bigint*)); extern Bigint *diff ANSI((Bigint*, Bigint*)); extern char *dtoa ANSI((double d, int mode, int ndigits, int *decpt, int *sign, char **rve)); ==== //depot/projects/mpsafetty/contrib/gdtoa/gethex.c#2 (text+ko) ==== @@ -45,7 +45,7 @@ { Bigint *b; CONST unsigned char *decpt, *s0, *s, *s1; - int esign, havedig, irv, k, n, nbits, up, zret; + int big, esign, havedig, irv, j, k, n, n0, nbits, up, zret; ULong L, lostbits, *x; Long e, e1; #ifdef USE_LOCALE @@ -56,6 +56,7 @@ if (!hexdig['0']) hexdig_init_D2A(); + *bp = 0; havedig = 0; s0 = *(CONST unsigned char **)sp + 2; while(s0[havedig] == '0') @@ -90,10 +91,10 @@ e = -(((Long)(s-decpt)) << 2); pcheck: s1 = s; + big = esign = 0; switch(*s) { case 'p': case 'P': - esign = 0; switch(*++s) { case '-': esign = 1; @@ -106,17 +107,65 @@ break; } e1 = n - 0x10; - while((n = hexdig[*++s]) !=0 && n <= 0x19) + while((n = hexdig[*++s]) !=0 && n <= 0x19) { + if (e1 & 0xf8000000) + big = 1; e1 = 10*e1 + n - 0x10; + } if (esign) e1 = -e1; e += e1; } *sp = (char*)s; - if (zret) { - if (!havedig) - *sp = s0 - 1; + if (!havedig) + *sp = s0 - 1; + if (zret) return STRTOG_Zero; + if (big) { + if (esign) { + switch(fpi->rounding) { + case FPI_Round_up: + if (sign) + break; + goto ret_tiny; + case FPI_Round_down: + if (!sign) + break; + goto ret_tiny; + } + goto retz; + ret_tiny: + b = Balloc(0); + b->wds = 1; + b->x[0] = 1; + goto dret; + } + switch(fpi->rounding) { + case FPI_Round_near: + goto ovfl1; + case FPI_Round_up: + if (!sign) + goto ovfl1; + goto ret_big; + case FPI_Round_down: + if (sign) + goto ovfl1; + goto ret_big; + } + ret_big: + nbits = fpi->nbits; + n0 = n = nbits >> kshift; + if (nbits & kmask) + ++n; + for(j = n, k = 0; j >>= 1; ++k); + *bp = b = Balloc(k); + b->wds = n; + for(j = 0; j < n0; ++j) + b->x[j] = ALL_ON; + if (n > n0) + b->x[j] = ULbits >> (ULbits - (nbits & kmask)); + *exp = fpi->emin; + return STRTOG_Normal | STRTOG_Inexlo; } n = s1 - s0 - 1; for(k = 0; n > 7; n >>= 1) @@ -149,7 +198,7 @@ k = n - 1; if (x[k>>kshift] & 1 << (k & kmask)) { lostbits = 2; - if (k > 1 && any_on(b,k-1)) + if (k > 0 && any_on(b,k)) lostbits = 3; } } @@ -165,7 +214,10 @@ if (e > fpi->emax) { ovfl: Bfree(b); - *bp = 0; + ovfl1: +#ifndef NO_ERRNO + errno = ERANGE; +#endif return STRTOG_Infinite | STRTOG_Overflow | STRTOG_Inexhi; } irv = STRTOG_Normal; @@ -185,15 +237,22 @@ case FPI_Round_down: if (sign) { one_bit: - *exp = fpi->emin; x[0] = b->wds = 1; + dret: *bp = b; + *exp = fpi->emin; +#ifndef NO_ERRNO + errno = ERANGE; +#endif return STRTOG_Denormal | STRTOG_Inexhi | STRTOG_Underflow; } } Bfree(b); - *bp = 0; + retz: +#ifndef NO_ERRNO + errno = ERANGE; +#endif return STRTOG_Zero | STRTOG_Inexlo | STRTOG_Underflow; } k = n - 1; ==== //depot/projects/mpsafetty/contrib/gdtoa/strtoIg.c#2 (text+ko) ==== @@ -61,12 +61,16 @@ if (rv & STRTOG_Inexlo) { swap = 0; b1 = increment(b1); - if (fpi->sudden_underflow - && (rv & STRTOG_Retmask) == STRTOG_Zero) { - b1->x[0] = 0; - b1->x[nw1] = 1L << nb11; - rv1 += STRTOG_Normal - STRTOG_Zero; - rv1 &= ~STRTOG_Underflow; + if ((rv & STRTOG_Retmask) == STRTOG_Zero) { + if (fpi->sudden_underflow) { + b1->x[0] = 0; + b1->x[nw1] = 1L << nb11; + rv1 += STRTOG_Normal - STRTOG_Zero; + rv1 &= ~STRTOG_Underflow; + goto swapcheck; + } + rv1 &= STRTOG_Inexlo | STRTOG_Underflow | STRTOG_Zero; + rv1 |= STRTOG_Inexhi | STRTOG_Denormal; goto swapcheck; } if (b1->wds > nw ==== //depot/projects/mpsafetty/contrib/gdtoa/strtod.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ /* Please send bug reports to David M. Gay (dmg at acm dot org, * with " at " changed at "@" and " dot " changed to "."). */ -/* $FreeBSD: src/contrib/gdtoa/strtod.c,v 1.2 2007/12/16 21:14:33 das Exp $ */ +/* $FreeBSD: src/contrib/gdtoa/strtod.c,v 1.3 2008/09/03 07:23:57 das Exp $ */ #include "gdtoaimp.h" #ifndef NO_FENV_H @@ -44,16 +44,15 @@ #ifndef NO_IEEE_Scale #define Avoid_Underflow #undef tinytens -/* The factor of 2^53 in tinytens[4] helps us avoid setting the underflow */ +/* The factor of 2^106 in tinytens[4] helps us avoid setting the underflow */ /* flag unnecessarily. It leads to a song and dance at the end of strtod. */ static CONST double tinytens[] = { 1e-16, 1e-32, 1e-64, 1e-128, - 9007199254740992.e-256 + 9007199254740992.*9007199254740992.e-256 }; #endif #endif #ifdef Honor_FLT_ROUNDS -#define Rounding rounding #undef Check_FLT_ROUNDS #define Check_FLT_ROUNDS #else @@ -81,9 +80,19 @@ #ifdef SET_INEXACT int inexact, oldinexact; #endif -#ifdef Honor_FLT_ROUNDS - int rounding; -#endif +#ifdef Honor_FLT_ROUNDS /*{*/ + int Rounding; +#ifdef Trust_FLT_ROUNDS /*{{ only define this if FLT_ROUNDS really works! */ + Rounding = Flt_Rounds; +#else /*}{*/ + Rounding = 1; + switch(fegetround()) { + case FE_TOWARDZERO: Rounding = 0; break; + case FE_UPWARD: Rounding = 2; break; + case FE_DOWNWARD: Rounding = 3; + } +#endif /*}}*/ +#endif /*}*/ sign = nz0 = nz = decpt = 0; dval(rv) = 0.; @@ -109,7 +118,7 @@ } break2: if (*s == '0') { -#ifndef NO_HEX_FP +#ifndef NO_HEX_FP /*{{*/ { static FPI fpi = { 53, 1-1023-53+1, 2046-1023-53+1, 1, SI }; Long exp; @@ -118,16 +127,20 @@ case 'x': case 'X': { -#if defined(FE_DOWNWARD) && defined(FE_TONEAREST) && defined(FE_TOWARDZERO) && defined(FE_UPWARD) +#if defined(FE_DOWNWARD) && defined(FE_TONEAREST) && defined(FE_TOWARDZERO) && defined(FE_UPWARD) /*{{*/ FPI fpi1 = fpi; +#ifdef Honor_FLT_ROUNDS /*{{*/ + fpi1.rounding = Rounding; +#else /*}{*/ switch(fegetround()) { case FE_TOWARDZERO: fpi1.rounding = 0; break; case FE_UPWARD: fpi1.rounding = 2; break; case FE_DOWNWARD: fpi1.rounding = 3; } -#else +#endif /*}}*/ +#else /*}{*/ #define fpi1 fpi -#endif +#endif /*}}*/ switch((i = gethex(&s, &fpi1, &exp, &bb, sign)) & STRTOG_Retmask) { case STRTOG_NoNumber: s = s00; @@ -381,12 +394,12 @@ scale = 0; #endif #ifdef Honor_FLT_ROUNDS - if ((rounding = Flt_Rounds) >= 2) { + if (Rounding >= 2) { if (sign) - rounding = rounding == 2 ? 0 : 2; + Rounding = Rounding == 2 ? 0 : 2; else - if (rounding != 2) - rounding = 0; + if (Rounding != 2) + Rounding = 0; } #endif #endif /*IEEE_Arith*/ @@ -405,7 +418,7 @@ /* Can't trust HUGE_VAL */ #ifdef IEEE_Arith #ifdef Honor_FLT_ROUNDS - switch(rounding) { + switch(Rounding) { case 0: /* toward 0 */ case 3: /* toward -infinity */ word0(rv) = Big0; @@ -536,7 +549,7 @@ bd2 -= bbe; bs2 = bb2; #ifdef Honor_FLT_ROUNDS - if (rounding != 1) + if (Rounding != 1) bs2++; #endif #ifdef Avoid_Underflow @@ -594,7 +607,7 @@ delta->sign = 0; i = cmp(delta, bs); #ifdef Honor_FLT_ROUNDS - if (rounding != 1) { + if (Rounding != 1) { if (i < 0) { /* Error is less than an ulp */ if (!delta->x[0] && delta->wds <= 1) { @@ -604,7 +617,7 @@ #endif break; } - if (rounding) { + if (Rounding) { if (dsign) { adj = 1.; goto apply_adj; @@ -650,10 +663,10 @@ if (adj < 1.) adj = 1.; if (adj <= 0x7ffffffe) { - /* adj = rounding ? ceil(adj) : floor(adj); */ + /* adj = Rounding ? ceil(adj) : floor(adj); */ y = adj; if (y != adj) { - if (!((rounding>>1) ^ dsign)) + if (!((Rounding>>1) ^ dsign)) y++; adj = y; } @@ -676,8 +689,11 @@ #endif /*Sudden_Underflow*/ #endif /*Avoid_Underflow*/ adj *= ulp(dval(rv)); - if (dsign) + if (dsign) { + if (word0(rv) == Big0 && word1(rv) == Big1) + goto ovfl; dval(rv) += adj; + } else dval(rv) -= adj; goto cont; @@ -770,7 +786,7 @@ } #endif /*Avoid_Underflow*/ L = (word0(rv) & Exp_mask) - Exp_msk1; -#endif /*Sudden_Underflow}*/ +#endif /*Sudden_Underflow}}*/ word0(rv) = L | Bndry_mask1; word1(rv) = 0xffffffff; #ifdef IBM ==== //depot/projects/mpsafetty/contrib/gdtoa/strtodg.c#2 (text+ko) ==== @@ -89,7 +89,7 @@ return b; } - int + void #ifdef KR_headers decrement(b) Bigint *b; #else @@ -119,7 +119,6 @@ *x++ = y & 0xffff; } while(borrow && x < xe); #endif - return STRTOG_Inexlo; } static int @@ -206,9 +205,9 @@ goto ret; } switch(rd) { - case 1: + case 1: /* round down (toward -Infinity) */ goto trunc; - case 2: + case 2: /* round up (toward +Infinity) */ break; default: /* round near */ k = bdif - 1; @@ -330,7 +329,7 @@ CONST char *s, *s0, *s1; double adj, adj0, rv, tol; Long L; - ULong y, z; + ULong *b, *be, y, z; Bigint *ab, *bb, *bb1, *bd, *bd0, *bs, *delta, *rvb, *rvb0; irv = STRTOG_Zero; @@ -822,10 +821,8 @@ break; if (dsign) { rvb = increment(rvb); - if ( (j = rvbits & kmask) !=0) - j = ULbits - j; - if (hi0bits(rvb->x[(rvb->wds - 1) >> kshift]) - != j) + j = kmask & (ULbits - (rvbits & kmask)); + if (hi0bits(rvb->x[rvb->wds - 1]) != j) rvbits++; irv = STRTOG_Normal | STRTOG_Inexhi; } @@ -978,6 +975,29 @@ Bfree(bd0); Bfree(delta); if (rve > fpi->emax) { + switch(fpi->rounding & 3) { + case FPI_Round_near: + goto huge; + case FPI_Round_up: + if (!sign) + goto huge; + break; + case FPI_Round_down: + if (sign) + goto huge; + } + /* Round to largest representable magnitude */ + Bfree(rvb); + rvb = 0; + irv = STRTOG_Normal | STRTOG_Inexlo; + *exp = fpi->emax; + b = bits; + be = b + (fpi->nbits >> 5) + 1; + while(b < be) + *b++ = -1; + if ((j = fpi->nbits & 0x1f)) + *--be >>= (32 - j); + goto ret; huge: rvb->wds = 0; irv = STRTOG_Infinite | STRTOG_Overflow | STRTOG_Inexhi; @@ -992,12 +1012,19 @@ if (sudden_underflow) { rvb->wds = 0; irv = STRTOG_Underflow | STRTOG_Inexlo; +#ifndef NO_ERRNO + errno = ERANGE; +#endif } else { irv = (irv & ~STRTOG_Retmask) | (rvb->wds > 0 ? STRTOG_Denormal : STRTOG_Zero); - if (irv & STRTOG_Inexact) + if (irv & STRTOG_Inexact) { irv |= STRTOG_Underflow; +#ifndef NO_ERRNO + errno = ERANGE; +#endif + } } } if (se) ==== //depot/projects/mpsafetty/contrib/gdtoa/strtof.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ /* Please send bug reports to David M. Gay (dmg at acm dot org, * with " at " changed at "@" and " dot " changed to "."). */ -/* $FreeBSD: src/contrib/gdtoa/strtof.c,v 1.2 2007/12/16 21:14:33 das Exp $ */ +/* $FreeBSD: src/contrib/gdtoa/strtof.c,v 1.3 2008/09/03 07:32:06 das Exp $ */ #include "gdtoaimp.h" @@ -40,13 +40,21 @@ strtof(CONST char *s, char **sp) #endif { - static FPI fpi = { 24, 1-127-24+1, 254-127-24+1, 1, SI }; + static FPI fpi0 = { 24, 1-127-24+1, 254-127-24+1, 1, SI }; + FPI *fpi, fpi1; ULong bits[1]; Long exp; int k; + int Rounding = Flt_Rounds; union { ULong L[1]; float f; } u; - k = strtodg(s, sp, &fpi, &exp, bits); + fpi = &fpi0; + if (Rounding != FPI_Round_near) { + fpi1 = fpi0; + fpi1.rounding = Rounding; + fpi = &fpi1; + } + k = strtodg(s, sp, fpi, &exp, bits); switch(k & STRTOG_Retmask) { case STRTOG_NoNumber: case STRTOG_Zero: ==== //depot/projects/mpsafetty/contrib/gdtoa/test/README#2 (text+ko) ==== @@ -55,7 +55,12 @@ Program strtodt tests strtod on some hard cases (in file testnos3) posted by Fred Tydeman to comp.arch.arithmetic on 26 Feb. 1996. +To get correct results on Intel (x86) systems, the rounding precision +must be set to 53 bits. This can be done, e.g., by invoking +fpinit_ASL(), whose source appears in +http://www.netlib.org/ampl/solvers/fpinit.c . These are simple test programs, not meant for exhaustive testing, but for manually testing "interesting" cases. Paxson's testbase is good for more exhaustive testing, in part with random inputs. +See ftp://ftp.ee.lbl.gov/testbase-report.ps.Z . ==== //depot/projects/mpsafetty/contrib/gdtoa/test/f.out#2 (text+ko) ==== @@ -124,7 +124,9 @@ g_ffmt(0) gives 1 bytes: "0" strtoIf returns 80, consuming 9 bytes. -fI[0] == fI[1] == strtof +fI[0] = #0 = 0 +fI[1] = #1 = 1.4012985e-45 +fI[0] == strtof Input: 1.23e-320 @@ -132,7 +134,9 @@ g_ffmt(0) gives 1 bytes: "0" strtoIf returns 80, consuming 9 bytes. -fI[0] == fI[1] == strtof +fI[0] = #0 = 0 +fI[1] = #1 = 1.4012985e-45 +fI[0] == strtof Input: 1.23e-20 @@ -160,7 +164,9 @@ g_ffmt(0) gives 1 bytes: "0" strtoIf returns 80, consuming 15 bytes. -fI[0] == fI[1] == strtof +fI[0] = #0 = 0 +fI[1] = #1 = 1.4012985e-45 +fI[0] == strtof Input: 1.234567890123456789 @@ -188,7 +194,9 @@ g_ffmt(0) gives 1 bytes: "0" strtoIf returns 80, consuming 25 bytes. -fI[0] == fI[1] == strtof +fI[0] = #0 = 0 +fI[1] = #1 = 1.4012985e-45 +fI[0] == strtof Input: 1.234567890123456789e-321 @@ -196,7 +204,9 @@ g_ffmt(0) gives 1 bytes: "0" strtoIf returns 80, consuming 25 bytes. -fI[0] == fI[1] == strtof +fI[0] = #0 = 0 +fI[1] = #1 = 1.4012985e-45 +fI[0] == strtof Input: 1e23 @@ -224,7 +234,9 @@ g_ffmt(0) gives 1 bytes: "0" strtoIf returns 80, consuming 23 bytes. -fI[0] == fI[1] == strtof +fI[0] = #0 = 0 +fI[1] = #1 = 1.4012985e-45 +fI[0] == strtof Input: 9.025971879324147880346310405869e-277 @@ -232,7 +244,9 @@ g_ffmt(0) gives 1 bytes: "0" strtoIf returns 80, consuming 37 bytes. -fI[0] == fI[1] == strtof +fI[0] = #0 = 0 +fI[1] = #1 = 1.4012985e-45 +fI[0] == strtof Input: 9.025971879324147880346310405868e-277 @@ -240,7 +254,9 @@ g_ffmt(0) gives 1 bytes: "0" strtoIf returns 80, consuming 37 bytes. -fI[0] == fI[1] == strtof +fI[0] = #0 = 0 +fI[1] = #1 = 1.4012985e-45 +fI[0] == strtof Input: 2.2250738585072014e-308 @@ -248,7 +264,9 @@ g_ffmt(0) gives 1 bytes: "0" strtoIf returns 80, consuming 23 bytes. -fI[0] == fI[1] == strtof +fI[0] = #0 = 0 +fI[1] = #1 = 1.4012985e-45 +fI[0] == strtof Input: 2.2250738585072013e-308 @@ -256,7 +274,9 @@ g_ffmt(0) gives 1 bytes: "0" strtoIf returns 80, consuming 23 bytes. -fI[0] == fI[1] == strtof +fI[0] = #0 = 0 +fI[1] = #1 = 1.4012985e-45 +fI[0] == strtof Rounding mode for strtor... changed from 1 (nearest) to 0 (toward zero) ==== //depot/projects/mpsafetty/contrib/gdtoa/test/getround.c#2 (text+ko) ==== @@ -44,7 +44,14 @@ { int i; - i = atoi(s+1); + while(*++s <= ' ') { + if (!*s) { + printf("Current round mode for strtor... is %d (%s).\n", + r, dir[r]); + return r; + } + } + i = atoi(s); if (i >= 0 && i < 4) { printf("Rounding mode for strtor... "); if (i == r) ==== //depot/projects/mpsafetty/contrib/gdtoa/test/xsum0.out#2 (text+ko) ==== @@ -1,11 +1,11 @@ -README e6ebdc91 2429 +README e86e9133 2692 Qtest.c e8353ffc 5046 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Sep 4 17:34:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 40E50106568A; Thu, 4 Sep 2008 17:34: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 038A51065687 for ; Thu, 4 Sep 2008 17:34:23 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E43988FC15 for ; Thu, 4 Sep 2008 17:34:22 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m84HYMbc080006 for ; Thu, 4 Sep 2008 17:34:22 GMT (envelope-from sson@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m84HYMXB079999 for perforce@freebsd.org; Thu, 4 Sep 2008 17:34:22 GMT (envelope-from sson@FreeBSD.org) Date: Thu, 4 Sep 2008 17:34:22 GMT Message-Id: <200809041734.m84HYMXB079999@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sson@FreeBSD.org using -f From: Stacey Son To: Perforce Change Reviews Cc: Subject: PERFORCE change 149213 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Sep 2008 17:34:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=149213 Change 149213 by sson@sson_amd64 on 2008/09/04 17:33:54 Various gcc warning (-Wall -Wextra) fixes. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#12 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#22 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#55 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#15 edit .. //depot/projects/trustedbsd/openbsm/modules/auditfilter_noop/auditfilter_noop.c#5 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#12 (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#11 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#12 $ */ /* @@ -216,7 +216,7 @@ * from a file stream. */ static void -mainloop_pipe(const char *conffile, const char *pipefile, int pipe_fd) +mainloop_pipe(const char *conffile, const char *pipefile __unused, int pipe_fd) { u_char record[MAX_AUDIT_RECORD_SIZE]; struct timespec ts; ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#22 (text+ko) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#21 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#22 $ */ #include @@ -367,7 +367,7 @@ pthread_mutex_unlock(&mutex); return (-1); } - if (strlen(dir) >= len) { + if (strlen(dir) >= (size_t)len) { pthread_mutex_unlock(&mutex); return (-3); } @@ -457,7 +457,7 @@ pthread_mutex_unlock(&mutex); return (1); } - if (strlen(str) >= len) { + if (strlen(str) >= (size_t)len) { pthread_mutex_unlock(&mutex); return (-3); } @@ -484,7 +484,7 @@ pthread_mutex_unlock(&mutex); return (1); } - if (strlen(str) >= len) { + if (strlen(str) >= (size_t)len) { pthread_mutex_unlock(&mutex); return (-3); } ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#55 (text+ko) ==== @@ -32,7 +32,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#54 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#55 $ */ #include @@ -77,48 +77,48 @@ #include #define READ_TOKEN_BYTES(buf, len, dest, size, bytesread, err) do { \ - if (bytesread + size > len) { \ - err = 1; \ + if ((bytesread) + (size) > (u_int32_t)(len)) { \ + (err) = 1; \ } else { \ - memcpy(dest, buf + bytesread, size); \ + memcpy((dest), (buf) + (bytesread), (size)); \ bytesread += size; \ } \ } while (0) #define READ_TOKEN_U_CHAR(buf, len, dest, bytesread, err) do { \ - if (bytesread + sizeof(u_char) <= len) { \ - dest = buf[bytesread]; \ - bytesread += sizeof(u_char); \ + if ((bytesread) + sizeof(u_char) <= (u_int32_t)(len)) { \ + (dest) = buf[(bytesread)]; \ + (bytesread) += sizeof(u_char); \ } else \ - err = 1; \ + (err) = 1; \ } while (0) #define READ_TOKEN_U_INT16(buf, len, dest, bytesread, err) do { \ - if (bytesread + sizeof(u_int16_t) <= len) { \ - dest = be16dec(buf + bytesread); \ - bytesread += sizeof(u_int16_t); \ + if ((bytesread) + sizeof(u_int16_t) <= (u_int32_t)(len)) { \ + (dest) = be16dec((buf) + (bytesread)); \ + (bytesread) += sizeof(u_int16_t); \ } else \ - err = 1; \ + (err) = 1; \ } while (0) #define READ_TOKEN_U_INT32(buf, len, dest, bytesread, err) do { \ - if (bytesread + sizeof(u_int32_t) <= len) { \ - dest = be32dec(buf + bytesread); \ - bytesread += sizeof(u_int32_t); \ + if ((bytesread) + sizeof(u_int32_t) <= (u_int32_t)(len)) { \ + (dest) = be32dec((buf) + (bytesread)); \ + (bytesread) += sizeof(u_int32_t); \ } else \ - err = 1; \ + (err) = 1; \ } while (0) #define READ_TOKEN_U_INT64(buf, len, dest, bytesread, err) do { \ - if (bytesread + sizeof(u_int64_t) <= len) { \ - dest = be64dec(buf + bytesread); \ - bytesread += sizeof(u_int64_t); \ + if ((bytesread) + sizeof(u_int64_t) <= (u_int32_t)(len)) { \ + dest = be64dec((buf) + (bytesread)); \ + (bytesread) += sizeof(u_int64_t); \ } else \ - err = 1; \ + (err) = 1; \ } while (0) #define SET_PTR(buf, len, ptr, size, bytesread, err) do { \ - if ((bytesread) + (size) > (len)) \ + if ((bytesread) + (size) > (u_int32_t)(len)) \ (err) = 1; \ else { \ (ptr) = (buf) + (bytesread); \ @@ -188,7 +188,7 @@ static void print_mem(FILE *fp, u_char *data, size_t len) { - int i; + u_int32_t i; if (len > 0) { fprintf(fp, "0x"); @@ -203,7 +203,7 @@ static void print_string(FILE *fp, const char *str, size_t len) { - int i; + u_int32_t i; if (len > 0) { for (i = 0; i < len; i++) { @@ -1799,7 +1799,7 @@ fetch_execarg_tok(tokenstr_t *tok, u_char *buf, int len) { int err = 0; - int i; + u_int32_t i; u_char *bptr; READ_TOKEN_U_INT32(buf, len, tok->tt.execarg.count, tok->len, err); @@ -1813,7 +1813,7 @@ /* Look for a null terminated string. */ while (bptr && (*bptr != '\0')) { - if (++tok->len >=len) + if (++tok->len >= (u_int32_t)len) return (-1); bptr = buf + tok->len; } @@ -1831,7 +1831,7 @@ print_execarg_tok(FILE *fp, tokenstr_t *tok, char *del, char raw, __unused char sfrm, int xml) { - int i; + u_int32_t i; print_tok_type(fp, tok->id, "exec arg", raw, xml); for (i = 0; i < tok->tt.execarg.count; i++) { @@ -1858,7 +1858,7 @@ fetch_execenv_tok(tokenstr_t *tok, u_char *buf, int len) { int err = 0; - int i; + u_int32_t i; u_char *bptr; READ_TOKEN_U_INT32(buf, len, tok->tt.execenv.count, tok->len, err); @@ -1872,7 +1872,7 @@ /* Look for a null terminated string. */ while (bptr && (*bptr != '\0')) { - if (++tok->len >=len) + if (++tok->len >= (u_int32_t)len) return (-1); bptr = buf + tok->len; } @@ -1890,7 +1890,7 @@ print_execenv_tok(FILE *fp, tokenstr_t *tok, char *del, char raw, __unused char sfrm, int xml) { - int i; + u_int32_t i; print_tok_type(fp, tok->id, "exec env", raw, xml); for (i = 0; i< tok->tt.execenv.count; i++) { ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#15 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#14 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#15 $ */ /* @@ -165,7 +165,7 @@ #ifdef __APPLE__ return (!(au_get_state() == AUC_AUDITING)); #else - unsigned long au_cond; + long au_cond; if (auditon(A_GETCOND, &au_cond, sizeof(long)) < 0) { if (errno != ENOSYS) { ==== //depot/projects/trustedbsd/openbsm/modules/auditfilter_noop/auditfilter_noop.c#5 (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/modules/auditfilter_noop/auditfilter_noop.c#4 $ + * $P4: //depot/projects/trustedbsd/openbsm/modules/auditfilter_noop/auditfilter_noop.c#5 $ */ /* @@ -39,35 +39,37 @@ #include int -AUDIT_FILTER_ATTACH(void *instance, int argc, char *argv[]) +AUDIT_FILTER_ATTACH(void *instance __unused, int argc __unused, + char *argv[] __unused) { return (0); } int -AUDIT_FILTER_REINIT(void *instance, int argc, char *argv[]) +AUDIT_FILTER_REINIT(void *instance __unused, int argc __unused, + char *argv[] __unused) { return (0); } void -AUDIT_FILTER_RECORD(void *instance, struct timespec *ts, int token_count, - const tokenstr_t *tok[]) +AUDIT_FILTER_RECORD(void *instance __unused, struct timespec *ts __unused, + int token_count __unused, const tokenstr_t *tok[] __unused) { } void -AUDIT_FILTER_RAWRECORD(void *instance, struct timespec *ts, u_char *data, - u_int len) +AUDIT_FILTER_RAWRECORD(void *instance __unused, struct timespec *ts __unused, + u_char *data __unused, u_int len __unused) { } void -AUDIT_FILTER_DETACH(void *instance) +AUDIT_FILTER_DETACH(void *instance __unused) { } From owner-p4-projects@FreeBSD.ORG Thu Sep 4 17:48:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0AAF31065670; Thu, 4 Sep 2008 17:48: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 C294D106566B for ; Thu, 4 Sep 2008 17:48:37 +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 971258FC0A for ; Thu, 4 Sep 2008 17:48:37 +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 m84Hmb5D067316 for ; Thu, 4 Sep 2008 17:48:37 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m84Hmb8I067314 for perforce@freebsd.org; Thu, 4 Sep 2008 17:48:37 GMT (envelope-from ed@FreeBSD.org) Date: Thu, 4 Sep 2008 17:48:37 GMT Message-Id: <200809041748.m84Hmb8I067314@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 149215 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Sep 2008 17:48:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=149215 Change 149215 by ed@ed_dull on 2008/09/04 17:48:12 Don't forget to IFC the pts(4) manpage as well. Affected files ... .. //depot/projects/mpsafetty/share/man/man4/pts.4#9 integrate Differences ... ==== //depot/projects/mpsafetty/share/man/man4/pts.4#9 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)pty.4 8.2 (Berkeley) 11/30/93 -.\" $FreeBSD: src/share/man/man4/pts.4,v 1.1 2008/08/20 08:31:58 ed Exp $ +.\" $FreeBSD: src/share/man/man4/pts.4,v 1.2 2008/09/04 16:39:02 ed Exp $ .\" .Dd August 20, 2008 .Dt PTS 4 From owner-p4-projects@FreeBSD.ORG Thu Sep 4 18:44:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D1941065674; Thu, 4 Sep 2008 18:44: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 1092A106566B for ; Thu, 4 Sep 2008 18:44:35 +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 F289B8FC14 for ; Thu, 4 Sep 2008 18:44:34 +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 m84IiYi7008658 for ; Thu, 4 Sep 2008 18:44:34 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m84IiYMt008530 for perforce@freebsd.org; Thu, 4 Sep 2008 18:44:34 GMT (envelope-from zec@tel.fer.hr) Date: Thu, 4 Sep 2008 18:44:34 GMT Message-Id: <200809041844.m84IiYMt008530@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 149216 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Sep 2008 18:44:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=149216 Change 149216 by zec@zec_tpx32 on 2008/09/04 18:43:50 Restore an initializer for a global variable - initializers should go away in the next commit, not just yet. Affected files ... .. //depot/projects/vimage-commit2/src/sys/net/if_gif.c#9 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/net/if_gif.c#9 (text+ko) ==== @@ -124,7 +124,7 @@ #define MAX_GIF_NEST 1 #endif #ifndef VIMAGE -static int max_gif_nesting; +static int max_gif_nesting = MAX_GIF_NEST; #endif SYSCTL_V_INT(V_NET, vnet_gif, _net_link_gif, OID_AUTO, max_nesting, CTLFLAG_RW, max_gif_nesting, 0, "Max nested tunnels"); From owner-p4-projects@FreeBSD.ORG Thu Sep 4 18:44:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 89F6C106571F; Thu, 4 Sep 2008 18:44: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 332261065670 for ; Thu, 4 Sep 2008 18:44: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 206858FC15 for ; Thu, 4 Sep 2008 18:44: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 m84IiZJn008689 for ; Thu, 4 Sep 2008 18:44:35 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m84IiYc1008683 for perforce@freebsd.org; Thu, 4 Sep 2008 18:44:35 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 4 Sep 2008 18:44:35 GMT Message-Id: <200809041844.m84IiYc1008683@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 149217 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Sep 2008 18:44:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=149217 Change 149217 by hselasky@hselasky_laptop001 on 2008/09/04 18:44:10 Bugfixs to USB file interface: 1) Use bcmp instead of strcmp, else we match the wrong string. Else it is not possible to access /dev/ugenX.Y.Z.T . Previously only access to /dev/ugenX.Y worked. 2) Add support for FIODTYPE ioctl so that the "dd" utility can be used on /dev/ugen . Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.c#27 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_ioctl.h#14 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.c#27 (text+ko) ==== @@ -1314,37 +1314,55 @@ * usb2_clone - cdev callback * * This function is the kernel clone callback for "/dev/usbX.Y". + * + * NOTE: This function assumes that the clone and device open + * operation is atomic. *------------------------------------------------------------------------*/ static void usb2_clone(void *arg, USB_UCRED char *name, int namelen, struct cdev **dev) { enum { USB_DNAME_LEN = sizeof(USB_DEVICE_NAME) - 1, + USB_GNAME_LEN = sizeof(USB_GENERIC_NAME) - 1, }; if (*dev) { /* someone else has created a device */ return; } - if (usb2_last_devloc != (uint32_t)(0 - 1)) { - /* - * XXX can we assume that the clone and open operation is - * atomic ? - */ - DPRINTFN(2, "Clone race!\n"); - } - if (strcmp(name, USB_DEVICE_NAME)) { - usb2_last_devloc = - usb2_lookup_symlink(name, namelen); - } else { + /* reset device location */ + usb2_last_devloc = (uint32_t)(0 - 1); + + /* + * Check if we are matching "usb", "ugen" or an internal + * symbolic link: + */ + if ((namelen >= USB_DNAME_LEN) && + (bcmp(name, USB_DEVICE_NAME, USB_DNAME_LEN) == 0)) { if (namelen == USB_DNAME_LEN) { + /* USB management device location */ usb2_last_devloc = (uint32_t)(0 - 2); } else { + /* USB endpoint */ usb2_last_devloc = usb2_path_convert(name + USB_DNAME_LEN); } + } else if ((namelen >= USB_GNAME_LEN) && + (bcmp(name, USB_GENERIC_NAME, USB_GNAME_LEN) == 0)) { + if (namelen == USB_GNAME_LEN) { + /* USB management device location */ + usb2_last_devloc = (uint32_t)(0 - 2); + } else { + /* USB endpoint */ + usb2_last_devloc = + usb2_path_convert(name + USB_GNAME_LEN); + } + } + if (usb2_last_devloc == (uint32_t)(0 - 1)) { + /* Search for symbolic link */ + usb2_last_devloc = + usb2_lookup_symlink(name, namelen); } - if (usb2_last_devloc == (uint32_t)(0 - 1)) { /* invalid location */ return; @@ -1449,6 +1467,10 @@ int error = 0; switch (cmd) { + case FIODTYPE: + *(int *)addr = 0; /* character device */ + break; + case FIONBIO: /* handled by upper FS layer */ break; ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_ioctl.h#14 (text+ko) ==== @@ -32,6 +32,7 @@ #include #define USB_DEVICE_NAME "usb" +#define USB_GENERIC_NAME "ugen" struct usb2_read_dir { void *urd_data; From owner-p4-projects@FreeBSD.ORG Thu Sep 4 18:47:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A7005106566B; Thu, 4 Sep 2008 18: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 6BA1C1065675 for ; Thu, 4 Sep 2008 18:47:38 +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 59C6C8FC22 for ; Thu, 4 Sep 2008 18:47:38 +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 m84Ilc60028977 for ; Thu, 4 Sep 2008 18:47:38 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m84IlcmZ028971 for perforce@freebsd.org; Thu, 4 Sep 2008 18:47:38 GMT (envelope-from zec@tel.fer.hr) Date: Thu, 4 Sep 2008 18:47:38 GMT Message-Id: <200809041847.m84IlcmZ028971@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 149218 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Sep 2008 18:47:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=149218 Change 149218 by zec@zec_tpx32 on 2008/09/04 18:47:06 whitespace redux, clarify a comment. Affected files ... .. //depot/projects/vimage-commit2/src/sys/netinet/in.c#9 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netinet/in.c#9 (text+ko) ==== @@ -203,7 +203,7 @@ in_control(struct socket *so, u_long cmd, caddr_t data, struct ifnet *ifp, struct thread *td) { - INIT_VNET_INET(curvnet); /* so and ifp can be 0 ! */ + INIT_VNET_INET(curvnet); /* both so and ifp can be NULL here! */ register struct ifreq *ifr = (struct ifreq *)data; register struct in_ifaddr *ia = 0, *iap; register struct ifaddr *ifa; @@ -984,7 +984,6 @@ in_purgemaddrs(struct ifnet *ifp) { INIT_VNET_INET(ifp->if_vnet); - struct in_multi *inm; struct in_multi *oinm; From owner-p4-projects@FreeBSD.ORG Thu Sep 4 19:52:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 032E31065672; Thu, 4 Sep 2008 19:52: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 BB4F9106564A for ; Thu, 4 Sep 2008 19:52:44 +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 A81A68FC1D for ; Thu, 4 Sep 2008 19:52:44 +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 m84Jqiml069453 for ; Thu, 4 Sep 2008 19:52:44 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m84JqiIF069451 for perforce@freebsd.org; Thu, 4 Sep 2008 19:52:44 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 4 Sep 2008 19:52:44 GMT Message-Id: <200809041952.m84JqiIF069451@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 149220 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Sep 2008 19:52:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=149220 Change 149220 by hselasky@hselasky_laptop001 on 2008/09/04 19:52:38 Fix MTP templates and add support for vendor specific USB descriptors. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_handle_request.c#8 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_standard.h#7 edit .. //depot/projects/usb/src/sys/dev/usb2/template/usb2_template.c#9 edit .. //depot/projects/usb/src/sys/dev/usb2/template/usb2_template.h#4 edit .. //depot/projects/usb/src/sys/dev/usb2/template/usb2_template_cdce.c#6 edit .. //depot/projects/usb/src/sys/dev/usb2/template/usb2_template_msc.c#5 edit .. //depot/projects/usb/src/sys/dev/usb2/template/usb2_template_mtp.c#5 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_handle_request.c#8 (text+ko) ==== @@ -419,6 +419,7 @@ uint16_t wValue; uint16_t wIndex; uint8_t state; + usb2_error_t err; union { uWord wStatus; uint8_t buf[2]; @@ -564,11 +565,25 @@ break; default: /* we use "USB_ADD_BYTES" to de-const the src_zcopy */ - if (usb2_handle_iface_request(xfer, + err = usb2_handle_iface_request(xfer, USB_ADD_BYTES(&src_zcopy, 0), - &max_len, req, off, state)) { - goto tr_stalled; + &max_len, req, off, state); + if (err == 0) { + goto tr_valid; } + /* + * Reset zero-copy pointer and max length + * variable in case they were unintentionally + * set: + */ + src_zcopy = NULL; + max_len = 0; + + /* + * Check if we have a vendor specific + * descriptor: + */ + goto tr_handle_get_descriptor; } goto tr_valid; ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_standard.h#7 (text+ko) ==== @@ -283,6 +283,7 @@ #define UICLASS_PHYSICAL 0x05 #define UICLASS_IMAGE 0x06 +#define UISUBCLASS_SIC 1 /* still image class */ #define UICLASS_PRINTER 0x07 #define UISUBCLASS_PRINTER 1 #define UIPROTO_PRINTER_UNI 1 ==== //depot/projects/usb/src/sys/dev/usb2/template/usb2_template.c#9 (text+ko) ==== @@ -69,6 +69,7 @@ static void *usb2_temp_get_qualifier_desc(struct usb2_device *udev); static void *usb2_temp_get_config_desc(struct usb2_device *udev, uint16_t *pLength, uint8_t index); static const void *usb2_temp_get_string_desc(struct usb2_device *udev, uint16_t lang_id, uint8_t string_index); +static const void *usb2_temp_get_vendor_desc(struct usb2_device *udev, const struct usb2_device_request *req); static const void *usb2_temp_get_hub_desc(struct usb2_device *udev); static void usb2_temp_get_desc(struct usb2_device *udev, struct usb2_device_request *req, const void **pPtr, uint16_t *pLength); static usb2_error_t usb2_temp_setup(struct usb2_device *udev, const struct usb2_temp_device_desc *tdd); @@ -955,6 +956,29 @@ } /*------------------------------------------------------------------------* + * usb2_temp_get_vendor_desc + * + * Returns: + * NULL: No vendor descriptor found. + * Else: Pointer to a vendor descriptor. + *------------------------------------------------------------------------*/ +static const void * +usb2_temp_get_vendor_desc(struct usb2_device *udev, + const struct usb2_device_request *req) +{ + const struct usb2_temp_device_desc *tdd; + + tdd = usb2_temp_get_tdd(udev); + if (tdd == NULL) { + return (NULL); + } + if (tdd->getVendorDesc == NULL) { + return (NULL); + } + return ((tdd->getVendorDesc) (req)); +} + +/*------------------------------------------------------------------------* * usb2_temp_get_string_desc * * Returns: @@ -1023,6 +1047,10 @@ goto tr_stalled; } break; + case UT_READ_VENDOR_DEVICE: + case UT_READ_VENDOR_OTHER: + buf = usb2_temp_get_vendor_desc(udev, req); + goto tr_valid; default: goto tr_stalled; } ==== //depot/projects/usb/src/sys/dev/usb2/template/usb2_template.h#4 (text+ko) ==== @@ -31,6 +31,7 @@ #define _USB_TEMPLATE_H_ typedef const void *(usb2_temp_get_string_desc_t)(uint16_t lang_id, uint8_t string_index); +typedef const void *(usb2_temp_get_vendor_desc_t)(const struct usb2_device_request *req); struct usb2_temp_packet_size { uint16_t mps[USB_SPEED_MAX]; @@ -67,6 +68,7 @@ struct usb2_temp_device_desc { usb2_temp_get_string_desc_t *getStringDesc; + usb2_temp_get_vendor_desc_t *getVendorDesc; const struct usb2_temp_config_desc **ppConfigDesc; uint16_t idVendor; uint16_t idProduct; ==== //depot/projects/usb/src/sys/dev/usb2/template/usb2_template_cdce.c#6 (text+ko) ==== @@ -271,8 +271,8 @@ const struct usb2_temp_device_desc usb2_template_cdce = { .getStringDesc = ð_get_string_desc, .ppConfigDesc = eth_configs, - .idVendor = 0, - .idProduct = 0, + .idVendor = 0x0001, + .idProduct = 0x0001, .bcdDevice = 0x0100, .bDeviceClass = UDCLASS_COMM, .bDeviceSubClass = 0, ==== //depot/projects/usb/src/sys/dev/usb2/template/usb2_template_msc.c#5 (text+ko) ==== @@ -148,8 +148,8 @@ const struct usb2_temp_device_desc usb2_template_msc = { .getStringDesc = &msc_get_string_desc, .ppConfigDesc = msc_configs, - .idVendor = 0, - .idProduct = 0, + .idVendor = 0x0001, + .idProduct = 0x0001, .bcdDevice = 0x0100, .bDeviceClass = UDCLASS_COMM, .bDeviceSubClass = 0, ==== //depot/projects/usb/src/sys/dev/usb2/template/usb2_template_mtp.c#5 (text+ko) ==== @@ -30,6 +30,12 @@ /* * This file contains the USB templates for an USB Message Transfer * Protocol device. + * + * NOTE: It is common practice that MTP devices use some dummy + * descriptor cludges to be automatically detected by the host + * operating system. These descriptors are documented in the LibMTP + * library at sourceforge.net. The alternative is to supply the host + * operating system the VID and PID of your device. */ #include @@ -39,6 +45,8 @@ #include +#define MTP_BREQUEST 0x08 + enum { STRING_LANG_INDEX, STRING_MTP_DATA_INDEX, @@ -93,6 +101,7 @@ /* prototypes */ static usb2_temp_get_string_desc_t mtp_get_string_desc; +static usb2_temp_get_vendor_desc_t mtp_get_vendor_desc; static const struct usb2_temp_packet_size bulk_mps = { .mps[USB_SPEED_FULL] = 64, @@ -119,16 +128,16 @@ static const struct usb2_temp_endpoint_desc *mtp_data_endpoints[] = { &bulk_in_ep, + &bulk_out_ep, &intr_in_ep, - &bulk_out_ep, NULL, }; static const struct usb2_temp_interface_desc mtp_data_interface = { .ppEndpoints = mtp_data_endpoints, - .bInterfaceClass = 6, - .bInterfaceSubClass = 1, - .bInterfaceProtocol = 1, + .bInterfaceClass = UICLASS_IMAGE, + .bInterfaceSubClass = UISUBCLASS_SIC, /* Still Image Class */ + .bInterfaceProtocol = 1, /* PIMA 15740 */ .iInterface = STRING_MTP_DATA_INDEX, }; @@ -151,9 +160,10 @@ const struct usb2_temp_device_desc usb2_template_mtp = { .getStringDesc = &mtp_get_string_desc, + .getVendorDesc = &mtp_get_vendor_desc, .ppConfigDesc = mtp_configs, - .idVendor = 0, - .idProduct = 0, + .idVendor = 0x0001, + .idProduct = 0x0001, .bcdDevice = 0x0100, .bDeviceClass = 0, .bDeviceSubClass = 0, @@ -164,6 +174,37 @@ }; /*------------------------------------------------------------------------* + * mtp_get_vendor_desc + * + * Return values: + * NULL: Failure. No such vendor descriptor. + * Else: Success. Pointer to vendor descriptor is returned. + *------------------------------------------------------------------------*/ +static const void * +mtp_get_vendor_desc(const struct usb2_device_request *req) +{ + static const uint8_t dummy_desc[0x28] = { + 0x28, 0, 0, 0, 0, 1, 4, 0, + 1, 0, 0, 0, 0, 0, 0, 0, + 0, 1, 0x4D, 0x54, 0x50, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + }; + + if ((req->bmRequestType == UT_READ_VENDOR_DEVICE) && + (req->bRequest == MTP_BREQUEST) && (req->wValue[0] == 0) && + (req->wValue[1] == 0) && (req->wIndex[1] == 0) && + ((req->wIndex[0] == 4) || (req->wIndex[0] == 5))) { + /* + * By returning this descriptor LibMTP will + * automatically pickup our device. + */ + return (dummy_desc); + } + return (NULL); +} + +/*------------------------------------------------------------------------* * mtp_get_string_desc * * Return values: @@ -182,6 +223,19 @@ [STRING_MTP_SERIAL_INDEX] = &string_mtp_serial, }; + static const uint8_t dummy_desc[0x12] = { + 0x12, 0x03, 0x4D, 0x00, 0x53, 0x00, 0x46, 0x00, + 0x54, 0x00, 0x31, 0x00, 0x30, 0x00, 0x30, 0x00, + MTP_BREQUEST, 0x00, + }; + + if (string_index == 0xEE) { + /* + * By returning this string LibMTP will automatically + * pickup our device. + */ + return (dummy_desc); + } if (string_index == 0) { return (&string_lang); } From owner-p4-projects@FreeBSD.ORG Thu Sep 4 20:04:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8AFAB1065671; Thu, 4 Sep 2008 20:04:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4F2AC106566B for ; Thu, 4 Sep 2008 20:04:57 +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 3CB588FC25 for ; Thu, 4 Sep 2008 20:04:57 +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 m84K4vG3040092 for ; Thu, 4 Sep 2008 20:04:57 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m84K4v7p040081 for perforce@freebsd.org; Thu, 4 Sep 2008 20:04:57 GMT (envelope-from zec@tel.fer.hr) Date: Thu, 4 Sep 2008 20:04:57 GMT Message-Id: <200809042004.m84K4v7p040081@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 149222 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Sep 2008 20:04:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=149222 Change 149222 by zec@zec_tpx32 on 2008/09/04 20:04:32 Random reasonable and unreasonable whitespace / junk redux. Affected files ... .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw.h#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#18 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_icmp.c#8 edit .. //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#2 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/icmp6.c#13 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#11 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/vinet6.h#2 edit .. //depot/projects/vimage-commit2/src/sys/rpc/authunix_prot.c#10 edit .. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#15 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_fw.h#4 (text+ko) ==== @@ -750,20 +750,16 @@ #define V_fw_one_pass VNET_IPFW(fw_one_pass) #define V_fw_enable VNET_IPFW(fw_enable) #define V_fw6_enable VNET_IPFW(fw6_enable) - #define V_set_disable VNET_IPFW(set_disable) #define V_fw_deny_unknown_exthdrs VNET_IPFW(fw_deny_unknown_exthdrs) #define V_fw_verbose VNET_IPFW(fw_verbose) #define V_verbose_limit VNET_IPFW(verbose_limit) - #define V_fw_debug VNET_IPFW(fw_debug) #define V_autoinc_step VNET_IPFW(autoinc_step) - #define V_ipfw_dyn_v VNET_IPFW(ipfw_dyn_v) #define V_layer3_chain VNET_IPFW(layer3_chain) #define V_dyn_buckets VNET_IPFW(dyn_buckets) #define V_curr_dyn_buckets VNET_IPFW(curr_dyn_buckets) - #define V_dyn_ack_lifetime VNET_IPFW(dyn_ack_lifetime) #define V_dyn_syn_lifetime VNET_IPFW(dyn_syn_lifetime) #define V_dyn_fin_lifetime VNET_IPFW(dyn_fin_lifetime) @@ -777,7 +773,6 @@ #define V_static_len VNET_IPFW(static_len) #define V_dyn_count VNET_IPFW(dyn_count) #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_ifaddr_event_tag VNET_IPFW(ifaddr_event_tag) ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#18 (text+ko) ==== @@ -633,7 +633,6 @@ return 1; } - static __inline int hash_packet6(struct ipfw_flow_id *id) { ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_icmp.c#8 (text+ko) ==== @@ -79,7 +79,7 @@ struct icmpstat icmpstat; SYSCTL_V_STRUCT(V_NET, vnet_inet, _net_inet_icmp, ICMPCTL_STATS, stats, - CTLFLAG_RW, icmpstat, icmpstat, ""); + CTLFLAG_RW, icmpstat, icmpstat, ""); static int icmpmaskrepl = 0; SYSCTL_INT(_net_inet_icmp, ICMPCTL_MASKREPL, maskrepl, CTLFLAG_RW, ==== //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#2 (text+ko) ==== @@ -194,7 +194,6 @@ #define V_in_ifaddrhashtbl VNET_INET(in_ifaddrhashtbl) #define V_in_ifaddrhmask VNET_INET(in_ifaddrhmask) #define V_in_multihead VNET_INET(in_multihead) - #define V_llinfo_arp VNET_INET(llinfo_arp) #define V_arpt_prune VNET_INET(arpt_prune) #define V_arpt_keep VNET_INET(arpt_keep) @@ -203,7 +202,6 @@ #define V_arp_proxyall VNET_INET(arp_proxyall) #define V_subnetsarelocal VNET_INET(subnetsarelocal) #define V_sameprefixcarponly VNET_INET(sameprefixcarponly) - #define V_ipforwarding VNET_INET(ipforwarding) #define V_ipstealth VNET_INET(ipstealth) #define V_ipfastforward_active VNET_INET(ipfastforward_active) @@ -214,13 +212,11 @@ #define V_ip_id VNET_INET(ip_id) #define V_ip_do_randomid VNET_INET(ip_do_randomid) #define V_ip_checkinterface VNET_INET(ip_checkinterface) - #define V_ipq VNET_INET(ipq) #define V_ipq_zone VNET_INET(ipq_zone) #define V_nipq VNET_INET(nipq) #define V_maxnipq VNET_INET(maxnipq) #define V_maxfragsperpacket VNET_INET(maxfragsperpacket) - #define V_tcb VNET_INET(tcb) #define V_tcbinfo VNET_INET(tcbinfo) #define V_tcpstat VNET_INET(tcpstat) @@ -229,7 +225,6 @@ #define V_tcp_hc_callout VNET_INET(tcp_hc_callout) #define V_tcp_syncache VNET_INET(tcp_syncache) #define V_tcp_sc_rst_sock_fail VNET_INET(tcp_sc_rst_sock_fail) - #define V_tcp_mssdflt VNET_INET(tcp_mssdflt) #define V_tcp_v6mssdflt VNET_INET(tcp_v6mssdflt) #define V_tcp_minmss VNET_INET(tcp_minmss) @@ -269,38 +264,30 @@ #define V_tcp_reass_qsize VNET_INET(tcp_reass_qsize) #define V_tcp_reass_maxqlen VNET_INET(tcp_reass_maxqlen) #define V_tcp_reass_overflows VNET_INET(tcp_reass_overflows) - #define V_isn_secret VNET_INET(isn_secret) #define V_isn_last_reseed VNET_INET(isn_last_reseed) #define V_isn_offset VNET_INET(isn_offset) #define V_isn_offset_old VNET_INET(isn_offset_old) #define V_isn_ctx VNET_INET(isn_ctx) - #define V_udb VNET_INET(udb) #define V_udbinfo VNET_INET(udbinfo) #define V_udpstat VNET_INET(udpstat) #define V_udp_blackhole VNET_INET(udp_blackhole) - #define V_ripcb VNET_INET(ripcb) #define V_ripcbinfo VNET_INET(ripcbinfo) #define V_ip_mrouter VNET_INET(ip_mrouter) - #define V_rsvp_on VNET_INET(rsvp_on) #define V_ip_rsvp_on VNET_INET(ip_rsvp_on) #define V_ip_rsvpd VNET_INET(ip_rsvpd) - #define V_icmpstat VNET_INET(icmpstat) #define V_ipstat VNET_INET(ipstat) #define V_igmpstat VNET_INET(igmpstat) - #define V_router_info_head VNET_INET(router_info_head) - #define V_rtq_timeout VNET_INET(rtq_timeout) #define V_rtq_reallyold VNET_INET(rtq_reallyold) #define V_rtq_minreallyold VNET_INET(rtq_minreallyold) #define V_rtq_toomany VNET_INET(rtq_toomany) #define V_rtq_timer VNET_INET(rtq_timer) - #define V_ipport_lowfirstauto VNET_INET(ipport_lowfirstauto) #define V_ipport_lowlastauto VNET_INET(ipport_lowlastauto) #define V_ipport_firstauto VNET_INET(ipport_firstauto) @@ -315,7 +302,6 @@ #define V_ipport_stoprandom VNET_INET(ipport_stoprandom) #define V_ipport_tcpallocs VNET_INET(ipport_tcpallocs) #define V_ipport_tcplastcount VNET_INET(ipport_tcplastcount) - #define V_divcb VNET_INET(divcb) #define V_divcbinfo VNET_INET(divcbinfo) #endif /* !_NETINET_VINET_H_ */ ==== //depot/projects/vimage-commit2/src/sys/netinet6/icmp6.c#13 (text+ko) ==== @@ -393,8 +393,7 @@ icmp6_input(struct mbuf **mp, int *offp, int proto) { INIT_VNET_INET6(curvnet); - /* XXX this below is WRONG - MARKO */ - INIT_VPROCG(TD_TO_VPROCG(curthread)); + INIT_VPROCG(TD_TO_VPROCG(curthread)); /* XXX V_hostname needs this */ struct mbuf *m = *mp, *n; struct ip6_hdr *ip6, *nip6; struct icmp6_hdr *icmp6, *nicmp6; @@ -1167,8 +1166,7 @@ ni6_input(struct mbuf *m, int off) { INIT_VNET_INET6(curvnet); - /* XXX this bellow is WRONG - MARKO */ - INIT_VPROCG(TD_TO_VPROCG(curthread)); + INIT_VPROCG(TD_TO_VPROCG(curthread)); /* XXX V_hostname needs this */ struct icmp6_nodeinfo *ni6, *nni6; struct mbuf *n = NULL; u_int16_t qtype; ==== //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#11 (text+ko) ==== @@ -534,7 +534,7 @@ * ND6 timer routine to expire default route list and prefix list */ void -nd6_timer(void *ignored_arg) +nd6_timer(void *arg) { INIT_VNET_INET6((struct vnet *) arg); int s; @@ -1898,7 +1898,7 @@ } static void -nd6_slowtimo(void *ignored_arg) +nd6_slowtimo(void *arg) { CURVNET_SET((struct vnet *) arg); INIT_VNET_NET((struct vnet *) arg); ==== //depot/projects/vimage-commit2/src/sys/netinet6/vinet6.h#2 (text+ko) ==== @@ -165,33 +165,26 @@ * Symbol translation macros */ #define V_in6_ifaddr VNET_INET6(in6_ifaddr) - #define V_frag6_nfragpackets VNET_INET6(frag6_nfragpackets) #define V_frag6_nfrags VNET_INET6(frag6_nfrags) #define V_ip6q VNET_INET6(ip6q) - #define V_ip6_forward_rt VNET_INET6(ip6_forward_rt) - #define V_defaultaddrpolicy VNET_INET6(defaultaddrpolicy) #define V_addrsel_policytab VNET_INET6(addrsel_policytab) #define V_in6_maxmtu VNET_INET6(in6_maxmtu) #define V_ip6_auto_linklocal VNET_INET6(ip6_auto_linklocal) - #define V_rtq_minreallyold6 VNET_INET6(rtq_minreallyold6) #define V_rtq_reallyold6 VNET_INET6(rtq_reallyold6) #define V_rtq_toomany6 VNET_INET6(rtq_toomany6) - #define V_ip6stat VNET_INET6(ip6stat) #define V_rip6stat VNET_INET6(rip6stat) #define V_icmp6stat VNET_INET6(icmp6stat) - #define V_rtq_timeout6 VNET_INET6(rtq_timeout6) #define V_rtq_timer6 VNET_INET6(rtq_timer6) #define V_rtq_mtutimer VNET_INET6(rtq_mtutimer) #define V_nd6_slowtimo_ch VNET_INET6(nd6_slowtimo_ch) #define V_nd6_timer_ch VNET_INET6(nd6_timer_ch) #define V_in6_tmpaddrtimer_ch VNET_INET6(in6_tmpaddrtimer_ch) - #define V_nd6_inuse VNET_INET6(nd6_inuse) #define V_nd6_allocated VNET_INET6(nd6_allocated) #define V_llinfo_nd6 VNET_INET6(llinfo_nd6) @@ -199,16 +192,12 @@ #define V_nd_prefix VNET_INET6(nd_prefix) #define V_nd6_defifp VNET_INET6(nd6_defifp) #define V_nd6_defifindex VNET_INET6(nd6_defifindex) - #define V_sid_default VNET_INET6(sid_default) - #define V_dadq VNET_INET6(dadq) #define V_dad_init VNET_INET6(dad_init) - //#define V_icmp6errppslim VNET_INET6(icmp6errppslim) #define V_icmp6errpps_count VNET_INET6(icmp6errpps_count) //#define V_icmp6_nodeinfo VNET_INET6(icmp6_nodeinfo) - #define V_ip6_forwarding VNET_INET6(ip6_forwarding) #define V_ip6_sendredirects VNET_INET6(ip6_sendredirects) #define V_ip6_defhlim VNET_INET6(ip6_defhlim) @@ -227,7 +216,6 @@ #define V_ip6_keepfaith VNET_INET6(ip6_keepfaith) #define V_ip6stealth VNET_INET6(ip6stealth) #define V_ip6_log_time VNET_INET6(ip6_log_time) - #define V_pmtu_expire VNET_INET6(pmtu_expire) #define V_pmtu_probe VNET_INET6(pmtu_probe) #define V_rip6_sendspace VNET_INET6(rip6_sendspace) @@ -262,14 +250,11 @@ #define V_ip6_desync_factor VNET_INET6(ip6_desync_factor) #define V_ip6_temp_preferred_lifetime VNET_INET6(ip6_temp_preferred_lifetime) #define V_ip6_temp_valid_lifetime VNET_INET6(ip6_temp_valid_lifetime) - #define V_ip6_mrouter_ver VNET_INET6(ip6_mrouter_ver) #define V_pim6 VNET_INET6(pim6) #define V_mrt6debug VNET_INET6(mrt6debug) #define V_ip6_temp_regen_advance VNET_INET6(ip6_temp_regen_advance) - #define V_ip6_use_defzone VNET_INET6(ip6_use_defzone) - #define V_ip6_opts VNET_INET6(ip6_opts) #endif /* !_NETINET6_VINET6_H_ */ ==== //depot/projects/vimage-commit2/src/sys/rpc/authunix_prot.c#10 (text+ko) ==== @@ -69,8 +69,7 @@ uint32_t namelen; uint32_t ngroups, i; uint32_t junk; -/* XXX VIMAGE */ - INIT_VPROCG(TD_TO_VPROCG(&thread0)); + INIT_VPROCG(TD_TO_VPROCG(&thread0)); /* XXX revisit - fixme! */ mtx_lock(&hostname_mtx); if (xdrs->x_op == XDR_ENCODE) { ==== //depot/projects/vimage-commit2/src/sys/sys/vimage.h#15 (text+ko) ==== @@ -65,7 +65,7 @@ #define V_GLOBAL 0 #define V_NET 1 #define V_PROCG 2 -#define V_CPU 3 +#define V_CPU 3 #define VNET_MOD_NONE -1 /*statefull modules */ @@ -97,7 +97,7 @@ #define VNET_MOD_DYNAMIC_START 32 #define VNET_MOD_MAX 64 -/* Needed for ugly sysctl virtualization macros */ +/* Needed for ugly sysctl virtualization macros for vnet minor modules */ #define V_MOD_vnet_net VNET_MOD_NET #define V_MOD_vnet_netgraph VNET_MOD_NETGRAPH #define V_MOD_vnet_inet VNET_MOD_INET @@ -107,6 +107,7 @@ #define V_MOD_vnet_gif VNET_MOD_GIF #define V_MOD_vnet_ipsec VNET_MOD_IPSEC +/* vprocg and vcpu major modules do not have minor modules like vnet does */ #define V_MOD_vprocg 0 #define V_MOD_vcpu 0 @@ -404,35 +405,6 @@ char _hostname[MAXHOSTNAMELEN]; char _domainname[MAXHOSTNAMELEN]; - - int _morphing_symlinks; - -#if 0 - long _cp_time[CPUSTATES]; - - struct loadavg _averunnable; /* from kern/kern_synch.c */ - int _sched_tdcnt; /* from kern/sched_4bsd.c */ - int _tdq_sysload[32]; /* XXX MAXCPUS from kern/sched_ule.c (SMP) */ - - u_int proc_limit; /* max. number of processes */ - - struct msgbuf *msgbufp; - int msgbuftrigger; - int msg_seqn; - - pid_t log_open_pid; - int log_sc_state; - struct selinfo log_sc_selp; - struct sigio *log_sc_sigio; - struct callout log_sc_callout; - - struct timeval boottime; - long boottdelta_sec; - - char chroot[MAXPATHLEN]; /* assigned/inherited from parent */ - - int big_brother; /* manage procs in all child vprocgs */ -#endif }; struct vcpu { @@ -443,58 +415,8 @@ u_int _acc_statcalls; /* statclocks since last avg update*/ u_int _avg1_fixp; /* "fast" avg in 16:16 bit fixedpoint */ u_int _avg2_fixp; /* "slow" avg in 16:16 bit fixedpoint */ - -#if 0 - u_int cpu_min; /* Guaranteed CPU share */ - u_int cpu_max; /* Maximum average CPU usage */ - u_int intr_limit; /* Limit on CPU usage in intr ctx */ - u_int cpu_weight; /* Prop. share scheduling priority */ - u_int cpu_elimit; /* Dynamic soft CPU usage limit */ - u_int schedstamp; /* Prop. share scheduler tmp var */ - u_int forcedmin; /* Prop. share scheduler tmp var */ -#endif }; #endif /* VIMAGE */ -struct vi_req { - int req_action; /* What to do with this reqest? */ - u_int vi_cpu_min; /* Guaranteed CPU share */ - u_int vi_cpu_max; /* Maximum average CPU usage */ - u_int vi_cpu_weight; /* Prop. share scheduling priority */ - int vi_intr_limit; /* Limit on CPU usage in intr ctx */ - int vi_maxsockets; - u_short vi_proc_limit; /* max. number of processes */ - u_short vi_proc_count; /* current number of processes */ - u_short vi_child_limit; /* max. number of child vnets */ - u_short vi_child_count; /* current number of child vnets */ - int vi_if_count; /* current number network interfaces */ - int vi_sock_count; - char vi_name[MAXPATHLEN]; - char vi_chroot[MAXPATHLEN]; - char vi_if_xname[MAXPATHLEN]; /* XXX should be IFNAMSIZ */ - u_int cp_time_avg; - struct loadavg averunnable; -}; - -#define VI_CREATE 0x00000001 -#define VI_DESTROY 0x00000002 -#define VI_MODIFY 0x00000004 -#define VI_SWITCHTO 0x00000008 -#define VI_IFACE 0x00000010 - -#define VI_GET 0x00000100 -#define VI_GETNEXT 0x00000200 -#define VI_GETNEXT_RECURSE 0x00000300 - -#define VI_SET_CPU_MIN 0x00001000 -#define VI_SET_CPU_MAX 0x00002000 -#define VI_SET_CPU_WEIGHT 0x00004000 -#define VI_SET_INTR_LIMIT 0x00008000 -#define VI_SET_PROC_LIMIT 0x00010000 -#define VI_SET_CHILD_LIMIT 0x00020000 -#define VI_SET_SOCK_LIMIT 0x00040000 -#define VI_SET_NAME 0x00100000 -#define VI_SET_CHROOT 0x00200000 - #endif /* !_SYS_VIMAGE_H_ */ From owner-p4-projects@FreeBSD.ORG Thu Sep 4 20:17:10 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BAE4D106567A; Thu, 4 Sep 2008 20:17: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 657D21065671 for ; Thu, 4 Sep 2008 20:17:10 +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 51E7B8FC16 for ; Thu, 4 Sep 2008 20:17:10 +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 m84KH9f2018612 for ; Thu, 4 Sep 2008 20:17:09 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m84KH9qq018610 for perforce@freebsd.org; Thu, 4 Sep 2008 20:17:09 GMT (envelope-from rene@FreeBSD.org) Date: Thu, 4 Sep 2008 20:17:09 GMT Message-Id: <200809042017.m84KH9qq018610@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 149224 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Sep 2008 20:17:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=149224 Change 149224 by rene@rene_self on 2008/09/04 20:16:34 IFC (with some help from Remko) Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#6 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#7 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/dialup-firewall/article.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/portbuild/article.sgml#5 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/arch-handbook/boot/chapter.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#8 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#4 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mac/chapter.sgml#4 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#5 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/security/chapter.sgml#6 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#6 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#6 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#3 integrate .. //depot/projects/docproj_nl/share/pgpkeys/des.key#2 integrate .. //depot/projects/docproj_nl/share/pgpkeys/lippe.key#2 integrate .. //depot/projects/docproj_nl/share/pgpkeys/makc.key#1 branch .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#6 integrate .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#6 integrate .. //depot/projects/docproj_nl/share/pgpkeys/yar.key#1 branch .. //depot/projects/docproj_nl/share/sgml/mirrors.xml#3 integrate .. //depot/projects/docproj_nl/www/en/developers.sgml#4 integrate .. //depot/projects/docproj_nl/www/en/donations/donors.sgml#4 integrate .. //depot/projects/docproj_nl/www/en/donations/wantlist.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/gnome/docs/example-Makefile.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/gnome/docs/gnome2_porting.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/gnome/docs/gnome_porting.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/gnome/docs/porting.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/java/dists/index.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/java/docs/newbies.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/java/index.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/java/news.xml#2 integrate .. //depot/projects/docproj_nl/www/en/multimedia/multimedia-input.xml#2 integrate .. //depot/projects/docproj_nl/www/en/news/status/Makefile#2 integrate .. //depot/projects/docproj_nl/www/en/news/status/report-2008-04-2008-06.xml#1 branch .. //depot/projects/docproj_nl/www/en/news/status/status.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/platforms/amd64.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/platforms/amd64/motherboards.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/releases/6.4R/Makefile#1 branch .. //depot/projects/docproj_nl/www/en/releases/6.4R/docbook.css#1 branch .. //depot/projects/docproj_nl/www/en/releases/6.4R/schedule.sgml#1 branch .. //depot/projects/docproj_nl/www/en/releases/7.1R/Makefile#1 branch .. //depot/projects/docproj_nl/www/en/releases/7.1R/docbook.css#1 branch .. //depot/projects/docproj_nl/www/en/releases/7.1R/schedule.sgml#1 branch .. //depot/projects/docproj_nl/www/en/releases/Makefile#2 integrate .. //depot/projects/docproj_nl/www/en/releng/index.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/smp/index.sgml#2 integrate .. //depot/projects/docproj_nl/www/share/sgml/advisories.xml#3 integrate .. //depot/projects/docproj_nl/www/share/sgml/commercial.consult.xml#3 integrate .. //depot/projects/docproj_nl/www/share/sgml/commercial.hardware.xml#2 integrate .. //depot/projects/docproj_nl/www/share/sgml/commercial.isp.xml#2 integrate .. //depot/projects/docproj_nl/www/share/sgml/events.xml#4 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#6 integrate .. //depot/projects/docproj_nl/www/share/sgml/press.xml#4 integrate .. //depot/projects/docproj_nl/www/share/sgml/usergroups.xml#2 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#6 (text+ko) ==== @@ -1,4 +1,4 @@ - + + @@ -478,9 +478,10 @@ Kernel initialization - To where exactly is the execution passed by the loader, - i.e. what is the kernel's actual entry point. Let us take a - look at the command that links the kernel: + Let us take a look at the command that links the kernel. This + will help us identify the exact location where the loader passes + execution to the kernel. This location is the kernel's actual entry + point. sys/conf/Makefile.i386: ld -elf -Bdynamic -T /usr/src/sys/conf/ldscript.i386 -export-dynamic \ ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml#3 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -12,6 +12,10 @@ Kamp Contributed by + + Giorgos + Keramidas + @@ -25,33 +29,55 @@ <makevar>MAINTAINER</makevar> on Makefiles ports maintainer - If a particular portion of the FreeBSD distribution is being - maintained by a person or group of persons, they can communicate this - fact to the world by adding a + If a particular portion of the &os; src/ + distribution is being maintained by a person or group of persons, + this is communicated through an entry in the + src/MAINTAINERS file. Maintainers of ports + within the Ports Collection express their maintainership to the + world by adding a MAINTAINER line to the + Makefile of the port in question: + + MAINTAINER= email-addresses - MAINTAINER= email-addresses + + For other parts of the repository, or for sections not listed + as having a maintainer, or when you are unsure who the active + maintainer is, try looking at the recent commit history of the + relevant parts of the source tree. It is quite often the case + that a maintainer is not explicitly named, but the people who are + actively working in a part of the source tree for, say, the last + couple of years are interested in reviewing changes. Even if this + is not specifically mentioned in the documentation or the source + itself, asking for a review as a form of courtesy is a very + reasonable thing to do. + - line to the Makefiles covering this portion of the - source tree. + The role of the maintainer is as follows: - The semantics of this are as follows: - + + The maintainer owns and is responsible for that code. This means - that he is responsible for fixing bugs and answering problem reports + that he or she is responsible for fixing bugs and answering problem reports pertaining to that piece of the code, and in the case of contributed software, for tracking new versions, as appropriate. + + Changes to directories which have a maintainer defined shall be sent to the maintainer for review before being committed. Only if the maintainer does not respond for an unacceptable period of time, to several emails, will it be acceptable to commit changes without review by the maintainer. However, it is suggested that you try to have the changes reviewed by someone else if at all possible. + + It is of course not acceptable to add a person or group as maintainer unless they agree to assume this duty. On the other hand it does not have to be a committer and it can easily be a group of people. + + @@ -66,6 +92,10 @@ David O'Brien + + Gavin + Atkinson + @@ -90,7 +120,7 @@ model over time, as it has significant advantages over the old method, including the ability to easily obtain diffs relative to the official versions of the source by everyone (even without - cvs access). This will make it significantly easier to return changes + direct repository access). This will make it significantly easier to return changes to the primary developers of the contributed software. Ultimately, however, it comes down to the people actually doing the @@ -102,50 +132,47 @@ Because of some unfortunate design limitations with the RCS file - format and CVS's use of vendor branches, minor, trivial and/or + format and the use of vendor branches, minor, trivial and/or cosmetic changes are strongly discouraged on files that are still tracking the vendor branch. Spelling fixes are explicitly included here under the - cosmetic category and are to be avoided for files with - revision 1.1.x.x. The repository bloat impact from a single character + cosmetic category and are to be avoided. + The repository bloat impact from a single character change can be rather dramatic. - The Tcl embedded programming - language will be used as example of how this model works: + + Vendor Imports with CVS + + The file utility, used to identify + the format of a file, will be used as example of how this model + works: - src/contrib/tcl contains the source as + src/contrib/file contains the source as distributed by the maintainers of this package. Parts that are entirely - not applicable for FreeBSD can be removed. In the case of Tcl, the - mac, win and - compat subdirectories were eliminated before the - import. + not applicable for &os; can be removed. In the case of &man.file.1;, the + python subdirectory and files with the lt + prefix were eliminated before the import, amongst others. - src/lib/libtcl contains only a bmake style + src/lib/libmagic contains a bmake style Makefile that uses the standard bsd.lib.mk makefile rules to produce the library and install the documentation. - src/usr.bin/tclsh contains only a bmake style + src/usr.bin/file contains a bmake style Makefile which will produce and install the - tclsh program and its associated man-pages using the + file program and its associated man-pages using the standard bsd.prog.mk rules. - src/tools/tools/tcl_bmake contains a couple of - shell-scripts that can be of help when the tcl software needs updating. - These are not part of the built or installed software. - The important thing here is that the - src/contrib/tcl directory is created according to + src/contrib/file directory is created according to the rules: it is supposed to contain the sources as distributed (on a - proper CVS vendor-branch and without RCS keyword expansion) with as few + proper vendor-branch and without RCS keyword expansion) with as few FreeBSD-specific changes as possible. If there are any doubts on how to go about it, it is imperative that you ask first and not blunder - ahead and hope it works out. CVS is not forgiving of - import accidents and a fair amount of effort is required to back out - major mistakes. + ahead and hope it works out. - Because of the previously mentioned design limitations with CVS's + Because of the previously mentioned design limitations with vendor branches, it is required that official patches from the vendor be applied to the original distributed sources and the result re-imported onto the vendor branch again. Official patches should never @@ -168,7 +195,7 @@ src/tools directory along with the port itself so that it is available to future maintainers. - In the src/contrib/tcl level directory, a file + In the src/contrib/file level directory, a file called FREEBSD-upgrade should be added and it should state things like: @@ -192,49 +219,298 @@ - However, please do not import FREEBSD-upgrade - with the contributed source. Rather you should cvs add - FREEBSD-upgrade ; cvs ci after the initial import. Example - wording from src/contrib/cpio is below: + Example wording from + src/contrib/groff/FREEBSD-upgrade is + below: + + $FreeBSD: src/contrib/groff/FREEBSD-upgrade,v 1.5.12.1 2005/11/15 22:06:18 ru Exp $ - This directory contains virgin sources of the original distribution files +This directory contains virgin copies of the original distribution files on a "vendor" branch. Do not, under any circumstances, attempt to upgrade -the files in this directory via patches and a cvs commit. New versions or -official-patch versions must be imported. Please remember to import with -"-ko" to prevent CVS from corrupting any vendor RCS Ids. +the files in this directory via patches and a cvs commit. + +To upgrade to a newer version of groff, when it is available: + 1. Unpack the new version into an empty directory. + [Do not make ANY changes to the files.] + + 2. Use the command: + cvs import -m 'Virgin import of FSF groff v<version>' \ + src/contrib/groff FSF v<version> + + For example, to do the import of version 1.19.2, I typed: + cvs import -m 'Virgin import of FSF groff v1.19.2' \ + src/contrib/groff FSF v1_19_2 + + 3. Follow the instructions printed out in step 2 to resolve any + conflicts between local FreeBSD changes and the newer version. + +Do not, under any circumstances, deviate from this procedure. + +To make local changes to groff, simply patch and commit to the main +branch (aka HEAD). Never make local changes on the FSF branch. + +All local changes should be submitted to Werner Lemberg <wl@gnu.org> or +Ted Harding <ted.harding@nessie.mcc.ac.uk> for inclusion in the next +vendor release. + +ru@FreeBSD.org - 20 October 2005 + + Another approach my also be taken for the list of files to be + excluded, which is especially useful when the list is large or + complicated or where imports happen frequently. By creating a + file FREEBSD-Xlist in the same directory the + vendor source is imported into, containing a list of filename + patterns to be excluded one per line, future imports can often + performed with: + + &prompt.user; tar FREEBSD-Xlist vendor-source.tgz + + An example of a FREEBSD-Xlist file, from + src/contrib/tcsh, is here: + + */BUGS +*/config/a* +*/config/bs2000 +*/config/bsd +*/config/bsdreno +*/config/[c-z]* +*/tests +*/win32 + + + Please do not import FREEBSD-upgrade or + FREEBSD-Xlist with the contributed source. + Rather you should add these files after the initial + import. + + + + + + + + + Dag-Erling + Smørgrav + Contributed by + + + + Vendor Imports with SVN + + This section describes the vendor import procedure with + Subversion in details. + + + + Preparing the Tree + + If this is your first import after the switch to + SVN, you will have to flatten and clean + up the vendor tree, and bootstrap merge history in the main + tree. If not, you can safely omit this step. + + During the conversion from CVS to + SVN, vendor branches were imported with + the same layout as the main tree. For example, the + foo vendor sources ended up in + vendor/foo/dist/contrib/foo, + but it is pointless and rather inconvenient. What we really + want is to have the vendor source directly in + vendor/foo/dist, + like this: + + &prompt.user; cd vendor/foo/dist/contrib/foo +&prompt.user; svn move $(svn list) ../.. +&prompt.user; cd ../.. +&prompt.user; svn remove contrib +&prompt.user; svn propdel svn:mergeinfo +&prompt.user; svn commit + + Note that, the propdel bit is + necessary because starting with 1.5, Subversion will + automatically add svn:mergeinfo to any + directory you copy or move. In this case, you will not need + this information, since you are not going to merge anything + from the tree you deleted. + + + You may want to flatten the tags as well. The + procedure is exactly the same. If you do this, put off + the commit until the end. + + + Check the dist tree and perform any + cleanup that is deemed to be necessary. You may want to + disable keyword expansion, as it makes no sense on + unmodified vendor code. In some cases, it can be even be + harmful. + + &prompt.user; svn propdel svn:keywords . +&prompt.user; svn commit + + Bootstrapping of svn:mergeinfo on the + target directory (in the main tree) to the revision that + corresponds to the last change was made to the vendor tree + prior to importing new sources is also needed: + + &prompt.user; cd head/contrib/foo +&prompt.user; svn merge svn_base/vendor/foo/dist@12345678 . +&prompt.user; svn commit + + where svn_base is the base + directory of your SVN repository, e.g. + svn+ssh://svn.FreeBSD.org/base. + + + + Importing New Sources + + Prepare a full, clean tree of the vendor sources. With + SVN, we can keep a full distribution in + the vendor tree without bloating the main tree. Import + everything but merge only what is needed. + + Note that you will need to add any files that were added + since the last vendor import, and remove any that were + removed. To facilitate this, you should prepare sorted + lists of the contents of the vendor tree and of the sources + you are about to import: + + &prompt.user; cd vendor/foo/dist +&prompt.user; svn list | grep '/$' | sort > ../old +&prompt.user; cd ../foo-9.9 +&prompt.user; find . f | cut 3- | sort > ../new + + With these two files, the following command will list + list removed files (files only in + old): + + &prompt.user; comm ../old ../new + + While the command below will list added files (files + only in + new): + + &prompt.user; comm ../old ../new + + Let's put this together: + + &prompt.user; cd vendor/foo/foo-9.9 +&prompt.user; tar cf - . | tar xf - ../dist +&prompt.user; cd ../dist +&prompt.user; comm ../old ../new | xargs svn remove +&prompt.user; comm ../old ../new | xargs svn add + + + If there are new directories in the new distribution, + the last command will fail. You will have to add the + directories, and run it again. Conversely, if any + directories were removed, you will have to remove them + manually. + + + Check properties on any new files: + + + + All text files + should have svn:eol-style set to + native. + + + + All binary files should have + svn:mime-type set to + application/octet-stream, unless + there is a more appropriate media type. + + + + Executable files should have + svn:executable set to + *. + + + + There should be no other properties on any file in + the tree. + + + + + You are ready to commit, but you should first check + the output of svn stat and svn + diff to make sure everything is in order. + + + Once you have committed the new vendor release, you + should tag it for future reference. The best and quickest + way is to do it directly in the repository: + + &prompt.user; svn copy svn_base/vendor/foo/dist svn_base/vendor/foo/9.9 + + To get the new tag, you can update your working copy of + vendor/foo. -For the import of GNU cpio 2.4.2, the following files were removed: + + If you choose to do the copy in the checkout instead, + do not forget to remove the generated + svn:mergeinfo as described + above. + + - INSTALL cpio.info mkdir.c - Makefile.in cpio.texi mkinstalldirs + + Merging to <emphasis>-HEAD</emphasis> -To upgrade to a newer version of cpio, when it is available: - 1. Unpack the new version into an empty directory. - [Do not make ANY changes to the files.] + After you have prepared your import, it is time to + merge. Option tells + SVN not to handle merge conflicts yet, + because they will be taken care of manually: - 2. Remove the files listed above and any others that don't apply to - FreeBSD. + &prompt.user; cd head/contrib/foo +&prompt.user; svn update +&prompt.user; svn merge svn_base/vendor/foo/dist - 3. Use the command: - cvs import -ko -m 'Virgin import of GNU cpio v<version>' \ - src/contrib/cpio GNU cpio_<version> + Resolve any conflicts, and make sure that any files that + were added or removed in the vendor tree have been properly + added or removed in the main tree. It is always a good idea + to check differences against the vendor branch: - For example, to do the import of version 2.4.2, I typed: - cvs import -ko -m 'Virgin import of GNU v2.4.2' \ - src/contrib/cpio GNU cpio_2_4_2 + &prompt.user; svn diff svn_base/vendor/foo/dist . - 4. Follow the instructions printed out in step 3 to resolve any - conflicts between local FreeBSD changes and the newer version. + The option tells + SVN not to check files that are in the + vendor tree but not in the main tree. -Do not, under any circumstances, deviate from this procedure. + + With SVN, there is no concept of on + or off the vendor branch. If a file that previously had + local modifications no longer does, just remove any + left-over cruft, such as &os; version tags, so it no + longer shows up in diffs against the vendor tree. + -To make local changes to cpio, simply patch and commit to the main -branch (aka HEAD). Never make local changes on the GNU branch. + If any changes are required for the world to build with + the new sources, make them now — and test until you + are satisfied that everything build and runs + correctly. + -All local changes should be submitted to "cpio@gnu.ai.mit.edu" for -inclusion in the next vendor release. + + Commit -obrien@FreeBSD.org - 30 March 1997 + Now, you are ready to commit. Make sure you get + everything in one go. Ideally, you would have done all + steps in a clean tree, in which case you can just commit + from the top of that tree. That is the best way to avoid + surprises. If you do it properly, the tree will move + atomically from a consistent state with the old code to a + consistent state with the new code. + + + @@ -411,7 +687,7 @@ For non-port libraries, it is also our policy to change the shared library version number only once between releases. In addition, it is our policy to change the major shared library version number only once - between major OS releases (i.e. from 3.0 to 4.0). When you make a + between major OS releases (i.e. from 6.0 to 7.0). When you make a change to a system library that requires the version number to be bumped, check the Makefile's commit logs. It is the responsibility of the committer to ensure that the first such change ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#8 (text+ko) ==== @@ -12,7 +12,7 @@ The &os; Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1098 2008/08/16 21:22:24 pgj Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1099 2008/08/21 20:53:08 danger Exp $ 1995 @@ -1024,7 +1024,7 @@ a chat channel, first and foremost, and topics there are just as likely to involve sex, sports or nuclear weapons as they are &os;. You Have Been Warned! Available at - server irc.chat.org. + server irc.efnet.org. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#4 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -832,9 +832,18 @@ With a device driver configured you need to also bring in the 802.11 networking support required by the driver. - For the &man.ath.4; driver this is at least the &man.wlan.4; - module; this module is automatically loaded with the - wireless device driver. With that you will need the modules + For the &man.ath.4; driver these are at least the &man.wlan.4;, + wlan_scan_ap and + wlan_scan_sta + modules; the &man.wlan.4; module is automatically loaded with the + wireless device driver, the remaining modules must be loaded + at boot time via the /boot/loader.conf + file: + + wlan_scan_ap_load="YES" +wlan_scan_sta_load="YES" + + With that you will need the modules that implement cryptographic support for the security protocols you intend to use. These are intended to be dynamically loaded on demand by the &man.wlan.4; module but @@ -868,6 +877,8 @@ device ath_hal # Atheros Hardware Access Layer device ath_rate_sample # John Bicket's SampleRate control algorithm. device wlan # 802.11 support (Required) +device wlan_scan_ap # 802.11 AP mode scanning +device wlan_scan_sta # 802.11 STA mode scanning device wlan_wep # WEP crypto support for 802.11 devices device wlan_ccmp # AES-CCMP crypto support for 802.11 devices device wlan_tkip # TKIP and Michael crypto support for 802.11 devices @@ -1654,7 +1665,10 @@ The weptxkey means which WEP key will be used in the transmission. Here we used the third key. This must match the setting in the access - point. + point. If you do not have any idea of what is the key + used by the access point, you should try to use + 1 (i.e., the first key) for this + value. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#2 (text+ko) ==== @@ -1,14 +1,14 @@ - Jim + Jim Mock Restructured, reorganized, and parts rewritten by @@ -21,55 +21,58 @@ Synopsis - Thank you for your interest in FreeBSD! The following chapter - covers various aspects of the FreeBSD Project, such as its history, + Thank you for your interest in &os;! The following chapter + covers various aspects of the &os; Project, such as its history, goals, development model, and so on. After reading this chapter, you will know: - How FreeBSD relates to other computer operating systems. + How &os; relates to other computer operating systems. + - The history of the FreeBSD Project. + The history of the &os; Project. + - The goals of the FreeBSD Project. + The goals of the &os; Project. + - The basics of the FreeBSD open-source development model. + The basics of the &os; open-source development model. + - And of course: where the name FreeBSD comes from. + And of course: where the name &os; comes + from. - - Welcome to FreeBSD! - 4.4BSD-Lite + Welcome to &os;! + 4.4BSD-Lite - FreeBSD is a 4.4BSD-Lite based operating system for + &os; is a 4.4BSD-Lite based operating system for Intel (x86 and &itanium;), AMD64, Alpha, Sun &ultrasparc; computers. Ports to other - architectures are also underway. - You can also - read about the history of FreeBSD, + architectures are also underway. You can also + read about the history of &os;, or the current release. If you are interested in contributing something to the Project (code, hardware, funding), see the Contributing to FreeBSD article. + url="&url.articles.contributing;/index.html">Contributing to &os; article. - What Can FreeBSD Do? + What Can &os; Do? - FreeBSD has many noteworthy features. Some of these - are: + &os; has many noteworthy features. Some of these >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Sep 4 20:28:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE6301065675; Thu, 4 Sep 2008 20:28:21 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A25D61065671 for ; Thu, 4 Sep 2008 20:28:21 +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 903C08FC23 for ; Thu, 4 Sep 2008 20:28:21 +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 m84KSLM5088903 for ; Thu, 4 Sep 2008 20:28:21 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m84KSLYS088901 for perforce@freebsd.org; Thu, 4 Sep 2008 20:28:21 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 4 Sep 2008 20:28:21 GMT Message-Id: <200809042028.m84KSLYS088901@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 149225 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Sep 2008 20:28:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=149225 Change 149225 by hselasky@hselasky_laptop001 on 2008/09/04 20:27:52 Fix spelling. Affected files ... .. //depot/projects/usb/src/share/man/man4/usb2_core.4#2 edit Differences ... ==== //depot/projects/usb/src/share/man/man4/usb2_core.4#2 (text+ko) ==== @@ -561,8 +561,8 @@ command on the STALL'ed endpoint. This flag can be changed during operation. .It Host Side Mode -Setting this flag will case a clear-stall control request to be -performed on the endpoint before the USB transfer is started. +Setting this flag will cause a clear-stall control request to be +executed on the endpoint before the USB transfer is started. .El .Pp If this flag is changed outside the USB callback function you have to From owner-p4-projects@FreeBSD.ORG Thu Sep 4 21:00:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DDEE51065686; Thu, 4 Sep 2008 21:00: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 9972D106567A; Thu, 4 Sep 2008 21:00:02 +0000 (UTC) (envelope-from remko@FreeBSD.org) Received: from websrv01.jr-hosting.nl (websrv01.jr-hosting.nl [78.47.69.233]) by mx1.freebsd.org (Postfix) with ESMTP id 580D18FC21; Thu, 4 Sep 2008 21:00:02 +0000 (UTC) (envelope-from remko@FreeBSD.org) Received: from [195.64.94.120] (helo=axantucar.local) by websrv01.jr-hosting.nl with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.69 (FreeBSD)) (envelope-from ) id 1KbLds-0001wk-5T; Thu, 04 Sep 2008 22:41:24 +0200 Message-ID: <48C047F0.7070204@FreeBSD.org> Date: Thu, 04 Sep 2008 22:41:20 +0200 From: Remko Lodder User-Agent: Thunderbird 2.0.0.16 (Macintosh/20080707) MIME-Version: 1.0 To: Rene Ladan References: <200809042017.m84KH9qq018610@repoman.freebsd.org> In-Reply-To: <200809042017.m84KH9qq018610@repoman.freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews Subject: Re: PERFORCE change 149224 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Sep 2008 21:00:03 -0000 Rene Ladan wrote: > http://perforce.freebsd.org/chv.cgi?CH=149224 > > Change 149224 by rene@rene_self on 2008/09/04 20:16:34 > > IFC (with some help from Remko) > \o/ nice work :) -- /"\ Best regards, | remko@FreeBSD.org \ / Remko Lodder | remko@EFnet X http://www.evilcoder.org/ | / \ ASCII Ribbon Campaign | Against HTML Mail and News From owner-p4-projects@FreeBSD.ORG Thu Sep 4 21:14:49 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A767C1065672; Thu, 4 Sep 2008 21:14:49 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 69A44106566C for ; Thu, 4 Sep 2008 21:14:49 +0000 (UTC) (envelope-from hselasky@c2i.net) Received: from swip.net (mailfe15.swip.net [212.247.155.193]) by mx1.freebsd.org (Postfix) with ESMTP id EF95B8FC1A for ; Thu, 4 Sep 2008 21:14:48 +0000 (UTC) (envelope-from hselasky@c2i.net) X-Cloudmark-Score: 0.000000 [] X-Cloudmark-Analysis: v=1.0 c=1 a=rQs1eURU-McA:10 a=7tteu2RL+pjC+YlG6ugHZw==:17 a=6I5d2MoRAAAA:8 a=nPoRBnEeJXXsaOSNeHIA:9 a=nlpiey0X5W9ZVxkMBngA:7 a=ti_CyjdFVwNPCLycfUjk0MFYiNoA:4 a=LY0hPdMaydYA:10 Received: from [85.19.218.24] (account mc467741@c2i.net [85.19.218.24] verified) by mailfe15.swip.net (CommuniGate Pro SMTP 5.2.6) with ESMTPA id 320154830 for perforce@freebsd.org; Thu, 04 Sep 2008 22:14:45 +0200 From: Hans Petter Selasky To: Perforce Change Reviews Date: Thu, 4 Sep 2008 22:16:34 +0200 User-Agent: KMail/1.9.7 References: <200809041952.m84JqiIF069451@repoman.freebsd.org> In-Reply-To: <200809041952.m84JqiIF069451@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200809042216.34878.hselasky@c2i.net> Cc: Subject: Re: PERFORCE change 149220 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Sep 2008 21:14:49 -0000 On Thursday 04 September 2008, Hans Petter Selasky wrote: > http://perforce.freebsd.org/chv.cgi?CH=149220 > > Change 149220 by hselasky@hselasky_laptop001 on 2008/09/04 19:52:38 > > > Fix MTP templates and add support for vendor specific USB descriptors. > > Affected files ... > > .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_handle_request.c#8 edit > .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_standard.h#7 edit > .. //depot/projects/usb/src/sys/dev/usb2/template/usb2_template.c#9 edit > .. //depot/projects/usb/src/sys/dev/usb2/template/usb2_template.h#4 edit > .. //depot/projects/usb/src/sys/dev/usb2/template/usb2_template_cdce.c#6 > edit .. > //depot/projects/usb/src/sys/dev/usb2/template/usb2_template_msc.c#5 edit > .. //depot/projects/usb/src/sys/dev/usb2/template/usb2_template_mtp.c#5 > edit > And also fix zero vendor ID and product ID. Not all operating systems like this. --HPS From owner-p4-projects@FreeBSD.ORG Fri Sep 5 00:30:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 564341065673; Fri, 5 Sep 2008 00:30: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 179CB106566C for ; Fri, 5 Sep 2008 00:30:03 +0000 (UTC) (envelope-from diego@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 04BBC8FC12 for ; Fri, 5 Sep 2008 00:30:03 +0000 (UTC) (envelope-from diego@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 m850U2IO014106 for ; Fri, 5 Sep 2008 00:30:02 GMT (envelope-from diego@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m850TQSt011141 for perforce@freebsd.org; Fri, 5 Sep 2008 00:29:26 GMT (envelope-from diego@FreeBSD.org) Date: Fri, 5 Sep 2008 00:29:26 GMT Message-Id: <200809050029.m850TQSt011141@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to diego@FreeBSD.org using -f From: Diego Giagio To: Perforce Change Reviews Cc: Subject: PERFORCE change 149232 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Sep 2008 00:30:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=149232 Change 149232 by diego@diego_black on 2008/09/05 00:28:40 IFC Affected files ... .. //depot/projects/soc2008/diego-audit/src/sbin/ipfw/ipfw.8#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/amd64/amd64/cpu_switch.S#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/amd64/amd64/machdep.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/amd64/ia32/ia32_signal.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/arm/at91/if_ate.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/boot/common/dev_net.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/boot/common/devopen.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/boot/powerpc/uboot/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/boot/powerpc/uboot/metadata.c#2 delete .. //depot/projects/soc2008/diego-audit/src/sys/boot/powerpc/uboot/start.S#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/boot/sparc64/loader/main.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/boot/uboot/common/Makefile.inc#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/boot/uboot/common/main.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/boot/uboot/common/metadata.c#1 branch .. //depot/projects/soc2008/diego-audit/src/sys/boot/uboot/lib/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/boot/uboot/lib/console.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/boot/uboot/lib/elf_freebsd.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/boot/uboot/lib/glue.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/boot/uboot/lib/glue.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/boot/uboot/lib/net.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/boot/uboot/lib/reboot.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/boot/uboot/lib/time.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/cam/scsi/scsi_da.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/cddl/compat/opensolaris/sys/cpuvar.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/compat/linprocfs/linprocfs.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/compat/linux/linux_getcwd.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/compat/linux/linux_misc.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/compat/ndis/subr_ndis.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/compat/svr4/svr4_fcntl.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/conf/files.mips#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/conf/files.sun4v#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/conf/options#8 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/COPYRIGHT#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/README#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/ah.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/ah_desc.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/ah_devid.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/ah_soc.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/alpha-elf.inc#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/alpha-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/ap30.hal.o.uu#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/ap30.inc#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/ap43.hal.o.uu#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/ap43.inc#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/ap51.hal.o.uu#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/ap51.inc#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/ap61.hal.o.uu#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/ap61.inc#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/armv4-be-elf.inc#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/armv4-le-elf.inc#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/i386-elf.inc#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/mips-be-elf.inc#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/mips-le-elf.inc#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/mips1-be-elf.inc#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/mips1-le-elf.inc#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/powerpc-be-elf.inc#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/sh4-le-elf.inc#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/sparc-be-elf.inc#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/sparc-be-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/sparc64-be-elf.inc#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/wackelf.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/x86_64-elf.inc#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/xscale-be-elf.inc#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/xscale-le-elf.inc#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/version.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/ata/ata-chipset.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/bce/if_bce.c#6 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/bce/if_bcereg.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/bm/if_bm.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/ciss/ciss.c#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/ciss/cissreg.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/cpuctl/cpuctl.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/cxgb/cxgb_ioctl.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/cxgb/cxgb_main.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/cxgb/cxgb_sge.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/cxgb/ulp/toecore/toedev.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/dc/if_dc.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/dc/if_dcreg.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/drm_drv.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/drm_lock.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/e1000/if_igb.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/e1000/if_igb.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/ex/if_ex_pccard.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/ic/ns16550.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/ipmi/ipmi.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/ipmi/ipmi_kcs.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/ipmi/ipmivars.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/k8temp/k8temp.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/md/md.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/mii/e1000phy.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/mii/miidevs#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/pccard/pccard_cis.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/pccard/pccarddevs#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/pci/pci_pci.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/ppc/ppc_isa.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/syscons/syscons.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/usb/ehci_pci.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/usb/ohci_pci.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/usb/ufoma.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/usb/uipaq.c#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/usb/umodem.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/usb/uplcom.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/usb/uvscom.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/wi/if_wi_pccard.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/xen/blkback/blkback.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/cd9660/cd9660_vnops.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/coda/coda_venus.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/coda/coda_venus.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/coda/coda_vnops.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/devfs/devfs_vnops.c#7 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/fdescfs/fdesc_vnops.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/hpfs/hpfs_vnops.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/msdosfs/msdosfs_fat.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/msdosfs/msdosfs_vnops.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/nwfs/nwfs_io.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/nwfs/nwfs_vnops.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/portalfs/portal_vnops.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/smbfs/smbfs_io.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/smbfs/smbfs_node.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/smbfs/smbfs_vnops.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/tmpfs/tmpfs.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/tmpfs/tmpfs_fifoops.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/tmpfs/tmpfs_fifoops.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/tmpfs/tmpfs_subr.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/tmpfs/tmpfs_vfsops.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/tmpfs/tmpfs_vnops.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/tmpfs/tmpfs_vnops.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/unionfs/union_subr.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/unionfs/union_vfsops.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/unionfs/union_vnops.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/geom/journal/g_journal.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/gnu/fs/ext2fs/ext2_vnops.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/i386/cpufreq/powernow.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/i386/cpufreq/smist.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/i386/ibcs2/imgact_coff.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/i386/xen/locore.s#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/i386/xen/xen_machdep.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/imgact_shell.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/kern_exec.c#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/kern_exit.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/kern_linker.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/kern_mib.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/kern_proc.c#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/kern_sig.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/kern_subr.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/subr_smp.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/subr_witness.c#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/tty.c#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/tty_compat.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/tty_inq.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/tty_outq.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/tty_pts.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/tty_ttydisc.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/uipc_mqueue.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/uipc_socket.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/vfs_default.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/vfs_lookup.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/vfs_mount.c#6 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/vfs_subr.c#7 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/vfs_syscalls.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/vfs_vnops.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/vnode_if.src#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/mips/adm5120/std.adm5120#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/mips/conf/ADM5120#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/mips/conf/IDT#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/mips/conf/MALTA#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/mips/conf/SENTRY5#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/mips/idt/std.idt#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/mips/malta/files.malta#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/mips/malta/std.malta#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/mips/mips/in_cksum.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/mips/mips/intr_machdep.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/aha/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/ahb/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/an/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/ar/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/ath_rate_amrr/Makefile#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/ath_rate_onoe/Makefile#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/ath_rate_sample/Makefile#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/ce/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/cp/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/ctau/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/cx/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/digi/digi/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/fatm/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/hatm/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/hifn/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/if_tap/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/linux/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/netgraph/sync_ar/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/netgraph/sync_sr/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/patm/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/pf/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/pflog/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/rp/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/safe/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/sppp/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/sr/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/svr4/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/trm/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/ubsec/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/usb/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/wi/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/wlan/Makefile#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/wlan_acl/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/wlan_amrr/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/wlan_ccmp/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/wlan_rssadapt/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/wlan_tkip/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/wlan_wep/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/wlan_xauth/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/net/bpf.c#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/net/bpf_filter.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/net/bpf_jitter.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/net/ethernet.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/net/if.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/net/if_ethersubr.c#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/net/if_vlan.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/net/route.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/net80211/ieee80211.c#6 integrate .. //depot/projects/soc2008/diego-audit/src/sys/net80211/ieee80211_crypto_tkip.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netgraph/ng_bpf.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netgraph/ng_pipe.c#1 branch .. //depot/projects/soc2008/diego-audit/src/sys/netgraph/ng_pipe.h#1 branch .. //depot/projects/soc2008/diego-audit/src/sys/netinet/if_ether.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/ip_fw2.c#11 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/ip_options.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/libalias/alias_db.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_indata.c#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_lock_bsd.h#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_output.c#6 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_pcb.c#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_sysctl.h#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_timer.c#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_timer.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_var.h#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctputil.c#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/tcp_hostcache.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/tcp_offload.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/toedev.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet6/icmp6.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet6/mld6.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet6/udp6_usrreq.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/nfs4client/nfs4_vnops.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/nfsclient/nfs_bio.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/nfsclient/nfs_vfsops.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/nfsclient/nfs_vnops.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/nfsserver/nfs_serv.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/nfsserver/nfs_srvsubs.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/powerpc/aim/clock.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/powerpc/aim/interrupt.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/powerpc/aim/machdep.c#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/powerpc/aim/mmu_oea.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/powerpc/aim/vm_machdep.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/powerpc/booke/pmap.c#6 integrate .. //depot/projects/soc2008/diego-audit/src/sys/powerpc/include/cpufunc.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/powerpc/powerpc/db_interface.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/powerpc/powerpc/pmap_dispatch.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/security/audit/audit_arg.c#9 integrate .. //depot/projects/soc2008/diego-audit/src/sys/security/audit/audit_syscalls.c#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/security/audit/audit_worker.c#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/security/mac_bsdextended/mac_bsdextended.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/security/mac_lomac/mac_lomac.c#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/conf/GENERIC#6 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/include/cache.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/include/clock.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/include/cpu.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/include/cpufunc.h#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/include/dcr.h#1 branch .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/include/pcpu.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/include/smp.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/include/tick.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/include/trap.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/include/tte.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/include/ver.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/sparc64/autoconf.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/sparc64/cache.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/sparc64/cheetah.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/sparc64/clock.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/sparc64/exception.S#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/sparc64/genassym.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/sparc64/locore.S#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/sparc64/machdep.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/sparc64/mp_exception.S#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/sparc64/mp_locore.S#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/sparc64/mp_machdep.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/sparc64/pmap.c#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/sparc64/spitfire.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/sparc64/tick.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/sparc64/trap.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sun4v/sun4v/clock.c#1 branch .. //depot/projects/soc2008/diego-audit/src/sys/sys/ioccom.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sys/mount.h#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sys/tty.h#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sys/ttydevsw.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sys/ttydisc.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sys/ttyqueue.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sys/vnode.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/ufs/ffs/ffs_alloc.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/ufs/ffs/ffs_extern.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/ufs/ffs/ffs_snapshot.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/ufs/ffs/ffs_softdep.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/ufs/ffs/ffs_vfsops.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/ufs/ffs/ffs_vnops.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/ufs/ufs/ufs_extattr.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/ufs/ufs/ufs_vfsops.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/ufs/ufs/ufs_vnops.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/vm/swap_pager.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/vm/vm_mmap.c#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/vm/vnode_pager.c#5 integrate Differences ... ==== //depot/projects/soc2008/diego-audit/src/sbin/ipfw/ipfw.8#2 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.215 2008/08/01 23:31:28 julian Exp $ +.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.216 2008/08/27 15:30:09 ivoras Exp $ .\" .Dd November 26, 2007 .Dt IPFW 8 @@ -1850,7 +1850,7 @@ .Em pipes can be used to set hard limits to the bandwidth that a flow can use, whereas .Em queues -can be used to determine how different flow share the available bandwidth. +can be used to determine how different flows share the available bandwidth. .Pp The .Em pipe ==== //depot/projects/soc2008/diego-audit/src/sys/amd64/amd64/cpu_switch.S#3 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.162 2008/07/30 11:30:55 kib Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.163 2008/09/02 17:52:11 kib Exp $ */ #include @@ -109,8 +109,24 @@ movq %rsp,PCB_RSP(%r8) movq %rbx,PCB_RBX(%r8) movq %rax,PCB_RIP(%r8) - movq PCB_FSBASE(%r8),%r9 - movq PCB_GSBASE(%r8),%r10 + + /* + * Reread fs and gs bases. Explicit fs segment register load + * by the usermode code may change actual fs base without + * updating pcb_{fs,gs}base. + * + * %rdx still contains the mtx, save %rdx around rdmsr. + */ + movq %rdx,%r11 + movl $MSR_FSBASE,%ecx + rdmsr + shlq $32,%rdx + leaq (%rax,%rdx),%r9 + movl $MSR_KGSBASE,%ecx + rdmsr + shlq $32,%rdx + leaq (%rax,%rdx),%r10 + movq %r11,%rdx testl $PCB_32BIT,PCB_FLAGS(%r8) jnz store_seg ==== //depot/projects/soc2008/diego-audit/src/sys/amd64/amd64/machdep.c#4 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.687 2008/07/09 19:44:37 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.688 2008/09/02 17:52:11 kib Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -734,6 +734,7 @@ pcb->pcb_fsbase = 0; pcb->pcb_gsbase = 0; critical_exit(); + pcb->pcb_flags &= ~(PCB_32BIT | PCB_GS32BIT); load_ds(_udatasel); load_es(_udatasel); load_fs(_udatasel); ==== //depot/projects/soc2008/diego-audit/src/sys/amd64/ia32/ia32_signal.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.18 2008/07/30 11:30:55 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.19 2008/09/02 17:52:11 kib Exp $"); #include "opt_compat.h" @@ -742,5 +742,6 @@ /* Return via doreti so that we can change to a different %cs */ pcb->pcb_flags |= PCB_FULLCTX | PCB_32BIT; + pcb->pcb_flags &= ~PCB_GS32BIT; td->td_retval[1] = 0; } ==== //depot/projects/soc2008/diego-audit/src/sys/arm/at91/if_ate.c#3 (text) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.24 2008/06/09 21:51:48 wkoszek Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.28 2008/08/31 18:20:01 imp Exp $"); #include #include @@ -170,7 +170,8 @@ struct sysctl_ctx_list *sctx; struct sysctl_oid *soid; int err; - u_char eaddr[6]; + u_char eaddr[ETHER_ADDR_LEN]; + uint32_t rnd; sc->dev = dev; err = ate_activate(dev); @@ -179,7 +180,7 @@ sc->use_rmii = (RD4(sc, ETH_CFG) & ETH_CFG_RMII) == ETH_CFG_RMII; - /*Sysctls*/ + /* Sysctls */ sctx = device_get_sysctl_ctx(dev); soid = device_get_sysctl_tree(dev); SYSCTL_ADD_UINT(sctx, SYSCTL_CHILDREN(soid), OID_AUTO, "rmii", @@ -191,8 +192,25 @@ callout_init_mtx(&sc->tick_ch, &sc->sc_mtx, 0); if ((err = ate_get_mac(sc, eaddr)) != 0) { - device_printf(dev, "No MAC address set\n"); - goto out; + /* + * No MAC address configured. Generate the random one. + */ + if (bootverbose) + device_printf(dev, + "Generating random ethernet address.\n"); + rnd = arc4random(); + + /* + * Set OUI to convenient locally assigned address. 'b' + * is 0x62, which has the locally assigned bit set, and + * the broadcast/multicast bit clear. + */ + eaddr[0] = 'b'; + eaddr[1] = 's'; + eaddr[2] = 'd'; + eaddr[3] = (rnd >> 16) & 0xff; + eaddr[4] = (rnd >> 8) & 0xff; + eaddr[5] = rnd & 0xff; } ate_set_mac(sc, eaddr); @@ -586,24 +604,29 @@ static int ate_get_mac(struct ate_softc *sc, u_char *eaddr) { + bus_size_t sa_low_reg[] = { ETH_SA1L, ETH_SA2L, ETH_SA3L, ETH_SA4L }; + bus_size_t sa_high_reg[] = { ETH_SA1H, ETH_SA2H, ETH_SA3H, ETH_SA4H }; uint32_t low, high; + int i; /* * The boot loader setup the MAC with an address, if one is set in - * the loader. The TSC loader will also set the MAC address in a - * similar way. Grab the MAC address from the SA1[HL] registers. + * the loader. Grab one MAC address from the SA[1-4][HL] registers. */ - low = RD4(sc, ETH_SA1L); - high = RD4(sc, ETH_SA1H); - if ((low | (high & 0xffff)) == 0) - return (ENXIO); - eaddr[0] = low & 0xff; - eaddr[1] = (low >> 8) & 0xff; - eaddr[2] = (low >> 16) & 0xff; - eaddr[3] = (low >> 24) & 0xff; - eaddr[4] = high & 0xff; - eaddr[5] = (high >> 8) & 0xff; - return (0); + for (i = 0; i < 4; i++) { + low = RD4(sc, sa_low_reg[i]); + high = RD4(sc, sa_high_reg[i]); + if ((low | (high & 0xffff)) != 0) { + eaddr[0] = low & 0xff; + eaddr[1] = (low >> 8) & 0xff; + eaddr[2] = (low >> 16) & 0xff; + eaddr[3] = (low >> 24) & 0xff; + eaddr[4] = high & 0xff; + eaddr[5] = (high >> 8) & 0xff; + return (0); + } + } + return (ENXIO); } static void ==== //depot/projects/soc2008/diego-audit/src/sys/boot/common/dev_net.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/* * $NetBSD: dev_net.c,v 1.12 1997/12/10 20:38:37 gwr Exp $ */ @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/common/dev_net.c,v 1.16 2008/03/12 16:01:33 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/common/dev_net.c,v 1.17 2008/09/03 17:41:44 raj Exp $"); /*- * This module implements a "raw device" interface suitable for @@ -90,20 +90,21 @@ static int net_getparams(int sock); struct devsw netdev = { - "net", - DEVT_NET, - net_init, - net_strategy, - net_open, - net_close, - noioctl, - net_print + "net", + DEVT_NET, + net_init, + net_strategy, + net_open, + net_close, + noioctl, + net_print }; int net_init(void) { - return 0; + + return (0); } /* @@ -114,75 +115,74 @@ int net_open(struct open_file *f, ...) { - va_list args; - char *devname; /* Device part of file name (or NULL). */ - int error = 0; + va_list args; + char *devname; /* Device part of file name (or NULL). */ + int error = 0; - va_start(args, f); - devname = va_arg(args, char*); - va_end(args); + va_start(args, f); + devname = va_arg(args, char*); + va_end(args); - /* On first open, do netif open, mount, etc. */ - if (netdev_opens == 0) { - /* Find network interface. */ - if (netdev_sock < 0) { - netdev_sock = netif_open(devname); - if (netdev_sock < 0) { - printf("net_open: netif_open() failed\n"); - return (ENXIO); - } - if (debug) - printf("net_open: netif_open() succeeded\n"); - } - if (rootip.s_addr == 0) { - /* Get root IP address, and path, etc. */ - error = net_getparams(netdev_sock); - if (error) { + /* On first open, do netif open, mount, etc. */ + if (netdev_opens == 0) { + /* Find network interface. */ + if (netdev_sock < 0) { + netdev_sock = netif_open(devname); + if (netdev_sock < 0) { + printf("net_open: netif_open() failed\n"); + return (ENXIO); + } + if (debug) + printf("net_open: netif_open() succeeded\n"); + } + if (rootip.s_addr == 0) { + /* Get root IP address, and path, etc. */ + error = net_getparams(netdev_sock); + if (error) { /* getparams makes its own noise */ - netif_close(netdev_sock); - netdev_sock = -1; - return (error); - } + netif_close(netdev_sock); + netdev_sock = -1; + return (error); + } + } } - } - netdev_opens++; - f->f_devdata = &netdev_sock; - return (error); + netdev_opens++; + f->f_devdata = &netdev_sock; + return (error); } int -net_close(f) - struct open_file *f; +net_close(struct open_file *f) { - #ifdef NETIF_DEBUG - if (debug) - printf("net_close: opens=%d\n", netdev_opens); + if (debug) + printf("net_close: opens=%d\n", netdev_opens); #endif - /* On last close, do netif close, etc. */ - f->f_devdata = NULL; - /* Extra close call? */ - if (netdev_opens <= 0) + /* On last close, do netif close, etc. */ + f->f_devdata = NULL; + /* Extra close call? */ + if (netdev_opens <= 0) + return (0); + netdev_opens--; + /* Not last close? */ + if (netdev_opens > 0) + return(0); + rootip.s_addr = 0; + if (netdev_sock >= 0) { + if (debug) + printf("net_close: calling netif_close()\n"); + netif_close(netdev_sock); + netdev_sock = -1; + } return (0); - netdev_opens--; - /* Not last close? */ - if (netdev_opens > 0) - return(0); - rootip.s_addr = 0; - if (netdev_sock >= 0) { - if (debug) - printf("net_close: calling netif_close()\n"); - netif_close(netdev_sock); - netdev_sock = -1; - } - return (0); } int net_strategy() { - return EIO; + + return (EIO); } #define SUPPORT_BOOTP @@ -205,106 +205,118 @@ extern n_long ip_convertaddr(char *p); static int -net_getparams(sock) - int sock; +net_getparams(int sock) { - char buf[MAXHOSTNAMELEN]; - char temp[FNAME_SIZE]; - struct iodesc *d; - int i; - n_long smask; + char buf[MAXHOSTNAMELEN]; + char temp[FNAME_SIZE]; + struct iodesc *d; + int i; + n_long smask; #ifdef SUPPORT_BOOTP - /* - * Try to get boot info using BOOTP. If we succeed, then - * the server IP address, gateway, and root path will all - * be initialized. If any remain uninitialized, we will - * use RARP and RPC/bootparam (the Sun way) to get them. - */ - if (try_bootp) - bootp(sock, BOOTP_NONE); - if (myip.s_addr != 0) - goto exit; - if (debug) - printf("net_open: BOOTP failed, trying RARP/RPC...\n"); + /* + * Try to get boot info using BOOTP. If we succeed, then + * the server IP address, gateway, and root path will all + * be initialized. If any remain uninitialized, we will + * use RARP and RPC/bootparam (the Sun way) to get them. + */ + if (try_bootp) + bootp(sock, BOOTP_NONE); + if (myip.s_addr != 0) + goto exit; + if (debug) + printf("net_open: BOOTP failed, trying RARP/RPC...\n"); #endif - /* - * Use RARP to get our IP address. This also sets our - * netmask to the "natural" default for our address. - */ - if (rarp_getipaddress(sock)) { - printf("net_open: RARP failed\n"); - return (EIO); - } - printf("net_open: client addr: %s\n", inet_ntoa(myip)); + /* + * Use RARP to get our IP address. This also sets our + * netmask to the "natural" default for our address. + */ + if (rarp_getipaddress(sock)) { + printf("net_open: RARP failed\n"); + return (EIO); + } + printf("net_open: client addr: %s\n", inet_ntoa(myip)); - /* Get our hostname, server IP address, gateway. */ - if (bp_whoami(sock)) { - printf("net_open: bootparam/whoami RPC failed\n"); - return (EIO); - } - if (debug) - printf("net_open: client name: %s\n", hostname); + /* Get our hostname, server IP address, gateway. */ + if (bp_whoami(sock)) { + printf("net_open: bootparam/whoami RPC failed\n"); + return (EIO); + } + if (debug) + printf("net_open: client name: %s\n", hostname); - /* - * Ignore the gateway from whoami (unreliable). - * Use the "gateway" parameter instead. - */ - smask = 0; - gateip.s_addr = 0; - if (bp_getfile(sock, "gateway", &gateip, buf) == 0) { - /* Got it! Parse the netmask. */ - smask = ip_convertaddr(buf); - } - if (smask) { - netmask = smask; - if (debug) - printf("net_open: subnet mask: %s\n", intoa(netmask)); - } - if (gateip.s_addr && debug) - printf("net_open: net gateway: %s\n", inet_ntoa(gateip)); + /* + * Ignore the gateway from whoami (unreliable). + * Use the "gateway" parameter instead. + */ + smask = 0; + gateip.s_addr = 0; + if (bp_getfile(sock, "gateway", &gateip, buf) == 0) { + /* Got it! Parse the netmask. */ + smask = ip_convertaddr(buf); + } + if (smask) { + netmask = smask; + if (debug) + printf("net_open: subnet mask: %s\n", intoa(netmask)); + } + if (gateip.s_addr && debug) + printf("net_open: net gateway: %s\n", inet_ntoa(gateip)); - /* Get the root server and pathname. */ - if (bp_getfile(sock, "root", &rootip, rootpath)) { - printf("net_open: bootparam/getfile RPC failed\n"); - return (EIO); - } - exit: - /* - * If present, strip the server's address off of the rootpath - * before passing it along. This allows us to be compatible with - * the kernel's diskless (BOOTP_NFSROOT) booting conventions - */ - for (i = 0; rootpath[i] != '\0' && i < FNAME_SIZE; i++) - if (rootpath[i] == ':') - break; - if (i && i != FNAME_SIZE && rootpath[i] == ':') { - rootpath[i++] = '\0'; - if (inet_addr(&rootpath[0]) != INADDR_NONE) - rootip.s_addr = inet_addr(&rootpath[0]); - bcopy(&rootpath[i], &temp[0], strlen(&rootpath[i])+1); - bcopy(&temp[0], &rootpath[0], strlen(&rootpath[i])+1); - } - if (debug) { - printf("net_open: server addr: %s\n", inet_ntoa(rootip)); - printf("net_open: server path: %s\n", rootpath); - } + /* Get the root server and pathname. */ + if (bp_getfile(sock, "root", &rootip, rootpath)) { + printf("net_open: bootparam/getfile RPC failed\n"); + return (EIO); + } +exit: + /* + * If present, strip the server's address off of the rootpath + * before passing it along. This allows us to be compatible with + * the kernel's diskless (BOOTP_NFSROOT) booting conventions + */ + for (i = 0; rootpath[i] != '\0' && i < FNAME_SIZE; i++) + if (rootpath[i] == ':') + break; + if (i && i != FNAME_SIZE && rootpath[i] == ':') { + rootpath[i++] = '\0'; + if (inet_addr(&rootpath[0]) != INADDR_NONE) + rootip.s_addr = inet_addr(&rootpath[0]); + bcopy(&rootpath[i], &temp[0], strlen(&rootpath[i])+1); + bcopy(&temp[0], &rootpath[0], strlen(&rootpath[i])+1); + } + if (debug) { + printf("net_open: server addr: %s\n", inet_ntoa(rootip)); + printf("net_open: server path: %s\n", rootpath); + } - d = socktodesc(sock); - sprintf(temp, "%6D", d->myea, ":"); - setenv("boot.netif.ip", inet_ntoa(myip), 1); - setenv("boot.netif.netmask", intoa(netmask), 1); - setenv("boot.netif.gateway", inet_ntoa(gateip), 1); - setenv("boot.netif.hwaddr", temp, 1); - setenv("boot.nfsroot.server", inet_ntoa(rootip), 1); - setenv("boot.nfsroot.path", rootpath, 1); + d = socktodesc(sock); + sprintf(temp, "%6D", d->myea, ":"); + setenv("boot.netif.ip", inet_ntoa(myip), 1); + setenv("boot.netif.netmask", intoa(netmask), 1); + setenv("boot.netif.gateway", inet_ntoa(gateip), 1); + setenv("boot.netif.hwaddr", temp, 1); + setenv("boot.nfsroot.server", inet_ntoa(rootip), 1); + setenv("boot.nfsroot.path", rootpath, 1); - return (0); + return (0); } static void net_print(int verbose) { - return; + struct netif_driver *drv; + int i, d, cnt; + + cnt = 0; + for (d = 0; netif_drivers[d]; d++) { + drv = netif_drivers[d]; + for (i = 0; i < drv->netif_nifs; i++) { + printf("\t%s%d:", "net", cnt++); + if (verbose) + printf(" (%s%d)", drv->netif_bname, + drv->netif_ifs[i].dif_unit); + } + } + printf("\n"); } ==== //depot/projects/soc2008/diego-audit/src/sys/boot/common/devopen.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/common/devopen.c,v 1.5 2006/11/02 00:02:22 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/common/devopen.c,v 1.6 2008/09/03 17:41:44 raj Exp $"); #include #include @@ -35,32 +35,33 @@ int devopen(struct open_file *f, const char *fname, const char **file) { - struct devdesc *dev; - int result; + struct devdesc *dev; + int result; - result = archsw.arch_getdev((void **)&dev, fname, file); - if (result) - return (result); + result = archsw.arch_getdev((void **)&dev, fname, file); + if (result) + return (result); - /* point to device-specific data so that device open can use it */ - f->f_devdata = dev; - result = dev->d_dev->dv_open(f, dev); - if (result != 0) { - f->f_devdata = NULL; - free(dev); - return (result); - } + /* point to device-specific data so that device open can use it */ + f->f_devdata = dev; + result = dev->d_dev->dv_open(f, dev); + if (result != 0) { + f->f_devdata = NULL; + free(dev); + return (result); + } - /* reference the devsw entry from the open_file structure */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Sep 5 04:42:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 01EC11065672; Fri, 5 Sep 2008 04:42:21 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B938F106564A for ; Fri, 5 Sep 2008 04:42:19 +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 A9D118FC1A for ; Fri, 5 Sep 2008 04:42:19 +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 m854gJaI051073 for ; Fri, 5 Sep 2008 04:42:19 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m854gJwN051063 for perforce@freebsd.org; Fri, 5 Sep 2008 04:42:19 GMT (envelope-from gonzo@FreeBSD.org) Date: Fri, 5 Sep 2008 04:42:19 GMT Message-Id: <200809050442.m854gJwN051063@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 149237 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Sep 2008 04:42:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=149237 Change 149237 by gonzo@gonzo_jeeves on 2008/09/05 04:41:55 Move struct pmap and friends out of _KERNEL-only scope. Fixes libkvm breakage. Affected files ... .. //depot/projects/mips2/src/sys/mips/include/pmap.h#15 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/include/pmap.h#15 (text+ko) ==== @@ -46,6 +46,7 @@ #define _MACHINE_PMAP_H_ #include +#include /* * Copyright (c) 1987 Carnegie-Mellon University @@ -104,11 +105,9 @@ #define KPTDI (VM_MIN_KERNEL_ADDRESS >> SEGSHIFT) #define NUSERPGTBLS (VM_MAXUSER_ADDRESS >> SEGSHIFT) -#ifdef _KERNEL #ifndef LOCORE #include -#include #include #include @@ -146,6 +145,8 @@ typedef struct pmap *pmap_t; +#ifdef _KERNEL + pt_entry_t *pmap_pte(pmap_t, vm_offset_t); pd_entry_t pmap_segmap(pmap_t pmap, vm_offset_t va); vm_offset_t pmap_kextract(vm_offset_t va); From owner-p4-projects@FreeBSD.ORG Fri Sep 5 17:59:07 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 99E2710656A7; Fri, 5 Sep 2008 17:59:07 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5DAA310656A3 for ; Fri, 5 Sep 2008 17:59:07 +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 4BD588FC1C for ; Fri, 5 Sep 2008 17:59:07 +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 m85Hx7TE072535 for ; Fri, 5 Sep 2008 17:59:07 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m85Hx7de072533 for perforce@freebsd.org; Fri, 5 Sep 2008 17:59:07 GMT (envelope-from gonzo@FreeBSD.org) Date: Fri, 5 Sep 2008 17:59:07 GMT Message-Id: <200809051759.m85Hx7de072533@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 149267 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Sep 2008 17:59:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=149267 Change 149267 by gonzo@gonzo_jeeves on 2008/09/05 17:58:25 Add MIPS to the list of axceptions along with ARM and PowerPC. Affected files ... .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c#2 edit Differences ... ==== //depot/projects/mips2/src/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)); From owner-p4-projects@FreeBSD.ORG Fri Sep 5 18:43:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CC2CA106567E; Fri, 5 Sep 2008 18:43: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 8EAD91065678 for ; Fri, 5 Sep 2008 18:43:11 +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 7A2868FC1F for ; Fri, 5 Sep 2008 18:43:11 +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 m85IhB37079419 for ; Fri, 5 Sep 2008 18:43:11 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m85IhBKo079375 for perforce@freebsd.org; Fri, 5 Sep 2008 18:43:11 GMT (envelope-from gonzo@FreeBSD.org) Date: Fri, 5 Sep 2008 18:43:11 GMT Message-Id: <200809051843.m85IhBKo079375@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 149271 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Sep 2008 18:43:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=149271 Change 149271 by gonzo@gonzo_jeeves on 2008/09/05 18:42:52 IFC @149270 Affected files ... .. //depot/projects/mips2/src/UPDATING#19 integrate .. //depot/projects/mips2/src/contrib/gdtoa/README#3 integrate .. //depot/projects/mips2/src/contrib/gdtoa/dtoa.c#3 integrate .. //depot/projects/mips2/src/contrib/gdtoa/gdtoa.h#3 integrate .. //depot/projects/mips2/src/contrib/gdtoa/gdtoaimp.h#4 integrate .. //depot/projects/mips2/src/contrib/gdtoa/gethex.c#4 integrate .. //depot/projects/mips2/src/contrib/gdtoa/strtoIg.c#3 integrate .. //depot/projects/mips2/src/contrib/gdtoa/strtod.c#4 integrate .. //depot/projects/mips2/src/contrib/gdtoa/strtodg.c#3 integrate .. //depot/projects/mips2/src/contrib/gdtoa/strtof.c#4 integrate .. //depot/projects/mips2/src/contrib/gdtoa/test/README#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/test/f.out#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/test/getround.c#3 integrate .. //depot/projects/mips2/src/contrib/gdtoa/test/xsum0.out#3 integrate .. //depot/projects/mips2/src/contrib/gdtoa/xsum0.out#3 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_entry_link_resolver.c#3 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_write_disk.3#4 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_write_disk.c#12 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_write_disk.c#8 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_write_disk_hardlink.c#5 integrate .. //depot/projects/mips2/src/lib/librpcsec_gss/svc_rpcsec_gss.c#2 integrate .. //depot/projects/mips2/src/lib/libstand/stand.h#3 integrate .. //depot/projects/mips2/src/lib/libstand/ufs.c#3 integrate .. //depot/projects/mips2/src/lib/libstand/zalloc_malloc.c#2 integrate .. //depot/projects/mips2/src/libexec/rtld-elf/rtld.c#9 integrate .. //depot/projects/mips2/src/share/man/man4/Makefile#21 integrate .. //depot/projects/mips2/src/share/man/man4/pts.4#2 integrate .. //depot/projects/mips2/src/share/man/man9/CTASSERT.9#2 integrate .. //depot/projects/mips2/src/sys/boot/common/dev_net.c#3 integrate .. //depot/projects/mips2/src/sys/boot/common/devopen.c#3 integrate .. //depot/projects/mips2/src/sys/boot/powerpc/uboot/Makefile#2 integrate .. //depot/projects/mips2/src/sys/boot/powerpc/uboot/metadata.c#3 delete .. //depot/projects/mips2/src/sys/boot/powerpc/uboot/start.S#2 integrate .. //depot/projects/mips2/src/sys/boot/sparc64/loader/main.c#5 integrate .. //depot/projects/mips2/src/sys/boot/uboot/common/Makefile.inc#2 integrate .. //depot/projects/mips2/src/sys/boot/uboot/common/main.c#3 integrate .. //depot/projects/mips2/src/sys/boot/uboot/common/metadata.c#1 branch .. //depot/projects/mips2/src/sys/boot/uboot/lib/Makefile#3 integrate .. //depot/projects/mips2/src/sys/boot/uboot/lib/console.c#3 integrate .. //depot/projects/mips2/src/sys/boot/uboot/lib/elf_freebsd.c#3 integrate .. //depot/projects/mips2/src/sys/boot/uboot/lib/glue.c#4 integrate .. //depot/projects/mips2/src/sys/boot/uboot/lib/glue.h#3 integrate .. //depot/projects/mips2/src/sys/boot/uboot/lib/net.c#4 integrate .. //depot/projects/mips2/src/sys/boot/uboot/lib/reboot.c#3 integrate .. //depot/projects/mips2/src/sys/boot/uboot/lib/time.c#3 integrate .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#2 integrate .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#3 integrate .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#4 integrate .. //depot/projects/mips2/src/sys/conf/files.sun4v#6 integrate .. //depot/projects/mips2/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#4 integrate .. //depot/projects/mips2/src/sys/dev/ata/ata-chipset.c#18 integrate .. //depot/projects/mips2/src/sys/dev/ata/ata-pci.h#13 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/cxgb_main.c#17 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#2 integrate .. //depot/projects/mips2/src/sys/dev/k8temp/k8temp.c#4 integrate .. //depot/projects/mips2/src/sys/dev/mii/e1000phy.c#6 integrate .. //depot/projects/mips2/src/sys/dev/mii/miidevs#12 integrate .. //depot/projects/mips2/src/sys/dev/pci/pci_pci.c#6 integrate .. //depot/projects/mips2/src/sys/dev/usb/if_zyd.c#8 integrate .. //depot/projects/mips2/src/sys/dev/usb/usbdevs#20 integrate .. //depot/projects/mips2/src/sys/fs/tmpfs/tmpfs.h#6 integrate .. //depot/projects/mips2/src/sys/fs/tmpfs/tmpfs_fifoops.c#2 integrate .. //depot/projects/mips2/src/sys/fs/tmpfs/tmpfs_fifoops.h#2 integrate .. //depot/projects/mips2/src/sys/fs/tmpfs/tmpfs_subr.c#9 integrate .. //depot/projects/mips2/src/sys/fs/tmpfs/tmpfs_vfsops.c#10 integrate .. //depot/projects/mips2/src/sys/fs/tmpfs/tmpfs_vnops.c#12 integrate .. //depot/projects/mips2/src/sys/fs/tmpfs/tmpfs_vnops.h#2 integrate .. //depot/projects/mips2/src/sys/geom/part/g_part.c#10 integrate .. //depot/projects/mips2/src/sys/geom/part/g_part.h#9 integrate .. //depot/projects/mips2/src/sys/geom/part/g_part_gpt.c#8 integrate .. //depot/projects/mips2/src/sys/i386/include/pmc_mdep.h#3 integrate .. //depot/projects/mips2/src/sys/i386/xen/locore.s#2 integrate .. //depot/projects/mips2/src/sys/kern/kern_proc.c#15 integrate .. //depot/projects/mips2/src/sys/kern/kern_resource.c#9 integrate .. //depot/projects/mips2/src/sys/kern/tty.c#10 integrate .. //depot/projects/mips2/src/sys/kern/tty_compat.c#3 integrate .. //depot/projects/mips2/src/sys/kern/tty_pts.c#6 integrate .. //depot/projects/mips2/src/sys/kern/uipc_mbuf.c#9 integrate .. //depot/projects/mips2/src/sys/kern/uipc_mqueue.c#8 integrate .. //depot/projects/mips2/src/sys/kern/vfs_mount.c#18 integrate .. //depot/projects/mips2/src/sys/mips/adm5120/std.adm5120#5 integrate .. //depot/projects/mips2/src/sys/mips/conf/ADM5120#7 integrate .. //depot/projects/mips2/src/sys/mips/conf/IDT#10 integrate .. //depot/projects/mips2/src/sys/mips/conf/MALTA#20 integrate .. //depot/projects/mips2/src/sys/mips/conf/SENTRY5#12 integrate .. //depot/projects/mips2/src/sys/mips/idt/std.idt#3 integrate .. //depot/projects/mips2/src/sys/mips/malta/files.malta#2 integrate .. //depot/projects/mips2/src/sys/mips/malta/std.malta#3 integrate .. //depot/projects/mips2/src/sys/mips/mips/in_cksum.c#3 integrate .. //depot/projects/mips2/src/sys/mips/mips/intr_machdep.c#6 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211.c#11 integrate .. //depot/projects/mips2/src/sys/netgraph/ng_pipe.c#1 branch .. //depot/projects/mips2/src/sys/netgraph/ng_pipe.h#1 branch .. //depot/projects/mips2/src/sys/netinet/if_ether.c#10 integrate .. //depot/projects/mips2/src/sys/netinet/ip_fw2.c#14 integrate .. //depot/projects/mips2/src/sys/netinet6/icmp6.c#10 integrate .. //depot/projects/mips2/src/sys/netinet6/mld6.c#7 integrate .. //depot/projects/mips2/src/sys/security/audit/audit_syscalls.c#11 integrate .. //depot/projects/mips2/src/sys/sparc64/conf/GENERIC#14 integrate .. //depot/projects/mips2/src/sys/sparc64/include/clock.h#4 integrate .. //depot/projects/mips2/src/sys/sparc64/include/cpu.h#2 integrate .. //depot/projects/mips2/src/sys/sparc64/include/cpufunc.h#3 integrate .. //depot/projects/mips2/src/sys/sparc64/include/dcr.h#1 branch .. //depot/projects/mips2/src/sys/sparc64/include/pcpu.h#6 integrate .. //depot/projects/mips2/src/sys/sparc64/include/smp.h#4 integrate .. //depot/projects/mips2/src/sys/sparc64/include/tick.h#2 integrate .. //depot/projects/mips2/src/sys/sparc64/include/trap.h#2 integrate .. //depot/projects/mips2/src/sys/sparc64/include/tte.h#3 integrate .. //depot/projects/mips2/src/sys/sparc64/include/ver.h#3 integrate .. //depot/projects/mips2/src/sys/sparc64/sparc64/cheetah.c#5 integrate .. //depot/projects/mips2/src/sys/sparc64/sparc64/clock.c#4 integrate .. //depot/projects/mips2/src/sys/sparc64/sparc64/exception.S#5 integrate .. //depot/projects/mips2/src/sys/sparc64/sparc64/genassym.c#5 integrate .. //depot/projects/mips2/src/sys/sparc64/sparc64/locore.S#3 integrate .. //depot/projects/mips2/src/sys/sparc64/sparc64/machdep.c#9 integrate .. //depot/projects/mips2/src/sys/sparc64/sparc64/mp_locore.S#4 integrate .. //depot/projects/mips2/src/sys/sparc64/sparc64/mp_machdep.c#9 integrate .. //depot/projects/mips2/src/sys/sparc64/sparc64/pmap.c#11 integrate .. //depot/projects/mips2/src/sys/sparc64/sparc64/tick.c#4 integrate .. //depot/projects/mips2/src/sys/sparc64/sparc64/trap.c#8 integrate .. //depot/projects/mips2/src/sys/sun4v/sun4v/clock.c#1 branch .. //depot/projects/mips2/src/sys/sys/gpt.h#3 integrate .. //depot/projects/mips2/src/sys/sys/tty.h#5 integrate .. //depot/projects/mips2/src/sys/sys/ttydevsw.h#2 integrate .. //depot/projects/mips2/src/sys/ufs/ffs/ffs_vnops.c#10 integrate .. //depot/projects/mips2/src/sys/ufs/ufs/ufs_extattr.c#6 integrate .. //depot/projects/mips2/src/tools/regression/lib/libc/stdio/test-scanfloat.c#6 integrate .. //depot/projects/mips2/src/tools/tools/nanobsd/nanobsd.sh#10 integrate .. //depot/projects/mips2/src/usr.bin/cpio/cpio.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/crunch/crunchide/exec_elf32.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/cxgbtool/reg_defs_t3c.c#1 branch .. //depot/projects/mips2/src/usr.sbin/pciconf/pciconf.c#4 integrate Differences ... ==== //depot/projects/mips2/src/UPDATING#19 (text+ko) ==== @@ -41,6 +41,9 @@ Adding these drivers to your kernel configuration file shall cause compilation to fail. +20080818: + ntpd has been upgraded to 4.2.4p5. + 20080801: OpenSSH has been upgraded to 5.1p1. @@ -1123,4 +1126,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.540 2008/09/01 23:50:56 des Exp $ +$FreeBSD: src/UPDATING,v 1.541 2008/09/03 08:30:17 roberto Exp $ ==== //depot/projects/mips2/src/contrib/gdtoa/README#3 (text+ko) ==== @@ -332,5 +332,15 @@ the decimal-point character to be taken from the current locale; otherwise it is '.'. +Source files dtoa.c and strtod.c in this directory are derived from +netlib's "dtoa.c from fp" and are meant to function equivalently. +When compiled with Honor_FLT_ROUNDS #defined (on systems that provide +FLT_ROUNDS and fegetround() as specified in the C99 standard), they +honor the current rounding mode. Because FLT_ROUNDS is buggy on some +(Linux) systems -- not reflecting calls on fesetround(), as the C99 +standard says it should -- when Honor_FLT_ROUNDS is #defined, the +current rounding mode is obtained from fegetround() rather than from +FLT_ROUNDS, unless Trust_FLT_ROUNDS is also #defined. + Please send comments to David M. Gay (dmg at acm dot org, with " at " changed at "@" and " dot " changed to "."). ==== //depot/projects/mips2/src/contrib/gdtoa/dtoa.c#3 (text+ko) ==== @@ -66,7 +66,6 @@ */ #ifdef Honor_FLT_ROUNDS -#define Rounding rounding #undef Check_FLT_ROUNDS #define Check_FLT_ROUNDS #else @@ -127,12 +126,22 @@ Bigint *b, *b1, *delta, *mlo, *mhi, *S; double d2, ds, eps; char *s, *s0; -#ifdef Honor_FLT_ROUNDS - int rounding; -#endif #ifdef SET_INEXACT int inexact, oldinexact; #endif +#ifdef Honor_FLT_ROUNDS /*{*/ + int Rounding; +#ifdef Trust_FLT_ROUNDS /*{{ only define this if FLT_ROUNDS really works! */ + Rounding = Flt_Rounds; +#else /*}{*/ + Rounding = 1; + switch(fegetround()) { + case FE_TOWARDZERO: Rounding = 0; break; + case FE_UPWARD: Rounding = 2; break; + case FE_DOWNWARD: Rounding = 3; + } +#endif /*}}*/ +#endif /*}*/ #ifndef MULTIPLE_THREADS if (dtoa_result) { @@ -178,12 +187,12 @@ inexact = 1; #endif #ifdef Honor_FLT_ROUNDS - if ((rounding = Flt_Rounds) >= 2) { + if (Rounding >= 2) { if (*sign) - rounding = rounding == 2 ? 0 : 2; + Rounding = Rounding == 2 ? 0 : 2; else - if (rounding != 2) - rounding = 0; + if (Rounding != 2) + Rounding = 0; } #endif @@ -316,7 +325,7 @@ s = s0 = rv_alloc(i); #ifdef Honor_FLT_ROUNDS - if (mode > 1 && rounding != 1) + if (mode > 1 && Rounding != 1) leftright = 0; #endif @@ -453,7 +462,7 @@ if (i == ilim) { #ifdef Honor_FLT_ROUNDS if (mode > 1) - switch(rounding) { + switch(Rounding) { case 0: goto ret1; case 2: goto bump_up; } @@ -521,7 +530,7 @@ spec_case = 0; if ((mode < 2 || leftright) #ifdef Honor_FLT_ROUNDS - && rounding == 1 + && Rounding == 1 #endif ) { if (!word1(d) && !(word0(d) & Bndry_mask) @@ -614,7 +623,7 @@ #ifndef ROUND_BIASED if (j1 == 0 && mode != 1 && !(word1(d) & 1) #ifdef Honor_FLT_ROUNDS - && rounding >= 1 + && Rounding >= 1 #endif ) { if (dig == '9') @@ -642,7 +651,7 @@ } #ifdef Honor_FLT_ROUNDS if (mode > 1) - switch(rounding) { + switch(Rounding) { case 0: goto accept_dig; case 2: goto keep_dig; } @@ -660,7 +669,7 @@ } if (j1 > 0) { #ifdef Honor_FLT_ROUNDS - if (!rounding) + if (!Rounding) goto accept_dig; #endif if (dig == '9') { /* possible if i == 1 */ @@ -703,7 +712,7 @@ /* Round off last digit */ #ifdef Honor_FLT_ROUNDS - switch(rounding) { + switch(Rounding) { case 0: goto trimzeros; case 2: goto roundoff; } ==== //depot/projects/mips2/src/contrib/gdtoa/gdtoa.h#3 (text+ko) ==== @@ -74,9 +74,9 @@ /* The following may be or-ed into one of the above values. */ - STRTOG_Neg = 0x08, - STRTOG_Inexlo = 0x10, - STRTOG_Inexhi = 0x20, + STRTOG_Neg = 0x08, /* does not affect STRTOG_Inexlo or STRTOG_Inexhi */ + STRTOG_Inexlo = 0x10, /* returned result rounded toward zero */ + STRTOG_Inexhi = 0x20, /* returned result rounded away from zero */ STRTOG_Inexact = 0x30, STRTOG_Underflow= 0x40, STRTOG_Overflow = 0x80 ==== //depot/projects/mips2/src/contrib/gdtoa/gdtoaimp.h#4 (text+ko) ==== @@ -26,7 +26,7 @@ ****************************************************************/ -/* $FreeBSD: src/contrib/gdtoa/gdtoaimp.h,v 1.9 2007/12/17 00:19:49 das Exp $ */ +/* $FreeBSD: src/contrib/gdtoa/gdtoaimp.h,v 1.10 2008/09/03 07:23:57 das Exp $ */ /* This is a variation on dtoa.c that converts arbitary binary floating-point formats to and from decimal notation. It uses @@ -132,13 +132,16 @@ * Infinity and NaN (case insensitively). * When INFNAN_CHECK is #defined and No_Hex_NaN is not #defined, * strtodg also accepts (case insensitively) strings of the form - * NaN(x), where x is a string of hexadecimal digits and spaces; - * if there is only one string of hexadecimal digits, it is taken - * for the fraction bits of the resulting NaN; if there are two or - * more strings of hexadecimal digits, each string is assigned - * to the next available sequence of 32-bit words of fractions - * bits (starting with the most significant), right-aligned in - * each sequence. + * NaN(x), where x is a string of hexadecimal digits (optionally + * preceded by 0x or 0X) and spaces; if there is only one string + * of hexadecimal digits, it is taken for the fraction bits of the + * resulting NaN; if there are two or more strings of hexadecimal + * digits, each string is assigned to the next available sequence + * of 32-bit words of fractions bits (starting with the most + * significant), right-aligned in each sequence. + * Unless GDTOA_NON_PEDANTIC_NANCHECK is #defined, input "NaN(...)" + * is consumed even when ... has the wrong form (in which case the + * "(...)" is consumed but ignored). * #define MULTIPLE_THREADS if the system offers preemptively scheduled * multiple threads. In this case, you must provide (or suitably * #define) two locks, acquired by ACQUIRE_DTOA_LOCK(n) and freed @@ -150,7 +153,7 @@ * dtoa. You may do so whether or not MULTIPLE_THREADS is #defined. * #define IMPRECISE_INEXACT if you do not care about the setting of * the STRTOG_Inexact bits in the special case of doing IEEE double - * precision conversions (which could also be done by the strtog in + * precision conversions (which could also be done by the strtod in * dtoa.c). * #define NO_HEX_FP to disable recognition of C9x's hexadecimal * floating-point constants. @@ -204,6 +207,7 @@ #define INFNAN_CHECK #define USE_LOCALE #define Honor_FLT_ROUNDS +#define Trust_FLT_ROUNDS #undef IEEE_Arith #undef Avoid_Underflow @@ -597,7 +601,7 @@ extern int cmp ANSI((Bigint*, Bigint*)); extern void copybits ANSI((ULong*, int, Bigint*)); extern Bigint *d2b ANSI((double, int*, int*)); - extern int decrement ANSI((Bigint*)); + extern void decrement ANSI((Bigint*)); extern Bigint *diff ANSI((Bigint*, Bigint*)); extern char *dtoa ANSI((double d, int mode, int ndigits, int *decpt, int *sign, char **rve)); ==== //depot/projects/mips2/src/contrib/gdtoa/gethex.c#4 (text+ko) ==== @@ -45,7 +45,7 @@ { Bigint *b; CONST unsigned char *decpt, *s0, *s, *s1; - int esign, havedig, irv, k, n, nbits, up, zret; + int big, esign, havedig, irv, j, k, n, n0, nbits, up, zret; ULong L, lostbits, *x; Long e, e1; #ifdef USE_LOCALE @@ -56,6 +56,7 @@ if (!hexdig['0']) hexdig_init_D2A(); + *bp = 0; havedig = 0; s0 = *(CONST unsigned char **)sp + 2; while(s0[havedig] == '0') @@ -90,10 +91,10 @@ e = -(((Long)(s-decpt)) << 2); pcheck: s1 = s; + big = esign = 0; switch(*s) { case 'p': case 'P': - esign = 0; switch(*++s) { case '-': esign = 1; @@ -106,17 +107,65 @@ break; } e1 = n - 0x10; - while((n = hexdig[*++s]) !=0 && n <= 0x19) + while((n = hexdig[*++s]) !=0 && n <= 0x19) { + if (e1 & 0xf8000000) + big = 1; e1 = 10*e1 + n - 0x10; + } if (esign) e1 = -e1; e += e1; } *sp = (char*)s; - if (zret) { - if (!havedig) - *sp = s0 - 1; + if (!havedig) + *sp = s0 - 1; + if (zret) return STRTOG_Zero; + if (big) { + if (esign) { + switch(fpi->rounding) { + case FPI_Round_up: + if (sign) + break; + goto ret_tiny; + case FPI_Round_down: + if (!sign) + break; + goto ret_tiny; + } + goto retz; + ret_tiny: + b = Balloc(0); + b->wds = 1; + b->x[0] = 1; + goto dret; + } + switch(fpi->rounding) { + case FPI_Round_near: + goto ovfl1; + case FPI_Round_up: + if (!sign) + goto ovfl1; + goto ret_big; + case FPI_Round_down: + if (sign) + goto ovfl1; + goto ret_big; + } + ret_big: + nbits = fpi->nbits; + n0 = n = nbits >> kshift; + if (nbits & kmask) + ++n; + for(j = n, k = 0; j >>= 1; ++k); + *bp = b = Balloc(k); + b->wds = n; + for(j = 0; j < n0; ++j) + b->x[j] = ALL_ON; + if (n > n0) + b->x[j] = ULbits >> (ULbits - (nbits & kmask)); + *exp = fpi->emin; + return STRTOG_Normal | STRTOG_Inexlo; } n = s1 - s0 - 1; for(k = 0; n > 7; n >>= 1) @@ -149,7 +198,7 @@ k = n - 1; if (x[k>>kshift] & 1 << (k & kmask)) { lostbits = 2; - if (k > 1 && any_on(b,k-1)) + if (k > 0 && any_on(b,k)) lostbits = 3; } } @@ -165,7 +214,10 @@ if (e > fpi->emax) { ovfl: Bfree(b); - *bp = 0; + ovfl1: +#ifndef NO_ERRNO + errno = ERANGE; +#endif return STRTOG_Infinite | STRTOG_Overflow | STRTOG_Inexhi; } irv = STRTOG_Normal; @@ -185,15 +237,22 @@ case FPI_Round_down: if (sign) { one_bit: - *exp = fpi->emin; x[0] = b->wds = 1; + dret: *bp = b; + *exp = fpi->emin; +#ifndef NO_ERRNO + errno = ERANGE; +#endif return STRTOG_Denormal | STRTOG_Inexhi | STRTOG_Underflow; } } Bfree(b); - *bp = 0; + retz: +#ifndef NO_ERRNO + errno = ERANGE; +#endif return STRTOG_Zero | STRTOG_Inexlo | STRTOG_Underflow; } k = n - 1; ==== //depot/projects/mips2/src/contrib/gdtoa/strtoIg.c#3 (text+ko) ==== @@ -61,12 +61,16 @@ if (rv & STRTOG_Inexlo) { swap = 0; b1 = increment(b1); - if (fpi->sudden_underflow - && (rv & STRTOG_Retmask) == STRTOG_Zero) { - b1->x[0] = 0; - b1->x[nw1] = 1L << nb11; - rv1 += STRTOG_Normal - STRTOG_Zero; - rv1 &= ~STRTOG_Underflow; + if ((rv & STRTOG_Retmask) == STRTOG_Zero) { + if (fpi->sudden_underflow) { + b1->x[0] = 0; + b1->x[nw1] = 1L << nb11; + rv1 += STRTOG_Normal - STRTOG_Zero; + rv1 &= ~STRTOG_Underflow; + goto swapcheck; + } + rv1 &= STRTOG_Inexlo | STRTOG_Underflow | STRTOG_Zero; + rv1 |= STRTOG_Inexhi | STRTOG_Denormal; goto swapcheck; } if (b1->wds > nw ==== //depot/projects/mips2/src/contrib/gdtoa/strtod.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ /* Please send bug reports to David M. Gay (dmg at acm dot org, * with " at " changed at "@" and " dot " changed to "."). */ -/* $FreeBSD: src/contrib/gdtoa/strtod.c,v 1.2 2007/12/16 21:14:33 das Exp $ */ +/* $FreeBSD: src/contrib/gdtoa/strtod.c,v 1.3 2008/09/03 07:23:57 das Exp $ */ #include "gdtoaimp.h" #ifndef NO_FENV_H @@ -44,16 +44,15 @@ #ifndef NO_IEEE_Scale #define Avoid_Underflow #undef tinytens -/* The factor of 2^53 in tinytens[4] helps us avoid setting the underflow */ +/* The factor of 2^106 in tinytens[4] helps us avoid setting the underflow */ /* flag unnecessarily. It leads to a song and dance at the end of strtod. */ static CONST double tinytens[] = { 1e-16, 1e-32, 1e-64, 1e-128, - 9007199254740992.e-256 + 9007199254740992.*9007199254740992.e-256 }; #endif #endif #ifdef Honor_FLT_ROUNDS -#define Rounding rounding #undef Check_FLT_ROUNDS #define Check_FLT_ROUNDS #else @@ -81,9 +80,19 @@ #ifdef SET_INEXACT int inexact, oldinexact; #endif -#ifdef Honor_FLT_ROUNDS - int rounding; -#endif +#ifdef Honor_FLT_ROUNDS /*{*/ + int Rounding; +#ifdef Trust_FLT_ROUNDS /*{{ only define this if FLT_ROUNDS really works! */ + Rounding = Flt_Rounds; +#else /*}{*/ + Rounding = 1; + switch(fegetround()) { + case FE_TOWARDZERO: Rounding = 0; break; + case FE_UPWARD: Rounding = 2; break; + case FE_DOWNWARD: Rounding = 3; + } +#endif /*}}*/ +#endif /*}*/ sign = nz0 = nz = decpt = 0; dval(rv) = 0.; @@ -109,7 +118,7 @@ } break2: if (*s == '0') { -#ifndef NO_HEX_FP +#ifndef NO_HEX_FP /*{{*/ { static FPI fpi = { 53, 1-1023-53+1, 2046-1023-53+1, 1, SI }; Long exp; @@ -118,16 +127,20 @@ case 'x': case 'X': { -#if defined(FE_DOWNWARD) && defined(FE_TONEAREST) && defined(FE_TOWARDZERO) && defined(FE_UPWARD) +#if defined(FE_DOWNWARD) && defined(FE_TONEAREST) && defined(FE_TOWARDZERO) && defined(FE_UPWARD) /*{{*/ FPI fpi1 = fpi; +#ifdef Honor_FLT_ROUNDS /*{{*/ + fpi1.rounding = Rounding; +#else /*}{*/ switch(fegetround()) { case FE_TOWARDZERO: fpi1.rounding = 0; break; case FE_UPWARD: fpi1.rounding = 2; break; case FE_DOWNWARD: fpi1.rounding = 3; } -#else +#endif /*}}*/ +#else /*}{*/ #define fpi1 fpi -#endif +#endif /*}}*/ switch((i = gethex(&s, &fpi1, &exp, &bb, sign)) & STRTOG_Retmask) { case STRTOG_NoNumber: s = s00; @@ -381,12 +394,12 @@ scale = 0; #endif #ifdef Honor_FLT_ROUNDS - if ((rounding = Flt_Rounds) >= 2) { + if (Rounding >= 2) { if (sign) - rounding = rounding == 2 ? 0 : 2; + Rounding = Rounding == 2 ? 0 : 2; else - if (rounding != 2) - rounding = 0; + if (Rounding != 2) + Rounding = 0; } #endif #endif /*IEEE_Arith*/ @@ -405,7 +418,7 @@ /* Can't trust HUGE_VAL */ #ifdef IEEE_Arith #ifdef Honor_FLT_ROUNDS - switch(rounding) { + switch(Rounding) { case 0: /* toward 0 */ case 3: /* toward -infinity */ word0(rv) = Big0; @@ -536,7 +549,7 @@ bd2 -= bbe; bs2 = bb2; #ifdef Honor_FLT_ROUNDS - if (rounding != 1) + if (Rounding != 1) bs2++; #endif #ifdef Avoid_Underflow @@ -594,7 +607,7 @@ delta->sign = 0; i = cmp(delta, bs); #ifdef Honor_FLT_ROUNDS - if (rounding != 1) { + if (Rounding != 1) { if (i < 0) { /* Error is less than an ulp */ if (!delta->x[0] && delta->wds <= 1) { @@ -604,7 +617,7 @@ #endif break; } - if (rounding) { + if (Rounding) { if (dsign) { adj = 1.; goto apply_adj; @@ -650,10 +663,10 @@ if (adj < 1.) adj = 1.; if (adj <= 0x7ffffffe) { - /* adj = rounding ? ceil(adj) : floor(adj); */ + /* adj = Rounding ? ceil(adj) : floor(adj); */ y = adj; if (y != adj) { - if (!((rounding>>1) ^ dsign)) + if (!((Rounding>>1) ^ dsign)) y++; adj = y; } @@ -676,8 +689,11 @@ #endif /*Sudden_Underflow*/ #endif /*Avoid_Underflow*/ adj *= ulp(dval(rv)); - if (dsign) + if (dsign) { + if (word0(rv) == Big0 && word1(rv) == Big1) + goto ovfl; dval(rv) += adj; + } else dval(rv) -= adj; goto cont; @@ -770,7 +786,7 @@ } #endif /*Avoid_Underflow*/ L = (word0(rv) & Exp_mask) - Exp_msk1; -#endif /*Sudden_Underflow}*/ +#endif /*Sudden_Underflow}}*/ word0(rv) = L | Bndry_mask1; word1(rv) = 0xffffffff; #ifdef IBM ==== //depot/projects/mips2/src/contrib/gdtoa/strtodg.c#3 (text+ko) ==== @@ -89,7 +89,7 @@ return b; } - int + void #ifdef KR_headers decrement(b) Bigint *b; #else @@ -119,7 +119,6 @@ *x++ = y & 0xffff; } while(borrow && x < xe); #endif - return STRTOG_Inexlo; } static int @@ -206,9 +205,9 @@ goto ret; } switch(rd) { - case 1: + case 1: /* round down (toward -Infinity) */ goto trunc; - case 2: + case 2: /* round up (toward +Infinity) */ break; default: /* round near */ k = bdif - 1; @@ -330,7 +329,7 @@ CONST char *s, *s0, *s1; double adj, adj0, rv, tol; Long L; - ULong y, z; + ULong *b, *be, y, z; Bigint *ab, *bb, *bb1, *bd, *bd0, *bs, *delta, *rvb, *rvb0; irv = STRTOG_Zero; @@ -822,10 +821,8 @@ break; if (dsign) { rvb = increment(rvb); - if ( (j = rvbits & kmask) !=0) - j = ULbits - j; - if (hi0bits(rvb->x[(rvb->wds - 1) >> kshift]) - != j) + j = kmask & (ULbits - (rvbits & kmask)); + if (hi0bits(rvb->x[rvb->wds - 1]) != j) rvbits++; irv = STRTOG_Normal | STRTOG_Inexhi; } @@ -978,6 +975,29 @@ Bfree(bd0); Bfree(delta); if (rve > fpi->emax) { + switch(fpi->rounding & 3) { + case FPI_Round_near: + goto huge; + case FPI_Round_up: + if (!sign) + goto huge; + break; + case FPI_Round_down: + if (sign) + goto huge; + } + /* Round to largest representable magnitude */ + Bfree(rvb); + rvb = 0; + irv = STRTOG_Normal | STRTOG_Inexlo; + *exp = fpi->emax; + b = bits; + be = b + (fpi->nbits >> 5) + 1; + while(b < be) + *b++ = -1; + if ((j = fpi->nbits & 0x1f)) + *--be >>= (32 - j); + goto ret; huge: rvb->wds = 0; irv = STRTOG_Infinite | STRTOG_Overflow | STRTOG_Inexhi; @@ -992,12 +1012,19 @@ if (sudden_underflow) { rvb->wds = 0; irv = STRTOG_Underflow | STRTOG_Inexlo; +#ifndef NO_ERRNO + errno = ERANGE; +#endif } else { irv = (irv & ~STRTOG_Retmask) | (rvb->wds > 0 ? STRTOG_Denormal : STRTOG_Zero); - if (irv & STRTOG_Inexact) + if (irv & STRTOG_Inexact) { irv |= STRTOG_Underflow; +#ifndef NO_ERRNO + errno = ERANGE; +#endif + } } } if (se) ==== //depot/projects/mips2/src/contrib/gdtoa/strtof.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ /* Please send bug reports to David M. Gay (dmg at acm dot org, * with " at " changed at "@" and " dot " changed to "."). */ -/* $FreeBSD: src/contrib/gdtoa/strtof.c,v 1.2 2007/12/16 21:14:33 das Exp $ */ +/* $FreeBSD: src/contrib/gdtoa/strtof.c,v 1.3 2008/09/03 07:32:06 das Exp $ */ #include "gdtoaimp.h" @@ -40,13 +40,21 @@ strtof(CONST char *s, char **sp) #endif { - static FPI fpi = { 24, 1-127-24+1, 254-127-24+1, 1, SI }; + static FPI fpi0 = { 24, 1-127-24+1, 254-127-24+1, 1, SI }; + FPI *fpi, fpi1; ULong bits[1]; Long exp; int k; + int Rounding = Flt_Rounds; union { ULong L[1]; float f; } u; - k = strtodg(s, sp, &fpi, &exp, bits); + fpi = &fpi0; + if (Rounding != FPI_Round_near) { + fpi1 = fpi0; + fpi1.rounding = Rounding; + fpi = &fpi1; + } + k = strtodg(s, sp, fpi, &exp, bits); switch(k & STRTOG_Retmask) { case STRTOG_NoNumber: case STRTOG_Zero: ==== //depot/projects/mips2/src/contrib/gdtoa/test/README#2 (text+ko) ==== @@ -55,7 +55,12 @@ Program strtodt tests strtod on some hard cases (in file testnos3) posted by Fred Tydeman to comp.arch.arithmetic on 26 Feb. 1996. +To get correct results on Intel (x86) systems, the rounding precision +must be set to 53 bits. This can be done, e.g., by invoking +fpinit_ASL(), whose source appears in +http://www.netlib.org/ampl/solvers/fpinit.c . These are simple test programs, not meant for exhaustive testing, but for manually testing "interesting" cases. Paxson's testbase is good for more exhaustive testing, in part with random inputs. +See ftp://ftp.ee.lbl.gov/testbase-report.ps.Z . ==== //depot/projects/mips2/src/contrib/gdtoa/test/f.out#2 (text+ko) ==== @@ -124,7 +124,9 @@ g_ffmt(0) gives 1 bytes: "0" strtoIf returns 80, consuming 9 bytes. -fI[0] == fI[1] == strtof +fI[0] = #0 = 0 +fI[1] = #1 = 1.4012985e-45 +fI[0] == strtof Input: 1.23e-320 @@ -132,7 +134,9 @@ g_ffmt(0) gives 1 bytes: "0" strtoIf returns 80, consuming 9 bytes. -fI[0] == fI[1] == strtof +fI[0] = #0 = 0 +fI[1] = #1 = 1.4012985e-45 +fI[0] == strtof Input: 1.23e-20 @@ -160,7 +164,9 @@ g_ffmt(0) gives 1 bytes: "0" strtoIf returns 80, consuming 15 bytes. -fI[0] == fI[1] == strtof +fI[0] = #0 = 0 +fI[1] = #1 = 1.4012985e-45 +fI[0] == strtof Input: 1.234567890123456789 @@ -188,7 +194,9 @@ g_ffmt(0) gives 1 bytes: "0" strtoIf returns 80, consuming 25 bytes. -fI[0] == fI[1] == strtof +fI[0] = #0 = 0 +fI[1] = #1 = 1.4012985e-45 +fI[0] == strtof Input: 1.234567890123456789e-321 @@ -196,7 +204,9 @@ g_ffmt(0) gives 1 bytes: "0" strtoIf returns 80, consuming 25 bytes. -fI[0] == fI[1] == strtof +fI[0] = #0 = 0 +fI[1] = #1 = 1.4012985e-45 +fI[0] == strtof Input: 1e23 @@ -224,7 +234,9 @@ g_ffmt(0) gives 1 bytes: "0" strtoIf returns 80, consuming 23 bytes. -fI[0] == fI[1] == strtof +fI[0] = #0 = 0 +fI[1] = #1 = 1.4012985e-45 +fI[0] == strtof Input: 9.025971879324147880346310405869e-277 @@ -232,7 +244,9 @@ g_ffmt(0) gives 1 bytes: "0" strtoIf returns 80, consuming 37 bytes. -fI[0] == fI[1] == strtof +fI[0] = #0 = 0 +fI[1] = #1 = 1.4012985e-45 +fI[0] == strtof Input: 9.025971879324147880346310405868e-277 @@ -240,7 +254,9 @@ g_ffmt(0) gives 1 bytes: "0" strtoIf returns 80, consuming 37 bytes. -fI[0] == fI[1] == strtof +fI[0] = #0 = 0 +fI[1] = #1 = 1.4012985e-45 +fI[0] == strtof Input: 2.2250738585072014e-308 @@ -248,7 +264,9 @@ g_ffmt(0) gives 1 bytes: "0" strtoIf returns 80, consuming 23 bytes. -fI[0] == fI[1] == strtof +fI[0] = #0 = 0 +fI[1] = #1 = 1.4012985e-45 +fI[0] == strtof Input: 2.2250738585072013e-308 @@ -256,7 +274,9 @@ g_ffmt(0) gives 1 bytes: "0" strtoIf returns 80, consuming 23 bytes. -fI[0] == fI[1] == strtof +fI[0] = #0 = 0 +fI[1] = #1 = 1.4012985e-45 +fI[0] == strtof Rounding mode for strtor... changed from 1 (nearest) to 0 (toward zero) ==== //depot/projects/mips2/src/contrib/gdtoa/test/getround.c#3 (text+ko) ==== @@ -44,7 +44,14 @@ { int i; - i = atoi(s+1); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Sep 5 20:04:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EBD7D1065673; Fri, 5 Sep 2008 20:04: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 AF47D106566C for ; Fri, 5 Sep 2008 20:04:34 +0000 (UTC) (envelope-from gk@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9A6338FC1E for ; Fri, 5 Sep 2008 20:04:34 +0000 (UTC) (envelope-from gk@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 m85K4YsC006042 for ; Fri, 5 Sep 2008 20:04:34 GMT (envelope-from gk@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m85K4YPB006040 for perforce@freebsd.org; Fri, 5 Sep 2008 20:04:34 GMT (envelope-from gk@FreeBSD.org) Date: Fri, 5 Sep 2008 20:04:34 GMT Message-Id: <200809052004.m85K4YPB006040@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gk@FreeBSD.org using -f From: Gleb Kurtsou To: Perforce Change Reviews Cc: Subject: PERFORCE change 149275 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Sep 2008 20:04:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=149275 Change 149275 by gk@gk_h1 on 2008/09/05 20:03:56 IFC Affected files ... .. //depot/projects/soc2008/gk_l2filter/sbin-ifconfig/Makefile#2 integrate .. //depot/projects/soc2008/gk_l2filter/sbin-ifconfig/ifconfig.8#5 integrate .. //depot/projects/soc2008/gk_l2filter/sbin-ifconfig/ifconfig.c#4 integrate .. //depot/projects/soc2008/gk_l2filter/sbin-ifconfig/ifgre.c#1 branch .. //depot/projects/soc2008/gk_l2filter/sbin-ifconfig/ifieee80211.c#4 integrate .. //depot/projects/soc2008/gk_l2filter/sbin-ifconfig/ifvlan.c#2 integrate .. //depot/projects/soc2008/gk_l2filter/sbin-ifconfig/regdomain.c#2 integrate .. //depot/projects/soc2008/gk_l2filter/sbin-ipfw/ipfw.8#7 integrate .. //depot/projects/soc2008/gk_l2filter/share-man4/if_bridge.4#3 integrate .. //depot/projects/soc2008/gk_l2filter/sys-net/bpf.c#5 integrate .. //depot/projects/soc2008/gk_l2filter/sys-net/bpf.h#3 integrate .. //depot/projects/soc2008/gk_l2filter/sys-net/bpf_filter.c#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-net/bpf_jitter.c#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-net/bpf_jitter.h#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-net/bridgestp.c#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-net/ethernet.h#3 integrate .. //depot/projects/soc2008/gk_l2filter/sys-net/if.c#3 integrate .. //depot/projects/soc2008/gk_l2filter/sys-net/if.h#4 integrate .. //depot/projects/soc2008/gk_l2filter/sys-net/if_bridge.c#9 integrate .. //depot/projects/soc2008/gk_l2filter/sys-net/if_ef.c#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-net/if_enc.c#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-net/if_enc.h#1 branch .. //depot/projects/soc2008/gk_l2filter/sys-net/if_ethersubr.c#4 integrate .. //depot/projects/soc2008/gk_l2filter/sys-net/if_faith.c#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-net/if_gif.c#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-net/if_loop.c#4 integrate .. //depot/projects/soc2008/gk_l2filter/sys-net/if_mib.c#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-net/if_spppsubr.c#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-net/if_stf.c#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-net/if_var.h#3 integrate .. //depot/projects/soc2008/gk_l2filter/sys-net/if_vlan.c#3 integrate .. //depot/projects/soc2008/gk_l2filter/sys-net/raw_cb.c#3 integrate .. //depot/projects/soc2008/gk_l2filter/sys-net/raw_usrreq.c#3 integrate .. //depot/projects/soc2008/gk_l2filter/sys-net/route.c#3 integrate .. //depot/projects/soc2008/gk_l2filter/sys-net/rtsock.c#3 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/if_ether.c#3 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/igmp.c#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/in.c#3 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/in_gif.c#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/in_mcast.c#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/in_pcb.c#4 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/in_pcb.h#4 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/in_rmx.c#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/in_var.h#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/ip6.h#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/ip_carp.c#4 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/ip_divert.c#3 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/ip_fastfwd.c#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/ip_fw2.c#16 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/ip_fw_nat.c#3 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/ip_fw_pfil.c#9 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/ip_icmp.c#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/ip_input.c#3 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/ip_ipsec.c#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/ip_mroute.c#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/ip_options.c#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/ip_output.c#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/ip_var.h#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/libalias/alias_db.c#4 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/raw_ip.c#5 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/sctp_bsd_addr.c#5 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/sctp_indata.c#4 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/sctp_lock_bsd.h#3 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/sctp_os_bsd.h#4 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/sctp_output.c#5 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/sctp_pcb.c#5 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/sctp_sysctl.h#4 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/sctp_timer.c#5 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/sctp_timer.h#3 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/sctp_var.h#5 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/sctputil.c#5 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/tcp_hostcache.c#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/tcp_input.c#3 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/tcp_lro.c#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/tcp_offload.c#3 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/tcp_output.c#4 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/tcp_reass.c#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/tcp_sack.c#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/tcp_subr.c#4 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/tcp_syncache.c#5 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/tcp_syncache.h#3 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/tcp_timer.c#4 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/tcp_timewait.c#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/tcp_usrreq.c#3 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/toedev.h#3 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/udp_usrreq.c#5 integrate .. //depot/projects/soc2008/gk_l2filter/sys-pf/net/pf.c#9 integrate .. //depot/projects/soc2008/gk_l2filter/sys-pf/net/pf_if.c#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-pf/net/pf_ioctl.c#5 integrate .. //depot/projects/soc2008/gk_l2filter/sys-pf/net/pf_subr.c#2 integrate Differences ... ==== //depot/projects/soc2008/gk_l2filter/sbin-ifconfig/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/5/93 -# $FreeBSD: src/sbin/ifconfig/Makefile,v 1.34 2008/04/20 20:35:46 sam Exp $ +# $FreeBSD: src/sbin/ifconfig/Makefile,v 1.35 2008/08/03 03:36:12 thompsa Exp $ .include @@ -23,6 +23,7 @@ SRCS+= ifmac.c # MAC support SRCS+= ifmedia.c # SIOC[GS]IFMEDIA support SRCS+= ifvlan.c # SIOC[GS]ETVLAN support +SRCS+= ifgre.c # GRE keys etc SRCS+= ifieee80211.c regdomain.c # SIOC[GS]IEEE80211 support DPADD+= ${LIBBSDXML} ${LIBSBUF} ==== //depot/projects/soc2008/gk_l2filter/sbin-ifconfig/ifconfig.8#5 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94 -.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.149 2008/07/30 16:22:52 sam Exp $ +.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.153 2008/08/28 22:13:44 jfv Exp $ .\" -.Dd July 30, 2008 +.Dd August 27, 2008 .Dt IFCONFIG 8 .Os .Sh NAME @@ -423,18 +423,20 @@ is a synonym for enabling all available WOL mechanisms. To disable WOL use .Fl wol . -.It Cm vlanmtu , vlanhwtag +.It Cm vlanmtu , vlanhwtag, vlanhwfilter If the driver offers user-configurable VLAN support, enable -reception of extended frames or tag processing in hardware, +reception of extended frames, tag processing in hardware, or +frame filtering in hardware, respectively. Note that this must be issued on a physical interface associated with .Xr vlan 4 , not on a .Xr vlan 4 interface itself. -.It Fl vlanmtu , vlanhwtag +.It Fl vlanmtu , vlanhwtag, vlanhwfilter If the driver offers user-configurable VLAN support, disable -reception of extended frames or tag processing in hardware, +reception of extended frames, tag processing in hardware, or +frame filtering in hardware, respectively. .It Cm polling Turn on @@ -1254,6 +1256,8 @@ (station supports WME), .Cm WPA (station supports WPA), +.Cm WPS +(station supports WPS), .Cm RSN (station supports 802.11i/RSN), .Cm HTCAP @@ -1321,7 +1325,11 @@ .Fl v flag causes this information to be displayed symbolicaly. .It Cm list wme -Display the current parameters to use when operating in WME mode. +Display the current channel parameters to use when operating in WME mode. +If the +.Fl v +option is specified then both channel and BSS parameters are displayed +for each AC (first channel, then BSS). When WME mode is enabled for an adaptor this information will be displayed with the regular status; this command is mostly useful for examining parameters when WME mode is disabled. @@ -1439,7 +1447,7 @@ .Cm scanvalid parameter; otherwise a background scan operation is triggered before any selection occurs. -Rach channel type has a separate rssi threshold; the default values are +Each channel type has a separate rssi threshold; the default values are all 7 dBm. .It Cm roaming Ar mode When operating as a station, control how the system will ==== //depot/projects/soc2008/gk_l2filter/sbin-ifconfig/ifconfig.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)ifconfig.c 8.2 (Berkeley) 2/16/94"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.137 2008/06/20 17:26:34 thompsa Exp $"; + "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.139 2008/08/28 22:13:44 jfv Exp $"; #endif /* not lint */ #include @@ -51,7 +51,6 @@ #include #include -#include #include #include #include @@ -750,18 +749,6 @@ } static void -setifgrekey(const char *val, int dummy __unused, int s, - const struct afswtch *afp) -{ - uint32_t grekey = atol(val); - - strncpy(ifr.ifr_name, name, sizeof (ifr.ifr_name)); - ifr.ifr_data = (caddr_t)&grekey; - if (ioctl(s, GRESKEY, (caddr_t)&ifr) < 0) - warn("ioctl (set grekey)"); -} - -static void setifname(const char *val, int dummy __unused, int s, const struct afswtch *afp) { @@ -789,7 +776,8 @@ #define IFCAPBITS \ "\020\1RXCSUM\2TXCSUM\3NETCONS\4VLAN_MTU\5VLAN_HWTAGGING\6JUMBO_MTU\7POLLING" \ -"\10VLAN_HWCSUM\11TSO4\12TSO6\13LRO\14WOL_UCAST\15WOL_MCAST\16WOL_MAGIC" +"\10VLAN_HWCSUM\11TSO4\12TSO6\13LRO\14WOL_UCAST\15WOL_MCAST\16WOL_MAGIC" \ +"\21VLAN_HWFILTER" /* * Print the status of the interface. If an address family was @@ -876,12 +864,6 @@ if (ioctl(s, SIOCGIFSTATUS, &ifs) == 0) printf("%s", ifs.ascii); - int grekey = 0; - ifr.ifr_data = (caddr_t)&grekey; - if (ioctl(s, GREGKEY, &ifr) == 0) - if (grekey != 0) - printf("\tgrekey: %d\n", grekey); - close(s); return; } @@ -1057,7 +1039,6 @@ DEF_CMD("noicmp", IFF_LINK1, setifflags), DEF_CMD_ARG("mtu", setifmtu), DEF_CMD_ARG("name", setifname), - DEF_CMD_ARG("grekey", setifgrekey), }; static __constructor void ==== //depot/projects/soc2008/gk_l2filter/sbin-ifconfig/ifieee80211.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sbin/ifconfig/ifieee80211.c,v 1.53 2008/08/01 01:27:52 sam Exp $ + * $FreeBSD: src/sbin/ifconfig/ifieee80211.c,v 1.57 2008/08/14 03:49:14 thompsa Exp $ */ /*- @@ -185,7 +185,7 @@ if (rdp == NULL) { rdp = lib80211_alloc_regdata(); if (rdp == NULL) - exit(-1); + errx(-1, "missing or corrupted regdomain database"); } return rdp; } @@ -670,8 +670,10 @@ getchaninfo(s); v = strtol(val, &ep, 10); - if (val[0] == '\0' || ep[0] != '\0' || errno == ERANGE) - errx(1, "invalid channel number"); + if (val[0] == '\0' || val == ep || errno == ERANGE || + /* channel may be suffixed with nothing, :flag, or /width */ + (ep[0] != '\0' && ep[0] != ':' && ep[0] != '/')) + errx(1, "invalid channel specification"); flags = getchannelflags(val, v); if (v > 255) { /* treat as frequency */ mapfreq(&chan, v, flags); @@ -2441,6 +2443,79 @@ } } +/* XXX move to a public include file */ +#define IEEE80211_WPS_DEV_PASS_ID 0x1012 +#define IEEE80211_WPS_SELECTED_REG 0x1041 +#define IEEE80211_WPS_SETUP_STATE 0x1044 +#define IEEE80211_WPS_UUID_E 0x1047 +#define IEEE80211_WPS_VERSION 0x104a + +#define BE_READ_2(p) \ + ((u_int16_t) \ + ((((const u_int8_t *)(p))[1] ) | \ + (((const u_int8_t *)(p))[0] << 8))) + +static void +printwpsie(const char *tag, const u_int8_t *ie, size_t ielen, int maxlen) +{ +#define N(a) (sizeof(a) / sizeof(a[0])) + u_int8_t len = ie[1]; + + printf("%s", tag); + if (verbose) { + static const char *dev_pass_id[] = { + "D", /* Default (PIN) */ + "U", /* User-specified */ + "M", /* Machine-specified */ + "K", /* Rekey */ + "P", /* PushButton */ + "R" /* Registrar-specified */ + }; + int n; + + ie +=6, len -= 4; /* NB: len is payload only */ + + /* WPS IE in Beacon and Probe Resp frames have different fields */ + printf("<"); + while (len) { + uint16_t tlv_type = BE_READ_2(ie); + uint16_t tlv_len = BE_READ_2(ie + 2); + + ie += 4, len -= 4; + + switch (tlv_type) { + case IEEE80211_WPS_VERSION: + printf("v:%d.%d", *ie >> 4, *ie & 0xf); + break; + case IEEE80211_WPS_SETUP_STATE: + /* Only 1 and 2 are valid */ + if (*ie == 0 || *ie >= 3) + printf(" state:B"); + else + printf(" st:%s", *ie == 1 ? "N" : "C"); + break; + case IEEE80211_WPS_SELECTED_REG: + printf(" sel:%s", *ie ? "T" : "F"); + break; + case IEEE80211_WPS_DEV_PASS_ID: + n = LE_READ_2(ie); + if (n < N(dev_pass_id)) + printf(" dpi:%s", dev_pass_id[n]); + break; + case IEEE80211_WPS_UUID_E: + printf(" uuid-e:"); + for (n = 0; n < (tlv_len - 1); n++) + printf("%02x-", ie[n]); + printf("%02x", ie[n]); + break; + } + ie += tlv_len, len -= tlv_len; + } + printf(">"); + } +#undef N +} + /* * Copy the ssid string contents into buf, truncating to fit. If the * ssid is entirely printable then just copy intact. Otherwise convert @@ -2563,6 +2638,12 @@ return frm[1] > 3 && LE_READ_4(frm+2) == ((ATH_OUI_TYPE<<24)|ATH_OUI); } +static __inline int +iswpsoui(const uint8_t *frm) +{ + return frm[1] > 3 && LE_READ_4(frm+2) == ((WPS_OUI_TYPE<<24)|WPA_OUI); +} + static const char * iename(int elemid) { @@ -2624,6 +2705,8 @@ printwmeparam(" WME", vp, 2+vp[1], maxcols); else if (isatherosoui(vp)) printathie(" ATH", vp, 2+vp[1], maxcols); + else if (iswpsoui(vp)) + printwpsie(" WPS", vp, 2+vp[1], maxcols); else if (verbose) printie(" VEN", vp, 2+vp[1], maxcols); break; @@ -3114,48 +3197,63 @@ } static void -list_wme(int s) +list_wme_aci(int s, const char *tag, int ac) { - static const char *acnames[] = { "AC_BE", "AC_BK", "AC_VI", "AC_VO" }; - int ac, val; + int val; - for (ac = WME_AC_BE; ac <= WME_AC_VO; ac++) { -again: - if (ac & IEEE80211_WMEPARAM_BSS) - printf("\t%s", " "); - else - printf("\t%s", acnames[ac]); + printf("\t%s", tag); - /* show WME BSS parameters */ - if (get80211wme(s, IEEE80211_IOC_WME_CWMIN, ac, &val) != -1) - printf(" cwmin %2u", val); - if (get80211wme(s, IEEE80211_IOC_WME_CWMAX, ac, &val) != -1) - printf(" cwmax %2u", val); - if (get80211wme(s, IEEE80211_IOC_WME_AIFS, ac, &val) != -1) - printf(" aifs %2u", val); - if (get80211wme(s, IEEE80211_IOC_WME_TXOPLIMIT, ac, &val) != -1) - printf(" txopLimit %3u", val); - if (get80211wme(s, IEEE80211_IOC_WME_ACM, ac, &val) != -1) { - if (val) - printf(" acm"); + /* show WME BSS parameters */ + if (get80211wme(s, IEEE80211_IOC_WME_CWMIN, ac, &val) != -1) + printf(" cwmin %2u", val); + if (get80211wme(s, IEEE80211_IOC_WME_CWMAX, ac, &val) != -1) + printf(" cwmax %2u", val); + if (get80211wme(s, IEEE80211_IOC_WME_AIFS, ac, &val) != -1) + printf(" aifs %2u", val); + if (get80211wme(s, IEEE80211_IOC_WME_TXOPLIMIT, ac, &val) != -1) + printf(" txopLimit %3u", val); + if (get80211wme(s, IEEE80211_IOC_WME_ACM, ac, &val) != -1) { + if (val) + printf(" acm"); + else if (verbose) + printf(" -acm"); + } + /* !BSS only */ + if ((ac & IEEE80211_WMEPARAM_BSS) == 0) { + if (get80211wme(s, IEEE80211_IOC_WME_ACKPOLICY, ac, &val) != -1) { + if (!val) + printf(" -ack"); else if (verbose) - printf(" -acm"); + printf(" ack"); } - /* !BSS only */ - if ((ac & IEEE80211_WMEPARAM_BSS) == 0) { - if (get80211wme(s, IEEE80211_IOC_WME_ACKPOLICY, ac, &val) != -1) { - if (!val) - printf(" -ack"); - else if (verbose) - printf(" ack"); - } + } + printf("\n"); +} + +static void +list_wme(int s) +{ + static const char *acnames[] = { "AC_BE", "AC_BK", "AC_VI", "AC_VO" }; + int ac; + + if (verbose) { + /* display both BSS and local settings */ + for (ac = WME_AC_BE; ac <= WME_AC_VO; ac++) { + again: + if (ac & IEEE80211_WMEPARAM_BSS) + list_wme_aci(s, " ", ac); + else + list_wme_aci(s, acnames[ac], ac); + if ((ac & IEEE80211_WMEPARAM_BSS) == 0) { + ac |= IEEE80211_WMEPARAM_BSS; + goto again; + } else + ac &= ~IEEE80211_WMEPARAM_BSS; } - printf("\n"); - if ((ac & IEEE80211_WMEPARAM_BSS) == 0) { - ac |= IEEE80211_WMEPARAM_BSS; - goto again; - } else - ac &= ~IEEE80211_WMEPARAM_BSS; + } else { + /* display only channel settings */ + for (ac = WME_AC_BE; ac <= WME_AC_VO; ac++) + list_wme_aci(s, acnames[ac], ac); } } ==== //depot/projects/soc2008/gk_l2filter/sbin-ifconfig/ifvlan.c#2 (text+ko) ==== @@ -56,7 +56,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sbin/ifconfig/ifvlan.c,v 1.13 2008/03/31 15:38:07 sam Exp $"; + "$FreeBSD: src/sbin/ifconfig/ifvlan.c,v 1.14 2008/08/28 22:13:44 jfv Exp $"; #endif #define NOTAG ((u_short) -1) @@ -180,6 +180,8 @@ DEF_CMD("-vlanmtu", -IFCAP_VLAN_MTU, setifcap), DEF_CMD("vlanhwtag", IFCAP_VLAN_HWTAGGING, setifcap), DEF_CMD("-vlanhwtag", -IFCAP_VLAN_HWTAGGING, setifcap), + DEF_CMD("vlanhwfilter", IFCAP_VLAN_HWFILTER, setifcap), + DEF_CMD("-vlanhwfilter", -IFCAP_VLAN_HWFILTER, setifcap), }; static struct afswtch af_vlan = { .af_name = "af_vlan", ==== //depot/projects/soc2008/gk_l2filter/sbin-ifconfig/regdomain.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifndef lint -static const char rcsid[] = "$FreeBSD: src/sbin/ifconfig/regdomain.c,v 1.2 2008/05/08 14:01:42 cokane Exp $"; +static const char rcsid[] = "$FreeBSD: src/sbin/ifconfig/regdomain.c,v 1.3 2008/08/09 11:14:05 des Exp $"; #endif /* not lint */ #include @@ -78,7 +78,7 @@ /* XXX force parser to abort */ return; } - mt->sbuf[mt->level] = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); + mt->sbuf[mt->level] = sbuf_new_auto(); id = ref = mode = NULL; for (i = 0; attr[i] != NULL; i += 2) { if (iseq(attr[i], "id")) { ==== //depot/projects/soc2008/gk_l2filter/sbin-ipfw/ipfw.8#7 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.215 2008/08/01 23:31:28 julian Exp $ +.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.216 2008/08/27 15:30:09 ivoras Exp $ .\" .Dd November 26, 2007 .Dt IPFW 8 @@ -1914,7 +1914,7 @@ .Em pipes can be used to set hard limits to the bandwidth that a flow can use, whereas .Em queues -can be used to determine how different flow share the available bandwidth. +can be used to determine how different flows share the available bandwidth. .Pp The .Em pipe ==== //depot/projects/soc2008/gk_l2filter/share-man4/if_bridge.4#3 (text+ko) ==== @@ -33,7 +33,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/if_bridge.4,v 1.30 2007/09/16 21:14:47 thompsa Exp $ +.\" $FreeBSD: src/share/man/man4/if_bridge.4,v 1.31 2008/08/04 23:16:07 thompsa Exp $ .\" .Dd September 17, 2007 .Dt IF_BRIDGE 4 @@ -402,6 +402,3 @@ .Nm driver currently supports only Ethernet and Ethernet-like (e.g., 802.11) network devices, with exactly the same interface MTU size as the bridge device. -.Pp -Only wireless interfaces in hostap mode can be bridged due to the 802.11 -framing format, bridging a wireless client is not supported yet. ==== //depot/projects/soc2008/gk_l2filter/sys-net/bpf.c#5 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net/bpf.c,v 1.199 2008/08/01 21:38:46 csjp Exp $"); +__FBSDID("$FreeBSD: src/sys/net/bpf.c,v 1.201 2008/08/29 20:34:06 jkim Exp $"); #include "opt_bpf.h" #include "opt_mac.h" @@ -117,11 +117,10 @@ static void filt_bpfdetach(struct knote *); static int filt_bpfread(struct knote *, long); static void bpf_drvinit(void *); -static void bpf_clone(void *, struct ucred *, char *, int, struct cdev **); static int bpf_stats_sysctl(SYSCTL_HANDLER_ARGS); SYSCTL_NODE(_net, OID_AUTO, bpf, CTLFLAG_RW, 0, "bpf sysctl"); -static int bpf_maxinsns = BPF_MAXINSNS; +int bpf_maxinsns = BPF_MAXINSNS; SYSCTL_INT(_net_bpf, OID_AUTO, maxinsns, CTLFLAG_RW, &bpf_maxinsns, 0, "Maximum bpf program instructions"); static int bpf_zerocopy_enable = 0; @@ -131,7 +130,6 @@ bpf_stats_sysctl, "bpf statistics portal"); static d_open_t bpfopen; -static d_close_t bpfclose; static d_read_t bpfread; static d_write_t bpfwrite; static d_ioctl_t bpfioctl; @@ -140,9 +138,7 @@ static struct cdevsw bpf_cdevsw = { .d_version = D_VERSION, - .d_flags = D_TRACKCLOSE, .d_open = bpfopen, - .d_close = bpfclose, .d_read = bpfread, .d_write = bpfwrite, .d_ioctl = bpfioctl, @@ -585,6 +581,34 @@ } /* + * Close the descriptor by detaching it from its interface, + * deallocating its buffers, and marking it free. + */ +static void +bpf_dtor(void *data) +{ + struct bpf_d *d = data; + + BPFD_LOCK(d); + if (d->bd_state == BPF_WAITING) + callout_stop(&d->bd_callout); + d->bd_state = BPF_IDLE; + BPFD_UNLOCK(d); + funsetown(&d->bd_sigio); + mtx_lock(&bpf_mtx); + if (d->bd_bif) + bpf_detachd(d); + mtx_unlock(&bpf_mtx); + selwakeuppri(&d->bd_sel, PRINET); +#ifdef MAC + mac_bpfdesc_destroy(d); +#endif /* MAC */ + knlist_destroy(&d->bd_sel.si_note); + bpf_freed(d); + free(d, M_BPF); +} + +/* * Open ethernet device. Returns ENXIO for illegal minor device number, * EBUSY if file is open by another process. */ @@ -593,25 +617,14 @@ bpfopen(struct cdev *dev, int flags, int fmt, struct thread *td) { struct bpf_d *d; + int error; - mtx_lock(&bpf_mtx); - d = dev->si_drv1; - /* - * Each minor can be opened by only one process. If the requested - * minor is in use, return EBUSY. - */ - if (d != NULL) { - mtx_unlock(&bpf_mtx); - return (EBUSY); + MALLOC(d, struct bpf_d *, sizeof(*d), M_BPF, M_WAITOK | M_ZERO); + error = devfs_set_cdevpriv(d, bpf_dtor); + if (error != 0) { + free(d, M_BPF); + return (error); } - dev->si_drv1 = (struct bpf_d *)~0; /* mark device in use */ - mtx_unlock(&bpf_mtx); - - if ((dev->si_flags & SI_NAMED) == 0) - make_dev(&bpf_cdevsw, minor(dev), UID_ROOT, GID_WHEEL, 0600, - "bpf%d", dev2unit(dev)); - MALLOC(d, struct bpf_d *, sizeof(*d), M_BPF, M_WAITOK | M_ZERO); - dev->si_drv1 = d; /* * For historical reasons, perform a one-time initialization call to @@ -635,47 +648,19 @@ } /* - * Close the descriptor by detaching it from its interface, - * deallocating its buffers, and marking it free. - */ -/* ARGSUSED */ -static int -bpfclose(struct cdev *dev, int flags, int fmt, struct thread *td) -{ - struct bpf_d *d = dev->si_drv1; - - BPFD_LOCK(d); - if (d->bd_state == BPF_WAITING) - callout_stop(&d->bd_callout); - d->bd_state = BPF_IDLE; - BPFD_UNLOCK(d); - funsetown(&d->bd_sigio); - mtx_lock(&bpf_mtx); - if (d->bd_bif) - bpf_detachd(d); - mtx_unlock(&bpf_mtx); - selwakeuppri(&d->bd_sel, PRINET); -#ifdef MAC - mac_bpfdesc_destroy(d); -#endif /* MAC */ - knlist_destroy(&d->bd_sel.si_note); - bpf_freed(d); - dev->si_drv1 = NULL; - free(d, M_BPF); - - return (0); -} - -/* * bpfread - read next chunk of packets from buffers */ static int bpfread(struct cdev *dev, struct uio *uio, int ioflag) { - struct bpf_d *d = dev->si_drv1; + struct bpf_d *d; int timed_out; int error; + error = devfs_get_cdevpriv((void **)&d); + if (error != 0) + return (error); + /* * Restrict application to use a buffer the same size as * as kernel buffers. @@ -829,12 +814,16 @@ static int bpfwrite(struct cdev *dev, struct uio *uio, int ioflag) { - struct bpf_d *d = dev->si_drv1; + struct bpf_d *d; struct ifnet *ifp; struct mbuf *m, *mc; struct sockaddr dst; int error, hlen; + error = devfs_get_cdevpriv((void **)&d); + if (error != 0) + return (error); + d->bd_pid = curthread->td_proc->p_pid; d->bd_wcount++; if (d->bd_bif == NULL) { @@ -963,8 +952,12 @@ bpfioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flags, struct thread *td) { - struct bpf_d *d = dev->si_drv1; - int error = 0; + struct bpf_d *d; + int error; + + error = devfs_get_cdevpriv((void **)&d); + if (error != 0) + return (error); /* * Refresh PID associated with this descriptor. @@ -1482,9 +1475,9 @@ struct bpf_d *d; int revents; - d = dev->si_drv1; - if (d->bd_bif == NULL) - return (ENXIO); + if (devfs_get_cdevpriv((void **)&d) != 0 || d->bd_bif == NULL) + return (events & + (POLLHUP|POLLIN|POLLRDNORM|POLLOUT|POLLWRNORM)); /* * Refresh PID associated with this descriptor. @@ -1516,9 +1509,10 @@ int bpfkqfilter(struct cdev *dev, struct knote *kn) { - struct bpf_d *d = (struct bpf_d *)dev->si_drv1; + struct bpf_d *d; - if (kn->kn_filter != EVFILT_READ) + if (devfs_get_cdevpriv((void **)&d) != 0 || + kn->kn_filter != EVFILT_READ) return (1); /* @@ -2008,29 +2002,17 @@ } static void -bpf_clone(void *arg, struct ucred *cred, char *name, int namelen, - struct cdev **dev) -{ - int u; - - if (*dev != NULL) - return; - if (dev_stdclone(name, NULL, "bpf", &u) != 1) - return; - *dev = make_dev(&bpf_cdevsw, unit2minor(u), UID_ROOT, GID_WHEEL, 0600, - "bpf%d", u); - dev_ref(*dev); - (*dev)->si_flags |= SI_CHEAPCLONE; - return; -} - -static void bpf_drvinit(void *unused) { + struct cdev *dev; mtx_init(&bpf_mtx, "bpf global lock", NULL, MTX_DEF); LIST_INIT(&bpf_iflist); - EVENTHANDLER_REGISTER(dev_clone, bpf_clone, 0, 1000); + + dev = make_dev(&bpf_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "bpf"); + /* For compatibility */ + make_dev_alias(dev, "bpf0"); + } static void ==== //depot/projects/soc2008/gk_l2filter/sys-net/bpf.h#3 (text+ko) ==== @@ -34,7 +34,7 @@ * @(#)bpf.h 8.1 (Berkeley) 6/10/93 * @(#)bpf.h 1.34 (LBL) 6/16/96 * - * $FreeBSD: src/sys/net/bpf.h,v 1.51 2008/07/07 09:25:49 dwmalone Exp $ + * $FreeBSD: src/sys/net/bpf.h,v 1.53 2008/08/26 16:12:49 jkim Exp $ */ #ifndef _NET_BPF_H_ ==== //depot/projects/soc2008/gk_l2filter/sys-net/bpf_filter.c#2 (text+ko) ==== @@ -35,11 +35,11 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net/bpf_filter.c,v 1.30 2008/03/09 21:13:43 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/net/bpf_filter.c,v 1.37 2008/08/29 20:00:55 jkim Exp $"); #include -#ifdef sun +#if !defined(_KERNEL) || defined(sun) #include #endif @@ -64,6 +64,8 @@ #ifdef _KERNEL #include +#else +#include #endif #include #ifdef _KERNEL @@ -75,7 +77,7 @@ k -= len; \ m = m->m_next; \ if (m == 0) \ - return 0; \ + return (0); \ len = m->m_len; \ } \ } @@ -101,7 +103,7 @@ cp = mtod(m, u_char *) + k; if (len - k >= 4) { *err = 0; - return EXTRACT_LONG(cp); + return (EXTRACT_LONG(cp)); } m0 = m->m_next; if (m0 == 0 || m0->m_len + len - k < 4) @@ -110,25 +112,22 @@ np = mtod(m0, u_char *); switch (len - k) { case 1: - return - ((u_int32_t)cp[0] << 24) | + return (((u_int32_t)cp[0] << 24) | ((u_int32_t)np[0] << 16) | ((u_int32_t)np[1] << 8) | - (u_int32_t)np[2]; + (u_int32_t)np[2]); case 2: - return - ((u_int32_t)cp[0] << 24) | + return (((u_int32_t)cp[0] << 24) | ((u_int32_t)cp[1] << 16) | ((u_int32_t)np[0] << 8) | - (u_int32_t)np[1]; + (u_int32_t)np[1]); default: - return - ((u_int32_t)cp[0] << 24) | + return (((u_int32_t)cp[0] << 24) | ((u_int32_t)cp[1] << 16) | ((u_int32_t)cp[2] << 8) | - (u_int32_t)np[0]; + (u_int32_t)np[0]); } bad: *err = 1; @@ -190,7 +189,7 @@ switch (pc->code) { default: #ifdef _KERNEL - return 0; + return (0); #else abort(); #endif @@ -208,10 +207,10 @@ int merr; if (buflen != 0) - return 0; + return (0); A = m_xword((struct mbuf *)p, k, &merr); if (merr != 0) - return 0; + return (0); continue; #else return (0); @@ -232,11 +231,11 @@ int merr; if (buflen != 0) - return 0; + return (0); A = m_xhalf((struct mbuf *)p, k, &merr); continue; #else - return 0; + return (0); #endif } A = EXTRACT_SHORT(&p[k]); @@ -249,13 +248,13 @@ struct mbuf *m; if (buflen != 0) - return 0; + return (0); m = (struct mbuf *)p; MINDEX(m, k); A = mtod(m, u_char *)[k]; continue; #else - return 0; + return (0); #endif } A = p[k]; @@ -302,7 +301,7 @@ int merr; if (buflen != 0) - return 0; + return (0); A = m_xhalf((struct mbuf *)p, k, &merr); if (merr != 0) return (0); @@ -321,7 +320,7 @@ struct mbuf *m; if (buflen != 0) - return 0; + return (0); m = (struct mbuf *)p; MINDEX(m, k); A = mtod(m, u_char *)[k]; @@ -340,13 +339,13 @@ register struct mbuf *m; if (buflen != 0) - return 0; + return (0); m = (struct mbuf *)p; MINDEX(m, k); X = (mtod(m, u_char *)[k] & 0xf) << 2; continue; #else >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Sep 5 20:49:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B8D471065671; Fri, 5 Sep 2008 20:49: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 7C949106566B for ; Fri, 5 Sep 2008 20:49:20 +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 68E618FC12 for ; Fri, 5 Sep 2008 20:49:20 +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 m85KnKl2068720 for ; Fri, 5 Sep 2008 20:49:20 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m85KnKTT068714 for perforce@freebsd.org; Fri, 5 Sep 2008 20:49:20 GMT (envelope-from sam@freebsd.org) Date: Fri, 5 Sep 2008 20:49:20 GMT Message-Id: <200809052049.m85KnKTT068714@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 149277 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Sep 2008 20:49:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=149277 Change 149277 by sam@sam_ebb on 2008/09/05 20:48:53 kill ni_reqcw, it was never used Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_ddb.c#22 edit .. //depot/projects/vap/sys/net80211/ieee80211_node.h#22 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_ddb.c#22 (text+ko) ==== @@ -283,8 +283,8 @@ db_printf("\thtcap %b htparam 0x%x htctlchan %u ht2ndchan %u\n", ni->ni_htcap, IEEE80211_HTCAP_BITS, ni->ni_htparam, ni->ni_htctlchan, ni->ni_ht2ndchan); - db_printf("\thtopmode 0x%x htstbc 0x%x reqcw %u chw %u\n", - ni->ni_htopmode, ni->ni_htstbc, ni->ni_reqcw, ni->ni_chw); + db_printf("\thtopmode 0x%x htstbc 0x%x chw %u\n", + ni->ni_htopmode, ni->ni_htstbc, ni->ni_chw); /* XXX ampdu state */ for (i = 0; i < WME_NUM_AC; i++) ==== //depot/projects/vap/sys/net80211/ieee80211_node.h#22 (text+ko) ==== @@ -173,7 +173,6 @@ uint8_t ni_ht2ndchan; /* HT 2nd channel */ uint8_t ni_htopmode; /* HT operating mode */ uint8_t ni_htstbc; /* HT */ - uint8_t ni_reqcw; /* requested tx channel width */ uint8_t ni_chw; /* negotiated channel width */ struct ieee80211_htrateset ni_htrates; /* negotiated ht rate set */ struct ieee80211_tx_ampdu ni_tx_ampdu[WME_NUM_AC]; From owner-p4-projects@FreeBSD.ORG Fri Sep 5 20:58:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F612106566C; Fri, 5 Sep 2008 20:58:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1391B106564A for ; Fri, 5 Sep 2008 20:58:30 +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 F3B1E8FC08 for ; Fri, 5 Sep 2008 20:58:29 +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 m85KwTsa036140 for ; Fri, 5 Sep 2008 20:58:29 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m85KwTdf036133 for perforce@freebsd.org; Fri, 5 Sep 2008 20:58:29 GMT (envelope-from sam@freebsd.org) Date: Fri, 5 Sep 2008 20:58:29 GMT Message-Id: <200809052058.m85KwTdf036133@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 149279 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Sep 2008 20:58:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=149279 Change 149279 by sam@sam_ebb on 2008/09/05 20:57:57 o kill IEEE80211_NODE_CHWUPDATE; it was not useful and needs to be replaced by a notification callback that handles other state changes (and was defined in the wrong place so it overlapped with another flag) o cleanup node flags etc. - widen ni_flags as it's going to be full shortly - shuffle members to minimize holes - remove IEEE80211_NODE_PSUPDATE, it was never used and overlapped - add IEEE80211_NODE_HT_ALL as an aggregate of all HT-related flags; we're about to grow some more Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_ht.c#41 edit .. //depot/projects/vap/sys/net80211/ieee80211_node.h#23 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_ht.c#41 (text+ko) ==== @@ -1650,16 +1650,14 @@ switch (ia->ia_action) { case IEEE80211_ACTION_HT_TXCHWIDTH: chw = frm[2] == IEEE80211_A_HT_TXCHWIDTH_2040 ? 40 : 20; + IEEE80211_NOTE(vap, + IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, ni, + "%s: HT txchwidth, width %d%s", + __func__, chw, ni->ni_chw != chw ? "*" : ""); if (chw != ni->ni_chw) { ni->ni_chw = chw; - ni->ni_flags |= IEEE80211_NODE_CHWUPDATE; + /* XXX notify on change */ } - IEEE80211_NOTE(vap, - IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, ni, - "%s: HT txchwidth, width %d (%s)", - __func__, chw, - ni->ni_flags & IEEE80211_NODE_CHWUPDATE ? - "new" : "no change"); break; case IEEE80211_ACTION_HT_MIMOPWRSAVE: IEEE80211_NOTE(vap, ==== //depot/projects/vap/sys/net80211/ieee80211_node.h#23 (text+ko) ==== @@ -99,18 +99,7 @@ LIST_ENTRY(ieee80211_node) ni_hash; /* hash collision list */ u_int ni_refcnt; /* count of held references */ u_int ni_scangen; /* gen# for timeout scan */ - uint8_t ni_authmode; /* authentication algorithm */ - uint8_t ni_ath_flags; /* Atheros feature flags */ - /* NB: These must have the same values as IEEE80211_ATHC_* */ -#define IEEE80211_NODE_TURBOP 0x0001 /* Turbo prime enable */ -#define IEEE80211_NODE_COMP 0x0002 /* Compresssion enable */ -#define IEEE80211_NODE_FF 0x0004 /* Fast Frame capable */ -#define IEEE80211_NODE_XR 0x0008 /* Atheros WME enable */ -#define IEEE80211_NODE_AR 0x0010 /* AR capable */ -#define IEEE80211_NODE_BOOST 0x0080 -#define IEEE80211_NODE_PSUPDATE 0x0200 /* power save state changed */ -#define IEEE80211_NODE_CHWUPDATE 0x0400 /* 11n channel width change */ - uint16_t ni_flags; /* special-purpose state */ + u_int ni_flags; #define IEEE80211_NODE_AUTH 0x0001 /* authorized for data */ #define IEEE80211_NODE_QOS 0x0002 /* QoS enabled */ #define IEEE80211_NODE_ERP 0x0004 /* ERP enabled */ @@ -123,11 +112,20 @@ #define IEEE80211_NODE_TSN 0x0200 /* TSN association */ #define IEEE80211_NODE_AMPDU_RX 0x0400 /* AMPDU rx enabled */ #define IEEE80211_NODE_AMPDU_TX 0x0800 /* AMPDU tx enabled */ + uint16_t ni_associd; /* association ID */ + uint16_t ni_vlan; /* vlan tag */ + uint16_t ni_txpower; /* current transmit power */ + uint8_t ni_authmode; /* authentication algorithm */ + uint8_t ni_ath_flags; /* Atheros feature flags */ + /* NB: These must have the same values as IEEE80211_ATHC_* */ +#define IEEE80211_NODE_TURBOP 0x0001 /* Turbo prime enable */ +#define IEEE80211_NODE_COMP 0x0002 /* Compresssion enable */ +#define IEEE80211_NODE_FF 0x0004 /* Fast Frame capable */ +#define IEEE80211_NODE_XR 0x0008 /* Atheros WME enable */ +#define IEEE80211_NODE_AR 0x0010 /* AR capable */ +#define IEEE80211_NODE_BOOST 0x0080 /* Dynamic Turbo boosted */ uint16_t ni_ath_defkeyix;/* Atheros def key index */ - uint16_t ni_associd; /* assoc response */ - uint16_t ni_txpower; /* current transmit power */ const struct ieee80211_txparam *ni_txparms; - uint16_t ni_vlan; /* vlan tag */ uint32_t ni_jointime; /* time of join (secs) */ uint32_t *ni_challenge; /* shared-key challenge */ struct ieee80211_ies ni_ies; /* captured ie's */ @@ -195,6 +193,8 @@ #define IEEE80211_NODE_ATH (IEEE80211_NODE_FF | IEEE80211_NODE_TURBOP) #define IEEE80211_NODE_AMPDU \ (IEEE80211_NODE_AMPDU_RX | IEEE80211_NODE_AMPDU_TX) +#define IEEE80211_NODE_HT_ALL \ + (IEEE80211_NODE_HT | IEEE80211_NODE_HTCOMPAT) #define IEEE80211_NODE_AID(ni) IEEE80211_AID(ni->ni_associd) From owner-p4-projects@FreeBSD.ORG Fri Sep 5 21:01:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 73218106566B; Fri, 5 Sep 2008 21:01: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 36E10106567C for ; Fri, 5 Sep 2008 21:01: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 212BF8FC18 for ; Fri, 5 Sep 2008 21:01: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 m85L1XjN047008 for ; Fri, 5 Sep 2008 21:01:33 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m85L1X94047001 for perforce@freebsd.org; Fri, 5 Sep 2008 21:01:33 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 5 Sep 2008 21:01:33 GMT Message-Id: <200809052101.m85L1X94047001@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 149280 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Sep 2008 21:01:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=149280 Change 149280 by hselasky@hselasky_laptop001 on 2008/09/05 21:00:32 Optimisations and improvements. 1) Lower remote wakeup delay to make up for extra delay added by the system timer. 2) Optimise PIO to use 32-bit access whenever possible. 3) Add support for DMA transfer of USB packets. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.c#10 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.h#5 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.c#10 (text+ko) ==== @@ -92,6 +92,7 @@ static void musbotg_do_poll(struct usb2_bus *bus); static void musbotg_root_ctrl_poll(struct musbotg_softc *sc); static void musbotg_standard_done(struct usb2_xfer *xfer); +static void musbotg_interrupt_poll(struct musbotg_softc *sc); static usb2_sw_transfer_func_t musbotg_root_intr_done; static usb2_sw_transfer_func_t musbotg_root_ctrl_done; @@ -221,13 +222,13 @@ temp |= MUSB2_MASK_RESUME; MUSB2_WRITE_1(sc, MUSB2_REG_POWER, temp); - /* wait 10 milliseconds */ + /* wait 8 milliseconds */ if (use_polling) { /* polling */ - DELAY(10000); + DELAY(8000); } else { /* Wait for reset to complete. */ - usb2_pause_mtx(&sc->sc_bus.mtx, 10); + usb2_pause_mtx(&sc->sc_bus.mtx, 8); } temp = MUSB2_READ_1(sc, MUSB2_REG_POWER); @@ -422,16 +423,23 @@ return (0); /* we are complete */ } while (count > 0) { + uint32_t temp; + usb2_get_page(td->pc, td->offset, &buf_res); /* get correct length */ if (buf_res.length > count) { buf_res.length = count; } + /* + * Compute the least number of bytes to the next buffer + * alignment address: + */ + temp = 4 - (USB_P2U(buf_res.buffer) & 3); + /* check if we can optimise */ - if ((!(USB_P2U(buf_res.buffer) & 3)) && + if ((temp == 4) && (buf_res.length >= 4)) { - uint32_t temp; /* receive data 4 bytes at a time */ bus_space_read_multi_4(sc->sc_io_tag, sc->sc_io_hdl, @@ -446,6 +454,10 @@ td->remainder -= temp; continue; } + /* minimise data transfer length */ + if (buf_res.length > temp) { + buf_res.length = temp; + } /* receive data */ bus_space_read_multi_1(sc->sc_io_tag, sc->sc_io_hdl, MUSB2_REG_EPFIFO(0), buf_res.buffer, buf_res.length); @@ -514,6 +526,7 @@ count = td->remainder; } while (count > 0) { + uint32_t temp; usb2_get_page(td->pc, td->offset, &buf_res); @@ -521,10 +534,15 @@ if (buf_res.length > count) { buf_res.length = count; } + /* + * Compute the least number of bytes to the next buffer + * alignment address: + */ + temp = 4 - (USB_P2U(buf_res.buffer) & 3); + /* check if we can optimise */ - if ((!(USB_P2U(buf_res.buffer) & 3)) && + if ((temp == 4) && (buf_res.length >= 4)) { - uint32_t temp; /* transmit data 4 bytes at a time */ bus_space_write_multi_4(sc->sc_io_tag, sc->sc_io_hdl, @@ -539,6 +557,10 @@ td->remainder -= temp; continue; } + /* minimise data transfer length */ + if (buf_res.length > temp) { + buf_res.length = temp; + } /* transmit data */ bus_space_write_multi_1(sc->sc_io_tag, sc->sc_io_hdl, MUSB2_REG_EPFIFO(0), buf_res.buffer, buf_res.length); @@ -598,6 +620,33 @@ return (0); /* complete */ } +#ifdef MUSB2_DMA_ENABLED +void +musbotg_complete_dma_cb(void *arg, uint32_t is_error) +{ + struct musbotg_dma *dma = arg; + struct musbotg_softc *sc; + + sc = dma->sc; + + mtx_lock(&sc->sc_bus.mtx); + + dma->busy = 0; + + if (is_error) { + dma->error = 1; + } + DPRINTFN(4, "DMA interrupt\n"); + + musbotg_interrupt_poll(sc); + + mtx_unlock(&sc->sc_bus.mtx); + + return; +} + +#endif + static uint8_t musbotg_data_rx(struct musbotg_td *td) { @@ -614,6 +663,11 @@ /* get pointer to softc */ sc = MUSBOTG_PC2SC(td->pc); +#ifdef MUSB2_DMA_ENABLED + if (sc->sc_rx_dma[td->ep_no].busy) { + return (1); /* not complete */ + } +#endif /* select endpoint */ MUSB2_WRITE_1(sc, MUSB2_REG_EPINDEX, td->ep_no); @@ -636,7 +690,24 @@ /* get the packet byte count */ count = MUSB2_READ_2(sc, MUSB2_REG_RXCOUNT); - /* verify the packet byte count */ + DPRINTFN(4, "count=0x%04x\n", count); + + /* + * First check for DMA complete and then check for short or + * invalid packet: + */ +#ifdef MUSB2_DMA_ENABLED + if (sc->sc_rx_dma[td->ep_no].complete) { + sc->sc_rx_dma[td->ep_no].complete = 0; + /* check for errors */ + if ((count >= td->max_frame_size) || + (sc->sc_rx_dma[td->ep_no].error)) { + /* invalid USB packet */ + td->error = 1; + return (0); /* we are complete */ + } + } else +#endif if (count != td->max_frame_size) { if (count < td->max_frame_size) { /* we have a short packet */ @@ -655,16 +726,61 @@ return (0); /* we are complete */ } while (count > 0) { + uint32_t temp; + usb2_get_page(td->pc, td->offset, &buf_res); /* get correct length */ if (buf_res.length > count) { buf_res.length = count; } +#ifdef MUSB2_DMA_ENABLED + if (td->dma_enabled) { + /* + * Compute the least number of bytes to the next DMA + * alignment address: + */ + temp = sc->sc_dma_align - + (USB_P2U(buf_res.buffer) & (sc->sc_dma_align - 1)); + + /* check if we can do DMA */ + if ((temp == sc->sc_dma_align) && + (buf_res.length >= sc->sc_dma_align)) { + + temp = buf_res.length & ~(sc->sc_dma_align - 1); + + /* set some status bits */ + sc->sc_rx_dma[td->ep_no].busy = 1; + sc->sc_rx_dma[td->ep_no].complete = 1; + sc->sc_rx_dma[td->ep_no].error = 0; + + /* start DMA job */ + musbotg_start_rxdma(sc->sc_rx_dma + td->ep_no, + buf_res.buffer, temp, td->ep_no); + + /* + * Pre-advance buffer pointers because the + * USB chip will update its counters: + */ + td->offset += temp; + td->remainder -= temp; + return (1); /* wait for callback */ + } + /* minimise data transfer length */ + if (buf_res.length > temp) { + buf_res.length = temp; + } + } +#endif + /* + * Compute the least number of bytes to the next buffer + * alignment address: + */ + temp = 4 - (USB_P2U(buf_res.buffer) & 3); + /* check if we can optimise */ - if ((!(USB_P2U(buf_res.buffer) & 3)) && + if ((temp == 4) && (buf_res.length >= 4)) { - uint32_t temp; /* receive data 4 bytes at a time */ bus_space_read_multi_4(sc->sc_io_tag, sc->sc_io_hdl, @@ -679,6 +795,10 @@ td->remainder -= temp; continue; } + /* minimise data transfer length */ + if (buf_res.length > temp) { + buf_res.length = temp; + } /* receive data */ bus_space_read_multi_1(sc->sc_io_tag, sc->sc_io_hdl, MUSB2_REG_EPFIFO(td->ep_no), buf_res.buffer, @@ -721,6 +841,11 @@ /* get pointer to softc */ sc = MUSBOTG_PC2SC(td->pc); +#ifdef MUSB2_DMA_ENABLED + if (sc->sc_tx_dma[td->ep_no].busy) { + return (1); /* not complete */ + } +#endif /* select endpoint */ MUSB2_WRITE_1(sc, MUSB2_REG_EPINDEX, td->ep_no); @@ -739,6 +864,7 @@ if (csr & MUSB2_MASK_CSRL_TXPKTRDY) { return (1); /* not complete */ } + /* check for short packet */ count = td->max_frame_size; if (td->remainder < count) { /* we have a short packet */ @@ -746,6 +872,7 @@ count = td->remainder; } while (count > 0) { + uint32_t temp; usb2_get_page(td->pc, td->offset, &buf_res); @@ -753,10 +880,67 @@ if (buf_res.length > count) { buf_res.length = count; } +#ifdef MUSB2_DMA_ENABLED + if (td->dma_enabled) { + /* + * Compute the least number of bytes to the next DMA + * alignment address: + */ + temp = sc->sc_dma_align - + (USB_P2U(buf_res.buffer) & (sc->sc_dma_align - 1)); + + /* check if we can do DMA */ + if ((temp == sc->sc_dma_align) && + (buf_res.length >= sc->sc_dma_align)) { + + temp = buf_res.length & ~(sc->sc_dma_align - 1); + + /* + * Check for DMA complete or if we should + * start DMA: + */ + if (sc->sc_tx_dma[td->ep_no].complete) { + sc->sc_tx_dma[td->ep_no].complete = 0; + + /* check for errors */ + if (sc->sc_tx_dma[td->ep_no].error) { + /* invalid USB packet */ + td->error = 1; + /* we are complete */ + return (0); + } + /* update counters */ + count -= temp; + td->offset += temp; + td->remainder -= temp; + continue; + } else { + /* set some status bits */ + sc->sc_tx_dma[td->ep_no].busy = 1; + sc->sc_tx_dma[td->ep_no].complete = 1; + sc->sc_tx_dma[td->ep_no].error = 0; + + /* start DMA job */ + musbotg_start_txdma(sc->sc_tx_dma + td->ep_no, + buf_res.buffer, temp, td->ep_no); + return (1); /* wait for callback */ + } + } + /* minimise data transfer length */ + if (buf_res.length > temp) { + buf_res.length = temp; + } + } +#endif + /* + * Compute the least number of bytes to the next buffer + * alignment address: + */ + temp = 4 - (USB_P2U(buf_res.buffer) & 3); + /* check if we can optimise */ - if ((!(USB_P2U(buf_res.buffer) & 3)) && + if ((temp == 4) && (buf_res.length >= 4)) { - uint32_t temp; /* transmit data 4 bytes at a time */ bus_space_write_multi_4(sc->sc_io_tag, sc->sc_io_hdl, @@ -771,6 +955,10 @@ td->remainder -= temp; continue; } + /* minimise data transfer length */ + if (buf_res.length > temp) { + buf_res.length = temp; + } /* transmit data */ bus_space_write_multi_1(sc->sc_io_tag, sc->sc_io_hdl, MUSB2_REG_EPFIFO(td->ep_no), buf_res.buffer, @@ -1193,6 +1381,21 @@ else temp &= ~MUSB2_MASK_EPINT(ep_no); MUSB2_WRITE_2(sc, MUSB2_REG_INTRXE, temp); + +#ifdef MUSB2_DMA_ENABLED + if (on == 0) { + if (sc->sc_rx_dma[ep_no].busy) { + /* + * The USB driver uses a DMA delay + * so there is no need for an + * immediate DMA stop! + */ + musbotg_stop_rxdma_async(ep_no); + } + sc->sc_rx_dma[ep_no].complete = 0; + sc->sc_rx_dma[ep_no].busy = 0; + } +#endif } else { temp = MUSB2_READ_2(sc, MUSB2_REG_INTTXE); if (on) @@ -1200,6 +1403,21 @@ else temp &= ~MUSB2_MASK_EPINT(ep_no); MUSB2_WRITE_2(sc, MUSB2_REG_INTTXE, temp); + +#ifdef MUSB2_DMA_ENABLED + if (on == 0) { + if (sc->sc_tx_dma[ep_no].busy) { + /* + * The USB driver uses a DMA delay + * so there is no need for an + * immediate DMA stop! + */ + musbotg_stop_txdma_async(ep_no); + } + sc->sc_tx_dma[ep_no].complete = 0; + sc->sc_tx_dma[ep_no].busy = 0; + } +#endif } } return; @@ -1453,23 +1671,31 @@ if (ep_dir == UE_DIR_IN) { + /* check if we support DMA */ + if (musbotg_support_txdma(ep_no)) { + temp = MUSB2_MASK_CSRH_TXDMAREQMODE | + MUSB2_MASK_CSRH_TXDMAREQENA; + } else { + temp = 0; + } + /* Configure endpoint */ switch (ep_type) { case UE_INTERRUPT: MUSB2_WRITE_1(sc, MUSB2_REG_TXMAXP, wMaxPacket); MUSB2_WRITE_1(sc, MUSB2_REG_TXCSRH, - MUSB2_MASK_CSRH_TXMODE); + MUSB2_MASK_CSRH_TXMODE | temp); break; case UE_ISOCHRONOUS: MUSB2_WRITE_1(sc, MUSB2_REG_TXMAXP, wMaxPacket); MUSB2_WRITE_1(sc, MUSB2_REG_TXCSRH, MUSB2_MASK_CSRH_TXMODE | - MUSB2_MASK_CSRH_TXISO); + MUSB2_MASK_CSRH_TXISO | temp); break; case UE_BULK: MUSB2_WRITE_1(sc, MUSB2_REG_TXMAXP, wMaxPacket); MUSB2_WRITE_1(sc, MUSB2_REG_TXCSRH, - MUSB2_MASK_CSRH_TXMODE); + MUSB2_MASK_CSRH_TXMODE | temp); break; default: break; @@ -1512,22 +1738,30 @@ } } else { + /* check if we support DMA */ + if (musbotg_support_rxdma(ep_no)) { + temp = MUSB2_MASK_CSRH_RXDMAREQMODE | + MUSB2_MASK_CSRH_RXDMAREQENA; + } else { + temp = 0; + } + /* Configure endpoint */ switch (ep_type) { case UE_INTERRUPT: MUSB2_WRITE_1(sc, MUSB2_REG_RXMAXP, wMaxPacket); MUSB2_WRITE_1(sc, MUSB2_REG_RXCSRH, - MUSB2_MASK_CSRH_RXNYET); + MUSB2_MASK_CSRH_RXNYET | temp); break; case UE_ISOCHRONOUS: MUSB2_WRITE_1(sc, MUSB2_REG_RXMAXP, wMaxPacket); MUSB2_WRITE_1(sc, MUSB2_REG_RXCSRH, MUSB2_MASK_CSRH_RXNYET | - MUSB2_MASK_CSRH_RXISO); + MUSB2_MASK_CSRH_RXISO | temp); break; case UE_BULK: MUSB2_WRITE_1(sc, MUSB2_REG_RXMAXP, wMaxPacket); - MUSB2_WRITE_1(sc, MUSB2_REG_RXCSRH, 0); + MUSB2_WRITE_1(sc, MUSB2_REG_RXCSRH, temp); break; default: break; @@ -1618,6 +1852,15 @@ sc->sc_bus.usbrev = USB_REV_2_0; sc->sc_bus.methods = &musbotg_bus_methods; +#ifdef MUSB2_DMA_ENABLED + /* initialise DMA structures */ + for (temp = 0; temp != 16; temp++) { + sc->sc_rx_dma[temp].sc = sc; + sc->sc_tx_dma[temp].sc = sc; + } + sc->sc_dma_align = musbotg_get_dma_align(); +#endif + mtx_lock(&sc->sc_bus.mtx); /* turn on clocks */ @@ -2732,6 +2975,17 @@ td->ep_no = ep_no; td->obj_next = last_obj; + /* check for DMA support */ + if ((xfer->endpoint & (UE_DIR_IN | + UE_DIR_OUT)) == UE_DIR_IN) { + if (musbotg_support_txdma(ep_no)) { + td->dma_enabled = 1; + } + } else { + if (musbotg_support_rxdma(ep_no)) { + td->dma_enabled = 1; + } + } last_obj = td; } parm->size[0] += sizeof(*td); ==== //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.h#5 (text+ko) ==== @@ -288,9 +288,17 @@ bus_space_write_1((sc)->sc_io_tag, (sc)->sc_io_hdl, reg, data) struct musbotg_td; +struct musbotg_softc; typedef uint8_t (musbotg_cmd_t)(struct musbotg_td *td); +struct musbotg_dma { + struct musbotg_softc *sc; + uint8_t busy:1; + uint8_t complete:1; + uint8_t error:1; +}; + struct musbotg_td { struct musbotg_td *obj_next; musbotg_cmd_t *func; @@ -304,6 +312,7 @@ uint8_t short_pkt:1; uint8_t support_multi_buffer:1; uint8_t did_stall:1; + uint8_t dma_enabled:1; }; struct musbotg_std_temp { @@ -355,6 +364,10 @@ struct usb2_sw_transfer sc_root_intr; struct usb2_config_td sc_config_td; struct usb2_hw_ep_profile sc_hw_ep_profile[16]; +#ifdef MUSB2_DMA_ENABLED + struct musbotg_dma sc_rx_dma[16]; + struct musbotg_dma sc_tx_dma[16]; +#endif struct resource *sc_io_res; struct resource *sc_irq_res; @@ -367,7 +380,10 @@ void (*sc_clocks_off) (void *arg); void *sc_clocks_arg; - uint8_t sc_ep_max; /* maximum number of duplex endpoints */ + uint32_t sc_dma_align; /* DMA buffer alignment */ + + uint8_t sc_ep_max; /* maximum number of RX and TX + * endpoints supported */ uint8_t sc_rt_addr; /* root HUB address */ uint8_t sc_dv_addr; /* device address */ uint8_t sc_conf; /* root HUB config */ @@ -388,4 +404,20 @@ void musbotg_resume(struct musbotg_softc *sc); void musbotg_interrupt(struct musbotg_softc *sc); +#ifdef MUSB2_DMA_ENABLED +void musbotg_start_rxdma(void *arg, const void *dstaddr, uint32_t bytecount, uint32_t ep_no); +void musbotg_start_txdma(void *arg, const void *srcaddr, uint32_t bytecount, uint32_t ep_no); +void musbotg_stop_rxdma_async(uint32_t ep_no); +void musbotg_stop_txdma_async(uint32_t ep_no); +void musbotg_complete_dma_cb(void *arg, uint32_t is_error); +uint32_t musbotg_support_rxdma(uint32_t ep_no); +uint32_t musbotg_support_txdma(uint32_t ep_no); +uint32_t musbotg_get_dma_align(void); + +#else +#define musbotg_support_rxdma(...) 0 +#define musbotg_support_txdma(...) 0 +#define musbotg_get_dma_align(...) 0 +#endif + #endif /* _MUSB2_OTG_H_ */ From owner-p4-projects@FreeBSD.ORG Fri Sep 5 21:11:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 134AF1065679; Fri, 5 Sep 2008 21:11: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 CB2161065674 for ; Fri, 5 Sep 2008 21:11:43 +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 B64CC8FC1A for ; Fri, 5 Sep 2008 21:11:43 +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 m85LBhvK009634 for ; Fri, 5 Sep 2008 21:11:43 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m85LBhRt009624 for perforce@freebsd.org; Fri, 5 Sep 2008 21:11:43 GMT (envelope-from sam@freebsd.org) Date: Fri, 5 Sep 2008 21:11:43 GMT Message-Id: <200809052111.m85LBhRt009624@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 149282 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Sep 2008 21:11:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=149282 Change 149282 by sam@sam_ebb on 2008/09/05 21:11:01 MIMO power save (kernel part); still needs driver notification for dynamic state change in sta mode Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_ddb.c#23 edit .. //depot/projects/vap/sys/net80211/ieee80211_ht.c#42 edit .. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#63 edit .. //depot/projects/vap/sys/net80211/ieee80211_ioctl.h#22 edit .. //depot/projects/vap/sys/net80211/ieee80211_node.c#43 edit .. //depot/projects/vap/sys/net80211/ieee80211_node.h#24 edit .. //depot/projects/vap/sys/net80211/ieee80211_sta.c#16 edit .. //depot/projects/vap/sys/net80211/ieee80211_var.h#49 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_ddb.c#23 (text+ko) ==== @@ -81,7 +81,7 @@ #define IEEE80211_C_HTCAP_BITS \ "\20\1LDPC\2CHWIDTH40\5GREENFIELD\6SHORTGI20\7SHORTGI40\10TXSTBC" \ - "\21AMPDU\22AMSDU\23HT" + "\21AMPDU\22AMSDU\23HT\24SMPS" /* NB: policy bits not included */ #define IEEE80211_CHAN_BITS \ @@ -90,7 +90,7 @@ #define IEEE80211_NODE_BITS \ "\20\1AUTH\2QOS\3ERP\5PWR_MGT\6AREF\7HT\10HTCOMPAT\11WPS\12TSN" \ - "\13AMPDU_RX\14AMPDU_TX" + "\13AMPDU_RX\14AMPDU_TX\15MIMO_PS\16MIMO_RTS" #define IEEE80211_ERP_BITS \ "\20\1NON_ERP_PRESENT\2USE_PROTECTION\3LONG_PREAMBLE" ==== //depot/projects/vap/sys/net80211/ieee80211_ht.c#42 (text+ko) ==== @@ -835,8 +835,7 @@ ampdu_rx_stop(&ni->ni_rx_ampdu[i]); ni->ni_htcap = 0; - ni->ni_flags &= ~(IEEE80211_NODE_HT | IEEE80211_NODE_HTCOMPAT | - IEEE80211_NODE_AMPDU); + ni->ni_flags &= ~IEEE80211_NODE_HT_ALL; } /* @@ -1238,6 +1237,32 @@ } /* + * Handle 11n MIMO PS switch. + */ +static int +htcap_update_mimo_ps(struct ieee80211_node *ni) +{ + uint16_t oflags = ni->ni_flags; + + switch (ni->ni_htcap & IEEE80211_HTCAP_SMPS) { + case IEEE80211_HTCAP_SMPS_DYNAMIC: + ni->ni_flags |= IEEE80211_NODE_MIMO_PS; + ni->ni_flags |= IEEE80211_NODE_MIMO_RTS; + break; + case IEEE80211_HTCAP_SMPS_ENA: + ni->ni_flags |= IEEE80211_NODE_MIMO_PS; + ni->ni_flags &= ~IEEE80211_NODE_MIMO_RTS; + break; + case IEEE80211_HTCAP_SMPS_OFF: + default: /* disable on rx of reserved value */ + ni->ni_flags &= ~IEEE80211_NODE_MIMO_PS; + ni->ni_flags &= ~IEEE80211_NODE_MIMO_RTS; + break; + } + return (oflags ^ ni->ni_flags); +} + +/* * Parse and update HT-related state extracted from * the HT cap and info ie's. */ @@ -1250,6 +1275,9 @@ int htflags; ieee80211_parse_htcap(ni, htcapie); + if (vap->iv_htcaps & IEEE80211_HTCAP_SMPS) + htcap_update_mimo_ps(ni); + if (htinfoie[0] == IEEE80211_ELEMID_VENDOR) htinfoie += 4; htinfo = (const struct ieee80211_ie_htinfo *) htinfoie; @@ -1279,6 +1307,8 @@ int htflags; ieee80211_parse_htcap(ni, htcapie); + if (vap->iv_htcaps & IEEE80211_HTCAP_SMPS) + htcap_update_mimo_ps(ni); /* NB: honor operating mode constraint */ /* XXX 40 MHZ intolerant */ @@ -1659,11 +1689,29 @@ /* XXX notify on change */ } break; - case IEEE80211_ACTION_HT_MIMOPWRSAVE: + case IEEE80211_ACTION_HT_MIMOPWRSAVE: { + const struct ieee80211_action_ht_mimopowersave *mps = + (const struct ieee80211_action_ht_mimopowersave *) ia; + /* XXX check iv_htcaps */ + if (mps->am_control & IEEE80211_A_HT_MIMOPWRSAVE_ENA) + ni->ni_flags |= IEEE80211_NODE_MIMO_PS; + else + ni->ni_flags &= ~IEEE80211_NODE_MIMO_PS; + if (mps->am_control & IEEE80211_A_HT_MIMOPWRSAVE_MODE) + ni->ni_flags |= IEEE80211_NODE_MIMO_RTS; + else + ni->ni_flags &= ~IEEE80211_NODE_MIMO_RTS; + /* XXX notify on change */ IEEE80211_NOTE(vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, ni, - "%s: HT MIMO PS", __func__); + "%s: HT MIMO PS (%s%s)", __func__, + (ni->ni_flags & IEEE80211_NODE_MIMO_PS) ? + "on" : "off", + (ni->ni_flags & IEEE80211_NODE_MIMO_RTS) ? + "+rts" : "" + ); break; + } default: IEEE80211_NOTE(vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, ni, ==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#63 (text+ko) ==== @@ -1068,6 +1068,18 @@ case IEEE80211_IOC_STA_VLAN: error = ieee80211_ioctl_getstavlan(vap, ireq); break; + case IEEE80211_IOC_SMPS: + if (vap->iv_opmode == IEEE80211_M_STA && + vap->iv_state == IEEE80211_S_RUN) { + if (vap->iv_bss->ni_flags & IEEE80211_NODE_MIMO_RTS) + ireq->i_val = IEEE80211_HTCAP_SMPS_DYNAMIC; + else if (vap->iv_bss->ni_flags & IEEE80211_NODE_MIMO_PS) + ireq->i_val = IEEE80211_HTCAP_SMPS_ENA; + else + ireq->i_val = IEEE80211_HTCAP_SMPS_OFF; + } else + ireq->i_val = vap->iv_htcaps & IEEE80211_HTCAP_SMPS; + break; default: error = EINVAL; break; @@ -3068,6 +3080,19 @@ case IEEE80211_IOC_STA_VLAN: error = ieee80211_ioctl_setstavlan(vap, ireq); break; + case IEEE80211_IOC_SMPS: + if ((ireq->i_val &~ IEEE80211_HTCAP_SMPS) != 0 || + ireq->i_val == 0x0008) /* value of 2 is reserved */ + return EINVAL; + if (ireq->i_val != IEEE80211_HTCAP_SMPS_OFF && + (vap->iv_htcaps & IEEE80211_HTC_SMPS) == 0) + return EOPNOTSUPP; + vap->iv_htcaps = (vap->iv_htcaps &~ IEEE80211_HTCAP_SMPS) | + ireq->i_val; + /* NB: if not operating in 11n this can wait */ + if (isvapht(vap)) + error = ERESTART; + break; default: error = EINVAL; break; ==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.h#22 (text+ko) ==== @@ -609,6 +609,7 @@ #define IEEE80211_IOC_ROAM 107 /* roaming params en masse */ #define IEEE80211_IOC_TXPARAMS 108 /* tx parameters */ #define IEEE80211_IOC_STA_VLAN 109 /* per-station vlan tag */ +#define IEEE80211_IOC_SMPS 110 /* MIMO power save */ /* * Parameters for controlling a scan requested with ==== //depot/projects/vap/sys/net80211/ieee80211_node.c#43 (text+ko) ==== @@ -2266,7 +2266,7 @@ newassoc = 0; IEEE80211_NOTE(vap, IEEE80211_MSG_ASSOC | IEEE80211_MSG_DEBUG, ni, - "station associated at aid %d: %s preamble, %s slot time%s%s%s%s%s%s", + "station associated at aid %d: %s preamble, %s slot time%s%s%s%s%s%s%s", IEEE80211_NODE_AID(ni), ic->ic_flags & IEEE80211_F_SHPREAMBLE ? "short" : "long", ic->ic_flags & IEEE80211_F_SHSLOT ? "short" : "long", @@ -2275,6 +2275,8 @@ ni->ni_flags & IEEE80211_NODE_HT ? (ni->ni_chw == 40 ? ", HT40" : ", HT20") : "", ni->ni_flags & IEEE80211_NODE_AMPDU ? " (+AMPDU)" : "", + ni->ni_flags & IEEE80211_NODE_MIMO_RTS ? " (+SMPS-DYN)" : + ni->ni_flags & IEEE80211_NODE_MIMO_PS ? " (+SMPS)" : "", IEEE80211_ATH_CAP(vap, ni, IEEE80211_NODE_FF) ? ", fast-frames" : "", IEEE80211_ATH_CAP(vap, ni, IEEE80211_NODE_TURBOP) ? ==== //depot/projects/vap/sys/net80211/ieee80211_node.h#24 (text+ko) ==== @@ -112,6 +112,8 @@ #define IEEE80211_NODE_TSN 0x0200 /* TSN association */ #define IEEE80211_NODE_AMPDU_RX 0x0400 /* AMPDU rx enabled */ #define IEEE80211_NODE_AMPDU_TX 0x0800 /* AMPDU tx enabled */ +#define IEEE80211_NODE_MIMO_PS 0x1000 /* MIMO power save enabled */ +#define IEEE80211_NODE_MIMO_RTS 0x2000 /* send RTS in MIMO PS */ uint16_t ni_associd; /* association ID */ uint16_t ni_vlan; /* vlan tag */ uint16_t ni_txpower; /* current transmit power */ @@ -194,7 +196,9 @@ #define IEEE80211_NODE_AMPDU \ (IEEE80211_NODE_AMPDU_RX | IEEE80211_NODE_AMPDU_TX) #define IEEE80211_NODE_HT_ALL \ - (IEEE80211_NODE_HT | IEEE80211_NODE_HTCOMPAT) + (IEEE80211_NODE_HT | IEEE80211_NODE_HTCOMPAT | \ + IEEE80211_NODE_AMPDU | IEEE80211_NODE_MIMO_PS | \ + IEEE80211_NODE_MIMO_RTS) #define IEEE80211_NODE_AID(ni) IEEE80211_AID(ni->ni_associd) ==== //depot/projects/vap/sys/net80211/ieee80211_sta.c#16 (text+ko) ==== @@ -1538,7 +1538,7 @@ ic->ic_flags &= ~IEEE80211_F_USEPROT; IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_ASSOC | IEEE80211_MSG_DEBUG, wh->i_addr2, - "%sassoc success at aid %d: %s preamble, %s slot time%s%s%s%s%s%s", + "%sassoc success at aid %d: %s preamble, %s slot time%s%s%s%s%s%s%s", ISREASSOC(subtype) ? "re" : "", IEEE80211_NODE_AID(ni), ic->ic_flags&IEEE80211_F_SHPREAMBLE ? "short" : "long", @@ -1548,6 +1548,8 @@ ni->ni_flags & IEEE80211_NODE_HT ? (ni->ni_chw == 40 ? ", HT40" : ", HT20") : "", ni->ni_flags & IEEE80211_NODE_AMPDU ? " (+AMPDU)" : "", + ni->ni_flags & IEEE80211_NODE_MIMO_RTS ? " (+SMPS-DYN)" : + ni->ni_flags & IEEE80211_NODE_MIMO_PS ? " (+SMPS)" : "", IEEE80211_ATH_CAP(vap, ni, IEEE80211_NODE_FF) ? ", fast-frames" : "", IEEE80211_ATH_CAP(vap, ni, IEEE80211_NODE_TURBOP) ? ==== //depot/projects/vap/sys/net80211/ieee80211_var.h#49 (text+ko) ==== @@ -534,6 +534,7 @@ #define IEEE80211_HTC_AMSDU 0x00020000 /* CAPABILITY: A-MSDU tx */ /* NB: HT40 is implied by IEEE80211_HTCAP_CHWIDTH40 */ #define IEEE80211_HTC_HT 0x00040000 /* CAPABILITY: HT operation */ +#define IEEE80211_HTC_SMPS 0x00080000 /* CAPABILITY: MIMO power save*/ void ieee80211_ifattach(struct ieee80211com *); void ieee80211_ifdetach(struct ieee80211com *); From owner-p4-projects@FreeBSD.ORG Fri Sep 5 21:22:55 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 873FA106567C; Fri, 5 Sep 2008 21:22: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 4B2221065676 for ; Fri, 5 Sep 2008 21:22:55 +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 362818FC1B for ; Fri, 5 Sep 2008 21:22:55 +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 m85LMtKc079168 for ; Fri, 5 Sep 2008 21:22:55 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m85LMtOc079166 for perforce@freebsd.org; Fri, 5 Sep 2008 21:22:55 GMT (envelope-from sam@freebsd.org) Date: Fri, 5 Sep 2008 21:22:55 GMT Message-Id: <200809052122.m85LMtOc079166@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 149283 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Sep 2008 21:22:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=149283 Change 149283 by sam@sam_ebb on 2008/09/05 21:22:42 RIFS support; like MIMO PS needs driver notification for dynamic state change in sta mode Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_ddb.c#24 edit .. //depot/projects/vap/sys/net80211/ieee80211_ht.c#43 edit .. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#64 edit .. //depot/projects/vap/sys/net80211/ieee80211_ioctl.h#23 edit .. //depot/projects/vap/sys/net80211/ieee80211_node.c#44 edit .. //depot/projects/vap/sys/net80211/ieee80211_node.h#25 edit .. //depot/projects/vap/sys/net80211/ieee80211_sta.c#17 edit .. //depot/projects/vap/sys/net80211/ieee80211_var.h#50 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_ddb.c#24 (text+ko) ==== @@ -66,7 +66,7 @@ "\20\1NONHT_PR\2INACT\3SCANWAIT\4BGSCAN\5WPS\6TSN\7SCANREQ\10RESUME" \ "\12NONEPR_PR\13SWBMISS\14DFS\15DOTD\22WDSLEGACY\23PROBECHAN\24HT" \ "\25AMDPU_TX\26AMPDU_TX\27AMSDU_TX\30AMSDU_RX\31USEHT40\32PUREN" \ - "\33SHORTGI20\34SHORTGI40\35HTCOMPAT" + "\33SHORTGI20\34SHORTGI40\35HTCOMPAT\36RIFS" #define IEEE80211_FVEN_BITS "\20" @@ -81,7 +81,7 @@ #define IEEE80211_C_HTCAP_BITS \ "\20\1LDPC\2CHWIDTH40\5GREENFIELD\6SHORTGI20\7SHORTGI40\10TXSTBC" \ - "\21AMPDU\22AMSDU\23HT\24SMPS" + "\21AMPDU\22AMSDU\23HT\24SMPS\25RIFS" /* NB: policy bits not included */ #define IEEE80211_CHAN_BITS \ @@ -90,7 +90,7 @@ #define IEEE80211_NODE_BITS \ "\20\1AUTH\2QOS\3ERP\5PWR_MGT\6AREF\7HT\10HTCOMPAT\11WPS\12TSN" \ - "\13AMPDU_RX\14AMPDU_TX\15MIMO_PS\16MIMO_RTS" + "\13AMPDU_RX\14AMPDU_TX\15MIMO_PS\16MIMO_RTS\17RIFS" #define IEEE80211_ERP_BITS \ "\20\1NON_ERP_PRESENT\2USE_PROTECTION\3LONG_PREAMBLE" ==== //depot/projects/vap/sys/net80211/ieee80211_ht.c#43 (text+ko) ==== @@ -166,6 +166,10 @@ if (vap->iv_htcaps & IEEE80211_HTCAP_SHORTGI40) vap->iv_flags_ext |= IEEE80211_FEXT_SHORTGI40; } + /* enable RIFS if capable */ + if (vap->iv_htcaps & IEEE80211_HTC_RIFS) + vap->iv_flags_ext |= IEEE80211_FEXT_RIFS; + /* NB: A-MPDU and A-MSDU rx are mandated, these are tx only */ vap->iv_flags_ext |= IEEE80211_FEXT_AMPDU_RX; if (vap->iv_htcaps & IEEE80211_HTC_AMPDU) @@ -962,6 +966,9 @@ ni->ni_ht2ndchan = IEEE80211_HTINFO_2NDCHAN_NONE; } ni->ni_htctlchan = ni->ni_chan->ic_ieee; + if (vap->iv_flags_ext & IEEE80211_FEXT_RIFS) + ni->ni_flags |= IEEE80211_NODE_RIFS; + /* XXX does it make sense to enable SMPS? */ ni->ni_htopmode = 0; /* XXX need protection state */ ni->ni_htstbc = 0; /* XXX need info */ @@ -1294,6 +1301,12 @@ htflags = IEEE80211_CHAN_HT40D; } htinfo_update_chw(ni, htflags); + + if ((htinfo->hi_byte1 & IEEE80211_HTINFO_RIFSMODE_PERM) && + (vap->iv_flags_ext & IEEE80211_FEXT_RIFS)) + ni->ni_flags |= IEEE80211_NODE_RIFS; + else + ni->ni_flags &= ~IEEE80211_NODE_RIFS; } /* @@ -2200,7 +2213,10 @@ /* XXX only update on channel change */ ht->hi_ctrlchannel = ieee80211_chan2ieee(ic, bsschan); - ht->hi_byte1 = IEEE80211_HTINFO_RIFSMODE_PROH; + if (vap->iv_flags_ext & IEEE80211_FEXT_RIFS) + ht->hi_byte1 = IEEE80211_HTINFO_RIFSMODE_PERM; + else + ht->hi_byte1 = IEEE80211_HTINFO_RIFSMODE_PROH; if (IEEE80211_IS_CHAN_HT40U(bsschan)) ht->hi_byte1 |= IEEE80211_HTINFO_2NDCHAN_ABOVE; else if (IEEE80211_IS_CHAN_HT40D(bsschan)) @@ -2227,6 +2243,7 @@ static uint8_t * ieee80211_add_htinfo_body(uint8_t *frm, struct ieee80211_node *ni) { + struct ieee80211vap *vap = ni->ni_vap; struct ieee80211com *ic = ni->ni_ic; /* pre-zero remainder of ie */ @@ -2235,7 +2252,10 @@ /* primary/control channel center */ *frm++ = ieee80211_chan2ieee(ic, ni->ni_chan); - frm[0] = IEEE80211_HTINFO_RIFSMODE_PROH; + if (vap->iv_flags_ext & IEEE80211_FEXT_RIFS) + frm[0] = IEEE80211_HTINFO_RIFSMODE_PERM; + else + frm[0] = IEEE80211_HTINFO_RIFSMODE_PROH; if (IEEE80211_IS_CHAN_HT40U(ni->ni_chan)) frm[0] |= IEEE80211_HTINFO_2NDCHAN_ABOVE; else if (IEEE80211_IS_CHAN_HT40D(ni->ni_chan)) ==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#64 (text+ko) ==== @@ -1080,6 +1080,15 @@ } else ireq->i_val = vap->iv_htcaps & IEEE80211_HTCAP_SMPS; break; + case IEEE80211_IOC_RIFS: + if (vap->iv_opmode == IEEE80211_M_STA && + vap->iv_state == IEEE80211_S_RUN) + ireq->i_val = + (vap->iv_bss->ni_flags & IEEE80211_NODE_RIFS) != 0; + else + ireq->i_val = + (vap->iv_flags_ext & IEEE80211_FEXT_RIFS) != 0; + break; default: error = EINVAL; break; @@ -3093,6 +3102,17 @@ if (isvapht(vap)) error = ERESTART; break; + case IEEE80211_IOC_RIFS: + if (ireq->i_val != 0) { + if ((vap->iv_htcaps & IEEE80211_HTC_RIFS) == 0) + return EOPNOTSUPP; + vap->iv_flags_ext |= IEEE80211_FEXT_RIFS; + } else + vap->iv_flags_ext &= ~IEEE80211_FEXT_RIFS; + /* NB: if not operating in 11n this can wait */ + if (isvapht(vap)) + error = ERESTART; + break; default: error = EINVAL; break; ==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.h#23 (text+ko) ==== @@ -610,6 +610,7 @@ #define IEEE80211_IOC_TXPARAMS 108 /* tx parameters */ #define IEEE80211_IOC_STA_VLAN 109 /* per-station vlan tag */ #define IEEE80211_IOC_SMPS 110 /* MIMO power save */ +#define IEEE80211_IOC_RIFS 111 /* RIFS config (on, off) */ /* * Parameters for controlling a scan requested with ==== //depot/projects/vap/sys/net80211/ieee80211_node.c#44 (text+ko) ==== @@ -2266,7 +2266,7 @@ newassoc = 0; IEEE80211_NOTE(vap, IEEE80211_MSG_ASSOC | IEEE80211_MSG_DEBUG, ni, - "station associated at aid %d: %s preamble, %s slot time%s%s%s%s%s%s%s", + "station associated at aid %d: %s preamble, %s slot time%s%s%s%s%s%s%s%s", IEEE80211_NODE_AID(ni), ic->ic_flags & IEEE80211_F_SHPREAMBLE ? "short" : "long", ic->ic_flags & IEEE80211_F_SHSLOT ? "short" : "long", @@ -2277,6 +2277,7 @@ ni->ni_flags & IEEE80211_NODE_AMPDU ? " (+AMPDU)" : "", ni->ni_flags & IEEE80211_NODE_MIMO_RTS ? " (+SMPS-DYN)" : ni->ni_flags & IEEE80211_NODE_MIMO_PS ? " (+SMPS)" : "", + ni->ni_flags & IEEE80211_NODE_RIFS ? " (+RIFS)" : "", IEEE80211_ATH_CAP(vap, ni, IEEE80211_NODE_FF) ? ", fast-frames" : "", IEEE80211_ATH_CAP(vap, ni, IEEE80211_NODE_TURBOP) ? ==== //depot/projects/vap/sys/net80211/ieee80211_node.h#25 (text+ko) ==== @@ -114,6 +114,7 @@ #define IEEE80211_NODE_AMPDU_TX 0x0800 /* AMPDU tx enabled */ #define IEEE80211_NODE_MIMO_PS 0x1000 /* MIMO power save enabled */ #define IEEE80211_NODE_MIMO_RTS 0x2000 /* send RTS in MIMO PS */ +#define IEEE80211_NODE_RIFS 0x4000 /* RIFS enabled */ uint16_t ni_associd; /* association ID */ uint16_t ni_vlan; /* vlan tag */ uint16_t ni_txpower; /* current transmit power */ @@ -198,7 +199,7 @@ #define IEEE80211_NODE_HT_ALL \ (IEEE80211_NODE_HT | IEEE80211_NODE_HTCOMPAT | \ IEEE80211_NODE_AMPDU | IEEE80211_NODE_MIMO_PS | \ - IEEE80211_NODE_MIMO_RTS) + IEEE80211_NODE_MIMO_RTS | IEEE80211_NODE_RIFS) #define IEEE80211_NODE_AID(ni) IEEE80211_AID(ni->ni_associd) ==== //depot/projects/vap/sys/net80211/ieee80211_sta.c#17 (text+ko) ==== @@ -1538,7 +1538,7 @@ ic->ic_flags &= ~IEEE80211_F_USEPROT; IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_ASSOC | IEEE80211_MSG_DEBUG, wh->i_addr2, - "%sassoc success at aid %d: %s preamble, %s slot time%s%s%s%s%s%s%s", + "%sassoc success at aid %d: %s preamble, %s slot time%s%s%s%s%s%s%s%s", ISREASSOC(subtype) ? "re" : "", IEEE80211_NODE_AID(ni), ic->ic_flags&IEEE80211_F_SHPREAMBLE ? "short" : "long", @@ -1550,6 +1550,7 @@ ni->ni_flags & IEEE80211_NODE_AMPDU ? " (+AMPDU)" : "", ni->ni_flags & IEEE80211_NODE_MIMO_RTS ? " (+SMPS-DYN)" : ni->ni_flags & IEEE80211_NODE_MIMO_PS ? " (+SMPS)" : "", + ni->ni_flags & IEEE80211_NODE_RIFS ? " (+RIFS)" : "", IEEE80211_ATH_CAP(vap, ni, IEEE80211_NODE_FF) ? ", fast-frames" : "", IEEE80211_ATH_CAP(vap, ni, IEEE80211_NODE_TURBOP) ? ==== //depot/projects/vap/sys/net80211/ieee80211_var.h#50 (text+ko) ==== @@ -492,6 +492,7 @@ #define IEEE80211_FEXT_SHORTGI20 0x04000000 /* CONF: short GI in HT20 */ #define IEEE80211_FEXT_SHORTGI40 0x08000000 /* CONF: short GI in HT40 */ #define IEEE80211_FEXT_HTCOMPAT 0x10000000 /* CONF: HT vendor OUI's */ +#define IEEE80211_FEXT_RIFS 0x20000000 /* CONF: RIFS enabled */ /* ic_caps/iv_caps: device driver capabilities */ /* 0x2f available */ @@ -535,6 +536,7 @@ /* NB: HT40 is implied by IEEE80211_HTCAP_CHWIDTH40 */ #define IEEE80211_HTC_HT 0x00040000 /* CAPABILITY: HT operation */ #define IEEE80211_HTC_SMPS 0x00080000 /* CAPABILITY: MIMO power save*/ +#define IEEE80211_HTC_RIFS 0x00100000 /* CAPABILITY: RIFS support */ void ieee80211_ifattach(struct ieee80211com *); void ieee80211_ifdetach(struct ieee80211com *); From owner-p4-projects@FreeBSD.ORG Fri Sep 5 21:45:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B29A3106567E; Fri, 5 Sep 2008 21:45:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 768B6106567A for ; Fri, 5 Sep 2008 21:45:18 +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 610F08FC14 for ; Fri, 5 Sep 2008 21:45:18 +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 m85LjIDW019668 for ; Fri, 5 Sep 2008 21:45:18 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m85LjIkn019660 for perforce@freebsd.org; Fri, 5 Sep 2008 21:45:18 GMT (envelope-from sam@freebsd.org) Date: Fri, 5 Sep 2008 21:45:18 GMT Message-Id: <200809052145.m85LjIkn019660@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 149284 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Sep 2008 21:45:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=149284 Change 149284 by sam@sam_ebb on 2008/09/05 21:44:52 MIMO power save and RIFS support Affected files ... .. //depot/projects/vap/sbin/ifconfig/ifconfig.8#17 edit .. //depot/projects/vap/sbin/ifconfig/ifieee80211.c#27 edit Differences ... ==== //depot/projects/vap/sbin/ifconfig/ifconfig.8#17 (text+ko) ==== @@ -28,7 +28,7 @@ .\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94 .\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.153 2008/08/28 22:13:44 jfv Exp $ .\" -.Dd August 27, 2008 +.Dd September 5, 2008 .Dt IFCONFIG 8 .Os .Sh NAME @@ -1396,6 +1396,13 @@ .Cm outdoor , and .Cm anywhere . +.It Cm rifs +Enable use of Reduced InterFrame Spacing (RIFS) when operating in 802.11n +on an HT channel. +Note that RIFS must be supported by both the station and access point +for it to be used. +To disable RIFS use +.Fl rifs . .It Cm roam:rate Ar rate Set the threshold for controlling roaming when operating in a BSS. The @@ -1497,6 +1504,23 @@ NB: this currently enables Short GI on both HT40 and HT20 channels. To disable Short GI use .Fl shortgi . +.It Cm smps +Enable use of Static Spatial Multiplexing Power Save (SMPS) +when operating in 802.11n. +A station operating with Static SMPS maintains only a single +receive chain active (this can significantly reduce power consumption). +To disable SMPS use +.Fl smps . +.It Cm smpsdyn +Enable use of Dynamic Spatial Multiplexing Power Save (SMPS) +when operating in 802.11n. +A station operating with Dynamic SMPS maintains only a single +receive chain active but switches to multiple receive chains when it +receives an RTS frame (this can significantly reduce power consumption). +Note that stations cannot distinguish between RTS/CTS intended to +enable multiple receive chains and those used for other purposes. +To disable SMPS use +.Fl smps . .It Cm ssid Ar ssid Set the desired Service Set Identifier (aka network name). The SSID is a string up to 32 characters ==== //depot/projects/vap/sbin/ifconfig/ifieee80211.c#27 (text+ko) ==== @@ -112,6 +112,11 @@ #define IEEE80211_NODE_HTCOMPAT 0x0080 /* HT setup w/ vendor OUI's */ #define IEEE80211_NODE_WPS 0x0100 /* WPS association */ #define IEEE80211_NODE_TSN 0x0200 /* TSN association */ +#define IEEE80211_NODE_AMPDU_RX 0x0400 /* AMPDU rx enabled */ +#define IEEE80211_NODE_AMPDU_TX 0x0800 /* AMPDU tx enabled */ +#define IEEE80211_NODE_MIMO_PS 0x1000 /* MIMO power save enabled */ +#define IEEE80211_NODE_MIMO_RTS 0x2000 /* send RTS in MIMO PS */ +#define IEEE80211_NODE_RIFS 0x4000 /* RIFS enabled */ #endif #define MAXCOL 78 @@ -1694,6 +1699,18 @@ set80211(s, IEEE80211_IOC_DOTD, d, 0, NULL); } +static void +set80211smps(const char *val, int d, int s, const struct afswtch *rafp) +{ + set80211(s, IEEE80211_IOC_SMPS, d, 0, NULL); +} + +static void +set80211rifs(const char *val, int d, int s, const struct afswtch *rafp) +{ + set80211(s, IEEE80211_IOC_RIFS, d, 0, NULL); +} + static int regdomain_sort(const void *a, const void *b) { @@ -2092,7 +2109,18 @@ if (flags & IEEE80211_NODE_WPS) *cp++ = 'W'; if (flags & IEEE80211_NODE_TSN) + *cp++ = 'N'; + if (flags & IEEE80211_NODE_AMPDU_TX) *cp++ = 'T'; + if (flags & IEEE80211_NODE_AMPDU_RX) + *cp++ = 'R'; + if (flags & IEEE80211_NODE_MIMO_PS) { + *cp++ = 'M'; + if (flags & IEEE80211_NODE_MIMO_RTS) + *cp++ = '+'; + } + if (flags & IEEE80211_NODE_RIFS) + *cp++ = 'I'; *cp = '\0'; return flagstring; } @@ -4110,6 +4138,20 @@ else if (verbose) LINE_CHECK("-puren"); } + if (get80211val(s, IEEE80211_IOC_SMPS, &val) != -1) { + if (val == IEEE80211_HTCAP_SMPS_DYNAMIC) + LINE_CHECK("smpsdyn"); + else if (val == IEEE80211_HTCAP_SMPS_ENA) + LINE_CHECK("smps"); + else if (verbose) + LINE_CHECK("-smps"); + } + if (get80211val(s, IEEE80211_IOC_RIFS, &val) != -1) { + if (val) + LINE_CHECK("rifs"); + else if (verbose) + LINE_CHECK("-rifs"); + } } if (get80211val(s, IEEE80211_IOC_WME, &wme) != -1) { @@ -4592,6 +4634,11 @@ DEF_CMD("-ht40", 0, set80211htconf), DEF_CMD("ht", 3, set80211htconf), /* NB: 20+40 */ DEF_CMD("-ht", 0, set80211htconf), + DEF_CMD("rifs", 1, set80211rifs), + DEF_CMD("-rifs", 0, set80211rifs), + DEF_CMD("smps", IEEE80211_HTCAP_SMPS_ENA, set80211smps), + DEF_CMD("smpsdyn", IEEE80211_HTCAP_SMPS_DYNAMIC, set80211smps), + DEF_CMD("-smps", IEEE80211_HTCAP_SMPS_OFF, set80211smps), /* XXX for testing */ DEF_CMD_ARG("chanswitch", set80211chanswitch), From owner-p4-projects@FreeBSD.ORG Fri Sep 5 21:53:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 678961065677; Fri, 5 Sep 2008 21:53: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 2ACA01065671 for ; Fri, 5 Sep 2008 21:53:27 +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 157948FC17 for ; Fri, 5 Sep 2008 21:53:27 +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 m85LrQUO066674 for ; Fri, 5 Sep 2008 21:53:26 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m85LrQLJ066667 for perforce@freebsd.org; Fri, 5 Sep 2008 21:53:26 GMT (envelope-from sam@freebsd.org) Date: Fri, 5 Sep 2008 21:53:26 GMT Message-Id: <200809052153.m85LrQLJ066667@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 149285 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Sep 2008 21:53:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=149285 Change 149285 by sam@sam_ebb on 2008/09/05 21:53:20 "ampdudensity -" is confusing; display NA when there is no requirement for the density (and accept it as a setting) Affected files ... .. //depot/projects/vap/sbin/ifconfig/ifieee80211.c#28 edit Differences ... ==== //depot/projects/vap/sbin/ifconfig/ifieee80211.c#28 (text+ko) ==== @@ -1602,7 +1602,7 @@ { int v; - if (isanyarg(val)) + if (isanyarg(val) || strcasecmp(val, "na") == 0) v = IEEE80211_HTCAP_MPDUDENSITY_NA; else switch ((int)(atof(val)*4)) { case 0: @@ -4075,7 +4075,7 @@ switch (val) { case IEEE80211_HTCAP_MPDUDENSITY_NA: if (verbose) - LINE_CHECK("ampdudensity -"); + LINE_CHECK("ampdudensity NA"); break; case IEEE80211_HTCAP_MPDUDENSITY_025: LINE_CHECK("ampdudensity .25"); From owner-p4-projects@FreeBSD.ORG Fri Sep 5 22:11:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 520CC1065674; Fri, 5 Sep 2008 22:11: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 162D9106566C for ; Fri, 5 Sep 2008 22:11:46 +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 DB8878FC1D for ; Fri, 5 Sep 2008 22:11:45 +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 m85MBjQL086903 for ; Fri, 5 Sep 2008 22:11:45 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m85MBjAo086901 for perforce@freebsd.org; Fri, 5 Sep 2008 22:11:45 GMT (envelope-from sam@freebsd.org) Date: Fri, 5 Sep 2008 22:11:45 GMT Message-Id: <200809052211.m85MBjAo086901@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 149287 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Sep 2008 22:11:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=149287 Change 149287 by sam@sam_ebb on 2008/09/05 22:11:34 catch up with SMPS changes Affected files ... .. //depot/projects/vap/sys/dev/mwl/if_mwl.c#15 edit Differences ... ==== //depot/projects/vap/sys/dev/mwl/if_mwl.c#15 (text+ko) ==== @@ -466,6 +466,7 @@ | IEEE80211_HTC_HT /* HT operation */ | IEEE80211_HTC_AMPDU /* tx A-MPDU */ | IEEE80211_HTC_AMSDU /* tx A-MSDU */ + | IEEE80211_HTC_SMPS /* SMPS available */ ; /* From owner-p4-projects@FreeBSD.ORG Fri Sep 5 23:20:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1F9741065677; Fri, 5 Sep 2008 23:20: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 D8E611065675 for ; Fri, 5 Sep 2008 23:20: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 C17508FC1C for ; Fri, 5 Sep 2008 23:20: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 m85NKv5V048086 for ; Fri, 5 Sep 2008 23:20:57 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m85NKvil048072 for perforce@freebsd.org; Fri, 5 Sep 2008 23:20:57 GMT (envelope-from sam@freebsd.org) Date: Fri, 5 Sep 2008 23:20:57 GMT Message-Id: <200809052320.m85NKvil048072@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 149294 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Sep 2008 23:20:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=149294 Change 149294 by sam@sam_ebb on 2008/09/05 23:20:52 Fix tx parameters for mgt frames so drivers don't need to deal with this; this also eliminates the hack M_LINK0 use to force wep encryption for the shared key auth handshake (which is important 'cuz we're out of flags and will shortly re-use it for something else). This is a bit ugly and may need some cleanup. Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_ht.c#44 edit .. //depot/projects/vap/sys/net80211/ieee80211_output.c#54 edit .. //depot/projects/vap/sys/net80211/ieee80211_proto.h#25 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_ht.c#44 (text+ko) ==== @@ -1945,6 +1945,7 @@ } while (0) struct ieee80211vap *vap = ni->ni_vap; struct ieee80211com *ic = ni->ni_ic; + struct ieee80211_bpf_params params; struct mbuf *m; uint8_t *frm; uint16_t baparamset; @@ -2048,7 +2049,14 @@ } m->m_pkthdr.len = m->m_len = frm - mtod(m, uint8_t *); - return ieee80211_mgmt_output(ni, m, IEEE80211_FC0_SUBTYPE_ACTION); + memset(¶ms, 0, sizeof(params)); + params.ibp_pri = WME_AC_VO; + params.ibp_rate0 = ni->ni_txparms->mgmtrate; + /* NB: we know all frames are unicast */ + params.ibp_try0 = ni->ni_txparms->maxretry; + params.ibp_power = ni->ni_txpower; + return ieee80211_mgmt_output(ni, m, IEEE80211_FC0_SUBTYPE_ACTION, + ¶ms); bad: ieee80211_free_node(ni); if (m != NULL) ==== //depot/projects/vap/sys/net80211/ieee80211_output.c#54 (text+ko) ==== @@ -479,7 +479,8 @@ * otherwise deal with reclaiming any reference (on error). */ int -ieee80211_mgmt_output(struct ieee80211_node *ni, struct mbuf *m, int type) +ieee80211_mgmt_output(struct ieee80211_node *ni, struct mbuf *m, int type, + struct ieee80211_bpf_params *params) { struct ieee80211vap *vap = ni->ni_vap; struct ieee80211com *ic = ni->ni_ic; @@ -509,17 +510,15 @@ ieee80211_send_setup(ni, wh, IEEE80211_FC0_TYPE_MGT | type, vap->iv_myaddr, ni->ni_macaddr, ni->ni_bssid); - if ((m->m_flags & M_LINK0) != 0 && ni->ni_challenge != NULL) { - m->m_flags &= ~M_LINK0; + if (params->ibp_flags & IEEE80211_BPF_CRYPTO) { IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_AUTH, wh->i_addr1, "encrypting frame (%s)", __func__); wh->i_fc[1] |= IEEE80211_FC1_WEP; } - if (type != IEEE80211_FC0_SUBTYPE_PROBE_RESP) { - /* NB: force non-ProbeResp frames to the highest queue */ - M_WME_SETAC(m, WME_AC_VO); - } else - M_WME_SETAC(m, WME_AC_BE); + + KASSERT(type != IEEE80211_FC0_SUBTYPE_PROBE_RESP, ("probe response?")); + M_WME_SETAC(m, params->ibp_pri); + #ifdef IEEE80211_DEBUG /* avoid printing too many frames */ if ((ieee80211_msg_debug(vap) && doprint(vap, type)) || @@ -534,7 +533,7 @@ #endif IEEE80211_NODE_STAT(ni, tx_mgmt); - return ic->ic_raw_xmit(ni, m, NULL); + return ic->ic_raw_xmit(ni, m, params); } /* @@ -554,6 +553,8 @@ struct ieee80211com *ic = ni->ni_ic; struct mbuf *m; struct ieee80211_frame *wh; + int hdrlen; + uint8_t *frm; if (vap->iv_state == IEEE80211_S_CAC) { IEEE80211_NOTE(vap, IEEE80211_MSG_OUTPUT | IEEE80211_MSG_DOTH, @@ -563,16 +564,27 @@ return EIO; /* XXX */ } - m = m_gethdr(M_NOWAIT, MT_HEADER); + if (vap->iv_opmode == IEEE80211_M_WDS) + hdrlen = sizeof(struct ieee80211_frame_addr4); + else + hdrlen = sizeof(struct ieee80211_frame); + m = ieee80211_getmgtframe(&frm, ic->ic_headroom + hdrlen, 0); if (m == NULL) { /* XXX debug msg */ ieee80211_unref_node(&ni); vap->iv_stats.is_tx_nobuf++; return ENOMEM; } - MH_ALIGN(m, sizeof(struct ieee80211_frame)); + KASSERT(M_LEADINGSPACE(m) >= hdrlen, + ("leading space %d", M_LEADINGSPACE(m))); + M_PREPEND(m, hdrlen, M_DONTWAIT); + if (m == NULL) { + /* NB: cannot happen */ + ieee80211_free_node(ni); + return ENOMEM; + } - wh = mtod(m, struct ieee80211_frame *); + 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); @@ -582,11 +594,8 @@ vap->iv_opmode != IEEE80211_M_HOSTAP) wh->i_fc[1] |= IEEE80211_FC1_PWR_MGT; m->m_len = m->m_pkthdr.len = sizeof(struct ieee80211_frame); - } else { - /* NB: 4-address frame */ - m->m_len = m->m_pkthdr.len = - sizeof(struct ieee80211_frame_addr4); } + m->m_len = m->m_pkthdr.len = hdrlen; M_WME_SETAC(m, WME_AC_BE); IEEE80211_NODE_STAT(ni, tx_data); @@ -1654,6 +1663,8 @@ { struct ieee80211vap *vap = ni->ni_vap; struct ieee80211com *ic = ni->ni_ic; + const struct ieee80211_txparam *tp; + struct ieee80211_bpf_params params; struct ieee80211_frame *wh; const struct ieee80211_rateset *rs; struct mbuf *m; @@ -1721,6 +1732,8 @@ frm = add_appie(frm, vap->iv_appie_probereq); m->m_pkthdr.len = m->m_len = frm - mtod(m, uint8_t *); + KASSERT(M_LEADINGSPACE(m) >= sizeof(struct ieee80211_frame), + ("leading space %d", M_LEADINGSPACE(m))); M_PREPEND(m, sizeof(struct ieee80211_frame), M_DONTWAIT); if (m == NULL) return ENOMEM; @@ -1741,7 +1754,17 @@ ieee80211_chan2ieee(ic, ic->ic_curchan), ether_sprintf(bssid), ssidlen, ssid); - return ic->ic_raw_xmit(ni, m, NULL); + memset(¶ms, 0, sizeof(params)); + params.ibp_pri = M_WME_GETAC(m); + tp = &vap->iv_txparms[ieee80211_chan2mode(ic->ic_curchan)]; + params.ibp_rate0 = tp->mgmtrate; + if (IEEE80211_IS_MULTICAST(da)) { + params.ibp_flags |= IEEE80211_BPF_NOACK; + params.ibp_try0 = 1; + } else + params.ibp_try0 = tp->maxretry; + params.ibp_power = ni->ni_txpower; + return ic->ic_raw_xmit(ni, m, ¶ms); } /* @@ -1786,6 +1809,7 @@ struct ieee80211vap *vap = ni->ni_vap; struct ieee80211com *ic = ni->ni_ic; struct ieee80211_node *bss = vap->iv_bss; + struct ieee80211_bpf_params params; struct mbuf *m; uint8_t *frm; uint16_t capinfo; @@ -1805,6 +1829,7 @@ ieee80211_node_refcnt(ni)+1); ieee80211_ref_node(ni); + memset(¶ms, 0, sizeof(params)); switch (type) { case IEEE80211_FC0_SUBTYPE_AUTH: @@ -1827,7 +1852,7 @@ bss->ni_authmode == IEEE80211_AUTH_SHARED); m = ieee80211_getmgtframe(&frm, - ic->ic_headroom + sizeof(struct ieee80211_frame), + ic->ic_headroom + sizeof(struct ieee80211_frame), 3 * sizeof(uint16_t) + (has_challenge && status == IEEE80211_STATUS_SUCCESS ? sizeof(uint16_t)+IEEE80211_CHALLENGE_LEN : 0) @@ -1852,7 +1877,8 @@ if (arg == IEEE80211_AUTH_SHARED_RESPONSE) { IEEE80211_NOTE(vap, IEEE80211_MSG_AUTH, ni, "request encrypt frame (%s)", __func__); - m->m_flags |= M_LINK0; /* WEP-encrypt, please */ + /* mark frame for encryption */ + params.ibp_flags |= IEEE80211_BPF_CRYPTO; } } else m->m_pkthdr.len = m->m_len = 3 * sizeof(uint16_t); @@ -2093,7 +2119,13 @@ /* NOTREACHED */ } - return ieee80211_mgmt_output(ni, m, type); + /* NB: force non-ProbeResp frames to the highest queue */ + params.ibp_pri = WME_AC_VO; + params.ibp_rate0 = ni->ni_txparms->mgmtrate; + /* NB: we know all frames are unicast */ + params.ibp_try0 = ni->ni_txparms->maxretry; + params.ibp_power = ni->ni_txpower; + return ieee80211_mgmt_output(ni, m, type, ¶ms); bad: ieee80211_free_node(ni); return ret; ==== //depot/projects/vap/sys/net80211/ieee80211_proto.h#25 (text+ko) ==== @@ -64,8 +64,9 @@ ((ni)->ni_vap->iv_input(ni, m, rssi, noise, rstamp)) int ieee80211_input_all(struct ieee80211com *, struct mbuf *, int, int, uint32_t); -int ieee80211_mgmt_output(struct ieee80211_node *, struct mbuf *, int); struct ieee80211_bpf_params; +int ieee80211_mgmt_output(struct ieee80211_node *, struct mbuf *, int, + struct ieee80211_bpf_params *); int ieee80211_raw_xmit(struct ieee80211_node *, struct mbuf *, const struct ieee80211_bpf_params *); int ieee80211_output(struct ifnet *, struct mbuf *, From owner-p4-projects@FreeBSD.ORG Fri Sep 5 23:32:09 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8F11D106567C; Fri, 5 Sep 2008 23:32: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 539111065675 for ; Fri, 5 Sep 2008 23:32: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 3C8948FC16 for ; Fri, 5 Sep 2008 23:32: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 m85NW9OC015131 for ; Fri, 5 Sep 2008 23:32:09 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m85NW9hm015129 for perforce@freebsd.org; Fri, 5 Sep 2008 23:32:09 GMT (envelope-from sam@freebsd.org) Date: Fri, 5 Sep 2008 23:32:09 GMT Message-Id: <200809052332.m85NW9hm015129@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 149295 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Sep 2008 23:32:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=149295 Change 149295 by sam@sam_ebb on 2008/09/05 23:31:33 Reuse now free M_PROTO1 flag to mark frames as encapsulted with an 802.11 header (M_ENCAP); this is going to be used shortly. Also fixed some straggler mis-merges (not critical except for fixing send of 4-address null data frames). Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_freebsd.h#33 edit .. //depot/projects/vap/sys/net80211/ieee80211_output.c#55 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_freebsd.h#33 (text+ko) ==== @@ -239,7 +239,7 @@ struct mbuf *ieee80211_getmgtframe(uint8_t **frm, int headroom, int pktlen); /* tx path usage */ -#define M_LINK0 M_PROTO1 /* WEP requested */ +#define M_ENCAP M_PROTO1 /* 802.11 encap done */ #define M_WDS M_PROTO2 /* WDS frame */ #define M_EAPOL M_PROTO3 /* PAE/EAPOL frame */ #define M_PWR_SAV M_PROTO4 /* bypass PS handling */ @@ -248,7 +248,7 @@ #define M_TXCB M_PROTO7 /* do tx complete callback */ #define M_AMPDU_MPDU M_PROTO8 /* ok for A-MPDU aggregation */ #define M_80211_TX \ - (M_LINK0|M_WDS|M_EAPOL|M_PWR_SAV|M_MORE_DATA|M_FF|M_TXCB|M_AMPDU_MPDU) + (M_ENCAP|M_WDS|M_EAPOL|M_PWR_SAV|M_MORE_DATA|M_FF|M_TXCB|M_AMPDU_MPDU) /* rx path usage */ #define M_AMPDU M_PROTO1 /* A-MPDU subframe */ ==== //depot/projects/vap/sys/net80211/ieee80211_output.c#55 (text+ko) ==== @@ -515,6 +515,7 @@ "encrypting frame (%s)", __func__); wh->i_fc[1] |= IEEE80211_FC1_WEP; } + m->m_flags |= M_ENCAP; /* mark encapsulated */ KASSERT(type != IEEE80211_FC0_SUBTYPE_PROBE_RESP, ("probe response?")); M_WME_SETAC(m, params->ibp_pri); @@ -593,9 +594,10 @@ if ((ni->ni_flags & IEEE80211_NODE_PWR_MGT) && vap->iv_opmode != IEEE80211_M_HOSTAP) wh->i_fc[1] |= IEEE80211_FC1_PWR_MGT; - m->m_len = m->m_pkthdr.len = sizeof(struct ieee80211_frame); } m->m_len = m->m_pkthdr.len = hdrlen; + m->m_flags |= M_ENCAP; /* mark encapsulated */ + M_WME_SETAC(m, WME_AC_BE); IEEE80211_NODE_STAT(ni, tx_data); @@ -1127,6 +1129,8 @@ key != NULL ? key->wk_cipher->ic_header : 0, vap->iv_fragthreshold)) goto bad; + m->m_flags |= M_ENCAP; /* mark encapsulated */ + IEEE80211_NODE_STAT(ni, tx_data); if (IEEE80211_IS_MULTICAST(wh->i_addr1)) IEEE80211_NODE_STAT(ni, tx_mcast); @@ -1735,14 +1739,18 @@ KASSERT(M_LEADINGSPACE(m) >= sizeof(struct ieee80211_frame), ("leading space %d", M_LEADINGSPACE(m))); M_PREPEND(m, sizeof(struct ieee80211_frame), M_DONTWAIT); - if (m == NULL) + if (m == NULL) { + /* NB: cannot happen */ + ieee80211_free_node(ni); return ENOMEM; + } wh = mtod(m, struct ieee80211_frame *); ieee80211_send_setup(ni, wh, IEEE80211_FC0_TYPE_MGT | IEEE80211_FC0_SUBTYPE_PROBE_REQ, sa, da, bssid); /* XXX power management? */ + m->m_flags |= M_ENCAP; /* mark encapsulated */ M_WME_SETAC(m, WME_AC_BE); @@ -2332,6 +2340,7 @@ IEEE80211_FC0_TYPE_MGT | IEEE80211_FC0_SUBTYPE_PROBE_RESP, vap->iv_myaddr, da, bss->ni_bssid); /* XXX power management? */ + m->m_flags |= M_ENCAP; /* mark encapsulated */ M_WME_SETAC(m, WME_AC_BE); From owner-p4-projects@FreeBSD.ORG Sat Sep 6 00:15:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF887106567D; Sat, 6 Sep 2008 00:15: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 B31851065678 for ; Sat, 6 Sep 2008 00:15:53 +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 9BBE88FC15 for ; Sat, 6 Sep 2008 00:15:53 +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 m860FrNU085863 for ; Sat, 6 Sep 2008 00:15:53 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m860Frib085861 for perforce@freebsd.org; Sat, 6 Sep 2008 00:15:53 GMT (envelope-from sam@freebsd.org) Date: Sat, 6 Sep 2008 00:15:53 GMT Message-Id: <200809060015.m860Frib085861@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 149296 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Sep 2008 00:15:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=149296 Change 149296 by sam@sam_ebb on 2008/09/06 00:15:22 fix age calculations yet again; q entries have an age that is relative to the head Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_freebsd.h#34 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_freebsd.h#34 (text+ko) ==== @@ -101,7 +101,7 @@ #define _AGEQ_ENQUEUE(_ifq, _m, _qlen, _age) do { \ (_m)->m_nextpkt = NULL; \ if ((_ifq)->ifq_tail != NULL) { \ - _age -= M_AGE_GET((_ifq)->ifq_tail); \ + _age -= M_AGE_GET((_ifq)->ifq_head); \ (_ifq)->ifq_tail->m_nextpkt = (_m); \ } else { \ (_ifq)->ifq_head = (_m); \ From owner-p4-projects@FreeBSD.ORG Sat Sep 6 00:20:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 65F921065673; Sat, 6 Sep 2008 00:19: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 2A00C1065671 for ; Sat, 6 Sep 2008 00:19:58 +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 110DD8FC08 for ; Sat, 6 Sep 2008 00:19:58 +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 m860JvcE006859 for ; Sat, 6 Sep 2008 00:19:57 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m860JvI4006857 for perforce@freebsd.org; Sat, 6 Sep 2008 00:19:57 GMT (envelope-from sam@freebsd.org) Date: Sat, 6 Sep 2008 00:19:57 GMT Message-Id: <200809060019.m860JvI4006857@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 149297 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Sep 2008 00:20:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=149297 Change 149297 by sam@sam_ebb on 2008/09/06 00:18:59 Rewrite power save support; we support two packet lists, one for frames coming out of the 802.11 layer and one for frames coming up from the driver (already encapsulated with an 802.11 header and marked M_ENCAP). Frames are returned either to the vap snd q or the device snd q based on which q they come from. Drivers must handle encap'd frames if they submit them (otherwise drivers don't need to worry as they will never get encap'd frames). Lightly tested; in particular need to review the age calcs when frames are on both lists. Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_freebsd.h#35 edit .. //depot/projects/vap/sys/net80211/ieee80211_hostap.c#25 edit .. //depot/projects/vap/sys/net80211/ieee80211_node.c#45 edit .. //depot/projects/vap/sys/net80211/ieee80211_node.h#26 edit .. //depot/projects/vap/sys/net80211/ieee80211_output.c#56 edit .. //depot/projects/vap/sys/net80211/ieee80211_power.c#13 edit .. //depot/projects/vap/sys/net80211/ieee80211_power.h#8 edit .. //depot/projects/vap/sys/net80211/ieee80211_var.h#51 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_freebsd.h#35 (text+ko) ==== @@ -112,41 +112,14 @@ } while (0) /* - * Per-node power-save queue definitions. + * Power-save queue definitions. */ -#define IEEE80211_NODE_SAVEQ_INIT(_ni, _name) do { \ - mtx_init(&(_ni)->ni_savedq.ifq_mtx, _name, "802.11 ps queue", MTX_DEF);\ - (_ni)->ni_savedq.ifq_maxlen = IEEE80211_PS_MAX_QUEUE; \ -} while (0) -#define IEEE80211_NODE_SAVEQ_DESTROY(_ni) \ - mtx_destroy(&(_ni)->ni_savedq.ifq_mtx) -#define IEEE80211_NODE_SAVEQ_QLEN(_ni) \ - _IF_QLEN(&(_ni)->ni_savedq) -#define IEEE80211_NODE_SAVEQ_LOCK(_ni) do { \ - IF_LOCK(&(_ni)->ni_savedq); \ -} while (0) -#define IEEE80211_NODE_SAVEQ_UNLOCK(_ni) do { \ - IF_UNLOCK(&(_ni)->ni_savedq); \ -} while (0) -#define IEEE80211_NODE_SAVEQ_DEQUEUE(_ni, _m, _qlen) do { \ - IEEE80211_NODE_SAVEQ_LOCK(_ni); \ - _IF_DEQUEUE(&(_ni)->ni_savedq, _m); \ - (_qlen) = IEEE80211_NODE_SAVEQ_QLEN(_ni); \ - IEEE80211_NODE_SAVEQ_UNLOCK(_ni); \ -} while (0) -#define IEEE80211_NODE_SAVEQ_DRAIN(_ni, _qlen) do { \ - IEEE80211_NODE_SAVEQ_LOCK(_ni); \ - (_qlen) = IEEE80211_NODE_SAVEQ_QLEN(_ni); \ - _IF_DRAIN(&(_ni)->ni_savedq); \ - IEEE80211_NODE_SAVEQ_UNLOCK(_ni); \ -} while (0) -/* XXX could be optimized */ -#define _IEEE80211_NODE_SAVEQ_DEQUEUE_HEAD(_ni, _m) do { \ - _IF_DEQUEUE(&(_ni)->ni_savedq, m); \ -} while (0) -#define _IEEE80211_NODE_SAVEQ_ENQUEUE(_ni, _m, _qlen, _age) do {\ - _AGEQ_ENQUEUE(&ni->ni_savedq, _m, _qlen, _age); \ -} while (0) +typedef struct mtx ieee80211_psq_lock_t; +#define IEEE80211_PSQ_INIT(_psq, _name) \ + mtx_init(&(_psq)->psq_lock, _name, "802.11 ps q", MTX_DEF); +#define IEEE80211_PSQ_DESTROY(_psq) mtx_destroy(&(_psq)->psq_lock) +#define IEEE80211_PSQ_LOCK(_psq) mtx_lock(&(_psq)->psq_lock) +#define IEEE80211_PSQ_UNLOCK(_psq) mtx_unlock(&(_psq)->psq_lock) #ifndef IF_PREPEND_LIST #define _IF_PREPEND_LIST(ifq, mhead, mtail, mcount) do { \ ==== //depot/projects/vap/sys/net80211/ieee80211_hostap.c#25 (text+ko) ==== @@ -2171,7 +2171,7 @@ { struct ieee80211vap *vap = ni->ni_vap; struct ieee80211_frame_min *wh; - struct ifnet *ifp = vap->iv_ifp; + struct ifnet *ifp; struct mbuf *m; uint16_t aid; int qlen; @@ -2208,7 +2208,7 @@ } /* Okay, take the first queued packet and put it out... */ - IEEE80211_NODE_SAVEQ_DEQUEUE(ni, m, qlen); + m = ieee80211_node_psq_dequeue(ni, &qlen); if (m == NULL) { IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_POWER, wh->i_addr2, "%s", "recv ps-poll, but queue empty"); @@ -2234,6 +2234,11 @@ vap->iv_set_tim(ni, 0); } m->m_flags |= M_PWR_SAV; /* bypass PS handling */ + + if (m->m_flags & M_ENCAP) + ifp = vap->iv_ic->ic_ifp; + else + ifp = vap->iv_ifp; IF_ENQUEUE(&ifp->if_snd, m); if_start(ifp); } ==== //depot/projects/vap/sys/net80211/ieee80211_node.c#45 (text+ko) ==== @@ -885,7 +885,7 @@ /* * Drain power save queue and, if needed, clear TIM. */ - if (ieee80211_node_saveq_drain(ni) != 0 && vap->iv_set_tim != NULL) + if (ieee80211_node_psq_drain(ni) != 0 && vap->iv_set_tim != NULL) vap->iv_set_tim(ni, 0); ni->ni_associd = 0; @@ -924,7 +924,7 @@ ic->ic_node_cleanup(ni); ieee80211_ies_cleanup(&ni->ni_ies); - IEEE80211_NODE_SAVEQ_DESTROY(ni); + ieee80211_psq_cleanup(&ni->ni_psq); IEEE80211_NODE_WDSQ_DESTROY(ni); FREE(ni, M_80211_NODE); } @@ -939,9 +939,8 @@ /* * Age frames on the power save queue. */ - if (ieee80211_node_saveq_age(ni) != 0 && - IEEE80211_NODE_SAVEQ_QLEN(ni) == 0 && - vap->iv_set_tim != NULL) + if (ieee80211_node_psq_age(ni) != 0 && + ni->ni_psq.psq_len == 0 && vap->iv_set_tim != NULL) vap->iv_set_tim(ni, 0); /* * Age frames on the wds pending queue. @@ -1012,7 +1011,7 @@ ni->ni_inact_reload = nt->nt_inact_init; ni->ni_inact = ni->ni_inact_reload; ni->ni_ath_defkeyix = 0x7fff; - IEEE80211_NODE_SAVEQ_INIT(ni, "unknown"); + ieee80211_psq_init(&ni->ni_psq, "unknown"); IEEE80211_NODE_WDSQ_INIT(ni, "unknown"); IEEE80211_NODE_LOCK(nt); @@ -1059,7 +1058,7 @@ IEEE80211_KEYIX_NONE); ni->ni_txpower = bss->ni_txpower; /* XXX optimize away */ - IEEE80211_NODE_SAVEQ_INIT(ni, "unknown"); + ieee80211_psq_init(&ni->ni_psq, "unknown"); IEEE80211_NODE_WDSQ_INIT(ni, "unknown"); } else { /* XXX msg */ ==== //depot/projects/vap/sys/net80211/ieee80211_node.h#26 (text+ko) ==== @@ -183,7 +183,7 @@ short ni_inact; /* inactivity mark count */ short ni_inact_reload;/* inactivity reload value */ int ni_txrate; /* legacy rate/MCS */ - struct ifqueue ni_savedq; /* ps-poll queue */ + struct ieee80211_psq ni_psq; /* power save queue */ struct ieee80211_nodestats ni_stats; /* per-node statistics */ struct ieee80211vap *ni_wdsvap; /* associated WDS vap */ ==== //depot/projects/vap/sys/net80211/ieee80211_output.c#56 (text+ko) ==== @@ -230,7 +230,7 @@ * the frame back when the time is right. * XXX lose WDS vap linkage? */ - ieee80211_pwrsave(ni, m); + (void) ieee80211_pwrsave(ni, m); ieee80211_free_node(ni); continue; } ==== //depot/projects/vap/sys/net80211/ieee80211_power.c#13 (text+ko) ==== @@ -99,24 +99,115 @@ } } +void +ieee80211_psq_init(struct ieee80211_psq *psq, const char *name) +{ + memset(psq, 0, sizeof(psq)); + psq->psq_maxlen = IEEE80211_PS_MAX_QUEUE; + IEEE80211_PSQ_INIT(psq, name); /* OS-dependent setup */ +} + +void +ieee80211_psq_cleanup(struct ieee80211_psq *psq) +{ +#if 0 + psq_drain(psq); /* XXX should not be needed? */ +#else + KASSERT(psq->psq_len == 0, ("%d frames on ps q", psq->psq_len)); +#endif + IEEE80211_PSQ_DESTROY(psq); /* OS-dependent cleanup */ +} + +/* + * Return the highest priority frame in the ps queue. + */ +struct mbuf * +ieee80211_node_psq_dequeue(struct ieee80211_node *ni, int *qlen) +{ + struct ieee80211_psq *psq = &ni->ni_psq; + struct ieee80211_psq_head *qhead; + struct mbuf *m; + + IEEE80211_PSQ_LOCK(psq); + qhead = &psq->psq_head[0]; +again: + if ((m = qhead->head) != NULL) { + if ((qhead->head = m->m_nextpkt) == NULL) + qhead->tail = NULL; + KASSERT(qhead->len > 0, ("qhead len %d", qhead->len)); + qhead->len--; + KASSERT(psq->psq_len > 0, ("psq len %d", psq->psq_len)); + psq->psq_len--; + m->m_nextpkt = NULL; + } + if (m == NULL && qhead == &psq->psq_head[0]) { + /* Algol-68 style for loop */ + qhead = &psq->psq_head[1]; + goto again; + } + if (qlen != NULL) + *qlen = psq->psq_len; + IEEE80211_PSQ_UNLOCK(psq); + return m; +} + +/* + * Reclaim an mbuf from the ps q. If marked with M_ENCAP + * we assume there is a node reference that must be relcaimed. + */ +static void +psq_mfree(struct mbuf *m) +{ + if (m->m_flags & M_ENCAP) { + struct ieee80211_node *ni = (void *) m->m_pkthdr.rcvif; + ieee80211_free_node(ni); + } + m->m_nextpkt = NULL; + m_freem(m); +} + /* - * Clear any frames queued on a node's power save queue. + * Clear any frames queued in the power save queue. * The number of frames that were present is returned. */ -int -ieee80211_node_saveq_drain(struct ieee80211_node *ni) +static int +psq_drain(struct ieee80211_psq *psq) { + struct ieee80211_psq_head *qhead; + struct mbuf *m; int qlen; - IEEE80211_NODE_SAVEQ_LOCK(ni); - qlen = IEEE80211_NODE_SAVEQ_QLEN(ni); - _IF_DRAIN(&ni->ni_savedq); - IEEE80211_NODE_SAVEQ_UNLOCK(ni); + IEEE80211_PSQ_LOCK(psq); + qlen = psq->psq_len; + qhead = &psq->psq_head[0]; +again: + while ((m = qhead->head) != NULL) { + qhead->head = m->m_nextpkt; + psq_mfree(m); + } + qhead->tail = NULL; + qhead->len = 0; + if (qhead == &psq->psq_head[0]) { /* Algol-68 style for loop */ + qhead = &psq->psq_head[1]; + goto again; + } + psq->psq_len = 0; + IEEE80211_PSQ_UNLOCK(psq); return qlen; } /* + * Clear any frames queued in the power save queue. + * The number of frames that were present is returned. + */ +int +ieee80211_node_psq_drain(struct ieee80211_node *ni) +{ + return psq_drain(&ni->ni_psq); +} + +/* * Age frames on the power save queue. The aging interval is * 4 times the listen interval specified by the station. This * number is factored into the age calculations when the frame @@ -127,28 +218,41 @@ * can check if it needs to adjust the tim. */ int -ieee80211_node_saveq_age(struct ieee80211_node *ni) +ieee80211_node_psq_age(struct ieee80211_node *ni) { + struct ieee80211_psq *psq = &ni->ni_psq; int discard = 0; - if (IEEE80211_NODE_SAVEQ_QLEN(ni) != 0) { + if (psq->psq_len != 0) { #ifdef IEEE80211_DEBUG struct ieee80211vap *vap = ni->ni_vap; #endif + struct ieee80211_psq_head *qhead; struct mbuf *m; - IEEE80211_NODE_SAVEQ_LOCK(ni); - while (IF_POLL(&ni->ni_savedq, m) != NULL && - M_AGE_GET(m) < IEEE80211_INACT_WAIT) { + IEEE80211_PSQ_LOCK(psq); + qhead = &psq->psq_head[0]; + again: + while ((m = qhead->head) != NULL && + M_AGE_GET(m) < IEEE80211_INACT_WAIT) { IEEE80211_NOTE(vap, IEEE80211_MSG_POWER, ni, "discard frame, age %u", M_AGE_GET(m)); - _IEEE80211_NODE_SAVEQ_DEQUEUE_HEAD(ni, m); - m_freem(m); + if ((qhead->head = m->m_nextpkt) == NULL) + qhead->tail = NULL; + KASSERT(qhead->len > 0, ("qhead len %d", qhead->len)); + qhead->len--; + KASSERT(psq->psq_len > 0, ("psq len %d", psq->psq_len)); + psq->psq_len--; + psq_mfree(m); discard++; } + if (qhead == &psq->psq_head[0]) { /* Algol-68 style for loop */ + qhead = &psq->psq_head[1]; + goto again; + } if (m != NULL) M_AGE_SUB(m, IEEE80211_INACT_WAIT); - IEEE80211_NODE_SAVEQ_UNLOCK(ni); + IEEE80211_PSQ_UNLOCK(psq); IEEE80211_NOTE(vap, IEEE80211_MSG_POWER, ni, "discard %u frames for age", discard); @@ -211,82 +315,143 @@ * The new packet is placed on the node's saved queue, and the TIM * is changed, if necessary. */ -void +int ieee80211_pwrsave(struct ieee80211_node *ni, struct mbuf *m) { + struct ieee80211_psq *psq = &ni->ni_psq; struct ieee80211vap *vap = ni->ni_vap; struct ieee80211com *ic = ni->ni_ic; + struct ieee80211_psq_head *qhead; int qlen, age; - IEEE80211_NODE_SAVEQ_LOCK(ni); - if (_IF_QFULL(&ni->ni_savedq)) { - _IF_DROP(&ni->ni_savedq); - IEEE80211_NODE_SAVEQ_UNLOCK(ni); + IEEE80211_PSQ_LOCK(psq); + if (psq->psq_len >= psq->psq_maxlen) { + psq->psq_drops++; + IEEE80211_PSQ_UNLOCK(psq); IEEE80211_NOTE(vap, IEEE80211_MSG_ANY, ni, "pwr save q overflow, drops %d (size %d)", - ni->ni_savedq.ifq_drops, IEEE80211_PS_MAX_QUEUE); + psq->psq_drops, psq->psq_len); #ifdef IEEE80211_DEBUG if (ieee80211_msg_dumppkts(vap)) ieee80211_dump_pkt(ni->ni_ic, mtod(m, caddr_t), m->m_len, -1, -1); #endif - m_freem(m); - return; + psq_mfree(m); + return ENOSPC; } /* - * Tag the frame with it's expiry time and insert - * it in the queue. The aging interval is 4 times - * the listen interval specified by the station. - * Frames that sit around too long are reclaimed - * using this information. + * Tag the frame with it's expiry time and insert it in + * the appropriate queue. The aging interval is 4 times + * the listen interval specified by the station. Frames + * that sit around too long are reclaimed using this + * information. */ /* TU -> secs. XXX handle overflow? */ age = IEEE80211_TU_TO_MS((ni->ni_intval * ic->ic_bintval) << 2) / 1000; - _IEEE80211_NODE_SAVEQ_ENQUEUE(ni, m, qlen, age); - IEEE80211_NODE_SAVEQ_UNLOCK(ni); + /* + * Encapsulated frames go on the high priority queue, + * other stuff goes on the low priority queue. We use + * this to order frames returned out of the driver + * ahead of frames we collect in ieee80211_start. + */ + if (m->m_flags & M_ENCAP) + qhead = &psq->psq_head[0]; + else + qhead = &psq->psq_head[1]; + if (qhead->tail == NULL) { + struct mbuf *mh; + + qhead->head = m; + /* + * Take care to adjust age when inserting the first + * frame of a queue and the other queue already has + * frames. We need to preserve the age difference + * relationship so ieee80211_node_psq_age works. + */ + if (qhead == &psq->psq_head[1]) { + mh = psq->psq_head[0].head; + if (mh != NULL) + age-= M_AGE_GET(mh); + } else { + mh = psq->psq_head[1].head; + if (mh != NULL) { + int nage = M_AGE_GET(mh) - age; + /* XXX is clamping to zero good 'nuf? */ + M_AGE_SET(mh, nage < 0 ? 0 : nage); + } + } + } else { + qhead->tail->m_nextpkt = m; + age -= M_AGE_GET(qhead->head); + } + KASSERT(age >= 0, ("age %d", age)); + M_AGE_SET(m, age); + m->m_nextpkt = NULL; + qhead->tail = m; + qhead->len++; + qlen = ++(psq->psq_len); + IEEE80211_PSQ_UNLOCK(psq); IEEE80211_NOTE(vap, IEEE80211_MSG_POWER, ni, "save frame with age %d, %u now queued", age, qlen); if (qlen == 1 && vap->iv_set_tim != NULL) vap->iv_set_tim(ni, 1); + + return 0; } /* - * Unload the frames from the ps q but don't send them - * to the driver yet. We do this in two stages to minimize - * locking but also because there's no easy way to preserve - * ordering given the existing ifnet access mechanisms. - * XXX could be optimized + * Move frames from the ps q to the vap's send queue + * and/or the driver's send queue; and kick the start + * method for each, as appropriate. Note we're careful + * to preserve packet ordering here. */ static void pwrsave_flushq(struct ieee80211_node *ni) { - struct mbuf *m, *mhead, *mtail; - int mcount; + struct ieee80211_psq *psq = &ni->ni_psq; + struct ieee80211vap *vap = ni->ni_vap; + struct ieee80211_psq_head *qhead; + struct ifnet *parent, *ifp; + + IEEE80211_NOTE(vap, IEEE80211_MSG_POWER, ni, + "flush ps queue, %u packets queued", psq->psq_len); + + IEEE80211_PSQ_LOCK(psq); + qhead = &psq->psq_head[0]; /* 802.11 frames */ + if (qhead->head != NULL) { + /* XXX could dispatch through vap and check M_ENCAP */ + parent = vap->iv_ic->ic_ifp; + /* XXX need different driver interface */ + /* XXX bypasses q max and OACTIVE */ + IF_PREPEND_LIST(&parent->if_snd, qhead->head, qhead->tail, + qhead->len); + qhead->head = qhead->tail = NULL; + qhead->len = 0; + } else + parent = NULL; - IEEE80211_NODE_SAVEQ_LOCK(ni); - mcount = IEEE80211_NODE_SAVEQ_QLEN(ni); - mhead = mtail = NULL; - for (;;) { - _IEEE80211_NODE_SAVEQ_DEQUEUE_HEAD(ni, m); - if (m == NULL) - break; - if (mhead == NULL) { - mhead = m; - m->m_nextpkt = NULL; - } else - mtail->m_nextpkt = m; - mtail = m; - } - IEEE80211_NODE_SAVEQ_UNLOCK(ni); - if (mhead != NULL) { + qhead = &psq->psq_head[1]; /* 802.3 frames */ + if (qhead->head != NULL) { + ifp = vap->iv_ifp; /* XXX need different driver interface */ /* XXX bypasses q max and OACTIVE */ - struct ifnet *ifp = ni->ni_vap->iv_ifp; - IF_PREPEND_LIST(&ifp->if_snd, mhead, mtail, mcount); + IF_PREPEND_LIST(&ifp->if_snd, qhead->head, qhead->tail, + qhead->len); + qhead->head = qhead->tail = NULL; + qhead->len = 0; + } else + ifp = NULL; + psq->psq_len = 0; + IEEE80211_PSQ_UNLOCK(psq); + + /* NB: do this outside the psq lock */ + /* XXX packets might get reordered if parent is OACTIVE */ + if (parent != NULL) + if_start(parent); + if (ifp != NULL) if_start(ifp); - } } /* @@ -326,7 +491,8 @@ /* NB if no sta's in ps, driver should flush mc q */ vap->iv_update_ps(vap, vap->iv_ps_sta); } - pwrsave_flushq(ni); + if (ni->ni_psq.psq_len != 0) + pwrsave_flushq(ni); } } @@ -337,7 +503,6 @@ ieee80211_sta_pwrsave(struct ieee80211vap *vap, int enable) { struct ieee80211_node *ni = vap->iv_bss; - int qlen; if (!((enable != 0) ^ ((ni->ni_flags & IEEE80211_NODE_PWR_MGT) != 0))) return; @@ -353,12 +518,8 @@ * data frame we send the ap. * XXX can we use a data frame to take us out of ps? */ - qlen = IEEE80211_NODE_SAVEQ_QLEN(ni); - if (qlen != 0) { - IEEE80211_NOTE(vap, IEEE80211_MSG_POWER, ni, - "flush ps queue, %u packets queued", qlen); + if (ni->ni_psq.psq_len != 0) pwrsave_flushq(ni); - } } else { ni->ni_flags |= IEEE80211_NODE_PWR_MGT; ieee80211_send_nulldata(ieee80211_ref_node(ni)); ==== //depot/projects/vap/sys/net80211/ieee80211_power.h#8 (text+ko) ==== @@ -28,16 +28,50 @@ #define _NET80211_IEEE80211_POWER_H_ struct ieee80211com; +struct ieee80211vap; +struct ieee80211_node; +struct mbuf; + +/* + * Power save packet queues. There are two queues, one + * for frames coming from the net80211 layer and the other + * for frames that come from the driver. Frames from the + * driver are expected to have M_ENCAP marked to indicate + * they have already been encapsulated and are treated as + * higher priority: they are sent first when flushing the + * queue on a power save state change or in response to a + * ps-poll frame. + * + * Note that frames sent from the high priority queue are + * fed directly to the driver without going through + * ieee80211_start again; drivers that send up encap'd + * frames are required to handle them when they come back. + */ +struct ieee80211_psq { + ieee80211_psq_lock_t psq_lock; + int psq_len; + int psq_maxlen; + int psq_drops; + struct ieee80211_psq_head { + struct mbuf *head; + struct mbuf *tail; + int len; + } psq_head[2]; /* 2 priorities */ +}; +void ieee80211_psq_init(struct ieee80211_psq *, const char *); +void ieee80211_psq_cleanup(struct ieee80211_psq *); + void ieee80211_power_attach(struct ieee80211com *); void ieee80211_power_detach(struct ieee80211com *); void ieee80211_power_vattach(struct ieee80211vap *); void ieee80211_power_vdetach(struct ieee80211vap *); void ieee80211_power_latevattach(struct ieee80211vap *); -int ieee80211_node_saveq_drain(struct ieee80211_node *); -int ieee80211_node_saveq_age(struct ieee80211_node *); -void ieee80211_pwrsave(struct ieee80211_node *, struct mbuf *); +struct mbuf *ieee80211_node_psq_dequeue(struct ieee80211_node *ni, int *qlen); +int ieee80211_node_psq_drain(struct ieee80211_node *); +int ieee80211_node_psq_age(struct ieee80211_node *); +int ieee80211_pwrsave(struct ieee80211_node *, struct mbuf *); void ieee80211_node_pwrsave(struct ieee80211_node *, int enable); void ieee80211_sta_pwrsave(struct ieee80211vap *, int enable); ==== //depot/projects/vap/sys/net80211/ieee80211_var.h#51 (text+ko) ==== @@ -47,8 +47,8 @@ #include #include #include /* for ieee80211_stats */ +#include #include -#include #include #include From owner-p4-projects@FreeBSD.ORG Sat Sep 6 00:34:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E4296106567E; Sat, 6 Sep 2008 00:34: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 A85E3106567A for ; Sat, 6 Sep 2008 00:34:13 +0000 (UTC) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9041C8FC0A for ; Sat, 6 Sep 2008 00:34:13 +0000 (UTC) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m860YD3q041027 for ; Sat, 6 Sep 2008 00:34:13 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m860YCNB041019 for perforce@freebsd.org; Sat, 6 Sep 2008 00:34:12 GMT (envelope-from wsalamon@computer.org) Date: Sat, 6 Sep 2008 00:34:12 GMT Message-Id: <200809060034.m860YCNB041019@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 149299 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Sep 2008 00:34:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=149299 Change 149299 by wsalamon@vh2 on 2008/09/06 00:33:31 Use an sbuf when composing the string that the MAC framework sends to the Audit system on behalf of a policy that is annotating an audit record. Affected files ... .. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac/mac_audit.c#5 edit Differences ... ==== //depot/projects/trustedbsd/audit_mac/src/sys/security/mac/mac_audit.c#5 (text+ko) ==== @@ -42,6 +42,7 @@ #include #include #include +#include #include #include @@ -118,13 +119,12 @@ int mac_audit_text(char *text, struct mac_policy_conf *mpc) { - char *sanitized; - const char *name; - int i, size, plen, len; + struct sbuf sb; + char *buf; + int i, size, plen, len, ret; - name = mpc->mpc_name; len = strlen(text); - plen = 2 + strlen(name); + plen = 2 + strlen(mpc->mpc_name); /* 2 chars for the ": " below */ if (plen + len >= MAC_AUDIT_DATA_LIMIT) return (EINVAL); @@ -137,14 +137,17 @@ return (EINVAL); size = len + plen + 1; - /* XXX Should we use a malloc area for MAC storage (M_AUDITMAC)? */ - sanitized = (char *)malloc(size, M_TEMP, M_WAITOK); + buf = (char *)malloc(size, M_TEMP, M_WAITOK); + sbuf_new(&sb, buf, size, SBUF_FIXEDLEN); - strcpy(sanitized, name); - strcat(sanitized, ": "); - strcat(sanitized, text); + sbuf_printf(&sb, "%s: %s", mpc->mpc_name, text); + sbuf_finish(&sb); - return (audit_mac_data(MAC_AUDIT_TEXT_TYPE, size, sanitized)); + /* The data buffer is free'd in the Audit side */ + ret = audit_mac_data(MAC_AUDIT_TEXT_TYPE, sbuf_len(&sb), + sbuf_data(&sb)); + sbuf_delete(&sb); + return (ret); } int From owner-p4-projects@FreeBSD.ORG Sat Sep 6 10:26:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CB20A106568D; Sat, 6 Sep 2008 10:26: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 8DE3E1065676 for ; Sat, 6 Sep 2008 10:26:16 +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 819108FC16 for ; Sat, 6 Sep 2008 10:26:16 +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 m86AQGGk003971 for ; Sat, 6 Sep 2008 10:26:16 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m86AQGip003937 for perforce@freebsd.org; Sat, 6 Sep 2008 10:26:16 GMT (envelope-from ed@FreeBSD.org) Date: Sat, 6 Sep 2008 10:26:16 GMT Message-Id: <200809061026.m86AQGip003937@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 149307 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Sep 2008 10:26:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=149307 Change 149307 by ed@ed_dull on 2008/09/06 10:25:45 IFC. Maybe this will remove the $P4$ expansion in sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu. Affected files ... .. //depot/projects/mpsafetty/lib/libarchive/archive_entry_link_resolver.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/archive_write_disk.c#5 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_write_disk.c#5 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_write_disk_hardlink.c#4 integrate .. //depot/projects/mpsafetty/lib/libc/regex/re_format.7#2 integrate .. //depot/projects/mpsafetty/lib/libc/stdlib/malloc.c#6 integrate .. //depot/projects/mpsafetty/share/man/man4/Makefile#11 integrate .. //depot/projects/mpsafetty/share/man/man9/CTASSERT.9#2 integrate .. //depot/projects/mpsafetty/sys/arm/at91/at91.c#3 integrate .. //depot/projects/mpsafetty/sys/arm/at91/at91_mci.c#2 integrate .. //depot/projects/mpsafetty/sys/arm/at91/at91_ssc.c#2 integrate .. //depot/projects/mpsafetty/sys/arm/at91/kb920x_machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/boot/sparc64/loader/main.c#5 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#3 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#4 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/wisoc.hal.o.uu#1 branch .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/wisoc.inc#1 branch .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/wisoc.opt_ah.h#1 branch .. //depot/projects/mpsafetty/sys/dev/re/if_re.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/usb/if_zyd.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb/ucom.c#6 integrate .. //depot/projects/mpsafetty/sys/dev/usb/ucomvar.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb/usbdevs#8 integrate .. //depot/projects/mpsafetty/sys/geom/part/g_part.c#3 integrate .. //depot/projects/mpsafetty/sys/geom/part/g_part.h#2 integrate .. //depot/projects/mpsafetty/sys/geom/part/g_part_gpt.c#2 integrate .. //depot/projects/mpsafetty/sys/i386/include/pmc_mdep.h#2 integrate .. //depot/projects/mpsafetty/sys/kern/kern_resource.c#4 integrate .. //depot/projects/mpsafetty/sys/kern/uipc_mbuf.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/uipc_mqueue.c#3 integrate .. //depot/projects/mpsafetty/sys/net/route.h#2 integrate .. //depot/projects/mpsafetty/sys/netinet/if_ether.c#5 integrate .. //depot/projects/mpsafetty/sys/sparc64/include/cpu.h#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/include/dcr.h#1 branch .. //depot/projects/mpsafetty/sys/sparc64/include/trap.h#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/include/tte.h#3 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/cheetah.c#4 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/exception.S#5 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/genassym.c#3 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/machdep.c#4 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/mp_machdep.c#5 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/pmap.c#3 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/trap.c#4 integrate .. //depot/projects/mpsafetty/sys/sys/gpt.h#2 integrate Differences ... ==== //depot/projects/mpsafetty/lib/libarchive/archive_entry_link_resolver.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_link_resolver.c,v 1.3 2008/06/15 04:31:43 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_link_resolver.c,v 1.4 2008/09/05 06:15:25 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -189,7 +189,7 @@ case ARCHIVE_ENTRY_LINKIFY_LIKE_TAR: le = find_entry(res, *e); if (le != NULL) { - archive_entry_set_size(*e, 0); + archive_entry_unset_size(*e); archive_entry_copy_hardlink(*e, archive_entry_pathname(le->canonical)); } else @@ -217,7 +217,7 @@ *e = le->entry; le->entry = t; /* Make the old entry into a hardlink. */ - archive_entry_set_size(*e, 0); + archive_entry_unset_size(*e); archive_entry_copy_hardlink(*e, archive_entry_pathname(le->canonical)); /* If we ran out of links, return the ==== //depot/projects/mpsafetty/lib/libarchive/archive_write_disk.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.33 2008/09/01 02:50:24 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.35 2008/09/05 06:13:11 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include @@ -176,7 +176,7 @@ int fd; /* Current offset for writing data to the file. */ off_t offset; - /* Maximum size of file. */ + /* Maximum size of file, -1 if unknown. */ off_t filesize; /* Dir we were in before this restore; only for deep paths. */ int restore_pwd; @@ -231,8 +231,9 @@ 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); +static ssize_t write_data_block(struct archive_write_disk *, + const char *, size_t, off_t); - static struct archive_vtable *archive_write_disk_vtable(void); static int _archive_write_close(struct archive *); @@ -337,7 +338,10 @@ a->offset = 0; a->uid = a->user_uid; a->mode = archive_entry_mode(a->entry); - a->filesize = archive_entry_size(a->entry); + if (archive_entry_size_is_set(a->entry)) + a->filesize = archive_entry_size(a->entry); + else + a->filesize = -1; archive_strcpy(&(a->_name_data), archive_entry_pathname(a->entry)); a->name = a->_name_data.s; archive_clear_error(&a->archive); @@ -439,15 +443,25 @@ fe->mode = a->mode; } - if (a->deferred & TODO_TIMES) { + if ((a->deferred & TODO_TIMES) + && (archive_entry_mtime_is_set(entry) + || archive_entry_atime_is_set(entry))) { fe = current_fixup(a, archive_entry_pathname(entry)); fe->fixup |= TODO_TIMES; - fe->mtime = archive_entry_mtime(entry); - fe->mtime_nanos = archive_entry_mtime_nsec(entry); - fe->atime = archive_entry_atime(entry); - fe->atime_nanos = archive_entry_atime_nsec(entry); - if (fe->atime == 0 && 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 { + 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); + } else { fe->atime = a->start_time; + fe->atime_nanos = 0; + } } if (a->deferred & TODO_FFLAGS) { @@ -486,89 +500,113 @@ } static ssize_t -_archive_write_data_block(struct archive *_a, - const void *buff, size_t size, off_t offset) +write_data_block(struct archive_write_disk *a, + const char *buff, size_t size, off_t offset) { - struct archive_write_disk *a = (struct archive_write_disk *)_a; ssize_t bytes_written = 0; - ssize_t block_size, bytes_to_write; - int r = ARCHIVE_OK; + ssize_t block_size = 0, bytes_to_write; + int r; - __archive_check_magic(&a->archive, ARCHIVE_WRITE_DISK_MAGIC, - ARCHIVE_STATE_DATA, "archive_write_disk_block"); - if (a->fd < 0) { - archive_set_error(&a->archive, 0, "File not open"); + if (a->filesize == 0 || a->fd < 0) { + archive_set_error(&a->archive, 0, + "Attempt to write to an empty file"); return (ARCHIVE_WARN); } - archive_clear_error(&a->archive); if (a->flags & ARCHIVE_EXTRACT_SPARSE) { if ((r = _archive_write_disk_lazy_stat(a)) != ARCHIVE_OK) return (r); block_size = a->pst->st_blksize; - } else - block_size = -1; + } - if ((off_t)(offset + size) > a->filesize) { - size = (size_t)(a->filesize - a->offset); - archive_set_error(&a->archive, 0, - "Write request too large"); - r = ARCHIVE_WARN; - } + if (a->filesize >= 0 && (off_t)(offset + size) > a->filesize) + size = (size_t)(a->filesize - offset); /* Write the data. */ while (size > 0) { - if (block_size != -1) { - const char *buf; + if (block_size == 0) { + bytes_to_write = size; + } else { + /* We're sparsifying the file. */ + const char *p, *end; + off_t block_end; - for (buf = buff; size; ++buf, --size, ++offset) { - if (*buf != '\0') + /* Skip leading zero bytes. */ + for (p = buff, end = buff + size; p < end; ++p) { + if (*p != '\0') break; } + offset += p - buff; + size -= p - buff; + buff = p; if (size == 0) break; - bytes_to_write = block_size - offset % block_size; - buff = buf; - } else + + /* Calculate next block boundary after offset. */ + block_end + = (offset / block_size) * block_size + block_size; + + /* If the adjusted write would cross block boundary, + * truncate it to the block boundary. */ bytes_to_write = size; + if (offset + bytes_to_write > block_end) + bytes_to_write = block_end - offset; + } + /* Seek if necessary to the specified offset. */ if (offset != a->last_offset) { if (lseek(a->fd, offset, SEEK_SET) < 0) { - archive_set_error(&a->archive, errno, "Seek failed"); + archive_set_error(&a->archive, errno, + "Seek failed"); return (ARCHIVE_FATAL); } } - bytes_written = write(a->fd, buff, size); + bytes_written = write(a->fd, buff, bytes_to_write); if (bytes_written < 0) { archive_set_error(&a->archive, errno, "Write failed"); return (ARCHIVE_WARN); } - buff = (const char *)buff + bytes_written; + buff += bytes_written; size -= bytes_written; offset += bytes_written; a->archive.file_position += bytes_written; a->archive.raw_position += bytes_written; a->last_offset = a->offset = offset; } - a->offset = offset; - return (r); + return (bytes_written); +} + +static ssize_t +_archive_write_data_block(struct archive *_a, + const void *buff, size_t size, off_t offset) +{ + struct archive_write_disk *a = (struct archive_write_disk *)_a; + ssize_t r; + + __archive_check_magic(&a->archive, ARCHIVE_WRITE_DISK_MAGIC, + ARCHIVE_STATE_DATA, "archive_write_disk_block"); + + r = write_data_block(a, buff, size, offset); + + if (r < 0) + return (r); + if ((size_t)r < size) { + archive_set_error(&a->archive, 0, + "Write request too large"); + return (ARCHIVE_WARN); + } + return (ARCHIVE_OK); } static ssize_t _archive_write_data(struct archive *_a, const void *buff, size_t size) { struct archive_write_disk *a = (struct archive_write_disk *)_a; - int r; __archive_check_magic(&a->archive, ARCHIVE_WRITE_DISK_MAGIC, ARCHIVE_STATE_DATA, "archive_write_data"); - if (a->fd < 0) - return (ARCHIVE_OK); - r = _archive_write_data_block(_a, buff, size, a->offset); - if (r < ARCHIVE_OK) - return (r); - return size; + return (write_data_block(a, buff, size, a->offset)); } static int @@ -584,7 +622,15 @@ return (ARCHIVE_OK); archive_clear_error(&a->archive); - if (a->last_offset != a->filesize && a->fd >= 0) { + /* Pad or truncate file to the right size. */ + if (a->fd < 0) { + /* There's no file. */ + } else if (a->filesize < 0) { + /* File size is unknown, so we can't set the size. */ + } else if (a->last_offset == a->filesize) { + /* Last write ended at exactly the filesize; we're done. */ + /* Hopefully, this is the common case. */ + } else { if (ftruncate(a->fd, a->filesize) == -1 && a->filesize == 0) { archive_set_error(&a->archive, errno, @@ -601,7 +647,8 @@ if (a->st.st_size != a->filesize) { const char nul = '\0'; if (lseek(a->fd, a->st.st_size - 1, SEEK_SET) < 0) { - archive_set_error(&a->archive, errno, "Seek failed"); + archive_set_error(&a->archive, errno, + "Seek failed"); return (ARCHIVE_FATAL); } if (write(a->fd, &nul, 1) < 0) { @@ -609,6 +656,7 @@ "Write to restore size failed"); return (ARCHIVE_FATAL); } + a->pst = NULL; } } @@ -963,7 +1011,7 @@ * If the hardlink does carry data, let the last * archive entry decide ownership. */ - if (r == 0 && a->filesize == 0) { + if (r == 0 && a->filesize <= 0) { a->todo = 0; a->deferred = 0; } if (r == 0 && a->filesize > 0) { @@ -1623,18 +1671,31 @@ { struct timeval times[2]; - times[1].tv_sec = archive_entry_mtime(a->entry); - times[1].tv_usec = archive_entry_mtime_nsec(a->entry) / 1000; + /* 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); - times[0].tv_sec = archive_entry_atime(a->entry); - times[0].tv_usec = archive_entry_atime_nsec(a->entry) / 1000; + /* 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; + } /* 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 (times[0].tv_sec == 0 && times[0].tv_usec == 0) + 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) { @@ -1672,10 +1733,24 @@ { struct utimbuf times; - times.modtime = archive_entry_mtime(a->entry); - times.actime = archive_entry_atime(a->entry); - if (times.actime == 0) + /* 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... */ + /* 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; + + /* 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 (!S_ISLNK(a->mode) && utime(a->name, ×) != 0) { archive_set_error(&a->archive, errno, "Can't update time for %s", a->name); ==== //depot/projects/mpsafetty/lib/libarchive/test/test_write_disk.c#5 (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.13 2008/09/01 05:38:33 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk.c,v 1.14 2008/09/05 06:13:11 kientzle Exp $"); #if ARCHIVE_VERSION_NUMBER >= 1009000 @@ -84,7 +84,7 @@ * the entry being a maximum size. */ archive_entry_set_size(ae, sizeof(data)); - archive_entry_set_mtime(ae, 123456789, 0); + archive_entry_set_mtime(ae, 123456789, 0); assertEqualIntA(ad, 0, archive_write_header(ad, ae)); assertEqualInt(sizeof(data), archive_write_data(ad, data, sizeof(data))); assertEqualIntA(ad, 0, archive_write_finish_entry(ad)); @@ -152,8 +152,63 @@ free(compare); free(data); } + +static void create_reg_file3(struct archive_entry *ae, const char *msg) +{ + static const char data[]="abcdefghijklmnopqrstuvwxyz"; + struct archive *ad; + struct stat st; + + /* Write the entry to disk. */ + assert((ad = archive_write_disk_new()) != NULL); + failure("%s", msg); + /* Set the size smaller than the data and verify the truncation. */ + archive_entry_set_size(ae, 5); + assertEqualIntA(ad, 0, archive_write_header(ad, ae)); + assertEqualInt(5, archive_write_data(ad, data, sizeof(data))); + assertEqualIntA(ad, 0, archive_write_finish_entry(ad)); +#if ARCHIVE_VERSION_NUMBER < 2000000 + archive_write_finish(ad); +#else + assertEqualInt(0, archive_write_finish(ad)); #endif + /* Test the entry on disk. */ + assert(0 == stat(archive_entry_pathname(ae), &st)); + failure("st.st_mode=%o archive_entry_mode(ae)=%o", + st.st_mode, archive_entry_mode(ae)); + assertEqualInt(st.st_mode, (archive_entry_mode(ae) & ~UMASK)); + assertEqualInt(st.st_size, 5); +} + + +static void create_reg_file4(struct archive_entry *ae, const char *msg) +{ + static const char data[]="abcdefghijklmnopqrstuvwxyz"; + struct archive *ad; + struct stat st; + /* Write the entry to disk. */ + assert((ad = archive_write_disk_new()) != NULL); + /* Leave the size unset. The data should not be truncated. */ + assertEqualIntA(ad, 0, archive_write_header(ad, ae)); + assertEqualInt(ARCHIVE_OK, + archive_write_data_block(ad, data, sizeof(data), 0)); + assertEqualIntA(ad, 0, archive_write_finish_entry(ad)); +#if ARCHIVE_VERSION_NUMBER < 2000000 + archive_write_finish(ad); +#else + assertEqualInt(0, archive_write_finish(ad)); +#endif + /* Test the entry on disk. */ + assert(0 == stat(archive_entry_pathname(ae), &st)); + failure("st.st_mode=%o archive_entry_mode(ae)=%o", + st.st_mode, archive_entry_mode(ae)); + assertEqualInt(st.st_mode, (archive_entry_mode(ae) & ~UMASK)); + failure(msg); + assertEqualInt(st.st_size, sizeof(data)); +} +#endif + DEFINE_TEST(test_write_disk) { #if ARCHIVE_VERSION_NUMBER < 1009000 @@ -178,6 +233,20 @@ create_reg_file2(ae, "Test creating another regular file"); archive_entry_free(ae); + /* A regular file with a size restriction */ + assert((ae = archive_entry_new()) != NULL); + archive_entry_copy_pathname(ae, "file3"); + archive_entry_set_mode(ae, S_IFREG | 0755); + create_reg_file3(ae, "Regular file with size restriction"); + archive_entry_free(ae); + + /* A regular file with an unspecified size */ + assert((ae = archive_entry_new()) != NULL); + archive_entry_copy_pathname(ae, "file3"); + archive_entry_set_mode(ae, S_IFREG | 0755); + create_reg_file4(ae, "Regular file with unspecified size"); + archive_entry_free(ae); + /* A regular file over an existing file */ assert((ae = archive_entry_new()) != NULL); archive_entry_copy_pathname(ae, "file"); ==== //depot/projects/mpsafetty/lib/libarchive/test/test_write_disk_hardlink.c#4 (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_hardlink.c,v 1.4 2008/09/01 05:38:33 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk_hardlink.c,v 1.5 2008/09/05 06:13:11 kientzle Exp $"); #define UMASK 022 @@ -61,18 +61,48 @@ archive_entry_set_mode(ae, S_IFREG | 0755); archive_entry_set_size(ae, sizeof(data)); assertEqualIntA(ad, 0, archive_write_header(ad, ae)); - assertEqualInt(sizeof(data), archive_write_data(ad, data, sizeof(data))); + assertEqualInt(sizeof(data), + archive_write_data(ad, data, sizeof(data))); assertEqualIntA(ad, 0, archive_write_finish_entry(ad)); archive_entry_free(ae); - /* Link. */ + /* Link. Size of zero means this doesn't carry data. */ assert((ae = archive_entry_new()) != NULL); archive_entry_copy_pathname(ae, "link1b"); - archive_entry_set_mode(ae, S_IFREG | 0600); + archive_entry_set_mode(ae, S_IFREG | 0642); archive_entry_set_size(ae, 0); archive_entry_copy_hardlink(ae, "link1a"); assertEqualIntA(ad, 0, archive_write_header(ad, ae)); - assertEqualInt(0, archive_write_data(ad, data, sizeof(data))); + assertEqualInt(ARCHIVE_WARN, + archive_write_data(ad, data, sizeof(data))); + assertEqualIntA(ad, 0, archive_write_finish_entry(ad)); + archive_entry_free(ae); + + /* + * Repeat tar approach test, but use unset to mark the + * hardlink as having no data. + */ + + /* Regular file. */ + assert((ae = archive_entry_new()) != NULL); + archive_entry_copy_pathname(ae, "link2a"); + archive_entry_set_mode(ae, S_IFREG | 0755); + archive_entry_set_size(ae, sizeof(data)); + assertEqualIntA(ad, 0, archive_write_header(ad, ae)); + assertEqualInt(sizeof(data), + archive_write_data(ad, data, sizeof(data))); + assertEqualIntA(ad, 0, archive_write_finish_entry(ad)); + archive_entry_free(ae); + + /* Link. Unset size means this doesn't carry data. */ + assert((ae = archive_entry_new()) != NULL); + archive_entry_copy_pathname(ae, "link2b"); + archive_entry_set_mode(ae, S_IFREG | 0642); + archive_entry_unset_size(ae); + archive_entry_copy_hardlink(ae, "link2a"); + assertEqualIntA(ad, 0, archive_write_header(ad, ae)); + assertEqualInt(ARCHIVE_WARN, + archive_write_data(ad, data, sizeof(data))); assertEqualIntA(ad, 0, archive_write_finish_entry(ad)); archive_entry_free(ae); @@ -83,7 +113,7 @@ /* Regular file. */ assert((ae = archive_entry_new()) != NULL); - archive_entry_copy_pathname(ae, "link2a"); + archive_entry_copy_pathname(ae, "link3a"); archive_entry_set_mode(ae, S_IFREG | 0600); archive_entry_set_size(ae, sizeof(data)); assertEqualIntA(ad, 0, archive_write_header(ad, ae)); @@ -93,10 +123,10 @@ /* Link. */ assert((ae = archive_entry_new()) != NULL); - archive_entry_copy_pathname(ae, "link2b"); + archive_entry_copy_pathname(ae, "link3b"); archive_entry_set_mode(ae, S_IFREG | 0755); archive_entry_set_size(ae, sizeof(data)); - archive_entry_copy_hardlink(ae, "link2a"); + archive_entry_copy_hardlink(ae, "link3a"); assertEqualIntA(ad, 0, archive_write_header(ad, ae)); assertEqualInt(sizeof(data), archive_write_data(ad, data, sizeof(data))); assertEqualIntA(ad, 0, archive_write_finish_entry(ad)); @@ -109,7 +139,7 @@ /* Regular file. */ assert((ae = archive_entry_new()) != NULL); - archive_entry_copy_pathname(ae, "link3a"); + archive_entry_copy_pathname(ae, "link4a"); archive_entry_set_mode(ae, S_IFREG | 0600); archive_entry_set_size(ae, 0); assertEqualIntA(ad, 0, archive_write_header(ad, ae)); @@ -123,10 +153,10 @@ /* Link. */ assert((ae = archive_entry_new()) != NULL); - archive_entry_copy_pathname(ae, "link3b"); + archive_entry_copy_pathname(ae, "link4b"); archive_entry_set_mode(ae, S_IFREG | 0755); archive_entry_set_size(ae, sizeof(data)); - archive_entry_copy_hardlink(ae, "link3a"); + archive_entry_copy_hardlink(ae, "link4a"); assertEqualIntA(ad, 0, archive_write_header(ad, ae)); assertEqualInt(sizeof(data), archive_write_data(ad, data, sizeof(data))); assertEqualIntA(ad, 0, archive_write_finish_entry(ad)); @@ -138,36 +168,63 @@ #endif /* Test the entries on disk. */ + + /* Test #1 */ assert(0 == stat("link1a", &st)); + /* If the hardlink was successfully created and the archive + * doesn't carry data for it, we consider it to be + * non-authoritive for meta data as well. This is consistent + * with GNU tar and BSD pax. */ assertEqualInt(st.st_mode, (S_IFREG | 0755) & ~UMASK); assertEqualInt(st.st_size, sizeof(data)); assertEqualInt(st.st_nlink, 2); assert(0 == stat("link1b", &st2)); - assertEqualInt(st2.st_mode, (S_IFREG | 0755) & ~UMASK); - assertEqualInt(st2.st_size, sizeof(data)); - assertEqualInt(st2.st_nlink, 2); + assertEqualInt(st.st_mode, st2.st_mode); + assertEqualInt(st.st_size, st2.st_size); + assertEqualInt(st.st_nlink, st2.st_nlink); assertEqualInt(st.st_ino, st2.st_ino); assertEqualInt(st.st_dev, st2.st_dev); + /* Test #2: Should produce identical results to test #1 */ + /* Note that marking a hardlink with size = 0 is treated the + * same as having an unset size. This is partly for backwards + * compatibility (we used to not have unset tracking, so + * relied on size == 0) and partly to match the model used by + * common file formats that store a size of zero for + * hardlinks. */ assert(0 == stat("link2a", &st)); assertEqualInt(st.st_mode, (S_IFREG | 0755) & ~UMASK); assertEqualInt(st.st_size, sizeof(data)); assertEqualInt(st.st_nlink, 2); assert(0 == stat("link2b", &st2)); + assertEqualInt(st.st_mode, st2.st_mode); + assertEqualInt(st.st_size, st2.st_size); + assertEqualInt(st.st_nlink, st2.st_nlink); + assertEqualInt(st.st_ino, st2.st_ino); + assertEqualInt(st.st_dev, st2.st_dev); + + /* Test #3 */ + assert(0 == stat("link3a", &st)); + assertEqualInt(st.st_mode, (S_IFREG | 0755) & ~UMASK); + assertEqualInt(st.st_size, sizeof(data)); + assertEqualInt(st.st_nlink, 2); + + assert(0 == stat("link3b", &st2)); assertEqualInt(st2.st_mode, (S_IFREG | 0755) & ~UMASK); assertEqualInt(st2.st_size, sizeof(data)); assertEqualInt(st2.st_nlink, 2); assertEqualInt(st.st_ino, st2.st_ino); assertEqualInt(st.st_dev, st2.st_dev); - assert(0 == stat("link3a", &st)); + /* Test #4 */ + assert(0 == stat("link4a", &st)); assertEqualInt(st.st_mode, (S_IFREG | 0755) & ~UMASK); assertEqualInt(st.st_size, sizeof(data)); assertEqualInt(st.st_nlink, 2); - assert(0 == stat("link3b", &st2)); + assert(0 == stat("link4b", &st2)); assertEqualInt(st2.st_mode, (S_IFREG | 0755) & ~UMASK); assertEqualInt(st2.st_size, sizeof(data)); assertEqualInt(st2.st_nlink, 2); ==== //depot/projects/mpsafetty/lib/libc/regex/re_format.7#2 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)re_format.7 8.3 (Berkeley) 3/20/94 -.\" $FreeBSD: src/lib/libc/regex/re_format.7,v 1.11 2004/07/02 23:52:12 ru Exp $ +.\" $FreeBSD: src/lib/libc/regex/re_format.7,v 1.12 2008/09/05 17:41:20 keramida Exp $ .\" .Dd March 20, 1994 .Dt RE_FORMAT 7 @@ -288,6 +288,14 @@ A locale may provide others. A character class may not be used as an endpoint of a range. .Pp +A bracketed expression like +.Ql [[:class:]] +can be used to match a single character that belongs to a character +class. +The reverse, matching any character that does not belong to a specific +class, the negation operator of bracket expressions may be used: +.Ql [^[:class:]] . +.Pp There are two special cases\(dd of bracket expressions: the bracket expressions .Ql [[:<:]] ==== //depot/projects/mpsafetty/lib/libc/stdlib/malloc.c#6 (text+ko) ==== @@ -156,7 +156,7 @@ #define MALLOC_DSS #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.177 2008/08/27 02:00:53 jasone Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.178 2008/09/06 05:26:31 marcel Exp $"); #include "libc_private.h" #ifdef MALLOC_DEBUG @@ -226,7 +226,7 @@ # define CPU_SPINWAIT __asm__ volatile("pause") #endif #ifdef __ia64__ -# define PAGESIZE_2POW 12 +# define PAGESIZE_2POW 13 # define QUANTUM_2POW 4 # define SIZEOF_PTR_2POW 3 #endif ==== //depot/projects/mpsafetty/share/man/man4/Makefile#11 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.430 2008/08/25 02:05:04 imp Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.431 2008/09/04 20:45:36 brueffer Exp $ MAN= aac.4 \ acpi.4 \ @@ -148,6 +148,7 @@ iwi.4 \ iwn.4 \ ixgb.4 \ + ixgbe.4 \ jme.4 \ joy.4 \ ${_k8temp.4} \ @@ -492,6 +493,7 @@ MLINKS+=ipw.4 if_ipw.4 MLINKS+=iwi.4 if_iwi.4 MLINKS+=ixgb.4 if_ixgb.4 +MLINKS+=ixgbe.4 if_ixgbe.4 MLINKS+=kue.4 if_kue.4 MLINKS+=lagg.4 trunk.4 MLINKS+=le.4 if_le.4 ==== //depot/projects/mpsafetty/share/man/man9/CTASSERT.9#2 (text+ko) ==== @@ -24,9 +24,9 @@ .\" (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/CTASSERT.9,v 1.2 2003/05/30 21:13:32 ru Exp $ +.\" $FreeBSD: src/share/man/man9/CTASSERT.9,v 1.3 2008/09/05 15:24:54 emaste Exp $ .\" -.Dd May 15, 2003 +.Dd September 5, 2008 .Os .Dt CTASSERT 9 .Sh NAME @@ -48,6 +48,14 @@ macro is useful for asserting the size or alignment of important data structures and variables during compilation, which would otherwise cause the code to fail at run time. +.Sh IMPLEMENTATION NOTES +The +.Fn CTASSERT +macro should not be used in a header file. +It is implemented using a dummy typedef, with a name (based on line number) +that may conflict with a +.Fn CTASSERT +in a source file including that header. .Sh EXAMPLES Assert that the size of the .Vt uuid ==== //depot/projects/mpsafetty/sys/arm/at91/at91.c#3 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.17 2008/08/19 22:15:14 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.18 2008/09/05 22:27:10 imp Exp $"); #include #include @@ -458,10 +458,6 @@ sc->sc_irq_rman.rm_descr = "AT91 IRQs"; sc->sc_mem_rman.rm_type = RMAN_ARRAY; sc->sc_mem_rman.rm_descr = "AT91 Memory"; -#if 0 - sc->sc_usbmem_rman.rm_type = RMAN_ARRAY; - sc->sc_usbmem_rman.rm_descr = "AT91RM9200 USB Memory-mapped regs"; -#endif if (rman_init(&sc->sc_irq_rman) != 0 || rman_manage_region(&sc->sc_irq_rman, 1, 31) != 0) panic("at91_attach: failed to set up IRQ rman"); @@ -536,14 +532,8 @@ start, end, count, flags, child); break; case SYS_RES_MEMORY: -#if 0 - if (start >= 0x00300000 && start <= 0x003fffff) - rle->res = rman_reserve_resource(&sc->sc_usbmem_rman, - start, end, count, flags, child); - else -#endif - rle->res = rman_reserve_resource(&sc->sc_mem_rman, - start, end, count, flags, child); + rle->res = rman_reserve_resource(&sc->sc_mem_rman, + start, end, count, flags, child); rman_set_bustag(rle->res, &at91_bs_tag); rman_set_bushandle(rle->res, start); break; ==== //depot/projects/mpsafetty/sys/arm/at91/at91_mci.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.4 2007/09/16 07:48:58 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.5 2008/09/05 22:30:59 imp Exp $"); #include #include @@ -298,14 +298,7 @@ else WR4(sc, MCI_SDCR, RD4(sc, MCI_SDCR) & ~MCI_SDCR_SDCBUS); WR4(sc, MCI_MR, (RD4(sc, MCI_MR) & ~MCI_MR_CLKDIV) | clkdiv); -#if 0 - if (sc->vcc_pin) { - if (sc->power_mode == MMC_POWER_OFF) - gpio_set(sc->vcc_pin, 0); - else - gpio_set(sc->vcc_pin, 1); - } -#endif + /* XXX We need to turn the device on/off here with a GPIO pin */ return (0); } ==== //depot/projects/mpsafetty/sys/arm/at91/at91_ssc.c#2 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_ssc.c,v 1.4 2007/02/23 12:18:27 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_ssc.c,v 1.5 2008/09/05 22:29:50 imp Exp $"); #include #include @@ -209,16 +209,6 @@ at91_ssc_intr(void *xsc) { struct at91_ssc_softc *sc = xsc; -#if 0 - uint32_t status; - - /* Reading the status also clears the interrupt */ - status = RD4(sc, SSC_SR); - if (status == 0) - return; - AT91_SSC_LOCK(sc); - AT91_SSC_UNLOCK(sc); -#endif wakeup(sc); return; } @@ -232,9 +222,6 @@ AT91_SSC_LOCK(sc); if (!(sc->flags & OPENED)) { sc->flags |= OPENED; -#if 0 - // Enable interrupts -#endif } AT91_SSC_UNLOCK(sc); return (0); @@ -248,9 +235,6 @@ sc = CDEV2SOFTC(dev); AT91_SSC_LOCK(sc); sc->flags &= ~OPENED; -#if 0 - // Disable interrupts -#endif AT91_SSC_UNLOCK(sc); return (0); } ==== //depot/projects/mpsafetty/sys/arm/at91/kb920x_machdep.c#2 (text) ==== @@ -47,7 +47,7 @@ #include "opt_at91.h" #include -__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.30 2008/04/03 16:44:49 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.31 2008/09/05 22:23:41 imp Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -164,7 +164,6 @@ * initialization is done. However, the AT91 resource allocation * system doesn't know how to use pmap_mapdev() yet. */ -#if 1 { /* * Add the ohci controller, and anything else that might be @@ -176,7 +175,6 @@ VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, -#endif { 0, 0, ==== //depot/projects/mpsafetty/sys/boot/sparc64/loader/main.c#5 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.35 2008/08/30 16:03:22 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.36 2008/09/04 19:41:54 marius Exp $"); /* * FreeBSD/sparc64 kernel loader - machine dependent part @@ -396,36 +396,44 @@ static vm_offset_t dtlb_va_to_pa_sun4u(vm_offset_t va) { - u_long reg; + u_long pstate, reg; int i; + pstate = rdpr(pstate); + wrpr(pstate, pstate & ~PSTATE_IE, 0); for (i = 0; i < dtlb_slot_max; i++) { reg = ldxa(TLB_DAR_SLOT(i), ASI_DTLB_TAG_READ_REG); if (TLB_TAR_VA(reg) != va) continue; reg = dtlb_get_data_sun4u(i); + wrpr(pstate, pstate, 0); if (cpu_impl >= CPU_IMPL_ULTRASPARCIII) return ((reg & TD_PA_CH_MASK) >> TD_PA_SHIFT); return ((reg & TD_PA_SF_MASK) >> TD_PA_SHIFT); } + wrpr(pstate, pstate, 0); return (-1); } static vm_offset_t itlb_va_to_pa_sun4u(vm_offset_t va) { - u_long reg; + u_long pstate, reg; int i; + pstate = rdpr(pstate); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Sep 6 11:18:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 265F0106568B; Sat, 6 Sep 2008 11:18: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 DDE53106567E for ; Sat, 6 Sep 2008 11:18:11 +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 BA23F8FC34 for ; Sat, 6 Sep 2008 11:18:11 +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 m86BIBjv017354 for ; Sat, 6 Sep 2008 11:18:11 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m86BIBgZ017350 for perforce@freebsd.org; Sat, 6 Sep 2008 11:18:11 GMT (envelope-from ed@FreeBSD.org) Date: Sat, 6 Sep 2008 11:18:11 GMT Message-Id: <200809061118.m86BIBgZ017350@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 149312 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Sep 2008 11:18:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=149312 Change 149312 by ed@ed_dull on 2008/09/06 11:17:20 Remove, so I can reintegrate it with proper attributes. Affected files ... .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#5 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sat Sep 6 11:19:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4FB6E106568B; Sat, 6 Sep 2008 11:19: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 1308E10656A0 for ; Sat, 6 Sep 2008 11:19:13 +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 E3B498FC1D for ; Sat, 6 Sep 2008 11:19:12 +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 m86BJCmE023478 for ; Sat, 6 Sep 2008 11:19:12 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m86BJCl3023476 for perforce@freebsd.org; Sat, 6 Sep 2008 11:19:12 GMT (envelope-from ed@FreeBSD.org) Date: Sat, 6 Sep 2008 11:19:12 GMT Message-Id: <200809061119.m86BJCl3023476@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 149313 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Sep 2008 11:19:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=149313 Change 149313 by ed@ed_dull on 2008/09/06 11:18:21 Reintroduce the firmware with proper attribtues. Affected files ... .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#6 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sat Sep 6 14:51:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C666106567E; Sat, 6 Sep 2008 14:51: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 DBA111065672 for ; Sat, 6 Sep 2008 14:51:52 +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 D3CD08FC15 for ; Sat, 6 Sep 2008 14:51:52 +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 m86Epq5S057440 for ; Sat, 6 Sep 2008 14:51:52 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m86EpqeF057437 for perforce@freebsd.org; Sat, 6 Sep 2008 14:51:52 GMT (envelope-from ed@FreeBSD.org) Date: Sat, 6 Sep 2008 14:51:52 GMT Message-Id: <200809061451.m86EpqeF057437@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 149319 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Sep 2008 14:51:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=149319 Change 149319 by ed@ed_flippo on 2008/09/06 14:50:58 IFC my TIOCCONS changes. Affected files ... .. //depot/projects/mpsafetty/bin/setfacl/setfacl.c#2 integrate .. //depot/projects/mpsafetty/release/Makefile.inc.docports#2 integrate .. //depot/projects/mpsafetty/share/misc/committers-ports.dot#4 integrate .. //depot/projects/mpsafetty/sys/kern/tty.c#38 edit Differences ... ==== //depot/projects/mpsafetty/bin/setfacl/setfacl.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/setfacl/setfacl.c,v 1.13 2007/02/26 00:42:17 mckusick Exp $"); +__FBSDID("$FreeBSD: src/bin/setfacl/setfacl.c,v 1.14 2008/09/06 13:17:35 trasz Exp $"); #include #include @@ -245,10 +245,13 @@ continue; } - if (acl_type == ACL_TYPE_ACCESS) + if (acl_type == ACL_TYPE_ACCESS) { final_acl = acl[ACCESS_ACL]; - else + acl_free(acl[DEFAULT_ACL]); + } else { final_acl = acl[DEFAULT_ACL]; + acl_free(acl[ACCESS_ACL]); + } if (need_mask && (set_acl_mask(&final_acl) == -1)) { warnx("failed to set ACL mask on %s", file->filename); @@ -269,8 +272,7 @@ } } - acl_free(acl[ACCESS_ACL]); - acl_free(acl[DEFAULT_ACL]); + acl_free(final_acl); free(acl); } ==== //depot/projects/mpsafetty/release/Makefile.inc.docports#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile.inc.docports,v 1.27 2007/04/11 15:24:58 ru Exp $ +# $FreeBSD: src/release/Makefile.inc.docports,v 1.28 2008/09/06 10:12:52 jhay Exp $ # # List of (dependent) ports that are minimally required to be # checked out from CVS in order to get ${DOCPORTS} built and @@ -38,8 +38,8 @@ ports/graphics/scr2png \ ports/graphics/tiff \ ports/print/freetype2 \ - ports/print/ghostscript-gpl \ - ports/print/ghostscript-gpl-nox11 \ + ports/print/ghostscript8 \ + ports/print/ghostscript8-nox11 \ ports/print/gsfonts \ ports/textproc/docbook-410 \ ports/textproc/docbook-xml \ ==== //depot/projects/mpsafetty/share/misc/committers-ports.dot#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/misc/committers-ports.dot,v 1.73 2008/07/30 01:05:13 rnoland Exp $ +# $FreeBSD: src/share/misc/committers-ports.dot,v 1.74 2008/09/06 14:10:31 jpaetzel Exp $ # This file is meant to list all FreeBSD ports committers and describe the # mentor-mentee relationships between them. @@ -88,6 +88,7 @@ joerg [label="Joerg Wunsch\njoerg@FreeBSD.org\n1994/08/22"] johans [label="Johan Selst\njohans@FreeBSD.org\n2006/04/01"] josef [label="Josef El-Rayes\njosef@FreeBSD.org\n2004/12/20"] +jpaetzel [label="Josh Paetzel\njpaetzel@FreeBSD.org\n2008/09/05"] jylefort [label="Jean-Yves Lefort\njylefort@FreeBSD.org\n2005/04/12"] kevlo [label="Kevin Lo\nkevlo@FreeBSD.org\n2003/02/21"] knu [label="Akinori Musha\nknu@FreeBSD.org\n2000/03/22"] @@ -157,6 +158,8 @@ adamw -> mezz adamw -> pav +ade -> jpaetzel + ahze -> shaun ahze -> tmclaugh ==== //depot/projects/mpsafetty/sys/kern/tty.c#38 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/tty.c,v 1.287 2008/09/04 16:39:02 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/tty.c,v 1.288 2008/09/06 14:43:32 ed Exp $"); #include "opt_compat.h" @@ -45,7 +45,6 @@ #include #include #include -#include #include #include #include @@ -1514,46 +1513,21 @@ case TIOCCONS: /* Set terminal as console TTY. */ if (*(int *)data) { - struct nameidata nd; - int vfslocked; + error = priv_check(td, PRIV_TTY_CONSOLE); + if (error) + return (error); /* - * XXX: TTY won't slip away, but constty would - * really need to be locked! + * XXX: constty should really need to be locked! + * XXX: allow disconnected constty's to be stolen! */ - tty_unlock(tp); - if (constty == tp) { - tty_lock(tp); + if (constty == tp) return (0); - } - if (constty != NULL) { - tty_lock(tp); + if (constty != NULL) return (EBUSY); - } - /* XXX: allow disconnected constty's to be stolen! */ - /* - * Only allow this to work when the user can - * open /dev/console. - */ - NDINIT(&nd, LOOKUP, FOLLOW|LOCKLEAF|MPSAFE, - UIO_SYSSPACE, "/dev/console", td); - if ((error = namei(&nd)) != 0) { - tty_lock(tp); - return (error); - } - vfslocked = NDHASGIANT(&nd); - NDFREE(&nd, NDF_ONLY_PNBUF); - - error = VOP_ACCESS(nd.ni_vp, VREAD, td->td_ucred, td); - vput(nd.ni_vp); - VFS_UNLOCK_GIANT(vfslocked); - if (error) { - tty_lock(tp); - return (error); - } - + tty_unlock(tp); constty_set(tp); tty_lock(tp); } else if (constty == tp) { From owner-p4-projects@FreeBSD.ORG Sat Sep 6 15:40:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4632B106566B; Sat, 6 Sep 2008 15:40: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 09BDF106566C for ; Sat, 6 Sep 2008 15:40:43 +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 017A78FC13 for ; Sat, 6 Sep 2008 15:40:43 +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 m86FegXX027606 for ; Sat, 6 Sep 2008 15:40:42 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m86FegAT027601 for perforce@freebsd.org; Sat, 6 Sep 2008 15:40:42 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 6 Sep 2008 15:40:42 GMT Message-Id: <200809061540.m86FegAT027601@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 149324 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Sep 2008 15:40:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=149324 Change 149324 by pgj@kolbasz on 2008/09/06 15:40:41 IFC Affected files ... .. //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#13 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/jpaetzel.key#1 branch .. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#10 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#10 integrate .. //depot/projects/docproj_hu/www/en/developers.sgml#11 integrate .. //depot/projects/docproj_hu/www/en/releases/6.4R/schedule.sgml#2 integrate .. //depot/projects/docproj_hu/www/hu/administration.sgml#11 integrate .. //depot/projects/docproj_hu/www/share/sgml/events.xml#6 integrate .. //depot/projects/docproj_hu/www/share/sgml/news.xml#17 integrate Differences ... ==== //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#13 (text+ko) ==== @@ -13,7 +13,7 @@ builds for the other languages, and we will poke fun of you in public. - $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.460 2008/08/25 22:03:59 makc Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.461 2008/09/05 21:35:59 jpaetzel Exp $ --> aaron@FreeBSD.org"> @@ -532,6 +532,8 @@ josef@FreeBSD.org"> +jpaetzel@FreeBSD.org"> + jseger@FreeBSD.org"> julian@FreeBSD.org"> ==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#10 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -874,6 +874,11 @@ &pgpkey.philip; + + &a.jpaetzel; + &pgpkey.jpaetzel; + + &a.pgj; &pgpkey.pgj; ==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#10 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -132,6 +132,7 @@ + ==== //depot/projects/docproj_hu/www/en/developers.sgml#11 (text+ko) ==== @@ -6,7 +6,7 @@ us to update author names, or the representation of those names (such as adding email addresses), by just editing a single file. -$FreeBSD: www/en/developers.sgml,v 1.203 2008/08/25 22:28:15 makc Exp $ +$FreeBSD: www/en/developers.sgml,v 1.204 2008/09/05 21:55:07 jpaetzel Exp $ --> @@ -267,6 +267,7 @@ + ==== //depot/projects/docproj_hu/www/en/releases/6.4R/schedule.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ - + @@ -132,6 +132,7 @@ Ports tree tagged + 15 September 2008 -- RELEASE_&local.rel.tag;_0 tag for ports/. ==== //depot/projects/docproj_hu/www/hu/administration.sgml#11 (text+ko) ==== @@ -1,5 +1,5 @@ + ==== //depot/projects/docproj_hu/www/share/sgml/events.xml#6 (text+ko) ==== @@ -10,7 +10,7 @@ - $FreeBSD: www/share/sgml/events.xml,v 1.56 2008/09/04 04:56:29 murray Exp $ + $FreeBSD: www/share/sgml/events.xml,v 1.57 2008/09/05 01:00:56 murray Exp $ @@ -44,6 +44,27 @@ to celebrate FreeBSD's 15th Anniversary! + + Ticino Informatica 2008 + + 2008 + 10 + 22 + + + 2008 + 10 + 25 + + + Switzerland + Lugano + Palazzo dei Congressi + + FreeBSD and The FreeBSD Foundation + Stand A13 Presented by OEMS Sagl + + EuroBSDCon 2008 http://2008.eurobsdcon.org/ @@ -95,6 +116,28 @@ (NYC*BUG). + + OpenExpo 2008 + http://www.openexpo.ch/ + + 2008 + 9 + 24 + + + 2008 + 9 + 25 + + + Switzerland + Zurich + + The goal of OpenExpo is the promotion of Open Source + software in the business environment. Among many others, there + will be a FreeBSD booth. + + COSCUP 2008 - Conference for Open Source Coders, Users and Promoters http://coscup.org/2008/ ==== //depot/projects/docproj_hu/www/share/sgml/news.xml#17 (text+ko) ==== @@ -20,7 +20,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.192 2008/08/25 23:40:56 stas Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.193 2008/09/05 22:28:12 jpaetzel Exp $ @@ -28,6 +28,17 @@ 2008 + 9 + + 5 + +

    New committer: Josh Paetzel + (ports)

    +     +     +     + + 8 26 From owner-p4-projects@FreeBSD.ORG Sat Sep 6 17:09:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B74F1065675; Sat, 6 Sep 2008 17:09: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 4E8521065673 for ; Sat, 6 Sep 2008 17:09:51 +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 44BDF8FC1F for ; Sat, 6 Sep 2008 17:09:51 +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 m86H9o0Z021500 for ; Sat, 6 Sep 2008 17:09:50 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m86H9oO0021460 for perforce@freebsd.org; Sat, 6 Sep 2008 17:09:50 GMT (envelope-from sam@freebsd.org) Date: Sat, 6 Sep 2008 17:09:50 GMT Message-Id: <200809061709.m86H9oO0021460@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 149330 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Sep 2008 17:09:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=149330 Change 149330 by sam@sam_ebb on 2008/09/06 17:09:36 IFC @ 149329 Affected files ... .. //depot/projects/vap/bin/setfacl/setfacl.c#3 integrate .. //depot/projects/vap/lib/libarchive/archive_entry_link_resolver.c#4 integrate .. //depot/projects/vap/lib/libarchive/archive_write_disk.3#5 integrate .. //depot/projects/vap/lib/libarchive/archive_write_disk.c#13 integrate .. //depot/projects/vap/lib/libarchive/test/test_write_disk.c#6 integrate .. //depot/projects/vap/lib/libarchive/test/test_write_disk_hardlink.c#5 integrate .. //depot/projects/vap/lib/libc/regex/re_format.7#3 integrate .. //depot/projects/vap/lib/libc/stdlib/malloc.c#15 integrate .. //depot/projects/vap/lib/librpcsec_gss/svc_rpcsec_gss.c#2 integrate .. //depot/projects/vap/lib/libstand/stand.h#3 integrate .. //depot/projects/vap/lib/libstand/ufs.c#3 integrate .. //depot/projects/vap/lib/libstand/zalloc_malloc.c#3 integrate .. //depot/projects/vap/release/Makefile.inc.docports#3 integrate .. //depot/projects/vap/share/man/man4/Makefile#20 integrate .. //depot/projects/vap/share/man/man4/pts.4#2 integrate .. //depot/projects/vap/share/man/man9/CTASSERT.9#3 integrate .. //depot/projects/vap/share/man/man9/bus_dma.9#4 integrate .. //depot/projects/vap/share/misc/committers-ports.dot#10 integrate .. //depot/projects/vap/sys/arm/at91/at91.c#6 integrate .. //depot/projects/vap/sys/arm/at91/at91_mci.c#3 integrate .. //depot/projects/vap/sys/arm/at91/at91_ssc.c#3 integrate .. //depot/projects/vap/sys/arm/at91/kb920x_machdep.c#5 integrate .. //depot/projects/vap/sys/boot/common/dev_net.c#4 integrate .. //depot/projects/vap/sys/boot/common/devopen.c#5 integrate .. //depot/projects/vap/sys/boot/powerpc/uboot/Makefile#3 integrate .. //depot/projects/vap/sys/boot/powerpc/uboot/metadata.c#4 delete .. //depot/projects/vap/sys/boot/powerpc/uboot/start.S#3 integrate .. //depot/projects/vap/sys/boot/sparc64/loader/main.c#8 integrate .. //depot/projects/vap/sys/boot/uboot/common/Makefile.inc#2 integrate .. //depot/projects/vap/sys/boot/uboot/common/main.c#5 integrate .. //depot/projects/vap/sys/boot/uboot/common/metadata.c#1 branch .. //depot/projects/vap/sys/boot/uboot/lib/glue.c#5 integrate .. //depot/projects/vap/sys/boot/uboot/lib/glue.h#4 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#3 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#4 integrate .. //depot/projects/vap/sys/conf/files.sun4v#6 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#7 integrate .. //depot/projects/vap/sys/dev/ata/ata-chipset.c#15 integrate .. //depot/projects/vap/sys/dev/ata/ata-pci.h#10 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#2 integrate .. //depot/projects/vap/sys/dev/mii/e1000phy.c#5 integrate .. //depot/projects/vap/sys/dev/mii/miidevs#13 integrate .. //depot/projects/vap/sys/dev/re/if_re.c#16 integrate .. //depot/projects/vap/sys/dev/usb/if_zyd.c#26 integrate .. //depot/projects/vap/sys/dev/usb/ucom.c#9 integrate .. //depot/projects/vap/sys/dev/usb/ucomvar.h#7 integrate .. //depot/projects/vap/sys/dev/usb/usbdevs#27 integrate .. //depot/projects/vap/sys/fs/tmpfs/tmpfs.h#4 integrate .. //depot/projects/vap/sys/fs/tmpfs/tmpfs_fifoops.c#3 integrate .. //depot/projects/vap/sys/fs/tmpfs/tmpfs_fifoops.h#3 integrate .. //depot/projects/vap/sys/fs/tmpfs/tmpfs_subr.c#6 integrate .. //depot/projects/vap/sys/fs/tmpfs/tmpfs_vfsops.c#6 integrate .. //depot/projects/vap/sys/fs/tmpfs/tmpfs_vnops.c#8 integrate .. //depot/projects/vap/sys/fs/tmpfs/tmpfs_vnops.h#3 integrate .. //depot/projects/vap/sys/geom/part/g_part.c#9 integrate .. //depot/projects/vap/sys/geom/part/g_part.h#8 integrate .. //depot/projects/vap/sys/geom/part/g_part_gpt.c#7 integrate .. //depot/projects/vap/sys/i386/include/pmc_mdep.h#6 integrate .. //depot/projects/vap/sys/kern/kern_proc.c#12 integrate .. //depot/projects/vap/sys/kern/kern_resource.c#9 integrate .. //depot/projects/vap/sys/kern/tty.c#13 integrate .. //depot/projects/vap/sys/kern/tty_compat.c#6 integrate .. //depot/projects/vap/sys/kern/tty_pts.c#6 integrate .. //depot/projects/vap/sys/kern/uipc_mbuf.c#11 integrate .. //depot/projects/vap/sys/kern/uipc_mqueue.c#6 integrate .. //depot/projects/vap/sys/kern/vfs_mount.c#21 integrate .. //depot/projects/vap/sys/mips/adm5120/std.adm5120#2 integrate .. //depot/projects/vap/sys/mips/conf/ADM5120#3 integrate .. //depot/projects/vap/sys/mips/conf/IDT#4 integrate .. //depot/projects/vap/sys/mips/conf/MALTA#3 integrate .. //depot/projects/vap/sys/mips/conf/SENTRY5#4 integrate .. //depot/projects/vap/sys/mips/idt/std.idt#2 integrate .. //depot/projects/vap/sys/mips/malta/files.malta#2 integrate .. //depot/projects/vap/sys/mips/malta/std.malta#2 integrate .. //depot/projects/vap/sys/mips/mips/in_cksum.c#2 integrate .. //depot/projects/vap/sys/mips/mips/intr_machdep.c#2 integrate .. //depot/projects/vap/sys/net/route.h#8 integrate .. //depot/projects/vap/sys/net80211/ieee80211.c#50 integrate .. //depot/projects/vap/sys/netgraph/ng_pipe.c#1 branch .. //depot/projects/vap/sys/netgraph/ng_pipe.h#1 branch .. //depot/projects/vap/sys/netinet/if_ether.c#11 integrate .. //depot/projects/vap/sys/netinet/ip_fw.h#10 integrate .. //depot/projects/vap/sys/netinet/ip_fw2.c#16 integrate .. //depot/projects/vap/sys/netinet6/icmp6.c#13 integrate .. //depot/projects/vap/sys/security/audit/audit_syscalls.c#9 integrate .. //depot/projects/vap/sys/sparc64/include/clock.h#6 integrate .. //depot/projects/vap/sys/sparc64/include/cpu.h#5 integrate .. //depot/projects/vap/sys/sparc64/include/cpufunc.h#8 integrate .. //depot/projects/vap/sys/sparc64/include/dcr.h#1 branch .. //depot/projects/vap/sys/sparc64/include/pcpu.h#9 integrate .. //depot/projects/vap/sys/sparc64/include/smp.h#7 integrate .. //depot/projects/vap/sys/sparc64/include/tick.h#4 integrate .. //depot/projects/vap/sys/sparc64/include/trap.h#5 integrate .. //depot/projects/vap/sys/sparc64/include/tte.h#4 integrate .. //depot/projects/vap/sys/sparc64/include/ver.h#5 integrate .. //depot/projects/vap/sys/sparc64/sparc64/cheetah.c#6 integrate .. //depot/projects/vap/sys/sparc64/sparc64/clock.c#5 integrate .. //depot/projects/vap/sys/sparc64/sparc64/exception.S#8 integrate .. //depot/projects/vap/sys/sparc64/sparc64/genassym.c#7 integrate .. //depot/projects/vap/sys/sparc64/sparc64/locore.S#7 integrate .. //depot/projects/vap/sys/sparc64/sparc64/machdep.c#10 integrate .. //depot/projects/vap/sys/sparc64/sparc64/mp_locore.S#6 integrate .. //depot/projects/vap/sys/sparc64/sparc64/mp_machdep.c#12 integrate .. //depot/projects/vap/sys/sparc64/sparc64/pmap.c#11 integrate .. //depot/projects/vap/sys/sparc64/sparc64/tick.c#7 integrate .. //depot/projects/vap/sys/sparc64/sparc64/trap.c#10 integrate .. //depot/projects/vap/sys/sys/gpt.h#5 integrate .. //depot/projects/vap/sys/sys/termios.h#6 integrate .. //depot/projects/vap/sys/sys/tty.h#8 integrate .. //depot/projects/vap/sys/sys/ttydevsw.h#2 integrate .. //depot/projects/vap/usr.bin/cpio/cpio.c#7 integrate .. //depot/projects/vap/usr.sbin/crunch/crunchide/exec_elf32.c#3 integrate Differences ... ==== //depot/projects/vap/bin/setfacl/setfacl.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/setfacl/setfacl.c,v 1.13 2007/02/26 00:42:17 mckusick Exp $"); +__FBSDID("$FreeBSD: src/bin/setfacl/setfacl.c,v 1.14 2008/09/06 13:17:35 trasz Exp $"); #include #include @@ -245,10 +245,13 @@ continue; } - if (acl_type == ACL_TYPE_ACCESS) + if (acl_type == ACL_TYPE_ACCESS) { final_acl = acl[ACCESS_ACL]; - else + acl_free(acl[DEFAULT_ACL]); + } else { final_acl = acl[DEFAULT_ACL]; + acl_free(acl[ACCESS_ACL]); + } if (need_mask && (set_acl_mask(&final_acl) == -1)) { warnx("failed to set ACL mask on %s", file->filename); @@ -269,8 +272,7 @@ } } - acl_free(acl[ACCESS_ACL]); - acl_free(acl[DEFAULT_ACL]); + acl_free(final_acl); free(acl); } ==== //depot/projects/vap/lib/libarchive/archive_entry_link_resolver.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_link_resolver.c,v 1.3 2008/06/15 04:31:43 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_link_resolver.c,v 1.4 2008/09/05 06:15:25 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -189,7 +189,7 @@ case ARCHIVE_ENTRY_LINKIFY_LIKE_TAR: le = find_entry(res, *e); if (le != NULL) { - archive_entry_set_size(*e, 0); + archive_entry_unset_size(*e); archive_entry_copy_hardlink(*e, archive_entry_pathname(le->canonical)); } else @@ -217,7 +217,7 @@ *e = le->entry; le->entry = t; /* Make the old entry into a hardlink. */ - archive_entry_set_size(*e, 0); + archive_entry_unset_size(*e); archive_entry_copy_hardlink(*e, archive_entry_pathname(le->canonical)); /* If we ran out of links, return the ==== //depot/projects/vap/lib/libarchive/archive_write_disk.3#5 (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/libarchive/archive_write_disk.3,v 1.3 2008/05/26 17:00:23 kientzle Exp $ +.\" $FreeBSD: src/lib/libarchive/archive_write_disk.3,v 1.4 2008/09/04 05:22:00 kientzle Exp $ .\" -.Dd March 2, 2007 +.Dd August 5, 2008 .Dt archive_write_disk 3 .Os .Sh NAME @@ -169,11 +169,11 @@ Note that paths ending in .Pa .. always cause an error, regardless of this flag. -.El .It Cm ARCHIVE_EXTRACT_SPARSE Scan data for blocks of NUL bytes and try to recreate them with holes. This results in sparse files, independent of whether the archive format supports or uses them. +.El .It Xo .Fn archive_write_disk_set_group_lookup , .Fn archive_write_disk_set_user_lookup ==== //depot/projects/vap/lib/libarchive/archive_write_disk.c#13 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.33 2008/09/01 02:50:24 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.35 2008/09/05 06:13:11 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include @@ -176,7 +176,7 @@ int fd; /* Current offset for writing data to the file. */ off_t offset; - /* Maximum size of file. */ + /* Maximum size of file, -1 if unknown. */ off_t filesize; /* Dir we were in before this restore; only for deep paths. */ int restore_pwd; @@ -231,8 +231,9 @@ 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); +static ssize_t write_data_block(struct archive_write_disk *, + const char *, size_t, off_t); - static struct archive_vtable *archive_write_disk_vtable(void); static int _archive_write_close(struct archive *); @@ -337,7 +338,10 @@ a->offset = 0; a->uid = a->user_uid; a->mode = archive_entry_mode(a->entry); - a->filesize = archive_entry_size(a->entry); + if (archive_entry_size_is_set(a->entry)) + a->filesize = archive_entry_size(a->entry); + else + a->filesize = -1; archive_strcpy(&(a->_name_data), archive_entry_pathname(a->entry)); a->name = a->_name_data.s; archive_clear_error(&a->archive); @@ -439,15 +443,25 @@ fe->mode = a->mode; } - if (a->deferred & TODO_TIMES) { + if ((a->deferred & TODO_TIMES) + && (archive_entry_mtime_is_set(entry) + || archive_entry_atime_is_set(entry))) { fe = current_fixup(a, archive_entry_pathname(entry)); fe->fixup |= TODO_TIMES; - fe->mtime = archive_entry_mtime(entry); - fe->mtime_nanos = archive_entry_mtime_nsec(entry); - fe->atime = archive_entry_atime(entry); - fe->atime_nanos = archive_entry_atime_nsec(entry); - if (fe->atime == 0 && 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 { + 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); + } else { fe->atime = a->start_time; + fe->atime_nanos = 0; + } } if (a->deferred & TODO_FFLAGS) { @@ -486,89 +500,113 @@ } static ssize_t -_archive_write_data_block(struct archive *_a, - const void *buff, size_t size, off_t offset) +write_data_block(struct archive_write_disk *a, + const char *buff, size_t size, off_t offset) { - struct archive_write_disk *a = (struct archive_write_disk *)_a; ssize_t bytes_written = 0; - ssize_t block_size, bytes_to_write; - int r = ARCHIVE_OK; + ssize_t block_size = 0, bytes_to_write; + int r; - __archive_check_magic(&a->archive, ARCHIVE_WRITE_DISK_MAGIC, - ARCHIVE_STATE_DATA, "archive_write_disk_block"); - if (a->fd < 0) { - archive_set_error(&a->archive, 0, "File not open"); + if (a->filesize == 0 || a->fd < 0) { + archive_set_error(&a->archive, 0, + "Attempt to write to an empty file"); return (ARCHIVE_WARN); } - archive_clear_error(&a->archive); if (a->flags & ARCHIVE_EXTRACT_SPARSE) { if ((r = _archive_write_disk_lazy_stat(a)) != ARCHIVE_OK) return (r); block_size = a->pst->st_blksize; - } else - block_size = -1; + } - if ((off_t)(offset + size) > a->filesize) { - size = (size_t)(a->filesize - a->offset); - archive_set_error(&a->archive, 0, - "Write request too large"); - r = ARCHIVE_WARN; - } + if (a->filesize >= 0 && (off_t)(offset + size) > a->filesize) + size = (size_t)(a->filesize - offset); /* Write the data. */ while (size > 0) { - if (block_size != -1) { - const char *buf; + if (block_size == 0) { + bytes_to_write = size; + } else { + /* We're sparsifying the file. */ + const char *p, *end; + off_t block_end; - for (buf = buff; size; ++buf, --size, ++offset) { - if (*buf != '\0') + /* Skip leading zero bytes. */ + for (p = buff, end = buff + size; p < end; ++p) { + if (*p != '\0') break; } + offset += p - buff; + size -= p - buff; + buff = p; if (size == 0) break; - bytes_to_write = block_size - offset % block_size; - buff = buf; - } else + + /* Calculate next block boundary after offset. */ + block_end + = (offset / block_size) * block_size + block_size; + + /* If the adjusted write would cross block boundary, + * truncate it to the block boundary. */ bytes_to_write = size; + if (offset + bytes_to_write > block_end) + bytes_to_write = block_end - offset; + } + /* Seek if necessary to the specified offset. */ if (offset != a->last_offset) { if (lseek(a->fd, offset, SEEK_SET) < 0) { - archive_set_error(&a->archive, errno, "Seek failed"); + archive_set_error(&a->archive, errno, + "Seek failed"); return (ARCHIVE_FATAL); } } - bytes_written = write(a->fd, buff, size); + bytes_written = write(a->fd, buff, bytes_to_write); if (bytes_written < 0) { archive_set_error(&a->archive, errno, "Write failed"); return (ARCHIVE_WARN); } - buff = (const char *)buff + bytes_written; + buff += bytes_written; size -= bytes_written; offset += bytes_written; a->archive.file_position += bytes_written; a->archive.raw_position += bytes_written; a->last_offset = a->offset = offset; } - a->offset = offset; - return (r); + return (bytes_written); +} + +static ssize_t +_archive_write_data_block(struct archive *_a, + const void *buff, size_t size, off_t offset) +{ + struct archive_write_disk *a = (struct archive_write_disk *)_a; + ssize_t r; + + __archive_check_magic(&a->archive, ARCHIVE_WRITE_DISK_MAGIC, + ARCHIVE_STATE_DATA, "archive_write_disk_block"); + + r = write_data_block(a, buff, size, offset); + + if (r < 0) + return (r); + if ((size_t)r < size) { + archive_set_error(&a->archive, 0, + "Write request too large"); + return (ARCHIVE_WARN); + } + return (ARCHIVE_OK); } static ssize_t _archive_write_data(struct archive *_a, const void *buff, size_t size) { struct archive_write_disk *a = (struct archive_write_disk *)_a; - int r; __archive_check_magic(&a->archive, ARCHIVE_WRITE_DISK_MAGIC, ARCHIVE_STATE_DATA, "archive_write_data"); - if (a->fd < 0) - return (ARCHIVE_OK); - r = _archive_write_data_block(_a, buff, size, a->offset); - if (r < ARCHIVE_OK) - return (r); - return size; + return (write_data_block(a, buff, size, a->offset)); } static int @@ -584,7 +622,15 @@ return (ARCHIVE_OK); archive_clear_error(&a->archive); - if (a->last_offset != a->filesize && a->fd >= 0) { + /* Pad or truncate file to the right size. */ + if (a->fd < 0) { + /* There's no file. */ + } else if (a->filesize < 0) { + /* File size is unknown, so we can't set the size. */ + } else if (a->last_offset == a->filesize) { + /* Last write ended at exactly the filesize; we're done. */ + /* Hopefully, this is the common case. */ + } else { if (ftruncate(a->fd, a->filesize) == -1 && a->filesize == 0) { archive_set_error(&a->archive, errno, @@ -601,7 +647,8 @@ if (a->st.st_size != a->filesize) { const char nul = '\0'; if (lseek(a->fd, a->st.st_size - 1, SEEK_SET) < 0) { - archive_set_error(&a->archive, errno, "Seek failed"); + archive_set_error(&a->archive, errno, + "Seek failed"); return (ARCHIVE_FATAL); } if (write(a->fd, &nul, 1) < 0) { @@ -609,6 +656,7 @@ "Write to restore size failed"); return (ARCHIVE_FATAL); } + a->pst = NULL; } } @@ -963,7 +1011,7 @@ * If the hardlink does carry data, let the last * archive entry decide ownership. */ - if (r == 0 && a->filesize == 0) { + if (r == 0 && a->filesize <= 0) { a->todo = 0; a->deferred = 0; } if (r == 0 && a->filesize > 0) { @@ -1623,18 +1671,31 @@ { struct timeval times[2]; - times[1].tv_sec = archive_entry_mtime(a->entry); - times[1].tv_usec = archive_entry_mtime_nsec(a->entry) / 1000; + /* 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); - times[0].tv_sec = archive_entry_atime(a->entry); - times[0].tv_usec = archive_entry_atime_nsec(a->entry) / 1000; + /* 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; + } /* 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 (times[0].tv_sec == 0 && times[0].tv_usec == 0) + 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) { @@ -1672,10 +1733,24 @@ { struct utimbuf times; - times.modtime = archive_entry_mtime(a->entry); - times.actime = archive_entry_atime(a->entry); - if (times.actime == 0) + /* 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... */ + /* 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; + + /* 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 (!S_ISLNK(a->mode) && utime(a->name, ×) != 0) { archive_set_error(&a->archive, errno, "Can't update time for %s", a->name); ==== //depot/projects/vap/lib/libarchive/test/test_write_disk.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_write_disk.c,v 1.13 2008/09/01 05:38:33 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk.c,v 1.14 2008/09/05 06:13:11 kientzle Exp $"); #if ARCHIVE_VERSION_NUMBER >= 1009000 @@ -84,7 +84,7 @@ * the entry being a maximum size. */ archive_entry_set_size(ae, sizeof(data)); - archive_entry_set_mtime(ae, 123456789, 0); + archive_entry_set_mtime(ae, 123456789, 0); assertEqualIntA(ad, 0, archive_write_header(ad, ae)); assertEqualInt(sizeof(data), archive_write_data(ad, data, sizeof(data))); assertEqualIntA(ad, 0, archive_write_finish_entry(ad)); @@ -152,8 +152,63 @@ free(compare); free(data); } + +static void create_reg_file3(struct archive_entry *ae, const char *msg) +{ + static const char data[]="abcdefghijklmnopqrstuvwxyz"; + struct archive *ad; + struct stat st; + + /* Write the entry to disk. */ + assert((ad = archive_write_disk_new()) != NULL); + failure("%s", msg); + /* Set the size smaller than the data and verify the truncation. */ + archive_entry_set_size(ae, 5); + assertEqualIntA(ad, 0, archive_write_header(ad, ae)); + assertEqualInt(5, archive_write_data(ad, data, sizeof(data))); + assertEqualIntA(ad, 0, archive_write_finish_entry(ad)); +#if ARCHIVE_VERSION_NUMBER < 2000000 + archive_write_finish(ad); +#else + assertEqualInt(0, archive_write_finish(ad)); #endif + /* Test the entry on disk. */ + assert(0 == stat(archive_entry_pathname(ae), &st)); + failure("st.st_mode=%o archive_entry_mode(ae)=%o", + st.st_mode, archive_entry_mode(ae)); + assertEqualInt(st.st_mode, (archive_entry_mode(ae) & ~UMASK)); + assertEqualInt(st.st_size, 5); +} + + +static void create_reg_file4(struct archive_entry *ae, const char *msg) +{ + static const char data[]="abcdefghijklmnopqrstuvwxyz"; + struct archive *ad; + struct stat st; + /* Write the entry to disk. */ + assert((ad = archive_write_disk_new()) != NULL); + /* Leave the size unset. The data should not be truncated. */ + assertEqualIntA(ad, 0, archive_write_header(ad, ae)); + assertEqualInt(ARCHIVE_OK, + archive_write_data_block(ad, data, sizeof(data), 0)); + assertEqualIntA(ad, 0, archive_write_finish_entry(ad)); +#if ARCHIVE_VERSION_NUMBER < 2000000 + archive_write_finish(ad); +#else + assertEqualInt(0, archive_write_finish(ad)); +#endif + /* Test the entry on disk. */ + assert(0 == stat(archive_entry_pathname(ae), &st)); + failure("st.st_mode=%o archive_entry_mode(ae)=%o", + st.st_mode, archive_entry_mode(ae)); + assertEqualInt(st.st_mode, (archive_entry_mode(ae) & ~UMASK)); + failure(msg); + assertEqualInt(st.st_size, sizeof(data)); +} +#endif + DEFINE_TEST(test_write_disk) { #if ARCHIVE_VERSION_NUMBER < 1009000 @@ -178,6 +233,20 @@ create_reg_file2(ae, "Test creating another regular file"); archive_entry_free(ae); + /* A regular file with a size restriction */ + assert((ae = archive_entry_new()) != NULL); + archive_entry_copy_pathname(ae, "file3"); + archive_entry_set_mode(ae, S_IFREG | 0755); + create_reg_file3(ae, "Regular file with size restriction"); + archive_entry_free(ae); + + /* A regular file with an unspecified size */ + assert((ae = archive_entry_new()) != NULL); + archive_entry_copy_pathname(ae, "file3"); + archive_entry_set_mode(ae, S_IFREG | 0755); + create_reg_file4(ae, "Regular file with unspecified size"); + archive_entry_free(ae); + /* A regular file over an existing file */ assert((ae = archive_entry_new()) != NULL); archive_entry_copy_pathname(ae, "file"); ==== //depot/projects/vap/lib/libarchive/test/test_write_disk_hardlink.c#5 (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_hardlink.c,v 1.4 2008/09/01 05:38:33 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk_hardlink.c,v 1.5 2008/09/05 06:13:11 kientzle Exp $"); #define UMASK 022 @@ -61,18 +61,48 @@ archive_entry_set_mode(ae, S_IFREG | 0755); archive_entry_set_size(ae, sizeof(data)); assertEqualIntA(ad, 0, archive_write_header(ad, ae)); - assertEqualInt(sizeof(data), archive_write_data(ad, data, sizeof(data))); + assertEqualInt(sizeof(data), + archive_write_data(ad, data, sizeof(data))); assertEqualIntA(ad, 0, archive_write_finish_entry(ad)); archive_entry_free(ae); - /* Link. */ + /* Link. Size of zero means this doesn't carry data. */ assert((ae = archive_entry_new()) != NULL); archive_entry_copy_pathname(ae, "link1b"); - archive_entry_set_mode(ae, S_IFREG | 0600); + archive_entry_set_mode(ae, S_IFREG | 0642); archive_entry_set_size(ae, 0); archive_entry_copy_hardlink(ae, "link1a"); assertEqualIntA(ad, 0, archive_write_header(ad, ae)); - assertEqualInt(0, archive_write_data(ad, data, sizeof(data))); + assertEqualInt(ARCHIVE_WARN, + archive_write_data(ad, data, sizeof(data))); + assertEqualIntA(ad, 0, archive_write_finish_entry(ad)); + archive_entry_free(ae); + + /* + * Repeat tar approach test, but use unset to mark the + * hardlink as having no data. + */ + + /* Regular file. */ + assert((ae = archive_entry_new()) != NULL); + archive_entry_copy_pathname(ae, "link2a"); + archive_entry_set_mode(ae, S_IFREG | 0755); + archive_entry_set_size(ae, sizeof(data)); + assertEqualIntA(ad, 0, archive_write_header(ad, ae)); + assertEqualInt(sizeof(data), + archive_write_data(ad, data, sizeof(data))); + assertEqualIntA(ad, 0, archive_write_finish_entry(ad)); + archive_entry_free(ae); + + /* Link. Unset size means this doesn't carry data. */ + assert((ae = archive_entry_new()) != NULL); + archive_entry_copy_pathname(ae, "link2b"); + archive_entry_set_mode(ae, S_IFREG | 0642); + archive_entry_unset_size(ae); + archive_entry_copy_hardlink(ae, "link2a"); + assertEqualIntA(ad, 0, archive_write_header(ad, ae)); + assertEqualInt(ARCHIVE_WARN, + archive_write_data(ad, data, sizeof(data))); assertEqualIntA(ad, 0, archive_write_finish_entry(ad)); archive_entry_free(ae); @@ -83,7 +113,7 @@ /* Regular file. */ assert((ae = archive_entry_new()) != NULL); - archive_entry_copy_pathname(ae, "link2a"); + archive_entry_copy_pathname(ae, "link3a"); archive_entry_set_mode(ae, S_IFREG | 0600); archive_entry_set_size(ae, sizeof(data)); assertEqualIntA(ad, 0, archive_write_header(ad, ae)); @@ -93,10 +123,10 @@ /* Link. */ assert((ae = archive_entry_new()) != NULL); - archive_entry_copy_pathname(ae, "link2b"); + archive_entry_copy_pathname(ae, "link3b"); archive_entry_set_mode(ae, S_IFREG | 0755); archive_entry_set_size(ae, sizeof(data)); - archive_entry_copy_hardlink(ae, "link2a"); + archive_entry_copy_hardlink(ae, "link3a"); assertEqualIntA(ad, 0, archive_write_header(ad, ae)); assertEqualInt(sizeof(data), archive_write_data(ad, data, sizeof(data))); assertEqualIntA(ad, 0, archive_write_finish_entry(ad)); @@ -109,7 +139,7 @@ /* Regular file. */ assert((ae = archive_entry_new()) != NULL); - archive_entry_copy_pathname(ae, "link3a"); + archive_entry_copy_pathname(ae, "link4a"); archive_entry_set_mode(ae, S_IFREG | 0600); archive_entry_set_size(ae, 0); assertEqualIntA(ad, 0, archive_write_header(ad, ae)); @@ -123,10 +153,10 @@ /* Link. */ assert((ae = archive_entry_new()) != NULL); - archive_entry_copy_pathname(ae, "link3b"); + archive_entry_copy_pathname(ae, "link4b"); archive_entry_set_mode(ae, S_IFREG | 0755); archive_entry_set_size(ae, sizeof(data)); - archive_entry_copy_hardlink(ae, "link3a"); + archive_entry_copy_hardlink(ae, "link4a"); assertEqualIntA(ad, 0, archive_write_header(ad, ae)); assertEqualInt(sizeof(data), archive_write_data(ad, data, sizeof(data))); assertEqualIntA(ad, 0, archive_write_finish_entry(ad)); @@ -138,36 +168,63 @@ #endif /* Test the entries on disk. */ + + /* Test #1 */ assert(0 == stat("link1a", &st)); + /* If the hardlink was successfully created and the archive + * doesn't carry data for it, we consider it to be + * non-authoritive for meta data as well. This is consistent + * with GNU tar and BSD pax. */ assertEqualInt(st.st_mode, (S_IFREG | 0755) & ~UMASK); assertEqualInt(st.st_size, sizeof(data)); assertEqualInt(st.st_nlink, 2); assert(0 == stat("link1b", &st2)); - assertEqualInt(st2.st_mode, (S_IFREG | 0755) & ~UMASK); - assertEqualInt(st2.st_size, sizeof(data)); - assertEqualInt(st2.st_nlink, 2); + assertEqualInt(st.st_mode, st2.st_mode); + assertEqualInt(st.st_size, st2.st_size); + assertEqualInt(st.st_nlink, st2.st_nlink); assertEqualInt(st.st_ino, st2.st_ino); assertEqualInt(st.st_dev, st2.st_dev); + /* Test #2: Should produce identical results to test #1 */ + /* Note that marking a hardlink with size = 0 is treated the + * same as having an unset size. This is partly for backwards + * compatibility (we used to not have unset tracking, so + * relied on size == 0) and partly to match the model used by + * common file formats that store a size of zero for + * hardlinks. */ assert(0 == stat("link2a", &st)); assertEqualInt(st.st_mode, (S_IFREG | 0755) & ~UMASK); assertEqualInt(st.st_size, sizeof(data)); assertEqualInt(st.st_nlink, 2); assert(0 == stat("link2b", &st2)); + assertEqualInt(st.st_mode, st2.st_mode); + assertEqualInt(st.st_size, st2.st_size); + assertEqualInt(st.st_nlink, st2.st_nlink); + assertEqualInt(st.st_ino, st2.st_ino); + assertEqualInt(st.st_dev, st2.st_dev); + + /* Test #3 */ + assert(0 == stat("link3a", &st)); + assertEqualInt(st.st_mode, (S_IFREG | 0755) & ~UMASK); + assertEqualInt(st.st_size, sizeof(data)); + assertEqualInt(st.st_nlink, 2); + + assert(0 == stat("link3b", &st2)); assertEqualInt(st2.st_mode, (S_IFREG | 0755) & ~UMASK); assertEqualInt(st2.st_size, sizeof(data)); assertEqualInt(st2.st_nlink, 2); assertEqualInt(st.st_ino, st2.st_ino); assertEqualInt(st.st_dev, st2.st_dev); - assert(0 == stat("link3a", &st)); + /* Test #4 */ + assert(0 == stat("link4a", &st)); assertEqualInt(st.st_mode, (S_IFREG | 0755) & ~UMASK); assertEqualInt(st.st_size, sizeof(data)); assertEqualInt(st.st_nlink, 2); - assert(0 == stat("link3b", &st2)); + assert(0 == stat("link4b", &st2)); assertEqualInt(st2.st_mode, (S_IFREG | 0755) & ~UMASK); assertEqualInt(st2.st_size, sizeof(data)); assertEqualInt(st2.st_nlink, 2); ==== //depot/projects/vap/lib/libc/regex/re_format.7#3 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)re_format.7 8.3 (Berkeley) 3/20/94 -.\" $FreeBSD: src/lib/libc/regex/re_format.7,v 1.11 2004/07/02 23:52:12 ru Exp $ +.\" $FreeBSD: src/lib/libc/regex/re_format.7,v 1.12 2008/09/05 17:41:20 keramida Exp $ .\" .Dd March 20, 1994 .Dt RE_FORMAT 7 @@ -288,6 +288,14 @@ A locale may provide others. A character class may not be used as an endpoint of a range. .Pp +A bracketed expression like +.Ql [[:class:]] +can be used to match a single character that belongs to a character +class. +The reverse, matching any character that does not belong to a specific +class, the negation operator of bracket expressions may be used: +.Ql [^[:class:]] . +.Pp There are two special cases\(dd of bracket expressions: the bracket expressions .Ql [[:<:]] ==== //depot/projects/vap/lib/libc/stdlib/malloc.c#15 (text+ko) ==== @@ -156,7 +156,7 @@ #define MALLOC_DSS #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.177 2008/08/27 02:00:53 jasone Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.178 2008/09/06 05:26:31 marcel Exp $"); #include "libc_private.h" #ifdef MALLOC_DEBUG @@ -226,7 +226,7 @@ # define CPU_SPINWAIT __asm__ volatile("pause") #endif #ifdef __ia64__ -# define PAGESIZE_2POW 12 +# define PAGESIZE_2POW 13 # define QUANTUM_2POW 4 # define SIZEOF_PTR_2POW 3 #endif ==== //depot/projects/vap/lib/librpcsec_gss/svc_rpcsec_gss.c#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/lib/librpcsec_gss/svc_rpcsec_gss.c,v 1.2 2008/08/06 17:11:12 dfr Exp $ + * $FreeBSD: src/lib/librpcsec_gss/svc_rpcsec_gss.c,v 1.3 2008/09/04 14:54:22 dfr Exp $ */ /* svc_rpcsec_gss.c @@ -883,7 +883,7 @@ u_int32_t offset; int word, bit; - if (seq < client->cl_seqlast) { + if (seq <= client->cl_seqlast) { /* * The request sequence number is less than * the largest we have seen so far. If it is ==== //depot/projects/vap/lib/libstand/stand.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/lib/libstand/stand.h,v 1.42 2007/01/09 01:02:04 imp Exp $ + * $FreeBSD: src/lib/libstand/stand.h,v 1.43 2008/09/04 10:05:44 raj Exp $ * From $NetBSD: stand.h,v 1.22 1997/06/26 19:17:40 drochner Exp $ */ @@ -235,9 +235,6 @@ extern void *realloc(void *ptr, size_t size); extern void *reallocf(void *ptr, size_t size); extern void mallocstats(void); -#ifdef __alpha__ -extern void free_region(void *start, void *end); -#endif /* disklabel support (undocumented, may be junk) */ struct disklabel; ==== //depot/projects/vap/lib/libstand/ufs.c#3 (text+ko) ==== @@ -68,7 +68,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libstand/ufs.c,v 1.16 2007/01/09 01:02:04 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libstand/ufs.c,v 1.17 2008/09/04 10:05:44 raj Exp $"); /* * Stand-alone file reading package. @@ -83,10 +83,6 @@ #include "stand.h" #include "string.h" -#ifdef __alpha__ -#define COMPAT_UFS /* DUX has old format file systems */ -#endif - static int ufs_open(const char *path, struct open_file *f); static int ufs_write(struct open_file *f, void *buf, size_t size, size_t *resid); static int ufs_close(struct open_file *f); ==== //depot/projects/vap/lib/libstand/zalloc_malloc.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libstand/zalloc_malloc.c,v 1.9 2004/02/25 00:52:14 grehan Exp $"); +__FBSDID("$FreeBSD: src/lib/libstand/zalloc_malloc.c,v 1.10 2008/09/04 10:05:44 raj Exp $"); /* * MALLOC.C - malloc equivalent, runs on top of zalloc and uses sbrk @@ -50,15 +50,6 @@ #undef free #endif -#ifdef __alpha__ -void -free_region(void *start, void *end) -{ - zextendPool(&MallocPool, start, (caddr_t)end - (caddr_t)start); - zfree(&MallocPool, start, (caddr_t)end - (caddr_t)start); -} -#endif - void * Malloc(size_t bytes, const char *file, int line) { ==== //depot/projects/vap/release/Makefile.inc.docports#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile.inc.docports,v 1.27 2007/04/11 15:24:58 ru Exp $ +# $FreeBSD: src/release/Makefile.inc.docports,v 1.28 2008/09/06 10:12:52 jhay Exp $ # # List of (dependent) ports that are minimally required to be # checked out from CVS in order to get ${DOCPORTS} built and @@ -38,8 +38,8 @@ ports/graphics/scr2png \ ports/graphics/tiff \ ports/print/freetype2 \ - ports/print/ghostscript-gpl \ - ports/print/ghostscript-gpl-nox11 \ + ports/print/ghostscript8 \ + ports/print/ghostscript8-nox11 \ ports/print/gsfonts \ ports/textproc/docbook-410 \ ports/textproc/docbook-xml \ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Sep 6 17:11:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 83667106567B; Sat, 6 Sep 2008 17:11: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 4726C1065676 for ; Sat, 6 Sep 2008 17:11:53 +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 3F94A8FC17 for ; Sat, 6 Sep 2008 17:11:53 +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 m86HBrAf023974 for ; Sat, 6 Sep 2008 17:11:53 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m86HBrSB023972 for perforce@freebsd.org; Sat, 6 Sep 2008 17:11:53 GMT (envelope-from sam@freebsd.org) Date: Sat, 6 Sep 2008 17:11:53 GMT Message-Id: <200809061711.m86HBrSB023972@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 149331 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Sep 2008 17:11:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=149331 Change 149331 by sam@sam_ebb on 2008/09/06 17:11:47 fix building against a hal that does not have 5416 support Affected files ... .. //depot/projects/vap/sys/dev/ath/if_ath.c#91 edit Differences ... ==== //depot/projects/vap/sys/dev/ath/if_ath.c#91 (text+ko) ==== @@ -3917,7 +3917,7 @@ rix = rt->rateCodeToIndex[rs->rs_rate]; sc->sc_rx_th.wr_rate = sc->sc_hwmap[rix].ieeerate; sc->sc_rx_th.wr_flags = sc->sc_hwmap[rix].rxflags; -#if HAL_ABI_VERSION >= 0x07050400 +#ifdef AH_SUPPORT_AR5416 sc->sc_rx_th.wr_chan_flags &= ~CHAN_HT; if (sc->sc_rx_th.wr_rate & IEEE80211_RATE_MCS) { /* HT rate */ if ((rs->rs_flags & HAL_RX_2040) == 0) From owner-p4-projects@FreeBSD.ORG Sat Sep 6 17:55:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A5399106567D; Sat, 6 Sep 2008 17:55:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4E7971065676 for ; Sat, 6 Sep 2008 17:55:39 +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 411608FC1A for ; Sat, 6 Sep 2008 17:55:39 +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 m86HtdDM001379 for ; Sat, 6 Sep 2008 17:55:39 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m86HtcMK001373 for perforce@freebsd.org; Sat, 6 Sep 2008 17:55:38 GMT (envelope-from raj@freebsd.org) Date: Sat, 6 Sep 2008 17:55:38 GMT Message-Id: <200809061755.m86HtcMK001373@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 149342 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Sep 2008 17:55:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=149342 Change 149342 by raj@raj_mimi on 2008/09/06 17:54:40 IFC @149326 Affected files ... .. //depot/projects/arm/src/UPDATING#30 integrate .. //depot/projects/arm/src/bin/setfacl/setfacl.c#3 integrate .. //depot/projects/arm/src/contrib/gdtoa/README#3 integrate .. //depot/projects/arm/src/contrib/gdtoa/dtoa.c#3 integrate .. //depot/projects/arm/src/contrib/gdtoa/gdtoa.h#3 integrate .. //depot/projects/arm/src/contrib/gdtoa/gdtoaimp.h#4 integrate .. //depot/projects/arm/src/contrib/gdtoa/gethex.c#4 integrate .. //depot/projects/arm/src/contrib/gdtoa/strtoIg.c#3 integrate .. //depot/projects/arm/src/contrib/gdtoa/strtod.c#4 integrate .. //depot/projects/arm/src/contrib/gdtoa/strtodg.c#3 integrate .. //depot/projects/arm/src/contrib/gdtoa/strtof.c#4 integrate .. //depot/projects/arm/src/contrib/gdtoa/test/README#2 integrate .. //depot/projects/arm/src/contrib/gdtoa/test/f.out#2 integrate .. //depot/projects/arm/src/contrib/gdtoa/test/getround.c#3 integrate .. //depot/projects/arm/src/contrib/gdtoa/test/xsum0.out#3 integrate .. //depot/projects/arm/src/contrib/gdtoa/xsum0.out#3 integrate .. //depot/projects/arm/src/lib/libarchive/archive_entry_link_resolver.c#3 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write_disk.3#4 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write_disk.c#15 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_write_disk.c#8 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_write_disk_hardlink.c#4 integrate .. //depot/projects/arm/src/lib/libc/regex/re_format.7#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/malloc.c#17 integrate .. //depot/projects/arm/src/lib/librpcsec_gss/svc_rpcsec_gss.c#2 integrate .. //depot/projects/arm/src/lib/libstand/stand.h#3 integrate .. //depot/projects/arm/src/lib/libstand/ufs.c#3 integrate .. //depot/projects/arm/src/lib/libstand/zalloc_malloc.c#2 integrate .. //depot/projects/arm/src/libexec/rtld-elf/rtld.c#12 integrate .. //depot/projects/arm/src/release/Makefile.inc.docports#3 integrate .. //depot/projects/arm/src/share/man/man4/Makefile#27 integrate .. //depot/projects/arm/src/share/man/man4/pts.4#2 integrate .. //depot/projects/arm/src/share/man/man9/CTASSERT.9#2 integrate .. //depot/projects/arm/src/share/man/man9/bus_dma.9#8 integrate .. //depot/projects/arm/src/share/misc/committers-ports.dot#12 integrate .. //depot/projects/arm/src/sys/amd64/amd64/cpu_switch.S#11 integrate .. //depot/projects/arm/src/sys/amd64/amd64/machdep.c#31 integrate .. //depot/projects/arm/src/sys/amd64/ia32/ia32_signal.c#8 integrate .. //depot/projects/arm/src/sys/arm/at91/at91.c#31 integrate .. //depot/projects/arm/src/sys/arm/at91/at91_mci.c#33 integrate .. //depot/projects/arm/src/sys/arm/at91/at91_ssc.c#23 integrate .. //depot/projects/arm/src/sys/arm/at91/at91var.h#6 edit .. //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c#48 integrate .. //depot/projects/arm/src/sys/boot/common/dev_net.c#3 integrate .. //depot/projects/arm/src/sys/boot/common/devopen.c#3 integrate .. //depot/projects/arm/src/sys/boot/powerpc/uboot/Makefile#2 integrate .. //depot/projects/arm/src/sys/boot/powerpc/uboot/metadata.c#3 delete .. //depot/projects/arm/src/sys/boot/powerpc/uboot/start.S#2 integrate .. //depot/projects/arm/src/sys/boot/sparc64/loader/main.c#8 integrate .. //depot/projects/arm/src/sys/boot/uboot/common/Makefile.inc#2 integrate .. //depot/projects/arm/src/sys/boot/uboot/common/main.c#3 integrate .. //depot/projects/arm/src/sys/boot/uboot/common/metadata.c#1 branch .. //depot/projects/arm/src/sys/boot/uboot/lib/Makefile#3 integrate .. //depot/projects/arm/src/sys/boot/uboot/lib/console.c#3 integrate .. //depot/projects/arm/src/sys/boot/uboot/lib/elf_freebsd.c#3 integrate .. //depot/projects/arm/src/sys/boot/uboot/lib/glue.c#4 integrate .. //depot/projects/arm/src/sys/boot/uboot/lib/glue.h#3 integrate .. //depot/projects/arm/src/sys/boot/uboot/lib/net.c#4 integrate .. //depot/projects/arm/src/sys/boot/uboot/lib/reboot.c#3 integrate .. //depot/projects/arm/src/sys/boot/uboot/lib/time.c#3 integrate .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#2 integrate .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#3 integrate .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#4 integrate .. //depot/projects/arm/src/sys/conf/files.sun4v#12 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#7 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/public/wisoc.hal.o.uu#1 branch .. //depot/projects/arm/src/sys/contrib/dev/ath/public/wisoc.inc#1 branch .. //depot/projects/arm/src/sys/contrib/dev/ath/public/wisoc.opt_ah.h#1 branch .. //depot/projects/arm/src/sys/dev/ata/ata-chipset.c#48 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-pci.h#31 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_main.c#18 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#2 integrate .. //depot/projects/arm/src/sys/dev/k8temp/k8temp.c#5 integrate .. //depot/projects/arm/src/sys/dev/mii/e1000phy.c#6 integrate .. //depot/projects/arm/src/sys/dev/mii/miidevs#24 integrate .. //depot/projects/arm/src/sys/dev/pci/pci_pci.c#16 integrate .. //depot/projects/arm/src/sys/dev/re/if_re.c#35 integrate .. //depot/projects/arm/src/sys/dev/usb/if_zyd.c#8 integrate .. //depot/projects/arm/src/sys/dev/usb/ucom.c#11 integrate .. //depot/projects/arm/src/sys/dev/usb/ucomvar.h#6 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdevs#48 integrate .. //depot/projects/arm/src/sys/fs/tmpfs/tmpfs.h#8 integrate .. //depot/projects/arm/src/sys/fs/tmpfs/tmpfs_fifoops.c#3 integrate .. //depot/projects/arm/src/sys/fs/tmpfs/tmpfs_fifoops.h#3 integrate .. //depot/projects/arm/src/sys/fs/tmpfs/tmpfs_subr.c#9 integrate .. //depot/projects/arm/src/sys/fs/tmpfs/tmpfs_vfsops.c#9 integrate .. //depot/projects/arm/src/sys/fs/tmpfs/tmpfs_vnops.c#10 integrate .. //depot/projects/arm/src/sys/fs/tmpfs/tmpfs_vnops.h#3 integrate .. //depot/projects/arm/src/sys/geom/part/g_part.c#13 integrate .. //depot/projects/arm/src/sys/geom/part/g_part.h#10 integrate .. //depot/projects/arm/src/sys/geom/part/g_part_gpt.c#9 integrate .. //depot/projects/arm/src/sys/i386/include/pmc_mdep.h#3 integrate .. //depot/projects/arm/src/sys/i386/xen/locore.s#2 integrate .. //depot/projects/arm/src/sys/kern/kern_proc.c#19 integrate .. //depot/projects/arm/src/sys/kern/kern_resource.c#24 integrate .. //depot/projects/arm/src/sys/kern/tty.c#23 integrate .. //depot/projects/arm/src/sys/kern/tty_compat.c#5 integrate .. //depot/projects/arm/src/sys/kern/tty_pts.c#12 integrate .. //depot/projects/arm/src/sys/kern/tty_ttydisc.c#3 integrate .. //depot/projects/arm/src/sys/kern/uipc_mbuf.c#24 integrate .. //depot/projects/arm/src/sys/kern/uipc_mqueue.c#19 integrate .. //depot/projects/arm/src/sys/kern/uipc_socket.c#45 integrate .. //depot/projects/arm/src/sys/kern/vfs_mount.c#42 integrate .. //depot/projects/arm/src/sys/mips/adm5120/std.adm5120#2 integrate .. //depot/projects/arm/src/sys/mips/conf/ADM5120#3 integrate .. //depot/projects/arm/src/sys/mips/conf/IDT#3 integrate .. //depot/projects/arm/src/sys/mips/conf/MALTA#3 integrate .. //depot/projects/arm/src/sys/mips/conf/SENTRY5#3 integrate .. //depot/projects/arm/src/sys/mips/idt/std.idt#2 integrate .. //depot/projects/arm/src/sys/mips/malta/files.malta#2 integrate .. //depot/projects/arm/src/sys/mips/malta/std.malta#2 integrate .. //depot/projects/arm/src/sys/mips/mips/in_cksum.c#2 integrate .. //depot/projects/arm/src/sys/mips/mips/intr_machdep.c#2 integrate .. //depot/projects/arm/src/sys/net/route.h#7 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211.c#21 integrate .. //depot/projects/arm/src/sys/netgraph/ng_pipe.c#1 branch .. //depot/projects/arm/src/sys/netgraph/ng_pipe.h#1 branch .. //depot/projects/arm/src/sys/netinet/if_ether.c#22 integrate .. //depot/projects/arm/src/sys/netinet/ip_fw2.c#45 integrate .. //depot/projects/arm/src/sys/netinet6/icmp6.c#17 integrate .. //depot/projects/arm/src/sys/netinet6/mld6.c#10 integrate .. //depot/projects/arm/src/sys/security/audit/audit_syscalls.c#21 integrate .. //depot/projects/arm/src/sys/sparc64/conf/GENERIC#30 integrate .. //depot/projects/arm/src/sys/sparc64/include/cache.h#4 integrate .. //depot/projects/arm/src/sys/sparc64/include/clock.h#4 integrate .. //depot/projects/arm/src/sys/sparc64/include/cpu.h#4 integrate .. //depot/projects/arm/src/sys/sparc64/include/cpufunc.h#4 integrate .. //depot/projects/arm/src/sys/sparc64/include/dcr.h#1 branch .. //depot/projects/arm/src/sys/sparc64/include/pcpu.h#6 integrate .. //depot/projects/arm/src/sys/sparc64/include/smp.h#7 integrate .. //depot/projects/arm/src/sys/sparc64/include/tick.h#3 integrate .. //depot/projects/arm/src/sys/sparc64/include/trap.h#3 integrate .. //depot/projects/arm/src/sys/sparc64/include/tte.h#3 integrate .. //depot/projects/arm/src/sys/sparc64/include/ver.h#3 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/autoconf.c#5 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/cache.c#3 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/cheetah.c#4 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/clock.c#4 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/exception.S#10 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/genassym.c#11 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/locore.S#4 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/machdep.c#15 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/mp_exception.S#3 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/mp_locore.S#4 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/mp_machdep.c#12 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/pmap.c#20 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/spitfire.c#4 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/tick.c#9 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/trap.c#15 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/clock.c#3 branch .. //depot/projects/arm/src/sys/sys/gpt.h#5 integrate .. //depot/projects/arm/src/sys/sys/termios.h#4 integrate .. //depot/projects/arm/src/sys/sys/tty.h#6 integrate .. //depot/projects/arm/src/sys/sys/ttydevsw.h#2 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_vnops.c#18 integrate .. //depot/projects/arm/src/sys/ufs/ufs/ufs_extattr.c#8 integrate .. //depot/projects/arm/src/tools/regression/lib/libc/stdio/test-scanfloat.c#5 integrate .. //depot/projects/arm/src/tools/tools/nanobsd/nanobsd.sh#12 integrate .. //depot/projects/arm/src/usr.bin/Makefile#15 integrate .. //depot/projects/arm/src/usr.bin/cpio/cpio.c#2 integrate .. //depot/projects/arm/src/usr.bin/gprof/mips.h#3 branch .. //depot/projects/arm/src/usr.bin/limits/limits.1#2 integrate .. //depot/projects/arm/src/usr.bin/limits/limits.c#4 integrate .. //depot/projects/arm/src/usr.sbin/crunch/crunchide/exec_elf32.c#2 integrate .. //depot/projects/arm/src/usr.sbin/cxgbtool/reg_defs_t3c.c#1 branch .. //depot/projects/arm/src/usr.sbin/ntp/config.h#3 integrate .. //depot/projects/arm/src/usr.sbin/pciconf/pciconf.c#5 integrate Differences ... ==== //depot/projects/arm/src/UPDATING#30 (text+ko) ==== @@ -41,6 +41,9 @@ Adding these drivers to your kernel configuration file shall cause compilation to fail. +20080818: + ntpd has been upgraded to 4.2.4p5. + 20080801: OpenSSH has been upgraded to 5.1p1. @@ -1123,4 +1126,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.540 2008/09/01 23:50:56 des Exp $ +$FreeBSD: src/UPDATING,v 1.541 2008/09/03 08:30:17 roberto Exp $ ==== //depot/projects/arm/src/bin/setfacl/setfacl.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/setfacl/setfacl.c,v 1.13 2007/02/26 00:42:17 mckusick Exp $"); +__FBSDID("$FreeBSD: src/bin/setfacl/setfacl.c,v 1.14 2008/09/06 13:17:35 trasz Exp $"); #include #include @@ -245,10 +245,13 @@ continue; } - if (acl_type == ACL_TYPE_ACCESS) + if (acl_type == ACL_TYPE_ACCESS) { final_acl = acl[ACCESS_ACL]; - else + acl_free(acl[DEFAULT_ACL]); + } else { final_acl = acl[DEFAULT_ACL]; + acl_free(acl[ACCESS_ACL]); + } if (need_mask && (set_acl_mask(&final_acl) == -1)) { warnx("failed to set ACL mask on %s", file->filename); @@ -269,8 +272,7 @@ } } - acl_free(acl[ACCESS_ACL]); - acl_free(acl[DEFAULT_ACL]); + acl_free(final_acl); free(acl); } ==== //depot/projects/arm/src/contrib/gdtoa/README#3 (text+ko) ==== @@ -332,5 +332,15 @@ the decimal-point character to be taken from the current locale; otherwise it is '.'. +Source files dtoa.c and strtod.c in this directory are derived from +netlib's "dtoa.c from fp" and are meant to function equivalently. +When compiled with Honor_FLT_ROUNDS #defined (on systems that provide +FLT_ROUNDS and fegetround() as specified in the C99 standard), they +honor the current rounding mode. Because FLT_ROUNDS is buggy on some +(Linux) systems -- not reflecting calls on fesetround(), as the C99 +standard says it should -- when Honor_FLT_ROUNDS is #defined, the +current rounding mode is obtained from fegetround() rather than from +FLT_ROUNDS, unless Trust_FLT_ROUNDS is also #defined. + Please send comments to David M. Gay (dmg at acm dot org, with " at " changed at "@" and " dot " changed to "."). ==== //depot/projects/arm/src/contrib/gdtoa/dtoa.c#3 (text+ko) ==== @@ -66,7 +66,6 @@ */ #ifdef Honor_FLT_ROUNDS -#define Rounding rounding #undef Check_FLT_ROUNDS #define Check_FLT_ROUNDS #else @@ -127,12 +126,22 @@ Bigint *b, *b1, *delta, *mlo, *mhi, *S; double d2, ds, eps; char *s, *s0; -#ifdef Honor_FLT_ROUNDS - int rounding; -#endif #ifdef SET_INEXACT int inexact, oldinexact; #endif +#ifdef Honor_FLT_ROUNDS /*{*/ + int Rounding; +#ifdef Trust_FLT_ROUNDS /*{{ only define this if FLT_ROUNDS really works! */ + Rounding = Flt_Rounds; +#else /*}{*/ + Rounding = 1; + switch(fegetround()) { + case FE_TOWARDZERO: Rounding = 0; break; + case FE_UPWARD: Rounding = 2; break; + case FE_DOWNWARD: Rounding = 3; + } +#endif /*}}*/ +#endif /*}*/ #ifndef MULTIPLE_THREADS if (dtoa_result) { @@ -178,12 +187,12 @@ inexact = 1; #endif #ifdef Honor_FLT_ROUNDS - if ((rounding = Flt_Rounds) >= 2) { + if (Rounding >= 2) { if (*sign) - rounding = rounding == 2 ? 0 : 2; + Rounding = Rounding == 2 ? 0 : 2; else - if (rounding != 2) - rounding = 0; + if (Rounding != 2) + Rounding = 0; } #endif @@ -316,7 +325,7 @@ s = s0 = rv_alloc(i); #ifdef Honor_FLT_ROUNDS - if (mode > 1 && rounding != 1) + if (mode > 1 && Rounding != 1) leftright = 0; #endif @@ -453,7 +462,7 @@ if (i == ilim) { #ifdef Honor_FLT_ROUNDS if (mode > 1) - switch(rounding) { + switch(Rounding) { case 0: goto ret1; case 2: goto bump_up; } @@ -521,7 +530,7 @@ spec_case = 0; if ((mode < 2 || leftright) #ifdef Honor_FLT_ROUNDS - && rounding == 1 + && Rounding == 1 #endif ) { if (!word1(d) && !(word0(d) & Bndry_mask) @@ -614,7 +623,7 @@ #ifndef ROUND_BIASED if (j1 == 0 && mode != 1 && !(word1(d) & 1) #ifdef Honor_FLT_ROUNDS - && rounding >= 1 + && Rounding >= 1 #endif ) { if (dig == '9') @@ -642,7 +651,7 @@ } #ifdef Honor_FLT_ROUNDS if (mode > 1) - switch(rounding) { + switch(Rounding) { case 0: goto accept_dig; case 2: goto keep_dig; } @@ -660,7 +669,7 @@ } if (j1 > 0) { #ifdef Honor_FLT_ROUNDS - if (!rounding) + if (!Rounding) goto accept_dig; #endif if (dig == '9') { /* possible if i == 1 */ @@ -703,7 +712,7 @@ /* Round off last digit */ #ifdef Honor_FLT_ROUNDS - switch(rounding) { + switch(Rounding) { case 0: goto trimzeros; case 2: goto roundoff; } ==== //depot/projects/arm/src/contrib/gdtoa/gdtoa.h#3 (text+ko) ==== @@ -74,9 +74,9 @@ /* The following may be or-ed into one of the above values. */ - STRTOG_Neg = 0x08, - STRTOG_Inexlo = 0x10, - STRTOG_Inexhi = 0x20, + STRTOG_Neg = 0x08, /* does not affect STRTOG_Inexlo or STRTOG_Inexhi */ + STRTOG_Inexlo = 0x10, /* returned result rounded toward zero */ + STRTOG_Inexhi = 0x20, /* returned result rounded away from zero */ STRTOG_Inexact = 0x30, STRTOG_Underflow= 0x40, STRTOG_Overflow = 0x80 ==== //depot/projects/arm/src/contrib/gdtoa/gdtoaimp.h#4 (text+ko) ==== @@ -26,7 +26,7 @@ ****************************************************************/ -/* $FreeBSD: src/contrib/gdtoa/gdtoaimp.h,v 1.9 2007/12/17 00:19:49 das Exp $ */ +/* $FreeBSD: src/contrib/gdtoa/gdtoaimp.h,v 1.10 2008/09/03 07:23:57 das Exp $ */ /* This is a variation on dtoa.c that converts arbitary binary floating-point formats to and from decimal notation. It uses @@ -132,13 +132,16 @@ * Infinity and NaN (case insensitively). * When INFNAN_CHECK is #defined and No_Hex_NaN is not #defined, * strtodg also accepts (case insensitively) strings of the form - * NaN(x), where x is a string of hexadecimal digits and spaces; - * if there is only one string of hexadecimal digits, it is taken - * for the fraction bits of the resulting NaN; if there are two or - * more strings of hexadecimal digits, each string is assigned - * to the next available sequence of 32-bit words of fractions - * bits (starting with the most significant), right-aligned in - * each sequence. + * NaN(x), where x is a string of hexadecimal digits (optionally + * preceded by 0x or 0X) and spaces; if there is only one string + * of hexadecimal digits, it is taken for the fraction bits of the + * resulting NaN; if there are two or more strings of hexadecimal + * digits, each string is assigned to the next available sequence + * of 32-bit words of fractions bits (starting with the most + * significant), right-aligned in each sequence. + * Unless GDTOA_NON_PEDANTIC_NANCHECK is #defined, input "NaN(...)" + * is consumed even when ... has the wrong form (in which case the + * "(...)" is consumed but ignored). * #define MULTIPLE_THREADS if the system offers preemptively scheduled * multiple threads. In this case, you must provide (or suitably * #define) two locks, acquired by ACQUIRE_DTOA_LOCK(n) and freed @@ -150,7 +153,7 @@ * dtoa. You may do so whether or not MULTIPLE_THREADS is #defined. * #define IMPRECISE_INEXACT if you do not care about the setting of * the STRTOG_Inexact bits in the special case of doing IEEE double - * precision conversions (which could also be done by the strtog in + * precision conversions (which could also be done by the strtod in * dtoa.c). * #define NO_HEX_FP to disable recognition of C9x's hexadecimal * floating-point constants. @@ -204,6 +207,7 @@ #define INFNAN_CHECK #define USE_LOCALE #define Honor_FLT_ROUNDS +#define Trust_FLT_ROUNDS #undef IEEE_Arith #undef Avoid_Underflow @@ -597,7 +601,7 @@ extern int cmp ANSI((Bigint*, Bigint*)); extern void copybits ANSI((ULong*, int, Bigint*)); extern Bigint *d2b ANSI((double, int*, int*)); - extern int decrement ANSI((Bigint*)); + extern void decrement ANSI((Bigint*)); extern Bigint *diff ANSI((Bigint*, Bigint*)); extern char *dtoa ANSI((double d, int mode, int ndigits, int *decpt, int *sign, char **rve)); ==== //depot/projects/arm/src/contrib/gdtoa/gethex.c#4 (text+ko) ==== @@ -45,7 +45,7 @@ { Bigint *b; CONST unsigned char *decpt, *s0, *s, *s1; - int esign, havedig, irv, k, n, nbits, up, zret; + int big, esign, havedig, irv, j, k, n, n0, nbits, up, zret; ULong L, lostbits, *x; Long e, e1; #ifdef USE_LOCALE @@ -56,6 +56,7 @@ if (!hexdig['0']) hexdig_init_D2A(); + *bp = 0; havedig = 0; s0 = *(CONST unsigned char **)sp + 2; while(s0[havedig] == '0') @@ -90,10 +91,10 @@ e = -(((Long)(s-decpt)) << 2); pcheck: s1 = s; + big = esign = 0; switch(*s) { case 'p': case 'P': - esign = 0; switch(*++s) { case '-': esign = 1; @@ -106,17 +107,65 @@ break; } e1 = n - 0x10; - while((n = hexdig[*++s]) !=0 && n <= 0x19) + while((n = hexdig[*++s]) !=0 && n <= 0x19) { + if (e1 & 0xf8000000) + big = 1; e1 = 10*e1 + n - 0x10; + } if (esign) e1 = -e1; e += e1; } *sp = (char*)s; - if (zret) { - if (!havedig) - *sp = s0 - 1; + if (!havedig) + *sp = s0 - 1; + if (zret) return STRTOG_Zero; + if (big) { + if (esign) { + switch(fpi->rounding) { + case FPI_Round_up: + if (sign) + break; + goto ret_tiny; + case FPI_Round_down: + if (!sign) + break; + goto ret_tiny; + } + goto retz; + ret_tiny: + b = Balloc(0); + b->wds = 1; + b->x[0] = 1; + goto dret; + } + switch(fpi->rounding) { + case FPI_Round_near: + goto ovfl1; + case FPI_Round_up: + if (!sign) + goto ovfl1; + goto ret_big; + case FPI_Round_down: + if (sign) + goto ovfl1; + goto ret_big; + } + ret_big: + nbits = fpi->nbits; + n0 = n = nbits >> kshift; + if (nbits & kmask) + ++n; + for(j = n, k = 0; j >>= 1; ++k); + *bp = b = Balloc(k); + b->wds = n; + for(j = 0; j < n0; ++j) + b->x[j] = ALL_ON; + if (n > n0) + b->x[j] = ULbits >> (ULbits - (nbits & kmask)); + *exp = fpi->emin; + return STRTOG_Normal | STRTOG_Inexlo; } n = s1 - s0 - 1; for(k = 0; n > 7; n >>= 1) @@ -149,7 +198,7 @@ k = n - 1; if (x[k>>kshift] & 1 << (k & kmask)) { lostbits = 2; - if (k > 1 && any_on(b,k-1)) + if (k > 0 && any_on(b,k)) lostbits = 3; } } @@ -165,7 +214,10 @@ if (e > fpi->emax) { ovfl: Bfree(b); - *bp = 0; + ovfl1: +#ifndef NO_ERRNO + errno = ERANGE; +#endif return STRTOG_Infinite | STRTOG_Overflow | STRTOG_Inexhi; } irv = STRTOG_Normal; @@ -185,15 +237,22 @@ case FPI_Round_down: if (sign) { one_bit: - *exp = fpi->emin; x[0] = b->wds = 1; + dret: *bp = b; + *exp = fpi->emin; +#ifndef NO_ERRNO + errno = ERANGE; +#endif return STRTOG_Denormal | STRTOG_Inexhi | STRTOG_Underflow; } } Bfree(b); - *bp = 0; + retz: +#ifndef NO_ERRNO + errno = ERANGE; +#endif return STRTOG_Zero | STRTOG_Inexlo | STRTOG_Underflow; } k = n - 1; ==== //depot/projects/arm/src/contrib/gdtoa/strtoIg.c#3 (text+ko) ==== @@ -61,12 +61,16 @@ if (rv & STRTOG_Inexlo) { swap = 0; b1 = increment(b1); - if (fpi->sudden_underflow - && (rv & STRTOG_Retmask) == STRTOG_Zero) { - b1->x[0] = 0; - b1->x[nw1] = 1L << nb11; - rv1 += STRTOG_Normal - STRTOG_Zero; - rv1 &= ~STRTOG_Underflow; + if ((rv & STRTOG_Retmask) == STRTOG_Zero) { + if (fpi->sudden_underflow) { + b1->x[0] = 0; + b1->x[nw1] = 1L << nb11; + rv1 += STRTOG_Normal - STRTOG_Zero; + rv1 &= ~STRTOG_Underflow; + goto swapcheck; + } + rv1 &= STRTOG_Inexlo | STRTOG_Underflow | STRTOG_Zero; + rv1 |= STRTOG_Inexhi | STRTOG_Denormal; goto swapcheck; } if (b1->wds > nw ==== //depot/projects/arm/src/contrib/gdtoa/strtod.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ /* Please send bug reports to David M. Gay (dmg at acm dot org, * with " at " changed at "@" and " dot " changed to "."). */ -/* $FreeBSD: src/contrib/gdtoa/strtod.c,v 1.2 2007/12/16 21:14:33 das Exp $ */ +/* $FreeBSD: src/contrib/gdtoa/strtod.c,v 1.3 2008/09/03 07:23:57 das Exp $ */ #include "gdtoaimp.h" #ifndef NO_FENV_H @@ -44,16 +44,15 @@ #ifndef NO_IEEE_Scale #define Avoid_Underflow #undef tinytens -/* The factor of 2^53 in tinytens[4] helps us avoid setting the underflow */ +/* The factor of 2^106 in tinytens[4] helps us avoid setting the underflow */ /* flag unnecessarily. It leads to a song and dance at the end of strtod. */ static CONST double tinytens[] = { 1e-16, 1e-32, 1e-64, 1e-128, - 9007199254740992.e-256 + 9007199254740992.*9007199254740992.e-256 }; #endif #endif #ifdef Honor_FLT_ROUNDS -#define Rounding rounding #undef Check_FLT_ROUNDS #define Check_FLT_ROUNDS #else @@ -81,9 +80,19 @@ #ifdef SET_INEXACT int inexact, oldinexact; #endif -#ifdef Honor_FLT_ROUNDS - int rounding; -#endif +#ifdef Honor_FLT_ROUNDS /*{*/ + int Rounding; +#ifdef Trust_FLT_ROUNDS /*{{ only define this if FLT_ROUNDS really works! */ + Rounding = Flt_Rounds; +#else /*}{*/ + Rounding = 1; + switch(fegetround()) { + case FE_TOWARDZERO: Rounding = 0; break; + case FE_UPWARD: Rounding = 2; break; + case FE_DOWNWARD: Rounding = 3; + } +#endif /*}}*/ +#endif /*}*/ sign = nz0 = nz = decpt = 0; dval(rv) = 0.; @@ -109,7 +118,7 @@ } break2: if (*s == '0') { -#ifndef NO_HEX_FP +#ifndef NO_HEX_FP /*{{*/ { static FPI fpi = { 53, 1-1023-53+1, 2046-1023-53+1, 1, SI }; Long exp; @@ -118,16 +127,20 @@ case 'x': case 'X': { -#if defined(FE_DOWNWARD) && defined(FE_TONEAREST) && defined(FE_TOWARDZERO) && defined(FE_UPWARD) +#if defined(FE_DOWNWARD) && defined(FE_TONEAREST) && defined(FE_TOWARDZERO) && defined(FE_UPWARD) /*{{*/ FPI fpi1 = fpi; +#ifdef Honor_FLT_ROUNDS /*{{*/ + fpi1.rounding = Rounding; +#else /*}{*/ switch(fegetround()) { case FE_TOWARDZERO: fpi1.rounding = 0; break; case FE_UPWARD: fpi1.rounding = 2; break; case FE_DOWNWARD: fpi1.rounding = 3; } -#else +#endif /*}}*/ +#else /*}{*/ #define fpi1 fpi -#endif +#endif /*}}*/ switch((i = gethex(&s, &fpi1, &exp, &bb, sign)) & STRTOG_Retmask) { case STRTOG_NoNumber: s = s00; @@ -381,12 +394,12 @@ scale = 0; #endif #ifdef Honor_FLT_ROUNDS - if ((rounding = Flt_Rounds) >= 2) { + if (Rounding >= 2) { if (sign) - rounding = rounding == 2 ? 0 : 2; + Rounding = Rounding == 2 ? 0 : 2; else - if (rounding != 2) - rounding = 0; + if (Rounding != 2) + Rounding = 0; } #endif #endif /*IEEE_Arith*/ @@ -405,7 +418,7 @@ /* Can't trust HUGE_VAL */ #ifdef IEEE_Arith #ifdef Honor_FLT_ROUNDS - switch(rounding) { + switch(Rounding) { case 0: /* toward 0 */ case 3: /* toward -infinity */ word0(rv) = Big0; @@ -536,7 +549,7 @@ bd2 -= bbe; bs2 = bb2; #ifdef Honor_FLT_ROUNDS - if (rounding != 1) + if (Rounding != 1) bs2++; #endif #ifdef Avoid_Underflow @@ -594,7 +607,7 @@ delta->sign = 0; i = cmp(delta, bs); #ifdef Honor_FLT_ROUNDS - if (rounding != 1) { + if (Rounding != 1) { if (i < 0) { /* Error is less than an ulp */ if (!delta->x[0] && delta->wds <= 1) { @@ -604,7 +617,7 @@ #endif break; } - if (rounding) { + if (Rounding) { if (dsign) { adj = 1.; goto apply_adj; @@ -650,10 +663,10 @@ if (adj < 1.) adj = 1.; if (adj <= 0x7ffffffe) { - /* adj = rounding ? ceil(adj) : floor(adj); */ + /* adj = Rounding ? ceil(adj) : floor(adj); */ y = adj; if (y != adj) { - if (!((rounding>>1) ^ dsign)) + if (!((Rounding>>1) ^ dsign)) y++; adj = y; } @@ -676,8 +689,11 @@ #endif /*Sudden_Underflow*/ #endif /*Avoid_Underflow*/ adj *= ulp(dval(rv)); - if (dsign) + if (dsign) { + if (word0(rv) == Big0 && word1(rv) == Big1) + goto ovfl; dval(rv) += adj; + } else dval(rv) -= adj; goto cont; @@ -770,7 +786,7 @@ } #endif /*Avoid_Underflow*/ L = (word0(rv) & Exp_mask) - Exp_msk1; -#endif /*Sudden_Underflow}*/ +#endif /*Sudden_Underflow}}*/ word0(rv) = L | Bndry_mask1; word1(rv) = 0xffffffff; #ifdef IBM ==== //depot/projects/arm/src/contrib/gdtoa/strtodg.c#3 (text+ko) ==== @@ -89,7 +89,7 @@ return b; } - int + void #ifdef KR_headers decrement(b) Bigint *b; #else @@ -119,7 +119,6 @@ *x++ = y & 0xffff; } while(borrow && x < xe); #endif - return STRTOG_Inexlo; } static int @@ -206,9 +205,9 @@ goto ret; } switch(rd) { - case 1: + case 1: /* round down (toward -Infinity) */ goto trunc; - case 2: + case 2: /* round up (toward +Infinity) */ break; default: /* round near */ k = bdif - 1; @@ -330,7 +329,7 @@ CONST char *s, *s0, *s1; double adj, adj0, rv, tol; Long L; - ULong y, z; + ULong *b, *be, y, z; Bigint *ab, *bb, *bb1, *bd, *bd0, *bs, *delta, *rvb, *rvb0; irv = STRTOG_Zero; @@ -822,10 +821,8 @@ break; if (dsign) { rvb = increment(rvb); - if ( (j = rvbits & kmask) !=0) - j = ULbits - j; - if (hi0bits(rvb->x[(rvb->wds - 1) >> kshift]) - != j) + j = kmask & (ULbits - (rvbits & kmask)); + if (hi0bits(rvb->x[rvb->wds - 1]) != j) rvbits++; irv = STRTOG_Normal | STRTOG_Inexhi; } @@ -978,6 +975,29 @@ Bfree(bd0); Bfree(delta); if (rve > fpi->emax) { + switch(fpi->rounding & 3) { + case FPI_Round_near: + goto huge; + case FPI_Round_up: + if (!sign) + goto huge; + break; + case FPI_Round_down: + if (sign) + goto huge; + } + /* Round to largest representable magnitude */ + Bfree(rvb); + rvb = 0; + irv = STRTOG_Normal | STRTOG_Inexlo; + *exp = fpi->emax; + b = bits; + be = b + (fpi->nbits >> 5) + 1; + while(b < be) + *b++ = -1; + if ((j = fpi->nbits & 0x1f)) + *--be >>= (32 - j); + goto ret; huge: rvb->wds = 0; irv = STRTOG_Infinite | STRTOG_Overflow | STRTOG_Inexhi; @@ -992,12 +1012,19 @@ if (sudden_underflow) { rvb->wds = 0; irv = STRTOG_Underflow | STRTOG_Inexlo; +#ifndef NO_ERRNO + errno = ERANGE; +#endif } else { irv = (irv & ~STRTOG_Retmask) | (rvb->wds > 0 ? STRTOG_Denormal : STRTOG_Zero); - if (irv & STRTOG_Inexact) + if (irv & STRTOG_Inexact) { irv |= STRTOG_Underflow; +#ifndef NO_ERRNO + errno = ERANGE; +#endif + } } } if (se) ==== //depot/projects/arm/src/contrib/gdtoa/strtof.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ /* Please send bug reports to David M. Gay (dmg at acm dot org, * with " at " changed at "@" and " dot " changed to "."). */ -/* $FreeBSD: src/contrib/gdtoa/strtof.c,v 1.2 2007/12/16 21:14:33 das Exp $ */ +/* $FreeBSD: src/contrib/gdtoa/strtof.c,v 1.3 2008/09/03 07:32:06 das Exp $ */ #include "gdtoaimp.h" @@ -40,13 +40,21 @@ strtof(CONST char *s, char **sp) #endif { - static FPI fpi = { 24, 1-127-24+1, 254-127-24+1, 1, SI }; + static FPI fpi0 = { 24, 1-127-24+1, 254-127-24+1, 1, SI }; + FPI *fpi, fpi1; ULong bits[1]; Long exp; int k; + int Rounding = Flt_Rounds; union { ULong L[1]; float f; } u; - k = strtodg(s, sp, &fpi, &exp, bits); + fpi = &fpi0; + if (Rounding != FPI_Round_near) { + fpi1 = fpi0; + fpi1.rounding = Rounding; + fpi = &fpi1; + } + k = strtodg(s, sp, fpi, &exp, bits); switch(k & STRTOG_Retmask) { case STRTOG_NoNumber: case STRTOG_Zero: ==== //depot/projects/arm/src/contrib/gdtoa/test/README#2 (text+ko) ==== @@ -55,7 +55,12 @@ Program strtodt tests strtod on some hard cases (in file testnos3) posted by Fred Tydeman to comp.arch.arithmetic on 26 Feb. 1996. +To get correct results on Intel (x86) systems, the rounding precision +must be set to 53 bits. This can be done, e.g., by invoking +fpinit_ASL(), whose source appears in +http://www.netlib.org/ampl/solvers/fpinit.c . These are simple test programs, not meant for exhaustive testing, but for manually testing "interesting" cases. Paxson's testbase is good for more exhaustive testing, in part with random inputs. +See ftp://ftp.ee.lbl.gov/testbase-report.ps.Z . ==== //depot/projects/arm/src/contrib/gdtoa/test/f.out#2 (text+ko) ==== @@ -124,7 +124,9 @@ g_ffmt(0) gives 1 bytes: "0" strtoIf returns 80, consuming 9 bytes. -fI[0] == fI[1] == strtof +fI[0] = #0 = 0 +fI[1] = #1 = 1.4012985e-45 +fI[0] == strtof Input: 1.23e-320 @@ -132,7 +134,9 @@ g_ffmt(0) gives 1 bytes: "0" strtoIf returns 80, consuming 9 bytes. -fI[0] == fI[1] == strtof +fI[0] = #0 = 0 +fI[1] = #1 = 1.4012985e-45 +fI[0] == strtof Input: 1.23e-20 @@ -160,7 +164,9 @@ g_ffmt(0) gives 1 bytes: "0" strtoIf returns 80, consuming 15 bytes. -fI[0] == fI[1] == strtof +fI[0] = #0 = 0 +fI[1] = #1 = 1.4012985e-45 +fI[0] == strtof Input: 1.234567890123456789 @@ -188,7 +194,9 @@ g_ffmt(0) gives 1 bytes: "0" strtoIf returns 80, consuming 25 bytes. -fI[0] == fI[1] == strtof +fI[0] = #0 = 0 +fI[1] = #1 = 1.4012985e-45 +fI[0] == strtof Input: 1.234567890123456789e-321 @@ -196,7 +204,9 @@ g_ffmt(0) gives 1 bytes: "0" >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Sep 6 18:11:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EE140106567F; Sat, 6 Sep 2008 18:11: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 AFD35106567B for ; Sat, 6 Sep 2008 18:11:58 +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 A3E048FC26 for ; Sat, 6 Sep 2008 18:11:58 +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 m86IBw7X050430 for ; Sat, 6 Sep 2008 18:11:58 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m86IBwBJ050428 for perforce@freebsd.org; Sat, 6 Sep 2008 18:11:58 GMT (envelope-from raj@freebsd.org) Date: Sat, 6 Sep 2008 18:11:58 GMT Message-Id: <200809061811.m86IBwBJ050428@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 149346 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Sep 2008 18:11:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=149346 Change 149346 by raj@raj_mimi on 2008/09/06 18:11:57 Reorg Marvell SOC directory layout to better accomodate many chip variants. Step 1/2 (DB-88F5XXX is BROKEN) Affected files ... .. //depot/projects/arm/src/sys/arm/mv/5x/5x.c#1 branch .. //depot/projects/arm/src/sys/arm/mv/5x/db88f5xxx.c#1 branch .. //depot/projects/arm/src/sys/arm/mv/5x/files.db88f5xxx#1 branch .. //depot/projects/arm/src/sys/arm/mv/5x/std.db88f5xxx#1 branch .. //depot/projects/arm/src/sys/arm/mv/bus_space.c#1 branch .. //depot/projects/arm/src/sys/arm/mv/files.orion#1 branch .. //depot/projects/arm/src/sys/arm/mv/ic.c#1 branch .. //depot/projects/arm/src/sys/arm/mv/obio.c#1 branch .. //depot/projects/arm/src/sys/arm/mv/orion_machdep.c#1 branch .. //depot/projects/arm/src/sys/arm/mv/orionreg.h#1 branch .. //depot/projects/arm/src/sys/arm/mv/orionvar.h#1 branch .. //depot/projects/arm/src/sys/arm/mv/std.orion#1 branch .. //depot/projects/arm/src/sys/arm/mv/timer.c#1 branch .. //depot/projects/arm/src/sys/arm/orion/5x/5x.c#3 delete .. //depot/projects/arm/src/sys/arm/orion/5x/db88f5xxx.c#2 delete .. //depot/projects/arm/src/sys/arm/orion/5x/files.db88f5xxx#2 delete .. //depot/projects/arm/src/sys/arm/orion/5x/std.db88f5xxx#2 delete .. //depot/projects/arm/src/sys/arm/orion/bus_space.c#2 delete .. //depot/projects/arm/src/sys/arm/orion/files.orion#5 delete .. //depot/projects/arm/src/sys/arm/orion/ic.c#2 delete .. //depot/projects/arm/src/sys/arm/orion/obio.c#2 delete .. //depot/projects/arm/src/sys/arm/orion/orion_machdep.c#6 delete .. //depot/projects/arm/src/sys/arm/orion/orionreg.h#5 delete .. //depot/projects/arm/src/sys/arm/orion/orionvar.h#4 delete .. //depot/projects/arm/src/sys/arm/orion/std.orion#5 delete .. //depot/projects/arm/src/sys/arm/orion/timer.c#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sat Sep 6 18:32:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E27EC106566B; Sat, 6 Sep 2008 18:32:19 +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 8B6E41065677 for ; Sat, 6 Sep 2008 18:32:19 +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 7EB388FC23 for ; Sat, 6 Sep 2008 18:32:19 +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 m86IWJRS083154 for ; Sat, 6 Sep 2008 18:32:19 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m86IWJ0M083152 for perforce@freebsd.org; Sat, 6 Sep 2008 18:32:19 GMT (envelope-from raj@freebsd.org) Date: Sat, 6 Sep 2008 18:32:19 GMT Message-Id: <200809061832.m86IWJ0M083152@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 149348 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Sep 2008 18:32:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=149348 Change 149348 by raj@raj_mimi on 2008/09/06 18:31:39 Reorg Marvell SOC directory layout to better accomodate many chip variations. Step 2/2 (DB-88F5XXX RECOVERED) Affected files ... .. //depot/projects/arm/src/sys/arm/conf/DB-88F5XXX#3 edit .. //depot/projects/arm/src/sys/arm/mv/5x/5x.c#2 delete .. //depot/projects/arm/src/sys/arm/mv/5x/db88f5xxx.c#2 delete .. //depot/projects/arm/src/sys/arm/mv/5x/files.db88f5xxx#2 delete .. //depot/projects/arm/src/sys/arm/mv/5x/std.db88f5xxx#2 delete .. //depot/projects/arm/src/sys/arm/mv/files.orion#2 edit .. //depot/projects/arm/src/sys/arm/mv/ic.c#2 edit .. //depot/projects/arm/src/sys/arm/mv/obio.c#2 edit .. //depot/projects/arm/src/sys/arm/mv/orion/5x.c#1 add .. //depot/projects/arm/src/sys/arm/mv/orion/db88f5xxx.c#1 add .. //depot/projects/arm/src/sys/arm/mv/orion/files.db88f5xxx#1 add .. //depot/projects/arm/src/sys/arm/mv/orion/std.db88f5xxx#1 add .. //depot/projects/arm/src/sys/arm/mv/orion_machdep.c#2 edit .. //depot/projects/arm/src/sys/arm/mv/std.orion#2 edit .. //depot/projects/arm/src/sys/arm/mv/timer.c#2 edit .. //depot/projects/arm/src/sys/dev/mge/if_mge.c#2 edit .. //depot/projects/arm/src/sys/dev/uart/uart_bus_mbus.c#2 edit .. //depot/projects/arm/src/sys/dev/uart/uart_cpu_orion.c#2 edit .. //depot/projects/arm/src/sys/dev/usb/ehci_mbus.c#2 edit Differences ... ==== //depot/projects/arm/src/sys/arm/conf/DB-88F5XXX#3 (text+ko) ==== @@ -6,7 +6,7 @@ machine arm ident DB-88F5XXX -include "../orion/5x/std.db88f5xxx" +include "../mv/orion/std.db88f5xxx" #makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions WERROR="-Werror" ==== //depot/projects/arm/src/sys/arm/mv/files.orion#2 (text+ko) ==== @@ -18,11 +18,11 @@ arm/arm/cpufunc_asm_armv5_ec.S standard arm/arm/irq_dispatch.S standard -arm/orion/bus_space.c standard -arm/orion/ic.c standard -arm/orion/obio.c standard -arm/orion/orion_machdep.c standard -arm/orion/timer.c standard +arm/mv/bus_space.c standard +arm/mv/ic.c standard +arm/mv/obio.c standard +arm/mv/orion_machdep.c standard +arm/mv/timer.c standard dev/mge/if_mge.c optional mge dev/uart/uart_bus_mbus.c optional uart ==== //depot/projects/arm/src/sys/arm/mv/ic.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ #include #include -#include +#include struct orion_ic_softc { struct resource * ic_res[1]; ==== //depot/projects/arm/src/sys/arm/mv/obio.c#2 (text+ko) ==== @@ -37,8 +37,8 @@ #include #include -#include -#include +#include +#include static void mbus_identify(driver_t *, device_t); static int mbus_probe(device_t); ==== //depot/projects/arm/src/sys/arm/mv/orion_machdep.c#2 (text+ko) ==== @@ -84,7 +84,7 @@ #include #include -#include /* XXX eventually this should be eliminated */ +#include /* XXX eventually this should be eliminated */ #define KERNEL_PT_SYS 0 /* Page table for mapping proc0 zero page */ #define KERNEL_PT_KERN 1 ==== //depot/projects/arm/src/sys/arm/mv/std.orion#2 (text+ko) ==== @@ -1,5 +1,5 @@ # $FreeBSD$ -files "../orion/files.orion" +files "../mv/files.orion" cpu CPU_ARM9E makeoptions CONF_CFLAGS="-march=armv5te" ==== //depot/projects/arm/src/sys/arm/mv/timer.c#2 (text+ko) ==== @@ -44,8 +44,8 @@ #include #include -#include -#include +#include +#include #define ORION_TIMER_TICK (get_tclk() / hz) #define INITIAL_TIMECOUNTER (0xffffffff) ==== //depot/projects/arm/src/sys/dev/mge/if_mge.c#2 (text+ko) ==== @@ -61,7 +61,7 @@ #include #include -#include +#include #include "miibus_if.h" ==== //depot/projects/arm/src/sys/dev/uart/uart_bus_mbus.c#2 (text+ko) ==== @@ -47,7 +47,7 @@ #include #include -#include +#include static int uart_mbus_probe(device_t dev); ==== //depot/projects/arm/src/sys/dev/uart/uart_cpu_orion.c#2 (text+ko) ==== @@ -44,8 +44,8 @@ #include #include -#include -#include +#include +#include bus_space_tag_t uart_bus_space_io; bus_space_tag_t uart_bus_space_mem; ==== //depot/projects/arm/src/sys/dev/usb/ehci_mbus.c#2 (text+ko) ==== @@ -59,8 +59,8 @@ #include #include -#include -#include +#include +#include #define EHCI_VENDORID_MRVL 0x1286 #define EHCI_HC_DEVSTR "88F5XXX Integrated USB 2.0 controller" From owner-p4-projects@FreeBSD.ORG Sat Sep 6 18:59:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EEF9F106567B; Sat, 6 Sep 2008 18:59:47 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B33E81065674 for ; Sat, 6 Sep 2008 18:59:47 +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 A6DDB8FC14 for ; Sat, 6 Sep 2008 18:59:47 +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 m86IxlC7006559 for ; Sat, 6 Sep 2008 18:59:47 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m86IxlL3006557 for perforce@freebsd.org; Sat, 6 Sep 2008 18:59:47 GMT (envelope-from raj@freebsd.org) Date: Sat, 6 Sep 2008 18:59:47 GMT Message-Id: <200809061859.m86IxlL3006557@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 149349 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Sep 2008 18:59:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=149349 Change 149349 by raj@raj_mimi on 2008/09/06 18:58:54 More reorg around Marvell SOC files. Affected files ... .. //depot/projects/arm/src/sys/arm/mv/files.mv#1 add .. //depot/projects/arm/src/sys/arm/mv/files.orion#3 delete .. //depot/projects/arm/src/sys/arm/mv/ic.c#3 edit .. //depot/projects/arm/src/sys/arm/mv/mv_machdep.c#1 add .. //depot/projects/arm/src/sys/arm/mv/mvreg.h#1 branch .. //depot/projects/arm/src/sys/arm/mv/mvvar.h#1 branch .. //depot/projects/arm/src/sys/arm/mv/obio.c#3 edit .. //depot/projects/arm/src/sys/arm/mv/orion/5x.c#2 delete .. //depot/projects/arm/src/sys/arm/mv/orion/db88f5xxx.c#2 edit .. //depot/projects/arm/src/sys/arm/mv/orion/files.db88f5xxx#2 edit .. //depot/projects/arm/src/sys/arm/mv/orion/orion.c#1 add .. //depot/projects/arm/src/sys/arm/mv/orion/std.db88f5xxx#2 edit .. //depot/projects/arm/src/sys/arm/mv/orion_machdep.c#3 delete .. //depot/projects/arm/src/sys/arm/mv/orionreg.h#2 delete .. //depot/projects/arm/src/sys/arm/mv/orionvar.h#2 delete .. //depot/projects/arm/src/sys/arm/mv/std.mv#1 add .. //depot/projects/arm/src/sys/arm/mv/std.orion#3 delete .. //depot/projects/arm/src/sys/arm/mv/timer.c#3 edit .. //depot/projects/arm/src/sys/dev/mge/if_mge.c#3 edit .. //depot/projects/arm/src/sys/dev/uart/uart_bus_mbus.c#3 edit .. //depot/projects/arm/src/sys/dev/uart/uart_cpu_mv.c#1 add .. //depot/projects/arm/src/sys/dev/uart/uart_cpu_orion.c#3 delete .. //depot/projects/arm/src/sys/dev/usb/ehci_mbus.c#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/mv/ic.c#3 (text+ko) ==== @@ -40,7 +40,7 @@ #include #include -#include +#include struct orion_ic_softc { struct resource * ic_res[1]; ==== //depot/projects/arm/src/sys/arm/mv/obio.c#3 (text+ko) ==== @@ -37,8 +37,8 @@ #include #include -#include -#include +#include +#include static void mbus_identify(driver_t *, device_t); static int mbus_probe(device_t); ==== //depot/projects/arm/src/sys/arm/mv/orion/db88f5xxx.c#2 (text+ko) ==== @@ -44,8 +44,8 @@ #include #include -#include -#include +#include +#include const struct pmap_devmap *pmap_devmap_bootstrap_table; vm_offset_t pmap_bootstrap_lastaddr; ==== //depot/projects/arm/src/sys/arm/mv/orion/files.db88f5xxx#2 (text+ko) ==== @@ -1,4 +1,4 @@ # $FreeBSD$ -arm/mv/orion/5x.c standard +arm/mv/orion/orion.c standard arm/mv/orion/db88f5xxx.c standard ==== //depot/projects/arm/src/sys/arm/mv/orion/std.db88f5xxx#2 (text+ko) ==== @@ -1,6 +1,6 @@ # $FreeBSD$ -include "../mv/std.orion" +include "../mv/std.mv" files "../mv/orion/files.db88f5xxx" makeoptions KERNPHYSADDR=0x00400000 ==== //depot/projects/arm/src/sys/arm/mv/timer.c#3 (text+ko) ==== @@ -44,8 +44,8 @@ #include #include -#include -#include +#include +#include #define ORION_TIMER_TICK (get_tclk() / hz) #define INITIAL_TIMECOUNTER (0xffffffff) ==== //depot/projects/arm/src/sys/dev/mge/if_mge.c#3 (text+ko) ==== @@ -61,7 +61,7 @@ #include #include -#include +#include #include "miibus_if.h" ==== //depot/projects/arm/src/sys/dev/uart/uart_bus_mbus.c#3 (text+ko) ==== @@ -47,7 +47,7 @@ #include #include -#include +#include static int uart_mbus_probe(device_t dev); ==== //depot/projects/arm/src/sys/dev/usb/ehci_mbus.c#3 (text+ko) ==== @@ -59,8 +59,8 @@ #include #include -#include -#include +#include +#include #define EHCI_VENDORID_MRVL 0x1286 #define EHCI_HC_DEVSTR "88F5XXX Integrated USB 2.0 controller" From owner-p4-projects@FreeBSD.ORG Sat Sep 6 19:27:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1EFA2106567F; Sat, 6 Sep 2008 19:27: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 D5F10106567A for ; Sat, 6 Sep 2008 19:27:15 +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 C8CA68FC14 for ; Sat, 6 Sep 2008 19:27:15 +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 m86JRFHr033035 for ; Sat, 6 Sep 2008 19:27:15 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m86JRFKG033027 for perforce@freebsd.org; Sat, 6 Sep 2008 19:27:15 GMT (envelope-from raj@freebsd.org) Date: Sat, 6 Sep 2008 19:27:15 GMT Message-Id: <200809061927.m86JRFKG033027@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 149350 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Sep 2008 19:27:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=149350 Change 149350 by raj@raj_mimi on 2008/09/06 19:26:50 mge(4): Import updated version of the Ethernet controller driver. This brings the following advanced features: - multicast - VLAN tagging - IP/TCP/UDP checksum calculation offloading - polling - interrupt coalescing Obtained from: Marvell, Semihalf Affected files ... .. //depot/projects/arm/src/sys/dev/mge/if_mge.c#4 edit .. //depot/projects/arm/src/sys/dev/mge/if_mgevar.h#2 edit Differences ... ==== //depot/projects/arm/src/sys/dev/mge/if_mge.c#4 (text+ko) ==== @@ -29,6 +29,10 @@ * SUCH DAMAGE. */ +#ifdef HAVE_KERNEL_OPTION_HEADERS +#include "opt_device_polling.h" +#endif + #include __FBSDID("$FreeBSD$"); @@ -50,6 +54,11 @@ #include #include #include +#include + +#include +#include +#include #include #include @@ -60,11 +69,20 @@ #include #include +#if defined(SOC_MV_KIRKWOOD) || defined(SOC_MV_DISCOVERY) +#define MGE_VER2 1 +#endif + +#define MV_PHY_ADDR_BASE 8 + #include #include #include "miibus_if.h" +/* PHY registers are in the address space of the first mge unit */ +static struct mge_softc *sc_mge0 = NULL; + static int mge_probe(device_t dev); static int mge_attach(device_t dev); static int mge_detach(device_t dev); @@ -85,8 +103,11 @@ static void mge_watchdog(struct mge_softc *sc); static int mge_ioctl(struct ifnet *ifp, u_long command, caddr_t data); +static void mge_intrs_ctrl(struct mge_softc *sc, int enable); static void mge_intr_rx(void *arg); +static void mge_intr_rx_locked(struct mge_softc *sc, int count); static void mge_intr_tx(void *arg); +static void mge_intr_tx_locked(struct mge_softc *sc); static void mge_intr_misc(void *arg); static void mge_intr_sum(void *arg); static void mge_intr_err(void *arg); @@ -107,7 +128,16 @@ static void mge_free_dma(struct mge_softc *sc); static void mge_free_desc(struct mge_softc *sc, struct mge_desc_wrapper* tab, uint32_t size, bus_dma_tag_t buffer_tag, uint8_t free_mbufs); - +static void mge_offload_process_frame(struct ifnet *ifp, struct mbuf *frame, + uint32_t status, uint16_t bufsize); +static void mge_offload_setup_descriptor(struct mge_softc *sc, + struct mge_desc_wrapper *dw); +static uint8_t mge_crc8(uint8_t *data, int size); +static void mge_setup_multicast(struct mge_softc *sc); +static void mge_set_rxic(struct mge_softc *sc); +static void mge_set_txic(struct mge_softc *sc); +static void mge_add_sysctls(struct mge_softc *sc); +static int mge_sysctl_ic(SYSCTL_HANDLER_ARGS); static device_method_t mge_methods[] = { /* Device interface */ @@ -182,8 +212,7 @@ char *if_mac; uint32_t mac_l, mac_h; - mtx_assert(&sc->transmit_lock, MA_OWNED); - mtx_assert(&sc->receive_lock, MA_OWNED); + MGE_GLOBAL_LOCK_ASSERT(sc); if_mac = (char *)IF_LLADDR(sc->ifp); @@ -203,15 +232,15 @@ uint32_t reg_idx, reg_off, reg_val, i; last_byte &= 0xf; - reg_idx = last_byte / 4; - reg_off = (last_byte % 4) * 8; + reg_idx = last_byte / MGE_UCAST_REG_NUMBER; + reg_off = (last_byte % MGE_UCAST_REG_NUMBER) * 8; reg_val = (1 | (queue << 1)) << reg_off; - for (i = 0; i < 4; i++) { + for (i = 0; i < MGE_UCAST_REG_NUMBER; i++) { if ( i == reg_idx) - MGE_WRITE(sc, MGE_DA_FILTER_UCAST + (i * 4), reg_val); + MGE_WRITE(sc, MGE_DA_FILTER_UCAST(i), reg_val); else - MGE_WRITE(sc, MGE_DA_FILTER_UCAST + (i * 4), 0); + MGE_WRITE(sc, MGE_DA_FILTER_UCAST(i), 0); } } @@ -235,8 +264,8 @@ MGE_WRITE(sc, MGE_DA_FILTER_OTH_MCAST(i), reg_val); } - for (i = 0; i < 4; i++) - MGE_WRITE(sc, MGE_DA_FILTER_UCAST + (i * 4), reg_val); + for (i = 0; i < MGE_UCAST_REG_NUMBER; i++) + MGE_WRITE(sc, MGE_DA_FILTER_UCAST(i), reg_val); } else { port_config = MGE_READ(sc, MGE_PORT_CONFIG); @@ -459,7 +488,8 @@ struct mge_desc_wrapper *dw; int i; - mtx_lock(&sc->receive_lock); + MGE_RECEIVE_LOCK(sc); + mge_free_desc(sc, sc->mge_rx_desc, MGE_RX_DESC_NUM, sc->mge_rx_dtag, 1); mge_alloc_desc_dma(sc, sc->mge_rx_desc, MGE_RX_DESC_NUM, @@ -480,8 +510,45 @@ /* Enable RX queue */ MGE_WRITE(sc, MGE_RX_QUEUE_CMD, MGE_ENABLE_RXQ(MGE_RX_DEFAULT_QUEUE)); - mtx_unlock(&sc->receive_lock); + MGE_RECEIVE_UNLOCK(sc); +} + +#ifdef DEVICE_POLLING +static poll_handler_t mge_poll; + +static void +mge_poll(struct ifnet *ifp, enum poll_cmd cmd, int count) +{ + struct mge_softc *sc = ifp->if_softc; + uint32_t int_cause, int_cause_ext; + + MGE_GLOBAL_LOCK(sc); + + if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) { + MGE_GLOBAL_UNLOCK(sc); + return; + } + + if (cmd == POLL_AND_CHECK_STATUS) { + int_cause = MGE_READ(sc, MGE_PORT_INT_CAUSE); + int_cause_ext = MGE_READ(sc, MGE_PORT_INT_CAUSE_EXT); + + /* Check for resource error */ + if (int_cause & MGE_PORT_INT_RXERRQ0) + mge_reinit_rx(sc); + + if (int_cause || int_cause_ext) { + MGE_WRITE(sc, MGE_PORT_INT_CAUSE, ~int_cause); + MGE_WRITE(sc, MGE_PORT_INT_CAUSE_EXT, ~int_cause_ext); + } + } + + mge_intr_tx_locked(sc); + mge_intr_rx_locked(sc, count); + + MGE_GLOBAL_UNLOCK(sc); } +#endif /* DEVICE_POLLING */ static int mge_attach(device_t dev) @@ -494,6 +561,9 @@ sc = device_get_softc(dev); sc->dev = dev; + if (device_get_unit(dev) == 0) + sc_mge0 = sc; + /* Initialize mutexes */ mtx_init(&sc->transmit_lock, device_get_nameunit(dev), "mge TX lock", MTX_DEF); mtx_init(&sc->receive_lock, device_get_nameunit(dev), "mge RX lock", MTX_DEF); @@ -517,6 +587,11 @@ sc->rx_desc_curr = 0; sc->tx_desc_used_idx = 0; + /* Configure defaults for interrupts coalescing */ + sc->rx_ic_time = 768; + sc->tx_ic_time = 768; + mge_add_sysctls(sc); + /* Allocate network interface */ ifp = sc->ifp = if_alloc(IFT_ETHER); if (ifp == NULL) { @@ -527,23 +602,28 @@ if_initname(ifp, device_get_name(dev), device_get_unit(dev)); ifp->if_softc = sc; - ifp->if_flags = IFF_SIMPLEX | IFF_BROADCAST; - /* XXX for now IFCAP_RXCSUM is the only extra capability we support */ - ifp->if_capabilities = IFCAP_RXCSUM; + ifp->if_flags = IFF_SIMPLEX | IFF_MULTICAST | IFF_BROADCAST; + ifp->if_capabilities = IFCAP_HWCSUM | IFCAP_VLAN_MTU; ifp->if_capenable = ifp->if_capabilities; + ifp->if_hwassist = MGE_CHECKSUM_FEATURES; + +#ifdef DEVICE_POLLING + /* Advertise that polling is supported */ + ifp->if_capabilities |= IFCAP_POLLING; +#endif ifp->if_init = mge_init; ifp->if_start = mge_start; ifp->if_ioctl = mge_ioctl; + ifp->if_snd.ifq_drv_maxlen = MGE_TX_DESC_NUM - 1; + IFQ_SET_MAXLEN(&ifp->if_snd, ifp->if_snd.ifq_drv_maxlen); + IFQ_SET_READY(&ifp->if_snd); + mge_get_mac_address(sc, hwaddr); ether_ifattach(ifp, hwaddr); callout_init(&sc->wd_callout, 0); - IFQ_SET_MAXLEN(&ifp->if_snd, MGE_TX_DESC_NUM - 1); - ifp->if_snd.ifq_drv_maxlen = MGE_TX_DESC_NUM - 1; - IFQ_SET_READY(&ifp->if_snd); - /* Probe PHY(s) */ error = mii_phy_probe(dev, &sc->miibus, mge_ifmedia_upd, mge_ifmedia_sts); if (error) { @@ -579,10 +659,13 @@ sc = device_get_softc(dev); - /* Stop TSEC controller and free TX queue */ + /* Stop controller and free TX queue */ if (sc->ifp) mge_shutdown(dev); + /* Wait for stopping ticks */ + callout_drain(&sc->wd_callout); + /* Stop and release all interrupts */ for (i = 0; i < 2; ++i) { error = bus_teardown_intr(dev, sc->res[1 + i], sc->ih_cookie[i]); @@ -616,7 +699,7 @@ struct mge_softc *sc = ifp->if_softc; struct mii_data *mii; - mtx_lock(&sc->transmit_lock); + MGE_TRANSMIT_LOCK(sc); mii = sc->mii; mii_pollstat(mii); @@ -624,7 +707,7 @@ ifmr->ifm_active = mii->mii_media_active; ifmr->ifm_status = mii->mii_media_status; - mtx_unlock(&sc->transmit_lock); + MGE_TRANSMIT_UNLOCK(sc); } static uint32_t @@ -667,15 +750,13 @@ struct mge_softc *sc = ifp->if_softc; if (ifp->if_flags & IFF_UP) { - mtx_lock(&sc->transmit_lock); - mtx_lock(&sc->receive_lock); + MGE_GLOBAL_LOCK(sc); sc->mge_media_status = sc->mii->mii_media.ifm_media; mii_mediachg(sc->mii); mge_init_locked(sc); - mtx_unlock(&sc->receive_lock); - mtx_unlock(&sc->transmit_lock); + MGE_GLOBAL_UNLOCK(sc); } return (0); @@ -686,13 +767,11 @@ { struct mge_softc *sc = arg; - mtx_lock(&sc->transmit_lock); - mtx_lock(&sc->receive_lock); + MGE_GLOBAL_LOCK(sc); mge_init_locked(arg); - mtx_unlock(&sc->receive_lock); - mtx_unlock(&sc->transmit_lock); + MGE_GLOBAL_UNLOCK(sc); } static void @@ -703,33 +782,31 @@ volatile uint32_t reg_val; int i, count; + + MGE_GLOBAL_LOCK_ASSERT(sc); + /* Stop interface */ mge_stop(sc); - /* Clear and mask interrrupts */ - MGE_WRITE(sc, MGE_INT_CAUSE, 0x0); - MGE_WRITE(sc, MGE_INT_MASK, 0x0); - - MGE_WRITE(sc, MGE_PORT_INT_CAUSE, 0x0); - MGE_WRITE(sc, MGE_PORT_INT_CAUSE_EXT, 0x0); + /* Disable interrupts */ + mge_intrs_ctrl(sc, 0); - MGE_WRITE(sc, MGE_PORT_INT_MASK, 0x0); - MGE_WRITE(sc, MGE_PORT_INT_MASK_EXT, 0x0); - /* Set MAC address */ mge_set_mac_address(sc); - for (i = 0; i < MGE_MCAST_REG_NUMBER; i++) { - MGE_WRITE(sc, MGE_DA_FILTER_SPEC_MCAST(i), 0x0); - MGE_WRITE(sc, MGE_DA_FILTER_OTH_MCAST(i), 0x0); - } + /* Setup multicast filters */ + mge_setup_multicast(sc); +#if defined(MGE_VER2) + MGE_WRITE(sc, MGE_PORT_SERIAL_CTRL1, MGE_RGMII_EN); + MGE_WRITE(sc, MGE_FIXED_PRIO_CONF, MGE_FIXED_PRIO_EN(0)); +#endif /* Initialize TX queue configuration registers */ MGE_WRITE(sc, MGE_TX_TOKEN_COUNT(0), MGE_TX_TOKEN_Q0_DFLT); MGE_WRITE(sc, MGE_TX_TOKEN_CONF(0), MGE_TX_TOKEN_Q0_DFLT); MGE_WRITE(sc, MGE_TX_ARBITER_CONF(0), MGE_TX_ARB_Q0_DFLT); - for (i = 1; i < MGE_RX_QUEUE_NUM; i++) { + for (i = 1; i < 7; i++) { MGE_WRITE(sc, MGE_TX_TOKEN_COUNT(i), MGE_TX_TOKEN_Q1_7_DFLT); MGE_WRITE(sc, MGE_TX_TOKEN_CONF(i), MGE_TX_TOKEN_Q1_7_DFLT); MGE_WRITE(sc, MGE_TX_ARBITER_CONF(i), MGE_TX_ARB_Q1_7_DFLT); @@ -749,11 +826,10 @@ MGE_WRITE(sc, MGE_PORT_SERIAL_CTRL, reg_val); /* Setup SDMA configuration */ - MGE_WRITE(sc, MGE_SDMA_CONFIG , MGE_SMDA_RX_BYTE_SWAP | - MGE_SMDA_TX_BYTE_SWAP | + MGE_WRITE(sc, MGE_SDMA_CONFIG , MGE_SDMA_RX_BYTE_SWAP | + MGE_SDMA_TX_BYTE_SWAP | MGE_SDMA_RX_BURST_SIZE(MGE_SDMA_BURST_16_WORD) | - MGE_SDMA_TX_BURST_SIZE(MGE_SDMA_BURST_16_WORD) | - MGE_SMDA_RX_IPG(0)); + MGE_SDMA_TX_BURST_SIZE(MGE_SDMA_BURST_16_WORD)); MGE_WRITE(sc, MGE_TX_FIFO_URGENT_TRSH, 0x0); @@ -794,11 +870,21 @@ } } + /* Setup interrupts coalescing */ + mge_set_rxic(sc); + mge_set_txic(sc); + /* Enable interrupts */ - MGE_WRITE(sc, MGE_PORT_INT_MASK , MGE_PORT_INT_RX0 | - MGE_PORT_INT_EXTEND | MGE_PORT_INT_RXERR0); - MGE_WRITE(sc, MGE_PORT_INT_MASK_EXT , MGE_PORT_INT_EXT_TXERR | - MGE_PORT_INT_EXT_RXOR | MGE_PORT_INT_EXT_TXUR | MGE_PORT_INT_EXT_TXBUF); +#ifdef DEVICE_POLLING + /* + * * ...only if polling is not turned on. Disable interrupts explicitly + * if polling is enabled. + */ + if (sc->ifp->if_capenable & IFCAP_POLLING) + mge_intrs_ctrl(sc, 0); + else +#endif /* DEVICE_POLLING */ + mge_intrs_ctrl(sc, 1); /* Activate network interface */ sc->ifp->if_drv_flags |= IFF_DRV_RUNNING; @@ -830,86 +916,95 @@ } static void -mge_intr_rx(void *arg) -{ +mge_intr_rx(void *arg) { struct mge_softc *sc = arg; - struct ifnet *ifp; - uint32_t int_cause, int_cause_ext, status; - struct mge_desc_wrapper* dw; - struct mbuf *mb; - struct mbuf *rcv_mbufs[MGE_RX_DESC_NUM]; - int c1 = 0; - int c2; + uint32_t int_cause, int_cause_ext; + + MGE_RECEIVE_LOCK(sc); - ifp = sc->ifp; +#ifdef DEVICE_POLLING + if (sc->ifp->if_capenable & IFCAP_POLLING) { + MGE_RECEIVE_UNLOCK(sc); + return; + } +#endif /* Get interrupt cause */ int_cause = MGE_READ(sc, MGE_PORT_INT_CAUSE); int_cause_ext = MGE_READ(sc, MGE_PORT_INT_CAUSE_EXT); /* Check for resource error */ - if (int_cause & MGE_PORT_INT_RXERR0) { + if (int_cause & MGE_PORT_INT_RXERRQ0) { mge_reinit_rx(sc); MGE_WRITE(sc, MGE_PORT_INT_CAUSE, - int_cause & ~MGE_PORT_INT_RXERR0); + int_cause & ~MGE_PORT_INT_RXERRQ0); } - int_cause &= MGE_PORT_INT_RX0; + int_cause &= MGE_PORT_INT_RXQ0; int_cause_ext &= MGE_PORT_INT_EXT_RXOR; if (int_cause || int_cause_ext) { MGE_WRITE(sc, MGE_PORT_INT_CAUSE, ~int_cause); MGE_WRITE(sc, MGE_PORT_INT_CAUSE_EXT, ~int_cause_ext); + mge_intr_rx_locked(sc, -1); + } - mtx_lock(&sc->receive_lock); + MGE_RECEIVE_UNLOCK(sc); +} + + +static void +mge_intr_rx_locked(struct mge_softc *sc, int count) +{ + struct ifnet *ifp = sc->ifp; + uint32_t status; + uint16_t bufsize; + struct mge_desc_wrapper* dw; + struct mbuf *mb; - while(1) { - dw = &sc->mge_rx_desc[sc->rx_desc_curr]; - bus_dmamap_sync(sc->mge_desc_dtag, dw->desc_dmap, - BUS_DMASYNC_POSTREAD); + MGE_RECEIVE_LOCK_ASSERT(sc); - /* Get status */ - status = dw->mge_desc->cmd_status; - if ((status & MGE_DMA_OWNED) != 0) - break; + while(count != 0) { + dw = &sc->mge_rx_desc[sc->rx_desc_curr]; + bus_dmamap_sync(sc->mge_desc_dtag, dw->desc_dmap, + BUS_DMASYNC_POSTREAD); - sc->rx_desc_curr = (++sc->rx_desc_curr % MGE_RX_DESC_NUM); - if (dw->mge_desc->byte_count && - ~(status & MGE_ERR_SUMMARY)) { + /* Get status */ + status = dw->mge_desc->cmd_status; + bufsize = dw->mge_desc->buff_size; + if ((status & MGE_DMA_OWNED) != 0) + break; - bus_dmamap_sync(sc->mge_rx_dtag, dw->buffer_dmap, - BUS_DMASYNC_POSTREAD); + sc->rx_desc_curr = (++sc->rx_desc_curr % MGE_RX_DESC_NUM); + if (dw->mge_desc->byte_count && + ~(status & MGE_ERR_SUMMARY)) { - mb = m_devget(dw->buffer->m_data, - dw->mge_desc->byte_count - ETHER_CRC_LEN, - 0, ifp, NULL); + bus_dmamap_sync(sc->mge_rx_dtag, dw->buffer_dmap, + BUS_DMASYNC_POSTREAD); - mb->m_len -= 2; - mb->m_pkthdr.len -= 2; - mb->m_data += 2; + mb = m_devget(dw->buffer->m_data, + dw->mge_desc->byte_count - ETHER_CRC_LEN, + 0, ifp, NULL); - if (ifp->if_capenable & IFCAP_RXCSUM) { - if (status & MGE_RX_IP_OK) - mb->m_pkthdr.csum_flags = - CSUM_IP_CHECKED | CSUM_IP_VALID; - } + mb->m_len -= 2; + mb->m_pkthdr.len -= 2; + mb->m_data += 2; - rcv_mbufs[c1++] = mb; - if (c1 >= MGE_RX_DESC_NUM) - break; - } + mge_offload_process_frame(ifp, mb, status, + bufsize); - dw->mge_desc->byte_count = 0; - dw->mge_desc->cmd_status = MGE_RX_ENABLE_INT | MGE_DMA_OWNED; - bus_dmamap_sync(sc->mge_desc_dtag, dw->desc_dmap, - BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); + (*ifp->if_input)(ifp, mb); } - mtx_unlock(&sc->receive_lock); + dw->mge_desc->byte_count = 0; + dw->mge_desc->cmd_status = MGE_RX_ENABLE_INT | MGE_DMA_OWNED; + bus_dmamap_sync(sc->mge_desc_dtag, dw->desc_dmap, + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); - for (c2 = 0; c2 < c1; c2++) - (*ifp->if_input)(ifp, rcv_mbufs[c2]); + if (count > 0) + count -= 1; } + return; } @@ -927,26 +1022,42 @@ mge_intr_tx(void *arg) { struct mge_softc *sc = arg; - struct ifnet *ifp; - uint32_t int_cause_ext, status; - struct mge_desc_wrapper *dw; - struct mge_desc *desc; - int send = 0; + uint32_t int_cause_ext; + + MGE_TRANSMIT_LOCK(sc); - ifp = sc->ifp; +#ifdef DEVICE_POLLING + if (sc->ifp->if_capenable & IFCAP_POLLING) { + MGE_TRANSMIT_UNLOCK(sc); + return; + } +#endif /* Ack the interrupt */ int_cause_ext = MGE_READ(sc, MGE_PORT_INT_CAUSE_EXT); MGE_WRITE(sc, MGE_PORT_INT_CAUSE_EXT, - int_cause_ext & ~MGE_PORT_INT_EXT_TXBUF); + int_cause_ext & ~MGE_PORT_INT_EXT_TXBUF0); + + mge_intr_tx_locked(sc); + + MGE_TRANSMIT_UNLOCK(sc); +} + + +static void +mge_intr_tx_locked(struct mge_softc *sc) +{ + struct ifnet *ifp = sc->ifp; + struct mge_desc_wrapper *dw; + struct mge_desc *desc; + uint32_t status; + int send = 0; + + MGE_TRANSMIT_LOCK_ASSERT(sc); /* Disable watchdog */ sc->wd_timer = 0; - /* Acquire the mutex */ - mtx_assert(&sc->receive_lock, MA_NOTOWNED); - mtx_lock(&sc->transmit_lock); - while (sc->tx_desc_used_count) { /* Get the descriptor */ dw = &sc->mge_tx_desc[sc->tx_desc_used_idx]; @@ -987,8 +1098,6 @@ ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; mge_start_locked(ifp); } - - mtx_unlock(&sc->transmit_lock); } static int @@ -996,21 +1105,24 @@ { struct mge_softc *sc = ifp->if_softc; struct ifreq *ifr = (struct ifreq *)data; - int error; + int mask, error; uint32_t flags; error = 0; switch (command) { case SIOCSIFFLAGS: - mtx_lock(&sc->transmit_lock); - mtx_lock(&sc->receive_lock); + MGE_GLOBAL_LOCK(sc); if (ifp->if_flags & IFF_UP) { if (ifp->if_drv_flags & IFF_DRV_RUNNING) { flags = ifp->if_flags ^ sc->mge_if_flags; if (flags & IFF_PROMISC) - mge_set_prom_mode(sc, MGE_RX_DEFAULT_QUEUE); + mge_set_prom_mode(sc, + MGE_RX_DEFAULT_QUEUE); + + if (flags & IFF_ALLMULTI) + mge_setup_multicast(sc); } else mge_init_locked(sc); } @@ -1018,11 +1130,55 @@ mge_stop(sc); sc->mge_if_flags = ifp->if_flags; - mtx_unlock(&sc->transmit_lock); - mtx_unlock(&sc->receive_lock); + MGE_GLOBAL_UNLOCK(sc); + break; + case SIOCADDMULTI: + case SIOCDELMULTI: + if (ifp->if_drv_flags & IFF_DRV_RUNNING) { + MGE_GLOBAL_LOCK(sc); + mge_setup_multicast(sc); + MGE_GLOBAL_UNLOCK(sc); + } + break; + case SIOCSIFCAP: + mask = ifp->if_capenable ^ ifr->ifr_reqcap; + if (mask & IFCAP_HWCSUM) { + ifp->if_capenable &= ~IFCAP_HWCSUM; + ifp->if_capenable |= IFCAP_HWCSUM & ifr->ifr_reqcap; + if (ifp->if_capenable & IFCAP_TXCSUM) + ifp->if_hwassist = MGE_CHECKSUM_FEATURES; + else + ifp->if_hwassist = 0; + } +#ifdef DEVICE_POLLING + if (mask & IFCAP_POLLING) { + if (ifr->ifr_reqcap & IFCAP_POLLING) { + error = ether_poll_register(mge_poll, ifp); + if (error) + return(error); + + MGE_GLOBAL_LOCK(sc); + mge_intrs_ctrl(sc, 0); + ifp->if_capenable |= IFCAP_POLLING; + MGE_GLOBAL_UNLOCK(sc); + } else { + error = ether_poll_deregister(ifp); + MGE_GLOBAL_LOCK(sc); + mge_intrs_ctrl(sc, 1); + ifp->if_capenable &= ~IFCAP_POLLING; + MGE_GLOBAL_UNLOCK(sc); + } + } +#endif break; case SIOCGIFMEDIA: /* fall through */ case SIOCSIFMEDIA: + if (IFM_SUBTYPE(ifr->ifr_media) == IFM_1000_T + && !(ifr->ifr_media & IFM_FDX)) { + device_printf(sc->dev, + "1000baseTX half-duplex unsupported\n"); + return 0; + } error = ifmedia_ioctl(ifp, ifr, &sc->mii->mii_media, command); break; default: @@ -1034,35 +1190,46 @@ static int mge_miibus_readreg(device_t dev, int phy, int reg) { - struct mge_softc *sc; uint32_t retries; - sc = device_get_softc(dev); - MGE_WRITE(sc, MGE_REG_SMI, 0x1fffffff & + /* + * We assume static PHY address <=> device unit mapping: + * PHY Address = MV_PHY_ADDR_BASE + devce unit. + * This is true for most Marvell boards. + * + * Code below grants proper PHY detection on each device + * unit. + */ + + if ((MV_PHY_ADDR_BASE + device_get_unit(dev)) != phy) + return (0); + + MGE_WRITE(sc_mge0, MGE_REG_SMI, 0x1fffffff & (MGE_SMI_READ | (reg << 21) | (phy << 16))); retries = MGE_SMI_READ_RETRIES; - while (--retries && !(MGE_READ(sc, MGE_REG_SMI) & MGE_SMI_READVALID)) + while (--retries && !(MGE_READ(sc_mge0, MGE_REG_SMI) & MGE_SMI_READVALID)) DELAY(MGE_SMI_READ_DELAY); if (retries == 0) device_printf(dev, "Timeout while reading from PHY\n"); - return (MGE_READ(sc, MGE_REG_SMI) & 0xffff); + return (MGE_READ(sc_mge0, MGE_REG_SMI) & 0xffff); } static void mge_miibus_writereg(device_t dev, int phy, int reg, int value) { - struct mge_softc *sc; uint32_t retries; - sc = device_get_softc(dev); - MGE_WRITE(sc, MGE_REG_SMI, 0x1fffffff & + if ((MV_PHY_ADDR_BASE + device_get_unit(dev)) != phy) + return; + + MGE_WRITE(sc_mge0, MGE_REG_SMI, 0x1fffffff & (MGE_SMI_WRITE | (reg << 21) | (phy << 16) | (value & 0xffff))); retries = MGE_SMI_WRITE_RETRIES; - while (--retries && MGE_READ(sc, MGE_REG_SMI) & MGE_SMI_BUSY) + while (--retries && MGE_READ(sc_mge0, MGE_REG_SMI) & MGE_SMI_BUSY) DELAY(MGE_SMI_WRITE_DELAY); if (retries == 0) @@ -1074,7 +1241,6 @@ { device_set_desc(dev, "Marvell Gigabit Ethernet controller"); - return (BUS_PROBE_DEFAULT); } @@ -1091,13 +1257,16 @@ { struct mge_softc *sc = device_get_softc(dev); - mtx_lock(&sc->transmit_lock); - mtx_lock(&sc->receive_lock); + MGE_GLOBAL_LOCK(sc); + +#ifdef DEVICE_POLLING + if (sc->ifp->if_capenable & IFCAP_POLLING) + ether_poll_deregister(sc->ifp); +#endif mge_stop(sc); - mtx_unlock(&sc->transmit_lock); - mtx_unlock(&sc->receive_lock); + MGE_GLOBAL_UNLOCK(sc); return (0); } @@ -1116,9 +1285,10 @@ ifp = sc->ifp; /* Check for free descriptors */ - if (sc->tx_desc_used_count + 1 >= MGE_TX_DESC_NUM) + if (sc->tx_desc_used_count + 1 >= MGE_TX_DESC_NUM) { /* No free descriptors */ return (-1); + } /* Fetch unused map */ desc_no = sc->tx_desc_curr; @@ -1143,9 +1313,12 @@ dw->mge_desc->byte_count = segs[seg].ds_len; dw->mge_desc->buffer = segs[seg].ds_addr; dw->buffer = m0; - dw->mge_desc->cmd_status = MGE_TX_DESC_LAST | - MGE_TX_DESC_FIRST | MGE_TX_DESC_ETH_CRC | - MGE_TX_DESC_EN_INT | MGE_TX_DESC_PADDING | MGE_DMA_OWNED; + dw->mge_desc->cmd_status = MGE_TX_LAST | MGE_TX_FIRST | + MGE_TX_ETH_CRC | MGE_TX_EN_INT | MGE_TX_PADDING | + MGE_DMA_OWNED; + + if (seg == 0) + mge_offload_setup_descriptor(sc, dw); } bus_dmamap_sync(sc->mge_desc_dtag, mapp, @@ -1181,12 +1354,10 @@ ifp = sc->ifp; - mtx_lock(&sc->transmit_lock); - mtx_lock(&sc->receive_lock); + MGE_GLOBAL_LOCK(sc); if (sc->wd_timer == 0 || --sc->wd_timer) { - mtx_unlock(&sc->receive_lock); - mtx_unlock(&sc->transmit_lock); + MGE_GLOBAL_UNLOCK(sc); return; } @@ -1196,8 +1367,7 @@ mge_stop(sc); mge_init_locked(sc); - mtx_unlock(&sc->receive_lock); - mtx_unlock(&sc->transmit_lock); + MGE_GLOBAL_UNLOCK(sc); } static void @@ -1205,12 +1375,11 @@ { struct mge_softc *sc = ifp->if_softc; - mtx_assert(&sc->receive_lock, MA_NOTOWNED); - mtx_lock(&sc->transmit_lock); + MGE_TRANSMIT_LOCK(sc); mge_start_locked(ifp); - mtx_unlock(&sc->transmit_lock); + MGE_TRANSMIT_UNLOCK(sc); } static void @@ -1218,10 +1387,12 @@ { struct mge_softc *sc; struct mbuf *m0, *mtmp; - unsigned int queued = 0; + uint32_t reg_val, queued = 0; sc = ifp->if_softc; + MGE_TRANSMIT_LOCK_ASSERT(sc); + if ((ifp->if_drv_flags & (IFF_DRV_RUNNING | IFF_DRV_OACTIVE)) != IFF_DRV_RUNNING) return; @@ -1247,7 +1418,8 @@ if (queued) { /* Enable transmitter and watchdog timer */ - MGE_WRITE(sc, MGE_TX_QUEUE_CMD, MGE_ENABLE_TXQ); + reg_val = MGE_READ(sc, MGE_TX_QUEUE_CMD); + MGE_WRITE(sc, MGE_TX_QUEUE_CMD, reg_val | MGE_ENABLE_TXQ); sc->wd_timer = 5; } } @@ -1266,16 +1438,19 @@ if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) return; + /* Stop tick engine */ + callout_stop(&sc->wd_callout); + /* Disable interface */ ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE); sc->wd_timer = 0; - /* Disable all interrupts and stop DMA */ - MGE_WRITE(sc, MGE_PORT_INT_MASK , 0x0); - MGE_WRITE(sc, MGE_PORT_INT_MASK_EXT , 0x0); + /* Disable interrupts */ + mge_intrs_ctrl(sc, 0); /* Disable Rx and Tx */ - MGE_WRITE(sc, MGE_TX_QUEUE_CMD, MGE_DISABLE_TXQ); + reg_val = MGE_READ(sc, MGE_TX_QUEUE_CMD); + MGE_WRITE(sc, MGE_TX_QUEUE_CMD, reg_val | MGE_DISABLE_TXQ); MGE_WRITE(sc, MGE_RX_QUEUE_CMD, MGE_DISABLE_RXQ_ALL); /* Remove pending data from TX queue */ @@ -1329,3 +1504,252 @@ device_printf(dev, "%s\n", __FUNCTION__); return (0); } + +static void +mge_offload_process_frame(struct ifnet *ifp, struct mbuf *frame, + uint32_t status, uint16_t bufsize) +{ + int csum_flags = 0; + + if (ifp->if_capenable & IFCAP_RXCSUM) { + if ((status & MGE_RX_L3_IS_IP) && (status & MGE_RX_IP_OK)) + csum_flags |= CSUM_IP_CHECKED | CSUM_IP_VALID; + + if ((bufsize & MGE_RX_IP_FRAGMENT) == 0 && + (MGE_RX_L4_IS_TCP(status) || MGE_RX_L4_IS_UDP(status)) && + (status & MGE_RX_L4_CSUM_OK)) { + csum_flags |= CSUM_DATA_VALID | CSUM_PSEUDO_HDR; + frame->m_pkthdr.csum_data = 0xFFFF; + } + + frame->m_pkthdr.csum_flags = csum_flags; + } +} + +static void +mge_offload_setup_descriptor(struct mge_softc *sc, struct mge_desc_wrapper *dw) +{ + struct mbuf *m0 = dw->buffer; + struct ether_vlan_header *eh = mtod(m0, struct ether_vlan_header *); + int csum_flags = m0->m_pkthdr.csum_flags; + int cmd_status = 0; + struct ip *ip; + int ehlen, etype; + + if (csum_flags) { + if (eh->evl_encap_proto == htons(ETHERTYPE_VLAN)) { + etype = ntohs(eh->evl_proto); + ehlen = ETHER_HDR_LEN + ETHER_VLAN_ENCAP_LEN; + csum_flags |= MGE_TX_VLAN_TAGGED; + } else { + etype = ntohs(eh->evl_encap_proto); + ehlen = ETHER_HDR_LEN; + } + + if (etype != ETHERTYPE_IP) { + if_printf(sc->ifp, + "TCP/IP Offload enabled for unsupported " + "protocol!\n"); + return; + } + + ip = (struct ip *)(m0->m_data + ehlen); + cmd_status |= MGE_TX_IP_HDR_SIZE(ip->ip_hl); + + if ((m0->m_flags & M_FRAG) == 0) + cmd_status |= MGE_TX_NOT_FRAGMENT; + } + + if (csum_flags & CSUM_IP) + cmd_status |= MGE_TX_GEN_IP_CSUM; + + if (csum_flags & CSUM_TCP) + cmd_status |= MGE_TX_GEN_L4_CSUM; + + if (csum_flags & CSUM_UDP) + cmd_status |= MGE_TX_GEN_L4_CSUM | MGE_TX_UDP; + + dw->mge_desc->cmd_status |= cmd_status; +} + +static void +mge_intrs_ctrl(struct mge_softc *sc, int enable) +{ + + if (enable) { + MGE_WRITE(sc, MGE_PORT_INT_MASK , MGE_PORT_INT_RXQ0 | + MGE_PORT_INT_EXTEND | MGE_PORT_INT_RXERRQ0); + MGE_WRITE(sc, MGE_PORT_INT_MASK_EXT , MGE_PORT_INT_EXT_TXERR0 | + MGE_PORT_INT_EXT_RXOR | MGE_PORT_INT_EXT_TXUR | + MGE_PORT_INT_EXT_TXBUF0); + } else { + MGE_WRITE(sc, MGE_INT_CAUSE, 0x0); + MGE_WRITE(sc, MGE_INT_MASK, 0x0); + + MGE_WRITE(sc, MGE_PORT_INT_CAUSE, 0x0); + MGE_WRITE(sc, MGE_PORT_INT_CAUSE_EXT, 0x0); + + MGE_WRITE(sc, MGE_PORT_INT_MASK, 0x0); + MGE_WRITE(sc, MGE_PORT_INT_MASK_EXT, 0x0); + } +} + +static uint8_t +mge_crc8(uint8_t *data, int size) +{ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Sep 6 19:28:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 286641065675; Sat, 6 Sep 2008 19:28: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 E045F106566C for ; Sat, 6 Sep 2008 19:28:16 +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 BB9298FC29 for ; Sat, 6 Sep 2008 19:28:16 +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 m86JSGYC039682 for ; Sat, 6 Sep 2008 19:28:16 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m86JSGmd039679 for perforce@freebsd.org; Sat, 6 Sep 2008 19:28:16 GMT (envelope-from raj@freebsd.org) Date: Sat, 6 Sep 2008 19:28:16 GMT Message-Id: <200809061928.m86JSGmd039679@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 149351 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Sep 2008 19:28:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=149351 Change 149351 by raj@raj_mimi on 2008/09/06 19:27:24 Enable polling in the DB-88F5XXX kernel config. Affected files ... .. //depot/projects/arm/src/sys/arm/conf/DB-88F5XXX#4 edit Differences ... ==== //depot/projects/arm/src/sys/arm/conf/DB-88F5XXX#4 (text+ko) ==== @@ -61,6 +61,10 @@ device e1000phy device bpf +# polling(4) support +options DEVICE_POLLING +options HZ=1000 + device mem # Memory and kernel memory devices device md From owner-p4-projects@FreeBSD.ORG Sat Sep 6 20:45:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4E520106567B; Sat, 6 Sep 2008 20:45: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 1203D1065679 for ; Sat, 6 Sep 2008 20:45:36 +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 05B6C8FC1F for ; Sat, 6 Sep 2008 20:45:36 +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 m86KjZMk067959 for ; Sat, 6 Sep 2008 20:45:35 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m86KjZlH067946 for perforce@freebsd.org; Sat, 6 Sep 2008 20:45:35 GMT (envelope-from sam@freebsd.org) Date: Sat, 6 Sep 2008 20:45:35 GMT Message-Id: <200809062045.m86KjZlH067946@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 149353 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Sep 2008 20:45:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=149353 Change 149353 by sam@sam_ebb on 2008/09/06 20:44:47 IFC @ 149343 Affected files ... .. //depot/projects/vap/sbin/ipfw/ipfw2.c#8 integrate .. //depot/projects/vap/sbin/natd/natd.c#5 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#5 integrate .. //depot/projects/vap/sys/contrib/dev/ath/public/wisoc.hal.o.uu#1 branch .. //depot/projects/vap/sys/contrib/dev/ath/public/wisoc.inc#1 branch .. //depot/projects/vap/sys/net80211/ieee80211.h#15 integrate .. //depot/projects/vap/sys/net80211/ieee80211_ddb.c#25 integrate .. //depot/projects/vap/sys/net80211/ieee80211_freebsd.h#36 integrate .. //depot/projects/vap/sys/net80211/ieee80211_ht.c#45 integrate .. //depot/projects/vap/sys/net80211/ieee80211_ht.h#20 integrate .. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#65 integrate .. //depot/projects/vap/sys/net80211/ieee80211_ioctl.h#24 integrate .. //depot/projects/vap/sys/net80211/ieee80211_node.c#46 integrate .. //depot/projects/vap/sys/net80211/ieee80211_node.h#27 integrate .. //depot/projects/vap/sys/net80211/ieee80211_phy.c#10 integrate .. //depot/projects/vap/sys/net80211/ieee80211_sta.c#18 integrate Differences ... ==== //depot/projects/vap/sbin/ipfw/ipfw2.c#8 (text+ko) ==== @@ -17,7 +17,7 @@ * * NEW command line interface for IP firewall facility * - * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.120 2008/05/10 15:02:56 julian Exp $ + * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.121 2008/09/06 17:23:37 rik Exp $ */ #include @@ -2429,7 +2429,7 @@ rulenum = atoi(av[0]); new_set = atoi(av[2]); if (!isdigit(*(av[0])) || (cmd == 3 && rulenum > RESVD_SET) || - (cmd == 2 && rulenum == 65535) ) + (cmd == 2 && rulenum == IPFW_DEFAULT_RULE) ) errx(EX_DATAERR, "invalid source number %s\n", av[0]); if (!isdigit(*(av[2])) || new_set > RESVD_SET) errx(EX_DATAERR, "invalid dest. set %s\n", av[1]); @@ -2553,7 +2553,7 @@ * need to scan the list to count them. */ for (nstat = 1, r = data, lim = (char *)data + nbytes; - r->rulenum < 65535 && (char *)r < lim; + r->rulenum < IPFW_DEFAULT_RULE && (char *)r < lim; ++nstat, r = NEXT(r) ) ; /* nothing */ @@ -5045,7 +5045,8 @@ if (have_tag) errx(EX_USAGE, "tag and untag cannot be " "specified more than once"); - GET_UINT_ARG(tag, 1, 65534, i, rule_action_params); + GET_UINT_ARG(tag, 1, IPFW_DEFAULT_RULE - 1, i, + rule_action_params); have_tag = cmd; fill_cmd(cmd, O_TAG, (i == TOK_TAG) ? 0: F_NOT, tag); ac--; av++; @@ -5521,8 +5522,8 @@ if (c->limit_mask == 0) errx(EX_USAGE, "limit: missing limit mask"); - GET_UINT_ARG(c->conn_limit, 1, 65534, TOK_LIMIT, - rule_options); + GET_UINT_ARG(c->conn_limit, 1, IPFW_DEFAULT_RULE - 1, + TOK_LIMIT, rule_options); ac--; av++; break; @@ -5649,8 +5650,8 @@ else { uint16_t tag; - GET_UINT_ARG(tag, 1, 65534, TOK_TAGGED, - rule_options); + GET_UINT_ARG(tag, 1, IPFW_DEFAULT_RULE - 1, + TOK_TAGGED, rule_options); fill_cmd(cmd, O_TAGGED, 0, tag); } ac--; av++; @@ -5978,7 +5979,7 @@ size = 0; data = NULL; frule = 0; - lrule = 65535; /* max ipfw rule number */ + lrule = IPFW_DEFAULT_RULE; /* max ipfw rule number */ ac--; av++; /* Parse parameters. */ ==== //depot/projects/vap/sbin/natd/natd.c#5 (text+ko) ==== @@ -11,7 +11,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/natd/natd.c,v 1.53 2008/06/22 22:14:02 mav Exp $"); +__FBSDID("$FreeBSD: src/sbin/natd/natd.c,v 1.54 2008/09/06 17:26:52 rik Exp $"); #define SYSLOG_NAMES @@ -130,6 +130,7 @@ static void SetupSkinnyPort(const char *strValue); static void NewInstance(const char *name); static void DoGlobal (int fd); +static int CheckIpfwRulenum(unsigned int rnum); /* * Globals. @@ -1947,6 +1948,10 @@ if (sscanf(strValue, "%u:%u", &base, &num) != 2) errx(1, "punch_fw: basenumber:count parameter required"); + if (CheckIpfwRulenum(base + num - 1) == -1) + errx(1, "punch_fw: basenumber:count parameter should fit " + "the maximum allowed rule numbers"); + LibAliasSetFWBase(mla, base, num); (void)LibAliasSetMode(mla, PKT_ALIAS_PUNCH_FW, PKT_ALIAS_PUNCH_FW); } @@ -1991,3 +1996,22 @@ mla = ip->la; mip = ip; } + +static int +CheckIpfwRulenum(unsigned int rnum) +{ + unsigned int default_rule; + size_t len = sizeof(default_rule); + + if (sysctlbyname("net.inet.ip.fw.default_rule", &default_rule, &len, + NULL, 0) == -1) { + warn("Failed to get the default ipfw rule number, using " + "default historical value 65535. The reason was"); + default_rule = 65535; + } + if (rnum >= default_rule) { + return -1; + } + + return 0; +} ==== //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 (text+ko) ==== @@ -1303,12 +1303,6 @@ } } out: - - if (error == 0) { - *vpp = ZTOV(zp); - vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY); - } - if (dl) zfs_dirent_unlock(dl); @@ -1588,8 +1582,6 @@ zfs_log_create(zilog, tx, TX_MKDIR, dzp, zp, dirname); dmu_tx_commit(tx); - vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY); - zfs_dirent_unlock(dl); ZFS_EXIT(zfsvfs); @@ -2773,7 +2765,6 @@ if (error == 0) { zfs_log_symlink(zilog, tx, TX_SYMLINK, dzp, zp, name, link); *vpp = ZTOV(zp); - vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY); } dmu_tx_commit(tx); ==== //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#5 (text+ko) ==== @@ -117,6 +117,7 @@ if (cdrarg != NULL) { error = getnewvnode("zfs", vfsp, &zfs_vnodeops, &vp); ASSERT(error == 0); + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); zp->z_vnode = vp; vp->v_data = (caddr_t)zp; VN_LOCK_AREC(vp); @@ -535,8 +536,10 @@ *zpp = zp; } else { - if (ZTOV(zp) != NULL) + if (ZTOV(zp) != NULL) { ZTOV(zp)->v_count = 0; + VOP_UNLOCK(ZTOV(zp), 0); + } dmu_buf_rele(dbp, NULL); zfs_znode_free(zp); } @@ -598,6 +601,7 @@ &zp->z_vnode); ASSERT(err == 0); vp = ZTOV(zp); + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); vp->v_data = (caddr_t)zp; VN_LOCK_AREC(vp); VN_LOCK_ASHARE(vp); @@ -608,6 +612,7 @@ err = insmntque(vp, zfsvfs->z_vfs); vp->v_vflag &= ~VV_FORCEINSMQ; KASSERT(err == 0, ("insmntque() failed: error %d", err)); + VOP_UNLOCK(vp, 0); } mutex_exit(&zp->z_lock); ZFS_OBJ_HOLD_EXIT(zfsvfs, obj_num); @@ -623,6 +628,7 @@ zfs_znode_dmu_init(zp); ZFS_OBJ_HOLD_EXIT(zfsvfs, obj_num); *zpp = zp; + VOP_UNLOCK(vp, 0); return (0); } ==== //depot/projects/vap/sys/net80211/ieee80211.h#15 (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/sys/net80211/ieee80211.h,v 1.21 2008/08/06 15:54:59 sam Exp $ + * $FreeBSD: src/sys/net80211/ieee80211.h,v 1.22 2008/09/06 17:14:27 sam Exp $ */ #ifndef _NET80211_IEEE80211_H_ #define _NET80211_IEEE80211_H_ ==== //depot/projects/vap/sys/net80211/ieee80211_ddb.c#25 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_ddb.c,v 1.5 2008/08/25 05:20:29 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_ddb.c,v 1.7 2008/09/06 17:18:38 sam Exp $"); #include "opt_ddb.h" #include "opt_wlan.h" ==== //depot/projects/vap/sys/net80211/ieee80211_freebsd.h#36 (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/sys/net80211/ieee80211_freebsd.h,v 1.18 2008/05/28 23:10:53 sam Exp $ + * $FreeBSD: src/sys/net80211/ieee80211_freebsd.h,v 1.20 2008/09/06 17:29:11 sam Exp $ */ #ifndef _NET80211_IEEE80211_FREEBSD_H_ #define _NET80211_IEEE80211_FREEBSD_H_ ==== //depot/projects/vap/sys/net80211/ieee80211_ht.c#45 (text+ko) ==== @@ -25,7 +25,7 @@ #include #ifdef __FreeBSD__ -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_ht.c,v 1.12 2008/08/02 18:04:09 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_ht.c,v 1.18 2008/09/06 17:42:51 sam Exp $"); #endif /* ==== //depot/projects/vap/sys/net80211/ieee80211_ht.h#20 (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/sys/net80211/ieee80211_ht.h,v 1.6 2008/05/11 23:18:11 sam Exp $ + * $FreeBSD: src/sys/net80211/ieee80211_ht.h,v 1.7 2008/09/06 17:29:11 sam Exp $ */ #ifndef _NET80211_IEEE80211_HT_H_ #define _NET80211_IEEE80211_HT_H_ ==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#65 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_ioctl.c,v 1.62 2008/08/09 05:46:01 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_ioctl.c,v 1.63 2008/09/06 17:43:47 sam Exp $"); /* * IEEE 802.11 ioctl support (FreeBSD-specific) ==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.h#24 (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/sys/net80211/ieee80211_ioctl.h,v 1.27 2008/04/20 20:35:43 sam Exp $ + * $FreeBSD: src/sys/net80211/ieee80211_ioctl.h,v 1.28 2008/09/06 17:38:20 sam Exp $ */ #ifndef _NET80211_IEEE80211_IOCTL_H_ #define _NET80211_IEEE80211_IOCTL_H_ ==== //depot/projects/vap/sys/net80211/ieee80211_node.c#46 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_node.c,v 1.99 2008/06/07 18:38:02 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_node.c,v 1.100 2008/09/06 17:51:02 sam Exp $"); #include "opt_wlan.h" ==== //depot/projects/vap/sys/net80211/ieee80211_node.h#27 (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/sys/net80211/ieee80211_node.h,v 1.31 2008/04/20 20:35:43 sam Exp $ + * $FreeBSD: src/sys/net80211/ieee80211_node.h,v 1.34 2008/09/06 17:42:51 sam Exp $ */ #ifndef _NET80211_IEEE80211_NODE_H_ #define _NET80211_IEEE80211_NODE_H_ ==== //depot/projects/vap/sys/net80211/ieee80211_phy.c#10 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_phy.c,v 1.3 2008/09/06 17:48:25 sam Exp $"); /* * IEEE 802.11 PHY-related support. @@ -174,6 +174,7 @@ }, }; +#undef Mb #undef B #undef OFDM #undef CCK ==== //depot/projects/vap/sys/net80211/ieee80211_sta.c#18 (text+ko) ==== @@ -25,7 +25,7 @@ #include #ifdef __FreeBSD__ -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_sta.c,v 1.2 2008/09/06 17:51:02 sam Exp $"); #endif /* From owner-p4-projects@FreeBSD.ORG Sat Sep 6 21:41:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F3EF7106567E; Sat, 6 Sep 2008 21:41: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 B8126106567C for ; Sat, 6 Sep 2008 21:41:32 +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 938BE8FC32 for ; Sat, 6 Sep 2008 21:41:32 +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 m86LfWul058158 for ; Sat, 6 Sep 2008 21:41:32 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m86LfWDF058154 for perforce@freebsd.org; Sat, 6 Sep 2008 21:41:32 GMT (envelope-from sam@freebsd.org) Date: Sat, 6 Sep 2008 21:41:32 GMT Message-Id: <200809062141.m86LfWDF058154@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 149355 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Sep 2008 21:41:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=149355 Change 149355 by sam@sam_ebb on 2008/09/06 21:41:24 can't assume ni_chan is setup unless in RUN state Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_ht.c#46 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_ht.c#46 (text+ko) ==== @@ -995,7 +995,8 @@ TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) { if (vap->iv_opmode != IEEE80211_M_HOSTAP) continue; - if (!IEEE80211_IS_CHAN_HT(vap->iv_bss->ni_chan)) + if (vap->iv_state != IEEE80211_S_RUN || + !IEEE80211_IS_CHAN_HT(vap->iv_bss->ni_chan)) continue; if (first) { IEEE80211_NOTE(vap,