From owner-p4-projects@FreeBSD.ORG Sun Mar 23 00:20:09 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6AA181065677; Sun, 23 Mar 2008 00:20: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 29DEE1065670 for ; Sun, 23 Mar 2008 00:20:09 +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 20F788FC21 for ; Sun, 23 Mar 2008 00:20:09 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2N0K9eQ096575 for ; Sun, 23 Mar 2008 00:20:09 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2N0K9GF096572 for perforce@freebsd.org; Sun, 23 Mar 2008 00:20:09 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 23 Mar 2008 00:20:09 GMT Message-Id: <200803230020.m2N0K9GF096572@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 138308 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Mar 2008 00:20:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=138308 Change 138308 by pgj@disznohal on 2008/03/23 00:19:42 (book.sgml) MFen: 1.171 --> 1.172 Affected files ... .. //depot/projects/docproj_hu/books/handbook/book.sgml#5 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/book.sgml#5 (text+ko) ==== @@ -1,12 +1,12 @@ + Original Revision: 1.172 --> @@ -78,6 +78,7 @@ 2005 2006 2007 + 2008 A &os; dokumentációs projekt From owner-p4-projects@FreeBSD.ORG Sun Mar 23 01:03:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9DA671065676; Sun, 23 Mar 2008 01:03: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 4300E106566B for ; Sun, 23 Mar 2008 01:03:57 +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 37B088FC21 for ; Sun, 23 Mar 2008 01:03:57 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2N13vcL016790 for ; Sun, 23 Mar 2008 01:03:57 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2N13v9e016788 for perforce@freebsd.org; Sun, 23 Mar 2008 01:03:57 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 23 Mar 2008 01:03:57 GMT Message-Id: <200803230103.m2N13v9e016788@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 138309 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Mar 2008 01:03:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=138309 Change 138309 by pgj@disznohal on 2008/03/23 01:03:48 (kernelconfig) MFen: 1.176 --> 1.180 Affected files ... .. //depot/projects/docproj_hu/books/handbook/kernelconfig/chapter.sgml#4 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/kernelconfig/chapter.sgml#4 (text+ko) ==== @@ -1,11 +1,11 @@ + Original Revision: 1.180 --> @@ -171,6 +171,113 @@ + + + + + Tom + Rhodes + Írta: + + + + + A rendszerünkben levõ hardverek + összeszedése + + Mielõtt belevetnénk magunkat a rendszermag + beállításáva, érdemes egy + leltárt készíteni a gépünkben + található különbözõ + eszközökrõl. Ahol a &os; nem elsõdlegesen + használt operációs rendszer, ott ehhez + elegendõ megnézni a jelenlegi rendszerben + található elemeket. Például az + µsoft; rendszerek + Eszközkezelõjében + (Device Manager) általában az összes + eszköz fontosabb adatait megtaláljuk. Magát az + Eszközkezelõt pedig a + Vezérlõpultból (Control Panel) + érhetjük el. + + + A µsoft.windows; egyes verzióiban a + Rendszer (System) ikonjára + kattintva megkapjuk azt a képernyõt, ahonnan + közvetlenül el tudjuk érni az + Eszközkezelõt. + + + Ha viszont nincs másik operációs rendszer + a gépünkön, akkor magunknak kell mindezeknek + utánanéznünk. Erre az egyik alkalmas + módszer a &man.dmesg.8; és a &man.man.1; parancsok + használata. A &os;-ben található + legtöbb meghajtónak van saját man oldala, ami + tartalmazza az általuk kezelt eszközök + listáját, illetve így a + rendszerindítás során észlelt + hardvereket nézhetjük vissza. Például + az alábbi sor arra utal, hogy a + psm meghajtó megtalálta a + gépünkhöz tartozó egeret: + + psm0: <PS/2 Mouse> irq 12 on atkdbc0 +psm0: [GIANT-LOCKED] +psm0: [ITHREAD] +psm0: model Generic PS/2 mouse, device ID 0 + + Ezután ezt a meghajtót vagy a rendszermagba kell + beépítenünk, vagy pedig a &man.loader.conf.5; + állományon keresztül betölteni. + + Bizonyos esetekben a dmesg az + eszközpróbák eredményei helyett csak a + rendszer üzeneteit mutatja. Ilyen helyezetekben a teljes + kimenet a /var/run/dmesg.boot + állományban tekinthetõ meg. + + A hardverek manuálisan + felderítésének módja a &man.pciconf.8; + segédprogram kimenetének + böngészése, ami egy valamivel + részletesebb eredményt ad. Mint + például: + + ath0@pci0:3:0:0: class=0x020000 card=0x058a1014 chip=0x1014168c rev=0x01 hdr=0x00 + vendor = 'Atheros Communications Inc.' + device = 'AR5212 Atheros AR5212 802.11abg wireless' + class = network + subclass = ethernet + + A pciconf paranccsal + kapott kimenet ezen része azt mutatja, hogy az + ath meghajtó talált egy + vezeték nélküli Ethernet eszközt. Innen a + man ath paranccsal + érhetjük el a &man.ath.4; man oldalát. + + A &man.man.1; a paraméter + megadásával további hasznos + információkkal is tud szolgálni. A + fentiekbõl kiindulva például a + következõ paranccsal: + + &prompt.root; man -k Atheros + + le tudjuk kérdezni azokat a man oldalakat, amelyek + tartalmazzák az adott szót: + + ath(4) - Atheros IEEE 802.11 wireless network driver +ath_hal(4) - Atheros Hardware Access Layer (HAL) + + A hardvereszközeink listájával + felvértezve most már egy saját rendszermag + létrehozása sem lesz annyira ijesztõ. + + + Saját rendszermag készítése és telepítése @@ -882,9 +989,10 @@ options KBD_INSTALL_CDEV # CDEV bejegyzés létrehozása a /dev könyvtárban - Ez a beállítása a billentyûzethez - kapcsolódik. Létrehoz egy CDEV bejegyzést a - /dev könyvtárban. + Ez a beállítás kell ahhoz, hogy + /dev könyvtárban létre + tudjunk hozni eszközleírókat a + billentyûzethez. options ADAPTIVE_GIANT # adaptív Giant mutexek @@ -909,6 +1017,18 @@ várakozva a futásra. Ha nem tudunk dönteni, hagyjuk csak benn. + + Hozzátesszük, hogy a &os; 8.0-CURRENT és + késõbbi változataiban az össszes mutex + alapértelmezés szerint adaptív, hacsak meg + nem adjuk a NO_ADAPTIVE_MUTEXES + beállítást. Ennek + eredményeképpen a Giant most már + alapból adaptív, ezért esetükben az + ADAPTIVE_GIANT nem szerepel a rendszermag + beállításai között. + + a rendszermag beállításai SMP From owner-p4-projects@FreeBSD.ORG Sun Mar 23 01:18:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 412F81065670; Sun, 23 Mar 2008 01: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 F41AD106566B for ; Sun, 23 Mar 2008 01:18:11 +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 E89A08FC14 for ; Sun, 23 Mar 2008 01:18:11 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2N1IBS6019594 for ; Sun, 23 Mar 2008 01:18:11 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2N1IBaQ019592 for perforce@freebsd.org; Sun, 23 Mar 2008 01:18:11 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 23 Mar 2008 01:18:11 GMT Message-Id: <200803230118.m2N1IBaQ019592@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 138310 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Mar 2008 01:18:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=138310 Change 138310 by pgj@disznohal on 2008/03/23 01:17:54 (mirrors) MFen: 1.442 --> 1.443 Affected files ... .. //depot/projects/docproj_hu/books/handbook/mirrors/chapter.sgml#5 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/mirrors/chapter.sgml#5 (text+ko) ==== @@ -1,12 +1,12 @@ + Original Revision: 1.443 --> A &os; beszerzése @@ -3284,6 +3284,25 @@ + RELENG_7 + + + A FreeBSD-7.X fejlesztési ága, más + néven a FreeBSD 7-STABLE + + + + + RELENG_7_0 + + + A FreeBSD-7.0 kiadás ága, ahová + csak a biztonsági frissítések és a + kritikus hibajavítások kerülnek. + + + + RELENG_6 @@ -3293,6 +3312,16 @@ + RELENG_6_3 + + + A FreeBSD-6.3 kiadás ága, ahová csak + biztonsági frissítések és a + ritikus hibajavítások kerülnek. + + + + RELENG_6_2 @@ -3540,6 +3569,22 @@ + RELENG_7_0_0_RELEASE + + + FreeBSD 7.0 + + + + + RELENG_6_3_0_RELEASE + + + FreeBSD 6.3 + + + + RELENG_6_2_0_RELEASE From owner-p4-projects@FreeBSD.ORG Sun Mar 23 01:41:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 43C9E1065671; Sun, 23 Mar 2008 01:41: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 0354D1065670 for ; Sun, 23 Mar 2008 01:41:37 +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 EB3AB8FC13 for ; Sun, 23 Mar 2008 01:41:36 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2N1faqD024631 for ; Sun, 23 Mar 2008 01:41:36 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2N1favg024629 for perforce@freebsd.org; Sun, 23 Mar 2008 01:41:36 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 23 Mar 2008 01:41:36 GMT Message-Id: <200803230141.m2N1favg024629@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 138313 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Mar 2008 01:41:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=138313 Change 138313 by pgj@disznohal on 2008/03/23 01:41:15 (ports) MFen: 1.268 --> 1.274 Affected files ... .. //depot/projects/docproj_hu/books/handbook/ports/chapter.sgml#3 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/ports/chapter.sgml#3 (text+ko) ==== @@ -1,7 +1,7 @@ 1.107 Affected files ... .. //depot/projects/docproj_hu/books/handbook/printing/chapter.sgml#3 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/printing/chapter.sgml#3 (text+ko) ==== @@ -1,12 +1,12 @@ + Original Revision: 1.107 --> @@ -2204,17 +2204,18 @@ és elosztja õket a nyomtató által oldalanként nyomtatott sorok számával. Egy szövegszûrõ - a következõ paraméterekkel indulhat: + a következõ paraméterekkel + indulhat: szûrõnév -c - -wszélesség - -lhossz - -ibehúzás + -w + szélesség + -l + hossz + -i + behúzás -n hozzáférés -h @@ -2223,7 +2224,7 @@ choice="plain">nyilvántartás - ahol a + ahol a @@ -2297,13 +2298,13 @@ - nyomtatás szûrõk + A konverziós szûrõk (conversion filter) egy adott @@ -2321,14 +2322,14 @@ ezekrõl többet mondani. Ilyen esetekben kérhetünk nyilvántartást. A konverziós szûrõk az alábbi - paraméterekkel indulhatnak: + paraméterekkel indulhatnak: szûrõnév - -xpixelszélesség - -ypixelmagasság + -x + pixelszélesség + -y + pixelmagasság -n hozzáférés -h @@ -2337,7 +2338,7 @@ choice="plain">nyilvántartás - ahol a + ahol a pixelszélesség a px tulajdonság értékébõl (ami alapból @@ -2358,17 +2359,18 @@ linkend="printing-advanced-of">Kimeneti szûrõk címû szakasz mutatja be a mûködésüket. Ekkor - csupán két paraméterünk van: + csupán két paraméterünk + van: szûrõnév - -wszélesség - -lhosszúság + -w + szélesség + -l + hosszúság - amik rendre megegyezik a szövegszûrõk + amik rendre megegyezik a szövegszûrõk és paramétereivel. @@ -2574,11 +2576,13 @@ &postscript; szimulációja nem &postscript; nyomtatókon + PostScript emuláció Ghostscript + A &postscript; a magas színvonalú betûszedés és nyomtatás de facto szabványa. Emellett azonban a @@ -2673,6 +2677,7 @@ beírhatjuk, hogy lpr plain.text vagy lpr whatever.ps, mind a kettõnek ki kell tudnia nyomtatódnia. + @@ -2691,6 +2696,7 @@ Miért használjunk konverziós szûrõket? + &tex; DVI állományok @@ -4366,7 +4372,7 @@ egy Diablo 750-N típusú sornyomtatót csatlakoztattunk a hálózatra, amely az 5100-as porton várja a nyomtatandó adatokat. A - hálózati neve most scrivener + hálózati neve most scrivener lesz. Íme a hozzátartozó szövegszûrõ: @@ -4388,6 +4394,7 @@ a hozzáférés korlátozása + Ebben a szakaszban a nyomtató használatának korlázásáról írunk. Az From owner-p4-projects@FreeBSD.ORG Sun Mar 23 02:17:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B068F1065672; Sun, 23 Mar 2008 02:17: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 6E9D41065670 for ; Sun, 23 Mar 2008 02:17:14 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 609E68FC1B for ; Sun, 23 Mar 2008 02:17:14 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2N2HDtI036469 for ; Sun, 23 Mar 2008 02:17:13 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2N2HDRP036466 for perforce@freebsd.org; Sun, 23 Mar 2008 02:17:13 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 23 Mar 2008 02:17:13 GMT Message-Id: <200803230217.m2N2HDRP036466@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 138317 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Mar 2008 02:17:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=138317 Change 138317 by pgj@disznohal on 2008/03/23 02:16:31 (security) MFen: 1.316 --> 1.320 Affected files ... .. //depot/projects/docproj_hu/books/handbook/security/chapter.sgml#5 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/security/chapter.sgml#5 (text+ko) ==== @@ -1,12 +1,12 @@ + Original Revision: 1.320 --> @@ -70,7 +70,7 @@ - hogyan burkoljunk az inetd + hogyan burkoljunk az >inetd> segítségével TCP kapcsolatokat @@ -490,9 +490,7 @@ rendszerkonzolon keresztül szabad tudnia bejelentkeznie. - - wheel - + wheel Természetesen egy rendszergazdának valahogy el kell érnie a root @@ -545,67 +543,45 @@ semmi, de kétségtelenül nem legbiztonságosabb. - A személyzeti hozzáférések - és ezáltal a root - hozzáférésének egyik közvetett - módja egy alternatív bejelentkezési - mód használata, ami lényegében a - személyzeti hozzáférések - titkosított jelszavainak - kicsillagozását jelenti. A - &man.vipw.8; parancs használatával a - titkosított jelszavakat ki tudjuk cserélni - egyetlen * karakterre. Ez a - parancs a jelszó alapú hitelesítések - letiltásához frissíteni fogja az - /etc/master.passwd állományt - valamint a felhasználókat és jelszavakat - tartalmazó adatbázist. + A hozzáférések teljes körû + letiltásához a &man.pw.8; parancsot érdemes + használni: + + &prompt.root; pw lock személyzet + + Ezzel meg tudjuk akadályozni, hogy a + felhasználó akármilyen módon, + beleértve az &man.ssh.1; használatát is, + hozzá tudjon férni a + rendszerünkhöz. - A személyzet egyik tagjának tehát - így néz ki a bejegyzése: + A hozzáférések + blokkolásának másik ilyen módszere a + titkosított jelszó átírása + egyetlen * karakterre. Mivel + ez a karakter egyetlen titkosított jelszóra sem + illeszkedik, ezért a felhasználó nem lesz + képes bejelentkezni. Ahogy például a + személyzet alábbi tagja sem: foobar:R9DT/Fa1/LV9U:1000:1000::0:0:Foo Bar:/home/foobar:/usr/local/bin/tcsh - Amit erre cserélünk ki: + Amit tehát erre cserélünk ki: foobar:*:1000:1000::0:0:Foo Bar:/home/foobar:/usr/local/bin/tcsh - Ez a változtatás meggátolja a - hagyományos bejelentkezéseket, mivel a - titkosított jelszó soha nem fog egyezni a - * karakterrel. Ezután - a személyzet tagjainak más módon kell - azonosítaniuk magukat, például a - &man.kerberos.1; segítségével vagy az - &man.ssh.1; nyilvános/privát - kulcspárjaival. Amikor egy Kerberoshoz hasonló - rendszert használunk, akkor általában a - Kerberos szervereit futtató gépeket és az - asztali munkaállomásunkat kell védeni. - Amikor az ssh-t használjuk nyilvános/privát - kulcspárokkal, általában azt a gépet - kell védenünk ahonnan - bejelentkezünk (ez többnyire egy - munkaállomás). A kulcspárokat bevonhatjuk - egy további védelmi réteggel is, ha a - &man.ssh-keygen.1; paranccsal történõ - létrehozásuk során jelszót is - megadunk. Ha kicsillagozzuk a személyzet - tagjainak jelszavait, akkor biztosra vehetjük, hogy - kizárólag csak az általunk - telepített biztonságos módokon fognak - bejelentkezni. Ennek köszönhetõen a - személyzet minden tagja biztonságos, - titkosított kapcsolatot fog használni, és - ezzel elzárunk egy olyan biztonsági rést, - amit a legtöbb behatoló kihasznál: a - gyengébb védelmû - számítógépek felõl - érkezõ forgalom lehallgatását. + Ezzel megakadályozzuk, hogy a + foobar nevû felhasználó a + hagyományos módszerekkel be tudjon jelentkezni. + Ez a megoldás azonban a + Kerberost alkalmazó rendszerek + esetén nem mûködik, illetve olyan helyezetekben + sem, amikor a felhasználó az &man.ssh.1; + paranccsal már létrehozott magának + kulcsokat. - Egy még közvetettebb védelmi mechanizmus - szerint mindig egy szigorúbb biztonsági szintû + Az ilyen védelmi mechanizmusok esetében mindig + egy szigorúbb biztonsági szintû géprõl jelentkezünk be egy kevésbé biztonságosabb gépre. Például ha a szerverünk mindenféle @@ -6960,8 +6936,9 @@ trhodes ttyp1 Ezzel megjelenik a trhodes nevû - felhasználó ttyp1 terminálon kiadott - összes ismert ls parancsa. + felhasználó ttyp1 + terminálon kiadott összes ismert + ls parancsa. Számos hasznos beállítást és hozzájuk tartozó leírást From owner-p4-projects@FreeBSD.ORG Sun Mar 23 02:59:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 17DAE1065672; Sun, 23 Mar 2008 02:59: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 CB660106566B for ; Sun, 23 Mar 2008 02:59:57 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BC75D8FC1B for ; Sun, 23 Mar 2008 02:59:57 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2N2xvq4046353 for ; Sun, 23 Mar 2008 02:59:57 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2N2xv8J046351 for perforce@freebsd.org; Sun, 23 Mar 2008 02:59:57 GMT (envelope-from jb@freebsd.org) Date: Sun, 23 Mar 2008 02:59:57 GMT Message-Id: <200803230259.m2N2xv8J046351@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 138319 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Mar 2008 02:59:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=138319 Change 138319 by jb@jb_freebsd1 on 2008/03/23 02:59:49 Enable a couple more tests. Disable some new ones from the latest IFopensolaris that depend on the pid provider. Affected files ... .. //depot/projects/dtrace/src/tools/test/dtrace/Makefile#27 edit Differences ... ==== //depot/projects/dtrace/src/tools/test/dtrace/Makefile#27 (text+ko) ==== @@ -78,6 +78,10 @@ ${TESTSRCDIR}/tst/common/pid/tst.main.ksh \ ${TESTSRCDIR}/tst/common/pid/tst.manypids.ksh \ ${TESTSRCDIR}/tst/common/pid/tst.probemod.ksh \ + ${TESTSRCDIR}/tst/common/pid/tst.provregex1.ksh \ + ${TESTSRCDIR}/tst/common/pid/tst.provregex2.ksh \ + ${TESTSRCDIR}/tst/common/pid/tst.provregex3.ksh \ + ${TESTSRCDIR}/tst/common/pid/tst.provregex4.ksh \ ${TESTSRCDIR}/tst/common/pid/tst.ret1.c \ ${TESTSRCDIR}/tst/common/pid/tst.ret1.d \ ${TESTSRCDIR}/tst/common/pid/tst.ret2.c \ @@ -128,9 +132,6 @@ ${TESTSRCDIR}/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithPanic.d \ ${TESTSRCDIR}/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithRaise.d \ ${TESTSRCDIR}/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithStop.d \ - ${TESTSRCDIR}/tst/common/stack/err.D_USTACK_FRAMES.bad.d \ - ${TESTSRCDIR}/tst/common/stack/err.D_USTACK_PROTO.bad.d \ - ${TESTSRCDIR}/tst/common/stack/err.D_USTACK_STRSIZE.bad.d \ ${TESTSRCDIR}/tst/common/syscall/tst.args.c \ ${TESTSRCDIR}/tst/common/syscall/tst.args.d \ ${TESTSRCDIR}/tst/common/syscall/tst.openret.ksh \ From owner-p4-projects@FreeBSD.ORG Sun Mar 23 03:05:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C8EA61065673; Sun, 23 Mar 2008 03:05: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 6D9671065671 for ; Sun, 23 Mar 2008 03:05:03 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5E6BB8FC17 for ; Sun, 23 Mar 2008 03:05:03 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2N353V1049379 for ; Sun, 23 Mar 2008 03:05:03 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2N353sG049377 for perforce@freebsd.org; Sun, 23 Mar 2008 03:05:03 GMT (envelope-from jb@freebsd.org) Date: Sun, 23 Mar 2008 03:05:03 GMT Message-Id: <200803230305.m2N353sG049377@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 138320 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Mar 2008 03:05:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=138320 Change 138320 by jb@jb_freebsd1 on 2008/03/23 03:04:49 Get the skew between per-cpu tsc values. Ignore the possibility of drift like Solaris does. This makes the 'timestamp' DIF variable accurate across CPUs now so that timing function entry -> return makes sense. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/dtrace_subr.c#10 edit .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/i386/dtrace_subr.c#13 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/dtrace_subr.c#10 (text+ko) ==== @@ -36,6 +36,7 @@ #include #include #include +#include #include #include @@ -377,6 +378,72 @@ } #endif +static int64_t tgt_cpu_tsc; +static int64_t hst_cpu_tsc; +static int64_t tsc_skew[MAXCPU]; + +static void +dtrace_gethrtime_init_sync(void *arg) +{ +#ifdef CHECK_SYNC + /* + * Delay this function from returning on one + * of the CPUs to check that the synchronisation + * works. + */ + uintptr_t cpu = (uintptr_t) arg; + + if (cpu == curcpu) { + int i; + for (i = 0; i < 1000000000; i++) + tgt_cpu_tsc = rdtsc(); + tgt_cpu_tsc = 0; + } +#endif +} + +static void +dtrace_gethrtime_init_cpu(void *arg) +{ + uintptr_t cpu = (uintptr_t) arg; + + if (cpu == curcpu) + tgt_cpu_tsc = rdtsc(); + else + hst_cpu_tsc = rdtsc(); +} + +static void +dtrace_gethrtime_init(void *arg) +{ + cpumask_t map; + int i; + struct pcpu *cp; + + /* The current CPU is the reference one. */ + tsc_skew[curcpu] = 0; + + for (i = 0; i <= mp_maxid; i++) { + if (i == curcpu) + continue; + + if ((cp = pcpu_find(i)) == NULL) + continue; + + map = 0; + map |= (1 << curcpu); + map |= (1 << i); + + smp_rendezvous_cpus(map, dtrace_gethrtime_init_sync, + dtrace_gethrtime_init_cpu, + smp_no_rendevous_barrier, (void *)(uintptr_t) i); + + tsc_skew[i] = tgt_cpu_tsc - hst_cpu_tsc; + } +} + +SYSINIT(dtrace_gethrtime_init, SI_SUB_SMP, SI_ORDER_ANY, dtrace_gethrtime_init, NULL); + /* * DTrace needs a high resolution time function which can * be called from a probe context and guaranteed not to have @@ -387,7 +454,7 @@ uint64_t dtrace_gethrtime() { - return (rdtsc() * (uint64_t) 1000000000 / tsc_freq); + return ((rdtsc() + tsc_skew[curcpu]) * (int64_t) 1000000000 / tsc_freq); } uint64_t ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/i386/dtrace_subr.c#13 (text+ko) ==== @@ -376,6 +376,72 @@ } #endif +static int64_t tgt_cpu_tsc; +static int64_t hst_cpu_tsc; +static int64_t tsc_skew[MAXCPU]; + +static void +dtrace_gethrtime_init_sync(void *arg) +{ +#ifdef CHECK_SYNC + /* + * Delay this function from returning on one + * of the CPUs to check that the synchronisation + * works. + */ + uintptr_t cpu = (uintptr_t) arg; + + if (cpu == curcpu) { + int i; + for (i = 0; i < 1000000000; i++) + tgt_cpu_tsc = rdtsc(); + tgt_cpu_tsc = 0; + } +#endif +} + +static void +dtrace_gethrtime_init_cpu(void *arg) +{ + uintptr_t cpu = (uintptr_t) arg; + + if (cpu == curcpu) + tgt_cpu_tsc = rdtsc(); + else + hst_cpu_tsc = rdtsc(); +} + +static void +dtrace_gethrtime_init(void *arg) +{ + cpumask_t map; + int i; + struct pcpu *cp; + + /* The current CPU is the reference one. */ + tsc_skew[curcpu] = 0; + + for (i = 0; i <= mp_maxid; i++) { + if (i == curcpu) + continue; + + if ((cp = pcpu_find(i)) == NULL) + continue; + + map = 0; + map |= (1 << curcpu); + map |= (1 << i); + + smp_rendezvous_cpus(map, dtrace_gethrtime_init_sync, + dtrace_gethrtime_init_cpu, + smp_no_rendevous_barrier, (void *)(uintptr_t) i); + + tsc_skew[i] = tgt_cpu_tsc - hst_cpu_tsc; + } +} + +SYSINIT(dtrace_gethrtime_init, SI_SUB_SMP, SI_ORDER_ANY, dtrace_gethrtime_init, NULL); + /* * DTrace needs a high resolution time function which can * be called from a probe context and guaranteed not to have @@ -386,7 +452,7 @@ uint64_t dtrace_gethrtime() { - return (rdtsc() * (uint64_t) 1000000000 / tsc_freq); + return ((rdtsc() + tsc_skew[curcpu]) * (int64_t) 1000000000 / tsc_freq); } uint64_t From owner-p4-projects@FreeBSD.ORG Sun Mar 23 03:10:09 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 066DD1065670; Sun, 23 Mar 2008 03:10: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 B95DF106564A for ; Sun, 23 Mar 2008 03:10:08 +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 A9AD58FC17 for ; Sun, 23 Mar 2008 03:10:08 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2N3A8M2050809 for ; Sun, 23 Mar 2008 03:10:08 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2N3A8M4050807 for perforce@freebsd.org; Sun, 23 Mar 2008 03:10:08 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 23 Mar 2008 03:10:08 GMT Message-Id: <200803230310.m2N3A8M4050807@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 138321 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Mar 2008 03:10:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=138321 Change 138321 by pgj@disznohal on 2008/03/23 03:10:07 (virtualization) MFen: 1.13 --> 1.16 Affected files ... .. //depot/projects/docproj_hu/books/handbook/virtualization/chapter.sgml#6 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/virtualization/chapter.sgml#6 (text+ko) ==== @@ -1,12 +1,12 @@ + Original Revision: 1.16 --> @@ -953,13 +953,258 @@ - VMware-rel &windows;/&mac;/&linux;-on + VMware-rel MacOS-en + + A &mac;-ek számára fejlesztett + VMWare Fusion egy olyan kereskedelmi + termék, amit az &intel; alapú &apple; &mac; + gépekre tudunk telepíteni a &macos; 10.4.9 + és késõbbi változatain. A &os; itt + egy teljesen támogatott vendég + operációs rendszer. Miután a + VMWare Fusion felkerült a + &macos; X rendszerünkre, be kell állítanunk a + virtuális gépet és telepítenünk + rá a vendég operációs + rendszert. + + + A &os; telepítése a &macos; X/VMWare-re + + Elõször indítsuk el a VMWare Fusion-t, + aminek eredményeképpen betöltõdik a + Virtual Machine Library. Egy új virtuális + gépre létrehozásához kattintsunk a + "New" gombra: + + + + + + + + Ekkor bejön az új gép + összeállítását + segítõ New Virtual Machine Assistant, ahol a + továbblépéshez kattintsunk a Continue + gombra: + + + + + + + + Az operációs rendszerek + (Operating System) közül + válasszuk az egyéb + (Other) kategóriát, + majd a Version fülön a + FreeBSD vagy a FreeBSD + 64-bit változatot attól + függõen, hogy 32 bites vagy 64 bites + támogatásra van + szükségünk: + + + + + + + + Adjuk meg a virtuális gép + képének nevét és a + könyvtárat, ahova el akarjuk menteni: + + + + + + + + Válasszuk meg a virtuális géphez + tartozó virtuális merevlemez méretét + is: + + + + + + + + Mondjuk meg, hogy milyen módon szeretnénk + telepíteni a virtuális gépre, ISO + formátumú lemezképrõl vagy + CD-rõl: + + + + + + + + Ahogy a Finish feliratú gombra kattintunk, a + virtuális gép máris elindul: + + + + + + + + Telepítsük fel a &os;-t a megszokott + módon vagy a + utasításai mentén: + + + + + + + + Miután befejezõdött a + telepítés, módosítsuk a + virtuális gép beállításait, + például a memória + mennyiségét: + + + A virtuális gép hardveres + beállításai a futása alatt nem + változtathatóak meg. + + + + + + + + + A virtuális gép által + használható processzorok + számát: + + + + + + + + A CD-meghajtó állapotát. + Általában lehetõségünk van a + virtuális gépet leválasztani a + CD-meghajtóról vagy ISO lemezképrõl, + ha már nem használjuk. + + + + + + + + A hálózati csatlakozás a + virtuális géppel kapcsolatban + utolsóként beállítandó + tényezõ. Ha a befogadó gépen + kívül még más gépeket is el + akarunk érni a virtuális géprõl, + akkor ehhez mindenképpen a Connect + directly to the physical network (Bridged) + opciót válasszuk. Minden más esetben a + Share the host's internet connection + (NAT) az ajánlott, mivel így a + virtuális gép eléri az internetet, de a + hálózatról nem lehet azt + elérni. + + + + + + + + Miután befejeztük a + beállítások finomhangolását, + indítsuk is el a frissen telepített &os;-s + virtuális gépünket. + + + + + A &os; beállítása a &macos; X/VMWare-en + + Ahogy a &os;-t sikeresen telepítettük a + &macos; X alatt futó + VMWare-re, néhány + konfigurációs lépést még + meg kell tennünk a virtualizált rendszer + teljesítmények optimalizálása + érdekében. + + + + A rendszertöltő változóinak beállítása + + A legfontosabb lépés talán a + változó + értékének csökkentése, + amivel a VMWare alatt + futó &os; processzorhasználatát + szoríthatjuk vissza. Ezt a következõ sor + hozzáadásával érhetjük el + a /boot/loader.conf + állományban: + + kern.hz=100 + + Enélkül az üresjáratban + zakatoló &os;-s VMWare + vendég nagyjából az &imac; egyik + processzorának 15%-át emészti fel. + Ezzel a módosítással azonban ez + lenyomható közel 5%-ra. + + + + Új konfigurációs + állomány létrehozása a + rendszermaghoz + + Nyugodtan törölhetjük az összes + FireWire és USB eszköz + meghajtóját. A + VMWare egy &man.em.4; + meghajtón keresztül elérhetõ + virtuális hálózati + kártyát biztosít, így az + &man.em.4; kivételével az összes + hálózati eszköz + meghajtóját kivehetjük a + rendszermagból. + + + + A hálózat + beállítása - Ez a rész még nincs - elkészítve. + A legegyszerûbb hálózati + beállítás mindösszesen a DHCP + használatát igényli, aminek + révén a virtuális gépünk + a befogadó &mac;-kel egy helyi + hálózatra kerül. Ezt úgy tudjuk + engedélyezni, ha az + /etc/rc.conf állományba + felvesszük az ifconfig_em0="DHCP" + sort. Ha ennél komolyabb hálózati + beállítások is érdekelnek + minket, akkor olvassuk el a et. + + + - From owner-p4-projects@FreeBSD.ORG Sun Mar 23 03:20:19 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8F8291065672; Sun, 23 Mar 2008 03:20: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 4F3B4106566B for ; Sun, 23 Mar 2008 03:20:19 +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 3F8D78FC12 for ; Sun, 23 Mar 2008 03:20:19 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2N3KJ2H055059 for ; Sun, 23 Mar 2008 03:20:19 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2N3KJFf055053 for perforce@freebsd.org; Sun, 23 Mar 2008 03:20:19 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 23 Mar 2008 03:20:19 GMT Message-Id: <200803230320.m2N3KJFf055053@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 138322 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Mar 2008 03:20:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=138322 Change 138322 by pgj@disznohal on 2008/03/23 03:20:07 (x11) MFen: 1.184 --> 1.186 Affected files ... .. //depot/projects/docproj_hu/books/handbook/x11/chapter.sgml#3 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/x11/chapter.sgml#3 (text+ko) ==== @@ -1,12 +1,12 @@ + Original Revision: 1.186 --> @@ -161,10 +161,14 @@ A szerver feladatai között találjuk a megjelenítés irányítását, az egérrõl - és a billentyûzetrõl érkezõ adatok - feldolgozását és így tovább. - Mindegyik X alkalmazás (mint mondjuk az - XTerm vagy a + és a billentyûzetrõl, valamint a többi + bemeneti és kimeneti eszközrõl + érkezõ adatok felfeldolgozását + és így tovább (pl. a digitális + táblák is használhatóak beviteli + eszközként, illetve egy projektor is lehet + megjelenítõ). Mindegyik X alkalmazás (mint + mondjuk az XTerm vagy a &netscape;) egy kliens. A kliens üzeneteket küld a szervernek, például Kérlek, rajzolj egy ablakot ezekre a @@ -564,8 +568,19 @@ Az X11 beállítása - Az X11 beállítása egy - többlépcsõs folyamat. Elsõ + Az &xorg; 7.3-as + változatában gyakran mindenféle + konfigurációs állomány + használata nélkül ki adni a + következõ parancsot: + + &prompt.user; startx + + Amennyiben ez nem mûködne, vagy az + alapértelmezések nem felelnek meg számunkra, + az X11 kézzel is beállítható. Az + X11 beállítása egy + többlépcsõs folyamat. Elsõ lépésünk egy alap konfigurációs állomány összeállítása lesz. Rendszeradminisztrátorként adjuk ki az @@ -781,7 +796,7 @@ Az i810 grafikus chipkészlet - beállítása Intel i810 grafikus chipkészlet From owner-p4-projects@FreeBSD.ORG Sun Mar 23 03:42:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3430D1065674; Sun, 23 Mar 2008 03:42: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 C43DD106564A for ; Sun, 23 Mar 2008 03:42:52 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B1B3C8FC19 for ; Sun, 23 Mar 2008 03:42:52 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2N3gqIZ067608 for ; Sun, 23 Mar 2008 03:42:52 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2N3ggvH067590 for perforce@freebsd.org; Sun, 23 Mar 2008 03:42:42 GMT (envelope-from peter-gmail@wemm.org) Date: Sun, 23 Mar 2008 03:42:42 GMT Message-Id: <200803230342.m2N3ggvH067590@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 138324 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Mar 2008 03:42:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=138324 Change 138324 by peter@peter_overcee on 2008/03/23 03:42:26 IFC @138323 Affected files ... .. //depot/projects/hammer/bin/sh/options.c#7 integrate .. //depot/projects/hammer/contrib/bzip2/CHANGES#4 integrate .. //depot/projects/hammer/contrib/bzip2/FREEBSD-upgrade#4 integrate .. //depot/projects/hammer/contrib/bzip2/FREEBSD-vendor#1 branch .. //depot/projects/hammer/contrib/bzip2/LICENSE#4 integrate .. //depot/projects/hammer/contrib/bzip2/Makefile#4 integrate .. //depot/projects/hammer/contrib/bzip2/Makefile-libbz2_so#4 integrate .. //depot/projects/hammer/contrib/bzip2/README#4 integrate .. //depot/projects/hammer/contrib/bzip2/README.COMPILATION.PROBLEMS#4 integrate .. //depot/projects/hammer/contrib/bzip2/blocksort.c#4 integrate .. //depot/projects/hammer/contrib/bzip2/bzip2.c#5 integrate .. //depot/projects/hammer/contrib/bzip2/bzip2recover.c#4 integrate .. //depot/projects/hammer/contrib/bzip2/bzlib.c#5 integrate .. //depot/projects/hammer/contrib/bzip2/bzlib.h#4 integrate .. //depot/projects/hammer/contrib/bzip2/bzlib_private.h#4 integrate .. //depot/projects/hammer/contrib/bzip2/compress.c#4 integrate .. //depot/projects/hammer/contrib/bzip2/crctable.c#4 integrate .. //depot/projects/hammer/contrib/bzip2/decompress.c#4 integrate .. //depot/projects/hammer/contrib/bzip2/huffman.c#4 integrate .. //depot/projects/hammer/contrib/bzip2/randtable.c#4 integrate .. //depot/projects/hammer/contrib/bzip2/spewG.c#3 integrate .. //depot/projects/hammer/contrib/bzip2/unzcrash.c#3 integrate .. //depot/projects/hammer/contrib/cvs/ChangeLog#7 integrate .. //depot/projects/hammer/contrib/cvs/FAQ#5 integrate .. //depot/projects/hammer/contrib/cvs/HACKING#5 integrate .. //depot/projects/hammer/contrib/cvs/INSTALL#7 integrate .. //depot/projects/hammer/contrib/cvs/Makefile.in#7 integrate .. //depot/projects/hammer/contrib/cvs/NEWS#7 integrate .. //depot/projects/hammer/contrib/cvs/README#5 integrate .. //depot/projects/hammer/contrib/cvs/TODO#6 integrate .. //depot/projects/hammer/contrib/cvs/aclocal.m4#7 integrate .. //depot/projects/hammer/contrib/cvs/config.h.in#7 integrate .. //depot/projects/hammer/contrib/cvs/configure#7 integrate .. //depot/projects/hammer/contrib/cvs/configure.in#7 integrate .. //depot/projects/hammer/contrib/cvs/contrib/Makefile.in#6 integrate .. //depot/projects/hammer/contrib/cvs/depcomp#4 integrate .. //depot/projects/hammer/contrib/cvs/diff/Makefile.in#7 integrate .. //depot/projects/hammer/contrib/cvs/doc/ChangeLog#7 integrate .. //depot/projects/hammer/contrib/cvs/doc/HACKING.DOCS#1 branch .. //depot/projects/hammer/contrib/cvs/doc/Makefile.in#7 integrate .. //depot/projects/hammer/contrib/cvs/doc/cvs.1#3 integrate .. //depot/projects/hammer/contrib/cvs/doc/cvs.texinfo#7 integrate .. //depot/projects/hammer/contrib/cvs/doc/cvsclient.texi#5 integrate .. //depot/projects/hammer/contrib/cvs/doc/mdate-sh#2 integrate .. //depot/projects/hammer/contrib/cvs/doc/mkman.pl#2 integrate .. //depot/projects/hammer/contrib/cvs/doc/stamp-1#6 integrate .. //depot/projects/hammer/contrib/cvs/doc/stamp-vti#6 integrate .. //depot/projects/hammer/contrib/cvs/doc/version-client.texi#6 integrate .. //depot/projects/hammer/contrib/cvs/doc/version.texi#6 integrate .. //depot/projects/hammer/contrib/cvs/install-sh#2 integrate .. //depot/projects/hammer/contrib/cvs/lib/ChangeLog#7 integrate .. //depot/projects/hammer/contrib/cvs/lib/Makefile.in#7 integrate .. //depot/projects/hammer/contrib/cvs/lib/xsize.h#2 integrate .. //depot/projects/hammer/contrib/cvs/man/Makefile.in#7 integrate .. //depot/projects/hammer/contrib/cvs/missing#2 integrate .. //depot/projects/hammer/contrib/cvs/mkinstalldirs#2 integrate .. //depot/projects/hammer/contrib/cvs/src/ChangeLog#7 integrate .. //depot/projects/hammer/contrib/cvs/src/Makefile.in#6 integrate .. //depot/projects/hammer/contrib/cvs/src/add.c#6 integrate .. //depot/projects/hammer/contrib/cvs/src/classify.c#5 integrate .. //depot/projects/hammer/contrib/cvs/src/client.c#7 integrate .. //depot/projects/hammer/contrib/cvs/src/client.h#5 integrate .. //depot/projects/hammer/contrib/cvs/src/cvs.h#7 integrate .. //depot/projects/hammer/contrib/cvs/src/edit.c#5 integrate .. //depot/projects/hammer/contrib/cvs/src/edit.h#3 integrate .. //depot/projects/hammer/contrib/cvs/src/hash.h#4 integrate .. //depot/projects/hammer/contrib/cvs/src/import.c#6 integrate .. //depot/projects/hammer/contrib/cvs/src/lock.c#6 integrate .. //depot/projects/hammer/contrib/cvs/src/log.c#9 integrate .. //depot/projects/hammer/contrib/cvs/src/login.c#7 integrate .. //depot/projects/hammer/contrib/cvs/src/main.c#8 integrate .. //depot/projects/hammer/contrib/cvs/src/mkmodules.c#5 integrate .. //depot/projects/hammer/contrib/cvs/src/modules.c#6 integrate .. //depot/projects/hammer/contrib/cvs/src/parseinfo.c#9 integrate .. //depot/projects/hammer/contrib/cvs/src/rcs.c#8 integrate .. //depot/projects/hammer/contrib/cvs/src/recurse.c#6 integrate .. //depot/projects/hammer/contrib/cvs/src/root.c#6 integrate .. //depot/projects/hammer/contrib/cvs/src/root.h#4 integrate .. //depot/projects/hammer/contrib/cvs/src/sanity.sh#7 integrate .. //depot/projects/hammer/contrib/cvs/src/server.c#10 integrate .. //depot/projects/hammer/contrib/cvs/src/update.c#7 integrate .. //depot/projects/hammer/contrib/cvs/src/vers_ts.c#7 integrate .. //depot/projects/hammer/contrib/cvs/tools/Makefile.in#6 integrate .. //depot/projects/hammer/etc/rc.d/zfs#3 integrate .. //depot/projects/hammer/gnu/usr.bin/Makefile#18 integrate .. //depot/projects/hammer/gnu/usr.bin/cvs/lib/Makefile#10 integrate .. //depot/projects/hammer/gnu/usr.bin/cvs/lib/config.h.proto#3 integrate .. //depot/projects/hammer/include/pthread.h#14 integrate .. //depot/projects/hammer/include/time.h#7 integrate .. //depot/projects/hammer/lib/libarchive/Makefile#48 integrate .. //depot/projects/hammer/lib/libelf/elf_update.3#4 integrate .. //depot/projects/hammer/lib/libelf/elf_update.c#4 integrate .. //depot/projects/hammer/lib/libfetch/common.c#12 integrate .. //depot/projects/hammer/lib/libsdp/sdp.h#7 integrate .. //depot/projects/hammer/lib/libthr/pthread.map#19 integrate .. //depot/projects/hammer/lib/libthr/thread/Makefile.inc#16 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_affinity.c#2 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_create.c#26 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_getcpuclockid.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_mutexattr.c#8 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_rtld.c#4 integrate .. //depot/projects/hammer/lib/libthread_db/libc_r_db.c#4 integrate .. //depot/projects/hammer/lib/libthread_db/libpthread_db.c#9 integrate .. //depot/projects/hammer/lib/libthread_db/libthr_db.c#9 integrate .. //depot/projects/hammer/lib/libthread_db/thread_db.c#5 integrate .. //depot/projects/hammer/sbin/devd/token.l#6 integrate .. //depot/projects/hammer/sbin/dhclient/dhclient.c#14 integrate .. //depot/projects/hammer/sbin/newfs/newfs.8#15 integrate .. //depot/projects/hammer/sbin/route/route.c#14 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/streams.4#5 integrate .. //depot/projects/hammer/share/mk/bsd.cpu.mk#35 integrate .. //depot/projects/hammer/sys/amd64/amd64/nexus.c#45 integrate .. //depot/projects/hammer/sys/amd64/isa/atpic.c#60 integrate .. //depot/projects/hammer/sys/arm/arm/elf_trampoline.c#10 integrate .. //depot/projects/hammer/sys/arm/conf/AVILA#9 integrate .. //depot/projects/hammer/sys/arm/conf/AVILA.hints#2 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/if_npe.c#7 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/ixdp425_pci.c#2 integrate .. //depot/projects/hammer/sys/compat/linux/linux_futex.c#6 integrate .. //depot/projects/hammer/sys/compat/linux/linux_futex.h#3 integrate .. //depot/projects/hammer/sys/conf/NOTES#139 integrate .. //depot/projects/hammer/sys/conf/files#176 integrate .. //depot/projects/hammer/sys/conf/options#125 integrate .. //depot/projects/hammer/sys/dev/aac/aac.c#45 integrate .. //depot/projects/hammer/sys/dev/ata/ata-raid.c#41 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath.c#57 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_main.c#18 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_offload.h#8 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_sge.c#18 integrate .. //depot/projects/hammer/sys/dev/drm/drm_pciids.h#8 integrate .. //depot/projects/hammer/sys/dev/drm/i915_dma.c#7 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#65 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_amd.c#11 integrate .. //depot/projects/hammer/sys/dev/mfi/mfi.c#12 integrate .. //depot/projects/hammer/sys/dev/syscons/syscons.c#45 integrate .. //depot/projects/hammer/sys/dev/usb/ehci.c#33 integrate .. //depot/projects/hammer/sys/dev/usb/if_rum.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/ohci.c#28 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#97 integrate .. //depot/projects/hammer/sys/dev/usb/usbdi.c#19 integrate .. //depot/projects/hammer/sys/dev/usb/usbdi.h#15 integrate .. //depot/projects/hammer/sys/dev/usb/usbdivar.h#11 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_rule.c#14 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vfsops.c#52 integrate .. //depot/projects/hammer/sys/geom/geom.h#39 integrate .. //depot/projects/hammer/sys/geom/geom_subr.c#38 integrate .. //depot/projects/hammer/sys/geom/part/g_part.c#11 integrate .. //depot/projects/hammer/sys/geom/part/g_part.h#7 integrate .. //depot/projects/hammer/sys/geom/part/g_part_apm.c#5 integrate .. //depot/projects/hammer/sys/geom/part/g_part_bsd.c#4 integrate .. //depot/projects/hammer/sys/geom/part/g_part_gpt.c#6 integrate .. //depot/projects/hammer/sys/geom/part/g_part_mbr.c#3 integrate .. //depot/projects/hammer/sys/geom/part/g_part_vtoc8.c#2 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_drive.c#19 integrate .. //depot/projects/hammer/sys/i386/i386/nexus.c#25 integrate .. //depot/projects/hammer/sys/i386/include/nexusvar.h#4 branch .. //depot/projects/hammer/sys/i386/isa/atpic.c#22 integrate .. //depot/projects/hammer/sys/kern/bus_if.m#11 integrate .. //depot/projects/hammer/sys/kern/kern_cpuset.c#2 integrate .. //depot/projects/hammer/sys/kern/kern_descrip.c#78 integrate .. //depot/projects/hammer/sys/kern/kern_exit.c#72 integrate .. //depot/projects/hammer/sys/kern/kern_fork.c#70 integrate .. //depot/projects/hammer/sys/kern/kern_kthread.c#16 integrate .. //depot/projects/hammer/sys/kern/kern_lockf.c#17 integrate .. //depot/projects/hammer/sys/kern/kern_proc.c#67 integrate .. //depot/projects/hammer/sys/kern/kern_resource.c#40 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#89 integrate .. //depot/projects/hammer/sys/kern/kern_switch.c#61 integrate .. //depot/projects/hammer/sys/kern/kern_thr.c#41 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#106 integrate .. //depot/projects/hammer/sys/kern/kern_timeout.c#29 integrate .. //depot/projects/hammer/sys/kern/sched_4bsd.c#59 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#94 integrate .. //depot/projects/hammer/sys/kern/subr_bus.c#59 integrate .. //depot/projects/hammer/sys/kern/subr_sleepqueue.c#29 integrate .. //depot/projects/hammer/sys/kern/subr_trap.c#43 integrate .. //depot/projects/hammer/sys/kern/sys_generic.c#39 integrate .. //depot/projects/hammer/sys/kern/sys_process.c#44 integrate .. //depot/projects/hammer/sys/kern/tty.c#57 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#79 integrate .. //depot/projects/hammer/sys/kern/vfs_bio.c#87 integrate .. //depot/projects/hammer/sys/kern/vfs_cluster.c#36 integrate .. //depot/projects/hammer/sys/kern/vfs_default.c#54 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#127 integrate .. //depot/projects/hammer/sys/modules/geom/geom_part/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/geom/geom_part/geom_part_apm/Makefile#1 branch .. //depot/projects/hammer/sys/modules/geom/geom_part/geom_part_bsd/Makefile#1 branch .. //depot/projects/hammer/sys/modules/geom/geom_part/geom_part_gpt/Makefile#1 branch .. //depot/projects/hammer/sys/modules/geom/geom_part/geom_part_mbr/Makefile#1 branch .. //depot/projects/hammer/sys/modules/geom/geom_part/geom_part_vtoc8/Makefile#1 branch .. //depot/projects/hammer/sys/net/if_ethersubr.c#71 integrate .. //depot/projects/hammer/sys/net/if_gre.c#35 integrate .. //depot/projects/hammer/sys/netgraph/ng_tee.c#11 integrate .. //depot/projects/hammer/sys/netinet/libalias/alias_irc.c#8 integrate .. //depot/projects/hammer/sys/netipsec/xform_tcp.c#5 integrate .. //depot/projects/hammer/sys/nfs4client/nfs4_vfsops.c#26 integrate .. //depot/projects/hammer/sys/nfs4client/nfs4_vnops.c#30 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_subs.c#34 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vfsops.c#55 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#58 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_serv.c#40 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_srvsock.c#24 integrate .. //depot/projects/hammer/sys/sparc64/include/atomic.h#7 integrate .. //depot/projects/hammer/sys/sun4v/include/atomic.h#3 integrate .. //depot/projects/hammer/sys/sun4v/sun4v/intr_machdep.c#6 integrate .. //depot/projects/hammer/sys/sys/aac_ioctl.h#2 integrate .. //depot/projects/hammer/sys/sys/buf.h#36 integrate .. //depot/projects/hammer/sys/sys/bufobj.h#11 integrate .. //depot/projects/hammer/sys/sys/bus.h#27 integrate .. //depot/projects/hammer/sys/sys/eventhandler.h#13 integrate .. //depot/projects/hammer/sys/sys/proc.h#117 integrate .. //depot/projects/hammer/sys/sys/runq.h#6 integrate .. //depot/projects/hammer/sys/sys/sched.h#26 integrate .. //depot/projects/hammer/sys/sys/sysctl.h#40 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_inode.c#20 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_rawread.c#23 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#53 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_softdep.c#52 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#73 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vnops.c#50 integrate .. //depot/projects/hammer/sys/vm/vm_glue.c#51 integrate .. //depot/projects/hammer/sys/vm/vm_meter.c#25 integrate .. //depot/projects/hammer/sys/vm/vm_mmap.c#51 integrate .. //depot/projects/hammer/sys/vm/vm_page.c#70 integrate .. //depot/projects/hammer/sys/vm/vm_page.h#32 integrate .. //depot/projects/hammer/sys/vm/vm_pageout.c#49 integrate .. //depot/projects/hammer/tools/regression/bin/sh/builtins/getopts1.0#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/builtins/getopts1.0.stdout#1 branch .. //depot/projects/hammer/tools/tools/README#26 integrate .. //depot/projects/hammer/tools/tools/mctest/mctest.cc#1 branch .. //depot/projects/hammer/tools/tools/mctest/mctest.h#1 branch .. //depot/projects/hammer/tools/tools/net80211/wlanwatch/wlanwatch.c#4 integrate .. //depot/projects/hammer/tools/tools/tinybsd/tinybsd#4 integrate .. //depot/projects/hammer/tools/tools/track/Makefile#1 branch .. //depot/projects/hammer/tools/tools/track/track.sh#1 branch .. //depot/projects/hammer/usr.bin/ktrace/ktrace.c#5 integrate .. //depot/projects/hammer/usr.bin/netstat/inet6.c#10 integrate .. //depot/projects/hammer/usr.sbin/arp/arp.8#8 integrate .. //depot/projects/hammer/usr.sbin/arp/arp.c#18 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/gn.c#2 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/lan.c#2 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/nap.c#2 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/panu.c#2 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/profile.c#4 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/profile.h#3 integrate .. //depot/projects/hammer/usr.sbin/fifolog/lib/fifolog_int.c#2 integrate .. //depot/projects/hammer/usr.sbin/fifolog/lib/fifolog_write_poll.c#2 integrate Differences ... ==== //depot/projects/hammer/bin/sh/options.c#7 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/options.c,v 1.25 2006/04/09 12:20:42 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/options.c,v 1.26 2008/03/22 14:06:01 stefanf Exp $"); #include #include @@ -383,7 +383,7 @@ } ap2 = shellparam.p; while ((*ap2++ = *ap1++) != NULL); - shellparam.optnext = NULL; + shellparam.reset = 1; INTON; return 0; } @@ -405,6 +405,7 @@ if (*argptr != NULL) { setparam(argptr); } + shellparam.reset = 1; INTON; return 0; } @@ -414,7 +415,6 @@ getoptsreset(const char *value) { if (number(value) == 1) { - shellparam.optnext = NULL; shellparam.reset = 1; } } ==== //depot/projects/hammer/contrib/bzip2/CHANGES#4 (text+ko) ==== @@ -2,8 +2,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -312,3 +312,8 @@ * Fix minor doc/comment bugs. + +1.0.5 (10 Dec 07) +~~~~~~~~~~~~~~~~~ +Security fix only. Fixes CERT-FI 20469 as it applies to bzip2. + ==== //depot/projects/hammer/contrib/bzip2/FREEBSD-upgrade#4 (text+ko) ==== @@ -1,12 +1,12 @@ -$FreeBSD: src/contrib/bzip2/FREEBSD-upgrade,v 1.4 2007/03/30 16:33:05 delphij Exp $ +$FreeBSD: src/contrib/bzip2/FREEBSD-upgrade,v 1.5 2008/03/20 02:45:32 delphij Exp $ Julian Seward's bzip2 originals can be found at: http://www.bzip.org/downloads.html Imported by: - cvs import -m "Virgin import (trimmed) of Bzip2 version 1.0.4." \ - src/contrib/bzip2 BZIP2 v1_0_4 + cvs import -m "Virgin import (trimmed) of Bzip2 version 1.0.5." \ + src/contrib/bzip2 BZIP2 v1_0_5 Notes: The following log shows details of trimming: ==== //depot/projects/hammer/contrib/bzip2/LICENSE#4 (text+ko) ==== @@ -2,7 +2,7 @@ -------------------------------------------------------------------------- This program, "bzip2", the associated library "libbzip2", and all -documentation, are copyright (C) 1996-2006 Julian R Seward. All +documentation, are copyright (C) 1996-2007 Julian R Seward. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -36,8 +36,7 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -Julian Seward, Cambridge, UK. -jseward@bzip.org -bzip2/libbzip2 version 1.0.4 of 20 December 2006 +Julian Seward, jseward@bzip.org +bzip2/libbzip2 version 1.0.5 of 10 December 2007 -------------------------------------------------------------------------- ==== //depot/projects/hammer/contrib/bzip2/Makefile#4 (text+ko) ==== @@ -2,8 +2,8 @@ # This file is part of bzip2/libbzip2, a program and library for # lossless, block-sorting data compression. # -# bzip2/libbzip2 version 1.0.4 of 20 December 2006 -# Copyright (C) 1996-2006 Julian Seward +# bzip2/libbzip2 version 1.0.5 of 10 December 2007 +# Copyright (C) 1996-2007 Julian Seward # # Please read the WARNING, DISCLAIMER and PATENTS sections in the # README file. @@ -137,7 +137,7 @@ distclean: clean rm -f manual.ps manual.html manual.pdf -DISTNAME=bzip2-1.0.4 +DISTNAME=bzip2-1.0.5 dist: check manual rm -f $(DISTNAME) ln -s -f . $(DISTNAME) ==== //depot/projects/hammer/contrib/bzip2/Makefile-libbz2_so#4 (text+ko) ==== @@ -10,8 +10,8 @@ # This file is part of bzip2/libbzip2, a program and library for # lossless, block-sorting data compression. # -# bzip2/libbzip2 version 1.0.4 of 20 December 2006 -# Copyright (C) 1996-2006 Julian Seward +# bzip2/libbzip2 version 1.0.5 of 10 December 2007 +# Copyright (C) 1996-2007 Julian Seward # # Please read the WARNING, DISCLAIMER and PATENTS sections in the # README file. ==== //depot/projects/hammer/contrib/bzip2/README#4 (text+ko) ==== @@ -6,8 +6,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. -bzip2/libbzip2 version 1.0.4 of 20 December 2006 -Copyright (C) 1996-2006 Julian Seward +bzip2/libbzip2 version 1.0.5 of 10 December 2007 +Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in this file. @@ -177,7 +177,11 @@ See the CHANGES file. +WHAT'S NEW IN 1.0.5 ? + See the CHANGES file. + + I hope you find bzip2 useful. Feel free to contact me at jseward@bzip.org if you have any suggestions or queries. Many people mailed me with @@ -203,3 +207,4 @@ 30 December 2001 (bzip2, version 1.0.2pre1) 15 February 2005 (bzip2, version 1.0.3) 20 December 2006 (bzip2, version 1.0.4) +10 December 2007 (bzip2, version 1.0.5) ==== //depot/projects/hammer/contrib/bzip2/README.COMPILATION.PROBLEMS#4 (text+ko) ==== @@ -2,8 +2,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. -bzip2/libbzip2 version 1.0.4 of 20 December 2006 -Copyright (C) 1996-2006 Julian Seward +bzip2/libbzip2 version 1.0.5 of 10 December 2007 +Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -12,7 +12,7 @@ in the file LICENSE. ------------------------------------------------------------------ -bzip2-1.0.4 should compile without problems on the vast majority of +bzip2-1.0.5 should compile without problems on the vast majority of platforms. Using the supplied Makefile, I've built and tested it myself for x86-linux and amd64-linux. With makefile.msc, Visual C++ 6.0 and nmake, you can build a native Win32 version too. Large file ==== //depot/projects/hammer/contrib/bzip2/blocksort.c#4 (text+ko) ==== @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. ==== //depot/projects/hammer/contrib/bzip2/bzip2.c#5 (text+ko) ==== @@ -7,8 +7,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -1605,11 +1605,11 @@ "bzip2, a block-sorting file compressor. " "Version %s.\n" " \n" - " Copyright (C) 1996-2006 by Julian Seward.\n" + " Copyright (C) 1996-2007 by Julian Seward.\n" " \n" " This program is free software; you can redistribute it and/or modify\n" " it under the terms set out in the LICENSE file, which is included\n" - " in the bzip2-1.0.4 source distribution.\n" + " in the bzip2-1.0.5 source distribution.\n" " \n" " This program is distributed in the hope that it will be useful,\n" " but WITHOUT ANY WARRANTY; without even the implied warranty of\n" ==== //depot/projects/hammer/contrib/bzip2/bzip2recover.c#4 (text+ko) ==== @@ -7,8 +7,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -313,7 +313,7 @@ inFileName[0] = outFileName[0] = 0; fprintf ( stderr, - "bzip2recover 1.0.4: extracts blocks from damaged .bz2 files.\n" ); + "bzip2recover 1.0.5: extracts blocks from damaged .bz2 files.\n" ); if (argc != 2) { fprintf ( stderr, "%s: usage is `%s damaged_file_name'.\n", ==== //depot/projects/hammer/contrib/bzip2/bzlib.c#5 (text+ko) ==== @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/contrib/bzip2/bzlib.c,v 1.3 2007/03/28 07:46:20 delphij Exp $"); +__FBSDID("$FreeBSD: src/contrib/bzip2/bzlib.c,v 1.4 2008/03/20 02:56:24 delphij Exp $"); #include "bzlib_private.h" @@ -52,7 +52,7 @@ "component, you should also report this bug to the author(s)\n" "of that program. Please make an effort to report this bug;\n" "timely and accurate bug reports eventually lead to higher\n" - "quality software. Thanks. Julian Seward, 15 February 2005.\n\n", + "quality software. Thanks. Julian Seward, 10 December 2007.\n\n", errcode, BZ2_bzlibVersion() ); @@ -605,6 +605,7 @@ UInt32 c_tPos = s->tPos; char* cs_next_out = s->strm->next_out; unsigned int cs_avail_out = s->strm->avail_out; + Int32 ro_blockSize100k = s->blockSize100k; /* end restore */ UInt32 avail_out_INIT = cs_avail_out; ==== //depot/projects/hammer/contrib/bzip2/bzlib.h#4 (text+ko) ==== @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. ==== //depot/projects/hammer/contrib/bzip2/bzlib_private.h#4 (text+ko) ==== @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -36,7 +36,7 @@ /*-- General stuff. --*/ -#define BZ_VERSION "1.0.4, 20-Dec-2006" +#define BZ_VERSION "1.0.5, 10-Dec-2007" typedef char Char; typedef unsigned char Bool; @@ -442,11 +442,15 @@ /*-- Macros for decompression. --*/ #define BZ_GET_FAST(cccc) \ + /* c_tPos is unsigned, hence test < 0 is pointless. */ \ + if (s->tPos >= (UInt32)100000 * (UInt32)s->blockSize100k) return True; \ s->tPos = s->tt[s->tPos]; \ cccc = (UChar)(s->tPos & 0xff); \ s->tPos >>= 8; #define BZ_GET_FAST_C(cccc) \ + /* c_tPos is unsigned, hence test < 0 is pointless. */ \ + if (c_tPos >= (UInt32)100000 * (UInt32)ro_blockSize100k) return True; \ c_tPos = c_tt[c_tPos]; \ cccc = (UChar)(c_tPos & 0xff); \ c_tPos >>= 8; @@ -469,8 +473,10 @@ (((UInt32)s->ll16[i]) | (GET_LL4(i) << 16)) #define BZ_GET_SMALL(cccc) \ - cccc = BZ2_indexIntoF ( s->tPos, s->cftab ); \ - s->tPos = GET_LL(s->tPos); + /* c_tPos is unsigned, hence test < 0 is pointless. */ \ + if (s->tPos >= (UInt32)100000 * (UInt32)s->blockSize100k) return True; \ + cccc = BZ2_indexIntoF ( s->tPos, s->cftab ); \ + s->tPos = GET_LL(s->tPos); /*-- externs for decompression. --*/ ==== //depot/projects/hammer/contrib/bzip2/compress.c#4 (text+ko) ==== @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. ==== //depot/projects/hammer/contrib/bzip2/crctable.c#4 (text+ko) ==== @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. ==== //depot/projects/hammer/contrib/bzip2/decompress.c#4 (text+ko) ==== @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. ==== //depot/projects/hammer/contrib/bzip2/huffman.c#4 (text+ko) ==== @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. ==== //depot/projects/hammer/contrib/bzip2/randtable.c#4 (text+ko) ==== @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. ==== //depot/projects/hammer/contrib/bzip2/spewG.c#3 (text+ko) ==== @@ -13,8 +13,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. ==== //depot/projects/hammer/contrib/bzip2/unzcrash.c#3 (text+ko) ==== @@ -17,8 +17,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. ==== //depot/projects/hammer/contrib/cvs/ChangeLog#7 (text+ko) ==== @@ -1,3 +1,96 @@ +2008-03-10 Mark D. Baushke + + * NEWS: Note new IgnoreUnknownConfigKeys CVSROOT/config option. + +2008-01-30 Derek Price + + * NEWS: Note improved join of removals. + +2008-01-27 Mark D. Baushke + + * configure.in: Look for lshc rather than lsh to avoid problems + under Debian GNU/Linux. + * configure: Regenerated. + + * configure.in: Add support for --with-ssh and CVS_SSH. + * NEWS: Note that :extssh: looks to CVS_SSH rather tha CVS_RSH. + * Makefile.in, config.h.in, configure: Regenerated. + +2008-01-24 Mark D. Baushke + + * NEWS: Note that :extssh: method was fixed. New `cvs blame' as an + alias for `cvs annotate' command. New `cvs log -n' switch to undo + a `log -N' entry in a .cvsrc file. + +2007-12-14 Larry Jones + + * configure.in: Add --disable-mmap. + * configure: Regenerated. + +2007-10-19 Derek Price + + * cvs.texinfo: Update Ximbiot's address and Copyright dates. + +2007-08-22 Derek Price + + * NEWS: Note `cvs server' accepts `--allow-root=PATH'. Note further + `cvs add' stops for `CVS' dirs. + + * HACKING, NEWS: Note new Autotool versions. + +2007-08-16 Derek Price + + * NEWS: Note backport of `cvs --allow-root=PATH server'. + +2007-06-18 Derek Price + + * NEWS: Note import now keeps metadata to itself. + +2007-06-15 Derek Price + + * NEWS: Note `cvs import CVS-/CVS' fix. + +2007-05-07 Derek Price + + * NEWS: Note removal of remote `cvs init'. + +2006-09-06 Derek Price + + * NEWS: Note apply_rcs_diff speedup. + +2006-08-28 Derek Price + + * NEWS: Note strstr ("/./") assertion fix. + +2006-08-25 Derek Price + + * TODO (216): Removed. + +2006-08-24 Derek Price + + [bug #17032] + * NEWS: Note patch w/Name keyword fix. + +2006-07-17 Derek Price + + * FAQ, INSTALL, README: Update Copyright notice. + * HACKING: Ditto. Update Savannah URLs. + +2006-06-29 Derek Price + + * NEWS: Note trailing slash fix. + +2006-06-28 Larry Jones + + * HACKING, NEWS: Note new Autoconf version. + * configure.in (AC_PREREQ): Require Autoconf 2.60. + * config.h.in, configure, **/Makefile.in: Regenerated. + +2006-06-28 Derek Price + + [bug #16961] + * NEWS: Note double-free fix. + 2006-06-09 Derek Price * NEWS: Note client/server conflict fix. ==== //depot/projects/hammer/contrib/cvs/FAQ#5 (text+ko) ==== @@ -1,6 +1,6 @@ ------------------------------------------------------------------------------- - CVS is Copyright (C) 1989-2005 The Free Software Foundation, Inc. + CVS is Copyright (C) 1986-2006 The Free Software Foundation, Inc. CVS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by ==== //depot/projects/hammer/contrib/cvs/HACKING#5 (text+ko) ==== @@ -2,7 +2,7 @@ * License of CVS - CVS is Copyright (C) 1989-2005 The Free Software Foundation, Inc. + CVS is Copyright (C) 1986-2006 The Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,7 +23,10 @@ Patches against the development version of CVS are most likely to be accepted: - $ CVS_RSH=ssh cvs -d:ext:anoncvs@savannah.nongnu.org:/cvsroot/cvs co ccvs + $ cvs -z3 -d:pserver:anonymous@cvs.sv.nongnu.org:/sources/cvs co ccvs + +See the Savannah sources page for +more information. * Compiler options @@ -145,8 +148,8 @@ automatically aren't included in the generated Makefiles unless you run configure with the --enable-maintainer-mode option. -The CVS Makefiles and configure script were built using Automake 1.9.6 and -Autoconf 2.59, respectively. +The CVS Makefiles and configure script were built using Automake 1.10 and +Autoconf 2.61, respectively. There is a known bug in Autoconf 2.57 that will prevent the configure scripts it generates from working on some platforms. Other combinations of ==== //depot/projects/hammer/contrib/cvs/INSTALL#7 (text+ko) ==== @@ -1,6 +1,6 @@ ------------------------------------------------------------------------------- -CVS is Copyright (C) 1989-2005 The Free Software Foundation, Inc. +CVS is Copyright (C) 1986-2006 The Free Software Foundation, Inc. CVS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by ==== //depot/projects/hammer/contrib/cvs/Makefile.in#7 (text+ko) ==== @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -28,15 +28,11 @@ # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = . am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -62,7 +58,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno configure.status.lineno + configure.lineno config.status.lineno mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = cvs.spec emx/Makefile os2/Makefile zlib/Makefile @@ -70,10 +66,13 @@ DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -89,8 +88,6 @@ distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -111,6 +108,8 @@ EDITOR = @EDITOR@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ +GREP = @GREP@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -122,11 +121,8 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ -MAKE_TARGETS_IN_VPATH_FALSE = @MAKE_TARGETS_IN_VPATH_FALSE@ -MAKE_TARGETS_IN_VPATH_TRUE = @MAKE_TARGETS_IN_VPATH_TRUE@ +MKDIR_P = @MKDIR_P@ MKTEMP = @MKTEMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -148,12 +144,13 @@ TEXI2DVI = @TEXI2DVI@ VERSION = @VERSION@ YACC = @YACC@ +YFLAGS = @YFLAGS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ ac_prefix_program = @ac_prefix_program@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -161,26 +158,38 @@ am__untar = @am__untar@ bindir = @bindir@ build_alias = @build_alias@ +builddir = @builddir@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host_alias = @host_alias@ +htmldir = @htmldir@ includedir = @includedir@ includeopt = @includeopt@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Mar 23 03:46:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C4D611065671; Sun, 23 Mar 2008 03:46: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 8496D106566C for ; Sun, 23 Mar 2008 03:46:57 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 741AF8FC12 for ; Sun, 23 Mar 2008 03:46:57 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2N3kvN1070291 for ; Sun, 23 Mar 2008 03:46:57 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2N3kvKN070289 for perforce@freebsd.org; Sun, 23 Mar 2008 03:46:57 GMT (envelope-from jb@freebsd.org) Date: Sun, 23 Mar 2008 03:46:57 GMT Message-Id: <200803230346.m2N3kvKN070289@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 138325 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Mar 2008 03:46:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=138325 Change 138325 by jb@jb_freebsd1 on 2008/03/23 03:46:32 Put the SDT probes back in after they got whacked by the KSE removal. Affected files ... .. //depot/projects/dtrace/src/sys/kern/kern_sig.c#25 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/kern_sig.c#25 (text+ko) ==== @@ -38,6 +38,7 @@ __FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.360 2008/03/21 08:23:25 jeff Exp $"); #include "opt_compat.h" +#include "opt_kdtrace.h" #include "opt_ktrace.h" #include @@ -59,6 +60,7 @@ #include #include #include +#include #include #include #include @@ -82,6 +84,19 @@ #define ONSIG 32 /* NSIG for osig* syscalls. XXX. */ +SDT_PROVIDER_DECLARE(proc); +SDT_PROBE_DEFINE(proc, kernel, , signal_send); +SDT_PROBE_ARGTYPE(proc, kernel, , signal_send, 0, "struct thread *"); +SDT_PROBE_ARGTYPE(proc, kernel, , signal_send, 1, "struct proc *"); +SDT_PROBE_ARGTYPE(proc, kernel, , signal_send, 2, "int"); +SDT_PROBE_DEFINE(proc, kernel, , signal_clear); +SDT_PROBE_ARGTYPE(proc, kernel, , signal_clear, 0, "int"); +SDT_PROBE_ARGTYPE(proc, kernel, , signal_clear, 1, "ksiginfo_t *"); +SDT_PROBE_DEFINE(proc, kernel, , signal_discard); +SDT_PROBE_ARGTYPE(proc, kernel, , signal_discard, 0, "struct thread *"); +SDT_PROBE_ARGTYPE(proc, kernel, , signal_discard, 1, "struct proc *"); +SDT_PROBE_ARGTYPE(proc, kernel, , signal_discard, 2, "int"); + static int coredump(struct thread *); static char *expand_name(const char *, uid_t, pid_t); static int killpg1(struct thread *td, int sig, int pgid, int all); @@ -1236,6 +1251,9 @@ ksiginfo_init(ksi); sigqueue_get(&td->td_sigqueue, sig, ksi); ksi->ksi_signo = sig; + + SDT_PROBE(proc, kernel, , signal_clear, sig, ksi, 0, 0, 0); + if (ksi->ksi_code == SI_TIMER) itimer_accept(p, ksi->ksi_timerid, ksi); error = 0; @@ -1976,6 +1994,8 @@ sigqueue = &td->td_sigqueue; } + SDT_PROBE(proc, kernel, , signal_send, td, p, sig, 0, 0 ); + /* * If the signal is being ignored, * then we forget about it immediately. @@ -1985,6 +2005,8 @@ */ mtx_lock(&ps->ps_mtx); if (SIGISMEMBER(ps->ps_sigignore, sig)) { + SDT_PROBE(proc, kernel, , signal_discard, ps, td, sig, 0, 0 ); + mtx_unlock(&ps->ps_mtx); if (ksi && (ksi->ksi_flags & KSI_INS)) ksiginfo_tryfree(ksi); From owner-p4-projects@FreeBSD.ORG Sun Mar 23 03:47:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D9B71065676; Sun, 23 Mar 2008 03:47: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 D42F11065670 for ; Sun, 23 Mar 2008 03:47:58 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C426F8FC1A for ; Sun, 23 Mar 2008 03:47:58 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2N3lwis071332 for ; Sun, 23 Mar 2008 03:47:58 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2N3lwW7071326 for perforce@freebsd.org; Sun, 23 Mar 2008 03:47:58 GMT (envelope-from jb@freebsd.org) Date: Sun, 23 Mar 2008 03:47:58 GMT Message-Id: <200803230347.m2N3lwW7071326@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 138327 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Mar 2008 03:47:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=138327 Change 138327 by jb@jb_freebsd1 on 2008/03/23 03:47:53 Ensure the sync includes the current CPU. Fix the bug where the current CPU would get called twice, Affected files ... .. //depot/projects/dtrace/src/sys/kern/subr_smp.c#13 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/subr_smp.c#13 (text+ko) ==== @@ -376,7 +376,7 @@ mtx_lock_spin(&smp_ipi_mtx); /* set static function pointers */ - smp_rv_cpumask = map & ~(1 << curcpu); + smp_rv_cpumask = map; smp_rv_setup_func = setup_func; smp_rv_action_func = action_func; smp_rv_teardown_func = teardown_func; @@ -386,11 +386,10 @@ atomic_store_rel_int(&smp_rv_waiters[0], 0); /* signal other processors, which will enter the IPI with interrupts off */ - ipi_selected(map, IPI_RENDEZVOUS); + ipi_selected(map & ~(1 << curcpu), IPI_RENDEZVOUS); /* Check if the current CPU is in the map */ if ((map & (1 << curcpu)) != 0) - /* call executor function for the current CPU */ smp_rendezvous_action(); if (teardown_func == smp_no_rendevous_barrier) From owner-p4-projects@FreeBSD.ORG Sun Mar 23 03:50:01 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 747BF1065674; Sun, 23 Mar 2008 03:50:01 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 31F1F106566B for ; Sun, 23 Mar 2008 03:50:01 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0799D8FC1E for ; Sun, 23 Mar 2008 03:50:01 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2N3o045072649 for ; Sun, 23 Mar 2008 03:50:00 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2N3o0Id072647 for perforce@freebsd.org; Sun, 23 Mar 2008 03:50:00 GMT (envelope-from jb@freebsd.org) Date: Sun, 23 Mar 2008 03:50:00 GMT Message-Id: <200803230350.m2N3o0Id072647@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 138328 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Mar 2008 03:50:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=138328 Change 138328 by jb@jb_freebsd1 on 2008/03/23 03:49:38 On FreeBSD the executables are built in the objdir. This was broken by the last IFopensolaris. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#10 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#10 (text+kox) ==== @@ -273,7 +273,7 @@ } $fullname = "$dir/$name"; - $exe = "$dir/$base.exe"; + $exe = "./$base.exe"; $exe_pid = -1; if ($opt_a && ($status != 0 || $tag != 0 || $droptag != 0 || From owner-p4-projects@FreeBSD.ORG Sun Mar 23 03:55:10 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E96E41065671; Sun, 23 Mar 2008 03:55: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 A6D4B106566C for ; Sun, 23 Mar 2008 03:55:08 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 824D98FC12 for ; Sun, 23 Mar 2008 03:55:08 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2N3t8li075821 for ; Sun, 23 Mar 2008 03:55:08 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2N3t8xd075818 for perforce@freebsd.org; Sun, 23 Mar 2008 03:55:08 GMT (envelope-from peter-gmail@wemm.org) Date: Sun, 23 Mar 2008 03:55:08 GMT Message-Id: <200803230355.m2N3t8xd075818@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 138329 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Mar 2008 03:55:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=138329 Change 138329 by peter@peter_daintree on 2008/03/23 03:54:10 IFC @138326 (the rest of it) Affected files ... .. //depot/projects/hammer/contrib/cvs/compile#2 integrate .. //depot/projects/hammer/lib/Makefile#70 integrate .. //depot/projects/hammer/sbin/bsdlabel/bsdlabel.c#22 integrate .. //depot/projects/hammer/usr.bin/Makefile#60 integrate Differences ... ==== //depot/projects/hammer/contrib/cvs/compile#2 (text+ko) ==== @@ -1,8 +1,9 @@ #! /bin/sh +# Wrapper for compilers which do not understand `-c -o'. -# Wrapper for compilers which do not understand `-c -o'. +scriptversion=2005-05-14.22 -# Copyright 1999, 2000 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -17,66 +18,125 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +case $1 in + '') + echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand `-c -o'. +Remove `-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. -# Usage: -# compile PROGRAM [ARGS]... -# `-o FOO.o' is removed from the args passed to the actual compile. +If you are trying to build a whole package this is not the +right script to run: please start by reading the file `INSTALL'. -prog=$1 -shift +Report bugs to . +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; +esac ofile= cfile= -args= -while test $# -gt 0; do - case "$1" in - -o) - ofile=$2 - shift - ;; - *.c) - cfile=$1 - args="$args $1" - ;; - *) - args="$args $1" - ;; - esac - shift +eat= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as `compile cc -o foo foo.c'. + # So we strip `-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift done -test -z "$ofile" && { - echo "compile: no \`-o' option seen" 1>&2 - exit 1 -} +if test -z "$ofile" || test -z "$cfile"; then + # If no `-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # `.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi -test -z "$cfile" && { - echo "compile: no \`.c' file seen" 1>&2 - exit 1 -} - # Name of file we expect compiler to create. -cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'` +cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'` # Create the lock directory. -lockdir=`echo $ofile | sed -e 's|/|_|g'` +# Note: use `[/.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d while true; do - if mkdir $lockdir > /dev/null 2>&1; then - break - fi - sleep 1 + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 done # FIXME: race condition here if user kills between mkdir and trap. -trap "rmdir $lockdir; exit 1" 1 2 15 +trap "rmdir '$lockdir'; exit 1" 1 2 15 # Run the compile. -"$prog" $args -status=$? +"$@" +ret=$? if test -f "$cofile"; then - mv "$cofile" "$ofile" + mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + mv "${cofile}bj" "$ofile" fi -rmdir $lockdir -exit $status +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: ==== //depot/projects/hammer/lib/Makefile#70 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.228 2007/12/12 16:39:31 ru Exp $ +# $FreeBSD: src/lib/Makefile,v 1.229 2008/03/12 09:49:39 jeff Exp $ .include @@ -34,7 +34,7 @@ ${_libgssapi} libipsec \ ${_libipx} libkiconv libmagic libmemstat ${_libmilter} ${_libmp} \ ${_libncp} ${_libngatm} libopie libpam libpcap \ - libpmc ${_libkse} librt ${_libsdp} ${_libsm} ${_libsmb} \ + libpmc librt ${_libsdp} ${_libsm} ${_libsmb} \ ${_libsmdb} \ ${_libsmutil} libstand libtelnet ${_libthr} libthread_db libufs \ libugidfw ${_libusbhid} ${_libvgl} libwrap liby libz ${_bind} @@ -104,10 +104,6 @@ _libsmb= libsmb .endif -.if ${MK_LIBKSE} != "no" -_libkse= libkse -.endif - .if ${MK_LIBTHR} != "no" _libthr= libthr .endif ==== //depot/projects/hammer/sbin/bsdlabel/bsdlabel.c#22 (text+ko) ==== @@ -53,7 +53,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/bsdlabel/bsdlabel.c,v 1.113 2007/12/09 22:58:49 marcel Exp $"); +__FBSDID("$FreeBSD: src/sbin/bsdlabel/bsdlabel.c,v 1.114 2008/03/23 03:01:10 rodrigc Exp $"); #include #include @@ -463,7 +463,6 @@ /* * Fetch disklabel for disk. - * Use ioctl to get label unless -r flag is given. */ static int readlabel(int flag) ==== //depot/projects/hammer/usr.bin/Makefile#60 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.3 (Berkeley) 1/7/94 -# $FreeBSD: src/usr.bin/Makefile,v 1.311 2008/03/02 07:52:26 jeff Exp $ +# $FreeBSD: src/usr.bin/Makefile,v 1.312 2008/03/13 17:38:05 obrien Exp $ .include @@ -208,7 +208,6 @@ users \ uudecode \ uuencode \ - uuidgen \ ${_vacation} \ vgrind \ vi \ From owner-p4-projects@FreeBSD.ORG Sun Mar 23 04:08:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1EC6A1065672; Sun, 23 Mar 2008 04:08: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 B6229106564A for ; Sun, 23 Mar 2008 04:08:22 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A4DCD8FC17 for ; Sun, 23 Mar 2008 04:08:22 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2N48MU6085148 for ; Sun, 23 Mar 2008 04:08:22 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2N48MSY085146 for perforce@freebsd.org; Sun, 23 Mar 2008 04:08:22 GMT (envelope-from jb@freebsd.org) Date: Sun, 23 Mar 2008 04:08:22 GMT Message-Id: <200803230408.m2N48MSY085146@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 138330 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Mar 2008 04:08:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=138330 Change 138330 by jb@jb_freebsd1 on 2008/03/23 04:08:02 WIP Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/dtrace_isa.c#4 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/dtrace_isa.c#4 (text+ko) ==== @@ -31,6 +31,7 @@ #include #include +#include #include #include @@ -41,7 +42,7 @@ extern uintptr_t kernbase; uintptr_t kernelbase = (uintptr_t) &kernbase; -struct frame { +struct xframe { greg_t fr_savfp; /* saved frame pointer */ greg_t fr_savpc; /* saved program counter */ }; @@ -100,29 +101,17 @@ } } -#ifdef DOODAD static int dtrace_getustack_common(uint64_t *pcstack, int pcstack_limit, uintptr_t pc, uintptr_t sp) { - klwp_t *lwp = ttolwp(curthread); - proc_t *p = curproc; - uintptr_t oldcontext = lwp->lwp_oldcontext; volatile uint16_t *flags = (volatile uint16_t *)&cpu_core[curcpu].cpuc_dtrace_flags; - size_t s1, s2; + struct amd64_frame *frame; int ret = 0; ASSERT(pcstack == NULL || pcstack_limit > 0); - if (p->p_model == DATAMODEL_NATIVE) { - s1 = sizeof (struct frame) + 2 * sizeof (long); - s2 = s1 + sizeof (siginfo_t); - } else { - s1 = sizeof (struct frame32) + 3 * sizeof (int); - s2 = s1 + sizeof (siginfo32_t); - } - while (pc != 0 && sp != 0) { ret++; if (pcstack != NULL) { @@ -132,38 +121,11 @@ break; } - if (oldcontext == sp + s1 || oldcontext == sp + s2) { - if (p->p_model == DATAMODEL_NATIVE) { - ucontext_t *ucp = (ucontext_t *)oldcontext; - greg_t *gregs = ucp->uc_mcontext.gregs; + frame = (struct amd64_frame *) sp; - sp = dtrace_fulword(&gregs[REG_FP]); - pc = dtrace_fulword(&gregs[REG_PC]); - - oldcontext = dtrace_fulword(&ucp->uc_link); - } else { - ucontext32_t *ucp = (ucontext32_t *)oldcontext; - greg32_t *gregs = ucp->uc_mcontext.gregs; + pc = dtrace_fulword(&frame->f_retaddr); + sp = dtrace_fulword(&frame->f_frame); - sp = dtrace_fuword32(&gregs[EBP]); - pc = dtrace_fuword32(&gregs[EIP]); - - oldcontext = dtrace_fuword32(&ucp->uc_link); - } - } else { - if (p->p_model == DATAMODEL_NATIVE) { - struct frame *fr = (struct frame *)sp; - - pc = dtrace_fulword(&fr->fr_savpc); - sp = dtrace_fulword(&fr->fr_savfp); - } else { - struct frame32 *fr = (struct frame32 *)sp; - - pc = dtrace_fuword32(&fr->fr_savpc); - sp = dtrace_fuword32(&fr->fr_savfp); - } - } - /* * This is totally bogus: if we faulted, we're going to clear * the fault and break. This is to deal with the apparently @@ -177,15 +139,12 @@ return (ret); } -#endif void dtrace_getupcstack(uint64_t *pcstack, int pcstack_limit) { -#ifdef DOODAD - klwp_t *lwp = ttolwp(curthread); proc_t *p = curproc; - struct regs *rp; + struct trapframe *tf; uintptr_t pc, sp; volatile uint16_t *flags = (volatile uint16_t *)&cpu_core[curcpu].cpuc_dtrace_flags; @@ -200,7 +159,7 @@ /* * If there's no user context we still need to zero the stack. */ - if (lwp == NULL || p == NULL || (rp = lwp->lwp_regs) == NULL) + if (p == NULL || (tf = curthread->td_frame) == NULL) goto zero; *pcstack++ = (uint64_t)p->p_pid; @@ -209,8 +168,8 @@ if (pcstack_limit <= 0) return; - pc = rp->r_pc; - sp = rp->r_fp; + pc = tf->tf_rip; + sp = tf->tf_rsp; if (DTRACE_CPUFLAG_ISSET(CPU_DTRACE_ENTRY)) { *pcstack++ = (uint64_t)pc; @@ -218,10 +177,7 @@ if (pcstack_limit <= 0) return; - if (p->p_model == DATAMODEL_NATIVE) - pc = dtrace_fulword((void *)rp->r_sp); - else - pc = dtrace_fuword32((void *)rp->r_sp); + pc = dtrace_fulword((void *) sp); } n = dtrace_getustack_common(pcstack, pcstack_limit, pc, sp); @@ -233,44 +189,35 @@ zero: while (pcstack_limit-- > 0) - *pcstack++ = NULL; -#endif + *pcstack++ = 0; } int dtrace_getustackdepth(void) { -#ifdef DOODAD - klwp_t *lwp = ttolwp(curthread); proc_t *p = curproc; - struct regs *rp; + struct trapframe *tf; uintptr_t pc, sp; int n = 0; - if (lwp == NULL || p == NULL || (rp = lwp->lwp_regs) == NULL) + if (p == NULL || (tf = curthread->td_frame) == NULL) return (0); if (DTRACE_CPUFLAG_ISSET(CPU_DTRACE_FAULT)) return (-1); - pc = rp->r_pc; - sp = rp->r_fp; + pc = tf->tf_rip; + sp = tf->tf_rsp; if (DTRACE_CPUFLAG_ISSET(CPU_DTRACE_ENTRY)) { n++; - if (p->p_model == DATAMODEL_NATIVE) - pc = dtrace_fulword((void *)rp->r_sp); - else - pc = dtrace_fuword32((void *)rp->r_sp); + pc = dtrace_fulword((void *) sp); } n += dtrace_getustack_common(NULL, 0, pc, sp); return (n); -#else -return 0; -#endif } void @@ -307,13 +254,8 @@ sp = rp->r_fp; oldcontext = lwp->lwp_oldcontext; - if (p->p_model == DATAMODEL_NATIVE) { - s1 = sizeof (struct frame) + 2 * sizeof (long); - s2 = s1 + sizeof (siginfo_t); - } else { - s1 = sizeof (struct frame32) + 3 * sizeof (int); - s2 = s1 + sizeof (siginfo32_t); - } + s1 = sizeof (struct xframe) + 2 * sizeof (long); + s2 = s1 + sizeof (siginfo_t); if (DTRACE_CPUFLAG_ISSET(CPU_DTRACE_ENTRY)) { *pcstack++ = (uint64_t)pc; @@ -336,35 +278,18 @@ break; if (oldcontext == sp + s1 || oldcontext == sp + s2) { - if (p->p_model == DATAMODEL_NATIVE) { - ucontext_t *ucp = (ucontext_t *)oldcontext; - greg_t *gregs = ucp->uc_mcontext.gregs; + ucontext_t *ucp = (ucontext_t *)oldcontext; + greg_t *gregs = ucp->uc_mcontext.gregs; - sp = dtrace_fulword(&gregs[REG_FP]); - pc = dtrace_fulword(&gregs[REG_PC]); + sp = dtrace_fulword(&gregs[REG_FP]); + pc = dtrace_fulword(&gregs[REG_PC]); - oldcontext = dtrace_fulword(&ucp->uc_link); - } else { - ucontext_t *ucp = (ucontext_t *)oldcontext; - greg_t *gregs = ucp->uc_mcontext.gregs; - - sp = dtrace_fuword32(&gregs[EBP]); - pc = dtrace_fuword32(&gregs[EIP]); - - oldcontext = dtrace_fuword32(&ucp->uc_link); - } + oldcontext = dtrace_fulword(&ucp->uc_link); } else { - if (p->p_model == DATAMODEL_NATIVE) { - struct frame *fr = (struct frame *)sp; + struct xframe *fr = (struct xframe *)sp; - pc = dtrace_fulword(&fr->fr_savpc); - sp = dtrace_fulword(&fr->fr_savfp); - } else { - struct frame32 *fr = (struct frame32 *)sp; - - pc = dtrace_fuword32(&fr->fr_savpc); - sp = dtrace_fuword32(&fr->fr_savfp); - } + pc = dtrace_fulword(&fr->fr_savpc); + sp = dtrace_fulword(&fr->fr_savfp); } /* @@ -390,7 +315,7 @@ { #ifdef DOODAD uintptr_t val; - struct frame *fp = (struct frame *)dtrace_getfp(); + struct xframe *fp = (struct xframe *)dtrace_getfp(); uintptr_t *stack; int i; #if defined(__amd64) @@ -402,7 +327,7 @@ #endif for (i = 1; i <= aframes; i++) { - fp = (struct frame *)(fp->fr_savfp); + fp = (struct xframe *)(fp->fr_savfp); if (fp->fr_savpc == (pc_t)dtrace_invop_callsite) { #if !defined(__amd64) @@ -486,12 +411,12 @@ { #ifdef DOODAD int depth = 0; - struct frame *frame; + struct xframe *frame; vm_offset_t ebp; aframes++; ebp = dtrace_getfp(); - frame = (struct frame *)ebp; + frame = (struct xframe *)ebp; depth++; for(;;) { if (!INKERNEL(frame)) @@ -499,12 +424,12 @@ if (!INKERNEL(frame->fr_savpc)) break; depth++; - if ((struct frame *)frame->fr_savfp < frame || + if ((struct xframe *)frame->fr_savfp < frame || (vm_offset_t)frame->fr_savfp >= (vm_offset_t)ebp + KSTACK_PAGES * PAGE_SIZE) break; - frame = (struct frame *)frame->fr_savfp; + frame = (struct xframe *)frame->fr_savfp; } if (depth < aframes) return 0; From owner-p4-projects@FreeBSD.ORG Sun Mar 23 08:11:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8F1E01065674; Sun, 23 Mar 2008 08: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 47BD61065670 for ; Sun, 23 Mar 2008 08:11:46 +0000 (UTC) (envelope-from qingli@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2F4B28FC1F for ; Sun, 23 Mar 2008 08:11:46 +0000 (UTC) (envelope-from qingli@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2N8BkjH005986 for ; Sun, 23 Mar 2008 08:11:46 GMT (envelope-from qingli@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2N8BjAx005984 for perforce@freebsd.org; Sun, 23 Mar 2008 08:11:45 GMT (envelope-from qingli@freebsd.org) Date: Sun, 23 Mar 2008 08:11:45 GMT Message-Id: <200803230811.m2N8BjAx005984@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to qingli@freebsd.org using -f From: Qing Li To: Perforce Change Reviews Cc: Subject: PERFORCE change 138344 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Mar 2008 08:11:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=138344 Change 138344 by qingli@FreeBSD-newarp on 2008/03/23 08:11:05 This patch provides the backend of the equal-cost multi-path support for both IPv4 and IPv6. Previously, multi-path route insertion is disallowed. For example, route add -net 192.103.54.0/24 10.9.44.1 route add -net 192.103.54.0/24 10.9.44.10 The second route insertion will trigger an error message of "add net 192.103.54.0/24: gateway 10.9.44.10: route already in table" More testing is in progress. I intend to provide incremental support for failover and connection load balancing across the multi-path. Affected files ... .. //depot/projects/qingli_mpath/src/bin/sh/options.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/bzip2/CHANGES#2 integrate .. //depot/projects/qingli_mpath/src/contrib/bzip2/FREEBSD-upgrade#2 integrate .. //depot/projects/qingli_mpath/src/contrib/bzip2/FREEBSD-vendor#1 branch .. //depot/projects/qingli_mpath/src/contrib/bzip2/LICENSE#2 integrate .. //depot/projects/qingli_mpath/src/contrib/bzip2/Makefile#2 integrate .. //depot/projects/qingli_mpath/src/contrib/bzip2/Makefile-libbz2_so#2 integrate .. //depot/projects/qingli_mpath/src/contrib/bzip2/README#2 integrate .. //depot/projects/qingli_mpath/src/contrib/bzip2/README.COMPILATION.PROBLEMS#2 integrate .. //depot/projects/qingli_mpath/src/contrib/bzip2/blocksort.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/bzip2/bzip2.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/bzip2/bzip2recover.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/bzip2/bzlib.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/bzip2/bzlib.h#2 integrate .. //depot/projects/qingli_mpath/src/contrib/bzip2/bzlib_private.h#2 integrate .. //depot/projects/qingli_mpath/src/contrib/bzip2/compress.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/bzip2/crctable.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/bzip2/decompress.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/bzip2/huffman.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/bzip2/randtable.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/bzip2/spewG.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/bzip2/unzcrash.c#2 integrate .. //depot/projects/qingli_mpath/src/include/pthread.h#2 integrate .. //depot/projects/qingli_mpath/src/include/time.h#2 integrate .. //depot/projects/qingli_mpath/src/lib/libarchive/Makefile#3 integrate .. //depot/projects/qingli_mpath/src/lib/libfetch/common.c#3 integrate .. //depot/projects/qingli_mpath/src/lib/libthr/pthread.map#3 integrate .. //depot/projects/qingli_mpath/src/lib/libthr/thread/Makefile.inc#3 integrate .. //depot/projects/qingli_mpath/src/lib/libthr/thread/thr_getcpuclockid.c#1 branch .. //depot/projects/qingli_mpath/src/lib/libthr/thread/thr_mutexattr.c#2 integrate .. //depot/projects/qingli_mpath/src/lib/libthr/thread/thr_rtld.c#2 integrate .. //depot/projects/qingli_mpath/src/lib/libthread_db/libc_r_db.c#2 integrate .. //depot/projects/qingli_mpath/src/lib/libthread_db/libpthread_db.c#2 integrate .. //depot/projects/qingli_mpath/src/lib/libthread_db/libthr_db.c#2 integrate .. //depot/projects/qingli_mpath/src/lib/libthread_db/thread_db.c#2 integrate .. //depot/projects/qingli_mpath/src/sbin/devd/token.l#2 integrate .. //depot/projects/qingli_mpath/src/sbin/dhclient/dhclient.c#2 integrate .. //depot/projects/qingli_mpath/src/sbin/newfs/newfs.8#2 integrate .. //depot/projects/qingli_mpath/src/sbin/route/route.c#2 integrate .. //depot/projects/qingli_mpath/src/share/man/man4/man4.i386/streams.4#3 integrate .. //depot/projects/qingli_mpath/src/sys/amd64/amd64/nexus.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/amd64/isa/atpic.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/arm/arm/elf_trampoline.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/arm/conf/AVILA#3 integrate .. //depot/projects/qingli_mpath/src/sys/arm/conf/AVILA.hints#2 integrate .. //depot/projects/qingli_mpath/src/sys/arm/xscale/ixp425/if_npe.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/arm/xscale/ixp425/ixdp425_pci.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/compat/linux/linux_futex.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/compat/linux/linux_futex.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/conf/NOTES#3 integrate .. //depot/projects/qingli_mpath/src/sys/conf/files#3 edit .. //depot/projects/qingli_mpath/src/sys/conf/options#3 edit .. //depot/projects/qingli_mpath/src/sys/dev/aac/aac.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/ata/ata-raid.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/dev/ath/if_ath.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/cxgb/cxgb_main.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/cxgb/cxgb_offload.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/dev/cxgb/cxgb_sge.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/drm/drm_pciids.h#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/drm/i915_dma.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/dev/mfi/mfi.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/syscons/syscons.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/usb/ehci.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/usb/if_rum.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/dev/usb/ohci.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/usb/usbdi.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/usb/usbdi.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/dev/usb/usbdivar.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/fs/devfs/devfs_rule.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/i386/i386/nexus.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/i386/isa/atpic.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/kern/bus_if.m#2 integrate .. //depot/projects/qingli_mpath/src/sys/kern/kern_exit.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/kern/kern_fork.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/kern/kern_sig.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/kern/kern_switch.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/kern/kern_thr.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/kern/kern_thread.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/kern/kern_timeout.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/kern/sched_4bsd.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/kern/sched_ule.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/kern/subr_bus.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/kern/subr_sleepqueue.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/kern/subr_trap.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/kern/vfs_bio.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/kern/vfs_cluster.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/kern/vfs_default.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/kern/vfs_subr.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/net/if_ethersubr.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/net/if_gre.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/net/radix.c#2 edit .. //depot/projects/qingli_mpath/src/sys/net/radix.h#2 edit .. //depot/projects/qingli_mpath/src/sys/net/radix_mpath.c#1 add .. //depot/projects/qingli_mpath/src/sys/net/radix_mpath.h#1 add .. //depot/projects/qingli_mpath/src/sys/net/route.c#3 edit .. //depot/projects/qingli_mpath/src/sys/net/route.h#2 edit .. //depot/projects/qingli_mpath/src/sys/net/rtsock.c#3 edit .. //depot/projects/qingli_mpath/src/sys/netgraph/ng_tee.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/netinet/in_proto.c#2 edit .. //depot/projects/qingli_mpath/src/sys/netinet6/in6_proto.c#2 edit .. //depot/projects/qingli_mpath/src/sys/netipsec/xform_tcp.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/nfs4client/nfs4_vfsops.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/nfs4client/nfs4_vnops.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/nfsclient/nfs_subs.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/nfsclient/nfs_vfsops.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/nfsclient/nfs_vnops.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/nfsserver/nfs_serv.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/sys/aac_ioctl.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/sys/buf.h#3 integrate .. //depot/projects/qingli_mpath/src/sys/sys/bufobj.h#3 integrate .. //depot/projects/qingli_mpath/src/sys/sys/bus.h#3 integrate .. //depot/projects/qingli_mpath/src/sys/sys/proc.h#3 integrate .. //depot/projects/qingli_mpath/src/sys/sys/runq.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/sys/sched.h#3 integrate .. //depot/projects/qingli_mpath/src/sys/sys/sysctl.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/ufs/ffs/ffs_inode.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/ufs/ffs/ffs_rawread.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/ufs/ffs/ffs_softdep.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/ufs/ffs/ffs_vfsops.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/ufs/ffs/ffs_vnops.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/vm/vm_mmap.c#3 integrate .. //depot/projects/qingli_mpath/src/tools/regression/bin/sh/builtins/getopts1.0#1 branch .. //depot/projects/qingli_mpath/src/tools/regression/bin/sh/builtins/getopts1.0.stdout#1 branch .. //depot/projects/qingli_mpath/src/tools/tools/README#2 integrate .. //depot/projects/qingli_mpath/src/tools/tools/net80211/wlanwatch/wlanwatch.c#2 integrate .. //depot/projects/qingli_mpath/src/tools/tools/tinybsd/tinybsd#3 integrate .. //depot/projects/qingli_mpath/src/tools/tools/track/Makefile#1 branch .. //depot/projects/qingli_mpath/src/tools/tools/track/track.sh#1 branch .. //depot/projects/qingli_mpath/src/usr.bin/ktrace/ktrace.c#2 integrate Differences ... ==== //depot/projects/qingli_mpath/src/bin/sh/options.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/options.c,v 1.25 2006/04/09 12:20:42 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/options.c,v 1.26 2008/03/22 14:06:01 stefanf Exp $"); #include #include @@ -383,7 +383,7 @@ } ap2 = shellparam.p; while ((*ap2++ = *ap1++) != NULL); - shellparam.optnext = NULL; + shellparam.reset = 1; INTON; return 0; } @@ -405,6 +405,7 @@ if (*argptr != NULL) { setparam(argptr); } + shellparam.reset = 1; INTON; return 0; } @@ -414,7 +415,6 @@ getoptsreset(const char *value) { if (number(value) == 1) { - shellparam.optnext = NULL; shellparam.reset = 1; } } ==== //depot/projects/qingli_mpath/src/contrib/bzip2/CHANGES#2 (text+ko) ==== @@ -2,8 +2,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -312,3 +312,8 @@ * Fix minor doc/comment bugs. + +1.0.5 (10 Dec 07) +~~~~~~~~~~~~~~~~~ +Security fix only. Fixes CERT-FI 20469 as it applies to bzip2. + ==== //depot/projects/qingli_mpath/src/contrib/bzip2/FREEBSD-upgrade#2 (text+ko) ==== @@ -1,12 +1,12 @@ -$FreeBSD: src/contrib/bzip2/FREEBSD-upgrade,v 1.4 2007/03/30 16:33:05 delphij Exp $ +$FreeBSD: src/contrib/bzip2/FREEBSD-upgrade,v 1.5 2008/03/20 02:45:32 delphij Exp $ Julian Seward's bzip2 originals can be found at: http://www.bzip.org/downloads.html Imported by: - cvs import -m "Virgin import (trimmed) of Bzip2 version 1.0.4." \ - src/contrib/bzip2 BZIP2 v1_0_4 + cvs import -m "Virgin import (trimmed) of Bzip2 version 1.0.5." \ + src/contrib/bzip2 BZIP2 v1_0_5 Notes: The following log shows details of trimming: ==== //depot/projects/qingli_mpath/src/contrib/bzip2/LICENSE#2 (text+ko) ==== @@ -2,7 +2,7 @@ -------------------------------------------------------------------------- This program, "bzip2", the associated library "libbzip2", and all -documentation, are copyright (C) 1996-2006 Julian R Seward. All +documentation, are copyright (C) 1996-2007 Julian R Seward. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -36,8 +36,7 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -Julian Seward, Cambridge, UK. -jseward@bzip.org -bzip2/libbzip2 version 1.0.4 of 20 December 2006 +Julian Seward, jseward@bzip.org +bzip2/libbzip2 version 1.0.5 of 10 December 2007 -------------------------------------------------------------------------- ==== //depot/projects/qingli_mpath/src/contrib/bzip2/Makefile#2 (text+ko) ==== @@ -2,8 +2,8 @@ # This file is part of bzip2/libbzip2, a program and library for # lossless, block-sorting data compression. # -# bzip2/libbzip2 version 1.0.4 of 20 December 2006 -# Copyright (C) 1996-2006 Julian Seward +# bzip2/libbzip2 version 1.0.5 of 10 December 2007 +# Copyright (C) 1996-2007 Julian Seward # # Please read the WARNING, DISCLAIMER and PATENTS sections in the # README file. @@ -137,7 +137,7 @@ distclean: clean rm -f manual.ps manual.html manual.pdf -DISTNAME=bzip2-1.0.4 +DISTNAME=bzip2-1.0.5 dist: check manual rm -f $(DISTNAME) ln -s -f . $(DISTNAME) ==== //depot/projects/qingli_mpath/src/contrib/bzip2/Makefile-libbz2_so#2 (text+ko) ==== @@ -10,8 +10,8 @@ # This file is part of bzip2/libbzip2, a program and library for # lossless, block-sorting data compression. # -# bzip2/libbzip2 version 1.0.4 of 20 December 2006 -# Copyright (C) 1996-2006 Julian Seward +# bzip2/libbzip2 version 1.0.5 of 10 December 2007 +# Copyright (C) 1996-2007 Julian Seward # # Please read the WARNING, DISCLAIMER and PATENTS sections in the # README file. ==== //depot/projects/qingli_mpath/src/contrib/bzip2/README#2 (text+ko) ==== @@ -6,8 +6,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. -bzip2/libbzip2 version 1.0.4 of 20 December 2006 -Copyright (C) 1996-2006 Julian Seward +bzip2/libbzip2 version 1.0.5 of 10 December 2007 +Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in this file. @@ -177,7 +177,11 @@ See the CHANGES file. +WHAT'S NEW IN 1.0.5 ? + See the CHANGES file. + + I hope you find bzip2 useful. Feel free to contact me at jseward@bzip.org if you have any suggestions or queries. Many people mailed me with @@ -203,3 +207,4 @@ 30 December 2001 (bzip2, version 1.0.2pre1) 15 February 2005 (bzip2, version 1.0.3) 20 December 2006 (bzip2, version 1.0.4) +10 December 2007 (bzip2, version 1.0.5) ==== //depot/projects/qingli_mpath/src/contrib/bzip2/README.COMPILATION.PROBLEMS#2 (text+ko) ==== @@ -2,8 +2,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. -bzip2/libbzip2 version 1.0.4 of 20 December 2006 -Copyright (C) 1996-2006 Julian Seward +bzip2/libbzip2 version 1.0.5 of 10 December 2007 +Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -12,7 +12,7 @@ in the file LICENSE. ------------------------------------------------------------------ -bzip2-1.0.4 should compile without problems on the vast majority of +bzip2-1.0.5 should compile without problems on the vast majority of platforms. Using the supplied Makefile, I've built and tested it myself for x86-linux and amd64-linux. With makefile.msc, Visual C++ 6.0 and nmake, you can build a native Win32 version too. Large file ==== //depot/projects/qingli_mpath/src/contrib/bzip2/blocksort.c#2 (text+ko) ==== @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. ==== //depot/projects/qingli_mpath/src/contrib/bzip2/bzip2.c#2 (text+ko) ==== @@ -7,8 +7,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -1605,11 +1605,11 @@ "bzip2, a block-sorting file compressor. " "Version %s.\n" " \n" - " Copyright (C) 1996-2006 by Julian Seward.\n" + " Copyright (C) 1996-2007 by Julian Seward.\n" " \n" " This program is free software; you can redistribute it and/or modify\n" " it under the terms set out in the LICENSE file, which is included\n" - " in the bzip2-1.0.4 source distribution.\n" + " in the bzip2-1.0.5 source distribution.\n" " \n" " This program is distributed in the hope that it will be useful,\n" " but WITHOUT ANY WARRANTY; without even the implied warranty of\n" ==== //depot/projects/qingli_mpath/src/contrib/bzip2/bzip2recover.c#2 (text+ko) ==== @@ -7,8 +7,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -313,7 +313,7 @@ inFileName[0] = outFileName[0] = 0; fprintf ( stderr, - "bzip2recover 1.0.4: extracts blocks from damaged .bz2 files.\n" ); + "bzip2recover 1.0.5: extracts blocks from damaged .bz2 files.\n" ); if (argc != 2) { fprintf ( stderr, "%s: usage is `%s damaged_file_name'.\n", ==== //depot/projects/qingli_mpath/src/contrib/bzip2/bzlib.c#2 (text+ko) ==== @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/contrib/bzip2/bzlib.c,v 1.3 2007/03/28 07:46:20 delphij Exp $"); +__FBSDID("$FreeBSD: src/contrib/bzip2/bzlib.c,v 1.4 2008/03/20 02:56:24 delphij Exp $"); #include "bzlib_private.h" @@ -52,7 +52,7 @@ "component, you should also report this bug to the author(s)\n" "of that program. Please make an effort to report this bug;\n" "timely and accurate bug reports eventually lead to higher\n" - "quality software. Thanks. Julian Seward, 15 February 2005.\n\n", + "quality software. Thanks. Julian Seward, 10 December 2007.\n\n", errcode, BZ2_bzlibVersion() ); @@ -605,6 +605,7 @@ UInt32 c_tPos = s->tPos; char* cs_next_out = s->strm->next_out; unsigned int cs_avail_out = s->strm->avail_out; + Int32 ro_blockSize100k = s->blockSize100k; /* end restore */ UInt32 avail_out_INIT = cs_avail_out; ==== //depot/projects/qingli_mpath/src/contrib/bzip2/bzlib.h#2 (text+ko) ==== @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. ==== //depot/projects/qingli_mpath/src/contrib/bzip2/bzlib_private.h#2 (text+ko) ==== @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -36,7 +36,7 @@ /*-- General stuff. --*/ -#define BZ_VERSION "1.0.4, 20-Dec-2006" +#define BZ_VERSION "1.0.5, 10-Dec-2007" typedef char Char; typedef unsigned char Bool; @@ -442,11 +442,15 @@ /*-- Macros for decompression. --*/ #define BZ_GET_FAST(cccc) \ + /* c_tPos is unsigned, hence test < 0 is pointless. */ \ + if (s->tPos >= (UInt32)100000 * (UInt32)s->blockSize100k) return True; \ s->tPos = s->tt[s->tPos]; \ cccc = (UChar)(s->tPos & 0xff); \ s->tPos >>= 8; #define BZ_GET_FAST_C(cccc) \ + /* c_tPos is unsigned, hence test < 0 is pointless. */ \ + if (c_tPos >= (UInt32)100000 * (UInt32)ro_blockSize100k) return True; \ c_tPos = c_tt[c_tPos]; \ cccc = (UChar)(c_tPos & 0xff); \ c_tPos >>= 8; @@ -469,8 +473,10 @@ (((UInt32)s->ll16[i]) | (GET_LL4(i) << 16)) #define BZ_GET_SMALL(cccc) \ - cccc = BZ2_indexIntoF ( s->tPos, s->cftab ); \ - s->tPos = GET_LL(s->tPos); + /* c_tPos is unsigned, hence test < 0 is pointless. */ \ + if (s->tPos >= (UInt32)100000 * (UInt32)s->blockSize100k) return True; \ + cccc = BZ2_indexIntoF ( s->tPos, s->cftab ); \ + s->tPos = GET_LL(s->tPos); /*-- externs for decompression. --*/ ==== //depot/projects/qingli_mpath/src/contrib/bzip2/compress.c#2 (text+ko) ==== @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. ==== //depot/projects/qingli_mpath/src/contrib/bzip2/crctable.c#2 (text+ko) ==== @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. ==== //depot/projects/qingli_mpath/src/contrib/bzip2/decompress.c#2 (text+ko) ==== @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. ==== //depot/projects/qingli_mpath/src/contrib/bzip2/huffman.c#2 (text+ko) ==== @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. ==== //depot/projects/qingli_mpath/src/contrib/bzip2/randtable.c#2 (text+ko) ==== @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. ==== //depot/projects/qingli_mpath/src/contrib/bzip2/spewG.c#2 (text+ko) ==== @@ -13,8 +13,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. ==== //depot/projects/qingli_mpath/src/contrib/bzip2/unzcrash.c#2 (text+ko) ==== @@ -17,8 +17,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. ==== //depot/projects/qingli_mpath/src/include/pthread.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/pthread.h,v 1.41 2007/10/29 21:01:47 kris Exp $ + * $FreeBSD: src/include/pthread.h,v 1.42 2008/03/22 09:59:20 davidxu Exp $ */ #ifndef _PTHREAD_H_ #define _PTHREAD_H_ @@ -185,6 +185,7 @@ int pthread_equal(pthread_t, pthread_t); void pthread_exit(void *) __dead2; void *pthread_getspecific(pthread_key_t); +int pthread_getcpuclockid(pthread_t, clockid_t *); int pthread_join(pthread_t, void **); int pthread_key_create(pthread_key_t *, void (*) (void *)); ==== //depot/projects/qingli_mpath/src/include/time.h#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ /* - * $FreeBSD: src/include/time.h,v 1.34 2006/04/15 03:08:55 jb Exp $ + * $FreeBSD: src/include/time.h,v 1.35 2008/03/22 09:59:20 davidxu Exp $ */ #ifndef _TIME_H_ @@ -108,6 +108,7 @@ #define CLOCK_MONOTONIC_PRECISE 11 /* FreeBSD-specific. */ #define CLOCK_MONOTONIC_FAST 12 /* FreeBSD-specific. */ #define CLOCK_SECOND 13 /* FreeBSD-specific. */ +#define CLOCK_THREAD_CPUTIME_ID 14 #endif /* !defined(CLOCK_REALTIME) && __POSIX_VISIBLE >= 200112 */ #if !defined(TIMER_ABSTIME) && __POSIX_VISIBLE >= 200112 ==== //depot/projects/qingli_mpath/src/lib/libarchive/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/Makefile,v 1.82 2008/03/14 23:00:53 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/Makefile,v 1.83 2008/03/21 11:10:20 kaiw Exp $ LIB= archive DPADD= ${LIBBZ2} ${LIBZ} @@ -214,6 +214,7 @@ MLINKS+= archive_util.3 archive_format.3 MLINKS+= archive_util.3 archive_format_name.3 MLINKS+= archive_util.3 archive_set_error.3 +MLINKS+= archive_write.3 archive_write_close.3 MLINKS+= archive_write.3 archive_write_data.3 MLINKS+= archive_write.3 archive_write_finish.3 MLINKS+= archive_write.3 archive_write_finish_entry.3 ==== //depot/projects/qingli_mpath/src/lib/libfetch/common.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libfetch/common.c,v 1.54 2008/02/08 09:48:48 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libfetch/common.c,v 1.55 2008/03/20 09:55:27 des Exp $"); #include #include @@ -377,7 +377,7 @@ ssize_t fetch_read(conn_t *conn, char *buf, size_t len) { - struct timeval now, timeout, wait; + struct timeval now, timeout, delta; fd_set readfds; ssize_t rlen, total; int r; @@ -393,19 +393,19 @@ while (fetchTimeout && !FD_ISSET(conn->sd, &readfds)) { FD_SET(conn->sd, &readfds); gettimeofday(&now, NULL); - wait.tv_sec = timeout.tv_sec - now.tv_sec; - wait.tv_usec = timeout.tv_usec - now.tv_usec; - if (wait.tv_usec < 0) { - wait.tv_usec += 1000000; - wait.tv_sec--; + delta.tv_sec = timeout.tv_sec - now.tv_sec; + delta.tv_usec = timeout.tv_usec - now.tv_usec; + if (delta.tv_usec < 0) { + delta.tv_usec += 1000000; + delta.tv_sec--; } - if (wait.tv_sec < 0) { + if (delta.tv_sec < 0) { errno = ETIMEDOUT; fetch_syserr(); return (-1); } errno = 0; - r = select(conn->sd + 1, &readfds, NULL, NULL, &wait); + r = select(conn->sd + 1, &readfds, NULL, NULL, &delta); if (r == -1) { if (errno == EINTR && fetchRestartCalls) continue; @@ -503,7 +503,7 @@ ssize_t fetch_writev(conn_t *conn, struct iovec *iov, int iovcnt) { - struct timeval now, timeout, wait; + struct timeval now, timeout, delta; fd_set writefds; ssize_t wlen, total; int r; @@ -519,19 +519,19 @@ while (fetchTimeout && !FD_ISSET(conn->sd, &writefds)) { FD_SET(conn->sd, &writefds); gettimeofday(&now, NULL); - wait.tv_sec = timeout.tv_sec - now.tv_sec; - wait.tv_usec = timeout.tv_usec - now.tv_usec; - if (wait.tv_usec < 0) { - wait.tv_usec += 1000000; - wait.tv_sec--; + delta.tv_sec = timeout.tv_sec - now.tv_sec; + delta.tv_usec = timeout.tv_usec - now.tv_usec; + if (delta.tv_usec < 0) { + delta.tv_usec += 1000000; + delta.tv_sec--; } - if (wait.tv_sec < 0) { + if (delta.tv_sec < 0) { errno = ETIMEDOUT; fetch_syserr(); return (-1); } errno = 0; - r = select(conn->sd + 1, NULL, &writefds, NULL, &wait); + r = select(conn->sd + 1, NULL, &writefds, NULL, &delta); if (r == -1) { if (errno == EINTR && fetchRestartCalls) continue; ==== //depot/projects/qingli_mpath/src/lib/libthr/pthread.map#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libthr/pthread.map,v 1.28 2008/03/05 06:56:35 davidxu Exp $ + * $FreeBSD: src/lib/libthr/pthread.map,v 1.29 2008/03/22 09:59:20 davidxu Exp $ */ /* @@ -271,6 +271,7 @@ _pthread_exit; _pthread_getaffinity_np; _pthread_getconcurrency; + _pthread_getcpuclockid; _pthread_getprio; _pthread_getschedparam; _pthread_getspecific; @@ -395,6 +396,7 @@ pthread_attr_getaffinity_np; pthread_attr_setaffinity_np; pthread_getaffinity_np; + pthread_getcpuclockid; pthread_setaffinity_np; pthread_mutex_getspinloops_np; pthread_mutex_getyieldloops_np; ==== //depot/projects/qingli_mpath/src/lib/libthr/thread/Makefile.inc#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libthr/thread/Makefile.inc,v 1.17 2008/03/03 09:16:29 davidxu Exp $ +# $FreeBSD: src/lib/libthr/thread/Makefile.inc,v 1.18 2008/03/22 09:59:20 davidxu Exp $ # thr sources .PATH: ${.CURDIR}/thread @@ -20,6 +20,7 @@ thr_exit.c \ thr_fork.c \ thr_getprio.c \ + thr_getcpuclockid.c \ thr_getschedparam.c \ thr_info.c \ thr_init.c \ ==== //depot/projects/qingli_mpath/src/lib/libthr/thread/thr_mutexattr.c#2 (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/libthr/thread/thr_mutexattr.c,v 1.7 2007/01/12 07:26:20 imp Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_mutexattr.c,v 1.9 2008/03/20 11:47:08 ru Exp $ */ /* @@ -132,8 +132,7 @@ { int ret; if (attr == NULL || *attr == NULL || type >= PTHREAD_MUTEX_TYPE_MAX) { - errno = EINVAL; - ret = -1; + ret = EINVAL; } else { (*attr)->m_type = type; ret = 0; ==== //depot/projects/qingli_mpath/src/lib/libthr/thread/thr_rtld.c#2 (text) ==== @@ -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/lib/libthr/thread/thr_rtld.c,v 1.4 2007/11/21 05:21:58 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_rtld.c,v 1.6 2008/03/21 02:31:55 davidxu Exp $ * */ @@ -36,6 +36,9 @@ #include "rtld_lock.h" #include "thr_private.h" +#undef errno +extern int errno; + #define CACHE_LINE_SIZE 64 #define WAFLAG 0x1 #define RC_INCR 0x2 @@ -88,20 +91,38 @@ free(l->base); } +#define SAVE_ERRNO() { \ + if (curthread != _thr_initial) \ + errsave = curthread->error; \ + else \ + errsave = errno; \ +} + +#define RESTORE_ERRNO() { \ + if (curthread != _thr_initial) \ + curthread->error = errsave; \ + else \ + errno = errsave; \ +} + static void _thr_rtld_rlock_acquire(void *lock) { struct pthread *curthread; struct rtld_lock *l; long v; + int errsave; curthread = _get_curthread(); + SAVE_ERRNO(); l = (struct rtld_lock *)lock; THR_CRITICAL_ENTER(curthread); atomic_add_acq_int(&l->lock, RC_INCR); - if (!(l->lock & WAFLAG)) + if (!(l->lock & WAFLAG)) { + RESTORE_ERRNO(); return; + } v = l->rd_cv; atomic_add_int(&l->rd_waiters, 1); while (l->lock & WAFLAG) { @@ -109,6 +130,7 @@ v = l->rd_cv; } atomic_add_int(&l->rd_waiters, -1); + RESTORE_ERRNO(); } static void @@ -117,14 +139,18 @@ struct pthread *curthread; struct rtld_lock *l; long v; + int errsave; curthread = _get_curthread(); + SAVE_ERRNO(); l = (struct rtld_lock *)lock; _thr_signal_block(curthread); for (;;) { - if (atomic_cmpset_acq_int(&l->lock, 0, WAFLAG)) + if (atomic_cmpset_acq_int(&l->lock, 0, WAFLAG)) { + RESTORE_ERRNO(); return; + } v = l->wr_cv; atomic_add_int(&l->wr_waiters, 1); while (l->lock != 0) { @@ -140,8 +166,10 @@ { struct pthread *curthread; struct rtld_lock *l; + int errsave; curthread = _get_curthread(); + SAVE_ERRNO(); l = (struct rtld_lock *)lock; if ((l->lock & WAFLAG) == 0) { @@ -162,6 +190,7 @@ } _thr_signal_unblock(curthread); } + RESTORE_ERRNO(); } static int @@ -191,6 +220,9 @@ /* force to resolve _umtx_op PLT */ _umtx_op((struct umtx *)&dummy, UMTX_OP_WAKE, 1, 0, 0); + + /* force to resolve errno() PLT */ + __error(); li.lock_create = _thr_rtld_lock_create; li.lock_destroy = _thr_rtld_lock_destroy; ==== //depot/projects/qingli_mpath/src/lib/libthread_db/libc_r_db.c#2 (text+ko) ==== @@ -25,9 +25,10 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libthread_db/libc_r_db.c,v 1.3 2005/05/31 09:43:03 dfr Exp $"); +__FBSDID("$FreeBSD: src/lib/libthread_db/libc_r_db.c,v 1.4 2008/03/22 05:40:44 davidxu Exp $"); #include +#include #include #include #include @@ -346,3 +347,5 @@ .to_thr_setxmmregs = libc_r_db_thr_setxmmregs, #endif }; + +DATA_SET(__ta_ops, libc_r_db_ops); ==== //depot/projects/qingli_mpath/src/lib/libthread_db/libpthread_db.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libthread_db/libpthread_db.c,v 1.14 2006/05/17 05:12:42 davidxu Exp $"); +__FBSDID("$FreeBSD: src/lib/libthread_db/libpthread_db.c,v 1.15 2008/03/22 05:40:44 davidxu Exp $"); #include #include @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -1147,3 +1148,5 @@ .to_thr_setxmmregs = pt_thr_setxmmregs, #endif }; + +DATA_SET(__ta_ops, libpthread_db_ops); ==== //depot/projects/qingli_mpath/src/lib/libthread_db/libthr_db.c#2 (text+ko) ==== @@ -26,13 +26,14 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libthread_db/libthr_db.c,v 1.12 2006/05/17 05:14:45 davidxu Exp $"); +__FBSDID("$FreeBSD: src/lib/libthread_db/libthr_db.c,v 1.13 2008/03/22 05:40:44 davidxu Exp $"); #include #include #include #include >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Mar 23 17:05:02 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5DBDE10657BC; Sun, 23 Mar 2008 17:05: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 D6CC81065671 for ; Sun, 23 Mar 2008 17:05:01 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BE22B8FC14 for ; Sun, 23 Mar 2008 17:05:01 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2NH51pI002269 for ; Sun, 23 Mar 2008 17:05:01 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2NH519J002267 for perforce@freebsd.org; Sun, 23 Mar 2008 17:05:01 GMT (envelope-from piso@freebsd.org) Date: Sun, 23 Mar 2008 17:05:01 GMT Message-Id: <200803231705.m2NH519J002267@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 138373 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Mar 2008 17:05:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=138373 Change 138373 by piso@piso_newluxor on 2008/03/23 17:04:40 Start modifying libalias API to properly use mbuf while in kernel land: -Make LibAliasSaveFragment() & LibAliasGetFrament() mbuf able. -Import some helper macros&c to handle code in kernel & user land transparently. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#70 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.h#18 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_db.c#31 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_local.h#33 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#70 (text+ko) ==== @@ -1148,44 +1148,51 @@ (prototypes in alias.h) */ -// XXX ip free int -LibAliasSaveFragment(struct libalias *la, char *ptr) +LibAliasSaveFragment(struct libalias *la, pkt_t ptr) { int iresult; struct alias_link *lnk; struct ip *pip; LIBALIAS_LOCK(la); - pip = (struct ip *)ptr; + iresult = PKT_ALIAS_ERROR; + PULLUP_IPHDR(pip, ptr); + if (!pip) + goto getout; lnk = AddFragmentPtrLink(la, pip->ip_src, pip->ip_id); - iresult = PKT_ALIAS_ERROR; if (lnk != NULL) { SetFragmentPtr(lnk, ptr); iresult = PKT_ALIAS_OK; } +getout: LIBALIAS_UNLOCK(la); return (iresult); } -// XXX ip free -char * -LibAliasGetFragment(struct libalias *la, char *ptr) +#ifdef _KERNEL +struct mbuf * +#else +char * +#endif +LibAliasGetFragment(struct libalias *la, pkt_t ptr) { struct alias_link *lnk; - char *fptr; + void *fptr; struct ip *pip; LIBALIAS_LOCK(la); - pip = (struct ip *)ptr; + fptr = NULL; + PULLUP_IPHDR(pip, ptr); + if (!pip) + goto getout; lnk = FindFragmentPtr(la, pip->ip_src, pip->ip_id); if (lnk != NULL) { GetFragmentPtr(lnk, &fptr); SetFragmentPtr(lnk, NULL); SetExpire(lnk, 0); /* Deletes link */ - } else - fptr = NULL; - + } +getout: LIBALIAS_UNLOCK(la); return (fptr); } ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.h#18 (text+ko) ==== @@ -81,6 +81,27 @@ */ struct alias_link; +#ifdef _KERNEL +typedef struct mbuf ** pkt_t; + +#define _MTOD(p, foo) (p != NULL) ? mtod(p, foo) : NULL + +#define PULLUP_SIZE(pip, ptr, s) do { \ + *ptr = m_pullup((*ptr), s); \ + (pip) = _MTOD(*ptr, struct ip *); \ +} while (0) + +#define PULLUP_IPHDR(pip, ptr) do { \ + PULLUP_SIZE(pip, ptr, sizeof(struct ip)); \ + if (pip != NULL && ((pip->ip_hl << 2) > sizeof(struct ip))) \ + PULLUP_SIZE(pip, ptr, (pip->ip_hl << 2)); \ +} while (0) +#else +typedef char * pkt_t; + +#define PULLUP_IPHDR(pip, ptr) pip = (struct ip *)ptr +#endif + /* Initialization and control functions. */ struct libalias *LibAliasInit(struct libalias *); void LibAliasSetAddress(struct libalias *, struct in_addr _addr); @@ -118,8 +139,13 @@ /* Fragment Handling functions. */ void LibAliasFragmentIn(struct libalias *, char *_ptr, char *_ptr_fragment); +#ifdef _KERNEL +struct mbuf *LibAliasGetFragment(struct libalias *, struct mbuf **_ptr); +int LibAliasSaveFragment(struct libalias *, struct mbuf **_ptr); +#else char *LibAliasGetFragment(struct libalias *, char *_ptr); int LibAliasSaveFragment(struct libalias *, char *_ptr); +#endif /* Miscellaneous functions. */ int LibAliasCheckNewLink(struct libalias *); ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_db.c#31 (text+ko) ==== @@ -327,7 +327,7 @@ * lookup tables */ union { /* Auxiliary data */ - char *frag_ptr; + void *frag_ptr; struct in_addr frag_addr; struct tcp_dat *tcp; } data; @@ -1814,14 +1814,14 @@ void -SetFragmentPtr(struct alias_link *lnk, char *fptr) +SetFragmentPtr(struct alias_link *lnk, void *fptr) { lnk->data.frag_ptr = fptr; } void -GetFragmentPtr(struct alias_link *lnk, char **fptr) +GetFragmentPtr(struct alias_link *lnk, void **fptr) { *fptr = lnk->data.frag_ptr; } ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_local.h#33 (text+ko) ==== @@ -274,8 +274,8 @@ u_char _proto, u_char _align); void GetFragmentAddr(struct alias_link *_lnk, struct in_addr *_src_addr); void SetFragmentAddr(struct alias_link *_lnk, struct in_addr _src_addr); -void GetFragmentPtr(struct alias_link *_lnk, char **_fptr); -void SetFragmentPtr(struct alias_link *_lnk, char *fptr); +void GetFragmentPtr(struct alias_link *_lnk, void **_fptr); +void SetFragmentPtr(struct alias_link *_lnk, void *fptr); void SetStateIn(struct alias_link *_lnk, int _state); void SetStateOut(struct alias_link *_lnk, int _state); int GetStateIn (struct alias_link *_lnk); From owner-p4-projects@FreeBSD.ORG Sun Mar 23 17:14:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4DDDC1065674; Sun, 23 Mar 2008 17:14: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 0A9911065671; Sun, 23 Mar 2008 17:14:21 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mail.cksoft.de (mail.cksoft.de [62.111.66.27]) by mx1.freebsd.org (Postfix) with ESMTP id B28578FC1E; Sun, 23 Mar 2008 17:14:20 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from localhost (amavis.str.cksoft.de [192.168.74.71]) by mail.cksoft.de (Postfix) with ESMTP id BDBE641C7A7; Sun, 23 Mar 2008 17:55:05 +0100 (CET) X-Virus-Scanned: amavisd-new at cksoft.de Received: from mail.cksoft.de ([62.111.66.27]) by localhost (amavis.str.cksoft.de [192.168.74.71]) (amavisd-new, port 10024) with ESMTP id 4I2j6komHjMk; Sun, 23 Mar 2008 17:55:05 +0100 (CET) Received: by mail.cksoft.de (Postfix, from userid 66) id 53EBA41C7A6; Sun, 23 Mar 2008 17:55:05 +0100 (CET) Received: from maildrop.int.zabbadoz.net (maildrop.int.zabbadoz.net [10.111.66.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.int.zabbadoz.net (Postfix) with ESMTP id E1A3A44487F; Sun, 23 Mar 2008 16:54:12 +0000 (UTC) Date: Sun, 23 Mar 2008 16:54:12 +0000 (UTC) From: "Bjoern A. Zeeb" X-X-Sender: bz@maildrop.int.zabbadoz.net To: Qing Li In-Reply-To: <200803230811.m2N8BjAx005984@repoman.freebsd.org> Message-ID: <20080323165342.C50685@maildrop.int.zabbadoz.net> References: <200803230811.m2N8BjAx005984@repoman.freebsd.org> X-OpenPGP-Key: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Perforce Change Reviews Subject: Re: PERFORCE change 138344 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Mar 2008 17:14:22 -0000 On Sun, 23 Mar 2008, Qing Li wrote: > http://perforce.freebsd.org/chv.cgi?CH=138344 > > Change 138344 by qingli@FreeBSD-newarp on 2008/03/23 08:11:05 > > > This patch provides the backend of the equal-cost multi-path > support for both IPv4 and IPv6. Previously, multi-path route > insertion is disallowed. For example, > > route add -net 192.103.54.0/24 10.9.44.1 > route add -net 192.103.54.0/24 10.9.44.10 > > The second route insertion will trigger an error message of > "add net 192.103.54.0/24: gateway 10.9.44.10: route already in table" > > More testing is in progress. I intend to provide incremental support > for failover and connection load balancing across the multi-path. If I am not misreading rtalloc_mpath is used nowhere. Are you sure everything was submitted? -- Bjoern A. Zeeb bzeeb at Zabbadoz dot NeT Software is harder than hardware so better get it right the first time. From owner-p4-projects@FreeBSD.ORG Sun Mar 23 17:21:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D7618106566B; Sun, 23 Mar 2008 17:21: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 7B3DF1065673 for ; Sun, 23 Mar 2008 17:21:21 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 60D168FC1D for ; Sun, 23 Mar 2008 17:21:21 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2NHLLXa008792 for ; Sun, 23 Mar 2008 17:21:21 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2NHLIIr008790 for perforce@freebsd.org; Sun, 23 Mar 2008 17:21:18 GMT (envelope-from piso@freebsd.org) Date: Sun, 23 Mar 2008 17:21:18 GMT Message-Id: <200803231721.m2NHLIIr008790@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 138375 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Mar 2008 17:21:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=138375 Change 138375 by piso@piso_newluxor on 2008/03/23 17:20:25 IFC@138372 Affected files ... .. //depot/projects/soc2005/libalias/ObsoleteFiles.inc#26 integrate .. //depot/projects/soc2005/libalias/bin/Makefile#2 integrate .. //depot/projects/soc2005/libalias/bin/sh/options.c#2 integrate .. //depot/projects/soc2005/libalias/bin/uuidgen/Makefile#2 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/CHANGES#3 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/FREEBSD-upgrade#3 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/FREEBSD-vendor#1 branch .. //depot/projects/soc2005/libalias/contrib/bzip2/LICENSE#3 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/Makefile#3 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/Makefile-libbz2_so#3 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/README#3 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/README.COMPILATION.PROBLEMS#3 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/blocksort.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/bzip2.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/bzip2recover.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/bzlib.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/bzlib.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/bzlib_private.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/compress.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/crctable.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/decompress.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/huffman.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/randtable.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/spewG.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bzip2/unzcrash.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/ChangeLog#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/FAQ#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/HACKING#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/INSTALL#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/Makefile.in#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/NEWS#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/README#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/TODO#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/aclocal.m4#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/compile#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/config.h.in#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/configure#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/configure.in#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/contrib/Makefile.in#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/depcomp#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/diff/Makefile.in#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/doc/ChangeLog#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/doc/HACKING.DOCS#1 branch .. //depot/projects/soc2005/libalias/contrib/cvs/doc/Makefile.in#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/doc/cvs.1#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/doc/cvs.texinfo#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/doc/cvsclient.texi#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/doc/mdate-sh#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/doc/mkman.pl#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/doc/stamp-1#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/doc/stamp-vti#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/doc/version-client.texi#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/doc/version.texi#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/install-sh#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/lib/ChangeLog#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/lib/Makefile.in#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/lib/getdate#2 delete .. //depot/projects/soc2005/libalias/contrib/cvs/lib/xsize.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/man/Makefile.in#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/missing#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/mkinstalldirs#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/ChangeLog#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/Makefile.in#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/add.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/classify.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/client.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/client.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/cvs.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/edit.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/edit.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/hash.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/import.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/lock.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/log.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/login.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/main.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/mkmodules.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/modules.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/parseinfo.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/rcs.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/recurse.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/root.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/root.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/sanity.sh#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/server.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/update.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/vers_ts.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/tools/Makefile.in#3 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/zfs#4 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/Makefile#7 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/cvs/lib/Makefile#2 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/cvs/lib/config.h.proto#2 integrate .. //depot/projects/soc2005/libalias/include/pthread.h#3 integrate .. //depot/projects/soc2005/libalias/include/time.h#2 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/Makefile#11 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive.h.in#13 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_entry.3#7 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_entry.c#10 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_entry.h#7 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_read_private.h#5 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_read_support_format_mtree.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_read_support_format_tar.c#13 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_string.h#5 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_string_sprintf.c#4 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_util.c#8 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_write.c#8 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_write_disk.c#7 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_write_private.h#3 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_write_set_compression_compress.c#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/archive_write_set_format_ar.c#5 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_write_set_format_cpio.c#8 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_write_set_format_cpio_newc.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_write_set_format_pax.c#8 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_write_set_format_shar.c#6 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_write_set_format_ustar.c#9 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/config_freebsd.h#6 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/test/.cvsignore#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/test/Makefile#7 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/test/test_archive_api_feature.c#4 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/test/test_empty_write.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/test/test_entry.c#4 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/test/test_pax_filename_encoding.c#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/test/test_pax_filename_encoding.tar.gz.uu#1 branch .. //depot/projects/soc2005/libalias/lib/libarchive/test/test_write_compress.c#1 branch .. //depot/projects/soc2005/libalias/lib/libc/gen/scandir.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/locale/wctype.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libelf/elf_update.3#4 integrate .. //depot/projects/soc2005/libalias/lib/libelf/elf_update.c#5 integrate .. //depot/projects/soc2005/libalias/lib/libfetch/common.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libpmc/pmc.3#5 integrate .. //depot/projects/soc2005/libalias/lib/libsdp/sdp.h#4 integrate .. //depot/projects/soc2005/libalias/lib/libthr/pthread.map#6 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/Makefile.inc#3 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_affinity.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_create.c#9 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_exit.c#6 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_getcpuclockid.c#1 branch .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_mutexattr.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_rtld.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_sig.c#8 integrate .. //depot/projects/soc2005/libalias/lib/libthread_db/Makefile#5 integrate .. //depot/projects/soc2005/libalias/lib/libthread_db/kse.h#1 branch .. //depot/projects/soc2005/libalias/lib/libthread_db/libc_r_db.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libthread_db/libpthread_db.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libthread_db/libthr_db.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libthread_db/thread_db.c#3 integrate .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/relnotes/article.sgml#11 integrate .. //depot/projects/soc2005/libalias/sbin/atacontrol/atacontrol.8#3 integrate .. //depot/projects/soc2005/libalias/sbin/atacontrol/atacontrol.c#4 integrate .. //depot/projects/soc2005/libalias/sbin/bsdlabel/bsdlabel.c#4 integrate .. //depot/projects/soc2005/libalias/sbin/devd/token.l#2 integrate .. //depot/projects/soc2005/libalias/sbin/dhclient/dhclient.c#5 integrate .. //depot/projects/soc2005/libalias/sbin/geom/class/multipath/gmultipath.8#4 integrate .. //depot/projects/soc2005/libalias/sbin/newfs/newfs.8#4 integrate .. //depot/projects/soc2005/libalias/sbin/route/route.c#4 integrate .. //depot/projects/soc2005/libalias/share/examples/cvsup/cvs-supfile#5 integrate .. //depot/projects/soc2005/libalias/share/man/man4/man4.i386/ar.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/man4.i386/linux.4#3 integrate .. //depot/projects/soc2005/libalias/share/man/man4/man4.i386/pnp.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/man4.i386/scd.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/man4.i386/streams.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/man4.i386/svr4.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man9/Makefile#15 integrate .. //depot/projects/soc2005/libalias/share/man/man9/atomic.9#2 integrate .. //depot/projects/soc2005/libalias/share/man/man9/ieee80211_radiotap.9#2 integrate .. //depot/projects/soc2005/libalias/share/man/man9/rwlock.9#6 integrate .. //depot/projects/soc2005/libalias/share/man/man9/stack.9#2 integrate .. //depot/projects/soc2005/libalias/share/mk/bsd.cpu.mk#10 integrate .. //depot/projects/soc2005/libalias/sys/amd64/acpica/acpi_machdep.c#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/acpica/madt.c#6 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/intr_machdep.c#11 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/legacy.c#5 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/local_apic.c#12 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/machdep.c#17 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/mptable.c#4 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/nexus.c#9 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/pmap.c#16 integrate .. //depot/projects/soc2005/libalias/sys/amd64/include/atomic.h#4 integrate .. //depot/projects/soc2005/libalias/sys/amd64/include/intr_machdep.h#8 integrate .. //depot/projects/soc2005/libalias/sys/amd64/include/nexusvar.h#1 branch .. //depot/projects/soc2005/libalias/sys/amd64/isa/atpic.c#5 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux32_proto.h#13 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux32_syscall.h#13 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux32_sysent.c#13 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/syscalls.master#12 integrate .. //depot/projects/soc2005/libalias/sys/arm/arm/elf_trampoline.c#8 integrate .. //depot/projects/soc2005/libalias/sys/arm/arm/intr.c#6 integrate .. //depot/projects/soc2005/libalias/sys/arm/arm/machdep.c#4 integrate .. //depot/projects/soc2005/libalias/sys/arm/arm/vm_machdep.c#10 integrate .. //depot/projects/soc2005/libalias/sys/arm/conf/AVILA#8 integrate .. //depot/projects/soc2005/libalias/sys/arm/conf/AVILA.hints#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/xscale/ixp425/if_npe.c#5 integrate .. //depot/projects/soc2005/libalias/sys/arm/xscale/ixp425/ixdp425_pci.c#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/uboot/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/uboot/common/main.c#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/uboot/lib/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/uboot/lib/api_public.h#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/uboot/lib/copy.c#3 integrate .. //depot/projects/soc2005/libalias/sys/boot/uboot/lib/devicename.c#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/uboot/lib/disk.c#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/uboot/lib/elf_freebsd.c#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/uboot/lib/glue.c#3 integrate .. //depot/projects/soc2005/libalias/sys/boot/uboot/lib/glue.h#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/uboot/lib/libuboot.h#3 integrate .. //depot/projects/soc2005/libalias/sys/boot/uboot/lib/module.c#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/uboot/lib/net.c#3 integrate .. //depot/projects/soc2005/libalias/sys/boot/uboot/lib/reboot.c#2 integrate .. //depot/projects/soc2005/libalias/sys/cam/scsi/scsi_ses.c#6 integrate .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_futex.c#8 integrate .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_futex.h#3 integrate .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_misc.c#18 integrate .. //depot/projects/soc2005/libalias/sys/compat/svr4/svr4_fcntl.c#6 integrate .. //depot/projects/soc2005/libalias/sys/conf/NOTES#29 integrate .. //depot/projects/soc2005/libalias/sys/conf/files#34 integrate .. //depot/projects/soc2005/libalias/sys/conf/options#26 integrate .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#6 integrate .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/os/callb.c#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/os/taskq.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/aac/aac.c#6 integrate .. //depot/projects/soc2005/libalias/sys/dev/acpica/acpi.c#12 integrate .. //depot/projects/soc2005/libalias/sys/dev/acpica/acpivar.h#7 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-all.c#7 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-all.h#8 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-disk.c#10 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-disk.h#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-raid.c#6 integrate .. //depot/projects/soc2005/libalias/sys/dev/ath/if_ath.c#16 integrate .. //depot/projects/soc2005/libalias/sys/dev/cxgb/common/cxgb_ael1002.c#5 integrate .. //depot/projects/soc2005/libalias/sys/dev/cxgb/common/cxgb_common.h#5 integrate .. //depot/projects/soc2005/libalias/sys/dev/cxgb/common/cxgb_version.h#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/cxgb/cxgb_ioctl.h#5 integrate .. //depot/projects/soc2005/libalias/sys/dev/cxgb/cxgb_main.c#7 integrate .. //depot/projects/soc2005/libalias/sys/dev/cxgb/cxgb_offload.h#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/cxgb/cxgb_sge.c#8 integrate .. //depot/projects/soc2005/libalias/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/cxgb/ulp/tom/cxgb_defs.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/drm/drm_pciids.h#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/drm/i915_dma.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/fxp/if_fxp.c#8 integrate .. //depot/projects/soc2005/libalias/sys/dev/hwpmc/hwpmc_amd.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/hwpmc/pmc_events.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mfi/mfi.c#15 integrate .. //depot/projects/soc2005/libalias/sys/dev/ofw/ofw_console.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/re/if_re.c#16 integrate .. //depot/projects/soc2005/libalias/sys/dev/syscons/syscons.c#8 integrate .. //depot/projects/soc2005/libalias/sys/dev/syscons/sysmouse.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/tdfx/tdfx_pci.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/ehci.c#8 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/if_rum.c#5 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/if_zyd.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/ohci.c#6 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/usb_quirks.c#8 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/usbdevs#15 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/usbdi.c#7 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/usbdi.h#5 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/usbdivar.h#5 integrate .. //depot/projects/soc2005/libalias/sys/fs/devfs/devfs_rule.c#4 integrate .. //depot/projects/soc2005/libalias/sys/fs/msdosfs/msdosfs_vfsops.c#11 integrate .. //depot/projects/soc2005/libalias/sys/gdb/gdb_cons.c#2 integrate .. //depot/projects/soc2005/libalias/sys/geom/geom.h#6 integrate .. //depot/projects/soc2005/libalias/sys/geom/geom_subr.c#4 integrate .. //depot/projects/soc2005/libalias/sys/geom/part/g_part.c#6 integrate .. //depot/projects/soc2005/libalias/sys/geom/part/g_part.h#5 integrate .. //depot/projects/soc2005/libalias/sys/geom/part/g_part_apm.c#4 integrate .. //depot/projects/soc2005/libalias/sys/geom/part/g_part_bsd.c#2 integrate .. //depot/projects/soc2005/libalias/sys/geom/part/g_part_gpt.c#4 integrate .. //depot/projects/soc2005/libalias/sys/geom/part/g_part_mbr.c#3 integrate .. //depot/projects/soc2005/libalias/sys/geom/part/g_part_vtoc8.c#2 integrate .. //depot/projects/soc2005/libalias/sys/geom/vinum/geom_vinum_drive.c#3 integrate .. //depot/projects/soc2005/libalias/sys/i386/acpica/acpi_machdep.c#5 integrate .. //depot/projects/soc2005/libalias/sys/i386/acpica/acpi_wakeup.c#4 integrate .. //depot/projects/soc2005/libalias/sys/i386/acpica/madt.c#7 integrate .. //depot/projects/soc2005/libalias/sys/i386/cpufreq/est.c#4 integrate .. //depot/projects/soc2005/libalias/sys/i386/cpufreq/p4tcc.c#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/intr_machdep.c#9 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/legacy.c#5 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/local_apic.c#12 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/machdep.c#19 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/mp_machdep.c#13 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/mptable.c#4 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/nexus.c#8 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/pmap.c#13 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/vm_machdep.c#9 integrate .. //depot/projects/soc2005/libalias/sys/i386/include/atomic.h#4 integrate .. //depot/projects/soc2005/libalias/sys/i386/include/intr_machdep.h#8 integrate .. //depot/projects/soc2005/libalias/sys/i386/include/nexusvar.h#1 branch .. //depot/projects/soc2005/libalias/sys/i386/isa/atpic.c#5 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/linux_proto.h#15 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/linux_syscall.h#14 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/linux_sysent.c#14 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/syscalls.master#14 integrate .. //depot/projects/soc2005/libalias/sys/i386/xbox/xbox.c#3 integrate .. //depot/projects/soc2005/libalias/sys/ia64/ia64/interrupt.c#7 integrate .. //depot/projects/soc2005/libalias/sys/ia64/ia64/machdep.c#12 integrate .. //depot/projects/soc2005/libalias/sys/ia64/ia64/nexus.c#5 integrate .. //depot/projects/soc2005/libalias/sys/ia64/ia64/sscdisk.c#2 integrate .. //depot/projects/soc2005/libalias/sys/ia64/include/atomic.h#4 integrate .. //depot/projects/soc2005/libalias/sys/ia64/isa/isa_dma.c#3 integrate .. //depot/projects/soc2005/libalias/sys/kern/bus_if.m#6 integrate .. //depot/projects/soc2005/libalias/sys/kern/init_main.c#13 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_alq.c#7 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_clock.c#10 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_conf.c#8 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_cpuset.c#3 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_descrip.c#13 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_event.c#8 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_exit.c#8 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_fork.c#14 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_idle.c#8 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_intr.c#11 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_kthread.c#6 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_linker.c#10 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_lockf.c#4 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_malloc.c#7 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_mbuf.c#9 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_module.c#5 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_ntptime.c#6 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_poll.c#6 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_proc.c#12 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_resource.c#14 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_shutdown.c#9 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_sig.c#12 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_switch.c#10 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_synch.c#11 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_tc.c#5 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_thr.c#13 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_thread.c#14 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_timeout.c#7 integrate .. //depot/projects/soc2005/libalias/sys/kern/link_elf.c#8 integrate .. //depot/projects/soc2005/libalias/sys/kern/link_elf_obj.c#7 integrate .. //depot/projects/soc2005/libalias/sys/kern/sched_4bsd.c#16 integrate .. //depot/projects/soc2005/libalias/sys/kern/sched_ule.c#16 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_autoconf.c#4 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_bus.c#11 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_eventhandler.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_log.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_prof.c#4 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_sleepqueue.c#9 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_smp.c#8 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_trap.c#9 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_witness.c#15 integrate .. //depot/projects/soc2005/libalias/sys/kern/sys_generic.c#9 integrate .. //depot/projects/soc2005/libalias/sys/kern/sys_process.c#10 integrate .. //depot/projects/soc2005/libalias/sys/kern/tty.c#12 integrate .. //depot/projects/soc2005/libalias/sys/kern/tty_cons.c#6 integrate .. //depot/projects/soc2005/libalias/sys/kern/tty_pts.c#7 integrate .. //depot/projects/soc2005/libalias/sys/kern/tty_pty.c#8 integrate .. //depot/projects/soc2005/libalias/sys/kern/tty_subr.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/tty_tty.c#5 integrate .. //depot/projects/soc2005/libalias/sys/kern/uipc_domain.c#5 integrate .. //depot/projects/soc2005/libalias/sys/kern/uipc_socket.c#17 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_acl.c#4 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_bio.c#14 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_cache.c#6 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_cluster.c#6 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_default.c#7 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_hash.c#3 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_lookup.c#10 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_mount.c#17 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_subr.c#17 integrate .. //depot/projects/soc2005/libalias/sys/modules/geom/geom_part/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/modules/geom/geom_part/geom_part_apm/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/modules/geom/geom_part/geom_part_bsd/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/modules/geom/geom_part/geom_part_gpt/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/modules/geom/geom_part/geom_part_mbr/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/modules/geom/geom_part/geom_part_vtoc8/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/net/bpf.c#10 integrate .. //depot/projects/soc2005/libalias/sys/net/ieee8023ad_lacp.c#6 integrate .. //depot/projects/soc2005/libalias/sys/net/ieee8023ad_lacp.h#6 integrate .. //depot/projects/soc2005/libalias/sys/net/if.c#12 integrate .. //depot/projects/soc2005/libalias/sys/net/if_ethersubr.c#16 integrate .. //depot/projects/soc2005/libalias/sys/net/if_gre.c#6 integrate .. //depot/projects/soc2005/libalias/sys/net/if_lagg.c#5 integrate .. //depot/projects/soc2005/libalias/sys/net/netisr.c#4 integrate .. //depot/projects/soc2005/libalias/sys/net/rtsock.c#6 integrate .. //depot/projects/soc2005/libalias/sys/netatm/ipatm/ipatm_load.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netatm/sigpvc/sigpvc_if.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netatm/spans/spans_if.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netatm/uni/uni_load.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/ng_base.c#9 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/ng_l2tp.c#6 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/ng_tee.c#3 integrate .. //depot/projects/soc2005/libalias/sys/netinet/in_pcb.c#13 integrate .. //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#55 integrate .. //depot/projects/soc2005/libalias/sys/netinet/ip_ipsec.c#5 integrate .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_irc.c#26 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/ip6_ipsec.c#3 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/ip6_ipsec.h#3 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/ip6_output.c#5 integrate .. //depot/projects/soc2005/libalias/sys/netipsec/ipsec.c#9 integrate .. //depot/projects/soc2005/libalias/sys/netipsec/ipsec_output.c#6 integrate .. //depot/projects/soc2005/libalias/sys/netipsec/key.c#5 integrate .. //depot/projects/soc2005/libalias/sys/netipsec/xform_tcp.c#2 integrate .. //depot/projects/soc2005/libalias/sys/nfs4client/nfs4_vfsops.c#6 integrate .. //depot/projects/soc2005/libalias/sys/nfs4client/nfs4_vnops.c#7 integrate .. //depot/projects/soc2005/libalias/sys/nfsclient/nfs_diskless.c#5 integrate .. //depot/projects/soc2005/libalias/sys/nfsclient/nfs_subs.c#6 integrate .. //depot/projects/soc2005/libalias/sys/nfsclient/nfs_vfsops.c#12 integrate .. //depot/projects/soc2005/libalias/sys/nfsclient/nfs_vnops.c#12 integrate .. //depot/projects/soc2005/libalias/sys/nfsserver/nfs_serv.c#10 integrate .. //depot/projects/soc2005/libalias/sys/nfsserver/nfs_srvsock.c#7 integrate .. //depot/projects/soc2005/libalias/sys/pc98/include/nexusvar.h#1 branch .. //depot/projects/soc2005/libalias/sys/pc98/pc98/machdep.c#16 integrate .. //depot/projects/soc2005/libalias/sys/pci/if_rlreg.h#12 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/aim/machdep.c#4 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/booke/machdep.c#4 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/booke/vm_machdep.c#3 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/include/atomic.h#4 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/include/gdb_machdep.h#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/powerpc/gdb_machdep.c#3 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/powerpc/intr_machdep.c#9 integrate .. //depot/projects/soc2005/libalias/sys/security/audit/audit.c#14 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/include/atomic.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/sparc64/intr_machdep.c#6 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/sparc64/vm_machdep.c#5 integrate .. //depot/projects/soc2005/libalias/sys/sun4v/include/atomic.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/intr_machdep.c#6 integrate .. //depot/projects/soc2005/libalias/sys/sys/aac_ioctl.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/ata.h#5 integrate .. //depot/projects/soc2005/libalias/sys/sys/buf.h#7 integrate .. //depot/projects/soc2005/libalias/sys/sys/bufobj.h#5 integrate .. //depot/projects/soc2005/libalias/sys/sys/bus.h#8 integrate .. //depot/projects/soc2005/libalias/sys/sys/bus_dma.h#3 integrate .. //depot/projects/soc2005/libalias/sys/sys/conf.h#7 integrate .. //depot/projects/soc2005/libalias/sys/sys/eventhandler.h#6 integrate .. //depot/projects/soc2005/libalias/sys/sys/interrupt.h#6 integrate .. //depot/projects/soc2005/libalias/sys/sys/kernel.h#8 integrate .. //depot/projects/soc2005/libalias/sys/sys/module.h#3 integrate .. //depot/projects/soc2005/libalias/sys/sys/proc.h#18 integrate .. //depot/projects/soc2005/libalias/sys/sys/resourcevar.h#3 integrate .. //depot/projects/soc2005/libalias/sys/sys/runq.h#5 integrate .. //depot/projects/soc2005/libalias/sys/sys/rwlock.h#7 integrate .. //depot/projects/soc2005/libalias/sys/sys/sched.h#11 integrate .. //depot/projects/soc2005/libalias/sys/sys/sysctl.h#10 integrate .. //depot/projects/soc2005/libalias/sys/sys/taskqueue.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/vnode.h#11 integrate .. //depot/projects/soc2005/libalias/sys/ufs/ffs/ffs_inode.c#5 integrate .. //depot/projects/soc2005/libalias/sys/ufs/ffs/ffs_rawread.c#4 integrate .. //depot/projects/soc2005/libalias/sys/ufs/ffs/ffs_snapshot.c#10 integrate .. //depot/projects/soc2005/libalias/sys/ufs/ffs/ffs_softdep.c#11 integrate .. //depot/projects/soc2005/libalias/sys/ufs/ffs/ffs_vfsops.c#13 integrate .. //depot/projects/soc2005/libalias/sys/ufs/ffs/ffs_vnops.c#10 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_fault.c#11 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_glue.c#9 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_init.c#2 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_meter.c#7 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_mmap.c#7 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_page.c#16 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_page.h#9 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_pageout.c#9 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_pageq.c#8 delete .. //depot/projects/soc2005/libalias/sys/vm/vm_zeroidle.c#8 integrate .. //depot/projects/soc2005/libalias/tools/regression/bin/sh/builtins/getopts1.0#1 branch .. //depot/projects/soc2005/libalias/tools/regression/bin/sh/builtins/getopts1.0.stdout#1 branch .. //depot/projects/soc2005/libalias/tools/tools/README#5 integrate .. //depot/projects/soc2005/libalias/tools/tools/editing/freebsd.vim#1 branch .. //depot/projects/soc2005/libalias/tools/tools/mctest/mctest.cc#1 branch .. //depot/projects/soc2005/libalias/tools/tools/mctest/mctest.h#1 branch .. //depot/projects/soc2005/libalias/tools/tools/net80211/wlanwatch/wlanwatch.c#4 integrate .. //depot/projects/soc2005/libalias/tools/tools/tinybsd/tinybsd#7 integrate .. //depot/projects/soc2005/libalias/tools/tools/track/Makefile#1 branch .. //depot/projects/soc2005/libalias/tools/tools/track/track.sh#1 branch .. //depot/projects/soc2005/libalias/usr.bin/Makefile#8 integrate .. //depot/projects/soc2005/libalias/usr.bin/ktrace/ktrace.c#3 integrate .. //depot/projects/soc2005/libalias/usr.bin/netstat/inet6.c#7 integrate .. //depot/projects/soc2005/libalias/usr.bin/ruptime/ruptime.c#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/split/split.1#4 integrate .. //depot/projects/soc2005/libalias/usr.bin/split/split.c#3 integrate .. //depot/projects/soc2005/libalias/usr.bin/tar/Makefile#7 integrate .. //depot/projects/soc2005/libalias/usr.bin/tar/bsdtar.1#5 integrate .. //depot/projects/soc2005/libalias/usr.bin/tar/bsdtar.c#9 integrate .. //depot/projects/soc2005/libalias/usr.bin/tar/bsdtar.h#7 integrate .. //depot/projects/soc2005/libalias/usr.bin/tar/config_freebsd.h#3 integrate .. //depot/projects/soc2005/libalias/usr.bin/tar/matching.c#4 integrate .. //depot/projects/soc2005/libalias/usr.bin/tar/read.c#9 integrate .. //depot/projects/soc2005/libalias/usr.bin/tar/write.c#10 integrate .. //depot/projects/soc2005/libalias/usr.bin/uuidgen/Makefile#3 delete .. //depot/projects/soc2005/libalias/usr.bin/uuidgen/uuidgen.1#2 delete .. //depot/projects/soc2005/libalias/usr.bin/uuidgen/uuidgen.c#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/adduser/adduser.8#6 integrate .. //depot/projects/soc2005/libalias/usr.sbin/arp/arp.8#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/arp/arp.c#6 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c#4 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bluetooth/sdpd/gn.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bluetooth/sdpd/lan.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bluetooth/sdpd/nap.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bluetooth/sdpd/panu.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bluetooth/sdpd/profile.c#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bluetooth/sdpd/profile.h#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/fifolog/lib/fifolog_int.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/fifolog/lib/fifolog_write_poll.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/fifolog/lib/miniobj.h#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/freebsd-update/freebsd-update.sh#9 integrate .. //depot/projects/soc2005/libalias/usr.sbin/mixer/Makefile#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/mixer/mixer.8#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/mixer/mixer.c#2 integrate Differences ... ==== //depot/projects/soc2005/libalias/ObsoleteFiles.inc#26 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.132 2008/03/08 21:59:43 antoine Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.133 2008/03/13 18:17:46 brueffer Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -27,6 +27,8 @@ # 20071207: Merged with fortunes-o.real OLD_FILES+=usr/share/games/fortune/fortunes2-o OLD_FILES+=usr/share/games/fortune/fortunes2-o.dat +# 20071201: Removal of XRPU driver +OLD_FILES+=usr/include/sys/xrpuio.h # 20071129: Disabled static versions of libkse by default .if ${DEFAULT_THREAD_LIB} != "libkse" && ${MK_LIBTHR} != "no" OLD_FILES+=usr/lib/libkse.a ==== //depot/projects/soc2005/libalias/bin/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/Makefile,v 1.26 2006/03/17 18:54:20 ru Exp $ +# $FreeBSD: src/bin/Makefile,v 1.27 2008/03/13 17:38:06 obrien Exp $ .include @@ -37,7 +37,8 @@ sleep \ stty \ sync \ - test + test \ + uuidgen .if ${MK_RCMDS} != "no" _rcp= rcp ==== //depot/projects/soc2005/libalias/bin/sh/options.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/options.c,v 1.25 2006/04/09 12:20:42 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/options.c,v 1.26 2008/03/22 14:06:01 stefanf Exp $"); #include #include @@ -383,7 +383,7 @@ } ap2 = shellparam.p; while ((*ap2++ = *ap1++) != NULL); - shellparam.optnext = NULL; + shellparam.reset = 1; INTON; return 0; } @@ -405,6 +405,7 @@ if (*argptr != NULL) { setparam(argptr); } + shellparam.reset = 1; INTON; return 0; } @@ -414,7 +415,6 @@ getoptsreset(const char *value) { if (number(value) == 1) { - shellparam.optnext = NULL; shellparam.reset = 1; } } ==== //depot/projects/soc2005/libalias/bin/uuidgen/Makefile#2 (text+ko) ==== @@ -1,6 +1,4 @@ -# $FreeBSD: src/bin/uuidgen/Makefile,v 1.3 2007/04/09 19:16:48 pjd Exp $ - -BINDIR= /bin +# $FreeBSD: src/bin/uuidgen/Makefile,v 1.4 2008/03/13 17:38:06 obrien Exp $ PROG= uuidgen WARNS?= 6 ==== //depot/projects/soc2005/libalias/contrib/bzip2/CHANGES#3 (text+ko) ==== @@ -2,8 +2,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -312,3 +312,8 @@ * Fix minor doc/comment bugs. + +1.0.5 (10 Dec 07) +~~~~~~~~~~~~~~~~~ +Security fix only. Fixes CERT-FI 20469 as it applies to bzip2. + ==== //depot/projects/soc2005/libalias/contrib/bzip2/FREEBSD-upgrade#3 (text+ko) ==== @@ -1,12 +1,12 @@ -$FreeBSD: src/contrib/bzip2/FREEBSD-upgrade,v 1.4 2007/03/30 16:33:05 delphij Exp $ +$FreeBSD: src/contrib/bzip2/FREEBSD-upgrade,v 1.5 2008/03/20 02:45:32 delphij Exp $ Julian Seward's bzip2 originals can be found at: http://www.bzip.org/downloads.html Imported by: - cvs import -m "Virgin import (trimmed) of Bzip2 version 1.0.4." \ - src/contrib/bzip2 BZIP2 v1_0_4 + cvs import -m "Virgin import (trimmed) of Bzip2 version 1.0.5." \ + src/contrib/bzip2 BZIP2 v1_0_5 Notes: The following log shows details of trimming: ==== //depot/projects/soc2005/libalias/contrib/bzip2/LICENSE#3 (text+ko) ==== @@ -2,7 +2,7 @@ -------------------------------------------------------------------------- This program, "bzip2", the associated library "libbzip2", and all -documentation, are copyright (C) 1996-2006 Julian R Seward. All +documentation, are copyright (C) 1996-2007 Julian R Seward. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -36,8 +36,7 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -Julian Seward, Cambridge, UK. -jseward@bzip.org -bzip2/libbzip2 version 1.0.4 of 20 December 2006 +Julian Seward, jseward@bzip.org +bzip2/libbzip2 version 1.0.5 of 10 December 2007 -------------------------------------------------------------------------- ==== //depot/projects/soc2005/libalias/contrib/bzip2/Makefile#3 (text+ko) ==== @@ -2,8 +2,8 @@ # This file is part of bzip2/libbzip2, a program and library for # lossless, block-sorting data compression. # -# bzip2/libbzip2 version 1.0.4 of 20 December 2006 -# Copyright (C) 1996-2006 Julian Seward +# bzip2/libbzip2 version 1.0.5 of 10 December 2007 +# Copyright (C) 1996-2007 Julian Seward # # Please read the WARNING, DISCLAIMER and PATENTS sections in the # README file. @@ -137,7 +137,7 @@ distclean: clean rm -f manual.ps manual.html manual.pdf -DISTNAME=bzip2-1.0.4 +DISTNAME=bzip2-1.0.5 dist: check manual rm -f $(DISTNAME) ln -s -f . $(DISTNAME) ==== //depot/projects/soc2005/libalias/contrib/bzip2/Makefile-libbz2_so#3 (text+ko) ==== @@ -10,8 +10,8 @@ # This file is part of bzip2/libbzip2, a program and library for # lossless, block-sorting data compression. # -# bzip2/libbzip2 version 1.0.4 of 20 December 2006 -# Copyright (C) 1996-2006 Julian Seward +# bzip2/libbzip2 version 1.0.5 of 10 December 2007 +# Copyright (C) 1996-2007 Julian Seward # # Please read the WARNING, DISCLAIMER and PATENTS sections in the # README file. ==== //depot/projects/soc2005/libalias/contrib/bzip2/README#3 (text+ko) ==== @@ -6,8 +6,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. -bzip2/libbzip2 version 1.0.4 of 20 December 2006 -Copyright (C) 1996-2006 Julian Seward +bzip2/libbzip2 version 1.0.5 of 10 December 2007 +Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in this file. @@ -177,7 +177,11 @@ See the CHANGES file. +WHAT'S NEW IN 1.0.5 ? + See the CHANGES file. + + I hope you find bzip2 useful. Feel free to contact me at jseward@bzip.org if you have any suggestions or queries. Many people mailed me with @@ -203,3 +207,4 @@ 30 December 2001 (bzip2, version 1.0.2pre1) 15 February 2005 (bzip2, version 1.0.3) 20 December 2006 (bzip2, version 1.0.4) +10 December 2007 (bzip2, version 1.0.5) ==== //depot/projects/soc2005/libalias/contrib/bzip2/README.COMPILATION.PROBLEMS#3 (text+ko) ==== @@ -2,8 +2,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. -bzip2/libbzip2 version 1.0.4 of 20 December 2006 -Copyright (C) 1996-2006 Julian Seward +bzip2/libbzip2 version 1.0.5 of 10 December 2007 +Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -12,7 +12,7 @@ in the file LICENSE. ------------------------------------------------------------------ -bzip2-1.0.4 should compile without problems on the vast majority of +bzip2-1.0.5 should compile without problems on the vast majority of platforms. Using the supplied Makefile, I've built and tested it myself for x86-linux and amd64-linux. With makefile.msc, Visual C++ 6.0 and nmake, you can build a native Win32 version too. Large file ==== //depot/projects/soc2005/libalias/contrib/bzip2/blocksort.c#3 (text+ko) ==== @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. ==== //depot/projects/soc2005/libalias/contrib/bzip2/bzip2.c#3 (text+ko) ==== @@ -7,8 +7,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -1605,11 +1605,11 @@ "bzip2, a block-sorting file compressor. " "Version %s.\n" " \n" - " Copyright (C) 1996-2006 by Julian Seward.\n" + " Copyright (C) 1996-2007 by Julian Seward.\n" " \n" " This program is free software; you can redistribute it and/or modify\n" " it under the terms set out in the LICENSE file, which is included\n" - " in the bzip2-1.0.4 source distribution.\n" + " in the bzip2-1.0.5 source distribution.\n" " \n" " This program is distributed in the hope that it will be useful,\n" " but WITHOUT ANY WARRANTY; without even the implied warranty of\n" ==== //depot/projects/soc2005/libalias/contrib/bzip2/bzip2recover.c#3 (text+ko) ==== @@ -7,8 +7,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -313,7 +313,7 @@ inFileName[0] = outFileName[0] = 0; fprintf ( stderr, - "bzip2recover 1.0.4: extracts blocks from damaged .bz2 files.\n" ); + "bzip2recover 1.0.5: extracts blocks from damaged .bz2 files.\n" ); if (argc != 2) { fprintf ( stderr, "%s: usage is `%s damaged_file_name'.\n", ==== //depot/projects/soc2005/libalias/contrib/bzip2/bzlib.c#3 (text+ko) ==== @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/contrib/bzip2/bzlib.c,v 1.3 2007/03/28 07:46:20 delphij Exp $"); +__FBSDID("$FreeBSD: src/contrib/bzip2/bzlib.c,v 1.4 2008/03/20 02:56:24 delphij Exp $"); #include "bzlib_private.h" @@ -52,7 +52,7 @@ "component, you should also report this bug to the author(s)\n" "of that program. Please make an effort to report this bug;\n" "timely and accurate bug reports eventually lead to higher\n" - "quality software. Thanks. Julian Seward, 15 February 2005.\n\n", + "quality software. Thanks. Julian Seward, 10 December 2007.\n\n", errcode, BZ2_bzlibVersion() ); @@ -605,6 +605,7 @@ UInt32 c_tPos = s->tPos; char* cs_next_out = s->strm->next_out; unsigned int cs_avail_out = s->strm->avail_out; + Int32 ro_blockSize100k = s->blockSize100k; /* end restore */ UInt32 avail_out_INIT = cs_avail_out; ==== //depot/projects/soc2005/libalias/contrib/bzip2/bzlib.h#3 (text+ko) ==== @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. ==== //depot/projects/soc2005/libalias/contrib/bzip2/bzlib_private.h#3 (text+ko) ==== @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -36,7 +36,7 @@ /*-- General stuff. --*/ -#define BZ_VERSION "1.0.4, 20-Dec-2006" +#define BZ_VERSION "1.0.5, 10-Dec-2007" typedef char Char; typedef unsigned char Bool; @@ -442,11 +442,15 @@ /*-- Macros for decompression. --*/ #define BZ_GET_FAST(cccc) \ + /* c_tPos is unsigned, hence test < 0 is pointless. */ \ + if (s->tPos >= (UInt32)100000 * (UInt32)s->blockSize100k) return True; \ s->tPos = s->tt[s->tPos]; \ cccc = (UChar)(s->tPos & 0xff); \ s->tPos >>= 8; #define BZ_GET_FAST_C(cccc) \ + /* c_tPos is unsigned, hence test < 0 is pointless. */ \ + if (c_tPos >= (UInt32)100000 * (UInt32)ro_blockSize100k) return True; \ c_tPos = c_tt[c_tPos]; \ cccc = (UChar)(c_tPos & 0xff); \ c_tPos >>= 8; @@ -469,8 +473,10 @@ (((UInt32)s->ll16[i]) | (GET_LL4(i) << 16)) #define BZ_GET_SMALL(cccc) \ - cccc = BZ2_indexIntoF ( s->tPos, s->cftab ); \ - s->tPos = GET_LL(s->tPos); + /* c_tPos is unsigned, hence test < 0 is pointless. */ \ + if (s->tPos >= (UInt32)100000 * (UInt32)s->blockSize100k) return True; \ + cccc = BZ2_indexIntoF ( s->tPos, s->cftab ); \ + s->tPos = GET_LL(s->tPos); /*-- externs for decompression. --*/ ==== //depot/projects/soc2005/libalias/contrib/bzip2/compress.c#3 (text+ko) ==== @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. ==== //depot/projects/soc2005/libalias/contrib/bzip2/crctable.c#3 (text+ko) ==== @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. ==== //depot/projects/soc2005/libalias/contrib/bzip2/decompress.c#3 (text+ko) ==== @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. ==== //depot/projects/soc2005/libalias/contrib/bzip2/huffman.c#3 (text+ko) ==== @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. ==== //depot/projects/soc2005/libalias/contrib/bzip2/randtable.c#3 (text+ko) ==== @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. ==== //depot/projects/soc2005/libalias/contrib/bzip2/spewG.c#3 (text+ko) ==== @@ -13,8 +13,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Mar 23 20:16:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E3790106566B; Sun, 23 Mar 2008 20: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 A1E3C1065672 for ; Sun, 23 Mar 2008 20:16:27 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8B5C58FC29 for ; Sun, 23 Mar 2008 20:16:27 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2NKGRdo092618 for ; Sun, 23 Mar 2008 20:16:27 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2NKGRrO092616 for perforce@freebsd.org; Sun, 23 Mar 2008 20:16:27 GMT (envelope-from jb@freebsd.org) Date: Sun, 23 Mar 2008 20:16:27 GMT Message-Id: <200803232016.m2NKGRrO092616@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 138377 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Mar 2008 20:16:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=138377 Change 138377 by jb@jb_freebsd1 on 2008/03/23 20:16:21 Ix some DIF subr prototypes for FreeBSD. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_open.c#28 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_open.c#28 (text) ==== @@ -258,9 +258,17 @@ { "index", DT_IDENT_FUNC, 0, DIF_SUBR_INDEX, DT_ATTR_STABCMN, DT_VERS_1_1, &dt_idops_func, "int(const char *, const char *, [int])" }, { "inet_ntoa", DT_IDENT_FUNC, 0, DIF_SUBR_INET_NTOA, DT_ATTR_STABCMN, +#if defined(sun) DT_VERS_1_5, &dt_idops_func, "string(ipaddr_t *)" }, +#else + DT_VERS_1_5, &dt_idops_func, "string(in_addr_t *)" }, +#endif { "inet_ntoa6", DT_IDENT_FUNC, 0, DIF_SUBR_INET_NTOA6, DT_ATTR_STABCMN, +#if defined(sun) DT_VERS_1_5, &dt_idops_func, "string(in6_addr_t *)" }, +#else + DT_VERS_1_5, &dt_idops_func, "string(struct in6_addr *)" }, +#endif { "inet_ntop", DT_IDENT_FUNC, 0, DIF_SUBR_INET_NTOP, DT_ATTR_STABCMN, DT_VERS_1_5, &dt_idops_func, "string(int, void *)" }, { "ipl", DT_IDENT_SCALAR, 0, DIF_VAR_IPL, DT_ATTR_STABCMN, DT_VERS_1_0, From owner-p4-projects@FreeBSD.ORG Sun Mar 23 20:17:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 235D5106566B; Sun, 23 Mar 2008 20:17: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 D65291065670 for ; Sun, 23 Mar 2008 20:17:28 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C00F98FC14 for ; Sun, 23 Mar 2008 20:17:28 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2NKHS1c092671 for ; Sun, 23 Mar 2008 20:17:28 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2NKHSut092669 for perforce@freebsd.org; Sun, 23 Mar 2008 20:17:28 GMT (envelope-from jb@freebsd.org) Date: Sun, 23 Mar 2008 20:17:28 GMT Message-Id: <200803232017.m2NKHSut092669@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 138378 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Mar 2008 20:17:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=138378 Change 138378 by jb@jb_freebsd1 on 2008/03/23 20:17:10 Implement the in_addr and in6_addr SIF subrs. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#43 edit Differences ... ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#43 (text) ==== @@ -118,6 +118,7 @@ #include #include #include +#include #include "dtrace_cddl.h" #include "dtrace_debug.c" #endif @@ -272,6 +273,7 @@ #define cr_suid cr_svuid #define cr_sgid cr_svgid +#define ipaddr_t in_addr_t #define mod_modname pathname #define vuprintf vprintf #define ttoproc(_a) ((_a)->td_proc) @@ -4403,8 +4405,6 @@ case DIF_SUBR_INET_NTOA: case DIF_SUBR_INET_NTOA6: case DIF_SUBR_INET_NTOP: { -printf("%s(%d): DOODAD\n",__func__,__LINE__); -#ifdef DOODAD size_t size; int af, argi, i; char *base, *end; @@ -4502,14 +4502,22 @@ tryzero = -1; numzero = 1; for (i = 0; i < sizeof (struct in6_addr); i++) { +#if defined(sun) if (ip6._S6_un._S6_u8[i] == 0 && +#else + if (ip6.__u6_addr.__u6_addr8[i] == 0 && +#endif tryzero == -1 && i % 2 == 0) { tryzero = i; continue; } if (tryzero != -1 && +#if defined(sun) (ip6._S6_un._S6_u8[i] != 0 || +#else + (ip6.__u6_addr.__u6_addr8[i] != 0 || +#endif i == sizeof (struct in6_addr) - 1)) { if (i - tryzero <= numzero) { @@ -4521,7 +4529,11 @@ numzero = i - i % 2 - tryzero; tryzero = -1; +#if defined(sun) if (ip6._S6_un._S6_u8[i] == 0 && +#else + if (ip6.__u6_addr.__u6_addr8[i] == 0 && +#endif i == sizeof (struct in6_addr) - 1) numzero += 2; } @@ -4538,7 +4550,11 @@ i >= DTRACE_V4MAPPED_OFFSET; i--) { ASSERT(end >= base); +#if defined(sun) val = ip6._S6_un._S6_u8[i]; +#else + val = ip6.__u6_addr.__u6_addr8[i]; +#endif if (val == 0) { *end-- = '0'; @@ -4579,8 +4595,13 @@ if (i < 14 && i != firstzero - 2) *end-- = ':'; +#if defined(sun) val = (ip6._S6_un._S6_u8[i] << 8) + ip6._S6_un._S6_u8[i + 1]; +#else + val = (ip6.__u6_addr.__u6_addr8[i] << 8) + + ip6.__u6_addr.__u6_addr8[i + 1]; +#endif if (val == 0) { *end-- = '0'; @@ -4603,7 +4624,6 @@ inetout: regs[rd] = (uintptr_t)end + 1; mstate->dtms_scratch_ptr += size; -#endif break; } From owner-p4-projects@FreeBSD.ORG Sun Mar 23 20:18:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F755106566C; Sun, 23 Mar 2008 20:18:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0EB591065674 for ; Sun, 23 Mar 2008 20:18:30 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id ECB7C8FC22 for ; Sun, 23 Mar 2008 20:18:29 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2NKITJ0093590 for ; Sun, 23 Mar 2008 20:18:29 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2NKITuT093588 for perforce@freebsd.org; Sun, 23 Mar 2008 20:18:29 GMT (envelope-from jb@freebsd.org) Date: Sun, 23 Mar 2008 20:18:29 GMT Message-Id: <200803232018.m2NKITuT093588@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 138379 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Mar 2008 20:18:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=138379 Change 138379 by jb@jb_freebsd1 on 2008/03/23 20:17:39 Enable the in_addr and in6_addr tests. Affected files ... .. //depot/projects/dtrace/src/tools/test/dtrace/Makefile#28 edit Differences ... ==== //depot/projects/dtrace/src/tools/test/dtrace/Makefile#28 (text+ko) ==== @@ -31,10 +31,6 @@ ${TESTSRCDIR}/tst/common/funcs/tst.copyin.d \ ${TESTSRCDIR}/tst/common/funcs/tst.copyinto.d \ ${TESTSRCDIR}/tst/common/funcs/tst.ddi_pathname.d \ - ${TESTSRCDIR}/tst/common/funcs/tst.hton.d \ - ${TESTSRCDIR}/tst/common/funcs/tst.inet_ntoa.d \ - ${TESTSRCDIR}/tst/common/funcs/tst.inet_ntoa6.d \ - ${TESTSRCDIR}/tst/common/funcs/tst.inet_ntop.d \ ${TESTSRCDIR}/tst/common/funcs/tst.mutex_owned.d \ ${TESTSRCDIR}/tst/common/funcs/tst.mutex_owner.d \ ${TESTSRCDIR}/tst/common/funcs/tst.mutex_type_adaptive.d \ @@ -51,8 +47,8 @@ ${TESTSRCDIR}/tst/common/misc/tst.schrock.ksh \ ${TESTSRCDIR}/tst/common/nfs/tst.call.c \ ${TESTSRCDIR}/tst/common/nfs/tst.call.d \ - ${TESTSRCDIR}/tst/common/nfs/tst.call3.c \ - ${TESTSRCDIR}/tst/common/nfs/tst.call3.d \ + ${TESTSRCDIR}/tst/common/nfs/tst.call3.c \ + ${TESTSRCDIR}/tst/common/nfs/tst.call3.d \ ${TESTSRCDIR}/tst/common/offsetof/err.D_OFFSETOF_BITFIELD.bitfield.d \ ${TESTSRCDIR}/tst/common/pid/err.D_PDESC_ZERO.badlib.d \ ${TESTSRCDIR}/tst/common/pid/err.D_PDESC_ZERO.badproc1.d \ From owner-p4-projects@FreeBSD.ORG Sun Mar 23 20:18:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E3601065713; Sun, 23 Mar 2008 20:18:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 33618106564A for ; Sun, 23 Mar 2008 20:18:30 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1BCF78FC28 for ; Sun, 23 Mar 2008 20:18:30 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2NKIUPK093595 for ; Sun, 23 Mar 2008 20:18:30 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2NKIUYK093593 for perforce@freebsd.org; Sun, 23 Mar 2008 20:18:30 GMT (envelope-from jb@freebsd.org) Date: Sun, 23 Mar 2008 20:18:30 GMT Message-Id: <200803232018.m2NKIUYK093593@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 138380 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Mar 2008 20:18:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=138380 Change 138380 by jb@jb_freebsd1 on 2008/03/23 20:18:27 Port the in_addr and in6_addr tests to FreeBSD. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.hton.d#5 edit .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa.d#4 edit .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa6.d#4 edit .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d#4 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.hton.d#5 (text+ko) ==== @@ -30,7 +30,9 @@ * ASSERTION: Test network byte-ordering routines. */ -#include +#if defined(__amd64__) || defined(__i386__) +#define _LITTLE_ENDIAN +#endif BEGIN { ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa.d#4 (text+ko) ==== @@ -28,17 +28,17 @@ #pragma D option quiet -ipaddr_t *ip4a; -ipaddr_t *ip4b; -ipaddr_t *ip4c; -ipaddr_t *ip4d; +in_addr_t *ip4a; +in_addr_t *ip4b; +in_addr_t *ip4c; +in_addr_t *ip4d; BEGIN { - this->buf4a = alloca(sizeof (ipaddr_t)); - this->buf4b = alloca(sizeof (ipaddr_t)); - this->buf4c = alloca(sizeof (ipaddr_t)); - this->buf4d = alloca(sizeof (ipaddr_t)); + this->buf4a = alloca(sizeof (in_addr_t)); + this->buf4b = alloca(sizeof (in_addr_t)); + this->buf4c = alloca(sizeof (in_addr_t)); + this->buf4d = alloca(sizeof (in_addr_t)); ip4a = this->buf4a; ip4b = this->buf4b; ip4c = this->buf4c; ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa6.d#4 (text+ko) ==== @@ -53,35 +53,35 @@ ip6f = this->buf6f; ip6g = this->buf6g; - ip6a->_S6_un._S6_u8[0] = 0xfe; - ip6a->_S6_un._S6_u8[1] = 0x80; - ip6a->_S6_un._S6_u8[8] = 0x02; - ip6a->_S6_un._S6_u8[9] = 0x14; - ip6a->_S6_un._S6_u8[10] = 0x4f; - ip6a->_S6_un._S6_u8[11] = 0xff; - ip6a->_S6_un._S6_u8[12] = 0xfe; - ip6a->_S6_un._S6_u8[13] = 0x0b; - ip6a->_S6_un._S6_u8[14] = 0x76; - ip6a->_S6_un._S6_u8[15] = 0xc8; - ip6b->_S6_un._S6_u8[0] = 0x10; - ip6b->_S6_un._S6_u8[1] = 0x80; - ip6b->_S6_un._S6_u8[10] = 0x08; - ip6b->_S6_un._S6_u8[11] = 0x08; - ip6b->_S6_un._S6_u8[13] = 0x20; - ip6b->_S6_un._S6_u8[13] = 0x0c; - ip6b->_S6_un._S6_u8[14] = 0x41; - ip6b->_S6_un._S6_u8[15] = 0x7a; - ip6c->_S6_un._S6_u8[15] = 0x01; - ip6e->_S6_un._S6_u8[12] = 0x7f; - ip6e->_S6_un._S6_u8[15] = 0x01; - ip6f->_S6_un._S6_u8[10] = 0xff; - ip6f->_S6_un._S6_u8[11] = 0xff; - ip6f->_S6_un._S6_u8[12] = 0x7f; - ip6f->_S6_un._S6_u8[15] = 0x01; - ip6g->_S6_un._S6_u8[10] = 0xff; - ip6g->_S6_un._S6_u8[11] = 0xfe; - ip6g->_S6_un._S6_u8[12] = 0x7f; - ip6g->_S6_un._S6_u8[15] = 0x01; + ip6a->__u6_addr.__u6_addr8[0] = 0xfe; + ip6a->__u6_addr.__u6_addr8[1] = 0x80; + ip6a->__u6_addr.__u6_addr8[8] = 0x02; + ip6a->__u6_addr.__u6_addr8[9] = 0x14; + ip6a->__u6_addr.__u6_addr8[10] = 0x4f; + ip6a->__u6_addr.__u6_addr8[11] = 0xff; + ip6a->__u6_addr.__u6_addr8[12] = 0xfe; + ip6a->__u6_addr.__u6_addr8[13] = 0x0b; + ip6a->__u6_addr.__u6_addr8[14] = 0x76; + ip6a->__u6_addr.__u6_addr8[15] = 0xc8; + ip6b->__u6_addr.__u6_addr8[0] = 0x10; + ip6b->__u6_addr.__u6_addr8[1] = 0x80; + ip6b->__u6_addr.__u6_addr8[10] = 0x08; + ip6b->__u6_addr.__u6_addr8[11] = 0x08; + ip6b->__u6_addr.__u6_addr8[13] = 0x20; + ip6b->__u6_addr.__u6_addr8[13] = 0x0c; + ip6b->__u6_addr.__u6_addr8[14] = 0x41; + ip6b->__u6_addr.__u6_addr8[15] = 0x7a; + ip6c->__u6_addr.__u6_addr8[15] = 0x01; + ip6e->__u6_addr.__u6_addr8[12] = 0x7f; + ip6e->__u6_addr.__u6_addr8[15] = 0x01; + ip6f->__u6_addr.__u6_addr8[10] = 0xff; + ip6f->__u6_addr.__u6_addr8[11] = 0xff; + ip6f->__u6_addr.__u6_addr8[12] = 0x7f; + ip6f->__u6_addr.__u6_addr8[15] = 0x01; + ip6g->__u6_addr.__u6_addr8[10] = 0xff; + ip6g->__u6_addr.__u6_addr8[11] = 0xfe; + ip6g->__u6_addr.__u6_addr8[12] = 0x7f; + ip6g->__u6_addr.__u6_addr8[15] = 0x01; printf("%s\n", inet_ntoa6(ip6a)); printf("%s\n", inet_ntoa6(ip6b)); ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d#4 (text+ko) ==== @@ -28,10 +28,13 @@ #pragma D option quiet -ipaddr_t *ip4a; -ipaddr_t *ip4b; -ipaddr_t *ip4c; -ipaddr_t *ip4d; +inline int AF_INET = 2; +inline int AF_INET6 = 28; + +in_addr_t *ip4a; +in_addr_t *ip4b; +in_addr_t *ip4c; +in_addr_t *ip4d; struct in6_addr *ip6a; struct in6_addr *ip6b; struct in6_addr *ip6c; @@ -43,10 +46,10 @@ BEGIN { - this->buf4a = alloca(sizeof (ipaddr_t)); - this->buf4b = alloca(sizeof (ipaddr_t)); - this->buf4c = alloca(sizeof (ipaddr_t)); - this->buf4d = alloca(sizeof (ipaddr_t)); + this->buf4a = alloca(sizeof (in_addr_t)); + this->buf4b = alloca(sizeof (in_addr_t)); + this->buf4c = alloca(sizeof (in_addr_t)); + this->buf4d = alloca(sizeof (in_addr_t)); this->buf6a = alloca(sizeof (struct in6_addr)); this->buf6b = alloca(sizeof (struct in6_addr)); this->buf6c = alloca(sizeof (struct in6_addr)); @@ -72,51 +75,51 @@ *ip4b = htonl(0x7f000001); *ip4c = htonl(0xffffffff); *ip4d = htonl(0x00000000); - ip6a->_S6_un._S6_u8[0] = 0xfe; - ip6a->_S6_un._S6_u8[1] = 0x80; - ip6a->_S6_un._S6_u8[8] = 0x02; - ip6a->_S6_un._S6_u8[9] = 0x14; - ip6a->_S6_un._S6_u8[10] = 0x4f; - ip6a->_S6_un._S6_u8[11] = 0xff; - ip6a->_S6_un._S6_u8[12] = 0xfe; - ip6a->_S6_un._S6_u8[13] = 0x0b; - ip6a->_S6_un._S6_u8[14] = 0x76; - ip6a->_S6_un._S6_u8[15] = 0xc8; - ip6b->_S6_un._S6_u8[0] = 0x10; - ip6b->_S6_un._S6_u8[1] = 0x80; - ip6b->_S6_un._S6_u8[10] = 0x08; - ip6b->_S6_un._S6_u8[11] = 0x08; - ip6b->_S6_un._S6_u8[13] = 0x20; - ip6b->_S6_un._S6_u8[13] = 0x0c; - ip6b->_S6_un._S6_u8[14] = 0x41; - ip6b->_S6_un._S6_u8[15] = 0x7a; - ip6c->_S6_un._S6_u8[15] = 0x01; - ip6e->_S6_un._S6_u8[12] = 0x7f; - ip6e->_S6_un._S6_u8[15] = 0x01; - ip6f->_S6_un._S6_u8[10] = 0xff; - ip6f->_S6_un._S6_u8[11] = 0xff; - ip6f->_S6_un._S6_u8[12] = 0x7f; - ip6f->_S6_un._S6_u8[15] = 0x01; - ip6g->_S6_un._S6_u8[10] = 0xff; - ip6g->_S6_un._S6_u8[11] = 0xfe; - ip6g->_S6_un._S6_u8[12] = 0x7f; - ip6g->_S6_un._S6_u8[15] = 0x01; - ip6h->_S6_un._S6_u8[0] = 0xff; - ip6h->_S6_un._S6_u8[1] = 0xff; - ip6h->_S6_un._S6_u8[2] = 0xff; - ip6h->_S6_un._S6_u8[3] = 0xff; - ip6h->_S6_un._S6_u8[4] = 0xff; - ip6h->_S6_un._S6_u8[5] = 0xff; - ip6h->_S6_un._S6_u8[6] = 0xff; - ip6h->_S6_un._S6_u8[7] = 0xff; - ip6h->_S6_un._S6_u8[8] = 0xff; - ip6h->_S6_un._S6_u8[9] = 0xff; - ip6h->_S6_un._S6_u8[10] = 0xff; - ip6h->_S6_un._S6_u8[11] = 0xff; - ip6h->_S6_un._S6_u8[12] = 0xff; - ip6h->_S6_un._S6_u8[13] = 0xff; - ip6h->_S6_un._S6_u8[14] = 0xff; - ip6h->_S6_un._S6_u8[15] = 0xff; + ip6a->__u6_addr.__u6_addr8[0] = 0xfe; + ip6a->__u6_addr.__u6_addr8[1] = 0x80; + ip6a->__u6_addr.__u6_addr8[8] = 0x02; + ip6a->__u6_addr.__u6_addr8[9] = 0x14; + ip6a->__u6_addr.__u6_addr8[10] = 0x4f; + ip6a->__u6_addr.__u6_addr8[11] = 0xff; + ip6a->__u6_addr.__u6_addr8[12] = 0xfe; + ip6a->__u6_addr.__u6_addr8[13] = 0x0b; + ip6a->__u6_addr.__u6_addr8[14] = 0x76; + ip6a->__u6_addr.__u6_addr8[15] = 0xc8; + ip6b->__u6_addr.__u6_addr8[0] = 0x10; + ip6b->__u6_addr.__u6_addr8[1] = 0x80; + ip6b->__u6_addr.__u6_addr8[10] = 0x08; + ip6b->__u6_addr.__u6_addr8[11] = 0x08; + ip6b->__u6_addr.__u6_addr8[13] = 0x20; + ip6b->__u6_addr.__u6_addr8[13] = 0x0c; + ip6b->__u6_addr.__u6_addr8[14] = 0x41; + ip6b->__u6_addr.__u6_addr8[15] = 0x7a; + ip6c->__u6_addr.__u6_addr8[15] = 0x01; + ip6e->__u6_addr.__u6_addr8[12] = 0x7f; + ip6e->__u6_addr.__u6_addr8[15] = 0x01; + ip6f->__u6_addr.__u6_addr8[10] = 0xff; + ip6f->__u6_addr.__u6_addr8[11] = 0xff; + ip6f->__u6_addr.__u6_addr8[12] = 0x7f; + ip6f->__u6_addr.__u6_addr8[15] = 0x01; + ip6g->__u6_addr.__u6_addr8[10] = 0xff; + ip6g->__u6_addr.__u6_addr8[11] = 0xfe; + ip6g->__u6_addr.__u6_addr8[12] = 0x7f; + ip6g->__u6_addr.__u6_addr8[15] = 0x01; + ip6h->__u6_addr.__u6_addr8[0] = 0xff; + ip6h->__u6_addr.__u6_addr8[1] = 0xff; + ip6h->__u6_addr.__u6_addr8[2] = 0xff; + ip6h->__u6_addr.__u6_addr8[3] = 0xff; + ip6h->__u6_addr.__u6_addr8[4] = 0xff; + ip6h->__u6_addr.__u6_addr8[5] = 0xff; + ip6h->__u6_addr.__u6_addr8[6] = 0xff; + ip6h->__u6_addr.__u6_addr8[7] = 0xff; + ip6h->__u6_addr.__u6_addr8[8] = 0xff; + ip6h->__u6_addr.__u6_addr8[9] = 0xff; + ip6h->__u6_addr.__u6_addr8[10] = 0xff; + ip6h->__u6_addr.__u6_addr8[11] = 0xff; + ip6h->__u6_addr.__u6_addr8[12] = 0xff; + ip6h->__u6_addr.__u6_addr8[13] = 0xff; + ip6h->__u6_addr.__u6_addr8[14] = 0xff; + ip6h->__u6_addr.__u6_addr8[15] = 0xff; printf("%s\n", inet_ntop(AF_INET, ip4a)); printf("%s\n", inet_ntop(AF_INET, ip4b)); From owner-p4-projects@FreeBSD.ORG Sun Mar 23 20:25:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6752D1065672; Sun, 23 Mar 2008 20:25: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 271611065670 for ; Sun, 23 Mar 2008 20:25:39 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 10E728FC21 for ; Sun, 23 Mar 2008 20:25:39 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2NKPciu099030 for ; Sun, 23 Mar 2008 20:25:39 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2NKPcWC099028 for perforce@freebsd.org; Sun, 23 Mar 2008 20:25:38 GMT (envelope-from jb@freebsd.org) Date: Sun, 23 Mar 2008 20:25:38 GMT Message-Id: <200803232025.m2NKPcWC099028@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 138381 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Mar 2008 20:25:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=138381 Change 138381 by jb@jb_freebsd1 on 2008/03/23 20:24:44 Tidy up before commit to current. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#44 edit Differences ... ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#44 (text) ==== @@ -2761,8 +2761,8 @@ return (mstate->dtms_arg[ndx]); +#if defined(sun) case DIF_VAR_UREGS: { -#ifdef DOODAD klwp_t *lwp; if (!dtrace_priv_proc(state)) @@ -2775,11 +2775,9 @@ } return (dtrace_getreg(lwp->lwp_regs, ndx)); -#else -printf("%s(%d): DOODAD\n",__func__,__LINE__); return (0); + } #endif - } case DIF_VAR_CURTHREAD: if (!dtrace_priv_kernel(state)) @@ -5647,8 +5645,8 @@ dtrace_action_ustack(dtrace_mstate_t *mstate, dtrace_state_t *state, uint64_t *buf, uint64_t arg) { -printf("%s(%d): DOODAD\n",__func__,__LINE__); -#ifdef DOODAD + printf("%s(%d): unimplemented.\n",__func__,__LINE__); +#if defined(sun) int nframes = DTRACE_USTACK_NFRAMES(arg); int strsize = DTRACE_USTACK_STRSIZE(arg); uint64_t *pcs = &buf[1], *fps; From owner-p4-projects@FreeBSD.ORG Sun Mar 23 20:27:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C9573106568B; Sun, 23 Mar 2008 20:27:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8899B1065687 for ; Sun, 23 Mar 2008 20:27:41 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 722698FC17 for ; Sun, 23 Mar 2008 20:27:41 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2NKRf5T000329 for ; Sun, 23 Mar 2008 20:27:41 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2NKRfA8000327 for perforce@freebsd.org; Sun, 23 Mar 2008 20:27:41 GMT (envelope-from jb@freebsd.org) Date: Sun, 23 Mar 2008 20:27:41 GMT Message-Id: <200803232027.m2NKRfA8000327@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 138382 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Mar 2008 20:27:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=138382 Change 138382 by jb@jb_freebsd1 on 2008/03/23 20:27:26 Cleanup. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_load.c#30 edit .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_unload.c#26 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_load.c#30 (text+ko) ==== @@ -79,24 +79,8 @@ mutex_enter(&dtrace_lock); mutex_enter(&cpu_lock); -#ifdef DOODAD - dtrace_helpers_cleanup = dtrace_helpers_destroy; - dtrace_helpers_fork = dtrace_helpers_duplicate; - dtrace_cpustart_init = dtrace_suspend; - dtrace_cpustart_fini = dtrace_resume; - dtrace_debugger_init = dtrace_suspend; - dtrace_debugger_fini = dtrace_resume; - dtrace_kreloc_init = dtrace_suspend; - dtrace_kreloc_fini = dtrace_resume; - -#endif ASSERT(MUTEX_HELD(&cpu_lock)); -#ifdef DOODAD - dtrace_taskq = taskq_create("dtrace_taskq", 1, maxclsyspri, - 1, INT_MAX, 0); -#endif - dtrace_arena = new_unrhdr(1, INT_MAX, &dtrace_unr_mtx); dtrace_state_cache = kmem_cache_create("dtrace_state_cache", ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_unload.c#26 (text+ko) ==== @@ -71,34 +71,9 @@ */ ASSERT(state->dts_necbs == 0); dtrace_state_destroy(state); - -#ifdef DOODAD - /* - * If we're being detached with anonymous state, we need to - * indicate to the kernel debugger that DTrace is now inactive. - */ - (void) kdi_dtrace_set(KDI_DTSET_DTRACE_DEACTIVATE); -#endif } bzero(&dtrace_anon, sizeof (dtrace_anon_t)); -#ifdef DOODAD - unregister_cpu_setup_func((cpu_setup_func_t *)dtrace_cpu_setup, NULL); -#endif - -#ifdef DOODAD - dtrace_cpu_init = NULL; - dtrace_helpers_cleanup = NULL; - dtrace_helpers_fork = NULL; - dtrace_cpustart_init = NULL; - dtrace_cpustart_fini = NULL; - dtrace_debugger_init = NULL; - dtrace_debugger_fini = NULL; - dtrace_kreloc_init = NULL; - dtrace_kreloc_fini = NULL; - dtrace_modload = NULL; - dtrace_modunload = NULL; -#endif mutex_exit(&cpu_lock); @@ -138,19 +113,6 @@ mutex_exit(&dtrace_lock); mutex_exit(&dtrace_provider_lock); - /* - * We don't destroy the task queue until after we have dropped our - * locks (taskq_destroy() may block on running tasks). To prevent - * attempting to do work after we have effectively detached but before - * the task queue has been destroyed, all tasks dispatched via the - * task queue must check that DTrace is still attached before - * performing any operation. - */ -#ifdef DOODAD - taskq_destroy(dtrace_taskq); - dtrace_taskq = NULL; -#endif - mutex_destroy(&dtrace_meta_lock); mutex_destroy(&dtrace_provider_lock); mutex_destroy(&dtrace_lock); From owner-p4-projects@FreeBSD.ORG Sun Mar 23 20:31:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0B6F71065671; Sun, 23 Mar 2008 20:31: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 BEA7B106566C for ; Sun, 23 Mar 2008 20:31:45 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 74DE68FC1D for ; Sun, 23 Mar 2008 20:31:45 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2NKVjAR002960 for ; Sun, 23 Mar 2008 20:31:45 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2NKVjfJ002958 for perforce@freebsd.org; Sun, 23 Mar 2008 20:31:45 GMT (envelope-from jb@freebsd.org) Date: Sun, 23 Mar 2008 20:31:45 GMT Message-Id: <200803232031.m2NKVjfJ002958@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 138383 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Mar 2008 20:31:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=138383 Change 138383 by jb@jb_freebsd1 on 2008/03/23 20:30:47 Cleanup. Fix the data model default. Not sure what effect this would have had. Things seemed to work with it 'wrong'. :-/ Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/dtrace_subr.c#11 edit .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/instr_size.c#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/dtrace_subr.c#11 (text+ko) ==== @@ -108,20 +108,6 @@ void dtrace_toxic_ranges(void (*func)(uintptr_t base, uintptr_t limit)) { -#ifdef DOODAD - extern void *device_arena_contains(void *, size_t, size_t *); - caddr_t vaddr; - size_t len; - - for (vaddr = (caddr_t)kernelbase; vaddr < (caddr_t)KERNEL_TEXT; - vaddr += len) { - len = (caddr_t)KERNEL_TEXT - vaddr; - vaddr = device_arena_contains(vaddr, len, &len); - if (vaddr == NULL) - break; - (*func)((uintptr_t)vaddr, (uintptr_t)vaddr + len); - } -#endif (*func)(0, (uintptr_t) addr_PTmap); } @@ -163,7 +149,7 @@ dtrace_xcall(DTRACE_CPUALL, (dtrace_xcall_t)dtrace_sync_func, NULL); } -#ifdef DOODAD +#ifdef notyet int (*dtrace_fasttrap_probe_ptr)(struct regs *); int (*dtrace_pid_probe_ptr)(struct regs *); int (*dtrace_return_probe_ptr)(struct regs *); ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/instr_size.c#2 (text+ko) ==== @@ -99,7 +99,7 @@ { int sz; dis86_t x; - uint_t mode = SIZE32; + uint_t mode = SIZE64; #if defined(sun) mode = (model == DATAMODEL_LP64) ? SIZE64 : SIZE32; @@ -122,33 +122,9 @@ return (sz); } -#ifdef DOODAD int -dtrace_instr_size_isa(uchar_t *instr, model_t model, int *rmindex) -{ - return (dtrace_dis_isize(instr, DIS_ISIZE_INSTR, model, rmindex)); -} -#endif - -int dtrace_instr_size(uchar_t *instr) { return (dtrace_dis_isize(instr, DIS_ISIZE_INSTR, DATAMODEL_NATIVE, NULL)); } - -#ifdef DOODAD -/*ARGSUSED*/ -int -instr_size(struct regs *rp, caddr_t *addrp, enum seg_rw rw) -{ - uchar_t instr[16]; /* maximum size instruction */ - caddr_t pc = (caddr_t)rp->r_pc; - - (void) copyin_nowatch(pc, (caddr_t)instr, sizeof (instr)); - - return (dtrace_dis_isize(instr, - rw == S_EXEC ? DIS_ISIZE_INSTR : DIS_ISIZE_OPERAND, - curproc->p_model, NULL)); -} -#endif From owner-p4-projects@FreeBSD.ORG Sun Mar 23 20:40:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D0D5B1065674; Sun, 23 Mar 2008 20:40:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 74D6A106566B for ; Sun, 23 Mar 2008 20:40:56 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5EA968FC1C for ; Sun, 23 Mar 2008 20:40:56 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2NKeuo3009207 for ; Sun, 23 Mar 2008 20:40:56 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2NKeuFa009205 for perforce@freebsd.org; Sun, 23 Mar 2008 20:40:56 GMT (envelope-from jb@freebsd.org) Date: Sun, 23 Mar 2008 20:40:56 GMT Message-Id: <200803232040.m2NKeuFa009205@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 138384 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Mar 2008 20:40:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=138384 Change 138384 by jb@jb_freebsd1 on 2008/03/23 20:40:28 Implement the stack depth. Cleanup. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/dtrace_asm.S#4 edit .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/dtrace_isa.c#5 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/dtrace_asm.S#4 (text+ko) ==== @@ -426,7 +426,7 @@ * they were when we entered vpanic() to the designated location in * the regs structure we allocated on the stack. */ -#ifdef DOODAD +#ifdef notyet movq 0x0(%rbx), %rcx movq %rcx, REGOFF_RDI(%rsp) movq 0x8(%rbx), %rcx ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/dtrace_isa.c#5 (text+ko) ==== @@ -42,11 +42,6 @@ extern uintptr_t kernbase; uintptr_t kernelbase = (uintptr_t) &kernbase; -struct xframe { - greg_t fr_savfp; /* saved frame pointer */ - greg_t fr_savpc; /* saved program counter */ -}; - uint8_t dtrace_fuword8_nocheck(void *); uint16_t dtrace_fuword16_nocheck(void *); uint32_t dtrace_fuword32_nocheck(void *); @@ -220,10 +215,10 @@ return (n); } +#ifdef notyet void dtrace_getufpstack(uint64_t *pcstack, uint64_t *fpstack, int pcstack_limit) { -#ifdef DOODAD klwp_t *lwp = ttolwp(curthread); proc_t *p = curproc; struct regs *rp; @@ -306,14 +301,12 @@ zero: while (pcstack_limit-- > 0) *pcstack++ = NULL; -#endif } /*ARGSUSED*/ uint64_t dtrace_getarg(int arg, int aframes) { -#ifdef DOODAD uintptr_t val; struct xframe *fp = (struct xframe *)dtrace_getfp(); uintptr_t *stack; @@ -400,50 +393,44 @@ DTRACE_CPUFLAG_CLEAR(CPU_DTRACE_NOFAULT); return (val); -#else return (0); +} #endif -} /*ARGSUSED*/ int dtrace_getstackdepth(int aframes) { -#ifdef DOODAD int depth = 0; - struct xframe *frame; - vm_offset_t ebp; + struct amd64_frame *frame; + vm_offset_t rbp; aframes++; - ebp = dtrace_getfp(); - frame = (struct xframe *)ebp; + rbp = dtrace_getfp(); + frame = (struct amd64_frame *)rbp; depth++; for(;;) { - if (!INKERNEL(frame)) + if (!INKERNEL((long) frame)) break; - if (!INKERNEL(frame->fr_savpc)) + if (!INKERNEL((long) frame->f_frame)) break; depth++; - if ((struct xframe *)frame->fr_savfp < frame || - (vm_offset_t)frame->fr_savfp >= - (vm_offset_t)ebp + KSTACK_PAGES * PAGE_SIZE) + if (frame->f_frame <= frame || + (vm_offset_t)frame->f_frame >= + (vm_offset_t)rbp + KSTACK_PAGES * PAGE_SIZE) break; - - frame = (struct xframe *)frame->fr_savfp; + frame = frame->f_frame; } if (depth < aframes) return 0; else return depth - aframes; -#else - return (0); -#endif } +#ifdef notyet ulong_t dtrace_getreg(struct regs *rp, uint_t reg) { -#ifdef DOODAD #if defined(__amd64) int regmap[] = { REG_GS, /* GS */ @@ -544,10 +531,8 @@ return ((&rp->r_gs)[reg]); #endif -#else -return 0; +} #endif -} static int dtrace_copycheck(uintptr_t uaddr, uintptr_t kaddr, size_t size) From owner-p4-projects@FreeBSD.ORG Sun Mar 23 20:46:02 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B91B1065672; Sun, 23 Mar 2008 20:46: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 30F0B106566B for ; Sun, 23 Mar 2008 20:46:02 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1A93E8FC13 for ; Sun, 23 Mar 2008 20:46:02 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2NKk2AB010627 for ; Sun, 23 Mar 2008 20:46:02 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2NKk1wi010625 for perforce@freebsd.org; Sun, 23 Mar 2008 20:46:01 GMT (envelope-from jb@freebsd.org) Date: Sun, 23 Mar 2008 20:46:01 GMT Message-Id: <200803232046.m2NKk1wi010625@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 138386 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Mar 2008 20:46:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=138386 Change 138386 by jb@jb_freebsd1 on 2008/03/23 20:45:55 Cleanup. Not compile tested yet. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/i386/dtrace_asm.S#7 edit .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/i386/dtrace_isa.c#8 edit .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/i386/dtrace_subr.c#14 edit .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/i386/instr_size.c#3 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/i386/dtrace_asm.S#7 (text+ko) ==== @@ -410,7 +410,7 @@ * they were when we entered vpanic() to the designated location in * the regs structure we allocated on the stack. */ -#ifdef DOODAD +#ifdef notyet mov %gs, %edx mov %edx, REGOFF_GS(%esp) mov %fs, %edx ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/i386/dtrace_isa.c#8 (text+ko) ==== @@ -103,7 +103,7 @@ } } -#ifdef DOODAD +#ifdef notyet static int dtrace_getustack_common(uint64_t *pcstack, int pcstack_limit, uintptr_t pc, uintptr_t sp) @@ -180,12 +180,10 @@ return (ret); } -#endif void dtrace_getupcstack(uint64_t *pcstack, int pcstack_limit) { -#ifdef DOODAD klwp_t *lwp = ttolwp(curthread); proc_t *p = curproc; struct regs *rp; @@ -237,49 +235,16 @@ zero: while (pcstack_limit-- > 0) *pcstack++ = NULL; -#endif } int dtrace_getustackdepth(void) { -#ifdef DOODAD - klwp_t *lwp = ttolwp(curthread); - proc_t *p = curproc; - struct regs *rp; - uintptr_t pc, sp; - int n = 0; - - if (lwp == NULL || p == NULL || (rp = lwp->lwp_regs) == NULL) - return (0); - - if (DTRACE_CPUFLAG_ISSET(CPU_DTRACE_FAULT)) - return (-1); - - pc = rp->r_pc; - sp = rp->r_fp; - - if (DTRACE_CPUFLAG_ISSET(CPU_DTRACE_ENTRY)) { - n++; - - if (p->p_model == DATAMODEL_NATIVE) - pc = dtrace_fulword((void *)rp->r_sp); - else - pc = dtrace_fuword32((void *)rp->r_sp); - } - - n += dtrace_getustack_common(NULL, 0, pc, sp); - - return (n); -#else -return 0; -#endif } void dtrace_getufpstack(uint64_t *pcstack, uint64_t *fpstack, int pcstack_limit) { -#ifdef DOODAD klwp_t *lwp = ttolwp(curthread); proc_t *p = curproc; struct regs *rp; @@ -384,14 +349,11 @@ zero: while (pcstack_limit-- > 0) *pcstack++ = NULL; -#endif } -/*ARGSUSED*/ uint64_t dtrace_getarg(int arg, int aframes) { -#ifdef DOODAD uintptr_t val; struct frame *fp = (struct frame *)dtrace_getfp(); uintptr_t *stack; @@ -478,50 +440,42 @@ DTRACE_CPUFLAG_CLEAR(CPU_DTRACE_NOFAULT); return (val); -#else - return (0); +} #endif -} -/*ARGSUSED*/ int dtrace_getstackdepth(int aframes) { -#ifdef DOODAD int depth = 0; - struct frame *frame; - vm_offset_t ebp; + struct i386_frame *frame; + vm_offset_t rbp; aframes++; ebp = dtrace_getfp(); - frame = (struct frame *)ebp; + frame = (struct i386_frame *)ebp; depth++; for(;;) { - if (!INKERNEL(frame)) + if (!INKERNEL((long) frame)) break; - if (!INKERNEL(frame->fr_savpc)) + if (!INKERNEL((long) frame->f_frame)) break; depth++; - if ((struct frame *)frame->fr_savfp < frame || - (vm_offset_t)frame->fr_savfp >= - (vm_offset_t)ebp + KSTACK_PAGES * PAGE_SIZE) + if (frame->f_frame <= frame || + (vm_offset_t)frame->f_frame >= + (vm_offset_t)ebp + KSTACK_PAGES * PAGE_SIZE) break; - - frame = (struct frame *)frame->fr_savfp; + frame = frame->f_frame; } if (depth < aframes) return 0; else return depth - aframes; -#else - return (0); -#endif } +#ifdef notyet ulong_t dtrace_getreg(struct regs *rp, uint_t reg) { -#ifdef DOODAD #if defined(__amd64) int regmap[] = { REG_GS, /* GS */ @@ -622,10 +576,8 @@ return ((&rp->r_gs)[reg]); #endif -#else -return 0; +} #endif -} static int dtrace_copycheck(uintptr_t uaddr, uintptr_t kaddr, size_t size) ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/i386/dtrace_subr.c#14 (text+ko) ==== @@ -106,20 +106,6 @@ void dtrace_toxic_ranges(void (*func)(uintptr_t base, uintptr_t limit)) { -#ifdef DOODAD - extern void *device_arena_contains(void *, size_t, size_t *); - caddr_t vaddr; - size_t len; - - for (vaddr = (caddr_t)kernelbase; vaddr < (caddr_t)KERNEL_TEXT; - vaddr += len) { - len = (caddr_t)KERNEL_TEXT - vaddr; - vaddr = device_arena_contains(vaddr, len, &len); - if (vaddr == NULL) - break; - (*func)((uintptr_t)vaddr, (uintptr_t)vaddr + len); - } -#endif (*func)(0, kernelbase); } @@ -161,7 +147,7 @@ dtrace_xcall(DTRACE_CPUALL, (dtrace_xcall_t)dtrace_sync_func, NULL); } -#ifdef DOODAD +#ifdef notyet int (*dtrace_fasttrap_probe_ptr)(struct regs *); int (*dtrace_pid_probe_ptr)(struct regs *); int (*dtrace_return_probe_ptr)(struct regs *); ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/i386/instr_size.c#3 (text+ko) ==== @@ -122,33 +122,9 @@ return (sz); } -#ifdef DOODAD -int -dtrace_instr_size_isa(uchar_t *instr, model_t model, int *rmindex) -{ - return (dtrace_dis_isize(instr, DIS_ISIZE_INSTR, model, rmindex)); -} -#endif - int dtrace_instr_size(uchar_t *instr) { return (dtrace_dis_isize(instr, DIS_ISIZE_INSTR, DATAMODEL_NATIVE, NULL)); } - -#ifdef DOODAD -/*ARGSUSED*/ -int -instr_size(struct regs *rp, caddr_t *addrp, enum seg_rw rw) -{ - uchar_t instr[16]; /* maximum size instruction */ - caddr_t pc = (caddr_t)rp->r_pc; - - (void) copyin_nowatch(pc, (caddr_t)instr, sizeof (instr)); - - return (dtrace_dis_isize(instr, - rw == S_EXEC ? DIS_ISIZE_INSTR : DIS_ISIZE_OPERAND, - curproc->p_model, NULL)); -} -#endif From owner-p4-projects@FreeBSD.ORG Sun Mar 23 20:51:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5EEE41065673; Sun, 23 Mar 2008 20:51: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 1CCD4106564A for ; Sun, 23 Mar 2008 20:51:08 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 053128FC18 for ; Sun, 23 Mar 2008 20:51:08 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2NKp7Kr022014 for ; Sun, 23 Mar 2008 20:51:07 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2NKp7vd022012 for perforce@freebsd.org; Sun, 23 Mar 2008 20:51:07 GMT (envelope-from jb@freebsd.org) Date: Sun, 23 Mar 2008 20:51:07 GMT Message-Id: <200803232051.m2NKp7vd022012@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 138388 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Mar 2008 20:51:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=138388 Change 138388 by jb@jb_freebsd1 on 2008/03/23 20:50:44 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#60 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/keramida.key#4 integrate .. //depot/projects/dtrace/doc/share/sgml/man-refs.ent#27 integrate .. //depot/projects/dtrace/src/bin/sh/options.c#5 integrate .. //depot/projects/dtrace/src/include/pthread.h#5 integrate .. //depot/projects/dtrace/src/include/time.h#6 integrate .. //depot/projects/dtrace/src/lib/libthr/pthread.map#13 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/Makefile.inc#8 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_getcpuclockid.c#1 branch .. //depot/projects/dtrace/src/lib/libthread_db/Makefile#7 integrate .. //depot/projects/dtrace/src/lib/libthread_db/kse.h#1 branch .. //depot/projects/dtrace/src/lib/libthread_db/libc_r_db.c#4 integrate .. //depot/projects/dtrace/src/lib/libthread_db/libpthread_db.c#5 integrate .. //depot/projects/dtrace/src/lib/libthread_db/libthr_db.c#5 integrate .. //depot/projects/dtrace/src/lib/libthread_db/thread_db.c#5 integrate .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#19 integrate .. //depot/projects/dtrace/src/sbin/bsdlabel/bsdlabel.c#6 integrate .. //depot/projects/dtrace/src/sbin/dhclient/dhclient.c#8 integrate .. //depot/projects/dtrace/src/sbin/route/route.c#6 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#35 integrate .. //depot/projects/dtrace/src/sys/arm/arm/elf_trampoline.c#11 integrate .. //depot/projects/dtrace/src/sys/arm/conf/AVILA.hints#2 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/ixp425/if_npe.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/ath/if_ath.c#18 integrate .. //depot/projects/dtrace/src/sys/dev/fxp/if_fxp.c#11 integrate .. //depot/projects/dtrace/src/sys/dev/mfi/mfi.c#14 integrate .. //depot/projects/dtrace/src/sys/dev/re/if_re.c#17 integrate .. //depot/projects/dtrace/src/sys/fs/msdosfs/msdosfs_vfsops.c#20 integrate .. //depot/projects/dtrace/src/sys/geom/geom.h#9 integrate .. //depot/projects/dtrace/src/sys/geom/geom_subr.c#7 integrate .. //depot/projects/dtrace/src/sys/geom/part/g_part.c#6 integrate .. //depot/projects/dtrace/src/sys/geom/part/g_part.h#5 integrate .. //depot/projects/dtrace/src/sys/geom/part/g_part_apm.c#3 integrate .. //depot/projects/dtrace/src/sys/geom/part/g_part_bsd.c#4 integrate .. //depot/projects/dtrace/src/sys/geom/part/g_part_gpt.c#4 integrate .. //depot/projects/dtrace/src/sys/geom/part/g_part_mbr.c#3 integrate .. //depot/projects/dtrace/src/sys/geom/part/g_part_vtoc8.c#2 integrate .. //depot/projects/dtrace/src/sys/i386/i386/pmap.c#30 integrate .. //depot/projects/dtrace/src/sys/kern/kern_exit.c#21 integrate .. //depot/projects/dtrace/src/sys/kern/kern_thr.c#23 integrate .. //depot/projects/dtrace/src/sys/kern/kern_timeout.c#10 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_bio.c#23 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_cluster.c#7 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_default.c#11 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_mount.c#28 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_subr.c#33 integrate .. //depot/projects/dtrace/src/sys/modules/geom/geom_part/Makefile#2 integrate .. //depot/projects/dtrace/src/sys/modules/geom/geom_part/geom_part_apm/Makefile#1 branch .. //depot/projects/dtrace/src/sys/modules/geom/geom_part/geom_part_bsd/Makefile#1 branch .. //depot/projects/dtrace/src/sys/modules/geom/geom_part/geom_part_gpt/Makefile#1 branch .. //depot/projects/dtrace/src/sys/modules/geom/geom_part/geom_part_mbr/Makefile#1 branch .. //depot/projects/dtrace/src/sys/modules/geom/geom_part/geom_part_vtoc8/Makefile#1 branch .. //depot/projects/dtrace/src/sys/nfs4client/nfs4_vfsops.c#12 integrate .. //depot/projects/dtrace/src/sys/nfs4client/nfs4_vnops.c#11 integrate .. //depot/projects/dtrace/src/sys/nfsclient/nfs_subs.c#14 integrate .. //depot/projects/dtrace/src/sys/nfsclient/nfs_vfsops.c#18 integrate .. //depot/projects/dtrace/src/sys/nfsclient/nfs_vnops.c#15 integrate .. //depot/projects/dtrace/src/sys/nfsserver/nfs_serv.c#11 integrate .. //depot/projects/dtrace/src/sys/pci/if_rlreg.h#13 integrate .. //depot/projects/dtrace/src/sys/sys/buf.h#12 integrate .. //depot/projects/dtrace/src/sys/sys/bufobj.h#8 integrate .. //depot/projects/dtrace/src/sys/sys/vnode.h#13 integrate .. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_inode.c#7 integrate .. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_rawread.c#8 integrate .. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_softdep.c#17 integrate .. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_vfsops.c#22 integrate .. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_vnops.c#17 integrate .. //depot/projects/dtrace/src/tools/regression/bin/sh/builtins/getopts1.0#1 branch .. //depot/projects/dtrace/src/tools/regression/bin/sh/builtins/getopts1.0.stdout#1 branch .. //depot/projects/dtrace/src/tools/tools/net80211/wlanwatch/wlanwatch.c#5 integrate .. //depot/projects/dtrace/src/usr.sbin/freebsd-update/freebsd-update.sh#9 integrate .. //depot/projects/dtrace/www/en/gnome/docs/bugging.sgml#7 integrate .. //depot/projects/dtrace/www/en/gnome/docs/example-Makefile.sgml#8 integrate .. //depot/projects/dtrace/www/en/gnome/docs/faq2.sgml#16 integrate .. //depot/projects/dtrace/www/en/projects/ideas/ideas.xml#13 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#60 (text+ko) ==== @@ -1,7 +1,7 @@ 800025 + + + 8.0-CURRENT after changing the priority parameter + to cv_broadcastpri such that 0 means no priority. + + 800026 + ==== //depot/projects/dtrace/doc/share/pgpkeys/keramida.key#4 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -9,6 +9,7 @@ uid Giorgos Keramidas uid Giorgos Keramidas uid Giorgos Keramidas +uid Giorgos Keramidas sub 1024g/50FDBAD1 2001-09-21 ]]> ==== //depot/projects/dtrace/doc/share/sgml/man-refs.ent#27 (text+ko) ==== @@ -20,7 +20,7 @@ lexicographical order by the entity (i.e., the dots used in place of special characters should not be expanded when comparing). - $FreeBSD: doc/share/sgml/man-refs.ent,v 1.452 2008/03/15 06:55:16 bmah Exp $ + $FreeBSD: doc/share/sgml/man-refs.ent,v 1.453 2008/03/22 17:46:11 bmah Exp $ --> @@ -3296,6 +3296,7 @@ + @@ -3743,6 +3744,7 @@ + ==== //depot/projects/dtrace/src/bin/sh/options.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/options.c,v 1.25 2006/04/09 12:20:42 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/options.c,v 1.26 2008/03/22 14:06:01 stefanf Exp $"); #include #include @@ -383,7 +383,7 @@ } ap2 = shellparam.p; while ((*ap2++ = *ap1++) != NULL); - shellparam.optnext = NULL; + shellparam.reset = 1; INTON; return 0; } @@ -405,6 +405,7 @@ if (*argptr != NULL) { setparam(argptr); } + shellparam.reset = 1; INTON; return 0; } @@ -414,7 +415,6 @@ getoptsreset(const char *value) { if (number(value) == 1) { - shellparam.optnext = NULL; shellparam.reset = 1; } } ==== //depot/projects/dtrace/src/include/pthread.h#5 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/pthread.h,v 1.41 2007/10/29 21:01:47 kris Exp $ + * $FreeBSD: src/include/pthread.h,v 1.42 2008/03/22 09:59:20 davidxu Exp $ */ #ifndef _PTHREAD_H_ #define _PTHREAD_H_ @@ -185,6 +185,7 @@ int pthread_equal(pthread_t, pthread_t); void pthread_exit(void *) __dead2; void *pthread_getspecific(pthread_key_t); +int pthread_getcpuclockid(pthread_t, clockid_t *); int pthread_join(pthread_t, void **); int pthread_key_create(pthread_key_t *, void (*) (void *)); ==== //depot/projects/dtrace/src/include/time.h#6 (text+ko) ==== @@ -39,7 +39,7 @@ */ /* - * $FreeBSD: src/include/time.h,v 1.34 2006/04/15 03:08:55 jb Exp $ + * $FreeBSD: src/include/time.h,v 1.35 2008/03/22 09:59:20 davidxu Exp $ */ #ifndef _TIME_H_ @@ -108,6 +108,7 @@ #define CLOCK_MONOTONIC_PRECISE 11 /* FreeBSD-specific. */ #define CLOCK_MONOTONIC_FAST 12 /* FreeBSD-specific. */ #define CLOCK_SECOND 13 /* FreeBSD-specific. */ +#define CLOCK_THREAD_CPUTIME_ID 14 #endif /* !defined(CLOCK_REALTIME) && __POSIX_VISIBLE >= 200112 */ #if !defined(TIMER_ABSTIME) && __POSIX_VISIBLE >= 200112 ==== //depot/projects/dtrace/src/lib/libthr/pthread.map#13 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libthr/pthread.map,v 1.28 2008/03/05 06:56:35 davidxu Exp $ + * $FreeBSD: src/lib/libthr/pthread.map,v 1.29 2008/03/22 09:59:20 davidxu Exp $ */ /* @@ -271,6 +271,7 @@ _pthread_exit; _pthread_getaffinity_np; _pthread_getconcurrency; + _pthread_getcpuclockid; _pthread_getprio; _pthread_getschedparam; _pthread_getspecific; @@ -395,6 +396,7 @@ pthread_attr_getaffinity_np; pthread_attr_setaffinity_np; pthread_getaffinity_np; + pthread_getcpuclockid; pthread_setaffinity_np; pthread_mutex_getspinloops_np; pthread_mutex_getyieldloops_np; ==== //depot/projects/dtrace/src/lib/libthr/thread/Makefile.inc#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libthr/thread/Makefile.inc,v 1.17 2008/03/03 09:16:29 davidxu Exp $ +# $FreeBSD: src/lib/libthr/thread/Makefile.inc,v 1.18 2008/03/22 09:59:20 davidxu Exp $ # thr sources .PATH: ${.CURDIR}/thread @@ -20,6 +20,7 @@ thr_exit.c \ thr_fork.c \ thr_getprio.c \ + thr_getcpuclockid.c \ thr_getschedparam.c \ thr_info.c \ thr_init.c \ ==== //depot/projects/dtrace/src/lib/libthread_db/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libthread_db/Makefile,v 1.11 2008/03/12 09:49:39 jeff Exp $ +# $FreeBSD: src/lib/libthread_db/Makefile,v 1.12 2008/03/23 09:38:11 jeff Exp $ .PATH: ${.CURDIR}/arch/${MACHINE_ARCH} @@ -6,6 +6,7 @@ SHLIB_MAJOR= 3 SRCS= thread_db.c SRCS+= libpthread_md.c +SRCS+= libpthread_db.c SRCS+= libthr_db.c INCS= thread_db.h WARNS?= 1 ==== //depot/projects/dtrace/src/lib/libthread_db/libc_r_db.c#4 (text+ko) ==== @@ -25,9 +25,10 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libthread_db/libc_r_db.c,v 1.3 2005/05/31 09:43:03 dfr Exp $"); +__FBSDID("$FreeBSD: src/lib/libthread_db/libc_r_db.c,v 1.4 2008/03/22 05:40:44 davidxu Exp $"); #include +#include #include #include #include @@ -346,3 +347,5 @@ .to_thr_setxmmregs = libc_r_db_thr_setxmmregs, #endif }; + +DATA_SET(__ta_ops, libc_r_db_ops); ==== //depot/projects/dtrace/src/lib/libthread_db/libpthread_db.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libthread_db/libpthread_db.c,v 1.14 2006/05/17 05:12:42 davidxu Exp $"); +__FBSDID("$FreeBSD: src/lib/libthread_db/libpthread_db.c,v 1.16 2008/03/23 09:38:11 jeff Exp $"); #include #include @@ -33,12 +33,13 @@ #include #include #include -#include +#include #include #include #include #include "libpthread_db.h" +#include "kse.h" #define P2T(c) ps2td(c) @@ -1147,3 +1148,5 @@ .to_thr_setxmmregs = pt_thr_setxmmregs, #endif }; + +DATA_SET(__ta_ops, libpthread_db_ops); ==== //depot/projects/dtrace/src/lib/libthread_db/libthr_db.c#5 (text+ko) ==== @@ -26,13 +26,14 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libthread_db/libthr_db.c,v 1.12 2006/05/17 05:14:45 davidxu Exp $"); +__FBSDID("$FreeBSD: src/lib/libthread_db/libthr_db.c,v 1.13 2008/03/22 05:40:44 davidxu Exp $"); #include #include #include #include #include +#include #include #include #include @@ -791,3 +792,5 @@ .to_thr_setxmmregs = pt_thr_setxmmregs, #endif }; + +DATA_SET(__ta_ops, libthr_db_ops); ==== //depot/projects/dtrace/src/lib/libthread_db/thread_db.c#5 (text+ko) ==== @@ -25,12 +25,14 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libthread_db/thread_db.c,v 1.4 2006/10/20 14:15:42 davidxu Exp $"); +__FBSDID("$FreeBSD: src/lib/libthread_db/thread_db.c,v 1.5 2008/03/22 05:40:44 davidxu Exp $"); #include #include #include #include +#include +#include #include "thread_db_int.h" @@ -41,24 +43,20 @@ static TAILQ_HEAD(, td_thragent) proclist = TAILQ_HEAD_INITIALIZER(proclist); -extern struct ta_ops libpthread_db_ops; -extern struct ta_ops libthr_db_ops; +SET_DECLARE(__ta_ops, struct ta_ops); -static struct ta_ops *ops[] = { - &libpthread_db_ops, - &libthr_db_ops, -}; - td_err_e td_init(void) { td_err_e ret, tmp; + struct ta_ops *ops_p, **ops_pp; size_t i; ret = 0; - for (i = 0; i < sizeof(ops)/sizeof(ops[0]); i++) { - if (ops[i]->to_init != NULL) { - tmp = ops[i]->to_init(); + SET_FOREACH(ops_pp, __ta_ops) { + ops_p = *ops_pp; + if (ops_p->to_init != NULL) { + tmp = ops_p->to_init(); if (tmp != TD_OK) ret = tmp; } @@ -107,11 +105,13 @@ td_ta_new(struct ps_prochandle *ph, td_thragent_t **pta) { size_t i; + struct ta_ops *ops_p, **ops_pp; - for (i = 0; i < sizeof(ops)/sizeof(ops[0]); ++i) { - if (ops[i]->to_ta_new(ph, pta) == TD_OK) { + SET_FOREACH(ops_pp, __ta_ops) { + ops_p = *ops_pp; + if (ops_p->to_ta_new(ph, pta) == TD_OK) { TAILQ_INSERT_HEAD(&proclist, *pta, ta_next); - (*pta)->ta_ops = ops[i]; + (*pta)->ta_ops = ops_p; return (TD_OK); } } ==== //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#19 (text+ko) ==== @@ -20,7 +20,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1080 2008/03/15 07:06:12 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1081 2008/03/23 04:12:07 bmah Exp $ 2000 @@ -167,6 +167,14 @@ synchronized source code. More information can be found in the &man.textdump.4; manual page. + Kernel support for M:N threading has been removed. While + the KSE (Kernel Scheduled Entities) project was quite successful + in bringing threading to FreeBSD, the M:N approach taken by the + kse library was never developed to its full potential. + Backwards compatibility for applications using KSE threading + will be provided via &man.libmap.conf.5; for dynamically linked + binaries. + Boot Loader Changes @@ -187,7 +195,12 @@ Hardware Support - + The &man.cmx.4; driver, a driver for Omnikey CardMan 4040 + PCMCIA smartcard readers, has been added. + + The &man.uslcom.4; driver, a driver for Silicon + Laboratories CP2101/CP2102-based USB serial adapters, has been + imported from OpenBSD. Multimedia Support @@ -199,6 +212,18 @@ Network Interface Support + The &man.sf.4; driver has been overhauled to improve its + performance and to add support for checksum offloading. It + should also work on all architectures. + + The &man.re.4; driver has been overhauled to fix a + number of issues. This driver now has Wake On LAN (WOL) + support. + + The &man.vr.4; driver has been overhauled to fix a + number of outstanding issues. It also now works on all + architectures. + [&arch.amd64;, &arch.i386;] The &man.wpi.4; driver has been added to support the Intel 3945 Wireless LAN Controller. @@ -209,21 +234,31 @@ Network Protocols - + A bug in TCP options padding, where the wrong padding + bytes were used, has been fixed. Disks and Storage - + The &man.ata.4; driver now supports a spindown command for + disks; after a configurable amount of time, if no requests + have been received for a disk, the disk will be spun down + until the next request. The &man.atacontrol.8; utility now + supports a spindown command to configure + this feature. + + The &man.hptrr.4; driver has been updated to version 1.2 + from Highpoint. File Systems - + A problem with using &man.mmap.2; on ZFS filesystems has + been fixed. @@ -235,6 +270,26 @@ based on libarchive, have replaced the GNU Binutils versions of these utilities. + &man.chflags.1; now supports a flag for + verbose output and a flag to ignore errors + with the same semantics as (for example) + &man.chmod.1;. &merged; + + For compatiblity with other implementations, &man.cp.1; now + supports a flag, which is equivalent to + specifying the flags. + + &man.find.1; has been enhanced by the addition of a number + of primaries that were present in GNU find but not &os; + &man.find.1;. + + The &man.split.1; utility now supports a + flag to split a file into a certain number of chunks. + + The &man.tar.1; utility now supports a + flag to enable &man.compress.1;-style + compression/decompression. + &man.traceroute.8; now has the ability to print the AS number for each hop with the new switch; a new option allows selecting a particular @@ -261,8 +316,11 @@ awk has been updated from 1 May 2007 release to the 23 October 2007 release. &merged; + bzip2 has been updated from 1.0.4 + to 1.0.5. + CVS has been updated from 1.11.17 - to 1.11.22. + to a post-1.11.22 snapshot from 10 March 2008. IPFilter has been updated from 4.1.23 to 4.1.28. ==== //depot/projects/dtrace/src/sbin/bsdlabel/bsdlabel.c#6 (text+ko) ==== @@ -53,7 +53,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/bsdlabel/bsdlabel.c,v 1.113 2007/12/09 22:58:49 marcel Exp $"); +__FBSDID("$FreeBSD: src/sbin/bsdlabel/bsdlabel.c,v 1.114 2008/03/23 03:01:10 rodrigc Exp $"); #include #include @@ -463,7 +463,6 @@ /* * Fetch disklabel for disk. - * Use ioctl to get label unless -r flag is given. */ static int readlabel(int flag) ==== //depot/projects/dtrace/src/sbin/dhclient/dhclient.c#8 (text+ko) ==== @@ -54,7 +54,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/dhclient/dhclient.c,v 1.21 2007/02/09 17:50:26 emaste Exp $"); +__FBSDID("$FreeBSD: src/sbin/dhclient/dhclient.c,v 1.23 2008/03/22 16:24:02 sam Exp $"); #include "dhcpd.h" #include "privsep.h" @@ -176,8 +176,30 @@ return (NULL); } + struct iaddr defaddr = { 4 }; +uint8_t curbssid[6]; +static void +disassoc(void *arg) +{ + struct interface_info *ifi = arg; + + /* + * Clear existing state. + */ + if (ifi->client->active != NULL) { + script_init("EXPIRE", NULL); + script_write_params("old_", + ifi->client->active); + if (ifi->client->alias) + script_write_params("alias_", + ifi->client->alias); + script_go(); + } + ifi->client->state = S_INIT; +} + /* ARGSUSED */ void routehandler(struct protocol *p) @@ -187,6 +209,7 @@ struct if_msghdr *ifm; struct ifa_msghdr *ifam; struct if_announcemsghdr *ifan; + struct ieee80211_join_event *jev; struct client_lease *l; time_t t = time(NULL); struct sockaddr *sa; @@ -255,24 +278,17 @@ switch (ifan->ifan_what) { case RTM_IEEE80211_ASSOC: case RTM_IEEE80211_REASSOC: - state_reboot(ifi); - break; - case RTM_IEEE80211_DISASSOC: /* - * Clear existing state; transition to the init - * state and then wait for either a link down - * notification or an associate event. + * Use assoc/reassoc event to kick state machine + * in case we roam. Otherwise fall back to the + * normal state machine just like a wired network. */ - if (ifi->client->active != NULL) { - script_init("EXPIRE", NULL); - script_write_params("old_", - ifi->client->active); - if (ifi->client->alias) - script_write_params("alias_", - ifi->client->alias); - script_go(); + jev = (struct ieee80211_join_event *) &ifan[1]; + if (memcmp(curbssid, jev->iev_addr, 6)) { + disassoc(ifi); + state_reboot(ifi); } - ifi->client->state = S_INIT; + memcpy(curbssid, jev->iev_addr, 6); break; } break; @@ -300,7 +316,7 @@ /* Initially, log errors to stderr as well as to syslogd. */ openlog(__progname, LOG_PID | LOG_NDELAY, DHCPD_LOG_FACILITY); - setlogmask(LOG_UPTO(LOG_INFO)); + setlogmask(LOG_UPTO(LOG_DEBUG)); while ((ch = getopt(argc, argv, "bc:dl:qu")) != -1) switch (ch) { ==== //depot/projects/dtrace/src/sbin/route/route.c#6 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)route.c 8.6 (Berkeley) 4/28/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/route/route.c,v 1.83 2007/11/04 11:12:40 mtm Exp $"; + "$FreeBSD: src/sbin/route/route.c,v 1.84 2008/03/22 12:50:43 remko Exp $"; #endif /* not lint */ #include @@ -748,7 +748,7 @@ break; } if (*cmd == 'g') - exit(0); + exit(ret != 0); if (!qflag) { oerrno = errno; (void) printf("%s %s %s", cmd, ishost? "host" : "net", dest); ==== //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#35 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.606 2008/03/04 18:50:15 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.608 2008/03/23 20:38:01 alc Exp $"); /* * Manages physical address maps. @@ -1861,12 +1861,8 @@ ("pmap_collect: wired pte %#lx", tpte)); if (tpte & PG_A) vm_page_flag_set(m, PG_REFERENCED); - if (tpte & PG_M) { - KASSERT((tpte & PG_RW), - ("pmap_collect: modified page not writable: va: %#lx, pte: %#lx", - va, tpte)); + if ((tpte & (PG_M | PG_RW)) == (PG_M | PG_RW)) vm_page_dirty(m); - } free = NULL; pmap_unuse_pt(pmap, va, *pde, &free); pmap_invalidate_page(pmap, va); @@ -2311,12 +2307,8 @@ eva = sva + NBPDR; for (va = sva, m = PHYS_TO_VM_PAGE(oldpde & PG_FRAME); va < eva; va += PAGE_SIZE, m++) { - if (oldpde & PG_M) { - KASSERT((oldpde & PG_RW) != 0, - ("pmap_remove_pde: modified 2mpage not writable: va: %#lx, pde: %#lx", - va, oldpde)); + if ((oldpde & (PG_M | PG_RW)) == (PG_M | PG_RW)) vm_page_dirty(m); - } if (oldpde & PG_A) vm_page_flag_set(m, PG_REFERENCED); if (TAILQ_EMPTY(&m->md.pv_list) && @@ -2364,12 +2356,8 @@ pmap->pm_stats.resident_count -= 1; if (oldpte & PG_MANAGED) { m = PHYS_TO_VM_PAGE(oldpte & PG_FRAME); - if (oldpte & PG_M) { - KASSERT((oldpte & PG_RW), - ("pmap_remove_pte: modified page not writable: va: %#lx, pte: %#lx", - va, oldpte)); + if ((oldpte & (PG_M | PG_RW)) == (PG_M | PG_RW)) vm_page_dirty(m); - } if (oldpte & PG_A) vm_page_flag_set(m, PG_REFERENCED); pmap_remove_entry(pmap, m, va); @@ -2444,12 +2432,16 @@ pml4e = pmap_pml4e(pmap, sva); if ((*pml4e & PG_V) == 0) { va_next = (sva + NBPML4) & ~PML4MASK; + if (va_next < sva) + va_next = eva; continue; } pdpe = pmap_pml4e_to_pdpe(pml4e, sva); if ((*pdpe & PG_V) == 0) { va_next = (sva + NBPDP) & ~PDPMASK; + if (va_next < sva) + va_next = eva; continue; } @@ -2457,6 +2449,8 @@ * Calculate index for next page table. */ va_next = (sva + NBPDR) & ~PDRMASK; + if (va_next < sva) + va_next = eva; pde = pmap_pdpe_to_pde(pdpe, sva); ptpaddr = *pde; @@ -2575,12 +2569,8 @@ /* * Update the vm_page_t clean and reference bits. */ - if (tpte & PG_M) { - KASSERT((tpte & PG_RW), - ("pmap_remove_all: modified page not writable: va: %#lx, pte: %#lx", - pv->pv_va, tpte)); + if ((tpte & (PG_M | PG_RW)) == (PG_M | PG_RW)) vm_page_dirty(m); - } free = NULL; pmap_unuse_pt(pmap, pv->pv_va, *pde, &free); pmap_invalidate_page(pmap, pv->pv_va); @@ -2621,7 +2611,7 @@ * page mapping with a stored page table page has PG_A * set. */ - if ((oldpde & PG_M) != 0) + if ((oldpde & (PG_M | PG_RW)) == (PG_M | PG_RW)) vm_page_dirty(m); } } @@ -2672,16 +2662,22 @@ pml4e = pmap_pml4e(pmap, sva); if ((*pml4e & PG_V) == 0) { va_next = (sva + NBPML4) & ~PML4MASK; + if (va_next < sva) + va_next = eva; continue; } pdpe = pmap_pml4e_to_pdpe(pml4e, sva); if ((*pdpe & PG_V) == 0) { va_next = (sva + NBPDP) & ~PDPMASK; + if (va_next < sva) + va_next = eva; continue; } va_next = (sva + NBPDR) & ~PDRMASK; + if (va_next < sva) + va_next = eva; pde = pmap_pdpe_to_pde(pdpe, sva); ptpaddr = *pde; @@ -2733,7 +2729,7 @@ vm_page_flag_set(m, PG_REFERENCED); pbits &= ~PG_A; } - if ((pbits & PG_M) != 0) { + if ((pbits & (PG_M | PG_RW)) == (PG_M | PG_RW)) { if (m == NULL) m = PHYS_TO_VM_PAGE(pbits & PG_FRAME); @@ -2806,12 +2802,15 @@ return; } if ((oldpte & (PG_M | PG_RW)) == PG_RW) { + /* + * When PG_M is already clear, PG_RW can be cleared + * without a TLB invalidation. + */ if (!atomic_cmpset_long(pte, oldpte, oldpte & ~PG_RW)) goto retry; oldpte &= ~PG_RW; oldpteva = (oldpte & PG_FRAME & PDRMASK) | (va & ~PDRMASK); - pmap_invalidate_page(pmap, oldpteva); CTR2(KTR_PMAP, "pmap_promote_pde: protect for va %#lx" " in pmap %p", oldpteva, pmap); } @@ -3023,10 +3022,7 @@ PG_NX) == 0 && (newpte & PG_NX))) invlva = TRUE; } - if (origpte & PG_M) { - KASSERT((origpte & PG_RW), - ("pmap_enter: modified page not writable: va: %#lx, pte: %#lx", - va, origpte)); + if ((origpte & (PG_M | PG_RW)) == (PG_M | PG_RW)) { if ((origpte & PG_MANAGED) != 0) vm_page_dirty(om); if ((newpte & PG_RW) == 0) @@ -3084,7 +3080,7 @@ newpde |= PG_MANAGED; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Mar 23 21:03:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B221D1065681; Sun, 23 Mar 2008 21:03: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 716FD1065678 for ; Sun, 23 Mar 2008 21:03:20 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5B5E18FC20 for ; Sun, 23 Mar 2008 21:03:20 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2NL3Kjf028329 for ; Sun, 23 Mar 2008 21:03:20 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2NL3KGg028327 for perforce@freebsd.org; Sun, 23 Mar 2008 21:03:20 GMT (envelope-from piso@freebsd.org) Date: Sun, 23 Mar 2008 21:03:20 GMT Message-Id: <200803232103.m2NL3KGg028327@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 138389 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Mar 2008 21:03:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=138389 Change 138389 by piso@piso_newluxor on 2008/03/23 21:02:53 Convert LibaliasFragmentIn() to use mbuf while in kernel. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#71 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.h#19 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#71 (text+ko) ==== @@ -1197,12 +1197,11 @@ return (fptr); } -// XXX ip free void -LibAliasFragmentIn(struct libalias *la, char *ptr, /* Points to correctly +LibAliasFragmentIn(struct libalias *la, pkt_t ptr, /* Points to correctly * de-aliased header * fragment */ - char *ptr_fragment /* Points to fragment which must be + pkt_t ptr_fragment /* Points to fragment which must be * de-aliased */ ) { @@ -1211,8 +1210,8 @@ LIBALIAS_LOCK(la); (void)la; - pip = (struct ip *)ptr; - fpip = (struct ip *)ptr_fragment; + PULLUP_IPHDR(pip, ptr); + PULLUP_IPHDR(fpip, ptr_fragment); DifferentialChecksum(&fpip->ip_sum, &pip->ip_dst, &fpip->ip_dst, 2); ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.h#19 (text+ko) ==== @@ -138,11 +138,14 @@ unsigned char _proto); /* Fragment Handling functions. */ -void LibAliasFragmentIn(struct libalias *, char *_ptr, char *_ptr_fragment); #ifdef _KERNEL +void LibAliasFragmentIn(struct libalias *, struct mbuf **_ptr, + struct mbuf **_ptr_fragment); struct mbuf *LibAliasGetFragment(struct libalias *, struct mbuf **_ptr); int LibAliasSaveFragment(struct libalias *, struct mbuf **_ptr); #else +void LibAliasFragmentIn(struct libalias *, char *_ptr, + char *_ptr_fragment); char *LibAliasGetFragment(struct libalias *, char *_ptr); int LibAliasSaveFragment(struct libalias *, char *_ptr); #endif From owner-p4-projects@FreeBSD.ORG Sun Mar 23 22:10:31 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0165C1065671; Sun, 23 Mar 2008 22:10: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 B4561106566B for ; Sun, 23 Mar 2008 22:10:30 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9E7C08FC1F for ; Sun, 23 Mar 2008 22:10:30 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2NMAUJn053769 for ; Sun, 23 Mar 2008 22:10:30 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2NMAU9n053767 for perforce@freebsd.org; Sun, 23 Mar 2008 22:10:30 GMT (envelope-from piso@freebsd.org) Date: Sun, 23 Mar 2008 22:10:30 GMT Message-Id: <200803232210.m2NMAU9n053767@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 138392 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Mar 2008 22:10:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=138392 Change 138392 by piso@piso_newluxor on 2008/03/23 22:09:41 Modify kernel side of LibUnaliasOut to use mbuf. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#72 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.h#20 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#72 (text+ko) ==== @@ -1455,7 +1455,7 @@ } int -LibAliasUnaliasOut(struct libalias *la, char *ptr, /* valid IP packet */ +LibAliasUnaliasOut(struct libalias *la, pkt_t ptr, /* valid IP packet */ int maxpacketsize /* for error checking */ ) { @@ -1464,32 +1464,38 @@ struct udphdr *ud; struct tcphdr *tc; struct alias_link *lnk; - int iresult = PKT_ALIAS_IGNORED; + int iresult; LIBALIAS_LOCK(la); - pip = (struct ip *)ptr; + iresult = PKT_ALIAS_IGNORED; + ic = NULL; + ud = NULL; + tc = NULL; + PULLUP_IPHDR(pip, ptr); /* Defense against mangled packets */ if (ntohs(pip->ip_len) > maxpacketsize || (pip->ip_hl << 2) > maxpacketsize) goto getout; - ud = (struct udphdr *)ip_next(pip); - tc = (struct tcphdr *)ip_next(pip); - ic = (struct icmp *)ip_next(pip); - /* Find a link */ - if (pip->ip_p == IPPROTO_UDP) + if (pip->ip_p == IPPROTO_UDP) { + PULLUP_UDPHDR(pip, ptr); + ud = (struct udphdr *)ip_next(pip); lnk = FindUdpTcpIn(la, pip->ip_dst, pip->ip_src, ud->uh_dport, ud->uh_sport, IPPROTO_UDP, 0); - else if (pip->ip_p == IPPROTO_TCP) + } else if (pip->ip_p == IPPROTO_TCP) { + PULLUP_TCPHDR(pip, ptr); + tc = (struct tcphdr *)ip_next(pip); lnk = FindUdpTcpIn(la, pip->ip_dst, pip->ip_src, tc->th_dport, tc->th_sport, IPPROTO_TCP, 0); - else if (pip->ip_p == IPPROTO_ICMP) + } else if (pip->ip_p == IPPROTO_ICMP) { + PULLUP_ICMPHDR(pip, ptr); + ic = (struct icmp *)ip_next(pip); lnk = FindIcmpIn(la, pip->ip_dst, pip->ip_src, ic->icmp_id, 0); - else + } else lnk = NULL; /* Change it from an aliased packet to an unaliased packet */ ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.h#20 (text+ko) ==== @@ -96,10 +96,35 @@ if (pip != NULL && ((pip->ip_hl << 2) > sizeof(struct ip))) \ PULLUP_SIZE(pip, ptr, (pip->ip_hl << 2)); \ } while (0) + +#define PULLUP_UDPHDR(pip, ptr) do { \ + pip = mtod(*ptr, struct ip *); \ + PULLUP_SIZE(pip, ptr, (pip->ip_hl << 2) + sizeof(struct udphdr)); \ + } while (0) + +#define PULLUP_TCPHDR(pip, ptr) do { \ + struct tcphdr *th; \ + pip = mtod(*ptr, struct ip *); \ + PULLUP_SIZE(pip, ptr, (pip->ip_hl << 2) + sizeof(struct tcphdr)); \ + if (pip != NULL) { \ + th = (struct tcphdr *)&(((char *)pip)[pip->ip_hl << 2]); \ + if ((th->th_off << 2) > sizeof(struct tcphdr)) \ + PULLUP_SIZE(pip, ptr, ((pip->ip_hl + th->th_off) << \ + 2)); \ + } \ +} while (0) + +#define PULLUP_ICMPHDR(pip, ptr) do { \ + pip = mtod(*ptr, struct ip *); \ + PULLUP_SIZE(pip, ptr, (pip->ip_hl << 2) + sizeof(struct icmp)); \ +} while (0) #else typedef char * pkt_t; #define PULLUP_IPHDR(pip, ptr) pip = (struct ip *)ptr +#define PULLUP_UDPHDR(pip, ptr) +#define PULLUP_TCPHDR(pip, ptr) +#define PULLUP_ICMPHDR(pip, ptr) #endif /* Initialization and control functions. */ @@ -115,7 +140,12 @@ int LibAliasIn (struct libalias *, char *_ptr, int _maxpacketsize); int LibAliasOut(struct libalias *, char *_ptr, int _maxpacketsize); int LibAliasOutTry(struct libalias *, char *_ptr, int _maxpacketsize, int _create); +#ifdef _KERNEL +int LibAliasUnaliasOut(struct libalias *, struct mbuf **_ptr, + int _maxpacketsize); +#else int LibAliasUnaliasOut(struct libalias *, char *_ptr, int _maxpacketsize); +#endif /* Port and address redirection functions. */ From owner-p4-projects@FreeBSD.ORG Mon Mar 24 02:02:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C9C53106566C; Mon, 24 Mar 2008 02:02: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 894C4106564A for ; Mon, 24 Mar 2008 02:02:45 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5B2C48FC1B for ; Mon, 24 Mar 2008 02:02:45 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2O22j3s072249 for ; Mon, 24 Mar 2008 02:02:45 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2O22jnn072247 for perforce@freebsd.org; Mon, 24 Mar 2008 02:02:45 GMT (envelope-from jb@freebsd.org) Date: Mon, 24 Mar 2008 02:02:45 GMT Message-Id: <200803240202.m2O22jnn072247@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 138404 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Mar 2008 02:02:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=138404 Change 138404 by jb@jb_freebsd1 on 2008/03/24 02:02:30 Fix the greg_t type. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dtrace_impl.h#18 edit Differences ... ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dtrace_impl.h#18 (text) ==== @@ -51,7 +51,7 @@ #else typedef uintptr_t pc_t; #endif -typedef u_int greg_t; +typedef u_long greg_t; #endif /* From owner-p4-projects@FreeBSD.ORG Mon Mar 24 02:42:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 62EEB1065672; Mon, 24 Mar 2008 02:42:26 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 22FC51065670 for ; Mon, 24 Mar 2008 02:42:26 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0FC838FC13 for ; Mon, 24 Mar 2008 02:42:26 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2O2gQZI088446 for ; Mon, 24 Mar 2008 02:42:26 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2O2gPsf088444 for perforce@freebsd.org; Mon, 24 Mar 2008 02:42:25 GMT (envelope-from jb@freebsd.org) Date: Mon, 24 Mar 2008 02:42:25 GMT Message-Id: <200803240242.m2O2gPsf088444@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 138405 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Mar 2008 02:42:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=138405 Change 138405 by jb@jb_freebsd1 on 2008/03/24 02:42:07 Reset GENERIC to match current. Affected files ... .. //depot/projects/dtrace/src/sys/i386/conf/GENERIC#32 edit Differences ... ==== //depot/projects/dtrace/src/sys/i386/conf/GENERIC#32 (text+ko) ==== @@ -70,14 +70,14 @@ options KDB # Enable kernel debugger support. options DDB # Support DDB. options DDB_CTF # Load CTF data too. -#options GDB # Support remote GDB. -#options INVARIANTS # Enable calls of extra sanity checking -#options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS -#options WITNESS # Enable checks to detect deadlocks and cycles -#options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed +options GDB # Support remote GDB. +options INVARIANTS # Enable calls of extra sanity checking +options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS +options WITNESS # Enable checks to detect deadlocks and cycles +options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed # To make an SMP kernel, the next two lines are needed -#options SMP # Symmetric MultiProcessor Kernel +options SMP # Symmetric MultiProcessor Kernel device apic # I/O APIC # CPU frequency control From owner-p4-projects@FreeBSD.ORG Mon Mar 24 05:15:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A03CE1065672; Mon, 24 Mar 2008 05:15: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 5E1601065670 for ; Mon, 24 Mar 2008 05:15:03 +0000 (UTC) (envelope-from alm@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 53B3E8FC1A for ; Mon, 24 Mar 2008 05:15:03 +0000 (UTC) (envelope-from alm@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2O5F3eJ090397 for ; Mon, 24 Mar 2008 05:15:03 GMT (envelope-from alm@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2O5F3eV090395 for perforce@freebsd.org; Mon, 24 Mar 2008 05:15:03 GMT (envelope-from alm@freebsd.org) Date: Mon, 24 Mar 2008 05:15:03 GMT Message-Id: <200803240515.m2O5F3eV090395@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alm@freebsd.org using -f From: Aaron Meihm To: Perforce Change Reviews Cc: Subject: PERFORCE change 138411 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Mar 2008 05:15:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=138411 Change 138411 by alm@alm_praetorian on 2008/03/24 05:14:11 Submit modified netauditd code in preparation for new worker thread model. Affected files ... .. //depot/projects/trustedbsd/netauditd/Makefile#5 edit .. //depot/projects/trustedbsd/netauditd/README#3 edit .. //depot/projects/trustedbsd/netauditd/component.c#7 delete .. //depot/projects/trustedbsd/netauditd/conf.c#7 edit .. //depot/projects/trustedbsd/netauditd/conf.h#1 add .. //depot/projects/trustedbsd/netauditd/crypto.c#6 delete .. //depot/projects/trustedbsd/netauditd/crypto.h#2 delete .. //depot/projects/trustedbsd/netauditd/grammar.y#1 add .. //depot/projects/trustedbsd/netauditd/netauditd.c#16 edit .. //depot/projects/trustedbsd/netauditd/netauditd.conf#5 edit .. //depot/projects/trustedbsd/netauditd/netauditd.h#11 edit .. //depot/projects/trustedbsd/netauditd/token.l#1 add Differences ... ==== //depot/projects/trustedbsd/netauditd/Makefile#5 (text+ko) ==== @@ -1,10 +1,23 @@ -PROG= netauditd -SRCS= netauditd.c component.c conf.c crypto.c -NO_MAN= +CC = gcc +CFLAGS = -Wall -g +TARGETS = netauditd +OBJ = conf.o lex.yy.o netauditd.o y.tab.o + +all: $(TARGETS) + +.c.o: + $(CC) $(CFLAGS) -c $< + +clean: + rm -f $(TARGETS) *.o *.core ktrace.out lex.yy.c y.tab.* y.output -DPADD= ${LIBSSL} -LDADD= -lssl +lex.yy.o: y.tab.o token.l + lex token.l + $(CC) $(CFLAGS) -c lex.yy.c -CFLAGS+= -Wall -ggdb +netauditd: $(OBJ) + $(CC) $(CFLAGS) -o $@ $(OBJ) -.include +y.tab.o: grammar.y + yacc -vd grammar.y + $(CC) $(CFLAGS) -c y.tab.c ==== //depot/projects/trustedbsd/netauditd/README#3 (text+ko) ==== @@ -1,21 +1,0 @@ -Netauditd v1.0.0a - - Introduction - -Netauditd is a daemon which given one or more audit inputs, will write the -records to one or more outputs. Currently, inputs may include audit pipes -or network sockets. Outputs may include a file or audit trail, or a remote -host running netauditd. - - Sample Configuration - -A basic configuration example may be as follows: - -src src0 pipe /dev/auditpipe -dst dst0 trail /tmp/src0/trail src0 -dst dst1 net 127.0.0.1 9999 src0 - -This defines an audit input source "src0" which references an audit pipe. -Two output sources have been defined for "src0", a trail and a remote -host. It should be noted that a single "dst" can reference multiple -sources. ==== //depot/projects/trustedbsd/netauditd/conf.c#7 (text+ko) ==== @@ -23,242 +23,98 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -#include #include -#include -#include -#include -#include - -#include #include #include +#include #include #include -#include #include -#include -#include -#include -#include -#include - -#include "crypto.h" +#include "conf.h" #include "netauditd.h" -#define SYNTAX_ERROR(x, y) { (void) fprintf(stderr, \ - "netauditd: Syntax error: %s:%d\n", \ - x, y); \ - exit(1); } +char *conf_path; +int lineno = 1; -static const struct conf_ent { - char *c_cmd; - char *c_arg1; - char *c_arg2; - int c_min_args; - int (*c_func)(args_t *); -} conftab[] = { - { "src", NULL, "pipe", 4, conf_parse_src_pipe }, - { "src", NULL, "net", 5, conf_parse_net }, - { "dst", NULL, "trail", 5, conf_parse_dst_trail }, - { "dst", NULL, "net", 6, conf_parse_net }, - { "crypto", "keyfile", NULL, 3, conf_parse_keyfile }, - { "crypto", "dsaparam", NULL, 3, conf_parse_keyfile }, - { "crypto", "cacert", NULL, 3, conf_parse_keyfile }, - { NULL, NULL, NULL, 0, NULL } -}; +extern char *yytext; +extern FILE *yyin; +extern int yyparse(void); -int -conf_parse_keyfile(args_t *a) +void +conf_error(char *fmt, ...) { + char buf[1024]; + va_list ap; - if (strcmp(a->args[1], "keyfile") == 0) - crypto_keyfile = a->args[2]; - if (strcmp(a->args[1], "dsaparam") == 0) - crypto_dsaparam = a->args[2]; - if (strcmp(a->args[1], "cacert") == 0) - crypto_cacert = a->args[2]; - crypto_enabled = 1; - return (0); + va_start(ap, fmt); + (void) vsnprintf(buf, sizeof(buf), fmt, ap); + va_end(ap); + (void) fprintf(stderr, "netauditd: %s:%d: %s\n", conf_path, lineno, + buf); + exit(2); } -int -conf_parse_net(args_t *a) +struct au_cmpnt * +conf_get_src(char *name) { - struct addrinfo hints; - struct au_cmpnt *new; - char *host, *svc; - int is_src = 0; + struct au_cmpnt *ret; - if (strcmp(a->args[0], "src") == 0) - is_src = 1; - else if (strcmp(a->args[0], "dst") != 0) - return (-1); - host = a->args[3]; - svc = a->args[4]; - if ((new = component_init(is_src, a->args[2], a->args[1])) == NULL) - exit(2); - (void) memset(&hints, 0, sizeof(hints)); - hints.ai_family = PF_UNSPEC; - hints.ai_socktype = SOCK_STREAM; - if (is_src) { - hints.ai_flags = AI_PASSIVE; - new->ac_type = NETAUDIT_SRC_NET; + TAILQ_FOREACH(ret, &ac_list_src, ac_glue) { + if (strcmp(ret->ac_name, name) == 0) + return (ret); } - else - new->ac_type = NETAUDIT_DST_NET; - if (getaddrinfo(host, svc, &hints, &new->ac_ainfo) != 0) { - component_destroy(new); - return (-1); - } - if (is_src) - TAILQ_INSERT_TAIL(&au_srclist, new, ac_glue); - else { - if (conf_link_consumers(new, a, 5) == -1) { - component_destroy(new); - return (-1); - } - TAILQ_INSERT_TAIL(&au_dstlist, new, ac_glue); - } - return (0); + return (NULL); } -int -conf_link_consumers(struct au_cmpnt *ac, args_t *a, int start) +struct au_cmpnt * +conf_get_dst(char *name) { - struct au_cmpnt *ptr; - int i; + struct au_cmpnt *ret; - for (i = start; i < a->args_n; i++) { - if ((ptr = component_get_src(a->args[i])) == NULL) - return (-1); - dprintf("%s <- %s\n", ac->ac_name, ptr->ac_name); - if (ptr->ac_consumers == NULL) { - ptr->ac_consumers = malloc(sizeof(struct au_cmpnt *)); - ptr->ac_nconsumers = 1; - } - else { - ptr->ac_nconsumers++; - ptr->ac_consumers = realloc(ptr->ac_consumers, - sizeof(struct au_cmpnt *) * ptr->ac_nconsumers); - } - ptr->ac_consumers[ptr->ac_nconsumers - 1] = ac; + TAILQ_FOREACH(ret, &ac_list_dst, ac_glue) { + if (strcmp(ret->ac_name, name) == 0) + return (ret); } - return (0); + return (NULL); } -int -conf_parse_src_pipe(args_t *a) +void +conf_link(struct au_cmpnt *src, struct au_cmpnt *dst) { - struct au_cmpnt *new; - - if ((new = component_init(1, a->args[2], a->args[1])) == NULL) - exit(2); - if ((new->ac_path = strdup(a->args[3])) == NULL) - exit(2); - TAILQ_INSERT_TAIL(&au_srclist, new, ac_glue); - return (0); -} - -int -conf_parse_dst_trail(args_t *a) -{ - struct au_cmpnt *new; - - if ((new = component_init(0, a->args[2], a->args[1])) == NULL) - exit(2); - if ((new->ac_path = strdup(a->args[3])) == NULL) - exit(2); - if (conf_link_consumers(new, a, 4) == -1) { - component_destroy(new); - return (-1); - } - TAILQ_INSERT_TAIL(&au_dstlist, new, ac_glue); - return (0); -} - -args_t * -conf_parse_args(char *buf) -{ - args_t *ret; - char *s0, *ptr; - - ret = malloc(sizeof(args_t)); - if (ret == NULL) - exit(2); - (void) memset(ret, 0, sizeof(args_t)); - for (s0 = buf; (ptr = strsep(&s0, " ")) != NULL;) { - ret->args[ret->args_n] = strdup(ptr); - if (ret->args[ret->args_n] == NULL) - exit(2); - ret->args_n++; - if (ret->args_n == MAX_ARGUMENTS) - break; - } - return (ret); + if ((src == NULL) || (dst == NULL)) + conf_error("A component specified does not exist"); + src->ac_ndsts++; + if (src->ac_dsts == NULL) + src->ac_dsts = malloc(sizeof(struct au_cmpnt *)); + else + src->ac_dsts = realloc(src->ac_dsts, + sizeof(struct au_cmpnt *) * src->ac_ndsts); + src->ac_dsts[src->ac_ndsts - 1] = dst; } void -conf_free_args(args_t *a) +conf_load(char *path) { - int i; + FILE *f; - for (i = 0; i < a->args_n; i++) - free(a->args[i]); - free(a); + f = fopen(conf_path, "r"); + if (f == NULL) + err(2, "%s", conf_path); + yyin = f; + (void) yyparse(); + (void) fclose(f); } void -conf_parse(char *buf, int lc) +yyerror(const char *str) { - const struct conf_ent *cptr; - args_t *a; - int i; - - if (buf == NULL) - return; - for (i = 0; i < strlen(buf); i++) - if (buf[i] == '\n') { - buf[i] = '\0'; - break; - } - if ((buf[0] == '#') || (buf[0] == '\0')) - return; - dprintf("%d: \"%s\"\n", lc, buf); - a = conf_parse_args(buf); - /* The minimum number of arguments for a command is 3. */ - if (a->args_n < 3) - SYNTAX_ERROR(conf_path, lc) - for (cptr = conftab; cptr->c_cmd != NULL; cptr++) { - if ((strcmp(cptr->c_cmd, a->args[0]) == 0) && - (cptr->c_arg1 ? (strcmp(cptr->c_arg1, a->args[1]) == 0) - : 1) && - (cptr->c_arg2 ? (strcmp(cptr->c_arg2, a->args[2]) == 0) - : 1)) { - if (a->args_n < cptr->c_min_args) - SYNTAX_ERROR(conf_path, lc) - if (cptr->c_func(a) == -1) - SYNTAX_ERROR(conf_path, lc) - break; - } - } - if (cptr->c_cmd == NULL) - SYNTAX_ERROR(conf_path, lc) - conf_free_args(a); + conf_error("Syntax error near '%s'", yytext); } -void -conf_load(char *path) +int +yywrap() { - char confbuf[1024]; - FILE *fp; - int lc = 0; - - if ((fp = fopen(path, "r")) == NULL) - err(1, "%s", path); - while (fgets(confbuf, sizeof(confbuf), fp) != NULL) - conf_parse(confbuf, ++lc); - (void) fclose(fp); + return (1); } ==== //depot/projects/trustedbsd/netauditd/netauditd.c#16 (text+ko) ==== @@ -24,527 +24,49 @@ * SUCH DAMAGE. */ #include +#include #include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include #include #include #include #include -#include -#include -#include -#include #include -#include -#include "crypto.h" +#include "conf.h" #include "netauditd.h" -#define FLAG_DEBUG 1 -#define FLAG_FOREGROUND (1 << 1) +ac_head_t ac_list_src; +ac_head_t ac_list_dst; -char *conf_path = "/usr/local/etc/netauditd.conf"; -int netaudit_flags; +extern char *conf_path; -void -dprintf(char *fmt, ...) -{ - char buf[2048]; - va_list ap; - - if (!(netaudit_flags & FLAG_DEBUG)) - return; - va_start(ap, fmt); - (void) vsnprintf(buf, sizeof(buf), fmt, ap); - va_end(ap); - (void) fprintf(stderr, "debug: %s", buf); -} - int main(int argc, char *argv[]) { char ch; - while ((ch = getopt(argc, argv, "Ddf:h")) != -1) { + conf_path = DEFAULT_CONF_PATH; + while ((ch = getopt(argc, argv, "f:h")) != -1) { switch (ch) { - case 'D': - netaudit_flags |= FLAG_FOREGROUND; - break; - case 'd': - netaudit_flags |= FLAG_DEBUG; - break; case 'f': conf_path = optarg; break; + default: case 'h': - default: usage(); - /* NOT REACHED */ + /* Not reached */ } } - dprintf("debugging enabled\n"); - TAILQ_INIT(&au_srclist); - TAILQ_INIT(&au_dstlist); + TAILQ_INIT(&ac_list_src); + TAILQ_INIT(&ac_list_dst); conf_load(conf_path); - (void) signal(SIGPIPE, SIG_IGN); - netaudit_run(); return (0); } void -netaudit_build_rfds(fd_set *rfds) +usage() { - struct au_srcbuffer *asb; - struct au_cmpnt *au; - - TAILQ_FOREACH(au, &au_srclist, ac_glue) { - if (au->ac_type == NETAUDIT_SRC_NET) { - TAILQ_FOREACH(asb, &au->ac_sbufq, sb_glue) - FD_SET(asb->sb_fd, rfds); - } - FD_SET(au->ac_fd, rfds); - } -} - -void -netaudit_record_handler(fd_set *rfds) -{ - struct au_srcbuffer *asb, *tmp; - struct au_cmpnt *au; - - TAILQ_FOREACH(au, &au_srclist, ac_glue) { - if (FD_ISSET(au->ac_fd, rfds)) { - switch(au->ac_type) { - case NETAUDIT_SRC_PIPE: - netaudit_pipe_read(au); - break; - case NETAUDIT_SRC_NET: - netaudit_socket_accept(au); - break; - default: - exit(2); - } - } - } - TAILQ_FOREACH(au, &au_srclist, ac_glue) { - if (au->ac_type != NETAUDIT_SRC_NET) - continue; - TAILQ_FOREACH_SAFE(asb, &au->ac_sbufq, sb_glue, tmp) - if (FD_ISSET(asb->sb_fd, rfds)) - if (netaudit_socket_read(asb) == -1) { - /* A read error occurred while reading - * a record from a connected client. - * We remove the client and continue. - * This may occur after an sb_recbuf - * object has been allocated. */ - (void) close(asb->sb_fd); - TAILQ_REMOVE(&au->ac_sbufq, asb, - sb_glue); - free(asb->sb_sockaddr); - if (asb->sb_recbuf != NULL) { - free(asb->sb_recbuf->ar_rec); - free(asb->sb_recbuf); - } - free(asb); - } - } -} - -void -netaudit_run(void) -{ - fd_set rfds; - struct timeval tv; - struct au_cmpnt *au; - int ret, fd; -#ifdef AUDITPIPE_SET_BUFMODE - int opt; -#endif - - TAILQ_FOREACH(au, &au_srclist, ac_glue) { - switch (au->ac_type) { - case NETAUDIT_SRC_PIPE: - au->ac_fd = open(au->ac_path, O_RDONLY); - if (au->ac_fd == -1) - err(1, "%s", au->ac_path); -#ifdef AUDITPIPE_SET_BUFMODE - opt = AUDITPIPE_BUFMODE_BUFFERED; - if (ioctl(au->ac_fd, AUDITPIPE_SET_BUFMODE, &opt) < 0) - err(1, "AUDITPIPE_SET_BUFMODE"); - /* - * We should add support for low watermarks here. - */ -#endif - break; - case NETAUDIT_SRC_NET: - netaudit_socket_listen(au); - break; - default: - exit(2); - } - } - if (!(netaudit_flags & FLAG_FOREGROUND)) { - ret = fork(); - if (ret == -1) - err(1, "fork"); - if (ret != 0) - exit(0); - fd = open("/dev/null", O_RDWR); - if (fd == -1) - err(1, "/dev/null"); - (void) dup2(fd, STDIN_FILENO); - (void) dup2(fd, STDOUT_FILENO); - (void) dup2(fd, STDERR_FILENO); - if (fd > 2) - (void) close(fd); - if (setsid() == -1) - err(1, "setsid"); - } - (void) memset(&tv, 0, sizeof(tv)); - tv.tv_sec = 1; - for (;;) { - FD_ZERO(&rfds); - netaudit_build_rfds(&rfds); - ret = select(FD_SETSIZE, &rfds, NULL, NULL, &tv); - if (ret == -1) { - if (errno != EINTR) - exit(2); - else - continue; - } - else if (ret != 0) - netaudit_record_handler(&rfds); - netaudit_establish(); - netaudit_oq(); - } -} - -int -netaudit_connect(struct au_cmpnt *au) -{ - int error; - - error = connect(au->ac_fd, au->ac_ainfo->ai_addr, - au->ac_ainfo->ai_addrlen); - if (error < 0) - return (-1); - if (crypto_enabled == 0) - return (error); - assert(au->ac_crypto_init == 0); - (void) crypto_init_context(&au->ac_cct, CRTYPO_CTX_CLIENT); - au->ac_ssl = SSL_new(au->ac_cct.c_ctx); - au->ac_sbio = BIO_new_socket(au->ac_fd, BIO_NOCLOSE); - SSL_set_bio(au->ac_ssl, au->ac_sbio, au->ac_sbio); - error = SSL_connect(au->ac_ssl); - /* XXX need to do better error checking here */ - au->ac_crypto_init = 1; - return (error == 1 ? 0 : -1); -} - -void -netaudit_establish(void) -{ - struct au_cmpnt *au; - - TAILQ_FOREACH(au, &au_dstlist, ac_glue) { - if (au->ac_established) - continue; - dprintf("establish: %s\n", au->ac_name); - switch (au->ac_type) { - case NETAUDIT_DST_TRAIL: - au->ac_fd = open(au->ac_path, O_WRONLY | O_APPEND | \ - O_CREAT, S_IRUSR | S_IWUSR); - if (au->ac_fd == -1) { - warn("%s", au->ac_path); - continue; - } - au->ac_established = 1; - break; - case NETAUDIT_DST_NET: - au->ac_fd = socket(au->ac_ainfo->ai_family, - au->ac_ainfo->ai_socktype, - au->ac_ainfo->ai_protocol); - if (au->ac_fd == -1) - continue; - if (netaudit_connect(au) == -1) { - warn("connect"); - close(au->ac_fd); - continue; - } - au->ac_established = 1; - break; - default: - exit(2); - } - } -} - -int -netaudit_write(struct au_cmpnt *au, u_char *buf, int len) -{ - int error; - - if (crypto_enabled == 0) - return (write(au->ac_fd, buf, len)); - assert(au->ac_ssl != NULL); - error = SSL_write(au->ac_ssl, buf, len); - /* XXX error checking */ - return (error); -} - -void -netaudit_oq(void) -{ - struct au_cmpnt *au; - struct au_queue_ent *q, *tmpr; - struct au_recbuf *r; - int ret, s; - - TAILQ_FOREACH(au, &au_dstlist, ac_glue) { - if (!au->ac_established) { - dprintf("consumer %s not established, skipping\n", - au->ac_name); - continue; - } - TAILQ_FOREACH_SAFE(q, &au->ac_oq, aq_glue, tmpr) { - dprintf("consumer %s running output queue\n", - au->ac_name); - r = q->aq_ptr; - s = r->ar_reclen - q->aq_remain; - ret = netaudit_write(au, r->ar_rec + s, q->aq_remain); - if (ret == -1) { - if (errno == EAGAIN) - break; - else { - /* Check if we submitted a partial - * record. If so we reset aq_remain - * and retransmit when the consumer - * is reestablished. */ - if (q->aq_remain != r->ar_reclen) - q->aq_remain = r->ar_reclen; - (void) close(au->ac_fd); - au->ac_established = 0; - break; - } - } - else if (ret == q->aq_remain) { - dprintf("record %p submitted\n", r); - TAILQ_REMOVE(&au->ac_oq, q, aq_glue); - free(q); - r->ar_refcount--; - if (r->ar_refcount == 0) { - free(r->ar_rec); - free(r); - } - } - else - q->aq_remain -= ret; - } - } -} - -void -netaudit_queue_record(struct au_cmpnt *au, struct au_recbuf *rec) -{ - struct au_queue_ent *new; - int i; - - rec->ar_refcount = au->ac_nconsumers; - for (i = 0; i < au->ac_nconsumers; i++) { - new = malloc(sizeof(struct au_queue_ent)); - if (new == NULL) - exit(2); - (void) memset(new, 0, sizeof(struct au_queue_ent)); - new->aq_ptr = rec; - new->aq_remain = rec->ar_reclen; - TAILQ_INSERT_TAIL(&au->ac_consumers[i]->ac_oq, new, aq_glue); - dprintf("queued %p: %s\n", rec, au->ac_consumers[i]->ac_name); - } -} - -void -netaudit_pipe_read(struct au_cmpnt *au) -{ - struct au_recbuf *new; - - if ((new = malloc(sizeof(struct au_recbuf))) == NULL) - return; - if ((new->ar_rec = malloc(NETAUDIT_PIPE_BUFSIZE)) == NULL) { - free(new); - return; - } - /* - * XXXCSJP: It is possible that the audit record will be greater then - * NETAUDIT_PIPE_BUFSIZE, in which case the pipe will truncate it. - */ - new->ar_reclen = read(au->ac_fd, new->ar_rec, NETAUDIT_PIPE_BUFSIZE); - if (new->ar_reclen == -1) { - if ((errno != EAGAIN) && (errno != EINTR)) - exit(2); - else - return; - } - dprintf("au_cmpnt %p: read record %u bytes\n", au, new->ar_reclen); - netaudit_queue_record(au, new); -} - -void -netaudit_socket_accept(struct au_cmpnt *au) -{ - struct au_srcbuffer *new; - int error; - - new = malloc(sizeof(struct au_srcbuffer)); - if (new == NULL) - exit(2); - (void) memset(new, 0, sizeof(struct au_srcbuffer)); - new->sb_socklen = au->ac_ainfo->ai_addrlen; - if ((new->sb_sockaddr = malloc(new->sb_socklen)) == NULL) - exit(2); - new->sb_fd = accept(au->ac_fd, new->sb_sockaddr, &new->sb_socklen); - if (new->sb_fd == -1) { - if (errno == EWOULDBLOCK || errno == ECONNABORTED) { - free(new->sb_sockaddr); - free(new); - return; - } - else - exit(2); - } - new->sb_parent = au; - if (crypto_enabled == 0) { - TAILQ_INSERT_TAIL(&au->ac_sbufq, new, sb_glue); - return; - } - if (au->ac_crypto_init == 0) - (void) crypto_init_context(&au->ac_cct, CRYPTO_CTX_SERVER); - au->ac_crypto_init = 1; - new->sb_sbio = BIO_new_socket(new->sb_fd, BIO_NOCLOSE); - new->sb_ssl = SSL_new(au->ac_cct.c_ctx); - SSL_set_bio(new->sb_ssl, new->sb_sbio, new->sb_sbio); - error = SSL_accept(new->sb_ssl); - TAILQ_INSERT_TAIL(&au->ac_sbufq, new, sb_glue); -} - -void -netaudit_socket_listen(struct au_cmpnt *au) -{ - struct addrinfo *addrptr; - int flags; - - addrptr = au->ac_ainfo; - au->ac_fd = socket(addrptr->ai_family, addrptr->ai_socktype, - addrptr->ai_protocol); - if (au->ac_fd == -1) - err(1, "socket"); - if (bind(au->ac_fd, addrptr->ai_addr, addrptr->ai_addrlen) == -1) - err(1, "bind"); - if (listen(au->ac_fd, 16) == -1) - err(1, "listen"); - if ((flags = fcntl(au->ac_fd, F_GETFL)) == -1) - err(1, "fcntl"); - flags |= O_NONBLOCK; - if (fcntl(au->ac_fd, F_SETFL, flags) == -1) - err(1, "fcntl"); -} - -int -netaudit_socket_read(struct au_srcbuffer *asb) -{ - u_char *bufptr, *recbufptr; - int ret, left; - u_int32_t hdr_remain, val, need; - - if (crypto_enabled == 0) { - ret = read(asb->sb_fd, asb->sb_buf, sizeof(asb->sb_buf)); - if (ret == -1) { - if (errno != EINTR) - return (-1); - else - return (0); - } else if (ret == 0) - return (-1); - } else { - assert(asb->sb_ssl != NULL); - ret = SSL_read(asb->sb_ssl, asb->sb_buf, - sizeof(asb->sb_buf)); - if (ret < 0) - return (-1); - /* XXX handle I/O errors */ - } - left = ret; - bufptr = asb->sb_buf; - while (left > 0) { - if (asb->sb_recbuf == NULL) { - hdr_remain = sizeof(asb->sb_header) - - asb->sb_read; - if (left >= hdr_remain) { - (void) memcpy(asb->sb_header + asb->sb_read, - bufptr, hdr_remain); - asb->sb_read += hdr_remain; - left -= hdr_remain; - bufptr += hdr_remain; - (void) memcpy(&val, asb->sb_header + 1, - sizeof(val)); - asb->sb_recbuf = - malloc(sizeof(struct au_recbuf)); - if (asb->sb_recbuf == NULL) - exit(2); - asb->sb_recbuf->ar_reclen = be32toh(val); - dprintf("audit header: rec %u bytes\n", - asb->sb_recbuf->ar_reclen); - asb->sb_recbuf->ar_rec = \ - malloc(asb->sb_recbuf->ar_reclen); - if (asb->sb_recbuf->ar_rec == NULL) - exit(2); - (void) memcpy(asb->sb_recbuf->ar_rec, - asb->sb_header, sizeof(asb->sb_header)); - continue; - } - else { - dprintf("read partial header\n"); - (void) memcpy(asb->sb_header + asb->sb_read, - bufptr, left); - asb->sb_read += left; - return (0); - } - } - need = asb->sb_recbuf->ar_reclen - asb->sb_read; - recbufptr = asb->sb_recbuf->ar_rec + asb->sb_read; - dprintf("still need %u bytes\n", need); - if (left < need) { - (void) memcpy(recbufptr, bufptr, left); - asb->sb_read += left; - return (0); - } - else { - (void) memcpy(recbufptr, bufptr, need); - left -= need; - bufptr += need; - netaudit_queue_record(asb->sb_parent, asb->sb_recbuf); - asb->sb_recbuf = NULL; - asb->sb_read = 0; - } - } - return (0); -} - -void -usage(void) -{ - - (void) fputs("usage: netauditd [-Ddh] [-f path]\n", stderr); + (void) fputs("usage: netauditd [-h] [-f path]\n", stderr); exit(1); } ==== //depot/projects/trustedbsd/netauditd/netauditd.conf#5 (text+ko) ==== @@ -1,14 +1,7 @@ -# netauditd configuration file +src: p source_pipe /dev/auditpipe +src: n source_net 0.0.0.0 6655 +dst: n dst_net 127.0.0.1 6655 +dst: t dst_trail /tmp/trail -# -# For the use of SSL un-comment and define the following variables: -# -# crypto keyfile server.pem -# crypto cacert cacert.pem -# crypto dsaparam dsaparam.pem - -src src0 pipe /dev/auditpipe -src src1 net 0.0.0.0 9999 - -dst dst0 trail /tmp/src0/trail src1 -dst dst1 net 127.0.0.1 9999 src0 +map: source_pipe dst_net +map: source_net dst_trail ==== //depot/projects/trustedbsd/netauditd/netauditd.h#11 (text+ko) ==== @@ -24,112 +24,27 @@ * SUCH DAMAGE. */ -#define MAX_ARGUMENTS 256 +#define DEFAULT_CONF_PATH "/usr/local/etc/netauditd.conf" -#define NETAUDIT_PIPE_BUFSIZE 1024 - -#define NETAUDIT_SRC_PIPE 1 -#define NETAUDIT_SRC_NET 2 -#define NETAUDIT_DST_TRAIL 1 -#define NETAUDIT_DST_NET 2 - -struct au_recbuf { - void *ar_rec; - u_int32_t ar_reclen; - int ar_refcount; -}; - -struct au_queue_ent { - struct au_recbuf *aq_ptr; - u_int32_t aq_remain; - TAILQ_ENTRY(au_queue_ent) aq_glue; +enum { + COMPONENT_PIPE, + COMPONENT_NET, + COMPONENT_TRAIL }; -/* - * This object exists for accepted connections. For each new file descriptor - * returned by accept(2), a au_srcbuffer will be allocated and initialized to - * track I/O for each connected remote peer. - */ -struct au_srcbuffer { - struct au_cmpnt *sb_parent; - struct sockaddr *sb_sockaddr; - socklen_t sb_socklen; - int sb_fd; - struct au_recbuf *sb_recbuf; - u_int32_t sb_read; - u_char sb_buf[2048]; - u_char sb_header[5]; - TAILQ_ENTRY(au_srcbuffer) sb_glue; - BIO *sb_sbio; - SSL *sb_ssl; -}; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Mar 24 13:02:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 81C561065675; Mon, 24 Mar 2008 13:02: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 413E61065673 for ; Mon, 24 Mar 2008 13:02:14 +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 271188FC23 for ; Mon, 24 Mar 2008 13:02:14 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2OD2D62041076 for ; Mon, 24 Mar 2008 13:02:13 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2OD2DZT041065 for perforce@freebsd.org; Mon, 24 Mar 2008 13:02:13 GMT (envelope-from gonzo@FreeBSD.org) Date: Mon, 24 Mar 2008 13:02:13 GMT Message-Id: <200803241302.m2OD2DZT041065@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 138422 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Mar 2008 13:02:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=138422 Change 138422 by gonzo@gonzo_jeeves on 2008/03/24 13:02:11 o Add missing .endif Affected files ... .. //depot/projects/mips2-jnpr/src/share/mk/bsd.cpu.mk#7 edit Differences ... ==== //depot/projects/mips2-jnpr/src/share/mk/bsd.cpu.mk#7 (text+ko) ==== @@ -118,6 +118,7 @@ . if ${CPUTYPE} == "e500" MACHINE_CPU = booke _CPUCFLAGS = -Wa,-me500 -msoft-float +. endif . elif ${MACHINE_ARCH} == "mips" . if ${CPUTYPE} == "mips64" _CPUCFLAGS = -march=mips64 From owner-p4-projects@FreeBSD.ORG Mon Mar 24 14:00:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 545E01065672; Mon, 24 Mar 2008 14:00: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 13E091065670 for ; Mon, 24 Mar 2008 14:00:13 +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 0B4A58FC31 for ; Mon, 24 Mar 2008 14:00:13 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2OE0CLW076904 for ; Mon, 24 Mar 2008 14:00:12 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2OE0Csj076902 for perforce@freebsd.org; Mon, 24 Mar 2008 14:00:12 GMT (envelope-from gonzo@FreeBSD.org) Date: Mon, 24 Mar 2008 14:00:12 GMT Message-Id: <200803241400.m2OE0Csj076902@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 138425 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Mar 2008 14:00:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=138425 Change 138425 by gonzo@gonzo_jeeves on 2008/03/24 13:59:22 o Use ';' after SYSINIT Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/machdep.c#24 edit .. //depot/projects/mips2-jnpr/src/sys/mips/mips/vm_machdep.c#23 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/machdep.c#24 (text+ko) ==== @@ -136,7 +136,7 @@ u_int need_wired_tlb_page_pool; static void cpu_startup(void *); -SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL) +SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL); struct kva_md_info kmi; ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/vm_machdep.c#23 (text+ko) ==== @@ -75,7 +75,7 @@ #endif static void sf_buf_init(void *arg); -SYSINIT(sock_sf, SI_SUB_MBUF, SI_ORDER_ANY, sf_buf_init, NULL) +SYSINIT(sock_sf, SI_SUB_MBUF, SI_ORDER_ANY, sf_buf_init, NULL); LIST_HEAD(sf_head, sf_buf); From owner-p4-projects@FreeBSD.ORG Mon Mar 24 14:05:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8EA751065672; Mon, 24 Mar 2008 14:05: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 4E1BE106566B for ; Mon, 24 Mar 2008 14:05:18 +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 444598FC17 for ; Mon, 24 Mar 2008 14:05:18 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2OE5Isw079631 for ; Mon, 24 Mar 2008 14:05:18 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2OE5IqO079629 for perforce@freebsd.org; Mon, 24 Mar 2008 14:05:18 GMT (envelope-from gonzo@FreeBSD.org) Date: Mon, 24 Mar 2008 14:05:18 GMT Message-Id: <200803241405.m2OE5IqO079629@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 138426 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Mar 2008 14:05:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=138426 Change 138426 by gonzo@gonzo_jeeves on 2008/03/24 14:04:33 o Instead of bare defines's of atomic_xxx_long use #define with parameteres and type casts. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/include/atomic.h#6 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/include/atomic.h#6 (text+ko) ==== @@ -364,6 +364,7 @@ #define atomic_cmpset_rel_long atomic_cmpset_rel_64 #define atomic_load_acq_long atomic_load_acq_64 #define atomic_store_rel_long atomic_store_rel_64 +#define atomic_fetchadd_long atomic_fetchadd_64 #define atomic_readandclear_long atomic_readandclear_64 /* Operations on pointers. */ @@ -395,10 +396,12 @@ #define atomic_clear_long atomic_clear_32 #define atomic_clear_acq_long atomic_clear_acq_32 #define atomic_clear_rel_long atomic_clear_rel_32 -#define atomic_add_long atomic_add_32 +#define atomic_add_long(p, v) \ + atomic_add_32((volatile u_int *)(p), (u_int)(v)) #define atomic_add_acq_long atomic_add_acq_32 #define atomic_add_rel_long atomic_add_rel_32 -#define atomic_subtract_long atomic_subtract_32 +#define atomic_subtract_long(p, v) \ + atomic_subtract_32((volatile u_int *)(p), (u_int)(v)) #define atomic_subtract_acq_long atomic_subtract_acq_32 #define atomic_subtract_rel_long atomic_subtract_rel_32 #define atomic_cmpset_long atomic_cmpset_32 @@ -406,6 +409,8 @@ #define atomic_cmpset_rel_long atomic_cmpset_rel_32 #define atomic_load_acq_long atomic_load_acq_32 #define atomic_store_rel_long atomic_store_rel_32 +#define atomic_fetchadd_long(p, v) \ + atomic_fetchadd_32((volatile u_int *)(p), (u_int)(v)) #define atomic_readandclear_long atomic_readandclear_32 /* Operations on pointers. */ From owner-p4-projects@FreeBSD.ORG Mon Mar 24 14:17:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 051951065670; Mon, 24 Mar 2008 14:17:32 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B899E106566B for ; Mon, 24 Mar 2008 14:17:31 +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 AB7408FC20 for ; Mon, 24 Mar 2008 14:17:31 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2OEHV1N083425 for ; Mon, 24 Mar 2008 14:17:31 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2OEHVLp083423 for perforce@freebsd.org; Mon, 24 Mar 2008 14:17:31 GMT (envelope-from gonzo@FreeBSD.org) Date: Mon, 24 Mar 2008 14:17:31 GMT Message-Id: <200803241417.m2OEHVLp083423@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 138427 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Mar 2008 14:17:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=138427 Change 138427 by gonzo@gonzo_jeeves on 2008/03/24 14:17:07 o Provide bogus mips_mask_irq/mips_unmask_irq functions o Fix intr_event_create calls to conform new API, use mips_mask_irq/mips_unmask_irq as arguments. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/include/intr.h#6 edit .. //depot/projects/mips2-jnpr/src/sys/mips/mips/intr_machdep.c#8 edit .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/malta/gt_pci.c#3 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/include/intr.h#6 (text+ko) ==== @@ -73,6 +73,11 @@ extern struct mips_intr_handler intr_handlers[]; +typedef void (*mask_fn)(void *); + +void mips_mask_irq(void); +void mips_unmask_irq(void); + struct trapframe; void mips_set_intr(int pri, uint32_t mask, uint32_t (*int_hand)(uint32_t, struct trapframe *)); ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/intr_machdep.c#8 (text+ko) ==== @@ -53,6 +53,20 @@ static int last_printed = 0; #endif +void +mips_mask_irq(void) +{ + + printf("Unimplemented: %s\n", __func__); +} + +void +mips_unmask_irq(void) +{ + + printf("Unimplemented: %s\n", __func__); +} + void cpu_establish_hardintr(const char *name, driver_filter_t *filt, void (*handler)(void*), void *arg, int irq, int flags, @@ -71,7 +85,8 @@ event = hardintr_events[irq]; if (event == NULL) { error = intr_event_create(&event, (void *)irq, 0, - (void (*)(void *))NULL, "hard intr%d:", irq); + (mask_fn)mips_mask_irq, (mask_fn)mips_unmask_irq, + (mask_fn)mips_unmask_irq, NULL, "hard intr%d:", irq); if (error) return; hardintr_events[irq] = event; @@ -108,7 +123,8 @@ event = softintr_events[irq]; if (event == NULL) { error = intr_event_create(&event, (void *)irq, 0, - (void (*)(void *))NULL, "intr%d:", irq); + (mask_fn)mips_mask_irq, (mask_fn)mips_unmask_irq, + (mask_fn)mips_unmask_irq, NULL, "intr%d:", irq); if (error) return; softintr_events[irq] = event; ==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/malta/gt_pci.c#3 (text+ko) ==== @@ -657,8 +657,9 @@ event = sc->sc_eventstab[irq]; if (event == NULL) { - error = intr_event_create(&event, (void *)irq, 0, - (void (*)(void *))NULL, "gt_pci intr%d:", irq); + error = intr_event_create(&event, (void *)irq, 0, + (mask_fn)mips_mask_irq, (mask_fn)mips_unmask_irq, + (mask_fn)mips_unmask_irq, NULL, "gt_pci intr%d:", irq); if (error) return 0; sc->sc_eventstab[irq] = event; From owner-p4-projects@FreeBSD.ORG Mon Mar 24 15:20:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 14B6310656CB; Mon, 24 Mar 2008 15:20: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 AE2D010656C8 for ; Mon, 24 Mar 2008 15:20:49 +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 925968FC13 for ; Mon, 24 Mar 2008 15:20:49 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2OFKnpF001465 for ; Mon, 24 Mar 2008 15:20:49 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2OFKnTG001463 for perforce@freebsd.org; Mon, 24 Mar 2008 15:20:49 GMT (envelope-from pgj@FreeBSD.org) Date: Mon, 24 Mar 2008 15:20:49 GMT Message-Id: <200803241520.m2OFKnTG001463@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 138436 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Mar 2008 15:20:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=138436 Change 138436 by pgj@disznohal on 2008/03/24 15:20:19 Add images to be localised. (Makefile) MFen: 1.108 --> 1.109 Approved by: gabor (mentor) Affected files ... .. //depot/projects/docproj_hu/books/handbook/Makefile#4 edit .. //depot/projects/docproj_hu/share/images/books/handbook/advanced-networking/isdn-bus.eps#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/advanced-networking/isdn-twisted-pair.eps#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/advanced-networking/natd.eps#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/advanced-networking/net-routing.pic#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/advanced-networking/static-routes.pic#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/geom/striping.pic#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/adduser1.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/adduser2.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/adduser3.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/boot-loader-menu.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/boot-mgr.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/config-country.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/console-saver1.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/console-saver2.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/console-saver3.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/console-saver4.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/desktop.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/disk-layout.eps#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/disklabel-auto.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/disklabel-ed1.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/disklabel-ed2.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/disklabel-fs.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/disklabel-root1.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/disklabel-root2.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/disklabel-root3.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/dist-set.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/dist-set2.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/docmenu1.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/ed0-conf.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/ed0-conf2.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/edit-inetd-conf.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/example-dir1.eps#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/example-dir2.eps#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/example-dir3.eps#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/example-dir4.eps#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/example-dir5.eps#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/fdisk-drive1.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/fdisk-drive2.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/fdisk-edit1.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/fdisk-edit2.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/ftp-anon1.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/ftp-anon2.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/hdwrconf.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/keymap.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/main-doc.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/main-keymap.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/main-options.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/main-std.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/main1.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/mainexit.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/media.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/mouse1.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/mouse2.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/mouse3.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/mouse4.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/mouse5.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/mouse6.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/mta-main.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/net-config-menu1.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/net-config-menu2.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/nfs-server-edit.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/ntp-config.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/options.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/pkg-cat.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/pkg-confirm.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/pkg-install.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/pkg-sel.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/probstart.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/routed.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/security.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/sysinstall-exit.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/timezone1.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/timezone2.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/timezone3.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/userconfig.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/userconfig2.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/install/xf86setup.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/mail/mutt1.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/mail/mutt2.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/mail/mutt3.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/mail/pine1.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/mail/pine2.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/mail/pine3.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/mail/pine4.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/mail/pine5.scr#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/security/ipsec-crypt-pkt.pic#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/security/ipsec-encap-pkt.pic#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/security/ipsec-network.pic#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/security/ipsec-out-pkt.pic#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/vinum/vinum-concat.pic#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/vinum/vinum-mirrored-vol.pic#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/vinum/vinum-raid10-vol.pic#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/vinum/vinum-raid5-org.pic#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/vinum/vinum-simple-vol.pic#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/vinum/vinum-striped-vol.pic#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/vinum/vinum-striped.pic#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/parallels-freebsd1.png#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/parallels-freebsd10.png#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/parallels-freebsd11.png#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/parallels-freebsd12.png#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/parallels-freebsd13.png#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/parallels-freebsd2.png#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/parallels-freebsd3.png#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/parallels-freebsd4.png#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/parallels-freebsd5.png#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/parallels-freebsd6.png#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/parallels-freebsd7.png#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/parallels-freebsd8.png#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/parallels-freebsd9.png#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/virtualpc-freebsd1.png#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/virtualpc-freebsd10.png#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/virtualpc-freebsd11.png#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/virtualpc-freebsd12.png#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/virtualpc-freebsd13.png#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/virtualpc-freebsd2.png#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/virtualpc-freebsd3.png#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/virtualpc-freebsd4.png#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/virtualpc-freebsd5.png#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/virtualpc-freebsd6.png#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/virtualpc-freebsd7.png#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/virtualpc-freebsd8.png#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/virtualpc-freebsd9.png#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/vmware-freebsd01.png#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/vmware-freebsd02.png#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/vmware-freebsd03.png#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/vmware-freebsd04.png#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/vmware-freebsd05.png#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/vmware-freebsd06.png#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/vmware-freebsd07.png#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/vmware-freebsd08.png#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/vmware-freebsd09.png#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/vmware-freebsd10.png#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/vmware-freebsd11.png#1 add .. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/vmware-freebsd12.png#1 add Differences ... ==== //depot/projects/docproj_hu/books/handbook/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: doc/en_US.ISO8859-1/books/handbook/Makefile,v 1.108 2007/10/13 12:01:20 chinsan Exp $ +# $FreeBSD: doc/en_US.ISO8859-1/books/handbook/Makefile,v 1.109 2008/03/03 11:07:37 brd Exp $ # # Build the FreeBSD Handbook. # @@ -44,6 +44,8 @@ INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= +IMAGES_EN_DIR=${.CURDIR}/../../share/images + IMAGES_EN = advanced-networking/isdn-bus.eps IMAGES_EN+= advanced-networking/isdn-twisted-pair.eps IMAGES_EN+= advanced-networking/natd.eps @@ -165,6 +167,18 @@ IMAGES_EN+= virtualization/virtualpc-freebsd11.png IMAGES_EN+= virtualization/virtualpc-freebsd12.png IMAGES_EN+= virtualization/virtualpc-freebsd13.png +IMAGES_EN+= virtualization/vmware-freebsd01.png +IMAGES_EN+= virtualization/vmware-freebsd02.png +IMAGES_EN+= virtualization/vmware-freebsd03.png +IMAGES_EN+= virtualization/vmware-freebsd04.png +IMAGES_EN+= virtualization/vmware-freebsd05.png +IMAGES_EN+= virtualization/vmware-freebsd06.png +IMAGES_EN+= virtualization/vmware-freebsd07.png +IMAGES_EN+= virtualization/vmware-freebsd08.png +IMAGES_EN+= virtualization/vmware-freebsd09.png +IMAGES_EN+= virtualization/vmware-freebsd10.png +IMAGES_EN+= virtualization/vmware-freebsd11.png +IMAGES_EN+= virtualization/vmware-freebsd12.png # Images from the cross-document image library IMAGES_LIB= callouts/1.png From owner-p4-projects@FreeBSD.ORG Mon Mar 24 15:27:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 52F4D1065681; Mon, 24 Mar 2008 15:27: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 128FA1065670 for ; Mon, 24 Mar 2008 15:27:57 +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 EAF108FC2A for ; Mon, 24 Mar 2008 15:27:56 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2OFRuDF004025 for ; Mon, 24 Mar 2008 15:27:56 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2OFRutn004023 for perforce@freebsd.org; Mon, 24 Mar 2008 15:27:56 GMT (envelope-from pgj@FreeBSD.org) Date: Mon, 24 Mar 2008 15:27:56 GMT Message-Id: <200803241527.m2OFRutn004023@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 138437 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Mar 2008 15:27:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=138437 Change 138437 by pgj@disznohal on 2008/03/24 15:27:32 (freebsd.ent) MFen: 1.94 --> 1.100 Approved by: gabor (mentor) Affected files ... .. //depot/projects/docproj_hu/share/sgml/freebsd.ent#3 edit Differences ... ==== //depot/projects/docproj_hu/share/sgml/freebsd.ent#3 (text+ko) ==== @@ -1,7 +1,7 @@ - + - - + + - - + + @@ -76,7 +76,7 @@ - + From owner-p4-projects@FreeBSD.ORG Mon Mar 24 18:42:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 071F21065675; Mon, 24 Mar 2008 18:42: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 B897A1065672 for ; Mon, 24 Mar 2008 18:42:29 +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 819508FC19 for ; Mon, 24 Mar 2008 18:42:29 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2OIgTsN088262 for ; Mon, 24 Mar 2008 18:42:29 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2OIgTAh088260 for perforce@freebsd.org; Mon, 24 Mar 2008 18:42:29 GMT (envelope-from sam@freebsd.org) Date: Mon, 24 Mar 2008 18:42:29 GMT Message-Id: <200803241842.m2OIgTAh088260@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 138453 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Mar 2008 18:42:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=138453 Change 138453 by sam@sam_ebb on 2008/03/24 18:41:42 IFC @ 138452 Affected files ... .. //depot/projects/vap/bin/sh/options.c#3 integrate .. //depot/projects/vap/contrib/bzip2/CHANGES#3 integrate .. //depot/projects/vap/contrib/bzip2/FREEBSD-upgrade#3 integrate .. //depot/projects/vap/contrib/bzip2/FREEBSD-vendor#1 branch .. //depot/projects/vap/contrib/bzip2/LICENSE#3 integrate .. //depot/projects/vap/contrib/bzip2/Makefile#3 integrate .. //depot/projects/vap/contrib/bzip2/Makefile-libbz2_so#3 integrate .. //depot/projects/vap/contrib/bzip2/README#3 integrate .. //depot/projects/vap/contrib/bzip2/README.COMPILATION.PROBLEMS#3 integrate .. //depot/projects/vap/contrib/bzip2/blocksort.c#3 integrate .. //depot/projects/vap/contrib/bzip2/bzip2.c#3 integrate .. //depot/projects/vap/contrib/bzip2/bzip2recover.c#3 integrate .. //depot/projects/vap/contrib/bzip2/bzlib.c#3 integrate .. //depot/projects/vap/contrib/bzip2/bzlib.h#3 integrate .. //depot/projects/vap/contrib/bzip2/bzlib_private.h#3 integrate .. //depot/projects/vap/contrib/bzip2/compress.c#3 integrate .. //depot/projects/vap/contrib/bzip2/crctable.c#3 integrate .. //depot/projects/vap/contrib/bzip2/decompress.c#3 integrate .. //depot/projects/vap/contrib/bzip2/huffman.c#3 integrate .. //depot/projects/vap/contrib/bzip2/randtable.c#3 integrate .. //depot/projects/vap/contrib/bzip2/spewG.c#3 integrate .. //depot/projects/vap/contrib/bzip2/unzcrash.c#3 integrate .. //depot/projects/vap/include/pthread.h#3 integrate .. //depot/projects/vap/include/time.h#3 integrate .. //depot/projects/vap/lib/libarchive/Makefile#6 integrate .. //depot/projects/vap/lib/libfetch/common.c#5 integrate .. //depot/projects/vap/lib/libthr/pthread.map#7 integrate .. //depot/projects/vap/lib/libthr/thread/Makefile.inc#4 integrate .. //depot/projects/vap/lib/libthr/thread/thr_getcpuclockid.c#1 branch .. //depot/projects/vap/lib/libthr/thread/thr_mutexattr.c#3 integrate .. //depot/projects/vap/lib/libthr/thread/thr_rtld.c#3 integrate .. //depot/projects/vap/lib/libthread_db/Makefile#4 integrate .. //depot/projects/vap/lib/libthread_db/kse.h#1 branch .. //depot/projects/vap/lib/libthread_db/libc_r_db.c#3 integrate .. //depot/projects/vap/lib/libthread_db/libpthread_db.c#3 integrate .. //depot/projects/vap/lib/libthread_db/libthr_db.c#3 integrate .. //depot/projects/vap/lib/libthread_db/thread_db.c#3 integrate .. //depot/projects/vap/release/doc/en_US.ISO8859-1/relnotes/article.sgml#6 integrate .. //depot/projects/vap/sbin/bsdlabel/bsdlabel.c#4 integrate .. //depot/projects/vap/sbin/devd/token.l#3 integrate .. //depot/projects/vap/sbin/dhclient/dhclient.c#7 integrate .. //depot/projects/vap/sbin/newfs/newfs.8#4 integrate .. //depot/projects/vap/sbin/route/route.c#3 integrate .. //depot/projects/vap/share/man/man4/bpf.4#3 integrate .. //depot/projects/vap/share/man/man4/man4.i386/streams.4#4 integrate .. //depot/projects/vap/sys/amd64/amd64/cpu_switch.S#5 integrate .. //depot/projects/vap/sys/amd64/amd64/genassym.c#5 integrate .. //depot/projects/vap/sys/amd64/amd64/nexus.c#7 integrate .. //depot/projects/vap/sys/amd64/amd64/pmap.c#9 integrate .. //depot/projects/vap/sys/amd64/ia32/ia32_signal.c#6 integrate .. //depot/projects/vap/sys/amd64/include/pcb.h#5 integrate .. //depot/projects/vap/sys/amd64/isa/atpic.c#7 integrate .. //depot/projects/vap/sys/arm/arm/elf_trampoline.c#3 integrate .. //depot/projects/vap/sys/arm/conf/AVILA#6 integrate .. //depot/projects/vap/sys/arm/conf/AVILA.hints#3 integrate .. //depot/projects/vap/sys/arm/xscale/ixp425/if_npe.c#4 integrate .. //depot/projects/vap/sys/arm/xscale/ixp425/ixdp425_pci.c#3 integrate .. //depot/projects/vap/sys/compat/linux/linux_futex.c#4 integrate .. //depot/projects/vap/sys/compat/linux/linux_futex.h#3 integrate .. //depot/projects/vap/sys/conf/NOTES#11 integrate .. //depot/projects/vap/sys/conf/files#26 integrate .. //depot/projects/vap/sys/conf/options#16 integrate .. //depot/projects/vap/sys/dev/aac/aac.c#8 integrate .. //depot/projects/vap/sys/dev/ata/ata-raid.c#6 integrate .. //depot/projects/vap/sys/dev/ath/if_ath.c#48 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_main.c#7 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_offload.h#4 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_sge.c#7 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#4 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#5 integrate .. //depot/projects/vap/sys/dev/dc/if_dc.c#3 integrate .. //depot/projects/vap/sys/dev/dc/if_dcreg.h#3 integrate .. //depot/projects/vap/sys/dev/drm/drm_pciids.h#7 integrate .. //depot/projects/vap/sys/dev/drm/i915_dma.c#5 integrate .. //depot/projects/vap/sys/dev/fxp/if_fxp.c#6 integrate .. //depot/projects/vap/sys/dev/gem/if_gem.c#8 integrate .. //depot/projects/vap/sys/dev/gem/if_gem_pci.c#7 integrate .. //depot/projects/vap/sys/dev/gem/if_gemreg.h#6 integrate .. //depot/projects/vap/sys/dev/gem/if_gemvar.h#6 integrate .. //depot/projects/vap/sys/dev/mfi/mfi.c#5 integrate .. //depot/projects/vap/sys/dev/re/if_re.c#9 integrate .. //depot/projects/vap/sys/dev/syscons/syscons.c#8 integrate .. //depot/projects/vap/sys/dev/usb/ehci.c#10 integrate .. //depot/projects/vap/sys/dev/usb/if_rum.c#13 integrate .. //depot/projects/vap/sys/dev/usb/ohci.c#6 integrate .. //depot/projects/vap/sys/dev/usb/usbdevs#10 integrate .. //depot/projects/vap/sys/dev/usb/usbdi.c#7 integrate .. //depot/projects/vap/sys/dev/usb/usbdi.h#6 integrate .. //depot/projects/vap/sys/dev/usb/usbdivar.h#5 integrate .. //depot/projects/vap/sys/fs/devfs/devfs_rule.c#6 integrate .. //depot/projects/vap/sys/fs/msdosfs/msdosfs_vfsops.c#8 integrate .. //depot/projects/vap/sys/geom/geom.h#5 integrate .. //depot/projects/vap/sys/geom/geom_subr.c#6 integrate .. //depot/projects/vap/sys/geom/part/g_part.c#4 integrate .. //depot/projects/vap/sys/geom/part/g_part.h#4 integrate .. //depot/projects/vap/sys/geom/part/g_part_apm.c#3 integrate .. //depot/projects/vap/sys/geom/part/g_part_bsd.c#2 integrate .. //depot/projects/vap/sys/geom/part/g_part_gpt.c#3 integrate .. //depot/projects/vap/sys/geom/part/g_part_mbr.c#5 integrate .. //depot/projects/vap/sys/geom/part/g_part_vtoc8.c#2 integrate .. //depot/projects/vap/sys/i386/i386/nexus.c#7 integrate .. //depot/projects/vap/sys/i386/i386/pmap.c#8 integrate .. //depot/projects/vap/sys/i386/isa/atpic.c#6 integrate .. //depot/projects/vap/sys/kern/bus_if.m#5 integrate .. //depot/projects/vap/sys/kern/kern_exit.c#9 integrate .. //depot/projects/vap/sys/kern/kern_fork.c#7 integrate .. //depot/projects/vap/sys/kern/kern_sig.c#10 integrate .. //depot/projects/vap/sys/kern/kern_switch.c#8 integrate .. //depot/projects/vap/sys/kern/kern_thr.c#7 integrate .. //depot/projects/vap/sys/kern/kern_thread.c#10 integrate .. //depot/projects/vap/sys/kern/kern_timeout.c#8 integrate .. //depot/projects/vap/sys/kern/sched_4bsd.c#10 integrate .. //depot/projects/vap/sys/kern/sched_ule.c#11 integrate .. //depot/projects/vap/sys/kern/subr_bus.c#10 integrate .. //depot/projects/vap/sys/kern/subr_sleepqueue.c#10 integrate .. //depot/projects/vap/sys/kern/subr_trap.c#8 integrate .. //depot/projects/vap/sys/kern/vfs_bio.c#11 integrate .. //depot/projects/vap/sys/kern/vfs_cluster.c#6 integrate .. //depot/projects/vap/sys/kern/vfs_default.c#10 integrate .. //depot/projects/vap/sys/kern/vfs_mount.c#9 integrate .. //depot/projects/vap/sys/kern/vfs_subr.c#12 integrate .. //depot/projects/vap/sys/kern/vfs_vnops.c#7 integrate .. //depot/projects/vap/sys/modules/geom/geom_part/Makefile#2 integrate .. //depot/projects/vap/sys/modules/geom/geom_part/geom_part_apm/Makefile#1 branch .. //depot/projects/vap/sys/modules/geom/geom_part/geom_part_bsd/Makefile#1 branch .. //depot/projects/vap/sys/modules/geom/geom_part/geom_part_gpt/Makefile#1 branch .. //depot/projects/vap/sys/modules/geom/geom_part/geom_part_mbr/Makefile#1 branch .. //depot/projects/vap/sys/modules/geom/geom_part/geom_part_vtoc8/Makefile#1 branch .. //depot/projects/vap/sys/net/bpf.c#9 integrate .. //depot/projects/vap/sys/net/bpf.h#6 integrate .. //depot/projects/vap/sys/net/bpf_buffer.c#1 branch .. //depot/projects/vap/sys/net/bpf_buffer.h#1 branch .. //depot/projects/vap/sys/net/bpf_zerocopy.c#1 branch .. //depot/projects/vap/sys/net/bpf_zerocopy.h#1 branch .. //depot/projects/vap/sys/net/bpfdesc.h#5 integrate .. //depot/projects/vap/sys/net/if_ethersubr.c#7 integrate .. //depot/projects/vap/sys/net/if_gre.c#6 integrate .. //depot/projects/vap/sys/netgraph/ng_tee.c#6 integrate .. //depot/projects/vap/sys/netinet/in_pcb.c#9 integrate .. //depot/projects/vap/sys/netinet/in_pcb.h#6 integrate .. //depot/projects/vap/sys/netipsec/key.c#7 integrate .. //depot/projects/vap/sys/netipsec/xform_tcp.c#5 integrate .. //depot/projects/vap/sys/nfs4client/nfs4_vfsops.c#9 integrate .. //depot/projects/vap/sys/nfs4client/nfs4_vnops.c#9 integrate .. //depot/projects/vap/sys/nfsclient/nfs_subs.c#10 integrate .. //depot/projects/vap/sys/nfsclient/nfs_vfsops.c#10 integrate .. //depot/projects/vap/sys/nfsclient/nfs_vnops.c#9 integrate .. //depot/projects/vap/sys/nfsserver/nfs_serv.c#8 integrate .. //depot/projects/vap/sys/pci/if_rlreg.h#8 integrate .. //depot/projects/vap/sys/pci/if_xl.c#6 integrate .. //depot/projects/vap/sys/pci/if_xlreg.h#6 integrate .. //depot/projects/vap/sys/sparc64/include/bus.h#6 integrate .. //depot/projects/vap/sys/sparc64/sparc64/bus_machdep.c#5 integrate .. //depot/projects/vap/sys/sys/aac_ioctl.h#3 integrate .. //depot/projects/vap/sys/sys/buf.h#11 integrate .. //depot/projects/vap/sys/sys/bufobj.h#7 integrate .. //depot/projects/vap/sys/sys/bus.h#8 integrate .. //depot/projects/vap/sys/sys/param.h#13 integrate .. //depot/projects/vap/sys/sys/proc.h#12 integrate .. //depot/projects/vap/sys/sys/runq.h#5 integrate .. //depot/projects/vap/sys/sys/sched.h#8 integrate .. //depot/projects/vap/sys/sys/sysctl.h#7 integrate .. //depot/projects/vap/sys/sys/vnode.h#9 integrate .. //depot/projects/vap/sys/ufs/ffs/ffs_inode.c#6 integrate .. //depot/projects/vap/sys/ufs/ffs/ffs_rawread.c#8 integrate .. //depot/projects/vap/sys/ufs/ffs/ffs_softdep.c#10 integrate .. //depot/projects/vap/sys/ufs/ffs/ffs_vfsops.c#10 integrate .. //depot/projects/vap/sys/ufs/ffs/ffs_vnops.c#10 integrate .. //depot/projects/vap/sys/vm/vm_mmap.c#8 integrate .. //depot/projects/vap/sys/vm/vm_page.c#8 integrate .. //depot/projects/vap/sys/vm/vm_page.h#6 integrate .. //depot/projects/vap/sys/vm/vm_pageout.c#6 integrate .. //depot/projects/vap/tools/build/mk/OptionalObsoleteFiles.inc#6 integrate .. //depot/projects/vap/tools/regression/bin/sh/builtins/getopts1.0#1 branch .. //depot/projects/vap/tools/regression/bin/sh/builtins/getopts1.0.stdout#1 branch .. //depot/projects/vap/tools/tools/README#3 integrate .. //depot/projects/vap/tools/tools/net80211/wlanwatch/wlanwatch.c#6 integrate .. //depot/projects/vap/tools/tools/tinybsd/tinybsd#4 integrate .. //depot/projects/vap/tools/tools/track/Makefile#1 branch .. //depot/projects/vap/tools/tools/track/track.sh#1 branch .. //depot/projects/vap/usr.bin/ktrace/ktrace.c#3 integrate .. //depot/projects/vap/usr.bin/make/for.c#3 integrate .. //depot/projects/vap/usr.bin/make/make.1#5 integrate .. //depot/projects/vap/usr.bin/netstat/bpf.c#4 integrate .. //depot/projects/vap/usr.sbin/freebsd-update/freebsd-update.sh#3 integrate Differences ... ==== //depot/projects/vap/bin/sh/options.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/options.c,v 1.25 2006/04/09 12:20:42 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/options.c,v 1.26 2008/03/22 14:06:01 stefanf Exp $"); #include #include @@ -383,7 +383,7 @@ } ap2 = shellparam.p; while ((*ap2++ = *ap1++) != NULL); - shellparam.optnext = NULL; + shellparam.reset = 1; INTON; return 0; } @@ -405,6 +405,7 @@ if (*argptr != NULL) { setparam(argptr); } + shellparam.reset = 1; INTON; return 0; } @@ -414,7 +415,6 @@ getoptsreset(const char *value) { if (number(value) == 1) { - shellparam.optnext = NULL; shellparam.reset = 1; } } ==== //depot/projects/vap/contrib/bzip2/CHANGES#3 (text+ko) ==== @@ -2,8 +2,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -312,3 +312,8 @@ * Fix minor doc/comment bugs. + +1.0.5 (10 Dec 07) +~~~~~~~~~~~~~~~~~ +Security fix only. Fixes CERT-FI 20469 as it applies to bzip2. + ==== //depot/projects/vap/contrib/bzip2/FREEBSD-upgrade#3 (text+ko) ==== @@ -1,12 +1,12 @@ -$FreeBSD: src/contrib/bzip2/FREEBSD-upgrade,v 1.4 2007/03/30 16:33:05 delphij Exp $ +$FreeBSD: src/contrib/bzip2/FREEBSD-upgrade,v 1.5 2008/03/20 02:45:32 delphij Exp $ Julian Seward's bzip2 originals can be found at: http://www.bzip.org/downloads.html Imported by: - cvs import -m "Virgin import (trimmed) of Bzip2 version 1.0.4." \ - src/contrib/bzip2 BZIP2 v1_0_4 + cvs import -m "Virgin import (trimmed) of Bzip2 version 1.0.5." \ + src/contrib/bzip2 BZIP2 v1_0_5 Notes: The following log shows details of trimming: ==== //depot/projects/vap/contrib/bzip2/LICENSE#3 (text+ko) ==== @@ -2,7 +2,7 @@ -------------------------------------------------------------------------- This program, "bzip2", the associated library "libbzip2", and all -documentation, are copyright (C) 1996-2006 Julian R Seward. All +documentation, are copyright (C) 1996-2007 Julian R Seward. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -36,8 +36,7 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -Julian Seward, Cambridge, UK. -jseward@bzip.org -bzip2/libbzip2 version 1.0.4 of 20 December 2006 +Julian Seward, jseward@bzip.org +bzip2/libbzip2 version 1.0.5 of 10 December 2007 -------------------------------------------------------------------------- ==== //depot/projects/vap/contrib/bzip2/Makefile#3 (text+ko) ==== @@ -2,8 +2,8 @@ # This file is part of bzip2/libbzip2, a program and library for # lossless, block-sorting data compression. # -# bzip2/libbzip2 version 1.0.4 of 20 December 2006 -# Copyright (C) 1996-2006 Julian Seward +# bzip2/libbzip2 version 1.0.5 of 10 December 2007 +# Copyright (C) 1996-2007 Julian Seward # # Please read the WARNING, DISCLAIMER and PATENTS sections in the # README file. @@ -137,7 +137,7 @@ distclean: clean rm -f manual.ps manual.html manual.pdf -DISTNAME=bzip2-1.0.4 +DISTNAME=bzip2-1.0.5 dist: check manual rm -f $(DISTNAME) ln -s -f . $(DISTNAME) ==== //depot/projects/vap/contrib/bzip2/Makefile-libbz2_so#3 (text+ko) ==== @@ -10,8 +10,8 @@ # This file is part of bzip2/libbzip2, a program and library for # lossless, block-sorting data compression. # -# bzip2/libbzip2 version 1.0.4 of 20 December 2006 -# Copyright (C) 1996-2006 Julian Seward +# bzip2/libbzip2 version 1.0.5 of 10 December 2007 +# Copyright (C) 1996-2007 Julian Seward # # Please read the WARNING, DISCLAIMER and PATENTS sections in the # README file. ==== //depot/projects/vap/contrib/bzip2/README#3 (text+ko) ==== @@ -6,8 +6,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. -bzip2/libbzip2 version 1.0.4 of 20 December 2006 -Copyright (C) 1996-2006 Julian Seward +bzip2/libbzip2 version 1.0.5 of 10 December 2007 +Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in this file. @@ -177,7 +177,11 @@ See the CHANGES file. +WHAT'S NEW IN 1.0.5 ? + See the CHANGES file. + + I hope you find bzip2 useful. Feel free to contact me at jseward@bzip.org if you have any suggestions or queries. Many people mailed me with @@ -203,3 +207,4 @@ 30 December 2001 (bzip2, version 1.0.2pre1) 15 February 2005 (bzip2, version 1.0.3) 20 December 2006 (bzip2, version 1.0.4) +10 December 2007 (bzip2, version 1.0.5) ==== //depot/projects/vap/contrib/bzip2/README.COMPILATION.PROBLEMS#3 (text+ko) ==== @@ -2,8 +2,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. -bzip2/libbzip2 version 1.0.4 of 20 December 2006 -Copyright (C) 1996-2006 Julian Seward +bzip2/libbzip2 version 1.0.5 of 10 December 2007 +Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -12,7 +12,7 @@ in the file LICENSE. ------------------------------------------------------------------ -bzip2-1.0.4 should compile without problems on the vast majority of +bzip2-1.0.5 should compile without problems on the vast majority of platforms. Using the supplied Makefile, I've built and tested it myself for x86-linux and amd64-linux. With makefile.msc, Visual C++ 6.0 and nmake, you can build a native Win32 version too. Large file ==== //depot/projects/vap/contrib/bzip2/blocksort.c#3 (text+ko) ==== @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. ==== //depot/projects/vap/contrib/bzip2/bzip2.c#3 (text+ko) ==== @@ -7,8 +7,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -1605,11 +1605,11 @@ "bzip2, a block-sorting file compressor. " "Version %s.\n" " \n" - " Copyright (C) 1996-2006 by Julian Seward.\n" + " Copyright (C) 1996-2007 by Julian Seward.\n" " \n" " This program is free software; you can redistribute it and/or modify\n" " it under the terms set out in the LICENSE file, which is included\n" - " in the bzip2-1.0.4 source distribution.\n" + " in the bzip2-1.0.5 source distribution.\n" " \n" " This program is distributed in the hope that it will be useful,\n" " but WITHOUT ANY WARRANTY; without even the implied warranty of\n" ==== //depot/projects/vap/contrib/bzip2/bzip2recover.c#3 (text+ko) ==== @@ -7,8 +7,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -313,7 +313,7 @@ inFileName[0] = outFileName[0] = 0; fprintf ( stderr, - "bzip2recover 1.0.4: extracts blocks from damaged .bz2 files.\n" ); + "bzip2recover 1.0.5: extracts blocks from damaged .bz2 files.\n" ); if (argc != 2) { fprintf ( stderr, "%s: usage is `%s damaged_file_name'.\n", ==== //depot/projects/vap/contrib/bzip2/bzlib.c#3 (text+ko) ==== @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/contrib/bzip2/bzlib.c,v 1.3 2007/03/28 07:46:20 delphij Exp $"); +__FBSDID("$FreeBSD: src/contrib/bzip2/bzlib.c,v 1.4 2008/03/20 02:56:24 delphij Exp $"); #include "bzlib_private.h" @@ -52,7 +52,7 @@ "component, you should also report this bug to the author(s)\n" "of that program. Please make an effort to report this bug;\n" "timely and accurate bug reports eventually lead to higher\n" - "quality software. Thanks. Julian Seward, 15 February 2005.\n\n", + "quality software. Thanks. Julian Seward, 10 December 2007.\n\n", errcode, BZ2_bzlibVersion() ); @@ -605,6 +605,7 @@ UInt32 c_tPos = s->tPos; char* cs_next_out = s->strm->next_out; unsigned int cs_avail_out = s->strm->avail_out; + Int32 ro_blockSize100k = s->blockSize100k; /* end restore */ UInt32 avail_out_INIT = cs_avail_out; ==== //depot/projects/vap/contrib/bzip2/bzlib.h#3 (text+ko) ==== @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. ==== //depot/projects/vap/contrib/bzip2/bzlib_private.h#3 (text+ko) ==== @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -36,7 +36,7 @@ /*-- General stuff. --*/ -#define BZ_VERSION "1.0.4, 20-Dec-2006" +#define BZ_VERSION "1.0.5, 10-Dec-2007" typedef char Char; typedef unsigned char Bool; @@ -442,11 +442,15 @@ /*-- Macros for decompression. --*/ #define BZ_GET_FAST(cccc) \ + /* c_tPos is unsigned, hence test < 0 is pointless. */ \ + if (s->tPos >= (UInt32)100000 * (UInt32)s->blockSize100k) return True; \ s->tPos = s->tt[s->tPos]; \ cccc = (UChar)(s->tPos & 0xff); \ s->tPos >>= 8; #define BZ_GET_FAST_C(cccc) \ + /* c_tPos is unsigned, hence test < 0 is pointless. */ \ + if (c_tPos >= (UInt32)100000 * (UInt32)ro_blockSize100k) return True; \ c_tPos = c_tt[c_tPos]; \ cccc = (UChar)(c_tPos & 0xff); \ c_tPos >>= 8; @@ -469,8 +473,10 @@ (((UInt32)s->ll16[i]) | (GET_LL4(i) << 16)) #define BZ_GET_SMALL(cccc) \ - cccc = BZ2_indexIntoF ( s->tPos, s->cftab ); \ - s->tPos = GET_LL(s->tPos); + /* c_tPos is unsigned, hence test < 0 is pointless. */ \ + if (s->tPos >= (UInt32)100000 * (UInt32)s->blockSize100k) return True; \ + cccc = BZ2_indexIntoF ( s->tPos, s->cftab ); \ + s->tPos = GET_LL(s->tPos); /*-- externs for decompression. --*/ ==== //depot/projects/vap/contrib/bzip2/compress.c#3 (text+ko) ==== @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. ==== //depot/projects/vap/contrib/bzip2/crctable.c#3 (text+ko) ==== @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. ==== //depot/projects/vap/contrib/bzip2/decompress.c#3 (text+ko) ==== @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. ==== //depot/projects/vap/contrib/bzip2/huffman.c#3 (text+ko) ==== @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. ==== //depot/projects/vap/contrib/bzip2/randtable.c#3 (text+ko) ==== @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. ==== //depot/projects/vap/contrib/bzip2/spewG.c#3 (text+ko) ==== @@ -13,8 +13,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. ==== //depot/projects/vap/contrib/bzip2/unzcrash.c#3 (text+ko) ==== @@ -17,8 +17,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. ==== //depot/projects/vap/include/pthread.h#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/include/pthread.h,v 1.41 2007/10/29 21:01:47 kris Exp $ + * $FreeBSD: src/include/pthread.h,v 1.42 2008/03/22 09:59:20 davidxu Exp $ */ #ifndef _PTHREAD_H_ #define _PTHREAD_H_ @@ -185,6 +185,7 @@ int pthread_equal(pthread_t, pthread_t); void pthread_exit(void *) __dead2; void *pthread_getspecific(pthread_key_t); +int pthread_getcpuclockid(pthread_t, clockid_t *); int pthread_join(pthread_t, void **); int pthread_key_create(pthread_key_t *, void (*) (void *)); ==== //depot/projects/vap/include/time.h#3 (text+ko) ==== @@ -39,7 +39,7 @@ */ /* - * $FreeBSD: src/include/time.h,v 1.34 2006/04/15 03:08:55 jb Exp $ + * $FreeBSD: src/include/time.h,v 1.35 2008/03/22 09:59:20 davidxu Exp $ */ #ifndef _TIME_H_ @@ -108,6 +108,7 @@ #define CLOCK_MONOTONIC_PRECISE 11 /* FreeBSD-specific. */ #define CLOCK_MONOTONIC_FAST 12 /* FreeBSD-specific. */ #define CLOCK_SECOND 13 /* FreeBSD-specific. */ +#define CLOCK_THREAD_CPUTIME_ID 14 #endif /* !defined(CLOCK_REALTIME) && __POSIX_VISIBLE >= 200112 */ #if !defined(TIMER_ABSTIME) && __POSIX_VISIBLE >= 200112 ==== //depot/projects/vap/lib/libarchive/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/Makefile,v 1.82 2008/03/14 23:00:53 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/Makefile,v 1.83 2008/03/21 11:10:20 kaiw Exp $ LIB= archive DPADD= ${LIBBZ2} ${LIBZ} @@ -214,6 +214,7 @@ MLINKS+= archive_util.3 archive_format.3 MLINKS+= archive_util.3 archive_format_name.3 MLINKS+= archive_util.3 archive_set_error.3 +MLINKS+= archive_write.3 archive_write_close.3 MLINKS+= archive_write.3 archive_write_data.3 MLINKS+= archive_write.3 archive_write_finish.3 MLINKS+= archive_write.3 archive_write_finish_entry.3 ==== //depot/projects/vap/lib/libfetch/common.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libfetch/common.c,v 1.54 2008/02/08 09:48:48 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libfetch/common.c,v 1.55 2008/03/20 09:55:27 des Exp $"); #include #include @@ -377,7 +377,7 @@ ssize_t fetch_read(conn_t *conn, char *buf, size_t len) { - struct timeval now, timeout, wait; + struct timeval now, timeout, delta; fd_set readfds; ssize_t rlen, total; int r; @@ -393,19 +393,19 @@ while (fetchTimeout && !FD_ISSET(conn->sd, &readfds)) { FD_SET(conn->sd, &readfds); gettimeofday(&now, NULL); - wait.tv_sec = timeout.tv_sec - now.tv_sec; - wait.tv_usec = timeout.tv_usec - now.tv_usec; - if (wait.tv_usec < 0) { - wait.tv_usec += 1000000; - wait.tv_sec--; + delta.tv_sec = timeout.tv_sec - now.tv_sec; + delta.tv_usec = timeout.tv_usec - now.tv_usec; + if (delta.tv_usec < 0) { + delta.tv_usec += 1000000; + delta.tv_sec--; } - if (wait.tv_sec < 0) { + if (delta.tv_sec < 0) { errno = ETIMEDOUT; fetch_syserr(); return (-1); } errno = 0; - r = select(conn->sd + 1, &readfds, NULL, NULL, &wait); + r = select(conn->sd + 1, &readfds, NULL, NULL, &delta); if (r == -1) { if (errno == EINTR && fetchRestartCalls) continue; @@ -503,7 +503,7 @@ ssize_t fetch_writev(conn_t *conn, struct iovec *iov, int iovcnt) { - struct timeval now, timeout, wait; + struct timeval now, timeout, delta; fd_set writefds; ssize_t wlen, total; int r; @@ -519,19 +519,19 @@ while (fetchTimeout && !FD_ISSET(conn->sd, &writefds)) { FD_SET(conn->sd, &writefds); gettimeofday(&now, NULL); - wait.tv_sec = timeout.tv_sec - now.tv_sec; - wait.tv_usec = timeout.tv_usec - now.tv_usec; - if (wait.tv_usec < 0) { - wait.tv_usec += 1000000; - wait.tv_sec--; + delta.tv_sec = timeout.tv_sec - now.tv_sec; + delta.tv_usec = timeout.tv_usec - now.tv_usec; + if (delta.tv_usec < 0) { + delta.tv_usec += 1000000; + delta.tv_sec--; } - if (wait.tv_sec < 0) { + if (delta.tv_sec < 0) { errno = ETIMEDOUT; fetch_syserr(); return (-1); } errno = 0; - r = select(conn->sd + 1, NULL, &writefds, NULL, &wait); + r = select(conn->sd + 1, NULL, &writefds, NULL, &delta); if (r == -1) { if (errno == EINTR && fetchRestartCalls) continue; ==== //depot/projects/vap/lib/libthr/pthread.map#7 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libthr/pthread.map,v 1.28 2008/03/05 06:56:35 davidxu Exp $ + * $FreeBSD: src/lib/libthr/pthread.map,v 1.29 2008/03/22 09:59:20 davidxu Exp $ */ /* @@ -271,6 +271,7 @@ _pthread_exit; _pthread_getaffinity_np; _pthread_getconcurrency; + _pthread_getcpuclockid; _pthread_getprio; _pthread_getschedparam; _pthread_getspecific; @@ -395,6 +396,7 @@ pthread_attr_getaffinity_np; pthread_attr_setaffinity_np; pthread_getaffinity_np; + pthread_getcpuclockid; pthread_setaffinity_np; pthread_mutex_getspinloops_np; pthread_mutex_getyieldloops_np; ==== //depot/projects/vap/lib/libthr/thread/Makefile.inc#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libthr/thread/Makefile.inc,v 1.17 2008/03/03 09:16:29 davidxu Exp $ +# $FreeBSD: src/lib/libthr/thread/Makefile.inc,v 1.18 2008/03/22 09:59:20 davidxu Exp $ # thr sources .PATH: ${.CURDIR}/thread @@ -20,6 +20,7 @@ thr_exit.c \ thr_fork.c \ thr_getprio.c \ + thr_getcpuclockid.c \ thr_getschedparam.c \ thr_info.c \ thr_init.c \ ==== //depot/projects/vap/lib/libthr/thread/thr_mutexattr.c#3 (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/libthr/thread/thr_mutexattr.c,v 1.7 2007/01/12 07:26:20 imp Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_mutexattr.c,v 1.9 2008/03/20 11:47:08 ru Exp $ */ /* @@ -132,8 +132,7 @@ { int ret; if (attr == NULL || *attr == NULL || type >= PTHREAD_MUTEX_TYPE_MAX) { - errno = EINVAL; - ret = -1; + ret = EINVAL; } else { (*attr)->m_type = type; ret = 0; ==== //depot/projects/vap/lib/libthr/thread/thr_rtld.c#3 (text) ==== @@ -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/lib/libthr/thread/thr_rtld.c,v 1.4 2007/11/21 05:21:58 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_rtld.c,v 1.6 2008/03/21 02:31:55 davidxu Exp $ * */ @@ -36,6 +36,9 @@ #include "rtld_lock.h" #include "thr_private.h" +#undef errno +extern int errno; + #define CACHE_LINE_SIZE 64 #define WAFLAG 0x1 #define RC_INCR 0x2 @@ -88,20 +91,38 @@ free(l->base); } +#define SAVE_ERRNO() { \ + if (curthread != _thr_initial) \ + errsave = curthread->error; \ + else \ + errsave = errno; \ +} + +#define RESTORE_ERRNO() { \ + if (curthread != _thr_initial) \ + curthread->error = errsave; \ + else \ + errno = errsave; \ +} + static void _thr_rtld_rlock_acquire(void *lock) { struct pthread *curthread; struct rtld_lock *l; long v; + int errsave; curthread = _get_curthread(); + SAVE_ERRNO(); l = (struct rtld_lock *)lock; THR_CRITICAL_ENTER(curthread); atomic_add_acq_int(&l->lock, RC_INCR); - if (!(l->lock & WAFLAG)) + if (!(l->lock & WAFLAG)) { + RESTORE_ERRNO(); return; + } v = l->rd_cv; atomic_add_int(&l->rd_waiters, 1); while (l->lock & WAFLAG) { @@ -109,6 +130,7 @@ v = l->rd_cv; } atomic_add_int(&l->rd_waiters, -1); + RESTORE_ERRNO(); } static void @@ -117,14 +139,18 @@ struct pthread *curthread; struct rtld_lock *l; long v; + int errsave; curthread = _get_curthread(); + SAVE_ERRNO(); l = (struct rtld_lock *)lock; _thr_signal_block(curthread); for (;;) { - if (atomic_cmpset_acq_int(&l->lock, 0, WAFLAG)) + if (atomic_cmpset_acq_int(&l->lock, 0, WAFLAG)) { + RESTORE_ERRNO(); return; + } v = l->wr_cv; atomic_add_int(&l->wr_waiters, 1); while (l->lock != 0) { @@ -140,8 +166,10 @@ { struct pthread *curthread; struct rtld_lock *l; + int errsave; curthread = _get_curthread(); + SAVE_ERRNO(); l = (struct rtld_lock *)lock; if ((l->lock & WAFLAG) == 0) { @@ -162,6 +190,7 @@ } _thr_signal_unblock(curthread); } + RESTORE_ERRNO(); } static int @@ -191,6 +220,9 @@ /* force to resolve _umtx_op PLT */ _umtx_op((struct umtx *)&dummy, UMTX_OP_WAKE, 1, 0, 0); + + /* force to resolve errno() PLT */ + __error(); li.lock_create = _thr_rtld_lock_create; li.lock_destroy = _thr_rtld_lock_destroy; ==== //depot/projects/vap/lib/libthread_db/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libthread_db/Makefile,v 1.11 2008/03/12 09:49:39 jeff Exp $ +# $FreeBSD: src/lib/libthread_db/Makefile,v 1.12 2008/03/23 09:38:11 jeff Exp $ .PATH: ${.CURDIR}/arch/${MACHINE_ARCH} @@ -6,6 +6,7 @@ SHLIB_MAJOR= 3 SRCS= thread_db.c SRCS+= libpthread_md.c +SRCS+= libpthread_db.c SRCS+= libthr_db.c INCS= thread_db.h WARNS?= 1 ==== //depot/projects/vap/lib/libthread_db/libc_r_db.c#3 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Mar 24 19:59:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D42FD1065686; Mon, 24 Mar 2008 19:59: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 92A921065680 for ; Mon, 24 Mar 2008 19:59:49 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 788758FC22 for ; Mon, 24 Mar 2008 19:59:49 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2OJxnOP020170 for ; Mon, 24 Mar 2008 19:59:49 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2OJxmJ4020168 for perforce@freebsd.org; Mon, 24 Mar 2008 19:59:48 GMT (envelope-from jhb@freebsd.org) Date: Mon, 24 Mar 2008 19:59:48 GMT Message-Id: <200803241959.m2OJxmJ4020168@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 138459 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Mar 2008 19:59:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=138459 Change 138459 by jhb@jhb_mutex on 2008/03/24 19:59:34 IFC @138458 Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/cpu_switch.S#19 integrate .. //depot/projects/smpng/sys/amd64/amd64/genassym.c#21 integrate .. //depot/projects/smpng/sys/amd64/amd64/nexus.c#29 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#79 integrate .. //depot/projects/smpng/sys/amd64/ia32/ia32_signal.c#17 integrate .. //depot/projects/smpng/sys/amd64/include/pcb.h#12 integrate .. //depot/projects/smpng/sys/amd64/isa/atpic.c#18 integrate .. //depot/projects/smpng/sys/arm/arm/elf_trampoline.c#15 integrate .. //depot/projects/smpng/sys/arm/conf/AVILA#5 integrate .. //depot/projects/smpng/sys/arm/conf/AVILA.hints#2 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/if_npe.c#7 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixdp425_pci.c#2 integrate .. //depot/projects/smpng/sys/compat/linux/linux_futex.c#7 integrate .. //depot/projects/smpng/sys/compat/linux/linux_futex.h#3 integrate .. //depot/projects/smpng/sys/conf/NOTES#148 integrate .. //depot/projects/smpng/sys/conf/files#213 integrate .. //depot/projects/smpng/sys/conf/options#147 integrate .. //depot/projects/smpng/sys/dev/aac/aac.c#60 integrate .. //depot/projects/smpng/sys/dev/aac/aac_cam.c#24 integrate .. //depot/projects/smpng/sys/dev/aac/aac_debug.c#19 integrate .. //depot/projects/smpng/sys/dev/aac/aac_disk.c#24 integrate .. //depot/projects/smpng/sys/dev/aac/aac_pci.c#46 integrate .. //depot/projects/smpng/sys/dev/aac/aacvar.h#28 integrate .. //depot/projects/smpng/sys/dev/ata/ata-raid.c#52 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#55 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_main.c#9 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_offload.h#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_sge.c#8 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#4 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#4 integrate .. //depot/projects/smpng/sys/dev/dc/if_dc.c#16 integrate .. //depot/projects/smpng/sys/dev/dc/if_dcreg.h#8 integrate .. //depot/projects/smpng/sys/dev/drm/drm_pciids.h#8 integrate .. //depot/projects/smpng/sys/dev/drm/i915_dma.c#6 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#83 integrate .. //depot/projects/smpng/sys/dev/gem/if_gem.c#35 integrate .. //depot/projects/smpng/sys/dev/gem/if_gem_pci.c#24 integrate .. //depot/projects/smpng/sys/dev/gem/if_gemreg.h#6 integrate .. //depot/projects/smpng/sys/dev/gem/if_gemvar.h#16 integrate .. //depot/projects/smpng/sys/dev/mfi/mfi.c#21 integrate .. //depot/projects/smpng/sys/dev/re/if_re.c#59 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.c#62 integrate .. //depot/projects/smpng/sys/dev/usb/ehci.c#32 integrate .. //depot/projects/smpng/sys/dev/usb/if_rum.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/ohci.c#46 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#110 integrate .. //depot/projects/smpng/sys/dev/usb/usbdi.c#27 integrate .. //depot/projects/smpng/sys/dev/usb/usbdi.h#21 integrate .. //depot/projects/smpng/sys/dev/usb/usbdivar.h#19 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_rule.c#18 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#57 integrate .. //depot/projects/smpng/sys/geom/geom.h#51 integrate .. //depot/projects/smpng/sys/geom/geom_subr.c#51 integrate .. //depot/projects/smpng/sys/geom/part/g_part.c#7 integrate .. //depot/projects/smpng/sys/geom/part/g_part.h#4 integrate .. //depot/projects/smpng/sys/geom/part/g_part_apm.c#4 integrate .. //depot/projects/smpng/sys/geom/part/g_part_bsd.c#3 integrate .. //depot/projects/smpng/sys/geom/part/g_part_gpt.c#4 integrate .. //depot/projects/smpng/sys/geom/part/g_part_mbr.c#3 integrate .. //depot/projects/smpng/sys/geom/part/g_part_vtoc8.c#2 integrate .. //depot/projects/smpng/sys/i386/i386/nexus.c#30 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#122 integrate .. //depot/projects/smpng/sys/i386/isa/atpic.c#21 integrate .. //depot/projects/smpng/sys/kern/bus_if.m#15 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#129 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#112 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#138 integrate .. //depot/projects/smpng/sys/kern/kern_switch.c#72 integrate .. //depot/projects/smpng/sys/kern/kern_thr.c#44 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#106 integrate .. //depot/projects/smpng/sys/kern/kern_timeout.c#37 integrate .. //depot/projects/smpng/sys/kern/sched_4bsd.c#73 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#85 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#68 integrate .. //depot/projects/smpng/sys/kern/subr_sleepqueue.c#38 integrate .. //depot/projects/smpng/sys/kern/subr_trap.c#87 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#109 integrate .. //depot/projects/smpng/sys/kern/vfs_cluster.c#49 integrate .. //depot/projects/smpng/sys/kern/vfs_default.c#54 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#78 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#148 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#82 integrate .. //depot/projects/smpng/sys/modules/geom/geom_part/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/geom/geom_part/geom_part_apm/Makefile#1 branch .. //depot/projects/smpng/sys/modules/geom/geom_part/geom_part_bsd/Makefile#1 branch .. //depot/projects/smpng/sys/modules/geom/geom_part/geom_part_gpt/Makefile#1 branch .. //depot/projects/smpng/sys/modules/geom/geom_part/geom_part_mbr/Makefile#1 branch .. //depot/projects/smpng/sys/modules/geom/geom_part/geom_part_vtoc8/Makefile#1 branch .. //depot/projects/smpng/sys/net/bpf.c#74 integrate .. //depot/projects/smpng/sys/net/bpf.h#23 integrate .. //depot/projects/smpng/sys/net/bpf_buffer.c#1 branch .. //depot/projects/smpng/sys/net/bpf_buffer.h#1 branch .. //depot/projects/smpng/sys/net/bpf_zerocopy.c#1 branch .. //depot/projects/smpng/sys/net/bpf_zerocopy.h#1 branch .. //depot/projects/smpng/sys/net/bpfdesc.h#20 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#86 integrate .. //depot/projects/smpng/sys/net/if_gre.c#35 integrate .. //depot/projects/smpng/sys/netgraph/ng_tee.c#15 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#80 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.h#49 integrate .. //depot/projects/smpng/sys/netipsec/key.c#21 integrate .. //depot/projects/smpng/sys/netipsec/xform_tcp.c#5 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_vfsops.c#22 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_vnops.c#26 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_subs.c#34 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#63 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#70 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_serv.c#56 integrate .. //depot/projects/smpng/sys/pci/if_rlreg.h#40 integrate .. //depot/projects/smpng/sys/pci/if_xl.c#73 integrate .. //depot/projects/smpng/sys/pci/if_xlreg.h#21 integrate .. //depot/projects/smpng/sys/sparc64/include/bus.h#30 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/bus_machdep.c#32 integrate .. //depot/projects/smpng/sys/sys/aac_ioctl.h#2 integrate .. //depot/projects/smpng/sys/sys/buf.h#50 integrate .. //depot/projects/smpng/sys/sys/bufobj.h#10 integrate .. //depot/projects/smpng/sys/sys/bus.h#31 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#75 integrate .. //depot/projects/smpng/sys/sys/param.h#123 integrate .. //depot/projects/smpng/sys/sys/proc.h#185 integrate .. //depot/projects/smpng/sys/sys/runq.h#10 integrate .. //depot/projects/smpng/sys/sys/sched.h#29 integrate .. //depot/projects/smpng/sys/sys/sysctl.h#47 integrate .. //depot/projects/smpng/sys/sys/vnode.h#84 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_inode.c#27 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_rawread.c#22 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#69 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#99 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#58 integrate .. //depot/projects/smpng/sys/vm/vm_mmap.c#66 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/cpu_switch.S#19 (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.160 2007/08/22 05:06:14 jkoshy Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.161 2008/03/23 23:09:06 peter Exp $ */ #include @@ -69,16 +69,20 @@ * %rsi = newtd */ ENTRY(cpu_throw) + testq %rdi,%rdi + jnz 1f + movq PCPU(IDLETHREAD),%rdi +1: + movq TD_PCB(%rdi),%r8 /* Old pcb */ movl PCPU(CPUID), %eax - testq %rdi,%rdi /* no thread? */ - jz 1f + movq PCB_FSBASE(%r8),%r9 + movq PCB_GSBASE(%r8),%r10 /* release bit from old pm_active */ movq TD_PROC(%rdi), %rdx /* oldtd->td_proc */ movq P_VMSPACE(%rdx), %rdx /* proc->p_vmspace */ LK btrl %eax, VM_PMAP+PM_ACTIVE(%rdx) /* clear old */ -1: - movq TD_PCB(%rsi),%rdx /* newtd->td_proc */ - movq PCB_CR3(%rdx),%rdx + movq TD_PCB(%rsi),%r8 /* newtd->td_proc */ + movq PCB_CR3(%r8),%rdx movq %rdx,%cr3 /* new address space */ jmp swact END(cpu_throw) @@ -97,43 +101,24 @@ movq TD_PCB(%rdi),%r8 movq (%rsp),%rax /* Hardware registers */ + movq %r15,PCB_R15(%r8) + movq %r14,PCB_R14(%r8) + movq %r13,PCB_R13(%r8) + movq %r12,PCB_R12(%r8) + movq %rbp,PCB_RBP(%r8) + movq %rsp,PCB_RSP(%r8) + movq %rbx,PCB_RBX(%r8) movq %rax,PCB_RIP(%r8) - movq %rbx,PCB_RBX(%r8) - movq %rsp,PCB_RSP(%r8) - movq %rbp,PCB_RBP(%r8) - movq %r12,PCB_R12(%r8) - movq %r13,PCB_R13(%r8) - movq %r14,PCB_R14(%r8) - movq %r15,PCB_R15(%r8) + movq PCB_FSBASE(%r8),%r9 + movq PCB_GSBASE(%r8),%r10 testl $PCB_32BIT,PCB_FLAGS(%r8) - jz 1f /* no, skip over */ - - /* Save userland %gs */ - movl %gs,PCB_GS(%r8) - movq PCB_GS32P(%r8),%rax - movq (%rax),%rax - movq %rax,PCB_GS32SD(%r8) + jnz store_gs /* static predict not taken */ +done_store_gs: -1: - /* Test if debug registers should be saved. */ testl $PCB_DBREGS,PCB_FLAGS(%r8) - jz 1f /* no, skip over */ - movq %dr7,%rax /* yes, do the save */ - movq %rax,PCB_DR7(%r8) - andq $0x0000fc00, %rax /* disable all watchpoints */ - movq %rax,%dr7 - movq %dr6,%rax - movq %rax,PCB_DR6(%r8) - movq %dr3,%rax - movq %rax,PCB_DR3(%r8) - movq %dr2,%rax - movq %rax,PCB_DR2(%r8) - movq %dr1,%rax - movq %rax,PCB_DR1(%r8) - movq %dr0,%rax - movq %rax,PCB_DR0(%r8) -1: + jnz store_dr /* static predict not taken */ +done_store_dr: /* have we used fp, and need a save? */ cmpq %rdi,PCPU(FPCURTHREAD) @@ -181,82 +166,138 @@ cmpq %rcx, %rdx pause je 1b - lfence #endif /* * At this point, we've switched address spaces and are ready * to load up the rest of the next context. */ - movq TD_PCB(%rsi),%r8 + + /* Skip loading user fsbase/gsbase for kthreads */ + testl $TDP_KTHREAD,TD_PFLAGS(%rsi) + jnz do_kthread + cmpq PCB_FSBASE(%r8),%r9 + jz 1f /* Restore userland %fs */ movl $MSR_FSBASE,%ecx movl PCB_FSBASE(%r8),%eax movl PCB_FSBASE+4(%r8),%edx wrmsr +1: + cmpq PCB_GSBASE(%r8),%r10 + jz 2f /* Restore userland %gs */ movl $MSR_KGSBASE,%ecx movl PCB_GSBASE(%r8),%eax movl PCB_GSBASE+4(%r8),%edx wrmsr +2: +do_tss: /* Update the TSS_RSP0 pointer for the next interrupt */ movq PCPU(TSSP), %rax + movq %r8, PCPU(RSP0) + movq %r8, PCPU(CURPCB) addq $COMMON_TSS_RSP0, %rax - leaq -16(%r8), %rbx - movq %rbx, (%rax) - movq %rbx, PCPU(RSP0) + movq %rsi, PCPU(CURTHREAD) /* into next thread */ + movq %r8, (%rax) - movq %r8, PCPU(CURPCB) - movq %rsi, PCPU(CURTHREAD) /* into next thread */ + /* Test if debug registers should be restored. */ + testl $PCB_DBREGS,PCB_FLAGS(%r8) + jnz load_dr /* static predict not taken */ +done_load_dr: testl $PCB_32BIT,PCB_FLAGS(%r8) - jz 1f /* no, skip over */ + jnz load_gs /* static predict not taken */ +done_load_gs: + + /* Restore context. */ + movq PCB_R15(%r8),%r15 + movq PCB_R14(%r8),%r14 + movq PCB_R13(%r8),%r13 + movq PCB_R12(%r8),%r12 + movq PCB_RBP(%r8),%rbp + movq PCB_RSP(%r8),%rsp + movq PCB_RBX(%r8),%rbx + movq PCB_RIP(%r8),%rax + movq %rax,(%rsp) + ret + + /* + * We order these strangely for several reasons. + * 1: I wanted to use static branch prediction hints + * 2: Most athlon64/opteron cpus don't have them. They define + * a forward branch as 'predict not taken'. Intel cores have + * the 'rep' prefix to invert this. + * So, to make it work on both forms of cpu we do the detour. + * We use jumps rather than call in order to avoid the stack. + */ + +do_kthread: + /* + * Copy old fs/gsbase to new kthread pcb for future switches + * This maintains curpcb->pcb_[fg]sbase as caches of the MSR + */ + movq %r9,PCB_FSBASE(%r8) + movq %r10,PCB_GSBASE(%r8) + jmp do_tss + +store_gs: + movl %gs,PCB_GS(%r8) + movq PCB_GS32P(%r8),%rax + movq (%rax),%rax + movq %rax,PCB_GS32SD(%r8) + jmp done_store_gs +load_gs: /* Restore userland %gs while preserving kernel gsbase */ movq PCB_GS32P(%r8),%rax - movq PCB_GS32SD(%r8),%rbx - movq %rbx,(%rax) + movq PCB_GS32SD(%r8),%rcx + movq %rcx,(%rax) movl $MSR_GSBASE,%ecx rdmsr movl PCB_GS(%r8),%gs wrmsr + jmp done_load_gs -1: - /* Restore context. */ - movq PCB_RBX(%r8),%rbx - movq PCB_RSP(%r8),%rsp - movq PCB_RBP(%r8),%rbp - movq PCB_R12(%r8),%r12 - movq PCB_R13(%r8),%r13 - movq PCB_R14(%r8),%r14 - movq PCB_R15(%r8),%r15 - movq PCB_RIP(%r8),%rax - movq %rax,(%rsp) +store_dr: + movq %dr7,%rax /* yes, do the save */ + movq %dr0,%r15 + movq %dr1,%r14 + movq %dr2,%r13 + movq %dr3,%r12 + movq %dr6,%r11 + andq $0x0000fc00, %rax /* disable all watchpoints */ + movq %r15,PCB_DR0(%r8) + movq %r14,PCB_DR1(%r8) + movq %r13,PCB_DR2(%r8) + movq %r12,PCB_DR3(%r8) + movq %r11,PCB_DR6(%r8) + movq %rax,PCB_DR7(%r8) + movq %rax,%dr7 + jmp done_store_dr - /* Test if debug registers should be restored. */ - testl $PCB_DBREGS,PCB_FLAGS(%r8) - jz 1f - movq PCB_DR6(%r8),%rax - movq %rax,%dr6 - movq PCB_DR3(%r8),%rax - movq %rax,%dr3 - movq PCB_DR2(%r8),%rax - movq %rax,%dr2 - movq PCB_DR1(%r8),%rax - movq %rax,%dr1 - movq PCB_DR0(%r8),%rax - movq %rax,%dr0 - /* But preserve reserved bits in %dr7 */ +load_dr: movq %dr7,%rax + movq PCB_DR0(%r8),%r15 + movq PCB_DR1(%r8),%r14 + movq PCB_DR2(%r8),%r13 + movq PCB_DR3(%r8),%r12 + movq PCB_DR6(%r8),%r11 + movq PCB_DR7(%r8),%rcx + movq %r15,%dr0 + movq %r14,%dr1 + /* Preserve reserved bits in %dr7 */ andq $0x0000fc00,%rax - movq PCB_DR7(%r8),%rcx andq $~0x0000fc00,%rcx + movq %r13,%dr2 + movq %r12,%dr3 orq %rcx,%rax + movq %r11,%dr6 movq %rax,%dr7 -1: - ret + jmp done_load_dr + END(cpu_switch) /* ==== //depot/projects/smpng/sys/amd64/amd64/genassym.c#21 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.166 2007/11/23 03:03:29 jkoshy Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.167 2008/03/23 22:46:37 peter Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" @@ -86,6 +86,7 @@ ASSYM(TDF_NEEDRESCHED, TDF_NEEDRESCHED); ASSYM(TDP_CALLCHAIN, TDP_CALLCHAIN); +ASSYM(TDP_KTHREAD, TDP_KTHREAD); ASSYM(V_TRAP, offsetof(struct vmmeter, v_trap)); ASSYM(V_SYSCALL, offsetof(struct vmmeter, v_syscall)); ==== //depot/projects/smpng/sys/amd64/amd64/nexus.c#29 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.79 2008/03/13 20:39:03 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.80 2008/03/20 21:24:32 jhb Exp $"); /* * This code implements a `root nexus' for Intel Architecture @@ -87,6 +87,9 @@ int unit); static struct resource *nexus_alloc_resource(device_t, device_t, int, int *, u_long, u_long, u_long, u_int); +#ifdef SMP +static int nexus_bind_intr(device_t, device_t, struct resource *, int); +#endif static int nexus_config_intr(device_t, int, enum intr_trigger, enum intr_polarity); static int nexus_activate_resource(device_t, device_t, int, int, @@ -128,6 +131,9 @@ DEVMETHOD(bus_deactivate_resource, nexus_deactivate_resource), DEVMETHOD(bus_setup_intr, nexus_setup_intr), DEVMETHOD(bus_teardown_intr, nexus_teardown_intr), +#ifdef SMP + DEVMETHOD(bus_bind_intr, nexus_bind_intr), +#endif DEVMETHOD(bus_config_intr, nexus_config_intr), DEVMETHOD(bus_get_resource_list, nexus_get_reslist), DEVMETHOD(bus_set_resource, nexus_set_resource), @@ -458,6 +464,14 @@ return (intr_remove_handler(ih)); } +#ifdef SMP +static int +nexus_bind_intr(device_t dev, device_t child, struct resource *irq, int cpu) +{ + return (intr_bind(rman_get_start(irq), cpu)); +} +#endif + static int nexus_config_intr(device_t dev, int irq, enum intr_trigger trig, enum intr_polarity pol) ==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#79 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.606 2008/03/04 18:50:15 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.609 2008/03/23 23:04:09 alc Exp $"); /* * Manages physical address maps. @@ -1861,12 +1861,8 @@ ("pmap_collect: wired pte %#lx", tpte)); if (tpte & PG_A) vm_page_flag_set(m, PG_REFERENCED); - if (tpte & PG_M) { - KASSERT((tpte & PG_RW), - ("pmap_collect: modified page not writable: va: %#lx, pte: %#lx", - va, tpte)); + if ((tpte & (PG_M | PG_RW)) == (PG_M | PG_RW)) vm_page_dirty(m); - } free = NULL; pmap_unuse_pt(pmap, va, *pde, &free); pmap_invalidate_page(pmap, va); @@ -2311,12 +2307,8 @@ eva = sva + NBPDR; for (va = sva, m = PHYS_TO_VM_PAGE(oldpde & PG_FRAME); va < eva; va += PAGE_SIZE, m++) { - if (oldpde & PG_M) { - KASSERT((oldpde & PG_RW) != 0, - ("pmap_remove_pde: modified 2mpage not writable: va: %#lx, pde: %#lx", - va, oldpde)); + if ((oldpde & (PG_M | PG_RW)) == (PG_M | PG_RW)) vm_page_dirty(m); - } if (oldpde & PG_A) vm_page_flag_set(m, PG_REFERENCED); if (TAILQ_EMPTY(&m->md.pv_list) && @@ -2364,12 +2356,8 @@ pmap->pm_stats.resident_count -= 1; if (oldpte & PG_MANAGED) { m = PHYS_TO_VM_PAGE(oldpte & PG_FRAME); - if (oldpte & PG_M) { - KASSERT((oldpte & PG_RW), - ("pmap_remove_pte: modified page not writable: va: %#lx, pte: %#lx", - va, oldpte)); + if ((oldpte & (PG_M | PG_RW)) == (PG_M | PG_RW)) vm_page_dirty(m); - } if (oldpte & PG_A) vm_page_flag_set(m, PG_REFERENCED); pmap_remove_entry(pmap, m, va); @@ -2444,12 +2432,16 @@ pml4e = pmap_pml4e(pmap, sva); if ((*pml4e & PG_V) == 0) { va_next = (sva + NBPML4) & ~PML4MASK; + if (va_next < sva) + va_next = eva; continue; } pdpe = pmap_pml4e_to_pdpe(pml4e, sva); if ((*pdpe & PG_V) == 0) { va_next = (sva + NBPDP) & ~PDPMASK; + if (va_next < sva) + va_next = eva; continue; } @@ -2457,6 +2449,8 @@ * Calculate index for next page table. */ va_next = (sva + NBPDR) & ~PDRMASK; + if (va_next < sva) + va_next = eva; pde = pmap_pdpe_to_pde(pdpe, sva); ptpaddr = *pde; @@ -2575,12 +2569,8 @@ /* * Update the vm_page_t clean and reference bits. */ - if (tpte & PG_M) { - KASSERT((tpte & PG_RW), - ("pmap_remove_all: modified page not writable: va: %#lx, pte: %#lx", - pv->pv_va, tpte)); + if ((tpte & (PG_M | PG_RW)) == (PG_M | PG_RW)) vm_page_dirty(m); - } free = NULL; pmap_unuse_pt(pmap, pv->pv_va, *pde, &free); pmap_invalidate_page(pmap, pv->pv_va); @@ -2621,7 +2611,7 @@ * page mapping with a stored page table page has PG_A * set. */ - if ((oldpde & PG_M) != 0) + if ((oldpde & (PG_M | PG_RW)) == (PG_M | PG_RW)) vm_page_dirty(m); } } @@ -2672,16 +2662,22 @@ pml4e = pmap_pml4e(pmap, sva); if ((*pml4e & PG_V) == 0) { va_next = (sva + NBPML4) & ~PML4MASK; + if (va_next < sva) + va_next = eva; continue; } pdpe = pmap_pml4e_to_pdpe(pml4e, sva); if ((*pdpe & PG_V) == 0) { va_next = (sva + NBPDP) & ~PDPMASK; + if (va_next < sva) + va_next = eva; continue; } va_next = (sva + NBPDR) & ~PDRMASK; + if (va_next < sva) + va_next = eva; pde = pmap_pdpe_to_pde(pdpe, sva); ptpaddr = *pde; @@ -2733,7 +2729,7 @@ vm_page_flag_set(m, PG_REFERENCED); pbits &= ~PG_A; } - if ((pbits & PG_M) != 0) { + if ((pbits & (PG_M | PG_RW)) == (PG_M | PG_RW)) { if (m == NULL) m = PHYS_TO_VM_PAGE(pbits & PG_FRAME); @@ -2806,12 +2802,15 @@ return; } if ((oldpte & (PG_M | PG_RW)) == PG_RW) { + /* + * When PG_M is already clear, PG_RW can be cleared + * without a TLB invalidation. + */ if (!atomic_cmpset_long(pte, oldpte, oldpte & ~PG_RW)) goto retry; oldpte &= ~PG_RW; oldpteva = (oldpte & PG_FRAME & PDRMASK) | (va & ~PDRMASK); - pmap_invalidate_page(pmap, oldpteva); CTR2(KTR_PMAP, "pmap_promote_pde: protect for va %#lx" " in pmap %p", oldpteva, pmap); } @@ -3023,10 +3022,7 @@ PG_NX) == 0 && (newpte & PG_NX))) invlva = TRUE; } - if (origpte & PG_M) { - KASSERT((origpte & PG_RW), - ("pmap_enter: modified page not writable: va: %#lx, pte: %#lx", - va, origpte)); + if ((origpte & (PG_M | PG_RW)) == (PG_M | PG_RW)) { if ((origpte & PG_MANAGED) != 0) vm_page_dirty(om); if ((newpte & PG_RW) == 0) @@ -3084,7 +3080,7 @@ newpde |= PG_MANAGED; /* - * Create a PV entry for each of the managed pages. + * Abort this mapping if its PV entry could not be created. */ if (!pmap_pv_insert_pde(pmap, va, m)) { free = NULL; @@ -3485,16 +3481,22 @@ pml4e = pmap_pml4e(src_pmap, addr); if ((*pml4e & PG_V) == 0) { va_next = (addr + NBPML4) & ~PML4MASK; + if (va_next < addr) + va_next = end_addr; continue; } pdpe = pmap_pml4e_to_pdpe(pml4e, addr); if ((*pdpe & PG_V) == 0) { va_next = (addr + NBPDP) & ~PDPMASK; + if (va_next < addr) + va_next = end_addr; continue; } va_next = (addr + NBPDR) & ~PDRMASK; + if (va_next < addr) + va_next = end_addr; pde = pmap_pdpe_to_pde(pdpe, addr); srcptepaddr = *pde; @@ -3797,10 +3799,7 @@ /* * Update the vm_page_t clean/reference bits. */ - if (tpte & PG_M) { - KASSERT((tpte & PG_RW) != 0, - ("pmap_remove_pages: modified page not writable: va: %#lx, pte: %#lx", - pv->pv_va, tpte)); + if ((tpte & (PG_M | PG_RW)) == (PG_M | PG_RW)) { if ((tpte & PG_PS) != 0) { for (mt = m; mt < &m[NBPDR / PAGE_SIZE]; mt++) vm_page_dirty(mt); @@ -3898,7 +3897,7 @@ pmap = PV_PMAP(pv); PMAP_LOCK(pmap); pte = pmap_pte(pmap, pv->pv_va); - rv = (*pte & PG_M) != 0; + rv = (*pte & (PG_M | PG_RW)) == (PG_M | PG_RW); PMAP_UNLOCK(pmap); if (rv) break; @@ -4106,9 +4105,7 @@ } } } - } else - KASSERT((oldpde & PG_M) == 0, - ("pmap_clear_modify: modified page not writable")); + } PMAP_UNLOCK(pmap); } TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { @@ -4118,7 +4115,7 @@ KASSERT((*pde & PG_PS) == 0, ("pmap_clear_modify: found" " a 2mpage in page %p's pv list", m)); pte = pmap_pde_to_pte(pde, pv->pv_va); - if (*pte & PG_M) { + if ((*pte & (PG_M | PG_RW)) == (PG_M | PG_RW)) { atomic_clear_long(pte, PG_M); pmap_invalidate_page(pmap, pv->pv_va); } @@ -4373,10 +4370,10 @@ pdep = pmap_pde(pmap, addr); if (pdep != NULL && (*pdep & PG_V)) { if (*pdep & PG_PS) { - KASSERT((*pdep & PG_FRAME & PDRMASK) == 0, - ("pmap_mincore: bad pde")); pte = *pdep; - pa = (*pdep & PG_FRAME) | (addr & PDRMASK); + /* Compute the physical address of the 4KB page. */ + pa = ((*pdep & PG_PS_FRAME) | (addr & PDRMASK)) & + PG_FRAME; } else { pte = *pmap_pde_to_pte(pdep, addr); pa = pte & PG_FRAME; @@ -4397,7 +4394,7 @@ /* * Modified by us */ - if (pte & PG_M) + if ((pte & (PG_M | PG_RW)) == (PG_M | PG_RW)) val |= MINCORE_MODIFIED|MINCORE_MODIFIED_OTHER; else { /* ==== //depot/projects/smpng/sys/amd64/ia32/ia32_signal.c#17 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.16 2008/03/13 10:54:37 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.17 2008/03/23 22:44:56 peter Exp $"); #include "opt_compat.h" @@ -715,10 +715,12 @@ struct trapframe *regs = td->td_frame; struct pcb *pcb = td->td_pcb; + critical_enter(); wrmsr(MSR_FSBASE, 0); wrmsr(MSR_KGSBASE, 0); /* User value while we're in the kernel */ pcb->pcb_fsbase = 0; pcb->pcb_gsbase = 0; + critical_exit(); load_ds(_udatasel); load_es(_udatasel); load_fs(_udatasel); ==== //depot/projects/smpng/sys/amd64/include/pcb.h#12 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)pcb.h 5.10 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pcb.h,v 1.63 2007/03/30 00:06:21 jkim Exp $ + * $FreeBSD: src/sys/amd64/include/pcb.h,v 1.64 2008/03/23 22:45:51 peter Exp $ */ #ifndef _AMD64_PCB_H_ @@ -55,6 +55,7 @@ register_t pcb_rip; register_t pcb_fsbase; register_t pcb_gsbase; + u_long pcb_flags; u_int32_t pcb_ds; u_int32_t pcb_es; u_int32_t pcb_fs; @@ -67,7 +68,6 @@ u_int64_t pcb_dr7; struct savefpu pcb_save; - u_long pcb_flags; #define PCB_DBREGS 0x02 /* process using debug registers */ #define PCB_FPUINITDONE 0x08 /* fpu state is initialized */ #define PCB_32BIT 0x40 /* process has 32 bit context (segs etc) */ ==== //depot/projects/smpng/sys/amd64/isa/atpic.c#18 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.23 2008/03/16 10:58:02 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.24 2008/03/20 21:53:27 jhb Exp $"); #include "opt_auto_eoi.h" #include "opt_isa.h" @@ -44,7 +44,6 @@ #include #include #include -#include #include #include @@ -208,12 +207,12 @@ struct atpic_intsrc *ai = (struct atpic_intsrc *)isrc; struct atpic *ap = (struct atpic *)isrc->is_pic; - mtx_lock_spin(&icu_lock); + spinlock_enter(); if (*ap->at_imen & IMEN_MASK(ai)) { *ap->at_imen &= ~IMEN_MASK(ai); outb(ap->at_ioaddr + ICU_IMR_OFFSET, *ap->at_imen); } - mtx_unlock_spin(&icu_lock); + spinlock_exit(); } static void @@ -222,7 +221,7 @@ struct atpic_intsrc *ai = (struct atpic_intsrc *)isrc; struct atpic *ap = (struct atpic *)isrc->is_pic; - mtx_lock_spin(&icu_lock); + spinlock_enter(); if (ai->at_trigger != INTR_TRIGGER_EDGE) { *ap->at_imen |= IMEN_MASK(ai); outb(ap->at_ioaddr + ICU_IMR_OFFSET, *ap->at_imen); @@ -240,16 +239,16 @@ _atpic_eoi_slave(isrc); } - mtx_unlock_spin(&icu_lock); + spinlock_exit(); } static void atpic_eoi_master(struct intsrc *isrc) { #ifndef AUTO_EOI_1 - mtx_lock_spin(&icu_lock); + spinlock_enter(); _atpic_eoi_master(isrc); - mtx_unlock_spin(&icu_lock); + spinlock_exit(); #endif } @@ -257,9 +256,9 @@ atpic_eoi_slave(struct intsrc *isrc) { #ifndef AUTO_EOI_2 - mtx_lock_spin(&icu_lock); + spinlock_enter(); _atpic_eoi_slave(isrc); - mtx_unlock_spin(&icu_lock); + spinlock_exit(); #endif } @@ -351,10 +350,10 @@ if (bootverbose) printf("atpic: Programming IRQ%u as %s\n", vector, trig == INTR_TRIGGER_EDGE ? "edge/high" : "level/low"); - mtx_lock_spin(&icu_lock); + spinlock_enter(); elcr_write_trigger(atpic_vector(isrc), trig); ai->at_trigger = trig; - mtx_unlock_spin(&icu_lock); + spinlock_exit(); return (0); } @@ -375,7 +374,7 @@ int imr_addr; /* Reset the PIC and program with next four bytes. */ - mtx_lock_spin(&icu_lock); + spinlock_enter(); outb(pic->at_ioaddr, ICW1_RESET | ICW1_IC4); imr_addr = pic->at_ioaddr + ICU_IMR_OFFSET; @@ -407,7 +406,7 @@ /* OCW2_L1 sets priority order to 3-7, 0-2 (com2 first). */ if (!slave) outb(pic->at_ioaddr, OCW2_R | OCW2_SL | OCW2_L1); - mtx_unlock_spin(&icu_lock); + spinlock_exit(); } void @@ -521,11 +520,11 @@ * pending. Reset read register back to IRR when done. */ port = ((struct atpic *)isrc->is_pic)->at_ioaddr; - mtx_lock_spin(&icu_lock); + spinlock_enter(); outb(port, OCW3_SEL | OCW3_RR | OCW3_RIS); isr = inb(port); outb(port, OCW3_SEL | OCW3_RR); - mtx_unlock_spin(&icu_lock); + spinlock_exit(); if ((isr & IRQ_MASK(7)) == 0) return; } ==== //depot/projects/smpng/sys/arm/arm/elf_trampoline.c#15 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.18 2007/07/27 14:42:25 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.19 2008/03/22 20:34:07 cognet Exp $"); #include #include #include @@ -47,6 +47,7 @@ extern void *_end; +void _start(void); void __start(void); void __startC(void); ==== //depot/projects/smpng/sys/arm/conf/AVILA#5 (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/arm/conf/AVILA,v 1.9 2008/03/12 10:11:55 jeff Exp $ +# $FreeBSD: src/sys/arm/conf/AVILA,v 1.10 2008/03/20 17:44:58 sam Exp $ machine arm ident AVILA @@ -91,7 +91,7 @@ device iicbb device iic -device ixpiic +device ixpiic # I2C bus glue device ixpwdog # watchdog timer device ds1672 # DS1672 on I2C bus device ad7418 # AD7418 on I2C bus @@ -126,9 +126,12 @@ # Wireless NIC cards device wlan # 802.11 support -#device wlan_wep # 802.11 WEP support -#device wlan_ccmp # 802.11 CCMP support -#device wlan_tkip # 802.11 TKIP support +device wlan_wep # 802.11 WEP support +device wlan_ccmp # 802.11 CCMP support +device wlan_tkip # 802.11 TKIP support +device wlan_scan_sta +device wlan_scan_ap +device wlan_xauth device ath # Atheros pci/cardbus NIC's device ath_hal # Atheros HAL (Hardware Access Layer) device ath_rate_sample # SampleRate tx rate control for ath @@ -138,12 +141,15 @@ #device cryptodev #device hifn # NB: Soekris minipci card known to work -#device usb -#options USB_DEBUG -#device uhci -#device ohci -#device ehci -#device ugen -#device umass -#device scbus # SCSI bus (required for SCSI) -#device da # Direct Access (disks) +device usb +options USB_DEBUG +device ohci +device ehci +device ugen +device umass +device scbus # SCSI bus (required for SCSI) +device da # Direct Access (disks) + +device ural +device zyd +device wlan_amrr ==== //depot/projects/smpng/sys/arm/conf/AVILA.hints#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/arm/conf/AVILA.hints,v 1.2 2007/05/29 18:10:42 jhay Exp $ +# $FreeBSD: src/sys/arm/conf/AVILA.hints,v 1.3 2008/03/22 16:55:51 sam Exp $ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Mar 24 21:24:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E5351065671; Mon, 24 Mar 2008 21:24: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 E83ED106566B for ; Mon, 24 Mar 2008 21:24:05 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from speedfactory.net (mail.speedfactory.net [66.23.216.219]) by mx1.freebsd.org (Postfix) with ESMTP id 74C9D8FC13 for ; Mon, 24 Mar 2008 21:24:04 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (unverified [66.23.211.162]) by speedfactory.net (SurgeMail 3.8s) with ESMTP id 236605004-1834499 for multiple; Mon, 24 Mar 2008 17:25:26 -0400 Received: from localhost.corp.yahoo.com (john@localhost [127.0.0.1]) (authenticated bits=0) by server.baldwin.cx (8.14.2/8.14.2) with ESMTP id m2OLNrAd066408; Mon, 24 Mar 2008 17:23:54 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: Oleksandr Tymoshenko Date: Mon, 24 Mar 2008 16:03:09 -0400 User-Agent: KMail/1.9.7 References: <200803241417.m2OEHVLp083423@repoman.freebsd.org> In-Reply-To: <200803241417.m2OEHVLp083423@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200803241603.09252.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [127.0.0.1]); Mon, 24 Mar 2008 17:23:54 -0400 (EDT) X-Virus-Scanned: ClamAV 0.91.2/6377/Mon Mar 24 17:15:18 2008 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.3 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 138427 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Mar 2008 21:24:06 -0000 On Monday 24 March 2008 10:17:31 am Oleksandr Tymoshenko wrote: > http://perforce.freebsd.org/chv.cgi?CH=138427 > > Change 138427 by gonzo@gonzo_jeeves on 2008/03/24 14:17:07 > > o Provide bogus mips_mask_irq/mips_unmask_irq functions > o Fix intr_event_create calls to conform new API, use > mips_mask_irq/mips_unmask_irq as arguments. You shouldn't need an EOI routine at all. That is a bug in the current arm code. > Affected files ... > > .. //depot/projects/mips2-jnpr/src/sys/mips/include/intr.h#6 edit > .. //depot/projects/mips2-jnpr/src/sys/mips/mips/intr_machdep.c#8 edit > .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/malta/gt_pci.c#3 edit > > Differences ... > > ==== //depot/projects/mips2-jnpr/src/sys/mips/include/intr.h#6 (text+ko) ==== > > @@ -73,6 +73,11 @@ > > extern struct mips_intr_handler intr_handlers[]; > > +typedef void (*mask_fn)(void *); > + > +void mips_mask_irq(void); > +void mips_unmask_irq(void); > + > struct trapframe; > void mips_set_intr(int pri, uint32_t mask, > uint32_t (*int_hand)(uint32_t, struct trapframe *)); > > ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/intr_machdep.c#8 (text+ko) ==== > > @@ -53,6 +53,20 @@ > static int last_printed = 0; > #endif > > +void > +mips_mask_irq(void) > +{ > + > + printf("Unimplemented: %s\n", __func__); > +} > + > +void > +mips_unmask_irq(void) > +{ > + > + printf("Unimplemented: %s\n", __func__); > +} > + > void > cpu_establish_hardintr(const char *name, driver_filter_t *filt, > void (*handler)(void*), void *arg, int irq, int flags, > @@ -71,7 +85,8 @@ > event = hardintr_events[irq]; > if (event == NULL) { > error = intr_event_create(&event, (void *)irq, 0, > - (void (*)(void *))NULL, "hard intr%d:", irq); > + (mask_fn)mips_mask_irq, (mask_fn)mips_unmask_irq, > + (mask_fn)mips_unmask_irq, NULL, "hard intr%d:", irq); > if (error) > return; > hardintr_events[irq] = event; > @@ -108,7 +123,8 @@ > event = softintr_events[irq]; > if (event == NULL) { > error = intr_event_create(&event, (void *)irq, 0, > - (void (*)(void *))NULL, "intr%d:", irq); > + (mask_fn)mips_mask_irq, (mask_fn)mips_unmask_irq, > + (mask_fn)mips_unmask_irq, NULL, "intr%d:", irq); > if (error) > return; > softintr_events[irq] = event; > > ==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/malta/gt_pci.c#3 (text+ko) ==== > > @@ -657,8 +657,9 @@ > > event = sc->sc_eventstab[irq]; > if (event == NULL) { > - error = intr_event_create(&event, (void *)irq, 0, > - (void (*)(void *))NULL, "gt_pci intr%d:", irq); > + error = intr_event_create(&event, (void *)irq, 0, > + (mask_fn)mips_mask_irq, (mask_fn)mips_unmask_irq, > + (mask_fn)mips_unmask_irq, NULL, "gt_pci intr%d:", irq); > if (error) > return 0; > sc->sc_eventstab[irq] = event; > -- John Baldwin From owner-p4-projects@FreeBSD.ORG Mon Mar 24 22:15:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A0C21065677; Mon, 24 Mar 2008 22:15: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 3E5D01065675 for ; Mon, 24 Mar 2008 22:15:58 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1DCAD8FC16 for ; Mon, 24 Mar 2008 22:15:58 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2OMFwsD077704 for ; Mon, 24 Mar 2008 22:15:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2OMFvkN077702 for perforce@freebsd.org; Mon, 24 Mar 2008 22:15:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 24 Mar 2008 22:15:57 GMT Message-Id: <200803242215.m2OMFvkN077702@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 138477 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Mar 2008 22:15:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=138477 Change 138477 by rwatson@rwatson_cinnamon on 2008/03/24 22:15:00 Integrate zcopybpf branch, looping back zero-copy BPF buffer support. Affected files ... .. //depot/projects/zcopybpf/src/share/man/man4/bpf.4#11 integrate .. //depot/projects/zcopybpf/src/sys/amd64/acpica/madt.c#5 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/cpu_switch.S#6 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/genassym.c#6 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/intr_machdep.c#8 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/local_apic.c#8 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/machdep.c#10 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/mptable.c#4 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/nexus.c#7 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/pmap.c#15 integrate .. //depot/projects/zcopybpf/src/sys/amd64/ia32/ia32_signal.c#3 integrate .. //depot/projects/zcopybpf/src/sys/amd64/include/atomic.h#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/include/intr_machdep.h#5 integrate .. //depot/projects/zcopybpf/src/sys/amd64/include/pcb.h#3 integrate .. //depot/projects/zcopybpf/src/sys/amd64/isa/atpic.c#3 integrate .. //depot/projects/zcopybpf/src/sys/amd64/linux32/linux32_proto.h#5 integrate .. //depot/projects/zcopybpf/src/sys/amd64/linux32/linux32_syscall.h#5 integrate .. //depot/projects/zcopybpf/src/sys/amd64/linux32/linux32_sysent.c#5 integrate .. //depot/projects/zcopybpf/src/sys/amd64/linux32/syscalls.master#5 integrate .. //depot/projects/zcopybpf/src/sys/arm/arm/elf_trampoline.c#4 integrate .. //depot/projects/zcopybpf/src/sys/arm/arm/intr.c#5 integrate .. //depot/projects/zcopybpf/src/sys/arm/arm/machdep.c#4 integrate .. //depot/projects/zcopybpf/src/sys/arm/arm/vm_machdep.c#6 integrate .. //depot/projects/zcopybpf/src/sys/arm/conf/AVILA#8 integrate .. //depot/projects/zcopybpf/src/sys/arm/conf/AVILA.hints#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/if_npe.c#6 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/ixdp425_pci.c#2 integrate .. //depot/projects/zcopybpf/src/sys/cam/scsi/scsi_ses.c#5 integrate .. //depot/projects/zcopybpf/src/sys/compat/linux/linux_futex.c#6 integrate .. //depot/projects/zcopybpf/src/sys/compat/linux/linux_futex.h#3 integrate .. //depot/projects/zcopybpf/src/sys/compat/linux/linux_misc.c#8 integrate .. //depot/projects/zcopybpf/src/sys/compat/svr4/svr4_fcntl.c#5 integrate .. //depot/projects/zcopybpf/src/sys/conf/NOTES#18 integrate .. //depot/projects/zcopybpf/src/sys/conf/files#22 integrate .. //depot/projects/zcopybpf/src/sys/conf/options#17 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#9 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/os/callb.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/os/taskq.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/aac/aac.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/aac/aac_cam.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/aac/aac_debug.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/aac/aac_disk.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/aac/aac_pci.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/aac/aacvar.h#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/ata/ata-all.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/ata/ata-all.h#8 integrate .. //depot/projects/zcopybpf/src/sys/dev/ata/ata-disk.c#8 integrate .. //depot/projects/zcopybpf/src/sys/dev/ata/ata-disk.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/ata/ata-raid.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/ath/if_ath.c#9 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_ael1002.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_common.h#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_version.h#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_ioctl.h#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_main.c#10 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_offload.h#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_sge.c#11 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/ulp/tom/cxgb_defs.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/dc/if_dc.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/dc/if_dcreg.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/drm/drm_pciids.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/drm/i915_dma.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/fxp/if_fxp.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/gem/if_gem.c#9 integrate .. //depot/projects/zcopybpf/src/sys/dev/gem/if_gem_pci.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/gem/if_gemreg.h#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/gem/if_gemvar.h#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/hwpmc/hwpmc_amd.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/mfi/mfi.c#9 integrate .. //depot/projects/zcopybpf/src/sys/dev/ofw/ofw_console.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/re/if_re.c#12 integrate .. //depot/projects/zcopybpf/src/sys/dev/syscons/syscons.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/syscons/sysmouse.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/ehci.c#7 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/if_rum.c#7 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/if_zyd.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/ohci.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/usbdevs#16 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/usbdi.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/usbdi.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/usbdivar.h#3 integrate .. //depot/projects/zcopybpf/src/sys/fs/devfs/devfs_rule.c#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/msdosfs/msdosfs_vfsops.c#9 integrate .. //depot/projects/zcopybpf/src/sys/gdb/gdb_cons.c#2 integrate .. //depot/projects/zcopybpf/src/sys/geom/geom.h#3 integrate .. //depot/projects/zcopybpf/src/sys/geom/geom_subr.c#3 integrate .. //depot/projects/zcopybpf/src/sys/geom/part/g_part.c#7 integrate .. //depot/projects/zcopybpf/src/sys/geom/part/g_part.h#6 integrate .. //depot/projects/zcopybpf/src/sys/geom/part/g_part_apm.c#5 integrate .. //depot/projects/zcopybpf/src/sys/geom/part/g_part_bsd.c#3 integrate .. //depot/projects/zcopybpf/src/sys/geom/part/g_part_gpt.c#5 integrate .. //depot/projects/zcopybpf/src/sys/geom/part/g_part_mbr.c#3 integrate .. //depot/projects/zcopybpf/src/sys/geom/part/g_part_vtoc8.c#2 integrate .. //depot/projects/zcopybpf/src/sys/geom/vinum/geom_vinum_drive.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/acpica/acpi_wakeup.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/acpica/madt.c#6 integrate .. //depot/projects/zcopybpf/src/sys/i386/cpufreq/est.c#4 integrate .. //depot/projects/zcopybpf/src/sys/i386/cpufreq/p4tcc.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/intr_machdep.c#8 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/local_apic.c#7 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/machdep.c#10 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/mp_machdep.c#11 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/mptable.c#4 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/nexus.c#6 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/pmap.c#14 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/vm_machdep.c#8 integrate .. //depot/projects/zcopybpf/src/sys/i386/include/atomic.h#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/include/intr_machdep.h#5 integrate .. //depot/projects/zcopybpf/src/sys/i386/isa/atpic.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/linux/linux_proto.h#5 integrate .. //depot/projects/zcopybpf/src/sys/i386/linux/linux_syscall.h#5 integrate .. //depot/projects/zcopybpf/src/sys/i386/linux/linux_sysent.c#5 integrate .. //depot/projects/zcopybpf/src/sys/i386/linux/syscalls.master#5 integrate .. //depot/projects/zcopybpf/src/sys/i386/xbox/xbox.c#2 integrate .. //depot/projects/zcopybpf/src/sys/ia64/ia64/interrupt.c#6 integrate .. //depot/projects/zcopybpf/src/sys/ia64/ia64/machdep.c#10 integrate .. //depot/projects/zcopybpf/src/sys/ia64/ia64/sscdisk.c#2 integrate .. //depot/projects/zcopybpf/src/sys/ia64/include/atomic.h#4 integrate .. //depot/projects/zcopybpf/src/sys/ia64/isa/isa_dma.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/bus_if.m#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/init_main.c#10 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_alq.c#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_clock.c#8 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_conf.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_cpuset.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_descrip.c#13 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_event.c#8 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_exit.c#7 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_fork.c#11 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_idle.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_intr.c#9 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_kthread.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_linker.c#9 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_lockf.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_malloc.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_mbuf.c#9 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_module.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_ntptime.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_poll.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_proc.c#10 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_resource.c#9 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_shutdown.c#8 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_sig.c#12 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_switch.c#8 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_synch.c#11 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_tc.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_thr.c#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_thread.c#12 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_timeout.c#8 integrate .. //depot/projects/zcopybpf/src/sys/kern/link_elf.c#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/link_elf_obj.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/sched_4bsd.c#12 integrate .. //depot/projects/zcopybpf/src/sys/kern/sched_ule.c#18 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_autoconf.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_bus.c#10 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_eventhandler.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_log.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_prof.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_sleepqueue.c#8 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_smp.c#9 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_trap.c#7 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_witness.c#11 integrate .. //depot/projects/zcopybpf/src/sys/kern/sys_generic.c#9 integrate .. //depot/projects/zcopybpf/src/sys/kern/sys_process.c#7 integrate .. //depot/projects/zcopybpf/src/sys/kern/tty.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/tty_cons.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/tty_pts.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/tty_pty.c#7 integrate .. //depot/projects/zcopybpf/src/sys/kern/tty_subr.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/tty_tty.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/uipc_domain.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/uipc_socket.c#8 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_acl.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_bio.c#12 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_cache.c#8 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_cluster.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_default.c#7 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_hash.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_lookup.c#9 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_mount.c#15 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_subr.c#13 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_vnops.c#9 integrate .. //depot/projects/zcopybpf/src/sys/modules/geom/geom_part/Makefile#2 integrate .. //depot/projects/zcopybpf/src/sys/modules/geom/geom_part/geom_part_apm/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/modules/geom/geom_part/geom_part_bsd/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/modules/geom/geom_part/geom_part_gpt/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/modules/geom/geom_part/geom_part_mbr/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/modules/geom/geom_part/geom_part_vtoc8/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/net/bpf.c#51 integrate .. //depot/projects/zcopybpf/src/sys/net/bpf.h#26 integrate .. //depot/projects/zcopybpf/src/sys/net/bpf_buffer.c#6 integrate .. //depot/projects/zcopybpf/src/sys/net/bpf_buffer.h#2 integrate .. //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.c#34 integrate .. //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.h#12 integrate .. //depot/projects/zcopybpf/src/sys/net/bpfdesc.h#13 integrate .. //depot/projects/zcopybpf/src/sys/net/ieee8023ad_lacp.c#7 integrate .. //depot/projects/zcopybpf/src/sys/net/ieee8023ad_lacp.h#6 integrate .. //depot/projects/zcopybpf/src/sys/net/if.c#10 integrate .. //depot/projects/zcopybpf/src/sys/net/if_ethersubr.c#12 integrate .. //depot/projects/zcopybpf/src/sys/net/if_gre.c#3 integrate .. //depot/projects/zcopybpf/src/sys/net/if_lagg.c#9 integrate .. //depot/projects/zcopybpf/src/sys/net/netisr.c#3 integrate .. //depot/projects/zcopybpf/src/sys/net/rtsock.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netatm/ipatm/ipatm_load.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netatm/sigpvc/sigpvc_if.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netatm/spans/spans_if.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netatm/uni/uni_load.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netgraph/ng_base.c#10 integrate .. //depot/projects/zcopybpf/src/sys/netgraph/ng_l2tp.c#6 integrate .. //depot/projects/zcopybpf/src/sys/netgraph/ng_tee.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet/in_pcb.c#10 integrate .. //depot/projects/zcopybpf/src/sys/netinet/in_pcb.h#8 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_fw2.c#13 integrate .. //depot/projects/zcopybpf/src/sys/netinet/libalias/alias_irc.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netipsec/ipsec.c#6 integrate .. //depot/projects/zcopybpf/src/sys/netipsec/key.c#5 integrate .. //depot/projects/zcopybpf/src/sys/netipsec/xform_tcp.c#2 integrate .. //depot/projects/zcopybpf/src/sys/nfs4client/nfs4_vfsops.c#6 integrate .. //depot/projects/zcopybpf/src/sys/nfs4client/nfs4_vnops.c#6 integrate .. //depot/projects/zcopybpf/src/sys/nfsclient/nfs_diskless.c#3 integrate .. //depot/projects/zcopybpf/src/sys/nfsclient/nfs_subs.c#7 integrate .. //depot/projects/zcopybpf/src/sys/nfsclient/nfs_vfsops.c#9 integrate .. //depot/projects/zcopybpf/src/sys/nfsclient/nfs_vnops.c#9 integrate .. //depot/projects/zcopybpf/src/sys/nfsserver/nfs_serv.c#8 integrate .. //depot/projects/zcopybpf/src/sys/nfsserver/nfs_srvsock.c#6 integrate .. //depot/projects/zcopybpf/src/sys/pc98/pc98/machdep.c#10 integrate .. //depot/projects/zcopybpf/src/sys/pci/if_rlreg.h#8 integrate .. //depot/projects/zcopybpf/src/sys/pci/if_xl.c#6 integrate .. //depot/projects/zcopybpf/src/sys/pci/if_xlreg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/aim/machdep.c#4 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/booke/machdep.c#3 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/booke/vm_machdep.c#3 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/include/atomic.h#4 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/include/gdb_machdep.h#2 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/powerpc/gdb_machdep.c#3 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/powerpc/intr_machdep.c#8 integrate .. //depot/projects/zcopybpf/src/sys/security/audit/audit.c#8 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/include/atomic.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/include/bus.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/sparc64/bus_machdep.c#4 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/sparc64/intr_machdep.c#6 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/sparc64/vm_machdep.c#5 integrate .. //depot/projects/zcopybpf/src/sys/sun4v/include/atomic.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sun4v/sun4v/intr_machdep.c#4 integrate .. //depot/projects/zcopybpf/src/sys/sys/aac_ioctl.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sys/ata.h#6 integrate .. //depot/projects/zcopybpf/src/sys/sys/buf.h#6 integrate .. //depot/projects/zcopybpf/src/sys/sys/bufobj.h#3 integrate .. //depot/projects/zcopybpf/src/sys/sys/bus.h#5 integrate .. //depot/projects/zcopybpf/src/sys/sys/bus_dma.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sys/conf.h#5 integrate .. //depot/projects/zcopybpf/src/sys/sys/eventhandler.h#5 integrate .. //depot/projects/zcopybpf/src/sys/sys/interrupt.h#5 integrate .. //depot/projects/zcopybpf/src/sys/sys/kernel.h#7 integrate .. //depot/projects/zcopybpf/src/sys/sys/mbuf.h#11 integrate .. //depot/projects/zcopybpf/src/sys/sys/module.h#3 integrate .. //depot/projects/zcopybpf/src/sys/sys/param.h#16 integrate .. //depot/projects/zcopybpf/src/sys/sys/proc.h#14 integrate .. //depot/projects/zcopybpf/src/sys/sys/resourcevar.h#3 integrate .. //depot/projects/zcopybpf/src/sys/sys/runq.h#3 integrate .. //depot/projects/zcopybpf/src/sys/sys/rwlock.h#8 integrate .. //depot/projects/zcopybpf/src/sys/sys/sched.h#6 integrate .. //depot/projects/zcopybpf/src/sys/sys/sysctl.h#7 integrate .. //depot/projects/zcopybpf/src/sys/sys/taskqueue.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sys/vnode.h#8 integrate .. //depot/projects/zcopybpf/src/sys/ufs/ffs/ffs_inode.c#4 integrate .. //depot/projects/zcopybpf/src/sys/ufs/ffs/ffs_rawread.c#5 integrate .. //depot/projects/zcopybpf/src/sys/ufs/ffs/ffs_snapshot.c#8 integrate .. //depot/projects/zcopybpf/src/sys/ufs/ffs/ffs_softdep.c#13 integrate .. //depot/projects/zcopybpf/src/sys/ufs/ffs/ffs_vfsops.c#8 integrate .. //depot/projects/zcopybpf/src/sys/ufs/ffs/ffs_vnops.c#11 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_fault.c#8 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_glue.c#6 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_init.c#2 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_meter.c#5 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_mmap.c#6 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_page.c#12 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_page.h#7 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_pageout.c#6 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_pageq.c#5 delete .. //depot/projects/zcopybpf/src/sys/vm/vm_zeroidle.c#6 integrate .. //depot/projects/zcopybpf/src/usr.sbin/netstat/bpf.c#9 integrate .. //depot/projects/zcopybpf/src/usr.sbin/netstat/inet6.c#5 integrate Differences ... ==== //depot/projects/zcopybpf/src/share/man/man4/bpf.4#11 (text+ko) ==== @@ -47,7 +47,7 @@ .\" This document is derived in part from the enet man page (enet.4) .\" distributed with 4.3BSD Unix. .\" -.\" $FreeBSD: src/share/man/man4/bpf.4,v 1.48 2007/02/26 22:24:14 jkim Exp $ +.\" $FreeBSD: src/share/man/man4/bpf.4,v 1.49 2008/03/24 13:49:17 csjp Exp $ .\" .Dd February 26, 2007 .Dt BPF 4 ==== //depot/projects/zcopybpf/src/sys/amd64/acpica/madt.c#5 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.25 2008/01/31 16:51:42 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.26 2008/03/16 10:58:02 rwatson Exp $"); #include #include @@ -409,7 +409,7 @@ apic_register_enumerator(&madt_enumerator); } SYSINIT(madt_register, SI_SUB_TUNABLES - 1, SI_ORDER_FIRST, - madt_register, NULL) + madt_register, NULL); /* * Call the handler routine for each entry in the MADT table. @@ -779,4 +779,4 @@ la->la_acpi_id); } } -SYSINIT(madt_set_ids, SI_SUB_CPU, SI_ORDER_ANY, madt_set_ids, NULL) +SYSINIT(madt_set_ids, SI_SUB_CPU, SI_ORDER_ANY, madt_set_ids, NULL); ==== //depot/projects/zcopybpf/src/sys/amd64/amd64/cpu_switch.S#6 (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.160 2007/08/22 05:06:14 jkoshy Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.161 2008/03/23 23:09:06 peter Exp $ */ #include @@ -69,16 +69,20 @@ * %rsi = newtd */ ENTRY(cpu_throw) + testq %rdi,%rdi + jnz 1f + movq PCPU(IDLETHREAD),%rdi +1: + movq TD_PCB(%rdi),%r8 /* Old pcb */ movl PCPU(CPUID), %eax - testq %rdi,%rdi /* no thread? */ - jz 1f + movq PCB_FSBASE(%r8),%r9 + movq PCB_GSBASE(%r8),%r10 /* release bit from old pm_active */ movq TD_PROC(%rdi), %rdx /* oldtd->td_proc */ movq P_VMSPACE(%rdx), %rdx /* proc->p_vmspace */ LK btrl %eax, VM_PMAP+PM_ACTIVE(%rdx) /* clear old */ -1: - movq TD_PCB(%rsi),%rdx /* newtd->td_proc */ - movq PCB_CR3(%rdx),%rdx + movq TD_PCB(%rsi),%r8 /* newtd->td_proc */ + movq PCB_CR3(%r8),%rdx movq %rdx,%cr3 /* new address space */ jmp swact END(cpu_throw) @@ -97,43 +101,24 @@ movq TD_PCB(%rdi),%r8 movq (%rsp),%rax /* Hardware registers */ + movq %r15,PCB_R15(%r8) + movq %r14,PCB_R14(%r8) + movq %r13,PCB_R13(%r8) + movq %r12,PCB_R12(%r8) + movq %rbp,PCB_RBP(%r8) + movq %rsp,PCB_RSP(%r8) + movq %rbx,PCB_RBX(%r8) movq %rax,PCB_RIP(%r8) - movq %rbx,PCB_RBX(%r8) - movq %rsp,PCB_RSP(%r8) - movq %rbp,PCB_RBP(%r8) - movq %r12,PCB_R12(%r8) - movq %r13,PCB_R13(%r8) - movq %r14,PCB_R14(%r8) - movq %r15,PCB_R15(%r8) + movq PCB_FSBASE(%r8),%r9 + movq PCB_GSBASE(%r8),%r10 testl $PCB_32BIT,PCB_FLAGS(%r8) - jz 1f /* no, skip over */ - - /* Save userland %gs */ - movl %gs,PCB_GS(%r8) - movq PCB_GS32P(%r8),%rax - movq (%rax),%rax - movq %rax,PCB_GS32SD(%r8) + jnz store_gs /* static predict not taken */ +done_store_gs: -1: - /* Test if debug registers should be saved. */ testl $PCB_DBREGS,PCB_FLAGS(%r8) - jz 1f /* no, skip over */ - movq %dr7,%rax /* yes, do the save */ - movq %rax,PCB_DR7(%r8) - andq $0x0000fc00, %rax /* disable all watchpoints */ - movq %rax,%dr7 - movq %dr6,%rax - movq %rax,PCB_DR6(%r8) - movq %dr3,%rax - movq %rax,PCB_DR3(%r8) - movq %dr2,%rax - movq %rax,PCB_DR2(%r8) - movq %dr1,%rax - movq %rax,PCB_DR1(%r8) - movq %dr0,%rax - movq %rax,PCB_DR0(%r8) -1: + jnz store_dr /* static predict not taken */ +done_store_dr: /* have we used fp, and need a save? */ cmpq %rdi,PCPU(FPCURTHREAD) @@ -181,82 +166,138 @@ cmpq %rcx, %rdx pause je 1b - lfence #endif /* * At this point, we've switched address spaces and are ready * to load up the rest of the next context. */ - movq TD_PCB(%rsi),%r8 + + /* Skip loading user fsbase/gsbase for kthreads */ + testl $TDP_KTHREAD,TD_PFLAGS(%rsi) + jnz do_kthread + cmpq PCB_FSBASE(%r8),%r9 + jz 1f /* Restore userland %fs */ movl $MSR_FSBASE,%ecx movl PCB_FSBASE(%r8),%eax movl PCB_FSBASE+4(%r8),%edx wrmsr +1: + cmpq PCB_GSBASE(%r8),%r10 + jz 2f /* Restore userland %gs */ movl $MSR_KGSBASE,%ecx movl PCB_GSBASE(%r8),%eax movl PCB_GSBASE+4(%r8),%edx wrmsr +2: +do_tss: /* Update the TSS_RSP0 pointer for the next interrupt */ movq PCPU(TSSP), %rax + movq %r8, PCPU(RSP0) + movq %r8, PCPU(CURPCB) addq $COMMON_TSS_RSP0, %rax - leaq -16(%r8), %rbx - movq %rbx, (%rax) - movq %rbx, PCPU(RSP0) + movq %rsi, PCPU(CURTHREAD) /* into next thread */ + movq %r8, (%rax) - movq %r8, PCPU(CURPCB) - movq %rsi, PCPU(CURTHREAD) /* into next thread */ + /* Test if debug registers should be restored. */ + testl $PCB_DBREGS,PCB_FLAGS(%r8) + jnz load_dr /* static predict not taken */ +done_load_dr: testl $PCB_32BIT,PCB_FLAGS(%r8) - jz 1f /* no, skip over */ + jnz load_gs /* static predict not taken */ +done_load_gs: + + /* Restore context. */ + movq PCB_R15(%r8),%r15 + movq PCB_R14(%r8),%r14 + movq PCB_R13(%r8),%r13 + movq PCB_R12(%r8),%r12 + movq PCB_RBP(%r8),%rbp + movq PCB_RSP(%r8),%rsp + movq PCB_RBX(%r8),%rbx + movq PCB_RIP(%r8),%rax + movq %rax,(%rsp) + ret + + /* + * We order these strangely for several reasons. + * 1: I wanted to use static branch prediction hints + * 2: Most athlon64/opteron cpus don't have them. They define + * a forward branch as 'predict not taken'. Intel cores have + * the 'rep' prefix to invert this. + * So, to make it work on both forms of cpu we do the detour. + * We use jumps rather than call in order to avoid the stack. + */ + +do_kthread: + /* + * Copy old fs/gsbase to new kthread pcb for future switches + * This maintains curpcb->pcb_[fg]sbase as caches of the MSR + */ + movq %r9,PCB_FSBASE(%r8) + movq %r10,PCB_GSBASE(%r8) + jmp do_tss + +store_gs: + movl %gs,PCB_GS(%r8) + movq PCB_GS32P(%r8),%rax + movq (%rax),%rax + movq %rax,PCB_GS32SD(%r8) + jmp done_store_gs +load_gs: /* Restore userland %gs while preserving kernel gsbase */ movq PCB_GS32P(%r8),%rax - movq PCB_GS32SD(%r8),%rbx - movq %rbx,(%rax) + movq PCB_GS32SD(%r8),%rcx + movq %rcx,(%rax) movl $MSR_GSBASE,%ecx rdmsr movl PCB_GS(%r8),%gs wrmsr + jmp done_load_gs -1: - /* Restore context. */ - movq PCB_RBX(%r8),%rbx - movq PCB_RSP(%r8),%rsp - movq PCB_RBP(%r8),%rbp - movq PCB_R12(%r8),%r12 - movq PCB_R13(%r8),%r13 - movq PCB_R14(%r8),%r14 - movq PCB_R15(%r8),%r15 - movq PCB_RIP(%r8),%rax - movq %rax,(%rsp) +store_dr: + movq %dr7,%rax /* yes, do the save */ + movq %dr0,%r15 + movq %dr1,%r14 + movq %dr2,%r13 + movq %dr3,%r12 + movq %dr6,%r11 + andq $0x0000fc00, %rax /* disable all watchpoints */ + movq %r15,PCB_DR0(%r8) + movq %r14,PCB_DR1(%r8) + movq %r13,PCB_DR2(%r8) + movq %r12,PCB_DR3(%r8) + movq %r11,PCB_DR6(%r8) + movq %rax,PCB_DR7(%r8) + movq %rax,%dr7 + jmp done_store_dr - /* Test if debug registers should be restored. */ - testl $PCB_DBREGS,PCB_FLAGS(%r8) - jz 1f - movq PCB_DR6(%r8),%rax - movq %rax,%dr6 - movq PCB_DR3(%r8),%rax - movq %rax,%dr3 - movq PCB_DR2(%r8),%rax - movq %rax,%dr2 - movq PCB_DR1(%r8),%rax - movq %rax,%dr1 - movq PCB_DR0(%r8),%rax - movq %rax,%dr0 - /* But preserve reserved bits in %dr7 */ +load_dr: movq %dr7,%rax + movq PCB_DR0(%r8),%r15 + movq PCB_DR1(%r8),%r14 + movq PCB_DR2(%r8),%r13 + movq PCB_DR3(%r8),%r12 + movq PCB_DR6(%r8),%r11 + movq PCB_DR7(%r8),%rcx + movq %r15,%dr0 + movq %r14,%dr1 + /* Preserve reserved bits in %dr7 */ andq $0x0000fc00,%rax - movq PCB_DR7(%r8),%rcx andq $~0x0000fc00,%rcx + movq %r13,%dr2 + movq %r12,%dr3 orq %rcx,%rax + movq %r11,%dr6 movq %rax,%dr7 -1: - ret + jmp done_load_dr + END(cpu_switch) /* ==== //depot/projects/zcopybpf/src/sys/amd64/amd64/genassym.c#6 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.166 2007/11/23 03:03:29 jkoshy Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.167 2008/03/23 22:46:37 peter Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" @@ -86,6 +86,7 @@ ASSYM(TDF_NEEDRESCHED, TDF_NEEDRESCHED); ASSYM(TDP_CALLCHAIN, TDP_CALLCHAIN); +ASSYM(TDP_KTHREAD, TDP_KTHREAD); ASSYM(V_TRAP, offsetof(struct vmmeter, v_trap)); ASSYM(V_SYSCALL, offsetof(struct vmmeter, v_syscall)); ==== //depot/projects/zcopybpf/src/sys/amd64/amd64/intr_machdep.c#8 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.36 2008/03/14 03:44:41 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.39 2008/03/17 22:42:00 jhb Exp $ */ /* @@ -77,18 +77,17 @@ static struct mtx intrcnt_lock; static STAILQ_HEAD(, pic) pics; -#ifdef INTR_FILTER -static void intr_eoi_src(void *arg); -static void intr_disab_eoi_src(void *arg); -static void intr_event_stray(void *cookie); -#endif - #ifdef SMP static int assign_cpu; static void intr_assign_next_cpu(struct intsrc *isrc); #endif +static int intr_assign_cpu(void *arg, u_char cpu); +static void intr_disable_src(void *arg); +#ifdef INTR_FILTER +static void intr_event_stray(void *cookie); +#endif static void intr_init(void *__dummy); static int intr_pic_registered(struct pic *pic); static void intrcnt_setname(const char *name, int index); @@ -143,14 +142,10 @@ vector = isrc->is_pic->pic_vector(isrc); if (interrupt_sources[vector] != NULL) return (EEXIST); -#ifdef INTR_FILTER error = intr_event_create(&isrc->is_event, isrc, 0, - (mask_fn)isrc->is_pic->pic_enable_source, - intr_eoi_src, intr_disab_eoi_src, "irq%d:", vector); -#else - error = intr_event_create(&isrc->is_event, isrc, 0, - (mask_fn)isrc->is_pic->pic_enable_source, "irq%d:", vector); -#endif + intr_disable_src, (mask_fn)isrc->is_pic->pic_enable_source, + (mask_fn)isrc->is_pic->pic_eoi_source, intr_assign_cpu, "irq%d:", + vector); if (error) return (error); sx_xlock(&intr_table_lock); @@ -234,6 +229,15 @@ return (isrc->is_pic->pic_config_intr(isrc, trig, pol)); } +static void +intr_disable_src(void *arg) +{ + struct intsrc *isrc; + + isrc = arg; + isrc->is_pic->pic_disable_source(isrc, PIC_EOI); +} + #ifdef INTR_FILTER void intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame) @@ -286,24 +290,6 @@ "too many stray irq %d's: not logging anymore\n", isrc->is_pic->pic_vector(isrc)); } - -static void -intr_eoi_src(void *arg) -{ - struct intsrc *isrc; - - isrc = arg; - isrc->is_pic->pic_eoi_source(isrc); -} - -static void -intr_disab_eoi_src(void *arg) -{ - struct intsrc *isrc; - - isrc = arg; - isrc->is_pic->pic_disable_source(isrc, PIC_EOI); -} #else void intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame) @@ -431,6 +417,28 @@ sx_xunlock(&intr_table_lock); } +static int +intr_assign_cpu(void *arg, u_char cpu) +{ +#ifdef SMP + struct intsrc *isrc; + + /* + * Don't do anything during early boot. We will pick up the + * assignment once the APs are started. + */ + if (assign_cpu && cpu != NOCPU) { + isrc = arg; + sx_xlock(&intr_table_lock); + isrc->is_pic->pic_assign_cpu(isrc, cpu_apic_ids[cpu]); + sx_xunlock(&intr_table_lock); + } + return (0); +#else + return (EOPNOTSUPP); +#endif +} + static void intrcnt_setname(const char *name, int index) { @@ -485,7 +493,7 @@ sx_init(&intr_table_lock, "intr sources"); mtx_init(&intrcnt_lock, "intrcnt", NULL, MTX_SPIN); } -SYSINIT(intr_init, SI_SUB_INTR, SI_ORDER_FIRST, intr_init, NULL) +SYSINIT(intr_init, SI_SUB_INTR, SI_ORDER_FIRST, intr_init, NULL); #ifndef DEV_ATPIC /* Initialize the two 8259A's to a known-good shutdown state. */ @@ -542,15 +550,11 @@ static void intr_assign_next_cpu(struct intsrc *isrc) { - struct pic *pic; - u_int apic_id; /* * Assign this source to a local APIC in a round-robin fashion. */ - pic = isrc->is_pic; - apic_id = cpu_apic_ids[current_cpu]; - pic->pic_assign_cpu(isrc, apic_id); + isrc->is_pic->pic_assign_cpu(isrc, cpu_apic_ids[current_cpu]); do { current_cpu++; if (current_cpu > mp_maxid) @@ -558,6 +562,18 @@ } while (!(intr_cpus & (1 << current_cpu))); } +/* Attempt to bind the specified IRQ to the specified CPU. */ +int +intr_bind(u_int vector, u_char cpu) +{ + struct intsrc *isrc; + + isrc = intr_lookup_source(vector); + if (isrc == NULL) + return (EINVAL); + return (intr_event_bind(isrc->is_event, cpu)); +} + /* * Add a CPU to our mask of valid CPUs that can be destinations of * interrupts. @@ -594,10 +610,21 @@ assign_cpu = 1; for (i = 0; i < NUM_IO_INTS; i++) { isrc = interrupt_sources[i]; - if (isrc != NULL && isrc->is_handlers > 0) - intr_assign_next_cpu(isrc); + if (isrc != NULL && isrc->is_handlers > 0) { + /* + * If this event is already bound to a CPU, + * then assign the source to that CPU instead + * of picking one via round-robin. + */ + if (isrc->is_event->ie_cpu != NOCPU) + isrc->is_pic->pic_assign_cpu(isrc, + cpu_apic_ids[isrc->is_event->ie_cpu]); + else + intr_assign_next_cpu(isrc); + } } sx_xunlock(&intr_table_lock); } -SYSINIT(intr_shuffle_irqs, SI_SUB_SMP, SI_ORDER_SECOND, intr_shuffle_irqs, NULL) +SYSINIT(intr_shuffle_irqs, SI_SUB_SMP, SI_ORDER_SECOND, intr_shuffle_irqs, + NULL); #endif ==== //depot/projects/zcopybpf/src/sys/amd64/amd64/local_apic.c#8 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.43 2007/10/27 13:34:53 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.44 2008/03/16 10:58:02 rwatson Exp $"); #include "opt_hwpmc_hooks.h" @@ -1039,7 +1039,7 @@ printf("%s: Failed to probe CPUs: returned %d\n", best_enum->apic_name, retval); } -SYSINIT(apic_init, SI_SUB_TUNABLES - 1, SI_ORDER_SECOND, apic_init, NULL) +SYSINIT(apic_init, SI_SUB_TUNABLES - 1, SI_ORDER_SECOND, apic_init, NULL); /* * Setup the local APIC. We have to do this prior to starting up the APs @@ -1057,7 +1057,8 @@ printf("%s: Failed to setup the local APIC: returned %d\n", best_enum->apic_name, retval); } -SYSINIT(apic_setup_local, SI_SUB_CPU, SI_ORDER_SECOND, apic_setup_local, NULL) +SYSINIT(apic_setup_local, SI_SUB_CPU, SI_ORDER_SECOND, apic_setup_local, + NULL); /* * Setup the I/O APICs. @@ -1086,7 +1087,7 @@ /* Enable the MSI "pic". */ msi_init(); } -SYSINIT(apic_setup_io, SI_SUB_INTR, SI_ORDER_SECOND, apic_setup_io, NULL) +SYSINIT(apic_setup_io, SI_SUB_INTR, SI_ORDER_SECOND, apic_setup_io, NULL); #ifdef SMP /* ==== //depot/projects/zcopybpf/src/sys/amd64/amd64/machdep.c#10 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.682 2008/03/13 10:54:36 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.683 2008/03/16 10:58:02 rwatson Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -149,7 +149,7 @@ static void cpu_startup(void *); static void get_fpcontext(struct thread *td, mcontext_t *mcp); static int set_fpcontext(struct thread *td, const mcontext_t *mcp); -SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL) +SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL); #ifdef DDB extern vm_offset_t ksym_start, ksym_end; ==== //depot/projects/zcopybpf/src/sys/amd64/amd64/mptable.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable.c,v 1.240 2007/05/08 22:01:02 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable.c,v 1.241 2008/03/16 10:58:02 rwatson Exp $"); #include #include @@ -381,7 +381,7 @@ apic_register_enumerator(&mptable_enumerator); } SYSINIT(mptable_register, SI_SUB_TUNABLES - 1, SI_ORDER_FIRST, - mptable_register, NULL) + mptable_register, NULL); /* * Call the handler routine for each entry in the MP config table. ==== //depot/projects/zcopybpf/src/sys/amd64/amd64/nexus.c#7 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.79 2008/03/13 20:39:03 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.80 2008/03/20 21:24:32 jhb Exp $"); /* * This code implements a `root nexus' for Intel Architecture @@ -87,6 +87,9 @@ int unit); static struct resource *nexus_alloc_resource(device_t, device_t, int, int *, u_long, u_long, u_long, u_int); +#ifdef SMP +static int nexus_bind_intr(device_t, device_t, struct resource *, int); +#endif static int nexus_config_intr(device_t, int, enum intr_trigger, enum intr_polarity); static int nexus_activate_resource(device_t, device_t, int, int, @@ -128,6 +131,9 @@ DEVMETHOD(bus_deactivate_resource, nexus_deactivate_resource), DEVMETHOD(bus_setup_intr, nexus_setup_intr), DEVMETHOD(bus_teardown_intr, nexus_teardown_intr), +#ifdef SMP + DEVMETHOD(bus_bind_intr, nexus_bind_intr), +#endif DEVMETHOD(bus_config_intr, nexus_config_intr), DEVMETHOD(bus_get_resource_list, nexus_get_reslist), DEVMETHOD(bus_set_resource, nexus_set_resource), @@ -458,6 +464,14 @@ return (intr_remove_handler(ih)); } +#ifdef SMP +static int +nexus_bind_intr(device_t dev, device_t child, struct resource *irq, int cpu) +{ + return (intr_bind(rman_get_start(irq), cpu)); +} +#endif + static int nexus_config_intr(device_t dev, int irq, enum intr_trigger trig, enum intr_polarity pol) ==== //depot/projects/zcopybpf/src/sys/amd64/amd64/pmap.c#15 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.606 2008/03/04 18:50:15 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.609 2008/03/23 23:04:09 alc Exp $"); /* * Manages physical address maps. @@ -1861,12 +1861,8 @@ ("pmap_collect: wired pte %#lx", tpte)); if (tpte & PG_A) vm_page_flag_set(m, PG_REFERENCED); - if (tpte & PG_M) { - KASSERT((tpte & PG_RW), - ("pmap_collect: modified page not writable: va: %#lx, pte: %#lx", - va, tpte)); + if ((tpte & (PG_M | PG_RW)) == (PG_M | PG_RW)) vm_page_dirty(m); - } free = NULL; pmap_unuse_pt(pmap, va, *pde, &free); pmap_invalidate_page(pmap, va); @@ -2311,12 +2307,8 @@ eva = sva + NBPDR; for (va = sva, m = PHYS_TO_VM_PAGE(oldpde & PG_FRAME); va < eva; va += PAGE_SIZE, m++) { - if (oldpde & PG_M) { - KASSERT((oldpde & PG_RW) != 0, - ("pmap_remove_pde: modified 2mpage not writable: va: %#lx, pde: %#lx", - va, oldpde)); + if ((oldpde & (PG_M | PG_RW)) == (PG_M | PG_RW)) vm_page_dirty(m); - } if (oldpde & PG_A) vm_page_flag_set(m, PG_REFERENCED); if (TAILQ_EMPTY(&m->md.pv_list) && @@ -2364,12 +2356,8 @@ pmap->pm_stats.resident_count -= 1; if (oldpte & PG_MANAGED) { m = PHYS_TO_VM_PAGE(oldpte & PG_FRAME); - if (oldpte & PG_M) { - KASSERT((oldpte & PG_RW), - ("pmap_remove_pte: modified page not writable: va: %#lx, pte: %#lx", - va, oldpte)); + if ((oldpte & (PG_M | PG_RW)) == (PG_M | PG_RW)) vm_page_dirty(m); - } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Mar 24 22:21:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AAAA11065680; Mon, 24 Mar 2008 22:21:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3AF001065676 for ; Mon, 24 Mar 2008 22:21:04 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1CA168FC26 for ; Mon, 24 Mar 2008 22:21:04 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2OML3Wa079266 for ; Mon, 24 Mar 2008 22:21:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2OML3mD079264 for perforce@freebsd.org; Mon, 24 Mar 2008 22:21:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 24 Mar 2008 22:21:03 GMT Message-Id: <200803242221.m2OML3mD079264@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 138480 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Mar 2008 22:21:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=138480 Change 138480 by rwatson@rwatson_cinnamon on 2008/03/24 22:20:58 Merge $FreeBSD$ from CVS to zcopybpf branch. Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpf_buffer.c#7 edit .. //depot/projects/zcopybpf/src/sys/net/bpf_buffer.h#3 edit .. //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.c#35 edit .. //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.h#13 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpf_buffer.c#7 (text+ko) ==== @@ -62,7 +62,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/net/bpf_buffer.c,v 1.1 2008/03/24 13:49:17 csjp Exp $"); #include "opt_bpf.h" ==== //depot/projects/zcopybpf/src/sys/net/bpf_buffer.h#3 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/net/bpf_buffer.h,v 1.1 2008/03/24 13:49:17 csjp Exp $ */ #ifndef _NET_BPF_BUFFER_H_ ==== //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.c#35 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD$"); +_FBSDID("$FreeBSD: src/sys/net/bpf_zerocopy.c,v 1.1 2008/03/24 13:49:17 csjp Exp $"); #include "opt_bpf.h" ==== //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.h#13 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/net/bpf_zerocopy.h,v 1.1 2008/03/24 13:49:17 csjp Exp $ */ #ifndef _NET_BPF_ZEROCOPY_H_ From owner-p4-projects@FreeBSD.ORG Mon Mar 24 22:23:07 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 55893106566B; Mon, 24 Mar 2008 22:23: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 14DF7106566C for ; Mon, 24 Mar 2008 22:23:07 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EA20A8FC15 for ; Mon, 24 Mar 2008 22:23:06 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2OMN60Y079385 for ; Mon, 24 Mar 2008 22:23:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2OMN6QB079383 for perforce@freebsd.org; Mon, 24 Mar 2008 22:23:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 24 Mar 2008 22:23:06 GMT Message-Id: <200803242223.m2OMN6QB079383@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 138481 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Mar 2008 22:23:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=138481 Change 138481 by rwatson@rwatson_cinnamon on 2008/03/24 22:22:08 Integrate zcopybpf branch from FreeBSD CVS. Affected files ... .. //depot/projects/zcopybpf/src/sys/net/if_enc.c#4 integrate .. //depot/projects/zcopybpf/src/sys/net/if_loop.c#4 integrate Differences ... ==== //depot/projects/zcopybpf/src/sys/net/if_enc.c#4 (text+ko) ==== @@ -46,7 +46,6 @@ #include #include #include -#include #include #include ==== //depot/projects/zcopybpf/src/sys/net/if_loop.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)if_loop.c 8.2 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/net/if_loop.c,v 1.113 2007/10/27 18:25:53 yar Exp $ + * $FreeBSD: src/sys/net/if_loop.c,v 1.114 2008/03/24 22:16:46 jkim Exp $ */ /* @@ -57,7 +57,6 @@ #include #include #include -#include #ifdef INET #include From owner-p4-projects@FreeBSD.ORG Mon Mar 24 22:24:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 98ECD1065671; Mon, 24 Mar 2008 22:24: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 586F6106564A for ; Mon, 24 Mar 2008 22:24:08 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1FAA08FC19 for ; Mon, 24 Mar 2008 22:24:08 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2OMO8d3079503 for ; Mon, 24 Mar 2008 22:24:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2OMO7ea079501 for perforce@freebsd.org; Mon, 24 Mar 2008 22:24:07 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 24 Mar 2008 22:24:07 GMT Message-Id: <200803242224.m2OMO7ea079501@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 138482 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Mar 2008 22:24:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=138482 Change 138482 by rwatson@rwatson_cinnamon on 2008/03/24 22:23:30 Fix mismerge. Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.c#36 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.c#36 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -_FBSDID("$FreeBSD: src/sys/net/bpf_zerocopy.c,v 1.1 2008/03/24 13:49:17 csjp Exp $"); +__FBSDID("$FreeBSD: src/sys/net/bpf_zerocopy.c,v 1.1 2008/03/24 13:49:17 csjp Exp $"); #include "opt_bpf.h" From owner-p4-projects@FreeBSD.ORG Tue Mar 25 01:51:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5135A106566C; Tue, 25 Mar 2008 01:51: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 0E402106566B for ; Tue, 25 Mar 2008 01:51:50 +0000 (UTC) (envelope-from alm@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DCBF28FC21 for ; Tue, 25 Mar 2008 01:51:49 +0000 (UTC) (envelope-from alm@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2P1pnrA033165 for ; Tue, 25 Mar 2008 01:51:49 GMT (envelope-from alm@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2P1pnMx033154 for perforce@freebsd.org; Tue, 25 Mar 2008 01:51:49 GMT (envelope-from alm@freebsd.org) Date: Tue, 25 Mar 2008 01:51:49 GMT Message-Id: <200803250151.m2P1pnMx033154@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alm@freebsd.org using -f From: Aaron Meihm To: Perforce Change Reviews Cc: Subject: PERFORCE change 138488 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Mar 2008 01:51:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=138488 Change 138488 by alm@alm_praetorian on 2008/03/25 01:51:35 First pass at new threaded model. Affected files ... .. //depot/projects/trustedbsd/netauditd/Makefile#6 edit .. //depot/projects/trustedbsd/netauditd/conf.c#8 edit .. //depot/projects/trustedbsd/netauditd/grammar.y#2 edit .. //depot/projects/trustedbsd/netauditd/netauditd.c#17 edit .. //depot/projects/trustedbsd/netauditd/netauditd.h#12 edit .. //depot/projects/trustedbsd/netauditd/reader.c#1 add .. //depot/projects/trustedbsd/netauditd/reader.h#1 add .. //depot/projects/trustedbsd/netauditd/writer.c#1 add .. //depot/projects/trustedbsd/netauditd/writer.h#1 add Differences ... ==== //depot/projects/trustedbsd/netauditd/Makefile#6 (text+ko) ==== @@ -1,7 +1,7 @@ CC = gcc -CFLAGS = -Wall -g +CFLAGS = -Wall -g -pthread TARGETS = netauditd -OBJ = conf.o lex.yy.o netauditd.o y.tab.o +OBJ = conf.o lex.yy.o netauditd.o reader.o y.tab.o writer.o all: $(TARGETS) ==== //depot/projects/trustedbsd/netauditd/conf.c#8 (text+ko) ==== @@ -23,6 +23,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ +#include +#include #include #include ==== //depot/projects/trustedbsd/netauditd/grammar.y#2 (text+ko) ==== @@ -36,10 +36,13 @@ #include "conf.h" #include "netauditd.h" +#include "reader.h" +#include "writer.h" #define AU_CMPNT_INIT(x) x = malloc(sizeof(struct au_cmpnt)); \ assert (x != NULL); \ - bzero(x, sizeof(struct au_cmpnt)); + bzero(x, sizeof(struct au_cmpnt)); \ + TAILQ_INIT(&x->ac_sbuffers); static int ainfo_passive; @@ -115,6 +118,8 @@ new->ac_type = COMPONENT_NET; new->ac_name = $3; new->ac_ainfo = $4; + new->ac_init_func = writer_init_net; + writer_q_init(new); $$ = new; } | @@ -125,6 +130,8 @@ new->ac_type = COMPONENT_TRAIL; new->ac_name = $2; new->ac_path = $3; + new->ac_init_func = writer_init_trail; + writer_q_init(new); $$ = new; } ; @@ -137,6 +144,8 @@ new->ac_type = COMPONENT_PIPE; new->ac_name = $2; new->ac_path = $3; + new->ac_init_func = reader_init_pipe; + new->ac_read_func = reader_read_pipe; $$ = new; } | @@ -147,6 +156,8 @@ new->ac_type = COMPONENT_NET; new->ac_name = $3; new->ac_ainfo = $4; + new->ac_init_func = reader_init_net; + new->ac_read_func = reader_accept_client; $$ = new; } ; ==== //depot/projects/trustedbsd/netauditd/netauditd.c#17 (text+ko) ==== @@ -30,25 +30,57 @@ #include #include #include +#include #include #include +#include +#include +#include #include "conf.h" #include "netauditd.h" +#include "reader.h" +#include "writer.h" +static int debug_flag; +pthread_mutex_t debug_mutex; ac_head_t ac_list_src; ac_head_t ac_list_dst; extern char *conf_path; +void +dprintf(char *fmt, ...) +{ + char buf[1024]; + va_list ap; + + if (!debug_flag) + return; + if (pthread_mutex_lock(&debug_mutex) != 0) + exit(2); + va_start(ap, fmt); + (void) vsnprintf(buf, sizeof(buf), fmt, ap); + va_end(ap); + (void) printf("debug: %s\n", buf); + if (pthread_mutex_unlock(&debug_mutex) != 0) + exit(2); +} + int main(int argc, char *argv[]) { + pthread_t writer_thread; char ch; + if (pthread_mutex_init(&debug_mutex, NULL) != 0) + exit(2); conf_path = DEFAULT_CONF_PATH; - while ((ch = getopt(argc, argv, "f:h")) != -1) { + while ((ch = getopt(argc, argv, "df:h")) != -1) { switch (ch) { + case 'd': + debug_flag = 1; + break; case 'f': conf_path = optarg; break; @@ -58,15 +90,33 @@ /* Not reached */ } } + (void) signal(SIGPIPE, SIG_IGN); TAILQ_INIT(&ac_list_src); TAILQ_INIT(&ac_list_dst); conf_load(conf_path); + if (pthread_create(&writer_thread, NULL, writer_start, NULL) != 0) + exit(2); + reader_start(); return (0); } +int +nonblock(int fd) +{ + int flags; + + flags = fcntl(fd, F_GETFL); + if (flags == -1) + return (-1); + flags |= O_NONBLOCK; + if (fcntl(fd, F_SETFL, flags) == -1) + return (-1); + return (0); +} + void usage() { - (void) fputs("usage: netauditd [-h] [-f path]\n", stderr); + (void) fputs("usage: netauditd [-dh] [-f path]\n", stderr); exit(1); } ==== //depot/projects/trustedbsd/netauditd/netauditd.h#12 (text+ko) ==== @@ -32,19 +32,67 @@ COMPONENT_TRAIL }; +#define FLAG_ONLINE 1 /* Component is online */ +#define FLAG_CONNECTING (1 << 1) /* Component connecting */ + +struct audit_record { + void *ar_buf; + u_int32_t ar_record_len; + int ar_refcount; +}; + +struct au_queue_ent { + TAILQ_ENTRY(au_queue_ent) aq_glue; + struct audit_record *aq_record; + u_int32_t aq_remain; +}; + +typedef TAILQ_HEAD(, au_queue_ent) au_q_t; + +struct au_qpair { + au_q_t qp_a, qp_b; + int qp_ready; + au_q_t *qp_read, *qp_write; + pthread_mutex_t qp_lock; + pthread_cond_t qp_cond; + u_int32_t qp_read_size; + time_t qp_time; +}; + struct au_cmpnt { struct addrinfo *ac_ainfo; struct au_cmpnt **ac_dsts; + time_t ac_failed; int ac_fd; + int ac_flags; TAILQ_ENTRY(au_cmpnt) ac_glue; char *ac_name; int ac_ndsts; char *ac_path; + struct au_qpair ac_q; int ac_type; + + TAILQ_HEAD(, au_src_buffer) ac_sbuffers; + + int (*ac_init_func)(struct au_cmpnt *); + int (*ac_read_func)(struct au_cmpnt *); +}; + +struct au_src_buffer { + struct sockaddr as_addr; + socklen_t as_addrlen; + int as_fd; + TAILQ_ENTRY(au_src_buffer) as_glue; + u_char as_header[5]; + struct au_cmpnt *as_parent; + u_int32_t as_nread; + struct audit_record *as_record; }; typedef TAILQ_HEAD(, au_cmpnt) ac_head_t; extern ac_head_t ac_list_src; extern ac_head_t ac_list_dst; +void dprintf(char *, ...); +int nonblock(int); void usage(void); From owner-p4-projects@FreeBSD.ORG Tue Mar 25 02:28:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D97AE1065674; Tue, 25 Mar 2008 02:28: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 983EA1065672 for ; Tue, 25 Mar 2008 02:28:28 +0000 (UTC) (envelope-from qingli@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 718548FC15 for ; Tue, 25 Mar 2008 02:28:28 +0000 (UTC) (envelope-from qingli@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2P2SSLZ036557 for ; Tue, 25 Mar 2008 02:28:28 GMT (envelope-from qingli@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2P2SSpo036555 for perforce@freebsd.org; Tue, 25 Mar 2008 02:28:28 GMT (envelope-from qingli@freebsd.org) Date: Tue, 25 Mar 2008 02:28:28 GMT Message-Id: <200803250228.m2P2SSpo036555@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to qingli@freebsd.org using -f From: Qing Li To: Perforce Change Reviews Cc: Subject: PERFORCE change 138489 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Mar 2008 02:28:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=138489 Change 138489 by qingli@FreeBSD-newarp on 2008/03/25 02:28:08 Checking in the missing files from the last commit. Fixed a locking issue, but there is one more radix head locking issue that is causing a panic... debugging is in progress. Affected files ... .. //depot/projects/qingli_mpath/src/sys/net/radix_mpath.c#2 edit .. //depot/projects/qingli_mpath/src/sys/net/rtsock.c#4 edit .. //depot/projects/qingli_mpath/src/sys/netinet/ip_output.c#3 edit .. //depot/projects/qingli_mpath/src/sys/netinet6/in6_src.c#3 edit .. //depot/projects/qingli_mpath/src/sys/netinet6/nd6_nbr.c#2 edit Differences ... ==== //depot/projects/qingli_mpath/src/sys/net/radix_mpath.c#2 (text+ko) ==== @@ -103,12 +103,12 @@ rn = (struct radix_node *)rt; do { rt = (struct rtentry *)rn; - /* Qing - * we are removing an address alias that has - * the same prefix as another address - * we need to compare the interface address because - * rt_gateway is a special sockadd_dl structure - */ + /* + * we are removing an address alias that has + * the same prefix as another address + * we need to compare the interface address because + * rt_gateway is a special sockadd_dl structure + */ if (rt->rt_gateway->sa_family == AF_LINK) { if (!memcmp(rt->rt_ifa->ifa_addr, gate, gate->sa_len)) break; @@ -274,8 +274,10 @@ ro->ro_rt = rtalloc1(&ro->ro_dst, 1, 0UL); /* if the route does not exist or it is not multipath, don't care */ - if (!ro->ro_rt || !rn_mpath_next((struct radix_node *)ro->ro_rt)) + if (!ro->ro_rt || !rn_mpath_next((struct radix_node *)ro->ro_rt)) { + RT_UNLOCK(ro->ro_rt); return; + } /* beyond here, we use rn as the master copy */ rn0 = rn = (struct radix_node *)ro->ro_rt; @@ -294,12 +296,16 @@ /* XXX try filling rt_gwroute and avoid unreachable gw */ /* if gw selection fails, use the first match (default) */ - if (!rn) + if (!rn) { + RT_UNLOCK(ro->ro_rt); return; - + } + rtfree(ro->ro_rt); ro->ro_rt = (struct rtentry *)rn; + RT_LOCK(ro->ro_rt); ro->ro_rt->rt_refcnt++; + RT_UNLOCK(ro->ro_rt); } extern int in6_inithead __P((void **head, int off)); ==== //depot/projects/qingli_mpath/src/sys/net/rtsock.c#4 (text+ko) ==== @@ -434,7 +434,6 @@ if (rn_mpath_capable(rnh) && (rtm->rtm_type != RTM_GET || info.rti_info[RTAX_GATEWAY])) { rt = rt_mpath_matchgate(rt, info.rti_info[RTAX_GATEWAY]); - rnh = (struct radix_node_head *)rt; if (!rt) { RADIX_NODE_HEAD_UNLOCK(rnh); senderr(ESRCH); ==== //depot/projects/qingli_mpath/src/sys/netinet/ip_output.c#3 (text+ko) ==== @@ -36,6 +36,7 @@ #include "opt_ipsec.h" #include "opt_mac.h" #include "opt_mbuf_stress_test.h" +#include "opt_mpath.h" #include #include @@ -54,6 +55,9 @@ #include #include #include +#ifdef RADIX_MPATH +#include +#endif #include #include @@ -225,7 +229,12 @@ * operation (as it is for ARP). */ if (ro->ro_rt == NULL) +#ifdef RADIX_MPATH + rtalloc_mpath(ro, + ntohl(ip->ip_src.s_addr ^ ip->ip_dst.s_addr)); +#else rtalloc_ign(ro, 0); +#endif if (ro->ro_rt == NULL) { ipstat.ips_noroute++; error = EHOSTUNREACH; ==== //depot/projects/qingli_mpath/src/sys/netinet6/in6_src.c#3 (text+ko) ==== @@ -65,6 +65,7 @@ #include "opt_inet.h" #include "opt_inet6.h" +#include "opt_mpath.h" #include #include @@ -84,6 +85,9 @@ #include #include +#ifdef RADIX_MPATH +#include +#endif #include #include @@ -568,7 +572,12 @@ sa6->sin6_scope_id = 0; if (clone) { +#ifdef RADIX_MPATH + rtalloc_mpath((struct route *)ro, + ntohl(sa6->sin6_addr.s6_addr32[3])); +#else rtalloc((struct route *)ro); +#endif } else { ro->ro_rt = rtalloc1(&((struct route *)ro) ->ro_dst, 0, 0UL); ==== //depot/projects/qingli_mpath/src/sys/netinet6/nd6_nbr.c#2 (text+ko) ==== @@ -36,6 +36,7 @@ #include "opt_inet6.h" #include "opt_ipsec.h" #include "opt_carp.h" +#include "opt_mpath.h" #include #include @@ -55,6 +56,9 @@ #include #include #include +#ifdef RADIX_MPATH +#include +#endif #include #include @@ -208,13 +212,23 @@ struct rtentry *rt; struct sockaddr_in6 tsin6; int need_proxy; +#ifdef RADIX_MPATH + struct route_in6 ro; +#endif bzero(&tsin6, sizeof tsin6); tsin6.sin6_len = sizeof(struct sockaddr_in6); tsin6.sin6_family = AF_INET6; tsin6.sin6_addr = taddr6; +#ifdef RADIX_MPATH + bzero(&ro, sizeof(ro)); + ro.ro_dst = tsin6; + rtalloc_mpath((struct route *)&ro, RTF_ANNOUNCE); + rt = ro.ro_rt; +#else rt = rtalloc1((struct sockaddr *)&tsin6, 0, 0); +#endif need_proxy = (rt && (rt->rt_flags & RTF_ANNOUNCE) != 0 && rt->rt_gateway->sa_family == AF_LINK); if (rt) From owner-p4-projects@FreeBSD.ORG Tue Mar 25 03:17:19 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E6B771065670; Tue, 25 Mar 2008 03:17: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 A2CF1106564A for ; Tue, 25 Mar 2008 03:17:18 +0000 (UTC) (envelope-from dongmei@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7A3798FC13 for ; Tue, 25 Mar 2008 03:17:18 +0000 (UTC) (envelope-from dongmei@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2P3HI5B041895 for ; Tue, 25 Mar 2008 03:17:18 GMT (envelope-from dongmei@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2P3HIYt041893 for perforce@freebsd.org; Tue, 25 Mar 2008 03:17:18 GMT (envelope-from dongmei@FreeBSD.org) Date: Tue, 25 Mar 2008 03:17:18 GMT Message-Id: <200803250317.m2P3HIYt041893@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to dongmei@FreeBSD.org using -f From: dongmei To: Perforce Change Reviews Cc: Subject: PERFORCE change 138490 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Mar 2008 03:17:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=138490 Change 138490 by dongmei@dongmei-soc2007-home on 2008/03/25 03:16:19 add find mechanism Affected files ... .. //depot/projects/soc2007/dongmei-auditanalyzer/eng/emem.c#1 add .. //depot/projects/soc2007/dongmei-auditanalyzer/eng/emem.h#1 add .. //depot/projects/soc2007/dongmei-auditanalyzer/eng/gnuc_format_check.h#1 add .. //depot/projects/soc2007/dongmei-auditanalyzer/eng/strutil.c#1 add .. //depot/projects/soc2007/dongmei-auditanalyzer/eng/strutil.h#1 add .. //depot/projects/soc2007/dongmei-auditanalyzer/gtk/compat_macros.h#5 edit .. //depot/projects/soc2007/dongmei-auditanalyzer/gtk/find_dlg.c#1 add .. //depot/projects/soc2007/dongmei-auditanalyzer/gtk/find_dlg.h#1 add .. //depot/projects/soc2007/dongmei-auditanalyzer/gtk/gui_utils.c#2 edit .. //depot/projects/soc2007/dongmei-auditanalyzer/gtk/gui_utils.h#2 edit .. //depot/projects/soc2007/dongmei-auditanalyzer/gtk/menu.c#5 edit .. //depot/projects/soc2007/dongmei-auditanalyzer/gtk/menu.h#4 edit .. //depot/projects/soc2007/dongmei-auditanalyzer/gtk/progress_dlg.h#1 add .. //depot/projects/soc2007/dongmei-auditanalyzer/gtk/simple_dialog.c#4 edit .. //depot/projects/soc2007/dongmei-auditanalyzer/gtk/simple_dialog.h#2 edit .. //depot/projects/soc2007/dongmei-auditanalyzer/tfile.c#8 edit .. //depot/projects/soc2007/dongmei-auditanalyzer/tfile.h#4 edit Differences ... ==== //depot/projects/soc2007/dongmei-auditanalyzer/gtk/compat_macros.h#5 (text+ko) ==== @@ -25,10 +25,10 @@ * @param arg value to pass to your function * @return the connection id */ -#define SIGNAL_CONNECT(widget, name, callback, arg) \ +/*#define SIGNAL_CONNECT(widget, name, callback, arg) \ gtk_signal_connect(GTK_OBJECT(widget), name, GTK_SIGNAL_FUNC(callback), \ (gpointer)(arg)) - +*/ /** This function is for registering a callback that will call another object's callback. * That is, instead of passing the object which is responsible for the event as the first * parameter of the callback, it is switched with the user data (so the object which emits ==== //depot/projects/soc2007/dongmei-auditanalyzer/gtk/gui_utils.c#2 (text+ko) ==== @@ -1,5 +1,11 @@ #include #include +#include "gui_utils.h" + +#define WINDOW_GEOM_KEY "window_geom" + +static void +dlg_activate (GtkWidget *widget, gpointer ok_button); /* exit the main window */ void main_window_exit(void) @@ -40,4 +46,159 @@ return FALSE; } +/* Set the "key_press_event" signal for a top-level dialog window to + call a routine to activate the "Cancel" button for a dialog box if + the key being pressed is the key. + + XXX - there should be a GTK+ widget that'll do that for you, and + let you specify a "Cancel" button. It should also not impose + a requirement that there be a separator in the dialog box, as + the GtkDialog widget does; the visual convention that there's + such a separator between the rest of the dialog boxes and buttons + such as "OK" and "Cancel" is, for better or worse, not universal + (not even in GTK+ - look at the GtkFileSelection dialog!). */ +static void +window_set_cancel(GtkWidget *widget, GtkWidget *cancel_button) +{ + SIGNAL_CONNECT(widget, "key_press_event", window_key_press_cb, cancel_button); +} + +/* set the actions needed for the cancel "Close"/"Ok"/"Cancel" button that closes the window */ +void window_set_cancel_button(GtkWidget *win, GtkWidget *bt, window_cancel_button_fct cb) +{ + if(cb) + SIGNAL_CONNECT(bt, "clicked", cb, win); + + gtk_widget_grab_default(bt); + + window_set_cancel(win, bt); +} +/* default callback handler for cancel button "clicked" signal */ +void window_cancel_button_cb(GtkWidget *w _U_, gpointer data) +{ + window_destroy(GTK_WIDGET(data)); +} +/* default callback handler: the window managers X of the window was clicked (delete_event) */ +gboolean +window_delete_event_cb(GtkWidget *win, GdkEvent *event _U_, gpointer user_data _U_) +{ + window_destroy(win); + + /* event handled, don't do anything else */ + return TRUE; +} +/* Set the "activate" signal for a widget to call a routine to + activate the "OK" button for a dialog box. + + XXX - there should be a way to specify that a GtkEntry widget + shouldn't itself handle the Return key, but should let it be + passed on to the parent, so that you don't have to do this + by hand for every GtkEntry widget in a dialog box, but, alas, + there isn't. (Does this problem exist for other widgets? + I.e., are there any others that seize the Return key? */ +void +dlg_set_activate(GtkWidget *widget, GtkWidget *ok_button) +{ + SIGNAL_CONNECT(widget, "activate", dlg_activate, ok_button); +} + +static void +dlg_activate (GtkWidget *widget _U_, gpointer ok_button) +{ + gtk_widget_activate(GTK_WIDGET(ok_button)); +} +/* set the geometry of a window from window_new() */ +void +window_set_geometry(GtkWidget *widget, window_geometry_t *geom) +{ + /* as we now have the geometry from the recent file, set it */ + /* if the window was minimized, x and y are -32000 (at least on Win32) */ + if (geom->set_pos && geom->x != -32000 && geom->y != -32000) { +#if GTK_MAJOR_VERSION >= 2 + gtk_window_move(GTK_WINDOW(widget), + geom->x, + geom->y); +#else + gtk_widget_set_uposition(widget, + geom->x, + geom->y); +#endif + } + + if (geom->set_size) { +#if GTK_MAJOR_VERSION >= 2 + gtk_window_resize(GTK_WINDOW(widget), +#else + gtk_window_set_default_size(GTK_WINDOW(widget), + geom->width, + geom->height); + gtk_widget_set_usize(widget, +#endif + /*WIDGET_SET_SIZE(widget,*/ + geom->width, + geom->height); + } + +#if GTK_MAJOR_VERSION >= 2 + if(geom->set_maximized) { + if (geom->maximized) { + gdk_window_maximize(widget->window); + } else { + gdk_window_unmaximize(widget->window); + } + } +#endif +} + + + +/* the geometry hashtable for all known window classes, + * the window name is the key, and the geometry struct is the value */ +GHashTable *window_geom_hash = NULL; + +/* load the desired geometry for this window from the geometry hashtable */ +static gboolean +window_geom_load(const gchar *name, window_geometry_t *geom) +{ + window_geometry_t *p; + + /* init hashtable, if not already done */ + if(!window_geom_hash) { + window_geom_hash = g_hash_table_new (g_str_hash, g_str_equal); + } + + p = g_hash_table_lookup(window_geom_hash, name); + if(p) { + *geom = *p; + return TRUE; + } else { + return FALSE; + } +} + + +/* Present the created window on the screen. */ +void +window_present(GtkWidget *win) +{ + window_geometry_t geom; + const gchar *name; + +#if GTK_MAJOR_VERSION >= 2 + /* present this window */ + gtk_window_present(GTK_WINDOW(win)); +#endif + + /* do we have a previously saved size and position of this window? */ + name = OBJECT_GET_DATA(win, WINDOW_GEOM_KEY); + if(name) { + if(window_geom_load(name, &geom)) { + /* XXX - use prefs to select which values to set? */ + geom.set_pos = TRUE; + geom.set_size = TRUE; + geom.set_maximized = TRUE; + window_set_geometry(win, &geom); + } + } +} ==== //depot/projects/soc2007/dongmei-auditanalyzer/gtk/gui_utils.h#2 (text+ko) ==== @@ -1,7 +1,26 @@ #include +#include "compat_macros.h" +/** geometry values for use in window_get_geometry() and window_set_geometry() */ +typedef struct window_geometry_s { + gchar *key; /**< current key in hashtable (internally used only) */ + gboolean set_pos; /**< set the x and y position values */ + gint x; /**< the windows x position */ + gint y; /**< the windows y position */ + gboolean set_size; /**< set the width and height values */ + gint width; /**< the windows width */ + gint height; /**< the windows height */ + + gboolean set_maximized; /**< set the maximized state (GTK2 only) */ + gboolean maximized; /**< the windows maximized state (GTK2 only) */ +} window_geometry_t; + typedef void (*window_cancel_button_fct) (GtkWidget *w, gpointer data); void main_window_exit(void); void main_window_quit(void); void window_destroy(GtkWidget *win); gint window_key_press_cb (GtkWidget *widget, GdkEventKey *event, gpointer cancel_button); +void window_set_cancel_button(GtkWidget *win, GtkWidget *bt, window_cancel_button_fct cb); +extern void window_cancel_button_cb(GtkWidget *w _U_, gpointer data); +extern gboolean window_delete_event_cb(GtkWidget *win, GdkEvent *event _U_, gpointer user_data _U_); + ==== //depot/projects/soc2007/dongmei-auditanalyzer/gtk/menu.c#5 (text+ko) ==== @@ -2,6 +2,7 @@ #include #include "compat_macros.h" #include "trail_file_dlg.h" +#include "find_dlg.h" #include "main.h" #include "../capture.h" #define GTK_MENU_FUNC(a) ((GtkItemFactoryCallback)(a)) @@ -16,6 +17,8 @@ 0, GTK_STOCK_QUIT), ITEM_FACTORY_ENTRY("/_Edit", NULL, NULL, 0, "", NULL), + ITEM_FACTORY_STOCK_ENTRY("/Edit/_Find Record...", "F", + find_frame_cb,0, GTK_STOCK_FIND), #if 0 /* Un-#if this when we actually implement Cut/Copy/Paste. */ ITEM_FACTORY_STOCK_ENTRY("/Edit/Cut", "X", NULL, ==== //depot/projects/soc2007/dongmei-auditanalyzer/gtk/menu.h#4 (text+ko) ==== ==== //depot/projects/soc2007/dongmei-auditanalyzer/gtk/simple_dialog.c#4 (text+ko) ==== @@ -387,34 +387,6 @@ return hbox; } -/* Set the "key_press_event" signal for a top-level dialog window to - call a routine to activate the "Cancel" button for a dialog box if - the key being pressed is the key. - - XXX - there should be a GTK+ widget that'll do that for you, and - let you specify a "Cancel" button. It should also not impose - a requirement that there be a separator in the dialog box, as - the GtkDialog widget does; the visual convention that there's - such a separator between the rest of the dialog boxes and buttons - such as "OK" and "Cancel" is, for better or worse, not universal - (not even in GTK+ - look at the GtkFileSelection dialog!). */ -static void -window_set_cancel(GtkWidget *widget, GtkWidget *cancel_button) -{ - SIGNAL_CONNECT(widget, "key_press_event", window_key_press_cb, cancel_button); -} - -/* set the actions needed for the cancel "Close"/"Ok"/"Cancel" button that closes the window */ -void -window_set_cancel_button(GtkWidget *win, GtkWidget *bt, window_cancel_button_fct cb) -{ - if(cb) - SIGNAL_CONNECT(bt, "clicked", cb, win); - - gtk_widget_grab_default(bt); - - window_set_cancel(win, bt); -} /* * Set the focus and default for the nth item in a button row, with * 0 being the first item. ==== //depot/projects/soc2007/dongmei-auditanalyzer/gtk/simple_dialog.h#2 (text+ko) ==== ==== //depot/projects/soc2007/dongmei-auditanalyzer/tfile.c#8 (text+ko) ==== @@ -24,8 +24,36 @@ u_char *buf; int reclen; }; +typedef struct { + const char *string; + size_t string_len; + trailer_file *cf; + gboolean frame_matched; +} match_data; +typedef struct { + const guint8 *data; + size_t data_len; +} cbs_t; /* "Counted byte string" */ static guint32 cum_bytes = 0; +static gboolean match_protocol_tree(trailer_file *cf, record_data *fdata, + void *criterion); +static gboolean match_summary_line(trailer_file *cf, record_data *fdata, + void *criterion); +static gboolean match_ascii_and_unicode(trailer_file *cf, record_data *fdata, + void *criterion); +static gboolean match_ascii(trailer_file *cf, record_data *fdata, + void *criterion); +static gboolean match_unicode(trailer_file *cf, record_data *fdata, + void *criterion); +static gboolean match_binary(trailer_file *cf, record_data *fdata, + void *criterion); +static gboolean match_dfilter(trailer_file *cf, record_data *fdata, + void *criterion); +static gboolean find_packet(trailer_file *cf, + gboolean (*match_function)(trailer_file *, record_data *, void *), + void *criterion); + void init_trail_file(trailer_file *cf) { @@ -506,3 +534,644 @@ } } +const gchar * +cf_get_display_name(trailer_file *cf) +{ + const gchar *displayname; + + /* Return a name to use in displays */ + if (!cf->is_tempfile) { + /* Get the last component of the file name, and use that. */ + if (cf->filename){ + displayname = get_basename(cf->filename); + } else { + displayname="(No file)"; + } + } else { + /* The file we read is a temporary file from a live capture; + we don't mention its name. */ + displayname = "(Untitled)"; + } + return displayname; +} + +/* XXX - use a macro instead? */ +int +cf_get_packet_count(trailer_file *cf) +{ + return cf->count; +} + +/* XXX - use a macro instead? */ +void +cf_set_packet_count(trailer_file *cf, int packet_count) +{ + cf->count = packet_count; +} + +/* XXX - use a macro instead? */ +gboolean +cf_is_tempfile(trailer_file *cf) +{ + return cf->is_tempfile; +} + +void cf_set_tempfile(trailer_file *cf, gboolean is_tempfile) +{ + cf->is_tempfile = is_tempfile; +} + + +/* XXX - use a macro instead? */ +void cf_set_drops(trailer_file *cf, guint32 drops) +{ + cf->drops = drops; +} + +/* XXX - use a macro instead? */ +gboolean cf_get_drops_known(trailer_file *cf) +{ + return cf->drops_known; +} + +/* XXX - use a macro instead? */ +guint32 cf_get_drops(trailer_file *cf) +{ + return cf->drops; +} +#ifdef FILTER_EXPRESSION +void cf_set_rfcode(trailer_file *cf, dfilter_t *rfcode) +{ + cf->rfcode = rfcode; +} +#endif +gboolean +cf_find_packet_summary_line(trailer_file *cf, const char *string) +{ + match_data mdata; + + mdata.string = string; + mdata.string_len = strlen(string); + return find_packet(cf, match_summary_line, &mdata); +} +gboolean +cf_find_packet_data(trailer_file *cf, const guint8 *string, size_t string_size) +{ + cbs_t info; + + info.data = string; + info.data_len = string_size; + + /* String or hex search? */ + if (cf->string) { + /* String search - what type of string? */ + switch (cf->scs_type) { + + case SCS_ASCII_AND_UNICODE: + return find_packet(cf, match_ascii_and_unicode, &info); + + case SCS_ASCII: + return find_packet(cf, match_ascii, &info); + + case SCS_UNICODE: + return find_packet(cf, match_unicode, &info); + + default: + g_assert_not_reached(); + return FALSE; + } + } else + return find_packet(cf, match_binary, &info); +} +static gboolean +match_ascii_and_unicode(trailer_file *cf, record_data *fdata, void *criterion) +{ + cbs_t *info = criterion; + const char *ascii_text = info->data; + size_t textlen = info->data_len; + gboolean frame_matched; + guint32 buf_len; + guint32 i; + guint8 c_char; + size_t c_match = 0; + + frame_matched = FALSE; + buf_len = fdata->record_len; + for (i = 0; i < buf_len; i++) { + c_char = cf->pd[i]; + if (cf->case_type) + c_char = toupper(c_char); + if (c_char != 0) { + if (c_char == ascii_text[c_match]) { + c_match++; + if (c_match == textlen) { + frame_matched = TRUE; + cf->search_pos = i; /* Save the position of the last character + for highlighting the field. */ + break; + } + } else + c_match = 0; + } + } + return frame_matched; +} + +static gboolean +match_ascii(trailer_file *cf, record_data *fdata, void *criterion) +{ + cbs_t *info = criterion; + const char *ascii_text = info->data; + size_t textlen = info->data_len; + gboolean frame_matched; + guint32 buf_len; + guint32 i; + guint8 c_char; + size_t c_match = 0; + + frame_matched = FALSE; + buf_len = fdata->record_len; + for (i = 0; i < buf_len; i++) { + c_char = cf->pd[i]; + if (cf->case_type) + c_char = toupper(c_char); + if (c_char == ascii_text[c_match]) { + c_match++; + if (c_match == textlen) { + frame_matched = TRUE; + cf->search_pos = i; /* Save the position of the last character + for highlighting the field. */ + break; + } + } else + c_match = 0; + } + return frame_matched; +} + +static gboolean +match_unicode(trailer_file *cf, record_data *fdata, void *criterion) +{ + cbs_t *info = criterion; + const char *ascii_text = info->data; + size_t textlen = info->data_len; + gboolean frame_matched; + guint32 buf_len; + guint32 i; + guint8 c_char; + size_t c_match = 0; + + frame_matched = FALSE; + buf_len = fdata->record_len; + for (i = 0; i < buf_len; i++) { + c_char = cf->pd[i]; + if (cf->case_type) + c_char = toupper(c_char); + if (c_char == ascii_text[c_match]) { + c_match++; + i++; + if (c_match == textlen) { + frame_matched = TRUE; + cf->search_pos = i; /* Save the position of the last character + for highlighting the field. */ + break; + } + } else + c_match = 0; + } + return frame_matched; +} + +static gboolean +match_binary(trailer_file *cf, record_data *fdata, void *criterion) +{ + cbs_t *info = criterion; + const guint8 *binary_data = info->data; + size_t datalen = info->data_len; + gboolean frame_matched; + guint32 buf_len; + guint32 i; + size_t c_match = 0; + + frame_matched = FALSE; + buf_len = fdata->record_len; + for (i = 0; i < buf_len; i++) { + if (cf->pd[i] == binary_data[c_match]) { + c_match++; + if (c_match == datalen) { + frame_matched = TRUE; + cf->search_pos = i; /* Save the position of the last character + for highlighting the field. */ + break; + } + } else + c_match = 0; + } + return frame_matched; +} +#ifdef FILTER_EXPRESSION +gboolean +cf_find_packet_dfilter(trailer_file *cf, dfilter_t *sfcode) +{ + return find_packet(cf, match_dfilter, sfcode); +} + +static gboolean +match_dfilter(trailer_file *cf, record_data *fdata, void *criterion) +{ + dfilter_t *sfcode = criterion; + epan_dissect_t *edt; + gboolean frame_matched; + + edt = epan_dissect_new(TRUE, FALSE); + epan_dissect_prime_dfilter(edt, sfcode); + epan_dissect_run(edt, &cf->pseudo_header, cf->pd, fdata, NULL); + frame_matched = dfilter_apply_edt(sfcode, edt); + epan_dissect_free(edt); + return frame_matched; +} + +#endif +static gboolean +find_packet(trailer_file *cf, + gboolean (*match_function)(trailer_file *, record_data *, void *), + void *criterion) +{ + record_data *start_fd; + record_data *fdata; + record_data *new_fd = NULL; + progdlg_t *progbar = NULL; + gboolean stop_flag; + int count; + int err; + gchar *err_info; + int row; + float progbar_val; + GTimeVal start_time; + gchar status_str[100]; + int progbar_nextstep; + int progbar_quantum; + char *title; + + start_fd = cf->current_record; + if (start_fd != NULL) { + /* Iterate through the list of packets, starting at the packet we've + picked, calling a routine to run the filter on the packet, see if + it matches, and stop if so. */ + count = 0; + fdata = start_fd; + + /* Update the progress bar when it gets to this value. */ + progbar_nextstep = 0; + /* When we reach the value that triggers a progress bar update, + bump that value by this amount. */ + progbar_quantum = cf->count/N_PROGBAR_UPDATES; + /* Progress so far. */ + progbar_val = 0.0; + + stop_flag = FALSE; + g_get_current_time(&start_time); + + fdata = start_fd; + title = cf->sfilter?cf->sfilter:""; + for (;;) { + /* Create the progress bar if necessary. + We check on every iteration of the loop, so that it takes no + longer than the standard time to create it (otherwise, for a + large file, we might take considerably longer than that standard + time in order to get to the next progress bar step). */ + if (progbar == NULL) + progbar = delayed_create_progress_dlg("Searching", title, + FALSE, &stop_flag, &start_time, progbar_val); + + /* Update the progress bar, but do it only N_PROGBAR_UPDATES times; + when we update it, we have to run the GTK+ main loop to get it + to repaint what's pending, and doing so may involve an "ioctl()" + to see if there's any pending input from an X server, and doing + that for every packet can be costly, especially on a big file. */ + if (count >= progbar_nextstep) { + /* let's not divide by zero. I should never be started + * with count == 0, so let's assert that + */ + g_assert(cf->count > 0); + + progbar_val = (gfloat) count / cf->count; + + if (progbar != NULL) { + g_snprintf(status_str, sizeof(status_str), + "%4u of %u packets", count, cf->count); + update_progress_dlg(progbar, progbar_val, status_str); + } + + progbar_nextstep += progbar_quantum; + } + + if (stop_flag) { + /* Well, the user decided to abort the search. Go back to the + frame where we started. */ + new_fd = start_fd; + break; + } + + /* Go past the current frame. */ + if (cf->sbackward) { + /* Go on to the previous frame. */ + fdata = fdata->prev; + if (fdata == NULL) { + /* + * XXX - other apps have a bit more of a detailed message + * for this, and instead of offering "OK" and "Cancel", + * they offer things such as "Continue" and "Cancel"; + * we need an API for popping up alert boxes with + * {Verb} and "Cancel". + */ +#ifdef HAVE_PREFS + if (prefs.gui_find_wrap) + { + simple_dialog(ESD_TYPE_INFO, ESD_BTN_OK, + "%sBeginning of capture exceeded!%s\n\n" + "Search is continued from the end of the capture.", + simple_dialog_primary_start(), simple_dialog_primary_end()); + fdata = cf->rlist_end; /* wrap around */ + } + else + { +#endif + simple_dialog(ESD_TYPE_INFO, ESD_BTN_OK, + "%sBeginning of capture exceeded!%s\n\n" + "Try searching forwards.", + simple_dialog_primary_start(), simple_dialog_primary_end()); + fdata = start_fd; /* stay on previous packet */ +#ifdef HAVE_PREFS + } +#endif + } + } else { + /* Go on to the next frame. */ + fdata = fdata->next; + if (fdata == NULL) { +#ifdef HAVE_PREFS + if (prefs.gui_find_wrap) + { + simple_dialog(ESD_TYPE_INFO, ESD_BTN_OK, + "%sEnd of capture exceeded!%s\n\n" + "Search is continued from the start of the capture.", + simple_dialog_primary_start(), simple_dialog_primary_end()); + fdata = cf->rlist; /* wrap around */ + } + else + { +#endif + simple_dialog(ESD_TYPE_INFO, ESD_BTN_OK, + "%sEnd of capture exceeded!%s\n\n" + "Try searching backwards.", + simple_dialog_primary_start(), simple_dialog_primary_end()); + fdata = start_fd; /* stay on previous packet */ + +#ifdef HAVE_PREFS + } +#endif + } + } + + count++; +#ifdef FILTER_EXPRESSION + /* Is this packet in the display? */ + if (fdata->flags.passed_dfilter) { + /* Yes. Load its data. */ + if (!wtap_seek_read(cf->wth, fdata->file_off, &cf->pseudo_header, + cf->pd, fdata->cap_len, &err, &err_info)) { + /* Read error. Report the error, and go back to the frame + where we started. */ + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, + cf_read_error_message(err, err_info), cf->filename); + new_fd = start_fd; + break; + } + + /* Does it match the search criterion? */ + if ((*match_function)(cf, fdata, criterion)) { + new_fd = fdata; + break; /* found it! */ + } + } + +#endif + if (fdata == start_fd) { + /* We're back to the frame we were on originally, and that frame + doesn't match the search filter. The search failed. */ + break; + } + } + + /* We're done scanning the packets; destroy the progress bar if it + was created. */ + if (progbar != NULL) + destroy_progress_dlg(progbar); + } + + if (new_fd != NULL) { + /* We found a frame. Find what row it's in. */ + row = packet_list_find_row_from_data(new_fd); + g_assert(row != -1); + + /* Select that row, make it the focus row, and make it visible. */ + packet_list_set_selected_row(row); + return TRUE; /* success */ + } else + return FALSE; /* failure */ +} + +gboolean +cf_goto_frame(trailer_file *cf, guint fnumber) +{ + record_data *fdata; + int row; + + for (fdata = cf->rlist; fdata != NULL && fdata->num < fnumber; fdata = fdata->next) + ; + + if (fdata == NULL) { + /* we didn't find a packet with that packet number */ + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, + "There is no packet with the packet number %u.", fnumber); + return FALSE; /* we failed to go to that packet */ + } +#ifdef FILTER_EXPRESSION + if (!fdata->flags.passed_dfilter) { + /* that packet currently isn't displayed */ + /* XXX - add it to the set of displayed packets? */ + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, + "The packet number %u isn't currently being displayed.", fnumber); + return FALSE; /* we failed to go to that packet */ + } +#endif + /* We found that packet, and it's currently being displayed. + Find what row it's in. */ + row = packet_list_find_row_from_data(fdata); + g_assert(row != -1); + + /* Select that row, make it the focus row, and make it visible. */ + packet_list_set_selected_row(row); + return TRUE; /* we got to that packet */ +} + +gboolean +cf_goto_top_frame(trailer_file *cf) +{ + record_data *fdata; + int row; + record_data *lowest_fdata = NULL; + +#ifdef FILTER_EXPRESSION + for (fdata = cf->rlist; fdata != NULL; fdata = fdata->next) { + if (fdata->flags.passed_dfilter) { + lowest_fdata = fdata; + break; + } + } +#endif + if (lowest_fdata == NULL) { + return FALSE; + } + + /* We found that packet, and it's currently being displayed. + Find what row it's in. */ + row = packet_list_find_row_from_data(lowest_fdata); + g_assert(row != -1); + + /* Select that row, make it the focus row, and make it visible. */ + packet_list_set_selected_row(row); + return TRUE; /* we got to that packet */ +} + +gboolean +cf_goto_bottom_frame(trailer_file *cf) +{ + record_data *fdata; + int row; + record_data *highest_fdata = NULL; + +#ifdef FILTER_EXPRESSION + for (fdata = cf->rlist; fdata != NULL; fdata = fdata->next) { + if (fdata->flags.passed_dfilter) { + highest_fdata = fdata; + } + } +#endif + if (highest_fdata == NULL) { + return FALSE; + } + + /* We found that packet, and it's currently being displayed. + Find what row it's in. */ + row = packet_list_find_row_from_data(highest_fdata); + g_assert(row != -1); + + /* Select that row, make it the focus row, and make it visible. */ + packet_list_set_selected_row(row); + return TRUE; /* we got to that packet */ +} + +/* + * Go to frame specified by currently selected protocol tree item. + */ +/* +gboolean +cf_goto_framenum(trailer_file *cf) +{ + header_field_info *hfinfo; + guint32 framenum; + + if (cf->finfo_selected) { + hfinfo = cf->finfo_selected->hfinfo; + g_assert(hfinfo); + if (hfinfo->type == FT_FRAMENUM) { + framenum = fvalue_get_integer(&cf->finfo_selected->value); + if (framenum != 0) + return cf_goto_frame(cf, framenum); + } + } + + return FALSE; +} +*/ +static gboolean +match_summary_line(trailer_file *cf, record_data *fdata, void *criterion) +{ + match_data *mdata = criterion; + const gchar *string = mdata->string; + size_t string_len = mdata->string_len; +#ifdef HAVE_DISSECT + epan_dissect_t *edt; +#endif + const char *info_column; + size_t info_column_len; + gboolean frame_matched = FALSE; + gint colx; + guint32 i; + guint8 c_char; + size_t c_match = 0; + +#ifdef HAVE_DISSECT + /* Don't bother constructing the protocol tree */ + edt = epan_dissect_new(FALSE, FALSE); + /* Get the column information */ + epan_dissect_run(edt, &cf->pseudo_header, cf->pd, fdata, &cf->cinfo); + /* Find the Info column */ + for (colx = 0; colx < cf->cinfo.num_cols; colx++) { + if (cf->cinfo.fmt_matx[colx][COL_INFO]) { + /* Found it. See if we match. */ + info_column = edt->pi.cinfo->col_data[colx]; + info_column_len = strlen(info_column); + for (i = 0; i < info_column_len; i++) { + c_char = info_column[i]; + if (cf->case_type) + c_char = toupper(c_char); + if (c_char == string[c_match]) { + c_match++; + if (c_match == string_len) { + frame_matched = TRUE; + break; + } + } else + c_match = 0; + } + break; + } + } + epan_dissect_free(edt); +#endif + return frame_matched; +} + +gboolean +cf_find_packet_protocol_tree(trailer_file *cf, const char *string) +{ + match_data mdata; + + mdata.string = string; + mdata.string_len = strlen(string); + return find_packet(cf, match_protocol_tree, &mdata); +} +static gboolean +match_protocol_tree(trailer_file *cf, record_data *fdata, void *criterion) +{ + match_data *mdata = criterion; +#ifdef HAVE_DISSECT + epan_dissect_t *edt; + + /* Construct the protocol tree, including the displayed text */ + edt = epan_dissect_new(TRUE, TRUE); + /* We don't need the column information */ + epan_dissect_run(edt, &cf->pseudo_header, cf->pd, fdata, NULL); + + /* Iterate through all the nodes, seeing if they have text that matches. */ + mdata->cf = cf; + mdata->frame_matched = FALSE; + proto_tree_children_foreach(edt->tree, match_subtree_text, mdata); + epan_dissect_free(edt); +#endif + return mdata->frame_matched; +} + ==== //depot/projects/soc2007/dongmei-auditanalyzer/tfile.h#4 (text+ko) ==== @@ -3,6 +3,7 @@ #include >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Mar 25 06:38:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 269F21065671; Tue, 25 Mar 2008 06:38:52 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BFDC9106564A for ; Tue, 25 Mar 2008 06:38:51 +0000 (UTC) (envelope-from dongmei@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 98E1E8FC29 for ; Tue, 25 Mar 2008 06:38:51 +0000 (UTC) (envelope-from dongmei@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2P6cpZE083162 for ; Tue, 25 Mar 2008 06:38:51 GMT (envelope-from dongmei@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2P6cpqN083160 for perforce@freebsd.org; Tue, 25 Mar 2008 06:38:51 GMT (envelope-from dongmei@FreeBSD.org) Date: Tue, 25 Mar 2008 06:38:51 GMT Message-Id: <200803250638.m2P6cpqN083160@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to dongmei@FreeBSD.org using -f From: dongmei To: Perforce Change Reviews Cc: Subject: PERFORCE change 138498 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Mar 2008 06:38:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=138498 Change 138498 by dongmei@dongmei2007 on 2008/03/25 06:38:27 add find mechanism continue Affected files ... .. //depot/projects/soc2007/dongmei-auditanalyzer/Makefile#5 edit .. //depot/projects/soc2007/dongmei-auditanalyzer/gtk/list_view.c#6 edit .. //depot/projects/soc2007/dongmei-auditanalyzer/gtk/list_view.h#3 edit .. //depot/projects/soc2007/dongmei-auditanalyzer/gtk/progress_dlg.c#3 edit .. //depot/projects/soc2007/dongmei-auditanalyzer/tfile.c#9 edit Differences ... ==== //depot/projects/soc2007/dongmei-auditanalyzer/Makefile#5 (text+ko) ==== @@ -2,8 +2,9 @@ .PATH: ${.CURDIR} .PATH: ${.CURDIR}/gtk .PATH: ${.CURDIR}/image +.PATH: ${.CURDIR}/eng -SOURCES = main.c menu.c list_view.c tree_view.c file_dlg.c gui_utils.c simple_dialog.c trail_file_dlg.c filesystem.c buffer.c except.c file_access.c strerror.c tfile.c tsess.c file_util.c capture.c toolbar.c +SOURCES = main.c menu.c list_view.c tree_view.c file_dlg.c gui_utils.c simple_dialog.c trail_file_dlg.c filesystem.c buffer.c except.c file_access.c strerror.c tfile.c tsess.c file_util.c capture.c toolbar.c find_dlg.c progress_dlg.c strutil.c OBJS = ${SOURCES:.c=.o} CFLAGS = `pkg-config gtk+-2.0 --cflags` -D_U_="" LDADD = `pkg-config gtk+-2.0 gthread-2.0 --libs` -lbsm ==== //depot/projects/soc2007/dongmei-auditanalyzer/gtk/list_view.c#6 (text+ko) ==== @@ -214,4 +214,63 @@ free(event); } +gint +packet_list_find_row_from_data(gpointer data) +{ +#ifdef LATER + return eth_clist_find_row_from_data(ETH_CLIST(packet_list), data); +#endif +} +void +packet_list_set_selected_row(gint row) +{ +#ifdef LATER + gint visible_rows; + gint first_row; + gboolean full_visible; + + + full_visible = eth_clist_row_is_visible(ETH_CLIST(packet_list), row) == + GTK_VISIBILITY_FULL; + + /* XXX - why is there no "eth_clist_set_focus_row()", so that we + * can make the row for the frame we found the focus row? + * + * See http://www.gnome.org/mailing-lists/archives/gtk-list/2000-January/0038.shtml + */ + ETH_CLIST(packet_list)->focus_row = row; + + eth_clist_select_row(ETH_CLIST(packet_list), row, -1); + + if (!full_visible) { + + eth_clist_freeze(ETH_CLIST(packet_list)); + + eth_clist_moveto(ETH_CLIST(packet_list), row, -1, 0.0, 0.0); + + /* even after move still invisible (happens with empty list) -> give up */ + if(eth_clist_row_is_visible(ETH_CLIST(packet_list), row) != + GTK_VISIBILITY_FULL) { + eth_clist_thaw(ETH_CLIST(packet_list)); + return; + } + + /* The now selected row will be the first visible row in the list. + * This is inconvenient, as the user is usually interested in some + * packets *before* the currently selected one too. + * + * Try to adjust the visible rows, so the currently selected row will + * be shown around the first third of the list screen. + * + * (This won't even do any harm if the current row is the first or the + * last in the list) */ + visible_rows = packet_list_last_full_visible_row(row) - packet_list_first_full_visible_row(row); + first_row = row - visible_rows / 3; + + eth_clist_moveto(ETH_CLIST(packet_list), first_row >= 0 ? first_row : 0, -1, 0.0, 0.0); + + eth_clist_thaw(ETH_CLIST(packet_list)); + } +#endif +} ==== //depot/projects/soc2007/dongmei-auditanalyzer/gtk/list_view.h#3 (text+ko) ==== ==== //depot/projects/soc2007/dongmei-auditanalyzer/gtk/progress_dlg.c#3 (text+ko) ==== @@ -3,6 +3,23 @@ * * $Id: progress_dlg.c 19942 2006-11-21 00:40:36Z ulfl $ * + * Wireshark - Network traffic analyzer + * By Gerald Combs + * Copyright 1998 Gerald Combs + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifdef HAVE_CONFIG_H @@ -13,7 +30,7 @@ #include #include "gtkglobals.h" -#include "dlg_utils.h" +//#include "dlg_utils.h" #include "gui_utils.h" #include "progress_dlg.h" #include "compat_macros.h" ==== //depot/projects/soc2007/dongmei-auditanalyzer/tfile.c#9 (text+ko) ==== @@ -8,6 +8,7 @@ #include #include "exceptions.h" #include "gtk/tree_view.h" +#include "gtk/list_view.h" #include "file_wrappers.h" #include From owner-p4-projects@FreeBSD.ORG Tue Mar 25 07:25:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E52C1065672; Tue, 25 Mar 2008 07:25: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 D68A61065670 for ; Tue, 25 Mar 2008 07:25:44 +0000 (UTC) (envelope-from qingli@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AF24C8FC1D for ; Tue, 25 Mar 2008 07:25:44 +0000 (UTC) (envelope-from qingli@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2P7PiTe096361 for ; Tue, 25 Mar 2008 07:25:44 GMT (envelope-from qingli@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2P7Phk5096359 for perforce@freebsd.org; Tue, 25 Mar 2008 07:25:43 GMT (envelope-from qingli@freebsd.org) Date: Tue, 25 Mar 2008 07:25:43 GMT Message-Id: <200803250725.m2P7Phk5096359@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to qingli@freebsd.org using -f From: Qing Li To: Perforce Change Reviews Cc: Subject: PERFORCE change 138501 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Mar 2008 07:25:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=138501 Change 138501 by qingli@FreeBSD-newarp on 2008/03/25 07:25:19 IFC Affected files ... .. //depot/projects/qingli_mpath/src/contrib/hostapd/ChangeLog#2 integrate .. //depot/projects/qingli_mpath/src/contrib/hostapd/Makefile#2 integrate .. //depot/projects/qingli_mpath/src/contrib/hostapd/README#2 integrate .. //depot/projects/qingli_mpath/src/contrib/hostapd/aes_wrap.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/hostapd/aes_wrap.h#2 integrate .. //depot/projects/qingli_mpath/src/contrib/hostapd/common.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/hostapd/common.h#2 integrate .. //depot/projects/qingli_mpath/src/contrib/hostapd/defconfig#2 integrate .. //depot/projects/qingli_mpath/src/contrib/hostapd/driver.h#2 integrate .. //depot/projects/qingli_mpath/src/contrib/hostapd/driver_test.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/hostapd/eap_aka.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/hostapd/eap_gpsk.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/hostapd/eap_gpsk_common.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/hostapd/eap_gpsk_common.h#2 integrate .. //depot/projects/qingli_mpath/src/contrib/hostapd/eap_sim.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/hostapd/eap_sim_common.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/hostapd/eap_sim_db.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/hostapd/eap_tls_common.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/hostapd/eapol_version.patch#2 delete .. //depot/projects/qingli_mpath/src/contrib/hostapd/hostapd.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/hostapd/hostapd.conf#2 integrate .. //depot/projects/qingli_mpath/src/contrib/hostapd/ieee802_11.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/hostapd/ieee802_11_auth.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/hostapd/ieee802_1x.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/hostapd/madwifi.conf#2 integrate .. //depot/projects/qingli_mpath/src/contrib/hostapd/os.h#2 integrate .. //depot/projects/qingli_mpath/src/contrib/hostapd/os_unix.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/hostapd/radius.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/hostapd/radius.h#2 integrate .. //depot/projects/qingli_mpath/src/contrib/hostapd/radius_client.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/hostapd/radius_server.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/hostapd/tls_openssl.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/hostapd/version.h#2 integrate .. //depot/projects/qingli_mpath/src/contrib/hostapd/wpa.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/ChangeLog#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/FREEBSD-Xlist#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/FREEBSD-upgrade#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/Makefile#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/README#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/aes_wrap.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/aes_wrap.h#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/asn1.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/common.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/common.h#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/config.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/config_ssid.h#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/config_winreg.c#2 delete .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/ctrl_iface.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/ctrl_iface_dbus.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.h#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/ctrl_iface_named_pipe.c#2 delete .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/ctrl_iface_unix.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/dbus-wpa_supplicant.conf#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/dbus-wpa_supplicant.service#1 branch .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/defconfig#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/doc/ctrl_iface.doxygen#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/doc/docbook/wpa_background.8#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/doc/docbook/wpa_cli.8#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/doc/docbook/wpa_cli.sgml#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.8#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.8#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.sgml#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/driver_hostap.h#2 delete .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/driver_ndis.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/eap_gpsk.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/eap_gpsk_common.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/eap_gpsk_common.h#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/eap_peap.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/eap_sim.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/eap_sim_common.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/eap_tlv.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/eap_tlv.h#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/eapol_sm.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/eapol_test.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/eloop_win.c#2 delete .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/events.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/main.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/os.h#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/os_unix.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/pcsc_funcs.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/radius.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/radius.h#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/radius_client.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/tests/test_aes.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/tests/test_eap_sim_common.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/tests/test_md4.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/tests/test_md5.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/tests/test_ms_funcs.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/tests/test_sha1.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/tests/test_sha256.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/tests/test_x509v3.c#1 branch .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/tls_openssl.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/version.h#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/wpa.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/wpa_cli.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.cpp#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/wpa_gui/setup-mingw-cross-compiling#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/wpa_supplicant.c#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/wpa_supplicant.conf#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/wpa_supplicant_i.h#2 integrate .. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/x509v3.c#2 integrate .. //depot/projects/qingli_mpath/src/lib/libthread_db/Makefile#3 integrate .. //depot/projects/qingli_mpath/src/lib/libthread_db/kse.h#1 branch .. //depot/projects/qingli_mpath/src/lib/libthread_db/libpthread_db.c#3 integrate .. //depot/projects/qingli_mpath/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#3 integrate .. //depot/projects/qingli_mpath/src/sbin/bsdlabel/bsdlabel.c#2 integrate .. //depot/projects/qingli_mpath/src/share/man/man4/bpf.4#2 integrate .. //depot/projects/qingli_mpath/src/share/zoneinfo/asia#2 integrate .. //depot/projects/qingli_mpath/src/share/zoneinfo/backward#2 integrate .. //depot/projects/qingli_mpath/src/share/zoneinfo/northamerica#2 integrate .. //depot/projects/qingli_mpath/src/share/zoneinfo/southamerica#3 integrate .. //depot/projects/qingli_mpath/src/share/zoneinfo/zone.tab#2 integrate .. //depot/projects/qingli_mpath/src/sys/amd64/amd64/cpu_switch.S#2 integrate .. //depot/projects/qingli_mpath/src/sys/amd64/amd64/genassym.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/amd64/amd64/pmap.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/amd64/conf/NOTES#3 integrate .. //depot/projects/qingli_mpath/src/sys/amd64/ia32/ia32_signal.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/amd64/include/pcb.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/conf/files#4 integrate .. //depot/projects/qingli_mpath/src/sys/dev/aac/aac.c#4 integrate .. //depot/projects/qingli_mpath/src/sys/dev/aac/aac_cam.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/dev/aac/aac_debug.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/dev/aac/aac_disk.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/dev/aac/aac_pci.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/dev/aac/aacvar.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/dc/if_dc.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/dev/dc/if_dcreg.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/dev/gem/if_gem.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/gem/if_gem_pci.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/dev/gem/if_gemreg.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/dev/gem/if_gemvar.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/dev/re/if_re.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/geom/geom.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/geom/geom_subr.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/geom/part/g_part.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/geom/part/g_part.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/geom/part/g_part_apm.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/geom/part/g_part_bsd.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/geom/part/g_part_gpt.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/geom/part/g_part_mbr.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/geom/part/g_part_vtoc8.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/i386/conf/NOTES#3 integrate .. //depot/projects/qingli_mpath/src/sys/i386/i386/pmap.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/kern/kern_thr.c#4 integrate .. //depot/projects/qingli_mpath/src/sys/kern/vfs_mount.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/kern/vfs_subr.c#4 integrate .. //depot/projects/qingli_mpath/src/sys/kern/vfs_vnops.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/modules/geom/geom_part/Makefile#2 integrate .. //depot/projects/qingli_mpath/src/sys/modules/geom/geom_part/geom_part_apm/Makefile#1 branch .. //depot/projects/qingli_mpath/src/sys/modules/geom/geom_part/geom_part_bsd/Makefile#1 branch .. //depot/projects/qingli_mpath/src/sys/modules/geom/geom_part/geom_part_gpt/Makefile#1 branch .. //depot/projects/qingli_mpath/src/sys/modules/geom/geom_part/geom_part_mbr/Makefile#1 branch .. //depot/projects/qingli_mpath/src/sys/modules/geom/geom_part/geom_part_vtoc8/Makefile#1 branch .. //depot/projects/qingli_mpath/src/sys/net/bpf.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/net/bpf.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/net/bpf_buffer.c#1 branch .. //depot/projects/qingli_mpath/src/sys/net/bpf_buffer.h#1 branch .. //depot/projects/qingli_mpath/src/sys/net/bpf_zerocopy.c#1 branch .. //depot/projects/qingli_mpath/src/sys/net/bpf_zerocopy.h#1 branch .. //depot/projects/qingli_mpath/src/sys/net/bpfdesc.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/net/if_enc.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/net/if_loop.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/netgraph/ng_pptpgre.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/netgraph/ng_pptpgre.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/netinet/in_pcb.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/netinet/in_pcb.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/netipsec/key.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/pc98/conf/NOTES#2 integrate .. //depot/projects/qingli_mpath/src/sys/pci/if_rlreg.h#3 integrate .. //depot/projects/qingli_mpath/src/sys/pci/if_xl.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/pci/if_xlreg.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/sparc64/include/bus.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/sparc64/sparc64/bus_machdep.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/sys/mbuf.h#3 integrate .. //depot/projects/qingli_mpath/src/sys/sys/param.h#3 integrate .. //depot/projects/qingli_mpath/src/sys/sys/vnode.h#3 integrate .. //depot/projects/qingli_mpath/src/sys/ufs/ffs/ffs_softdep.c#4 integrate .. //depot/projects/qingli_mpath/src/tools/build/mk/OptionalObsoleteFiles.inc#3 integrate .. //depot/projects/qingli_mpath/src/usr.bin/make/for.c#2 integrate .. //depot/projects/qingli_mpath/src/usr.bin/make/make.1#3 integrate .. //depot/projects/qingli_mpath/src/usr.bin/netstat/bpf.c#2 integrate .. //depot/projects/qingli_mpath/src/usr.sbin/arp/arp.8#3 integrate .. //depot/projects/qingli_mpath/src/usr.sbin/freebsd-update/freebsd-update.sh#2 integrate .. //depot/projects/qingli_mpath/src/usr.sbin/wpa/wpa_supplicant/Makefile#2 integrate .. //depot/projects/qingli_mpath/src/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8#3 integrate Differences ... ==== //depot/projects/qingli_mpath/src/contrib/hostapd/ChangeLog#2 (text+ko) ==== @@ -1,5 +1,25 @@ ChangeLog for hostapd +2008-02-19 - v0.5.10 + * fixed EAP-SIM and EAP-AKA message parser to validate attribute + lengths properly to avoid potential crash caused by invalid messages + * fixed Reassociation Response callback processing when using internal + MLME (driver_{hostap,devicescape,test}.c) + * fixed EAP-SIM/AKA realm processing to allow decorated usernames to + be used + * added a workaround for EAP-SIM/AKA peers that include incorrect null + termination in the username + * fixed EAP-SIM Start response processing for fast reauthentication + case + * copy optional Proxy-State attributes into RADIUS response when acting + as a RADIUS authentication server + +2007-12-02 - v0.5.9 + * updated EAP Generalized Pre-Shared Key (EAP-GPSK) to use the latest + draft (draft-ietf-emu-eap-gpsk-07.txt) + * fixed debugging code not to use potentially unaligned read to fetch + IPv4 addresses + 2007-05-28 - v0.5.8 * updated driver_devicescape.c to build with the current wireless-dev.git tree and net/d80211 changes ==== //depot/projects/qingli_mpath/src/contrib/hostapd/Makefile#2 (text+ko) ==== @@ -313,6 +313,10 @@ CFLAGS += -DCONFIG_IPV6 endif +ifdef CONFIG_DRIVER_RADIUS_ACL +CFLAGS += -DCONFIG_DRIVER_RADIUS_ACL +endif + ifdef CONFIG_FULL_DYNAMIC_VLAN # define CONFIG_FULL_DYNAMIC_VLAN to have hostapd manipulate bridges # and vlan interfaces for the vlan feature. ==== //depot/projects/qingli_mpath/src/contrib/hostapd/README#2 (text+ko) ==== @@ -2,7 +2,7 @@ Authenticator and RADIUS authentication server ================================================================ -Copyright (c) 2002-2007, Jouni Malinen and contributors +Copyright (c) 2002-2008, Jouni Malinen and contributors All Rights Reserved. This program is dual-licensed under both the GPL version 2 and BSD ==== //depot/projects/qingli_mpath/src/contrib/hostapd/aes_wrap.c#2 (text+ko) ==== @@ -7,7 +7,7 @@ * - AES-128 EAX mode encryption/decryption * - AES-128 CBC * - * Copyright (c) 2003-2005, Jouni Malinen + * Copyright (c) 2003-2007, Jouni Malinen * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -34,10 +34,11 @@ /** * aes_wrap - Wrap keys with AES Key Wrap Algorithm (128-bit KEK) (RFC3394) - * @kek: Key encryption key (KEK) - * @n: Length of the wrapped key in 64-bit units; e.g., 2 = 128-bit = 16 bytes - * @plain: Plaintext key to be wrapped, n * 64 bit - * @cipher: Wrapped key, (n + 1) * 64 bit + * @kek: 16-octet Key encryption key (KEK) + * @n: Length of the plaintext key in 64-bit units; e.g., 2 = 128-bit = 16 + * bytes + * @plain: Plaintext key to be wrapped, n * 64 bits + * @cipher: Wrapped key, (n + 1) * 64 bits * Returns: 0 on success, -1 on failure */ int aes_wrap(const u8 *kek, int n, const u8 *plain, u8 *cipher) @@ -93,9 +94,10 @@ /** * aes_unwrap - Unwrap key with AES Key Wrap Algorithm (128-bit KEK) (RFC3394) * @kek: Key encryption key (KEK) - * @n: Length of the wrapped key in 64-bit units; e.g., 2 = 128-bit = 16 bytes - * @cipher: Wrapped key to be unwrapped, (n + 1) * 64 bit - * @plain: Plaintext key, n * 64 bit + * @n: Length of the plaintext key in 64-bit units; e.g., 2 = 128-bit = 16 + * bytes + * @cipher: Wrapped key to be unwrapped, (n + 1) * 64 bits + * @plain: Plaintext key, n * 64 bits * Returns: 0 on success, -1 on failure (e.g., integrity verification failed) */ int aes_unwrap(const u8 *kek, int n, const u8 *cipher, u8 *plain) @@ -167,28 +169,45 @@ /** - * omac1_aes_128 - One-Key CBC MAC (OMAC1) hash with AES-128 (aka AES-CMAC) + * omac1_aes_128_vector - One-Key CBC MAC (OMAC1) hash with AES-128 * @key: 128-bit key for the hash operation - * @data: Data buffer for which a MAC is determined - * @data: Length of data buffer in bytes + * @num_elem: Number of elements in the data vector + * @addr: Pointers to the data areas + * @len: Lengths of the data blocks * @mac: Buffer for MAC (128 bits, i.e., 16 bytes) * Returns: 0 on success, -1 on failure */ -int omac1_aes_128(const u8 *key, const u8 *data, size_t data_len, u8 *mac) +int omac1_aes_128_vector(const u8 *key, size_t num_elem, + const u8 *addr[], const size_t *len, u8 *mac) { void *ctx; u8 cbc[BLOCK_SIZE], pad[BLOCK_SIZE]; - const u8 *pos = data; - size_t i, left = data_len; + const u8 *pos, *end; + size_t i, e, left, total_len; ctx = aes_encrypt_init(key, 16); if (ctx == NULL) return -1; os_memset(cbc, 0, BLOCK_SIZE); + total_len = 0; + for (e = 0; e < num_elem; e++) + total_len += len[e]; + left = total_len; + + e = 0; + pos = addr[0]; + end = pos + len[0]; + while (left >= BLOCK_SIZE) { - for (i = 0; i < BLOCK_SIZE; i++) + for (i = 0; i < BLOCK_SIZE; i++) { cbc[i] ^= *pos++; + if (pos >= end) { + e++; + pos = addr[e]; + end = pos + len[e]; + } + } if (left > BLOCK_SIZE) aes_encrypt(ctx, cbc, cbc); left -= BLOCK_SIZE; @@ -198,9 +217,15 @@ aes_encrypt(ctx, pad, pad); gf_mulx(pad); - if (left || data_len == 0) { - for (i = 0; i < left; i++) + if (left || total_len == 0) { + for (i = 0; i < left; i++) { cbc[i] ^= *pos++; + if (pos >= end) { + e++; + pos = addr[e]; + end = pos + len[e]; + } + } cbc[left] ^= 0x80; gf_mulx(pad); } @@ -212,6 +237,24 @@ return 0; } + +/** + * omac1_aes_128 - One-Key CBC MAC (OMAC1) hash with AES-128 (aka AES-CMAC) + * @key: 128-bit key for the hash operation + * @data: Data buffer for which a MAC is determined + * @data_len: Length of data buffer in bytes + * @mac: Buffer for MAC (128 bits, i.e., 16 bytes) + * Returns: 0 on success, -1 on failure + * + * This is a mode for using block cipher (AES in this case) for authentication. + * OMAC1 was standardized with the name CMAC by NIST in a Special Publication + * (SP) 800-38B. + */ +int omac1_aes_128(const u8 *key, const u8 *data, size_t data_len, u8 *mac) +{ + return omac1_aes_128_vector(key, 1, &data, &data_len, mac); +} + #endif /* CONFIG_NO_AES_OMAC1 */ ==== //depot/projects/qingli_mpath/src/contrib/hostapd/aes_wrap.h#2 (text+ko) ==== @@ -7,7 +7,7 @@ * - AES-128 EAX mode encryption/decryption * - AES-128 CBC * - * Copyright (c) 2003-2005, Jouni Malinen + * Copyright (c) 2003-2007, Jouni Malinen * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -24,6 +24,8 @@ int aes_wrap(const u8 *kek, int n, const u8 *plain, u8 *cipher); int aes_unwrap(const u8 *kek, int n, const u8 *cipher, u8 *plain); +int omac1_aes_128_vector(const u8 *key, size_t num_elem, + const u8 *addr[], const size_t *len, u8 *mac); int omac1_aes_128(const u8 *key, const u8 *data, size_t data_len, u8 *mac); int aes_128_encrypt_block(const u8 *key, const u8 *in, u8 *out); int aes_128_ctr_encrypt(const u8 *key, const u8 *nonce, ==== //depot/projects/qingli_mpath/src/contrib/hostapd/common.c#2 (text+ko) ==== @@ -20,7 +20,6 @@ #ifdef CONFIG_DEBUG_FILE static FILE *out_file = NULL; #endif /* CONFIG_DEBUG_FILE */ -int wpa_debug_use_file = 0; int wpa_debug_level = MSG_INFO; int wpa_debug_show_keys = 0; int wpa_debug_timestamp = 0; @@ -344,32 +343,29 @@ } -int wpa_debug_open_file(void) +int wpa_debug_open_file(const char *path) { #ifdef CONFIG_DEBUG_FILE - static int count = 0; - char fname[64]; - if (!wpa_debug_use_file) + if (!path) return 0; -#ifdef _WIN32 - os_snprintf(fname, sizeof(fname), "\\Temp\\wpa_supplicant-log-%d.txt", - count++); -#else /* _WIN32 */ - os_snprintf(fname, sizeof(fname), "/tmp/wpa_supplicant-log-%d.txt", - count++); + out_file = fopen(path, "a"); + if (out_file == NULL) { + wpa_printf(MSG_ERROR, "wpa_debug_open_file: Failed to open " + "output file, using standard output"); + return -1; + } +#ifndef _WIN32 + setvbuf(out_file, NULL, _IOLBF, 0); #endif /* _WIN32 */ - out_file = fopen(fname, "w"); - return out_file == NULL ? -1 : 0; -#else /* CONFIG_DEBUG_FILE */ +#endif /* CONFIG_DEBUG_FILE */ return 0; -#endif /* CONFIG_DEBUG_FILE */ } void wpa_debug_close_file(void) { #ifdef CONFIG_DEBUG_FILE - if (!wpa_debug_use_file) + if (!out_file) return; fclose(out_file); out_file = NULL; ==== //depot/projects/qingli_mpath/src/contrib/hostapd/common.h#2 (text+ko) ==== @@ -264,12 +264,12 @@ #define wpa_hexdump_key(l,t,b,le) do { } while (0) #define wpa_hexdump_ascii(l,t,b,le) do { } while (0) #define wpa_hexdump_ascii_key(l,t,b,le) do { } while (0) -#define wpa_debug_open_file() do { } while (0) +#define wpa_debug_open_file(p) do { } while (0) #define wpa_debug_close_file() do { } while (0) #else /* CONFIG_NO_STDOUT_DEBUG */ -int wpa_debug_open_file(void); +int wpa_debug_open_file(const char *path); void wpa_debug_close_file(void); /** ==== //depot/projects/qingli_mpath/src/contrib/hostapd/defconfig#2 (text+ko) ==== @@ -102,3 +102,7 @@ # Build IPv6 support for RADIUS operations CONFIG_IPV6=y + +# Use the hostapd's IEEE 802.11 authentication (ACL), but without +# the IEEE 802.11 Management capability +CONFIG_DRIVER_RADIUS_ACL=y ==== //depot/projects/qingli_mpath/src/contrib/hostapd/driver.h#2 (text+ko) ==== @@ -141,6 +141,10 @@ * this handler will be called after initial setup has been completed. */ int (*commit)(void *priv); + + int (*set_radius_acl_auth)(void *priv, const u8 *mac, int accepted, + u32 session_timeout); + int (*set_radius_acl_expire)(void *priv, const u8 *mac); }; static inline int @@ -653,4 +657,22 @@ return hapd->driver->commit(hapd->driver); } +static inline int +hostapd_set_radius_acl_auth(struct hostapd_data *hapd, const u8 *mac, int accepted, + u32 session_timeout) +{ + if (hapd->driver == NULL || hapd->driver->set_radius_acl_auth == NULL) + return 0; + return hapd->driver->set_radius_acl_auth(hapd->driver, mac, accepted, + session_timeout); +} + +static inline int +hostapd_set_radius_acl_expire(struct hostapd_data *hapd, const u8 *mac) +{ + if (hapd->driver == NULL || hapd->driver->set_radius_acl_expire == NULL) + return 0; + return hapd->driver->set_radius_acl_expire(hapd->driver, mac); +} + #endif /* DRIVER_H */ ==== //depot/projects/qingli_mpath/src/contrib/hostapd/driver_test.c#2 (text+ko) ==== @@ -170,9 +170,10 @@ u16 fc; if (drv->test_socket < 0 || len < 10 || drv->socket_dir == NULL) { - wpa_printf(MSG_DEBUG, "%s: invalid parameters (sock=%d len=%d " - "socket_dir=%p)", - __func__, drv->test_socket, len, drv->socket_dir); + wpa_printf(MSG_DEBUG, "%s: invalid parameters (sock=%d len=%lu" + " socket_dir=%p)", + __func__, drv->test_socket, (unsigned long) len, + drv->socket_dir); return -1; } ==== //depot/projects/qingli_mpath/src/contrib/hostapd/eap_aka.c#2 (text+ko) ==== @@ -1,6 +1,6 @@ /* * hostapd / EAP-AKA (RFC 4187) - * Copyright (c) 2005-2007, Jouni Malinen + * Copyright (c) 2005-2008, Jouni Malinen * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -124,6 +124,14 @@ sm->identity_len)) { wpa_printf(MSG_DEBUG, " AT_PERMANENT_ID_REQ"); eap_sim_msg_add(msg, EAP_SIM_AT_PERMANENT_ID_REQ, 0, NULL, 0); + } else { + /* + * RFC 4187, Chap. 4.1.4 recommends that identity from EAP is + * ignored and the AKA/Identity is used to request the + * identity. + */ + wpa_printf(MSG_DEBUG, " AT_ANY_ID_REQ"); + eap_sim_msg_add(msg, EAP_SIM_AT_ANY_ID_REQ, 0, NULL, 0); } return eap_sim_msg_finish(msg, reqDataLen, NULL, NULL, 0); } @@ -445,10 +453,16 @@ sm->method_pending = METHOD_PENDING_NONE; } + identity_len = sm->identity_len; + while (identity_len > 0 && sm->identity[identity_len - 1] == '\0') { + wpa_printf(MSG_DEBUG, "EAP-AKA: Workaround - drop last null " + "character from identity"); + identity_len--; + } wpa_hexdump_ascii(MSG_DEBUG, "EAP-AKA: Identity for MK derivation", - sm->identity, sm->identity_len); + sm->identity, identity_len); - eap_aka_derive_mk(sm->identity, sm->identity_len, data->ik, data->ck, + eap_aka_derive_mk(sm->identity, identity_len, data->ik, data->ck, data->mk); eap_sim_derive_keys(data->mk, data->k_encr, data->k_aut, data->msk, data->emsk); ==== //depot/projects/qingli_mpath/src/contrib/hostapd/eap_gpsk.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * hostapd / EAP-GPSK (draft-ietf-emu-eap-gpsk-03.txt) server + * hostapd / EAP-GPSK (draft-ietf-emu-eap-gpsk-08.txt) server * Copyright (c) 2006-2007, Jouni Malinen * * This program is free software; you can redistribute it and/or modify @@ -23,15 +23,15 @@ struct eap_gpsk_data { enum { GPSK_1, GPSK_3, SUCCESS, FAILURE } state; u8 rand_server[EAP_GPSK_RAND_LEN]; - u8 rand_client[EAP_GPSK_RAND_LEN]; + u8 rand_peer[EAP_GPSK_RAND_LEN]; u8 msk[EAP_MSK_LEN]; u8 emsk[EAP_EMSK_LEN]; u8 sk[EAP_GPSK_MAX_SK_LEN]; size_t sk_len; u8 pk[EAP_GPSK_MAX_PK_LEN]; size_t pk_len; - u8 *id_client; - size_t id_client_len; + u8 *id_peer; + size_t id_peer_len; u8 *id_server; size_t id_server_len; #define MAX_NUM_CSUITES 2 @@ -85,17 +85,17 @@ data->csuite_count = 0; if (eap_gpsk_supported_ciphersuite(EAP_GPSK_VENDOR_IETF, EAP_GPSK_CIPHER_AES)) { - WPA_PUT_BE24(data->csuite_list[data->csuite_count].vendor, + WPA_PUT_BE32(data->csuite_list[data->csuite_count].vendor, EAP_GPSK_VENDOR_IETF); - WPA_PUT_BE24(data->csuite_list[data->csuite_count].specifier, + WPA_PUT_BE16(data->csuite_list[data->csuite_count].specifier, EAP_GPSK_CIPHER_AES); data->csuite_count++; } if (eap_gpsk_supported_ciphersuite(EAP_GPSK_VENDOR_IETF, EAP_GPSK_CIPHER_SHA256)) { - WPA_PUT_BE24(data->csuite_list[data->csuite_count].vendor, + WPA_PUT_BE32(data->csuite_list[data->csuite_count].vendor, EAP_GPSK_VENDOR_IETF); - WPA_PUT_BE24(data->csuite_list[data->csuite_count].specifier, + WPA_PUT_BE16(data->csuite_list[data->csuite_count].specifier, EAP_GPSK_CIPHER_SHA256); data->csuite_count++; } @@ -108,7 +108,7 @@ { struct eap_gpsk_data *data = priv; free(data->id_server); - free(data->id_client); + free(data->id_peer); free(data); } @@ -174,8 +174,8 @@ wpa_printf(MSG_DEBUG, "EAP-GPSK: Request/GPSK-3"); miclen = eap_gpsk_mic_len(data->vendor, data->specifier); - len = 1 + 2 * EAP_GPSK_RAND_LEN + sizeof(struct eap_gpsk_csuite) + 2 + - miclen; + len = 1 + 2 * EAP_GPSK_RAND_LEN + 2 + data->id_server_len + + sizeof(struct eap_gpsk_csuite) + 2 + miclen; req = eap_msg_alloc(EAP_VENDOR_IETF, EAP_TYPE_GPSK, reqDataLen, len, EAP_CODE_REQUEST, id, &pos); if (req == NULL) { @@ -188,13 +188,18 @@ *pos++ = EAP_GPSK_OPCODE_GPSK_3; start = pos; - memcpy(pos, data->rand_client, EAP_GPSK_RAND_LEN); + memcpy(pos, data->rand_peer, EAP_GPSK_RAND_LEN); pos += EAP_GPSK_RAND_LEN; memcpy(pos, data->rand_server, EAP_GPSK_RAND_LEN); pos += EAP_GPSK_RAND_LEN; + WPA_PUT_BE16(pos, data->id_server_len); + pos += 2; + if (data->id_server) + memcpy(pos, data->id_server, data->id_server_len); + pos += data->id_server_len; csuite = (struct eap_gpsk_csuite *) pos; - WPA_PUT_BE24(csuite->vendor, data->vendor); - WPA_PUT_BE24(csuite->specifier, data->specifier); + WPA_PUT_BE32(csuite->vendor, data->vendor); + WPA_PUT_BE16(csuite->specifier, data->specifier); pos += sizeof(*csuite); /* no PD_Payload_2 */ @@ -282,7 +287,7 @@ if (end - pos < 2) { wpa_printf(MSG_DEBUG, "EAP-GPSK: Too short message for " - "ID_Client length"); + "ID_Peer length"); eap_gpsk_state(data, FAILURE); return; } @@ -290,21 +295,21 @@ pos += 2; if (end - pos < alen) { wpa_printf(MSG_DEBUG, "EAP-GPSK: Too short message for " - "ID_Client"); + "ID_Peer"); eap_gpsk_state(data, FAILURE); return; } - free(data->id_client); - data->id_client = malloc(alen); - if (data->id_client == NULL) { + free(data->id_peer); + data->id_peer = malloc(alen); + if (data->id_peer == NULL) { wpa_printf(MSG_DEBUG, "EAP-GPSK: Not enough memory to store " - "%d-octet ID_Client", alen); + "%d-octet ID_Peer", alen); return; } - memcpy(data->id_client, pos, alen); - data->id_client_len = alen; - wpa_hexdump_ascii(MSG_DEBUG, "EAP-GPSK: ID_Client", - data->id_client, data->id_client_len); + memcpy(data->id_peer, pos, alen); + data->id_peer_len = alen; + wpa_hexdump_ascii(MSG_DEBUG, "EAP-GPSK: ID_Peer", + data->id_peer, data->id_peer_len); pos += alen; if (end - pos < 2) { @@ -332,13 +337,13 @@ if (end - pos < EAP_GPSK_RAND_LEN) { wpa_printf(MSG_DEBUG, "EAP-GPSK: Too short message for " - "RAND_Client"); + "RAND_Peer"); eap_gpsk_state(data, FAILURE); return; } - memcpy(data->rand_client, pos, EAP_GPSK_RAND_LEN); - wpa_hexdump(MSG_DEBUG, "EAP-GPSK: RAND_Client", - data->rand_client, EAP_GPSK_RAND_LEN); + memcpy(data->rand_peer, pos, EAP_GPSK_RAND_LEN); + wpa_hexdump(MSG_DEBUG, "EAP-GPSK: RAND_Peer", + data->rand_peer, EAP_GPSK_RAND_LEN); pos += EAP_GPSK_RAND_LEN; if (end - pos < EAP_GPSK_RAND_LEN) { @@ -397,13 +402,13 @@ if (i == data->csuite_count) { wpa_printf(MSG_DEBUG, "EAP-GPSK: Peer selected unsupported " "ciphersuite %d:%d", - WPA_GET_BE24(csuite->vendor), - WPA_GET_BE24(csuite->specifier)); + WPA_GET_BE32(csuite->vendor), + WPA_GET_BE16(csuite->specifier)); eap_gpsk_state(data, FAILURE); return; } - data->vendor = WPA_GET_BE24(csuite->vendor); - data->specifier = WPA_GET_BE24(csuite->specifier); + data->vendor = WPA_GET_BE32(csuite->vendor); + data->specifier = WPA_GET_BE16(csuite->specifier); wpa_printf(MSG_DEBUG, "EAP-GPSK: CSuite_Sel %d:%d", data->vendor, data->specifier); pos += sizeof(*csuite); @@ -434,8 +439,8 @@ if (eap_gpsk_derive_keys(sm->user->password, sm->user->password_len, data->vendor, data->specifier, - data->rand_client, data->rand_server, - data->id_client, data->id_client_len, + data->rand_peer, data->rand_server, + data->id_peer, data->id_peer_len, data->id_server, data->id_server_len, data->msk, data->emsk, data->sk, &data->sk_len, ==== //depot/projects/qingli_mpath/src/contrib/hostapd/eap_gpsk_common.c#2 (text+ko) ==== @@ -18,8 +18,9 @@ #include "eap_defs.h" #include "aes_wrap.h" #include "crypto.h" -#include "sha1.h" +#ifdef EAP_GPSK_SHA256 #include "sha256.h" +#endif /* EAP_GPSK_SHA256 */ #include "eap_gpsk_common.h" @@ -43,31 +44,29 @@ } -static int eap_gpsk_gkdf(const u8 *psk /* Y */, size_t psk_len, - const u8 *data /* Z */, size_t data_len, - u8 *buf, size_t len /* X */) +static int eap_gpsk_gkdf_cmac(const u8 *psk /* Y */, + const u8 *data /* Z */, size_t data_len, + u8 *buf, size_t len /* X */) { u8 *opos; size_t i, n, hashlen, left, clen; - u8 ibuf[2], hash[SHA1_MAC_LEN]; - const u8 *addr[3]; - size_t vlen[3]; + u8 ibuf[2], hash[16]; + const u8 *addr[2]; + size_t vlen[2]; - hashlen = SHA1_MAC_LEN; - /* M_i = Hash-Function (i || Y || Z); */ + hashlen = sizeof(hash); + /* M_i = MAC_Y (i || Z); (MAC = AES-CMAC-128) */ addr[0] = ibuf; vlen[0] = sizeof(ibuf); - addr[1] = psk; - vlen[1] = psk_len; - addr[2] = data; - vlen[2] = data_len; + addr[1] = data; + vlen[1] = data_len; opos = buf; left = len; n = (len + hashlen - 1) / hashlen; for (i = 1; i <= n; i++) { WPA_PUT_BE16(ibuf, i); - sha1_vector(3, addr, vlen, hash); + omac1_aes_128_vector(psk, 2, addr, vlen, hash); clen = left > hashlen ? hashlen : left; os_memcpy(opos, hash, clen); opos += clen; @@ -78,112 +77,30 @@ } -static int eap_gpsk_derive_keys_aes(const u8 *psk, size_t psk_len, - const u8 *seed, size_t seed_len, - u8 *msk, u8 *emsk, u8 *sk, size_t *sk_len, - u8 *pk, size_t *pk_len) -{ -#define EAP_GPSK_SK_LEN_AES 16 -#define EAP_GPSK_PK_LEN_AES 16 - u8 zero_string[1], mk[32], *pos, *data; - u8 kdf_out[EAP_MSK_LEN + EAP_EMSK_LEN + EAP_GPSK_SK_LEN_AES + - EAP_GPSK_PK_LEN_AES]; - size_t data_len; - - /* - * inputString = RAND_Client || ID_Client || RAND_Server || ID_Server - * (= seed) - * KS = 16, PL = psk_len, CSuite_Sel = 0x000000 0x000001 - * MK = GKDF-32 (0x00, PL || PSK || CSuite_Sel || inputString) - * MSK = GKDF-160 (MK, inputString)[0..63] - * EMSK = GKDF-160 (MK, inputString)[64..127] - * SK = GKDF-160 (MK, inputString)[128..143] - * PK = GKDF-160 (MK, inputString)[144..159] - * MID = GKDF-16(0x00, "Method ID" || EAP_Method_Type || CSuite_Sel || - * inputString) - * Hash-Function = SHA-1 (see [RFC3174]) - * hashlen = 20 octets (160 bits) - */ - - os_memset(zero_string, 0, sizeof(zero_string)); - - data_len = 2 + psk_len + 6 + seed_len; - data = os_malloc(data_len); - if (data == NULL) - return -1; - pos = data; - WPA_PUT_BE16(pos, psk_len); - pos += 2; - os_memcpy(pos, psk, psk_len); - pos += psk_len; - WPA_PUT_BE24(pos, 0); /* CSuite/Vendor = IETF */ - pos += 3; - WPA_PUT_BE24(pos, EAP_GPSK_CIPHER_AES); /* CSuite/Specifier */ - pos += 3; - os_memcpy(pos, seed, seed_len); /* inputString */ - wpa_hexdump_key(MSG_DEBUG, "EAP-GPSK: Data to MK derivation (AES)", - data, data_len); - - if (eap_gpsk_gkdf(zero_string, sizeof(zero_string), data, data_len, - mk, sizeof(mk)) < 0) { - os_free(data); - return -1; - } - os_free(data); - wpa_hexdump_key(MSG_DEBUG, "EAP-GPSK: MK", mk, sizeof(mk)); - - if (eap_gpsk_gkdf(mk, sizeof(mk), seed, seed_len, - kdf_out, sizeof(kdf_out)) < 0) - return -1; - - pos = kdf_out; - wpa_hexdump_key(MSG_DEBUG, "EAP-GPSK: MSK", pos, EAP_MSK_LEN); - os_memcpy(msk, pos, EAP_MSK_LEN); - pos += EAP_MSK_LEN; - - wpa_hexdump_key(MSG_DEBUG, "EAP-GPSK: EMSK", pos, EAP_EMSK_LEN); - os_memcpy(emsk, pos, EAP_EMSK_LEN); - pos += EAP_EMSK_LEN; - - wpa_hexdump_key(MSG_DEBUG, "EAP-GPSK: SK", pos, EAP_GPSK_SK_LEN_AES); - os_memcpy(sk, pos, EAP_GPSK_SK_LEN_AES); - *sk_len = EAP_GPSK_SK_LEN_AES; - pos += EAP_GPSK_SK_LEN_AES; - - wpa_hexdump_key(MSG_DEBUG, "EAP-GPSK: PK", pos, EAP_GPSK_PK_LEN_AES); - os_memcpy(pk, pos, EAP_GPSK_PK_LEN_AES); - *pk_len = EAP_GPSK_PK_LEN_AES; - - return 0; -} - - #ifdef EAP_GPSK_SHA256 -static int eap_gpsk_gkdf_sha256(const u8 *psk /* Y */, size_t psk_len, +static int eap_gpsk_gkdf_sha256(const u8 *psk /* Y */, const u8 *data /* Z */, size_t data_len, u8 *buf, size_t len /* X */) { u8 *opos; size_t i, n, hashlen, left, clen; u8 ibuf[2], hash[SHA256_MAC_LEN]; - const u8 *addr[3]; - size_t vlen[3]; + const u8 *addr[2]; + size_t vlen[2]; hashlen = SHA256_MAC_LEN; - /* M_i = Hash-Function (i || Y || Z); */ + /* M_i = MAC_Y (i || Z); (MAC = HMAC-SHA256) */ addr[0] = ibuf; vlen[0] = sizeof(ibuf); - addr[1] = psk; - vlen[1] = psk_len; - addr[2] = data; - vlen[2] = data_len; + addr[1] = data; + vlen[1] = data_len; opos = buf; left = len; n = (len + hashlen - 1) / hashlen; for (i = 1; i <= n; i++) { WPA_PUT_BE16(ibuf, i); - sha256_vector(3, addr, vlen, hash); + hmac_sha256_vector(psk, 32, 2, addr, vlen, hash); clen = left > hashlen ? hashlen : left; os_memcpy(opos, hash, clen); opos += clen; @@ -192,37 +109,40 @@ return 0; } +#endif /* EAP_GPSK_SHA256 */ -static int eap_gpsk_derive_keys_sha256(const u8 *psk, size_t psk_len, +static int eap_gpsk_derive_keys_helper(u32 csuite_specifier, + u8 *kdf_out, size_t kdf_out_len, + const u8 *psk, size_t psk_len, const u8 *seed, size_t seed_len, u8 *msk, u8 *emsk, - u8 *sk, size_t *sk_len, - u8 *pk, size_t *pk_len) + u8 *sk, size_t sk_len, + u8 *pk, size_t pk_len) { -#define EAP_GPSK_SK_LEN_SHA256 SHA256_MAC_LEN -#define EAP_GPSK_PK_LEN_SHA256 SHA256_MAC_LEN - u8 mk[SHA256_MAC_LEN], zero_string[1], *pos, *data; - u8 kdf_out[EAP_MSK_LEN + EAP_EMSK_LEN + EAP_GPSK_SK_LEN_SHA256 + - EAP_GPSK_PK_LEN_SHA256]; - size_t data_len; + u8 mk[32], *pos, *data; + size_t data_len, mk_len; + int (*gkdf)(const u8 *psk, const u8 *data, size_t data_len, + u8 *buf, size_t len); - /* - * inputString = RAND_Client || ID_Client || RAND_Server || ID_Server - * (= seed) - * KS = 32, PL = psk_len, CSuite_Sel = 0x000000 0x000002 - * MK = GKDF-32 (0x00, PL || PSK || CSuite_Sel || inputString) - * MSK = GKDF-192 (MK, inputString)[0..63] - * EMSK = GKDF-192 (MK, inputString)[64..127] - * SK = GKDF-192 (MK, inputString)[128..159] - * PK = GKDF-192 (MK, inputString)[160..191] - * MID = GKDF-16(0x00, "Method ID" || EAP_Method_Type || CSuite_Sel || - * inputString) - * Hash-Function = SHA256 (see [RFC4634]) - * hashlen = 32 octets (256 bits) - */ + gkdf = NULL; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Mar 25 08:52:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 356781065672; Tue, 25 Mar 2008 08:52: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 E9EF3106564A for ; Tue, 25 Mar 2008 08:52:13 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C893F8FC13 for ; Tue, 25 Mar 2008 08:52:13 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2P8qDUK019774 for ; Tue, 25 Mar 2008 08:52:13 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2P8qDha019772 for perforce@freebsd.org; Tue, 25 Mar 2008 08:52:13 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 25 Mar 2008 08:52:13 GMT Message-Id: <200803250852.m2P8qDha019772@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 138503 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Mar 2008 08:52:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=138503 Change 138503 by rwatson@rwatson_cinnamon on 2008/03/25 08:52:05 Maintain and observe a ZBUF_FLAG_IMMUTABLE flag on zero-copy BPF buffer kernel descriptors, which is used to allow the buffer currently in the BPF "store" position to be assigned to userspace when it fills, even if userspace hasn't acknowledged the buffer in the "hold" position yet. To implement this, notify the buffer model when a buffer becomes full, and check that the store buffer is writable, not just for it being full, before trying to append new packet data. Shared memory buffers will be assigned to userspace at most once per fill, be it in the store or in the hold position. This removes the restriction that at most one shared memory can by owned by userspace, reducing the chances that userspace will need to call select() after acknowledging one buffer in order to wait for the next buffer when under high load. This more fully realizes the goal of zero system calls in order to process a high-speed packet stream from BPF. Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpf.c#52 edit .. //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.c#37 edit .. //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.h#14 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpf.c#52 (text+ko) ==== @@ -218,6 +218,45 @@ return (0); } +/* + * Allow the buffer model to indicate that the current store buffer is + * immutable, regardless of the appearance of space. Return (1) if the + * buffer is writable, and (0) if not. + */ +static int +bpf_canwritebuf(struct bpf_d *d) +{ + + BPFD_LOCK_ASSERT(d); + + switch (d->bd_bufmode) { + case BPF_BUFMODE_ZBUF: + return (bpf_zerocopy_canwritebuf(d)); + } + return (1); +} + +/* + * Notify buffer model that an attempt to write to the store buffer has + * resulted in a dropped packet, in which case the buffer may be considered + * full. + */ +static void +bpf_buffull(struct bpf_d *d) +{ + + BPFD_LOCK_ASSERT(d); + + switch (d->bd_bufmode) { + case BPF_BUFMODE_ZBUF: + bpf_zerocopy_buffull(d); + break; + } +} + +/* + * Notify the buffer model that a buffer has moved into the hold position. + */ void bpf_bufheld(struct bpf_d *d) { @@ -1676,7 +1715,7 @@ * run this check if we need the space), but for now it's a reliable * spot to do it. */ - if (bpf_canfreebuf(d)) { + if (d->bd_fbuf == NULL && bpf_canfreebuf(d)) { d->bd_fbuf = d->bd_hbuf; d->bd_hbuf = NULL; d->bd_hlen = 0; @@ -1694,27 +1733,28 @@ /* * Round up the end of the previous packet to the next longword. + * + * Drop the packet if there's no room and no hope of room + * If the packet would overflow the storage buffer or the storage + * buffer is considered immutable by the buffer model, try to rotate + * the buffer and wakeup pending processes. */ curlen = BPF_WORDALIGN(d->bd_slen); - if (curlen + totlen > d->bd_bufsize) { - /* - * This packet will overflow the storage buffer. - * Rotate the buffers if we can, then wakeup any - * pending reads. - */ + if (curlen + totlen > d->bd_bufsize || !bpf_canwritebuf(d)) { if (d->bd_fbuf == NULL) { /* - * We haven't completed the previous read yet, - * so drop the packet. + * There's no room in the store buffer, and no + * prospect of room, so drop the packet. Notify the + * buffer model. */ + bpf_buffull(d); ++d->bd_dcount; return; } ROTATE_BUFFERS(d); do_wakeup = 1; curlen = 0; - } - else if (d->bd_immediate || d->bd_state == BPF_TIMED_OUT) + } else if (d->bd_immediate || d->bd_state == BPF_TIMED_OUT) /* * Immediate mode is set, or the read timeout has already * expired during a select call. A packet arrived, so the ==== //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.c#37 (text+ko) ==== @@ -84,7 +84,7 @@ * scatter-gather copying. One significant mitigating factor is that on * systems with a direct memory map, we can avoid TLB misses. * - * At the front of the shared memor region is a bpf_zbuf_header, which + * At the front of the shared memory region is a bpf_zbuf_header, which * contains shared control data to allow user space and the kernel to * synchronize; this is included in zb_size, but not bpf_bufsize, so that BPF * knows that the space is not available. @@ -93,11 +93,19 @@ vm_offset_t zb_uaddr; /* User address, may be stale. */ size_t zb_size; /* Size of buffer, incl. header. */ u_int zb_numpages; /* Number of pages. */ + int zb_flags; /* Flags on zbuf. */ struct sf_buf **zb_pages; /* Pages themselves. */ struct bpf_zbuf_header *zb_header; /* Shared header. */ }; /* + * When a buffer has been assigned to userspace, flag it as such, as the + * buffer may remain in the store position as a result of the user process + * not yet having acknowledged the buffer in the hold position yet. + */ +#define ZBUF_FLAG_IMMUTABLE 0x00000001 /* Set when owned by user. */ + +/* * Release a page we've previously wired. */ static void @@ -253,6 +261,9 @@ src_bytes = (u_char *)src; zb = (struct zbuf *)buf; + KASSERT((zb->zb_flags & ZBUF_FLAG_IMMUTABLE) == 0, + ("bpf_zerocopy_append_bytes: ZBUF_FLAG_IMMUTABLE")); + /* * Scatter-gather copy to user pages mapped into kernel address space * using sf_bufs: copy up to a page at a time. @@ -302,6 +313,9 @@ m = (struct mbuf *)src; zb = (struct zbuf *)buf; + KASSERT((zb->zb_flags & ZBUF_FLAG_IMMUTABLE) == 0, + ("bpf_zerocopy_append_mbuf: ZBUF_FLAG_IMMUTABLE")); + /* * Scatter gather both from an mbuf chain and to a user page set * mapped into kernel address space using sf_bufs. If we're lucky, @@ -343,9 +357,38 @@ } /* + * Notification from the BPF framework that a buffer in the store position is + * rejecting packets and may be considered full. We mark the buffer as + * immutable and assign to userspace so that it is immediately available for + * the user process to access. + */ +void +bpf_zerocopy_buffull(struct bpf_d *d) +{ + struct zbuf *zb; + + KASSERT(d->bd_bufmode == BPF_BUFMODE_ZBUF, + ("bpf_zerocopy_buffull: not in zbuf mode")); + + zb = (struct zbuf *)d->bd_sbuf; + KASSERT(zb != NULL, ("bpf_zerocopy_buffull: zb == NULL")); + + if ((zb->zb_flags & ZBUF_FLAG_IMMUTABLE) == 0) { + zb->zb_flags |= ZBUF_FLAG_IMMUTABLE; + zb->zb_header->bzh_kernel_len = d->bd_slen; + atomic_add_rel_int(&zb->zb_header->bzh_kernel_gen, 1); + } +} + +/* * Notification from the BPF framework that a buffer has moved into the held * slot on a descriptor. Zero-copy BPF will update the shared page to let - * the user process know. + * the user process know and flag the buffer as immutable if it hasn't + * already been marked immutable due to filling while it was in the store + * position. + * + * Note: identical logic as in bpf_zerocopy_buffull(), except that we operate + * on bd_hbuf and bd_hlen. */ void bpf_zerocopy_bufheld(struct bpf_d *d) @@ -357,8 +400,12 @@ zb = (struct zbuf *)d->bd_hbuf; KASSERT(zb != NULL, ("bpf_zerocopy_bufheld: zb == NULL")); - zb->zb_header->bzh_kernel_len = d->bd_hlen; - atomic_add_rel_int(&zb->zb_header->bzh_kernel_gen, 1); + + if ((zb->zb_flags & ZBUF_FLAG_IMMUTABLE) == 0) { + zb->zb_flags |= ZBUF_FLAG_IMMUTABLE; + zb->zb_header->bzh_kernel_len = d->bd_hlen; + atomic_add_rel_int(&zb->zb_header->bzh_kernel_gen, 1); + } } /* @@ -385,6 +432,28 @@ } /* + * Query from the BPF framework as to whether or not the buffer current in + * the store position can actually be written to. This may return false if + * the store buffer is assigned to userspace before the hold buffer is + * acknowledged. + */ +int +bpf_zerocopy_canwritebuf(struct bpf_d *d) +{ + struct zbuf *zb; + + KASSERT(d->bd_bufmode == BPF_BUFMODE_ZBUF, + ("bpf_zerocopy_canwritebuf: not in zbuf mode")); + + zb = (struct zbuf *)d->bd_sbuf; + KASSERT(zb != NULL, ("bpf_zerocopy_canwritebuf: bd_sbuf NULL")); + + if (zb->zb_flags & ZBUF_FLAG_IMMUTABLE) + return (0); + return (1); +} + +/* * Free zero copy buffers at request of descriptor. */ void ==== //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.h#14 (text+ko) ==== @@ -40,8 +40,10 @@ void *src, u_int len); void bpf_zerocopy_append_mbuf(struct bpf_d *d, caddr_t buf, u_int offset, void *src, u_int len); +void bpf_zerocopy_buffull(struct bpf_d *); void bpf_zerocopy_bufheld(struct bpf_d *); int bpf_zerocopy_canfreebuf(struct bpf_d *); +int bpf_zerocopy_canwritebuf(struct bpf_d *); void bpf_zerocopy_free(struct bpf_d *d); int bpf_zerocopy_ioctl_getzmax(struct thread *td, struct bpf_d *d, size_t *i); From owner-p4-projects@FreeBSD.ORG Tue Mar 25 09:14:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 149331065747; Tue, 25 Mar 2008 09:14: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 C7BE71065745 for ; Tue, 25 Mar 2008 09:14:36 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A826A8FC21 for ; Tue, 25 Mar 2008 09:14:36 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2P9Ean1024088 for ; Tue, 25 Mar 2008 09:14:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2P9EaKo024086 for perforce@freebsd.org; Tue, 25 Mar 2008 09:14:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 25 Mar 2008 09:14:36 GMT Message-Id: <200803250914.m2P9EaKo024086@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 138505 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Mar 2008 09:14:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=138505 Change 138505 by rwatson@rwatson_cinnamon on 2008/03/25 09:14:08 Update bpf.4 to reflect that both buffers may be owned by userspace at once; caution against assuming this. Affected files ... .. //depot/projects/zcopybpf/src/share/man/man4/bpf.4#12 edit Differences ... ==== //depot/projects/zcopybpf/src/share/man/man4/bpf.4#12 (text+ko) ==== @@ -259,14 +259,14 @@ They will return a readable file descriptor when ownership of the next buffer is assigned to user space. .Pp -In the current implementation, the kernel will assign ownership of at most -one buffer at a time to the user process. -The user processes must acknowledge the current buffer in order to be -notified that the next buffer is ready for processing. -Programs should not rely on this as an invariant, as it may change in future -versions; in particular, they must maintain their own notion of which buffer -is "next" so that if both buffers are owned by userspace, it can process them -in the correct order. +In the current implementation, the kernel may assign zero, one, or both +buffers to the user process; however, an earlier implementation maintained +the invariant that at most one buffer could be assigned to the user process +at a time. +In order to both ensure progress and high performance, user processes should +acknowledge a completely processed buffer as quickly as possible, returning +it for reuse, and not block waiting on a second buffer while holding another +buffer. .Sh IOCTLS The .Xr ioctl 2 From owner-p4-projects@FreeBSD.ORG Tue Mar 25 15:45:47 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 076461065676; Tue, 25 Mar 2008 15:45: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 BB82A106566B for ; Tue, 25 Mar 2008 15:45:46 +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 9CB238FC18 for ; Tue, 25 Mar 2008 15:45:46 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2PFjk0m046749 for ; Tue, 25 Mar 2008 15:45:46 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2PFjkKF046743 for perforce@freebsd.org; Tue, 25 Mar 2008 15:45:46 GMT (envelope-from gonzo@FreeBSD.org) Date: Tue, 25 Mar 2008 15:45:46 GMT Message-Id: <200803251545.m2PFjkKF046743@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 138524 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Mar 2008 15:45:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=138524 Change 138524 by gonzo@gonzo_jeeves on 2008/03/25 15:44:52 o machine/tlb.h is not really required by this file, moreover it does not exist in repo any more. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/idt/idt_machdep.c#4 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/idt/idt_machdep.c#4 (text+ko) ==== @@ -65,7 +65,6 @@ #include #include #include -#include #include #include From owner-p4-projects@FreeBSD.ORG Tue Mar 25 16:01:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 04D941065674; Tue, 25 Mar 2008 16:01: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 B8CFA1065672 for ; Tue, 25 Mar 2008 16:01:02 +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 B480D8FC18 for ; Tue, 25 Mar 2008 16:01:02 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2PG12lw050641 for ; Tue, 25 Mar 2008 16:01:02 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2PG12uV050639 for perforce@freebsd.org; Tue, 25 Mar 2008 16:01:02 GMT (envelope-from gonzo@FreeBSD.org) Date: Tue, 25 Mar 2008 16:01:02 GMT Message-Id: <200803251601.m2PG12uV050639@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 138525 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Mar 2008 16:01:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=138525 Change 138525 by gonzo@gonzo_jeeves on 2008/03/25 16:00:51 o Remove unused variable o Use int 0 instead of NULL to avoid type cast complaints from gcc Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/idt/uart_cpu_rc32434.c#2 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/idt/uart_cpu_rc32434.c#2 (text+ko) ==== @@ -62,7 +62,7 @@ int uart_cpu_getdev(int devtype, struct uart_devinfo *di) { - uint32_t i, maddr; + uint32_t maddr; if (resource_int_value("uart", 0, "maddr", &maddr) != 0 || maddr == 0) @@ -78,8 +78,8 @@ di->databits = 8; di->stopbits = 1; di->parity = UART_PARITY_NONE; - uart_bus_space_io = NULL; - uart_bus_space_mem = NULL; + uart_bus_space_io = 0; + uart_bus_space_mem = 0; di->bas.bsh = MIPS_PHYS_TO_KSEG1(maddr); return (0); } From owner-p4-projects@FreeBSD.ORG Tue Mar 25 16:04:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0286B1065672; Tue, 25 Mar 2008 16:04: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 B616F106566C for ; Tue, 25 Mar 2008 16:04:05 +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 B1E7A8FC17 for ; Tue, 25 Mar 2008 16:04:05 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2PG45Vb053219 for ; Tue, 25 Mar 2008 16:04:05 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2PG456K053216 for perforce@freebsd.org; Tue, 25 Mar 2008 16:04:05 GMT (envelope-from gonzo@FreeBSD.org) Date: Tue, 25 Mar 2008 16:04:05 GMT Message-Id: <200803251604.m2PG456K053216@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 138526 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Mar 2008 16:04:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=138526 Change 138526 by gonzo@gonzo_jeeves on 2008/03/25 16:03:47 o Remove unused variable o "#if 0" unused function Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/idt/idtpci.c#3 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/idt/idtpci.c#3 (text+ko) ==== @@ -478,10 +478,8 @@ struct idtpci_softc *sc = device_get_softc(bus); struct resource *rv = NULL; struct rman *rm1, *rm2; - bus_space_handle_t bh = 0; void *vaddr; - switch (type) { case SYS_RES_IRQ: rm1 = &sc->sc_irq_rman; @@ -539,13 +537,13 @@ return (rman_activate_resource(r)); } +#if 0 static int idtpci_setup_intr(device_t dev, device_t child, struct resource *ires, int flags, driver_filter_t *filt, driver_intr_t *handler, void *arg, void **cookiep) { panic("setup_intr"); -#if 0 struct idtpci_softc *sc = device_get_softc(dev); struct intr_event *event; int irq, error; @@ -571,10 +569,10 @@ sc->sc_elcr &= ~(1 << irq); idtpci_set_icus(sc); -#endif return (0); } +#endif static int idtpci_teardown_intr(device_t dev, device_t child, struct resource *res, From owner-p4-projects@FreeBSD.ORG Tue Mar 25 19:00:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CB4E810657D3; Tue, 25 Mar 2008 19:00: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 87D6110657D1 for ; Tue, 25 Mar 2008 19:00:14 +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 8360C8FC20 for ; Tue, 25 Mar 2008 19:00:14 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2PJ0EAX088234 for ; Tue, 25 Mar 2008 19:00:14 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2PJ0EMQ088232 for perforce@freebsd.org; Tue, 25 Mar 2008 19:00:14 GMT (envelope-from sam@freebsd.org) Date: Tue, 25 Mar 2008 19:00:14 GMT Message-Id: <200803251900.m2PJ0EMQ088232@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 138534 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Mar 2008 19:00:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=138534 Change 138534 by sam@sam_ebb on 2008/03/25 19:00:13 checkpoint work to move regdomain tables out of ifconfig; works but the final plan is to create a lib80211 that contains the parser plus other useful bits from ifconfig Affected files ... .. //depot/projects/vap/etc/Makefile#4 edit .. //depot/projects/vap/etc/regdomain.xml#1 add .. //depot/projects/vap/sbin/ifconfig/Makefile#7 edit .. //depot/projects/vap/sbin/ifconfig/ifieee80211.c#15 edit .. //depot/projects/vap/sbin/ifconfig/regdomain.c#1 add .. //depot/projects/vap/sbin/ifconfig/regdomain.h#1 add Differences ... ==== //depot/projects/vap/etc/Makefile#4 (text+ko) ==== @@ -17,7 +17,7 @@ portsnap.conf pf.os phones profile protocols \ rc rc.bsdextended rc.firewall rc.firewall6 rc.initdiskless \ rc.sendmail rc.shutdown \ - rc.subr remote rpc services shells \ + rc.subr regdomain.xml remote rpc services shells \ snmpd.config sysctl.conf syslog.conf \ etc.${MACHINE_ARCH}/ttys \ ${.CURDIR}/../gnu/usr.bin/man/manpath/manpath.config \ ==== //depot/projects/vap/sbin/ifconfig/Makefile#7 (text+ko) ==== @@ -23,7 +23,10 @@ SRCS+= ifmac.c # MAC support SRCS+= ifmedia.c # SIOC[GS]IFMEDIA support SRCS+= ifvlan.c # SIOC[GS]ETVLAN support -SRCS+= ifieee80211.c # SIOC[GS]IEEE80211 support + +SRCS+= ifieee80211.c regdomain.c # SIOC[GS]IEEE80211 support +DPADD+= ${LIBBSDXML} ${LIBSBUF} +LDADD+= -lbsdxml -lsbuf SRCS+= ifcarp.c # SIOC[GS]VH support SRCS+= ifgroup.c # ... @@ -34,8 +37,8 @@ .if ${MK_IPX_SUPPORT} != "no" && !defined(RELEASE_CRUNCH) SRCS+= af_ipx.c # IPX support -DPADD= ${LIBIPX} -LDADD= -lipx +DPADD+= ${LIBIPX} +LDADD+= -lipx .endif MAN= ifconfig.8 ==== //depot/projects/vap/sbin/ifconfig/ifieee80211.c#15 (text+ko) ==== @@ -78,7 +78,6 @@ #include #include -#include #include #include @@ -93,10 +92,16 @@ #include /* NB: for offsetof */ #include "ifconfig.h" +#include "regdomain.h" #ifndef IEEE80211_FIXED_RATE_NONE #define IEEE80211_FIXED_RATE_NONE 0xff #endif + +#define REQ_ECM 0x01000000 /* enable if ECM set */ +#define REQ_OUTDOOR 0x02000000 /* enable for outdoor operation */ +#define REQ_FLAGS 0xff000000 /* private flags, don't pass to os */ + /* XXX need these publicly defined or similar */ #ifndef IEEE80211_NODE_AUTH #define IEEE80211_NODE_AUTH 0x0001 /* authorized for data */ @@ -117,45 +122,6 @@ static void LINE_BREAK(void); static void LINE_CHECK(const char *fmt, ...); -#define REQ_ECM 0x01000000 /* enable if ECM set */ -#define REQ_OUTDOOR 0x02000000 /* enable for outdoor operation */ -#define REQ_FLAGS 0xff000000 /* private flags, don't pass to os */ - -struct freqband { - uint16_t freqStart; /* starting frequency (MHz) */ - uint16_t freqEnd; /* ending frequency (MHz) */ - uint8_t chanWidth; /* channel width (MHz) */ - uint8_t chanSep; /* channel sepaaration (MHz) */ - uint32_t flags; /* common operational constraints */ -}; -struct netband { - const struct freqband *b; /* channel list description */ - uint8_t maxPower; /* regulatory cap on tx power (dBm) */ - uint8_t maxPowerDFS; /* regulatory cap w/ DFS (dBm) */ - uint32_t flags; /* net80211 channel flags */ -}; - -#define MAXFBANDS 10 /* XXX could define per netband */ - -struct regdomain { - enum RegdomainCode sku; /* regdomain code/SKU */ - const char *name; /* printable name */ - enum ISOCountryCode cc; /* country code for 1-1/default map */ - - struct netband bands_11b[MAXFBANDS]; /* 11b operation */ - struct netband bands_11g[MAXFBANDS]; /* 11g operation */ - struct netband bands_11a[MAXFBANDS]; /* 11a operation */ - struct netband bands_11ng[MAXFBANDS]; /* 11ng operation */ - struct netband bands_11na[MAXFBANDS]; /* 11na operation */ -}; - -struct countrycode { - enum ISOCountryCode code; - const struct regdomain *rd; - const char* isoname; - const char* name; -}; - static const char *modename[] = { "auto", "11a", "11b", "11g", "fh", "turboA", "turboG", "sturbo", "11na", "11ng" @@ -173,10 +139,6 @@ int allchans, int verbose); static void regdomain_makechannels(struct ieee80211_regdomain_req *, const struct ieee80211_devcaps_req *); -static const struct regdomain *regdomain_lookupbyrd(enum RegdomainCode sku); -static const struct regdomain *regdomain_lookupbyname(const char *name); -static const struct countrycode *countrycode_lookupbycc(enum ISOCountryCode); -static const struct countrycode *countrycode_lookupbyname(const char *); static struct ieee80211req_chaninfo chaninfo; static struct ieee80211_regdomain regdomain; @@ -216,6 +178,18 @@ gethtconf(s); } +static struct regdata * +getregdata(void) +{ + static struct regdata *rdp = NULL; + if (rdp == NULL) { + rdp = lib80211_alloc_regdata(); + if (rdp == NULL) + exit(-1); + } + return rdp; +} + /* * Given the channel at index i with attributes from, * check if there is a channel with attributes to in @@ -444,16 +418,17 @@ struct ieee80211_regdomain_req req; struct ieee80211_regdomain *rd = arg; struct ieee80211_devcaps_req dc; + struct regdata *rdp = getregdata(); if (rd->country != 0) { - const struct countrycode *cc; + const struct country *cc; /* * Check current country seting to make sure it's * compatible with the new regdomain. If not, then * override it with any default country for this * SKU. If we cannot arrange a match, then abort. */ - cc = countrycode_lookupbycc(rd->country); + cc = lib80211_country_findbycc(rdp, rd->country); if (cc == NULL) errx(1, "unknown ISO country code %d", rd->country); if (cc->rd->sku != rd->regdomain) { @@ -471,12 +446,12 @@ * constructing the channel list by deferring to the * regdomain to construct the channel list. */ - rp = regdomain_lookupbyrd(rd->regdomain); + rp = lib80211_regdomain_findbysku(rdp, rd->regdomain); if (rp == NULL) errx(1, "country %s (%s) is not usable with " "regdomain %d", cc->isoname, cc->name, rd->regdomain); - else if (rp->cc != 0 && rp->cc != cc->code) + else if (rp->cc != 0 && rp->cc != cc) errx(1, "country %s (%s) is not usable with " "regdomain %s", cc->isoname, cc->name, rp->name); @@ -1715,385 +1690,6 @@ set80211(s, IEEE80211_IOC_DOTD, d, 0, NULL); } -/* NB: keep sorted by starting frequency, legacy before HT */ -const struct freqband F1_5120_5240 = { 5120, 5240, 20, 20, IEEE80211_CHAN_A }; -const struct freqband H4_5120_5240 = { 5120, 5240, 40, 20, IEEE80211_CHAN_A }; -const struct freqband F1_5180_5240 = { 5180, 5240, 20, 20, IEEE80211_CHAN_A }; -const struct freqband H4_5180_5240 = { 5180, 5240, 40, 20, IEEE80211_CHAN_A }; -const struct freqband F1_5200_5240 = { 5200, 5240, 20, 20, IEEE80211_CHAN_A }; -const struct freqband H4_5200_5240 = { 5200, 5240, 40, 20, IEEE80211_CHAN_A }; -const struct freqband F1_5260_5320 = { 5260, 5320, 20, 20, IEEE80211_CHAN_A }; -const struct freqband H4_5260_5320 = { 5260, 5320, 40, 20, IEEE80211_CHAN_A }; -const struct freqband F1_5260_5700 = { 5260, 5700, 20, 20, IEEE80211_CHAN_A }; -const struct freqband F1_5280_5320 = { 5280, 5320, 20, 20, IEEE80211_CHAN_A }; -const struct freqband H4_5280_5320 = { 5280, 5320, 40, 20, IEEE80211_CHAN_A }; -const struct freqband F1_5500_5620 = { 5500, 5620, 20, 20, IEEE80211_CHAN_A }; -const struct freqband H4_5500_5620 = { 5500, 5620, 40, 20, IEEE80211_CHAN_A }; -const struct freqband H4_5500_5680 = { 5500, 5680, 40, 20, IEEE80211_CHAN_A }; -const struct freqband F1_5500_5700 = { 5500, 5700, 20, 20, IEEE80211_CHAN_A }; -const struct freqband H4_5725_5825 = { 5725, 5825, 40, 20, IEEE80211_CHAN_A }; -const struct freqband F1_5745_5805 = { 5745, 5805, 20, 20, IEEE80211_CHAN_A }; -const struct freqband H4_5745_5805 = { 5745, 5805, 40, 20, IEEE80211_CHAN_A }; -const struct freqband H4_5745_5825 = { 5745, 5825, 40, 20, IEEE80211_CHAN_A }; -const struct freqband F1_5825_5825 = { 5825, 5825, 20, 20, IEEE80211_CHAN_A }; -const struct freqband H4_5825_5825 = { 5825, 5825, 40, 20, IEEE80211_CHAN_A }; - -const struct freqband F1_2312_2372 = { 2312, 2372, 20, 5 }; -const struct freqband F1_2412_2462 = { 2412, 2462, 20, 5 }; -const struct freqband H4_2412_2462 = { 2412, 2462, 40, 5 }; -const struct freqband F1_2412_2472 = { 2412, 2472, 20, 5 }; -const struct freqband H4_2412_2472 = { 2412, 2472, 40, 5 }; -const struct freqband F1_2467_2472 = { 2467, 2472, 20, 5 }; -const struct freqband H4_2467_2472 = { 2467, 2472, 40, 5 }; -const struct freqband F1_2484_2484 = { 2484, 2484, 20, 5 }; -const struct freqband F1_2512_2732 = { 2512, 2732, 20, 5 }; - -const static struct regdomain rd_debug = { - .sku = SKU_DEBUG, .name = "DEBUG", -}; - -const static struct regdomain rd_fcc = { - .sku = SKU_FCC, .name = "FCC", .cc = CTRY_UNITED_STATES, - .bands_11b = { - { &F1_2412_2462, 30, 30, IEEE80211_CHAN_B }, - }, - .bands_11g = { - { &F1_2412_2462, 30, 30, IEEE80211_CHAN_G }, - }, - .bands_11a = { - { &F1_5180_5240, 17, 17 }, - { &F1_5745_5805, 23, 23 }, - { &F1_5825_5825, 23, 23, IEEE80211_CHAN_PASSIVE }, - }, - .bands_11ng = { - { &F1_2412_2462, 30, 30, IEEE80211_CHAN_G | IEEE80211_CHAN_HT20 }, - { &F1_2412_2462, 30, 30, IEEE80211_CHAN_G | IEEE80211_CHAN_HT40 }, - }, - .bands_11na = { - { &F1_5180_5240, 17, 17, IEEE80211_CHAN_HT20 }, - { &H4_5180_5240, 17, 17, IEEE80211_CHAN_HT40 }, - { &F1_5745_5805, 23, 23, IEEE80211_CHAN_HT20 }, - { &H4_5745_5805, 23, 23, IEEE80211_CHAN_HT40 }, - }, -}; - -const static struct regdomain rd_fcc3 = { - .sku = SKU_FCC3, .name = "FCC3", - .bands_11b = { - { &F1_2412_2462, 30, 30, IEEE80211_CHAN_B }, - }, - .bands_11g = { - { &F1_2412_2462, 30, 30, IEEE80211_CHAN_G }, - }, - .bands_11a = { - { &F1_5180_5240, 17, 17 }, - { &F1_5745_5805, 23, 23, IEEE80211_CHAN_PASSIVE | IEEE80211_CHAN_DFS }, - { &F1_5825_5825, 23, 23, IEEE80211_CHAN_PASSIVE | IEEE80211_CHAN_DFS }, - }, - .bands_11ng = { - { &F1_2412_2462, 30, 30, IEEE80211_CHAN_G | IEEE80211_CHAN_HT20 }, - { &F1_2412_2462, 30, 30, IEEE80211_CHAN_G | IEEE80211_CHAN_HT40 }, - }, - .bands_11na = { - { &F1_5180_5240, 17, 17, IEEE80211_CHAN_HT20 }, - { &H4_5180_5240, 17, 17, IEEE80211_CHAN_HT40 }, - { &F1_5745_5805, 23, 23, IEEE80211_CHAN_HT20 }, - { &H4_5745_5805, 23, 23, IEEE80211_CHAN_HT40 | - IEEE80211_CHAN_PASSIVE | IEEE80211_CHAN_DFS }, - }, -}; - -const static struct regdomain rd_japan = { - .sku = SKU_JAPAN, .name = "JAPAN", .cc = CTRY_JAPAN, - .bands_11b = { - { &F1_2412_2472, 23, 23, IEEE80211_CHAN_B }, - { &F1_2484_2484, 23, 23, IEEE80211_CHAN_B }, - }, - .bands_11g = { - { &F1_2412_2472, 23, 23, IEEE80211_CHAN_G }, - }, - .bands_11a = { - { &F1_5180_5240, 23, 23 }, - { &F1_5260_5320, 23, 23, IEEE80211_CHAN_PASSIVE | IEEE80211_CHAN_DFS }, - }, - .bands_11ng = { - { &F1_2412_2472, 23, 23, IEEE80211_CHAN_G | IEEE80211_CHAN_HT20 }, - { &H4_2412_2472, 23, 23, IEEE80211_CHAN_G | IEEE80211_CHAN_HT40 }, - }, - .bands_11na = { - { &F1_5180_5240, 23, 23, IEEE80211_CHAN_HT20 }, - { &H4_5180_5240, 23, 23, IEEE80211_CHAN_HT40 }, - { &F1_5260_5320, 23, 23, IEEE80211_CHAN_HT20 | - IEEE80211_CHAN_PASSIVE | IEEE80211_CHAN_DFS }, - { &H4_5260_5320, 23, 23, IEEE80211_CHAN_HT40 | - IEEE80211_CHAN_PASSIVE | IEEE80211_CHAN_DFS }, - }, -}; - -const static struct regdomain rd_etsi = { - .sku = SKU_ETSI, .name = "ETSI", - .bands_11b = { - { &F1_2412_2472, 30, 30, IEEE80211_CHAN_B }, - }, - .bands_11g = { - { &F1_2412_2472, 30, 30, IEEE80211_CHAN_G }, - }, - .bands_11a = { - { &F1_5180_5240, 17, 17 }, - { &F1_5260_5320, 24, 24, IEEE80211_CHAN_PASSIVE | IEEE80211_CHAN_DFS }, - { &F1_5500_5700, 23, 23, IEEE80211_CHAN_PASSIVE | IEEE80211_CHAN_DFS }, - }, - .bands_11ng = { - { &F1_2412_2472, 30, 30, IEEE80211_CHAN_G | IEEE80211_CHAN_HT20 }, - { &H4_2412_2462, 30, 30, IEEE80211_CHAN_G | IEEE80211_CHAN_HT40 }, - }, - .bands_11na = { - { &F1_5180_5240, 17, 17, IEEE80211_CHAN_HT20 }, - { &H4_5180_5240, 17, 17, IEEE80211_CHAN_HT40 }, - { &F1_5260_5320, 24, 24, IEEE80211_CHAN_HT20 | - IEEE80211_CHAN_PASSIVE | IEEE80211_CHAN_DFS }, - { &H4_5260_5320, 24, 24, IEEE80211_CHAN_HT40 | - IEEE80211_CHAN_PASSIVE | IEEE80211_CHAN_DFS }, - { &F1_5500_5700, 23, 23, IEEE80211_CHAN_HT20 | - IEEE80211_CHAN_PASSIVE | IEEE80211_CHAN_DFS }, - { &H4_5500_5680, 23, 23, IEEE80211_CHAN_HT40 | - IEEE80211_CHAN_PASSIVE | IEEE80211_CHAN_DFS }, - }, -}; - -const static struct regdomain rd_etsi2 = { /* ETSI w/o HT40 in 5GHz */ - .sku = SKU_ETSI2, .name = "ETSI2", - .bands_11b = { - { &F1_2412_2472, 30, 30, IEEE80211_CHAN_B }, - }, - .bands_11g = { - { &F1_2412_2472, 30, 30, IEEE80211_CHAN_G }, - }, - .bands_11a = { - { &F1_5120_5240, 17, 17 }, - { &F1_5260_5320, 24, 24, IEEE80211_CHAN_PASSIVE | IEEE80211_CHAN_DFS }, - { &F1_5500_5700, 23, 23, IEEE80211_CHAN_PASSIVE | IEEE80211_CHAN_DFS }, - }, - .bands_11ng = { - { &F1_2412_2472, 30, 30, IEEE80211_CHAN_G | IEEE80211_CHAN_HT20 }, - }, - .bands_11na = { - { &F1_5120_5240, 17, 17, IEEE80211_CHAN_HT20 }, - { &F1_5260_5320, 24, 24, IEEE80211_CHAN_HT20 | - IEEE80211_CHAN_PASSIVE | IEEE80211_CHAN_DFS }, - { &F1_5500_5700, 23, 23, IEEE80211_CHAN_HT20 | - IEEE80211_CHAN_PASSIVE | IEEE80211_CHAN_DFS }, - }, -}; - -const static struct regdomain rd_etsi3 = { /* ETSI - channel 36 */ - .sku = SKU_ETSI3, .name = "ETSI3", .cc = CTRY_ROMANIA, - .bands_11b = { - { &F1_2412_2472, 30, 30, IEEE80211_CHAN_B }, - }, - .bands_11g = { - { &F1_2412_2472, 30, 30, IEEE80211_CHAN_G }, - }, - .bands_11a = { - { &F1_5200_5240, 17, 17 }, - { &F1_5280_5320, 24, 24, IEEE80211_CHAN_PASSIVE | IEEE80211_CHAN_DFS }, - { &F1_5500_5700, 23, 23, IEEE80211_CHAN_PASSIVE | IEEE80211_CHAN_DFS }, - }, - .bands_11ng = { - { &F1_2412_2472, 30, 30, IEEE80211_CHAN_G | IEEE80211_CHAN_HT20 }, - { &H4_2412_2462, 30, 30, IEEE80211_CHAN_G | IEEE80211_CHAN_HT40 }, - }, - .bands_11na = { - { &F1_5200_5240, 17, 17, IEEE80211_CHAN_HT20 }, - { &H4_5200_5240, 17, 17, IEEE80211_CHAN_HT40 }, - { &F1_5280_5320, 24, 24, IEEE80211_CHAN_HT20 | - IEEE80211_CHAN_PASSIVE | IEEE80211_CHAN_DFS }, - { &H4_5280_5320, 24, 24, IEEE80211_CHAN_HT40 | - IEEE80211_CHAN_PASSIVE | IEEE80211_CHAN_DFS }, - { &F1_5500_5700, 23, 23, IEEE80211_CHAN_HT20 | - IEEE80211_CHAN_PASSIVE | IEEE80211_CHAN_DFS }, - { &H4_5500_5680, 23, 23, IEEE80211_CHAN_HT40 | - IEEE80211_CHAN_PASSIVE | IEEE80211_CHAN_DFS }, - }, -}; - -const static struct regdomain rd_apac = { - .sku = SKU_APAC, .name = "APAC", - .bands_11b = { - { &F1_2412_2472, 30, 30, IEEE80211_CHAN_B }, - }, - .bands_11g = { - { &F1_2412_2472, 30, 30, IEEE80211_CHAN_G }, - }, - .bands_11a = { - { &F1_5180_5240, 17, 17 }, - { &F1_5260_5320, 23, 23, IEEE80211_CHAN_PASSIVE }, - { &F1_5745_5805, 23, 23 }, - { &F1_5825_5825, 23, 23 }, - }, - .bands_11ng = { - { &F1_2412_2472, 30, 30, IEEE80211_CHAN_G | IEEE80211_CHAN_HT20 }, - { &H4_2412_2462, 30, 30, IEEE80211_CHAN_G | IEEE80211_CHAN_HT40 }, - }, - .bands_11na = { - { &F1_5180_5240, 17, 17, IEEE80211_CHAN_HT20 }, - { &H4_5180_5240, 17, 17, IEEE80211_CHAN_HT40 }, - { &F1_5260_5320, 23, 23, IEEE80211_CHAN_HT20 | IEEE80211_CHAN_PASSIVE }, - { &H4_5260_5320, 23, 23, IEEE80211_CHAN_HT40 | IEEE80211_CHAN_PASSIVE }, - { &F1_5745_5805, 23, 23, IEEE80211_CHAN_HT20 }, - { &H4_5745_5805, 23, 23, IEEE80211_CHAN_HT40 }, - }, -}; - -const static struct regdomain rd_apac2 = { /* APAC w/ DFS on Mid-band */ - .sku = SKU_APAC2, .name = "APAC2", - .bands_11b = { - { &F1_2412_2462, 30, 30, IEEE80211_CHAN_B }, - }, - .bands_11g = { - { &F1_2412_2462, 30, 30, IEEE80211_CHAN_G }, - }, - .bands_11a = { - { &F1_5120_5240, 17, 17 }, - { &F1_5260_5320, 23, 23, IEEE80211_CHAN_PASSIVE | IEEE80211_CHAN_DFS }, - { &F1_5745_5805, 23, 23 }, - { &F1_5825_5825, 23, 23 }, - }, - .bands_11ng = { - { &F1_2412_2462, 30, 30, IEEE80211_CHAN_G | IEEE80211_CHAN_HT20 }, - { &H4_2412_2462, 30, 30, IEEE80211_CHAN_G | IEEE80211_CHAN_HT40 }, - }, - .bands_11na = { - { &F1_5120_5240, 17, 17, IEEE80211_CHAN_HT20 }, - { &H4_5120_5240, 17, 17, IEEE80211_CHAN_HT40 }, - { &F1_5260_5320, 23, 23, IEEE80211_CHAN_HT20 | - IEEE80211_CHAN_PASSIVE | IEEE80211_CHAN_DFS }, - { &H4_5260_5320, 23, 23, IEEE80211_CHAN_HT40 | - IEEE80211_CHAN_PASSIVE | IEEE80211_CHAN_DFS }, - { &F1_5745_5805, 23, 23, IEEE80211_CHAN_HT20 }, - { &H4_5745_5805, 23, 23, IEEE80211_CHAN_HT40 }, - }, -}; - -const static struct regdomain rd_apac3 = { /* APAC w/o ISM band */ - .sku = SKU_APAC3, .name = "APAC3", - .bands_11b = { - { &F1_2412_2462, 30, 30, IEEE80211_CHAN_B }, - }, - .bands_11g = { - { &F1_2412_2462, 30, 30, IEEE80211_CHAN_G }, - }, - .bands_11a = { - { &F1_5180_5240, 17, 17 }, - { &F1_5260_5320, 23, 23, IEEE80211_CHAN_PASSIVE | IEEE80211_CHAN_DFS }, - { &F1_5745_5805, 23, 23 }, - }, - .bands_11ng = { - { &F1_2412_2472, 30, 30, IEEE80211_CHAN_G | IEEE80211_CHAN_HT20 }, - { &H4_2412_2462, 30, 30, IEEE80211_CHAN_G | IEEE80211_CHAN_HT40 }, - }, - .bands_11na = { - { &F1_5180_5240, 17, 17, IEEE80211_CHAN_HT20 }, - { &H4_5180_5240, 17, 17, IEEE80211_CHAN_HT40 }, - { &F1_5260_5320, 23, 23, IEEE80211_CHAN_HT20 | IEEE80211_CHAN_PASSIVE }, - { &H4_5260_5320, 23, 23, IEEE80211_CHAN_HT40 | IEEE80211_CHAN_PASSIVE }, - { &F1_5745_5805, 23, 23, IEEE80211_CHAN_HT20 }, - { &H4_5745_5805, 23, 23, IEEE80211_CHAN_HT40 }, - }, -}; - -const static struct regdomain rd_korea = { - .sku = SKU_KOREA, .name = "KOREA", .cc = CTRY_KOREA_ROC, - .bands_11b = { - { &F1_2412_2462, 30, 30, IEEE80211_CHAN_B }, - { &F1_2467_2472, 30, 30, IEEE80211_CHAN_B | IEEE80211_CHAN_PASSIVE }, - }, - .bands_11g = { - { &F1_2412_2462, 30, 30, IEEE80211_CHAN_G }, - { &F1_2467_2472, 30, 30, IEEE80211_CHAN_G | IEEE80211_CHAN_PASSIVE }, - }, - .bands_11a = { - { &F1_5180_5240, 17, 17, IEEE80211_CHAN_PASSIVE }, - { &F1_5260_5320, 23, 23, IEEE80211_CHAN_PASSIVE }, - { &F1_5500_5620, 23, 23, IEEE80211_CHAN_PASSIVE }, - { &F1_5745_5805, 23, 23, IEEE80211_CHAN_PASSIVE }, - }, - .bands_11ng = { - { &F1_2412_2462, 30, 30, - IEEE80211_CHAN_G | IEEE80211_CHAN_HT20 }, - { &F1_2467_2472, 30, 30, - IEEE80211_CHAN_G | IEEE80211_CHAN_HT20 | IEEE80211_CHAN_PASSIVE }, - }, - .bands_11na = { - { &F1_5180_5240, 17, 17, IEEE80211_CHAN_HT20 | IEEE80211_CHAN_PASSIVE }, - { &F1_5260_5320, 23, 23, IEEE80211_CHAN_HT20 | IEEE80211_CHAN_PASSIVE }, - { &F1_5500_5620, 23, 23, IEEE80211_CHAN_HT20 | IEEE80211_CHAN_PASSIVE }, - { &F1_5745_5805, 23, 23, IEEE80211_CHAN_HT20 | IEEE80211_CHAN_PASSIVE }, - }, -}; - -const static struct regdomain rd_row = { - .sku = SKU_ROW, .name = "ROW", - .bands_11b = { - { &F1_2412_2462, 30, 30, IEEE80211_CHAN_B }, - }, - .bands_11g = { - { &F1_2412_2462, 30, 30, IEEE80211_CHAN_G }, - }, - .bands_11a = { - { &F1_5745_5805, 23, 23, IEEE80211_CHAN_PASSIVE }, - }, - .bands_11ng = { - { &F1_2412_2462, 30, 30, - IEEE80211_CHAN_G | IEEE80211_CHAN_HT20 }, - { &H4_2412_2462, 30, 30, - IEEE80211_CHAN_G | IEEE80211_CHAN_HT40 }, - }, - .bands_11na = { - { &F1_5745_5805, 23, 23, IEEE80211_CHAN_HT20 | IEEE80211_CHAN_PASSIVE }, - { &H4_5745_5805, 23, 23, IEEE80211_CHAN_HT40 | IEEE80211_CHAN_PASSIVE }, - }, -}; - -const static struct regdomain rd_none = { - .sku = SKU_NONE, .name = "NONE", - .bands_11b = { - { &F1_2412_2462, 30, 30, IEEE80211_CHAN_B }, - { &F1_2467_2472, 30, 30, IEEE80211_CHAN_B | IEEE80211_CHAN_PASSIVE }, - }, - .bands_11g = { - { &F1_2412_2462, 30, 30, IEEE80211_CHAN_G }, - { &F1_2467_2472, 30, 30, IEEE80211_CHAN_G | IEEE80211_CHAN_PASSIVE }, - }, - .bands_11a = { - { &F1_5120_5240, 17, 17, IEEE80211_CHAN_PASSIVE }, - { &F1_5260_5320, 24, 24, IEEE80211_CHAN_PASSIVE }, - { &F1_5500_5700, 24, 24, IEEE80211_CHAN_PASSIVE }, - { &F1_5745_5805, 23, 23, IEEE80211_CHAN_PASSIVE }, - { &F1_5825_5825, 23, 23, IEEE80211_CHAN_PASSIVE }, - }, - .bands_11ng = { - { &F1_2412_2462, 30, 30, IEEE80211_CHAN_G | IEEE80211_CHAN_HT20 }, - { &H4_2412_2462, 30, 30, IEEE80211_CHAN_G | IEEE80211_CHAN_HT40 }, - { &F1_2467_2472, 30, 30, - IEEE80211_CHAN_G | IEEE80211_CHAN_HT20 | IEEE80211_CHAN_PASSIVE }, - { &H4_2467_2472, 30, 30, - IEEE80211_CHAN_G | IEEE80211_CHAN_HT40 | IEEE80211_CHAN_PASSIVE }, - }, - .bands_11na = { - { &F1_5120_5240, 17, 17, IEEE80211_CHAN_HT20 | IEEE80211_CHAN_PASSIVE }, - { &H4_5120_5240, 17, 17, IEEE80211_CHAN_HT40 | IEEE80211_CHAN_PASSIVE }, - { &F1_5260_5320, 24, 24, IEEE80211_CHAN_HT20 | IEEE80211_CHAN_PASSIVE }, - { &H4_5260_5320, 24, 24, IEEE80211_CHAN_HT40 | IEEE80211_CHAN_PASSIVE }, - { &F1_5500_5700, 24, 24, IEEE80211_CHAN_HT20 | IEEE80211_CHAN_PASSIVE }, - { &H4_5500_5680, 24, 24, IEEE80211_CHAN_HT40 | IEEE80211_CHAN_PASSIVE }, - { &F1_5745_5805, 23, 23, IEEE80211_CHAN_HT20 | IEEE80211_CHAN_PASSIVE }, - { &H4_5745_5805, 23, 23, IEEE80211_CHAN_HT40 | IEEE80211_CHAN_PASSIVE }, - { &F1_5825_5825, 23, 23, IEEE80211_CHAN_HT20 | IEEE80211_CHAN_PASSIVE }, - { &H4_5825_5825, 23, 23, IEEE80211_CHAN_HT40 | IEEE80211_CHAN_PASSIVE }, - }, -}; - static int regdomain_sort(const void *a, const void *b) { @@ -2126,23 +1722,22 @@ static void regdomain_addchans(struct ieee80211req_chaninfo *ci, - const struct netband *nb, + const netband_head *bands, const struct ieee80211_regdomain *reg, uint32_t chanFlags, const struct ieee80211req_chaninfo *avail) { + const struct netband *nb; const struct freqband *b; struct ieee80211_channel *c, *prev; - int i, freq, channelSep; + int freq, channelSep; channelSep = (chanFlags & IEEE80211_CHAN_2GHZ) ? 0 : 40; - for (i = 0; i < MAXFBANDS; nb++, i++) { + LIST_FOREACH(nb, bands, next) { + b = nb->band; if (verbose) - printf("%s: [%d] chanFlags 0x%x b %p\n", - __func__, i, chanFlags, nb->b); - if (nb->b == NULL) - break; - b = nb->b; + printf("%s: chanFlags 0x%x b %p\n", + __func__, chanFlags, b); prev = NULL; for (freq = b->freqStart; freq <= b->freqEnd; freq += b->chanSep) { uint32_t flags = nb->flags | b->flags; @@ -2219,10 +1814,12 @@ } static void -regdomain_makechannels(struct ieee80211_regdomain_req *req, +regdomain_makechannels( + struct ieee80211_regdomain_req *req, const struct ieee80211_devcaps_req *dc) { - const struct countrycode *cc; + struct regdata *rdp = getregdata(); + const struct country *cc; const struct ieee80211_regdomain *reg = &req->rd; struct ieee80211req_chaninfo *ci = &req->chaninfo; const struct regdomain *rd; @@ -2236,255 +1833,89 @@ * belong to at least one regdomain. */ if (reg->regdomain == 0) { - cc = countrycode_lookupbycc(reg->country); + cc = lib80211_country_findbycc(rdp, reg->country); if (cc == NULL) errx(1, "internal error, country %d not found", reg->country); rd = cc->rd; } else - rd = regdomain_lookupbyrd(reg->regdomain); + rd = lib80211_regdomain_findbysku(rdp, reg->regdomain); if (rd == NULL) errx(1, "internal error, regdomain %d not found", reg->regdomain); if (rd->sku != SKU_DEBUG) { memset(ci, 0, sizeof(*ci)); - regdomain_addchans(ci, rd->bands_11b, reg, - IEEE80211_CHAN_B, &dc->dc_chaninfo); - regdomain_addchans(ci, rd->bands_11g, reg, - IEEE80211_CHAN_G, &dc->dc_chaninfo); - regdomain_addchans(ci, rd->bands_11a, reg, - IEEE80211_CHAN_A, &dc->dc_chaninfo); - regdomain_addchans(ci, rd->bands_11na, reg, - IEEE80211_CHAN_A | IEEE80211_CHAN_HT20, &dc->dc_chaninfo); - regdomain_addchans(ci, rd->bands_11na, reg, - IEEE80211_CHAN_A | IEEE80211_CHAN_HT40U, &dc->dc_chaninfo); - regdomain_addchans(ci, rd->bands_11na, reg, - IEEE80211_CHAN_A | IEEE80211_CHAN_HT40D, &dc->dc_chaninfo); - regdomain_addchans(ci, rd->bands_11ng, reg, - IEEE80211_CHAN_G | IEEE80211_CHAN_HT20, &dc->dc_chaninfo); - regdomain_addchans(ci, rd->bands_11ng, reg, - IEEE80211_CHAN_G | IEEE80211_CHAN_HT40U, &dc->dc_chaninfo); - regdomain_addchans(ci, rd->bands_11ng, reg, - IEEE80211_CHAN_G | IEEE80211_CHAN_HT40D, &dc->dc_chaninfo); + if (!LIST_EMPTY(&rd->bands_11b)) + regdomain_addchans(ci, &rd->bands_11b, reg, + IEEE80211_CHAN_B, &dc->dc_chaninfo); + if (!LIST_EMPTY(&rd->bands_11g)) + regdomain_addchans(ci, &rd->bands_11g, reg, + IEEE80211_CHAN_G, &dc->dc_chaninfo); + if (!LIST_EMPTY(&rd->bands_11a)) + regdomain_addchans(ci, &rd->bands_11a, reg, + IEEE80211_CHAN_A, &dc->dc_chaninfo); + if (!LIST_EMPTY(&rd->bands_11na)) { + regdomain_addchans(ci, &rd->bands_11na, reg, + IEEE80211_CHAN_A | IEEE80211_CHAN_HT20, + &dc->dc_chaninfo); + regdomain_addchans(ci, &rd->bands_11na, reg, + IEEE80211_CHAN_A | IEEE80211_CHAN_HT40U, + &dc->dc_chaninfo); + regdomain_addchans(ci, &rd->bands_11na, reg, + IEEE80211_CHAN_A | IEEE80211_CHAN_HT40D, + &dc->dc_chaninfo); + } + if (!LIST_EMPTY(&rd->bands_11ng)) { + regdomain_addchans(ci, &rd->bands_11ng, reg, + IEEE80211_CHAN_G | IEEE80211_CHAN_HT20, + &dc->dc_chaninfo); + regdomain_addchans(ci, &rd->bands_11ng, reg, + IEEE80211_CHAN_G | IEEE80211_CHAN_HT40U, + &dc->dc_chaninfo); + regdomain_addchans(ci, &rd->bands_11ng, reg, + IEEE80211_CHAN_G | IEEE80211_CHAN_HT40D, + &dc->dc_chaninfo); + } qsort(ci->ic_chans, ci->ic_nchans, sizeof(ci->ic_chans[0]), regdomain_sort); } else *ci = dc->dc_chaninfo; } -static const struct regdomain *regdomain_info[] = { - &rd_fcc, - &rd_fcc3, - &rd_japan, - &rd_etsi, - &rd_etsi2, - &rd_etsi3, - &rd_apac, - &rd_apac2, - &rd_apac3, - &rd_korea, - &rd_row, - &rd_none, - &rd_debug, -}; - -#define N(a) (sizeof(a) / sizeof(a[0])) - -static const struct regdomain * -regdomain_lookupbyrd(enum RegdomainCode sku) -{ - int i; - - for (i = 0; i < N(regdomain_info); i++) { - if (regdomain_info[i]->sku == sku) - return regdomain_info[i]; - } - return NULL; -} - -static const struct regdomain * -regdomain_lookupbyname(const char *name) -{ - int i; - - for (i = 0; i < N(regdomain_info); i++) { - if (strcasecmp(regdomain_info[i]->name, name) == 0) - return regdomain_info[i]; - } - return NULL; -} - -/* - * Country Code Table. - */ -static const struct countrycode country_info[] = { - { CTRY_ALBANIA, &rd_none, "AL", "Albania" }, - { CTRY_ALGERIA, &rd_none, "DZ", "Algeria" }, - { CTRY_ARGENTINA, &rd_none, "AR", "Argentina" }, - { CTRY_ARMENIA, &rd_etsi, "AM", "Armenia" }, - { CTRY_AUSTRALIA, &rd_row, "AU", "Australia" }, - { CTRY_AUSTRIA, &rd_etsi2, "AT", "Austria", }, - { CTRY_AZERBAIJAN, &rd_etsi, "AZ", "Azerbaijan" }, - { CTRY_BAHRAIN, &rd_none, "BH", "Bahrain" }, - { CTRY_BANGLADESH, &rd_row, "BD", "Bangladesh" }, - { CTRY_BELARUS, &rd_none, "BY", "Belarus" }, - { CTRY_BELGIUM, &rd_etsi, "BE", "Belgium" }, - { CTRY_BELIZE, &rd_none, "BZ", "Belize" }, - { CTRY_BOLIVIA, &rd_none, "BO", "Bolivia" }, - { CTRY_BRAZIL, &rd_fcc, "BR", "Brazil" }, - { CTRY_BRUNEI_DARUSSALAM, &rd_apac, "BN", "Brunei" }, - { CTRY_BULGARIA, &rd_etsi, "BG", "Bulgaria" }, - { CTRY_CANADA, &rd_fcc, "CA", "Canada" }, - { CTRY_CHILE, &rd_row, "CL", "Chile" }, - { CTRY_CHINA, &rd_row, "CN", "China" }, - { CTRY_COLOMBIA, &rd_fcc, "CO", "Colombia" }, - { CTRY_COSTA_RICA, &rd_none, "CR", "Costa Rica" }, - { CTRY_CROATIA, &rd_etsi, "HR", "Croatia" }, - { CTRY_CYPRUS, &rd_etsi, "CY", "Cyprus" }, - { CTRY_CZECH, &rd_etsi, "CZ", "Czech Republic" }, - { CTRY_DENMARK, &rd_etsi, "DK", "Denmark" }, - { CTRY_DOMINICAN_REPUBLIC, &rd_none, "DO", "Dominican Republic" }, - { CTRY_ECUADOR, &rd_none, "EC", "Ecuador" }, - { CTRY_EGYPT, &rd_none, "EG", "Egypt" }, - { CTRY_EL_SALVADOR, &rd_none, "SV", "El Salvador" }, - { CTRY_ESTONIA, &rd_etsi, "EE", "Estonia" }, - { CTRY_FINLAND, &rd_etsi, "FI", "Finland" }, - { CTRY_FRANCE, &rd_etsi, "FR", "France" }, - { CTRY_FRANCE2, &rd_etsi, "F2", "France2" }, - { CTRY_GEORGIA, &rd_etsi, "GE", "Georgia" }, - { CTRY_GERMANY, &rd_etsi, "DE", "Germany" }, - { CTRY_GREECE, &rd_etsi, "GR", "Greece" }, - { CTRY_GUATEMALA, &rd_none, "GT", "Guatemala" }, - { CTRY_HONDURAS, &rd_none, "HN", "Honduras" }, - { CTRY_HONG_KONG, &rd_apac, "HK", "Hong Kong" }, - { CTRY_HUNGARY, &rd_etsi, "HU", "Hungary" }, - { CTRY_ICELAND, &rd_etsi, "IS", "Iceland" }, - { CTRY_INDIA, &rd_apac, "IN", "India" }, - { CTRY_INDONESIA, &rd_none, "ID", "Indonesia" }, - { CTRY_IRAN, &rd_none, "IR", "Iran" }, - { CTRY_IRELAND, &rd_etsi, "IE", "Ireland" }, - { CTRY_ISRAEL, &rd_none, "IL", "Israel" }, - { CTRY_ITALY, &rd_etsi, "IT", "Italy" }, - { CTRY_JAMAICA, &rd_none, "JM", "Jamaica" }, - { CTRY_JAPAN, &rd_japan, "JP", "Japan" }, - { CTRY_JAPAN1, &rd_japan, "J1", "Japan1" }, - { CTRY_JAPAN2, &rd_japan, "J2", "Japan2" }, - { CTRY_JAPAN3, &rd_japan, "J3", "Japan3" }, - { CTRY_JAPAN4, &rd_japan, "J4", "Japan4" }, - { CTRY_JAPAN5, &rd_japan, "J5", "Japan5" }, - { CTRY_JORDAN, &rd_none, "JO", "Jordan" }, - { CTRY_KAZAKHSTAN, &rd_none, "KZ", "Kazakhstan" }, - { CTRY_KOREA_NORTH, &rd_korea, "KP", "North Korea" }, - { CTRY_KOREA_ROC, &rd_korea, "KR", "Korea Republic" }, - { CTRY_KOREA_ROC2, &rd_none, "K2", "Korea Republic2" }, - { CTRY_KUWAIT, &rd_none, "KW", "Kuwait" }, - { CTRY_LATVIA, &rd_etsi2, "LV", "Latvia" }, - { CTRY_LEBANON, &rd_none, "LB", "Lebanon" }, - { CTRY_LIECHTENSTEIN, &rd_etsi, "LI", "Liechtenstein" }, - { CTRY_LITHUANIA, &rd_etsi, "LT", "Lithuania" }, - { CTRY_LUXEMBOURG, &rd_etsi, "LU", "Luxemborg" }, - { CTRY_MACAU, &rd_none, "MO", "Macau" }, - { CTRY_MACEDONIA, &rd_none, "MK", "Macedonia" }, - { CTRY_MALAYSIA, &rd_apac3, "MY", "Malaysia" }, - { CTRY_MALTA, &rd_etsi, "MT", "Malta" }, - { CTRY_MEXICO, &rd_fcc, "MX", "Mexico" }, - { CTRY_MONACO, &rd_none, "MC", "Monaco" }, - { CTRY_MOROCCO, &rd_etsi, "MA", "Morocco" }, - { CTRY_NEPAL, &rd_row, "NP", "Nepal" }, - { CTRY_NETHERLANDS, &rd_etsi, "NL", "Netherlands" }, - { CTRY_NEW_ZEALAND, &rd_apac, "NZ", "New Zealand" }, - { CTRY_NORWAY, &rd_etsi, "NO", "Norway" }, - { CTRY_OMAN, &rd_none, "OM", "Oman" }, - { CTRY_PAKISTAN, &rd_row, "PK", "Pakistan" }, - { CTRY_PANAMA, &rd_none, "PA", "Panama" }, - { CTRY_PERU, &rd_none, "PE", "Peru" }, - { CTRY_PHILIPPINES, &rd_apac2, "PH", "Phillipines" }, - { CTRY_POLAND, &rd_etsi, "PL", "Poland" }, - { CTRY_PORTUGAL, &rd_etsi, "PT", "Portugal" }, - { CTRY_PUERTO_RICO, &rd_fcc, "PR", "Puerto Rico" }, - { CTRY_QATAR, &rd_none, "QA", "Quatar" }, - { CTRY_ROMANIA, &rd_etsi, "RO", "Romania" }, - { CTRY_RUSSIA, &rd_none, "RU", "Rusia" }, - { CTRY_SAUDI_ARABIA, &rd_none, "SA", "Saudi Arabia" }, - { CTRY_SINGAPORE, &rd_apac2, "SG", "Singapore" }, - { CTRY_SLOVAKIA, &rd_etsi2, "SK", "Slovak Republic" }, - { CTRY_SLOVENIA, &rd_etsi, "SI", "Slovenia" }, - { CTRY_SOUTH_AFRICA, &rd_none, "ZA", "South Africa" }, - { CTRY_SPAIN, &rd_etsi2, "ES", "Spain" }, - { CTRY_SRILANKA, &rd_apac2, "LK", "Sri Lanka" }, - { CTRY_SWEDEN, &rd_etsi, "SE", "Sweden" }, - { CTRY_SWITZERLAND, &rd_etsi, "CH", "Switzerland" }, - { CTRY_SYRIA, &rd_none, "SY", "Syria" }, - { CTRY_TAIWAN, &rd_row, "TW", "Taiwan" }, - { CTRY_THAILAND, &rd_none, "TH", "Thailand" }, - { CTRY_TRINIDAD_Y_TOBAGO, &rd_none, "TT", "Trinidiad & Tobago" }, - { CTRY_TUNISIA, &rd_none, "TN", "Tunisia" }, - { CTRY_TURKEY, &rd_etsi, "TR", "Turkey" }, - { CTRY_UKRAINE, &rd_none, "UA", "Ukraine" }, - { CTRY_UAE, &rd_none, "AE", "United Arab Emirates" }, - { CTRY_UNITED_KINGDOM, &rd_etsi, "GB", "United Kingdom" }, - { CTRY_UNITED_STATES, &rd_fcc, "US", "United States" }, - { CTRY_URUGUAY, &rd_none, "UY", "Uruguay" }, - { CTRY_UZBEKISTAN, &rd_none, "UZ", "Uzbekistan" }, - { CTRY_VENEZUELA, &rd_fcc, "VE", "Venezuela" }, - { CTRY_VIET_NAM, &rd_apac2, "VN", "Viet Nam" }, - { CTRY_YEMEN, &rd_none, "YE", "Yemen" }, - { CTRY_ZIMBABWE, &rd_none, "ZW", "Zimbabwe" } -}; - -static const struct countrycode * -countrycode_lookupbycc(enum ISOCountryCode cc) -{ - int i; - - for (i = 0; i < N(country_info); i++) { - if (country_info[i].code == cc) - return &country_info[i]; - } - return NULL; -} - -static const struct countrycode * -countrycode_lookupbyname(const char *name) -{ - int i, len; - - len = strlen(name); - for (i = 0; i < N(country_info); i++) { - if (strcasecmp(country_info[i].isoname, name) == 0 || - strncasecmp(country_info[i].name, name, len) == 0) - return &country_info[i]; - } - return NULL; -} - static void list_countries(void) { + struct regdata *rdp = getregdata(); + const struct country *cp; + const struct regdomain *dp; int i; + i = 0; printf("\nCountry codes:\n"); - for (i = 0; i < N(country_info); i++) - printf("%2s %-15.15s%s", country_info[i].isoname, - country_info[i].name, ((i+1)%4) == 0 ? "\n" : " "); + LIST_FOREACH(cp, &rdp->countries, next) { + printf("%2s %-15.15s%s", cp->isoname, + cp->name, ((i+1)%4) == 0 ? "\n" : " "); + i++; + } + i = 0; printf("\nRegulatory domains:\n"); - for (i = 0; i < N(regdomain_info); i++) { - printf("%-15s%s", regdomain_info[i]->name, - ((i+1)%5) == 0 ? "\n" : ""); + LIST_FOREACH(dp, &rdp->domains, next) { + printf("%-15.15s%s", dp->name, ((i+1)%4) == 0 ? "\n" : " "); + i++; } printf("\n"); } -#undef N static void defaultcountry(const struct regdomain *rd) { - const struct countrycode *cc; + struct regdata *rdp = getregdata(); + const struct country *cc; - cc = countrycode_lookupbycc(rd->cc); + cc = lib80211_country_findbycc(rdp, rd->cc->code); if (cc == NULL) errx(1, "internal error, ISO country code %d not " - "defined for regdomain %s", rd->cc, rd->name); + "defined for regdomain %s", rd->cc->code, rd->name); regdomain.country = cc->code; regdomain.isocc[0] = cc->isoname[0]; regdomain.isocc[1] = cc->isoname[1]; @@ -2493,17 +1924,18 @@ static DECL_CMD_FUNC(set80211regdomain, val, d) { + struct regdata *rdp = getregdata(); const struct regdomain *rd; - rd = regdomain_lookupbyname(val); + rd = lib80211_regdomain_findbyname(rdp, val); if (rd == NULL) { - rd = regdomain_lookupbyrd(atoi(val)); + rd = lib80211_regdomain_findbysku(rdp, atoi(val)); if (rd == NULL) errx(1, "unknown regdomain %s", val); } getregdomain(s); regdomain.regdomain = rd->sku; - if (regdomain.country == 0 && rd->cc != 0) { + if (regdomain.country == 0 && rd->cc != NULL) { /* * No country code setup and there's a default * one for this regdomain fill it in. @@ -2516,11 +1948,12 @@ static DECL_CMD_FUNC(set80211country, val, d) { - const struct countrycode *cc; + struct regdata *rdp = getregdata(); + const struct country *cc; - cc = countrycode_lookupbyname(val); + cc = lib80211_country_findbyname(rdp, val); if (cc == NULL) { - cc = countrycode_lookupbycc(atoi(val)); + cc = lib80211_country_findbycc(rdp, atoi(val)); if (cc == NULL) errx(1, "unknown ISO country code %s", val); } @@ -3874,15 +3307,15 @@ if ((reg->regdomain != 0 && reg->regdomain != reg->country) || verb) { const struct regdomain *rd = - regdomain_lookupbyrd(reg->regdomain); + lib80211_regdomain_findbysku(getregdata(), reg->regdomain); if (rd == NULL) LINE_CHECK("regdomain %d", reg->regdomain); else LINE_CHECK("regdomain %s", rd->name); } if (reg->country != 0 || verb) { - const struct countrycode *cc = - countrycode_lookupbycc(reg->country); + const struct country *cc = + lib80211_country_findbycc(getregdata(), reg->country); if (cc == NULL) LINE_CHECK("country %d", reg->country); else From owner-p4-projects@FreeBSD.ORG Tue Mar 25 21:20:01 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 05C161065673; Tue, 25 Mar 2008 21:20: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 B735B1065671 for ; Tue, 25 Mar 2008 21:20:00 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 990B78FC1B for ; Tue, 25 Mar 2008 21:20:00 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2PLK04w009405 for ; Tue, 25 Mar 2008 21:20:00 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2PLJxlh009403 for perforce@freebsd.org; Tue, 25 Mar 2008 21:19:59 GMT (envelope-from jb@freebsd.org) Date: Tue, 25 Mar 2008 21:19:59 GMT Message-Id: <200803252119.m2PLJxlh009403@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 138548 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Mar 2008 21:20:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=138548 Change 138548 by jb@jb_freebsd1 on 2008/03/25 21:19:37 IFC Affected files ... .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/audit/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/firewalls/chapter.sgml#10 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/introduction/chapter.sgml#9 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/linuxemu/chapter.sgml#6 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/ports/chapter.sgml#9 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#6 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/virtualization/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/x11/chapter.sgml#9 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/porters-handbook/book.sgml#6 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#66 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#15 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/jails/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#13 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#10 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#61 integrate .. //depot/projects/dtrace/doc/share/sgml/man-refs.ent#28 integrate .. //depot/projects/dtrace/ports/MOVED#73 integrate .. //depot/projects/dtrace/ports/Mk/bsd.gnome.mk#12 integrate .. //depot/projects/dtrace/ports/Mk/bsd.gstreamer.mk#10 integrate .. //depot/projects/dtrace/ports/UPDATING#59 integrate .. //depot/projects/dtrace/src/Makefile#19 integrate .. //depot/projects/dtrace/src/contrib/hostapd/ChangeLog#5 integrate .. //depot/projects/dtrace/src/contrib/hostapd/Makefile#5 integrate .. //depot/projects/dtrace/src/contrib/hostapd/README#5 integrate .. //depot/projects/dtrace/src/contrib/hostapd/aes_wrap.c#5 integrate .. //depot/projects/dtrace/src/contrib/hostapd/aes_wrap.h#5 integrate .. //depot/projects/dtrace/src/contrib/hostapd/common.c#5 integrate .. //depot/projects/dtrace/src/contrib/hostapd/common.h#5 integrate .. //depot/projects/dtrace/src/contrib/hostapd/defconfig#5 integrate .. //depot/projects/dtrace/src/contrib/hostapd/driver.h#5 integrate .. //depot/projects/dtrace/src/contrib/hostapd/driver_test.c#5 integrate .. //depot/projects/dtrace/src/contrib/hostapd/eap_aka.c#2 integrate .. //depot/projects/dtrace/src/contrib/hostapd/eap_gpsk.c#2 integrate .. //depot/projects/dtrace/src/contrib/hostapd/eap_gpsk_common.c#2 integrate .. //depot/projects/dtrace/src/contrib/hostapd/eap_gpsk_common.h#2 integrate .. //depot/projects/dtrace/src/contrib/hostapd/eap_sim.c#5 integrate .. //depot/projects/dtrace/src/contrib/hostapd/eap_sim_common.c#5 integrate .. //depot/projects/dtrace/src/contrib/hostapd/eap_sim_db.c#5 integrate .. //depot/projects/dtrace/src/contrib/hostapd/eap_tls_common.c#5 integrate .. //depot/projects/dtrace/src/contrib/hostapd/eapol_version.patch#2 delete .. //depot/projects/dtrace/src/contrib/hostapd/hostapd.c#5 integrate .. //depot/projects/dtrace/src/contrib/hostapd/hostapd.conf#5 integrate .. //depot/projects/dtrace/src/contrib/hostapd/ieee802_11.c#5 integrate .. //depot/projects/dtrace/src/contrib/hostapd/ieee802_11_auth.c#5 integrate .. //depot/projects/dtrace/src/contrib/hostapd/ieee802_1x.c#5 integrate .. //depot/projects/dtrace/src/contrib/hostapd/madwifi.conf#4 integrate .. //depot/projects/dtrace/src/contrib/hostapd/os.h#2 integrate .. //depot/projects/dtrace/src/contrib/hostapd/os_unix.c#2 integrate .. //depot/projects/dtrace/src/contrib/hostapd/radius.c#5 integrate .. //depot/projects/dtrace/src/contrib/hostapd/radius.h#5 integrate .. //depot/projects/dtrace/src/contrib/hostapd/radius_client.c#5 integrate .. //depot/projects/dtrace/src/contrib/hostapd/radius_server.c#5 integrate .. //depot/projects/dtrace/src/contrib/hostapd/tls_openssl.c#5 integrate .. //depot/projects/dtrace/src/contrib/hostapd/version.h#5 integrate .. //depot/projects/dtrace/src/contrib/hostapd/wpa.c#5 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/ChangeLog#5 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/FREEBSD-Xlist#5 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/FREEBSD-upgrade#5 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/Makefile#7 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/README#5 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/aes_wrap.c#5 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/aes_wrap.h#5 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/asn1.c#2 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/common.c#5 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/common.h#5 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/config.c#5 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/config_ssid.h#5 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/config_winreg.c#2 delete .. //depot/projects/dtrace/src/contrib/wpa_supplicant/ctrl_iface.c#5 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/ctrl_iface_dbus.c#2 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.c#2 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.h#2 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/ctrl_iface_named_pipe.c#2 delete .. //depot/projects/dtrace/src/contrib/wpa_supplicant/ctrl_iface_unix.c#2 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/dbus-wpa_supplicant.conf#2 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/dbus-wpa_supplicant.service#1 branch .. //depot/projects/dtrace/src/contrib/wpa_supplicant/defconfig#5 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/doc/ctrl_iface.doxygen#4 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/doc/docbook/wpa_background.8#4 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/doc/docbook/wpa_cli.8#4 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/doc/docbook/wpa_cli.sgml#4 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.8#4 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.8#4 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5#4 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.sgml#4 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/driver_hostap.h#4 delete .. //depot/projects/dtrace/src/contrib/wpa_supplicant/driver_ndis.c#5 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/eap_gpsk.c#2 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/eap_gpsk_common.c#2 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/eap_gpsk_common.h#2 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/eap_peap.c#5 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/eap_sim.c#5 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/eap_sim_common.c#5 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/eap_tlv.c#5 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/eap_tlv.h#5 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/eapol_sm.c#5 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/eapol_test.c#5 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/eloop_win.c#2 delete .. //depot/projects/dtrace/src/contrib/wpa_supplicant/events.c#4 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/main.c#5 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/os.h#2 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/os_unix.c#2 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/pcsc_funcs.c#5 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/radius.c#5 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/radius.h#5 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/radius_client.c#5 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/tests/test_aes.c#1 branch .. //depot/projects/dtrace/src/contrib/wpa_supplicant/tests/test_eap_sim_common.c#1 branch .. //depot/projects/dtrace/src/contrib/wpa_supplicant/tests/test_md4.c#1 branch .. //depot/projects/dtrace/src/contrib/wpa_supplicant/tests/test_md5.c#1 branch .. //depot/projects/dtrace/src/contrib/wpa_supplicant/tests/test_ms_funcs.c#1 branch .. //depot/projects/dtrace/src/contrib/wpa_supplicant/tests/test_sha1.c#1 branch .. //depot/projects/dtrace/src/contrib/wpa_supplicant/tests/test_sha256.c#1 branch .. //depot/projects/dtrace/src/contrib/wpa_supplicant/tests/test_x509v3.c#1 branch .. //depot/projects/dtrace/src/contrib/wpa_supplicant/tls_openssl.c#5 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/version.h#5 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/wpa.c#5 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/wpa_cli.c#5 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp#2 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.cpp#2 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h#4 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/wpa_gui/setup-mingw-cross-compiling#2 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h#4 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/wpa_supplicant.c#5 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/wpa_supplicant.conf#5 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/wpa_supplicant_i.h#5 integrate .. //depot/projects/dtrace/src/contrib/wpa_supplicant/x509v3.c#2 integrate .. //depot/projects/dtrace/src/etc/freebsd-update.conf#5 integrate .. //depot/projects/dtrace/src/etc/periodic/security/410.logincheck#3 integrate .. //depot/projects/dtrace/src/lib/libc/include/namespace.h#5 integrate .. //depot/projects/dtrace/src/lib/libc/include/un-namespace.h#5 integrate .. //depot/projects/dtrace/src/lib/libthr/Makefile#16 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_attr.c#8 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_exit.c#9 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_mutex.c#20 integrate .. //depot/projects/dtrace/src/share/man/man4/bpf.4#5 integrate .. //depot/projects/dtrace/src/share/man/man4/malo.4#1 branch .. //depot/projects/dtrace/src/share/man/man9/malloc.9#4 integrate .. //depot/projects/dtrace/src/share/man/man9/mbchain.9#4 integrate .. //depot/projects/dtrace/src/share/man/man9/mbuf.9#8 integrate .. //depot/projects/dtrace/src/share/zoneinfo/asia#10 integrate .. //depot/projects/dtrace/src/share/zoneinfo/backward#8 integrate .. //depot/projects/dtrace/src/share/zoneinfo/northamerica#9 integrate .. //depot/projects/dtrace/src/share/zoneinfo/southamerica#11 integrate .. //depot/projects/dtrace/src/share/zoneinfo/zone.tab#9 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/cpu_switch.S#6 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/genassym.c#9 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#36 integrate .. //depot/projects/dtrace/src/sys/amd64/conf/NOTES#16 integrate .. //depot/projects/dtrace/src/sys/amd64/ia32/ia32_signal.c#6 integrate .. //depot/projects/dtrace/src/sys/amd64/include/pcb.h#5 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_proto.h#22 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_syscall.h#22 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_syscalls.c#22 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_sysent.c#22 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/syscalls.master#22 integrate .. //depot/projects/dtrace/src/sys/compat/linux/linux_misc.c#22 integrate .. //depot/projects/dtrace/src/sys/conf/files#77 integrate .. //depot/projects/dtrace/src/sys/ddb/db_command.c#14 integrate .. //depot/projects/dtrace/src/sys/ddb/db_ps.c#14 integrate .. //depot/projects/dtrace/src/sys/ddb/ddb.h#8 integrate .. //depot/projects/dtrace/src/sys/dev/aac/aac.c#13 integrate .. //depot/projects/dtrace/src/sys/dev/aac/aac_cam.c#11 integrate .. //depot/projects/dtrace/src/sys/dev/aac/aac_debug.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/aac/aac_disk.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/aac/aac_pci.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/aac/aacvar.h#6 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/dc/if_dc.c#14 integrate .. //depot/projects/dtrace/src/sys/dev/dc/if_dcreg.h#8 integrate .. //depot/projects/dtrace/src/sys/dev/en/midway.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/fatm/if_fatm.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/firewire/if_fwe.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/firewire/if_fwip.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/gem/if_gem.c#12 integrate .. //depot/projects/dtrace/src/sys/dev/gem/if_gem_pci.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/gem/if_gemreg.h#7 integrate .. //depot/projects/dtrace/src/sys/dev/gem/if_gemvar.h#8 integrate .. //depot/projects/dtrace/src/sys/dev/iscsi/initiator/isc_soc.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/malo/if_malo.c#1 branch .. //depot/projects/dtrace/src/sys/dev/malo/if_malo.h#1 branch .. //depot/projects/dtrace/src/sys/dev/malo/if_malo_pci.c#1 branch .. //depot/projects/dtrace/src/sys/dev/malo/if_malohal.c#1 branch .. //depot/projects/dtrace/src/sys/dev/malo/if_malohal.h#1 branch .. //depot/projects/dtrace/src/sys/dev/malo/if_maloioctl.h#1 branch .. //depot/projects/dtrace/src/sys/i386/conf/NOTES#19 integrate .. //depot/projects/dtrace/src/sys/kern/init_sysent.c#27 integrate .. //depot/projects/dtrace/src/sys/kern/kern_cpuset.c#3 integrate .. //depot/projects/dtrace/src/sys/kern/makesyscalls.sh#12 integrate .. //depot/projects/dtrace/src/sys/kern/subr_mchain.c#4 integrate .. //depot/projects/dtrace/src/sys/kern/syscalls.c#26 integrate .. //depot/projects/dtrace/src/sys/kern/syscalls.master#21 integrate .. //depot/projects/dtrace/src/sys/kern/systrace_args.c#22 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_mbuf.c#12 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_socket.c#23 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_syscalls.c#27 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_subr.c#34 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_vnops.c#15 integrate .. //depot/projects/dtrace/src/sys/modules/malo/Makefile#1 branch .. //depot/projects/dtrace/src/sys/net/bpf.c#18 integrate .. //depot/projects/dtrace/src/sys/net/bpf.h#10 integrate .. //depot/projects/dtrace/src/sys/net/bpf_buffer.c#1 branch .. //depot/projects/dtrace/src/sys/net/bpf_buffer.h#1 branch .. //depot/projects/dtrace/src/sys/net/bpf_zerocopy.c#1 branch .. //depot/projects/dtrace/src/sys/net/bpf_zerocopy.h#1 branch .. //depot/projects/dtrace/src/sys/net/bpfdesc.h#5 integrate .. //depot/projects/dtrace/src/sys/net/if_ef.c#4 integrate .. //depot/projects/dtrace/src/sys/net/if_enc.c#12 integrate .. //depot/projects/dtrace/src/sys/net/if_fddisubr.c#6 integrate .. //depot/projects/dtrace/src/sys/net/if_iso88025subr.c#6 integrate .. //depot/projects/dtrace/src/sys/net/if_loop.c#9 integrate .. //depot/projects/dtrace/src/sys/net/if_sl.c#5 integrate .. //depot/projects/dtrace/src/sys/net/raw_cb.c#4 integrate .. //depot/projects/dtrace/src/sys/netatalk/aarp.c#9 integrate .. //depot/projects/dtrace/src/sys/netatm/port.h#4 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_pptpgre.c#5 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_pptpgre.h#4 integrate .. //depot/projects/dtrace/src/sys/netinet/in_pcb.c#19 integrate .. //depot/projects/dtrace/src/sys/netinet/in_pcb.h#8 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_output.c#15 integrate .. //depot/projects/dtrace/src/sys/netinet6/ip6_output.c#13 integrate .. //depot/projects/dtrace/src/sys/netipsec/key.c#8 integrate .. //depot/projects/dtrace/src/sys/netncp/ncp_sock.c#8 integrate .. //depot/projects/dtrace/src/sys/netsmb/smb_iod.c#7 integrate .. //depot/projects/dtrace/src/sys/netsmb/smb_rq.c#5 integrate .. //depot/projects/dtrace/src/sys/netsmb/smb_trantcp.c#8 integrate .. //depot/projects/dtrace/src/sys/nfs/nfs_common.c#4 integrate .. //depot/projects/dtrace/src/sys/nfsclient/krpc_subr.c#5 integrate .. //depot/projects/dtrace/src/sys/nfsclient/nfs_socket.c#17 integrate .. //depot/projects/dtrace/src/sys/nfsclient/nfs_subs.c#15 integrate .. //depot/projects/dtrace/src/sys/nfsserver/nfs_serv.c#12 integrate .. //depot/projects/dtrace/src/sys/nfsserver/nfs_srvcache.c#6 integrate .. //depot/projects/dtrace/src/sys/nfsserver/nfs_srvsock.c#9 integrate .. //depot/projects/dtrace/src/sys/nfsserver/nfs_srvsubs.c#12 integrate .. //depot/projects/dtrace/src/sys/nfsserver/nfs_syscalls.c#10 integrate .. //depot/projects/dtrace/src/sys/pc98/conf/NOTES#9 integrate .. //depot/projects/dtrace/src/sys/pci/if_mn.c#5 integrate .. //depot/projects/dtrace/src/sys/pci/if_xl.c#11 integrate .. //depot/projects/dtrace/src/sys/pci/if_xlreg.h#6 integrate .. //depot/projects/dtrace/src/sys/rpc/rpcclnt.c#5 integrate .. //depot/projects/dtrace/src/sys/sparc64/include/bus.h#5 integrate .. //depot/projects/dtrace/src/sys/sparc64/sparc64/bus_machdep.c#6 integrate .. //depot/projects/dtrace/src/sys/sys/cpuset.h#3 integrate .. //depot/projects/dtrace/src/sys/sys/mbuf.h#15 integrate .. //depot/projects/dtrace/src/sys/sys/param.h#44 integrate .. //depot/projects/dtrace/src/sys/sys/syscall.h#24 integrate .. //depot/projects/dtrace/src/sys/sys/syscall.mk#24 integrate .. //depot/projects/dtrace/src/sys/sys/sysproto.h#24 integrate .. //depot/projects/dtrace/src/sys/sys/vnode.h#14 integrate .. //depot/projects/dtrace/src/tools/build/mk/OptionalObsoleteFiles.inc#13 integrate .. //depot/projects/dtrace/src/usr.bin/make/for.c#4 integrate .. //depot/projects/dtrace/src/usr.bin/make/make.1#10 integrate .. //depot/projects/dtrace/src/usr.bin/netstat/bpf.c#8 integrate .. //depot/projects/dtrace/src/usr.sbin/arp/arp.8#6 integrate .. //depot/projects/dtrace/src/usr.sbin/freebsd-update/freebsd-update.sh#10 integrate .. //depot/projects/dtrace/src/usr.sbin/wpa/wpa_supplicant/Makefile#9 integrate .. //depot/projects/dtrace/src/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8#6 integrate .. //depot/projects/dtrace/www/de/about.sgml#8 integrate .. //depot/projects/dtrace/www/de/developers.sgml#9 integrate .. //depot/projects/dtrace/www/de/docs/books.sgml#12 integrate .. //depot/projects/dtrace/www/de/docs/webresources.sgml#6 integrate .. //depot/projects/dtrace/www/de/features.sgml#7 integrate .. //depot/projects/dtrace/www/de/share/sgml/news.xml#19 integrate .. //depot/projects/dtrace/www/de/share/sgml/press.xml#17 integrate .. //depot/projects/dtrace/www/de/where.sgml#13 integrate .. //depot/projects/dtrace/www/en/docs/webresources.sgml#5 integrate .. //depot/projects/dtrace/www/en/gnome/docs/Makefile#8 integrate .. //depot/projects/dtrace/www/en/gnome/docs/faq222.sgml#1 branch .. //depot/projects/dtrace/www/en/gnome/docs/gnome2_porting.sgml#8 integrate .. //depot/projects/dtrace/www/en/gnome/docs/gnome_porting.sgml#8 integrate .. //depot/projects/dtrace/www/en/gnome/images/Makefile#9 integrate .. //depot/projects/dtrace/www/en/gnome/images/ss220-1-tn.png#2 delete .. //depot/projects/dtrace/www/en/gnome/images/ss220-1.png#2 delete .. //depot/projects/dtrace/www/en/gnome/images/ss220-2-tn.png#2 delete .. //depot/projects/dtrace/www/en/gnome/images/ss220-2.png#2 delete .. //depot/projects/dtrace/www/en/gnome/images/ss222-1-tn.png#1 branch .. //depot/projects/dtrace/www/en/gnome/images/ss222-1.png#1 branch .. //depot/projects/dtrace/www/en/gnome/index.xsl#10 integrate .. //depot/projects/dtrace/www/en/gnome/news.xml#19 integrate .. //depot/projects/dtrace/www/en/gnome/screenshots.sgml#10 integrate .. //depot/projects/dtrace/www/en/projects/ideas/ideas.xml#14 integrate .. //depot/projects/dtrace/www/share/sgml/navibar.ent#9 integrate .. //depot/projects/dtrace/www/share/sgml/release.ent#21 integrate Differences ... ==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/audit/chapter.sgml#3 (text+ko) ==== @@ -2,30 +2,846 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/audit/chapter.sgml,v 1.2 2006/02/18 14:54:26 jkois Exp $ - $FreeBSDde: de-docproj/books/handbook/audit/chapter.sgml,v 1.2 2006/02/15 09:51:27 brueffer Exp $ - basiert auf: + $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/audit/chapter.sgml,v 1.3 2008/03/25 19:04:25 jkois Exp $ + $FreeBSDde: de-docproj/books/handbook/audit/chapter.sgml,v 1.11 2008/03/02 09:51:39 jkois Exp $ + basiert auf: 1.33 --> + + + + + + Tom + Rhodes + Geschrieben von + + + Robert + Watson + + + + + Daniel + Seuffert + Übersetzt von + + + + + Security Event Auditing + + + Einleitung + + AUDIT + + Security Event Auditing + MAC + + + FreeBSD 6.2 und neuer unterstützen + ein feingranuliertes Sicherheits-Auditing. + Ereignis-Auditing erlaubt die + zuverlässige, feingranulierte und konfigurierbare + Aufzeichnung einer Vielzahl von sicherheitsrelevanten + Systemereignissen einschliesslich Benutzereingaben, + Konfigurationsänderungen sowie Datei- und + Netzwerkzugriffen. Diese Log-Datensätze können + unschätzbar wertvoll sein für direkte + Systemüberwachung, Einbruchserkennung und + Post-Mortem-Analyse. &os; implementiert &sun;s öffentlich + zugängliche BSM API und Dateiformat. Die + &os;-Implementierung kann mit den Audit-Implementierungen von + &sun; &solaris; und &apple; &macos; X zusammenarbeiten. + + Dieses Kapitel konzentriert sich auf die Installation + und Konfiguration des Ereignis-Auditings. Es erklärt + Audit-Richtlinien und stellt ein Beispiel einer + Audit-Konfiguration vor. + + Nach dem Lesen dieses Kapitels werden Sie + Folgendes wissen: + + + + Was Ereignis-Auditing ist und wie es arbeitet. + + + + Wie man Ereignis-Auditing in &os; für Benutzer + und Prozesse konfiguriert. + + + + Wie man den Audit-Pfad mittels Audit-Reduktion und + Revisionswerkzeugen überprüft. + + + + Vor dem Lesen dieses Kapitels sollten Sie: + + + + Sowohl &unix; als auch &os;-Basismechanismen + beherrschen (). + + + + Mit den grundlegenden Mechanismen der + Kernel-Konfiguration und -Kompilierung vertraut sein (). + + + + Mit den Maßnahmen zur Sicherung von &os; + vertraut sein (). + + + + + Die Audit-Funktionalität in + &os; 6.X ist nach wie vor + experimentell. Ihre Anwendung auf Produktivsystemen sollte + nur nach sorgfältiger Abwägung der Risiken des + Einsatzes experimenteller Software erfolgen. Zu den bekannten + Einschränkungen gehört, dass zur Zeit nicht alle + sicherheitsrelevanten System-Ereignisse auditierbar sind und + dass einige Anmelde-Mechanismen, wie z.B. X11-basierte + Bildschirm-Manager und Daemonen von Drittanbietern, das + Auditing für Benutzeranmeldungen nicht korrekt + konfigurieren. + + + + Das Sicherheits-Auditing ist in der Lage, sehr + detaillierte Log-Dateien von Systemaktivitäten zu + erzeugen. Auf einem ausgelasteten System kann die Pfad-Datei + sehr groß werden, wenn sie für hohe Auflösung + konfiguriert ist, und im Extremfall pro Woche um mehrere + Gigabyte anwachsen. Administratoren sollten daher den + benötigten Plattenplatz in Verbindung mit umfangreichen + Audit-Konfigurationen berücksichtigen. So kann es + wünschenswert sein, ein eigenes + Dateisystem für /var/audit + einzusetzen, damit andere Dateisysteme nicht betoffen sind, + wenn das Dateisystem des Audit voll läuft. + + + + + Schlüsselbegriffe + + Vor dem Lesen dieses Kapitels müssen einige + Audit-bezogene Schlüsselbegriffe erläutert + werden: + + + + event: Ein auditierbares Ereignis + ist ein Ereignis, das mit dem Audit-Subsystem + aufgezeichnet werden kann. Beispiele für + sicherheitsrelevante Systemereignisse sind etwa das Anlegen + von Dateien, das Erstellen einer Netzwerkverbindung oder + eine Benutzeranmeldung. Ereignisse sind entweder + attributierbar, können also zu einen + authentifizierten Benutzer zurückverfolgt werden, oder + sind nicht-attributierbar, falls dies nicht + möglich ist. Nicht-attributierbare Ereignisse erfolgen + daher vor der Authentifizierung im Anmeldeprozess + (beispielsweise die Eingabe eines falschen Passworts). + + + + class: Ereignisklassen sind + benannte Zusammenstellungen von zusammengehörenden + Ereignissen und werden in Auswahl-Ausdrücken benutzt. + Häufig genutzte Klassen von Ereignissen schließen + file creation (fc, Anlegen von Dateien), + exec (ex, Ausführung) und + login_logout (lo, Anmeldung-Abmeldung) + ein. + + + + record: Ein Datensatz ist ein + Audit-Logeintrag, welcher ein Sicherheitsereignis + enthält. Jeder Datensatz enthält einen + Ereignistyp, Informationen über den Gegenstand + (Benutzer), welcher die Aktion durchführt, Datums- und + Zeitinformationen, Informationen über jedes Objekt oder + Argument sowie den Zustand hinsichtlich Erfolg oder + Scheitern der Operation. + + + + trail: Ein Audit-Pfad (audit + trail) oder eine Log-Datei besteht aus einer Reihe von + Audit-Datensätzen, die Sicherheitsereignisse + beschreiben. Normalerweise sind die Pfade in grober + zeitlicher Reihenfolge bezüglich des Zeitpunktes, + an welchem ein Ereignis beendet wurde. Nur authorisierte + Prozesse dürfen Datensätze zum Audit-Pfad + hinzufügen. + + + + selection expression: Ein + Auswahlausdruck ist eine Zeichenkette, welche eine Liste von + Präfixen und Audit-Ereignisklassennamen enthält, + um Ereignisse abzugleichen. + + + + preselection: Die Vorauswahl ist + der Prozess, durch den das System erkennt, welche Ereignisse + von Interesse für den Administrator sind, um die + Erzeugung von Datensätze zu verhindern, welche nicht + von Belang sind. Die Konfiguration der Vorauswahl benutzt + eine Reihe von Auswahl-Ausdrücken, um zu erkennen, + welche Klassen von Ereignissen für welche Benutzer + aufgezeichnet werden sollen sowie globale Einstellungen, + welche sowohl auf authorisierte + als auch unauthorisierte Prozesse angewendet werden. + + + + reduction: Die Reduzierung ist + der Prozess, durch den Datensätze von bestehenden + Audit-Pfaden ausgewählt werden für Speicherung, + Ausdruck oder Analyse. Ebenso der Prozess, durch den + unerwünschte Datensätze aus dem Audit-Pfad + entfernt werden. Mittels Reduzierung können + Administratoren Richtlinien für die Speicherung von + Audit-Daten vorgeben. Zum Beispiel können + ausführliche Audit-Pfade für einen Monat + gespeichert werden, um danach den Pfad für + archivarische Zwecke auf die Anmeldeinformationen + zu reduzieren. + + + + + + Installation der Audit-Unterstützung + + Die Unterstützung des Ereignis-Auditings für den + Benutzerbereich wird bereits als Teil des Basissystems installiert. + Ab &os; 7.0 ist die Audit-Unterstützung bereits im + Standardkernel enthalten. Verwenden Sie hingegen noch + &os; 6.X, müssen Sie + folgende Zeile in Ihre Kernelkonfigurationsdatei aufnehmen und + den Kernel neu bauen: + + options AUDIT + + Bauen und installieren Sie den Kernel wie in + beschrieben ist. + + Nachdem der Kernel mit Audit-Unterstützung + gebaut und installiert ist und das System neu gestartet wurde, + aktivieren Sie den Audit-Daemon + durch das Einfügen der folgenden Zeile in die Datei + &man.rc.conf.5;: + + auditd_enable="YES" + + Die Audit-Unterstützung kann nun durch einen + Neustart des Systems oder durch das manuelle Starten + des Audit-Daemon aktiviert werden: + + /etc/rc.d/auditd start + + + + Die Konfiguration des Audit + + Alle Konfigurationsdateien für das Sicherheits-Audit + finden sich unter + /etc/security. + Die folgenden Dateien müssen vorhanden sein, bevor + der Audit-Daemon gestartet wird: + + + + audit_class – Enthält + die Definitionen der Audit-Klassen. + + + + audit_control – Steuert + Teile des Audit-Subsystems wie Audit-Klassen, minimaler + Plattenplatz auf dem Audit-Log-Datenträger, maximale + Größe des Audit-Pfades usw. + + + + audit_event – Wörtliche + Namen und Beschreibungen von System-Audit-Ereignissen sowie + eine Liste, welche Klassen welches Ereignis + aufzeichnen. + + + + audit_user – Benutzerspezifische + Audit-Erfordernisse, welche mit den globalen Vorgaben bei + der Anmeldung kombiniert werden. + + + + audit_warn – Ein + anpassbares Shell-Skript, welches von + auditd benutzt wird, um + Warnhinweise in aussergewöhnlichen Situationen zu + erzeugen, z.B. wenn der Platz für die + Audit-Datensätze knapp wird oder wenn die Datei des + Audit-Pfades rotiert wurde. + + + + + Audit-Konfigurationsdateien sollten vorsichtig gewartet und + bearbeitet werden, da Fehler in der Konfiguration zu falscher + Aufzeichnung von Ereignissen führen könnten. + + + + Ereignis-Auswahlausdrücke + + Auswahlausdrücke werden an einigen Stellen + der Audit-Konfiguration benützt, um zu bestimmen, + welche Ereignisse auditiert werden sollen. Die Ausdrücke + enthalten eine Liste der Ereignisklassen, welche verglichen + werden sollen, jede mit einem Präfix, welches anzeigt, + ob verglichene Datensätze akzeptiert oder ignoriert + werden sollen und optional, um anzuzeigen, ob der Eintrag + beabsichtigt, erfolgreiche oder fehlgeschlagene Operationen + zu vergleichen. Auswahlausdrücke werden von links nach + rechts ausgewertet und zwei Ausdrücke werden durch + Aneinanderhängen miteinander kombiniert. + + Die folgende Liste enthält die + Standard-Ereignisklassen für das Audit und ist in + audit_class festgehalten: + + + + all – all – Vergleiche + alle Ereignisklassen. + + + + ad – administrative – Administrative + Aktionen ausgeführt auf dem System als Ganzes. + + + + ap – application – Aktionen + definiert für Applikationen. + + + + cl – file + close – Audit-Aufrufe für + den Systemaufruf close. + + + + ex – exec – Ausführung + des Audit-Programms. Auditierung von + Befehlszeilen-Argumenten und Umgebungsvariablen wird + gesteuert durch &man.audit.control.5; mittels der + argv und + envv-Parametergemäss der + Richtlinien-Einstellungen. + + + + fa – file + attribute access – Auditierung + des Zugriffs auf Objektattribute wie &man.stat.1;, + &man.pathconf.2; und ähnlichen Ereignissen. + + + + fc – file + create – Audit-Ereignisse, + bei denen eine Datei als Ergebnis angelegt wird. + + + + fd – file + delete – Audit-Ereignisse, + bei denen Dateilöschungen vorkommen. + + + + fm – file + attribute modify – Audit-Ereignisse, + bei welchen Dateiattribute geändert werden, wie + &man.chown.8;, &man.chflags.1;, &man.flock.2; etc. + + + + fr – file + read – Audit-Ereignisse, bei + denen Daten gelesen oder Dateien zum lesen geöffnet + werden usw. + + + + fw – file write – Audit-Ereignisse, + bei welchen Daten geschrieben oder Dateien geschrieben + oder verändert werden usw. + + + + io – ioctl – Nutzung + des Systemaufrufes &man.ioctl.2; durch Audit. + + + + ip – ipc – Auditierung + verschiedener Formen von Inter-Prozess-Kommunikation + einschliesslich POSIX-Pipes und System V + IPC-Operationen. + + + + lo – login_logout – Audit-Ereignisse + betreffend &man.login.1; und &man.logout.1;, welche auf + dem System auftreten. + + + + na – non + attributable – Auditierung + nicht-attributierbarer Ereignisse (Ereignisse, die nicht auf + einen bestimmten Benutzer zurückgeführt werden + können). + + + + no – invalid + class – Kein Abgleich von + Audit-Ereignissen. + + + + nt – network – Audit-Ereignisse + in Zusammenhang mit Netzwerkaktivitäten wie + z.B. &man.connect.2; und &man.accept.2;. + + + + ot – other – Auditierung + verschiedener Ereignisse. + + + + pc – process – Auditierung + von Prozess-Operationen wie &man.exec.3; und + &man.exit.3;. + + + + Diese Ereignisklassen können angepasst werden durch + Modifizierung der Konfigurationsdateien + audit_class und + audit_event. + + Jede Audit-Klasse in dieser Liste ist kombiniert mit + einem Präfix, welches anzeigt, ob + erfolgreiche/gescheiterte Operationen abgebildet werden, und + ob der Eintrag den Abgleich hinzufügt oder entfernt + für die Klasse und den Typ. + + + + (none) Kein Präfix, sowohl erfolgreiche als + auch gescheiterte Vorkommen eines Ereignisses werden + auditiert. + + + + + Auditiere nur erfolgreiche + Ereignisse in dieser Klasse. + + + + - Auditiere nur gescheiterte + Operationen in dieser Klasse. + + + + ^ Auditiere weder erfolgreiche + noch gescheiterte Ereignisse in dieser Klasse. + + + + ^+ Auditiere keine erfolgreichen + Ereignisse in dieser Klasse. + + + + ^- Auditiere keine gescheiterten + Ereignisse in dieser Klasse. + + + + Das folgende Beispiel einer Auswahl-Zeichenkette + wählt erfolgreiche und gescheiterte + Anmelde/Abmelde-Ereignisse aus, aber nur erfolgreich beendete + Ausführungs-Ereignisse: + + lo,+ex + + + + Konfigurationsdateien + + In den meisten Fällen müssen Administratoren + nur zwei Dateien ändern, wenn sie das Audit-System + konfigurieren: audit_control und + audit_user. Die erste Datei steuert + systemweite Audit-Eigenschaften und -Richtlinien; die zweite + Datei kann für die Feinanpassung der Auditierung von + Benutzern verwendet werden. + + + Die <filename>audit_control</filename>-Datei + + Die audit_control-Datei legt eine + Anzahl Vorgabewerte fest. Beim Betrachten des Inhaltes der + Datei sehen wir Folgendes: + + dir:/var/audit +flags:lo +minfree:20 +naflags:lo +policy:cnt +filesz:0 + + Die Option wird genutzt, um eines + oder mehrere Verzeichnisse festzulegen, in welchen + Audit-Protokolle gespeichert werden. Gibt es mehrere + Verzeichniseinträge, werden diese in der + angegebenen Reihenfolge genutzt, bis sie jeweils + gefüllt sind. Es ist üblich, Audit so zu + konfigurieren, dass die Audit-Logs auf einem dedizierten + Dateisystem abgelegt werden, um Wechselwirkungen zwischen + dem Audit-Subsystem und anderen Subsystemen zu verhindern, + falls das Dateisystem voll läuft. - Security Event Auditing (noch nicht übersetzt) + Das -Feld legt die systemweite + Standard-Vorauswahl-Maske für attributierbare (direkt + einem Benutzer zuordenbare) Ereignisse fest. Im + obigen Beispiel werden alle gescheiterten und erfolgreichen + Anmelde- und Abmelde-Ereignisse für alle Benutzer + aufgezeichnet. + + Die Option definiert den + minimalen Prozentsatz an freiem Plattenplatz für das + Dateisystem, in welchem der Audit-Pfad abgespeichert wird. + Wenn diese Schwelle überschritten ist, wird ein + Warnhinweis erzeugt. Das obige Beispiel legt den minimalen + freien Platz auf zwanzig Prozent fest. + + Die -Option bestimmt diejenigen + Audit-Klassen, für die nicht-attributierbare Ereignisse + aufgezeichnet werden sollen (beispielsweise Anmeldeprozesse + und System-Daemonen. + + Die Option legt eine durch Kommata + getrennte Liste von policy-Flags fest, welche verschiedene + Aspekte des Audit-Verhaltens steuern. Der vorgegebene Flag + cnt zeigt an, dass das System trotz eines + Audit-Fehlers weiterlaufen soll (dieses Flag wird dringend + angeraten). Ein anderes, häufig genutztes Flag ist + argv, welches dazu führt, dass + Befehlszeilen-Argumente für den Systemauruf + &man.execve.2; als Teil der Befehlsausführung + aufgezeichnet werden. + + Die -Option spezifiziert die + maximale Größe in Bytes, welche eine + Audit-Pfad-Datei wachsen darf, bevor sie automatisch beendet + und rotiert wird. Die Standardvorgabe 0 + setzt die automatische Log-Rotation ausser Kraft. Falls die + angeforderte Dateigröße größer Null + und gleichzeitig unterhalb des Minimums von 512K ist, dann + wird die Angabe verworfen und ein Log-Hinweis wird + erzeugt. + + + + Die Datei <filename>audit_user</filename> + + Die audit_user-Datei erlaubt es dem + Administrator, weitere Audit-Erfordernisse für bestimmte + Benutzer festzulegen. Jede Zeile konfiguriert das Auditing + für einen Benutzer über zwei Felder: Das erste Feld + ist alwaysaudit, welches eine Ansammlung + von Ereignissen vorgibt, welche immer für diesen Benutzer + aufgezeichnet werden. Das zweite Feld + neveraudit legt eine Menge an Ereignissen + fest, die niemals für diesen Benutzer auditiert werden + sollen. + + Das folgende Beispiel einer + audit_user-Datei zeichnet + Anmelde/Abmelde-Ereignisse, erfolgreiche + Befehlsausführungen für den Benutzer + root, Anlegen von Dateien und + erfolgreiche Befehlsausführungen für den Benutzer + www auf. Falls das Beispiel zusammen + mit der vorstehend als Beispiel gezeigten Datei + audit_control benutzt wird, dann ist + der Eintrag lo für Benutzer + root überflüssig und + Anmelde/Abmelde-Ereignisse werden für den Benutzer + www ebenfalls aufgezeichnet. + + root:lo,+ex:no +www:fc,+ex:no + + + + + + Administration des Audit-Subsystems + + + Audit-Pfade betrachten + + Audit-Pfade werden im binären BSM-Format + gespeichert, daher benötigen Sie spezielle Werkzeuge, um + derartige Dateien zu ändern oder Sie in Textdateien zu + konvertieren. Der + Befehl &man.praudit.1; wandelt alle Pfad-Dateien in ein + einfaches Textformat um. Der Befehl &man.auditreduce.1; kann + genutzt werden, um die Pfad-Dateien für Analyse, + Ausdruck, Archivierung oder andere Zwecke zu reduzieren. + auditreduce unterstützt eine Reihe von + Auswahl-Parametern einschliesslich Ereignistyp, + Ereignisklasse, Benutzer, Datum oder Uhrzeit des Ereignisses und + den Dateipfad oder das Objekt, mit dem gearbeitet + wurde. + + Das Dienstprogramm praudit schreibt + zum Beispiel den gesamten Inhalt einer angegebenen + Audit-Protokolldatei in eine simple Textdatei: + + &prompt.root; praudit /var/audit/AUDITFILE + + AUDITFILE + ist hier die zu schreibende Protokolldatei. + + Audit-Pfade bestehen aus einer Reihe von Datensätzen, + die wiederum aus Kürzeln (token) gebildet werden, die von + praudit fortlaufend zeilenweise ausgegeben + werden. Jedes Kürzel ist von einem bestimmten Typ, z.B. + enthält header einen + audit-Datensatz-Header oder path + enthält einen Dateipfad von einer Suche. Hier ein + Beispiel eines execve-Ereignisses: + + header,133,10,execve(2),0,Mon Sep 25 15:58:03 2006, + 384 msec +exec arg,finger,doug +path,/usr/bin/finger +attribute,555,root,wheel,90,24918,104944 +subject,robert,root,wheel,root,wheel,38439,38032,42086,128.232.9.100 +return,success,0 +trailer,133 + + Dieser Audit stellt einen erfolgreichen + execve-Aufruf dar, in welchem der Befehl + finger doug ausgeführt wurde. Das + Kürzel des Argumentes enthält die Befehlszeile, + welche die Shell an den Kernel weiterleitet. Das Kürzel + path enthält den Pfad zur + ausführbaren Datei (wie vom Kernel wahrgenommen). Das + Kürzel attribute beschreibt die + Binärdatei (insbesondere den Datei-Modus, der genutzt + werden kann, um zu bestimmen, ob setuid auf die Applikation + angewendet wurde). Das Kürzel subject + beschreibt den untergeordneten Prozess und speichert daher in + Aufeinanderfolge Audit-Benutzer-ID, effektive Benutzer-ID und + Gruppen-ID, wirkliche Benutzer-ID und Grppen-ID, Process-ID, + Session- ID, Port-ID und Anmelde-Adresse. Beachten Sie, dass + Audit-Benutzer-ID und wirkliche Benutzer-ID abweichen: Der Benutzer + robert wurde zum Benutzer + root, bevor er diesen Befehl + ausführte, aber er wird auditiert mit dem + ursprünglich authentifizierten Benutzer. Schließlich zeigt + das Kürzel return die erfolgreiche + Ausführung an und trailer schließt + den Datensatz ab. + + Seit &os; 6.3 unterstützt praudit auch + die Ausgabe im XML-Format (die sie über die Option + wählen. + + + + Audit-Pfade reduzieren + + Da Audit-Protokolldateien sehr groß sein können, + wird ein Administrator höchstwahrscheinlich eine Auswahl + an Datensätzen verwenden, wie z.B. alle Datensätze + zu einem bestimmten Benutzer: + + &prompt.root; auditreduce -u trhodes /var/audit/AUDITFILE | praudit >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Mar 25 21:23:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A12161065671; Tue, 25 Mar 2008 21:23: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 5F323106567A for ; Tue, 25 Mar 2008 21:23:04 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 42AA48FC1C for ; Tue, 25 Mar 2008 21:23:04 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2PLN4IS009654 for ; Tue, 25 Mar 2008 21:23:04 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2PLN3Kh009652 for perforce@freebsd.org; Tue, 25 Mar 2008 21:23:03 GMT (envelope-from jb@freebsd.org) Date: Tue, 25 Mar 2008 21:23:03 GMT Message-Id: <200803252123.m2PLN3Kh009652@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 138550 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Mar 2008 21:23:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=138550 Change 138550 by jb@jb_freebsd1 on 2008/03/25 21:22:22 Regen after IFC. Affected files ... .. //depot/projects/dtrace/src/sys/kern/init_sysent.c#28 edit .. //depot/projects/dtrace/src/sys/kern/syscalls.c#27 edit .. //depot/projects/dtrace/src/sys/kern/systrace_args.c#23 edit .. //depot/projects/dtrace/src/sys/sys/syscall.h#25 edit .. //depot/projects/dtrace/src/sys/sys/syscall.mk#25 edit .. //depot/projects/dtrace/src/sys/sys/sysproto.h#25 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/init_sysent.c#28 (text+ko) ==== @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.239 2008/03/12 10:11:59 jeff Exp + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.240 2008/03/25 09:11:53 ru Exp */ #include "opt_compat.h" ==== //depot/projects/dtrace/src/sys/kern/syscalls.c#27 (text+ko) ==== @@ -2,7 +2,7 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/syscalls.c,v 1.220 2008/03/25 09:14:17 ru Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.240 2008/03/25 09:11:53 ru Exp */ ==== //depot/projects/dtrace/src/sys/kern/systrace_args.c#23 (text+ko) ==== @@ -2,7 +2,7 @@ * System call argument to DTrace register array converstion. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/systrace_args.c,v 1.20 2008/03/25 09:14:17 ru Exp $ + * $FreeBSD$ * This file is part of the DTrace syscall provider. */ @@ -2896,3 +2896,4751 @@ break; }; } +static void +systrace_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) +{ + const char *p = NULL; + switch (sysnum) { + /* nosys */ + case 0: + break; + /* sys_exit */ + case 1: + switch(ndx) { + case 0: + p = "int"; + break; + default: + break; + }; + break; + /* fork */ + case 2: + break; + /* read */ + case 3: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "void *"; + break; + case 2: + p = "size_t"; + break; + default: + break; + }; + break; + /* write */ + case 4: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "const void *"; + break; + case 2: + p = "size_t"; + break; + default: + break; + }; + break; + /* open */ + case 5: + switch(ndx) { + case 0: + p = "char *"; + break; + case 1: + p = "int"; + break; + case 2: + p = "int"; + break; + default: + break; + }; + break; + /* close */ + case 6: + switch(ndx) { + case 0: + p = "int"; + break; + default: + break; + }; + break; + /* wait4 */ + case 7: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "int *"; + break; + case 2: + p = "int"; + break; + case 3: + p = "struct rusage *"; + break; + default: + break; + }; + break; + /* link */ + case 9: + switch(ndx) { + case 0: + p = "char *"; + break; + case 1: + p = "char *"; + break; + default: + break; + }; + break; + /* unlink */ + case 10: + switch(ndx) { + case 0: + p = "char *"; + break; + default: + break; + }; + break; + /* chdir */ + case 12: + switch(ndx) { + case 0: + p = "char *"; + break; + default: + break; + }; + break; + /* fchdir */ + case 13: + switch(ndx) { + case 0: + p = "int"; + break; + default: + break; + }; + break; + /* mknod */ + case 14: + switch(ndx) { + case 0: + p = "char *"; + break; + case 1: + p = "int"; + break; + case 2: + p = "int"; + break; + default: + break; + }; + break; + /* chmod */ + case 15: + switch(ndx) { + case 0: + p = "char *"; + break; + case 1: + p = "int"; + break; + default: + break; + }; + break; + /* chown */ + case 16: + switch(ndx) { + case 0: + p = "char *"; + break; + case 1: + p = "int"; + break; + case 2: + p = "int"; + break; + default: + break; + }; + break; + /* obreak */ + case 17: + switch(ndx) { + case 0: + p = "char *"; + break; + default: + break; + }; + break; + /* getpid */ + case 20: + break; + /* mount */ + case 21: + switch(ndx) { + case 0: + p = "char *"; + break; + case 1: + p = "char *"; + break; + case 2: + p = "int"; + break; + case 3: + p = "caddr_t"; + break; + default: + break; + }; + break; + /* unmount */ + case 22: + switch(ndx) { + case 0: + p = "char *"; + break; + case 1: + p = "int"; + break; + default: + break; + }; + break; + /* setuid */ + case 23: + switch(ndx) { + case 0: + p = "uid_t"; + break; + default: + break; + }; + break; + /* getuid */ + case 24: + break; + /* geteuid */ + case 25: + break; + /* ptrace */ + case 26: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "pid_t"; + break; + case 2: + p = "caddr_t"; + break; + case 3: + p = "int"; + break; + default: + break; + }; + break; + /* recvmsg */ + case 27: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "struct msghdr *"; + break; + case 2: + p = "int"; + break; + default: + break; + }; + break; + /* sendmsg */ + case 28: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "struct msghdr *"; + break; + case 2: + p = "int"; + break; + default: + break; + }; + break; + /* recvfrom */ + case 29: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "caddr_t"; + break; + case 2: + p = "size_t"; + break; + case 3: + p = "int"; + break; + case 4: + p = "struct sockaddr *__restrict"; + break; + case 5: + p = "__socklen_t *__restrict"; + break; + default: + break; + }; + break; + /* accept */ + case 30: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "struct sockaddr *__restrict"; + break; + case 2: + p = "__socklen_t *__restrict"; + break; + default: + break; + }; + break; + /* getpeername */ + case 31: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "struct sockaddr *__restrict"; + break; + case 2: + p = "__socklen_t *__restrict"; + break; + default: + break; + }; + break; + /* getsockname */ + case 32: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "struct sockaddr *__restrict"; + break; + case 2: + p = "__socklen_t *__restrict"; + break; + default: + break; + }; + break; + /* access */ + case 33: + switch(ndx) { + case 0: + p = "char *"; + break; + case 1: + p = "int"; + break; + default: + break; + }; + break; + /* chflags */ + case 34: + switch(ndx) { + case 0: + p = "char *"; + break; + case 1: + p = "int"; + break; + default: + break; + }; + break; + /* fchflags */ + case 35: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "int"; + break; + default: + break; + }; + break; + /* sync */ + case 36: + break; + /* kill */ + case 37: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "int"; + break; + default: + break; + }; + break; + /* getppid */ + case 39: + break; + /* dup */ + case 41: + switch(ndx) { + case 0: + p = "u_int"; + break; + default: + break; + }; + break; + /* pipe */ + case 42: + break; + /* getegid */ + case 43: + break; + /* profil */ + case 44: + switch(ndx) { + case 0: + p = "caddr_t"; + break; + case 1: + p = "size_t"; + break; + case 2: + p = "size_t"; + break; + case 3: + p = "u_int"; + break; + default: + break; + }; + break; + /* ktrace */ + case 45: + switch(ndx) { + case 0: + p = "const char *"; + break; + case 1: + p = "int"; + break; + case 2: + p = "int"; + break; + case 3: + p = "int"; + break; + default: + break; + }; + break; + /* getgid */ + case 47: + break; + /* getlogin */ + case 49: + switch(ndx) { + case 0: + p = "char *"; + break; + case 1: + p = "u_int"; + break; + default: + break; + }; + break; + /* setlogin */ + case 50: + switch(ndx) { + case 0: + p = "char *"; + break; + default: + break; + }; + break; + /* acct */ + case 51: + switch(ndx) { + case 0: + p = "char *"; + break; + default: + break; + }; + break; + /* sigaltstack */ + case 53: + switch(ndx) { + case 0: + p = "stack_t *"; + break; + case 1: + p = "stack_t *"; + break; + default: + break; + }; + break; + /* ioctl */ + case 54: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "u_long"; + break; + case 2: + p = "caddr_t"; + break; + default: + break; + }; + break; + /* reboot */ + case 55: + switch(ndx) { + case 0: + p = "int"; + break; + default: + break; + }; + break; + /* revoke */ + case 56: + switch(ndx) { + case 0: + p = "char *"; + break; + default: + break; + }; + break; + /* symlink */ + case 57: + switch(ndx) { + case 0: + p = "char *"; + break; + case 1: + p = "char *"; + break; + default: + break; + }; + break; + /* readlink */ + case 58: + switch(ndx) { + case 0: + p = "char *"; + break; + case 1: + p = "char *"; + break; + case 2: + p = "size_t"; + break; + default: + break; + }; + break; + /* execve */ + case 59: + switch(ndx) { + case 0: + p = "char *"; + break; + case 1: + p = "char **"; + break; + case 2: + p = "char **"; + break; + default: + break; + }; + break; + /* umask */ + case 60: + switch(ndx) { + case 0: + p = "int"; + break; + default: + break; + }; + break; + /* chroot */ + case 61: + switch(ndx) { + case 0: + p = "char *"; + break; + default: + break; + }; + break; + /* msync */ + case 65: + switch(ndx) { + case 0: + p = "void *"; + break; + case 1: + p = "size_t"; + break; + case 2: + p = "int"; + break; + default: + break; + }; + break; + /* vfork */ + case 66: + break; + /* sbrk */ + case 69: + switch(ndx) { + case 0: + p = "int"; + break; + default: + break; + }; + break; + /* sstk */ + case 70: + switch(ndx) { + case 0: + p = "int"; + break; + default: + break; + }; + break; + /* ovadvise */ + case 72: + switch(ndx) { + case 0: + p = "int"; + break; + default: + break; + }; + break; + /* munmap */ + case 73: + switch(ndx) { + case 0: + p = "void *"; + break; + case 1: + p = "size_t"; + break; + default: + break; + }; + break; + /* mprotect */ + case 74: + switch(ndx) { + case 0: + p = "const void *"; + break; + case 1: + p = "size_t"; + break; + case 2: + p = "int"; + break; + default: + break; + }; + break; + /* madvise */ + case 75: + switch(ndx) { + case 0: + p = "void *"; + break; + case 1: + p = "size_t"; + break; + case 2: + p = "int"; + break; + default: + break; + }; + break; + /* mincore */ + case 78: + switch(ndx) { + case 0: + p = "const void *"; + break; + case 1: + p = "size_t"; + break; + case 2: + p = "char *"; + break; + default: + break; + }; + break; + /* getgroups */ + case 79: + switch(ndx) { + case 0: + p = "u_int"; + break; + case 1: + p = "gid_t *"; + break; + default: + break; + }; + break; + /* setgroups */ + case 80: + switch(ndx) { + case 0: + p = "u_int"; + break; + case 1: + p = "gid_t *"; + break; + default: + break; + }; + break; + /* getpgrp */ + case 81: + break; + /* setpgid */ + case 82: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "int"; + break; + default: + break; + }; + break; + /* setitimer */ + case 83: + switch(ndx) { + case 0: + p = "u_int"; + break; + case 1: + p = "struct itimerval *"; + break; + case 2: + p = "struct itimerval *"; + break; + default: + break; + }; + break; + /* swapon */ + case 85: + switch(ndx) { + case 0: + p = "char *"; + break; + default: + break; + }; + break; + /* getitimer */ + case 86: + switch(ndx) { + case 0: + p = "u_int"; + break; + case 1: + p = "struct itimerval *"; + break; + default: + break; + }; + break; + /* getdtablesize */ + case 89: + break; + /* dup2 */ + case 90: + switch(ndx) { + case 0: + p = "u_int"; + break; + case 1: + p = "u_int"; + break; + default: + break; + }; + break; + /* fcntl */ + case 92: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "int"; + break; + case 2: + p = "long"; + break; + default: + break; + }; + break; + /* select */ + case 93: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "fd_set *"; + break; + case 2: + p = "fd_set *"; + break; + case 3: + p = "fd_set *"; + break; + case 4: + p = "struct timeval *"; + break; + default: + break; + }; + break; + /* fsync */ + case 95: + switch(ndx) { + case 0: + p = "int"; + break; + default: + break; + }; + break; + /* setpriority */ + case 96: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "int"; + break; + case 2: + p = "int"; + break; + default: + break; + }; + break; + /* socket */ + case 97: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "int"; + break; + case 2: + p = "int"; + break; + default: + break; + }; + break; + /* connect */ + case 98: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "caddr_t"; + break; + case 2: + p = "int"; + break; + default: + break; + }; + break; + /* getpriority */ + case 100: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "int"; + break; + default: >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Mar 25 21:36:19 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0868E1065671; Tue, 25 Mar 2008 21:36: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 BB414106564A for ; Tue, 25 Mar 2008 21:36: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 9AAEA8FC1B for ; Tue, 25 Mar 2008 21:36:18 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2PLaI9f010304 for ; Tue, 25 Mar 2008 21:36:18 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2PLaIrY010302 for perforce@freebsd.org; Tue, 25 Mar 2008 21:36:18 GMT (envelope-from sam@freebsd.org) Date: Tue, 25 Mar 2008 21:36:18 GMT Message-Id: <200803252136.m2PLaIrY010302@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 138553 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Mar 2008 21:36:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=138553 Change 138553 by sam@sam_ebb on 2008/03/25 21:36:11 IFC @ 138552 Affected files ... .. //depot/projects/vap/Makefile#5 integrate .. //depot/projects/vap/contrib/hostapd/ChangeLog#4 integrate .. //depot/projects/vap/contrib/hostapd/Makefile#4 integrate .. //depot/projects/vap/contrib/hostapd/README#4 integrate .. //depot/projects/vap/contrib/hostapd/aes_wrap.c#4 integrate .. //depot/projects/vap/contrib/hostapd/aes_wrap.h#4 integrate .. //depot/projects/vap/contrib/hostapd/common.c#4 integrate .. //depot/projects/vap/contrib/hostapd/common.h#4 integrate .. //depot/projects/vap/contrib/hostapd/defconfig#4 integrate .. //depot/projects/vap/contrib/hostapd/driver.h#4 integrate .. //depot/projects/vap/contrib/hostapd/driver_test.c#4 integrate .. //depot/projects/vap/contrib/hostapd/eap_aka.c#4 integrate .. //depot/projects/vap/contrib/hostapd/eap_gpsk.c#4 integrate .. //depot/projects/vap/contrib/hostapd/eap_gpsk_common.c#4 integrate .. //depot/projects/vap/contrib/hostapd/eap_gpsk_common.h#4 integrate .. //depot/projects/vap/contrib/hostapd/eap_sim.c#4 integrate .. //depot/projects/vap/contrib/hostapd/eap_sim_common.c#4 integrate .. //depot/projects/vap/contrib/hostapd/eap_sim_db.c#4 integrate .. //depot/projects/vap/contrib/hostapd/eap_tls_common.c#4 integrate .. //depot/projects/vap/contrib/hostapd/eapol_version.patch#3 delete .. //depot/projects/vap/contrib/hostapd/hostapd.c#4 integrate .. //depot/projects/vap/contrib/hostapd/hostapd.conf#4 integrate .. //depot/projects/vap/contrib/hostapd/ieee802_11.c#4 integrate .. //depot/projects/vap/contrib/hostapd/ieee802_11_auth.c#4 integrate .. //depot/projects/vap/contrib/hostapd/ieee802_1x.c#4 integrate .. //depot/projects/vap/contrib/hostapd/madwifi.conf#4 integrate .. //depot/projects/vap/contrib/hostapd/os.h#4 integrate .. //depot/projects/vap/contrib/hostapd/os_unix.c#4 integrate .. //depot/projects/vap/contrib/hostapd/radius.c#4 integrate .. //depot/projects/vap/contrib/hostapd/radius.h#4 integrate .. //depot/projects/vap/contrib/hostapd/radius_client.c#4 integrate .. //depot/projects/vap/contrib/hostapd/radius_server.c#4 integrate .. //depot/projects/vap/contrib/hostapd/tls_openssl.c#4 integrate .. //depot/projects/vap/contrib/hostapd/version.h#4 integrate .. //depot/projects/vap/contrib/hostapd/wpa.c#4 integrate .. //depot/projects/vap/contrib/wpa_supplicant/ChangeLog#4 integrate .. //depot/projects/vap/contrib/wpa_supplicant/FREEBSD-Xlist#3 integrate .. //depot/projects/vap/contrib/wpa_supplicant/FREEBSD-upgrade#3 integrate .. //depot/projects/vap/contrib/wpa_supplicant/Makefile#5 integrate .. //depot/projects/vap/contrib/wpa_supplicant/README#4 integrate .. //depot/projects/vap/contrib/wpa_supplicant/aes_wrap.c#4 integrate .. //depot/projects/vap/contrib/wpa_supplicant/aes_wrap.h#4 integrate .. //depot/projects/vap/contrib/wpa_supplicant/asn1.c#4 integrate .. //depot/projects/vap/contrib/wpa_supplicant/common.c#5 integrate .. //depot/projects/vap/contrib/wpa_supplicant/common.h#4 integrate .. //depot/projects/vap/contrib/wpa_supplicant/config.c#4 integrate .. //depot/projects/vap/contrib/wpa_supplicant/config_ssid.h#4 integrate .. //depot/projects/vap/contrib/wpa_supplicant/config_winreg.c#3 delete .. //depot/projects/vap/contrib/wpa_supplicant/ctrl_iface.c#4 integrate .. //depot/projects/vap/contrib/wpa_supplicant/ctrl_iface_dbus.c#4 integrate .. //depot/projects/vap/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.c#4 integrate .. //depot/projects/vap/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.h#4 integrate .. //depot/projects/vap/contrib/wpa_supplicant/ctrl_iface_named_pipe.c#3 delete .. //depot/projects/vap/contrib/wpa_supplicant/ctrl_iface_unix.c#4 integrate .. //depot/projects/vap/contrib/wpa_supplicant/dbus-wpa_supplicant.conf#4 integrate .. //depot/projects/vap/contrib/wpa_supplicant/defconfig#5 integrate .. //depot/projects/vap/contrib/wpa_supplicant/doc/ctrl_iface.doxygen#4 integrate .. //depot/projects/vap/contrib/wpa_supplicant/doc/docbook/wpa_background.8#4 integrate .. //depot/projects/vap/contrib/wpa_supplicant/doc/docbook/wpa_cli.8#4 integrate .. //depot/projects/vap/contrib/wpa_supplicant/doc/docbook/wpa_cli.sgml#4 integrate .. //depot/projects/vap/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.8#4 integrate .. //depot/projects/vap/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.8#4 integrate .. //depot/projects/vap/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5#4 integrate .. //depot/projects/vap/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.sgml#4 integrate .. //depot/projects/vap/contrib/wpa_supplicant/driver_hostap.h#3 delete .. //depot/projects/vap/contrib/wpa_supplicant/driver_ndis.c#4 integrate .. //depot/projects/vap/contrib/wpa_supplicant/eap_gpsk.c#4 integrate .. //depot/projects/vap/contrib/wpa_supplicant/eap_gpsk_common.c#4 integrate .. //depot/projects/vap/contrib/wpa_supplicant/eap_gpsk_common.h#4 integrate .. //depot/projects/vap/contrib/wpa_supplicant/eap_peap.c#4 integrate .. //depot/projects/vap/contrib/wpa_supplicant/eap_sim.c#4 integrate .. //depot/projects/vap/contrib/wpa_supplicant/eap_sim_common.c#4 integrate .. //depot/projects/vap/contrib/wpa_supplicant/eap_tlv.c#4 integrate .. //depot/projects/vap/contrib/wpa_supplicant/eap_tlv.h#4 integrate .. //depot/projects/vap/contrib/wpa_supplicant/eapol_sm.c#4 integrate .. //depot/projects/vap/contrib/wpa_supplicant/eapol_test.c#4 integrate .. //depot/projects/vap/contrib/wpa_supplicant/eloop_win.c#3 delete .. //depot/projects/vap/contrib/wpa_supplicant/events.c#5 integrate .. //depot/projects/vap/contrib/wpa_supplicant/main.c#5 integrate .. //depot/projects/vap/contrib/wpa_supplicant/os.h#4 integrate .. //depot/projects/vap/contrib/wpa_supplicant/os_unix.c#4 integrate .. //depot/projects/vap/contrib/wpa_supplicant/pcsc_funcs.c#4 integrate .. //depot/projects/vap/contrib/wpa_supplicant/radius.c#4 integrate .. //depot/projects/vap/contrib/wpa_supplicant/radius.h#4 integrate .. //depot/projects/vap/contrib/wpa_supplicant/radius_client.c#4 integrate .. //depot/projects/vap/contrib/wpa_supplicant/tests/test_aes.c#1 branch .. //depot/projects/vap/contrib/wpa_supplicant/tests/test_eap_sim_common.c#1 branch .. //depot/projects/vap/contrib/wpa_supplicant/tests/test_md4.c#1 branch .. //depot/projects/vap/contrib/wpa_supplicant/tests/test_md5.c#1 branch .. //depot/projects/vap/contrib/wpa_supplicant/tests/test_ms_funcs.c#1 branch .. //depot/projects/vap/contrib/wpa_supplicant/tests/test_sha1.c#1 branch .. //depot/projects/vap/contrib/wpa_supplicant/tests/test_sha256.c#1 branch .. //depot/projects/vap/contrib/wpa_supplicant/tests/test_x509v3.c#1 branch .. //depot/projects/vap/contrib/wpa_supplicant/tls_openssl.c#4 integrate .. //depot/projects/vap/contrib/wpa_supplicant/version.h#4 integrate .. //depot/projects/vap/contrib/wpa_supplicant/wpa.c#4 integrate .. //depot/projects/vap/contrib/wpa_supplicant/wpa_cli.c#4 integrate .. //depot/projects/vap/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp#4 integrate .. //depot/projects/vap/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.cpp#4 integrate .. //depot/projects/vap/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h#4 integrate .. //depot/projects/vap/contrib/wpa_supplicant/wpa_gui/setup-mingw-cross-compiling#4 integrate .. //depot/projects/vap/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h#4 integrate .. //depot/projects/vap/contrib/wpa_supplicant/wpa_supplicant.c#5 integrate .. //depot/projects/vap/contrib/wpa_supplicant/wpa_supplicant.conf#4 integrate .. //depot/projects/vap/contrib/wpa_supplicant/wpa_supplicant_i.h#5 integrate .. //depot/projects/vap/contrib/wpa_supplicant/x509v3.c#4 integrate .. //depot/projects/vap/etc/freebsd-update.conf#3 integrate .. //depot/projects/vap/etc/periodic/security/410.logincheck#3 integrate .. //depot/projects/vap/lib/libc/include/namespace.h#4 integrate .. //depot/projects/vap/lib/libc/include/un-namespace.h#4 integrate .. //depot/projects/vap/lib/libthr/Makefile#5 integrate .. //depot/projects/vap/lib/libthr/thread/thr_attr.c#4 integrate .. //depot/projects/vap/lib/libthr/thread/thr_exit.c#6 integrate .. //depot/projects/vap/lib/libthr/thread/thr_mutex.c#6 integrate .. //depot/projects/vap/share/man/man4/malo.4#1 branch .. //depot/projects/vap/share/man/man9/malloc.9#3 integrate .. //depot/projects/vap/share/man/man9/mbchain.9#3 integrate .. //depot/projects/vap/share/man/man9/mbuf.9#4 integrate .. //depot/projects/vap/share/zoneinfo/asia#4 integrate .. //depot/projects/vap/share/zoneinfo/backward#4 integrate .. //depot/projects/vap/share/zoneinfo/northamerica#4 integrate .. //depot/projects/vap/share/zoneinfo/southamerica#5 integrate .. //depot/projects/vap/share/zoneinfo/zone.tab#4 integrate .. //depot/projects/vap/sys/amd64/conf/NOTES#8 integrate .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_proto.h#10 integrate .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_syscall.h#10 integrate .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_syscalls.c#10 integrate .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_sysent.c#10 integrate .. //depot/projects/vap/sys/compat/freebsd32/syscalls.master#10 integrate .. //depot/projects/vap/sys/compat/linux/linux_misc.c#9 integrate .. //depot/projects/vap/sys/ddb/db_command.c#9 integrate .. //depot/projects/vap/sys/ddb/db_ps.c#6 integrate .. //depot/projects/vap/sys/ddb/ddb.h#8 integrate .. //depot/projects/vap/sys/dev/aac/aac.c#9 integrate .. //depot/projects/vap/sys/dev/aac/aac_cam.c#7 integrate .. //depot/projects/vap/sys/dev/aac/aac_debug.c#5 integrate .. //depot/projects/vap/sys/dev/aac/aac_disk.c#4 integrate .. //depot/projects/vap/sys/dev/aac/aac_pci.c#7 integrate .. //depot/projects/vap/sys/dev/aac/aacvar.h#6 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#5 integrate .. //depot/projects/vap/sys/dev/en/midway.c#5 integrate .. //depot/projects/vap/sys/dev/fatm/if_fatm.c#6 integrate .. //depot/projects/vap/sys/dev/firewire/if_fwe.c#5 integrate .. //depot/projects/vap/sys/dev/firewire/if_fwip.c#5 integrate .. //depot/projects/vap/sys/dev/iscsi/initiator/isc_soc.c#4 integrate .. //depot/projects/vap/sys/i386/conf/NOTES#8 integrate .. //depot/projects/vap/sys/kern/init_sysent.c#11 integrate .. //depot/projects/vap/sys/kern/kern_cpuset.c#3 integrate .. //depot/projects/vap/sys/kern/makesyscalls.sh#5 integrate .. //depot/projects/vap/sys/kern/subr_mchain.c#5 integrate .. //depot/projects/vap/sys/kern/syscalls.c#11 integrate .. //depot/projects/vap/sys/kern/syscalls.master#11 integrate .. //depot/projects/vap/sys/kern/systrace_args.c#8 integrate .. //depot/projects/vap/sys/kern/uipc_mbuf.c#8 integrate .. //depot/projects/vap/sys/kern/uipc_socket.c#9 integrate .. //depot/projects/vap/sys/kern/uipc_syscalls.c#11 integrate .. //depot/projects/vap/sys/net/bpf.c#10 integrate .. //depot/projects/vap/sys/net/bpf_buffer.c#2 integrate .. //depot/projects/vap/sys/net/bpf_zerocopy.c#2 integrate .. //depot/projects/vap/sys/net/if.c#10 integrate .. //depot/projects/vap/sys/net/if_ef.c#6 integrate .. //depot/projects/vap/sys/net/if_enc.c#4 integrate .. //depot/projects/vap/sys/net/if_fddisubr.c#6 integrate .. //depot/projects/vap/sys/net/if_iso88025subr.c#5 integrate .. //depot/projects/vap/sys/net/if_loop.c#7 integrate .. //depot/projects/vap/sys/net/if_media.h#8 integrate .. //depot/projects/vap/sys/net/if_sl.c#5 integrate .. //depot/projects/vap/sys/net/if_var.h#8 integrate .. //depot/projects/vap/sys/net/raw_cb.c#6 integrate .. //depot/projects/vap/sys/netatalk/aarp.c#6 integrate .. //depot/projects/vap/sys/netatm/port.h#3 integrate .. //depot/projects/vap/sys/netgraph/ng_pptpgre.c#5 integrate .. //depot/projects/vap/sys/netgraph/ng_pptpgre.h#3 integrate .. //depot/projects/vap/sys/netinet/in_pcb.c#10 integrate .. //depot/projects/vap/sys/netinet/in_pcb.h#7 integrate .. //depot/projects/vap/sys/netinet/ip_output.c#7 integrate .. //depot/projects/vap/sys/netinet6/ip6_output.c#10 integrate .. //depot/projects/vap/sys/netncp/ncp_sock.c#6 integrate .. //depot/projects/vap/sys/netsmb/smb_iod.c#6 integrate .. //depot/projects/vap/sys/netsmb/smb_rq.c#5 integrate .. //depot/projects/vap/sys/netsmb/smb_trantcp.c#6 integrate .. //depot/projects/vap/sys/nfs/nfs_common.c#5 integrate .. //depot/projects/vap/sys/nfsclient/krpc_subr.c#6 integrate .. //depot/projects/vap/sys/nfsclient/nfs_socket.c#8 integrate .. //depot/projects/vap/sys/nfsclient/nfs_subs.c#11 integrate .. //depot/projects/vap/sys/nfsserver/nfs_serv.c#9 integrate .. //depot/projects/vap/sys/nfsserver/nfs_srvcache.c#5 integrate .. //depot/projects/vap/sys/nfsserver/nfs_srvsock.c#7 integrate .. //depot/projects/vap/sys/nfsserver/nfs_srvsubs.c#8 integrate .. //depot/projects/vap/sys/nfsserver/nfs_syscalls.c#6 integrate .. //depot/projects/vap/sys/pc98/conf/NOTES#6 integrate .. //depot/projects/vap/sys/pci/if_mn.c#6 integrate .. //depot/projects/vap/sys/rpc/rpcclnt.c#6 integrate .. //depot/projects/vap/sys/sys/cpuset.h#3 integrate .. //depot/projects/vap/sys/sys/mbuf.h#10 integrate .. //depot/projects/vap/sys/sys/syscall.h#11 integrate .. //depot/projects/vap/sys/sys/syscall.mk#11 integrate .. //depot/projects/vap/sys/sys/sysproto.h#11 integrate .. //depot/projects/vap/usr.sbin/arp/arp.8#4 integrate .. //depot/projects/vap/usr.sbin/freebsd-update/freebsd-update.sh#4 integrate .. //depot/projects/vap/usr.sbin/wpa/wpa_supplicant/Makefile#5 integrate .. //depot/projects/vap/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8#4 integrate Differences ... ==== //depot/projects/vap/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.345 2008/01/30 19:33:18 jhb Exp $ +# $FreeBSD: src/Makefile,v 1.346 2008/03/25 15:47:22 ru Exp $ # # The user-driven targets are: # @@ -172,6 +172,10 @@ .MAIN: all STARTTIME!= LC_ALL=C date +CHECK_TIME!= find ${.CURDIR}/sys/sys/param.h -mtime -0 +.if !empty(CHECK_TIME) +.error check your date/time: ${STARTTIME} +.endif .if defined(HISTORICAL_MAKE_WORLD) || defined(DESTDIR) # ==== //depot/projects/vap/contrib/hostapd/ChangeLog#4 (text+ko) ==== ==== //depot/projects/vap/contrib/hostapd/Makefile#4 (text+ko) ==== ==== //depot/projects/vap/contrib/hostapd/README#4 (text+ko) ==== ==== //depot/projects/vap/contrib/hostapd/aes_wrap.c#4 (text+ko) ==== ==== //depot/projects/vap/contrib/hostapd/aes_wrap.h#4 (text+ko) ==== ==== //depot/projects/vap/contrib/hostapd/common.c#4 (text+ko) ==== ==== //depot/projects/vap/contrib/hostapd/common.h#4 (text+ko) ==== ==== //depot/projects/vap/contrib/hostapd/defconfig#4 (text+ko) ==== ==== //depot/projects/vap/contrib/hostapd/driver.h#4 (text+ko) ==== ==== //depot/projects/vap/contrib/hostapd/driver_test.c#4 (text+ko) ==== ==== //depot/projects/vap/contrib/hostapd/eap_aka.c#4 (text+ko) ==== ==== //depot/projects/vap/contrib/hostapd/eap_gpsk.c#4 (text+ko) ==== ==== //depot/projects/vap/contrib/hostapd/eap_gpsk_common.c#4 (text+ko) ==== ==== //depot/projects/vap/contrib/hostapd/eap_gpsk_common.h#4 (text+ko) ==== ==== //depot/projects/vap/contrib/hostapd/eap_sim.c#4 (text+ko) ==== ==== //depot/projects/vap/contrib/hostapd/eap_sim_common.c#4 (text+ko) ==== ==== //depot/projects/vap/contrib/hostapd/eap_sim_db.c#4 (text+ko) ==== ==== //depot/projects/vap/contrib/hostapd/eap_tls_common.c#4 (text+ko) ==== ==== //depot/projects/vap/contrib/hostapd/hostapd.c#4 (text+ko) ==== ==== //depot/projects/vap/contrib/hostapd/hostapd.conf#4 (text+ko) ==== ==== //depot/projects/vap/contrib/hostapd/ieee802_11.c#4 (text+ko) ==== ==== //depot/projects/vap/contrib/hostapd/ieee802_11_auth.c#4 (text+ko) ==== ==== //depot/projects/vap/contrib/hostapd/ieee802_1x.c#4 (text+ko) ==== @@ -10,6 +10,7 @@ * license. * * See README and COPYING for more details. + * $FreeBSD: src/contrib/hostapd/ieee802_1x.c,v 1.6 2008/03/24 21:08:25 sam Exp $ */ #include "includes.h" ==== //depot/projects/vap/contrib/hostapd/madwifi.conf#4 (text+ko) ==== ==== //depot/projects/vap/contrib/hostapd/os.h#4 (text+ko) ==== ==== //depot/projects/vap/contrib/hostapd/os_unix.c#4 (text+ko) ==== ==== //depot/projects/vap/contrib/hostapd/radius.c#4 (text+ko) ==== ==== //depot/projects/vap/contrib/hostapd/radius.h#4 (text+ko) ==== ==== //depot/projects/vap/contrib/hostapd/radius_client.c#4 (text+ko) ==== ==== //depot/projects/vap/contrib/hostapd/radius_server.c#4 (text+ko) ==== ==== //depot/projects/vap/contrib/hostapd/tls_openssl.c#4 (text+ko) ==== ==== //depot/projects/vap/contrib/hostapd/version.h#4 (text+ko) ==== ==== //depot/projects/vap/contrib/hostapd/wpa.c#4 (text+ko) ==== @@ -10,6 +10,7 @@ * license. * * See README and COPYING for more details. + * $FreeBSD: src/contrib/hostapd/wpa.c,v 1.6 2008/03/24 21:08:25 sam Exp $ */ #include "includes.h" ==== //depot/projects/vap/contrib/wpa_supplicant/ChangeLog#4 (text+ko) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/FREEBSD-Xlist#3 (text+ko) ==== @@ -1,10 +1,13 @@ -$FreeBSD: src/contrib/wpa_supplicant/FREEBSD-Xlist,v 1.4 2007/07/11 15:59:42 sam Exp $ +$FreeBSD: src/contrib/wpa_supplicant/FREEBSD-Xlist,v 1.5 2008/03/24 19:59:12 sam Exp $ .cvsignore README-Windows.txt +config_winreg.c +ctrl_iface_named_pipe.c driver_atmel.c driver_broadcom.c driver_bsd.c driver_hostap.c +driver_hostap.h driver_ipw.c driver_madwifi.c driver_ndiswrapper.c @@ -13,6 +16,7 @@ driver_test.c driver_wext.c driver_wext.h +eloop_win.c l2_packet_freebsd.c l2_packet_linux.c l2_packet_ndis.c ==== //depot/projects/vap/contrib/wpa_supplicant/FREEBSD-upgrade#3 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/contrib/wpa_supplicant/FREEBSD-upgrade,v 1.2 2007/07/11 15:59:42 sam Exp $ +$FreeBSD: src/contrib/wpa_supplicant/FREEBSD-upgrade,v 1.3 2008/03/24 19:59:12 sam Exp $ WPA Supplicant originals can be found at: http://hostap.epitest.fi/releases/ @@ -6,12 +6,12 @@ For the import files and directories were pruned by: - tar -X FREEBSD-Xlist -zxf wpa_supplicant-0.5.8.tar.gz + tar -X FREEBSD-Xlist -zxf wpa_supplicant-0.5.10.tar.gz then imported by: - cvs import -m 'Import of WPA supplicant 0.5.8' \ - src/contrib/wpa_supplicant MALINEN v0_5_8 + cvs import -m 'Import of WPA supplicant 0.5.10' \ + src/contrib/wpa_supplicant MALINEN v0_5_10 To make local changes to wpa_supplcaint, simply patch and commit to the main branch (aka HEAD). Never make local changes on the @@ -21,4 +21,4 @@ the next vendor release. sam@FreeBSD.org -11-July-2007 +24-March-2008 ==== //depot/projects/vap/contrib/wpa_supplicant/Makefile#5 (text+ko) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/README#4 (text+ko) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/aes_wrap.c#4 (text+ko) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/aes_wrap.h#4 (text+ko) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/asn1.c#4 (text+ko) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/common.c#5 (text+ko) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/common.h#4 (text+ko) ==== @@ -10,6 +10,7 @@ * license. * * See README and COPYING for more details. + * $FreeBSD: src/contrib/wpa_supplicant/common.h,v 1.5 2008/03/24 19:57:51 sam Exp $ */ #ifndef COMMON_H ==== //depot/projects/vap/contrib/wpa_supplicant/config.c#4 (text+ko) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/config_ssid.h#4 (text+ko) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/ctrl_iface.c#4 (text+ko) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/ctrl_iface_dbus.c#4 (text+ko) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.c#4 (text+ko) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.h#4 (text+ko) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/ctrl_iface_unix.c#4 (text+ko) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/dbus-wpa_supplicant.conf#4 (text+ko) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/defconfig#5 (text+ko) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/doc/ctrl_iface.doxygen#4 (text) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/doc/docbook/wpa_background.8#4 (text) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/doc/docbook/wpa_cli.8#4 (text) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/doc/docbook/wpa_cli.sgml#4 (text) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.8#4 (text) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.8#4 (text) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5#4 (text) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.sgml#4 (text) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/driver_ndis.c#4 (text+ko) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/eap_gpsk.c#4 (text+ko) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/eap_gpsk_common.c#4 (text+ko) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/eap_gpsk_common.h#4 (text+ko) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/eap_peap.c#4 (text+ko) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/eap_sim.c#4 (text+ko) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/eap_sim_common.c#4 (text+ko) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/eap_tlv.c#4 (text+ko) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/eap_tlv.h#4 (text+ko) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/eapol_sm.c#4 (text+ko) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/eapol_test.c#4 (text+ko) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/events.c#5 (text) ==== @@ -10,6 +10,7 @@ * license. * * See README and COPYING for more details. + * $FreeBSD: src/contrib/wpa_supplicant/events.c,v 1.4 2008/03/24 19:57:51 sam Exp $ */ #include "includes.h" ==== //depot/projects/vap/contrib/wpa_supplicant/main.c#5 (text) ==== @@ -10,6 +10,8 @@ * license. * * See README and COPYING for more details. + * + * $FreeBSD: src/contrib/wpa_supplicant/main.c,v 1.3 2008/03/24 19:57:51 sam Exp $ */ #include "includes.h" ==== //depot/projects/vap/contrib/wpa_supplicant/os.h#4 (text+ko) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/os_unix.c#4 (text+ko) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/pcsc_funcs.c#4 (text+ko) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/radius.c#4 (text+ko) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/radius.h#4 (text+ko) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/radius_client.c#4 (text+ko) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/tls_openssl.c#4 (text+ko) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/version.h#4 (text+ko) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/wpa.c#4 (text+ko) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/wpa_cli.c#4 (text+ko) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp#4 (text+ko) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.cpp#4 (text+ko) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h#4 (text) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/wpa_gui/setup-mingw-cross-compiling#4 (text+ko) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h#4 (text) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/wpa_supplicant.c#5 (text+ko) ==== @@ -14,6 +14,7 @@ * This file implements functions for registering and unregistering * %wpa_supplicant interfaces. In addition, this file contains number of * functions for managing network connections. + * $FreeBSD: src/contrib/wpa_supplicant/wpa_supplicant.c,v 1.5 2008/03/24 19:57:51 sam Exp $ */ #include "includes.h" ==== //depot/projects/vap/contrib/wpa_supplicant/wpa_supplicant.conf#4 (text+ko) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/wpa_supplicant_i.h#5 (text+ko) ==== ==== //depot/projects/vap/contrib/wpa_supplicant/x509v3.c#4 (text+ko) ==== ==== //depot/projects/vap/etc/freebsd-update.conf#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/freebsd-update.conf,v 1.3 2007/11/28 22:45:09 cperciva Exp $ +# $FreeBSD: src/etc/freebsd-update.conf,v 1.4 2008/03/25 12:13:12 cperciva Exp $ # Trusted keyprint. Changing this is a Bad Idea unless you've received # a PGP-signed email from telling you to @@ -28,7 +28,7 @@ # When upgrading to a new FreeBSD release, files which match MergeChanges # will have any local changes merged into the version from the new release. -MergeChanges /etc/ /var/named/etc/ +MergeChanges /etc/ /var/named/etc/ /boot/device.hints ### Default configuration options: ==== //depot/projects/vap/etc/periodic/security/410.logincheck#3 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/410.logincheck,v 1.1 2006/08/25 07:34:36 trhodes Exp $ +# $FreeBSD: src/etc/periodic/security/410.logincheck,v 1.2 2008/03/25 15:16:19 remko Exp $ # # If there is a global system configuration file, suck it in. @@ -39,7 +39,7 @@ [Yy][Ee][Ss]) echo "" echo 'Checking login.conf permissions:' - if [ -G /etc/login.conf -a -O /etc/login.conf ] then + if [ -G /etc/login.conf -a -O /etc/login.conf ]; then n=0 else echo "Bad ownership of /etc/login.conf" ==== //depot/projects/vap/lib/libc/include/namespace.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/include/namespace.h,v 1.21 2008/02/06 20:42:35 des Exp $ + * $FreeBSD: src/lib/libc/include/namespace.h,v 1.22 2008/03/25 15:33:00 ru Exp $ */ #ifndef _NAMESPACE_H_ @@ -84,6 +84,7 @@ #define pthread_atfork _pthread_atfork #define pthread_attr_destroy _pthread_attr_destroy #define pthread_attr_get_np _pthread_attr_get_np +#define pthread_attr_getaffinity_np _pthread_attr_getaffinity_np #define pthread_attr_getdetachstate _pthread_attr_getdetachstate #define pthread_attr_getguardsize _pthread_attr_getguardsize #define pthread_attr_getinheritsched _pthread_attr_getinheritsched @@ -94,6 +95,7 @@ #define pthread_attr_getstackaddr _pthread_attr_getstackaddr #define pthread_attr_getstacksize _pthread_attr_getstacksize #define pthread_attr_init _pthread_attr_init +#define pthread_attr_setaffinity_np _pthread_attr_setaffinity_np #define pthread_attr_setcreatesuspend_np _pthread_attr_setcreatesuspend_np #define pthread_attr_setdetachstate _pthread_attr_setdetachstate #define pthread_attr_setguardsize _pthread_attr_setguardsize @@ -131,6 +133,7 @@ #define pthread_equal _pthread_equal #define pthread_exit _pthread_exit #define pthread_getconcurrency _pthread_getconcurrency +#define pthread_getcpuclockid _pthread_getcpuclockid #define pthread_getprio _pthread_getprio #define pthread_getschedparam _pthread_getschedparam #define pthread_getspecific _pthread_getspecific ==== //depot/projects/vap/lib/libc/include/un-namespace.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/include/un-namespace.h,v 1.18 2008/02/06 20:42:35 des Exp $ + * $FreeBSD: src/lib/libc/include/un-namespace.h,v 1.19 2008/03/25 13:28:12 ru Exp $ */ #ifndef _UN_NAMESPACE_H_ @@ -65,6 +65,7 @@ #undef pthread_atfork #undef pthread_attr_destroy #undef pthread_attr_get_np +#undef pthread_attr_getaffinity_np #undef pthread_attr_getdetachstate #undef pthread_attr_getguardsize #undef pthread_attr_getinheritsched @@ -75,6 +76,7 @@ #undef pthread_attr_getstackaddr #undef pthread_attr_getstacksize #undef pthread_attr_init +#undef pthread_attr_setaffinity_np #undef pthread_attr_setcreatesuspend_np #undef pthread_attr_setdetachstate #undef pthread_attr_setguardsize @@ -112,6 +114,7 @@ #undef pthread_equal #undef pthread_exit #undef pthread_getconcurrency +#undef pthread_getcpuclockid #undef pthread_getprio #undef pthread_getschedparam #undef pthread_getspecific ==== //depot/projects/vap/lib/libthr/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libthr/Makefile,v 1.32 2008/02/06 20:25:00 des Exp $ +# $FreeBSD: src/lib/libthr/Makefile,v 1.33 2008/03/25 13:28:12 ru Exp $ # # All library objects contain FreeBSD revision strings by default; they may be # excluded as a space-saving measure. To produce a library that does @@ -17,6 +17,7 @@ LIB=thr SHLIB_MAJOR= 3 +WARNS?= 3 CFLAGS+=-DPTHREAD_KERNEL CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \ -I${.CURDIR}/../../include ==== //depot/projects/vap/lib/libthr/thread/thr_attr.c#4 (text+ko) ==== @@ -90,7 +90,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_attr.c,v 1.11 2008/03/06 03:24:03 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_attr.c,v 1.12 2008/03/25 13:28:12 ru Exp $ */ #include "namespace.h" @@ -547,13 +547,13 @@ return(ret); } -static int -_get_kern_cpuset_size() +static size_t +_get_kern_cpuset_size(void) { static int kern_cpuset_size = 0; if (kern_cpuset_size == 0) { - int len; + size_t len; len = sizeof(kern_cpuset_size); if (sysctlbyname("kern.smp.maxcpus", &kern_cpuset_size, @@ -587,9 +587,9 @@ } if (cpusetsize > attr->cpusetsize) { - int kern_size = _get_kern_cpuset_size(); + size_t kern_size = _get_kern_cpuset_size(); if (cpusetsize > kern_size) { - int i; + size_t i; for (i = kern_size; i < cpusetsize; ++i) { if (((char *)cpuset)[i]) return (EINVAL); @@ -627,7 +627,7 @@ memset(((char *)cpuset) + attr->cpusetsize, 0, cpusetsize - attr->cpusetsize); } else { - int kern_size = _get_kern_cpuset_size(); + size_t kern_size = _get_kern_cpuset_size(); memset(cpuset, -1, MIN(cpusetsize, kern_size)); if (cpusetsize > kern_size) memset(((char *)cpuset) + kern_size, 0, ==== //depot/projects/vap/lib/libthr/thread/thr_exit.c#6 (text+ko) ==== @@ -26,13 +26,15 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_exit.c,v 1.26 2008/03/18 02:06:51 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_exit.c,v 1.27 2008/03/25 13:28:12 ru Exp $ */ +#include "namespace.h" #include #include #include #include +#include "un-namespace.h" #include "thr_private.h" ==== //depot/projects/vap/lib/libthr/thread/thr_mutex.c#6 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.71 2008/02/14 12:37:58 des Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.72 2008/03/25 09:48:10 ru Exp $ */ #include "namespace.h" @@ -40,6 +40,7 @@ #include #include #include +#include #include "un-namespace.h" #include "thr_private.h" @@ -793,8 +794,9 @@ _pthread_mutex_getspinloops_np(pthread_mutex_t *mutex, int *count) { if (*mutex == NULL) - return (0); - return (*mutex)->m_spinloops; + return (EINVAL); + *count = (*mutex)->m_spinloops; + return (0); } int @@ -831,8 +833,9 @@ _pthread_mutex_getyieldloops_np(pthread_mutex_t *mutex, int *count) { if (*mutex == NULL) - return (0); - return (*mutex)->m_yieldloops; + return (EINVAL); + *count = (*mutex)->m_yieldloops; + return (0); } int ==== //depot/projects/vap/share/man/man9/malloc.9#3 (text+ko) ==== @@ -34,7 +34,7 @@ .\" POSSIBILITY OF SUCH DAMAGE. .\" .\" $NetBSD: malloc.9,v 1.3 1996/11/11 00:05:11 lukem Exp $ -.\" $FreeBSD: src/share/man/man9/malloc.9,v 1.42 2005/02/22 17:20:20 brueffer Exp $ +.\" $FreeBSD: src/share/man/man9/malloc.9,v 1.43 2008/03/25 15:44:49 ru Exp $ .\" .Dd June 12, 2003 .Dt MALLOC 9 @@ -247,7 +247,7 @@ flags .Dv M_DONTWAIT and -.Dv M_TRYWAIT . +.Dv M_WAIT . .Sh CONTEXT .Fn malloc , .Fn realloc ==== //depot/projects/vap/share/man/man9/mbchain.9#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/share/man/man9/mbchain.9,v 1.6 2005/01/28 10:48:52 ru Exp $ +.\" $FreeBSD: src/share/man/man9/mbchain.9,v 1.7 2008/03/25 15:44:02 ru Exp $ .\" .Dd February 20, 2001 .Dt MBCHAIN 9 @@ -210,7 +210,7 @@ mb_init(mbp); mb_put_uint8(mbp, 33); mb_put_uint16le(mbp, length); -m = m_copym(mbp->mb_top, 0, M_COPYALL, M_TRYWAIT); +m = m_copym(mbp->mb_top, 0, M_COPYALL, M_WAIT); send(m); mb_done(mbp); .Ed ==== //depot/projects/vap/share/man/man9/mbuf.9#4 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/mbuf.9,v 1.66 2008/02/01 19:36:21 phk Exp $ +.\" $FreeBSD: src/share/man/man9/mbuf.9,v 1.67 2008/03/25 09:39:02 ru Exp $ .\" -.Dd February 26, 2007 +.Dd March 25, 2008 .Dt MBUF 9 .Os .\" @@ -356,20 +356,10 @@ The .Fa how argument is to be set to -.Dv M_TRYWAIT +.Dv M_WAIT or .Dv M_DONTWAIT . It specifies whether the caller is willing to block if necessary. -If -.Fa how -is set to -.Dv M_TRYWAIT , -a failed allocation will result in the caller being put -to sleep for a designated -kern.ipc.mbuf_wait -.Xr ( sysctl 8 -tunable) -number of ticks. A number of other functions and macros related to .Vt mbufs have the same argument because they may @@ -922,7 +912,7 @@ chain will be returned. .Fa how should be either -.Dv M_TRYWAIT +.Dv M_WAIT or .Dv M_DONTWAIT , depending on the caller's preference. @@ -940,7 +930,7 @@ count of any shared mbuf clusters is decremented. .Fa how should be either -.Dv M_TRYWAIT +.Dv M_WAIT or .Dv M_DONTWAIT , depending on the caller's preference. ==== //depot/projects/vap/share/zoneinfo/asia#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# @(#)asia 8.14 +# @(#)asia 8.18 # 
 
 # This data is by no means authoritative; if you think you know better,
@@ -446,13 +446,13 @@
 
 # India
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Calcutta	5:53:28 -	LMT	1880	# Kolkata
+Zone	Asia/Kolkata	5:53:28 -	LMT	1880	# Kolkata
 			5:53:20	-	HMT	1941 Oct    # Howrah Mean Time?
 			6:30	-	BURT	1942 May 15 # Burma Time
 			5:30	-	IST	1942 Sep
 			5:30	1:00	IST	1945 Oct 15
 			5:30	-	IST
-# The following are like Asia/Calcutta:
+# The following are like Asia/Kolkata:
 #	Andaman Is
 #	Lakshadweep (Laccadive, Minicoy and Amindivi Is)
 #	Nicobar Is
@@ -660,6 +660,21 @@
 #
 # So we'll ignore the Economist's claim.
 
+# From Steffen Thorsen (2008-03-10):
+# The cabinet in Iraq abolished DST last week, according to the following
+# news sources (in Arabic):
+# 
+# http://www.aljeeran.net/wesima_articles/news-20080305-98602.html
+# 
+# 
+# http://www.aswataliraq.info/look/article.tpl?id=2047&IdLanguage=17&IdPublication=4&NrArticle=71743&NrIssue=1&NrSection=10
+# 
+#
+# We have published a short article in English about the change:
+# 
+# http://www.timeanddate.com/news/time/iraq-dumps-daylight-saving.html
+# 
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Iraq	1982	only	-	May	1	0:00	1:00	D
 Rule	Iraq	1982	1984	-	Oct	1	0:00	0	S
@@ -670,8 +685,8 @@
 # IATA SSIM (1991/1996) says Apr 1 12:01am UTC; guess the `:01' is a typo.
 # Shanks & Pottenger say Iraq did not observe DST 1992/1997; ignore this.
 #
-Rule	Iraq	1991	max	-	Apr	 1	3:00s	1:00	D
-Rule	Iraq	1991	max	-	Oct	 1	3:00s	0	S
+Rule	Iraq	1991	2007	-	Apr	 1	3:00s	1:00	D

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Tue Mar 25 21:50:35 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 95F561065673; Tue, 25 Mar 2008 21:50: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 5419B1065671
	for ; Tue, 25 Mar 2008 21:50:35 +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 326758FC1C
	for ; Tue, 25 Mar 2008 21:50:35 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2PLoZes011138
	for ; Tue, 25 Mar 2008 21:50:35 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2PLoZ0N011136
	for perforce@freebsd.org; Tue, 25 Mar 2008 21:50:35 GMT
	(envelope-from sam@freebsd.org)
Date: Tue, 25 Mar 2008 21:50:35 GMT
Message-Id: <200803252150.m2PLoZ0N011136@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 138555 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 25 Mar 2008 21:50:36 -0000

http://perforce.freebsd.org/chv.cgi?CH=138555

Change 138555 by sam@sam_ebb on 2008/03/25 21:49:37

	IFC @ 138554

Affected files ...

.. //depot/projects/vap/contrib/wpa_supplicant/dbus-wpa_supplicant.service#1 branch
.. //depot/projects/vap/sys/dev/aac/aac.c#10 integrate
.. //depot/projects/vap/sys/dev/aac/aac_disk.c#5 integrate
.. //depot/projects/vap/sys/dev/aac/aacreg.h#7 integrate
.. //depot/projects/vap/sys/dev/aac/aacvar.h#7 integrate
.. //depot/projects/vap/sys/dev/malo/if_malo.c#2 integrate
.. //depot/projects/vap/sys/dev/malo/if_malo.h#2 integrate
.. //depot/projects/vap/sys/dev/malo/if_malo_pci.c#2 integrate
.. //depot/projects/vap/sys/dev/malo/if_malohal.c#2 integrate
.. //depot/projects/vap/sys/dev/malo/if_malohal.h#2 integrate
.. //depot/projects/vap/sys/dev/malo/if_maloioctl.h#2 integrate
.. //depot/projects/vap/sys/modules/malo/Makefile#2 integrate
.. //depot/projects/vap/sys/sys/cdefs.h#9 integrate

Differences ...

==== //depot/projects/vap/sys/dev/aac/aac.c#10 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.133 2008/03/25 18:34:04 emaste Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.134 2008/03/25 21:39:06 emaste Exp $");
 
 /*
  * Driver for the Adaptec 'FSA' family of PCI/SCSI RAID adapters.
@@ -377,7 +377,9 @@
 	struct aac_mntinfo *mi;
 
 	mi = (struct aac_mntinfo *)&fib->data[0];
-	mi->Command = VM_NameServe;
+	/* use 64-bit LBA if enabled */
+	mi->Command = (sc->flags & AAC_FLAGS_LBA_64BIT) ?
+	    VM_NameServe64 : VM_NameServe;
 	mi->MntType = FT_FILESYS;
 	mi->MntCount = cid;
 
@@ -1802,6 +1804,11 @@
 		sc->flags |= AAC_FLAGS_RAW_IO;
 		device_printf(sc->aac_dev, "Enable Raw I/O\n");
 	}
+	if ((sc->flags & AAC_FLAGS_RAW_IO) &&
+	    (sc->flags & AAC_FLAGS_ARRAY_64BIT)) {
+		sc->flags |= AAC_FLAGS_LBA_64BIT;
+		device_printf(sc->aac_dev, "Enable 64-bit array\n");
+	}
 
 	return (0);
 }

==== //depot/projects/vap/sys/dev/aac/aac_disk.c#5 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/aac/aac_disk.c,v 1.44 2008/03/24 19:23:33 emaste Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/aac/aac_disk.c,v 1.45 2008/03/25 21:39:06 emaste Exp $");
 
 #include "opt_aac.h"
 
@@ -343,6 +343,9 @@
 	 * disk!
 	 */
 	sc->ad_size = sc->ad_container->co_mntobj.Capacity;
+	if (sc->ad_controller->flags & AAC_FLAGS_LBA_64BIT)
+		sc->ad_size += (u_int64_t)
+			sc->ad_container->co_mntobj.CapacityHigh << 32;
 	if (sc->ad_size >= (2 * 1024 * 1024)) {		/* 2GB */
 		sc->ad_heads = 255;
 		sc->ad_sectors = 63;
@@ -355,9 +358,9 @@
 	}
 	sc->ad_cylinders = (sc->ad_size / (sc->ad_heads * sc->ad_sectors));
 
-	device_printf(dev, "%uMB (%u sectors)\n",
-		      sc->ad_size / ((1024 * 1024) / AAC_BLOCK_SIZE),
-		      sc->ad_size);
+	device_printf(dev, "%juMB (%ju sectors)\n",
+		      (intmax_t)sc->ad_size / ((1024 * 1024) / AAC_BLOCK_SIZE),
+		      (intmax_t)sc->ad_size);
 
 	/* attach a generic disk device to ourselves */
 	sc->unit = device_get_unit(dev);

==== //depot/projects/vap/sys/dev/aac/aacreg.h#7 (text+ko) ====

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD: src/sys/dev/aac/aacreg.h,v 1.24 2007/12/07 18:05:41 emaste Exp $
+ *	$FreeBSD: src/sys/dev/aac/aacreg.h,v 1.25 2008/03/25 21:39:06 emaste Exp $
  */
 
 /*
@@ -1140,6 +1140,7 @@
 		u_int32_t	pad[8];
 	} ObjExtension;
 	u_int32_t			AlterEgoId;
+	u_int32_t			CapacityHigh;
 } __packed;
 
 struct aac_mntinfo {

==== //depot/projects/vap/sys/dev/aac/aacvar.h#7 (text+ko) ====

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD: src/sys/dev/aac/aacvar.h,v 1.50 2008/03/24 19:23:33 emaste Exp $
+ *	$FreeBSD: src/sys/dev/aac/aacvar.h,v 1.51 2008/03/25 21:39:06 emaste Exp $
  */
 
 #include 
@@ -133,7 +133,7 @@
 	int				ad_cylinders;
 	int				ad_heads;
 	int				ad_sectors;
-	u_int32_t			ad_size;
+	u_int64_t			ad_size;
 	int				unit;
 };
 
@@ -392,6 +392,7 @@
 #define AAC_FLAGS_NEW_COMM	(1 << 11)	/* New comm. interface supported */
 #define AAC_FLAGS_RAW_IO	(1 << 12)	/* Raw I/O interface */
 #define AAC_FLAGS_ARRAY_64BIT	(1 << 13)	/* 64-bit array size */
+#define	AAC_FLAGS_LBA_64BIT	(1 << 14)	/* 64-bit LBA support */
 
 	u_int32_t		supported_options;
 	u_int32_t		scsi_method_id;

==== //depot/projects/vap/sys/dev/malo/if_malo.c#2 (text+ko) ====


==== //depot/projects/vap/sys/dev/malo/if_malo.h#2 (text+ko) ====


==== //depot/projects/vap/sys/dev/malo/if_malo_pci.c#2 (text+ko) ====


==== //depot/projects/vap/sys/dev/malo/if_malohal.c#2 (text+ko) ====


==== //depot/projects/vap/sys/dev/malo/if_malohal.h#2 (text+ko) ====


==== //depot/projects/vap/sys/dev/malo/if_maloioctl.h#2 (text+ko) ====


==== //depot/projects/vap/sys/modules/malo/Makefile#2 (text+ko) ====


==== //depot/projects/vap/sys/sys/cdefs.h#9 (text+ko) ====

@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cdefs.h	8.8 (Berkeley) 1/9/95
- * $FreeBSD: src/sys/sys/cdefs.h,v 1.94 2007/12/09 21:00:36 alc Exp $
+ * $FreeBSD: src/sys/sys/cdefs.h,v 1.95 2008/03/25 21:30:01 sam Exp $
  */
 
 #ifndef	_SYS_CDEFS_H_
@@ -405,7 +405,7 @@
  * Embed the rcs id of a source file in the resulting library.  Note that in
  * more recent ELF binutils, we use .ident allowing the ID to be stripped.
  * Usage:
- *	__FBSDID("$FreeBSD: src/sys/sys/cdefs.h,v 1.94 2007/12/09 21:00:36 alc Exp $");
+ *	__FBSDID("$FreeBSD: src/sys/sys/cdefs.h,v 1.95 2008/03/25 21:30:01 sam Exp $");
  */
 #ifndef	__FBSDID
 #if !defined(lint) && !defined(STRIP_FBSDID)

From owner-p4-projects@FreeBSD.ORG  Tue Mar 25 22:02:48 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BC9481065675; Tue, 25 Mar 2008 22:02: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 79E501065673
	for ; Tue, 25 Mar 2008 22:02:48 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 56ED68FC1A
	for ; Tue, 25 Mar 2008 22:02:48 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2PM2mhd012394
	for ; Tue, 25 Mar 2008 22:02:48 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2PM2mm7012392
	for perforce@freebsd.org; Tue, 25 Mar 2008 22:02:48 GMT
	(envelope-from jb@freebsd.org)
Date: Tue, 25 Mar 2008 22:02:48 GMT
Message-Id: <200803252202.m2PM2mm7012392@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138557 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 25 Mar 2008 22:02:49 -0000

http://perforce.freebsd.org/chv.cgi?CH=138557

Change 138557 by jb@jb_freebsd1 on 2008/03/25 22:02:03

	Add an extra label for reference elsewhere.

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/dtrace_asm.S#5 edit
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/i386/dtrace_asm.S#8 edit

Differences ...

==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/dtrace_asm.S#5 (text+ko) ====

@@ -76,6 +76,7 @@
 	pushq	(%rsi)
 	movq	%rsp, %rsi
 	call	dtrace_invop
+	ALTENTRY(dtrace_invop_callsite)
 	addq	$8, %rsp
 	cmpl	$DTRACE_INVOP_PUSHL_EBP, %eax
 	je	bp_push

==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/i386/dtrace_asm.S#8 (text+ko) ====

@@ -54,6 +54,7 @@
 	 * those values.
 	 */
 	addl	$12, %esp
+	ALTENTRY(dtrace_invop_callsite)
 	cmpl	$DTRACE_INVOP_PUSHL_EBP, %eax
 	je	invop_push
 	cmpl	$DTRACE_INVOP_POPL_EBP, %eax

From owner-p4-projects@FreeBSD.ORG  Tue Mar 25 22:03:50 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 13071106566B; Tue, 25 Mar 2008 22:03: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 AEBFD1065674
	for ; Tue, 25 Mar 2008 22:03:49 +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 897F08FC1A
	for ; Tue, 25 Mar 2008 22:03:49 +0000 (UTC)
	(envelope-from wsalamon@computer.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2PM3n9t013680
	for ; Tue, 25 Mar 2008 22:03:49 GMT
	(envelope-from wsalamon@computer.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2PM3npn013678
	for perforce@freebsd.org; Tue, 25 Mar 2008 22:03:49 GMT
	(envelope-from wsalamon@computer.org)
Date: Tue, 25 Mar 2008 22:03:49 GMT
Message-Id: <200803252203.m2PM3npn013678@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 138558 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 25 Mar 2008 22:03:50 -0000

http://perforce.freebsd.org/chv.cgi?CH=138558

Change 138558 by wsalamon@vh2 on 2008/03/25 22:03:00

	MAC->Audit integration: Add functionality to allow a MAC policy to
	annotate an audit record with text. The MAC annotation is stored
	on the audit record, and that storage is managed by the audit subsystem,
	not MAC.
	Obtained from:SEDarwin8 project, with modifications.

Affected files ...

.. //depot/projects/trustedbsd/audit_mac/src/sys/conf/files#3 edit
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/audit/audit.c#3 edit
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/audit/audit.h#2 edit
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/audit/audit_bsm.c#2 edit
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/audit/audit_private.h#3 edit
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac/mac_audit.c#2 edit
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac/mac_policy.h#2 edit

Differences ...

==== //depot/projects/trustedbsd/audit_mac/src/sys/conf/files#3 (text+ko) ====

@@ -2058,6 +2058,7 @@
 security/audit/audit_bsm.c	optional audit
 security/audit/audit_bsm_klib.c	optional audit
 security/audit/audit_bsm_token.c	optional audit
+security/audit/audit_mac.c	optional audit
 security/audit/audit_pipe.c	optional audit
 security/audit/audit_syscalls.c	standard
 security/audit/audit_trigger.c	optional audit

==== //depot/projects/trustedbsd/audit_mac/src/sys/security/audit/audit.c#3 (text) ====

@@ -76,6 +76,9 @@
 MALLOC_DEFINE(M_AUDITDATA, "audit_data", "Audit data storage");
 MALLOC_DEFINE(M_AUDITPATH, "audit_path", "Audit path storage");
 MALLOC_DEFINE(M_AUDITTEXT, "audit_text", "Audit text storage");
+#ifdef MAC
+MALLOC_DEFINE(M_AUDITMAC, "audit_mac", "Audit MAC policy storage");
+#endif
 
 SYSCTL_NODE(_security, OID_AUTO, audit, CTLFLAG_RW, 0,
     "TrustedBSD audit controls");
@@ -185,6 +188,12 @@
 	ar->k_ar.ar_subj_pid = td->td_proc->p_pid;
 	ar->k_ar.ar_subj_amask = td->td_ucred->cr_audit.ai_mask;
 	ar->k_ar.ar_subj_term_addr = td->td_ucred->cr_audit.ai_termid;
+#ifdef MAC
+	ar->k_ar.ar_mac_records = (struct mac_audit_record_list_t *)
+	    malloc(sizeof(*ar->k_ar.ar_mac_records), M_AUDITMAC, M_WAITOK);
+	LIST_INIT(ar->k_ar.ar_mac_records);
+	ar->k_ar.ar_forced_by_mac = 0;
+#endif
 	return (0);
 }
 
@@ -208,6 +217,24 @@
 		free(ar->k_ar.ar_arg_argv, M_AUDITTEXT);
 	if (ar->k_ar.ar_arg_envv != NULL)
 		free(ar->k_ar.ar_arg_envv, M_AUDITTEXT);
+
+#ifdef MAC
+	/* Free the audit data from the MAC policies. */
+        do {
+                struct mac_audit_record *head, *next;
+
+		head = LIST_FIRST(ar->k_ar.ar_mac_records);
+		while (head != NULL) {
+			next = LIST_NEXT(head, records);
+			free(head->data, M_TEMP);
+			free(head, M_AUDITMAC);
+			head = next;
+		}
+ 
+		free(ar->k_ar.ar_mac_records, M_AUDITMAC);
+	} while (0);
+#endif
+
 }
 
 /*

==== //depot/projects/trustedbsd/audit_mac/src/sys/security/audit/audit.h#2 (text) ====

@@ -41,6 +41,8 @@
 #error "no user-serviceable parts inside"
 #endif
 
+#include "opt_mac.h"
+
 #include 
 
 #include 
@@ -181,6 +183,23 @@
 void	 audit_thread_alloc(struct thread *td);
 void	 audit_thread_free(struct thread *td);
 
+#ifdef MAC
+/* 
+ * Arbitrary limit on how much data will be logged by the audit entry points.
+ */
+#define MAC_AUDIT_DATA_LIMIT	1024
+
+/*
+ * audit_mac_data() is the MAC Framework's entry point to the audit subsystem.
+ * It currently creates only text and data audit tokens.
+ */
+
+#define MAC_AUDIT_DATA_TYPE	0
+#define MAC_AUDIT_TEXT_TYPE	1
+
+int	audit_mac_data(int type, int len, u_char *data);
+#endif
+
 /*
  * Define a macro to wrap the audit_arg_* calls by checking the global
  * audit_enabled flag before performing the actual call.

==== //depot/projects/trustedbsd/audit_mac/src/sys/security/audit/audit_bsm.c#2 (text) ====

@@ -1422,6 +1422,36 @@
 		return (BSM_NOAUDIT);
 	}
 
+#ifdef MAC
+	do {
+		/* Convert the audit data from the MAC policies */
+		struct mac_audit_record *mar;
+		
+		LIST_FOREACH(mar, ar->ar_mac_records, records) {
+			switch (mar->type) {
+				case MAC_AUDIT_DATA_TYPE:
+					tok = au_to_data(AUP_BINARY, AUR_BYTE,
+					    mar->length, mar->data);
+					kau_write(rec, tok);
+					break;
+				case MAC_AUDIT_TEXT_TYPE:
+					tok = au_to_text(mar->data);
+					kau_write(rec, tok);
+					break;
+				default:
+					/*
+					 * XXX: we can either continue,
+					 * skipping this particular entry,
+					 * or we can pre-verify the list and
+					 * abort before writing any records
+					 */
+					printf("kaudit_to_bsm(): BSM conversion requested for unknown mac_audit data type %d\n",
+					    mar->type);
+			}
+		}
+	} while (0);
+#endif
+
 	kau_write(rec, subj_tok);
 	tok = au_to_return32((char)ar->ar_errno, ar->ar_retval);
 	kau_write(rec, tok);  /* Every record gets a return token */

==== //depot/projects/trustedbsd/audit_mac/src/sys/security/audit/audit_private.h#3 (text) ====

@@ -140,6 +140,15 @@
 	mode_t	pipc_mode;
 };
 
+#ifdef MAC
+struct mac_audit_record {
+	int			type;	/* one of the MAC_AUDIT types */
+	int			length;	/* byte length of the data field */
+	u_char		       *data;	/* the payload */
+	LIST_ENTRY(mac_audit_record) records;
+};
+#endif
+
 struct audit_record {
 	/* Audit record header. */
 	u_int32_t		ar_magic;
@@ -209,6 +218,14 @@
 	int			ar_arg_exitstatus;
 	int			ar_arg_exitretval;
 	struct sockaddr_storage ar_arg_sockaddr;
+#ifdef MAC
+	/* MAC security related fields added by MAC policies
+	 * ar_forced_by_mac is 1 if mac_audit_check_preselect() forced this
+	 * call to be audited, 0 otherwise.
+	 */
+	LIST_HEAD(mac_audit_record_list_t, mac_audit_record)*	ar_mac_records;
+	int			ar_forced_by_mac;
+#endif
 };
 
 /*

==== //depot/projects/trustedbsd/audit_mac/src/sys/security/mac/mac_audit.c#2 (text+ko) ====

@@ -39,6 +39,7 @@
  * $FreeBSD: src/sys/security/mac/mac_audit.c,v 1.3 2007/10/24 19:04:00 rwatson Exp $
  */
 
+#include 
 #include 
 #include 
 #include 
@@ -113,3 +114,35 @@
 
 	return (error);
 }
+
+int
+mac_audit_text(char *text, struct mac_policy_conf *mpc)
+{
+	char *sanitized;
+	const char *name;
+	int i, size, plen, len;
+
+	name = mpc->mpc_name;
+	len = strlen(text);
+	plen = 2 + strlen(name);
+	if (plen + len >= MAC_AUDIT_DATA_LIMIT)
+		return (EINVAL);
+
+	/*
+	 * Make sure the text is only composed of only ASCII printable
+	 * characters.
+	 */
+	for (i=0; i < len; i++)
+		if (text[i] < (char) 32 || text[i] > (char) 126)
+			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);
+
+	strcpy(sanitized, name);
+	strcat(sanitized, ": ");
+	strcat(sanitized, text);
+
+	return (audit_mac_data(MAC_AUDIT_TEXT_TYPE, size, sanitized));
+}

==== //depot/projects/trustedbsd/audit_mac/src/sys/security/mac/mac_policy.h#2 (text+ko) ====

@@ -1,7 +1,7 @@
 /*-
  * Copyright (c) 1999-2002, 2007 Robert N. M. Watson
  * Copyright (c) 2001-2005 Networks Associates Technology, Inc.
- * Copyright (c) 2005-2006 SPARTA, Inc.
+ * Copyright (c) 2005-2007 SPARTA, Inc.
  * All rights reserved.
  *
  * This software was developed by Robert Watson for the TrustedBSD Project.
@@ -981,4 +981,10 @@
 intptr_t	mac_label_get(struct label *l, int slot);
 void		mac_label_set(struct label *l, int slot, intptr_t v);
 
+/*
+ * This is the entry point a MAC policy will call to add NULL-terminated
+ * ASCII text to the current audit record.
+ */
+int	mac_audit_text(char *text, struct mac_policy_conf *mpc);
+
 #endif /* !_SYS_SECURITY_MAC_MAC_POLICY_H_ */

From owner-p4-projects@FreeBSD.ORG  Tue Mar 25 22:03:50 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 57604106571C; Tue, 25 Mar 2008 22:03: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 CF9CC1065677
	for ; Tue, 25 Mar 2008 22:03:49 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id AC14C8FC1B
	for ; Tue, 25 Mar 2008 22:03:49 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2PM3njF013685
	for ; Tue, 25 Mar 2008 22:03:49 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2PM3n8W013683
	for perforce@freebsd.org; Tue, 25 Mar 2008 22:03:49 GMT
	(envelope-from jb@freebsd.org)
Date: Tue, 25 Mar 2008 22:03:49 GMT
Message-Id: <200803252203.m2PM3n8W013683@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138559 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 25 Mar 2008 22:03:50 -0000

http://perforce.freebsd.org/chv.cgi?CH=138559

Change 138559 by jb@jb_freebsd1 on 2008/03/25 22:03:09

	This file is amd64-specfic, so remove #ifdefs and non-amd64 code
	to clean it up.

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/dtrace_isa.c#6 edit

Differences ...

==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/dtrace_isa.c#6 (text+ko) ====

@@ -33,6 +33,7 @@
 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -302,39 +303,28 @@
 	while (pcstack_limit-- > 0)
 		*pcstack++ = NULL;
 }
+#endif
 
 /*ARGSUSED*/
 uint64_t
 dtrace_getarg(int arg, int aframes)
 {
 	uintptr_t val;
-	struct xframe *fp = (struct xframe *)dtrace_getfp();
+	struct amd64_frame *fp = (struct amd64_frame *)dtrace_getfp();
 	uintptr_t *stack;
 	int i;
-#if defined(__amd64)
+
 	/*
 	 * A total of 6 arguments are passed via registers; any argument with
 	 * index of 5 or lower is therefore in a register.
 	 */
 	int inreg = 5;
-#endif
 
 	for (i = 1; i <= aframes; i++) {
-		fp = (struct xframe *)(fp->fr_savfp);
+		fp = fp->f_frame;
 
-		if (fp->fr_savpc == (pc_t)dtrace_invop_callsite) {
-#if !defined(__amd64)
+		if (fp->f_retaddr == (long)dtrace_invop_callsite) {
 			/*
-			 * If we pass through the invalid op handler, we will
-			 * use the pointer that it passed to the stack as the
-			 * second argument to dtrace_invop() as the pointer to
-			 * the stack.  When using this stack, we must step
-			 * beyond the EIP/RIP that was pushed when the trap was
-			 * taken -- hence the "+ 1" below.
-			 */
-			stack = ((uintptr_t **)&fp[1])[1] + 1;
-#else
-			/*
 			 * In the case of amd64, we will use the pointer to the
 			 * regs structure that was pushed when we took the
 			 * trap.  To get this structure, we must increment
@@ -347,7 +337,7 @@
 			 * we're seeking is passed in regsiters, we can just
 			 * load it directly.
 			 */
-			struct regs *rp = (struct regs *)((uintptr_t)&fp[1] +
+			struct reg *rp = (struct reg *)((uintptr_t)&fp[1] +
 			    sizeof (uintptr_t));
 
 			if (arg <= inreg) {
@@ -356,7 +346,6 @@
 				stack = (uintptr_t *)(rp->r_rsp);
 				arg -= inreg;
 			}
-#endif
 			goto load;
 		}
 
@@ -372,7 +361,6 @@
 	 */
 	arg++;
 
-#if defined(__amd64)
 	if (arg <= inreg) {
 		/*
 		 * This shouldn't happen.  If the argument is passed in a
@@ -384,7 +372,6 @@
 	}
 
 	arg -= (inreg + 1);
-#endif
 	stack = (uintptr_t *)&fp[1];
 
 load:
@@ -395,9 +382,7 @@
 	return (val);
 	return (0);
 }
-#endif
 
-/*ARGSUSED*/
 int
 dtrace_getstackdepth(int aframes)
 {

From owner-p4-projects@FreeBSD.ORG  Tue Mar 25 22:04:51 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5FD21106567C; Tue, 25 Mar 2008 22: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 04D411065675
	for ; Tue, 25 Mar 2008 22:04:51 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D56E88FC1B
	for ; Tue, 25 Mar 2008 22:04:50 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2PM4oSZ013713
	for ; Tue, 25 Mar 2008 22:04:50 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2PM4ola013711
	for perforce@freebsd.org; Tue, 25 Mar 2008 22:04:50 GMT
	(envelope-from jb@freebsd.org)
Date: Tue, 25 Mar 2008 22:04:50 GMT
Message-Id: <200803252204.m2PM4ola013711@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138560 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 25 Mar 2008 22:04:52 -0000

http://perforce.freebsd.org/chv.cgi?CH=138560

Change 138560 by jb@jb_freebsd1 on 2008/03/25 22:03:59

	This file is i386-specific so remove #ifdefs and non-i386 code.

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/i386/dtrace_isa.c#9 edit

Differences ...

==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/i386/dtrace_isa.c#9 (text+ko) ====

@@ -44,11 +44,6 @@
 #define INKERNEL(va) (((vm_offset_t)(va)) >= USRSTACK && \
 	 ((vm_offset_t)(va)) < VM_MAX_KERNEL_ADDRESS)
 
-struct frame {
-	greg_t	fr_savfp;		/* saved frame pointer */
-	greg_t	fr_savpc;		/* saved program counter */
-};
-
 uint8_t dtrace_fuword8_nocheck(void *);
 uint16_t dtrace_fuword16_nocheck(void *);
 uint32_t dtrace_fuword32_nocheck(void *);
@@ -350,27 +345,20 @@
 	while (pcstack_limit-- > 0)
 		*pcstack++ = NULL;
 }
+#endif
 
 uint64_t
 dtrace_getarg(int arg, int aframes)
 {
 	uintptr_t val;
-	struct frame *fp = (struct frame *)dtrace_getfp();
+	struct i386_frame *fp = (struct i386_frame *)dtrace_getfp();
 	uintptr_t *stack;
 	int i;
-#if defined(__amd64)
-	/*
-	 * A total of 6 arguments are passed via registers; any argument with
-	 * index of 5 or lower is therefore in a register.
-	 */
-	int inreg = 5;
-#endif
 
 	for (i = 1; i <= aframes; i++) {
-		fp = (struct frame *)(fp->fr_savfp);
+		fp = fp->f_frame;
 
-		if (fp->fr_savpc == (pc_t)dtrace_invop_callsite) {
-#if !defined(__amd64)
+		if (fp->f_retaddr == (long)dtrace_invop_callsite) {
 			/*
 			 * If we pass through the invalid op handler, we will
 			 * use the pointer that it passed to the stack as the
@@ -380,30 +368,6 @@
 			 * taken -- hence the "+ 1" below.
 			 */
 			stack = ((uintptr_t **)&fp[1])[1] + 1;
-#else
-			/*
-			 * In the case of amd64, we will use the pointer to the
-			 * regs structure that was pushed when we took the
-			 * trap.  To get this structure, we must increment
-			 * beyond the frame structure, and then again beyond
-			 * the calling RIP stored in dtrace_invop().  If the
-			 * argument that we're seeking is passed on the stack,
-			 * we'll pull the true stack pointer out of the saved
-			 * registers and decrement our argument by the number
-			 * of arguments passed in registers; if the argument
-			 * we're seeking is passed in regsiters, we can just
-			 * load it directly.
-			 */
-			struct regs *rp = (struct regs *)((uintptr_t)&fp[1] +
-			    sizeof (uintptr_t));
-
-			if (arg <= inreg) {
-				stack = (uintptr_t *)&rp->r_rdi;
-			} else {
-				stack = (uintptr_t *)(rp->r_rsp);
-				arg -= inreg;
-			}
-#endif
 			goto load;
 		}
 
@@ -419,19 +383,6 @@
 	 */
 	arg++;
 
-#if defined(__amd64)
-	if (arg <= inreg) {
-		/*
-		 * This shouldn't happen.  If the argument is passed in a
-		 * register then it should have been, well, passed in a
-		 * register...
-		 */
-		DTRACE_CPUFLAG_SET(CPU_DTRACE_ILLOP);
-		return (0);
-	}
-
-	arg -= (inreg + 1);
-#endif
 	stack = (uintptr_t *)&fp[1];
 
 load:
@@ -441,14 +392,13 @@
 
 	return (val);
 }
-#endif
 
 int
 dtrace_getstackdepth(int aframes)
 {
 	int depth = 0;
 	struct i386_frame *frame;
-	vm_offset_t rbp;
+	vm_offset_t ebp;
 
 	aframes++;
 	ebp = dtrace_getfp();

From owner-p4-projects@FreeBSD.ORG  Tue Mar 25 22:04:53 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4F0D8106571C; Tue, 25 Mar 2008 22: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 41099106567A
	for ; Tue, 25 Mar 2008 22:04:51 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 03CEC8FC1C
	for ; Tue, 25 Mar 2008 22:04:51 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2PM4oKg013718
	for ; Tue, 25 Mar 2008 22:04:50 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2PM4ofs013716
	for perforce@freebsd.org; Tue, 25 Mar 2008 22:04:50 GMT
	(envelope-from jb@freebsd.org)
Date: Tue, 25 Mar 2008 22:04:50 GMT
Message-Id: <200803252204.m2PM4ofs013716@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138561 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 25 Mar 2008 22:04:53 -0000

http://perforce.freebsd.org/chv.cgi?CH=138561

Change 138561 by jb@jb_freebsd1 on 2008/03/25 22:04:39

	#include a missing header file.

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/i386/dtrace_subr.c#15 edit

Differences ...

==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/i386/dtrace_subr.c#15 (text+ko) ====

@@ -36,6 +36,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 

From owner-p4-projects@FreeBSD.ORG  Tue Mar 25 22:12:02 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0921E1065670; Tue, 25 Mar 2008 22:12:02 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A1E49106564A
	for ; Tue, 25 Mar 2008 22:12:01 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 7AD4C8FC16
	for ; Tue, 25 Mar 2008 22:12:01 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2PMC1Ua015022
	for ; Tue, 25 Mar 2008 22:12:01 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2PMBxks015016
	for perforce@freebsd.org; Tue, 25 Mar 2008 22:11:59 GMT
	(envelope-from jb@freebsd.org)
Date: Tue, 25 Mar 2008 22:11:59 GMT
Message-Id: <200803252211.m2PMBxks015016@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138562 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 25 Mar 2008 22:12:02 -0000

http://perforce.freebsd.org/chv.cgi?CH=138562

Change 138562 by jb@jb_freebsd1 on 2008/03/25 22:11:34

	Implement the lockstat provider for FreeBSD.
	
	Submitted by: stacey _ son dot org

Affected files ...

.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/dtrace.c#17 edit
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owned.d#5 edit
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owner.d#5 edit
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_type_adaptive.d#5 edit
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.rw.d#5 edit
.. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_link.c#16 edit
.. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_open.c#29 edit
.. //depot/projects/dtrace/src/sys/cddl/dev/lockstat/lockstat.c#1 add
.. //depot/projects/dtrace/src/sys/conf/files#78 edit
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#45 edit
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dtrace.h#35 edit
.. //depot/projects/dtrace/src/sys/kern/kern_lockstat.c#1 add
.. //depot/projects/dtrace/src/sys/kern/kern_mutex.c#19 edit
.. //depot/projects/dtrace/src/sys/kern/kern_rwlock.c#15 edit
.. //depot/projects/dtrace/src/sys/kern/kern_sx.c#13 edit
.. //depot/projects/dtrace/src/sys/modules/dtrace/Makefile#26 edit
.. //depot/projects/dtrace/src/sys/modules/dtrace/Makefile.inc#7 edit
.. //depot/projects/dtrace/src/sys/modules/dtrace/dtraceall/dtraceall.c#7 edit
.. //depot/projects/dtrace/src/sys/modules/dtrace/lockstat/Makefile#1 add
.. //depot/projects/dtrace/src/sys/sys/lockstat.h#1 add
.. //depot/projects/dtrace/src/sys/sys/mutex.h#10 edit
.. //depot/projects/dtrace/src/sys/sys/rwlock.h#9 edit
.. //depot/projects/dtrace/src/sys/sys/sx.h#8 edit
.. //depot/projects/dtrace/src/tools/test/dtrace/Makefile#29 edit

Differences ...

==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/dtrace.c#17 (text) ====

@@ -1373,8 +1373,14 @@
 		    dtrace_errmsg(NULL, err));
 	}
 
+#if defined(__i386__)
+	/* XXX The 32-bit seems to need more buffer space by default -sson */
+	(void) dtrace_setopt(g_dtp, "bufsize", "12m");
+	(void) dtrace_setopt(g_dtp, "aggsize", "12m");
+#else
 	(void) dtrace_setopt(g_dtp, "bufsize", "4m");
 	(void) dtrace_setopt(g_dtp, "aggsize", "4m");
+#endif
 
 	/*
 	 * If -G is specified, enable -xlink=dynamic and -xunodefs to permit

==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owned.d#5 (text+ko) ====

@@ -38,8 +38,8 @@
 
 lockstat:::adaptive-acquire
 {
-	this->owned = mutex_owned((kmutex_t *)arg0);
-	this->owner = mutex_owner((kmutex_t *)arg0);
+	this->owned = mutex_owned((struct mtx *)arg0);
+	this->owner = mutex_owner((struct mtx *)arg0);
 }
 
 lockstat:::adaptive-acquire

==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owner.d#5 (text+ko) ====

@@ -41,17 +41,17 @@
 
 #pragma D option quiet
 
-kthread_t *ptr;
+struct thread *ptr;
 
 BEGIN
 {
 	i = 0;
 }
 
-lockstat:genunix:mutex_enter:adaptive-acquire
+lockstat::mtx_lock:adaptive-acquire
 {
 
-	ptr = mutex_owner((kmutex_t *)arg0);
+	ptr = mutex_owner((struct mtx *)arg0);
 	i++;
 }
 

==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_type_adaptive.d#5 (text+ko) ====

@@ -44,9 +44,9 @@
 	ret = -99;
 }
 
-mutex_enter:adaptive-acquire
+mtx_lock:adaptive-acquire
 {
-	ret = mutex_type_adaptive((kmutex_t *)arg0);
+	ret = mutex_type_adaptive((struct mtx *)arg0);
 	i++;
 }
 

==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.rw.d#5 (text+ko) ====

@@ -38,22 +38,22 @@
 fbt:::
 /on/
 {
-	@[rw_read_held((krwlock_t *)&`clock)] = count();
-	@[rw_read_held((krwlock_t *)rand())] = count();
+	@[rw_read_held((struct rwlock *)&`unp_global_rwlock)] = count();
+	@[rw_read_held((struct rwlock *)rand())] = count();
 }
 
 fbt:::
 /on/
 {
-	@[rw_write_held((krwlock_t *)&`clock)] = count();
-	@[rw_write_held((krwlock_t *)rand())] = count();
+	@[rw_write_held((struct rwlock *)&`unp_global_rwlock)] = count();
+	@[rw_write_held((struct rwlock *)rand())] = count();
 }
 
 fbt:::
 /on/
 {
-	@[rw_iswriter((krwlock_t *)&`clock)] = count();
-	@[rw_iswriter((krwlock_t *)rand())] = count();
+	@[rw_iswriter((struct rwlock *)&`unp_global_rwlock)] = count();
+	@[rw_iswriter((struct rwlock *)rand())] = count();
 }
 
 tick-1sec

==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_link.c#16 (text) ====

@@ -1712,8 +1712,12 @@
 		 * Arches which are 32-bit only just use the normal
 		 * library path.
 		 */
+#if defined(__i386__)
+		int use_32 = 1;  /* use /usr/lib/... -sson */
+#else
 		int use_32 = 0;
 #endif
+#endif
 
 		(void) snprintf(drti, sizeof (drti), "/usr/lib%s/dtrace/drti.o",
 		    use_32 ? "":"32");

==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_open.c#29 (text) ====

@@ -60,6 +60,9 @@
 #include 
 #include 
 #endif
+#if defined(__i386__)
+#include 
+#endif
 
 /*
  * Stability and versioning definitions.  These #defines are used in the tables
@@ -133,6 +136,10 @@
  */
 #if !defined(sun)
 static char	curthread_str[MAXPATHLEN];
+static char	intmtx_str[MAXPATHLEN];
+static char	threadmtx_str[MAXPATHLEN];
+static char	rwlock_str[MAXPATHLEN];
+static char	sxlock_str[MAXPATHLEN];
 #endif
 
 /*
@@ -273,8 +280,10 @@
 	DT_VERS_1_5, &dt_idops_func, "string(int, void *)" },
 { "ipl", DT_IDENT_SCALAR, 0, DIF_VAR_IPL, DT_ATTR_STABCMN, DT_VERS_1_0,
 	&dt_idops_type, "uint_t" },
+#if defined(sun)
 { "jstack", DT_IDENT_ACTFUNC, 0, DT_ACT_JSTACK, DT_ATTR_STABCMN, DT_VERS_1_0,
 	&dt_idops_func, "stack(...)" },
+#endif
 { "lltostr", DT_IDENT_FUNC, 0, DIF_SUBR_LLTOSTR, DT_ATTR_STABCMN, DT_VERS_1_0,
 	&dt_idops_func, "string(int64_t)" },
 { "lquantize", DT_IDENT_AGGFUNC, 0, DTRACEAGG_LQUANTIZE,
@@ -294,6 +303,7 @@
 { "msgsize", DT_IDENT_FUNC, 0, DIF_SUBR_MSGSIZE,
 	DT_ATTR_STABCMN, DT_VERS_1_0,
 	&dt_idops_func, "size_t(mblk_t *)" },
+#if defined(sun)
 { "mutex_owned", DT_IDENT_FUNC, 0, DIF_SUBR_MUTEX_OWNED,
 	DT_ATTR_EVOLCMN, DT_VERS_1_0,
 	&dt_idops_func, "int(genunix`kmutex_t *)" },
@@ -306,6 +316,20 @@
 { "mutex_type_spin", DT_IDENT_FUNC, 0, DIF_SUBR_MUTEX_TYPE_SPIN,
 	DT_ATTR_EVOLCMN, DT_VERS_1_0,
 	&dt_idops_func, "int(genunix`kmutex_t *)" },
+#else
+{ "mutex_owned", DT_IDENT_FUNC, 0, DIF_SUBR_MUTEX_OWNED,
+	DT_ATTR_EVOLCMN, DT_VERS_1_0,
+	&dt_idops_func, intmtx_str },
+{ "mutex_owner", DT_IDENT_FUNC, 0, DIF_SUBR_MUTEX_OWNER,
+	DT_ATTR_EVOLCMN, DT_VERS_1_0,
+	&dt_idops_func, threadmtx_str },
+{ "mutex_type_adaptive", DT_IDENT_FUNC, 0, DIF_SUBR_MUTEX_TYPE_ADAPTIVE,
+	DT_ATTR_EVOLCMN, DT_VERS_1_0,
+	&dt_idops_func, intmtx_str },
+{ "mutex_type_spin", DT_IDENT_FUNC, 0, DIF_SUBR_MUTEX_TYPE_SPIN,
+	DT_ATTR_EVOLCMN, DT_VERS_1_0,
+	&dt_idops_func, intmtx_str },
+#endif
 { "ntohl", DT_IDENT_FUNC, 0, DIF_SUBR_NTOHL, DT_ATTR_EVOLCMN, DT_VERS_1_3,
 	&dt_idops_func, "uint32_t(uint32_t)" },
 { "ntohll", DT_IDENT_FUNC, 0, DIF_SUBR_NTOHLL, DT_ATTR_EVOLCMN, DT_VERS_1_3,
@@ -348,6 +372,7 @@
 	&dt_idops_func, "int()" },
 { "rindex", DT_IDENT_FUNC, 0, DIF_SUBR_RINDEX, DT_ATTR_STABCMN, DT_VERS_1_1,
 	&dt_idops_func, "int(const char *, const char *, [int])" },
+#if defined(sun)
 { "rw_iswriter", DT_IDENT_FUNC, 0, DIF_SUBR_RW_ISWRITER,
 	DT_ATTR_EVOLCMN, DT_VERS_1_0,
 	&dt_idops_func, "int(genunix`krwlock_t *)" },
@@ -357,6 +382,17 @@
 { "rw_write_held", DT_IDENT_FUNC, 0, DIF_SUBR_RW_WRITE_HELD,
 	DT_ATTR_EVOLCMN, DT_VERS_1_0,
 	&dt_idops_func, "int(genunix`krwlock_t *)" },
+#else
+{ "rw_iswriter", DT_IDENT_FUNC, 0, DIF_SUBR_RW_ISWRITER,
+	DT_ATTR_EVOLCMN, DT_VERS_1_0,
+	&dt_idops_func, rwlock_str },
+{ "rw_read_held", DT_IDENT_FUNC, 0, DIF_SUBR_RW_READ_HELD,
+	DT_ATTR_EVOLCMN, DT_VERS_1_0,
+	&dt_idops_func, rwlock_str },
+{ "rw_write_held", DT_IDENT_FUNC, 0, DIF_SUBR_RW_WRITE_HELD,
+	DT_ATTR_EVOLCMN, DT_VERS_1_0,
+	&dt_idops_func, rwlock_str },
+#endif
 { "self", DT_IDENT_PTR, 0, 0, DT_ATTR_STABCMN, DT_VERS_1_0,
 	&dt_idops_type, "void" },
 { "setopt", DT_IDENT_ACTFUNC, 0, DT_ACT_SETOPT, DT_ATTR_STABCMN,
@@ -392,6 +428,17 @@
 	&dt_idops_func, "string(const char *, int, [int])" },
 { "sum", DT_IDENT_AGGFUNC, 0, DTRACEAGG_SUM, DT_ATTR_STABCMN, DT_VERS_1_0,
 	&dt_idops_func, "void(@)" },
+#if !defined(sun)
+{ "sx_isexclusive", DT_IDENT_FUNC, 0, DIF_SUBR_SX_ISEXCLUSIVE,
+	DT_ATTR_EVOLCMN, DT_VERS_1_0,
+	&dt_idops_func, sxlock_str },
+{ "sx_shared_held", DT_IDENT_FUNC, 0, DIF_SUBR_SX_SHARED_HELD,
+	DT_ATTR_EVOLCMN, DT_VERS_1_0,
+	&dt_idops_func, sxlock_str },
+{ "sx_exclusive_held", DT_IDENT_FUNC, 0, DIF_SUBR_SX_EXCLUSIVE_HELD,
+	DT_ATTR_EVOLCMN, DT_VERS_1_0,
+	&dt_idops_func, sxlock_str },
+#endif
 { "sym", DT_IDENT_ACTFUNC, 0, DT_ACT_SYM, DT_ATTR_STABCMN,
 	DT_VERS_1_2, &dt_idops_func, "_symaddr(uintptr_t)" },
 { "system", DT_IDENT_ACTFUNC, 0, DT_ACT_SYSTEM, DT_ATTR_STABCMN, DT_VERS_1_0,
@@ -412,14 +459,17 @@
 	DT_VERS_1_0, &dt_idops_func, "void(...)" },
 { "typeref", DT_IDENT_FUNC, 0, DIF_SUBR_TYPEREF, DT_ATTR_STABCMN, DT_VERS_1_1,
 	&dt_idops_func, "uintptr_t *(void *, size_t, string, size_t)" },
+#if defined(sun)
 { "uaddr", DT_IDENT_ACTFUNC, 0, DT_ACT_UADDR, DT_ATTR_STABCMN,
 	DT_VERS_1_2, &dt_idops_func, "_usymaddr(uintptr_t)" },
 { "ucaller", DT_IDENT_SCALAR, 0, DIF_VAR_UCALLER, DT_ATTR_STABCMN,
 	DT_VERS_1_2, &dt_idops_type, "uint64_t" },
 { "ufunc", DT_IDENT_ACTFUNC, 0, DT_ACT_USYM, DT_ATTR_STABCMN,
 	DT_VERS_1_2, &dt_idops_func, "_usymaddr(uintptr_t)" },
+#endif
 { "uid", DT_IDENT_SCALAR, 0, DIF_VAR_UID, DT_ATTR_STABCMN, DT_VERS_1_0,
 	&dt_idops_type, "uid_t" },
+#if defined(sun)
 { "umod", DT_IDENT_ACTFUNC, 0, DT_ACT_UMOD, DT_ATTR_STABCMN,
 	DT_VERS_1_2, &dt_idops_func, "_usymaddr(uintptr_t)" },
 { "uregs", DT_IDENT_ARRAY, 0, DIF_VAR_UREGS, DT_ATTR_STABCMN, DT_VERS_1_0,
@@ -431,14 +481,17 @@
 	&dt_idops_type, "uint32_t" },
 { "usym", DT_IDENT_ACTFUNC, 0, DT_ACT_USYM, DT_ATTR_STABCMN,
 	DT_VERS_1_2, &dt_idops_func, "_usymaddr(uintptr_t)" },
+#endif
 { "vtimestamp", DT_IDENT_SCALAR, 0, DIF_VAR_VTIMESTAMP,
 	DT_ATTR_STABCMN, DT_VERS_1_0,
 	&dt_idops_type, "uint64_t" },
 { "walltimestamp", DT_IDENT_SCALAR, 0, DIF_VAR_WALLTIMESTAMP,
 	DT_ATTR_STABCMN, DT_VERS_1_0,
 	&dt_idops_type, "int64_t" },
+#if defined(sun)
 { "zonename", DT_IDENT_SCALAR, 0, DIF_VAR_ZONENAME,
 	DT_ATTR_STABCMN, DT_VERS_1_0, &dt_idops_type, "string" },
+#endif
 { NULL, 0, 0, 0, { 0, 0, 0 }, 0, NULL, NULL }
 };
 
@@ -730,6 +783,10 @@
 			break;
 	}
 #endif
+#if defined(__i386__)
+	/* make long doubles 64 bits -sson */
+	(void) fpsetprec(FP_PE);
+#endif
 }
 
 static dtrace_hdl_t *
@@ -1185,6 +1242,10 @@
 	 * Format the global variables based on the kernel module name.
 	 */
 	snprintf(curthread_str, sizeof(curthread_str), "%s`struct thread *",p);
+	snprintf(intmtx_str, sizeof(intmtx_str), "int(%s`struct mtx *)",p);
+	snprintf(threadmtx_str, sizeof(threadmtx_str), "struct thread *(%s`struct mtx *)",p);
+	snprintf(rwlock_str, sizeof(rwlock_str), "int(%s`struct rwlock *)",p);
+	snprintf(sxlock_str, sizeof(sxlock_str), "int(%s`struct sxlock *)",p);
 	}
 #endif
 

==== //depot/projects/dtrace/src/sys/conf/files#78 (text+ko) ====

@@ -1466,6 +1466,7 @@
 kern/kern_linker.c		standard
 kern/kern_lock.c		standard
 kern/kern_lockf.c		standard
+kern/kern_lockstat.c		optional kdtrace_hooks
 kern/kern_malloc.c		standard
 kern/kern_mbuf.c		standard
 kern/kern_mib.c			standard

==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#45 (text) ====

@@ -117,6 +117,9 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include "dtrace_cddl.h"
@@ -2832,6 +2835,7 @@
 		}
 		return (mstate->dtms_stackdepth);
 
+#if defined(sun)
 	case DIF_VAR_USTACKDEPTH:
 		if (!dtrace_priv_proc(state))
 			return (0);
@@ -2851,6 +2855,7 @@
 			mstate->dtms_present |= DTRACE_MSTATE_USTACKDEPTH;
 		}
 		return (mstate->dtms_ustackdepth);
+#endif
 
 	case DIF_VAR_CALLER:
 		if (!dtrace_priv_kernel(state))
@@ -2887,6 +2892,7 @@
 		}
 		return (mstate->dtms_caller);
 
+#if defined(sun)
 	case DIF_VAR_UCALLER:
 		if (!dtrace_priv_proc(state))
 			return (0);
@@ -2910,6 +2916,7 @@
 		}
 
 		return (mstate->dtms_ucaller);
+#endif
 
 	case DIF_VAR_PROBEPROV:
 		ASSERT(mstate->dtms_present & DTRACE_MSTATE_PROBE);
@@ -3154,6 +3161,15 @@
 		krwlock_t ri;
 		uintptr_t rw;
 	} r;
+#else
+	union {
+		struct mtx *mi;
+		uintptr_t mx;
+	} m;
+	union {
+		struct sx *si;
+		uintptr_t sx;
+	} s;
 #endif
 
 	switch (subr) {
@@ -3163,7 +3179,6 @@
 
 #if defined(sun)
 	case DIF_SUBR_MUTEX_OWNED:
-	union {
 		if (!dtrace_canload(tupregs[0].dttk_value, sizeof (kmutex_t),
 		    mstate, vstate)) {
 			regs[rd] = 0;
@@ -3178,7 +3193,6 @@
 		break;
 
 	case DIF_SUBR_MUTEX_OWNER:
-	union {
 		if (!dtrace_canload(tupregs[0].dttk_value, sizeof (kmutex_t),
 		    mstate, vstate)) {
 			regs[rd] = 0;
@@ -3194,7 +3208,6 @@
 		break;
 
 	case DIF_SUBR_MUTEX_TYPE_ADAPTIVE:
-	union {
 		if (!dtrace_canload(tupregs[0].dttk_value, sizeof (kmutex_t),
 		    mstate, vstate)) {
 			regs[rd] = 0;
@@ -3206,7 +3219,6 @@
 		break;
 
 	case DIF_SUBR_MUTEX_TYPE_SPIN:
-	union {
 		if (!dtrace_canload(tupregs[0].dttk_value, sizeof (kmutex_t),
 		    mstate, vstate)) {
 			regs[rd] = 0;
@@ -3218,7 +3230,6 @@
 		break;
 
 	case DIF_SUBR_RW_READ_HELD: {
-	union {
 		uintptr_t tmp;
 
 		if (!dtrace_canload(tupregs[0].dttk_value, sizeof (uintptr_t),
@@ -3233,7 +3244,6 @@
 	}
 
 	case DIF_SUBR_RW_WRITE_HELD:
-	union {
 		if (!dtrace_canload(tupregs[0].dttk_value, sizeof (krwlock_t),
 		    mstate, vstate)) {
 			regs[rd] = 0;
@@ -3245,7 +3255,6 @@
 		break;
 
 	case DIF_SUBR_RW_ISWRITER:
-	union {
 		if (!dtrace_canload(tupregs[0].dttk_value, sizeof (krwlock_t),
 		    mstate, vstate)) {
 			regs[rd] = 0;
@@ -3255,7 +3264,77 @@
 		r.rw = dtrace_loadptr(tupregs[0].dttk_value);
 		regs[rd] = _RW_ISWRITER(&r.ri);
 		break;
-#endif
+
+#else
+	/* 
+         * XXX - The following code works because mutex, rwlocks, & sxlocks
+         *       all have similar data structures in FreeBSD.  This may not be
+         *	 good if someone changes one of the lock data structures.
+	 * 	 Ideally, it would be nice if all these shared a common lock 
+	 * 	 object.
+         */
+	case DIF_SUBR_MUTEX_OWNED:
+		/* XXX - need to use dtrace_canload() and dtrace_loadptr() */ 
+		m.mx = tupregs[0].dttk_value;
+
+		if (LO_CLASSINDEX(&(m.mi->lock_object)) < 2) { 
+			regs[rd] = !(m.mi->mtx_lock & MTX_UNOWNED);
+		} else {	
+			regs[rd] = !(m.mi->mtx_lock & SX_UNLOCKED);
+		}
+		break;
+
+	case DIF_SUBR_MUTEX_OWNER:
+		/* XXX - need to use dtrace_canload() and dtrace_loadptr() */ 
+		m.mx = tupregs[0].dttk_value;
+
+		if (LO_CLASSINDEX(&(m.mi->lock_object)) < 2) { 
+			regs[rd] = m.mi->mtx_lock & ~MTX_FLAGMASK;
+		} else {
+			if (!(m.mi->mtx_lock & SX_LOCK_SHARED)) 
+				regs[rd] = SX_OWNER(m.mi->mtx_lock);
+			else
+				regs[rd] = 0;
+		}
+		break;
+
+	case DIF_SUBR_MUTEX_TYPE_ADAPTIVE:
+		/* XXX - need to use dtrace_canload() and dtrace_loadptr() */ 
+		m.mx = tupregs[0].dttk_value;
+
+		regs[rd] = (LO_CLASSINDEX(&(m.mi->lock_object)) != 0);
+		break;
+
+	case DIF_SUBR_MUTEX_TYPE_SPIN:
+		/* XXX - need to use dtrace_canload() and dtrace_loadptr() */ 
+		m.mx = tupregs[0].dttk_value;
+
+		regs[rd] = (LO_CLASSINDEX(&(m.mi->lock_object)) == 0);
+		break;
+
+	case DIF_SUBR_RW_READ_HELD: 
+	case DIF_SUBR_SX_SHARED_HELD: 
+		/* XXX - need to use dtrace_canload() and dtrace_loadptr() */ 
+		s.sx = tupregs[0].dttk_value;
+		regs[rd] = ((s.si->sx_lock & SX_LOCK_SHARED)  && 
+			    (SX_OWNER(s.si->sx_lock) >> SX_SHARERS_SHIFT) != 0);
+		break;
+
+	case DIF_SUBR_RW_WRITE_HELD:
+	case DIF_SUBR_SX_EXCLUSIVE_HELD:
+		/* XXX - need to use dtrace_canload() and dtrace_loadptr() */ 
+		s.sx = tupregs[0].dttk_value;
+		regs[rd] = (SX_OWNER(s.si->sx_lock) == (uintptr_t) curthread); 
+		break;
+
+	case DIF_SUBR_RW_ISWRITER:
+	case DIF_SUBR_SX_ISEXCLUSIVE:
+		/* XXX - need to use dtrace_canload() and dtrace_loadptr() */ 
+		s.sx = tupregs[0].dttk_value;
+		regs[rd] = ((s.si->sx_lock & SX_LOCK_EXCLUSIVE_WAITERS) ||
+		            !(s.si->sx_lock & SX_LOCK_SHARED));
+		break;
+#endif /* ! defined(sun) */
 
 	case DIF_SUBR_BCOPY: {
 		/*
@@ -5641,12 +5720,11 @@
 	cpu->cpu_dtrace_chilled += val;
 }
 
+#if defined(sun)
 static void
 dtrace_action_ustack(dtrace_mstate_t *mstate, dtrace_state_t *state,
     uint64_t *buf, uint64_t arg)
 {
-	printf("%s(%d): unimplemented.\n",__func__,__LINE__);
-#if defined(sun)
 	int nframes = DTRACE_USTACK_NFRAMES(arg);
 	int strsize = DTRACE_USTACK_STRSIZE(arg);
 	uint64_t *pcs = &buf[1], *fps;
@@ -5754,8 +5832,8 @@
 
 out:
 	mstate->dtms_scratch_ptr = old;
+}
 #endif
-}
 
 /*
  * If you're looking for the epicenter of DTrace, you just found it.  This
@@ -6078,6 +6156,7 @@
 				    (uint32_t *)arg0);
 				continue;
 
+#if defined(sun)
 			case DTRACEACT_JSTACK:
 			case DTRACEACT_USTACK:
 				if (!dtrace_priv_proc(state))
@@ -6119,6 +6198,7 @@
 				    DTRACE_USTACK_NFRAMES(rec->dtrd_arg) + 1);
 				DTRACE_CPUFLAG_CLEAR(CPU_DTRACE_NOFAULT);
 				continue;
+#endif
 
 			default:
 				break;

==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dtrace.h#35 (text) ====

@@ -297,8 +297,11 @@
 #define	DIF_SUBR_INET_NTOA6		43
 #define	DIF_SUBR_MEMREF			44
 #define	DIF_SUBR_TYPEREF		45
+#define	DIF_SUBR_SX_SHARED_HELD		46
+#define	DIF_SUBR_SX_EXCLUSIVE_HELD	47
+#define	DIF_SUBR_SX_ISEXCLUSIVE		48
 
-#define	DIF_SUBR_MAX			45	/* max subroutine value */
+#define	DIF_SUBR_MAX			48	/* max subroutine value */
 
 typedef uint32_t dif_instr_t;
 

==== //depot/projects/dtrace/src/sys/kern/kern_mutex.c#19 (text+ko) ====

@@ -40,6 +40,7 @@
 #include "opt_ddb.h"
 #include "opt_global.h"
 #include "opt_sched.h"
+#include "opt_kdtrace.h"
 
 #include 
 #include 
@@ -59,6 +60,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -201,8 +203,10 @@
 	    line);
 	mtx_assert(m, MA_OWNED);
 
-	if (m->mtx_recurse == 0)
+	if (m->mtx_recurse == 0) {
 		lock_profile_release_lock(&m->lock_object);
+		LOCKSTAT_RECORD0(LS_MTX_UNLOCK_RELEASE, m); 
+	}
 	_rel_sleep_lock(m, curthread, opts, file, line);
 }
 
@@ -276,10 +280,11 @@
 		WITNESS_LOCK(&m->lock_object, opts | LOP_EXCLUSIVE | LOP_TRYLOCK,
 		    file, line);
 		curthread->td_locks++;
-		if (m->mtx_recurse == 0)
+		if (m->mtx_recurse == 0) {
 			lock_profile_obtain_lock_success(&m->lock_object, contested,
 			    waittime, file, line);
-
+			LOCKSTAT_RECORD0(LS_MTX_LOCK_ACQUIRE, m);
+		}
 	}
 
 	return (rval);
@@ -305,6 +310,11 @@
 	int contested = 0;
 	uint64_t waittime = 0;
 	uintptr_t v;
+#ifdef KDTRACE_HOOKS
+	uint64_t spin_cnt = 0; 
+	uint64_t sleep_cnt = 0;
+	int64_t sleep_time = 0;
+#endif
 	
 	if (mtx_owned(m)) {
 		KASSERT((m->lock_object.lo_flags & LO_RECURSABLE) != 0,
@@ -325,6 +335,9 @@
 		    m->lock_object.lo_name, (void *)m->mtx_lock, file, line);
 
 	while (!_obtain_lock(m, tid)) { 
+#ifdef KDTRACE_HOOKS
+		spin_cnt++;
+#endif 
 #ifdef ADAPTIVE_MUTEXES
 		/*
 		 * If the owner is running on another CPU, spin until the
@@ -339,8 +352,12 @@
 					    "%s: spinning on %p held by %p",
 					    __func__, m, owner);
 				while (mtx_owner(m) == owner &&
-				    TD_IS_RUNNING(owner))
+				    TD_IS_RUNNING(owner)) {
 					cpu_spinwait();
+#ifdef KDTRACE_HOOKS
+					spin_cnt++;
+#endif
+				}
 				continue;
 			}
 		}
@@ -405,7 +422,15 @@
 		/*
 		 * Block on the turnstile.
 		 */
+#ifdef KDTRACE_HOOKS
+		/* Record the time blocked */
+		sleep_time -= lockstat_nsecs();
+#endif
 		turnstile_wait(ts, mtx_owner(m), TS_EXCLUSIVE_QUEUE);
+#ifdef KDTRACE_HOOKS
+		sleep_time += lockstat_nsecs();
+		sleep_cnt++;
+#endif
 	}
 #ifdef KTR
 	if (cont_logged) {
@@ -416,6 +441,15 @@
 #endif
 	lock_profile_obtain_lock_success(&m->lock_object, contested,	
 	    waittime, file, line);					
+#ifdef KDTRACE_HOOKS
+	/* sleep_time is the total time blocked */ 
+	if (sleep_time != 0) 
+		LOCKSTAT_RECORD1(LS_MTX_LOCK_BLOCK, m, sleep_time);
+	/* record only the loops spinning and not sleeping */
+	if (spin_cnt > sleep_cnt)
+		LOCKSTAT_RECORD1(LS_MTX_LOCK_SPIN, m, (spin_cnt - sleep_cnt));
+	LOCKSTAT_RECORD0(LS_MTX_LOCK_ACQUIRE, m); 
+#endif
 }
 
 static void
@@ -478,6 +512,8 @@
 
 	lock_profile_obtain_lock_success(&m->lock_object, contested,	
 	    waittime, (file), (line));
+	LOCKSTAT_RECORD1(LS_MTX_SPIN_LOCK_SPIN, m, i);
+	LOCKSTAT_RECORD0(LS_MTX_SPIN_LOCK_ACQUIRE, m);
 }
 #endif /* SMP */
 
@@ -488,6 +524,9 @@
 	uintptr_t tid;
 	int i, contested;
 	uint64_t waittime;
+#ifdef KDTRACE_HOOKS
+	uint64_t spin_cnt = 0;	
+#endif
 
 	contested = i = 0;
 	waittime = 0;
@@ -508,6 +547,9 @@
 		WITNESS_CHECKORDER(&m->lock_object,
 		    opts | LOP_NEWORDER | LOP_EXCLUSIVE, file, line);
 		while (!_obtain_lock(m, tid)) {
+#ifdef KDTRACE_HOOKS
+			spin_cnt++;
+#endif
 			if (m->mtx_lock == tid) {
 				m->mtx_recurse++;
 				break;

==== //depot/projects/dtrace/src/sys/kern/kern_rwlock.c#15 (text+ko) ====

@@ -36,10 +36,12 @@
 
 #include "opt_ddb.h"
 #include "opt_no_adaptive_rwlocks.h"
+#include "opt_kdtrace.h"
 
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -215,8 +217,10 @@
 	WITNESS_UNLOCK(&rw->lock_object, LOP_EXCLUSIVE, file, line);
 	LOCK_LOG_LOCK("WUNLOCK", &rw->lock_object, 0, rw->rw_recurse, file,
 	    line);
-	if (!rw_recursed(rw))
+	if (!rw_recursed(rw)) {
 		lock_profile_release_lock(&rw->lock_object);
+		LOCKSTAT_RECORD0(LS_RW_WUNLOCK_RELEASE, rw);
+	}
 	__rw_wunlock(rw, curthread, file, line);
 }
 /*
@@ -241,6 +245,11 @@
 	uint64_t waittime = 0;
 	int contested = 0;
 	uintptr_t v;
+#ifdef KDTRACE_HOOKS
+	uint64_t spin_cnt = 0;
+	uint64_t sleep_cnt = 0;
+	int64_t sleep_time = 0;
+#endif
 
 	KASSERT(rw->rw_lock != RW_DESTROYED,
 	    ("rw_rlock() of destroyed rwlock @ %s:%d", file, line));
@@ -250,6 +259,9 @@
 	WITNESS_CHECKORDER(&rw->lock_object, LOP_NEWORDER, file, line);
 
 	for (;;) {
+#ifdef KDTRACE_HOOKS
+		spin_cnt++;
+#endif
 		/*
 		 * Handle the easy case.  If no other thread has a write
 		 * lock, then try to bump up the count of read locks.  Note
@@ -296,8 +308,12 @@
 					    "%s: spinning on %p held by %p",
 					    __func__, rw, owner);
 				while ((struct thread*)RW_OWNER(rw->rw_lock) ==
-				    owner && TD_IS_RUNNING(owner))
+				    owner && TD_IS_RUNNING(owner)) {
 					cpu_spinwait();
+#ifdef KDTRACE_HOOKS
+					spin_cnt++;
+#endif
+				}
 				continue;
 			}
 		}
@@ -367,7 +383,14 @@
 		if (LOCK_LOG_TEST(&rw->lock_object, 0))
 			CTR2(KTR_LOCK, "%s: %p blocking on turnstile", __func__,
 			    rw);
+#ifdef KDTRACE_HOOKS
+		sleep_time -= lockstat_nsecs();
+#endif
 		turnstile_wait(ts, rw_owner(rw), TS_SHARED_QUEUE);
+#ifdef KDTRACE_HOOKS
+		sleep_time += lockstat_nsecs();
+		sleep_cnt++;
+#endif
 		if (LOCK_LOG_TEST(&rw->lock_object, 0))
 			CTR2(KTR_LOCK, "%s: %p resuming from turnstile",
 			    __func__, rw);
@@ -384,6 +407,15 @@
 	WITNESS_LOCK(&rw->lock_object, 0, file, line);
 	curthread->td_locks++;
 	curthread->td_rw_rlocks++;
+#ifdef KDTRACE_HOOKS
+	/* sleep_time is the total time blocked */
+	if (sleep_time != 0)
+		LOCKSTAT_RECORD1(LS_RW_RLOCK_BLOCK, rw, sleep_time);
+	/* record only the loops spinning and not sleeping */
+	if (spin_cnt > sleep_cnt)
+		LOCKSTAT_RECORD1(LS_RW_RLOCK_SPIN, rw, (spin_cnt - sleep_cnt));
+	LOCKSTAT_RECORD0(LS_RW_RLOCK_ACQUIRE, rw);
+#endif
 }
 
 void
@@ -489,6 +521,7 @@
 		break;
 	}
 	lock_profile_release_lock(&rw->lock_object);
+	LOCKSTAT_RECORD0(LS_RW_RUNLOCK_RELEASE, rw);
 }
 
 /*
@@ -508,6 +541,11 @@
 	uint64_t waittime = 0;
 	uintptr_t v, x;
 	int contested = 0;
+#ifdef KDTRACE_HOOKS
+	uint64_t spin_cnt = 0;
+	uint64_t sleep_cnt = 0;
+	int64_t sleep_time = 0;
+#endif
 
 	if (rw_wlocked(rw)) {
 		KASSERT(rw->lock_object.lo_flags & RW_RECURSE,
@@ -524,6 +562,9 @@
 		    rw->lock_object.lo_name, (void *)rw->rw_lock, file, line);
 
 	while (!_rw_write_lock(rw, tid)) {
+#ifdef KDTRACE_HOOKS
+		spin_cnt++;
+#endif
 		lock_profile_obtain_lock_failed(&rw->lock_object,
 		    &contested, &waittime);
 #ifdef ADAPTIVE_RWLOCKS
@@ -539,8 +580,12 @@
 				CTR3(KTR_LOCK, "%s: spinning on %p held by %p",
 				    __func__, rw, owner);
 			while ((struct thread*)RW_OWNER(rw->rw_lock) == owner &&
-			    TD_IS_RUNNING(owner))
+			    TD_IS_RUNNING(owner)) {
 				cpu_spinwait();
+#ifdef KDTRACE_HOOKS
+				spin_cnt++;
+#endif
+			}
 			continue;
 		}
 		if ((v & RW_LOCK_READ) && RW_READERS(v) && spintries < 100) {
@@ -557,6 +602,9 @@
 					break;
 				cpu_spinwait();
 			}
+#ifdef KDTRACE_HOOKS
+			spin_cnt += 100000 - i;
+#endif
 			if (i)
 				continue;
 		}
@@ -619,7 +667,14 @@
 		if (LOCK_LOG_TEST(&rw->lock_object, 0))
 			CTR2(KTR_LOCK, "%s: %p blocking on turnstile", __func__,
 			    rw);
+#ifdef KDTRACE_HOOKS
+		sleep_time -= lockstat_nsecs();
+#endif
 		turnstile_wait(ts, rw_owner(rw), TS_EXCLUSIVE_QUEUE);
+#ifdef KDTRACE_HOOKS
+		sleep_time += lockstat_nsecs();
+		sleep_cnt++;
+#endif
 		if (LOCK_LOG_TEST(&rw->lock_object, 0))
 			CTR2(KTR_LOCK, "%s: %p resuming from turnstile",
 			    __func__, rw);
@@ -629,6 +684,15 @@
 	}
 	lock_profile_obtain_lock_success(&rw->lock_object, contested, waittime,
 	    file, line);
+#ifdef KDTRACE_HOOKS
+	/* sleep_time is the total time blocked */
+	if (sleep_time != 0)
+		LOCKSTAT_RECORD1(LS_RW_WLOCK_BLOCK, rw, sleep_time);
+	/* record only the loops spinning and not sleeping */
+	if (spin_cnt > sleep_cnt)
+		LOCKSTAT_RECORD1(LS_RW_WLOCK_SPIN, rw, (spin_cnt - sleep_cnt));
+	LOCKSTAT_RECORD0(LS_RW_WLOCK_ACQUIRE, rw);
+#endif
 }
 
 /*
@@ -762,6 +826,7 @@
 		curthread->td_rw_rlocks--;
 		WITNESS_UPGRADE(&rw->lock_object, LOP_EXCLUSIVE | LOP_TRYLOCK,
 		    file, line);
+		LOCKSTAT_RECORD0(LS_RW_TRYUPGRADE_UPGRADE, rw);
 	}
 	return (success);
 }
@@ -827,6 +892,7 @@
 out:
 	curthread->td_rw_rlocks++;
 	LOCK_LOG_LOCK("WDOWNGRADE", &rw->lock_object, 0, 0, file, line);
+	LOCKSTAT_RECORD0(LS_RW_DOWNGRADE_DOWNGRADE, rw);
 }
 
 #ifdef INVARIANT_SUPPORT

==== //depot/projects/dtrace/src/sys/kern/kern_sx.c#13 (text+ko) ====

@@ -38,6 +38,7 @@
 
 #include "opt_adaptive_sx.h"
 #include "opt_ddb.h"
+#include "opt_kdtrace.h"
 
 #include 
 __FBSDID("$FreeBSD: src/sys/kern/kern_sx.c,v 1.59 2008/03/12 06:31:06 jeff Exp $");
@@ -304,6 +305,7 @@
 	LOCK_LOG_LOCK("SUNLOCK", &sx->lock_object, 0, 0, file, line);
 	__sx_sunlock(sx, file, line);
 	lock_profile_release_lock(&sx->lock_object);
+	LOCKSTAT_RECORD0(LS_SX_SUNLOCK_RELEASE, sx);
 }
 
 void
@@ -318,8 +320,10 @@
 	WITNESS_UNLOCK(&sx->lock_object, LOP_EXCLUSIVE, file, line);
 	LOCK_LOG_LOCK("XUNLOCK", &sx->lock_object, 0, sx->sx_recurse, file,
 	    line);
-	if (!sx_recursed(sx))
+	if (!sx_recursed(sx)) {
 		lock_profile_release_lock(&sx->lock_object);
+		LOCKSTAT_RECORD0(LS_SX_XUNLOCK_RELEASE, sx);
+	}
 	__sx_xunlock(sx, curthread, file, line);
 }
 
@@ -347,9 +351,11 @@
 	success = atomic_cmpset_ptr(&sx->sx_lock, SX_SHARERS_LOCK(1) | x,
 	    (uintptr_t)curthread | x);
 	LOCK_LOG_TRY("XUPGRADE", &sx->lock_object, 0, success, file, line);
-	if (success)
+	if (success) {
 		WITNESS_UPGRADE(&sx->lock_object, LOP_EXCLUSIVE | LOP_TRYLOCK,
 		    file, line);
+		LOCKSTAT_RECORD0(LS_SX_TRYUPGRADE_UPGRADE, sx);
+	}
 	return (success);
 }
 
@@ -409,6 +415,7 @@
 	sleepq_release(&sx->lock_object);
 
 	LOCK_LOG_LOCK("XDOWNGRADE", &sx->lock_object, 0, 0, file, line);
+	LOCKSTAT_RECORD0(LS_SX_DOWNGRADE_DOWNGRADE, sx);
 }
 
 /*
@@ -428,6 +435,11 @@
 	uint64_t waittime = 0;
 	uintptr_t x;
 	int contested = 0, error = 0;
+#ifdef KDTRACE_HOOKS
+	uint64_t spin_cnt = 0;
+	uint64_t sleep_cnt = 0;
+	int64_t sleep_time = 0;
+#endif
 
 	/* If we already hold an exclusive lock, then recurse. */
 	if (sx_xlocked(sx)) {
@@ -446,6 +458,9 @@
 		    sx->lock_object.lo_name, (void *)sx->sx_lock, file, line);
 
 	while (!atomic_cmpset_acq_ptr(&sx->sx_lock, SX_LOCK_UNLOCKED, tid)) {
+#ifdef KDTRACE_HOOKS
+		spin_cnt++;
+#endif
 		lock_profile_obtain_lock_failed(&sx->lock_object, &contested,
 		    &waittime);
 #ifdef ADAPTIVE_SX
@@ -466,8 +481,12 @@
 					    __func__, sx, owner);
 				GIANT_SAVE();
 				while (SX_OWNER(sx->sx_lock) == x &&
-				    TD_IS_RUNNING(owner))
+				    TD_IS_RUNNING(owner)) {

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Tue Mar 25 22:45:36 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 68192106566B; Tue, 25 Mar 2008 22: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 2632E1065671
	for ; Tue, 25 Mar 2008 22:45:36 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id EF9008FC12
	for ; Tue, 25 Mar 2008 22:45:35 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2PMja1Y023686
	for ; Tue, 25 Mar 2008 22:45:36 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2PMjZC1023684
	for perforce@freebsd.org; Tue, 25 Mar 2008 22:45:35 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Tue, 25 Mar 2008 22:45:35 GMT
Message-Id: <200803252245.m2PMjZC1023684@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 138564 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 25 Mar 2008 22:45:36 -0000

http://perforce.freebsd.org/chv.cgi?CH=138564

Change 138564 by pgj@disznohal on 2008/03/25 22:44:39

	Add localised version of images.

Affected files ...

.. //depot/projects/docproj_hu/share/images/books/handbook/advanced-networking/isdn-bus.eps#2 edit
.. //depot/projects/docproj_hu/share/images/books/handbook/advanced-networking/isdn-twisted-pair.eps#2 edit
.. //depot/projects/docproj_hu/share/images/books/handbook/advanced-networking/natd.eps#2 edit
.. //depot/projects/docproj_hu/share/images/books/handbook/advanced-networking/net-routing.pic#2 edit
.. //depot/projects/docproj_hu/share/images/books/handbook/advanced-networking/static-routes.pic#2 edit
.. //depot/projects/docproj_hu/share/images/books/handbook/geom/striping.pic#2 edit
.. //depot/projects/docproj_hu/share/images/books/handbook/install/disk-layout.eps#2 edit
.. //depot/projects/docproj_hu/share/images/books/handbook/install/example-dir1.eps#2 edit
.. //depot/projects/docproj_hu/share/images/books/handbook/install/example-dir2.eps#2 edit
.. //depot/projects/docproj_hu/share/images/books/handbook/install/example-dir3.eps#2 edit
.. //depot/projects/docproj_hu/share/images/books/handbook/install/example-dir4.eps#2 edit
.. //depot/projects/docproj_hu/share/images/books/handbook/install/example-dir5.eps#2 edit
.. //depot/projects/docproj_hu/share/images/books/handbook/mail/mutt1.scr#2 edit
.. //depot/projects/docproj_hu/share/images/books/handbook/mail/mutt2.scr#2 edit
.. //depot/projects/docproj_hu/share/images/books/handbook/mail/mutt3.scr#2 edit
.. //depot/projects/docproj_hu/share/images/books/handbook/mail/pine1.scr#2 edit
.. //depot/projects/docproj_hu/share/images/books/handbook/mail/pine2.scr#2 edit
.. //depot/projects/docproj_hu/share/images/books/handbook/mail/pine3.scr#2 edit
.. //depot/projects/docproj_hu/share/images/books/handbook/mail/pine4.scr#2 edit
.. //depot/projects/docproj_hu/share/images/books/handbook/mail/pine5.scr#2 edit
.. //depot/projects/docproj_hu/share/images/books/handbook/security/ipsec-crypt-pkt.pic#2 edit
.. //depot/projects/docproj_hu/share/images/books/handbook/security/ipsec-encap-pkt.pic#2 edit
.. //depot/projects/docproj_hu/share/images/books/handbook/security/ipsec-network.pic#2 edit
.. //depot/projects/docproj_hu/share/images/books/handbook/security/ipsec-out-pkt.pic#2 edit
.. //depot/projects/docproj_hu/share/images/books/handbook/vinum/vinum-concat.pic#2 edit
.. //depot/projects/docproj_hu/share/images/books/handbook/vinum/vinum-mirrored-vol.pic#2 edit
.. //depot/projects/docproj_hu/share/images/books/handbook/vinum/vinum-raid10-vol.pic#2 edit
.. //depot/projects/docproj_hu/share/images/books/handbook/vinum/vinum-raid5-org.pic#2 edit
.. //depot/projects/docproj_hu/share/images/books/handbook/vinum/vinum-simple-vol.pic#2 edit
.. //depot/projects/docproj_hu/share/images/books/handbook/vinum/vinum-striped-vol.pic#2 edit
.. //depot/projects/docproj_hu/share/images/books/handbook/vinum/vinum-striped.pic#2 edit

Differences ...

==== //depot/projects/docproj_hu/share/images/books/handbook/advanced-networking/isdn-bus.eps#2 (text+ko) ====

@@ -1,8 +1,52 @@
 %!PS-Adobe-3.0 EPSF-3.0
 %%BoundingBox: 99 -130 355 100
 %%Creator: G. Adam Stanislav
+% The FreeBSD Hungarian Documentation Project
+% Translated by: PALI, Gabor 
+% Original Revision: 1.1
 %%EndComments
 %%BeginProlog
+
+%%BeginResource: encoding ISOLatin2Encoding
+/ISOLatin2Encoding [
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+/parenleft /parenright /asterisk /plus /comma /minus /period /slash
+/zero /one /two /three /four /five /six /seven
+/eight /nine /colon /semicolon /less /equal /greater /question
+% 100
+/at /A /B /C /D /E /F /G
+/H /I /J /K /L /M /N /O
+/P /Q /R /S /T /U /V /W
+/X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+/quoteleft /a /b /c /d /e /f /g
+/h /i /j /k /l /m /n /o
+/p /q /r /s /t /u /v /w
+/x /y /z /braceleft /bar /braceright /asciitilde /.notdef
+% 200
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/space /Aogonek /breve /Lslash /currency /Lcaron /Sacute /section
+/dieresis /Scaron /Scedilla /Tcaron /Zacute /hyphen /Zcaron /Zdotaccent
+/degree /aogonek /ogonek /lslash /acute /lcaron /sacute /caron
+/cedilla /scaron /scedilla /tcaron /zacute /hungarumlaut /zcaron /zdotaccent
+% 300
+/Racute /Aacute /Acircumflex /Abreve /Adieresis /Lacute /Cacute /Ccedilla
+/Ccaron /Eacute /Eogonek /Edieresis /Ecaron /Iacute /Icircumflex /Dcaron
+/Dbar /Nacute /Ncaron /Oacute /Ocircumflex /Ohungarumlaut /Odieresis /multiply
+/Rcaron /Uring /Uacute /Uhungarumlaut /Udieresis /Yacute /Tcedilla /germandbls
+/racute /aacute /acircumflex /abreve /adieresis /lacute /cacute /ccedilla
+/ccaron /eacute /eogonek /edieresis /ecaron /iacute /icircumflex /dcaron
+/dbar /nacute /ncaron /oacute /ocircumflex /ohungarumlaut /odieresis /divide
+/rcaron /uring /uacute /uhungarumlaut /udieresis /yacute /tcedilla /dotaccent
+] def
+%%EndResource
+
 %%EndProlog
 
 %%BeginSetup
@@ -125,21 +169,29 @@
 closepath
 fill
 
-/Helvetica-bold findfont dup 10 scalefont setfont
+/Helvetica-Bold findfont
+dup length dict begin
+ { 1 index /FID ne {def} {pop pop} ifelse } forall
+ /Encoding ISOLatin2Encoding def
+ currentdict
+end
+/Helvetica-Bold-Latin2 exch definefont pop
+
+/Helvetica-Bold-Latin2 findfont dup 10 scalefont setfont
 
-140 74 moveto (Router) show
+130 74 moveto (Útválasztó) show
 140 -42 moveto (Windows 95) show
-130.5 -102 moveto (Sun Workstation) show
-138 18 moveto (FreeBSD Box) show
-161 47.5 moveto (ISDN BRI Line) show
+125 -102 moveto (Sun munkaállomás) show
+150 18 moveto (FreeBSD) show
+155 47.5 moveto (ISDN BRI vonal) show
 
 25 scalefont setfont
 
-265 51 moveto (The) show
-245 27 moveto (Internet) show
+270 51 moveto (Az) show
+245 27 moveto (internet) show
 1 setcolor
-264 53 moveto (The) show
-244 29 moveto (Internet) show
+269 53 moveto (Az) show
+244 29 moveto (internet) show
 
 %%Trailer
 showpage

==== //depot/projects/docproj_hu/share/images/books/handbook/advanced-networking/isdn-twisted-pair.eps#2 (text+ko) ====

@@ -1,8 +1,52 @@
 %!PS-Adobe-3.0 EPSF-3.0
 %%BoundingBox: -10 -70 355 100
 %%Creator: G. Adam Stanislav
+% The FreeBSD Hungarian Documentation Project
+% Translated by: PALI, Gabor 
+% Original Revision: 1.1
 %%EndComments
 %%BeginProlog
+
+%%BeginResource: encoding ISOLatin2Encoding
+/ISOLatin2Encoding [
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+/parenleft /parenright /asterisk /plus /comma /minus /period /slash
+/zero /one /two /three /four /five /six /seven
+/eight /nine /colon /semicolon /less /equal /greater /question
+% 100
+/at /A /B /C /D /E /F /G
+/H /I /J /K /L /M /N /O
+/P /Q /R /S /T /U /V /W
+/X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+/quoteleft /a /b /c /d /e /f /g
+/h /i /j /k /l /m /n /o
+/p /q /r /s /t /u /v /w
+/x /y /z /braceleft /bar /braceright /asciitilde /.notdef
+% 200
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/space /Aogonek /breve /Lslash /currency /Lcaron /Sacute /section
+/dieresis /Scaron /Scedilla /Tcaron /Zacute /hyphen /Zcaron /Zdotaccent
+/degree /aogonek /ogonek /lslash /acute /lcaron /sacute /caron
+/cedilla /scaron /scedilla /tcaron /zacute /hungarumlaut /zcaron /zdotaccent
+% 300
+/Racute /Aacute /Acircumflex /Abreve /Adieresis /Lacute /Cacute /Ccedilla
+/Ccaron /Eacute /Eogonek /Edieresis /Ecaron /Iacute /Icircumflex /Dcaron
+/Dbar /Nacute /Ncaron /Oacute /Ocircumflex /Ohungarumlaut /Odieresis /multiply
+/Rcaron /Uring /Uacute /Uhungarumlaut /Udieresis /Yacute /Tcedilla /germandbls
+/racute /aacute /acircumflex /abreve /adieresis /lacute /cacute /ccedilla
+/ccaron /eacute /eogonek /edieresis /ecaron /iacute /icircumflex /dcaron
+/dbar /nacute /ncaron /oacute /ocircumflex /ohungarumlaut /odieresis /divide
+/rcaron /uring /uacute /uhungarumlaut /udieresis /yacute /tcedilla /dotaccent
+] def
+%%EndResource
+
 %%EndProlog
 
 %%BeginSetup
@@ -218,23 +262,31 @@
 closepath
 fill
 
-/Helvetica-bold findfont dup 10 scalefont setfont
+/Helvetica-Bold findfont
+dup length dict begin
+ { 1 index /FID ne {def} {pop pop} ifelse } forall
+ /Encoding ISOLatin2Encoding def
+ currentdict
+end
+/Helvetica-Bold-Latin2 exch definefont pop
+
+/Helvetica-Bold-Latin2 findfont dup 10 scalefont setfont
 
-32 74 moveto (Hub) show
-120 74 moveto (Router) show
-17 -42 moveto (Novell Server) show
+26 74 moveto (Elosztó) show
+110 74 moveto (Útválasztó) show
+17 -42 moveto (Novell szerver) show
 140 -42 moveto (Windows 95) show
-250.5 -42 moveto (Sun Workstation) show
-138 18 moveto (FreeBSD Box) show
-161 47.5 moveto (ISDN BRI Line) show
+246 -42 moveto (Sun munkaállomás) show
+145 18 moveto (FreeBSD) show
+158 47.5 moveto (ISDN BRI vonal) show
 
 25 scalefont setfont
 
-265 51 moveto (The) show
-245 27 moveto (Internet) show
+270 51 moveto (Az) show
+245 27 moveto (internet) show
 1 setcolor
-264 53 moveto (The) show
-244 29 moveto (Internet) show
+269 53 moveto (Az) show
+244 29 moveto (internet) show
 
 %%Trailer
 showpage

==== //depot/projects/docproj_hu/share/images/books/handbook/advanced-networking/natd.eps#2 (text+ko) ====

@@ -1,8 +1,53 @@
 %!PS-Adobe-3.0 EPSF-3.0
 %%BoundingBox: -10 -10 355 100
 %%Creator: G. Adam Stanislav
+% The FreeBSD Hungarian Documentation Project
+% Translated by: PALI, Gabor 
+% Original Revision: 1.1
 %%EndComments
+
 %%BeginProlog
+
+%%BeginResource: encoding ISOLatin2Encoding
+/ISOLatin2Encoding [
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+/parenleft /parenright /asterisk /plus /comma /minus /period /slash
+/zero /one /two /three /four /five /six /seven
+/eight /nine /colon /semicolon /less /equal /greater /question
+% 100
+/at /A /B /C /D /E /F /G
+/H /I /J /K /L /M /N /O
+/P /Q /R /S /T /U /V /W
+/X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+/quoteleft /a /b /c /d /e /f /g
+/h /i /j /k /l /m /n /o
+/p /q /r /s /t /u /v /w
+/x /y /z /braceleft /bar /braceright /asciitilde /.notdef
+% 200
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/space /Aogonek /breve /Lslash /currency /Lcaron /Sacute /section
+/dieresis /Scaron /Scedilla /Tcaron /Zacute /hyphen /Zcaron /Zdotaccent
+/degree /aogonek /ogonek /lslash /acute /lcaron /sacute /caron
+/cedilla /scaron /scedilla /tcaron /zacute /hungarumlaut /zcaron /zdotaccent
+% 300
+/Racute /Aacute /Acircumflex /Abreve /Adieresis /Lacute /Cacute /Ccedilla
+/Ccaron /Eacute /Eogonek /Edieresis /Ecaron /Iacute /Icircumflex /Dcaron
+/Dbar /Nacute /Ncaron /Oacute /Ocircumflex /Ohungarumlaut /Odieresis /multiply
+/Rcaron /Uring /Uacute /Uhungarumlaut /Udieresis /Yacute /Tcedilla /germandbls
+/racute /aacute /acircumflex /abreve /adieresis /lacute /cacute /ccedilla
+/ccaron /eacute /eogonek /edieresis /ecaron /iacute /icircumflex /dcaron
+/dbar /nacute /ncaron /oacute /ocircumflex /ohungarumlaut /odieresis /divide
+/rcaron /uring /uacute /uhungarumlaut /udieresis /yacute /tcedilla /dotaccent
+] def
+%%EndResource
+
 %%EndProlog
 
 %%BeginSetup
@@ -206,21 +251,29 @@
 closepath
 fill
 
-/Helvetica-bold findfont dup 10 scalefont setfont
+/Helvetica-Bold findfont
+dup length dict begin
+ { 1 index /FID ne {def} {pop pop} ifelse } forall
+ /Encoding ISOLatin2Encoding def
+ currentdict
+end
+/Helvetica-Bold-Latin2 exch definefont pop
+
+/Helvetica-Bold-Latin2 findfont dup 10 scalefont setfont
 
-25 74 moveto (Hub) show
-155 74 moveto (Router) show
-28 18 moveto (Client A) show
-149 23 moveto (Client B) show
-123.5 10 moveto ((FreeBSD Gateway)) show
+18 74 moveto (Elosztó) show
+145 74 moveto (Útválasztó) show
+28 18 moveto (A kliens) show
+149 23 moveto (B kliens) show
+128 10 moveto ((FreeBSD átjáró)) show
 
 25 scalefont setfont
 
-265 51 moveto (The) show
-245 27 moveto (Internet) show
+270 51 moveto (Az) show
+245 27 moveto (internet) show
 1 setcolor
-264 53 moveto (The) show
-244 29 moveto (Internet) show
+269 53 moveto (Az) show
+244 29 moveto (internet) show
 
 %%Trailer
 showpage

==== //depot/projects/docproj_hu/share/images/books/handbook/advanced-networking/net-routing.pic#2 (text+ko) ====

@@ -1,18 +1,21 @@
 .\" $FreeBSD: doc/share/images/books/handbook/advanced-networking/net-routing.pic,v 1.2 2004/07/12 08:02:21 murray Exp $
+.\" The FreeBSD Hungarian Documentation Project
+.\" Translated by: PALI, Gabor 
+.\" Original Revision: 1.2
 .PS
 
-A:	box "Local2";
+A:	box "Helyi2";
 
 B:	line 0.7 <-> "Ethernet" above dashed;
 
-C:	box "Local1";
+C:	box "Helyi1";
 
 D:	line 0.8 <-> "PPP" above dashed;
 
-E:	box "ISP-Serv";
+E:	box "Szolgáltató";
 
 F:	line 0.7 <-> "Ethernet" above dashed;
 
-G:	box "T1-GW";
+G:	box "T1-ÁJ";
 
 .PE

==== //depot/projects/docproj_hu/share/images/books/handbook/advanced-networking/static-routes.pic#2 (text+ko) ====

@@ -1,15 +1,18 @@
 .\" $FreeBSD: doc/share/images/books/handbook/advanced-networking/static-routes.pic,v 1.1 2004/07/11 13:34:27 blackend Exp $
+.\" The FreeBSD Hungarian Documentation Project
+.\" Translated by: PALI, Gabor 
+.\" Original Revision: 1.1
 .PS
 
-I:	box rad 0.10 wid 1 ht 0.55 "Internet" dashed;
-	" (10.0.0.1/24) Default Router to Internet" at I.s below ljust;
+I:	box rad 0.10 wid 1 ht 0.55 "internet" dashed;
+	" (10.0.0.1/24) alapértelmezett átjáró az internet felé" at I.s below ljust;
 	circle rad 0.02 fill 1 at I.s;
 	line down at I.s;
 
-A:	box "RouterA";
-	" Interface xl0, 10.0.0.10/24" at A.n above ljust;
-	" Interface xl1, 192.168.1.1/24" at A.s below ljust;
-	" FreeBSD gateway" at A.e+(0.15,0) ljust;
+A:	box "A-utvalaszto";
+	" xl0 felület, 10.0.0.10/24" at A.n above ljust;
+	" xl1 felület, 192.168.1.1/24" at A.s below ljust;
+	" FreeBSD átjáró" at A.e+(0.15,0) ljust;
 	circle rad 0.02 fill 1 at A.n;
 	circle rad 0.02 fill 1 at A.s;
 	line down at A.s;
@@ -18,7 +21,7 @@
 	line at N1.se - (.4,0);
 
 
-B:	box "RouterB";
+B:	box "B-utvalaszto";
 	" 192.168.1.2/24" at B.n above ljust;
 	" 192.168.2.1/24" at B.s below ljust;
 	circle rad 0.02 fill 1 at B.n;
@@ -27,8 +30,8 @@
 
 N2:	box ht .04 wid 1.8 fill with .nw at last line.end - (.4,0);
 
-N2a:	"Internal Net 2" at N2.s + (0,-.15);
+N2a:	"2. belső hálózat" at N2.s + (0,-.15);
 
-N1a:	"Internal Net 1" at N1.sw + (.4,-.15);
+N1a:	"1. belső hálózat" at N1.sw + (.4,-.15);
 
 .PE

==== //depot/projects/docproj_hu/share/images/books/handbook/geom/striping.pic#2 (text+ko) ====

@@ -26,12 +26,12 @@
        disk_box(last ellipse.sw, 1st ellipse.ne)
 }
 
-A: box wid 2 "256 kb-nyi írást négy" "64 kb-os párhuzamos írásra" "bontunk fel a négy lemez között"
+A: box wid 2 "256 KB-nyi írást négy" "64 KB-os párhuzamos írásra" "bontunk fel a négy lemez között"
 
-B1: box ht 0.2 wid 0.4 "64 kb" at A.e + (0.4, 0.5)
-B2: box ht 0.2 wid 0.4 "64 kb" at A.e + (0.4, 0.2)
-B3: box ht 0.2 wid 0.4 "64 kb" at A.e + (0.4, -0.1)
-B4: box ht 0.2 wid 0.4 "64 kb" at A.e + (0.4, -0.4)
+B1: box ht 0.2 wid 0.4 "64 KB" at A.e + (0.4, 0.5)
+B2: box ht 0.2 wid 0.4 "64 KB" at A.e + (0.4, 0.2)
+B3: box ht 0.2 wid 0.4 "64 KB" at A.e + (0.4, -0.1)
+B4: box ht 0.2 wid 0.4 "64 KB" at A.e + (0.4, -0.4)
 
 move to A.s + (-0.5, -1.9)
 [disk];"1. lemez" at last [].s above

==== //depot/projects/docproj_hu/share/images/books/handbook/install/disk-layout.eps#2 (text+ko) ====

@@ -20623,47 +20623,47 @@
 [1 0 0 1 223 436]ST
 1 1 B 0 0 PE
 F2 F
-14 Y(DOS or)34 -25 T
-31 Y(Windows)41 -32 T
+14 Y(DOS vagy)44 -25 T
+31 Y(Windows)41 -22 T
 [1 0 0 1 51 445]ST
 1 1 B 0 0 PE
-14 Y(First slice,)45 0 T
-31 Y(called ad0s1)55 0 T
-48 Y((C: in DOS))52 0 T
+14 Y(Az első slice,)65 0 T
+31 Y(neve: ad0s1)55 0 T
+48 Y((C: DOS alatt))66 0 T
 [1 0 0 1 50 630]ST
 1 1 B 0 0 PE
-14 Y(Second slice,)59 0 T
-31 Y(called ad0s2)55 0 T
+14 Y(A második slice,)75 0 T
+31 Y(neve: ad0s2)55 0 T
 [1 0 0 1 308 520]ST
 1 1 B 0 0 PE
-14 Y(Partition a,)46 0 T
-31 Y(mounted as /,)60 0 T
-48 Y(called ad0s2a)61 0 T
+14 Y(Az a partíció,)66 0 T
+31 Y(csatlakoztatva: /,)85 0 T
+48 Y(neve: ad0s2a)61 0 T
 [1 0 0 1 308 579]ST
 1 1 B 0 0 PE
-14 Y(Partition b,)46 0 T
-31 Y(used as swap,)64 0 T
-48 Y(called ad0s2b)61 0 T
+14 Y(A b partíció,)61 0 T
+31 Y(lapozóterület,)64 0 T
+48 Y(neve: ad0s2b)61 0 T
 [1 0 0 1 308 639]ST
 1 1 B 0 0 PE
-14 Y(Partition e,)46 0 T
-31 Y(mounted as /var,)73 0 T
-48 Y(called ad0s2e)61 0 T
+14 Y(Az e partíció,)66 0 T
+31 Y(csatlakoztatva: /var,)100 0 T
+48 Y(neve: ad0s2e)61 0 T
 [1 0 0 1 309 717]ST
 1 1 B 0 0 PE
-14 Y(Partition f,)44 0 T
-31 Y(mounted as /usr,)74 0 T
-48 Y(called ad0s2f)58 0 T
+14 Y(Az f partíció,)66 0 T
+31 Y(csatlakoztatva: /usr,)100 0 T
+48 Y(neve: ad0s2f)58 0 T
 [1 0 0 1 222 801]ST
 1 1 B 0 0 PE
 F4 F
-11 Y((not to scale))48 -35 T
+11 Y((nem skálázódik))66 -35 T
 [1 0 0 1 455 625]ST
 1 1 B 0 0 PE
 F2 F
-14 Y(Partition c,)46 0 T
-31 Y(not mounted,)57 0 T
-48 Y(called ad0s2c)61 0 T
+14 Y(A c partíció,)61 0 T
+31 Y(nincs csatlakoztatva,)100 0 T
+48 Y(neve: ad0s2c)61 0 T
 [1 0 0 1 -27 385]ST
 1 1 B 0 0 PE
 175 35 180 HL

==== //depot/projects/docproj_hu/share/images/books/handbook/install/example-dir1.eps#2 (text+ko) ====

@@ -209,6 +209,47 @@
 /curlayer 0 def
 
 %%EndResource
+
+%%BeginResource: encoding ISOLatin2Encoding
+/ISOLatin2Encoding [
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+/parenleft /parenright /asterisk /plus /comma /minus /period /slash
+/zero /one /two /three /four /five /six /seven
+/eight /nine /colon /semicolon /less /equal /greater /question
+% 100
+/at /A /B /C /D /E /F /G
+/H /I /J /K /L /M /N /O
+/P /Q /R /S /T /U /V /W
+/X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+/quoteleft /a /b /c /d /e /f /g
+/h /i /j /k /l /m /n /o
+/p /q /r /s /t /u /v /w
+/x /y /z /braceleft /bar /braceright /asciitilde /.notdef
+% 200
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/space /Aogonek /breve /Lslash /currency /Lcaron /Sacute /section
+/dieresis /Scaron /Scedilla /Tcaron /Zacute /hyphen /Zcaron /Zdotaccent
+/degree /aogonek /ogonek /lslash /acute /lcaron /sacute /caron
+/cedilla /scaron /scedilla /tcaron /zacute /hungarumlaut /zcaron /zdotaccent
+% 300
+/Racute /Aacute /Acircumflex /Abreve /Adieresis /Lacute /Cacute /Ccedilla
+/Ccaron /Eacute /Eogonek /Edieresis /Ecaron /Iacute /Icircumflex /Dcaron
+/Dbar /Nacute /Ncaron /Oacute /Ocircumflex /Ohungarumlaut /Odieresis /multiply
+/Rcaron /Uring /Uacute /Uhungarumlaut /Udieresis /Yacute /Tcedilla /germandbls
+/racute /aacute /acircumflex /abreve /adieresis /lacute /cacute /ccedilla
+/ccaron /eacute /eogonek /edieresis /ecaron /iacute /icircumflex /dcaron
+/dbar /nacute /ncaron /oacute /ocircumflex /ohungarumlaut /odieresis /divide
+/rcaron /uring /uacute /uhungarumlaut /udieresis /yacute /tcedilla /dotaccent
+] def
+%%EndResource
+
 %%EndProlog
 %%BeginSetup
 14 default-font-family set_font
@@ -237,12 +278,22 @@
 0.000 0.000 0.000 graphcolor
 14.00 /Times-Roman set_font
 
+/Times-Roman findfont
+dup length dict begin
+ { 1 index /FID ne {def} {pop pop} ifelse } forall
+ /Encoding ISOLatin2Encoding def
+ currentdict
+end
+/Times-Roman-Latin2 exch definefont pop
+
+/Times-Roman-Latin2 findfont dup 14 scalefont setfont
+
 %	root
 gsave 10 dict begin
 63 106 31 25 ellipse_path
 stroke
 gsave 10 dict begin
-63 109 moveto 33 -0.5 (Root) alignedtext
+63 109 moveto 33 -0.5 (Gyökér) alignedtext
 63 93 moveto 5 -0.5 (/) alignedtext
 end grestore
 end grestore

==== //depot/projects/docproj_hu/share/images/books/handbook/install/example-dir2.eps#2 (text+ko) ====

@@ -209,6 +209,47 @@
 /curlayer 0 def
 
 %%EndResource
+
+%%BeginResource: encoding ISOLatin2Encoding
+/ISOLatin2Encoding [
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+/parenleft /parenright /asterisk /plus /comma /minus /period /slash
+/zero /one /two /three /four /five /six /seven
+/eight /nine /colon /semicolon /less /equal /greater /question
+% 100
+/at /A /B /C /D /E /F /G
+/H /I /J /K /L /M /N /O
+/P /Q /R /S /T /U /V /W
+/X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+/quoteleft /a /b /c /d /e /f /g
+/h /i /j /k /l /m /n /o
+/p /q /r /s /t /u /v /w
+/x /y /z /braceleft /bar /braceright /asciitilde /.notdef
+% 200
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/space /Aogonek /breve /Lslash /currency /Lcaron /Sacute /section
+/dieresis /Scaron /Scedilla /Tcaron /Zacute /hyphen /Zcaron /Zdotaccent
+/degree /aogonek /ogonek /lslash /acute /lcaron /sacute /caron
+/cedilla /scaron /scedilla /tcaron /zacute /hungarumlaut /zcaron /zdotaccent
+% 300
+/Racute /Aacute /Acircumflex /Abreve /Adieresis /Lacute /Cacute /Ccedilla
+/Ccaron /Eacute /Eogonek /Edieresis /Ecaron /Iacute /Icircumflex /Dcaron
+/Dbar /Nacute /Ncaron /Oacute /Ocircumflex /Ohungarumlaut /Odieresis /multiply
+/Rcaron /Uring /Uacute /Uhungarumlaut /Udieresis /Yacute /Tcedilla /germandbls
+/racute /aacute /acircumflex /abreve /adieresis /lacute /cacute /ccedilla
+/ccaron /eacute /eogonek /edieresis /ecaron /iacute /icircumflex /dcaron
+/dbar /nacute /ncaron /oacute /ocircumflex /ohungarumlaut /odieresis /divide
+/rcaron /uring /uacute /uhungarumlaut /udieresis /yacute /tcedilla /dotaccent
+] def
+%%EndResource
+
 %%EndProlog
 %%BeginSetup
 14 default-font-family set_font
@@ -237,12 +278,22 @@
 0.000 0.000 0.000 graphcolor
 14.00 /Times-Roman set_font
 
+/Times-Roman findfont
+dup length dict begin
+ { 1 index /FID ne {def} {pop pop} ifelse } forall
+ /Encoding ISOLatin2Encoding def
+ currentdict
+end
+/Times-Roman-Latin2 exch definefont pop
+
+/Times-Roman-Latin2 findfont dup 14 scalefont setfont
+
 %	root
 gsave 10 dict begin
 99 178 31 25 ellipse_path
 stroke
 gsave 10 dict begin
-99 181 moveto 33 -0.5 (Root) alignedtext
+99 181 moveto 33 -0.5 (Gyökér) alignedtext
 99 165 moveto 5 -0.5 (/) alignedtext
 end grestore
 end grestore

==== //depot/projects/docproj_hu/share/images/books/handbook/install/example-dir3.eps#2 (text+ko) ====

@@ -209,6 +209,47 @@
 /curlayer 0 def
 
 %%EndResource
+
+%%BeginResource: encoding ISOLatin2Encoding
+/ISOLatin2Encoding [
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+/parenleft /parenright /asterisk /plus /comma /minus /period /slash
+/zero /one /two /three /four /five /six /seven
+/eight /nine /colon /semicolon /less /equal /greater /question
+% 100
+/at /A /B /C /D /E /F /G
+/H /I /J /K /L /M /N /O
+/P /Q /R /S /T /U /V /W
+/X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+/quoteleft /a /b /c /d /e /f /g
+/h /i /j /k /l /m /n /o
+/p /q /r /s /t /u /v /w
+/x /y /z /braceleft /bar /braceright /asciitilde /.notdef
+% 200
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/space /Aogonek /breve /Lslash /currency /Lcaron /Sacute /section
+/dieresis /Scaron /Scedilla /Tcaron /Zacute /hyphen /Zcaron /Zdotaccent
+/degree /aogonek /ogonek /lslash /acute /lcaron /sacute /caron
+/cedilla /scaron /scedilla /tcaron /zacute /hungarumlaut /zcaron /zdotaccent
+% 300
+/Racute /Aacute /Acircumflex /Abreve /Adieresis /Lacute /Cacute /Ccedilla
+/Ccaron /Eacute /Eogonek /Edieresis /Ecaron /Iacute /Icircumflex /Dcaron
+/Dbar /Nacute /Ncaron /Oacute /Ocircumflex /Ohungarumlaut /Odieresis /multiply
+/Rcaron /Uring /Uacute /Uhungarumlaut /Udieresis /Yacute /Tcedilla /germandbls
+/racute /aacute /acircumflex /abreve /adieresis /lacute /cacute /ccedilla
+/ccaron /eacute /eogonek /edieresis /ecaron /iacute /icircumflex /dcaron
+/dbar /nacute /ncaron /oacute /ocircumflex /ohungarumlaut /odieresis /divide
+/rcaron /uring /uacute /uhungarumlaut /udieresis /yacute /tcedilla /dotaccent
+] def
+%%EndResource
+
 %%EndProlog
 %%BeginSetup
 14 default-font-family set_font
@@ -237,12 +278,22 @@
 0.000 0.000 0.000 graphcolor
 14.00 /Times-Roman set_font
 
+/Times-Roman findfont
+dup length dict begin
+ { 1 index /FID ne {def} {pop pop} ifelse } forall
+ /Encoding ISOLatin2Encoding def
+ currentdict
+end
+/Times-Roman-Latin2 exch definefont pop
+
+/Times-Roman-Latin2 findfont dup 14 scalefont setfont
+
 %	root
 gsave 10 dict begin
 63 178 31 25 ellipse_path
 stroke
 gsave 10 dict begin
-63 181 moveto 33 -0.5 (Root) alignedtext
+63 181 moveto 33 -0.5 (Gyökér) alignedtext
 63 165 moveto 5 -0.5 (/) alignedtext
 end grestore
 end grestore

==== //depot/projects/docproj_hu/share/images/books/handbook/install/example-dir4.eps#2 (text+ko) ====

@@ -209,6 +209,47 @@
 /curlayer 0 def
 
 %%EndResource
+
+%%BeginResource: encoding ISOLatin2Encoding
+/ISOLatin2Encoding [
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+/parenleft /parenright /asterisk /plus /comma /minus /period /slash
+/zero /one /two /three /four /five /six /seven
+/eight /nine /colon /semicolon /less /equal /greater /question
+% 100
+/at /A /B /C /D /E /F /G
+/H /I /J /K /L /M /N /O
+/P /Q /R /S /T /U /V /W
+/X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+/quoteleft /a /b /c /d /e /f /g
+/h /i /j /k /l /m /n /o
+/p /q /r /s /t /u /v /w
+/x /y /z /braceleft /bar /braceright /asciitilde /.notdef
+% 200
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/space /Aogonek /breve /Lslash /currency /Lcaron /Sacute /section
+/dieresis /Scaron /Scedilla /Tcaron /Zacute /hyphen /Zcaron /Zdotaccent
+/degree /aogonek /ogonek /lslash /acute /lcaron /sacute /caron
+/cedilla /scaron /scedilla /tcaron /zacute /hungarumlaut /zcaron /zdotaccent
+% 300
+/Racute /Aacute /Acircumflex /Abreve /Adieresis /Lacute /Cacute /Ccedilla
+/Ccaron /Eacute /Eogonek /Edieresis /Ecaron /Iacute /Icircumflex /Dcaron
+/Dbar /Nacute /Ncaron /Oacute /Ocircumflex /Ohungarumlaut /Odieresis /multiply
+/Rcaron /Uring /Uacute /Uhungarumlaut /Udieresis /Yacute /Tcedilla /germandbls
+/racute /aacute /acircumflex /abreve /adieresis /lacute /cacute /ccedilla
+/ccaron /eacute /eogonek /edieresis /ecaron /iacute /icircumflex /dcaron
+/dbar /nacute /ncaron /oacute /ocircumflex /ohungarumlaut /odieresis /divide
+/rcaron /uring /uacute /uhungarumlaut /udieresis /yacute /tcedilla /dotaccent
+] def
+%%EndResource
+
 %%EndProlog
 %%BeginSetup
 14 default-font-family set_font
@@ -237,12 +278,22 @@
 0.000 0.000 0.000 graphcolor
 14.00 /Times-Roman set_font
 
+/Times-Roman findfont
+dup length dict begin
+ { 1 index /FID ne {def} {pop pop} ifelse } forall
+ /Encoding ISOLatin2Encoding def
+ currentdict
+end
+/Times-Roman-Latin2 exch definefont pop
+
+/Times-Roman-Latin2 findfont dup 14 scalefont setfont
+
 %	root
 gsave 10 dict begin
 63 250 31 25 ellipse_path
 stroke
 gsave 10 dict begin
-63 253 moveto 33 -0.5 (Root) alignedtext
+63 253 moveto 33 -0.5 (Gyökér) alignedtext
 63 237 moveto 5 -0.5 (/) alignedtext
 end grestore
 end grestore

==== //depot/projects/docproj_hu/share/images/books/handbook/install/example-dir5.eps#2 (text+ko) ====

@@ -209,6 +209,47 @@
 /curlayer 0 def
 
 %%EndResource
+
+%%BeginResource: encoding ISOLatin2Encoding
+/ISOLatin2Encoding [
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+/parenleft /parenright /asterisk /plus /comma /minus /period /slash
+/zero /one /two /three /four /five /six /seven
+/eight /nine /colon /semicolon /less /equal /greater /question
+% 100
+/at /A /B /C /D /E /F /G
+/H /I /J /K /L /M /N /O
+/P /Q /R /S /T /U /V /W
+/X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+/quoteleft /a /b /c /d /e /f /g
+/h /i /j /k /l /m /n /o
+/p /q /r /s /t /u /v /w
+/x /y /z /braceleft /bar /braceright /asciitilde /.notdef
+% 200
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/space /Aogonek /breve /Lslash /currency /Lcaron /Sacute /section
+/dieresis /Scaron /Scedilla /Tcaron /Zacute /hyphen /Zcaron /Zdotaccent
+/degree /aogonek /ogonek /lslash /acute /lcaron /sacute /caron
+/cedilla /scaron /scedilla /tcaron /zacute /hungarumlaut /zcaron /zdotaccent
+% 300
+/Racute /Aacute /Acircumflex /Abreve /Adieresis /Lacute /Cacute /Ccedilla
+/Ccaron /Eacute /Eogonek /Edieresis /Ecaron /Iacute /Icircumflex /Dcaron
+/Dbar /Nacute /Ncaron /Oacute /Ocircumflex /Ohungarumlaut /Odieresis /multiply
+/Rcaron /Uring /Uacute /Uhungarumlaut /Udieresis /Yacute /Tcedilla /germandbls
+/racute /aacute /acircumflex /abreve /adieresis /lacute /cacute /ccedilla
+/ccaron /eacute /eogonek /edieresis /ecaron /iacute /icircumflex /dcaron
+/dbar /nacute /ncaron /oacute /ocircumflex /ohungarumlaut /odieresis /divide
+/rcaron /uring /uacute /uhungarumlaut /udieresis /yacute /tcedilla /dotaccent
+] def
+%%EndResource
+
 %%EndProlog
 %%BeginSetup
 14 default-font-family set_font
@@ -237,12 +278,22 @@
 0.000 0.000 0.000 graphcolor
 14.00 /Times-Roman set_font
 
+/Times-Roman findfont
+dup length dict begin
+ { 1 index /FID ne {def} {pop pop} ifelse } forall
+ /Encoding ISOLatin2Encoding def
+ currentdict
+end
+/Times-Roman-Latin2 exch definefont pop
+
+/Times-Roman-Latin2 findfont dup 14 scalefont setfont
+
 %	root
 gsave 10 dict begin
 135 178 31 25 ellipse_path
 stroke
 gsave 10 dict begin
-135 181 moveto 33 -0.5 (Root) alignedtext
+135 181 moveto 33 -0.5 (Gyökér) alignedtext
 135 165 moveto 5 -0.5 (/) alignedtext
 end grestore
 end grestore

==== //depot/projects/docproj_hu/share/images/books/handbook/mail/mutt1.scr#2 (text+ko) ====

@@ -1,1 +1,1 @@
-SCRSHOT_Pqp:pQpupiptp p pdp:pDpeplp p pup:pUpnpdpeplp p psp:pSpapvpep p pmp:pMpapiplp p prp:pRpeppplpyp p pgp:pGprpopuppp p p?p:pHpeplppp p p p p p p p p p p p p p p p p p p p1p pNp p p pMpaprp p0p9p pSpupppeprp-pUpspeprp p p p p p p(p p p p1p)p ptpepsptp p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p   2 N   Mar 09 Super-User      (   1) user account                                3 N   Mar 09 Super-User      (   1) sample                                                                                                                                                                                                            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               
                               !
     
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               
                                                                                                                                                                                                                                                                                                                                         -p*p-pMpuptptp:p p/pvpaprp/pmpapiplp/pmpaprpcpsp p[pMpspgpsp:p3p pNpepwp:p3p p1p.p6pKp]p-p-p-p(pdpaptpep/pdpaptpep)p-p-p-p-p-p-p-p-p-p-p-p-p-p-p(paplplp)p-p-p-p                                                                                +SCRSHOT_P
 qp:pQpupiptp p pdp:pDpeplp p pup:pUpnpdpeplp p psp:pSpapvpep!
  p pmp:p
Mpapiplp p prp:pRpeppplpyp p pgp:pGprpopuppp p p?p:pHpeplppp p p p p p p p p p p p p p p p p p p p1p pNp p p pMpaprp p0p9p pSpupppeprp-pUpspeprp p p p p p p(p p p p1p)p ppprpopbpap p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p   2 N   Mar 09 Super-User      (   1) hozzaferes                                  3 N   Mar 09 Super-User      (   1) minta                                                                                                                                                                                                                                                     
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
                               !
     
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               
                                                                                                                                                                                                                                                                                                -p*p-pMpuptptp:p p/pvpaprp/pmpapiplp/pmpaprpcpsp p[pMpspgpsp:p3p pNpepwp:p3p p1p.p6pKp]p-p-p-p(pdpaptpep/pdpaptpep)p-p-p-p-p-p-p-p-p-p-p-p-p-p-p(paplplp)p-p-p-p                                                                                
==== //depot/projects/docproj_hu/share/images/books/handbook/mail/mutt2.scr#2 (text+ko) ====

@@ -1,1 +1,1 @@
-SCRSHOT_Pip:pEpxpiptp p p-p:pPprpepvpPpgp p pp:pNpepxptpPpgp pvp:pVpipepwp pAptptpapcphpmp.p p pdp:pDpeplp p prp:pRpeppplpyp p pjp:pNpepxptp p?p:pHpeplppp pX-Original-To: marcs@localhost                                                  Delivered-To: marcs@localhost                                                   To: marcs@localhost                                                             Subject: test                                                                   Date: Tue,  9 Mar 2004 10:28:36 +0200 (SAST)                                    From: Sup
 er-User <root@localhost>                                                                                                                               This is a test message, please reply if you receieve it.                                                                                                                                                                                                                                                                                               
                               !
     
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               
                                                                                                                                                                                                                                                                                                                                         -pNp p p-p p1p/p1p:p pSpupppeprp-pUpspeprp p p p p p p p p p p p p ptpepsptp p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p-p-p p(paplplp)p p                                                                                +SCRSHOT_P
 ip:pEpxpiptp p p-p:pPprpepvpPpgp p pp:pNpepxptp!
 Ppgp pvp
:pVpipepwp pAptptpapcphpmp.p p pdp:pDpeplp p prp:pRpeppplpyp p pjp:pNpepxptp p?p:pHpeplppp pX-Original-To: marcs@localhost                                                  Delivered-To: marcs@localhost                                                   To: marcs@localhost                                                             Subject: proba                                                                  Date: Tue,  9 Mar 2004 10:28:36 +0200 (SAST)                                    From: Super-User <root@localhost>                
                                                                                                                Ez egy proba uzenet. Ha megkaptad, kerlek, valaszolj!                                                                                                                                                                                                                                                                                                                                           
                               !
     
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               
                                                                                                                                                                                                                                                                                                -pNp p p-p p1p/p1p:p pSpupppeprp-pUpspeprp p p p p p p p p p p p p ptpepsptp p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p-p-p p(paplplp)p p                                                                                
==== //depot/projects/docproj_hu/share/images/books/handbook/mail/mutt3.scr#2 (text+ko) ====

@@ -1,1 +1,1 @@
-SCRSHOT_Pyp:pSpepnpdp p pqp:pApbpoprptp p ptp:pTpop p pcp:pCpCp p psp:pSpupbpjp p pap:pAptptpapcphp pfpiplpep p pdp:pDpepspcprpippp p p?p:pHpeplppp p p p p p p p p p p p    From: Marc Silver <marcs@localhost>                                               To: Super-User <root@localhost>                                                 Cc:                                                                            Bcc:                                                                        Subject: Re: test                                                              Reply-To:
                                                                             Fcc:                                                                       Security: Clear                                                                                                                                                                                                                                 -p-p pAptptpapcphpmpepnptpsp p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p-p pIp p p p p p1p p/ptpmppp/pmpuptptp-pbpspdp
 -pcp0phpopbpspcpQp p p p p p p p p p p p p p[ptpepxptp/ppplp!
 apipnp,p
 p7pbpiptp,p pupsp-papspcpipip,p p1p.p1pKp]p p                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
                                                                                                                                                                                                                                                                                                                                         -p-p pMpuptptp:p pCpopmpppopspep p p[pAppppprpopxp.p pmpspgp pspipzpep:p p1p.p1pKp p p pAptptpsp:p p1p]p-p-p-p-p-p-p-p-p-p-p-p-p-p-p-p-p-p-p-p-p-p-p-p-p-p-p-p-p                                                                                +SCRSHOT_P
 yp:pSpepnpdp p pqp:pApbpoprptp p ptp:pTpop p pcp:pCpCp p psp!
 :pSpupbp
jp p pap:pAptptpapcphp pfpiplpep p pdp:pDpepspcprpippp p p?p:pHpeplppp p p p p p p p p p p p    From: Marc Silver <marcs@localhost>                                               To: Super-User <root@localhost>                                                 Cc:                                                                            Bcc:                                                                        Subject: Re: proba                                                             Reply-To:                                        
                                     Fcc:                                                                       Security: Clear                                                                                                                                                                                                                                 -p-p pAptptpapcphpmpepnptpsp p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p-p pIp p p p p p1p p/ptpmppp/pmpuptptp-pbpspdp-pcp0phpopbpspcpQp p p p p p p p p p p p p p[ptpepxptp/ppplpapipnp,p p7pbpiptp,p 
 pupsp-papspcpipip,p p1p.p1pKp]p p              !
     
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               
                                                                                                                                                                                                                                                                                                -p-p pMpuptptp:p pCpopmpppopspep p p[pAppppprpopxp.p pmpspgp pspipzpep:p p1p.p1pKp p p pAptptpsp:p p1p]p-p-p-p-p-p-p-p-p-p-p-p-p-p-p-p-p-p-p-p-p-p-p-p-p-p-p-p-p                                                                                
==== //depot/projects/docproj_hu/share/images/books/handbook/mail/pine1.scr#2 (text+ko) ====


==== //depot/projects/docproj_hu/share/images/books/handbook/mail/pine2.scr#2 (text+ko) ====


==== //depot/projects/docproj_hu/share/images/books/handbook/mail/pine3.scr#2 (text+ko) ====

@@ -1,1 +1,1 @@
-SCRSHOT_P p pPpIpNpEp p4p.p5p8p p p pMpEpSpSpApGpEp pIpNpDpEpXp p p p p p p p p p p p p p p p p p pFpoplpdpeprp:p pIpNpBpOpXp p pMpepspspapgpep p1p popfp p3p pApNpSp p p                                                                                 p pAp p p p1p pMpaprp p p9p pSpupppeprp-pUpspeprp p p p p p p p p p p p(p4p7p1p)p ptpepsptp p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p  A   2 Mar  9 Super-User           (479) user account                            A   3 Mar  9 Super-User           (473) sample                                                                                                                         
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               
                               !
     
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               
                                                                                                                                                                                                                                                                                                                                         ?p Help       
p [ViewMsg]  Np NextMsg     Spppcp NextPage Up Undelete   Fp Forward     +SCRSHOT_P
  p pPpIpNpEp p4p.p5p8p p p pMpEpSpSpApGpEp pIpNpDpEpXp p p p!
  p p p p
 p p p p p p p p p p pFpoplpdpeprp:p pIpNpBpOpXp p pMpepspspapgpep p1p popfp p3p pApNpSp p p                                                                                 p pAp p p p1p pMpaprp p p9p pSpupppeprp-pUpspeprp p p p p p p p p p p p(p4p7p1p)p ppprpopbpap p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p  A   2 Mar  9 Super-User           (479) hozzaferes                              A   3 Mar  9 Super-User           (473) minta                                                                                                                                                                  
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
                               !
     
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               
                                                                                                                                                                                                                                                                                                ?p Help       
p [ViewMsg]  Np NextMsg     Spppcp NextPage Up Undelete   Fp Forward     
==== //depot/projects/docproj_hu/share/images/books/handbook/mail/pine4.scr#2 (text+ko) ====

@@ -1,1 +1,1 @@
-SCRSHOT_P p pPpIpNpEp p4p.p5p8p p p pMpEpSpSpApGpEp pTpEpXpTp p p p p p p p p p p p p p p pFpoplpdpeprp:p pIpNpBpOpXp p pMpepspspapgpep p1p popfp p3p pApLpLp pApNpSp p p                                                                                Date: Tue,  9 Mar 2004 10:28:36 +0200 (SAST)                                    From: Super-User <root@localhost>                                               To: marcs@localhost                                                             Subject: test                                                                            
                                                                        This is a test message, please reply if you receieve it.                                                                                                                                                                                                                                                                                                                                                                               
                               !
     
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               
                                                                                                                                                                                                                                                                                         [pApLpLp popfp pmpepspspapgpep]p                                ?p Help       
p ViewAttch  Np NextMsg     Spppcp NextPage Up Undelete   Fp Forward     +SCRSHOT_P
  p pPpIpNpEp p4p.p5p8p p p pMpEpSpSpApGpEp pTpEpXpTp p p p p!
  p p p p
 p p p p p p pFpoplpdpeprp:p pIpNpBpOpXp p pMpepspspapgpep p1p popfp p3p pApLpLp pApNpSp p p                                                                                Date: Tue,  9 Mar 2004 10:28:36 +0200 (SAST)                                    From: Super-User <root@localhost>                                               To: marcs@localhost                                                             Subject: proba                                                                                                                   
                                Ez egy proba uzenet. Ha megkaptad, kerlek, valaszolj!                                                                                                                                                                                                                                                                                                                                                                                                                           
                               !
     
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               
                                                                                                                                                                                                                                                [pApLpLp popfp pmpepspspapgpep]p                                ?p Help       
p ViewAttch  Np NextMsg     Spppcp NextPage Up Undelete   Fp Forward     
==== //depot/projects/docproj_hu/share/images/books/handbook/mail/pine5.scr#2 (text+ko) ====

@@ -1,1 +1,1 @@
-SCRSHOT_P p pPpIpNpEp p4p.p5p8p p p pCpOpMpPpOpSpEp pMpEpSpSpApGpEp pRpEpPpLpYp p p p p p p p p p p p p p p p p pFpoplpdpeprp:p pIpNpBpOpXp p p3p pMpepspspapgpepsp p p p                                                                                To      : Super-User <root@localhost>                                           Cc      :                                                                       Attchmnt:                                                                       Subject : Re: test                                                              -p-p-p-p-p pMpeps
 pspapgpep pTpepxptp p-p-p-p-p-p                                                                                                                                        I did recieve your message...                                                                                                                                                                                                                                                                                                                          
                               !
     
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               
                                                                                                                                                                                                                                                                                                                                         ^pGp Get Help  ^pXp Send      ^pRp Read File ^pYp Prev Pg   ^pKp Cut Text  ^pOp Postpone    ^pCp Cancel    ^pJp Justify   ^pWp Where is  ^pVp Next Pg   ^pUp UnCut Text^pTp To Spell    +SCRSHOT_P
  p pPpIpNpEp p4p.p5p8p p p pCpOpMpPpOpSpEp pMpEpSpSpApGpEp p!
 RpEpPpLp
Yp p p p p p p p p p p p p p p p p pFpoplpdpeprp:p pIpNpBpOpXp p p3p pMpepspspapgpepsp p p p                                                                                To      : Super-User <root@localhost>                                           Cc      :                                                                       Attchmnt:                                                                       Subject : Re: proba                                                             -p-p-p-p-p pMpepspspapgpep pTpepxptp p-p-p-p-p-p                         
                                                                                                                Megkaptam az uzeneted...                                                                                                                                                                                                                                                                                                                                                                        
                               !
     
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               
                                                                                                                                                                                                                                                                                                ^pGp Get Help  ^pXp Send      ^pRp Read File ^pYp Prev Pg   ^pKp Cut Text  ^pOp Postpone    ^pCp Cancel    ^pJp Justify   ^pWp Where is  ^pVp Next Pg   ^pUp UnCut Text^pTp To Spell    
==== //depot/projects/docproj_hu/share/images/books/handbook/security/ipsec-crypt-pkt.pic#2 (text+ko) ====

@@ -1,27 +1,30 @@
 .\" $FreeBSD: doc/share/images/books/handbook/security/ipsec-crypt-pkt.pic,v 1.1 2003/08/15 12:25:44 blackend Exp $
+.\" The FreeBSD Hungarian Documentation Project
+.\" Translated by: PALI, Gabor 
+.\" Original Revision: 1.1
 .PS
 
-A:	box wid 2.7 ht 0.55 "Src: A.B.C.D" "Dst: W.X.Y.Z" \
-	  "";
+A:	box wid 2.7 ht 0.55 "Forrás: A.B.C.D" "Cél: W.X.Y.Z" \
+	  "";
 	down;
 
 B:	box wid 2.7 ht 2.15 with .n at A.s;
 
-C:	box wid 2.1 ht 0.55 "Src: A.B.C.D" "Dst: W.X.Y.Z" \
-	  "" with .n at A.s - (0,0.2);
+C:	box wid 2.1 ht 0.55 "Forrás: A.B.C.D" "Cél: W.X.Y.Z" \
+	  "" with .n at A.s - (0,0.2);
 	down;
 
 D:	box wid 2.1 ht 1.25 with .n at C.s;
 
-E:	box wid 1.5 ht 0.55 "Src: 192.168.1.1" "Dst: 192.168.2.1" \
-	  "" with .n at C.s - (0,0.2);
+E:	box wid 1.5 ht 0.55 "Forrás: 192.168.1.1" "Cél: 192.168.2.1" \
+	  "" with .n at C.s - (0,0.2);
 
-F:	box wid 1.5 ht 0.3 "" with .n at E.s;
+F:	box wid 1.5 ht 0.3 "" with .n at E.s;
 
 G:	line from E.ne + (1,0) to E.ne + (1.1,-0.0625);
 	line down (((E.ne.y - F.se.y) - 0.125) / 2) - 0.03125;
 	line down 0.03125 right 0.03125;
-	box "Original packet," "private IP addr" with .w at \
+	box "Az eredeti csomag" "privát IP címmel" with .w at \
 	  last line.end+(0.15,0) invis;
 	line from last line.end left 0.03125 down 0.03125;
 	line to F.se + (1.1,0.0625);
@@ -30,7 +33,7 @@
 H:	line from C.ne + (1.8,0) to C.ne + (1.9,-0.0625);
 	line down (((C.ne.y - D.se.y) - 0.125) / 2) - 0.03125;
 	line down 0.03125 right 0.03125;
-	box "Encapsuled" "packet," "with real IP addr" with .w at \
+	box "A becsomagolt" "csomag" "valódi IP címmel" with .w at \
 	  last line.end+(0.15,0) invis;
 	line from last line.end left 0.03125 down 0.03125;
 	line to D.se + (1.9,0.0625);
@@ -39,8 +42,8 @@
 I:	line from A.ne + (2.6,0) to A.ne + (2.7,-0.0625);
 	line down (((A.ne.y - B.se.y) - 0.125) / 2) - 0.03125;
 	line down 0.03125 right 0.03125;
-	box "Encrypted packet." "Contents are" "completely" \
-	  "secure from third" "party snooping" with .w at \
+	box "Titkosított csomag:" "a tartalma" "teljesen védett" \
+	  "bármilyen külső" "lehallgatás ellen" with .w at \
 	  last line.end+(0.15,0) invis;
 	line from last line.end left 0.03125 down 0.03125;
 	line to B.se + (2.7,0.0625);

==== //depot/projects/docproj_hu/share/images/books/handbook/security/ipsec-encap-pkt.pic#2 (text+ko) ====

@@ -1,15 +1,18 @@
 .\" $FreeBSD: doc/share/images/books/handbook/security/ipsec-encap-pkt.pic,v 1.1 2003/08/15 12:25:44 blackend Exp $
+.\" The FreeBSD Hungarian Documentation Project
+.\" Translated by: PALI, Gabor 
+.\" Original Revision: 1.1
 .PS
 
-A:	box wid 2.1 ht 0.55 "Src: A.B.C.D" "Dst: W.X.Y.Z" \
-	  "";
+A:	box wid 2.1 ht 0.55 "Forrás: A.B.C.D" "Cél: W.X.Y.Z" \
+	  "";
 	down;
 
 B:	box wid 2.1 ht 1.25 with .n at A.s;
 
-C:	box wid 1.5 ht 0.55 "Src: 192.168.1.1" "Dst: 192.168.2.1" \
-	  "" with .n at A.s - (0,0.2);
+C:	box wid 1.5 ht 0.55 "Forrás: 192.168.1.1" "Cél: 192.168.2.1" \
+	  "" with .n at A.s - (0,0.2);
 
-D:	box wid 1.5 ht 0.3 "" with .n at C.s;
+D:	box wid 1.5 ht 0.3 "" with .n at C.s;
 
 .PE

==== //depot/projects/docproj_hu/share/images/books/handbook/security/ipsec-network.pic#2 (text+ko) ====

@@ -1,35 +1,38 @@

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Tue Mar 25 23:08:03 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 68619106566C; Tue, 25 Mar 2008 23: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 26EE01065728
	for ; Tue, 25 Mar 2008 23:08:03 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id ED3A88FC26
	for ; Tue, 25 Mar 2008 23:08:02 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2PN82sT026498
	for ; Tue, 25 Mar 2008 23:08:02 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2PN82QY026496
	for perforce@freebsd.org; Tue, 25 Mar 2008 23:08:02 GMT
	(envelope-from piso@freebsd.org)
Date: Tue, 25 Mar 2008 23:08:02 GMT
Message-Id: <200803252308.m2PN82QY026496@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	piso@freebsd.org using -f
From: Paolo Pisati 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138565 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 25 Mar 2008 23:08:03 -0000

http://perforce.freebsd.org/chv.cgi?CH=138565

Change 138565 by piso@piso_newluxor on 2008/03/25 23:07:05

	Teach LibAliasIn() & LibAliasOut() about mbuf while in kernel land.	

Affected files ...

.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#73 edit
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.h#21 edit

Differences ...

==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#73 (text+ko) ====

@@ -256,13 +256,14 @@
 
 
 /* Local prototypes */
-static int	IcmpAliasIn1(struct libalias *, struct ip *);
-static int	IcmpAliasIn2(struct libalias *, struct ip *);
-static int	IcmpAliasIn(struct libalias *, struct ip *);
+static int	IcmpAliasIn1(struct libalias *, struct ip *, struct icmp *);
+static int	IcmpAliasIn2(struct libalias *, pkt_t);
+static int	IcmpAliasIn(struct libalias *, pkt_t);
 
-static int	IcmpAliasOut1(struct libalias *, struct ip *, int create);
-static int	IcmpAliasOut2(struct libalias *, struct ip *);
-static int	IcmpAliasOut(struct libalias *, struct ip *, int create);
+static int	IcmpAliasOut1(struct libalias *, struct ip *, struct icmp *,
+    int create);
+static int	IcmpAliasOut2(struct libalias *, pkt_t);
+static int	IcmpAliasOut(struct libalias *, pkt_t, int create);
 
 static int	ProtoAliasIn(struct libalias *la, struct in_addr ip_src,
 		    struct in_addr *ip_dst, u_char ip_p, u_short *ip_sum);
@@ -270,15 +271,15 @@
 		    struct in_addr ip_dst, u_char ip_p, u_short *ip_sum, 
 		    int create);
 
-static int	UdpAliasIn(struct libalias *, struct ip *);
-static int	UdpAliasOut(struct libalias *, struct ip *, int create);
+static int	UdpAliasIn(struct libalias *, pkt_t);
+static int	UdpAliasOut(struct libalias *, pkt_t, int create);
 
-static int	TcpAliasIn(struct libalias *, struct ip *);
-static int	TcpAliasOut(struct libalias *, struct ip *, int, int create);
+static int	TcpAliasIn(struct libalias *, pkt_t);
+static int	TcpAliasOut(struct libalias *, pkt_t, int, int create);
 
 
 static int
-IcmpAliasIn1(struct libalias *la, struct ip *pip)
+IcmpAliasIn1(struct libalias *la, struct ip *pip, struct icmp *ic)
 {
 
 	LIBALIAS_LOCK_ASSERT(la);
@@ -287,10 +288,7 @@
     Alias incoming echo and timestamp requests.
 */
 	struct alias_link *lnk;
-	struct icmp *ic;
 
-	ic = (struct icmp *)ip_next(pip);
-
 /* Get source address from ICMP data field and restore original data */
 	lnk = FindIcmpIn(la, pip->ip_src, pip->ip_dst, ic->icmp_id, 1);
 	if (lnk != NULL) {
@@ -323,7 +321,7 @@
 }
 
 static int
-IcmpAliasIn2(struct libalias *la, struct ip *pip)
+IcmpAliasIn2(struct libalias *la, pkt_t ptr)
 {
 
 	LIBALIAS_LOCK_ASSERT(la);
@@ -331,12 +329,13 @@
     Alias incoming ICMP error messages containing
     IP header and first 64 bits of datagram.
 */
-	struct ip *ip;
+	struct ip *ip, *pip;
 	struct icmp *ic, *ic2;
 	struct udphdr *ud;
 	struct tcphdr *tc;
 	struct alias_link *lnk;
 
+	PULLUP_ICMPIP64HDR(pip, ptr);
 	ic = (struct icmp *)ip_next(pip);
 	ip = &ic->icmp_ip;
 
@@ -425,9 +424,10 @@
 
 
 static int
-IcmpAliasIn(struct libalias *la, struct ip *pip)
+IcmpAliasIn(struct libalias *la, pkt_t ptr)
 {
 	int iresult;
+	struct ip *pip;
 	struct icmp *ic;
 
 	LIBALIAS_LOCK_ASSERT(la);
@@ -435,6 +435,7 @@
 	if (la->packetAliasMode & PKT_ALIAS_PROXY_ONLY)
 		return (PKT_ALIAS_OK);
 
+	PULLUP_ICMPHDR(pip, ptr);
 	ic = (struct icmp *)ip_next(pip);
 
 	iresult = PKT_ALIAS_IGNORED;
@@ -442,18 +443,18 @@
 	case ICMP_ECHOREPLY:
 	case ICMP_TSTAMPREPLY:
 		if (ic->icmp_code == 0) {
-			iresult = IcmpAliasIn1(la, pip);
+			iresult = IcmpAliasIn1(la, pip, ic);
 		}
 		break;
 	case ICMP_UNREACH:
 	case ICMP_SOURCEQUENCH:
 	case ICMP_TIMXCEED:
 	case ICMP_PARAMPROB:
-		iresult = IcmpAliasIn2(la, pip);
+		iresult = IcmpAliasIn2(la, ptr);
 		break;
 	case ICMP_ECHO:
 	case ICMP_TSTAMP:
-		iresult = IcmpAliasIn1(la, pip);
+		iresult = IcmpAliasIn1(la, pip, ic);
 		break;
 	}
 	return (iresult);
@@ -461,17 +462,15 @@
 
 
 static int
-IcmpAliasOut1(struct libalias *la, struct ip *pip, int create)
+IcmpAliasOut1(struct libalias *la, struct ip *pip, struct icmp *ic, int create)
 {
 /*
     Alias outgoing echo and timestamp requests.
     De-alias outgoing echo and timestamp replies.
 */
 	struct alias_link *lnk;
-	struct icmp *ic;
 
 	LIBALIAS_LOCK_ASSERT(la);
-	ic = (struct icmp *)ip_next(pip);
 
 /* Save overwritten data for when echo packet returns */
 	lnk = FindIcmpOut(la, pip->ip_src, pip->ip_dst, ic->icmp_id, create);
@@ -506,19 +505,20 @@
 
 
 static int
-IcmpAliasOut2(struct libalias *la, struct ip *pip)
+IcmpAliasOut2(struct libalias *la, pkt_t ptr)
 {
 /*
     Alias outgoing ICMP error messages containing
     IP header and first 64 bits of datagram.
 */
-	struct ip *ip;
+	struct ip *ip, *pip;
 	struct icmp *ic, *ic2;
 	struct udphdr *ud;
 	struct tcphdr *tc;
 	struct alias_link *lnk;
 
 	LIBALIAS_LOCK_ASSERT(la);
+	PULLUP_ICMPIP64HDR(pip, ptr);
 	ic = (struct icmp *)ip_next(pip);
 	ip = &ic->icmp_ip;
 
@@ -607,9 +607,10 @@
 
 
 static int
-IcmpAliasOut(struct libalias *la, struct ip *pip, int create)
+IcmpAliasOut(struct libalias *la, pkt_t ptr, int create)
 {
 	int iresult;
+	struct ip *pip;
 	struct icmp *ic;
 
 	LIBALIAS_LOCK_ASSERT(la);
@@ -619,6 +620,7 @@
 	if (la->packetAliasMode & PKT_ALIAS_PROXY_ONLY)
 		return (PKT_ALIAS_OK);
 
+	PULLUP_ICMPHDR(pip, ptr);
 	ic = (struct icmp *)ip_next(pip);
 
 	iresult = PKT_ALIAS_IGNORED;
@@ -626,18 +628,18 @@
 	case ICMP_ECHO:
 	case ICMP_TSTAMP:
 		if (ic->icmp_code == 0) {
-			iresult = IcmpAliasOut1(la, pip, create);
+			iresult = IcmpAliasOut1(la, pip, ic, create);
 		}
 		break;
 	case ICMP_UNREACH:
 	case ICMP_SOURCEQUENCH:
 	case ICMP_TIMXCEED:
 	case ICMP_PARAMPROB:
-		iresult = IcmpAliasOut2(la, pip);
+		iresult = IcmpAliasOut2(la, ptr);
 		break;
 	case ICMP_ECHOREPLY:
 	case ICMP_TSTAMPREPLY:
-		iresult = IcmpAliasOut1(la, pip, create);
+		iresult = IcmpAliasOut1(la, pip, ic, create);
 	}
 	return (iresult);
 }
@@ -711,8 +713,9 @@
 
 
 static int
-UdpAliasIn(struct libalias *la, struct ip *pip)
+UdpAliasIn(struct libalias *la, pkt_t ptr)
 {
+	struct ip *pip;
 	struct udphdr *ud;
 	struct alias_link *lnk;
 
@@ -721,6 +724,7 @@
 	if (la->packetAliasMode & PKT_ALIAS_PROXY_ONLY)
 		return (PKT_ALIAS_OK);
 
+	PULLUP_UDPHDR(pip, ptr);
 	ud = (struct udphdr *)ip_next(pip);
 
 	lnk = FindUdpTcpIn(la, pip->ip_src, pip->ip_dst,
@@ -776,8 +780,9 @@
 }
 
 static int
-UdpAliasOut(struct libalias *la, struct ip *pip, int create)
+UdpAliasOut(struct libalias *la, pkt_t ptr, int create)
 {
+	struct ip *pip;
 	struct udphdr *ud;
 	struct alias_link *lnk;
 	int error;
@@ -787,6 +792,7 @@
 	if (la->packetAliasMode & PKT_ALIAS_PROXY_ONLY)
 		return (PKT_ALIAS_OK);
 
+	PULLUP_UDPHDR(pip, ptr);
 	ud = (struct udphdr *)ip_next(pip);
 
 	lnk = FindUdpTcpOut(la, pip->ip_src, pip->ip_dst,
@@ -838,12 +844,14 @@
 
 
 static int
-TcpAliasIn(struct libalias *la, struct ip *pip)
+TcpAliasIn(struct libalias *la, pkt_t ptr)
 {
+	struct ip *pip;
 	struct tcphdr *tc;
 	struct alias_link *lnk;
 
 	LIBALIAS_LOCK_ASSERT(la);
+	PULLUP_TCPHDR(pip, ptr);
 	tc = (struct tcphdr *)ip_next(pip);
 
 	lnk = FindUdpTcpIn(la, pip->ip_src, pip->ip_dst,
@@ -960,17 +968,19 @@
 }
 
 static int
-TcpAliasOut(struct libalias *la, struct ip *pip, int maxpacketsize, int create)
+TcpAliasOut(struct libalias *la, pkt_t ptr, int maxpacketsize, int create)
 {
 	int proxy_type, error;
 	u_short dest_port;
 	u_short proxy_server_port;
 	struct in_addr dest_address;
 	struct in_addr proxy_server_address;
+	struct ip *pip;
 	struct tcphdr *tc;
 	struct alias_link *lnk;
 
 	LIBALIAS_LOCK_ASSERT(la);
+	PULLUP_TCPHDR(pip, ptr);
 	tc = (struct tcphdr *)ip_next(pip);
 
 	if (create)
@@ -1221,14 +1231,14 @@
 
 /* Local prototypes */
 static int
-LibAliasOutLocked(struct libalias *la, char *ptr,
-		  int maxpacketsize, int create);
+LibAliasOutLocked(struct libalias *la, pkt_t ptr,
+    int maxpacketsize, int create);
 static int
-LibAliasInLocked(struct libalias *la, char *ptr,
-		  int maxpacketsize);
+LibAliasInLocked(struct libalias *la, pkt_t ptr,
+    int maxpacketsize);
 
 int
-LibAliasIn(struct libalias *la, char *ptr, int maxpacketsize)
+LibAliasIn(struct libalias *la, pkt_t ptr, int maxpacketsize)
 {
 	int res;
 
@@ -1239,7 +1249,7 @@
 }
 
 static int
-LibAliasInLocked(struct libalias *la, char *ptr, int maxpacketsize)
+LibAliasInLocked(struct libalias *la, pkt_t ptr, int maxpacketsize)
 {
 	struct in_addr alias_addr;
 	struct ip *pip;
@@ -1253,6 +1263,7 @@
 	}
 	HouseKeeping(la);
 	ClearCheckNewLink(la);
+	PULLUP_IPHDR(pip, ptr);
 	pip = (struct ip *)ptr;
 	alias_addr = pip->ip_dst;
 
@@ -1267,13 +1278,13 @@
 	if ((ntohs(pip->ip_off) & IP_OFFMASK) == 0) {
 		switch (pip->ip_p) {
 		case IPPROTO_ICMP:
-			iresult = IcmpAliasIn(la, pip);
+			iresult = IcmpAliasIn(la, ptr);
 			break;
 		case IPPROTO_UDP:
-			iresult = UdpAliasIn(la, pip);
+			iresult = UdpAliasIn(la, ptr);
 			break;
 		case IPPROTO_TCP:
-			iresult = TcpAliasIn(la, pip);
+			iresult = TcpAliasIn(la, ptr);
 			break;
  		case IPPROTO_GRE: {
 			int error;
@@ -1339,7 +1350,7 @@
 #define UNREG_ADDR_C_UPPER 0xc0a8ffff
 
 int
-LibAliasOut(struct libalias *la, char *ptr, int maxpacketsize)
+LibAliasOut(struct libalias *la, pkt_t ptr, int maxpacketsize)
 {
 	int res;
 
@@ -1350,7 +1361,7 @@
 }
 
 int
-LibAliasOutTry(struct libalias *la, char *ptr, int maxpacketsize, int create)
+LibAliasOutTry(struct libalias *la, pkt_t ptr, int maxpacketsize, int create)
 {
 	int res;
 
@@ -1361,7 +1372,7 @@
 }
 
 static int
-LibAliasOutLocked(struct libalias *la, char *ptr,	/* valid IP packet */
+LibAliasOutLocked(struct libalias *la, pkt_t ptr,	/* valid IP packet */
     int maxpacketsize,		/* How much the packet data may grow (FTP
 				 * and IRC inline changes) */
     int create                  /* Create new entries ? */
@@ -1379,7 +1390,7 @@
 	}
 	HouseKeeping(la);
 	ClearCheckNewLink(la);
-	pip = (struct ip *)ptr;
+	PULLUP_IPHDR(pip, ptr);
 
 	/* Defense against mangled packets */
 	if (ntohs(pip->ip_len) > maxpacketsize
@@ -1412,13 +1423,13 @@
 	if ((ntohs(pip->ip_off) & IP_OFFMASK) == 0) {
 		switch (pip->ip_p) {
 		case IPPROTO_ICMP:
-			iresult = IcmpAliasOut(la, pip, create);
+			iresult = IcmpAliasOut(la, ptr, create);
 			break;
 		case IPPROTO_UDP:
-			iresult = UdpAliasOut(la, pip, create);
+			iresult = UdpAliasOut(la, ptr, create);
 			break;
 			case IPPROTO_TCP:
-			iresult = TcpAliasOut(la, pip, maxpacketsize, create);
+			iresult = TcpAliasOut(la, ptr, maxpacketsize, create);
 			break;
  		case IPPROTO_GRE: {
 			int error;
@@ -1433,6 +1444,7 @@
 			};
 			/* Walk out chain. */		
 			error = find_handler(OUT, IP, la, pip, &ad);
+			error = 0;
 			if (error == 0)
  				iresult = PKT_ALIAS_OK;
  			else

==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.h#21 (text+ko) ====

@@ -118,13 +118,24 @@
 	pip = mtod(*ptr, struct ip *);				\
         PULLUP_SIZE(pip, ptr, (pip->ip_hl << 2) + sizeof(struct icmp)); \
 } while (0)
+
+#define PULLUP_ICMPIP64HDR(pip, ptr) do {      \
+	int s;				\
+	struct icmp *ic;			\
+        pip = mtod(*ptr, struct ip *);          \
+	ic = (struct icmp *)&(((char *)pip)[pip->ip_hl << 2]); \
+        s = (pip->ip_hl << 2) + sizeof(struct icmp) +   \
+            (ic->icmp_ip.ip_hl << 2) - sizeof(struct ip) + 8;   \
+        PULLUP_SIZE(pip, ptr, s);               \
+} while (0)
 #else
 typedef char * pkt_t;
 
 #define PULLUP_IPHDR(pip, ptr) pip = (struct ip *)ptr
-#define PULLUP_UDPHDR(pip, ptr)
-#define PULLUP_TCPHDR(pip, ptr)
-#define PULLUP_ICMPHDR(pip, ptr)
+#define PULLUP_UDPHDR(pip, ptr) pip = (struct ip *)ptr
+#define PULLUP_TCPHDR(pip, ptr) pip = (struct ip *)ptr
+#define PULLUP_ICMPHDR(pip, ptr) pip = (struct ip *)ptr
+#define PULLUP_ICMPIP64HDR(pip, ptr) pip = (struct ip *)ptr
 #endif
 
 /* Initialization and control functions. */
@@ -137,13 +148,17 @@
 void		LibAliasUninit(struct libalias *);
 
 /* Packet Handling functions. */
-int		LibAliasIn (struct libalias *, char *_ptr, int _maxpacketsize);
-int		LibAliasOut(struct libalias *, char *_ptr, int _maxpacketsize);
-int		LibAliasOutTry(struct libalias *, char *_ptr, int _maxpacketsize, int _create);
 #ifdef _KERNEL
+int		LibAliasIn (struct libalias *, struct mbuf **_ptr, int _maxpacketsize);
+int		LibAliasOut(struct libalias *, struct mbuf **_ptr, int _maxpacketsize);
+int		LibAliasOutTry(struct libalias *, struct mbuf **_ptr, 
+    int _maxpacketsize, int _create);
 int		LibAliasUnaliasOut(struct libalias *, struct mbuf **_ptr, 
     int _maxpacketsize);
 #else
+int		LibAliasIn (struct libalias *, char *_ptr, int _maxpacketsize);
+int		LibAliasOut(struct libalias *, char *_ptr, int _maxpacketsize);
+int		LibAliasOutTry(struct libalias *, char *_ptr, int _maxpacketsize, int _create);
 int		LibAliasUnaliasOut(struct libalias *, char *_ptr, int _maxpacketsize);
 #endif
 

From owner-p4-projects@FreeBSD.ORG  Tue Mar 25 23:22:19 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6B7DA1065675; Tue, 25 Mar 2008 23:22: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 2A104106566C
	for ; Tue, 25 Mar 2008 23:22:19 +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 D64C58FC18
	for ; Tue, 25 Mar 2008 23:22:18 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2PNMI0x028748
	for ; Tue, 25 Mar 2008 23:22:18 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2PNMI85028746
	for perforce@freebsd.org; Tue, 25 Mar 2008 23:22:18 GMT
	(envelope-from sam@freebsd.org)
Date: Tue, 25 Mar 2008 23:22:18 GMT
Message-Id: <200803252322.m2PNMI85028746@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 138566 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 25 Mar 2008 23:22:19 -0000

http://perforce.freebsd.org/chv.cgi?CH=138566

Change 138566 by sam@sam_ebb on 2008/03/25 23:21:23

	fix mismerge

Affected files ...

.. //depot/projects/vap/sys/sys/mbuf.h#11 edit

Differences ...

==== //depot/projects/vap/sys/sys/mbuf.h#11 (text+ko) ====

@@ -201,6 +201,7 @@
 #define	M_PROTOFLAGS \
     (M_PROTO1|M_PROTO2|M_PROTO3|M_PROTO4|M_PROTO5|M_PROTO6|M_PROTO7|M_PROTO8)
 
+/*
  * Flags preserved when copying m_pkthdr.
  */
 #define	M_COPYFLAGS \

From owner-p4-projects@FreeBSD.ORG  Tue Mar 25 23:22:20 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 521591065717; Tue, 25 Mar 2008 23:22: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 4E52E1065670
	for ; Tue, 25 Mar 2008 23:22:19 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 04B9D8FC1D
	for ; Tue, 25 Mar 2008 23:22:19 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2PNMIXO028753
	for ; Tue, 25 Mar 2008 23:22:18 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2PNMI0x028751
	for perforce@freebsd.org; Tue, 25 Mar 2008 23:22:18 GMT
	(envelope-from piso@freebsd.org)
Date: Tue, 25 Mar 2008 23:22:18 GMT
Message-Id: <200803252322.m2PNMI0x028751@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	piso@freebsd.org using -f
From: Paolo Pisati 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138567 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 25 Mar 2008 23:22:20 -0000

http://perforce.freebsd.org/chv.cgi?CH=138567

Change 138567 by piso@piso_newluxor on 2008/03/25 23:21:43

	Temporary disable module execution.

Affected files ...

.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.c#29 edit

Differences ...

==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.c#29 (text+ko) ====

@@ -226,7 +226,7 @@
 	LIST_FOREACH(p, &handler_chain, entries) {
 		if ((p->dir & dir) && (p->proto & proto))
 			if (p->fingerprint(la, pip, ad) == 0) {
-				error = p->protohandler(la, pip, ad);
+				//error = p->protohandler(la, pip, ad);
 				break;
 			}
 	}

From owner-p4-projects@FreeBSD.ORG  Wed Mar 26 00:19:19 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BF4941065674; Wed, 26 Mar 2008 00: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 7F6B6106564A
	for ; Wed, 26 Mar 2008 00:19:18 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 4C7458FC14
	for ; Wed, 26 Mar 2008 00:19:18 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2Q0JId1034548
	for ; Wed, 26 Mar 2008 00:19:18 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2Q0JIJ1034546
	for perforce@freebsd.org; Wed, 26 Mar 2008 00:19:18 GMT
	(envelope-from piso@freebsd.org)
Date: Wed, 26 Mar 2008 00:19:18 GMT
Message-Id: <200803260019.m2Q0JIJ1034546@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	piso@freebsd.org using -f
From: Paolo Pisati 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138571 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 26 Mar 2008 00:19:19 -0000

http://perforce.freebsd.org/chv.cgi?CH=138571

Change 138571 by piso@piso_newluxor on 2008/03/26 00:18:17

	Adapt ipfw_nat to the new libalias API. 

Affected files ...

.. //depot/projects/soc2005/libalias/sys/netinet/ip_fw_nat.c#2 edit

Differences ...

==== //depot/projects/soc2005/libalias/sys/netinet/ip_fw_nat.c#2 (text+ko) ====

@@ -253,7 +253,7 @@
 
 	ldt = 0;
 	retval = 0;
-	if ((mcl = m_megapullup(m, m->m_pkthdr.len)) ==
+	if ((mcl = m_pullup(m, sizeof(struct ip))) ==
 	    NULL)
 		goto badnat;
 	ip = mtod(mcl, struct ip *);
@@ -317,10 +317,10 @@
 
 	c = mtod(mcl, char *);
 	if (args->oif == NULL)
-		retval = LibAliasIn(t->lib, c, 
+		retval = LibAliasIn(t->lib, &mcl, 
 				    MCLBYTES);
 	else
-		retval = LibAliasOut(t->lib, c, 
+		retval = LibAliasOut(t->lib, &mcl, 
 				     MCLBYTES);
 	if (retval != PKT_ALIAS_OK) {
 		/* XXX - should i add some logging? */

From owner-p4-projects@FreeBSD.ORG  Wed Mar 26 00:26:27 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 577F4106566C; Wed, 26 Mar 2008 00: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 15EFD106566B
	for ; Wed, 26 Mar 2008 00:26: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 D5A428FC1E
	for ; Wed, 26 Mar 2008 00:26:26 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2Q0QQSS034803
	for ; Wed, 26 Mar 2008 00:26:26 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2Q0QQcx034801
	for perforce@freebsd.org; Wed, 26 Mar 2008 00:26:26 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 26 Mar 2008 00:26:26 GMT
Message-Id: <200803260026.m2Q0QQcx034801@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 138572 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 26 Mar 2008 00:26:27 -0000

http://perforce.freebsd.org/chv.cgi?CH=138572

Change 138572 by sam@sam_ebb on 2008/03/26 00:25:45

	IFC

Affected files ...

.. //depot/projects/vap/contrib/wpa_supplicant/main.c#6 integrate
.. //depot/projects/vap/contrib/wpa_supplicant/wpa_supplicant.c#6 integrate
.. //depot/projects/vap/sys/dev/usb/ucom.c#7 edit
.. //depot/projects/vap/sys/dev/usb/ucomvar.h#5 edit
.. //depot/projects/vap/sys/dev/usb/usbdevs#11 edit
.. //depot/projects/vap/sys/kern/subr_taskqueue.c#6 integrate
.. //depot/projects/vap/sys/sys/taskqueue.h#7 integrate

Differences ...

==== //depot/projects/vap/contrib/wpa_supplicant/main.c#6 (text) ====

@@ -11,7 +11,7 @@
  *
  * See README and COPYING for more details.
  *
- * $FreeBSD: src/contrib/wpa_supplicant/main.c,v 1.3 2008/03/24 19:57:51 sam Exp $
+ * $FreeBSD: src/contrib/wpa_supplicant/main.c,v 1.4 2008/03/25 21:47:03 sam Exp $
  */
 
 #include "includes.h"

==== //depot/projects/vap/contrib/wpa_supplicant/wpa_supplicant.c#6 (text+ko) ====

@@ -14,7 +14,7 @@
  * This file implements functions for registering and unregistering
  * %wpa_supplicant interfaces. In addition, this file contains number of
  * functions for managing network connections.
- * $FreeBSD: src/contrib/wpa_supplicant/wpa_supplicant.c,v 1.5 2008/03/24 19:57:51 sam Exp $
+ * $FreeBSD: src/contrib/wpa_supplicant/wpa_supplicant.c,v 1.6 2008/03/25 21:47:03 sam Exp $
  */
 
 #include "includes.h"

==== //depot/projects/vap/sys/dev/usb/ucom.c#7 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/usb/ucom.c,v 1.65 2008/02/24 12:16:01 akiyama Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ucom.c,v 1.66 2008/03/25 23:46:24 sam Exp $");
 
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -161,13 +161,10 @@
 }
 
 int
-ucom_attach(struct ucom_softc *sc)
+ucom_attach_tty(struct ucom_softc *sc, int flags, char* fmt, int unit)
 {
 	struct tty *tp;
-	int unit;
 
-	unit = device_get_unit(sc->sc_dev);
-
 	sc->sc_tty = tp = ttyalloc();
 	tp->t_sc = sc;
 	tp->t_oproc = ucomstart;
@@ -179,10 +176,18 @@
 	tp->t_modem = ucommodem;
 	tp->t_ioctl = ucomioctl;
 
-	DPRINTF(("ucom_attach: tty_attach tp = %p\n", tp));
+	return ttycreate(tp, flags, fmt, unit);
+}
+
+int
+ucom_attach(struct ucom_softc *sc)
+{
+
+	ucom_attach_tty(sc, TS_CALLOUT,
+	    "U%d", device_get_unit(sc->sc_dev));
 
-	ttycreate(tp, TS_CALLOUT, "U%d", unit);
-	DPRINTF(("ucom_attach: ttycreate: ttyU%d\n", unit));
+	DPRINTF(("ucom_attach: ttycreate: tp = %p, %s\n",
+	    sc->sc_tty, sc->sc_tty->t_dev->si_name));
 
 	return (0);
 }

==== //depot/projects/vap/sys/dev/usb/ucomvar.h#5 (text+ko) ====

@@ -1,5 +1,5 @@
 /*	$NetBSD: ucomvar.h,v 1.9 2001/01/23 21:56:17 augustss Exp $	*/
-/*	$FreeBSD: src/sys/dev/usb/ucomvar.h,v 1.9 2007/06/12 17:30:54 imp Exp $	*/
+/*	$FreeBSD: src/sys/dev/usb/ucomvar.h,v 1.10 2008/03/25 23:46:24 sam Exp $	*/
 
 /*-
  * Copyright (c) 2001-2002, Shunsuke Akiyama .
@@ -159,6 +159,7 @@
 
 extern devclass_t ucom_devclass;
 
+int ucom_attach_tty(struct ucom_softc *, int, char*, int);
 int ucom_attach(struct ucom_softc *);
 int ucom_detach(struct ucom_softc *);
 void ucom_status_change(struct ucom_softc *);

==== //depot/projects/vap/sys/dev/usb/usbdevs#11 (text+ko) ====

@@ -1,4 +1,4 @@
-$FreeBSD: src/sys/dev/usb/usbdevs,v 1.343 2008/03/20 05:05:37 kevlo Exp $
+$FreeBSD: src/sys/dev/usb/usbdevs,v 1.344 2008/03/25 23:35:32 sam Exp $
 /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */
 
 /*-
@@ -579,6 +579,7 @@
 vendor CISCOLINKSYS	0x13b1	Cisco-Linksys
 vendor SHARK		0x13d2	Shark
 vendor NOVATEL		0x1410	Novatel Wireless
+vendor MERLIN		0x1416	Merlin
 vendor WISTRONNEWEB	0x1435	Wistron NeWeb
 vendor RADIOSHACK	0x1453	Radio Shack
 vendor HUAWEI3COM	0x1472	Huawei-3Com
@@ -1783,9 +1784,16 @@
 
 /* Novatel Wireless products */
 product NOVATEL CDMA_MODEM	0x1110	Novatel Wireless Merlin CDMA
+product NOVATEL V620		0x1110	Merlin V620
+product NOVATEL V720		0x1130	Merlin V720
 product NOVATEL U740		0x1400	Merlin U740
+product NOVATEL U720		0x2110	Merlin U720
+product NOVATEL U727		0x4100	Merlin U727 CDMA
 product NOVATEL2 FLEXPACKGPS	0x0100	NovAtel FlexPack GPS receiver
 
+/* Merlin products */
+product	MERLIN V620		0x1110	Merlin V620
+
 /* Olympus products */
 product OLYMPUS C1		0x0102	C-1 Digital Camera
 product OLYMPUS C700		0x0105	C-700 Ultra Zoom
@@ -2043,6 +2051,7 @@
 /* Sierra Wireless products */
 product SIERRA AIRCARD580	0x0112	Sierra Wireless AirCard 580
 product SIERRA MC5720		0x0218	MC5720 Wireless Modem
+product SIERRA AC875U		0x6812	AC875U HSDPA USB Modem
 
 /* Sigmatel products */
 product SIGMATEL I_BEAD100	0x8008	i-Bead 100 MP3 Player

==== //depot/projects/vap/sys/kern/subr_taskqueue.c#6 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/kern/subr_taskqueue.c,v 1.40 2007/10/20 23:23:21 julian Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/subr_taskqueue.c,v 1.41 2008/03/25 22:38:45 scottl Exp $");
 
 #include 
 #include 
@@ -63,6 +63,8 @@
 };
 
 #define	TQ_FLAGS_ACTIVE		(1 << 0)
+#define	TQ_FLAGS_BLOCKED	(1 << 1)
+#define	TQ_FLAGS_PENDING	(1 << 2)
 
 static __inline void
 TQ_LOCK(struct taskqueue *tq)
@@ -224,7 +226,10 @@
 	}
 
 	task->ta_pending = 1;
-	queue->tq_enqueue(queue->tq_context);
+	if ((queue->tq_flags & TQ_FLAGS_BLOCKED) == 0)
+		queue->tq_enqueue(queue->tq_context);
+	else
+		queue->tq_flags |= TQ_FLAGS_PENDING;
 
 	TQ_UNLOCK(queue);
 
@@ -232,6 +237,28 @@
 }
 
 void
+taskqueue_block(struct taskqueue *queue)
+{
+
+	TQ_LOCK(queue);
+	queue->tq_flags |= TQ_FLAGS_BLOCKED;
+	TQ_UNLOCK(queue);
+}
+
+void
+taskqueue_unblock(struct taskqueue *queue)
+{
+
+	TQ_LOCK(queue);
+	queue->tq_flags &= ~TQ_FLAGS_BLOCKED;
+	if (queue->tq_flags & TQ_FLAGS_PENDING) {
+		queue->tq_flags &= ~TQ_FLAGS_PENDING;
+		queue->tq_enqueue(queue->tq_context);
+	}
+	TQ_UNLOCK(queue);
+}
+
+void
 taskqueue_run(struct taskqueue *queue)
 {
 	struct task *task;

==== //depot/projects/vap/sys/sys/taskqueue.h#7 (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/sys/taskqueue.h,v 1.17 2008/03/16 10:58:01 rwatson Exp $
+ * $FreeBSD: src/sys/sys/taskqueue.h,v 1.18 2008/03/25 22:38:44 scottl Exp $
  */
 
 #ifndef _SYS_TASKQUEUE_H_
@@ -58,6 +58,8 @@
 struct taskqueue *taskqueue_find(const char *name);
 void	taskqueue_free(struct taskqueue *queue);
 void	taskqueue_run(struct taskqueue *queue);
+void	taskqueue_block(struct taskqueue *queue);
+void	taskqueue_unblock(struct taskqueue *queue);
 
 /*
  * Functions for dedicated thread taskqueues

From owner-p4-projects@FreeBSD.ORG  Wed Mar 26 02:03:12 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0E49A1065674; Wed, 26 Mar 2008 02:03: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 C24E3106566C
	for ; Wed, 26 Mar 2008 02:03:11 +0000 (UTC)
	(envelope-from qingli@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id AA0DA8FC17
	for ; Wed, 26 Mar 2008 02:03:11 +0000 (UTC)
	(envelope-from qingli@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2Q23Buw050064
	for ; Wed, 26 Mar 2008 02:03:11 GMT
	(envelope-from qingli@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2Q23BKe050062
	for perforce@freebsd.org; Wed, 26 Mar 2008 02:03:11 GMT
	(envelope-from qingli@freebsd.org)
Date: Wed, 26 Mar 2008 02:03:11 GMT
Message-Id: <200803260203.m2Q23BKe050062@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	qingli@freebsd.org using -f
From: Qing Li 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138573 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 26 Mar 2008 02:03:12 -0000

http://perforce.freebsd.org/chv.cgi?CH=138573

Change 138573 by qingli@FreeBSD-newarp on 2008/03/26 02:03:00

	fixed the "lock not released" panic

Affected files ...

.. //depot/projects/qingli_mpath/src/sys/net/radix_mpath.c#3 edit
.. //depot/projects/qingli_mpath/src/sys/net/radix_mpath.h#2 edit
.. //depot/projects/qingli_mpath/src/sys/net/route.c#4 edit

Differences ...

==== //depot/projects/qingli_mpath/src/sys/net/radix_mpath.c#3 (text+ko) ====

@@ -103,7 +103,7 @@
 	rn = (struct radix_node *)rt;
 	do {
 		rt = (struct rtentry *)rn;
-		/*
+		/* qingli:
 		 * we are removing an address alias that has 
 		 * the same prefix as another address
 		 * we need to compare the interface address because
@@ -124,6 +124,10 @@
 	return (struct rtentry *)rn;
 }
 
+/* qingli:
+ * go through the chain and unlink "rt" from the list
+ * the caller will free "rt"
+ */
 int
 rt_mpath_deldup(headrt, rt)
         struct rtentry *headrt;
@@ -304,7 +308,7 @@
 	rtfree(ro->ro_rt);
 	ro->ro_rt = (struct rtentry *)rn;
 	RT_LOCK(ro->ro_rt);
-	ro->ro_rt->rt_refcnt++;
+	RT_ADDREF(ro->ro_rt);
 	RT_UNLOCK(ro->ro_rt);
 }
 

==== //depot/projects/qingli_mpath/src/sys/net/radix_mpath.h#2 (text+ko) ====

@@ -47,29 +47,18 @@
 struct radix_node *rn_mpath_next __P((struct radix_node *));
 int rn_mpath_count __P((struct radix_node *));
 struct rtentry *rt_mpath_matchgate __P((struct rtentry *, struct sockaddr *));
-#ifdef __OpenBSD__
-int rt_mpath_conflict __P((struct radix_node_head *, struct rtentry *,
-	struct sockaddr *, int));
-#else
 int rt_mpath_conflict __P((struct radix_node_head *, struct rtentry *,
 	struct sockaddr *));
-#endif
 void rtalloc_mpath __P((struct route *, int));
 struct radix_node *rn_mpath_lookup __P((void *, void *,
 	struct radix_node_head *));
 int rt_mpath_deldup __P((struct rtentry *, struct rtentry *));
-#ifdef __FreeBSD__
 int	rn4_mpath_inithead __P((void **, int));
 int	rn6_mpath_inithead __P((void **, int));
-#else
-int	rn_mpath_inithead __P((void **, int));
-#endif
 
-#ifdef __FreeBSD__
 /* for compatibility with NetBSD */
 #define rn_p rn_parent
 #define rn_b rn_bit
-#endif
 
 #endif
 

==== //depot/projects/qingli_mpath/src/sys/net/route.c#4 (text+ko) ====

@@ -720,11 +720,19 @@
 			rt = rt_mpath_matchgate(rt, gateway);
 			if (!rt)
 				senderr(ESRCH);
+			/*
+			 * this is the first entry in the chain
+			 */
 			if (rto == rt) {
 				rn = rn_mpath_next((struct radix_node *)rt);
+				/*
+				 * there is another entry, now it's active
+				 */
 				if (rn) {
 					rto = RNTORT(rn);
+					RT_LOCK(rto);
 					rto->rt_flags |= RTF_UP;
+					RT_UNLOCK(rto);
 				} else if (rt->rt_flags & RTF_GATEWAY) {
 					/*
 					 * For gateway routes, we need to make sure that we 
@@ -737,8 +745,15 @@
 					    memcmp(rt->rt_gateway, gateway, gateway->sa_len)))
 						senderr(ESRCH);
 				}
+				/*
+				 * use the normal delete code to remove
+				 * the first entry
+				 */
 				goto normal_rtdel;
 			}
+			/*
+			 * if the entry is 2nd and on up
+			 */
 			if (!rt_mpath_deldup(rto, rt))
 				panic ("rtrequest1: rt_mpath_deldup");
 			RT_LOCK(rt);
@@ -877,11 +892,13 @@
 		if (rn_mpath_capable(rnh) &&
 			rt_mpath_conflict(rnh, rt, netmask)) {
 			if (rt->rt_gwroute)
-				rtfree(rt->rt_gwroute);
+				RTFREE(rt->rt_gwroute);
 			if (rt->rt_ifa) {
 				IFAFREE(rt->rt_ifa);
 			}
 			Free(rt_key(rt));
+			RT_LOCK_DESTROY(rt);
+			uma_zfree(rtzone, rt);
 			senderr(EEXIST);
 		}
 #endif
@@ -1230,7 +1247,7 @@
 	struct mbuf *m = NULL;
 	struct rtentry *rt = NULL;
 	struct rt_addrinfo info;
-	int error;
+	int error=0;
 
 	if (flags & RTF_HOST) {
 		dst = ifa->ifa_dstaddr;
@@ -1291,12 +1308,12 @@
 			}
 		}
 		else
-#else		
+#endif
 		error = ((rn = rnh->rnh_lookup(dst, netmask, rnh)) == NULL ||
 		    (rn->rn_flags & RNF_ROOT) ||
 		    RNTORT(rn)->rt_ifa != ifa ||
 		    !sa_equal((struct sockaddr *)rn->rn_key, dst));
-#endif
+
 		RADIX_NODE_HEAD_UNLOCK(rnh);
 		if (error) {
 bad:

From owner-p4-projects@FreeBSD.ORG  Wed Mar 26 06:56:30 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 298A41065676; Wed, 26 Mar 2008 06:56: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 DD71D1065674
	for ; Wed, 26 Mar 2008 06:56:29 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C76B38FC16
	for ; Wed, 26 Mar 2008 06:56:29 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2Q6uTEr083105
	for ; Wed, 26 Mar 2008 06:56:29 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2Q6uTic083103
	for perforce@freebsd.org; Wed, 26 Mar 2008 06:56:29 GMT
	(envelope-from jb@freebsd.org)
Date: Wed, 26 Mar 2008 06:56:29 GMT
Message-Id: <200803260656.m2Q6uTic083103@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138579 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 26 Mar 2008 06:56:30 -0000

http://perforce.freebsd.org/chv.cgi?CH=138579

Change 138579 by jb@jb_freebsd1 on 2008/03/26 06:56:20

	Ignore a few more tests now that the unimplemented functionality
	has been disabled in the parser so that the D script compile 
	fails. These were previously passing simply because the dtrace
	kernel module code was commented out, not because they actually
	worked. :-)

Affected files ...

.. //depot/projects/dtrace/src/tools/test/dtrace/Makefile#30 edit

Differences ...

==== //depot/projects/dtrace/src/tools/test/dtrace/Makefile#30 (text+ko) ====

@@ -4,6 +4,13 @@
 DTEST=		${TESTSRCDIR}/cmd/scripts/dtest.pl -n
 
 IGNORE=		\
+	${TESTSRCDIR}/tst/common/arrays/err.D_IDENT_UNDEF.badureg.d		\
+	${TESTSRCDIR}/tst/common/printa/err.D_PRINTF_ARG_TYPE.jstack.d		\
+	${TESTSRCDIR}/tst/common/printa/err.D_PRINTF_ARG_TYPE.ustack.d		\
+	${TESTSRCDIR}/tst/common/printa/tst.stack.d				\
+	${TESTSRCDIR}/tst/common/stack/err.D_USTACK_FRAMES.bad.d		\
+	${TESTSRCDIR}/tst/common/stack/err.D_USTACK_PROTO.bad.d			\
+	${TESTSRCDIR}/tst/common/stack/err.D_USTACK_STRSIZE.bad.d		\
 	${TESTSRCDIR}/tst/common/stop/tst.stop1.d				\
 	${TESTSRCDIR}/tst/common/aggs/tst.subr.d				\
 	${TESTSRCDIR}/tst/common/aggs/tst.signature.d				\

From owner-p4-projects@FreeBSD.ORG  Wed Mar 26 17:51:16 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B5D6E1065673; Wed, 26 Mar 2008 17:51: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 7257A106566C
	for ; Wed, 26 Mar 2008 17:51:16 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 662DA8FC26
	for ; Wed, 26 Mar 2008 17:51:16 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2QHpGqC072153
	for ; Wed, 26 Mar 2008 17:51:16 GMT
	(envelope-from peter-gmail@wemm.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2QHpGTx072151
	for perforce@freebsd.org; Wed, 26 Mar 2008 17:51:16 GMT
	(envelope-from peter-gmail@wemm.org)
Date: Wed, 26 Mar 2008 17:51:16 GMT
Message-Id: <200803261751.m2QHpGTx072151@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter-gmail@wemm.org using -f
From: Peter Wemm 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138633 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 26 Mar 2008 17:51:17 -0000

http://perforce.freebsd.org/chv.cgi?CH=138633

Change 138633 by peter@peter_overcee on 2008/03/26 17:50:33

	IFC @138629
	(cpu_switch won't work yet though)

Affected files ...

.. //depot/projects/hammer/Makefile#47 integrate
.. //depot/projects/hammer/ObsoleteFiles.inc#48 integrate
.. //depot/projects/hammer/contrib/hostapd/ChangeLog#5 integrate
.. //depot/projects/hammer/contrib/hostapd/Makefile#5 integrate
.. //depot/projects/hammer/contrib/hostapd/README#4 integrate
.. //depot/projects/hammer/contrib/hostapd/aes_wrap.c#4 integrate
.. //depot/projects/hammer/contrib/hostapd/aes_wrap.h#4 integrate
.. //depot/projects/hammer/contrib/hostapd/common.c#4 integrate
.. //depot/projects/hammer/contrib/hostapd/common.h#5 integrate
.. //depot/projects/hammer/contrib/hostapd/defconfig#4 integrate
.. //depot/projects/hammer/contrib/hostapd/driver.h#4 integrate
.. //depot/projects/hammer/contrib/hostapd/driver_test.c#4 integrate
.. //depot/projects/hammer/contrib/hostapd/eap_aka.c#2 integrate
.. //depot/projects/hammer/contrib/hostapd/eap_gpsk.c#2 integrate
.. //depot/projects/hammer/contrib/hostapd/eap_gpsk_common.c#2 integrate
.. //depot/projects/hammer/contrib/hostapd/eap_gpsk_common.h#2 integrate
.. //depot/projects/hammer/contrib/hostapd/eap_sim.c#4 integrate
.. //depot/projects/hammer/contrib/hostapd/eap_sim_common.c#4 integrate
.. //depot/projects/hammer/contrib/hostapd/eap_sim_db.c#4 integrate
.. //depot/projects/hammer/contrib/hostapd/eap_tls_common.c#4 integrate
.. //depot/projects/hammer/contrib/hostapd/eapol_version.patch#2 delete
.. //depot/projects/hammer/contrib/hostapd/hostapd.c#4 integrate
.. //depot/projects/hammer/contrib/hostapd/hostapd.conf#5 integrate
.. //depot/projects/hammer/contrib/hostapd/ieee802_11.c#4 integrate
.. //depot/projects/hammer/contrib/hostapd/ieee802_11_auth.c#4 integrate
.. //depot/projects/hammer/contrib/hostapd/ieee802_1x.c#5 integrate
.. //depot/projects/hammer/contrib/hostapd/madwifi.conf#3 integrate
.. //depot/projects/hammer/contrib/hostapd/os.h#2 integrate
.. //depot/projects/hammer/contrib/hostapd/os_unix.c#2 integrate
.. //depot/projects/hammer/contrib/hostapd/radius.c#4 integrate
.. //depot/projects/hammer/contrib/hostapd/radius.h#4 integrate
.. //depot/projects/hammer/contrib/hostapd/radius_client.c#5 integrate
.. //depot/projects/hammer/contrib/hostapd/radius_server.c#5 integrate
.. //depot/projects/hammer/contrib/hostapd/tls_openssl.c#5 integrate
.. //depot/projects/hammer/contrib/hostapd/version.h#5 integrate
.. //depot/projects/hammer/contrib/hostapd/wpa.c#5 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/ChangeLog#5 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/FREEBSD-Xlist#5 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/FREEBSD-upgrade#3 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/Makefile#4 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/README#5 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/aes_wrap.c#4 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/aes_wrap.h#4 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/asn1.c#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/common.c#4 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/common.h#4 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/config.c#5 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/config_ssid.h#4 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/config_winreg.c#2 delete
.. //depot/projects/hammer/contrib/wpa_supplicant/ctrl_iface.c#5 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/ctrl_iface_dbus.c#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.c#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.h#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/ctrl_iface_named_pipe.c#2 delete
.. //depot/projects/hammer/contrib/wpa_supplicant/ctrl_iface_unix.c#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/dbus-wpa_supplicant.conf#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/dbus-wpa_supplicant.service#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/defconfig#4 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/doc/ctrl_iface.doxygen#3 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/doc/docbook/wpa_background.8#3 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/doc/docbook/wpa_cli.8#3 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/doc/docbook/wpa_cli.sgml#3 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.8#3 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.8#3 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5#3 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.sgml#3 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/driver_hostap.h#3 delete
.. //depot/projects/hammer/contrib/wpa_supplicant/driver_ndis.c#5 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/eap_gpsk.c#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/eap_gpsk_common.c#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/eap_gpsk_common.h#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/eap_peap.c#5 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/eap_sim.c#4 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/eap_sim_common.c#4 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/eap_tlv.c#4 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/eap_tlv.h#4 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/eapol_sm.c#5 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/eapol_test.c#4 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/eloop_win.c#2 delete
.. //depot/projects/hammer/contrib/wpa_supplicant/events.c#3 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/main.c#4 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/os.h#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/os_unix.c#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/pcsc_funcs.c#4 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/radius.c#4 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/radius.h#4 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/radius_client.c#4 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/tests/test_aes.c#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/tests/test_eap_sim_common.c#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/tests/test_md4.c#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/tests/test_md5.c#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/tests/test_ms_funcs.c#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/tests/test_sha1.c#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/tests/test_sha256.c#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/tests/test_x509v3.c#1 branch
.. //depot/projects/hammer/contrib/wpa_supplicant/tls_openssl.c#5 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/version.h#5 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/wpa.c#5 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/wpa_cli.c#4 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.cpp#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h#3 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui/setup-mingw-cross-compiling#2 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h#3 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/wpa_supplicant.c#7 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/wpa_supplicant.conf#4 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/wpa_supplicant_i.h#5 integrate
.. //depot/projects/hammer/contrib/wpa_supplicant/x509v3.c#2 integrate
.. //depot/projects/hammer/etc/freebsd-update.conf#4 integrate
.. //depot/projects/hammer/etc/periodic/security/410.logincheck#2 integrate
.. //depot/projects/hammer/lib/libc/gen/lockf.c#2 integrate
.. //depot/projects/hammer/lib/libc/include/namespace.h#12 integrate
.. //depot/projects/hammer/lib/libc/include/un-namespace.h#11 integrate
.. //depot/projects/hammer/lib/libc/sys/Symbol.map#8 integrate
.. //depot/projects/hammer/lib/libc/sys/fcntl.2#7 integrate
.. //depot/projects/hammer/lib/libc/yp/xdryp.c#2 integrate
.. //depot/projects/hammer/lib/libc_r/uthread/uthread_sig.c#11 integrate
.. //depot/projects/hammer/lib/libelf/libelf_convert.m4#3 integrate
.. //depot/projects/hammer/lib/libkse/thread/thr_sig.c#3 integrate
.. //depot/projects/hammer/lib/libthr/Makefile#26 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_attr.c#10 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_exit.c#24 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_mutex.c#41 integrate
.. //depot/projects/hammer/lib/libthread_db/Makefile#12 integrate
.. //depot/projects/hammer/lib/libthread_db/kse.h#1 branch
.. //depot/projects/hammer/lib/libthread_db/libpthread_db.c#10 integrate
.. //depot/projects/hammer/libexec/talkd/announce.c#3 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/article.sgml#30 integrate
.. //depot/projects/hammer/share/man/man4/bpf.4#13 integrate
.. //depot/projects/hammer/share/man/man4/malo.4#1 branch
.. //depot/projects/hammer/share/man/man7/security.7#18 integrate
.. //depot/projects/hammer/share/man/man9/malloc.9#13 integrate
.. //depot/projects/hammer/share/man/man9/mbchain.9#3 integrate
.. //depot/projects/hammer/share/man/man9/mbuf.9#29 integrate
.. //depot/projects/hammer/share/zoneinfo/asia#14 integrate
.. //depot/projects/hammer/share/zoneinfo/backward#10 integrate
.. //depot/projects/hammer/share/zoneinfo/northamerica#14 integrate
.. //depot/projects/hammer/share/zoneinfo/southamerica#16 integrate
.. //depot/projects/hammer/share/zoneinfo/zone.tab#14 integrate
.. //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#46 integrate
.. //depot/projects/hammer/sys/amd64/amd64/genassym.c#51 integrate
.. //depot/projects/hammer/sys/amd64/amd64/pmap.c#175 integrate
.. //depot/projects/hammer/sys/amd64/amd64/prof_machdep.c#8 integrate
.. //depot/projects/hammer/sys/amd64/conf/NOTES#109 integrate
.. //depot/projects/hammer/sys/amd64/ia32/ia32_signal.c#24 integrate
.. //depot/projects/hammer/sys/amd64/include/clock.h#26 integrate
.. //depot/projects/hammer/sys/amd64/include/pcb.h#27 integrate
.. //depot/projects/hammer/sys/amd64/isa/clock.c#68 integrate
.. //depot/projects/hammer/sys/boot/i386/cdboot/cdboot.s#8 integrate
.. //depot/projects/hammer/sys/boot/pc98/cdboot/cdboot.s#4 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#53 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#50 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#50 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#50 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#55 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_file.c#28 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_misc.c#47 integrate
.. //depot/projects/hammer/sys/compat/svr4/svr4_fcntl.c#16 integrate
.. //depot/projects/hammer/sys/conf/NOTES#140 integrate
.. //depot/projects/hammer/sys/conf/files#177 integrate
.. //depot/projects/hammer/sys/conf/options#126 integrate
.. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#10 integrate
.. //depot/projects/hammer/sys/ddb/db_command.c#23 integrate
.. //depot/projects/hammer/sys/ddb/db_ps.c#22 integrate
.. //depot/projects/hammer/sys/ddb/ddb.h#16 integrate
.. //depot/projects/hammer/sys/dev/aac/aac.c#46 integrate
.. //depot/projects/hammer/sys/dev/aac/aac_cam.c#21 integrate
.. //depot/projects/hammer/sys/dev/aac/aac_debug.c#11 integrate
.. //depot/projects/hammer/sys/dev/aac/aac_disk.c#13 integrate
.. //depot/projects/hammer/sys/dev/aac/aac_pci.c#32 integrate
.. //depot/projects/hammer/sys/dev/aac/aacreg.h#13 integrate
.. //depot/projects/hammer/sys/dev/aac/aacvar.h#16 integrate
.. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#5 integrate
.. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#5 integrate
.. //depot/projects/hammer/sys/dev/dc/if_dc.c#14 integrate
.. //depot/projects/hammer/sys/dev/dc/if_dcreg.h#8 integrate
.. //depot/projects/hammer/sys/dev/en/midway.c#28 integrate
.. //depot/projects/hammer/sys/dev/fatm/if_fatm.c#17 integrate
.. //depot/projects/hammer/sys/dev/firewire/if_fwe.c#28 integrate
.. //depot/projects/hammer/sys/dev/firewire/if_fwip.c#14 integrate
.. //depot/projects/hammer/sys/dev/gem/if_gem.c#34 integrate
.. //depot/projects/hammer/sys/dev/gem/if_gem_pci.c#18 integrate
.. //depot/projects/hammer/sys/dev/gem/if_gemreg.h#6 integrate
.. //depot/projects/hammer/sys/dev/gem/if_gemvar.h#12 integrate
.. //depot/projects/hammer/sys/dev/iscsi/initiator/isc_soc.c#4 integrate
.. //depot/projects/hammer/sys/dev/malo/if_malo.c#1 branch
.. //depot/projects/hammer/sys/dev/malo/if_malo.h#1 branch
.. //depot/projects/hammer/sys/dev/malo/if_malo_pci.c#1 branch
.. //depot/projects/hammer/sys/dev/malo/if_malohal.c#1 branch
.. //depot/projects/hammer/sys/dev/malo/if_malohal.h#1 branch
.. //depot/projects/hammer/sys/dev/malo/if_maloioctl.h#1 branch
.. //depot/projects/hammer/sys/dev/re/if_re.c#58 integrate
.. //depot/projects/hammer/sys/dev/speaker/spkr.c#3 integrate
.. //depot/projects/hammer/sys/dev/ti/if_ti.c#9 integrate
.. //depot/projects/hammer/sys/dev/usb/ucom.c#27 integrate
.. //depot/projects/hammer/sys/dev/usb/ucomvar.h#9 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdevs#98 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vnops.c#36 integrate
.. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_vnops.c#11 integrate
.. //depot/projects/hammer/sys/i386/conf/NOTES#99 integrate
.. //depot/projects/hammer/sys/i386/i386/pmap.c#109 integrate
.. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_fcntl.c#8 integrate
.. //depot/projects/hammer/sys/i386/include/clock.h#16 integrate
.. //depot/projects/hammer/sys/i386/include/vmparam.h#14 integrate
.. //depot/projects/hammer/sys/i386/isa/clock.c#42 integrate
.. //depot/projects/hammer/sys/i386/isa/prof_machdep.c#11 integrate
.. //depot/projects/hammer/sys/i386/isa/vesa.c#14 integrate
.. //depot/projects/hammer/sys/isa/syscons_isa.c#13 integrate
.. //depot/projects/hammer/sys/kern/init_sysent.c#67 integrate
.. //depot/projects/hammer/sys/kern/kern_cpuset.c#3 integrate
.. //depot/projects/hammer/sys/kern/kern_descrip.c#79 integrate
.. //depot/projects/hammer/sys/kern/kern_lockf.c#18 integrate
.. //depot/projects/hammer/sys/kern/makesyscalls.sh#12 integrate
.. //depot/projects/hammer/sys/kern/subr_mchain.c#10 integrate
.. //depot/projects/hammer/sys/kern/subr_taskqueue.c#23 integrate
.. //depot/projects/hammer/sys/kern/syscalls.c#65 integrate
.. //depot/projects/hammer/sys/kern/syscalls.master#67 integrate
.. //depot/projects/hammer/sys/kern/systrace_args.c#11 integrate
.. //depot/projects/hammer/sys/kern/uipc_mbuf.c#48 integrate
.. //depot/projects/hammer/sys/kern/uipc_socket.c#80 integrate
.. //depot/projects/hammer/sys/kern/uipc_syscalls.c#71 integrate
.. //depot/projects/hammer/sys/kern/vfs_mount.c#90 integrate
.. //depot/projects/hammer/sys/kern/vfs_subr.c#128 integrate
.. //depot/projects/hammer/sys/kern/vfs_vnops.c#53 integrate
.. //depot/projects/hammer/sys/kern/vnode_if.src#27 integrate
.. //depot/projects/hammer/sys/modules/malo/Makefile#1 branch
.. //depot/projects/hammer/sys/net/bpf.c#58 integrate
.. //depot/projects/hammer/sys/net/bpf.h#20 integrate
.. //depot/projects/hammer/sys/net/bpf_buffer.c#1 branch
.. //depot/projects/hammer/sys/net/bpf_buffer.h#1 branch
.. //depot/projects/hammer/sys/net/bpf_zerocopy.c#1 branch
.. //depot/projects/hammer/sys/net/bpf_zerocopy.h#1 branch
.. //depot/projects/hammer/sys/net/bpfdesc.h#19 integrate
.. //depot/projects/hammer/sys/net/if.c#74 integrate
.. //depot/projects/hammer/sys/net/if_ef.c#17 integrate
.. //depot/projects/hammer/sys/net/if_enc.c#5 integrate
.. //depot/projects/hammer/sys/net/if_fddisubr.c#23 integrate
.. //depot/projects/hammer/sys/net/if_iso88025subr.c#21 integrate
.. //depot/projects/hammer/sys/net/if_loop.c#32 integrate
.. //depot/projects/hammer/sys/net/if_media.h#21 integrate
.. //depot/projects/hammer/sys/net/if_sl.c#27 integrate
.. //depot/projects/hammer/sys/net/if_var.h#46 integrate
.. //depot/projects/hammer/sys/net/raw_cb.c#12 integrate
.. //depot/projects/hammer/sys/netatalk/aarp.c#23 integrate
.. //depot/projects/hammer/sys/netatm/port.h#5 integrate
.. //depot/projects/hammer/sys/netgraph/ng_pptpgre.c#15 integrate
.. //depot/projects/hammer/sys/netgraph/ng_pptpgre.h#5 integrate
.. //depot/projects/hammer/sys/netinet/in_pcb.c#55 integrate
.. //depot/projects/hammer/sys/netinet/in_pcb.h#37 integrate
.. //depot/projects/hammer/sys/netinet/ip_output.c#68 integrate
.. //depot/projects/hammer/sys/netinet6/ip6_output.c#50 integrate
.. //depot/projects/hammer/sys/netipsec/key.c#20 integrate
.. //depot/projects/hammer/sys/netncp/ncp_sock.c#9 integrate
.. //depot/projects/hammer/sys/netsmb/smb_iod.c#12 integrate
.. //depot/projects/hammer/sys/netsmb/smb_rq.c#10 integrate
.. //depot/projects/hammer/sys/netsmb/smb_trantcp.c#13 integrate
.. //depot/projects/hammer/sys/nfs/nfs_common.c#8 integrate
.. //depot/projects/hammer/sys/nfs4client/nfs4_vnops.c#31 integrate
.. //depot/projects/hammer/sys/nfsclient/krpc_subr.c#12 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_lock.c#17 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_socket.c#46 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_subs.c#35 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#59 integrate
.. //depot/projects/hammer/sys/nfsserver/nfs_serv.c#41 integrate
.. //depot/projects/hammer/sys/nfsserver/nfs_srvcache.c#11 integrate
.. //depot/projects/hammer/sys/nfsserver/nfs_srvsock.c#25 integrate
.. //depot/projects/hammer/sys/nfsserver/nfs_srvsubs.c#32 integrate
.. //depot/projects/hammer/sys/nfsserver/nfs_syscalls.c#25 integrate
.. //depot/projects/hammer/sys/nlm/nlm.h#1 branch
.. //depot/projects/hammer/sys/nlm/nlm_prot.h#1 branch
.. //depot/projects/hammer/sys/nlm/nlm_prot_clnt.c#1 branch
.. //depot/projects/hammer/sys/nlm/nlm_prot_impl.c#1 branch
.. //depot/projects/hammer/sys/nlm/nlm_prot_server.c#1 branch
.. //depot/projects/hammer/sys/nlm/nlm_prot_svc.c#1 branch
.. //depot/projects/hammer/sys/nlm/nlm_prot_xdr.c#1 branch
.. //depot/projects/hammer/sys/nlm/sm_inter.h#1 branch
.. //depot/projects/hammer/sys/nlm/sm_inter_xdr.c#1 branch
.. //depot/projects/hammer/sys/pc98/cbus/clock.c#12 integrate
.. //depot/projects/hammer/sys/pc98/cbus/syscons_cbus.c#4 integrate
.. //depot/projects/hammer/sys/pc98/conf/NOTES#61 integrate
.. //depot/projects/hammer/sys/pci/if_mn.c#15 integrate
.. //depot/projects/hammer/sys/pci/if_rlreg.h#32 integrate
.. //depot/projects/hammer/sys/pci/if_xl.c#69 integrate
.. //depot/projects/hammer/sys/pci/if_xlreg.h#17 integrate
.. //depot/projects/hammer/sys/rpc/auth.h#1 branch
.. //depot/projects/hammer/sys/rpc/auth_none.c#1 branch
.. //depot/projects/hammer/sys/rpc/auth_unix.c#1 branch
.. //depot/projects/hammer/sys/rpc/authunix_prot.c#1 branch
.. //depot/projects/hammer/sys/rpc/clnt.h#1 branch
.. //depot/projects/hammer/sys/rpc/clnt_dg.c#1 branch
.. //depot/projects/hammer/sys/rpc/clnt_rc.c#1 branch
.. //depot/projects/hammer/sys/rpc/clnt_stat.h#1 branch
.. //depot/projects/hammer/sys/rpc/clnt_vc.c#1 branch
.. //depot/projects/hammer/sys/rpc/getnetconfig.c#1 branch
.. //depot/projects/hammer/sys/rpc/inet_ntop.c#1 branch
.. //depot/projects/hammer/sys/rpc/inet_pton.c#1 branch
.. //depot/projects/hammer/sys/rpc/netconfig.h#1 branch
.. //depot/projects/hammer/sys/rpc/nettype.h#1 branch
.. //depot/projects/hammer/sys/rpc/pmap_prot.h#1 branch
.. //depot/projects/hammer/sys/rpc/rpc.h#1 branch
.. //depot/projects/hammer/sys/rpc/rpc_callmsg.c#1 branch
.. //depot/projects/hammer/sys/rpc/rpc_com.h#1 branch
.. //depot/projects/hammer/sys/rpc/rpc_generic.c#1 branch
.. //depot/projects/hammer/sys/rpc/rpc_msg.h#1 branch
.. //depot/projects/hammer/sys/rpc/rpc_prot.c#1 branch
.. //depot/projects/hammer/sys/rpc/rpcb_clnt.c#1 branch
.. //depot/projects/hammer/sys/rpc/rpcb_clnt.h#1 branch
.. //depot/projects/hammer/sys/rpc/rpcb_prot.c#1 branch
.. //depot/projects/hammer/sys/rpc/rpcb_prot.h#1 branch
.. //depot/projects/hammer/sys/rpc/rpcclnt.c#17 integrate
.. //depot/projects/hammer/sys/rpc/svc.c#1 branch
.. //depot/projects/hammer/sys/rpc/svc.h#1 branch
.. //depot/projects/hammer/sys/rpc/svc_auth.c#1 branch
.. //depot/projects/hammer/sys/rpc/svc_auth.h#1 branch
.. //depot/projects/hammer/sys/rpc/svc_auth_unix.c#1 branch
.. //depot/projects/hammer/sys/rpc/svc_dg.c#1 branch
.. //depot/projects/hammer/sys/rpc/svc_generic.c#1 branch
.. //depot/projects/hammer/sys/rpc/svc_vc.c#1 branch
.. //depot/projects/hammer/sys/rpc/types.h#2 integrate
.. //depot/projects/hammer/sys/rpc/xdr.h#1 branch
.. //depot/projects/hammer/sys/sparc64/include/bus.h#23 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/bus_machdep.c#23 integrate
.. //depot/projects/hammer/sys/sun4v/include/cpu.h#2 integrate
.. //depot/projects/hammer/sys/sys/cdefs.h#26 integrate
.. //depot/projects/hammer/sys/sys/cpuset.h#3 integrate
.. //depot/projects/hammer/sys/sys/fcntl.h#7 integrate
.. //depot/projects/hammer/sys/sys/lockf.h#7 integrate
.. //depot/projects/hammer/sys/sys/mbuf.h#66 integrate
.. //depot/projects/hammer/sys/sys/param.h#108 integrate
.. //depot/projects/hammer/sys/sys/syscall.h#64 integrate
.. //depot/projects/hammer/sys/sys/syscall.mk#64 integrate
.. //depot/projects/hammer/sys/sys/sysproto.h#65 integrate
.. //depot/projects/hammer/sys/sys/taskqueue.h#12 integrate
.. //depot/projects/hammer/sys/sys/vnode.h#77 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_softdep.c#53 integrate
.. //depot/projects/hammer/sys/ufs/ufs/ufs_vnops.c#53 integrate
.. //depot/projects/hammer/sys/xdr/xdr.c#1 branch
.. //depot/projects/hammer/sys/xdr/xdr_array.c#1 branch
.. //depot/projects/hammer/sys/xdr/xdr_mbuf.c#1 branch
.. //depot/projects/hammer/sys/xdr/xdr_mem.c#1 branch
.. //depot/projects/hammer/sys/xdr/xdr_reference.c#1 branch
.. //depot/projects/hammer/sys/xdr/xdr_sizeof.c#1 branch
.. //depot/projects/hammer/tools/build/mk/OptionalObsoleteFiles.inc#10 integrate
.. //depot/projects/hammer/tools/regression/file/flock/Makefile#1 branch
.. //depot/projects/hammer/tools/regression/file/flock/flock.c#1 branch
.. //depot/projects/hammer/usr.bin/checknr/checknr.c#4 integrate
.. //depot/projects/hammer/usr.bin/make/for.c#19 integrate
.. //depot/projects/hammer/usr.bin/make/make.1#34 integrate
.. //depot/projects/hammer/usr.bin/netstat/bpf.c#6 integrate
.. //depot/projects/hammer/usr.bin/xlint/lint1/lint1.h#3 integrate
.. //depot/projects/hammer/usr.sbin/Makefile#87 integrate
.. //depot/projects/hammer/usr.sbin/arp/arp.8#9 integrate
.. //depot/projects/hammer/usr.sbin/clear_locks/Makefile#1 branch
.. //depot/projects/hammer/usr.sbin/clear_locks/clear_locks.8#1 branch
.. //depot/projects/hammer/usr.sbin/clear_locks/clear_locks.c#1 branch
.. //depot/projects/hammer/usr.sbin/freebsd-update/freebsd-update.sh#7 integrate
.. //depot/projects/hammer/usr.sbin/rpc.lockd/lockd.c#9 integrate
.. //depot/projects/hammer/usr.sbin/rpc.lockd/rpc.lockd.8#6 integrate
.. //depot/projects/hammer/usr.sbin/wpa/wpa_supplicant/Makefile#13 integrate
.. //depot/projects/hammer/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8#5 integrate

Differences ...

==== //depot/projects/hammer/Makefile#47 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile,v 1.345 2008/01/30 19:33:18 jhb Exp $
+# $FreeBSD: src/Makefile,v 1.346 2008/03/25 15:47:22 ru Exp $
 #
 # The user-driven targets are:
 #
@@ -172,6 +172,10 @@
 .MAIN:	all
 
 STARTTIME!= LC_ALL=C date
+CHECK_TIME!= find ${.CURDIR}/sys/sys/param.h -mtime -0
+.if !empty(CHECK_TIME)
+.error check your date/time: ${STARTTIME}
+.endif
 
 .if defined(HISTORICAL_MAKE_WORLD) || defined(DESTDIR)
 #

==== //depot/projects/hammer/ObsoleteFiles.inc#48 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.133 2008/03/13 18:17:46 brueffer Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.134 2008/03/26 06:45:28 remko Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -1103,6 +1103,9 @@
 OLD_FILES+=usr/sbin/ntptimeset
 OLD_FILES+=usr/share/man/man8/kernbb.8.gz
 OLD_FILES+=usr/share/man/man8/ntp-genkeys.8.gz
+# 20040627: usbdevs.h and usbdevs_data.h removal
+OLD_FILES+=usr/include/dev/usb/usbdevs.h
+OLD_FILES+=usr/include/dev/usb/usbdevs_data.h
 # 200406XX
 OLD_FILES+=usr/bin/gasp
 OLD_FILES+=usr/bin/gdbreplay
@@ -3551,8 +3554,6 @@
 OLD_FILES+=usr/bin/hesinfo
 OLD_FILES+=usr/include/c++/3.4/ext/demangle.h
 OLD_FILES+=usr/include/cam/cam_extend.h
-OLD_FILES+=usr/include/dev/usb/usbdevs.h
-OLD_FILES+=usr/include/dev/usb/usbdevs_data.h
 OLD_FILES+=usr/include/dev/wi/wi_hostap.h
 OLD_FILES+=usr/include/disktab.h
 OLD_FILES+=usr/include/g++/FlexLexer.h

==== //depot/projects/hammer/contrib/hostapd/ChangeLog#5 (text+ko) ====

@@ -1,5 +1,25 @@
 ChangeLog for hostapd
 
+2008-02-19 - v0.5.10
+	* fixed EAP-SIM and EAP-AKA message parser to validate attribute
+	  lengths properly to avoid potential crash caused by invalid messages
+	* fixed Reassociation Response callback processing when using internal
+	  MLME (driver_{hostap,devicescape,test}.c)
+	* fixed EAP-SIM/AKA realm processing to allow decorated usernames to
+	  be used
+	* added a workaround for EAP-SIM/AKA peers that include incorrect null
+	  termination in the username
+	* fixed EAP-SIM Start response processing for fast reauthentication
+	  case
+	* copy optional Proxy-State attributes into RADIUS response when acting
+	  as a RADIUS authentication server
+
+2007-12-02 - v0.5.9
+	* updated EAP Generalized Pre-Shared Key (EAP-GPSK) to use the latest
+	  draft (draft-ietf-emu-eap-gpsk-07.txt)
+	* fixed debugging code not to use potentially unaligned read to fetch
+	  IPv4 addresses
+
 2007-05-28 - v0.5.8
 	* updated driver_devicescape.c to build with the current
 	  wireless-dev.git tree and net/d80211 changes

==== //depot/projects/hammer/contrib/hostapd/Makefile#5 (text+ko) ====

@@ -313,6 +313,10 @@
 CFLAGS += -DCONFIG_IPV6
 endif
 
+ifdef CONFIG_DRIVER_RADIUS_ACL
+CFLAGS += -DCONFIG_DRIVER_RADIUS_ACL
+endif
+
 ifdef CONFIG_FULL_DYNAMIC_VLAN
 # define CONFIG_FULL_DYNAMIC_VLAN to have hostapd manipulate bridges
 # and vlan interfaces for the vlan feature.

==== //depot/projects/hammer/contrib/hostapd/README#4 (text+ko) ====

@@ -2,7 +2,7 @@
 	  Authenticator and RADIUS authentication server
 ================================================================
 
-Copyright (c) 2002-2007, Jouni Malinen  and contributors
+Copyright (c) 2002-2008, Jouni Malinen  and contributors
 All Rights Reserved.
 
 This program is dual-licensed under both the GPL version 2 and BSD

==== //depot/projects/hammer/contrib/hostapd/aes_wrap.c#4 (text+ko) ====

@@ -7,7 +7,7 @@
  * - AES-128 EAX mode encryption/decryption
  * - AES-128 CBC
  *
- * Copyright (c) 2003-2005, Jouni Malinen 
+ * Copyright (c) 2003-2007, Jouni Malinen 
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -34,10 +34,11 @@
 
 /**
  * aes_wrap - Wrap keys with AES Key Wrap Algorithm (128-bit KEK) (RFC3394)
- * @kek: Key encryption key (KEK)
- * @n: Length of the wrapped key in 64-bit units; e.g., 2 = 128-bit = 16 bytes
- * @plain: Plaintext key to be wrapped, n * 64 bit
- * @cipher: Wrapped key, (n + 1) * 64 bit
+ * @kek: 16-octet Key encryption key (KEK)
+ * @n: Length of the plaintext key in 64-bit units; e.g., 2 = 128-bit = 16
+ * bytes
+ * @plain: Plaintext key to be wrapped, n * 64 bits
+ * @cipher: Wrapped key, (n + 1) * 64 bits
  * Returns: 0 on success, -1 on failure
  */
 int aes_wrap(const u8 *kek, int n, const u8 *plain, u8 *cipher)
@@ -93,9 +94,10 @@
 /**
  * aes_unwrap - Unwrap key with AES Key Wrap Algorithm (128-bit KEK) (RFC3394)
  * @kek: Key encryption key (KEK)
- * @n: Length of the wrapped key in 64-bit units; e.g., 2 = 128-bit = 16 bytes
- * @cipher: Wrapped key to be unwrapped, (n + 1) * 64 bit
- * @plain: Plaintext key, n * 64 bit
+ * @n: Length of the plaintext key in 64-bit units; e.g., 2 = 128-bit = 16
+ * bytes
+ * @cipher: Wrapped key to be unwrapped, (n + 1) * 64 bits
+ * @plain: Plaintext key, n * 64 bits
  * Returns: 0 on success, -1 on failure (e.g., integrity verification failed)
  */
 int aes_unwrap(const u8 *kek, int n, const u8 *cipher, u8 *plain)
@@ -167,28 +169,45 @@
 
 
 /**
- * omac1_aes_128 - One-Key CBC MAC (OMAC1) hash with AES-128 (aka AES-CMAC)
+ * omac1_aes_128_vector - One-Key CBC MAC (OMAC1) hash with AES-128
  * @key: 128-bit key for the hash operation
- * @data: Data buffer for which a MAC is determined
- * @data: Length of data buffer in bytes
+ * @num_elem: Number of elements in the data vector
+ * @addr: Pointers to the data areas
+ * @len: Lengths of the data blocks
  * @mac: Buffer for MAC (128 bits, i.e., 16 bytes)
  * Returns: 0 on success, -1 on failure
  */
-int omac1_aes_128(const u8 *key, const u8 *data, size_t data_len, u8 *mac)
+int omac1_aes_128_vector(const u8 *key, size_t num_elem,
+			 const u8 *addr[], const size_t *len, u8 *mac)
 {
 	void *ctx;
 	u8 cbc[BLOCK_SIZE], pad[BLOCK_SIZE];
-	const u8 *pos = data;
-	size_t i, left = data_len;
+	const u8 *pos, *end;
+	size_t i, e, left, total_len;
 
 	ctx = aes_encrypt_init(key, 16);
 	if (ctx == NULL)
 		return -1;
 	os_memset(cbc, 0, BLOCK_SIZE);
 
+	total_len = 0;
+	for (e = 0; e < num_elem; e++)
+		total_len += len[e];
+	left = total_len;
+
+	e = 0;
+	pos = addr[0];
+	end = pos + len[0];
+
 	while (left >= BLOCK_SIZE) {
-		for (i = 0; i < BLOCK_SIZE; i++)
+		for (i = 0; i < BLOCK_SIZE; i++) {
 			cbc[i] ^= *pos++;
+			if (pos >= end) {
+				e++;
+				pos = addr[e];
+				end = pos + len[e];
+			}
+		}
 		if (left > BLOCK_SIZE)
 			aes_encrypt(ctx, cbc, cbc);
 		left -= BLOCK_SIZE;
@@ -198,9 +217,15 @@
 	aes_encrypt(ctx, pad, pad);
 	gf_mulx(pad);
 
-	if (left || data_len == 0) {
-		for (i = 0; i < left; i++)
+	if (left || total_len == 0) {
+		for (i = 0; i < left; i++) {
 			cbc[i] ^= *pos++;
+			if (pos >= end) {
+				e++;
+				pos = addr[e];
+				end = pos + len[e];
+			}
+		}
 		cbc[left] ^= 0x80;
 		gf_mulx(pad);
 	}
@@ -212,6 +237,24 @@
 	return 0;
 }
 
+
+/**
+ * omac1_aes_128 - One-Key CBC MAC (OMAC1) hash with AES-128 (aka AES-CMAC)
+ * @key: 128-bit key for the hash operation
+ * @data: Data buffer for which a MAC is determined
+ * @data_len: Length of data buffer in bytes
+ * @mac: Buffer for MAC (128 bits, i.e., 16 bytes)
+ * Returns: 0 on success, -1 on failure
+ *
+ * This is a mode for using block cipher (AES in this case) for authentication.
+ * OMAC1 was standardized with the name CMAC by NIST in a Special Publication
+ * (SP) 800-38B.
+ */
+int omac1_aes_128(const u8 *key, const u8 *data, size_t data_len, u8 *mac)
+{
+	return omac1_aes_128_vector(key, 1, &data, &data_len, mac);
+}
+
 #endif /* CONFIG_NO_AES_OMAC1 */
 
 

==== //depot/projects/hammer/contrib/hostapd/aes_wrap.h#4 (text+ko) ====

@@ -7,7 +7,7 @@
  * - AES-128 EAX mode encryption/decryption
  * - AES-128 CBC
  *
- * Copyright (c) 2003-2005, Jouni Malinen 
+ * Copyright (c) 2003-2007, Jouni Malinen 
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -24,6 +24,8 @@
 
 int aes_wrap(const u8 *kek, int n, const u8 *plain, u8 *cipher);
 int aes_unwrap(const u8 *kek, int n, const u8 *cipher, u8 *plain);
+int omac1_aes_128_vector(const u8 *key, size_t num_elem,
+			 const u8 *addr[], const size_t *len, u8 *mac);
 int omac1_aes_128(const u8 *key, const u8 *data, size_t data_len, u8 *mac);
 int aes_128_encrypt_block(const u8 *key, const u8 *in, u8 *out);
 int aes_128_ctr_encrypt(const u8 *key, const u8 *nonce,

==== //depot/projects/hammer/contrib/hostapd/common.c#4 (text+ko) ====

@@ -20,7 +20,6 @@
 #ifdef CONFIG_DEBUG_FILE
 static FILE *out_file = NULL;
 #endif /* CONFIG_DEBUG_FILE */
-int wpa_debug_use_file = 0;
 int wpa_debug_level = MSG_INFO;
 int wpa_debug_show_keys = 0;
 int wpa_debug_timestamp = 0;
@@ -344,32 +343,29 @@
 }
 
 
-int wpa_debug_open_file(void)
+int wpa_debug_open_file(const char *path)
 {
 #ifdef CONFIG_DEBUG_FILE
-	static int count = 0;
-	char fname[64];
-	if (!wpa_debug_use_file)
+	if (!path)
 		return 0;
-#ifdef _WIN32
-	os_snprintf(fname, sizeof(fname), "\\Temp\\wpa_supplicant-log-%d.txt",
-		    count++);
-#else /* _WIN32 */
-	os_snprintf(fname, sizeof(fname), "/tmp/wpa_supplicant-log-%d.txt",
-		    count++);
+	out_file = fopen(path, "a");
+	if (out_file == NULL) {
+		wpa_printf(MSG_ERROR, "wpa_debug_open_file: Failed to open "
+			   "output file, using standard output");
+		return -1;
+	}
+#ifndef _WIN32
+	setvbuf(out_file, NULL, _IOLBF, 0);
 #endif /* _WIN32 */
-	out_file = fopen(fname, "w");
-	return out_file == NULL ? -1 : 0;
-#else /* CONFIG_DEBUG_FILE */
+#endif /* CONFIG_DEBUG_FILE */
 	return 0;
-#endif /* CONFIG_DEBUG_FILE */
 }
 
 
 void wpa_debug_close_file(void)
 {
 #ifdef CONFIG_DEBUG_FILE
-	if (!wpa_debug_use_file)
+	if (!out_file)
 		return;
 	fclose(out_file);
 	out_file = NULL;

==== //depot/projects/hammer/contrib/hostapd/common.h#5 (text+ko) ====

@@ -264,12 +264,12 @@
 #define wpa_hexdump_key(l,t,b,le) do { } while (0)
 #define wpa_hexdump_ascii(l,t,b,le) do { } while (0)
 #define wpa_hexdump_ascii_key(l,t,b,le) do { } while (0)
-#define wpa_debug_open_file() do { } while (0)
+#define wpa_debug_open_file(p) do { } while (0)
 #define wpa_debug_close_file() do { } while (0)
 
 #else /* CONFIG_NO_STDOUT_DEBUG */
 
-int wpa_debug_open_file(void);
+int wpa_debug_open_file(const char *path);
 void wpa_debug_close_file(void);
 
 /**

==== //depot/projects/hammer/contrib/hostapd/defconfig#4 (text+ko) ====

@@ -102,3 +102,7 @@
 
 # Build IPv6 support for RADIUS operations
 CONFIG_IPV6=y
+
+# Use the hostapd's IEEE 802.11 authentication (ACL), but without
+# the IEEE 802.11 Management capability
+CONFIG_DRIVER_RADIUS_ACL=y

==== //depot/projects/hammer/contrib/hostapd/driver.h#4 (text+ko) ====

@@ -141,6 +141,10 @@
 	 * this handler will be called after initial setup has been completed.
 	 */
 	int (*commit)(void *priv);
+
+	int (*set_radius_acl_auth)(void *priv, const u8 *mac, int accepted, 
+			u32 session_timeout);
+	int (*set_radius_acl_expire)(void *priv, const u8 *mac);
 };
 
 static inline int
@@ -653,4 +657,22 @@
 	return hapd->driver->commit(hapd->driver);
 }
 
+static inline int 
+hostapd_set_radius_acl_auth(struct hostapd_data *hapd, const u8 *mac, int accepted, 
+	u32 session_timeout)
+{
+	if (hapd->driver == NULL || hapd->driver->set_radius_acl_auth == NULL)
+		return 0;
+	return hapd->driver->set_radius_acl_auth(hapd->driver, mac, accepted,
+						 session_timeout);
+}
+
+static inline int 
+hostapd_set_radius_acl_expire(struct hostapd_data *hapd, const u8 *mac)
+{
+	if (hapd->driver == NULL || hapd->driver->set_radius_acl_expire == NULL)
+		return 0;
+	return hapd->driver->set_radius_acl_expire(hapd->driver, mac);
+}
+
 #endif /* DRIVER_H */

==== //depot/projects/hammer/contrib/hostapd/driver_test.c#4 (text+ko) ====

@@ -170,9 +170,10 @@
 	u16 fc;
 
 	if (drv->test_socket < 0 || len < 10 || drv->socket_dir == NULL) {
-		wpa_printf(MSG_DEBUG, "%s: invalid parameters (sock=%d len=%d "
-			   "socket_dir=%p)",
-			   __func__, drv->test_socket, len, drv->socket_dir);
+		wpa_printf(MSG_DEBUG, "%s: invalid parameters (sock=%d len=%lu"
+			   " socket_dir=%p)",
+			   __func__, drv->test_socket, (unsigned long) len,
+			   drv->socket_dir);
 		return -1;
 	}
 

==== //depot/projects/hammer/contrib/hostapd/eap_aka.c#2 (text+ko) ====

@@ -1,6 +1,6 @@
 /*
  * hostapd / EAP-AKA (RFC 4187)
- * Copyright (c) 2005-2007, Jouni Malinen 
+ * Copyright (c) 2005-2008, Jouni Malinen 
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -124,6 +124,14 @@
 				      sm->identity_len)) {
 		wpa_printf(MSG_DEBUG, "   AT_PERMANENT_ID_REQ");
 		eap_sim_msg_add(msg, EAP_SIM_AT_PERMANENT_ID_REQ, 0, NULL, 0);
+	} else {
+		/*
+		 * RFC 4187, Chap. 4.1.4 recommends that identity from EAP is
+		 * ignored and the AKA/Identity is used to request the
+		 * identity.
+		 */
+		wpa_printf(MSG_DEBUG, "   AT_ANY_ID_REQ");
+		eap_sim_msg_add(msg, EAP_SIM_AT_ANY_ID_REQ, 0, NULL, 0);
 	}
 	return eap_sim_msg_finish(msg, reqDataLen, NULL, NULL, 0);
 }
@@ -445,10 +453,16 @@
 		sm->method_pending = METHOD_PENDING_NONE;
 	}
 
+	identity_len = sm->identity_len;
+	while (identity_len > 0 && sm->identity[identity_len - 1] == '\0') {
+		wpa_printf(MSG_DEBUG, "EAP-AKA: Workaround - drop last null "
+			   "character from identity");
+		identity_len--;
+	}
 	wpa_hexdump_ascii(MSG_DEBUG, "EAP-AKA: Identity for MK derivation",
-			  sm->identity, sm->identity_len);
+			  sm->identity, identity_len);
 
-	eap_aka_derive_mk(sm->identity, sm->identity_len, data->ik, data->ck,
+	eap_aka_derive_mk(sm->identity, identity_len, data->ik, data->ck,
 			  data->mk);
 	eap_sim_derive_keys(data->mk, data->k_encr, data->k_aut, data->msk,
 			    data->emsk);

==== //depot/projects/hammer/contrib/hostapd/eap_gpsk.c#2 (text+ko) ====

@@ -1,5 +1,5 @@
 /*
- * hostapd / EAP-GPSK (draft-ietf-emu-eap-gpsk-03.txt) server
+ * hostapd / EAP-GPSK (draft-ietf-emu-eap-gpsk-08.txt) server
  * Copyright (c) 2006-2007, Jouni Malinen 
  *
  * This program is free software; you can redistribute it and/or modify
@@ -23,15 +23,15 @@
 struct eap_gpsk_data {
 	enum { GPSK_1, GPSK_3, SUCCESS, FAILURE } state;
 	u8 rand_server[EAP_GPSK_RAND_LEN];
-	u8 rand_client[EAP_GPSK_RAND_LEN];
+	u8 rand_peer[EAP_GPSK_RAND_LEN];
 	u8 msk[EAP_MSK_LEN];
 	u8 emsk[EAP_EMSK_LEN];
 	u8 sk[EAP_GPSK_MAX_SK_LEN];
 	size_t sk_len;
 	u8 pk[EAP_GPSK_MAX_PK_LEN];
 	size_t pk_len;
-	u8 *id_client;
-	size_t id_client_len;
+	u8 *id_peer;
+	size_t id_peer_len;
 	u8 *id_server;
 	size_t id_server_len;
 #define MAX_NUM_CSUITES 2
@@ -85,17 +85,17 @@
 	data->csuite_count = 0;
 	if (eap_gpsk_supported_ciphersuite(EAP_GPSK_VENDOR_IETF,
 					   EAP_GPSK_CIPHER_AES)) {
-		WPA_PUT_BE24(data->csuite_list[data->csuite_count].vendor,
+		WPA_PUT_BE32(data->csuite_list[data->csuite_count].vendor,
 			     EAP_GPSK_VENDOR_IETF);
-		WPA_PUT_BE24(data->csuite_list[data->csuite_count].specifier,
+		WPA_PUT_BE16(data->csuite_list[data->csuite_count].specifier,
 			     EAP_GPSK_CIPHER_AES);
 		data->csuite_count++;
 	}
 	if (eap_gpsk_supported_ciphersuite(EAP_GPSK_VENDOR_IETF,
 					   EAP_GPSK_CIPHER_SHA256)) {
-		WPA_PUT_BE24(data->csuite_list[data->csuite_count].vendor,
+		WPA_PUT_BE32(data->csuite_list[data->csuite_count].vendor,
 			     EAP_GPSK_VENDOR_IETF);
-		WPA_PUT_BE24(data->csuite_list[data->csuite_count].specifier,
+		WPA_PUT_BE16(data->csuite_list[data->csuite_count].specifier,
 			     EAP_GPSK_CIPHER_SHA256);
 		data->csuite_count++;
 	}
@@ -108,7 +108,7 @@
 {
 	struct eap_gpsk_data *data = priv;
 	free(data->id_server);
-	free(data->id_client);
+	free(data->id_peer);
 	free(data);
 }
 
@@ -174,8 +174,8 @@
 	wpa_printf(MSG_DEBUG, "EAP-GPSK: Request/GPSK-3");
 
 	miclen = eap_gpsk_mic_len(data->vendor, data->specifier);
-	len = 1 + 2 * EAP_GPSK_RAND_LEN + sizeof(struct eap_gpsk_csuite) + 2 +
-		miclen;
+	len = 1 + 2 * EAP_GPSK_RAND_LEN + 2 + data->id_server_len +
+		sizeof(struct eap_gpsk_csuite) + 2 + miclen;
 	req = eap_msg_alloc(EAP_VENDOR_IETF, EAP_TYPE_GPSK, reqDataLen,
 			    len, EAP_CODE_REQUEST, id, &pos);
 	if (req == NULL) {
@@ -188,13 +188,18 @@
 	*pos++ = EAP_GPSK_OPCODE_GPSK_3;
 	start = pos;
 
-	memcpy(pos, data->rand_client, EAP_GPSK_RAND_LEN);
+	memcpy(pos, data->rand_peer, EAP_GPSK_RAND_LEN);
 	pos += EAP_GPSK_RAND_LEN;
 	memcpy(pos, data->rand_server, EAP_GPSK_RAND_LEN);
 	pos += EAP_GPSK_RAND_LEN;
+	WPA_PUT_BE16(pos, data->id_server_len);
+	pos += 2;
+	if (data->id_server)
+		memcpy(pos, data->id_server, data->id_server_len);
+	pos += data->id_server_len;
 	csuite = (struct eap_gpsk_csuite *) pos;
-	WPA_PUT_BE24(csuite->vendor, data->vendor);
-	WPA_PUT_BE24(csuite->specifier, data->specifier);
+	WPA_PUT_BE32(csuite->vendor, data->vendor);
+	WPA_PUT_BE16(csuite->specifier, data->specifier);
 	pos += sizeof(*csuite);
 
 	/* no PD_Payload_2 */
@@ -282,7 +287,7 @@
 
 	if (end - pos < 2) {
 		wpa_printf(MSG_DEBUG, "EAP-GPSK: Too short message for "
-			   "ID_Client length");
+			   "ID_Peer length");
 		eap_gpsk_state(data, FAILURE);
 		return;
 	}
@@ -290,21 +295,21 @@
 	pos += 2;
 	if (end - pos < alen) {
 		wpa_printf(MSG_DEBUG, "EAP-GPSK: Too short message for "
-			   "ID_Client");
+			   "ID_Peer");
 		eap_gpsk_state(data, FAILURE);
 		return;
 	}
-	free(data->id_client);
-	data->id_client = malloc(alen);
-	if (data->id_client == NULL) {
+	free(data->id_peer);
+	data->id_peer = malloc(alen);
+	if (data->id_peer == NULL) {
 		wpa_printf(MSG_DEBUG, "EAP-GPSK: Not enough memory to store "
-			   "%d-octet ID_Client", alen);
+			   "%d-octet ID_Peer", alen);
 		return;
 	}
-	memcpy(data->id_client, pos, alen);
-	data->id_client_len = alen;
-	wpa_hexdump_ascii(MSG_DEBUG, "EAP-GPSK: ID_Client",
-			  data->id_client, data->id_client_len);
+	memcpy(data->id_peer, pos, alen);
+	data->id_peer_len = alen;
+	wpa_hexdump_ascii(MSG_DEBUG, "EAP-GPSK: ID_Peer",
+			  data->id_peer, data->id_peer_len);
 	pos += alen;
 
 	if (end - pos < 2) {
@@ -332,13 +337,13 @@
 
 	if (end - pos < EAP_GPSK_RAND_LEN) {
 		wpa_printf(MSG_DEBUG, "EAP-GPSK: Too short message for "
-			   "RAND_Client");
+			   "RAND_Peer");
 		eap_gpsk_state(data, FAILURE);
 		return;
 	}
-	memcpy(data->rand_client, pos, EAP_GPSK_RAND_LEN);
-	wpa_hexdump(MSG_DEBUG, "EAP-GPSK: RAND_Client",
-		    data->rand_client, EAP_GPSK_RAND_LEN);
+	memcpy(data->rand_peer, pos, EAP_GPSK_RAND_LEN);
+	wpa_hexdump(MSG_DEBUG, "EAP-GPSK: RAND_Peer",
+		    data->rand_peer, EAP_GPSK_RAND_LEN);
 	pos += EAP_GPSK_RAND_LEN;
 
 	if (end - pos < EAP_GPSK_RAND_LEN) {
@@ -397,13 +402,13 @@
 	if (i == data->csuite_count) {
 		wpa_printf(MSG_DEBUG, "EAP-GPSK: Peer selected unsupported "
 			   "ciphersuite %d:%d",
-			   WPA_GET_BE24(csuite->vendor),
-			   WPA_GET_BE24(csuite->specifier));
+			   WPA_GET_BE32(csuite->vendor),
+			   WPA_GET_BE16(csuite->specifier));
 		eap_gpsk_state(data, FAILURE);
 		return;
 	}
-	data->vendor = WPA_GET_BE24(csuite->vendor);
-	data->specifier = WPA_GET_BE24(csuite->specifier);
+	data->vendor = WPA_GET_BE32(csuite->vendor);
+	data->specifier = WPA_GET_BE16(csuite->specifier);
 	wpa_printf(MSG_DEBUG, "EAP-GPSK: CSuite_Sel %d:%d",
 		   data->vendor, data->specifier);
 	pos += sizeof(*csuite);	
@@ -434,8 +439,8 @@
 
 	if (eap_gpsk_derive_keys(sm->user->password, sm->user->password_len,
 				 data->vendor, data->specifier,
-				 data->rand_client, data->rand_server,
-				 data->id_client, data->id_client_len,
+				 data->rand_peer, data->rand_server,
+				 data->id_peer, data->id_peer_len,
 				 data->id_server, data->id_server_len,
 				 data->msk, data->emsk,
 				 data->sk, &data->sk_len,

==== //depot/projects/hammer/contrib/hostapd/eap_gpsk_common.c#2 (text+ko) ====


>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Wed Mar 26 17:58:24 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C55671065671; Wed, 26 Mar 2008 17:58: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 69D58106566C
	for ; Wed, 26 Mar 2008 17:58:24 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5E23B8FC28
	for ; Wed, 26 Mar 2008 17:58:24 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2QHwOTT072450
	for ; Wed, 26 Mar 2008 17:58:24 GMT
	(envelope-from peter-gmail@wemm.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2QHwNB5072448
	for perforce@freebsd.org; Wed, 26 Mar 2008 17:58:23 GMT
	(envelope-from peter-gmail@wemm.org)
Date: Wed, 26 Mar 2008 17:58:23 GMT
Message-Id: <200803261758.m2QHwNB5072448@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter-gmail@wemm.org using -f
From: Peter Wemm 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138634 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 26 Mar 2008 17:58:25 -0000

http://perforce.freebsd.org/chv.cgi?CH=138634

Change 138634 by peter@peter_overcee on 2008/03/26 17:57:29

	IFC @138629  (minus sched_ule and sched_4bsd)

Affected files ...

.. //depot/projects/bike_sched/sys/amd64/amd64/cpu_switch.S#3 integrate
.. //depot/projects/bike_sched/sys/amd64/amd64/genassym.c#3 integrate
.. //depot/projects/bike_sched/sys/amd64/amd64/nexus.c#4 integrate
.. //depot/projects/bike_sched/sys/amd64/amd64/pmap.c#8 integrate
.. //depot/projects/bike_sched/sys/amd64/amd64/prof_machdep.c#3 integrate
.. //depot/projects/bike_sched/sys/amd64/conf/NOTES#5 integrate
.. //depot/projects/bike_sched/sys/amd64/ia32/ia32_signal.c#4 integrate
.. //depot/projects/bike_sched/sys/amd64/include/clock.h#3 integrate
.. //depot/projects/bike_sched/sys/amd64/include/pcb.h#3 integrate
.. //depot/projects/bike_sched/sys/amd64/isa/atpic.c#4 integrate
.. //depot/projects/bike_sched/sys/amd64/isa/clock.c#4 integrate
.. //depot/projects/bike_sched/sys/arm/arm/elf_trampoline.c#4 integrate
.. //depot/projects/bike_sched/sys/arm/conf/AVILA#4 integrate
.. //depot/projects/bike_sched/sys/arm/conf/AVILA.hints#2 integrate
.. //depot/projects/bike_sched/sys/arm/xscale/ixp425/if_npe.c#3 integrate
.. //depot/projects/bike_sched/sys/arm/xscale/ixp425/ixdp425_pci.c#2 integrate
.. //depot/projects/bike_sched/sys/boot/i386/cdboot/cdboot.s#3 integrate
.. //depot/projects/bike_sched/sys/boot/pc98/cdboot/cdboot.s#3 integrate
.. //depot/projects/bike_sched/sys/compat/freebsd32/freebsd32_proto.h#5 integrate
.. //depot/projects/bike_sched/sys/compat/freebsd32/freebsd32_syscall.h#6 integrate
.. //depot/projects/bike_sched/sys/compat/freebsd32/freebsd32_syscalls.c#6 integrate
.. //depot/projects/bike_sched/sys/compat/freebsd32/freebsd32_sysent.c#6 integrate
.. //depot/projects/bike_sched/sys/compat/freebsd32/syscalls.master#7 integrate
.. //depot/projects/bike_sched/sys/compat/linux/linux_file.c#5 integrate
.. //depot/projects/bike_sched/sys/compat/linux/linux_futex.c#3 integrate
.. //depot/projects/bike_sched/sys/compat/linux/linux_futex.h#2 integrate
.. //depot/projects/bike_sched/sys/compat/linux/linux_misc.c#6 integrate
.. //depot/projects/bike_sched/sys/compat/svr4/svr4_fcntl.c#5 integrate
.. //depot/projects/bike_sched/sys/conf/NOTES#6 integrate
.. //depot/projects/bike_sched/sys/conf/files#9 integrate
.. //depot/projects/bike_sched/sys/conf/options#6 integrate
.. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 integrate
.. //depot/projects/bike_sched/sys/ddb/db_command.c#5 integrate
.. //depot/projects/bike_sched/sys/ddb/db_ps.c#5 integrate
.. //depot/projects/bike_sched/sys/ddb/ddb.h#4 integrate
.. //depot/projects/bike_sched/sys/dev/aac/aac.c#5 integrate
.. //depot/projects/bike_sched/sys/dev/aac/aac_cam.c#5 integrate
.. //depot/projects/bike_sched/sys/dev/aac/aac_debug.c#3 integrate
.. //depot/projects/bike_sched/sys/dev/aac/aac_disk.c#2 integrate
.. //depot/projects/bike_sched/sys/dev/aac/aac_pci.c#5 integrate
.. //depot/projects/bike_sched/sys/dev/aac/aacreg.h#3 integrate
.. //depot/projects/bike_sched/sys/dev/aac/aacvar.h#4 integrate
.. //depot/projects/bike_sched/sys/dev/ata/ata-raid.c#3 integrate
.. //depot/projects/bike_sched/sys/dev/ath/if_ath.c#5 integrate
.. //depot/projects/bike_sched/sys/dev/cxgb/cxgb_main.c#4 integrate
.. //depot/projects/bike_sched/sys/dev/cxgb/cxgb_offload.h#3 integrate
.. //depot/projects/bike_sched/sys/dev/cxgb/cxgb_sge.c#3 integrate
.. //depot/projects/bike_sched/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#3 integrate
.. //depot/projects/bike_sched/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#3 integrate
.. //depot/projects/bike_sched/sys/dev/dc/if_dc.c#4 integrate
.. //depot/projects/bike_sched/sys/dev/dc/if_dcreg.h#4 integrate
.. //depot/projects/bike_sched/sys/dev/drm/drm_pciids.h#4 integrate
.. //depot/projects/bike_sched/sys/dev/drm/i915_dma.c#3 integrate
.. //depot/projects/bike_sched/sys/dev/en/midway.c#3 integrate
.. //depot/projects/bike_sched/sys/dev/fatm/if_fatm.c#3 integrate
.. //depot/projects/bike_sched/sys/dev/firewire/if_fwe.c#3 integrate
.. //depot/projects/bike_sched/sys/dev/firewire/if_fwip.c#3 integrate
.. //depot/projects/bike_sched/sys/dev/fxp/if_fxp.c#3 integrate
.. //depot/projects/bike_sched/sys/dev/gem/if_gem.c#4 integrate
.. //depot/projects/bike_sched/sys/dev/gem/if_gem_pci.c#4 integrate
.. //depot/projects/bike_sched/sys/dev/gem/if_gemreg.h#4 integrate
.. //depot/projects/bike_sched/sys/dev/gem/if_gemvar.h#4 integrate
.. //depot/projects/bike_sched/sys/dev/hwpmc/hwpmc_amd.c#3 integrate
.. //depot/projects/bike_sched/sys/dev/iscsi/initiator/isc_soc.c#3 integrate
.. //depot/projects/bike_sched/sys/dev/malo/if_malo.c#1 branch
.. //depot/projects/bike_sched/sys/dev/malo/if_malo.h#1 branch
.. //depot/projects/bike_sched/sys/dev/malo/if_malo_pci.c#1 branch
.. //depot/projects/bike_sched/sys/dev/malo/if_malohal.c#1 branch
.. //depot/projects/bike_sched/sys/dev/malo/if_malohal.h#1 branch
.. //depot/projects/bike_sched/sys/dev/malo/if_maloioctl.h#1 branch
.. //depot/projects/bike_sched/sys/dev/mfi/mfi.c#5 integrate
.. //depot/projects/bike_sched/sys/dev/re/if_re.c#5 integrate
.. //depot/projects/bike_sched/sys/dev/speaker/spkr.c#3 integrate
.. //depot/projects/bike_sched/sys/dev/syscons/syscons.c#4 integrate
.. //depot/projects/bike_sched/sys/dev/ti/if_ti.c#4 integrate
.. //depot/projects/bike_sched/sys/dev/usb/ehci.c#4 integrate
.. //depot/projects/bike_sched/sys/dev/usb/if_rum.c#3 integrate
.. //depot/projects/bike_sched/sys/dev/usb/ohci.c#3 integrate
.. //depot/projects/bike_sched/sys/dev/usb/ucom.c#4 integrate
.. //depot/projects/bike_sched/sys/dev/usb/ucomvar.h#3 integrate
.. //depot/projects/bike_sched/sys/dev/usb/usbdevs#6 integrate
.. //depot/projects/bike_sched/sys/dev/usb/usbdi.c#4 integrate
.. //depot/projects/bike_sched/sys/dev/usb/usbdi.h#3 integrate
.. //depot/projects/bike_sched/sys/dev/usb/usbdivar.h#3 integrate
.. //depot/projects/bike_sched/sys/fs/devfs/devfs_rule.c#3 integrate
.. //depot/projects/bike_sched/sys/fs/msdosfs/msdosfs_vfsops.c#4 integrate
.. //depot/projects/bike_sched/sys/fs/msdosfs/msdosfs_vnops.c#4 integrate
.. //depot/projects/bike_sched/sys/fs/tmpfs/tmpfs_vnops.c#3 integrate
.. //depot/projects/bike_sched/sys/geom/geom.h#5 integrate
.. //depot/projects/bike_sched/sys/geom/geom_subr.c#3 integrate
.. //depot/projects/bike_sched/sys/geom/part/g_part.c#3 integrate
.. //depot/projects/bike_sched/sys/geom/part/g_part.h#3 integrate
.. //depot/projects/bike_sched/sys/geom/part/g_part_apm.c#2 integrate
.. //depot/projects/bike_sched/sys/geom/part/g_part_bsd.c#2 integrate
.. //depot/projects/bike_sched/sys/geom/part/g_part_gpt.c#2 integrate
.. //depot/projects/bike_sched/sys/geom/part/g_part_mbr.c#3 integrate
.. //depot/projects/bike_sched/sys/geom/part/g_part_vtoc8.c#2 integrate
.. //depot/projects/bike_sched/sys/geom/vinum/geom_vinum_drive.c#3 integrate
.. //depot/projects/bike_sched/sys/i386/conf/NOTES#5 integrate
.. //depot/projects/bike_sched/sys/i386/i386/nexus.c#4 integrate
.. //depot/projects/bike_sched/sys/i386/i386/pmap.c#6 integrate
.. //depot/projects/bike_sched/sys/i386/ibcs2/ibcs2_fcntl.c#2 integrate
.. //depot/projects/bike_sched/sys/i386/include/clock.h#3 integrate
.. //depot/projects/bike_sched/sys/i386/include/vmparam.h#4 integrate
.. //depot/projects/bike_sched/sys/i386/isa/atpic.c#5 integrate
.. //depot/projects/bike_sched/sys/i386/isa/clock.c#4 integrate
.. //depot/projects/bike_sched/sys/i386/isa/prof_machdep.c#3 integrate
.. //depot/projects/bike_sched/sys/i386/isa/vesa.c#2 integrate
.. //depot/projects/bike_sched/sys/isa/syscons_isa.c#3 integrate
.. //depot/projects/bike_sched/sys/kern/bus_if.m#4 integrate
.. //depot/projects/bike_sched/sys/kern/init_sysent.c#8 integrate
.. //depot/projects/bike_sched/sys/kern/kern_cpuset.c#2 integrate
.. //depot/projects/bike_sched/sys/kern/kern_descrip.c#7 integrate
.. //depot/projects/bike_sched/sys/kern/kern_exit.c#4 integrate
.. //depot/projects/bike_sched/sys/kern/kern_fork.c#10 integrate
.. //depot/projects/bike_sched/sys/kern/kern_kthread.c#4 integrate
.. //depot/projects/bike_sched/sys/kern/kern_lockf.c#3 integrate
.. //depot/projects/bike_sched/sys/kern/kern_proc.c#6 integrate
.. //depot/projects/bike_sched/sys/kern/kern_resource.c#7 integrate
.. //depot/projects/bike_sched/sys/kern/kern_sig.c#7 integrate
.. //depot/projects/bike_sched/sys/kern/kern_switch.c#14 integrate
.. //depot/projects/bike_sched/sys/kern/kern_thr.c#7 integrate
.. //depot/projects/bike_sched/sys/kern/kern_thread.c#14 integrate
.. //depot/projects/bike_sched/sys/kern/kern_timeout.c#4 integrate
.. //depot/projects/bike_sched/sys/kern/makesyscalls.sh#3 integrate
.. //depot/projects/bike_sched/sys/kern/subr_bus.c#6 integrate
.. //depot/projects/bike_sched/sys/kern/subr_mchain.c#2 integrate
.. //depot/projects/bike_sched/sys/kern/subr_sleepqueue.c#5 integrate
.. //depot/projects/bike_sched/sys/kern/subr_taskqueue.c#3 integrate
.. //depot/projects/bike_sched/sys/kern/subr_trap.c#9 integrate
.. //depot/projects/bike_sched/sys/kern/sys_generic.c#5 integrate
.. //depot/projects/bike_sched/sys/kern/sys_process.c#5 integrate
.. //depot/projects/bike_sched/sys/kern/syscalls.c#7 integrate
.. //depot/projects/bike_sched/sys/kern/syscalls.master#9 integrate
.. //depot/projects/bike_sched/sys/kern/systrace_args.c#4 integrate
.. //depot/projects/bike_sched/sys/kern/tty.c#5 integrate
.. //depot/projects/bike_sched/sys/kern/uipc_mbuf.c#5 integrate
.. //depot/projects/bike_sched/sys/kern/uipc_socket.c#7 integrate
.. //depot/projects/bike_sched/sys/kern/uipc_syscalls.c#6 integrate
.. //depot/projects/bike_sched/sys/kern/vfs_bio.c#5 integrate
.. //depot/projects/bike_sched/sys/kern/vfs_cluster.c#3 integrate
.. //depot/projects/bike_sched/sys/kern/vfs_default.c#4 integrate
.. //depot/projects/bike_sched/sys/kern/vfs_mount.c#5 integrate
.. //depot/projects/bike_sched/sys/kern/vfs_subr.c#7 integrate
.. //depot/projects/bike_sched/sys/kern/vfs_vnops.c#5 integrate
.. //depot/projects/bike_sched/sys/kern/vnode_if.src#4 integrate
.. //depot/projects/bike_sched/sys/modules/geom/geom_part/Makefile#2 integrate
.. //depot/projects/bike_sched/sys/modules/geom/geom_part/geom_part_apm/Makefile#1 branch
.. //depot/projects/bike_sched/sys/modules/geom/geom_part/geom_part_bsd/Makefile#1 branch
.. //depot/projects/bike_sched/sys/modules/geom/geom_part/geom_part_gpt/Makefile#1 branch
.. //depot/projects/bike_sched/sys/modules/geom/geom_part/geom_part_mbr/Makefile#1 branch
.. //depot/projects/bike_sched/sys/modules/geom/geom_part/geom_part_vtoc8/Makefile#1 branch
.. //depot/projects/bike_sched/sys/modules/malo/Makefile#1 branch
.. //depot/projects/bike_sched/sys/net/bpf.c#7 integrate
.. //depot/projects/bike_sched/sys/net/bpf.h#5 integrate
.. //depot/projects/bike_sched/sys/net/bpf_buffer.c#1 branch
.. //depot/projects/bike_sched/sys/net/bpf_buffer.h#1 branch
.. //depot/projects/bike_sched/sys/net/bpf_zerocopy.c#1 branch
.. //depot/projects/bike_sched/sys/net/bpf_zerocopy.h#1 branch
.. //depot/projects/bike_sched/sys/net/bpfdesc.h#3 integrate
.. //depot/projects/bike_sched/sys/net/if.c#7 integrate
.. //depot/projects/bike_sched/sys/net/if_ef.c#2 integrate
.. //depot/projects/bike_sched/sys/net/if_enc.c#6 integrate
.. //depot/projects/bike_sched/sys/net/if_ethersubr.c#4 integrate
.. //depot/projects/bike_sched/sys/net/if_fddisubr.c#3 integrate
.. //depot/projects/bike_sched/sys/net/if_gre.c#4 integrate
.. //depot/projects/bike_sched/sys/net/if_iso88025subr.c#3 integrate
.. //depot/projects/bike_sched/sys/net/if_loop.c#4 integrate
.. //depot/projects/bike_sched/sys/net/if_media.h#3 integrate
.. //depot/projects/bike_sched/sys/net/if_sl.c#3 integrate
.. //depot/projects/bike_sched/sys/net/if_var.h#5 integrate
.. //depot/projects/bike_sched/sys/net/raw_cb.c#2 integrate
.. //depot/projects/bike_sched/sys/netatalk/aarp.c#3 integrate
.. //depot/projects/bike_sched/sys/netatm/port.h#2 integrate
.. //depot/projects/bike_sched/sys/netgraph/ng_pptpgre.c#3 integrate
.. //depot/projects/bike_sched/sys/netgraph/ng_pptpgre.h#2 integrate
.. //depot/projects/bike_sched/sys/netgraph/ng_tee.c#3 integrate
.. //depot/projects/bike_sched/sys/netinet/in_pcb.c#6 integrate
.. //depot/projects/bike_sched/sys/netinet/in_pcb.h#4 integrate
.. //depot/projects/bike_sched/sys/netinet/ip_output.c#5 integrate
.. //depot/projects/bike_sched/sys/netinet/libalias/alias_irc.c#5 integrate
.. //depot/projects/bike_sched/sys/netinet6/ip6_output.c#5 integrate
.. //depot/projects/bike_sched/sys/netipsec/key.c#5 integrate
.. //depot/projects/bike_sched/sys/netipsec/xform_tcp.c#2 integrate
.. //depot/projects/bike_sched/sys/netncp/ncp_sock.c#4 integrate
.. //depot/projects/bike_sched/sys/netsmb/smb_iod.c#4 integrate
.. //depot/projects/bike_sched/sys/netsmb/smb_rq.c#3 integrate
.. //depot/projects/bike_sched/sys/netsmb/smb_trantcp.c#4 integrate
.. //depot/projects/bike_sched/sys/nfs/nfs_common.c#2 integrate
.. //depot/projects/bike_sched/sys/nfs4client/nfs4_vfsops.c#4 integrate
.. //depot/projects/bike_sched/sys/nfs4client/nfs4_vnops.c#5 integrate
.. //depot/projects/bike_sched/sys/nfsclient/krpc_subr.c#3 integrate
.. //depot/projects/bike_sched/sys/nfsclient/nfs_lock.c#3 integrate
.. //depot/projects/bike_sched/sys/nfsclient/nfs_socket.c#5 integrate
.. //depot/projects/bike_sched/sys/nfsclient/nfs_subs.c#4 integrate
.. //depot/projects/bike_sched/sys/nfsclient/nfs_vfsops.c#4 integrate
.. //depot/projects/bike_sched/sys/nfsclient/nfs_vnops.c#5 integrate
.. //depot/projects/bike_sched/sys/nfsserver/nfs_serv.c#5 integrate
.. //depot/projects/bike_sched/sys/nfsserver/nfs_srvcache.c#4 integrate
.. //depot/projects/bike_sched/sys/nfsserver/nfs_srvsock.c#3 integrate
.. //depot/projects/bike_sched/sys/nfsserver/nfs_srvsubs.c#5 integrate
.. //depot/projects/bike_sched/sys/nfsserver/nfs_syscalls.c#3 integrate
.. //depot/projects/bike_sched/sys/nlm/nlm.h#1 branch
.. //depot/projects/bike_sched/sys/nlm/nlm_prot.h#1 branch
.. //depot/projects/bike_sched/sys/nlm/nlm_prot_clnt.c#1 branch
.. //depot/projects/bike_sched/sys/nlm/nlm_prot_impl.c#1 branch
.. //depot/projects/bike_sched/sys/nlm/nlm_prot_server.c#1 branch
.. //depot/projects/bike_sched/sys/nlm/nlm_prot_svc.c#1 branch
.. //depot/projects/bike_sched/sys/nlm/nlm_prot_xdr.c#1 branch
.. //depot/projects/bike_sched/sys/nlm/sm_inter.h#1 branch
.. //depot/projects/bike_sched/sys/nlm/sm_inter_xdr.c#1 branch
.. //depot/projects/bike_sched/sys/pc98/cbus/clock.c#3 integrate
.. //depot/projects/bike_sched/sys/pc98/cbus/syscons_cbus.c#3 integrate
.. //depot/projects/bike_sched/sys/pc98/conf/NOTES#4 integrate
.. //depot/projects/bike_sched/sys/pci/if_mn.c#3 integrate
.. //depot/projects/bike_sched/sys/pci/if_rlreg.h#5 integrate
.. //depot/projects/bike_sched/sys/pci/if_xl.c#3 integrate
.. //depot/projects/bike_sched/sys/pci/if_xlreg.h#3 integrate
.. //depot/projects/bike_sched/sys/rpc/auth.h#1 branch
.. //depot/projects/bike_sched/sys/rpc/auth_none.c#1 branch
.. //depot/projects/bike_sched/sys/rpc/auth_unix.c#1 branch
.. //depot/projects/bike_sched/sys/rpc/authunix_prot.c#1 branch
.. //depot/projects/bike_sched/sys/rpc/clnt.h#1 branch
.. //depot/projects/bike_sched/sys/rpc/clnt_dg.c#1 branch
.. //depot/projects/bike_sched/sys/rpc/clnt_rc.c#1 branch
.. //depot/projects/bike_sched/sys/rpc/clnt_stat.h#1 branch
.. //depot/projects/bike_sched/sys/rpc/clnt_vc.c#1 branch
.. //depot/projects/bike_sched/sys/rpc/getnetconfig.c#1 branch
.. //depot/projects/bike_sched/sys/rpc/inet_ntop.c#1 branch
.. //depot/projects/bike_sched/sys/rpc/inet_pton.c#1 branch
.. //depot/projects/bike_sched/sys/rpc/netconfig.h#1 branch
.. //depot/projects/bike_sched/sys/rpc/nettype.h#1 branch
.. //depot/projects/bike_sched/sys/rpc/pmap_prot.h#1 branch
.. //depot/projects/bike_sched/sys/rpc/rpc.h#1 branch
.. //depot/projects/bike_sched/sys/rpc/rpc_callmsg.c#1 branch
.. //depot/projects/bike_sched/sys/rpc/rpc_com.h#1 branch
.. //depot/projects/bike_sched/sys/rpc/rpc_generic.c#1 branch
.. //depot/projects/bike_sched/sys/rpc/rpc_msg.h#1 branch
.. //depot/projects/bike_sched/sys/rpc/rpc_prot.c#1 branch
.. //depot/projects/bike_sched/sys/rpc/rpcb_clnt.c#1 branch
.. //depot/projects/bike_sched/sys/rpc/rpcb_clnt.h#1 branch
.. //depot/projects/bike_sched/sys/rpc/rpcb_prot.c#1 branch
.. //depot/projects/bike_sched/sys/rpc/rpcb_prot.h#1 branch
.. //depot/projects/bike_sched/sys/rpc/rpcclnt.c#3 integrate
.. //depot/projects/bike_sched/sys/rpc/svc.c#1 branch
.. //depot/projects/bike_sched/sys/rpc/svc.h#1 branch
.. //depot/projects/bike_sched/sys/rpc/svc_auth.c#1 branch
.. //depot/projects/bike_sched/sys/rpc/svc_auth.h#1 branch
.. //depot/projects/bike_sched/sys/rpc/svc_auth_unix.c#1 branch
.. //depot/projects/bike_sched/sys/rpc/svc_dg.c#1 branch
.. //depot/projects/bike_sched/sys/rpc/svc_generic.c#1 branch
.. //depot/projects/bike_sched/sys/rpc/svc_vc.c#1 branch
.. //depot/projects/bike_sched/sys/rpc/types.h#2 integrate
.. //depot/projects/bike_sched/sys/rpc/xdr.h#1 branch
.. //depot/projects/bike_sched/sys/sparc64/include/atomic.h#3 integrate
.. //depot/projects/bike_sched/sys/sparc64/include/bus.h#4 integrate
.. //depot/projects/bike_sched/sys/sparc64/sparc64/bus_machdep.c#3 integrate
.. //depot/projects/bike_sched/sys/sun4v/include/atomic.h#3 integrate
.. //depot/projects/bike_sched/sys/sun4v/include/cpu.h#2 integrate
.. //depot/projects/bike_sched/sys/sun4v/sun4v/intr_machdep.c#3 integrate
.. //depot/projects/bike_sched/sys/sys/aac_ioctl.h#2 integrate
.. //depot/projects/bike_sched/sys/sys/buf.h#4 integrate
.. //depot/projects/bike_sched/sys/sys/bufobj.h#4 integrate
.. //depot/projects/bike_sched/sys/sys/bus.h#5 integrate
.. //depot/projects/bike_sched/sys/sys/cdefs.h#4 integrate
.. //depot/projects/bike_sched/sys/sys/cpuset.h#2 integrate
.. //depot/projects/bike_sched/sys/sys/eventhandler.h#4 integrate
.. //depot/projects/bike_sched/sys/sys/fcntl.h#3 integrate
.. //depot/projects/bike_sched/sys/sys/lockf.h#3 integrate
.. //depot/projects/bike_sched/sys/sys/mbuf.h#4 integrate
.. //depot/projects/bike_sched/sys/sys/param.h#4 integrate
.. //depot/projects/bike_sched/sys/sys/proc.h#13 integrate
.. //depot/projects/bike_sched/sys/sys/runq.h#4 integrate
.. //depot/projects/bike_sched/sys/sys/sched.h#10 integrate
.. //depot/projects/bike_sched/sys/sys/syscall.h#7 integrate
.. //depot/projects/bike_sched/sys/sys/syscall.mk#7 integrate
.. //depot/projects/bike_sched/sys/sys/sysctl.h#5 integrate
.. //depot/projects/bike_sched/sys/sys/sysproto.h#7 integrate
.. //depot/projects/bike_sched/sys/sys/taskqueue.h#3 integrate
.. //depot/projects/bike_sched/sys/sys/vnode.h#4 integrate
.. //depot/projects/bike_sched/sys/ufs/ffs/ffs_inode.c#3 integrate
.. //depot/projects/bike_sched/sys/ufs/ffs/ffs_rawread.c#4 integrate
.. //depot/projects/bike_sched/sys/ufs/ffs/ffs_snapshot.c#4 integrate
.. //depot/projects/bike_sched/sys/ufs/ffs/ffs_softdep.c#5 integrate
.. //depot/projects/bike_sched/sys/ufs/ffs/ffs_vfsops.c#5 integrate
.. //depot/projects/bike_sched/sys/ufs/ffs/ffs_vnops.c#4 integrate
.. //depot/projects/bike_sched/sys/ufs/ufs/ufs_vnops.c#4 integrate
.. //depot/projects/bike_sched/sys/vm/vm_glue.c#7 integrate
.. //depot/projects/bike_sched/sys/vm/vm_meter.c#6 integrate
.. //depot/projects/bike_sched/sys/vm/vm_mmap.c#6 integrate
.. //depot/projects/bike_sched/sys/vm/vm_page.c#6 integrate
.. //depot/projects/bike_sched/sys/vm/vm_page.h#4 integrate
.. //depot/projects/bike_sched/sys/vm/vm_pageout.c#4 integrate
.. //depot/projects/bike_sched/sys/xdr/xdr.c#1 branch
.. //depot/projects/bike_sched/sys/xdr/xdr_array.c#1 branch
.. //depot/projects/bike_sched/sys/xdr/xdr_mbuf.c#1 branch
.. //depot/projects/bike_sched/sys/xdr/xdr_mem.c#1 branch
.. //depot/projects/bike_sched/sys/xdr/xdr_reference.c#1 branch
.. //depot/projects/bike_sched/sys/xdr/xdr_sizeof.c#1 branch

Differences ...

==== //depot/projects/bike_sched/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.160 2007/08/22 05:06:14 jkoshy Exp $
+ * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.161 2008/03/23 23:09:06 peter Exp $
  */
 
 #include 
@@ -69,16 +69,20 @@
  * %rsi = newtd
  */
 ENTRY(cpu_throw)
+	testq	%rdi,%rdi
+	jnz	1f
+	movq	PCPU(IDLETHREAD),%rdi
+1:
+	movq	TD_PCB(%rdi),%r8		/* Old pcb */
 	movl	PCPU(CPUID), %eax
-	testq	%rdi,%rdi			/* no thread? */
-	jz	1f
+	movq	PCB_FSBASE(%r8),%r9
+	movq	PCB_GSBASE(%r8),%r10
 	/* release bit from old pm_active */
 	movq	TD_PROC(%rdi), %rdx		/* oldtd->td_proc */
 	movq	P_VMSPACE(%rdx), %rdx		/* proc->p_vmspace */
 	LK btrl	%eax, VM_PMAP+PM_ACTIVE(%rdx)	/* clear old */
-1:
-	movq	TD_PCB(%rsi),%rdx		/* newtd->td_proc */
-	movq	PCB_CR3(%rdx),%rdx
+	movq	TD_PCB(%rsi),%r8		/* newtd->td_proc */
+	movq	PCB_CR3(%r8),%rdx
 	movq	%rdx,%cr3			/* new address space */
 	jmp	swact
 END(cpu_throw)
@@ -97,43 +101,24 @@
 	movq	TD_PCB(%rdi),%r8
 
 	movq	(%rsp),%rax			/* Hardware registers */
+	movq	%r15,PCB_R15(%r8)
+	movq	%r14,PCB_R14(%r8)
+	movq	%r13,PCB_R13(%r8)
+	movq	%r12,PCB_R12(%r8)
+	movq	%rbp,PCB_RBP(%r8)
+	movq	%rsp,PCB_RSP(%r8)
+	movq	%rbx,PCB_RBX(%r8)
 	movq	%rax,PCB_RIP(%r8)
-	movq	%rbx,PCB_RBX(%r8)
-	movq	%rsp,PCB_RSP(%r8)
-	movq	%rbp,PCB_RBP(%r8)
-	movq	%r12,PCB_R12(%r8)
-	movq	%r13,PCB_R13(%r8)
-	movq	%r14,PCB_R14(%r8)
-	movq	%r15,PCB_R15(%r8)
+	movq	PCB_FSBASE(%r8),%r9
+	movq	PCB_GSBASE(%r8),%r10
 
 	testl	$PCB_32BIT,PCB_FLAGS(%r8)
-	jz	1f				/* no, skip over */
-
-	/* Save userland %gs */
-	movl	%gs,PCB_GS(%r8)
-	movq	PCB_GS32P(%r8),%rax
-	movq	(%rax),%rax
-	movq	%rax,PCB_GS32SD(%r8)
+	jnz	store_gs			/* static predict not taken */
+done_store_gs:
 
-1:
-	/* Test if debug registers should be saved. */
 	testl	$PCB_DBREGS,PCB_FLAGS(%r8)
-	jz	1f				/* no, skip over */
-	movq	%dr7,%rax			/* yes, do the save */
-	movq	%rax,PCB_DR7(%r8)
-	andq	$0x0000fc00, %rax		/* disable all watchpoints */
-	movq	%rax,%dr7
-	movq	%dr6,%rax
-	movq	%rax,PCB_DR6(%r8)
-	movq	%dr3,%rax
-	movq	%rax,PCB_DR3(%r8)
-	movq	%dr2,%rax
-	movq	%rax,PCB_DR2(%r8)
-	movq	%dr1,%rax
-	movq	%rax,PCB_DR1(%r8)
-	movq	%dr0,%rax
-	movq	%rax,PCB_DR0(%r8)
-1:
+	jnz	store_dr			/* static predict not taken */
+done_store_dr:
 
 	/* have we used fp, and need a save? */
 	cmpq	%rdi,PCPU(FPCURTHREAD)
@@ -181,82 +166,138 @@
 	cmpq	%rcx, %rdx
 	pause
 	je	1b
-	lfence
 #endif
 	/*
 	 * At this point, we've switched address spaces and are ready
 	 * to load up the rest of the next context.
 	 */
-	movq	TD_PCB(%rsi),%r8
+
+	/* Skip loading user fsbase/gsbase for kthreads */
+	testl	$TDP_KTHREAD,TD_PFLAGS(%rsi)
+	jnz	do_kthread
 
+	cmpq	PCB_FSBASE(%r8),%r9
+	jz	1f
 	/* Restore userland %fs */
 	movl	$MSR_FSBASE,%ecx
 	movl	PCB_FSBASE(%r8),%eax
 	movl	PCB_FSBASE+4(%r8),%edx
 	wrmsr
+1:
 
+	cmpq	PCB_GSBASE(%r8),%r10
+	jz	2f
 	/* Restore userland %gs */
 	movl	$MSR_KGSBASE,%ecx
 	movl	PCB_GSBASE(%r8),%eax
 	movl	PCB_GSBASE+4(%r8),%edx
 	wrmsr
+2:
+do_tss:
 
 	/* Update the TSS_RSP0 pointer for the next interrupt */
 	movq	PCPU(TSSP), %rax
+	movq	%r8, PCPU(RSP0)
+	movq	%r8, PCPU(CURPCB)
 	addq	$COMMON_TSS_RSP0, %rax
-	leaq	-16(%r8), %rbx
-	movq	%rbx, (%rax)
-	movq	%rbx, PCPU(RSP0)
+	movq	%rsi, PCPU(CURTHREAD)		/* into next thread */
+	movq	%r8, (%rax)
 
-	movq	%r8, PCPU(CURPCB)
-	movq	%rsi, PCPU(CURTHREAD)		/* into next thread */
+	/* Test if debug registers should be restored. */
+	testl	$PCB_DBREGS,PCB_FLAGS(%r8)
+	jnz	load_dr				/* static predict not taken */
+done_load_dr:
 
 	testl	$PCB_32BIT,PCB_FLAGS(%r8)
-	jz	1f				/* no, skip over */
+	jnz	load_gs				/* static predict not taken */
+done_load_gs:
+
+	/* Restore context. */
+	movq	PCB_R15(%r8),%r15
+	movq	PCB_R14(%r8),%r14
+	movq	PCB_R13(%r8),%r13
+	movq	PCB_R12(%r8),%r12
+	movq	PCB_RBP(%r8),%rbp
+	movq	PCB_RSP(%r8),%rsp
+	movq	PCB_RBX(%r8),%rbx
+	movq	PCB_RIP(%r8),%rax
+	movq	%rax,(%rsp)
+	ret
+
+	/*
+	 * We order these strangely for several reasons.
+	 * 1: I wanted to use static branch prediction hints
+	 * 2: Most athlon64/opteron cpus don't have them.  They define
+	 *    a forward branch as 'predict not taken'.  Intel cores have
+	 *    the 'rep' prefix to invert this.
+	 * So, to make it work on both forms of cpu we do the detour.
+	 * We use jumps rather than call in order to avoid the stack.
+	 */
+
+do_kthread:
+	/*
+	 * Copy old fs/gsbase to new kthread pcb for future switches
+	 * This maintains curpcb->pcb_[fg]sbase as caches of the MSR
+	 */
+	movq	%r9,PCB_FSBASE(%r8)
+	movq	%r10,PCB_GSBASE(%r8)
+	jmp	do_tss
+
+store_gs:
+	movl	%gs,PCB_GS(%r8)
+	movq	PCB_GS32P(%r8),%rax
+	movq	(%rax),%rax
+	movq	%rax,PCB_GS32SD(%r8)
+	jmp	done_store_gs
 
+load_gs:
 	/* Restore userland %gs while preserving kernel gsbase */
 	movq	PCB_GS32P(%r8),%rax
-	movq	PCB_GS32SD(%r8),%rbx
-	movq	%rbx,(%rax)
+	movq	PCB_GS32SD(%r8),%rcx
+	movq	%rcx,(%rax)
 	movl	$MSR_GSBASE,%ecx
 	rdmsr
 	movl	PCB_GS(%r8),%gs
 	wrmsr
+	jmp	done_load_gs
 
-1:
-	/* Restore context. */
-	movq	PCB_RBX(%r8),%rbx
-	movq	PCB_RSP(%r8),%rsp
-	movq	PCB_RBP(%r8),%rbp
-	movq	PCB_R12(%r8),%r12
-	movq	PCB_R13(%r8),%r13
-	movq	PCB_R14(%r8),%r14
-	movq	PCB_R15(%r8),%r15
-	movq	PCB_RIP(%r8),%rax
-	movq	%rax,(%rsp)
+store_dr:
+	movq	%dr7,%rax			/* yes, do the save */
+	movq	%dr0,%r15
+	movq	%dr1,%r14
+	movq	%dr2,%r13
+	movq	%dr3,%r12
+	movq	%dr6,%r11
+	andq	$0x0000fc00, %rax		/* disable all watchpoints */
+	movq	%r15,PCB_DR0(%r8)
+	movq	%r14,PCB_DR1(%r8)
+	movq	%r13,PCB_DR2(%r8)
+	movq	%r12,PCB_DR3(%r8)
+	movq	%r11,PCB_DR6(%r8)
+	movq	%rax,PCB_DR7(%r8)
+	movq	%rax,%dr7
+	jmp	done_store_dr
 
-	/* Test if debug registers should be restored. */
-	testl	$PCB_DBREGS,PCB_FLAGS(%r8)
-	jz	1f
-	movq	PCB_DR6(%r8),%rax
-	movq	%rax,%dr6
-	movq	PCB_DR3(%r8),%rax
-	movq	%rax,%dr3
-	movq	PCB_DR2(%r8),%rax
-	movq	%rax,%dr2
-	movq	PCB_DR1(%r8),%rax
-	movq	%rax,%dr1
-	movq	PCB_DR0(%r8),%rax
-	movq	%rax,%dr0
-	/* But preserve reserved bits in %dr7 */
+load_dr:
 	movq	%dr7,%rax
+	movq	PCB_DR0(%r8),%r15
+	movq	PCB_DR1(%r8),%r14
+	movq	PCB_DR2(%r8),%r13
+	movq	PCB_DR3(%r8),%r12
+	movq	PCB_DR6(%r8),%r11
+	movq	PCB_DR7(%r8),%rcx
+	movq	%r15,%dr0
+	movq	%r14,%dr1
+	/* Preserve reserved bits in %dr7 */
 	andq	$0x0000fc00,%rax
-	movq	PCB_DR7(%r8),%rcx
 	andq	$~0x0000fc00,%rcx
+	movq	%r13,%dr2
+	movq	%r12,%dr3
 	orq	%rcx,%rax
+	movq	%r11,%dr6
 	movq	%rax,%dr7
-1:
-	ret
+	jmp	done_load_dr
+
 END(cpu_switch)
 	
 /*

==== //depot/projects/bike_sched/sys/amd64/amd64/genassym.c#3 (text+ko) ====

@@ -33,7 +33,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.166 2007/11/23 03:03:29 jkoshy Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.167 2008/03/23 22:46:37 peter Exp $");
 
 #include "opt_compat.h"
 #include "opt_kstack_pages.h"
@@ -86,6 +86,7 @@
 ASSYM(TDF_NEEDRESCHED, TDF_NEEDRESCHED);
 
 ASSYM(TDP_CALLCHAIN, TDP_CALLCHAIN);
+ASSYM(TDP_KTHREAD, TDP_KTHREAD);
 
 ASSYM(V_TRAP, offsetof(struct vmmeter, v_trap));
 ASSYM(V_SYSCALL, offsetof(struct vmmeter, v_syscall));

==== //depot/projects/bike_sched/sys/amd64/amd64/nexus.c#4 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.79 2008/03/13 20:39:03 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.80 2008/03/20 21:24:32 jhb Exp $");
 
 /*
  * This code implements a `root nexus' for Intel Architecture
@@ -87,6 +87,9 @@
 				int unit);
 static	struct resource *nexus_alloc_resource(device_t, device_t, int, int *,
 					      u_long, u_long, u_long, u_int);
+#ifdef SMP
+static	int nexus_bind_intr(device_t, device_t, struct resource *, int);
+#endif
 static	int nexus_config_intr(device_t, int, enum intr_trigger,
 			      enum intr_polarity);
 static	int nexus_activate_resource(device_t, device_t, int, int,
@@ -128,6 +131,9 @@
 	DEVMETHOD(bus_deactivate_resource, nexus_deactivate_resource),
 	DEVMETHOD(bus_setup_intr,	nexus_setup_intr),
 	DEVMETHOD(bus_teardown_intr,	nexus_teardown_intr),
+#ifdef SMP
+	DEVMETHOD(bus_bind_intr,	nexus_bind_intr),
+#endif
 	DEVMETHOD(bus_config_intr,	nexus_config_intr),
 	DEVMETHOD(bus_get_resource_list, nexus_get_reslist),
 	DEVMETHOD(bus_set_resource,	nexus_set_resource),
@@ -458,6 +464,14 @@
 	return (intr_remove_handler(ih));
 }
 
+#ifdef SMP
+static int
+nexus_bind_intr(device_t dev, device_t child, struct resource *irq, int cpu)
+{
+	return (intr_bind(rman_get_start(irq), cpu));
+}
+#endif
+
 static int
 nexus_config_intr(device_t dev, int irq, enum intr_trigger trig,
     enum intr_polarity pol)

==== //depot/projects/bike_sched/sys/amd64/amd64/pmap.c#8 (text+ko) ====

@@ -77,7 +77,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.606 2008/03/04 18:50:15 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.609 2008/03/23 23:04:09 alc Exp $");
 
 /*
  *	Manages physical address maps.
@@ -1861,12 +1861,8 @@
 			    ("pmap_collect: wired pte %#lx", tpte));
 			if (tpte & PG_A)
 				vm_page_flag_set(m, PG_REFERENCED);
-			if (tpte & PG_M) {
-				KASSERT((tpte & PG_RW),
-	("pmap_collect: modified page not writable: va: %#lx, pte: %#lx",
-				    va, tpte));
+			if ((tpte & (PG_M | PG_RW)) == (PG_M | PG_RW))
 				vm_page_dirty(m);
-			}
 			free = NULL;
 			pmap_unuse_pt(pmap, va, *pde, &free);
 			pmap_invalidate_page(pmap, va);
@@ -2311,12 +2307,8 @@
 		eva = sva + NBPDR;
 		for (va = sva, m = PHYS_TO_VM_PAGE(oldpde & PG_FRAME);
 		    va < eva; va += PAGE_SIZE, m++) {
-			if (oldpde & PG_M) {
-				KASSERT((oldpde & PG_RW) != 0,
-	("pmap_remove_pde: modified 2mpage not writable: va: %#lx, pde: %#lx",
-				    va, oldpde));
+			if ((oldpde & (PG_M | PG_RW)) == (PG_M | PG_RW))
 				vm_page_dirty(m);
-			}
 			if (oldpde & PG_A)
 				vm_page_flag_set(m, PG_REFERENCED);
 			if (TAILQ_EMPTY(&m->md.pv_list) &&
@@ -2364,12 +2356,8 @@
 	pmap->pm_stats.resident_count -= 1;
 	if (oldpte & PG_MANAGED) {
 		m = PHYS_TO_VM_PAGE(oldpte & PG_FRAME);
-		if (oldpte & PG_M) {
-			KASSERT((oldpte & PG_RW),
-	("pmap_remove_pte: modified page not writable: va: %#lx, pte: %#lx",
-			    va, oldpte));
+		if ((oldpte & (PG_M | PG_RW)) == (PG_M | PG_RW))
 			vm_page_dirty(m);
-		}
 		if (oldpte & PG_A)
 			vm_page_flag_set(m, PG_REFERENCED);
 		pmap_remove_entry(pmap, m, va);
@@ -2444,12 +2432,16 @@
 		pml4e = pmap_pml4e(pmap, sva);
 		if ((*pml4e & PG_V) == 0) {
 			va_next = (sva + NBPML4) & ~PML4MASK;
+			if (va_next < sva)
+				va_next = eva;
 			continue;
 		}
 
 		pdpe = pmap_pml4e_to_pdpe(pml4e, sva);
 		if ((*pdpe & PG_V) == 0) {
 			va_next = (sva + NBPDP) & ~PDPMASK;
+			if (va_next < sva)
+				va_next = eva;
 			continue;
 		}
 
@@ -2457,6 +2449,8 @@
 		 * Calculate index for next page table.
 		 */
 		va_next = (sva + NBPDR) & ~PDRMASK;
+		if (va_next < sva)
+			va_next = eva;
 
 		pde = pmap_pdpe_to_pde(pdpe, sva);
 		ptpaddr = *pde;
@@ -2575,12 +2569,8 @@
 		/*
 		 * Update the vm_page_t clean and reference bits.
 		 */
-		if (tpte & PG_M) {
-			KASSERT((tpte & PG_RW),
-	("pmap_remove_all: modified page not writable: va: %#lx, pte: %#lx",
-			    pv->pv_va, tpte));
+		if ((tpte & (PG_M | PG_RW)) == (PG_M | PG_RW))
 			vm_page_dirty(m);
-		}
 		free = NULL;
 		pmap_unuse_pt(pmap, pv->pv_va, *pde, &free);
 		pmap_invalidate_page(pmap, pv->pv_va);
@@ -2621,7 +2611,7 @@
 			 * page mapping with a stored page table page has PG_A
 			 * set.
 			 */
-			if ((oldpde & PG_M) != 0)
+			if ((oldpde & (PG_M | PG_RW)) == (PG_M | PG_RW))
 				vm_page_dirty(m);
 		}
 	}
@@ -2672,16 +2662,22 @@
 		pml4e = pmap_pml4e(pmap, sva);
 		if ((*pml4e & PG_V) == 0) {
 			va_next = (sva + NBPML4) & ~PML4MASK;
+			if (va_next < sva)
+				va_next = eva;
 			continue;
 		}
 
 		pdpe = pmap_pml4e_to_pdpe(pml4e, sva);
 		if ((*pdpe & PG_V) == 0) {
 			va_next = (sva + NBPDP) & ~PDPMASK;
+			if (va_next < sva)
+				va_next = eva;
 			continue;
 		}
 
 		va_next = (sva + NBPDR) & ~PDRMASK;
+		if (va_next < sva)
+			va_next = eva;
 
 		pde = pmap_pdpe_to_pde(pdpe, sva);
 		ptpaddr = *pde;
@@ -2733,7 +2729,7 @@
 					vm_page_flag_set(m, PG_REFERENCED);
 					pbits &= ~PG_A;
 				}
-				if ((pbits & PG_M) != 0) {
+				if ((pbits & (PG_M | PG_RW)) == (PG_M | PG_RW)) {
 					if (m == NULL)
 						m = PHYS_TO_VM_PAGE(pbits &
 						    PG_FRAME);
@@ -2806,12 +2802,15 @@
 			return;
 		}
 		if ((oldpte & (PG_M | PG_RW)) == PG_RW) {
+			/*
+			 * When PG_M is already clear, PG_RW can be cleared
+			 * without a TLB invalidation.
+			 */
 			if (!atomic_cmpset_long(pte, oldpte, oldpte & ~PG_RW))
 				goto retry;
 			oldpte &= ~PG_RW;
 			oldpteva = (oldpte & PG_FRAME & PDRMASK) |
 			    (va & ~PDRMASK);
-			pmap_invalidate_page(pmap, oldpteva);
 			CTR2(KTR_PMAP, "pmap_promote_pde: protect for va %#lx"
 			    " in pmap %p", oldpteva, pmap);
 		}
@@ -3023,10 +3022,7 @@
 				    PG_NX) == 0 && (newpte & PG_NX)))
 					invlva = TRUE;
 			}
-			if (origpte & PG_M) {
-				KASSERT((origpte & PG_RW),
-	("pmap_enter: modified page not writable: va: %#lx, pte: %#lx",
-				    va, origpte));
+			if ((origpte & (PG_M | PG_RW)) == (PG_M | PG_RW)) {
 				if ((origpte & PG_MANAGED) != 0)
 					vm_page_dirty(om);
 				if ((newpte & PG_RW) == 0)
@@ -3084,7 +3080,7 @@
 		newpde |= PG_MANAGED;
 
 		/*
-		 * Create a PV entry for each of the managed pages.
+		 * Abort this mapping if its PV entry could not be created.
 		 */
 		if (!pmap_pv_insert_pde(pmap, va, m)) {
 			free = NULL;
@@ -3485,16 +3481,22 @@
 		pml4e = pmap_pml4e(src_pmap, addr);
 		if ((*pml4e & PG_V) == 0) {
 			va_next = (addr + NBPML4) & ~PML4MASK;
+			if (va_next < addr)
+				va_next = end_addr;
 			continue;
 		}
 
 		pdpe = pmap_pml4e_to_pdpe(pml4e, addr);
 		if ((*pdpe & PG_V) == 0) {
 			va_next = (addr + NBPDP) & ~PDPMASK;
+			if (va_next < addr)
+				va_next = end_addr;
 			continue;
 		}
 
 		va_next = (addr + NBPDR) & ~PDRMASK;
+		if (va_next < addr)
+			va_next = end_addr;
 
 		pde = pmap_pdpe_to_pde(pdpe, addr);
 		srcptepaddr = *pde;
@@ -3797,10 +3799,7 @@
 				/*
 				 * Update the vm_page_t clean/reference bits.
 				 */
-				if (tpte & PG_M) {
-					KASSERT((tpte & PG_RW) != 0,
-	("pmap_remove_pages: modified page not writable: va: %#lx, pte: %#lx",
-					    pv->pv_va, tpte));
+				if ((tpte & (PG_M | PG_RW)) == (PG_M | PG_RW)) {
 					if ((tpte & PG_PS) != 0) {
 						for (mt = m; mt < &m[NBPDR / PAGE_SIZE]; mt++)
 							vm_page_dirty(mt);
@@ -3898,7 +3897,7 @@
 		pmap = PV_PMAP(pv);
 		PMAP_LOCK(pmap);
 		pte = pmap_pte(pmap, pv->pv_va);
-		rv = (*pte & PG_M) != 0;
+		rv = (*pte & (PG_M | PG_RW)) == (PG_M | PG_RW);
 		PMAP_UNLOCK(pmap);
 		if (rv)
 			break;
@@ -4106,9 +4105,7 @@
 					}
 				}
 			}
-		} else
-			KASSERT((oldpde & PG_M) == 0,
-			    ("pmap_clear_modify: modified page not writable"));
+		}
 		PMAP_UNLOCK(pmap);
 	}
 	TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) {
@@ -4118,7 +4115,7 @@
 		KASSERT((*pde & PG_PS) == 0, ("pmap_clear_modify: found"
 		    " a 2mpage in page %p's pv list", m));
 		pte = pmap_pde_to_pte(pde, pv->pv_va);
-		if (*pte & PG_M) {
+		if ((*pte & (PG_M | PG_RW)) == (PG_M | PG_RW)) {
 			atomic_clear_long(pte, PG_M);
 			pmap_invalidate_page(pmap, pv->pv_va);
 		}
@@ -4373,10 +4370,10 @@
 	pdep = pmap_pde(pmap, addr);
 	if (pdep != NULL && (*pdep & PG_V)) {
 		if (*pdep & PG_PS) {
-			KASSERT((*pdep & PG_FRAME & PDRMASK) == 0,
-			    ("pmap_mincore: bad pde"));
 			pte = *pdep;
-			pa = (*pdep & PG_FRAME) | (addr & PDRMASK);
+			/* Compute the physical address of the 4KB page. */
+			pa = ((*pdep & PG_PS_FRAME) | (addr & PDRMASK)) &
+			    PG_FRAME;
 		} else {
 			pte = *pmap_pde_to_pte(pdep, addr);
 			pa = pte & PG_FRAME;
@@ -4397,7 +4394,7 @@
 		/*
 		 * Modified by us
 		 */
-		if (pte & PG_M)
+		if ((pte & (PG_M | PG_RW)) == (PG_M | PG_RW))
 			val |= MINCORE_MODIFIED|MINCORE_MODIFIED_OTHER;
 		else {
 			/*

==== //depot/projects/bike_sched/sys/amd64/amd64/prof_machdep.c#3 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/prof_machdep.c,v 1.31 2007/11/29 02:01:21 bde Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/prof_machdep.c,v 1.32 2008/03/26 15:03:23 phk Exp $");
 
 #ifdef GUPROF
 #if 0
@@ -258,7 +258,7 @@
 	delta = prev_count - count;
 	prev_count = count;
 	if ((int) delta <= 0)
-		return (delta + (timer0_max_count << CPUTIME_CLOCK_I8254_SHIFT));
+		return (delta + (i8254_max_count << CPUTIME_CLOCK_I8254_SHIFT));
 	return (delta);
 }
 
@@ -323,7 +323,7 @@
 			cputime_clock = CPUTIME_CLOCK_TSC;
 #endif
 	}
-	gp->profrate = timer_freq << CPUTIME_CLOCK_I8254_SHIFT;
+	gp->profrate = i8254_freq << CPUTIME_CLOCK_I8254_SHIFT;
 #if defined(I586_CPU) || defined(I686_CPU)
 	if (cputime_clock == CPUTIME_CLOCK_TSC) {
 		gp->profrate = tsc_freq >> 1;

==== //depot/projects/bike_sched/sys/amd64/conf/NOTES#5 (text+ko) ====

@@ -4,7 +4,7 @@
 # This file contains machine dependent kernel configuration notes.  For
 # machine independent notes, look in /sys/conf/NOTES.
 #
-# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.75 2008/02/03 07:07:30 scottl Exp $
+# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.76 2008/03/24 22:23:21 jkim Exp $
 #
 
 #
@@ -80,6 +80,10 @@
 
 options 	DEVICE_POLLING
 
+# BPF_JITTER adds support for BPF just-in-time compiler.
+
+options		BPF_JITTER
+
 
 #####################################################################
 # CLOCK OPTIONS

==== //depot/projects/bike_sched/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.16 2008/03/13 10:54:37 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.17 2008/03/23 22:44:56 peter Exp $");
 
 #include "opt_compat.h"
 
@@ -715,10 +715,12 @@
 	struct trapframe *regs = td->td_frame;
 	struct pcb *pcb = td->td_pcb;
 	
+	critical_enter();
 	wrmsr(MSR_FSBASE, 0);
 	wrmsr(MSR_KGSBASE, 0);	/* User value while we're in the kernel */
 	pcb->pcb_fsbase = 0;
 	pcb->pcb_gsbase = 0;
+	critical_exit();
 	load_ds(_udatasel);
 	load_es(_udatasel);
 	load_fs(_udatasel);

==== //depot/projects/bike_sched/sys/amd64/include/clock.h#3 (text+ko) ====

@@ -3,7 +3,7 @@
  * Garrett Wollman, September 1994.
  * This file is in the public domain.
  *
- * $FreeBSD: src/sys/amd64/include/clock.h,v 1.55 2007/10/26 03:23:53 peter Exp $
+ * $FreeBSD: src/sys/amd64/include/clock.h,v 1.57 2008/03/26 15:03:23 phk Exp $
  */
 
 #ifndef _MACHINE_CLOCK_H_
@@ -15,11 +15,9 @@
  * XXX large parts of the driver and its interface are misplaced.
  */
 extern int	clkintr_pending;

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Wed Mar 26 18:02:29 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 484EC1065672; Wed, 26 Mar 2008 18:02: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 047CC106566C
	for ; Wed, 26 Mar 2008 18:02:29 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id ED1108FC26
	for ; Wed, 26 Mar 2008 18:02:28 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2QI2Skh072639
	for ; Wed, 26 Mar 2008 18:02:28 GMT
	(envelope-from peter-gmail@wemm.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2QI2SG3072637
	for perforce@freebsd.org; Wed, 26 Mar 2008 18:02:28 GMT
	(envelope-from peter-gmail@wemm.org)
Date: Wed, 26 Mar 2008 18:02:28 GMT
Message-Id: <200803261802.m2QI2SG3072637@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter-gmail@wemm.org using -f
From: Peter Wemm 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138636 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 26 Mar 2008 18:02:29 -0000

http://perforce.freebsd.org/chv.cgi?CH=138636

Change 138636 by peter@peter_overcee on 2008/03/26 18:01:34

	IFC @138629

Affected files ...

.. //depot/projects/bike_sched/sys/kern/sched_4bsd.c#23 integrate

Differences ...

==== //depot/projects/bike_sched/sys/kern/sched_4bsd.c#23 (text+ko) ====

@@ -33,9 +33,10 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.118 2008/03/16 10:58:05 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.123 2008/03/20 05:51:16 jeff Exp $");
 
 #include "opt_hwpmc_hooks.h"
+#include "opt_sched.h"
 
 #include 
 #include 
@@ -81,15 +82,14 @@
  */
 struct td_sched {
 	fixpt_t		ts_pctcpu;	/* (j) %cpu during p_swtime. */
-	u_char		ts_flags;	/* (t) Flags */
 	int		ts_cpticks;	/* (j) Ticks of cpu time. */
 	int		ts_slptime;	/* (j) Seconds !RUNNING. */
 	struct runq	*ts_runq;	/* runq the thread is currently on */
 };
 
-#define TSF_DIDRUN	0x01	/* thread actually ran. */
-#define TSF_EXIT	0x02	/* thread is being killed. */
-#define TSF_BOUND	0x04	/* stuck to one CPU */
+/* flags kept in td_flags */
+#define TDF_DIDRUN	TDF_SCHED0	/* thread actually ran. */
+#define TDF_BOUND	TDF_SCHED1	/* Bound to one CPU. */
 
 #define SKE_RUNQ_PCPU(ts)						\
     ((ts)->ts_runq != 0 && (ts)->ts_runq != &runq)
@@ -184,6 +184,9 @@
 /* Enable forwarding of wakeups to all other cpus */
 SYSCTL_NODE(_kern_sched, OID_AUTO, ipiwakeup, CTLFLAG_RD, NULL, "Kernel SMP");
 
+static int runq_fuzz = 1;
+SYSCTL_INT(_kern_sched, OID_AUTO, runq_fuzz, CTLFLAG_RW, &runq_fuzz, 0, "");
+
 static int forward_wakeup_enabled = 1;
 SYSCTL_INT(_kern_sched_ipiwakeup, OID_AUTO, enabled, CTLFLAG_RW,
 	   &forward_wakeup_enabled, 0,
@@ -254,6 +257,89 @@
 }
 
 /*
+ * This function is called when a thread is about to be put on run queue
+ * because it has been made runnable or its priority has been adjusted.  It
+ * determines if the new thread should be immediately preempted to.  If so,
+ * it switches to it and eventually returns true.  If not, it returns false
+ * so that the caller may place the thread on an appropriate run queue.
+ */
+int
+maybe_preempt(struct thread *td)
+{
+#ifdef PREEMPTION
+	struct thread *ctd;
+	int cpri, pri;
+#endif
+
+#ifdef PREEMPTION
+	/*
+	 * The new thread should not preempt the current thread if any of the
+	 * following conditions are true:
+	 *
+	 *  - The kernel is in the throes of crashing (panicstr).
+	 *  - The current thread has a higher (numerically lower) or
+	 *    equivalent priority.  Note that this prevents curthread from
+	 *    trying to preempt to itself.
+	 *  - It is too early in the boot for context switches (cold is set).
+	 *  - The current thread has an inhibitor set or is in the process of
+	 *    exiting.  In this case, the current thread is about to switch
+	 *    out anyways, so there's no point in preempting.  If we did,
+	 *    the current thread would not be properly resumed as well, so
+	 *    just avoid that whole landmine.
+	 *  - If the new thread's priority is not a realtime priority and
+	 *    the current thread's priority is not an idle priority and
+	 *    FULL_PREEMPTION is disabled.
+	 *
+	 * If all of these conditions are false, but the current thread is in
+	 * a nested critical section, then we have to defer the preemption
+	 * until we exit the critical section.  Otherwise, switch immediately
+	 * to the new thread.
+	 */
+	ctd = curthread;
+	THREAD_LOCK_ASSERT(td, MA_OWNED);
+	KASSERT((td->td_inhibitors == 0),
+			("maybe_preempt: trying to run inhibited thread"));
+	pri = td->td_priority;
+	cpri = ctd->td_priority;
+	if (panicstr != NULL || pri >= cpri || cold /* || dumping */ ||
+	    TD_IS_INHIBITED(ctd))
+		return (0);
+#ifndef FULL_PREEMPTION
+	if (pri > PRI_MAX_ITHD && cpri < PRI_MIN_IDLE)
+		return (0);
+#endif
+
+	if (ctd->td_critnest > 1) {
+		CTR1(KTR_PROC, "maybe_preempt: in critical section %d",
+		    ctd->td_critnest);
+		ctd->td_owepreempt = 1;
+		return (0);
+	}
+	/*
+	 * Thread is runnable but not yet put on system run queue.
+	 */
+	MPASS(ctd->td_lock == td->td_lock);
+	MPASS(TD_ON_RUNQ(td));
+	TD_SET_RUNNING(td);
+	CTR3(KTR_PROC, "preempting to thread %p (pid %d, %s)\n", td,
+	    td->td_proc->p_pid, td->td_name);
+	SCHED_STAT_INC(switch_preempt);
+	mi_switch(SW_INVOL|SW_PREEMPT, td);
+	/*
+	 * td's lock pointer may have changed.  We have to return with it
+	 * locked.
+	 */
+	spinlock_enter();
+	thread_unlock(ctd);
+	thread_lock(td);
+	spinlock_exit();
+	return (1);
+#else
+	return (0);
+#endif
+}
+
+/*
  * Constants for digital decay and forget:
  *	90% of (td_estcpu) usage in 5 * loadav time
  *	95% of (ts_pctcpu) usage in 60 seconds (load insensitive)
@@ -356,7 +442,7 @@
 	realstathz = stathz ? stathz : hz;
 	sx_slock(&allproc_lock);
 	FOREACH_PROC_IN_SYSTEM(p) {
-		PROC_SLOCK(p);
+		PROC_LOCK(p);
 		FOREACH_THREAD_IN_PROC(p, td) { 
 			awake = 0;
 			thread_lock(td);
@@ -372,13 +458,13 @@
 			 */
 			if (TD_ON_RUNQ(td)) {
 				awake = 1;
-				ts->ts_flags &= ~TSF_DIDRUN;
+				td->td_flags &= ~TDF_DIDRUN;
 			} else if (TD_IS_RUNNING(td)) {
 				awake = 1;
-				/* Do not clear TSF_DIDRUN */
-			} else if (ts->ts_flags & TSF_DIDRUN) {
+				/* Do not clear TDF_DIDRUN */
+			} else if (td->td_flags & TDF_DIDRUN) {
 				awake = 1;
-				ts->ts_flags &= ~TSF_DIDRUN;
+				td->td_flags &= ~TDF_DIDRUN;
 			}
 
 			/*
@@ -435,7 +521,7 @@
 			resetpriority_thread(td);
 			thread_unlock(td);
 		} /* end of thread loop */
-		PROC_SUNLOCK(p);
+		PROC_UNLOCK(p);
 	} /* end of process loop */
 	sx_sunlock(&allproc_lock);
 }
@@ -627,10 +713,13 @@
 void
 sched_fork(struct thread *td, struct thread *childtd)
 {
+	struct td_sched *ts;
+
 	childtd->td_estcpu = td->td_estcpu;
 	childtd->td_lock = &sched_lock;
 	childtd->td_cpuset = cpuset_ref(td->td_cpuset);
-	sched_newthread(childtd);
+	ts = childtd->td_sched;
+	bzero(ts, sizeof(*ts));
 }
 
 void
@@ -639,7 +728,6 @@
 	struct thread *td;
 
 	PROC_LOCK_ASSERT(p, MA_OWNED);
-	PROC_SLOCK_ASSERT(p, MA_OWNED);
 	p->p_nice = nice;
 	FOREACH_THREAD_IN_PROC(p, td) {
 		thread_lock(td);
@@ -670,8 +758,7 @@
 	if (td->td_priority == prio)
 		return;
 	td->td_priority = prio;
-	if (TD_ON_RUNQ(td) && 
-	    td->td_rqindex != (prio / RQ_PPQ)) {
+	if (TD_ON_RUNQ(td) && td->td_rqindex != (prio / RQ_PPQ)) {
 		sched_rem(td);
 		sched_add(td, SRQ_BORING);
 	}
@@ -852,7 +939,7 @@
 		 */
 		KASSERT((newtd->td_inhibitors == 0),
 			("trying to run inhibited thread"));
-		TD_TO_TS(newtd)->ts_flags |= TSF_DIDRUN;
+		newtd->td_flags |= TDF_DIDRUN;
         	TD_SET_RUNNING(newtd);
 		if ((newtd->td_proc->p_flag & P_NOLOAD) == 0)
 			sched_load_add();
@@ -1077,7 +1164,7 @@
 		single_cpu = 1;
 		CTR3(KTR_RUNQ,
 		    "sched_add: Put td_sched:%p(td:%p) on cpu%d runq", ts, td, cpu);
-	} else if ((ts)->ts_flags & TSF_BOUND) {
+	} else if ((td)->td_flags & TDF_BOUND) {
 		/* Find CPU from bound runq */
 		KASSERT(SKE_RUNQ_PCPU(ts),("sched_add: bound td_sched not on cpu runq"));
 		cpu = ts->ts_runq - &runq_pcpu[0];
@@ -1114,7 +1201,7 @@
 	
 	if ((td->td_proc->p_flag & P_NOLOAD) == 0)
 		sched_load_add();
-	runq_add(ts->ts_runq, ts, flags);
+	runq_add(ts->ts_runq, td, flags);
 }
 #else /* SMP */
 {
@@ -1159,7 +1246,7 @@
 	}	
 	if ((td->td_proc->p_flag & P_NOLOAD) == 0)
 		sched_load_add();
-	runq_add(ts->ts_runq, ts, flags);
+	runq_add(ts->ts_runq, td, flags);
 	maybe_resched(td);
 }
 #endif /* SMP */
@@ -1187,7 +1274,7 @@
 
 	if ((td->td_proc->p_flag & P_NOLOAD) == 0)
 		sched_load_rem();
-	runq_remove(ts->ts_runq, ts);
+	runq_remove(ts->ts_runq, td);
 	TD_SET_CAN_RUN(td);
 }
 
@@ -1198,26 +1285,26 @@
 struct thread *
 sched_choose(void)
 {
-	struct td_sched *td;
+	struct thread *td;
 	struct runq *rq;
 
 	mtx_assert(&sched_lock,  MA_OWNED);
 #ifdef SMP
-	struct thread *kecpu;
+	struct thread *tdcpu;
 
 	rq = &runq;
-	td = runq_choose(&runq);
-	kecpu = runq_choose(&runq_pcpu[PCPU_GET(cpuid)]);
+	td = runq_choose_fuzz(&runq, runq_fuzz);
+	tdcpu = runq_choose(&runq_pcpu[PCPU_GET(cpuid)]);
 
 	if (td == NULL || 
-	    (kecpu != NULL && 
-	     kecpu->td_priority < td->td_priority)) {
-		CTR2(KTR_RUNQ, "choosing thread %p from pcpu runq %d", kecpu,
+	    (tdcpu != NULL && 
+	     tdcpu->td_priority < td->td_priority)) {
+		CTR2(KTR_RUNQ, "choosing td %p from pcpu runq %d", tdcpu,
 		     PCPU_GET(cpuid));
-		td = kecpu;
+		td = tdcpu;
 		rq = &runq_pcpu[PCPU_GET(cpuid)];
 	} else { 
-		CTR1(KTR_RUNQ, "choosing thread %p from main runq", td);
+		CTR1(KTR_RUNQ, "choosing td_sched %p from main runq", td);
 	}
 
 #else
@@ -1227,7 +1314,7 @@
 
 	if (td) {
 		runq_remove(rq, td);
-		TD_TO_TS(ts)->ts_flags |= TSF_DIDRUN;
+		td->td_flags |= TDF_DIDRUN;
 
 		KASSERT(td->td_flags & TDF_INMEM,
 		    ("sched_choose: thread swapped out"));
@@ -1280,7 +1367,7 @@
 
 	ts = TD_TO_TS(td);
 
-	ts->ts_flags |= TSF_BOUND;
+	td->td_flags |= TDF_BOUND;
 #ifdef SMP
 	ts->ts_runq = &runq_pcpu[cpu];
 	if (PCPU_GET(cpuid) == cpu)
@@ -1294,14 +1381,14 @@
 sched_unbind(struct thread* td)
 {
 	THREAD_LOCK_ASSERT(td, MA_OWNED);
-	TD_TO_TS(td)->ts_flags &= ~TSF_BOUND;
+	td->td_flags &= ~TDF_BOUND;
 }
 
 int
 sched_is_bound(struct thread *td)
 {
 	THREAD_LOCK_ASSERT(td, MA_OWNED);
-	return (TD_TO_TS(td)->ts_flags & TSF_BOUND);
+	return (td->td_flags & TDF_BOUND);
 }
 
 void

From owner-p4-projects@FreeBSD.ORG  Wed Mar 26 18:16:44 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 36A881065676; Wed, 26 Mar 2008 18:16: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 E8DCC106566C
	for ; Wed, 26 Mar 2008 18:16:43 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id DD0A58FC1A
	for ; Wed, 26 Mar 2008 18:16:43 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2QIGhrO074644
	for ; Wed, 26 Mar 2008 18:16:43 GMT
	(envelope-from peter-gmail@wemm.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2QIGhXq074642
	for perforce@freebsd.org; Wed, 26 Mar 2008 18:16:43 GMT
	(envelope-from peter-gmail@wemm.org)
Date: Wed, 26 Mar 2008 18:16:43 GMT
Message-Id: <200803261816.m2QIGhXq074642@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter-gmail@wemm.org using -f
From: Peter Wemm 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138638 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 26 Mar 2008 18:16:44 -0000

http://perforce.freebsd.org/chv.cgi?CH=138638

Change 138638 by peter@peter_overcee on 2008/03/26 18:16:03

	IFC @138629

Affected files ...

.. //depot/projects/bike_sched/sys/kern/sched_ule.c#23 integrate

Differences ...

==== //depot/projects/bike_sched/sys/kern/sched_ule.c#23 (text+ko) ====

@@ -36,7 +36,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.234 2008/03/16 10:58:05 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.238 2008/03/20 05:51:16 jeff Exp $");
 
 #include "opt_hwpmc_hooks.h"
 #include "opt_sched.h"
@@ -260,7 +260,7 @@
 static void sched_pctcpu_update(struct thread *);
 
 /* Operations on per processor queues */
-static struct thread * tdq_choose(struct tdq *);
+static struct thread *tdq_choose(struct tdq *);
 static void tdq_setup(struct tdq *);
 static void tdq_load_add(struct tdq *, struct thread *);
 static void tdq_load_rem(struct tdq *, struct thread *);
@@ -275,7 +275,7 @@
 static int tdq_idled(struct tdq *);
 static void tdq_notify(struct tdq *, struct thread *);
 static struct thread *tdq_steal(struct tdq *, int);
-static struct thread *runq_steal(struct runq *);
+static struct thread *runq_steal(struct runq *, int);
 static int sched_pickcpu(struct thread *, int);
 static void sched_balance(void);
 static int sched_balance_pair(struct tdq *, struct tdq *);
@@ -311,9 +311,10 @@
 			if (rq->rq_status.rqb_bits[i] & (1ul << j)) {
 				pri = j + (i << RQB_L2BPW);
 				rqh = &rq->rq_queues[pri];
-				TAILQ_FOREACH(td, rqh, td_procq) {
+				TAILQ_FOREACH(td, rqh, td_runq) {
 					printf("\t\t\ttd %p(%s) priority %d rqindex %d pri %d\n",
-					    td, td->td_name, td->td_priority, td->td_rqindex, pri);
+					    td, td->td_name, td->td_priority,
+					    td->td_rqindex, pri);
 				}
 			}
 	}
@@ -387,18 +388,19 @@
 static __inline void
 tdq_runq_add(struct tdq *tdq, struct thread *td, int flags)
 {
+	struct td_sched *ts;
 	u_char pri;
-	struct td_sched *ts = TD_TO_TS(td);
 
 	TDQ_LOCK_ASSERT(tdq, MA_OWNED);
 	THREAD_LOCK_ASSERT(td, MA_OWNED);
 
-	TD_SET_RUNQ(ts->ts_thread);
+	pri = td->td_priority;
+	ts = TD_TO_TS(td);
+	TD_SET_RUNQ(td);
 	if (THREAD_CAN_MIGRATE(td)) {
 		tdq->tdq_transferable++;
 		ts->ts_flags |= TSF_XFERABLE;
 	}
-	pri = td->td_priority;
 	if (pri <= PRI_MAX_REALTIME) {
 		ts->ts_runq = &tdq->tdq_realtime;
 	} else if (pri <= PRI_MAX_TIMESHARE) {
@@ -422,11 +424,11 @@
 				pri = (unsigned char)(pri - 1) % RQ_NQS;
 		} else
 			pri = tdq->tdq_ridx;
-		runq_add_pri(ts->ts_runq, ts, pri, flags);
+		runq_add_pri(ts->ts_runq, td, pri, flags);
 		return;
 	} else
 		ts->ts_runq = &tdq->tdq_idle;
-	runq_add(ts->ts_runq, ts, flags);
+	runq_add(ts->ts_runq, td, flags);
 }
 
 /* 
@@ -437,9 +439,10 @@
 static __inline void
 tdq_runq_rem(struct tdq *tdq, struct thread *td)
 {
-	struct td_sched *ts = TD_TO_TS(td);
+	struct td_sched *ts;
+
+	ts = TD_TO_TS(td);
 	TDQ_LOCK_ASSERT(tdq, MA_OWNED);
-	KASSERT(ts->ts_runq != NULL,
 	    ("tdq_runq_remove: thread %p null ts_runq", td));
 	if (ts->ts_flags & TSF_XFERABLE) {
 		tdq->tdq_transferable--;
@@ -451,7 +454,7 @@
 		else
 			runq_remove_idx(ts->ts_runq, td, NULL);
 	} else
-		runq_remove(ts->ts_runq, ts);
+		runq_remove(ts->ts_runq, td);
 }
 
 /*
@@ -461,15 +464,16 @@
 static void
 tdq_load_add(struct tdq *tdq, struct thread *td)
 {
+	struct td_sched *ts;
 	int class;
 
+	ts = td->td_sched;
 	TDQ_LOCK_ASSERT(tdq, MA_OWNED);
 	THREAD_LOCK_ASSERT(td, MA_OWNED);
 	class = PRI_BASE(td->td_pri_class);
 	tdq->tdq_load++;
 	CTR2(KTR_SCHED, "cpu %d load: %d", TDQ_ID(tdq), tdq->tdq_load);
-	if (class != PRI_ITHD &&
-	    (td->td_proc->p_flag & P_NOLOAD) == 0)
+	if (class != PRI_ITHD && (td->td_proc->p_flag & P_NOLOAD) == 0)
 		tdq->tdq_sysload++;
 }
 
@@ -480,19 +484,20 @@
 static void
 tdq_load_rem(struct tdq *tdq, struct thread *td)
 {
+	struct td_sched *ts;
 	int class;
 
+	ts = TD_TO_TS(td);
 	THREAD_LOCK_ASSERT(td, MA_OWNED);
 	TDQ_LOCK_ASSERT(tdq, MA_OWNED);
 	class = PRI_BASE(td->td_pri_class);
-	if (class != PRI_ITHD &&
-	    (td->td_proc->p_flag & P_NOLOAD) == 0)
+	if (class != PRI_ITHD && (td->td_proc->p_flag & P_NOLOAD) == 0)
 		tdq->tdq_sysload--;
 	KASSERT(tdq->tdq_load != 0,
 	    ("tdq_load_rem: Removing with 0 load on queue %d", TDQ_ID(tdq)));
 	tdq->tdq_load--;
 	CTR1(KTR_SCHED, "load: %d", tdq->tdq_load);
-	TD_TO_TS(td)->ts_runq = NULL;
+	ts->ts_runq = NULL;
 }
 
 /*
@@ -502,16 +507,13 @@
 static void
 tdq_setlowpri(struct tdq *tdq, struct thread *ctd)
 {
-	struct td_sched *ts;
 	struct thread *td;
 
 	TDQ_LOCK_ASSERT(tdq, MA_OWNED);
 	if (ctd == NULL)
 		ctd = pcpu_find(TDQ_ID(tdq))->pc_curthread;
-	ts = tdq_choose(tdq);
-	if (ts)
-		td = ts->ts_thread;
-	if (ts == NULL || td->td_priority > ctd->td_priority)
+	td = tdq_choose(tdq);
+	if (td == NULL || td->td_priority > ctd->td_priority)
 		tdq->tdq_lowpri = ctd->td_priority;
 	else
 		tdq->tdq_lowpri = td->td_priority;
@@ -843,7 +845,6 @@
 tdq_move(struct tdq *from, struct tdq *to)
 {
 	struct thread *td;
-	struct thread *td;
 	struct tdq *tdq;
 	int cpu;
 
@@ -938,6 +939,8 @@
 
 	if (tdq->tdq_ipipending)
 		return;
+	cpu = TD_TO_TS(td)->ts_cpu;
+	pri = td->td_priority;
 	cpri = pcpu_find(cpu)->pc_curthread->td_priority;
 	if (!sched_shouldpreempt(pri, cpri, 1))
 		return;
@@ -952,9 +955,9 @@
 static struct thread *
 runq_steal_from(struct runq *rq, int cpu, u_char start)
 {
-	struct thread *td;
 	struct rqbits *rqb;
 	struct rqhead *rqh;
+	struct thread *td;
 	int first;
 	int bit;
 	int pri;
@@ -978,7 +981,7 @@
 			pri = RQB_FFS(rqb->rqb_bits[i]);
 		pri += (i << RQB_L2BPW);
 		rqh = &rq->rq_queues[pri];
-		TAILQ_FOREACH(td, rqh, td_procq) {
+		TAILQ_FOREACH(td, rqh, td_runq) {
 			if (first && THREAD_CAN_MIGRATE(td) &&
 			    THREAD_CAN_SCHED(td, cpu))
 				return (td);
@@ -1013,7 +1016,7 @@
 			if ((rqb->rqb_bits[word] & (1ul << bit)) == 0)
 				continue;
 			rqh = &rq->rq_queues[bit + (word << RQB_L2BPW)];
-			TAILQ_FOREACH(td, rqh, td_procq)
+			TAILQ_FOREACH(td, rqh, td_runq)
 				if (THREAD_CAN_MIGRATE(td) &&
 				    THREAD_CAN_SCHED(td, cpu))
 					return (td);
@@ -1028,13 +1031,13 @@
 static struct thread *
 tdq_steal(struct tdq *tdq, int cpu)
 {
-	struct td_sched *td;
+	struct thread *td;
 
 	TDQ_LOCK_ASSERT(tdq, MA_OWNED);
 	if ((td = runq_steal(&tdq->tdq_realtime, cpu)) != NULL)
 		return (td);
-	if ((td = runq_steal_from(&tdq->tdq_timeshare, cpu, tdq->tdq_ridx))
-	    != NULL)
+	if ((td = runq_steal_from(&tdq->tdq_timeshare,
+	    cpu, tdq->tdq_ridx)) != NULL)
 		return (td);
 	return (runq_steal(&tdq->tdq_idle, cpu));
 }
@@ -1046,16 +1049,17 @@
 static inline struct tdq *
 sched_setcpu(struct thread *td, int cpu, int flags)
 {
-	struct thread *td;
+
 	struct tdq *tdq;
 
 	THREAD_LOCK_ASSERT(td, MA_OWNED);
-
 	tdq = TDQ_CPU(cpu);
+	td->td_sched->ts_cpu = cpu;
 	ts = TD_TO_TS(td);
 	ts->ts_cpu = cpu;
-
-	/* If the lock matches just return the queue. */
+	/*
+	 * If the lock matches just return the queue.
+	 */
 	if (td->td_lock == TDQ_LOCKPTR(tdq))
 		return (tdq);
 #ifdef notyet
@@ -1149,6 +1153,7 @@
 static struct thread *
 tdq_choose(struct tdq *tdq)
 {
+	struct thread *td;
 
 	TDQ_LOCK_ASSERT(tdq, MA_OWNED);
 	td = runq_choose(&tdq->tdq_realtime);
@@ -1161,7 +1166,6 @@
 		    td->td_priority));
 		return (td);
 	}
-
 	td = runq_choose(&tdq->tdq_idle);
 	if (td != NULL) {
 		KASSERT(td->td_priority >= PRI_MIN_IDLE,
@@ -1239,7 +1243,7 @@
 	/* Add thread0's load since it's running. */
 	TDQ_LOCK(tdq);
 	thread0.td_lock = TDQ_LOCKPTR(TDQ_SELF());
-	tdq_load_add(tdq, TD_TO_TS(&td_sched0));
+	tdq_load_add(tdq, &thread0);
 	tdq->tdq_lowpri = thread0.td_priority;
 	TDQ_UNLOCK(tdq);
 }
@@ -1521,28 +1525,33 @@
 	THREAD_LOCK_ASSERT(td, MA_OWNED);
 	if (td->td_priority == prio)
 		return;
-
+	/*
+	 * If the priority has been elevated due to priority
+	 * propagation, we may have to move ourselves to a new
+	 * queue.  This could be optimized to not re-add in some
+	 * cases.
+	 */
 	if (TD_ON_RUNQ(td) && prio < td->td_priority) {
-		/*
-		 * If the priority has been elevated due to priority
-		 * propagation, we may have to move ourselves to a new
-		 * queue.  This could be optimized to not re-add in some
-		 * cases.
-		 */
 		sched_rem(td);
 		td->td_priority = prio;
 		sched_add(td, SRQ_BORROWING);
 		return;
 	}
-	tdq = TDQ_CPU(ts->ts_cpu);
-	oldpri = td->td_priority;
-	td->td_priority = prio;
+	/*
+	 * If the thread is currently running we may have to adjust the lowpri
+	 * information so other cpus are aware of our current priority.
+	 */
 	if (TD_IS_RUNNING(td)) {
+		tdq = TDQ_CPU(ts->ts_cpu);
+		oldpri = td->td_priority;
+		td->td_priority = prio;
 		if (prio < tdq->tdq_lowpri)
 			tdq->tdq_lowpri = prio;
 		else if (tdq->tdq_lowpri == oldpri)
 			tdq_setlowpri(tdq, td);
+		return;
 	}
+	td->td_priority = prio;
 }
 
 /*
@@ -1654,26 +1663,6 @@
 }
 
 /*
- * Add the thread passed as 'newtd' to the run queue before selecting
- * the next thread to run.  This is only used for preemption.
- */
-static void
-sched_switchin(struct tdq *tdq, struct thread *td)
-{
-#ifdef SMP
-	spinlock_enter();
-	TDQ_UNLOCK(tdq);
-	thread_lock(td);
-	spinlock_exit();
-	sched_setcpu(td, TDQ_ID(tdq), SRQ_YIELDING);
-#else
-	td->td_lock = TDQ_LOCKPTR(tdq);
-#endif
-	tdq_add(tdq, td, SRQ_YIELDING);
-	MPASS(td->td_lock == TDQ_LOCKPTR(tdq));
-}
-
-/*
  * Block a thread for switching.  Similar to thread_block() but does not
  * bump the spin count.
  */
@@ -1701,7 +1690,7 @@
 
 	tdn = TDQ_CPU(TD_TO_TS(td)->ts_cpu);
 #ifdef SMP
-	tdq_load_rem(tdq, td->td_sched);
+	tdq_load_rem(tdq, td);
 	/*
 	 * Do the lock dance required to avoid LOR.  We grab an extra
 	 * spinlock nesting to prevent preemption while we're
@@ -1753,6 +1742,7 @@
 	int cpuid;
 
 	THREAD_LOCK_ASSERT(td, MA_OWNED);
+	KASSERT(newtd == NULL, ("sched_switch: Unsupported newtd argument"));
 
 	cpuid = PCPU_GET(cpuid);
 	tdq = TDQ_CPU(cpuid);
@@ -1776,14 +1766,14 @@
 		    SRQ_OURSELF|SRQ_YIELDING|SRQ_PREEMPTED :
 		    SRQ_OURSELF|SRQ_YIELDING;
 		if (ts->ts_cpu == cpuid)
-			tdq_runq_add(tdq, ts, srqflag);
+			tdq_runq_add(tdq, td, srqflag);
 		else
 			mtx = sched_switch_migrate(tdq, td, srqflag);
 	} else {
 		/* This thread must be going to sleep. */
 		TDQ_LOCK(tdq);
 		mtx = thread_block_switch(td);
-		tdq_load_rem(tdq, ts);
+		tdq_load_rem(tdq, td);
 	}
 	/*
 	 * We enter here with the thread blocked and assigned to the
@@ -1791,12 +1781,6 @@
 	 * thread-queue locked.
 	 */
 	TDQ_LOCK_ASSERT(tdq, MA_OWNED | MA_NOTRECURSED);
-	/*
-	 * If preemption assigned a new thread just add it here and let choosethread
-	 * select the best one.
-	 */
-	if (newtd != NULL)
-		sched_switchin(tdq, newtd);
 	newtd = choosethread();
 	/*
 	 * Call the MD code to switch contexts if necessary.
@@ -1825,10 +1809,6 @@
 	} else
 		thread_unblock_switch(td, mtx);
 	/*
-	 * We should always get here with the lowest priority td possible.
-	 */
-	tdq->tdq_lowpri = td->td_priority;
-	/*
 	 * Assert that all went well and return.
 	 */
 	TDQ_LOCK_ASSERT(tdq, MA_OWNED|MA_NOTRECURSED);
@@ -1845,7 +1825,6 @@
 	struct thread *td;
 
 	PROC_LOCK_ASSERT(p, MA_OWNED);
-	PROC_SLOCK_ASSERT(p, MA_OWNED);
 
 	p->p_nice = nice;
 	FOREACH_THREAD_IN_PROC(p, td) {
@@ -1914,17 +1893,16 @@
 	struct td_sched *ts;
 	struct td_sched *ts2;
 
+	THREAD_LOCK_ASSERT(td, MA_OWNED);
 	/*
 	 * Initialize child.
 	 */
-	THREAD_LOCK_ASSERT(td, MA_OWNED);
-	sched_newthread(child);
+	ts = TD_TO_TS(td);
+	ts2 = TD_TO_TS(child);
 	child->td_lock = TDQ_LOCKPTR(TDQ_SELF());
 	child->td_cpuset = cpuset_ref(td->td_cpuset);
-	ts = TD_TO_TS(td);
-	ts2 = TD_TO_TS(child);
 	ts2->ts_cpu = ts->ts_cpu;
-	ts2->ts_runq = NULL;
+	ts2->ts_flags = 0;
 	/*
 	 * Grab our parents cpu estimation information and priority.
 	 */
@@ -1959,21 +1937,6 @@
 	THREAD_LOCK_ASSERT(td, MA_OWNED);
 	if (td->td_pri_class == class)
 		return;
-	/*
-	 * On SMP if we're on the RUNQ we must adjust the transferable
-	 * count because could be changing to or from an interrupt
-	 * class.
-	 */
-	if (TD_ON_RUNQ(td)) {
-		struct tdq *tdq;
-
-		tdq = TDQ_CPU(TD_TO_TS(td)->ts_cpu);
-		if (THREAD_CAN_MIGRATE(td))
-			tdq->tdq_transferable--;
-		td->td_pri_class = class;
-		if (THREAD_CAN_MIGRATE(td))
-			tdq->tdq_transferable++;
-	}
 	td->td_pri_class = class;
 }
 
@@ -2158,15 +2121,15 @@
 struct thread *
 sched_choose(void)
 {
-	struct td_sched *ts;
+	struct thread *td;
 	struct tdq *tdq;
 
 	tdq = TDQ_SELF();
 	TDQ_LOCK_ASSERT(tdq, MA_OWNED);
-	ts = tdq_choose(tdq);
-	if (ts) {
-		ts->ts_ltick = ticks;
-		tdq_runq_rem(tdq, ts);
+	td = tdq_choose(tdq);
+	if (td) {
+		TD_TO_TS(td)->ts_ltick = ticks;
+		tdq_runq_rem(tdq, td);
 		return (td);
 	}
 	return (PCPU_GET(idlethread));
@@ -2205,7 +2168,6 @@
 void
 tdq_add(struct tdq *tdq, struct thread *td, int flags)
 {
-	struct td_sched *ts;
 
 	TDQ_LOCK_ASSERT(tdq, MA_OWNED);
 	KASSERT((td->td_inhibitors == 0),
@@ -2215,11 +2177,10 @@
 	KASSERT(td->td_flags & TDF_INMEM,
 	    ("sched_add: thread swapped out"));
 
-	ts = TD_TO_TS(td);
 	if (td->td_priority < tdq->tdq_lowpri)
 		tdq->tdq_lowpri = td->td_priority;
-	tdq_runq_add(tdq, ts, flags);
-	tdq_load_add(tdq, ts);
+	tdq_runq_add(tdq, td, flags);
+	tdq_load_add(tdq, td);
 }
 
 /*
@@ -2231,7 +2192,6 @@
 {
 	struct tdq *tdq;
 #ifdef SMP
-	struct td_sched *ts;
 	int cpu;
 #endif
 	CTR5(KTR_SCHED, "sched_add: %p(%s) prio %d by %p(%s)",
@@ -2249,12 +2209,11 @@
 	 * Pick the destination cpu and if it isn't ours transfer to the
 	 * target cpu.
 	 */
-	ts = TD_TO_TS(td);
-	cpu = sched_pickcpu(ts, flags);
+	cpu = sched_pickcpu(td, flags);
 	tdq = sched_setcpu(td, cpu, flags);
 	tdq_add(tdq, td, flags);
 	if (cpu != PCPU_GET(cpuid)) {
-		tdq_notify(tdq, ts);
+		tdq_notify(tdq, td);
 		return;
 	}
 #else
@@ -2286,19 +2245,17 @@
 sched_rem(struct thread *td)
 {
 	struct tdq *tdq;
-	struct td_sched *ts;
 
 	CTR5(KTR_SCHED, "sched_rem: %p(%s) prio %d by %p(%s)",
 	    td, td->td_name, td->td_priority, curthread,
 	    curthread->td_name);
-	ts = TD_TO_TS(td);
-	tdq = TDQ_CPU(ts->ts_cpu);
+	tdq = TDQ_CPU(TD_TO_TS(td)->ts_cpu);
 	TDQ_LOCK_ASSERT(tdq, MA_OWNED);
 	MPASS(td->td_lock == TDQ_LOCKPTR(tdq));
 	KASSERT(TD_ON_RUNQ(td),
 	    ("sched_rem: thread not on run queue"));
-	tdq_runq_rem(tdq, ts);
-	tdq_load_rem(tdq, ts);
+	tdq_runq_rem(tdq, td);
+	tdq_load_rem(tdq, td);
 	TD_SET_CAN_RUN(td);
 	if (td->td_priority == tdq->tdq_lowpri)
 		tdq_setlowpri(tdq, NULL);
@@ -2358,7 +2315,7 @@
 	 * an ipi to force the issue.
 	 */
 	cpu = ts->ts_cpu;
-	ts->ts_cpu = sched_pickcpu(ts, 0);
+	ts->ts_cpu = sched_pickcpu(td, 0);
 	if (cpu != PCPU_GET(cpuid))
 		ipi_selected(1 << cpu, IPI_PREEMPT);
 #endif
@@ -2500,7 +2457,7 @@
 		spinlock_exit();
 	} else {
 		MPASS(td->td_lock == TDQ_LOCKPTR(tdq));
-		tdq_load_rem(tdq, TD_TO_TS(td));
+		tdq_load_rem(tdq, td);
 		lock_profile_release_lock(&TDQ_LOCKPTR(tdq)->lock_object);
 	}
 	KASSERT(curthread->td_md.md_spinlock_count == 1, ("invalid count"));
@@ -2536,12 +2493,9 @@
 	TDQ_LOCK_ASSERT(tdq, MA_OWNED | MA_NOTRECURSED);
 	lock_profile_obtain_lock_success(
 	    &TDQ_LOCKPTR(tdq)->lock_object, 0, 0, __FILE__, __LINE__);
-	tdq->tdq_lowpri = td->td_priority;
 }
 
-
-static SYSCTL_NODE(_kern, OID_AUTO, sched, CTLFLAG_RW, 0,
-    "Scheduler");
+SYSCTL_NODE(_kern, OID_AUTO, sched, CTLFLAG_RW, 0, "Scheduler");
 SYSCTL_STRING(_kern_sched, OID_AUTO, name, CTLFLAG_RD, "ULE", 0,
     "Scheduler name");
 SYSCTL_INT(_kern_sched, OID_AUTO, slice, CTLFLAG_RW, &sched_slice, 0,

From owner-p4-projects@FreeBSD.ORG  Wed Mar 26 18:19:47 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 32A001065677; Wed, 26 Mar 2008 18:19: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 E66001065675
	for ; Wed, 26 Mar 2008 18:19: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 DC5A18FC20
	for ; Wed, 26 Mar 2008 18:19:46 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2QIJkHO074752
	for ; Wed, 26 Mar 2008 18:19:46 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2QIJkr6074750
	for perforce@freebsd.org; Wed, 26 Mar 2008 18:19:46 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 26 Mar 2008 18:19:46 GMT
Message-Id: <200803261819.m2QIJkr6074750@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 138639 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 26 Mar 2008 18:19:47 -0000

http://perforce.freebsd.org/chv.cgi?CH=138639

Change 138639 by sam@sam_ebb on 2008/03/26 18:18:59

	add a null getradiocaps callback

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_regdomain.c#11 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_regdomain.c#11 (text+ko) ====

@@ -43,6 +43,15 @@
 #include 
 #include 
 
+static void
+null_getradiocaps(struct ieee80211com *ic, int *n, struct ieee80211_channel *c)
+{
+	/* just feed back the current channel list */
+	*n = ic->ic_nchans;
+	memcpy(c, ic->ic_channels,
+	    ic->ic_nchans*sizeof(struct ieee80211_channel));
+}
+
 static int
 null_setregdomain(struct ieee80211com *ic,
 	struct ieee80211_regdomain *rd,
@@ -62,6 +71,7 @@
 		ic->ic_regdomain.isocc[1] = 'S';		/* XXX */
 		/* XXX? too late to setup default channel list */
 	}
+	ic->ic_getradiocaps = null_getradiocaps;
 	ic->ic_setregdomain = null_setregdomain;
 }
 

From owner-p4-projects@FreeBSD.ORG  Wed Mar 26 19:16:56 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3576F1065677; Wed, 26 Mar 2008 19:16:56 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E7913106564A
	for ; Wed, 26 Mar 2008 19:16:55 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id DA5238FC2B
	for ; Wed, 26 Mar 2008 19:16:55 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2QJGtr3078634
	for ; Wed, 26 Mar 2008 19:16:55 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2QJGt4O078632
	for perforce@freebsd.org; Wed, 26 Mar 2008 19:16:55 GMT
	(envelope-from imp@freebsd.org)
Date: Wed, 26 Mar 2008 19:16:55 GMT
Message-Id: <200803261916.m2QJGt4O078632@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138647 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 26 Mar 2008 19:16:56 -0000

http://perforce.freebsd.org/chv.cgi?CH=138647

Change 138647 by imp@imp_paco-paco on 2008/03/26 19:16:25

	IFC @138642

Affected files ...

.. //depot/projects/arm/src/Makefile#17 integrate
.. //depot/projects/arm/src/ObsoleteFiles.inc#34 integrate
.. //depot/projects/arm/src/bin/sh/options.c#2 integrate
.. //depot/projects/arm/src/contrib/hostapd/ChangeLog#3 integrate
.. //depot/projects/arm/src/contrib/hostapd/Makefile#3 integrate
.. //depot/projects/arm/src/contrib/hostapd/README#3 integrate
.. //depot/projects/arm/src/contrib/hostapd/aes_wrap.c#3 integrate
.. //depot/projects/arm/src/contrib/hostapd/aes_wrap.h#3 integrate
.. //depot/projects/arm/src/contrib/hostapd/common.c#3 integrate
.. //depot/projects/arm/src/contrib/hostapd/common.h#3 integrate
.. //depot/projects/arm/src/contrib/hostapd/defconfig#3 integrate
.. //depot/projects/arm/src/contrib/hostapd/driver.h#3 integrate
.. //depot/projects/arm/src/contrib/hostapd/driver_test.c#3 integrate
.. //depot/projects/arm/src/contrib/hostapd/eap_aka.c#2 integrate
.. //depot/projects/arm/src/contrib/hostapd/eap_gpsk.c#2 integrate
.. //depot/projects/arm/src/contrib/hostapd/eap_gpsk_common.c#2 integrate
.. //depot/projects/arm/src/contrib/hostapd/eap_gpsk_common.h#2 integrate
.. //depot/projects/arm/src/contrib/hostapd/eap_sim.c#3 integrate
.. //depot/projects/arm/src/contrib/hostapd/eap_sim_common.c#3 integrate
.. //depot/projects/arm/src/contrib/hostapd/eap_sim_db.c#3 integrate
.. //depot/projects/arm/src/contrib/hostapd/eap_tls_common.c#3 integrate
.. //depot/projects/arm/src/contrib/hostapd/eapol_version.patch#2 delete
.. //depot/projects/arm/src/contrib/hostapd/hostapd.c#3 integrate
.. //depot/projects/arm/src/contrib/hostapd/hostapd.conf#3 integrate
.. //depot/projects/arm/src/contrib/hostapd/ieee802_11.c#3 integrate
.. //depot/projects/arm/src/contrib/hostapd/ieee802_11_auth.c#3 integrate
.. //depot/projects/arm/src/contrib/hostapd/ieee802_1x.c#3 integrate
.. //depot/projects/arm/src/contrib/hostapd/madwifi.conf#2 integrate
.. //depot/projects/arm/src/contrib/hostapd/os.h#2 integrate
.. //depot/projects/arm/src/contrib/hostapd/os_unix.c#2 integrate
.. //depot/projects/arm/src/contrib/hostapd/radius.c#3 integrate
.. //depot/projects/arm/src/contrib/hostapd/radius.h#3 integrate
.. //depot/projects/arm/src/contrib/hostapd/radius_client.c#3 integrate
.. //depot/projects/arm/src/contrib/hostapd/radius_server.c#3 integrate
.. //depot/projects/arm/src/contrib/hostapd/tls_openssl.c#3 integrate
.. //depot/projects/arm/src/contrib/hostapd/version.h#3 integrate
.. //depot/projects/arm/src/contrib/hostapd/wpa.c#3 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/ChangeLog#3 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/FREEBSD-Xlist#3 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/FREEBSD-upgrade#3 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/Makefile#3 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/README#3 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/aes_wrap.c#3 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/aes_wrap.h#3 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/asn1.c#2 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/common.c#3 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/common.h#3 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/config.c#3 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/config_ssid.h#3 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/config_winreg.c#2 delete
.. //depot/projects/arm/src/contrib/wpa_supplicant/ctrl_iface.c#3 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/ctrl_iface_dbus.c#2 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.c#2 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.h#2 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/ctrl_iface_named_pipe.c#2 delete
.. //depot/projects/arm/src/contrib/wpa_supplicant/ctrl_iface_unix.c#2 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/dbus-wpa_supplicant.conf#2 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/dbus-wpa_supplicant.service#1 branch
.. //depot/projects/arm/src/contrib/wpa_supplicant/defconfig#3 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/doc/ctrl_iface.doxygen#3 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/doc/docbook/wpa_background.8#3 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/doc/docbook/wpa_cli.8#3 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/doc/docbook/wpa_cli.sgml#3 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.8#3 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.8#3 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5#3 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.sgml#3 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/driver_hostap.h#3 delete
.. //depot/projects/arm/src/contrib/wpa_supplicant/driver_ndis.c#3 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/eap_gpsk.c#2 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/eap_gpsk_common.c#2 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/eap_gpsk_common.h#2 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/eap_peap.c#3 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/eap_sim.c#3 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/eap_sim_common.c#3 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/eap_tlv.c#3 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/eap_tlv.h#3 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/eapol_sm.c#3 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/eapol_test.c#3 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/eloop_win.c#2 delete
.. //depot/projects/arm/src/contrib/wpa_supplicant/events.c#3 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/main.c#4 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/os.h#2 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/os_unix.c#2 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/pcsc_funcs.c#3 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/radius.c#3 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/radius.h#3 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/radius_client.c#3 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/tests/test_aes.c#1 branch
.. //depot/projects/arm/src/contrib/wpa_supplicant/tests/test_eap_sim_common.c#1 branch
.. //depot/projects/arm/src/contrib/wpa_supplicant/tests/test_md4.c#1 branch
.. //depot/projects/arm/src/contrib/wpa_supplicant/tests/test_md5.c#1 branch
.. //depot/projects/arm/src/contrib/wpa_supplicant/tests/test_ms_funcs.c#1 branch
.. //depot/projects/arm/src/contrib/wpa_supplicant/tests/test_sha1.c#1 branch
.. //depot/projects/arm/src/contrib/wpa_supplicant/tests/test_sha256.c#1 branch
.. //depot/projects/arm/src/contrib/wpa_supplicant/tests/test_x509v3.c#1 branch
.. //depot/projects/arm/src/contrib/wpa_supplicant/tls_openssl.c#3 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/version.h#3 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/wpa.c#3 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/wpa_cli.c#3 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp#2 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.cpp#2 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h#3 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/wpa_gui/setup-mingw-cross-compiling#2 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h#3 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/wpa_supplicant.c#3 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/wpa_supplicant.conf#3 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/wpa_supplicant_i.h#3 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/x509v3.c#2 integrate
.. //depot/projects/arm/src/etc/freebsd-update.conf#3 integrate
.. //depot/projects/arm/src/etc/periodic/security/410.logincheck#2 integrate
.. //depot/projects/arm/src/include/pthread.h#3 integrate
.. //depot/projects/arm/src/include/time.h#2 integrate
.. //depot/projects/arm/src/lib/libarchive/Makefile#18 integrate
.. //depot/projects/arm/src/lib/libc/gen/lockf.c#2 integrate
.. //depot/projects/arm/src/lib/libc/include/namespace.h#3 integrate
.. //depot/projects/arm/src/lib/libc/include/un-namespace.h#3 integrate
.. //depot/projects/arm/src/lib/libc/sys/Symbol.map#8 integrate
.. //depot/projects/arm/src/lib/libc/sys/fcntl.2#4 integrate
.. //depot/projects/arm/src/lib/libc/yp/xdryp.c#2 integrate
.. //depot/projects/arm/src/lib/libc_r/uthread/uthread_sig.c#4 integrate
.. //depot/projects/arm/src/lib/libelf/libelf_convert.m4#4 integrate
.. //depot/projects/arm/src/lib/libkse/thread/thr_sig.c#4 integrate
.. //depot/projects/arm/src/lib/libthr/Makefile#11 integrate
.. //depot/projects/arm/src/lib/libthr/pthread.map#7 integrate
.. //depot/projects/arm/src/lib/libthr/thread/Makefile.inc#3 integrate
.. //depot/projects/arm/src/lib/libthr/thread/thr_attr.c#4 integrate
.. //depot/projects/arm/src/lib/libthr/thread/thr_exit.c#7 integrate
.. //depot/projects/arm/src/lib/libthr/thread/thr_getcpuclockid.c#1 branch
.. //depot/projects/arm/src/lib/libthr/thread/thr_mutex.c#9 integrate
.. //depot/projects/arm/src/lib/libthr/thread/thr_rtld.c#4 integrate
.. //depot/projects/arm/src/lib/libthread_db/Makefile#6 integrate
.. //depot/projects/arm/src/lib/libthread_db/kse.h#1 branch
.. //depot/projects/arm/src/lib/libthread_db/libc_r_db.c#2 integrate
.. //depot/projects/arm/src/lib/libthread_db/libpthread_db.c#2 integrate
.. //depot/projects/arm/src/lib/libthread_db/libthr_db.c#2 integrate
.. //depot/projects/arm/src/lib/libthread_db/thread_db.c#3 integrate
.. //depot/projects/arm/src/libexec/talkd/announce.c#2 integrate
.. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#27 integrate
.. //depot/projects/arm/src/sbin/bsdlabel/bsdlabel.c#4 integrate
.. //depot/projects/arm/src/sbin/devd/token.l#2 integrate
.. //depot/projects/arm/src/sbin/dhclient/dhclient.c#6 integrate
.. //depot/projects/arm/src/sbin/newfs/newfs.8#4 integrate
.. //depot/projects/arm/src/sbin/route/route.c#3 integrate
.. //depot/projects/arm/src/share/man/man4/bpf.4#3 integrate
.. //depot/projects/arm/src/share/man/man4/malo.4#1 branch
.. //depot/projects/arm/src/share/man/man7/security.7#3 integrate
.. //depot/projects/arm/src/share/man/man9/malloc.9#2 integrate
.. //depot/projects/arm/src/share/man/man9/mbchain.9#2 integrate
.. //depot/projects/arm/src/share/man/man9/mbuf.9#5 integrate
.. //depot/projects/arm/src/share/zoneinfo/asia#6 integrate
.. //depot/projects/arm/src/share/zoneinfo/backward#5 integrate
.. //depot/projects/arm/src/share/zoneinfo/northamerica#6 integrate
.. //depot/projects/arm/src/share/zoneinfo/southamerica#7 integrate
.. //depot/projects/arm/src/share/zoneinfo/zone.tab#6 integrate
.. //depot/projects/arm/src/sys/amd64/amd64/cpu_switch.S#9 integrate
.. //depot/projects/arm/src/sys/amd64/amd64/genassym.c#11 integrate
.. //depot/projects/arm/src/sys/amd64/amd64/pmap.c#39 integrate
.. //depot/projects/arm/src/sys/amd64/amd64/prof_machdep.c#7 integrate
.. //depot/projects/arm/src/sys/amd64/conf/NOTES#20 integrate
.. //depot/projects/arm/src/sys/amd64/ia32/ia32_signal.c#6 integrate
.. //depot/projects/arm/src/sys/amd64/include/clock.h#7 integrate
.. //depot/projects/arm/src/sys/amd64/include/pcb.h#4 integrate
.. //depot/projects/arm/src/sys/amd64/isa/clock.c#17 integrate
.. //depot/projects/arm/src/sys/arm/arm/elf_trampoline.c#17 integrate
.. //depot/projects/arm/src/sys/arm/conf/AVILA.hints#3 integrate
.. //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npe.c#32 integrate
.. //depot/projects/arm/src/sys/boot/i386/cdboot/cdboot.s#5 integrate
.. //depot/projects/arm/src/sys/boot/pc98/cdboot/cdboot.s#4 integrate
.. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_proto.h#26 integrate
.. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscall.h#26 integrate
.. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscalls.c#26 integrate
.. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_sysent.c#26 integrate
.. //depot/projects/arm/src/sys/compat/freebsd32/syscalls.master#27 integrate
.. //depot/projects/arm/src/sys/compat/linux/linux_file.c#16 integrate
.. //depot/projects/arm/src/sys/compat/linux/linux_misc.c#31 integrate
.. //depot/projects/arm/src/sys/compat/svr4/svr4_fcntl.c#9 integrate
.. //depot/projects/arm/src/sys/conf/NOTES#60 integrate
.. //depot/projects/arm/src/sys/conf/files#86 integrate
.. //depot/projects/arm/src/sys/conf/options#56 integrate
.. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#9 integrate
.. //depot/projects/arm/src/sys/ddb/db_command.c#12 integrate
.. //depot/projects/arm/src/sys/ddb/db_ps.c#9 integrate
.. //depot/projects/arm/src/sys/ddb/ddb.h#7 integrate
.. //depot/projects/arm/src/sys/dev/aac/aac.c#11 integrate
.. //depot/projects/arm/src/sys/dev/aac/aac_cam.c#9 integrate
.. //depot/projects/arm/src/sys/dev/aac/aac_debug.c#4 integrate
.. //depot/projects/arm/src/sys/dev/aac/aac_disk.c#3 integrate
.. //depot/projects/arm/src/sys/dev/aac/aac_pci.c#10 integrate
.. //depot/projects/arm/src/sys/dev/aac/aacreg.h#4 integrate
.. //depot/projects/arm/src/sys/dev/aac/aacvar.h#5 integrate
.. //depot/projects/arm/src/sys/dev/ath/if_ath.c#35 integrate
.. //depot/projects/arm/src/sys/dev/cxgb/cxgb_offload.h#7 integrate
.. //depot/projects/arm/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#3 integrate
.. //depot/projects/arm/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#3 integrate
.. //depot/projects/arm/src/sys/dev/dc/if_dc.c#16 integrate
.. //depot/projects/arm/src/sys/dev/dc/if_dcreg.h#9 integrate
.. //depot/projects/arm/src/sys/dev/drm/drm_pciids.h#8 integrate
.. //depot/projects/arm/src/sys/dev/drm/i915_dma.c#7 integrate
.. //depot/projects/arm/src/sys/dev/en/midway.c#7 integrate
.. //depot/projects/arm/src/sys/dev/fatm/if_fatm.c#6 integrate
.. //depot/projects/arm/src/sys/dev/firewire/if_fwe.c#5 integrate
.. //depot/projects/arm/src/sys/dev/firewire/if_fwip.c#7 integrate
.. //depot/projects/arm/src/sys/dev/fxp/if_fxp.c#19 integrate
.. //depot/projects/arm/src/sys/dev/gem/if_gem.c#14 integrate
.. //depot/projects/arm/src/sys/dev/gem/if_gem_pci.c#8 integrate
.. //depot/projects/arm/src/sys/dev/gem/if_gemreg.h#5 integrate
.. //depot/projects/arm/src/sys/dev/gem/if_gemvar.h#8 integrate
.. //depot/projects/arm/src/sys/dev/iscsi/initiator/isc_soc.c#4 integrate
.. //depot/projects/arm/src/sys/dev/malo/if_malo.c#1 branch
.. //depot/projects/arm/src/sys/dev/malo/if_malo.h#1 branch
.. //depot/projects/arm/src/sys/dev/malo/if_malo_pci.c#1 branch
.. //depot/projects/arm/src/sys/dev/malo/if_malohal.c#1 branch
.. //depot/projects/arm/src/sys/dev/malo/if_malohal.h#1 branch
.. //depot/projects/arm/src/sys/dev/malo/if_maloioctl.h#1 branch
.. //depot/projects/arm/src/sys/dev/mfi/mfi.c#21 integrate
.. //depot/projects/arm/src/sys/dev/re/if_re.c#31 integrate
.. //depot/projects/arm/src/sys/dev/speaker/spkr.c#3 integrate
.. //depot/projects/arm/src/sys/dev/ti/if_ti.c#10 integrate
.. //depot/projects/arm/src/sys/dev/usb/ucom.c#9 integrate
.. //depot/projects/arm/src/sys/dev/usb/ucomvar.h#4 integrate
.. //depot/projects/arm/src/sys/dev/usb/usbdevs#43 integrate
.. //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_vfsops.c#24 integrate
.. //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_vnops.c#16 integrate
.. //depot/projects/arm/src/sys/fs/tmpfs/tmpfs_vnops.c#7 integrate
.. //depot/projects/arm/src/sys/geom/geom.h#9 integrate
.. //depot/projects/arm/src/sys/geom/geom_subr.c#7 integrate
.. //depot/projects/arm/src/sys/geom/part/g_part.c#9 integrate
.. //depot/projects/arm/src/sys/geom/part/g_part.h#6 integrate
.. //depot/projects/arm/src/sys/geom/part/g_part_apm.c#5 integrate
.. //depot/projects/arm/src/sys/geom/part/g_part_bsd.c#2 integrate
.. //depot/projects/arm/src/sys/geom/part/g_part_gpt.c#5 integrate
.. //depot/projects/arm/src/sys/geom/part/g_part_mbr.c#3 integrate
.. //depot/projects/arm/src/sys/geom/part/g_part_vtoc8.c#2 integrate
.. //depot/projects/arm/src/sys/i386/conf/NOTES#28 integrate
.. //depot/projects/arm/src/sys/i386/i386/pmap.c#37 integrate
.. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_fcntl.c#2 integrate
.. //depot/projects/arm/src/sys/i386/include/clock.h#9 integrate
.. //depot/projects/arm/src/sys/i386/include/vmparam.h#8 integrate
.. //depot/projects/arm/src/sys/i386/isa/clock.c#17 integrate
.. //depot/projects/arm/src/sys/i386/isa/prof_machdep.c#7 integrate
.. //depot/projects/arm/src/sys/i386/isa/vesa.c#6 integrate
.. //depot/projects/arm/src/sys/isa/syscons_isa.c#5 integrate
.. //depot/projects/arm/src/sys/kern/init_sysent.c#26 integrate
.. //depot/projects/arm/src/sys/kern/kern_cpuset.c#3 integrate
.. //depot/projects/arm/src/sys/kern/kern_descrip.c#29 integrate
.. //depot/projects/arm/src/sys/kern/kern_exit.c#29 integrate
.. //depot/projects/arm/src/sys/kern/kern_lockf.c#8 integrate
.. //depot/projects/arm/src/sys/kern/kern_sig.c#30 integrate
.. //depot/projects/arm/src/sys/kern/kern_thr.c#21 integrate
.. //depot/projects/arm/src/sys/kern/kern_thread.c#26 integrate
.. //depot/projects/arm/src/sys/kern/kern_timeout.c#10 integrate
.. //depot/projects/arm/src/sys/kern/makesyscalls.sh#8 integrate
.. //depot/projects/arm/src/sys/kern/subr_mchain.c#3 integrate
.. //depot/projects/arm/src/sys/kern/subr_sleepqueue.c#20 integrate
.. //depot/projects/arm/src/sys/kern/subr_taskqueue.c#11 integrate
.. //depot/projects/arm/src/sys/kern/subr_trap.c#15 integrate
.. //depot/projects/arm/src/sys/kern/syscalls.c#26 integrate
.. //depot/projects/arm/src/sys/kern/syscalls.master#29 integrate
.. //depot/projects/arm/src/sys/kern/systrace_args.c#14 integrate
.. //depot/projects/arm/src/sys/kern/uipc_mbuf.c#22 integrate
.. //depot/projects/arm/src/sys/kern/uipc_socket.c#42 integrate
.. //depot/projects/arm/src/sys/kern/uipc_syscalls.c#31 integrate
.. //depot/projects/arm/src/sys/kern/vfs_bio.c#27 integrate
.. //depot/projects/arm/src/sys/kern/vfs_cluster.c#9 integrate
.. //depot/projects/arm/src/sys/kern/vfs_default.c#15 integrate
.. //depot/projects/arm/src/sys/kern/vfs_mount.c#36 integrate
.. //depot/projects/arm/src/sys/kern/vfs_subr.c#43 integrate
.. //depot/projects/arm/src/sys/kern/vfs_vnops.c#19 integrate
.. //depot/projects/arm/src/sys/kern/vnode_if.src#12 integrate
.. //depot/projects/arm/src/sys/modules/geom/geom_part/Makefile#2 integrate
.. //depot/projects/arm/src/sys/modules/geom/geom_part/geom_part_apm/Makefile#1 branch
.. //depot/projects/arm/src/sys/modules/geom/geom_part/geom_part_bsd/Makefile#1 branch
.. //depot/projects/arm/src/sys/modules/geom/geom_part/geom_part_gpt/Makefile#1 branch
.. //depot/projects/arm/src/sys/modules/geom/geom_part/geom_part_mbr/Makefile#1 branch
.. //depot/projects/arm/src/sys/modules/geom/geom_part/geom_part_vtoc8/Makefile#1 branch
.. //depot/projects/arm/src/sys/modules/malo/Makefile#1 branch
.. //depot/projects/arm/src/sys/net/bpf.c#26 integrate
.. //depot/projects/arm/src/sys/net/bpf.h#10 integrate
.. //depot/projects/arm/src/sys/net/bpf_buffer.c#1 branch
.. //depot/projects/arm/src/sys/net/bpf_buffer.h#1 branch
.. //depot/projects/arm/src/sys/net/bpf_zerocopy.c#1 branch
.. //depot/projects/arm/src/sys/net/bpf_zerocopy.h#1 branch
.. //depot/projects/arm/src/sys/net/bpfdesc.h#8 integrate
.. //depot/projects/arm/src/sys/net/if.c#26 integrate
.. //depot/projects/arm/src/sys/net/if_ef.c#5 integrate
.. //depot/projects/arm/src/sys/net/if_enc.c#6 integrate
.. //depot/projects/arm/src/sys/net/if_fddisubr.c#6 integrate
.. //depot/projects/arm/src/sys/net/if_iso88025subr.c#6 integrate
.. //depot/projects/arm/src/sys/net/if_loop.c#11 integrate
.. //depot/projects/arm/src/sys/net/if_media.h#11 integrate
.. //depot/projects/arm/src/sys/net/if_sl.c#5 integrate
.. //depot/projects/arm/src/sys/net/if_var.h#12 integrate
.. //depot/projects/arm/src/sys/net/raw_cb.c#4 integrate
.. //depot/projects/arm/src/sys/netatalk/aarp.c#7 integrate
.. //depot/projects/arm/src/sys/netatm/port.h#2 integrate
.. //depot/projects/arm/src/sys/netgraph/ng_pptpgre.c#4 integrate
.. //depot/projects/arm/src/sys/netgraph/ng_pptpgre.h#2 integrate
.. //depot/projects/arm/src/sys/netgraph/ng_tee.c#4 integrate
.. //depot/projects/arm/src/sys/netinet/in_pcb.c#28 integrate
.. //depot/projects/arm/src/sys/netinet/in_pcb.h#15 integrate
.. //depot/projects/arm/src/sys/netinet/ip_output.c#28 integrate
.. //depot/projects/arm/src/sys/netinet6/ip6_output.c#13 integrate
.. //depot/projects/arm/src/sys/netipsec/key.c#9 integrate
.. //depot/projects/arm/src/sys/netipsec/xform_tcp.c#3 integrate
.. //depot/projects/arm/src/sys/netncp/ncp_sock.c#7 integrate
.. //depot/projects/arm/src/sys/netsmb/smb_iod.c#5 integrate
.. //depot/projects/arm/src/sys/netsmb/smb_rq.c#3 integrate
.. //depot/projects/arm/src/sys/netsmb/smb_trantcp.c#7 integrate
.. //depot/projects/arm/src/sys/nfs/nfs_common.c#3 integrate
.. //depot/projects/arm/src/sys/nfs4client/nfs4_vfsops.c#12 integrate
.. //depot/projects/arm/src/sys/nfs4client/nfs4_vnops.c#11 integrate
.. //depot/projects/arm/src/sys/nfsclient/krpc_subr.c#4 integrate
.. //depot/projects/arm/src/sys/nfsclient/nfs_lock.c#6 integrate
.. //depot/projects/arm/src/sys/nfsclient/nfs_socket.c#23 integrate
.. //depot/projects/arm/src/sys/nfsclient/nfs_subs.c#12 integrate
.. //depot/projects/arm/src/sys/nfsclient/nfs_vfsops.c#20 integrate
.. //depot/projects/arm/src/sys/nfsclient/nfs_vnops.c#20 integrate
.. //depot/projects/arm/src/sys/nfsserver/nfs_serv.c#19 integrate
.. //depot/projects/arm/src/sys/nfsserver/nfs_srvcache.c#5 integrate
.. //depot/projects/arm/src/sys/nfsserver/nfs_srvsock.c#14 integrate
.. //depot/projects/arm/src/sys/nfsserver/nfs_srvsubs.c#15 integrate
.. //depot/projects/arm/src/sys/nfsserver/nfs_syscalls.c#14 integrate
.. //depot/projects/arm/src/sys/nlm/nlm.h#1 branch
.. //depot/projects/arm/src/sys/nlm/nlm_prot.h#1 branch
.. //depot/projects/arm/src/sys/nlm/nlm_prot_clnt.c#1 branch
.. //depot/projects/arm/src/sys/nlm/nlm_prot_impl.c#1 branch
.. //depot/projects/arm/src/sys/nlm/nlm_prot_server.c#1 branch
.. //depot/projects/arm/src/sys/nlm/nlm_prot_svc.c#1 branch
.. //depot/projects/arm/src/sys/nlm/nlm_prot_xdr.c#1 branch
.. //depot/projects/arm/src/sys/nlm/sm_inter.h#1 branch
.. //depot/projects/arm/src/sys/nlm/sm_inter_xdr.c#1 branch
.. //depot/projects/arm/src/sys/pc98/cbus/clock.c#9 integrate
.. //depot/projects/arm/src/sys/pc98/cbus/syscons_cbus.c#4 integrate
.. //depot/projects/arm/src/sys/pc98/conf/NOTES#16 integrate
.. //depot/projects/arm/src/sys/pci/if_mn.c#5 integrate
.. //depot/projects/arm/src/sys/pci/if_rlreg.h#15 integrate
.. //depot/projects/arm/src/sys/pci/if_xl.c#14 integrate
.. //depot/projects/arm/src/sys/pci/if_xlreg.h#5 integrate
.. //depot/projects/arm/src/sys/rpc/auth.h#1 branch
.. //depot/projects/arm/src/sys/rpc/auth_none.c#1 branch
.. //depot/projects/arm/src/sys/rpc/auth_unix.c#1 branch
.. //depot/projects/arm/src/sys/rpc/authunix_prot.c#1 branch
.. //depot/projects/arm/src/sys/rpc/clnt.h#1 branch
.. //depot/projects/arm/src/sys/rpc/clnt_dg.c#1 branch
.. //depot/projects/arm/src/sys/rpc/clnt_rc.c#1 branch
.. //depot/projects/arm/src/sys/rpc/clnt_stat.h#1 branch
.. //depot/projects/arm/src/sys/rpc/clnt_vc.c#1 branch
.. //depot/projects/arm/src/sys/rpc/getnetconfig.c#1 branch
.. //depot/projects/arm/src/sys/rpc/inet_ntop.c#1 branch
.. //depot/projects/arm/src/sys/rpc/inet_pton.c#1 branch
.. //depot/projects/arm/src/sys/rpc/netconfig.h#1 branch
.. //depot/projects/arm/src/sys/rpc/nettype.h#1 branch
.. //depot/projects/arm/src/sys/rpc/pmap_prot.h#1 branch
.. //depot/projects/arm/src/sys/rpc/rpc.h#1 branch
.. //depot/projects/arm/src/sys/rpc/rpc_callmsg.c#1 branch
.. //depot/projects/arm/src/sys/rpc/rpc_com.h#1 branch
.. //depot/projects/arm/src/sys/rpc/rpc_generic.c#1 branch
.. //depot/projects/arm/src/sys/rpc/rpc_msg.h#1 branch
.. //depot/projects/arm/src/sys/rpc/rpc_prot.c#1 branch
.. //depot/projects/arm/src/sys/rpc/rpcb_clnt.c#1 branch
.. //depot/projects/arm/src/sys/rpc/rpcb_clnt.h#1 branch
.. //depot/projects/arm/src/sys/rpc/rpcb_prot.c#1 branch
.. //depot/projects/arm/src/sys/rpc/rpcb_prot.h#1 branch
.. //depot/projects/arm/src/sys/rpc/rpcclnt.c#8 integrate
.. //depot/projects/arm/src/sys/rpc/svc.c#1 branch
.. //depot/projects/arm/src/sys/rpc/svc.h#1 branch
.. //depot/projects/arm/src/sys/rpc/svc_auth.c#1 branch
.. //depot/projects/arm/src/sys/rpc/svc_auth.h#1 branch
.. //depot/projects/arm/src/sys/rpc/svc_auth_unix.c#1 branch
.. //depot/projects/arm/src/sys/rpc/svc_dg.c#1 branch
.. //depot/projects/arm/src/sys/rpc/svc_generic.c#1 branch
.. //depot/projects/arm/src/sys/rpc/svc_vc.c#1 branch
.. //depot/projects/arm/src/sys/rpc/types.h#2 integrate
.. //depot/projects/arm/src/sys/rpc/xdr.h#1 branch
.. //depot/projects/arm/src/sys/sparc64/include/bus.h#7 integrate
.. //depot/projects/arm/src/sys/sparc64/sparc64/bus_machdep.c#5 integrate
.. //depot/projects/arm/src/sys/sun4v/include/cpu.h#2 integrate
.. //depot/projects/arm/src/sys/sys/buf.h#11 integrate
.. //depot/projects/arm/src/sys/sys/bufobj.h#8 integrate
.. //depot/projects/arm/src/sys/sys/cdefs.h#9 integrate
.. //depot/projects/arm/src/sys/sys/cpuset.h#3 integrate
.. //depot/projects/arm/src/sys/sys/fcntl.h#4 integrate
.. //depot/projects/arm/src/sys/sys/lockf.h#4 integrate
.. //depot/projects/arm/src/sys/sys/mbuf.h#27 integrate
.. //depot/projects/arm/src/sys/sys/param.h#42 integrate
.. //depot/projects/arm/src/sys/sys/proc.h#36 integrate
.. //depot/projects/arm/src/sys/sys/syscall.h#26 integrate
.. //depot/projects/arm/src/sys/sys/syscall.mk#26 integrate
.. //depot/projects/arm/src/sys/sys/sysproto.h#27 integrate
.. //depot/projects/arm/src/sys/sys/taskqueue.h#5 integrate
.. //depot/projects/arm/src/sys/sys/vnode.h#23 integrate
.. //depot/projects/arm/src/sys/ufs/ffs/ffs_inode.c#8 integrate
.. //depot/projects/arm/src/sys/ufs/ffs/ffs_rawread.c#8 integrate
.. //depot/projects/arm/src/sys/ufs/ffs/ffs_softdep.c#25 integrate
.. //depot/projects/arm/src/sys/ufs/ffs/ffs_vfsops.c#30 integrate
.. //depot/projects/arm/src/sys/ufs/ffs/ffs_vnops.c#16 integrate
.. //depot/projects/arm/src/sys/ufs/ufs/ufs_vnops.c#20 integrate
.. //depot/projects/arm/src/sys/xdr/xdr.c#1 branch
.. //depot/projects/arm/src/sys/xdr/xdr_array.c#1 branch
.. //depot/projects/arm/src/sys/xdr/xdr_mbuf.c#1 branch
.. //depot/projects/arm/src/sys/xdr/xdr_mem.c#1 branch
.. //depot/projects/arm/src/sys/xdr/xdr_reference.c#1 branch
.. //depot/projects/arm/src/sys/xdr/xdr_sizeof.c#1 branch
.. //depot/projects/arm/src/tools/build/mk/OptionalObsoleteFiles.inc#12 integrate
.. //depot/projects/arm/src/tools/regression/bin/sh/builtins/getopts1.0#1 branch
.. //depot/projects/arm/src/tools/regression/bin/sh/builtins/getopts1.0.stdout#1 branch
.. //depot/projects/arm/src/tools/regression/file/flock/Makefile#1 branch
.. //depot/projects/arm/src/tools/regression/file/flock/flock.c#1 branch
.. //depot/projects/arm/src/tools/tools/net80211/wlanwatch/wlanwatch.c#3 integrate
.. //depot/projects/arm/src/usr.bin/checknr/checknr.c#2 integrate
.. //depot/projects/arm/src/usr.bin/make/for.c#2 integrate
.. //depot/projects/arm/src/usr.bin/make/make.1#8 integrate
.. //depot/projects/arm/src/usr.bin/netstat/bpf.c#7 integrate
.. //depot/projects/arm/src/usr.bin/xlint/lint1/lint1.h#2 integrate
.. //depot/projects/arm/src/usr.sbin/Makefile#19 integrate
.. //depot/projects/arm/src/usr.sbin/arp/arp.8#4 integrate
.. //depot/projects/arm/src/usr.sbin/clear_locks/Makefile#1 branch
.. //depot/projects/arm/src/usr.sbin/clear_locks/clear_locks.8#1 branch
.. //depot/projects/arm/src/usr.sbin/clear_locks/clear_locks.c#1 branch
.. //depot/projects/arm/src/usr.sbin/freebsd-update/freebsd-update.sh#10 integrate
.. //depot/projects/arm/src/usr.sbin/rpc.lockd/lockd.c#5 integrate
.. //depot/projects/arm/src/usr.sbin/rpc.lockd/rpc.lockd.8#4 integrate
.. //depot/projects/arm/src/usr.sbin/wpa/wpa_supplicant/Makefile#6 integrate
.. //depot/projects/arm/src/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8#4 integrate

Differences ...

==== //depot/projects/arm/src/Makefile#17 (text+ko) ====

@@ -1,6 +1,6 @@
 #OSX hint: bsdmake BSDMKAE=bsdmake MACHINE_ARCH=i386
 #
-# $FreeBSD: src/Makefile,v 1.345 2008/01/30 19:33:18 jhb Exp $
+# $FreeBSD: src/Makefile,v 1.346 2008/03/25 15:47:22 ru Exp $
 #
 # The user-driven targets are:
 #
@@ -175,6 +175,10 @@
 .MAIN:	all
 
 STARTTIME!= LC_ALL=C date
+CHECK_TIME!= find ${.CURDIR}/sys/sys/param.h -mtime -0
+.if !empty(CHECK_TIME)
+.error check your date/time: ${STARTTIME}
+.endif
 
 .if defined(HISTORICAL_MAKE_WORLD) || defined(DESTDIR)
 #

==== //depot/projects/arm/src/ObsoleteFiles.inc#34 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.133 2008/03/13 18:17:46 brueffer Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.134 2008/03/26 06:45:28 remko Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -1103,6 +1103,9 @@
 OLD_FILES+=usr/sbin/ntptimeset
 OLD_FILES+=usr/share/man/man8/kernbb.8.gz
 OLD_FILES+=usr/share/man/man8/ntp-genkeys.8.gz
+# 20040627: usbdevs.h and usbdevs_data.h removal
+OLD_FILES+=usr/include/dev/usb/usbdevs.h
+OLD_FILES+=usr/include/dev/usb/usbdevs_data.h
 # 200406XX
 OLD_FILES+=usr/bin/gasp
 OLD_FILES+=usr/bin/gdbreplay
@@ -3551,8 +3554,6 @@
 OLD_FILES+=usr/bin/hesinfo
 OLD_FILES+=usr/include/c++/3.4/ext/demangle.h
 OLD_FILES+=usr/include/cam/cam_extend.h
-OLD_FILES+=usr/include/dev/usb/usbdevs.h
-OLD_FILES+=usr/include/dev/usb/usbdevs_data.h
 OLD_FILES+=usr/include/dev/wi/wi_hostap.h
 OLD_FILES+=usr/include/disktab.h
 OLD_FILES+=usr/include/g++/FlexLexer.h

==== //depot/projects/arm/src/bin/sh/options.c#2 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include 
-__FBSDID("$FreeBSD: src/bin/sh/options.c,v 1.25 2006/04/09 12:20:42 stefanf Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/options.c,v 1.26 2008/03/22 14:06:01 stefanf Exp $");
 
 #include 
 #include 
@@ -383,7 +383,7 @@
 	}
 	ap2 = shellparam.p;
 	while ((*ap2++ = *ap1++) != NULL);
-	shellparam.optnext = NULL;
+	shellparam.reset = 1;
 	INTON;
 	return 0;
 }
@@ -405,6 +405,7 @@
 	if (*argptr != NULL) {
 		setparam(argptr);
 	}
+	shellparam.reset = 1;
 	INTON;
 	return 0;
 }
@@ -414,7 +415,6 @@
 getoptsreset(const char *value)
 {
 	if (number(value) == 1) {
-		shellparam.optnext = NULL;
 		shellparam.reset = 1;
 	}
 }

==== //depot/projects/arm/src/contrib/hostapd/ChangeLog#3 (text+ko) ====

@@ -1,5 +1,25 @@
 ChangeLog for hostapd
 
+2008-02-19 - v0.5.10
+	* fixed EAP-SIM and EAP-AKA message parser to validate attribute
+	  lengths properly to avoid potential crash caused by invalid messages
+	* fixed Reassociation Response callback processing when using internal
+	  MLME (driver_{hostap,devicescape,test}.c)
+	* fixed EAP-SIM/AKA realm processing to allow decorated usernames to
+	  be used
+	* added a workaround for EAP-SIM/AKA peers that include incorrect null
+	  termination in the username
+	* fixed EAP-SIM Start response processing for fast reauthentication
+	  case
+	* copy optional Proxy-State attributes into RADIUS response when acting
+	  as a RADIUS authentication server
+
+2007-12-02 - v0.5.9
+	* updated EAP Generalized Pre-Shared Key (EAP-GPSK) to use the latest
+	  draft (draft-ietf-emu-eap-gpsk-07.txt)
+	* fixed debugging code not to use potentially unaligned read to fetch
+	  IPv4 addresses
+
 2007-05-28 - v0.5.8
 	* updated driver_devicescape.c to build with the current
 	  wireless-dev.git tree and net/d80211 changes

==== //depot/projects/arm/src/contrib/hostapd/Makefile#3 (text+ko) ====

@@ -313,6 +313,10 @@
 CFLAGS += -DCONFIG_IPV6
 endif
 
+ifdef CONFIG_DRIVER_RADIUS_ACL
+CFLAGS += -DCONFIG_DRIVER_RADIUS_ACL
+endif
+
 ifdef CONFIG_FULL_DYNAMIC_VLAN
 # define CONFIG_FULL_DYNAMIC_VLAN to have hostapd manipulate bridges
 # and vlan interfaces for the vlan feature.

==== //depot/projects/arm/src/contrib/hostapd/README#3 (text+ko) ====

@@ -2,7 +2,7 @@
 	  Authenticator and RADIUS authentication server
 ================================================================
 
-Copyright (c) 2002-2007, Jouni Malinen  and contributors
+Copyright (c) 2002-2008, Jouni Malinen  and contributors
 All Rights Reserved.
 
 This program is dual-licensed under both the GPL version 2 and BSD

==== //depot/projects/arm/src/contrib/hostapd/aes_wrap.c#3 (text+ko) ====

@@ -7,7 +7,7 @@
  * - AES-128 EAX mode encryption/decryption
  * - AES-128 CBC
  *
- * Copyright (c) 2003-2005, Jouni Malinen 
+ * Copyright (c) 2003-2007, Jouni Malinen 
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -34,10 +34,11 @@
 
 /**
  * aes_wrap - Wrap keys with AES Key Wrap Algorithm (128-bit KEK) (RFC3394)
- * @kek: Key encryption key (KEK)
- * @n: Length of the wrapped key in 64-bit units; e.g., 2 = 128-bit = 16 bytes
- * @plain: Plaintext key to be wrapped, n * 64 bit
- * @cipher: Wrapped key, (n + 1) * 64 bit
+ * @kek: 16-octet Key encryption key (KEK)
+ * @n: Length of the plaintext key in 64-bit units; e.g., 2 = 128-bit = 16
+ * bytes
+ * @plain: Plaintext key to be wrapped, n * 64 bits
+ * @cipher: Wrapped key, (n + 1) * 64 bits
  * Returns: 0 on success, -1 on failure
  */
 int aes_wrap(const u8 *kek, int n, const u8 *plain, u8 *cipher)
@@ -93,9 +94,10 @@
 /**
  * aes_unwrap - Unwrap key with AES Key Wrap Algorithm (128-bit KEK) (RFC3394)
  * @kek: Key encryption key (KEK)
- * @n: Length of the wrapped key in 64-bit units; e.g., 2 = 128-bit = 16 bytes
- * @cipher: Wrapped key to be unwrapped, (n + 1) * 64 bit
- * @plain: Plaintext key, n * 64 bit
+ * @n: Length of the plaintext key in 64-bit units; e.g., 2 = 128-bit = 16
+ * bytes
+ * @cipher: Wrapped key to be unwrapped, (n + 1) * 64 bits
+ * @plain: Plaintext key, n * 64 bits
  * Returns: 0 on success, -1 on failure (e.g., integrity verification failed)
  */
 int aes_unwrap(const u8 *kek, int n, const u8 *cipher, u8 *plain)
@@ -167,28 +169,45 @@
 
 
 /**
- * omac1_aes_128 - One-Key CBC MAC (OMAC1) hash with AES-128 (aka AES-CMAC)
+ * omac1_aes_128_vector - One-Key CBC MAC (OMAC1) hash with AES-128
  * @key: 128-bit key for the hash operation
- * @data: Data buffer for which a MAC is determined
- * @data: Length of data buffer in bytes
+ * @num_elem: Number of elements in the data vector
+ * @addr: Pointers to the data areas
+ * @len: Lengths of the data blocks
  * @mac: Buffer for MAC (128 bits, i.e., 16 bytes)
  * Returns: 0 on success, -1 on failure
  */
-int omac1_aes_128(const u8 *key, const u8 *data, size_t data_len, u8 *mac)
+int omac1_aes_128_vector(const u8 *key, size_t num_elem,
+			 const u8 *addr[], const size_t *len, u8 *mac)
 {
 	void *ctx;
 	u8 cbc[BLOCK_SIZE], pad[BLOCK_SIZE];
-	const u8 *pos = data;
-	size_t i, left = data_len;
+	const u8 *pos, *end;
+	size_t i, e, left, total_len;
 
 	ctx = aes_encrypt_init(key, 16);
 	if (ctx == NULL)
 		return -1;
 	os_memset(cbc, 0, BLOCK_SIZE);
 
+	total_len = 0;
+	for (e = 0; e < num_elem; e++)
+		total_len += len[e];
+	left = total_len;
+
+	e = 0;
+	pos = addr[0];
+	end = pos + len[0];
+
 	while (left >= BLOCK_SIZE) {
-		for (i = 0; i < BLOCK_SIZE; i++)
+		for (i = 0; i < BLOCK_SIZE; i++) {
 			cbc[i] ^= *pos++;
+			if (pos >= end) {
+				e++;
+				pos = addr[e];
+				end = pos + len[e];
+			}
+		}
 		if (left > BLOCK_SIZE)
 			aes_encrypt(ctx, cbc, cbc);
 		left -= BLOCK_SIZE;
@@ -198,9 +217,15 @@
 	aes_encrypt(ctx, pad, pad);
 	gf_mulx(pad);
 
-	if (left || data_len == 0) {
-		for (i = 0; i < left; i++)
+	if (left || total_len == 0) {
+		for (i = 0; i < left; i++) {
 			cbc[i] ^= *pos++;
+			if (pos >= end) {
+				e++;
+				pos = addr[e];
+				end = pos + len[e];
+			}
+		}
 		cbc[left] ^= 0x80;
 		gf_mulx(pad);
 	}
@@ -212,6 +237,24 @@
 	return 0;
 }
 
+
+/**
+ * omac1_aes_128 - One-Key CBC MAC (OMAC1) hash with AES-128 (aka AES-CMAC)
+ * @key: 128-bit key for the hash operation
+ * @data: Data buffer for which a MAC is determined
+ * @data_len: Length of data buffer in bytes
+ * @mac: Buffer for MAC (128 bits, i.e., 16 bytes)
+ * Returns: 0 on success, -1 on failure
+ *
+ * This is a mode for using block cipher (AES in this case) for authentication.
+ * OMAC1 was standardized with the name CMAC by NIST in a Special Publication
+ * (SP) 800-38B.
+ */
+int omac1_aes_128(const u8 *key, const u8 *data, size_t data_len, u8 *mac)
+{
+	return omac1_aes_128_vector(key, 1, &data, &data_len, mac);
+}
+
 #endif /* CONFIG_NO_AES_OMAC1 */
 
 

==== //depot/projects/arm/src/contrib/hostapd/aes_wrap.h#3 (text+ko) ====

@@ -7,7 +7,7 @@
  * - AES-128 EAX mode encryption/decryption
  * - AES-128 CBC
  *
- * Copyright (c) 2003-2005, Jouni Malinen 
+ * Copyright (c) 2003-2007, Jouni Malinen 
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -24,6 +24,8 @@
 
 int aes_wrap(const u8 *kek, int n, const u8 *plain, u8 *cipher);
 int aes_unwrap(const u8 *kek, int n, const u8 *cipher, u8 *plain);
+int omac1_aes_128_vector(const u8 *key, size_t num_elem,
+			 const u8 *addr[], const size_t *len, u8 *mac);
 int omac1_aes_128(const u8 *key, const u8 *data, size_t data_len, u8 *mac);
 int aes_128_encrypt_block(const u8 *key, const u8 *in, u8 *out);
 int aes_128_ctr_encrypt(const u8 *key, const u8 *nonce,

==== //depot/projects/arm/src/contrib/hostapd/common.c#3 (text+ko) ====

@@ -20,7 +20,6 @@
 #ifdef CONFIG_DEBUG_FILE
 static FILE *out_file = NULL;
 #endif /* CONFIG_DEBUG_FILE */
-int wpa_debug_use_file = 0;
 int wpa_debug_level = MSG_INFO;
 int wpa_debug_show_keys = 0;
 int wpa_debug_timestamp = 0;
@@ -344,32 +343,29 @@
 }
 
 
-int wpa_debug_open_file(void)
+int wpa_debug_open_file(const char *path)
 {
 #ifdef CONFIG_DEBUG_FILE
-	static int count = 0;
-	char fname[64];
-	if (!wpa_debug_use_file)
+	if (!path)
 		return 0;
-#ifdef _WIN32
-	os_snprintf(fname, sizeof(fname), "\\Temp\\wpa_supplicant-log-%d.txt",
-		    count++);
-#else /* _WIN32 */
-	os_snprintf(fname, sizeof(fname), "/tmp/wpa_supplicant-log-%d.txt",
-		    count++);
+	out_file = fopen(path, "a");
+	if (out_file == NULL) {
+		wpa_printf(MSG_ERROR, "wpa_debug_open_file: Failed to open "
+			   "output file, using standard output");
+		return -1;
+	}
+#ifndef _WIN32
+	setvbuf(out_file, NULL, _IOLBF, 0);
 #endif /* _WIN32 */
-	out_file = fopen(fname, "w");
-	return out_file == NULL ? -1 : 0;
-#else /* CONFIG_DEBUG_FILE */
+#endif /* CONFIG_DEBUG_FILE */
 	return 0;
-#endif /* CONFIG_DEBUG_FILE */
 }
 
 
 void wpa_debug_close_file(void)
 {
 #ifdef CONFIG_DEBUG_FILE
-	if (!wpa_debug_use_file)
+	if (!out_file)
 		return;
 	fclose(out_file);
 	out_file = NULL;

==== //depot/projects/arm/src/contrib/hostapd/common.h#3 (text+ko) ====

@@ -264,12 +264,12 @@
 #define wpa_hexdump_key(l,t,b,le) do { } while (0)
 #define wpa_hexdump_ascii(l,t,b,le) do { } while (0)
 #define wpa_hexdump_ascii_key(l,t,b,le) do { } while (0)
-#define wpa_debug_open_file() do { } while (0)
+#define wpa_debug_open_file(p) do { } while (0)
 #define wpa_debug_close_file() do { } while (0)
 
 #else /* CONFIG_NO_STDOUT_DEBUG */
 
-int wpa_debug_open_file(void);
+int wpa_debug_open_file(const char *path);
 void wpa_debug_close_file(void);
 
 /**

==== //depot/projects/arm/src/contrib/hostapd/defconfig#3 (text+ko) ====

@@ -102,3 +102,7 @@
 
 # Build IPv6 support for RADIUS operations
 CONFIG_IPV6=y
+
+# Use the hostapd's IEEE 802.11 authentication (ACL), but without
+# the IEEE 802.11 Management capability
+CONFIG_DRIVER_RADIUS_ACL=y

==== //depot/projects/arm/src/contrib/hostapd/driver.h#3 (text+ko) ====

@@ -141,6 +141,10 @@
 	 * this handler will be called after initial setup has been completed.
 	 */
 	int (*commit)(void *priv);
+
+	int (*set_radius_acl_auth)(void *priv, const u8 *mac, int accepted, 
+			u32 session_timeout);
+	int (*set_radius_acl_expire)(void *priv, const u8 *mac);
 };
 
 static inline int
@@ -653,4 +657,22 @@
 	return hapd->driver->commit(hapd->driver);
 }
 
+static inline int 
+hostapd_set_radius_acl_auth(struct hostapd_data *hapd, const u8 *mac, int accepted, 
+	u32 session_timeout)
+{
+	if (hapd->driver == NULL || hapd->driver->set_radius_acl_auth == NULL)
+		return 0;
+	return hapd->driver->set_radius_acl_auth(hapd->driver, mac, accepted,
+						 session_timeout);
+}
+
+static inline int 
+hostapd_set_radius_acl_expire(struct hostapd_data *hapd, const u8 *mac)
+{
+	if (hapd->driver == NULL || hapd->driver->set_radius_acl_expire == NULL)
+		return 0;
+	return hapd->driver->set_radius_acl_expire(hapd->driver, mac);
+}
+
 #endif /* DRIVER_H */

==== //depot/projects/arm/src/contrib/hostapd/driver_test.c#3 (text+ko) ====

@@ -170,9 +170,10 @@
 	u16 fc;
 
 	if (drv->test_socket < 0 || len < 10 || drv->socket_dir == NULL) {
-		wpa_printf(MSG_DEBUG, "%s: invalid parameters (sock=%d len=%d "
-			   "socket_dir=%p)",
-			   __func__, drv->test_socket, len, drv->socket_dir);
+		wpa_printf(MSG_DEBUG, "%s: invalid parameters (sock=%d len=%lu"
+			   " socket_dir=%p)",
+			   __func__, drv->test_socket, (unsigned long) len,
+			   drv->socket_dir);
 		return -1;
 	}
 

==== //depot/projects/arm/src/contrib/hostapd/eap_aka.c#2 (text+ko) ====

@@ -1,6 +1,6 @@
 /*
  * hostapd / EAP-AKA (RFC 4187)
- * Copyright (c) 2005-2007, Jouni Malinen 
+ * Copyright (c) 2005-2008, Jouni Malinen 
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -124,6 +124,14 @@
 				      sm->identity_len)) {
 		wpa_printf(MSG_DEBUG, "   AT_PERMANENT_ID_REQ");
 		eap_sim_msg_add(msg, EAP_SIM_AT_PERMANENT_ID_REQ, 0, NULL, 0);
+	} else {
+		/*
+		 * RFC 4187, Chap. 4.1.4 recommends that identity from EAP is
+		 * ignored and the AKA/Identity is used to request the
+		 * identity.
+		 */
+		wpa_printf(MSG_DEBUG, "   AT_ANY_ID_REQ");
+		eap_sim_msg_add(msg, EAP_SIM_AT_ANY_ID_REQ, 0, NULL, 0);
 	}
 	return eap_sim_msg_finish(msg, reqDataLen, NULL, NULL, 0);
 }
@@ -445,10 +453,16 @@
 		sm->method_pending = METHOD_PENDING_NONE;
 	}
 
+	identity_len = sm->identity_len;
+	while (identity_len > 0 && sm->identity[identity_len - 1] == '\0') {
+		wpa_printf(MSG_DEBUG, "EAP-AKA: Workaround - drop last null "
+			   "character from identity");
+		identity_len--;
+	}
 	wpa_hexdump_ascii(MSG_DEBUG, "EAP-AKA: Identity for MK derivation",
-			  sm->identity, sm->identity_len);
+			  sm->identity, identity_len);
 
-	eap_aka_derive_mk(sm->identity, sm->identity_len, data->ik, data->ck,
+	eap_aka_derive_mk(sm->identity, identity_len, data->ik, data->ck,
 			  data->mk);
 	eap_sim_derive_keys(data->mk, data->k_encr, data->k_aut, data->msk,
 			    data->emsk);

==== //depot/projects/arm/src/contrib/hostapd/eap_gpsk.c#2 (text+ko) ====

@@ -1,5 +1,5 @@
 /*
- * hostapd / EAP-GPSK (draft-ietf-emu-eap-gpsk-03.txt) server
+ * hostapd / EAP-GPSK (draft-ietf-emu-eap-gpsk-08.txt) server
  * Copyright (c) 2006-2007, Jouni Malinen 
  *
  * This program is free software; you can redistribute it and/or modify
@@ -23,15 +23,15 @@
 struct eap_gpsk_data {
 	enum { GPSK_1, GPSK_3, SUCCESS, FAILURE } state;
 	u8 rand_server[EAP_GPSK_RAND_LEN];
-	u8 rand_client[EAP_GPSK_RAND_LEN];
+	u8 rand_peer[EAP_GPSK_RAND_LEN];
 	u8 msk[EAP_MSK_LEN];
 	u8 emsk[EAP_EMSK_LEN];
 	u8 sk[EAP_GPSK_MAX_SK_LEN];
 	size_t sk_len;
 	u8 pk[EAP_GPSK_MAX_PK_LEN];
 	size_t pk_len;
-	u8 *id_client;
-	size_t id_client_len;
+	u8 *id_peer;
+	size_t id_peer_len;
 	u8 *id_server;
 	size_t id_server_len;
 #define MAX_NUM_CSUITES 2
@@ -85,17 +85,17 @@
 	data->csuite_count = 0;
 	if (eap_gpsk_supported_ciphersuite(EAP_GPSK_VENDOR_IETF,
 					   EAP_GPSK_CIPHER_AES)) {
-		WPA_PUT_BE24(data->csuite_list[data->csuite_count].vendor,
+		WPA_PUT_BE32(data->csuite_list[data->csuite_count].vendor,
 			     EAP_GPSK_VENDOR_IETF);
-		WPA_PUT_BE24(data->csuite_list[data->csuite_count].specifier,
+		WPA_PUT_BE16(data->csuite_list[data->csuite_count].specifier,
 			     EAP_GPSK_CIPHER_AES);
 		data->csuite_count++;
 	}
 	if (eap_gpsk_supported_ciphersuite(EAP_GPSK_VENDOR_IETF,
 					   EAP_GPSK_CIPHER_SHA256)) {
-		WPA_PUT_BE24(data->csuite_list[data->csuite_count].vendor,
+		WPA_PUT_BE32(data->csuite_list[data->csuite_count].vendor,
 			     EAP_GPSK_VENDOR_IETF);
-		WPA_PUT_BE24(data->csuite_list[data->csuite_count].specifier,
+		WPA_PUT_BE16(data->csuite_list[data->csuite_count].specifier,
 			     EAP_GPSK_CIPHER_SHA256);
 		data->csuite_count++;
 	}
@@ -108,7 +108,7 @@
 {
 	struct eap_gpsk_data *data = priv;
 	free(data->id_server);
-	free(data->id_client);
+	free(data->id_peer);
 	free(data);
 }
 
@@ -174,8 +174,8 @@
 	wpa_printf(MSG_DEBUG, "EAP-GPSK: Request/GPSK-3");
 
 	miclen = eap_gpsk_mic_len(data->vendor, data->specifier);
-	len = 1 + 2 * EAP_GPSK_RAND_LEN + sizeof(struct eap_gpsk_csuite) + 2 +
-		miclen;
+	len = 1 + 2 * EAP_GPSK_RAND_LEN + 2 + data->id_server_len +
+		sizeof(struct eap_gpsk_csuite) + 2 + miclen;
 	req = eap_msg_alloc(EAP_VENDOR_IETF, EAP_TYPE_GPSK, reqDataLen,
 			    len, EAP_CODE_REQUEST, id, &pos);
 	if (req == NULL) {
@@ -188,13 +188,18 @@
 	*pos++ = EAP_GPSK_OPCODE_GPSK_3;
 	start = pos;
 
-	memcpy(pos, data->rand_client, EAP_GPSK_RAND_LEN);
+	memcpy(pos, data->rand_peer, EAP_GPSK_RAND_LEN);
 	pos += EAP_GPSK_RAND_LEN;
 	memcpy(pos, data->rand_server, EAP_GPSK_RAND_LEN);
 	pos += EAP_GPSK_RAND_LEN;
+	WPA_PUT_BE16(pos, data->id_server_len);

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Wed Mar 26 19:25:07 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 16B261065679; Wed, 26 Mar 2008 19:25: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 CB2B11065676
	for ; Wed, 26 Mar 2008 19:25:06 +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 A5BBE8FC44
	for ; Wed, 26 Mar 2008 19:25:06 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2QJP6jJ078973
	for ; Wed, 26 Mar 2008 19:25:06 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2QJP6cb078971
	for perforce@freebsd.org; Wed, 26 Mar 2008 19:25:06 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 26 Mar 2008 19:25:06 GMT
Message-Id: <200803261925.m2QJP6cb078971@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 138650 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 26 Mar 2008 19:25:07 -0000

http://perforce.freebsd.org/chv.cgi?CH=138650

Change 138650 by sam@sam_ebb on 2008/03/26 19:24:51

	allow AUTH -> RUN state change for cards like wi that do BSS join
	in firmware

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_sta.c#8 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_sta.c#8 (text+ko) ====

@@ -353,6 +353,7 @@
 		switch (ostate) {
 		case IEEE80211_S_RUN:
 			break;
+		case IEEE80211_S_AUTH:		/* when join is done in fw */
 		case IEEE80211_S_ASSOC:
 #ifdef IEEE80211_DEBUG
 			if (ieee80211_msg_debug(vap)) {

From owner-p4-projects@FreeBSD.ORG  Wed Mar 26 19:30:13 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 58CF8106567C; Wed, 26 Mar 2008 19:30: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 F01941065679
	for ; Wed, 26 Mar 2008 19:30:12 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E25648FC1C
	for ; Wed, 26 Mar 2008 19:30:12 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2QJUCOR079166
	for ; Wed, 26 Mar 2008 19:30:12 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2QJUBZO079164
	for perforce@freebsd.org; Wed, 26 Mar 2008 19:30:11 GMT
	(envelope-from imp@freebsd.org)
Date: Wed, 26 Mar 2008 19:30:11 GMT
Message-Id: <200803261930.m2QJUBZO079164@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138652 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 26 Mar 2008 19:30:13 -0000

http://perforce.freebsd.org/chv.cgi?CH=138652

Change 138652 by imp@imp_paco-paco on 2008/03/26 19:29:51

	IFC @138642

Affected files ...

.. //depot/projects/mips2/src/Makefile#8 integrate
.. //depot/projects/mips2/src/ObsoleteFiles.inc#16 integrate
.. //depot/projects/mips2/src/bin/sh/options.c#2 integrate
.. //depot/projects/mips2/src/contrib/hostapd/ChangeLog#3 integrate
.. //depot/projects/mips2/src/contrib/hostapd/Makefile#3 integrate
.. //depot/projects/mips2/src/contrib/hostapd/README#3 integrate
.. //depot/projects/mips2/src/contrib/hostapd/aes_wrap.c#3 integrate
.. //depot/projects/mips2/src/contrib/hostapd/aes_wrap.h#3 integrate
.. //depot/projects/mips2/src/contrib/hostapd/common.c#3 integrate
.. //depot/projects/mips2/src/contrib/hostapd/common.h#3 integrate
.. //depot/projects/mips2/src/contrib/hostapd/defconfig#3 integrate
.. //depot/projects/mips2/src/contrib/hostapd/driver.h#3 integrate
.. //depot/projects/mips2/src/contrib/hostapd/driver_test.c#3 integrate
.. //depot/projects/mips2/src/contrib/hostapd/eap_aka.c#2 integrate
.. //depot/projects/mips2/src/contrib/hostapd/eap_gpsk.c#2 integrate
.. //depot/projects/mips2/src/contrib/hostapd/eap_gpsk_common.c#2 integrate
.. //depot/projects/mips2/src/contrib/hostapd/eap_gpsk_common.h#2 integrate
.. //depot/projects/mips2/src/contrib/hostapd/eap_sim.c#3 integrate
.. //depot/projects/mips2/src/contrib/hostapd/eap_sim_common.c#3 integrate
.. //depot/projects/mips2/src/contrib/hostapd/eap_sim_db.c#3 integrate
.. //depot/projects/mips2/src/contrib/hostapd/eap_tls_common.c#3 integrate
.. //depot/projects/mips2/src/contrib/hostapd/eapol_version.patch#2 delete
.. //depot/projects/mips2/src/contrib/hostapd/hostapd.c#3 integrate
.. //depot/projects/mips2/src/contrib/hostapd/hostapd.conf#3 integrate
.. //depot/projects/mips2/src/contrib/hostapd/ieee802_11.c#3 integrate
.. //depot/projects/mips2/src/contrib/hostapd/ieee802_11_auth.c#3 integrate
.. //depot/projects/mips2/src/contrib/hostapd/ieee802_1x.c#3 integrate
.. //depot/projects/mips2/src/contrib/hostapd/madwifi.conf#2 integrate
.. //depot/projects/mips2/src/contrib/hostapd/os.h#2 integrate
.. //depot/projects/mips2/src/contrib/hostapd/os_unix.c#2 integrate
.. //depot/projects/mips2/src/contrib/hostapd/radius.c#3 integrate
.. //depot/projects/mips2/src/contrib/hostapd/radius.h#3 integrate
.. //depot/projects/mips2/src/contrib/hostapd/radius_client.c#3 integrate
.. //depot/projects/mips2/src/contrib/hostapd/radius_server.c#3 integrate
.. //depot/projects/mips2/src/contrib/hostapd/tls_openssl.c#3 integrate
.. //depot/projects/mips2/src/contrib/hostapd/version.h#3 integrate
.. //depot/projects/mips2/src/contrib/hostapd/wpa.c#3 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/ChangeLog#3 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/FREEBSD-Xlist#3 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/FREEBSD-upgrade#3 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/Makefile#3 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/README#3 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/aes_wrap.c#3 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/aes_wrap.h#3 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/asn1.c#2 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/common.c#3 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/common.h#3 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/config.c#3 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/config_ssid.h#3 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/config_winreg.c#2 delete
.. //depot/projects/mips2/src/contrib/wpa_supplicant/ctrl_iface.c#3 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/ctrl_iface_dbus.c#2 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.c#2 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.h#2 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/ctrl_iface_named_pipe.c#2 delete
.. //depot/projects/mips2/src/contrib/wpa_supplicant/ctrl_iface_unix.c#2 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/dbus-wpa_supplicant.conf#2 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/dbus-wpa_supplicant.service#1 branch
.. //depot/projects/mips2/src/contrib/wpa_supplicant/defconfig#3 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/doc/ctrl_iface.doxygen#3 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/doc/docbook/wpa_background.8#3 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/doc/docbook/wpa_cli.8#3 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/doc/docbook/wpa_cli.sgml#3 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.8#3 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.8#3 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5#3 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.sgml#3 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/driver_hostap.h#3 delete
.. //depot/projects/mips2/src/contrib/wpa_supplicant/driver_ndis.c#3 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/eap_gpsk.c#2 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/eap_gpsk_common.c#2 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/eap_gpsk_common.h#2 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/eap_peap.c#3 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/eap_sim.c#3 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/eap_sim_common.c#3 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/eap_tlv.c#3 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/eap_tlv.h#3 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/eapol_sm.c#3 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/eapol_test.c#3 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/eloop_win.c#2 delete
.. //depot/projects/mips2/src/contrib/wpa_supplicant/events.c#3 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/main.c#4 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/os.h#2 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/os_unix.c#2 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/pcsc_funcs.c#3 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/radius.c#3 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/radius.h#3 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/radius_client.c#3 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/tests/test_aes.c#1 branch
.. //depot/projects/mips2/src/contrib/wpa_supplicant/tests/test_eap_sim_common.c#1 branch
.. //depot/projects/mips2/src/contrib/wpa_supplicant/tests/test_md4.c#1 branch
.. //depot/projects/mips2/src/contrib/wpa_supplicant/tests/test_md5.c#1 branch
.. //depot/projects/mips2/src/contrib/wpa_supplicant/tests/test_ms_funcs.c#1 branch
.. //depot/projects/mips2/src/contrib/wpa_supplicant/tests/test_sha1.c#1 branch
.. //depot/projects/mips2/src/contrib/wpa_supplicant/tests/test_sha256.c#1 branch
.. //depot/projects/mips2/src/contrib/wpa_supplicant/tests/test_x509v3.c#1 branch
.. //depot/projects/mips2/src/contrib/wpa_supplicant/tls_openssl.c#3 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/version.h#3 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/wpa.c#3 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/wpa_cli.c#3 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp#2 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.cpp#2 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h#3 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/wpa_gui/setup-mingw-cross-compiling#2 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h#3 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/wpa_supplicant.c#3 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/wpa_supplicant.conf#3 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/wpa_supplicant_i.h#3 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/x509v3.c#2 integrate
.. //depot/projects/mips2/src/etc/freebsd-update.conf#4 integrate
.. //depot/projects/mips2/src/etc/periodic/security/410.logincheck#2 integrate
.. //depot/projects/mips2/src/include/pthread.h#3 integrate
.. //depot/projects/mips2/src/include/time.h#2 integrate
.. //depot/projects/mips2/src/lib/libarchive/Makefile#7 integrate
.. //depot/projects/mips2/src/lib/libc/gen/lockf.c#2 integrate
.. //depot/projects/mips2/src/lib/libc/include/namespace.h#3 integrate
.. //depot/projects/mips2/src/lib/libc/include/un-namespace.h#3 integrate
.. //depot/projects/mips2/src/lib/libc/sys/Symbol.map#8 integrate
.. //depot/projects/mips2/src/lib/libc/sys/fcntl.2#4 integrate
.. //depot/projects/mips2/src/lib/libc/yp/xdryp.c#2 integrate
.. //depot/projects/mips2/src/lib/libc_r/uthread/uthread_sig.c#3 integrate
.. //depot/projects/mips2/src/lib/libelf/libelf_convert.m4#3 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_sig.c#3 integrate
.. //depot/projects/mips2/src/lib/libthr/Makefile#8 integrate
.. //depot/projects/mips2/src/lib/libthr/pthread.map#8 integrate
.. //depot/projects/mips2/src/lib/libthr/thread/Makefile.inc#3 integrate
.. //depot/projects/mips2/src/lib/libthr/thread/thr_attr.c#5 integrate
.. //depot/projects/mips2/src/lib/libthr/thread/thr_exit.c#6 integrate
.. //depot/projects/mips2/src/lib/libthr/thread/thr_getcpuclockid.c#1 branch
.. //depot/projects/mips2/src/lib/libthr/thread/thr_mutex.c#10 integrate
.. //depot/projects/mips2/src/lib/libthr/thread/thr_rtld.c#4 integrate
.. //depot/projects/mips2/src/lib/libthread_db/Makefile#5 integrate
.. //depot/projects/mips2/src/lib/libthread_db/kse.h#1 branch
.. //depot/projects/mips2/src/lib/libthread_db/libc_r_db.c#2 integrate
.. //depot/projects/mips2/src/lib/libthread_db/libpthread_db.c#2 integrate
.. //depot/projects/mips2/src/lib/libthread_db/libthr_db.c#2 integrate
.. //depot/projects/mips2/src/lib/libthread_db/thread_db.c#3 integrate
.. //depot/projects/mips2/src/libexec/talkd/announce.c#2 integrate
.. //depot/projects/mips2/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#14 integrate
.. //depot/projects/mips2/src/sbin/bsdlabel/bsdlabel.c#4 integrate
.. //depot/projects/mips2/src/sbin/devd/token.l#2 integrate
.. //depot/projects/mips2/src/sbin/dhclient/dhclient.c#4 integrate
.. //depot/projects/mips2/src/sbin/newfs/newfs.8#5 integrate
.. //depot/projects/mips2/src/sbin/route/route.c#3 integrate
.. //depot/projects/mips2/src/share/man/man4/bpf.4#3 integrate
.. //depot/projects/mips2/src/share/man/man4/malo.4#1 branch
.. //depot/projects/mips2/src/share/man/man7/security.7#4 integrate
.. //depot/projects/mips2/src/share/man/man9/malloc.9#2 integrate
.. //depot/projects/mips2/src/share/man/man9/mbchain.9#2 integrate
.. //depot/projects/mips2/src/share/man/man9/mbuf.9#5 integrate
.. //depot/projects/mips2/src/share/zoneinfo/asia#6 integrate
.. //depot/projects/mips2/src/share/zoneinfo/backward#5 integrate
.. //depot/projects/mips2/src/share/zoneinfo/northamerica#7 integrate
.. //depot/projects/mips2/src/share/zoneinfo/southamerica#8 integrate
.. //depot/projects/mips2/src/share/zoneinfo/zone.tab#7 integrate
.. //depot/projects/mips2/src/sys/amd64/amd64/cpu_switch.S#5 integrate
.. //depot/projects/mips2/src/sys/amd64/amd64/genassym.c#6 integrate
.. //depot/projects/mips2/src/sys/amd64/amd64/pmap.c#16 integrate
.. //depot/projects/mips2/src/sys/amd64/amd64/prof_machdep.c#4 integrate
.. //depot/projects/mips2/src/sys/amd64/conf/NOTES#10 integrate
.. //depot/projects/mips2/src/sys/amd64/ia32/ia32_signal.c#4 integrate
.. //depot/projects/mips2/src/sys/amd64/include/clock.h#4 integrate
.. //depot/projects/mips2/src/sys/amd64/include/pcb.h#3 integrate
.. //depot/projects/mips2/src/sys/amd64/isa/clock.c#7 integrate
.. //depot/projects/mips2/src/sys/arm/arm/elf_trampoline.c#4 integrate
.. //depot/projects/mips2/src/sys/arm/conf/AVILA.hints#2 integrate
.. //depot/projects/mips2/src/sys/arm/xscale/ixp425/if_npe.c#5 integrate
.. //depot/projects/mips2/src/sys/boot/i386/cdboot/cdboot.s#4 integrate
.. //depot/projects/mips2/src/sys/boot/pc98/cdboot/cdboot.s#4 integrate
.. //depot/projects/mips2/src/sys/compat/freebsd32/freebsd32_proto.h#8 integrate
.. //depot/projects/mips2/src/sys/compat/freebsd32/freebsd32_syscall.h#8 integrate
.. //depot/projects/mips2/src/sys/compat/freebsd32/freebsd32_syscalls.c#8 integrate
.. //depot/projects/mips2/src/sys/compat/freebsd32/freebsd32_sysent.c#8 integrate
.. //depot/projects/mips2/src/sys/compat/freebsd32/syscalls.master#9 integrate
.. //depot/projects/mips2/src/sys/compat/linux/linux_file.c#8 integrate
.. //depot/projects/mips2/src/sys/compat/linux/linux_misc.c#8 integrate
.. //depot/projects/mips2/src/sys/compat/svr4/svr4_fcntl.c#7 integrate
.. //depot/projects/mips2/src/sys/conf/NOTES#17 integrate
.. //depot/projects/mips2/src/sys/conf/files#21 integrate
.. //depot/projects/mips2/src/sys/conf/options#15 integrate
.. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#8 integrate
.. //depot/projects/mips2/src/sys/ddb/db_command.c#6 integrate
.. //depot/projects/mips2/src/sys/ddb/db_ps.c#5 integrate
.. //depot/projects/mips2/src/sys/ddb/ddb.h#4 integrate
.. //depot/projects/mips2/src/sys/dev/aac/aac.c#7 integrate
.. //depot/projects/mips2/src/sys/dev/aac/aac_cam.c#8 integrate
.. //depot/projects/mips2/src/sys/dev/aac/aac_debug.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/aac/aac_disk.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/aac/aac_pci.c#6 integrate
.. //depot/projects/mips2/src/sys/dev/aac/aacreg.h#3 integrate
.. //depot/projects/mips2/src/sys/dev/aac/aacvar.h#4 integrate
.. //depot/projects/mips2/src/sys/dev/ath/if_ath.c#9 integrate
.. //depot/projects/mips2/src/sys/dev/cxgb/cxgb_offload.h#5 integrate
.. //depot/projects/mips2/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#4 integrate
.. //depot/projects/mips2/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#4 integrate
.. //depot/projects/mips2/src/sys/dev/dc/if_dc.c#5 integrate
.. //depot/projects/mips2/src/sys/dev/dc/if_dcreg.h#4 integrate
.. //depot/projects/mips2/src/sys/dev/drm/drm_pciids.h#4 integrate
.. //depot/projects/mips2/src/sys/dev/drm/i915_dma.c#5 integrate
.. //depot/projects/mips2/src/sys/dev/en/midway.c#4 integrate
.. //depot/projects/mips2/src/sys/dev/fatm/if_fatm.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/firewire/if_fwe.c#4 integrate
.. //depot/projects/mips2/src/sys/dev/firewire/if_fwip.c#4 integrate
.. //depot/projects/mips2/src/sys/dev/fxp/if_fxp.c#4 integrate
.. //depot/projects/mips2/src/sys/dev/gem/if_gem.c#7 integrate
.. //depot/projects/mips2/src/sys/dev/gem/if_gem_pci.c#6 integrate
.. //depot/projects/mips2/src/sys/dev/gem/if_gemreg.h#5 integrate
.. //depot/projects/mips2/src/sys/dev/gem/if_gemvar.h#6 integrate
.. //depot/projects/mips2/src/sys/dev/iscsi/initiator/isc_soc.c#4 integrate
.. //depot/projects/mips2/src/sys/dev/malo/if_malo.c#1 branch
.. //depot/projects/mips2/src/sys/dev/malo/if_malo.h#1 branch
.. //depot/projects/mips2/src/sys/dev/malo/if_malo_pci.c#1 branch
.. //depot/projects/mips2/src/sys/dev/malo/if_malohal.c#1 branch
.. //depot/projects/mips2/src/sys/dev/malo/if_malohal.h#1 branch
.. //depot/projects/mips2/src/sys/dev/malo/if_maloioctl.h#1 branch
.. //depot/projects/mips2/src/sys/dev/mfi/mfi.c#8 integrate
.. //depot/projects/mips2/src/sys/dev/re/if_re.c#13 integrate
.. //depot/projects/mips2/src/sys/dev/speaker/spkr.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/ti/if_ti.c#5 integrate
.. //depot/projects/mips2/src/sys/dev/usb/ucom.c#5 integrate
.. //depot/projects/mips2/src/sys/dev/usb/ucomvar.h#4 integrate
.. //depot/projects/mips2/src/sys/dev/usb/usbdevs#14 integrate
.. //depot/projects/mips2/src/sys/fs/msdosfs/msdosfs_vfsops.c#10 integrate
.. //depot/projects/mips2/src/sys/fs/msdosfs/msdosfs_vnops.c#7 integrate
.. //depot/projects/mips2/src/sys/fs/tmpfs/tmpfs_vnops.c#9 integrate
.. //depot/projects/mips2/src/sys/geom/geom.h#5 integrate
.. //depot/projects/mips2/src/sys/geom/geom_subr.c#4 integrate
.. //depot/projects/mips2/src/sys/geom/part/g_part.c#5 integrate
.. //depot/projects/mips2/src/sys/geom/part/g_part.h#5 integrate
.. //depot/projects/mips2/src/sys/geom/part/g_part_apm.c#4 integrate
.. //depot/projects/mips2/src/sys/geom/part/g_part_bsd.c#2 integrate
.. //depot/projects/mips2/src/sys/geom/part/g_part_gpt.c#4 integrate
.. //depot/projects/mips2/src/sys/geom/part/g_part_mbr.c#3 integrate
.. //depot/projects/mips2/src/sys/geom/part/g_part_vtoc8.c#2 integrate
.. //depot/projects/mips2/src/sys/i386/conf/NOTES#10 integrate
.. //depot/projects/mips2/src/sys/i386/i386/pmap.c#14 integrate
.. //depot/projects/mips2/src/sys/i386/ibcs2/ibcs2_fcntl.c#2 integrate
.. //depot/projects/mips2/src/sys/i386/include/clock.h#4 integrate
.. //depot/projects/mips2/src/sys/i386/include/vmparam.h#7 integrate
.. //depot/projects/mips2/src/sys/i386/isa/clock.c#8 integrate
.. //depot/projects/mips2/src/sys/i386/isa/prof_machdep.c#4 integrate
.. //depot/projects/mips2/src/sys/i386/isa/vesa.c#2 integrate
.. //depot/projects/mips2/src/sys/isa/syscons_isa.c#3 integrate
.. //depot/projects/mips2/src/sys/kern/init_sysent.c#10 integrate
.. //depot/projects/mips2/src/sys/kern/kern_cpuset.c#3 integrate
.. //depot/projects/mips2/src/sys/kern/kern_descrip.c#11 integrate
.. //depot/projects/mips2/src/sys/kern/kern_exit.c#7 integrate
.. //depot/projects/mips2/src/sys/kern/kern_lockf.c#5 integrate
.. //depot/projects/mips2/src/sys/kern/kern_sig.c#10 integrate
.. //depot/projects/mips2/src/sys/kern/kern_thr.c#9 integrate
.. //depot/projects/mips2/src/sys/kern/kern_thread.c#12 integrate
.. //depot/projects/mips2/src/sys/kern/kern_timeout.c#9 integrate
.. //depot/projects/mips2/src/sys/kern/makesyscalls.sh#4 integrate
.. //depot/projects/mips2/src/sys/kern/subr_mchain.c#2 integrate
.. //depot/projects/mips2/src/sys/kern/subr_sleepqueue.c#10 integrate
.. //depot/projects/mips2/src/sys/kern/subr_taskqueue.c#5 integrate
.. //depot/projects/mips2/src/sys/kern/subr_trap.c#8 integrate
.. //depot/projects/mips2/src/sys/kern/syscalls.c#10 integrate
.. //depot/projects/mips2/src/sys/kern/syscalls.master#11 integrate
.. //depot/projects/mips2/src/sys/kern/systrace_args.c#7 integrate
.. //depot/projects/mips2/src/sys/kern/uipc_mbuf.c#7 integrate
.. //depot/projects/mips2/src/sys/kern/uipc_socket.c#8 integrate
.. //depot/projects/mips2/src/sys/kern/uipc_syscalls.c#10 integrate
.. //depot/projects/mips2/src/sys/kern/vfs_bio.c#14 integrate
.. //depot/projects/mips2/src/sys/kern/vfs_cluster.c#4 integrate
.. //depot/projects/mips2/src/sys/kern/vfs_default.c#6 integrate
.. //depot/projects/mips2/src/sys/kern/vfs_mount.c#11 integrate
.. //depot/projects/mips2/src/sys/kern/vfs_subr.c#15 integrate
.. //depot/projects/mips2/src/sys/kern/vfs_vnops.c#7 integrate
.. //depot/projects/mips2/src/sys/kern/vnode_if.src#6 integrate
.. //depot/projects/mips2/src/sys/modules/geom/geom_part/Makefile#2 integrate
.. //depot/projects/mips2/src/sys/modules/geom/geom_part/geom_part_apm/Makefile#1 branch
.. //depot/projects/mips2/src/sys/modules/geom/geom_part/geom_part_bsd/Makefile#1 branch
.. //depot/projects/mips2/src/sys/modules/geom/geom_part/geom_part_gpt/Makefile#1 branch
.. //depot/projects/mips2/src/sys/modules/geom/geom_part/geom_part_mbr/Makefile#1 branch
.. //depot/projects/mips2/src/sys/modules/geom/geom_part/geom_part_vtoc8/Makefile#1 branch
.. //depot/projects/mips2/src/sys/modules/malo/Makefile#1 branch
.. //depot/projects/mips2/src/sys/net/bpf.c#11 integrate
.. //depot/projects/mips2/src/sys/net/bpf.h#5 integrate
.. //depot/projects/mips2/src/sys/net/bpf_buffer.c#1 branch
.. //depot/projects/mips2/src/sys/net/bpf_buffer.h#1 branch
.. //depot/projects/mips2/src/sys/net/bpf_zerocopy.c#1 branch
.. //depot/projects/mips2/src/sys/net/bpf_zerocopy.h#1 branch
.. //depot/projects/mips2/src/sys/net/bpfdesc.h#4 integrate
.. //depot/projects/mips2/src/sys/net/if.c#10 integrate
.. //depot/projects/mips2/src/sys/net/if_ef.c#2 integrate
.. //depot/projects/mips2/src/sys/net/if_enc.c#7 integrate
.. //depot/projects/mips2/src/sys/net/if_fddisubr.c#4 integrate
.. //depot/projects/mips2/src/sys/net/if_iso88025subr.c#4 integrate
.. //depot/projects/mips2/src/sys/net/if_loop.c#5 integrate
.. //depot/projects/mips2/src/sys/net/if_media.h#5 integrate
.. //depot/projects/mips2/src/sys/net/if_sl.c#3 integrate
.. //depot/projects/mips2/src/sys/net/if_var.h#6 integrate
.. //depot/projects/mips2/src/sys/net/raw_cb.c#2 integrate
.. //depot/projects/mips2/src/sys/netatalk/aarp.c#5 integrate
.. //depot/projects/mips2/src/sys/netatm/port.h#2 integrate
.. //depot/projects/mips2/src/sys/netgraph/ng_pptpgre.c#3 integrate
.. //depot/projects/mips2/src/sys/netgraph/ng_pptpgre.h#2 integrate
.. //depot/projects/mips2/src/sys/netgraph/ng_tee.c#3 integrate
.. //depot/projects/mips2/src/sys/netinet/in_pcb.c#10 integrate
.. //depot/projects/mips2/src/sys/netinet/in_pcb.h#8 integrate
.. //depot/projects/mips2/src/sys/netinet/ip_output.c#6 integrate
.. //depot/projects/mips2/src/sys/netinet6/ip6_output.c#8 integrate
.. //depot/projects/mips2/src/sys/netipsec/key.c#5 integrate
.. //depot/projects/mips2/src/sys/netipsec/xform_tcp.c#2 integrate
.. //depot/projects/mips2/src/sys/netncp/ncp_sock.c#6 integrate
.. //depot/projects/mips2/src/sys/netsmb/smb_iod.c#5 integrate
.. //depot/projects/mips2/src/sys/netsmb/smb_rq.c#3 integrate
.. //depot/projects/mips2/src/sys/netsmb/smb_trantcp.c#6 integrate
.. //depot/projects/mips2/src/sys/nfs/nfs_common.c#2 integrate
.. //depot/projects/mips2/src/sys/nfs4client/nfs4_vfsops.c#6 integrate
.. //depot/projects/mips2/src/sys/nfs4client/nfs4_vnops.c#6 integrate
.. //depot/projects/mips2/src/sys/nfsclient/krpc_subr.c#3 integrate
.. //depot/projects/mips2/src/sys/nfsclient/nfs_lock.c#4 integrate
.. //depot/projects/mips2/src/sys/nfsclient/nfs_socket.c#8 integrate
.. //depot/projects/mips2/src/sys/nfsclient/nfs_subs.c#7 integrate
.. //depot/projects/mips2/src/sys/nfsclient/nfs_vfsops.c#8 integrate
.. //depot/projects/mips2/src/sys/nfsclient/nfs_vnops.c#7 integrate
.. //depot/projects/mips2/src/sys/nfsserver/nfs_serv.c#7 integrate
.. //depot/projects/mips2/src/sys/nfsserver/nfs_srvcache.c#3 integrate
.. //depot/projects/mips2/src/sys/nfsserver/nfs_srvsock.c#8 integrate
.. //depot/projects/mips2/src/sys/nfsserver/nfs_srvsubs.c#6 integrate
.. //depot/projects/mips2/src/sys/nfsserver/nfs_syscalls.c#7 integrate
.. //depot/projects/mips2/src/sys/nlm/nlm.h#1 branch
.. //depot/projects/mips2/src/sys/nlm/nlm_prot.h#1 branch
.. //depot/projects/mips2/src/sys/nlm/nlm_prot_clnt.c#1 branch
.. //depot/projects/mips2/src/sys/nlm/nlm_prot_impl.c#1 branch
.. //depot/projects/mips2/src/sys/nlm/nlm_prot_server.c#1 branch
.. //depot/projects/mips2/src/sys/nlm/nlm_prot_svc.c#1 branch
.. //depot/projects/mips2/src/sys/nlm/nlm_prot_xdr.c#1 branch
.. //depot/projects/mips2/src/sys/nlm/sm_inter.h#1 branch
.. //depot/projects/mips2/src/sys/nlm/sm_inter_xdr.c#1 branch
.. //depot/projects/mips2/src/sys/pc98/cbus/clock.c#6 integrate
.. //depot/projects/mips2/src/sys/pc98/cbus/syscons_cbus.c#3 integrate
.. //depot/projects/mips2/src/sys/pc98/conf/NOTES#4 integrate
.. //depot/projects/mips2/src/sys/pci/if_mn.c#3 integrate
.. //depot/projects/mips2/src/sys/pci/if_rlreg.h#10 integrate
.. //depot/projects/mips2/src/sys/pci/if_xl.c#6 integrate
.. //depot/projects/mips2/src/sys/pci/if_xlreg.h#3 integrate
.. //depot/projects/mips2/src/sys/rpc/auth.h#1 branch
.. //depot/projects/mips2/src/sys/rpc/auth_none.c#1 branch
.. //depot/projects/mips2/src/sys/rpc/auth_unix.c#1 branch
.. //depot/projects/mips2/src/sys/rpc/authunix_prot.c#1 branch
.. //depot/projects/mips2/src/sys/rpc/clnt.h#1 branch
.. //depot/projects/mips2/src/sys/rpc/clnt_dg.c#1 branch
.. //depot/projects/mips2/src/sys/rpc/clnt_rc.c#1 branch
.. //depot/projects/mips2/src/sys/rpc/clnt_stat.h#1 branch
.. //depot/projects/mips2/src/sys/rpc/clnt_vc.c#1 branch
.. //depot/projects/mips2/src/sys/rpc/getnetconfig.c#1 branch
.. //depot/projects/mips2/src/sys/rpc/inet_ntop.c#1 branch
.. //depot/projects/mips2/src/sys/rpc/inet_pton.c#1 branch
.. //depot/projects/mips2/src/sys/rpc/netconfig.h#1 branch
.. //depot/projects/mips2/src/sys/rpc/nettype.h#1 branch
.. //depot/projects/mips2/src/sys/rpc/pmap_prot.h#1 branch
.. //depot/projects/mips2/src/sys/rpc/rpc.h#1 branch
.. //depot/projects/mips2/src/sys/rpc/rpc_callmsg.c#1 branch
.. //depot/projects/mips2/src/sys/rpc/rpc_com.h#1 branch
.. //depot/projects/mips2/src/sys/rpc/rpc_generic.c#1 branch
.. //depot/projects/mips2/src/sys/rpc/rpc_msg.h#1 branch
.. //depot/projects/mips2/src/sys/rpc/rpc_prot.c#1 branch
.. //depot/projects/mips2/src/sys/rpc/rpcb_clnt.c#1 branch
.. //depot/projects/mips2/src/sys/rpc/rpcb_clnt.h#1 branch
.. //depot/projects/mips2/src/sys/rpc/rpcb_prot.c#1 branch
.. //depot/projects/mips2/src/sys/rpc/rpcb_prot.h#1 branch
.. //depot/projects/mips2/src/sys/rpc/rpcclnt.c#5 integrate
.. //depot/projects/mips2/src/sys/rpc/svc.c#1 branch
.. //depot/projects/mips2/src/sys/rpc/svc.h#1 branch
.. //depot/projects/mips2/src/sys/rpc/svc_auth.c#1 branch
.. //depot/projects/mips2/src/sys/rpc/svc_auth.h#1 branch
.. //depot/projects/mips2/src/sys/rpc/svc_auth_unix.c#1 branch
.. //depot/projects/mips2/src/sys/rpc/svc_dg.c#1 branch
.. //depot/projects/mips2/src/sys/rpc/svc_generic.c#1 branch
.. //depot/projects/mips2/src/sys/rpc/svc_vc.c#1 branch
.. //depot/projects/mips2/src/sys/rpc/types.h#2 integrate
.. //depot/projects/mips2/src/sys/rpc/xdr.h#1 branch
.. //depot/projects/mips2/src/sys/sparc64/include/bus.h#3 integrate
.. //depot/projects/mips2/src/sys/sparc64/sparc64/bus_machdep.c#4 integrate
.. //depot/projects/mips2/src/sys/sun4v/include/cpu.h#2 integrate
.. //depot/projects/mips2/src/sys/sys/buf.h#6 integrate
.. //depot/projects/mips2/src/sys/sys/bufobj.h#5 integrate
.. //depot/projects/mips2/src/sys/sys/cdefs.h#4 integrate
.. //depot/projects/mips2/src/sys/sys/cpuset.h#3 integrate
.. //depot/projects/mips2/src/sys/sys/fcntl.h#4 integrate
.. //depot/projects/mips2/src/sys/sys/lockf.h#3 integrate
.. //depot/projects/mips2/src/sys/sys/mbuf.h#10 integrate
.. //depot/projects/mips2/src/sys/sys/param.h#14 integrate
.. //depot/projects/mips2/src/sys/sys/proc.h#15 integrate
.. //depot/projects/mips2/src/sys/sys/syscall.h#10 integrate
.. //depot/projects/mips2/src/sys/sys/syscall.mk#10 integrate
.. //depot/projects/mips2/src/sys/sys/sysproto.h#10 integrate
.. //depot/projects/mips2/src/sys/sys/taskqueue.h#3 integrate
.. //depot/projects/mips2/src/sys/sys/vnode.h#7 integrate
.. //depot/projects/mips2/src/sys/ufs/ffs/ffs_inode.c#5 integrate
.. //depot/projects/mips2/src/sys/ufs/ffs/ffs_rawread.c#5 integrate
.. //depot/projects/mips2/src/sys/ufs/ffs/ffs_softdep.c#10 integrate
.. //depot/projects/mips2/src/sys/ufs/ffs/ffs_vfsops.c#8 integrate
.. //depot/projects/mips2/src/sys/ufs/ffs/ffs_vnops.c#8 integrate
.. //depot/projects/mips2/src/sys/ufs/ufs/ufs_vnops.c#7 integrate
.. //depot/projects/mips2/src/sys/xdr/xdr.c#1 branch
.. //depot/projects/mips2/src/sys/xdr/xdr_array.c#1 branch
.. //depot/projects/mips2/src/sys/xdr/xdr_mbuf.c#1 branch
.. //depot/projects/mips2/src/sys/xdr/xdr_mem.c#1 branch
.. //depot/projects/mips2/src/sys/xdr/xdr_reference.c#1 branch
.. //depot/projects/mips2/src/sys/xdr/xdr_sizeof.c#1 branch
.. //depot/projects/mips2/src/tools/build/mk/OptionalObsoleteFiles.inc#7 integrate
.. //depot/projects/mips2/src/tools/regression/bin/sh/builtins/getopts1.0#1 branch
.. //depot/projects/mips2/src/tools/regression/bin/sh/builtins/getopts1.0.stdout#1 branch
.. //depot/projects/mips2/src/tools/regression/file/flock/Makefile#1 branch
.. //depot/projects/mips2/src/tools/regression/file/flock/flock.c#1 branch
.. //depot/projects/mips2/src/tools/tools/net80211/wlanwatch/wlanwatch.c#3 integrate
.. //depot/projects/mips2/src/usr.bin/checknr/checknr.c#2 integrate
.. //depot/projects/mips2/src/usr.bin/make/for.c#2 integrate
.. //depot/projects/mips2/src/usr.bin/make/make.1#6 integrate
.. //depot/projects/mips2/src/usr.bin/netstat/bpf.c#5 integrate
.. //depot/projects/mips2/src/usr.bin/xlint/lint1/lint1.h#2 integrate
.. //depot/projects/mips2/src/usr.sbin/Makefile#11 integrate
.. //depot/projects/mips2/src/usr.sbin/arp/arp.8#4 integrate
.. //depot/projects/mips2/src/usr.sbin/clear_locks/Makefile#1 branch
.. //depot/projects/mips2/src/usr.sbin/clear_locks/clear_locks.8#1 branch
.. //depot/projects/mips2/src/usr.sbin/clear_locks/clear_locks.c#1 branch
.. //depot/projects/mips2/src/usr.sbin/freebsd-update/freebsd-update.sh#7 integrate
.. //depot/projects/mips2/src/usr.sbin/rpc.lockd/lockd.c#6 integrate
.. //depot/projects/mips2/src/usr.sbin/rpc.lockd/rpc.lockd.8#4 integrate
.. //depot/projects/mips2/src/usr.sbin/wpa/wpa_supplicant/Makefile#6 integrate
.. //depot/projects/mips2/src/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8#4 integrate

Differences ...

==== //depot/projects/mips2/src/Makefile#8 (text+ko) ====

@@ -1,6 +1,6 @@
 #OSX hint: bsdmake BSDMKAE=bsdmake MACHINE_ARCH=i386
 #
-# $FreeBSD: src/Makefile,v 1.345 2008/01/30 19:33:18 jhb Exp $
+# $FreeBSD: src/Makefile,v 1.346 2008/03/25 15:47:22 ru Exp $
 #
 # The user-driven targets are:
 #
@@ -175,6 +175,10 @@
 .MAIN:	all
 
 STARTTIME!= LC_ALL=C date
+CHECK_TIME!= find ${.CURDIR}/sys/sys/param.h -mtime -0
+.if !empty(CHECK_TIME)
+.error check your date/time: ${STARTTIME}
+.endif
 
 .if defined(HISTORICAL_MAKE_WORLD) || defined(DESTDIR)
 #

==== //depot/projects/mips2/src/ObsoleteFiles.inc#16 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.133 2008/03/13 18:17:46 brueffer Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.134 2008/03/26 06:45:28 remko Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -1103,6 +1103,9 @@
 OLD_FILES+=usr/sbin/ntptimeset
 OLD_FILES+=usr/share/man/man8/kernbb.8.gz
 OLD_FILES+=usr/share/man/man8/ntp-genkeys.8.gz
+# 20040627: usbdevs.h and usbdevs_data.h removal
+OLD_FILES+=usr/include/dev/usb/usbdevs.h
+OLD_FILES+=usr/include/dev/usb/usbdevs_data.h
 # 200406XX
 OLD_FILES+=usr/bin/gasp
 OLD_FILES+=usr/bin/gdbreplay
@@ -3551,8 +3554,6 @@
 OLD_FILES+=usr/bin/hesinfo
 OLD_FILES+=usr/include/c++/3.4/ext/demangle.h
 OLD_FILES+=usr/include/cam/cam_extend.h
-OLD_FILES+=usr/include/dev/usb/usbdevs.h
-OLD_FILES+=usr/include/dev/usb/usbdevs_data.h
 OLD_FILES+=usr/include/dev/wi/wi_hostap.h
 OLD_FILES+=usr/include/disktab.h
 OLD_FILES+=usr/include/g++/FlexLexer.h

==== //depot/projects/mips2/src/bin/sh/options.c#2 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include 
-__FBSDID("$FreeBSD: src/bin/sh/options.c,v 1.25 2006/04/09 12:20:42 stefanf Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/options.c,v 1.26 2008/03/22 14:06:01 stefanf Exp $");
 
 #include 
 #include 
@@ -383,7 +383,7 @@
 	}
 	ap2 = shellparam.p;
 	while ((*ap2++ = *ap1++) != NULL);
-	shellparam.optnext = NULL;
+	shellparam.reset = 1;
 	INTON;
 	return 0;
 }
@@ -405,6 +405,7 @@
 	if (*argptr != NULL) {
 		setparam(argptr);
 	}
+	shellparam.reset = 1;
 	INTON;
 	return 0;
 }
@@ -414,7 +415,6 @@
 getoptsreset(const char *value)
 {
 	if (number(value) == 1) {
-		shellparam.optnext = NULL;
 		shellparam.reset = 1;
 	}
 }

==== //depot/projects/mips2/src/contrib/hostapd/ChangeLog#3 (text+ko) ====

@@ -1,5 +1,25 @@
 ChangeLog for hostapd
 
+2008-02-19 - v0.5.10
+	* fixed EAP-SIM and EAP-AKA message parser to validate attribute
+	  lengths properly to avoid potential crash caused by invalid messages
+	* fixed Reassociation Response callback processing when using internal
+	  MLME (driver_{hostap,devicescape,test}.c)
+	* fixed EAP-SIM/AKA realm processing to allow decorated usernames to
+	  be used
+	* added a workaround for EAP-SIM/AKA peers that include incorrect null
+	  termination in the username
+	* fixed EAP-SIM Start response processing for fast reauthentication
+	  case
+	* copy optional Proxy-State attributes into RADIUS response when acting
+	  as a RADIUS authentication server
+
+2007-12-02 - v0.5.9
+	* updated EAP Generalized Pre-Shared Key (EAP-GPSK) to use the latest
+	  draft (draft-ietf-emu-eap-gpsk-07.txt)
+	* fixed debugging code not to use potentially unaligned read to fetch
+	  IPv4 addresses
+
 2007-05-28 - v0.5.8
 	* updated driver_devicescape.c to build with the current
 	  wireless-dev.git tree and net/d80211 changes

==== //depot/projects/mips2/src/contrib/hostapd/Makefile#3 (text+ko) ====

@@ -313,6 +313,10 @@
 CFLAGS += -DCONFIG_IPV6
 endif
 
+ifdef CONFIG_DRIVER_RADIUS_ACL
+CFLAGS += -DCONFIG_DRIVER_RADIUS_ACL
+endif
+
 ifdef CONFIG_FULL_DYNAMIC_VLAN
 # define CONFIG_FULL_DYNAMIC_VLAN to have hostapd manipulate bridges
 # and vlan interfaces for the vlan feature.

==== //depot/projects/mips2/src/contrib/hostapd/README#3 (text+ko) ====

@@ -2,7 +2,7 @@
 	  Authenticator and RADIUS authentication server
 ================================================================
 
-Copyright (c) 2002-2007, Jouni Malinen  and contributors
+Copyright (c) 2002-2008, Jouni Malinen  and contributors
 All Rights Reserved.
 
 This program is dual-licensed under both the GPL version 2 and BSD

==== //depot/projects/mips2/src/contrib/hostapd/aes_wrap.c#3 (text+ko) ====

@@ -7,7 +7,7 @@
  * - AES-128 EAX mode encryption/decryption
  * - AES-128 CBC
  *
- * Copyright (c) 2003-2005, Jouni Malinen 
+ * Copyright (c) 2003-2007, Jouni Malinen 
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -34,10 +34,11 @@
 
 /**
  * aes_wrap - Wrap keys with AES Key Wrap Algorithm (128-bit KEK) (RFC3394)
- * @kek: Key encryption key (KEK)
- * @n: Length of the wrapped key in 64-bit units; e.g., 2 = 128-bit = 16 bytes
- * @plain: Plaintext key to be wrapped, n * 64 bit
- * @cipher: Wrapped key, (n + 1) * 64 bit
+ * @kek: 16-octet Key encryption key (KEK)
+ * @n: Length of the plaintext key in 64-bit units; e.g., 2 = 128-bit = 16
+ * bytes
+ * @plain: Plaintext key to be wrapped, n * 64 bits
+ * @cipher: Wrapped key, (n + 1) * 64 bits
  * Returns: 0 on success, -1 on failure
  */
 int aes_wrap(const u8 *kek, int n, const u8 *plain, u8 *cipher)
@@ -93,9 +94,10 @@
 /**
  * aes_unwrap - Unwrap key with AES Key Wrap Algorithm (128-bit KEK) (RFC3394)
  * @kek: Key encryption key (KEK)
- * @n: Length of the wrapped key in 64-bit units; e.g., 2 = 128-bit = 16 bytes
- * @cipher: Wrapped key to be unwrapped, (n + 1) * 64 bit
- * @plain: Plaintext key, n * 64 bit
+ * @n: Length of the plaintext key in 64-bit units; e.g., 2 = 128-bit = 16
+ * bytes
+ * @cipher: Wrapped key to be unwrapped, (n + 1) * 64 bits
+ * @plain: Plaintext key, n * 64 bits
  * Returns: 0 on success, -1 on failure (e.g., integrity verification failed)
  */
 int aes_unwrap(const u8 *kek, int n, const u8 *cipher, u8 *plain)
@@ -167,28 +169,45 @@
 
 
 /**
- * omac1_aes_128 - One-Key CBC MAC (OMAC1) hash with AES-128 (aka AES-CMAC)
+ * omac1_aes_128_vector - One-Key CBC MAC (OMAC1) hash with AES-128
  * @key: 128-bit key for the hash operation
- * @data: Data buffer for which a MAC is determined
- * @data: Length of data buffer in bytes
+ * @num_elem: Number of elements in the data vector
+ * @addr: Pointers to the data areas
+ * @len: Lengths of the data blocks
  * @mac: Buffer for MAC (128 bits, i.e., 16 bytes)
  * Returns: 0 on success, -1 on failure
  */
-int omac1_aes_128(const u8 *key, const u8 *data, size_t data_len, u8 *mac)
+int omac1_aes_128_vector(const u8 *key, size_t num_elem,
+			 const u8 *addr[], const size_t *len, u8 *mac)
 {
 	void *ctx;
 	u8 cbc[BLOCK_SIZE], pad[BLOCK_SIZE];
-	const u8 *pos = data;
-	size_t i, left = data_len;
+	const u8 *pos, *end;
+	size_t i, e, left, total_len;
 
 	ctx = aes_encrypt_init(key, 16);
 	if (ctx == NULL)
 		return -1;
 	os_memset(cbc, 0, BLOCK_SIZE);
 
+	total_len = 0;
+	for (e = 0; e < num_elem; e++)
+		total_len += len[e];
+	left = total_len;
+
+	e = 0;
+	pos = addr[0];
+	end = pos + len[0];
+
 	while (left >= BLOCK_SIZE) {
-		for (i = 0; i < BLOCK_SIZE; i++)
+		for (i = 0; i < BLOCK_SIZE; i++) {
 			cbc[i] ^= *pos++;
+			if (pos >= end) {
+				e++;
+				pos = addr[e];
+				end = pos + len[e];
+			}
+		}
 		if (left > BLOCK_SIZE)
 			aes_encrypt(ctx, cbc, cbc);
 		left -= BLOCK_SIZE;
@@ -198,9 +217,15 @@
 	aes_encrypt(ctx, pad, pad);
 	gf_mulx(pad);
 
-	if (left || data_len == 0) {
-		for (i = 0; i < left; i++)
+	if (left || total_len == 0) {
+		for (i = 0; i < left; i++) {
 			cbc[i] ^= *pos++;
+			if (pos >= end) {
+				e++;
+				pos = addr[e];
+				end = pos + len[e];
+			}
+		}
 		cbc[left] ^= 0x80;
 		gf_mulx(pad);
 	}
@@ -212,6 +237,24 @@
 	return 0;
 }
 
+
+/**
+ * omac1_aes_128 - One-Key CBC MAC (OMAC1) hash with AES-128 (aka AES-CMAC)
+ * @key: 128-bit key for the hash operation
+ * @data: Data buffer for which a MAC is determined
+ * @data_len: Length of data buffer in bytes
+ * @mac: Buffer for MAC (128 bits, i.e., 16 bytes)
+ * Returns: 0 on success, -1 on failure
+ *
+ * This is a mode for using block cipher (AES in this case) for authentication.
+ * OMAC1 was standardized with the name CMAC by NIST in a Special Publication
+ * (SP) 800-38B.
+ */
+int omac1_aes_128(const u8 *key, const u8 *data, size_t data_len, u8 *mac)
+{
+	return omac1_aes_128_vector(key, 1, &data, &data_len, mac);
+}
+
 #endif /* CONFIG_NO_AES_OMAC1 */
 
 

==== //depot/projects/mips2/src/contrib/hostapd/aes_wrap.h#3 (text+ko) ====

@@ -7,7 +7,7 @@
  * - AES-128 EAX mode encryption/decryption
  * - AES-128 CBC
  *
- * Copyright (c) 2003-2005, Jouni Malinen 
+ * Copyright (c) 2003-2007, Jouni Malinen 
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -24,6 +24,8 @@
 
 int aes_wrap(const u8 *kek, int n, const u8 *plain, u8 *cipher);
 int aes_unwrap(const u8 *kek, int n, const u8 *cipher, u8 *plain);
+int omac1_aes_128_vector(const u8 *key, size_t num_elem,
+			 const u8 *addr[], const size_t *len, u8 *mac);
 int omac1_aes_128(const u8 *key, const u8 *data, size_t data_len, u8 *mac);
 int aes_128_encrypt_block(const u8 *key, const u8 *in, u8 *out);
 int aes_128_ctr_encrypt(const u8 *key, const u8 *nonce,

==== //depot/projects/mips2/src/contrib/hostapd/common.c#3 (text+ko) ====

@@ -20,7 +20,6 @@
 #ifdef CONFIG_DEBUG_FILE
 static FILE *out_file = NULL;
 #endif /* CONFIG_DEBUG_FILE */
-int wpa_debug_use_file = 0;
 int wpa_debug_level = MSG_INFO;
 int wpa_debug_show_keys = 0;
 int wpa_debug_timestamp = 0;
@@ -344,32 +343,29 @@
 }
 
 
-int wpa_debug_open_file(void)
+int wpa_debug_open_file(const char *path)
 {
 #ifdef CONFIG_DEBUG_FILE
-	static int count = 0;
-	char fname[64];
-	if (!wpa_debug_use_file)
+	if (!path)
 		return 0;
-#ifdef _WIN32
-	os_snprintf(fname, sizeof(fname), "\\Temp\\wpa_supplicant-log-%d.txt",
-		    count++);
-#else /* _WIN32 */
-	os_snprintf(fname, sizeof(fname), "/tmp/wpa_supplicant-log-%d.txt",
-		    count++);
+	out_file = fopen(path, "a");
+	if (out_file == NULL) {
+		wpa_printf(MSG_ERROR, "wpa_debug_open_file: Failed to open "
+			   "output file, using standard output");
+		return -1;
+	}
+#ifndef _WIN32
+	setvbuf(out_file, NULL, _IOLBF, 0);
 #endif /* _WIN32 */
-	out_file = fopen(fname, "w");
-	return out_file == NULL ? -1 : 0;
-#else /* CONFIG_DEBUG_FILE */
+#endif /* CONFIG_DEBUG_FILE */
 	return 0;
-#endif /* CONFIG_DEBUG_FILE */
 }
 
 
 void wpa_debug_close_file(void)
 {
 #ifdef CONFIG_DEBUG_FILE
-	if (!wpa_debug_use_file)
+	if (!out_file)
 		return;
 	fclose(out_file);
 	out_file = NULL;

==== //depot/projects/mips2/src/contrib/hostapd/common.h#3 (text+ko) ====

@@ -264,12 +264,12 @@
 #define wpa_hexdump_key(l,t,b,le) do { } while (0)
 #define wpa_hexdump_ascii(l,t,b,le) do { } while (0)
 #define wpa_hexdump_ascii_key(l,t,b,le) do { } while (0)
-#define wpa_debug_open_file() do { } while (0)
+#define wpa_debug_open_file(p) do { } while (0)
 #define wpa_debug_close_file() do { } while (0)
 
 #else /* CONFIG_NO_STDOUT_DEBUG */
 
-int wpa_debug_open_file(void);
+int wpa_debug_open_file(const char *path);
 void wpa_debug_close_file(void);
 
 /**

==== //depot/projects/mips2/src/contrib/hostapd/defconfig#3 (text+ko) ====

@@ -102,3 +102,7 @@
 
 # Build IPv6 support for RADIUS operations
 CONFIG_IPV6=y
+
+# Use the hostapd's IEEE 802.11 authentication (ACL), but without
+# the IEEE 802.11 Management capability
+CONFIG_DRIVER_RADIUS_ACL=y

==== //depot/projects/mips2/src/contrib/hostapd/driver.h#3 (text+ko) ====

@@ -141,6 +141,10 @@
 	 * this handler will be called after initial setup has been completed.
 	 */
 	int (*commit)(void *priv);
+
+	int (*set_radius_acl_auth)(void *priv, const u8 *mac, int accepted, 
+			u32 session_timeout);
+	int (*set_radius_acl_expire)(void *priv, const u8 *mac);
 };
 
 static inline int
@@ -653,4 +657,22 @@
 	return hapd->driver->commit(hapd->driver);
 }
 
+static inline int 
+hostapd_set_radius_acl_auth(struct hostapd_data *hapd, const u8 *mac, int accepted, 
+	u32 session_timeout)
+{
+	if (hapd->driver == NULL || hapd->driver->set_radius_acl_auth == NULL)
+		return 0;
+	return hapd->driver->set_radius_acl_auth(hapd->driver, mac, accepted,
+						 session_timeout);
+}
+
+static inline int 
+hostapd_set_radius_acl_expire(struct hostapd_data *hapd, const u8 *mac)
+{
+	if (hapd->driver == NULL || hapd->driver->set_radius_acl_expire == NULL)
+		return 0;
+	return hapd->driver->set_radius_acl_expire(hapd->driver, mac);
+}
+
 #endif /* DRIVER_H */

==== //depot/projects/mips2/src/contrib/hostapd/driver_test.c#3 (text+ko) ====

@@ -170,9 +170,10 @@
 	u16 fc;
 
 	if (drv->test_socket < 0 || len < 10 || drv->socket_dir == NULL) {
-		wpa_printf(MSG_DEBUG, "%s: invalid parameters (sock=%d len=%d "
-			   "socket_dir=%p)",
-			   __func__, drv->test_socket, len, drv->socket_dir);
+		wpa_printf(MSG_DEBUG, "%s: invalid parameters (sock=%d len=%lu"
+			   " socket_dir=%p)",
+			   __func__, drv->test_socket, (unsigned long) len,
+			   drv->socket_dir);
 		return -1;
 	}
 

==== //depot/projects/mips2/src/contrib/hostapd/eap_aka.c#2 (text+ko) ====

@@ -1,6 +1,6 @@
 /*
  * hostapd / EAP-AKA (RFC 4187)
- * Copyright (c) 2005-2007, Jouni Malinen 
+ * Copyright (c) 2005-2008, Jouni Malinen 
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -124,6 +124,14 @@
 				      sm->identity_len)) {
 		wpa_printf(MSG_DEBUG, "   AT_PERMANENT_ID_REQ");
 		eap_sim_msg_add(msg, EAP_SIM_AT_PERMANENT_ID_REQ, 0, NULL, 0);
+	} else {
+		/*
+		 * RFC 4187, Chap. 4.1.4 recommends that identity from EAP is
+		 * ignored and the AKA/Identity is used to request the
+		 * identity.
+		 */
+		wpa_printf(MSG_DEBUG, "   AT_ANY_ID_REQ");
+		eap_sim_msg_add(msg, EAP_SIM_AT_ANY_ID_REQ, 0, NULL, 0);
 	}
 	return eap_sim_msg_finish(msg, reqDataLen, NULL, NULL, 0);
 }
@@ -445,10 +453,16 @@
 		sm->method_pending = METHOD_PENDING_NONE;
 	}
 
+	identity_len = sm->identity_len;
+	while (identity_len > 0 && sm->identity[identity_len - 1] == '\0') {
+		wpa_printf(MSG_DEBUG, "EAP-AKA: Workaround - drop last null "
+			   "character from identity");
+		identity_len--;
+	}
 	wpa_hexdump_ascii(MSG_DEBUG, "EAP-AKA: Identity for MK derivation",
-			  sm->identity, sm->identity_len);
+			  sm->identity, identity_len);
 
-	eap_aka_derive_mk(sm->identity, sm->identity_len, data->ik, data->ck,
+	eap_aka_derive_mk(sm->identity, identity_len, data->ik, data->ck,
 			  data->mk);
 	eap_sim_derive_keys(data->mk, data->k_encr, data->k_aut, data->msk,
 			    data->emsk);

==== //depot/projects/mips2/src/contrib/hostapd/eap_gpsk.c#2 (text+ko) ====

@@ -1,5 +1,5 @@
 /*
- * hostapd / EAP-GPSK (draft-ietf-emu-eap-gpsk-03.txt) server
+ * hostapd / EAP-GPSK (draft-ietf-emu-eap-gpsk-08.txt) server
  * Copyright (c) 2006-2007, Jouni Malinen 
  *
  * This program is free software; you can redistribute it and/or modify
@@ -23,15 +23,15 @@
 struct eap_gpsk_data {
 	enum { GPSK_1, GPSK_3, SUCCESS, FAILURE } state;
 	u8 rand_server[EAP_GPSK_RAND_LEN];
-	u8 rand_client[EAP_GPSK_RAND_LEN];
+	u8 rand_peer[EAP_GPSK_RAND_LEN];
 	u8 msk[EAP_MSK_LEN];
 	u8 emsk[EAP_EMSK_LEN];
 	u8 sk[EAP_GPSK_MAX_SK_LEN];
 	size_t sk_len;
 	u8 pk[EAP_GPSK_MAX_PK_LEN];
 	size_t pk_len;
-	u8 *id_client;
-	size_t id_client_len;
+	u8 *id_peer;
+	size_t id_peer_len;
 	u8 *id_server;
 	size_t id_server_len;
 #define MAX_NUM_CSUITES 2
@@ -85,17 +85,17 @@
 	data->csuite_count = 0;
 	if (eap_gpsk_supported_ciphersuite(EAP_GPSK_VENDOR_IETF,
 					   EAP_GPSK_CIPHER_AES)) {
-		WPA_PUT_BE24(data->csuite_list[data->csuite_count].vendor,
+		WPA_PUT_BE32(data->csuite_list[data->csuite_count].vendor,
 			     EAP_GPSK_VENDOR_IETF);
-		WPA_PUT_BE24(data->csuite_list[data->csuite_count].specifier,
+		WPA_PUT_BE16(data->csuite_list[data->csuite_count].specifier,
 			     EAP_GPSK_CIPHER_AES);
 		data->csuite_count++;
 	}
 	if (eap_gpsk_supported_ciphersuite(EAP_GPSK_VENDOR_IETF,
 					   EAP_GPSK_CIPHER_SHA256)) {
-		WPA_PUT_BE24(data->csuite_list[data->csuite_count].vendor,
+		WPA_PUT_BE32(data->csuite_list[data->csuite_count].vendor,
 			     EAP_GPSK_VENDOR_IETF);
-		WPA_PUT_BE24(data->csuite_list[data->csuite_count].specifier,
+		WPA_PUT_BE16(data->csuite_list[data->csuite_count].specifier,
 			     EAP_GPSK_CIPHER_SHA256);
 		data->csuite_count++;
 	}
@@ -108,7 +108,7 @@
 {
 	struct eap_gpsk_data *data = priv;
 	free(data->id_server);
-	free(data->id_client);
+	free(data->id_peer);
 	free(data);
 }
 
@@ -174,8 +174,8 @@
 	wpa_printf(MSG_DEBUG, "EAP-GPSK: Request/GPSK-3");
 
 	miclen = eap_gpsk_mic_len(data->vendor, data->specifier);
-	len = 1 + 2 * EAP_GPSK_RAND_LEN + sizeof(struct eap_gpsk_csuite) + 2 +
-		miclen;
+	len = 1 + 2 * EAP_GPSK_RAND_LEN + 2 + data->id_server_len +
+		sizeof(struct eap_gpsk_csuite) + 2 + miclen;
 	req = eap_msg_alloc(EAP_VENDOR_IETF, EAP_TYPE_GPSK, reqDataLen,
 			    len, EAP_CODE_REQUEST, id, &pos);
 	if (req == NULL) {
@@ -188,13 +188,18 @@
 	*pos++ = EAP_GPSK_OPCODE_GPSK_3;
 	start = pos;
 
-	memcpy(pos, data->rand_client, EAP_GPSK_RAND_LEN);
+	memcpy(pos, data->rand_peer, EAP_GPSK_RAND_LEN);
 	pos += EAP_GPSK_RAND_LEN;
 	memcpy(pos, data->rand_server, EAP_GPSK_RAND_LEN);
 	pos += EAP_GPSK_RAND_LEN;
+	WPA_PUT_BE16(pos, data->id_server_len);

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Wed Mar 26 19:42:31 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C43BD1065675; Wed, 26 Mar 2008 19:42: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 68C141065673
	for ; Wed, 26 Mar 2008 19:42:30 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5B0C48FC1B
	for ; Wed, 26 Mar 2008 19:42:30 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2QJgUoh079662
	for ; Wed, 26 Mar 2008 19:42:30 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2QJgT1f079660
	for perforce@freebsd.org; Wed, 26 Mar 2008 19:42:29 GMT
	(envelope-from imp@freebsd.org)
Date: Wed, 26 Mar 2008 19:42:29 GMT
Message-Id: <200803261942.m2QJgT1f079660@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138653 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 26 Mar 2008 19:42:32 -0000

http://perforce.freebsd.org/chv.cgi?CH=138653

Change 138653 by imp@imp_paco-paco on 2008/03/26 19:41:30

	IFC @138652

Affected files ...

.. //depot/projects/mips2-jnpr/src/Makefile#6 integrate
.. //depot/projects/mips2-jnpr/src/ObsoleteFiles.inc#5 integrate
.. //depot/projects/mips2-jnpr/src/bin/sh/options.c#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/hostapd/ChangeLog#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/hostapd/Makefile#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/hostapd/README#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/hostapd/aes_wrap.c#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/hostapd/aes_wrap.h#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/hostapd/common.c#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/hostapd/common.h#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/hostapd/defconfig#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/hostapd/driver.h#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/hostapd/driver_test.c#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/hostapd/eap_aka.c#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/hostapd/eap_gpsk.c#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/hostapd/eap_gpsk_common.c#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/hostapd/eap_gpsk_common.h#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/hostapd/eap_sim.c#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/hostapd/eap_sim_common.c#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/hostapd/eap_sim_db.c#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/hostapd/eap_tls_common.c#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/hostapd/eapol_version.patch#2 delete
.. //depot/projects/mips2-jnpr/src/contrib/hostapd/hostapd.c#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/hostapd/hostapd.conf#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/hostapd/ieee802_11.c#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/hostapd/ieee802_11_auth.c#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/hostapd/ieee802_1x.c#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/hostapd/madwifi.conf#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/hostapd/os.h#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/hostapd/os_unix.c#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/hostapd/radius.c#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/hostapd/radius.h#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/hostapd/radius_client.c#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/hostapd/radius_server.c#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/hostapd/tls_openssl.c#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/hostapd/version.h#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/hostapd/wpa.c#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/ChangeLog#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/FREEBSD-Xlist#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/FREEBSD-upgrade#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/Makefile#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/README#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/aes_wrap.c#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/aes_wrap.h#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/asn1.c#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/common.c#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/common.h#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/config.c#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/config_ssid.h#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/config_winreg.c#2 delete
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/ctrl_iface.c#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/ctrl_iface_dbus.c#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.c#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.h#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/ctrl_iface_named_pipe.c#2 delete
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/ctrl_iface_unix.c#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/dbus-wpa_supplicant.conf#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/dbus-wpa_supplicant.service#1 branch
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/defconfig#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/doc/ctrl_iface.doxygen#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/doc/docbook/wpa_background.8#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/doc/docbook/wpa_cli.8#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/doc/docbook/wpa_cli.sgml#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.8#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.8#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.sgml#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/driver_hostap.h#2 delete
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/driver_ndis.c#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/eap_gpsk.c#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/eap_gpsk_common.c#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/eap_gpsk_common.h#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/eap_peap.c#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/eap_sim.c#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/eap_sim_common.c#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/eap_tlv.c#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/eap_tlv.h#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/eapol_sm.c#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/eapol_test.c#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/eloop_win.c#2 delete
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/events.c#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/main.c#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/os.h#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/os_unix.c#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/pcsc_funcs.c#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/radius.c#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/radius.h#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/radius_client.c#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/tests/test_aes.c#1 branch
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/tests/test_eap_sim_common.c#1 branch
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/tests/test_md4.c#1 branch
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/tests/test_md5.c#1 branch
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/tests/test_ms_funcs.c#1 branch
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/tests/test_sha1.c#1 branch
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/tests/test_sha256.c#1 branch
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/tests/test_x509v3.c#1 branch
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/tls_openssl.c#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/version.h#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/wpa.c#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/wpa_cli.c#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.cpp#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/wpa_gui/setup-mingw-cross-compiling#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/wpa_supplicant.c#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/wpa_supplicant.conf#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/wpa_supplicant_i.h#2 integrate
.. //depot/projects/mips2-jnpr/src/contrib/wpa_supplicant/x509v3.c#2 integrate
.. //depot/projects/mips2-jnpr/src/etc/freebsd-update.conf#2 integrate
.. //depot/projects/mips2-jnpr/src/etc/periodic/security/410.logincheck#2 integrate
.. //depot/projects/mips2-jnpr/src/include/pthread.h#2 integrate
.. //depot/projects/mips2-jnpr/src/include/time.h#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libarchive/Makefile#4 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/arm/net/htonl.S#2 delete
.. //depot/projects/mips2-jnpr/src/lib/libc/arm/net/htons.S#2 delete
.. //depot/projects/mips2-jnpr/src/lib/libc/arm/net/ntohl.S#2 delete
.. //depot/projects/mips2-jnpr/src/lib/libc/arm/net/ntohs.S#2 delete
.. //depot/projects/mips2-jnpr/src/lib/libc/gen/lockf.c#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/include/namespace.h#3 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/include/un-namespace.h#3 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/sys/Symbol.map#4 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/sys/fcntl.2#3 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/yp/xdryp.c#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc_r/uthread/uthread_sig.c#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libelf/libelf_convert.m4#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libkse/thread/thr_sig.c#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libpthread/support/Makefile.inc#2 delete
.. //depot/projects/mips2-jnpr/src/lib/libthr/Makefile#3 integrate
.. //depot/projects/mips2-jnpr/src/lib/libthr/pthread.map#4 integrate
.. //depot/projects/mips2-jnpr/src/lib/libthr/thread/Makefile.inc#3 integrate
.. //depot/projects/mips2-jnpr/src/lib/libthr/thread/thr_attr.c#3 integrate
.. //depot/projects/mips2-jnpr/src/lib/libthr/thread/thr_exit.c#4 integrate
.. //depot/projects/mips2-jnpr/src/lib/libthr/thread/thr_getcpuclockid.c#1 branch
.. //depot/projects/mips2-jnpr/src/lib/libthr/thread/thr_mutex.c#3 integrate
.. //depot/projects/mips2-jnpr/src/lib/libthr/thread/thr_rtld.c#3 integrate
.. //depot/projects/mips2-jnpr/src/lib/libthread_db/Makefile#3 integrate
.. //depot/projects/mips2-jnpr/src/lib/libthread_db/kse.h#1 branch
.. //depot/projects/mips2-jnpr/src/lib/libthread_db/libc_r_db.c#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libthread_db/libpthread_db.c#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libthread_db/libthr_db.c#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libthread_db/thread_db.c#2 integrate
.. //depot/projects/mips2-jnpr/src/libexec/talkd/announce.c#2 integrate
.. //depot/projects/mips2-jnpr/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#4 integrate
.. //depot/projects/mips2-jnpr/src/sbin/bsdlabel/bsdlabel.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sbin/devd/token.l#2 integrate
.. //depot/projects/mips2-jnpr/src/sbin/dhclient/dhclient.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sbin/newfs/newfs.8#2 integrate
.. //depot/projects/mips2-jnpr/src/sbin/route/route.c#2 integrate
.. //depot/projects/mips2-jnpr/src/share/man/man4/bpf.4#2 integrate
.. //depot/projects/mips2-jnpr/src/share/man/man4/malo.4#1 branch
.. //depot/projects/mips2-jnpr/src/share/man/man7/security.7#2 integrate
.. //depot/projects/mips2-jnpr/src/share/man/man9/malloc.9#2 integrate
.. //depot/projects/mips2-jnpr/src/share/man/man9/mbchain.9#2 integrate
.. //depot/projects/mips2-jnpr/src/share/man/man9/mbuf.9#3 integrate
.. //depot/projects/mips2-jnpr/src/share/zoneinfo/asia#2 integrate
.. //depot/projects/mips2-jnpr/src/share/zoneinfo/backward#3 integrate
.. //depot/projects/mips2-jnpr/src/share/zoneinfo/northamerica#2 integrate
.. //depot/projects/mips2-jnpr/src/share/zoneinfo/southamerica#4 integrate
.. //depot/projects/mips2-jnpr/src/share/zoneinfo/zone.tab#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/amd64/amd64/cpu_switch.S#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/amd64/amd64/genassym.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/amd64/amd64/nexus.c#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/amd64/amd64/pmap.c#4 integrate
.. //depot/projects/mips2-jnpr/src/sys/amd64/amd64/prof_machdep.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/amd64/conf/NOTES#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/amd64/ia32/ia32_signal.c#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/amd64/include/clock.h#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/amd64/include/pcb.h#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/amd64/isa/atpic.c#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/amd64/isa/clock.c#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/arm/arm/elf_trampoline.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/arm/conf/AVILA#4 integrate
.. //depot/projects/mips2-jnpr/src/sys/arm/conf/AVILA.hints#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/arm/xscale/ixp425/if_npe.c#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/boot/i386/cdboot/cdboot.s#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/boot/pc98/cdboot/cdboot.s#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/compat/freebsd32/freebsd32_proto.h#4 integrate
.. //depot/projects/mips2-jnpr/src/sys/compat/freebsd32/freebsd32_syscall.h#4 integrate
.. //depot/projects/mips2-jnpr/src/sys/compat/freebsd32/freebsd32_syscalls.c#4 integrate
.. //depot/projects/mips2-jnpr/src/sys/compat/freebsd32/freebsd32_sysent.c#4 integrate
.. //depot/projects/mips2-jnpr/src/sys/compat/freebsd32/syscalls.master#4 integrate
.. //depot/projects/mips2-jnpr/src/sys/compat/linux/linux_file.c#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/compat/linux/linux_futex.c#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/compat/linux/linux_futex.h#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/compat/linux/linux_misc.c#4 integrate
.. //depot/projects/mips2-jnpr/src/sys/compat/svr4/svr4_fcntl.c#4 integrate
.. //depot/projects/mips2-jnpr/src/sys/conf/NOTES#6 integrate
.. //depot/projects/mips2-jnpr/src/sys/conf/files#8 integrate
.. //depot/projects/mips2-jnpr/src/sys/conf/options#6 integrate
.. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#5 integrate
.. //depot/projects/mips2-jnpr/src/sys/ddb/db_command.c#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/ddb/db_ps.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/ddb/ddb.h#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/dev/aac/aac.c#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/dev/aac/aac_cam.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/dev/aac/aac_debug.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/dev/aac/aac_disk.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/dev/aac/aac_pci.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/dev/aac/aacreg.h#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/dev/aac/aacvar.h#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/dev/ata/ata-raid.c#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/dev/ath/if_ath.c#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/dev/cxgb/cxgb_main.c#6 integrate
.. //depot/projects/mips2-jnpr/src/sys/dev/cxgb/cxgb_offload.h#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/dev/cxgb/cxgb_sge.c#4 integrate
.. //depot/projects/mips2-jnpr/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#4 integrate
.. //depot/projects/mips2-jnpr/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#4 integrate
.. //depot/projects/mips2-jnpr/src/sys/dev/dc/if_dc.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/dev/dc/if_dcreg.h#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/dev/drm/drm_pciids.h#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/dev/drm/i915_dma.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/dev/en/midway.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/dev/fatm/if_fatm.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/dev/firewire/if_fwe.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/dev/firewire/if_fwip.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/dev/fxp/if_fxp.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/dev/gem/if_gem.c#4 integrate
.. //depot/projects/mips2-jnpr/src/sys/dev/gem/if_gem_pci.c#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/dev/gem/if_gemreg.h#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/dev/gem/if_gemvar.h#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/dev/iscsi/initiator/isc_soc.c#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/dev/malo/if_malo.c#1 branch
.. //depot/projects/mips2-jnpr/src/sys/dev/malo/if_malo.h#1 branch
.. //depot/projects/mips2-jnpr/src/sys/dev/malo/if_malo_pci.c#1 branch
.. //depot/projects/mips2-jnpr/src/sys/dev/malo/if_malohal.c#1 branch
.. //depot/projects/mips2-jnpr/src/sys/dev/malo/if_malohal.h#1 branch
.. //depot/projects/mips2-jnpr/src/sys/dev/malo/if_maloioctl.h#1 branch
.. //depot/projects/mips2-jnpr/src/sys/dev/mfi/mfi.c#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/dev/re/if_re.c#4 integrate
.. //depot/projects/mips2-jnpr/src/sys/dev/speaker/spkr.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/dev/ti/if_ti.c#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/dev/usb/ucom.c#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/dev/usb/ucomvar.h#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/dev/usb/usbdevs#5 integrate
.. //depot/projects/mips2-jnpr/src/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/fs/msdosfs/msdosfs_vnops.c#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/fs/tmpfs/tmpfs_vnops.c#4 integrate
.. //depot/projects/mips2-jnpr/src/sys/geom/geom.h#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/geom/geom_subr.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/geom/part/g_part.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/geom/part/g_part.h#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/geom/part/g_part_apm.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/geom/part/g_part_bsd.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/geom/part/g_part_gpt.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/geom/part/g_part_mbr.c#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/geom/part/g_part_vtoc8.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/i386/conf/NOTES#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/i386/i386/nexus.c#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/i386/i386/pmap.c#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/i386/ibcs2/ibcs2_fcntl.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/i386/include/clock.h#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/i386/include/vmparam.h#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/i386/isa/atpic.c#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/i386/isa/clock.c#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/i386/isa/prof_machdep.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/i386/isa/vesa.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/isa/syscons_isa.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/kern/bus_if.m#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/kern/init_sysent.c#5 integrate
.. //depot/projects/mips2-jnpr/src/sys/kern/kern_cpuset.c#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/kern/kern_descrip.c#5 integrate
.. //depot/projects/mips2-jnpr/src/sys/kern/kern_exit.c#4 integrate
.. //depot/projects/mips2-jnpr/src/sys/kern/kern_lockf.c#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/kern/kern_sig.c#6 integrate
.. //depot/projects/mips2-jnpr/src/sys/kern/kern_thr.c#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/kern/kern_thread.c#5 integrate
.. //depot/projects/mips2-jnpr/src/sys/kern/kern_timeout.c#4 integrate
.. //depot/projects/mips2-jnpr/src/sys/kern/makesyscalls.sh#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/kern/subr_bus.c#4 integrate
.. //depot/projects/mips2-jnpr/src/sys/kern/subr_mchain.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/kern/subr_sleepqueue.c#5 integrate
.. //depot/projects/mips2-jnpr/src/sys/kern/subr_taskqueue.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/kern/subr_trap.c#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/kern/syscalls.c#5 integrate
.. //depot/projects/mips2-jnpr/src/sys/kern/syscalls.master#5 integrate
.. //depot/projects/mips2-jnpr/src/sys/kern/systrace_args.c#5 integrate
.. //depot/projects/mips2-jnpr/src/sys/kern/uipc_mbuf.c#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/kern/uipc_socket.c#4 integrate
.. //depot/projects/mips2-jnpr/src/sys/kern/uipc_syscalls.c#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/kern/vfs_bio.c#5 integrate
.. //depot/projects/mips2-jnpr/src/sys/kern/vfs_cluster.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/kern/vfs_default.c#4 integrate
.. //depot/projects/mips2-jnpr/src/sys/kern/vfs_mount.c#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/kern/vfs_subr.c#6 integrate
.. //depot/projects/mips2-jnpr/src/sys/kern/vfs_vnops.c#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/kern/vnode_if.src#4 integrate
.. //depot/projects/mips2-jnpr/src/sys/modules/geom/geom_part/Makefile#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/modules/geom/geom_part/geom_part_apm/Makefile#1 branch
.. //depot/projects/mips2-jnpr/src/sys/modules/geom/geom_part/geom_part_bsd/Makefile#1 branch
.. //depot/projects/mips2-jnpr/src/sys/modules/geom/geom_part/geom_part_gpt/Makefile#1 branch
.. //depot/projects/mips2-jnpr/src/sys/modules/geom/geom_part/geom_part_mbr/Makefile#1 branch
.. //depot/projects/mips2-jnpr/src/sys/modules/geom/geom_part/geom_part_vtoc8/Makefile#1 branch
.. //depot/projects/mips2-jnpr/src/sys/modules/malo/Makefile#1 branch
.. //depot/projects/mips2-jnpr/src/sys/net/bpf.c#4 integrate
.. //depot/projects/mips2-jnpr/src/sys/net/bpf.h#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/net/bpf_buffer.c#1 branch
.. //depot/projects/mips2-jnpr/src/sys/net/bpf_buffer.h#1 branch
.. //depot/projects/mips2-jnpr/src/sys/net/bpf_zerocopy.c#1 branch
.. //depot/projects/mips2-jnpr/src/sys/net/bpf_zerocopy.h#1 branch
.. //depot/projects/mips2-jnpr/src/sys/net/bpfdesc.h#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/net/if.c#4 integrate
.. //depot/projects/mips2-jnpr/src/sys/net/if_ef.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/net/if_enc.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/net/if_fddisubr.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/net/if_iso88025subr.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/net/if_loop.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/net/if_media.h#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/net/if_sl.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/net/if_var.h#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/net/raw_cb.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/netatalk/aarp.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/netatm/port.h#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/netgraph/ng_pptpgre.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/netgraph/ng_pptpgre.h#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/netgraph/ng_tee.c#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/netinet/in_pcb.c#4 integrate
.. //depot/projects/mips2-jnpr/src/sys/netinet/in_pcb.h#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/netinet/ip_output.c#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/netinet6/ip6_output.c#4 integrate
.. //depot/projects/mips2-jnpr/src/sys/netipsec/key.c#4 integrate
.. //depot/projects/mips2-jnpr/src/sys/netipsec/xform_tcp.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/netncp/ncp_sock.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/netsmb/smb_iod.c#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/netsmb/smb_rq.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/netsmb/smb_trantcp.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/nfs/nfs_common.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/nfs4client/nfs4_vfsops.c#4 integrate
.. //depot/projects/mips2-jnpr/src/sys/nfs4client/nfs4_vnops.c#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/nfsclient/krpc_subr.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/nfsclient/nfs_lock.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/nfsclient/nfs_socket.c#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/nfsclient/nfs_subs.c#4 integrate
.. //depot/projects/mips2-jnpr/src/sys/nfsclient/nfs_vfsops.c#5 integrate
.. //depot/projects/mips2-jnpr/src/sys/nfsclient/nfs_vnops.c#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/nfsserver/nfs_serv.c#4 integrate
.. //depot/projects/mips2-jnpr/src/sys/nfsserver/nfs_srvcache.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/nfsserver/nfs_srvsock.c#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/nfsserver/nfs_srvsubs.c#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/nfsserver/nfs_syscalls.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/nlm/nlm.h#1 branch
.. //depot/projects/mips2-jnpr/src/sys/nlm/nlm_prot.h#1 branch
.. //depot/projects/mips2-jnpr/src/sys/nlm/nlm_prot_clnt.c#1 branch
.. //depot/projects/mips2-jnpr/src/sys/nlm/nlm_prot_impl.c#1 branch
.. //depot/projects/mips2-jnpr/src/sys/nlm/nlm_prot_server.c#1 branch
.. //depot/projects/mips2-jnpr/src/sys/nlm/nlm_prot_svc.c#1 branch
.. //depot/projects/mips2-jnpr/src/sys/nlm/nlm_prot_xdr.c#1 branch
.. //depot/projects/mips2-jnpr/src/sys/nlm/sm_inter.h#1 branch
.. //depot/projects/mips2-jnpr/src/sys/nlm/sm_inter_xdr.c#1 branch
.. //depot/projects/mips2-jnpr/src/sys/pc98/cbus/clock.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/pc98/cbus/syscons_cbus.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/pc98/conf/NOTES#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/pci/if_mn.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/pci/if_rlreg.h#4 integrate
.. //depot/projects/mips2-jnpr/src/sys/pci/if_vr.c#2 delete
.. //depot/projects/mips2-jnpr/src/sys/pci/if_vrreg.h#2 delete
.. //depot/projects/mips2-jnpr/src/sys/pci/if_xl.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/pci/if_xlreg.h#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/rpc/auth.h#1 branch
.. //depot/projects/mips2-jnpr/src/sys/rpc/auth_none.c#1 branch
.. //depot/projects/mips2-jnpr/src/sys/rpc/auth_unix.c#1 branch
.. //depot/projects/mips2-jnpr/src/sys/rpc/authunix_prot.c#1 branch
.. //depot/projects/mips2-jnpr/src/sys/rpc/clnt.h#1 branch
.. //depot/projects/mips2-jnpr/src/sys/rpc/clnt_dg.c#1 branch
.. //depot/projects/mips2-jnpr/src/sys/rpc/clnt_rc.c#1 branch
.. //depot/projects/mips2-jnpr/src/sys/rpc/clnt_stat.h#1 branch
.. //depot/projects/mips2-jnpr/src/sys/rpc/clnt_vc.c#1 branch
.. //depot/projects/mips2-jnpr/src/sys/rpc/getnetconfig.c#1 branch
.. //depot/projects/mips2-jnpr/src/sys/rpc/inet_ntop.c#1 branch
.. //depot/projects/mips2-jnpr/src/sys/rpc/inet_pton.c#1 branch
.. //depot/projects/mips2-jnpr/src/sys/rpc/netconfig.h#1 branch
.. //depot/projects/mips2-jnpr/src/sys/rpc/nettype.h#1 branch
.. //depot/projects/mips2-jnpr/src/sys/rpc/pmap_prot.h#1 branch
.. //depot/projects/mips2-jnpr/src/sys/rpc/rpc.h#1 branch
.. //depot/projects/mips2-jnpr/src/sys/rpc/rpc_callmsg.c#1 branch
.. //depot/projects/mips2-jnpr/src/sys/rpc/rpc_com.h#1 branch
.. //depot/projects/mips2-jnpr/src/sys/rpc/rpc_generic.c#1 branch
.. //depot/projects/mips2-jnpr/src/sys/rpc/rpc_msg.h#1 branch
.. //depot/projects/mips2-jnpr/src/sys/rpc/rpc_prot.c#1 branch
.. //depot/projects/mips2-jnpr/src/sys/rpc/rpcb_clnt.c#1 branch
.. //depot/projects/mips2-jnpr/src/sys/rpc/rpcb_clnt.h#1 branch
.. //depot/projects/mips2-jnpr/src/sys/rpc/rpcb_prot.c#1 branch
.. //depot/projects/mips2-jnpr/src/sys/rpc/rpcb_prot.h#1 branch
.. //depot/projects/mips2-jnpr/src/sys/rpc/rpcclnt.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/rpc/svc.c#1 branch
.. //depot/projects/mips2-jnpr/src/sys/rpc/svc.h#1 branch
.. //depot/projects/mips2-jnpr/src/sys/rpc/svc_auth.c#1 branch
.. //depot/projects/mips2-jnpr/src/sys/rpc/svc_auth.h#1 branch
.. //depot/projects/mips2-jnpr/src/sys/rpc/svc_auth_unix.c#1 branch
.. //depot/projects/mips2-jnpr/src/sys/rpc/svc_dg.c#1 branch
.. //depot/projects/mips2-jnpr/src/sys/rpc/svc_generic.c#1 branch
.. //depot/projects/mips2-jnpr/src/sys/rpc/svc_vc.c#1 branch
.. //depot/projects/mips2-jnpr/src/sys/rpc/types.h#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/rpc/xdr.h#1 branch
.. //depot/projects/mips2-jnpr/src/sys/sparc64/include/bus.h#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/sparc64/sparc64/bus_machdep.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/sun4v/include/cpu.h#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/sys/aac_ioctl.h#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/sys/buf.h#5 integrate
.. //depot/projects/mips2-jnpr/src/sys/sys/bufobj.h#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/sys/bus.h#4 integrate
.. //depot/projects/mips2-jnpr/src/sys/sys/cdefs.h#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/sys/cpuset.h#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/sys/fcntl.h#4 integrate
.. //depot/projects/mips2-jnpr/src/sys/sys/lockf.h#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/sys/mbuf.h#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/sys/param.h#6 integrate
.. //depot/projects/mips2-jnpr/src/sys/sys/proc.h#6 integrate
.. //depot/projects/mips2-jnpr/src/sys/sys/syscall.h#5 integrate
.. //depot/projects/mips2-jnpr/src/sys/sys/syscall.mk#5 integrate
.. //depot/projects/mips2-jnpr/src/sys/sys/sysproto.h#5 integrate
.. //depot/projects/mips2-jnpr/src/sys/sys/taskqueue.h#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/sys/vnode.h#4 integrate
.. //depot/projects/mips2-jnpr/src/sys/ufs/ffs/ffs_inode.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/ufs/ffs/ffs_rawread.c#4 integrate
.. //depot/projects/mips2-jnpr/src/sys/ufs/ffs/ffs_softdep.c#5 integrate
.. //depot/projects/mips2-jnpr/src/sys/ufs/ffs/ffs_vfsops.c#4 integrate
.. //depot/projects/mips2-jnpr/src/sys/ufs/ffs/ffs_vnops.c#4 integrate
.. //depot/projects/mips2-jnpr/src/sys/ufs/ufs/ufs_vnops.c#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/xdr/xdr.c#1 branch
.. //depot/projects/mips2-jnpr/src/sys/xdr/xdr_array.c#1 branch
.. //depot/projects/mips2-jnpr/src/sys/xdr/xdr_mbuf.c#1 branch
.. //depot/projects/mips2-jnpr/src/sys/xdr/xdr_mem.c#1 branch
.. //depot/projects/mips2-jnpr/src/sys/xdr/xdr_reference.c#1 branch
.. //depot/projects/mips2-jnpr/src/sys/xdr/xdr_sizeof.c#1 branch
.. //depot/projects/mips2-jnpr/src/tools/build/mk/OptionalObsoleteFiles.inc#4 integrate
.. //depot/projects/mips2-jnpr/src/tools/regression/bin/sh/builtins/getopts1.0#1 branch
.. //depot/projects/mips2-jnpr/src/tools/regression/bin/sh/builtins/getopts1.0.stdout#1 branch
.. //depot/projects/mips2-jnpr/src/tools/regression/file/flock/Makefile#1 branch
.. //depot/projects/mips2-jnpr/src/tools/regression/file/flock/flock.c#1 branch
.. //depot/projects/mips2-jnpr/src/tools/tools/net80211/wlanwatch/wlanwatch.c#2 integrate
.. //depot/projects/mips2-jnpr/src/tools/tools/tinybsd/tinybsd#4 integrate
.. //depot/projects/mips2-jnpr/src/usr.bin/checknr/checknr.c#2 integrate
.. //depot/projects/mips2-jnpr/src/usr.bin/make/for.c#2 integrate
.. //depot/projects/mips2-jnpr/src/usr.bin/make/make.1#4 integrate
.. //depot/projects/mips2-jnpr/src/usr.bin/netstat/bpf.c#3 integrate
.. //depot/projects/mips2-jnpr/src/usr.bin/xlint/lint1/lint1.h#2 integrate
.. //depot/projects/mips2-jnpr/src/usr.sbin/Makefile#4 integrate
.. //depot/projects/mips2-jnpr/src/usr.sbin/arp/arp.8#3 integrate
.. //depot/projects/mips2-jnpr/src/usr.sbin/clear_locks/Makefile#1 branch
.. //depot/projects/mips2-jnpr/src/usr.sbin/clear_locks/clear_locks.8#1 branch
.. //depot/projects/mips2-jnpr/src/usr.sbin/clear_locks/clear_locks.c#1 branch
.. //depot/projects/mips2-jnpr/src/usr.sbin/freebsd-update/freebsd-update.sh#2 integrate
.. //depot/projects/mips2-jnpr/src/usr.sbin/rpc.lockd/lockd.c#2 integrate
.. //depot/projects/mips2-jnpr/src/usr.sbin/rpc.lockd/rpc.lockd.8#2 integrate
.. //depot/projects/mips2-jnpr/src/usr.sbin/wpa/wpa_supplicant/Makefile#2 integrate
.. //depot/projects/mips2-jnpr/src/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8#3 integrate

Differences ...

==== //depot/projects/mips2-jnpr/src/Makefile#6 (text+ko) ====

@@ -1,6 +1,6 @@
 #OSX hint: bsdmake BSDMKAE=bsdmake MACHINE_ARCH=i386
 #
-# $FreeBSD: src/Makefile,v 1.345 2008/01/30 19:33:18 jhb Exp $
+# $FreeBSD: src/Makefile,v 1.346 2008/03/25 15:47:22 ru Exp $
 #
 # The user-driven targets are:
 #
@@ -175,6 +175,10 @@
 .MAIN:	all
 
 STARTTIME!= LC_ALL=C date
+CHECK_TIME!= find ${.CURDIR}/sys/sys/param.h -mtime -0
+.if !empty(CHECK_TIME)
+.error check your date/time: ${STARTTIME}
+.endif
 
 .if defined(HISTORICAL_MAKE_WORLD) || defined(DESTDIR)
 #

==== //depot/projects/mips2-jnpr/src/ObsoleteFiles.inc#5 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.133 2008/03/13 18:17:46 brueffer Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.134 2008/03/26 06:45:28 remko Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -1103,6 +1103,9 @@
 OLD_FILES+=usr/sbin/ntptimeset
 OLD_FILES+=usr/share/man/man8/kernbb.8.gz
 OLD_FILES+=usr/share/man/man8/ntp-genkeys.8.gz
+# 20040627: usbdevs.h and usbdevs_data.h removal
+OLD_FILES+=usr/include/dev/usb/usbdevs.h
+OLD_FILES+=usr/include/dev/usb/usbdevs_data.h
 # 200406XX
 OLD_FILES+=usr/bin/gasp
 OLD_FILES+=usr/bin/gdbreplay
@@ -3551,8 +3554,6 @@
 OLD_FILES+=usr/bin/hesinfo
 OLD_FILES+=usr/include/c++/3.4/ext/demangle.h
 OLD_FILES+=usr/include/cam/cam_extend.h
-OLD_FILES+=usr/include/dev/usb/usbdevs.h
-OLD_FILES+=usr/include/dev/usb/usbdevs_data.h
 OLD_FILES+=usr/include/dev/wi/wi_hostap.h
 OLD_FILES+=usr/include/disktab.h
 OLD_FILES+=usr/include/g++/FlexLexer.h

==== //depot/projects/mips2-jnpr/src/bin/sh/options.c#2 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include 
-__FBSDID("$FreeBSD: src/bin/sh/options.c,v 1.25 2006/04/09 12:20:42 stefanf Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/options.c,v 1.26 2008/03/22 14:06:01 stefanf Exp $");
 
 #include 
 #include 
@@ -383,7 +383,7 @@
 	}
 	ap2 = shellparam.p;
 	while ((*ap2++ = *ap1++) != NULL);
-	shellparam.optnext = NULL;
+	shellparam.reset = 1;
 	INTON;
 	return 0;
 }
@@ -405,6 +405,7 @@
 	if (*argptr != NULL) {
 		setparam(argptr);
 	}
+	shellparam.reset = 1;
 	INTON;
 	return 0;
 }
@@ -414,7 +415,6 @@
 getoptsreset(const char *value)
 {
 	if (number(value) == 1) {
-		shellparam.optnext = NULL;
 		shellparam.reset = 1;
 	}
 }

==== //depot/projects/mips2-jnpr/src/contrib/hostapd/ChangeLog#2 (text+ko) ====

@@ -1,5 +1,25 @@
 ChangeLog for hostapd
 
+2008-02-19 - v0.5.10
+	* fixed EAP-SIM and EAP-AKA message parser to validate attribute
+	  lengths properly to avoid potential crash caused by invalid messages
+	* fixed Reassociation Response callback processing when using internal
+	  MLME (driver_{hostap,devicescape,test}.c)
+	* fixed EAP-SIM/AKA realm processing to allow decorated usernames to
+	  be used
+	* added a workaround for EAP-SIM/AKA peers that include incorrect null
+	  termination in the username
+	* fixed EAP-SIM Start response processing for fast reauthentication
+	  case
+	* copy optional Proxy-State attributes into RADIUS response when acting
+	  as a RADIUS authentication server
+
+2007-12-02 - v0.5.9
+	* updated EAP Generalized Pre-Shared Key (EAP-GPSK) to use the latest
+	  draft (draft-ietf-emu-eap-gpsk-07.txt)
+	* fixed debugging code not to use potentially unaligned read to fetch
+	  IPv4 addresses
+
 2007-05-28 - v0.5.8
 	* updated driver_devicescape.c to build with the current
 	  wireless-dev.git tree and net/d80211 changes

==== //depot/projects/mips2-jnpr/src/contrib/hostapd/Makefile#2 (text+ko) ====

@@ -313,6 +313,10 @@
 CFLAGS += -DCONFIG_IPV6
 endif
 
+ifdef CONFIG_DRIVER_RADIUS_ACL
+CFLAGS += -DCONFIG_DRIVER_RADIUS_ACL
+endif
+
 ifdef CONFIG_FULL_DYNAMIC_VLAN
 # define CONFIG_FULL_DYNAMIC_VLAN to have hostapd manipulate bridges
 # and vlan interfaces for the vlan feature.

==== //depot/projects/mips2-jnpr/src/contrib/hostapd/README#2 (text+ko) ====

@@ -2,7 +2,7 @@
 	  Authenticator and RADIUS authentication server
 ================================================================
 
-Copyright (c) 2002-2007, Jouni Malinen  and contributors
+Copyright (c) 2002-2008, Jouni Malinen  and contributors
 All Rights Reserved.
 
 This program is dual-licensed under both the GPL version 2 and BSD

==== //depot/projects/mips2-jnpr/src/contrib/hostapd/aes_wrap.c#2 (text+ko) ====

@@ -7,7 +7,7 @@
  * - AES-128 EAX mode encryption/decryption
  * - AES-128 CBC
  *
- * Copyright (c) 2003-2005, Jouni Malinen 
+ * Copyright (c) 2003-2007, Jouni Malinen 
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -34,10 +34,11 @@
 
 /**
  * aes_wrap - Wrap keys with AES Key Wrap Algorithm (128-bit KEK) (RFC3394)
- * @kek: Key encryption key (KEK)
- * @n: Length of the wrapped key in 64-bit units; e.g., 2 = 128-bit = 16 bytes
- * @plain: Plaintext key to be wrapped, n * 64 bit
- * @cipher: Wrapped key, (n + 1) * 64 bit
+ * @kek: 16-octet Key encryption key (KEK)
+ * @n: Length of the plaintext key in 64-bit units; e.g., 2 = 128-bit = 16
+ * bytes
+ * @plain: Plaintext key to be wrapped, n * 64 bits
+ * @cipher: Wrapped key, (n + 1) * 64 bits
  * Returns: 0 on success, -1 on failure
  */
 int aes_wrap(const u8 *kek, int n, const u8 *plain, u8 *cipher)
@@ -93,9 +94,10 @@
 /**
  * aes_unwrap - Unwrap key with AES Key Wrap Algorithm (128-bit KEK) (RFC3394)
  * @kek: Key encryption key (KEK)
- * @n: Length of the wrapped key in 64-bit units; e.g., 2 = 128-bit = 16 bytes
- * @cipher: Wrapped key to be unwrapped, (n + 1) * 64 bit
- * @plain: Plaintext key, n * 64 bit
+ * @n: Length of the plaintext key in 64-bit units; e.g., 2 = 128-bit = 16
+ * bytes
+ * @cipher: Wrapped key to be unwrapped, (n + 1) * 64 bits
+ * @plain: Plaintext key, n * 64 bits
  * Returns: 0 on success, -1 on failure (e.g., integrity verification failed)
  */
 int aes_unwrap(const u8 *kek, int n, const u8 *cipher, u8 *plain)
@@ -167,28 +169,45 @@
 
 
 /**
- * omac1_aes_128 - One-Key CBC MAC (OMAC1) hash with AES-128 (aka AES-CMAC)
+ * omac1_aes_128_vector - One-Key CBC MAC (OMAC1) hash with AES-128
  * @key: 128-bit key for the hash operation
- * @data: Data buffer for which a MAC is determined
- * @data: Length of data buffer in bytes
+ * @num_elem: Number of elements in the data vector
+ * @addr: Pointers to the data areas
+ * @len: Lengths of the data blocks
  * @mac: Buffer for MAC (128 bits, i.e., 16 bytes)
  * Returns: 0 on success, -1 on failure
  */
-int omac1_aes_128(const u8 *key, const u8 *data, size_t data_len, u8 *mac)
+int omac1_aes_128_vector(const u8 *key, size_t num_elem,
+			 const u8 *addr[], const size_t *len, u8 *mac)
 {
 	void *ctx;
 	u8 cbc[BLOCK_SIZE], pad[BLOCK_SIZE];
-	const u8 *pos = data;
-	size_t i, left = data_len;
+	const u8 *pos, *end;
+	size_t i, e, left, total_len;
 
 	ctx = aes_encrypt_init(key, 16);
 	if (ctx == NULL)
 		return -1;
 	os_memset(cbc, 0, BLOCK_SIZE);
 
+	total_len = 0;
+	for (e = 0; e < num_elem; e++)
+		total_len += len[e];
+	left = total_len;
+
+	e = 0;
+	pos = addr[0];
+	end = pos + len[0];
+
 	while (left >= BLOCK_SIZE) {
-		for (i = 0; i < BLOCK_SIZE; i++)
+		for (i = 0; i < BLOCK_SIZE; i++) {
 			cbc[i] ^= *pos++;
+			if (pos >= end) {
+				e++;
+				pos = addr[e];
+				end = pos + len[e];
+			}
+		}
 		if (left > BLOCK_SIZE)
 			aes_encrypt(ctx, cbc, cbc);
 		left -= BLOCK_SIZE;
@@ -198,9 +217,15 @@
 	aes_encrypt(ctx, pad, pad);
 	gf_mulx(pad);
 
-	if (left || data_len == 0) {
-		for (i = 0; i < left; i++)
+	if (left || total_len == 0) {
+		for (i = 0; i < left; i++) {
 			cbc[i] ^= *pos++;
+			if (pos >= end) {
+				e++;
+				pos = addr[e];
+				end = pos + len[e];
+			}
+		}
 		cbc[left] ^= 0x80;
 		gf_mulx(pad);
 	}
@@ -212,6 +237,24 @@
 	return 0;
 }
 
+
+/**
+ * omac1_aes_128 - One-Key CBC MAC (OMAC1) hash with AES-128 (aka AES-CMAC)
+ * @key: 128-bit key for the hash operation
+ * @data: Data buffer for which a MAC is determined
+ * @data_len: Length of data buffer in bytes
+ * @mac: Buffer for MAC (128 bits, i.e., 16 bytes)
+ * Returns: 0 on success, -1 on failure
+ *
+ * This is a mode for using block cipher (AES in this case) for authentication.
+ * OMAC1 was standardized with the name CMAC by NIST in a Special Publication
+ * (SP) 800-38B.
+ */
+int omac1_aes_128(const u8 *key, const u8 *data, size_t data_len, u8 *mac)
+{
+	return omac1_aes_128_vector(key, 1, &data, &data_len, mac);
+}
+
 #endif /* CONFIG_NO_AES_OMAC1 */
 
 

==== //depot/projects/mips2-jnpr/src/contrib/hostapd/aes_wrap.h#2 (text+ko) ====

@@ -7,7 +7,7 @@
  * - AES-128 EAX mode encryption/decryption
  * - AES-128 CBC
  *
- * Copyright (c) 2003-2005, Jouni Malinen 
+ * Copyright (c) 2003-2007, Jouni Malinen 
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -24,6 +24,8 @@
 
 int aes_wrap(const u8 *kek, int n, const u8 *plain, u8 *cipher);
 int aes_unwrap(const u8 *kek, int n, const u8 *cipher, u8 *plain);
+int omac1_aes_128_vector(const u8 *key, size_t num_elem,
+			 const u8 *addr[], const size_t *len, u8 *mac);
 int omac1_aes_128(const u8 *key, const u8 *data, size_t data_len, u8 *mac);
 int aes_128_encrypt_block(const u8 *key, const u8 *in, u8 *out);
 int aes_128_ctr_encrypt(const u8 *key, const u8 *nonce,

==== //depot/projects/mips2-jnpr/src/contrib/hostapd/common.c#2 (text+ko) ====

@@ -20,7 +20,6 @@
 #ifdef CONFIG_DEBUG_FILE
 static FILE *out_file = NULL;
 #endif /* CONFIG_DEBUG_FILE */
-int wpa_debug_use_file = 0;
 int wpa_debug_level = MSG_INFO;
 int wpa_debug_show_keys = 0;
 int wpa_debug_timestamp = 0;
@@ -344,32 +343,29 @@
 }
 
 
-int wpa_debug_open_file(void)
+int wpa_debug_open_file(const char *path)
 {
 #ifdef CONFIG_DEBUG_FILE
-	static int count = 0;
-	char fname[64];
-	if (!wpa_debug_use_file)
+	if (!path)
 		return 0;
-#ifdef _WIN32
-	os_snprintf(fname, sizeof(fname), "\\Temp\\wpa_supplicant-log-%d.txt",
-		    count++);
-#else /* _WIN32 */
-	os_snprintf(fname, sizeof(fname), "/tmp/wpa_supplicant-log-%d.txt",
-		    count++);
+	out_file = fopen(path, "a");
+	if (out_file == NULL) {
+		wpa_printf(MSG_ERROR, "wpa_debug_open_file: Failed to open "
+			   "output file, using standard output");
+		return -1;
+	}
+#ifndef _WIN32
+	setvbuf(out_file, NULL, _IOLBF, 0);
 #endif /* _WIN32 */
-	out_file = fopen(fname, "w");
-	return out_file == NULL ? -1 : 0;
-#else /* CONFIG_DEBUG_FILE */
+#endif /* CONFIG_DEBUG_FILE */
 	return 0;
-#endif /* CONFIG_DEBUG_FILE */
 }
 
 
 void wpa_debug_close_file(void)
 {
 #ifdef CONFIG_DEBUG_FILE
-	if (!wpa_debug_use_file)
+	if (!out_file)
 		return;
 	fclose(out_file);
 	out_file = NULL;

==== //depot/projects/mips2-jnpr/src/contrib/hostapd/common.h#2 (text+ko) ====

@@ -264,12 +264,12 @@
 #define wpa_hexdump_key(l,t,b,le) do { } while (0)
 #define wpa_hexdump_ascii(l,t,b,le) do { } while (0)
 #define wpa_hexdump_ascii_key(l,t,b,le) do { } while (0)
-#define wpa_debug_open_file() do { } while (0)
+#define wpa_debug_open_file(p) do { } while (0)
 #define wpa_debug_close_file() do { } while (0)
 
 #else /* CONFIG_NO_STDOUT_DEBUG */
 
-int wpa_debug_open_file(void);
+int wpa_debug_open_file(const char *path);
 void wpa_debug_close_file(void);
 
 /**

==== //depot/projects/mips2-jnpr/src/contrib/hostapd/defconfig#2 (text+ko) ====

@@ -102,3 +102,7 @@
 
 # Build IPv6 support for RADIUS operations
 CONFIG_IPV6=y
+
+# Use the hostapd's IEEE 802.11 authentication (ACL), but without
+# the IEEE 802.11 Management capability
+CONFIG_DRIVER_RADIUS_ACL=y

==== //depot/projects/mips2-jnpr/src/contrib/hostapd/driver.h#2 (text+ko) ====

@@ -141,6 +141,10 @@
 	 * this handler will be called after initial setup has been completed.
 	 */
 	int (*commit)(void *priv);
+
+	int (*set_radius_acl_auth)(void *priv, const u8 *mac, int accepted, 
+			u32 session_timeout);
+	int (*set_radius_acl_expire)(void *priv, const u8 *mac);
 };
 
 static inline int
@@ -653,4 +657,22 @@
 	return hapd->driver->commit(hapd->driver);
 }
 
+static inline int 
+hostapd_set_radius_acl_auth(struct hostapd_data *hapd, const u8 *mac, int accepted, 
+	u32 session_timeout)
+{
+	if (hapd->driver == NULL || hapd->driver->set_radius_acl_auth == NULL)
+		return 0;
+	return hapd->driver->set_radius_acl_auth(hapd->driver, mac, accepted,
+						 session_timeout);
+}
+
+static inline int 
+hostapd_set_radius_acl_expire(struct hostapd_data *hapd, const u8 *mac)
+{
+	if (hapd->driver == NULL || hapd->driver->set_radius_acl_expire == NULL)
+		return 0;
+	return hapd->driver->set_radius_acl_expire(hapd->driver, mac);
+}
+
 #endif /* DRIVER_H */

==== //depot/projects/mips2-jnpr/src/contrib/hostapd/driver_test.c#2 (text+ko) ====

@@ -170,9 +170,10 @@
 	u16 fc;
 
 	if (drv->test_socket < 0 || len < 10 || drv->socket_dir == NULL) {
-		wpa_printf(MSG_DEBUG, "%s: invalid parameters (sock=%d len=%d "
-			   "socket_dir=%p)",
-			   __func__, drv->test_socket, len, drv->socket_dir);
+		wpa_printf(MSG_DEBUG, "%s: invalid parameters (sock=%d len=%lu"
+			   " socket_dir=%p)",
+			   __func__, drv->test_socket, (unsigned long) len,
+			   drv->socket_dir);
 		return -1;
 	}
 

==== //depot/projects/mips2-jnpr/src/contrib/hostapd/eap_aka.c#2 (text+ko) ====

@@ -1,6 +1,6 @@
 /*
  * hostapd / EAP-AKA (RFC 4187)
- * Copyright (c) 2005-2007, Jouni Malinen 
+ * Copyright (c) 2005-2008, Jouni Malinen 
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -124,6 +124,14 @@
 				      sm->identity_len)) {
 		wpa_printf(MSG_DEBUG, "   AT_PERMANENT_ID_REQ");
 		eap_sim_msg_add(msg, EAP_SIM_AT_PERMANENT_ID_REQ, 0, NULL, 0);
+	} else {
+		/*
+		 * RFC 4187, Chap. 4.1.4 recommends that identity from EAP is
+		 * ignored and the AKA/Identity is used to request the
+		 * identity.
+		 */
+		wpa_printf(MSG_DEBUG, "   AT_ANY_ID_REQ");
+		eap_sim_msg_add(msg, EAP_SIM_AT_ANY_ID_REQ, 0, NULL, 0);
 	}
 	return eap_sim_msg_finish(msg, reqDataLen, NULL, NULL, 0);
 }
@@ -445,10 +453,16 @@
 		sm->method_pending = METHOD_PENDING_NONE;
 	}
 
+	identity_len = sm->identity_len;
+	while (identity_len > 0 && sm->identity[identity_len - 1] == '\0') {
+		wpa_printf(MSG_DEBUG, "EAP-AKA: Workaround - drop last null "
+			   "character from identity");
+		identity_len--;
+	}
 	wpa_hexdump_ascii(MSG_DEBUG, "EAP-AKA: Identity for MK derivation",
-			  sm->identity, sm->identity_len);
+			  sm->identity, identity_len);
 
-	eap_aka_derive_mk(sm->identity, sm->identity_len, data->ik, data->ck,
+	eap_aka_derive_mk(sm->identity, identity_len, data->ik, data->ck,
 			  data->mk);
 	eap_sim_derive_keys(data->mk, data->k_encr, data->k_aut, data->msk,
 			    data->emsk);

==== //depot/projects/mips2-jnpr/src/contrib/hostapd/eap_gpsk.c#2 (text+ko) ====

@@ -1,5 +1,5 @@
 /*
- * hostapd / EAP-GPSK (draft-ietf-emu-eap-gpsk-03.txt) server
+ * hostapd / EAP-GPSK (draft-ietf-emu-eap-gpsk-08.txt) server
  * Copyright (c) 2006-2007, Jouni Malinen 
  *
  * This program is free software; you can redistribute it and/or modify
@@ -23,15 +23,15 @@
 struct eap_gpsk_data {
 	enum { GPSK_1, GPSK_3, SUCCESS, FAILURE } state;
 	u8 rand_server[EAP_GPSK_RAND_LEN];
-	u8 rand_client[EAP_GPSK_RAND_LEN];
+	u8 rand_peer[EAP_GPSK_RAND_LEN];
 	u8 msk[EAP_MSK_LEN];
 	u8 emsk[EAP_EMSK_LEN];
 	u8 sk[EAP_GPSK_MAX_SK_LEN];
 	size_t sk_len;
 	u8 pk[EAP_GPSK_MAX_PK_LEN];
 	size_t pk_len;
-	u8 *id_client;
-	size_t id_client_len;
+	u8 *id_peer;
+	size_t id_peer_len;
 	u8 *id_server;
 	size_t id_server_len;
 #define MAX_NUM_CSUITES 2
@@ -85,17 +85,17 @@
 	data->csuite_count = 0;
 	if (eap_gpsk_supported_ciphersuite(EAP_GPSK_VENDOR_IETF,
 					   EAP_GPSK_CIPHER_AES)) {
-		WPA_PUT_BE24(data->csuite_list[data->csuite_count].vendor,
+		WPA_PUT_BE32(data->csuite_list[data->csuite_count].vendor,
 			     EAP_GPSK_VENDOR_IETF);
-		WPA_PUT_BE24(data->csuite_list[data->csuite_count].specifier,
+		WPA_PUT_BE16(data->csuite_list[data->csuite_count].specifier,
 			     EAP_GPSK_CIPHER_AES);
 		data->csuite_count++;
 	}
 	if (eap_gpsk_supported_ciphersuite(EAP_GPSK_VENDOR_IETF,
 					   EAP_GPSK_CIPHER_SHA256)) {
-		WPA_PUT_BE24(data->csuite_list[data->csuite_count].vendor,
+		WPA_PUT_BE32(data->csuite_list[data->csuite_count].vendor,
 			     EAP_GPSK_VENDOR_IETF);
-		WPA_PUT_BE24(data->csuite_list[data->csuite_count].specifier,
+		WPA_PUT_BE16(data->csuite_list[data->csuite_count].specifier,
 			     EAP_GPSK_CIPHER_SHA256);
 		data->csuite_count++;
 	}
@@ -108,7 +108,7 @@
 {
 	struct eap_gpsk_data *data = priv;
 	free(data->id_server);
-	free(data->id_client);
+	free(data->id_peer);
 	free(data);
 }

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Wed Mar 26 19:46:35 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 512761065677; Wed, 26 Mar 2008 19:46: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 0FE50106566C
	for ; Wed, 26 Mar 2008 19:46:35 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id DE20C8FC21
	for ; Wed, 26 Mar 2008 19:46:34 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2QJkYXQ079807
	for ; Wed, 26 Mar 2008 19:46:34 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2QJkY5C079805
	for perforce@freebsd.org; Wed, 26 Mar 2008 19:46:34 GMT
	(envelope-from imp@freebsd.org)
Date: Wed, 26 Mar 2008 19:46:34 GMT
Message-Id: <200803261946.m2QJkY5C079805@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138654 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 26 Mar 2008 19:46:35 -0000

http://perforce.freebsd.org/chv.cgi?CH=138654

Change 138654 by imp@imp_paco-paco on 2008/03/26 19:45:54

	IFC @138653

Affected files ...

.. //depot/projects/arm/src/sys/i386/include/nexusvar.h#3 branch
.. //depot/user/imp/freebsd-imp/contrib/cvs/doc/HACKING.DOCS#3 branch
.. //depot/user/imp/newcard/i386/include/nexusvar.h#4 branch

Differences ...

From owner-p4-projects@FreeBSD.ORG  Wed Mar 26 20:00:51 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 106921065676; Wed, 26 Mar 2008 20:00: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 C384E1065671
	for ; Wed, 26 Mar 2008 20:00:50 +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 B75CC8FC22
	for ; Wed, 26 Mar 2008 20:00:50 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2QK0oQx080403
	for ; Wed, 26 Mar 2008 20:00:50 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2QK0o7P080401
	for perforce@freebsd.org; Wed, 26 Mar 2008 20:00:50 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 26 Mar 2008 20:00:50 GMT
Message-Id: <200803262000.m2QK0o7P080401@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 138655 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 26 Mar 2008 20:00:51 -0000

http://perforce.freebsd.org/chv.cgi?CH=138655

Change 138655 by sam@sam_ebb on 2008/03/26 20:00:38

	fix typo

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_ddb.c#7 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_ddb.c#7 (text+ko) ====

@@ -56,7 +56,7 @@
 	"\33INPUT\34CRYPTO\35DUPMPKTS\36DEBUG\3711N"
 
 #define	IEEE80211_F_BITS \
-	"\20\1TURBOP\2COMP\3FF\4BURST\5PRIVACY\6PUREG\10SCAN\11ASCAN\1wSIBSS" \
+	"\20\1TURBOP\2COMP\3FF\4BURST\5PRIVACY\6PUREG\10SCAN\11ASCAN\12SIBSS" \
 	"\13SHSLOT\14PMGTON\15DESBSSID\16WME\17BGSCAN\20SWRETRY\21TXPOW_FIXED" \
 	"\22IBSSON\23SHPREAMBLE\24DATAPAD\25USEPROT\26USERBARKER\27CSAPENDING" \
 	"\30WPA1\31WPA2\32DROPUNENC\33COUNTERM\34HIDESSID\35NOBRIDG\36PCF" \

From owner-p4-projects@FreeBSD.ORG  Wed Mar 26 20:45:39 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CED0F106567A; Wed, 26 Mar 2008 20:45:38 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8D0FC1065676
	for ; Wed, 26 Mar 2008 20:45:38 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 7E3D18FC1F
	for ; Wed, 26 Mar 2008 20:45:38 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2QKjckn083813
	for ; Wed, 26 Mar 2008 20:45:38 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2QKjbr6083811
	for perforce@freebsd.org; Wed, 26 Mar 2008 20:45:37 GMT
	(envelope-from piso@freebsd.org)
Date: Wed, 26 Mar 2008 20:45:37 GMT
Message-Id: <200803262045.m2QKjbr6083811@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	piso@freebsd.org using -f
From: Paolo Pisati 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138659 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 26 Mar 2008 20:45:39 -0000

http://perforce.freebsd.org/chv.cgi?CH=138659

Change 138659 by piso@piso_newluxor on 2008/03/26 20:45:29

	IFC@138657

Affected files ...

.. //depot/projects/soc2005/libalias/Makefile#15 integrate
.. //depot/projects/soc2005/libalias/ObsoleteFiles.inc#27 integrate
.. //depot/projects/soc2005/libalias/contrib/hostapd/ChangeLog#3 integrate
.. //depot/projects/soc2005/libalias/contrib/hostapd/Makefile#3 integrate
.. //depot/projects/soc2005/libalias/contrib/hostapd/README#3 integrate
.. //depot/projects/soc2005/libalias/contrib/hostapd/aes_wrap.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/hostapd/aes_wrap.h#3 integrate
.. //depot/projects/soc2005/libalias/contrib/hostapd/common.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/hostapd/common.h#3 integrate
.. //depot/projects/soc2005/libalias/contrib/hostapd/defconfig#3 integrate
.. //depot/projects/soc2005/libalias/contrib/hostapd/driver.h#3 integrate
.. //depot/projects/soc2005/libalias/contrib/hostapd/driver_test.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/hostapd/eap_aka.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/hostapd/eap_gpsk.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/hostapd/eap_gpsk_common.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/hostapd/eap_gpsk_common.h#2 integrate
.. //depot/projects/soc2005/libalias/contrib/hostapd/eap_sim.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/hostapd/eap_sim_common.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/hostapd/eap_sim_db.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/hostapd/eap_tls_common.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/hostapd/eapol_version.patch#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/hostapd.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/hostapd/hostapd.conf#3 integrate
.. //depot/projects/soc2005/libalias/contrib/hostapd/ieee802_11.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/hostapd/ieee802_11_auth.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/hostapd/ieee802_1x.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/hostapd/madwifi.conf#2 integrate
.. //depot/projects/soc2005/libalias/contrib/hostapd/os.h#2 integrate
.. //depot/projects/soc2005/libalias/contrib/hostapd/os_unix.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/hostapd/radius.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/hostapd/radius.h#3 integrate
.. //depot/projects/soc2005/libalias/contrib/hostapd/radius_client.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/hostapd/radius_server.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/hostapd/tls_openssl.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/hostapd/version.h#3 integrate
.. //depot/projects/soc2005/libalias/contrib/hostapd/wpa.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/ChangeLog#3 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/FREEBSD-Xlist#3 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/FREEBSD-upgrade#3 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/Makefile#3 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/README#3 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/aes_wrap.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/aes_wrap.h#3 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/asn1.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/common.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/common.h#3 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/config.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/config_ssid.h#3 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/config_winreg.c#2 delete
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/ctrl_iface.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/ctrl_iface_dbus.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.h#2 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/ctrl_iface_named_pipe.c#2 delete
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/ctrl_iface_unix.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/dbus-wpa_supplicant.conf#2 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/dbus-wpa_supplicant.service#1 branch
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/defconfig#3 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/doc/ctrl_iface.doxygen#3 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/doc/docbook/wpa_background.8#3 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/doc/docbook/wpa_cli.8#3 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/doc/docbook/wpa_cli.sgml#3 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.8#3 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.8#3 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5#3 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.sgml#3 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/driver_hostap.h#3 delete
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/driver_ndis.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eap_gpsk.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eap_gpsk_common.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eap_gpsk_common.h#2 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eap_peap.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eap_sim.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eap_sim_common.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eap_tlv.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eap_tlv.h#3 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eapol_sm.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eapol_test.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/eloop_win.c#2 delete
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/events.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/main.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/os.h#2 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/os_unix.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/pcsc_funcs.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/radius.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/radius.h#3 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/radius_client.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/tests/test_aes.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/tests/test_eap_sim_common.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/tests/test_md4.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/tests/test_md5.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/tests/test_ms_funcs.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/tests/test_sha1.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/tests/test_sha256.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/tests/test_x509v3.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/tls_openssl.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/version.h#3 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa_cli.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp#2 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.cpp#2 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h#3 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa_gui/setup-mingw-cross-compiling#2 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h#3 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa_supplicant.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa_supplicant.conf#3 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/wpa_supplicant_i.h#3 integrate
.. //depot/projects/soc2005/libalias/contrib/wpa_supplicant/x509v3.c#2 integrate
.. //depot/projects/soc2005/libalias/etc/freebsd-update.conf#3 integrate
.. //depot/projects/soc2005/libalias/etc/periodic/security/410.logincheck#2 integrate
.. //depot/projects/soc2005/libalias/lib/libc/gen/lockf.c#2 integrate
.. //depot/projects/soc2005/libalias/lib/libc/include/namespace.h#3 integrate
.. //depot/projects/soc2005/libalias/lib/libc/include/un-namespace.h#3 integrate
.. //depot/projects/soc2005/libalias/lib/libc/sys/Symbol.map#8 integrate
.. //depot/projects/soc2005/libalias/lib/libc/sys/fcntl.2#4 integrate
.. //depot/projects/soc2005/libalias/lib/libc/yp/xdryp.c#2 integrate
.. //depot/projects/soc2005/libalias/lib/libc_r/uthread/uthread_sig.c#4 integrate
.. //depot/projects/soc2005/libalias/lib/libelf/libelf_convert.m4#4 integrate
.. //depot/projects/soc2005/libalias/lib/libkse/thread/thr_sig.c#3 integrate
.. //depot/projects/soc2005/libalias/lib/libthr/Makefile#7 integrate
.. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_attr.c#6 integrate
.. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_exit.c#7 integrate
.. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_mutex.c#12 integrate
.. //depot/projects/soc2005/libalias/libexec/talkd/announce.c#2 integrate
.. //depot/projects/soc2005/libalias/share/man/man4/bpf.4#3 integrate
.. //depot/projects/soc2005/libalias/share/man/man4/malo.4#1 branch
.. //depot/projects/soc2005/libalias/share/man/man7/security.7#4 integrate
.. //depot/projects/soc2005/libalias/share/man/man9/malloc.9#2 integrate
.. //depot/projects/soc2005/libalias/share/man/man9/mbchain.9#2 integrate
.. //depot/projects/soc2005/libalias/share/man/man9/mbuf.9#7 integrate
.. //depot/projects/soc2005/libalias/share/zoneinfo/asia#6 integrate
.. //depot/projects/soc2005/libalias/share/zoneinfo/backward#5 integrate
.. //depot/projects/soc2005/libalias/share/zoneinfo/northamerica#6 integrate
.. //depot/projects/soc2005/libalias/share/zoneinfo/southamerica#7 integrate
.. //depot/projects/soc2005/libalias/share/zoneinfo/zone.tab#6 integrate
.. //depot/projects/soc2005/libalias/sys/amd64/amd64/cpu_switch.S#6 integrate
.. //depot/projects/soc2005/libalias/sys/amd64/amd64/genassym.c#9 integrate
.. //depot/projects/soc2005/libalias/sys/amd64/amd64/pmap.c#17 integrate
.. //depot/projects/soc2005/libalias/sys/amd64/amd64/prof_machdep.c#5 integrate
.. //depot/projects/soc2005/libalias/sys/amd64/conf/NOTES#10 integrate
.. //depot/projects/soc2005/libalias/sys/amd64/ia32/ia32_signal.c#4 integrate
.. //depot/projects/soc2005/libalias/sys/amd64/include/clock.h#5 integrate
.. //depot/projects/soc2005/libalias/sys/amd64/include/pcb.h#3 integrate
.. //depot/projects/soc2005/libalias/sys/amd64/include/timerreg.h#2 integrate
.. //depot/projects/soc2005/libalias/sys/amd64/isa/clock.c#9 integrate
.. //depot/projects/soc2005/libalias/sys/boot/i386/cdboot/cdboot.s#4 integrate
.. //depot/projects/soc2005/libalias/sys/boot/pc98/cdboot/cdboot.s#4 integrate
.. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_proto.h#17 integrate
.. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_syscall.h#17 integrate
.. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_syscalls.c#17 integrate
.. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_sysent.c#17 integrate
.. //depot/projects/soc2005/libalias/sys/compat/freebsd32/syscalls.master#17 integrate
.. //depot/projects/soc2005/libalias/sys/compat/linux/linux_file.c#11 integrate
.. //depot/projects/soc2005/libalias/sys/compat/linux/linux_misc.c#19 integrate
.. //depot/projects/soc2005/libalias/sys/compat/svr4/svr4_fcntl.c#7 integrate
.. //depot/projects/soc2005/libalias/sys/conf/NOTES#30 integrate
.. //depot/projects/soc2005/libalias/sys/conf/files#35 integrate
.. //depot/projects/soc2005/libalias/sys/conf/options#27 integrate
.. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#7 integrate
.. //depot/projects/soc2005/libalias/sys/ddb/db_command.c#8 integrate
.. //depot/projects/soc2005/libalias/sys/ddb/db_ps.c#7 integrate
.. //depot/projects/soc2005/libalias/sys/ddb/ddb.h#4 integrate
.. //depot/projects/soc2005/libalias/sys/dev/aac/aac.c#7 integrate
.. //depot/projects/soc2005/libalias/sys/dev/aac/aac_cam.c#9 integrate
.. //depot/projects/soc2005/libalias/sys/dev/aac/aac_debug.c#3 integrate
.. //depot/projects/soc2005/libalias/sys/dev/aac/aac_disk.c#2 integrate
.. //depot/projects/soc2005/libalias/sys/dev/aac/aac_pci.c#6 integrate
.. //depot/projects/soc2005/libalias/sys/dev/aac/aacreg.h#3 integrate
.. //depot/projects/soc2005/libalias/sys/dev/aac/aacvar.h#4 integrate
.. //depot/projects/soc2005/libalias/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#3 integrate
.. //depot/projects/soc2005/libalias/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#3 integrate
.. //depot/projects/soc2005/libalias/sys/dev/dc/if_dc.c#10 integrate
.. //depot/projects/soc2005/libalias/sys/dev/dc/if_dcreg.h#5 integrate
.. //depot/projects/soc2005/libalias/sys/dev/en/midway.c#5 integrate
.. //depot/projects/soc2005/libalias/sys/dev/fatm/if_fatm.c#3 integrate
.. //depot/projects/soc2005/libalias/sys/dev/firewire/if_fwe.c#4 integrate
.. //depot/projects/soc2005/libalias/sys/dev/firewire/if_fwip.c#5 integrate
.. //depot/projects/soc2005/libalias/sys/dev/gem/if_gem.c#8 integrate
.. //depot/projects/soc2005/libalias/sys/dev/gem/if_gem_pci.c#6 integrate
.. //depot/projects/soc2005/libalias/sys/dev/gem/if_gemreg.h#5 integrate
.. //depot/projects/soc2005/libalias/sys/dev/gem/if_gemvar.h#6 integrate
.. //depot/projects/soc2005/libalias/sys/dev/iscsi/initiator/isc_soc.c#3 integrate
.. //depot/projects/soc2005/libalias/sys/dev/malo/if_malo.c#1 branch
.. //depot/projects/soc2005/libalias/sys/dev/malo/if_malo.h#1 branch
.. //depot/projects/soc2005/libalias/sys/dev/malo/if_malo_pci.c#1 branch
.. //depot/projects/soc2005/libalias/sys/dev/malo/if_malohal.c#1 branch
.. //depot/projects/soc2005/libalias/sys/dev/malo/if_malohal.h#1 branch
.. //depot/projects/soc2005/libalias/sys/dev/malo/if_maloioctl.h#1 branch
.. //depot/projects/soc2005/libalias/sys/dev/speaker/spkr.c#3 integrate
.. //depot/projects/soc2005/libalias/sys/dev/syscons/syscons.c#9 integrate
.. //depot/projects/soc2005/libalias/sys/dev/ti/if_ti.c#8 integrate
.. //depot/projects/soc2005/libalias/sys/dev/usb/ucom.c#6 integrate
.. //depot/projects/soc2005/libalias/sys/dev/usb/ucomvar.h#4 integrate
.. //depot/projects/soc2005/libalias/sys/dev/usb/usbdevs#16 integrate
.. //depot/projects/soc2005/libalias/sys/fs/msdosfs/msdosfs_vnops.c#8 integrate
.. //depot/projects/soc2005/libalias/sys/fs/tmpfs/tmpfs_vnops.c#3 integrate
.. //depot/projects/soc2005/libalias/sys/i386/conf/NOTES#12 integrate
.. //depot/projects/soc2005/libalias/sys/i386/i386/trap.c#12 integrate
.. //depot/projects/soc2005/libalias/sys/i386/ibcs2/ibcs2_fcntl.c#2 integrate
.. //depot/projects/soc2005/libalias/sys/i386/include/clock.h#5 integrate
.. //depot/projects/soc2005/libalias/sys/i386/include/timerreg.h#2 integrate
.. //depot/projects/soc2005/libalias/sys/i386/include/vmparam.h#7 integrate
.. //depot/projects/soc2005/libalias/sys/i386/isa/clock.c#10 integrate
.. //depot/projects/soc2005/libalias/sys/i386/isa/prof_machdep.c#5 integrate
.. //depot/projects/soc2005/libalias/sys/i386/isa/vesa.c#2 integrate
.. //depot/projects/soc2005/libalias/sys/ia64/ia64/machdep.c#13 integrate
.. //depot/projects/soc2005/libalias/sys/ia64/include/clock.h#3 integrate
.. //depot/projects/soc2005/libalias/sys/isa/syscons_isa.c#3 integrate
.. //depot/projects/soc2005/libalias/sys/kern/init_sysent.c#16 integrate
.. //depot/projects/soc2005/libalias/sys/kern/kern_cpuset.c#4 integrate
.. //depot/projects/soc2005/libalias/sys/kern/kern_descrip.c#14 integrate
.. //depot/projects/soc2005/libalias/sys/kern/kern_lockf.c#5 integrate
.. //depot/projects/soc2005/libalias/sys/kern/makesyscalls.sh#6 integrate
.. //depot/projects/soc2005/libalias/sys/kern/subr_mchain.c#2 integrate
.. //depot/projects/soc2005/libalias/sys/kern/subr_taskqueue.c#5 integrate
.. //depot/projects/soc2005/libalias/sys/kern/syscalls.c#16 integrate
.. //depot/projects/soc2005/libalias/sys/kern/syscalls.master#17 integrate
.. //depot/projects/soc2005/libalias/sys/kern/systrace_args.c#13 integrate
.. //depot/projects/soc2005/libalias/sys/kern/tty_cons.c#7 integrate
.. //depot/projects/soc2005/libalias/sys/kern/uipc_mbuf.c#11 integrate
.. //depot/projects/soc2005/libalias/sys/kern/uipc_socket.c#18 integrate
.. //depot/projects/soc2005/libalias/sys/kern/uipc_syscalls.c#14 integrate
.. //depot/projects/soc2005/libalias/sys/kern/vfs_subr.c#18 integrate
.. //depot/projects/soc2005/libalias/sys/kern/vfs_vnops.c#8 integrate
.. //depot/projects/soc2005/libalias/sys/kern/vnode_if.src#6 integrate
.. //depot/projects/soc2005/libalias/sys/modules/malo/Makefile#1 branch
.. //depot/projects/soc2005/libalias/sys/net/bpf.c#11 integrate
.. //depot/projects/soc2005/libalias/sys/net/bpf.h#6 integrate
.. //depot/projects/soc2005/libalias/sys/net/bpf_buffer.c#1 branch
.. //depot/projects/soc2005/libalias/sys/net/bpf_buffer.h#1 branch
.. //depot/projects/soc2005/libalias/sys/net/bpf_zerocopy.c#1 branch
.. //depot/projects/soc2005/libalias/sys/net/bpf_zerocopy.h#1 branch
.. //depot/projects/soc2005/libalias/sys/net/bpfdesc.h#5 integrate
.. //depot/projects/soc2005/libalias/sys/net/if.c#13 integrate
.. //depot/projects/soc2005/libalias/sys/net/if_ef.c#2 integrate
.. //depot/projects/soc2005/libalias/sys/net/if_enc.c#4 integrate
.. //depot/projects/soc2005/libalias/sys/net/if_fddisubr.c#4 integrate
.. //depot/projects/soc2005/libalias/sys/net/if_iso88025subr.c#4 integrate
.. //depot/projects/soc2005/libalias/sys/net/if_loop.c#6 integrate
.. //depot/projects/soc2005/libalias/sys/net/if_media.h#6 integrate
.. //depot/projects/soc2005/libalias/sys/net/if_sl.c#3 integrate
.. //depot/projects/soc2005/libalias/sys/net/if_var.h#9 integrate
.. //depot/projects/soc2005/libalias/sys/net/raw_cb.c#2 integrate
.. //depot/projects/soc2005/libalias/sys/netatalk/aarp.c#6 integrate
.. //depot/projects/soc2005/libalias/sys/netatm/port.h#2 integrate
.. //depot/projects/soc2005/libalias/sys/netgraph/ng_pptpgre.c#3 integrate
.. //depot/projects/soc2005/libalias/sys/netgraph/ng_pptpgre.h#2 integrate
.. //depot/projects/soc2005/libalias/sys/netinet/in_pcb.c#14 integrate
.. //depot/projects/soc2005/libalias/sys/netinet/in_pcb.h#8 integrate
.. //depot/projects/soc2005/libalias/sys/netinet/ip_output.c#14 integrate
.. //depot/projects/soc2005/libalias/sys/netinet6/ip6_output.c#6 integrate
.. //depot/projects/soc2005/libalias/sys/netipsec/key.c#6 integrate
.. //depot/projects/soc2005/libalias/sys/netncp/ncp_sock.c#7 integrate
.. //depot/projects/soc2005/libalias/sys/netsmb/smb_iod.c#5 integrate
.. //depot/projects/soc2005/libalias/sys/netsmb/smb_rq.c#3 integrate
.. //depot/projects/soc2005/libalias/sys/netsmb/smb_trantcp.c#7 integrate
.. //depot/projects/soc2005/libalias/sys/nfs/nfs_common.c#2 integrate
.. //depot/projects/soc2005/libalias/sys/nfs4client/nfs4_vnops.c#8 integrate
.. //depot/projects/soc2005/libalias/sys/nfsclient/krpc_subr.c#3 integrate
.. //depot/projects/soc2005/libalias/sys/nfsclient/nfs_lock.c#4 integrate
.. //depot/projects/soc2005/libalias/sys/nfsclient/nfs_socket.c#12 integrate
.. //depot/projects/soc2005/libalias/sys/nfsclient/nfs_subs.c#7 integrate
.. //depot/projects/soc2005/libalias/sys/nfsclient/nfs_vnops.c#13 integrate
.. //depot/projects/soc2005/libalias/sys/nfsserver/nfs_serv.c#11 integrate
.. //depot/projects/soc2005/libalias/sys/nfsserver/nfs_srvcache.c#4 integrate
.. //depot/projects/soc2005/libalias/sys/nfsserver/nfs_srvsock.c#8 integrate
.. //depot/projects/soc2005/libalias/sys/nfsserver/nfs_srvsubs.c#9 integrate
.. //depot/projects/soc2005/libalias/sys/nfsserver/nfs_syscalls.c#9 integrate
.. //depot/projects/soc2005/libalias/sys/nlm/nlm.h#1 branch
.. //depot/projects/soc2005/libalias/sys/nlm/nlm_prot.h#1 branch
.. //depot/projects/soc2005/libalias/sys/nlm/nlm_prot_clnt.c#1 branch
.. //depot/projects/soc2005/libalias/sys/nlm/nlm_prot_impl.c#1 branch
.. //depot/projects/soc2005/libalias/sys/nlm/nlm_prot_server.c#1 branch
.. //depot/projects/soc2005/libalias/sys/nlm/nlm_prot_svc.c#1 branch
.. //depot/projects/soc2005/libalias/sys/nlm/nlm_prot_xdr.c#1 branch
.. //depot/projects/soc2005/libalias/sys/nlm/sm_inter.h#1 branch
.. //depot/projects/soc2005/libalias/sys/nlm/sm_inter_xdr.c#1 branch
.. //depot/projects/soc2005/libalias/sys/pc98/cbus/clock.c#7 integrate
.. //depot/projects/soc2005/libalias/sys/pc98/cbus/syscons_cbus.c#3 integrate
.. //depot/projects/soc2005/libalias/sys/pc98/conf/NOTES#5 integrate
.. //depot/projects/soc2005/libalias/sys/pc98/include/clock.h#2 integrate
.. //depot/projects/soc2005/libalias/sys/pc98/include/timerreg.h#2 integrate
.. //depot/projects/soc2005/libalias/sys/pci/if_mn.c#3 integrate
.. //depot/projects/soc2005/libalias/sys/pci/if_xl.c#8 integrate
.. //depot/projects/soc2005/libalias/sys/pci/if_xlreg.h#4 integrate
.. //depot/projects/soc2005/libalias/sys/powerpc/aim/clock.c#2 integrate
.. //depot/projects/soc2005/libalias/sys/powerpc/booke/clock.c#2 integrate
.. //depot/projects/soc2005/libalias/sys/powerpc/include/clock.h#3 integrate
.. //depot/projects/soc2005/libalias/sys/rpc/auth.h#1 branch
.. //depot/projects/soc2005/libalias/sys/rpc/auth_none.c#1 branch
.. //depot/projects/soc2005/libalias/sys/rpc/auth_unix.c#1 branch
.. //depot/projects/soc2005/libalias/sys/rpc/authunix_prot.c#1 branch
.. //depot/projects/soc2005/libalias/sys/rpc/clnt.h#1 branch
.. //depot/projects/soc2005/libalias/sys/rpc/clnt_dg.c#1 branch
.. //depot/projects/soc2005/libalias/sys/rpc/clnt_rc.c#1 branch
.. //depot/projects/soc2005/libalias/sys/rpc/clnt_stat.h#1 branch
.. //depot/projects/soc2005/libalias/sys/rpc/clnt_vc.c#1 branch
.. //depot/projects/soc2005/libalias/sys/rpc/getnetconfig.c#1 branch
.. //depot/projects/soc2005/libalias/sys/rpc/inet_ntop.c#1 branch
.. //depot/projects/soc2005/libalias/sys/rpc/inet_pton.c#1 branch
.. //depot/projects/soc2005/libalias/sys/rpc/netconfig.h#1 branch
.. //depot/projects/soc2005/libalias/sys/rpc/nettype.h#1 branch
.. //depot/projects/soc2005/libalias/sys/rpc/pmap_prot.h#1 branch
.. //depot/projects/soc2005/libalias/sys/rpc/rpc.h#1 branch
.. //depot/projects/soc2005/libalias/sys/rpc/rpc_callmsg.c#1 branch
.. //depot/projects/soc2005/libalias/sys/rpc/rpc_com.h#1 branch
.. //depot/projects/soc2005/libalias/sys/rpc/rpc_generic.c#1 branch
.. //depot/projects/soc2005/libalias/sys/rpc/rpc_msg.h#1 branch
.. //depot/projects/soc2005/libalias/sys/rpc/rpc_prot.c#1 branch
.. //depot/projects/soc2005/libalias/sys/rpc/rpcb_clnt.c#1 branch
.. //depot/projects/soc2005/libalias/sys/rpc/rpcb_clnt.h#1 branch
.. //depot/projects/soc2005/libalias/sys/rpc/rpcb_prot.c#1 branch
.. //depot/projects/soc2005/libalias/sys/rpc/rpcb_prot.h#1 branch
.. //depot/projects/soc2005/libalias/sys/rpc/rpcclnt.c#4 integrate
.. //depot/projects/soc2005/libalias/sys/rpc/svc.c#1 branch
.. //depot/projects/soc2005/libalias/sys/rpc/svc.h#1 branch
.. //depot/projects/soc2005/libalias/sys/rpc/svc_auth.c#1 branch
.. //depot/projects/soc2005/libalias/sys/rpc/svc_auth.h#1 branch
.. //depot/projects/soc2005/libalias/sys/rpc/svc_auth_unix.c#1 branch
.. //depot/projects/soc2005/libalias/sys/rpc/svc_dg.c#1 branch
.. //depot/projects/soc2005/libalias/sys/rpc/svc_generic.c#1 branch
.. //depot/projects/soc2005/libalias/sys/rpc/svc_vc.c#1 branch
.. //depot/projects/soc2005/libalias/sys/rpc/types.h#2 integrate
.. //depot/projects/soc2005/libalias/sys/rpc/xdr.h#1 branch
.. //depot/projects/soc2005/libalias/sys/sparc64/include/bus.h#3 integrate
.. //depot/projects/soc2005/libalias/sys/sparc64/include/clock.h#3 integrate
.. //depot/projects/soc2005/libalias/sys/sparc64/sparc64/bus_machdep.c#5 integrate
.. //depot/projects/soc2005/libalias/sys/sparc64/sparc64/clock.c#2 integrate
.. //depot/projects/soc2005/libalias/sys/sun4v/include/clock.h#2 integrate
.. //depot/projects/soc2005/libalias/sys/sun4v/include/cpu.h#2 integrate
.. //depot/projects/soc2005/libalias/sys/sys/cdefs.h#4 integrate
.. //depot/projects/soc2005/libalias/sys/sys/cpuset.h#3 integrate
.. //depot/projects/soc2005/libalias/sys/sys/fcntl.h#4 integrate
.. //depot/projects/soc2005/libalias/sys/sys/lockf.h#3 integrate
.. //depot/projects/soc2005/libalias/sys/sys/mbuf.h#14 integrate
.. //depot/projects/soc2005/libalias/sys/sys/param.h#22 integrate
.. //depot/projects/soc2005/libalias/sys/sys/syscall.h#16 integrate
.. //depot/projects/soc2005/libalias/sys/sys/syscall.mk#16 integrate
.. //depot/projects/soc2005/libalias/sys/sys/sysproto.h#16 integrate
.. //depot/projects/soc2005/libalias/sys/sys/systm.h#17 integrate
.. //depot/projects/soc2005/libalias/sys/sys/taskqueue.h#3 integrate
.. //depot/projects/soc2005/libalias/sys/sys/vnode.h#12 integrate
.. //depot/projects/soc2005/libalias/sys/ufs/ufs/ufs_vnops.c#13 integrate
.. //depot/projects/soc2005/libalias/sys/xdr/xdr.c#1 branch
.. //depot/projects/soc2005/libalias/sys/xdr/xdr_array.c#1 branch
.. //depot/projects/soc2005/libalias/sys/xdr/xdr_mbuf.c#1 branch
.. //depot/projects/soc2005/libalias/sys/xdr/xdr_mem.c#1 branch
.. //depot/projects/soc2005/libalias/sys/xdr/xdr_reference.c#1 branch
.. //depot/projects/soc2005/libalias/sys/xdr/xdr_sizeof.c#1 branch
.. //depot/projects/soc2005/libalias/tools/build/mk/OptionalObsoleteFiles.inc#11 integrate
.. //depot/projects/soc2005/libalias/tools/regression/file/flock/Makefile#1 branch
.. //depot/projects/soc2005/libalias/tools/regression/file/flock/flock.c#1 branch
.. //depot/projects/soc2005/libalias/usr.bin/checknr/checknr.c#2 integrate
.. //depot/projects/soc2005/libalias/usr.bin/make/for.c#2 integrate
.. //depot/projects/soc2005/libalias/usr.bin/make/make.1#9 integrate
.. //depot/projects/soc2005/libalias/usr.bin/netstat/bpf.c#7 integrate
.. //depot/projects/soc2005/libalias/usr.bin/xlint/lint1/lint1.h#2 integrate
.. //depot/projects/soc2005/libalias/usr.sbin/Makefile#14 integrate
.. //depot/projects/soc2005/libalias/usr.sbin/arp/arp.8#4 integrate
.. //depot/projects/soc2005/libalias/usr.sbin/clear_locks/Makefile#1 branch
.. //depot/projects/soc2005/libalias/usr.sbin/clear_locks/clear_locks.8#1 branch
.. //depot/projects/soc2005/libalias/usr.sbin/clear_locks/clear_locks.c#1 branch
.. //depot/projects/soc2005/libalias/usr.sbin/freebsd-update/freebsd-update.sh#10 integrate
.. //depot/projects/soc2005/libalias/usr.sbin/rpc.lockd/lockd.c#6 integrate
.. //depot/projects/soc2005/libalias/usr.sbin/rpc.lockd/rpc.lockd.8#4 integrate
.. //depot/projects/soc2005/libalias/usr.sbin/wpa/wpa_supplicant/Makefile#4 integrate
.. //depot/projects/soc2005/libalias/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8#4 integrate

Differences ...

==== //depot/projects/soc2005/libalias/Makefile#15 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile,v 1.345 2008/01/30 19:33:18 jhb Exp $
+# $FreeBSD: src/Makefile,v 1.346 2008/03/25 15:47:22 ru Exp $
 #
 # The user-driven targets are:
 #
@@ -172,6 +172,10 @@
 .MAIN:	all
 
 STARTTIME!= LC_ALL=C date
+CHECK_TIME!= find ${.CURDIR}/sys/sys/param.h -mtime -0
+.if !empty(CHECK_TIME)
+.error check your date/time: ${STARTTIME}
+.endif
 
 .if defined(HISTORICAL_MAKE_WORLD) || defined(DESTDIR)
 #

==== //depot/projects/soc2005/libalias/ObsoleteFiles.inc#27 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.133 2008/03/13 18:17:46 brueffer Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.134 2008/03/26 06:45:28 remko Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -1103,6 +1103,9 @@
 OLD_FILES+=usr/sbin/ntptimeset
 OLD_FILES+=usr/share/man/man8/kernbb.8.gz
 OLD_FILES+=usr/share/man/man8/ntp-genkeys.8.gz
+# 20040627: usbdevs.h and usbdevs_data.h removal
+OLD_FILES+=usr/include/dev/usb/usbdevs.h
+OLD_FILES+=usr/include/dev/usb/usbdevs_data.h
 # 200406XX
 OLD_FILES+=usr/bin/gasp
 OLD_FILES+=usr/bin/gdbreplay
@@ -3551,8 +3554,6 @@
 OLD_FILES+=usr/bin/hesinfo
 OLD_FILES+=usr/include/c++/3.4/ext/demangle.h
 OLD_FILES+=usr/include/cam/cam_extend.h
-OLD_FILES+=usr/include/dev/usb/usbdevs.h
-OLD_FILES+=usr/include/dev/usb/usbdevs_data.h
 OLD_FILES+=usr/include/dev/wi/wi_hostap.h
 OLD_FILES+=usr/include/disktab.h
 OLD_FILES+=usr/include/g++/FlexLexer.h

==== //depot/projects/soc2005/libalias/contrib/hostapd/ChangeLog#3 (text+ko) ====

@@ -1,5 +1,25 @@
 ChangeLog for hostapd
 
+2008-02-19 - v0.5.10
+	* fixed EAP-SIM and EAP-AKA message parser to validate attribute
+	  lengths properly to avoid potential crash caused by invalid messages
+	* fixed Reassociation Response callback processing when using internal
+	  MLME (driver_{hostap,devicescape,test}.c)
+	* fixed EAP-SIM/AKA realm processing to allow decorated usernames to
+	  be used
+	* added a workaround for EAP-SIM/AKA peers that include incorrect null
+	  termination in the username
+	* fixed EAP-SIM Start response processing for fast reauthentication
+	  case
+	* copy optional Proxy-State attributes into RADIUS response when acting
+	  as a RADIUS authentication server
+
+2007-12-02 - v0.5.9
+	* updated EAP Generalized Pre-Shared Key (EAP-GPSK) to use the latest
+	  draft (draft-ietf-emu-eap-gpsk-07.txt)
+	* fixed debugging code not to use potentially unaligned read to fetch
+	  IPv4 addresses
+
 2007-05-28 - v0.5.8
 	* updated driver_devicescape.c to build with the current
 	  wireless-dev.git tree and net/d80211 changes

==== //depot/projects/soc2005/libalias/contrib/hostapd/Makefile#3 (text+ko) ====

@@ -313,6 +313,10 @@
 CFLAGS += -DCONFIG_IPV6
 endif
 
+ifdef CONFIG_DRIVER_RADIUS_ACL
+CFLAGS += -DCONFIG_DRIVER_RADIUS_ACL
+endif
+
 ifdef CONFIG_FULL_DYNAMIC_VLAN
 # define CONFIG_FULL_DYNAMIC_VLAN to have hostapd manipulate bridges
 # and vlan interfaces for the vlan feature.

==== //depot/projects/soc2005/libalias/contrib/hostapd/README#3 (text+ko) ====

@@ -2,7 +2,7 @@
 	  Authenticator and RADIUS authentication server
 ================================================================
 
-Copyright (c) 2002-2007, Jouni Malinen  and contributors
+Copyright (c) 2002-2008, Jouni Malinen  and contributors
 All Rights Reserved.
 
 This program is dual-licensed under both the GPL version 2 and BSD

==== //depot/projects/soc2005/libalias/contrib/hostapd/aes_wrap.c#3 (text+ko) ====

@@ -7,7 +7,7 @@
  * - AES-128 EAX mode encryption/decryption
  * - AES-128 CBC
  *
- * Copyright (c) 2003-2005, Jouni Malinen 
+ * Copyright (c) 2003-2007, Jouni Malinen 
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -34,10 +34,11 @@
 
 /**
  * aes_wrap - Wrap keys with AES Key Wrap Algorithm (128-bit KEK) (RFC3394)
- * @kek: Key encryption key (KEK)
- * @n: Length of the wrapped key in 64-bit units; e.g., 2 = 128-bit = 16 bytes
- * @plain: Plaintext key to be wrapped, n * 64 bit
- * @cipher: Wrapped key, (n + 1) * 64 bit
+ * @kek: 16-octet Key encryption key (KEK)
+ * @n: Length of the plaintext key in 64-bit units; e.g., 2 = 128-bit = 16
+ * bytes
+ * @plain: Plaintext key to be wrapped, n * 64 bits
+ * @cipher: Wrapped key, (n + 1) * 64 bits
  * Returns: 0 on success, -1 on failure
  */
 int aes_wrap(const u8 *kek, int n, const u8 *plain, u8 *cipher)
@@ -93,9 +94,10 @@
 /**
  * aes_unwrap - Unwrap key with AES Key Wrap Algorithm (128-bit KEK) (RFC3394)
  * @kek: Key encryption key (KEK)
- * @n: Length of the wrapped key in 64-bit units; e.g., 2 = 128-bit = 16 bytes
- * @cipher: Wrapped key to be unwrapped, (n + 1) * 64 bit
- * @plain: Plaintext key, n * 64 bit
+ * @n: Length of the plaintext key in 64-bit units; e.g., 2 = 128-bit = 16
+ * bytes
+ * @cipher: Wrapped key to be unwrapped, (n + 1) * 64 bits
+ * @plain: Plaintext key, n * 64 bits
  * Returns: 0 on success, -1 on failure (e.g., integrity verification failed)
  */
 int aes_unwrap(const u8 *kek, int n, const u8 *cipher, u8 *plain)
@@ -167,28 +169,45 @@
 
 
 /**
- * omac1_aes_128 - One-Key CBC MAC (OMAC1) hash with AES-128 (aka AES-CMAC)
+ * omac1_aes_128_vector - One-Key CBC MAC (OMAC1) hash with AES-128
  * @key: 128-bit key for the hash operation
- * @data: Data buffer for which a MAC is determined
- * @data: Length of data buffer in bytes
+ * @num_elem: Number of elements in the data vector
+ * @addr: Pointers to the data areas
+ * @len: Lengths of the data blocks
  * @mac: Buffer for MAC (128 bits, i.e., 16 bytes)
  * Returns: 0 on success, -1 on failure
  */
-int omac1_aes_128(const u8 *key, const u8 *data, size_t data_len, u8 *mac)
+int omac1_aes_128_vector(const u8 *key, size_t num_elem,
+			 const u8 *addr[], const size_t *len, u8 *mac)
 {
 	void *ctx;
 	u8 cbc[BLOCK_SIZE], pad[BLOCK_SIZE];
-	const u8 *pos = data;
-	size_t i, left = data_len;
+	const u8 *pos, *end;
+	size_t i, e, left, total_len;
 
 	ctx = aes_encrypt_init(key, 16);
 	if (ctx == NULL)
 		return -1;
 	os_memset(cbc, 0, BLOCK_SIZE);
 
+	total_len = 0;
+	for (e = 0; e < num_elem; e++)
+		total_len += len[e];
+	left = total_len;
+
+	e = 0;
+	pos = addr[0];
+	end = pos + len[0];
+
 	while (left >= BLOCK_SIZE) {
-		for (i = 0; i < BLOCK_SIZE; i++)
+		for (i = 0; i < BLOCK_SIZE; i++) {
 			cbc[i] ^= *pos++;
+			if (pos >= end) {
+				e++;
+				pos = addr[e];
+				end = pos + len[e];
+			}
+		}
 		if (left > BLOCK_SIZE)
 			aes_encrypt(ctx, cbc, cbc);
 		left -= BLOCK_SIZE;
@@ -198,9 +217,15 @@
 	aes_encrypt(ctx, pad, pad);
 	gf_mulx(pad);
 
-	if (left || data_len == 0) {
-		for (i = 0; i < left; i++)
+	if (left || total_len == 0) {
+		for (i = 0; i < left; i++) {
 			cbc[i] ^= *pos++;
+			if (pos >= end) {
+				e++;
+				pos = addr[e];
+				end = pos + len[e];
+			}
+		}
 		cbc[left] ^= 0x80;
 		gf_mulx(pad);
 	}
@@ -212,6 +237,24 @@
 	return 0;
 }
 
+
+/**
+ * omac1_aes_128 - One-Key CBC MAC (OMAC1) hash with AES-128 (aka AES-CMAC)
+ * @key: 128-bit key for the hash operation
+ * @data: Data buffer for which a MAC is determined
+ * @data_len: Length of data buffer in bytes
+ * @mac: Buffer for MAC (128 bits, i.e., 16 bytes)
+ * Returns: 0 on success, -1 on failure
+ *
+ * This is a mode for using block cipher (AES in this case) for authentication.
+ * OMAC1 was standardized with the name CMAC by NIST in a Special Publication
+ * (SP) 800-38B.
+ */
+int omac1_aes_128(const u8 *key, const u8 *data, size_t data_len, u8 *mac)
+{
+	return omac1_aes_128_vector(key, 1, &data, &data_len, mac);
+}
+
 #endif /* CONFIG_NO_AES_OMAC1 */
 
 

==== //depot/projects/soc2005/libalias/contrib/hostapd/aes_wrap.h#3 (text+ko) ====

@@ -7,7 +7,7 @@
  * - AES-128 EAX mode encryption/decryption
  * - AES-128 CBC
  *
- * Copyright (c) 2003-2005, Jouni Malinen 
+ * Copyright (c) 2003-2007, Jouni Malinen 
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -24,6 +24,8 @@
 
 int aes_wrap(const u8 *kek, int n, const u8 *plain, u8 *cipher);
 int aes_unwrap(const u8 *kek, int n, const u8 *cipher, u8 *plain);
+int omac1_aes_128_vector(const u8 *key, size_t num_elem,
+			 const u8 *addr[], const size_t *len, u8 *mac);
 int omac1_aes_128(const u8 *key, const u8 *data, size_t data_len, u8 *mac);
 int aes_128_encrypt_block(const u8 *key, const u8 *in, u8 *out);
 int aes_128_ctr_encrypt(const u8 *key, const u8 *nonce,

==== //depot/projects/soc2005/libalias/contrib/hostapd/common.c#3 (text+ko) ====

@@ -20,7 +20,6 @@
 #ifdef CONFIG_DEBUG_FILE
 static FILE *out_file = NULL;
 #endif /* CONFIG_DEBUG_FILE */
-int wpa_debug_use_file = 0;
 int wpa_debug_level = MSG_INFO;
 int wpa_debug_show_keys = 0;
 int wpa_debug_timestamp = 0;
@@ -344,32 +343,29 @@
 }
 
 
-int wpa_debug_open_file(void)
+int wpa_debug_open_file(const char *path)
 {
 #ifdef CONFIG_DEBUG_FILE
-	static int count = 0;
-	char fname[64];
-	if (!wpa_debug_use_file)
+	if (!path)
 		return 0;
-#ifdef _WIN32
-	os_snprintf(fname, sizeof(fname), "\\Temp\\wpa_supplicant-log-%d.txt",
-		    count++);
-#else /* _WIN32 */
-	os_snprintf(fname, sizeof(fname), "/tmp/wpa_supplicant-log-%d.txt",
-		    count++);
+	out_file = fopen(path, "a");
+	if (out_file == NULL) {
+		wpa_printf(MSG_ERROR, "wpa_debug_open_file: Failed to open "
+			   "output file, using standard output");
+		return -1;
+	}
+#ifndef _WIN32
+	setvbuf(out_file, NULL, _IOLBF, 0);
 #endif /* _WIN32 */
-	out_file = fopen(fname, "w");
-	return out_file == NULL ? -1 : 0;
-#else /* CONFIG_DEBUG_FILE */
+#endif /* CONFIG_DEBUG_FILE */
 	return 0;
-#endif /* CONFIG_DEBUG_FILE */
 }
 
 
 void wpa_debug_close_file(void)
 {
 #ifdef CONFIG_DEBUG_FILE
-	if (!wpa_debug_use_file)
+	if (!out_file)
 		return;
 	fclose(out_file);
 	out_file = NULL;

==== //depot/projects/soc2005/libalias/contrib/hostapd/common.h#3 (text+ko) ====

@@ -264,12 +264,12 @@
 #define wpa_hexdump_key(l,t,b,le) do { } while (0)
 #define wpa_hexdump_ascii(l,t,b,le) do { } while (0)
 #define wpa_hexdump_ascii_key(l,t,b,le) do { } while (0)
-#define wpa_debug_open_file() do { } while (0)
+#define wpa_debug_open_file(p) do { } while (0)
 #define wpa_debug_close_file() do { } while (0)
 
 #else /* CONFIG_NO_STDOUT_DEBUG */
 
-int wpa_debug_open_file(void);
+int wpa_debug_open_file(const char *path);
 void wpa_debug_close_file(void);
 
 /**

==== //depot/projects/soc2005/libalias/contrib/hostapd/defconfig#3 (text+ko) ====

@@ -102,3 +102,7 @@
 
 # Build IPv6 support for RADIUS operations
 CONFIG_IPV6=y
+
+# Use the hostapd's IEEE 802.11 authentication (ACL), but without
+# the IEEE 802.11 Management capability
+CONFIG_DRIVER_RADIUS_ACL=y

==== //depot/projects/soc2005/libalias/contrib/hostapd/driver.h#3 (text+ko) ====

@@ -141,6 +141,10 @@
 	 * this handler will be called after initial setup has been completed.
 	 */
 	int (*commit)(void *priv);
+
+	int (*set_radius_acl_auth)(void *priv, const u8 *mac, int accepted, 
+			u32 session_timeout);
+	int (*set_radius_acl_expire)(void *priv, const u8 *mac);
 };
 
 static inline int
@@ -653,4 +657,22 @@
 	return hapd->driver->commit(hapd->driver);
 }
 
+static inline int 
+hostapd_set_radius_acl_auth(struct hostapd_data *hapd, const u8 *mac, int accepted, 
+	u32 session_timeout)
+{
+	if (hapd->driver == NULL || hapd->driver->set_radius_acl_auth == NULL)
+		return 0;
+	return hapd->driver->set_radius_acl_auth(hapd->driver, mac, accepted,
+						 session_timeout);
+}
+
+static inline int 
+hostapd_set_radius_acl_expire(struct hostapd_data *hapd, const u8 *mac)
+{
+	if (hapd->driver == NULL || hapd->driver->set_radius_acl_expire == NULL)
+		return 0;
+	return hapd->driver->set_radius_acl_expire(hapd->driver, mac);
+}
+
 #endif /* DRIVER_H */

==== //depot/projects/soc2005/libalias/contrib/hostapd/driver_test.c#3 (text+ko) ====

@@ -170,9 +170,10 @@
 	u16 fc;
 
 	if (drv->test_socket < 0 || len < 10 || drv->socket_dir == NULL) {
-		wpa_printf(MSG_DEBUG, "%s: invalid parameters (sock=%d len=%d "
-			   "socket_dir=%p)",
-			   __func__, drv->test_socket, len, drv->socket_dir);
+		wpa_printf(MSG_DEBUG, "%s: invalid parameters (sock=%d len=%lu"
+			   " socket_dir=%p)",
+			   __func__, drv->test_socket, (unsigned long) len,
+			   drv->socket_dir);
 		return -1;
 	}
 

==== //depot/projects/soc2005/libalias/contrib/hostapd/eap_aka.c#2 (text+ko) ====

@@ -1,6 +1,6 @@
 /*
  * hostapd / EAP-AKA (RFC 4187)
- * Copyright (c) 2005-2007, Jouni Malinen 
+ * Copyright (c) 2005-2008, Jouni Malinen 
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -124,6 +124,14 @@
 				      sm->identity_len)) {
 		wpa_printf(MSG_DEBUG, "   AT_PERMANENT_ID_REQ");
 		eap_sim_msg_add(msg, EAP_SIM_AT_PERMANENT_ID_REQ, 0, NULL, 0);
+	} else {
+		/*
+		 * RFC 4187, Chap. 4.1.4 recommends that identity from EAP is
+		 * ignored and the AKA/Identity is used to request the
+		 * identity.
+		 */
+		wpa_printf(MSG_DEBUG, "   AT_ANY_ID_REQ");
+		eap_sim_msg_add(msg, EAP_SIM_AT_ANY_ID_REQ, 0, NULL, 0);
 	}
 	return eap_sim_msg_finish(msg, reqDataLen, NULL, NULL, 0);
 }
@@ -445,10 +453,16 @@
 		sm->method_pending = METHOD_PENDING_NONE;
 	}
 
+	identity_len = sm->identity_len;
+	while (identity_len > 0 && sm->identity[identity_len - 1] == '\0') {
+		wpa_printf(MSG_DEBUG, "EAP-AKA: Workaround - drop last null "
+			   "character from identity");
+		identity_len--;
+	}
 	wpa_hexdump_ascii(MSG_DEBUG, "EAP-AKA: Identity for MK derivation",
-			  sm->identity, sm->identity_len);
+			  sm->identity, identity_len);
 
-	eap_aka_derive_mk(sm->identity, sm->identity_len, data->ik, data->ck,
+	eap_aka_derive_mk(sm->identity, identity_len, data->ik, data->ck,
 			  data->mk);
 	eap_sim_derive_keys(data->mk, data->k_encr, data->k_aut, data->msk,
 			    data->emsk);

==== //depot/projects/soc2005/libalias/contrib/hostapd/eap_gpsk.c#2 (text+ko) ====

@@ -1,5 +1,5 @@
 /*
- * hostapd / EAP-GPSK (draft-ietf-emu-eap-gpsk-03.txt) server
+ * hostapd / EAP-GPSK (draft-ietf-emu-eap-gpsk-08.txt) server
  * Copyright (c) 2006-2007, Jouni Malinen 
  *
  * This program is free software; you can redistribute it and/or modify
@@ -23,15 +23,15 @@
 struct eap_gpsk_data {
 	enum { GPSK_1, GPSK_3, SUCCESS, FAILURE } state;
 	u8 rand_server[EAP_GPSK_RAND_LEN];
-	u8 rand_client[EAP_GPSK_RAND_LEN];
+	u8 rand_peer[EAP_GPSK_RAND_LEN];
 	u8 msk[EAP_MSK_LEN];
 	u8 emsk[EAP_EMSK_LEN];
 	u8 sk[EAP_GPSK_MAX_SK_LEN];
 	size_t sk_len;
 	u8 pk[EAP_GPSK_MAX_PK_LEN];
 	size_t pk_len;
-	u8 *id_client;
-	size_t id_client_len;
+	u8 *id_peer;
+	size_t id_peer_len;
 	u8 *id_server;
 	size_t id_server_len;
 #define MAX_NUM_CSUITES 2
@@ -85,17 +85,17 @@
 	data->csuite_count = 0;
 	if (eap_gpsk_supported_ciphersuite(EAP_GPSK_VENDOR_IETF,
 					   EAP_GPSK_CIPHER_AES)) {
-		WPA_PUT_BE24(data->csuite_list[data->csuite_count].vendor,
+		WPA_PUT_BE32(data->csuite_list[data->csuite_count].vendor,
 			     EAP_GPSK_VENDOR_IETF);
-		WPA_PUT_BE24(data->csuite_list[data->csuite_count].specifier,
+		WPA_PUT_BE16(data->csuite_list[data->csuite_count].specifier,
 			     EAP_GPSK_CIPHER_AES);
 		data->csuite_count++;
 	}
 	if (eap_gpsk_supported_ciphersuite(EAP_GPSK_VENDOR_IETF,
 					   EAP_GPSK_CIPHER_SHA256)) {
-		WPA_PUT_BE24(data->csuite_list[data->csuite_count].vendor,
+		WPA_PUT_BE32(data->csuite_list[data->csuite_count].vendor,
 			     EAP_GPSK_VENDOR_IETF);
-		WPA_PUT_BE24(data->csuite_list[data->csuite_count].specifier,
+		WPA_PUT_BE16(data->csuite_list[data->csuite_count].specifier,
 			     EAP_GPSK_CIPHER_SHA256);
 		data->csuite_count++;
 	}
@@ -108,7 +108,7 @@
 {
 	struct eap_gpsk_data *data = priv;
 	free(data->id_server);
-	free(data->id_client);
+	free(data->id_peer);
 	free(data);
 }
 
@@ -174,8 +174,8 @@
 	wpa_printf(MSG_DEBUG, "EAP-GPSK: Request/GPSK-3");
 
 	miclen = eap_gpsk_mic_len(data->vendor, data->specifier);
-	len = 1 + 2 * EAP_GPSK_RAND_LEN + sizeof(struct eap_gpsk_csuite) + 2 +
-		miclen;
+	len = 1 + 2 * EAP_GPSK_RAND_LEN + 2 + data->id_server_len +
+		sizeof(struct eap_gpsk_csuite) + 2 + miclen;
 	req = eap_msg_alloc(EAP_VENDOR_IETF, EAP_TYPE_GPSK, reqDataLen,
 			    len, EAP_CODE_REQUEST, id, &pos);
 	if (req == NULL) {
@@ -188,13 +188,18 @@
 	*pos++ = EAP_GPSK_OPCODE_GPSK_3;
 	start = pos;
 
-	memcpy(pos, data->rand_client, EAP_GPSK_RAND_LEN);
+	memcpy(pos, data->rand_peer, EAP_GPSK_RAND_LEN);
 	pos += EAP_GPSK_RAND_LEN;
 	memcpy(pos, data->rand_server, EAP_GPSK_RAND_LEN);
 	pos += EAP_GPSK_RAND_LEN;
+	WPA_PUT_BE16(pos, data->id_server_len);
+	pos += 2;
+	if (data->id_server)
+		memcpy(pos, data->id_server, data->id_server_len);
+	pos += data->id_server_len;
 	csuite = (struct eap_gpsk_csuite *) pos;
-	WPA_PUT_BE24(csuite->vendor, data->vendor);
-	WPA_PUT_BE24(csuite->specifier, data->specifier);
+	WPA_PUT_BE32(csuite->vendor, data->vendor);
+	WPA_PUT_BE16(csuite->specifier, data->specifier);
 	pos += sizeof(*csuite);
 
 	/* no PD_Payload_2 */
@@ -282,7 +287,7 @@
 
 	if (end - pos < 2) {
 		wpa_printf(MSG_DEBUG, "EAP-GPSK: Too short message for "
-			   "ID_Client length");
+			   "ID_Peer length");
 		eap_gpsk_state(data, FAILURE);
 		return;
 	}
@@ -290,21 +295,21 @@
 	pos += 2;
 	if (end - pos < alen) {
 		wpa_printf(MSG_DEBUG, "EAP-GPSK: Too short message for "
-			   "ID_Client");
+			   "ID_Peer");
 		eap_gpsk_state(data, FAILURE);
 		return;
 	}
-	free(data->id_client);
-	data->id_client = malloc(alen);
-	if (data->id_client == NULL) {
+	free(data->id_peer);
+	data->id_peer = malloc(alen);
+	if (data->id_peer == NULL) {
 		wpa_printf(MSG_DEBUG, "EAP-GPSK: Not enough memory to store "
-			   "%d-octet ID_Client", alen);
+			   "%d-octet ID_Peer", alen);
 		return;
 	}
-	memcpy(data->id_client, pos, alen);
-	data->id_client_len = alen;
-	wpa_hexdump_ascii(MSG_DEBUG, "EAP-GPSK: ID_Client",
-			  data->id_client, data->id_client_len);
+	memcpy(data->id_peer, pos, alen);
+	data->id_peer_len = alen;
+	wpa_hexdump_ascii(MSG_DEBUG, "EAP-GPSK: ID_Peer",
+			  data->id_peer, data->id_peer_len);
 	pos += alen;
 
 	if (end - pos < 2) {
@@ -332,13 +337,13 @@
 
 	if (end - pos < EAP_GPSK_RAND_LEN) {
 		wpa_printf(MSG_DEBUG, "EAP-GPSK: Too short message for "
-			   "RAND_Client");
+			   "RAND_Peer");
 		eap_gpsk_state(data, FAILURE);
 		return;
 	}
-	memcpy(data->rand_client, pos, EAP_GPSK_RAND_LEN);
-	wpa_hexdump(MSG_DEBUG, "EAP-GPSK: RAND_Client",
-		    data->rand_client, EAP_GPSK_RAND_LEN);
+	memcpy(data->rand_peer, pos, EAP_GPSK_RAND_LEN);
+	wpa_hexdump(MSG_DEBUG, "EAP-GPSK: RAND_Peer",
+		    data->rand_peer, EAP_GPSK_RAND_LEN);
 	pos += EAP_GPSK_RAND_LEN;
 
 	if (end - pos < EAP_GPSK_RAND_LEN) {
@@ -397,13 +402,13 @@
 	if (i == data->csuite_count) {
 		wpa_printf(MSG_DEBUG, "EAP-GPSK: Peer selected unsupported "
 			   "ciphersuite %d:%d",
-			   WPA_GET_BE24(csuite->vendor),
-			   WPA_GET_BE24(csuite->specifier));
+			   WPA_GET_BE32(csuite->vendor),
+			   WPA_GET_BE16(csuite->specifier));
 		eap_gpsk_state(data, FAILURE);
 		return;
 	}
-	data->vendor = WPA_GET_BE24(csuite->vendor);
-	data->specifier = WPA_GET_BE24(csuite->specifier);
+	data->vendor = WPA_GET_BE32(csuite->vendor);
+	data->specifier = WPA_GET_BE16(csuite->specifier);
 	wpa_printf(MSG_DEBUG, "EAP-GPSK: CSuite_Sel %d:%d",
 		   data->vendor, data->specifier);
 	pos += sizeof(*csuite);	
@@ -434,8 +439,8 @@
 
 	if (eap_gpsk_derive_keys(sm->user->password, sm->user->password_len,
 				 data->vendor, data->specifier,
-				 data->rand_client, data->rand_server,
-				 data->id_client, data->id_client_len,
+				 data->rand_peer, data->rand_server,
+				 data->id_peer, data->id_peer_len,

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Wed Mar 26 21:04:59 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 01B5C1065682; Wed, 26 Mar 2008 21:04: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 B385C1065673
	for ; Wed, 26 Mar 2008 21:04: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 9969D8FC2B
	for ; Wed, 26 Mar 2008 21:04:58 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2QL4w2a094792
	for ; Wed, 26 Mar 2008 21:04:58 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2QL4wWd094790
	for perforce@freebsd.org; Wed, 26 Mar 2008 21:04:58 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 26 Mar 2008 21:04:58 GMT
Message-Id: <200803262104.m2QL4wWd094790@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 138663 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 26 Mar 2008 21:05:00 -0000

http://perforce.freebsd.org/chv.cgi?CH=138663

Change 138663 by sam@sam_ebb on 2008/03/26 21:04:18

	handle channel change on monitor mode vaps more carefully; we
	cannot call back into the driver unless it's marked RUNNING

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#46 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#46 (text+ko) ====

@@ -1812,9 +1812,12 @@
 		/*
 		 * Monitor mode can switch directly.
 		 */
-		ieee80211_setcurchan(ic, vap->iv_des_chan);
-		vap->iv_bss->ni_chan = ic->ic_curchan;
-		/* XXX kick other vap's to follow */
+		if (IFNET_IS_UP_RUNNING(vap->iv_ifp)) {
+			/* XXX need state machine for other vap's to follow */
+			ieee80211_setcurchan(ic, vap->iv_des_chan);
+			vap->iv_bss->ni_chan = ic->ic_curchan;
+		} else
+			ic->ic_curchan = vap->iv_des_chan;
 	} else {
 		/*
 		 * Need to go through the state machine in case we

From owner-p4-projects@FreeBSD.ORG  Wed Mar 26 21:48:45 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 20AA5106567F; Wed, 26 Mar 2008 21:48: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 D2AD21065675
	for ; Wed, 26 Mar 2008 21:48:44 +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 C459F8FC1B
	for ; Wed, 26 Mar 2008 21:48:44 +0000 (UTC)
	(envelope-from brooks@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2QLmig4098025
	for ; Wed, 26 Mar 2008 21:48:44 GMT
	(envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2QLmiaD098023
	for perforce@freebsd.org; Wed, 26 Mar 2008 21:48:44 GMT
	(envelope-from brooks@freebsd.org)
Date: Wed, 26 Mar 2008 21:48:44 GMT
Message-Id: <200803262148.m2QLmiaD098023@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 138669 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 26 Mar 2008 21:48:46 -0000

http://perforce.freebsd.org/chv.cgi?CH=138669

Change 138669 by brooks@brooks_coredump on 2008/03/26 21:47:51

	Checkpoint support for creating vap devices with vaps_ specfying a list
	of vaps to attach to an interface.  The list is processed when the
	physical interface is attached or detached.  vap_create_ variables
	can be used to specify additional arguments (other than wlandev) to the
	creation process.
	
	This is totally untested and likely contains bugs, but it's a start.

Affected files ...

.. //depot/projects/vap/etc/defaults/rc.conf#6 edit
.. //depot/projects/vap/etc/network.subr#4 edit
.. //depot/projects/vap/etc/rc.d/netif#4 edit

Differences ...

==== //depot/projects/vap/etc/defaults/rc.conf#6 (text+ko) ====

@@ -180,6 +180,7 @@
 #ifconfig_lo0_alias0="inet 127.0.0.254 netmask 0xffffffff" # Sample alias entry.
 #ifconfig_ed0_ipx="ipx 0x00010010"	# Sample IPX address family entry.
 #ifconfig_fxp0_name="net0"	# Change interface name from fxp0 to net0.
+#vaps_ath0="ath0_main"		# VAP interfaces for ath0 device
 #ipv4_addrs_fxp0="192.168.0.1/24 192.168.1.1-5/28" # example IPv4 address entry.
 #
 #autobridge_interfaces="bridge0"	# List of bridges to check 

==== //depot/projects/vap/etc/network.subr#4 (text+ko) ====

@@ -30,6 +30,56 @@
 # Requires that rc.conf be loaded first.
 #
 
+# ifn_start ifn
+# Bring up and configure an interface.  If some configuration is applied
+# print the interface configuration.
+#
+ifn_start()
+{
+	local ifn cfg
+	ifn="$1"
+	cfg=1
+
+	[ -z "$ifn" ] && err 1 "ifn_start called without an interface"
+
+	ifscript_up ${ifn} && cfg=0
+	ifconfig_up ${ifn} && cfg=0
+	ipv4_up ${ifn} && cfg=0
+	ipx_up ${ifn} && cfg=0
+	childif_create ${ifn} && cfg=0
+
+	if [ "$cfg" -eq 0 ]; then
+		ifconfig ${ifn}
+	fi
+
+	return $cfg
+}
+
+# ifn_start ifn
+# Shutdown and de-configure an interface.  If action is taken print the
+# interface name.
+#
+ifn_stop()
+{
+	local ifn cfg
+	ifn="$1"
+	cfg=1
+
+	[ -z "$ifn" ] && return 1
+
+	ipx_down ${ifn} && cfg=0
+	ipv4_down ${ifn} && cfg=0
+	ifconfig_down ${ifn} && cfg=0
+	ifscript_down ${ifn} && cfg=0
+	childif_destroy ${ifn} && cfg=0
+
+	if [ "$cfg" -eq 0 ]; then
+		echo -n " ${ifn}"
+	fi
+
+	return $cfg
+}
+
 # ifconfig_up if
 #	Evaluate ifconfig(8) arguments for interface $if and
 #	run ifconfig(8) with those arguments. It returns 0 if
@@ -426,13 +476,7 @@
 	_prefix=
 	_list=
 	for ifn in ${cloned_interfaces}; do
-		_wlandev=`expr "$ifn" : 'wlan:\(.*\)'`
-		if [ -n "$_wlandev" ]; then
-			ifn="wlan";
-			ifconfig ${ifn} create wlandev $_wlandev
-		else
-			ifconfig ${ifn} create
-		fi
+		ifconfig ${ifn} create
 		if [ $? -eq 0 ]; then
 			_list="${_list}${_prefix}${ifn}"
 			[ -z "$_prefix" ] && _prefix=' '
@@ -458,6 +502,44 @@
 	debug "Destroyed clones: ${_list}"
 }
 
+# Create and configure child interfaces.
+# Return 0 if child interfaces are created.
+#
+childif_create()
+{
+	local cfg child child_vaps create_args ifn i
+	cfg=1
+
+	ifn=$1
+
+	# Create VAPs
+	child_vaps=`get_if_var $ifn vaps_IF`
+	for child in ${child_vaps}; do
+		create_args="wlandev $ifn `get_if_var $child vap_create_IF`"
+		if expr $child : 'wlan[0-9][0-9]*$' >/dev/null 2>&1; then
+			ifconfig $child create ${create_args} && cfg=0
+		else
+			i=`ifconfig wlan create ${create_args}`
+			ifconfig $i name $child && cfg=0
+		fi
+		ifn_start
+	done
+
+	return 
+}
+
+# Destroy child interfaces.
+#
+childif_destroy()
+{
+	local cfg child child_vaps ifn
+
+	child_vaps=`get_if_var $ifn vaps_IF`
+	for child in ${child_vaps}; do
+		ifconfig $child destroy && cfg=0
+	done
+}
+
 # Create netgraph nodes.
 #
 ng_mkpeer() {

==== //depot/projects/vap/etc/rc.d/netif#4 (text+ko) ====

@@ -68,7 +68,7 @@
 	fi
 
 	# Configure the interface(s).
-	network_common ifn_start verbose
+	network_common ifn_start
 
 	if [ -f /etc/rc.d/ipfilter ] ; then
 		# Resync ipfilter
@@ -92,34 +92,31 @@
 	echo '.'
 }
 
-# network_common routine verbose
+# network_common routine
 #	Common configuration subroutine for network interfaces. This
 #	routine takes all the preparatory steps needed for configuriing
-#	an interface and then calls $routine. If $verbose is specified,
-#	it will call ifconfig(8) to show, in long format, the configured
-#	interfaces. If $verbose is not given, it will simply output the
-#	configured interface(s).
+#	an interface and then calls $routine.
 network_common()
 {
-	local _cooked_list _fail _func _verbose
+	local _cooked_list _fail _func
 
 	_func=
-	_verbose=
 
 	if [ -z "$1" ]; then
 		err 1 "network_common(): No function name specified."
 	else
 		_func="$1"
 	fi
-	[ -n "$2" ] && _verbose=yes
 
 	# Set the scope of the command (all interfaces or just one).
 	#
 	_cooked_list=
 	if [ -n "$cmdifn" ]; then
-		# Don't check that the interfaces exist.  We need to run
+		# Don't check that the interface(s) exist.  We need to run
 		# the down code even when the interface doesn't exist to
 		# kill off wpa_supplicant.
+		# XXXBED: is this really true or does wpa_supplicant die?
+		# if so, we should get rid of the devd entry
 		_cooked_list="$cmdifn"
 	else
 		_cooked_list="`list_net_interfaces`"
@@ -127,59 +124,13 @@
 
 	_fail=
 	for ifn in ${_cooked_list}; do
-		if ${_func} ${ifn} ; then
-			eval showstat_$ifn=1
-		else
-			_fail="$_fail $ifn"
+		if !${_func} ${ifn} $2; then
+			_fail="${_fail} ${ifn}
 		fi
 	done
 
-	# Display interfaces configured by this script
-	#
-	for ifn in ${_cooked_list}; do
-		eval showstat=\$showstat_${ifn}
-		if [ ! -z ${showstat} ]; then
-			if [ -n "$_verbose" ]; then
-				ifconfig ${ifn}
-			else
-				echo -n " ${ifn}"
-			fi
-		fi
-	done
 	debug "The following interfaces were not configured: $_fail"
 }
 
-ifn_start()
-{
-	local ifn cfg
-	ifn="$1"
-	cfg=1
-
-	[ -z "$ifn" ] && return 1
-
-	ifscript_up ${ifn} && cfg=0
-	ifconfig_up ${ifn} && cfg=0
-	ipv4_up ${ifn} && cfg=0
-	ipx_up ${ifn} && cfg=0
-
-	return $cfg
-}
-
-ifn_stop()
-{
-	local ifn cfg
-	ifn="$1"
-	cfg=1
-
-	[ -z "$ifn" ] && return 1
-
-	ipx_down ${ifn} && cfg=0
-	ipv4_down ${ifn} && cfg=0
-	ifconfig_down ${ifn} && cfg=0
-	ifscript_down ${ifn} && cfg=0
-
-	return $cfg
-}
-
 load_rc_config $name
 run_rc_command $*

From owner-p4-projects@FreeBSD.ORG  Wed Mar 26 21:56:54 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2A9741065674; Wed, 26 Mar 2008 21:56:54 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DCC021065671
	for ; Wed, 26 Mar 2008 21:56:53 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id CD40B8FC14
	for ; Wed, 26 Mar 2008 21:56:53 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2QLurUv098405
	for ; Wed, 26 Mar 2008 21:56:53 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2QLurMT098403
	for perforce@freebsd.org; Wed, 26 Mar 2008 21:56:53 GMT
	(envelope-from jb@freebsd.org)
Date: Wed, 26 Mar 2008 21:56:53 GMT
Message-Id: <200803262156.m2QLurMT098403@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138670 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 26 Mar 2008 21:56:54 -0000

http://perforce.freebsd.org/chv.cgi?CH=138670

Change 138670 by jb@jb_freebsd1 on 2008/03/26 21:56:21

	IFC

Affected files ...

.. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/faq/book.sgml#13 integrate
.. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/Makefile#8 integrate
.. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/basics/chapter.sgml#8 integrate
.. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml#8 integrate
.. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml#12 integrate
.. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#7 integrate
.. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/ports/chapter.sgml#10 integrate
.. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/printing/chapter.sgml#4 integrate
.. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/security/chapter.sgml#12 integrate
.. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/virtualization/chapter.sgml#3 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/faq/book.sgml#15 integrate
.. //depot/projects/dtrace/ports/UPDATING#60 integrate
.. //depot/projects/dtrace/src/ObsoleteFiles.inc#40 integrate
.. //depot/projects/dtrace/src/contrib/wpa_supplicant/main.c#6 integrate
.. //depot/projects/dtrace/src/contrib/wpa_supplicant/wpa_supplicant.c#6 integrate
.. //depot/projects/dtrace/src/lib/libc/gen/lockf.c#4 integrate
.. //depot/projects/dtrace/src/lib/libc/sys/Symbol.map#8 integrate
.. //depot/projects/dtrace/src/lib/libc/sys/fcntl.2#6 integrate
.. //depot/projects/dtrace/src/lib/libc/yp/xdryp.c#4 integrate
.. //depot/projects/dtrace/src/lib/libc_r/uthread/uthread_sig.c#6 integrate
.. //depot/projects/dtrace/src/lib/libelf/libelf_convert.m4#16 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_sig.c#4 integrate
.. //depot/projects/dtrace/src/libexec/talkd/announce.c#4 integrate
.. //depot/projects/dtrace/src/share/man/man7/security.7#7 integrate
.. //depot/projects/dtrace/src/sys/amd64/amd64/prof_machdep.c#7 integrate
.. //depot/projects/dtrace/src/sys/amd64/include/clock.h#8 integrate
.. //depot/projects/dtrace/src/sys/amd64/include/timerreg.h#4 integrate
.. //depot/projects/dtrace/src/sys/amd64/isa/clock.c#9 integrate
.. //depot/projects/dtrace/src/sys/boot/i386/cdboot/cdboot.s#7 integrate
.. //depot/projects/dtrace/src/sys/boot/pc98/cdboot/cdboot.s#5 integrate
.. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_proto.h#23 integrate
.. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_syscall.h#23 integrate
.. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_syscalls.c#23 integrate
.. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_sysent.c#23 integrate
.. //depot/projects/dtrace/src/sys/compat/freebsd32/syscalls.master#23 integrate
.. //depot/projects/dtrace/src/sys/compat/linux/linux_file.c#14 integrate
.. //depot/projects/dtrace/src/sys/compat/svr4/svr4_fcntl.c#11 integrate
.. //depot/projects/dtrace/src/sys/conf/NOTES#43 integrate
.. //depot/projects/dtrace/src/sys/conf/files#79 integrate
.. //depot/projects/dtrace/src/sys/conf/options#44 integrate
.. //depot/projects/dtrace/src/sys/dev/aac/aac.c#14 integrate
.. //depot/projects/dtrace/src/sys/dev/aac/aac_disk.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/aac/aacreg.h#5 integrate
.. //depot/projects/dtrace/src/sys/dev/aac/aacvar.h#7 integrate
.. //depot/projects/dtrace/src/sys/dev/speaker/spkr.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/syscons/syscons.c#15 integrate
.. //depot/projects/dtrace/src/sys/dev/ti/if_ti.c#10 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/ucom.c#7 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/ucomvar.h#6 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/usbdevs#27 integrate
.. //depot/projects/dtrace/src/sys/fs/msdosfs/msdosfs_vnops.c#12 integrate
.. //depot/projects/dtrace/src/sys/fs/tmpfs/tmpfs_vnops.c#7 integrate
.. //depot/projects/dtrace/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#13 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/trap.c#31 integrate
.. //depot/projects/dtrace/src/sys/i386/ibcs2/ibcs2_fcntl.c#4 integrate
.. //depot/projects/dtrace/src/sys/i386/include/clock.h#8 integrate
.. //depot/projects/dtrace/src/sys/i386/include/timerreg.h#4 integrate
.. //depot/projects/dtrace/src/sys/i386/include/vmparam.h#6 integrate
.. //depot/projects/dtrace/src/sys/i386/isa/clock.c#11 integrate
.. //depot/projects/dtrace/src/sys/i386/isa/prof_machdep.c#7 integrate
.. //depot/projects/dtrace/src/sys/i386/isa/vesa.c#4 integrate
.. //depot/projects/dtrace/src/sys/ia64/ia64/machdep.c#17 integrate
.. //depot/projects/dtrace/src/sys/ia64/include/clock.h#5 integrate
.. //depot/projects/dtrace/src/sys/isa/syscons_isa.c#5 integrate
.. //depot/projects/dtrace/src/sys/kern/init_sysent.c#29 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_descrip.c#25 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_lockf.c#6 integrate
.. //depot/projects/dtrace/src/sys/kern/subr_taskqueue.c#7 integrate
.. //depot/projects/dtrace/src/sys/kern/syscalls.c#28 integrate
.. //depot/projects/dtrace/src/sys/kern/syscalls.master#22 integrate
.. //depot/projects/dtrace/src/sys/kern/systrace_args.c#24 integrate
.. //depot/projects/dtrace/src/sys/kern/tty_cons.c#14 integrate
.. //depot/projects/dtrace/src/sys/kern/vnode_if.src#9 integrate
.. //depot/projects/dtrace/src/sys/net/bpf_zerocopy.c#2 integrate
.. //depot/projects/dtrace/src/sys/net/if.c#14 integrate
.. //depot/projects/dtrace/src/sys/net/if_media.h#6 integrate
.. //depot/projects/dtrace/src/sys/net/if_var.h#8 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_pptpgre.c#6 integrate
.. //depot/projects/dtrace/src/sys/nfs4client/nfs4_vnops.c#12 integrate
.. //depot/projects/dtrace/src/sys/nfsclient/nfs_lock.c#6 integrate
.. //depot/projects/dtrace/src/sys/nfsclient/nfs_vnops.c#16 integrate
.. //depot/projects/dtrace/src/sys/nlm/nlm.h#1 branch
.. //depot/projects/dtrace/src/sys/nlm/nlm_prot.h#1 branch
.. //depot/projects/dtrace/src/sys/nlm/nlm_prot_clnt.c#1 branch
.. //depot/projects/dtrace/src/sys/nlm/nlm_prot_impl.c#1 branch
.. //depot/projects/dtrace/src/sys/nlm/nlm_prot_server.c#1 branch
.. //depot/projects/dtrace/src/sys/nlm/nlm_prot_svc.c#1 branch
.. //depot/projects/dtrace/src/sys/nlm/nlm_prot_xdr.c#1 branch
.. //depot/projects/dtrace/src/sys/nlm/sm_inter.h#1 branch
.. //depot/projects/dtrace/src/sys/nlm/sm_inter_xdr.c#1 branch
.. //depot/projects/dtrace/src/sys/pc98/cbus/clock.c#6 integrate
.. //depot/projects/dtrace/src/sys/pc98/cbus/syscons_cbus.c#6 integrate
.. //depot/projects/dtrace/src/sys/pc98/include/clock.h#4 integrate
.. //depot/projects/dtrace/src/sys/pc98/include/timerreg.h#4 integrate
.. //depot/projects/dtrace/src/sys/powerpc/aim/clock.c#3 integrate
.. //depot/projects/dtrace/src/sys/powerpc/booke/clock.c#2 integrate
.. //depot/projects/dtrace/src/sys/powerpc/include/clock.h#5 integrate
.. //depot/projects/dtrace/src/sys/rpc/auth.h#1 branch
.. //depot/projects/dtrace/src/sys/rpc/auth_none.c#1 branch
.. //depot/projects/dtrace/src/sys/rpc/auth_unix.c#1 branch
.. //depot/projects/dtrace/src/sys/rpc/authunix_prot.c#1 branch
.. //depot/projects/dtrace/src/sys/rpc/clnt.h#1 branch
.. //depot/projects/dtrace/src/sys/rpc/clnt_dg.c#1 branch
.. //depot/projects/dtrace/src/sys/rpc/clnt_rc.c#1 branch
.. //depot/projects/dtrace/src/sys/rpc/clnt_stat.h#1 branch
.. //depot/projects/dtrace/src/sys/rpc/clnt_vc.c#1 branch
.. //depot/projects/dtrace/src/sys/rpc/getnetconfig.c#1 branch
.. //depot/projects/dtrace/src/sys/rpc/inet_ntop.c#1 branch
.. //depot/projects/dtrace/src/sys/rpc/inet_pton.c#1 branch
.. //depot/projects/dtrace/src/sys/rpc/netconfig.h#1 branch
.. //depot/projects/dtrace/src/sys/rpc/nettype.h#1 branch
.. //depot/projects/dtrace/src/sys/rpc/pmap_prot.h#1 branch
.. //depot/projects/dtrace/src/sys/rpc/rpc.h#1 branch
.. //depot/projects/dtrace/src/sys/rpc/rpc_callmsg.c#1 branch
.. //depot/projects/dtrace/src/sys/rpc/rpc_com.h#1 branch
.. //depot/projects/dtrace/src/sys/rpc/rpc_generic.c#1 branch
.. //depot/projects/dtrace/src/sys/rpc/rpc_msg.h#1 branch
.. //depot/projects/dtrace/src/sys/rpc/rpc_prot.c#1 branch
.. //depot/projects/dtrace/src/sys/rpc/rpcb_clnt.c#1 branch
.. //depot/projects/dtrace/src/sys/rpc/rpcb_clnt.h#1 branch
.. //depot/projects/dtrace/src/sys/rpc/rpcb_prot.c#1 branch
.. //depot/projects/dtrace/src/sys/rpc/rpcb_prot.h#1 branch
.. //depot/projects/dtrace/src/sys/rpc/svc.c#1 branch
.. //depot/projects/dtrace/src/sys/rpc/svc.h#1 branch
.. //depot/projects/dtrace/src/sys/rpc/svc_auth.c#1 branch
.. //depot/projects/dtrace/src/sys/rpc/svc_auth.h#1 branch
.. //depot/projects/dtrace/src/sys/rpc/svc_auth_unix.c#1 branch
.. //depot/projects/dtrace/src/sys/rpc/svc_dg.c#1 branch
.. //depot/projects/dtrace/src/sys/rpc/svc_generic.c#1 branch
.. //depot/projects/dtrace/src/sys/rpc/svc_vc.c#1 branch
.. //depot/projects/dtrace/src/sys/rpc/types.h#2 integrate
.. //depot/projects/dtrace/src/sys/rpc/xdr.h#1 branch
.. //depot/projects/dtrace/src/sys/sparc64/include/clock.h#5 integrate
.. //depot/projects/dtrace/src/sys/sparc64/sparc64/clock.c#4 integrate
.. //depot/projects/dtrace/src/sys/sun4v/include/clock.h#5 integrate
.. //depot/projects/dtrace/src/sys/sun4v/include/cpu.h#5 integrate
.. //depot/projects/dtrace/src/sys/sys/cdefs.h#6 integrate
.. //depot/projects/dtrace/src/sys/sys/fcntl.h#10 integrate
.. //depot/projects/dtrace/src/sys/sys/lockf.h#5 integrate
.. //depot/projects/dtrace/src/sys/sys/param.h#45 integrate
.. //depot/projects/dtrace/src/sys/sys/syscall.h#26 integrate
.. //depot/projects/dtrace/src/sys/sys/syscall.mk#26 integrate
.. //depot/projects/dtrace/src/sys/sys/sysproto.h#26 integrate
.. //depot/projects/dtrace/src/sys/sys/systm.h#19 integrate
.. //depot/projects/dtrace/src/sys/sys/taskqueue.h#5 integrate
.. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_vfsops.c#23 integrate
.. //depot/projects/dtrace/src/sys/ufs/ufs/ufs_vnops.c#16 integrate
.. //depot/projects/dtrace/src/sys/xdr/xdr.c#1 branch
.. //depot/projects/dtrace/src/sys/xdr/xdr_array.c#1 branch
.. //depot/projects/dtrace/src/sys/xdr/xdr_mbuf.c#1 branch
.. //depot/projects/dtrace/src/sys/xdr/xdr_mem.c#1 branch
.. //depot/projects/dtrace/src/sys/xdr/xdr_reference.c#1 branch
.. //depot/projects/dtrace/src/sys/xdr/xdr_sizeof.c#1 branch
.. //depot/projects/dtrace/src/tools/regression/file/flock/Makefile#1 branch
.. //depot/projects/dtrace/src/tools/regression/file/flock/flock.c#1 branch
.. //depot/projects/dtrace/src/usr.bin/checknr/checknr.c#4 integrate
.. //depot/projects/dtrace/src/usr.bin/xlint/lint1/lint1.h#4 integrate
.. //depot/projects/dtrace/src/usr.sbin/Makefile#23 integrate
.. //depot/projects/dtrace/src/usr.sbin/clear_locks/Makefile#1 branch
.. //depot/projects/dtrace/src/usr.sbin/clear_locks/clear_locks.8#1 branch
.. //depot/projects/dtrace/src/usr.sbin/clear_locks/clear_locks.c#1 branch
.. //depot/projects/dtrace/src/usr.sbin/rpc.lockd/lockd.c#8 integrate
.. //depot/projects/dtrace/src/usr.sbin/rpc.lockd/rpc.lockd.8#6 integrate
.. //depot/projects/dtrace/www/en/gnome/images/Makefile#10 integrate
.. //depot/projects/dtrace/www/en/gnome/images/ss222-2-tn.png#1 branch
.. //depot/projects/dtrace/www/en/gnome/images/ss222-2.png#1 branch
.. //depot/projects/dtrace/www/en/gnome/images/ss222-3-tn.png#1 branch
.. //depot/projects/dtrace/www/en/gnome/images/ss222-3.png#1 branch
.. //depot/projects/dtrace/www/en/gnome/screenshots.sgml#11 integrate
.. //depot/projects/dtrace/www/share/sgml/events.xml#23 integrate

Differences ...

==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/faq/book.sgml#13 (text+ko) ====

@@ -2,10 +2,10 @@
     The FreeBSD Documentation Project
     The FreeBSD German Documentation Project
 
-$FreeBSD: doc/de_DE.ISO8859-1/books/faq/book.sgml,v 1.80 2008/02/24 12:11:29 jkois Exp $
-$FreeBSDde: de-docproj/books/faq/book.sgml,v 1.605 2008/02/24 12:01:55 jkois Exp $
+$FreeBSD: doc/de_DE.ISO8859-1/books/faq/book.sgml,v 1.81 2008/03/26 19:02:44 jkois Exp $
+$FreeBSDde: de-docproj/books/faq/book.sgml,v 1.606 2008/03/25 20:23:07 jkois Exp $
 
-    basiert auf: 1.809
+    basiert auf: 1.810
 
 -->
 
@@ -33,7 +33,7 @@
       
     
 
-    $FreeBSDde: de-docproj/books/faq/book.sgml,v 1.605 2008/02/24 12:01:55 jkois Exp $
+    $FreeBSDde: de-docproj/books/faq/book.sgml,v 1.606 2008/03/25 20:23:07 jkois Exp $
 
     
       1995
@@ -5398,7 +5398,7 @@
 	      role="package">audio/timidity++.  Danach
 	    müssen Sie manuell die GUS-Patche von
 	    Eric A. Welsh von 
+            url="http://alleg.sourceforge.net/digmid.html">
 	    installieren.  Wenn timidity++
 	    richtig installiert wurde, können Sie mit dem folgenden
 	    Kommando MIDI-Dateien in das WAV-Format konvertieren:

==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/Makefile#8 (text+ko) ====

@@ -1,7 +1,7 @@
 #
-# $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/Makefile,v 1.44 2008/01/14 08:36:45 miwi Exp $
-# $FreeBSDde: de-docproj/books/handbook/Makefile,v 1.59 2007/10/22 19:47:34 jkois Exp $
-# basiert auf: 1.108
+# $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/Makefile,v 1.45 2008/03/26 19:02:44 jkois Exp $
+# $FreeBSDde: de-docproj/books/handbook/Makefile,v 1.60 2008/03/26 16:57:34 jkois Exp $
+# basiert auf: 1.109
 #
 # Build the FreeBSD Handbook in its German translation.
 #
@@ -140,6 +140,18 @@
 IMAGES_EN+= virtualization/virtualpc-freebsd11.png
 IMAGES_EN+= virtualization/virtualpc-freebsd12.png
 IMAGES_EN+= virtualization/virtualpc-freebsd13.png
+IMAGES_EN+= virtualization/vmware-freebsd01.png
+IMAGES_EN+= virtualization/vmware-freebsd02.png
+IMAGES_EN+= virtualization/vmware-freebsd03.png
+IMAGES_EN+= virtualization/vmware-freebsd04.png
+IMAGES_EN+= virtualization/vmware-freebsd05.png
+IMAGES_EN+= virtualization/vmware-freebsd06.png
+IMAGES_EN+= virtualization/vmware-freebsd07.png
+IMAGES_EN+= virtualization/vmware-freebsd08.png
+IMAGES_EN+= virtualization/vmware-freebsd09.png
+IMAGES_EN+= virtualization/vmware-freebsd10.png
+IMAGES_EN+= virtualization/vmware-freebsd11.png
+IMAGES_EN+= virtualization/vmware-freebsd12.png
 
 # Images from the cross-document image library
 IMAGES_LIB=  callouts/1.png

==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/basics/chapter.sgml#8 (text+ko) ====

@@ -2,9 +2,9 @@
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
 
-     $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/basics/chapter.sgml,v 1.47 2008/01/14 08:36:46 miwi Exp $
-     $FreeBSDde: de-docproj/books/handbook/basics/chapter.sgml,v 1.105 2008/01/01 10:15:37 jkois Exp $
-     basiert auf: 1.152
+     $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/basics/chapter.sgml,v 1.48 2008/03/26 19:02:44 jkois Exp $
+     $FreeBSDde: de-docproj/books/handbook/basics/chapter.sgml,v 1.106 2008/03/25 19:39:58 jkois Exp $
+     basiert auf: 1.153
 -->
 
 

==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml#8 (text+ko) ====

@@ -2,9 +2,9 @@
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
 
-     $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml,v 1.47 2008/01/14 08:36:46 miwi Exp $
-     $FreeBSDde: de-docproj/books/handbook/config/chapter.sgml,v 1.133 2007/12/30 13:35:05 miwi Exp $
-     basiert auf: 1.228
+     $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml,v 1.48 2008/03/26 19:02:44 jkois Exp $
+     $FreeBSDde: de-docproj/books/handbook/config/chapter.sgml,v 1.134 2008/03/25 19:34:02 jkois Exp $
+     basiert auf: 1.229
 -->
 
 
@@ -818,17 +818,28 @@
       beispielsweise von dem rpcbind-Dienst
       (portmapper) ab.  Im Kopf der Startskripten befinden sich
       die Informationen über Abhängigkeiten von anderen
-      Diensten und weitere Metadaten.  Mithilfe dieser Daten
+      Diensten und weitere Metadaten.Mithilfe dieser Daten
       bestimmt das Programm &man.rcorder.8; beim Systemstart die
-      Startreihenfolge der Dienste.  Folgende Schlüsselwörter
-      werden im Kopf der Startskripten verwendet:
+      Startreihenfolge der Dienste.
+
+    Folgende Schlüsselwörter müssen im Kopf aller
+      Startskripten verwendet werden (da sie von &man.rc.subr.8; zum
+      Aktivieren des Startskripts benötigt
+      werden:
 
     
       
 	PROVIDE: Gibt die Namen der Dienste an,
 	  die mit dieser Datei zur Verfügung gestellt werden.
       
+    
+
+    Die folgenden Schlüsselwörter können im Kopf
+      des Startskripts angegeben werden.  Sie sind zwar nicht unbedingt
+      notwendig, sind aber hilfreich beim Umgang mit
+      &man.rcorder.8;:
 
+    
       
 	REQUIRE: Gibt die Namen der Dienste an,
 	  von denen dieser Dienst abhängt.  Diese Datei wird
@@ -844,8 +855,9 @@
       
     
 
-    Mit diesem System kann ein Administrator den Start
-      von Systemdiensten einfach steuern, ohne mit den
+    Durch das Verwenden dieser Schlüsselwörter kann
+      ein Administrator die Startreihenfolge von Systemdiensten
+      feingranuliert steuern, ohne mit den
       Schwierigkeiten des runlevel-Systems
       anderer &unix; Systeme kämpfen zu müssen.
 

==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml#12 (text+ko) ====

@@ -2,19 +2,19 @@
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
 
-     $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.59 2008/01/14 08:36:47 miwi Exp $
-     $FreeBSDde: de-docproj/books/handbook/disks/chapter.sgml,v 1.157 2008/01/01 10:22:36 jkois Exp $
-     basiert auf: 1.279
+     $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.60 2008/03/26 19:02:45 jkois Exp $
+     $FreeBSDde: de-docproj/books/handbook/disks/chapter.sgml,v 1.159 2008/03/26 07:27:36 as Exp $
+     basiert auf: 1.282
 -->
 
 
   
     
       
-        Bernd
-        Warken
-        Übersetzt von 
-        
+	Bernd
+	Warken
+	Übersetzt von 
+	
       
       
 	Martin
@@ -384,7 +384,7 @@
 	&prompt.root; dd if=/dev/zero of=/dev/da1 bs=1k count=1
 &prompt.root; bsdlabel -Bw da1 auto
 &prompt.root; bsdlabel -e da1  # Erstellen der `e' Partition
-&prompt.root; newfs -d0 /dev/da1e
+&prompt.root; newfs /dev/da1e
 &prompt.root; mkdir -p /1
 &prompt.root; vi /etc/fstab # /dev/da1e hinzufügen
 &prompt.root; mount /1
@@ -2000,7 +2000,7 @@
 	Dazu geben Sie als root bei
 	  eingelegter DVD-RAM die folgenden Befehle ein:
 
-	&prompt.root; dd if=/dev/zero of=/dev/acd0 count=2
+	&prompt.root; dd if=/dev/zero of=/dev/acd0 bs=2k count=1
 &prompt.root; bsdlabel -Bw acd0
 &prompt.root; newfs /dev/acd0
 
@@ -3973,7 +3973,7 @@
 	  Eine von gbde benutzte
 	    Partition muss einmalig vorbereitet werden:
 
-	  &prompt.root; gbde init /dev/ad4s1c -i -L /etc/gbde/ad4s1c
+	  &prompt.root; gbde init /dev/ad4s1c -i -L /etc/gbde/ad4s1c.lock
 
 	  &man.gbde.8; öffnet eine Vorlage in Ihrem Editor,
 	    in der Sie verschiedene Optionen einstellen können.
@@ -4005,8 +4005,12 @@
 	          Passphrase beschrieben.
 
 	  Mit gbde init wurde im Beispiel
-	    auch die Lock-Datei /etc/gbde/ad4s1c
-	    angelegt.
+	    auch die Lock-Datei /etc/gbde/ad4s1c.lock
+	    angelegt.  gbde-Lockdateien
+	    müssen die Dateiendung .lock aufweisen,
+	    damit sie von /etc/rc.d/gbde, dem
+	    Startskript von gbde, erkannt
+	    werden.
 
 	  
 	    Sichern Sie die Lock-Dateien von
@@ -4026,7 +4030,7 @@
 	  Einbinden der verschlüsselten Partition
 	    in den Kernel
 
-	  &prompt.root; gbde attach /dev/ad4s1c -l /etc/gbde/ad4s1c
+	  &prompt.root; gbde attach /dev/ad4s1c -l /etc/gbde/ad4s1c.lock
 
 	  Das Kommando fragt die Passphrase ab, die Sie
 	    beim Vorbereiten der Partition eingegeben haben.  Das
@@ -4110,7 +4114,7 @@
 	
 	  gbde-Partition im Kernel bekannt geben
 
-	  &prompt.root; gbde attach /dev/ad4s1c -l /etc/gbde/ad4s1c
+	  &prompt.root; gbde attach /dev/ad4s1c -l /etc/gbde/ad4s1c.lock
 
 	  Das Kommando fragt nach der Passphrase, die Sie
 	    beim Vorbereiten der verschlüsselten
@@ -4158,7 +4162,8 @@
 	  Beispiel:
 
 	gbde_autoattach_all="YES"
-gbde_devices="ad4s1c"
+gbde_devices="ad4s1c"
+gbde_lockdir="/etc/gbde"
 
 	Durch diese Argumente muss beim Systemstart die
 	  gbde-Passphrase eingegeben werden.

==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#7 (text+ko) ====

@@ -2,9 +2,9 @@
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
 
-     $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.sgml,v 1.42 2007/10/19 09:56:48 jkois Exp $
-     $FreeBSDde: de-docproj/books/handbook/kernelconfig/chapter.sgml,v 1.92 2007/09/18 07:29:27 jkois Exp $
-     basiert auf: 1.176
+     $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.sgml,v 1.43 2008/03/26 19:02:45 jkois Exp $
+     $FreeBSDde: de-docproj/books/handbook/kernelconfig/chapter.sgml,v 1.93 2008/03/26 16:54:47 jkois Exp $
+     basiert auf: 1.180
 -->
 
 
@@ -140,6 +140,100 @@
     
   
 
+ 
+    
+      
+	
+	  Tom
+	  Rhodes
+	  Geschrieben von 
+	
+      
+    
+
+    Informationen über die vorhandene Hardware
+      beschaffen
+
+    Bevor Sie mit der Kernelkonfiguration beginnen, sollten
+      Sie wissen, über welche Hardware Ihr System verfügt.
+      Verwenden Sie derzeit noch ein anderes Betriebssystem, ist
+      es meist sehr einfach, eine Liste der installierten Hardware
+      zu erzeugen.  Verwenden Sie beispielsweise µsoft.windows;,
+      können Sie dafür den
+      Gerätemanager verwenden, den
+      Sie in der Systemsteuerung finden.
+
+    
+      Einige Versionen von µsoft.windows; verfügen
+	über ein System-Icon auf
+	dem Desktop, über das Sie den
+	Gerätemanager direkt aufrufen
+	können.
+    
+
+    Haben Sie außer &os; kein weiteres Betriebssystem,
+      müssen Sie diese Informationen manuell zusammentragen.
+      Eine Möglichkeit, an Informationen über die
+      vorhandene Hardware zu gelangen, ist der Einsatz von &man.dmesg.8;
+      in Kombination mit &man.man.1;.  Die meisten &os;-Gerätetreiber
+      haben eine eigene Manualpage, die Informationen über die
+      unterstützte Hardware enthält.  Während des
+      Systemstarts werden Informationen über die vorhandene
+      Hardware ausgegeben.  Die folgenden Zeilen zeigen beispielsweise
+      an, dass der psm-Treiber eine
+      angeschlossene Maus gefunden hat:
+
+    psm0: <PS/2 Mouse> irq 12 on atkbdc0
+psm0: [GIANT-LOCKED]
+psm0: [ITHREAD]
+psm0: model Generic PS/2 mouse, device ID 0
+
+    Dieser Treiber muss in Ihrer Kernelkonfigurationsdatei
+      vorhanden sein oder durch das Werkzeug &man.loader.conf.5;
+      geladen werden.
+
+    Manchmal zeigt dmesg während des
+      Systemstarts nur Systemmeldungen, aber keine Informationen
+      zur gefundenen Hardware an.  In diesem Fall können Sie
+      diese Informationen durch das Studium der Datei
+      /var/run/dmesg.boot
+      herausfinden.
+
+    Eine weitere Möglichkeit bietet das Werkzeug
+      &man.pciconf.8;, das ausführliche Informationen
+      bereitstellt.  Dazu ein Beispiel:
+
+    ath0@pci0:3:0:0:        class=0x020000 card=0x058a1014 chip=0x1014168c rev=0x01 hdr=0x00
+    vendor     = 'Atheros Communications Inc.'
+    device     = 'AR5212 Atheros AR5212 802.11abg wireless'
+    class      = network
+    subclass   = ethernet
+
+    Diese Zeilen, die Sie durch den Aufruf des Befehls
+      pciconf  erhalten, zeigen,
+      dass der Treiber ath eine drahtlose
+      Ethernetkarte gefunden hat.  Durch Eingabe des Befehls
+      man ath öffnet
+      sich die Manualpage &man.ath.4;.
+
+    Rufen Sie &man.man.1; mit der Option 
+      auf, können Sie die Datenbank der Manualpages auch
+      durchsuchen.  Für das angegebene Beispiel würde
+      dieser Befehl beispielsweise so aussehen:
+
+    &prompt.root; man -k Atheros
+
+    Dadurch erhalten Sie eine Liste aller Manualpages, die das
+      angegebene Suchkriterium enthalten:
+
+    ath(4)                   - Atheros IEEE 802.11 wireless network driver
+ath_hal(4)               - Atheros Hardware Access Layer (HAL)
+
+    Mit diesen Informationen ausgestattet, sollte der Bau eines
+      angepassten Kernel keine allzugroßen Probleme mehr
+      bereiten.
+  
+
   
     Erstellen und Installation eines angepassten
       Kernels
@@ -724,6 +818,17 @@
       laufen kann.  Wenn Sie sich nicht sicher sind, belassen
       Sie diese Option.
 
+    
+      Beachten Sie, dass ab &os; 8.0-CURRENT und neuer alle
+	Mutexe in der Voreinstellung adaptiv sein werden, es sei denn,
+	Sie werden durch das Setzen der Option
+	NO_ADAPTIVE_MUTEXES explizit als
+	nichtadaptiv deklariert.  Als Folge dessen ist Giant nun in
+	in der Voreinstellung ebenfalls adaptiv, daher ist in diesen
+	Versionen die Kerneloption ADAPTIVE_GIANT
+	nicht mehr in der Kernelkonfigurationsdatei enthalten.
+    
+
     
       Kerneloptionen
       SMP

==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/ports/chapter.sgml#10 (text+ko) ====

@@ -2,9 +2,9 @@
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
 
-     $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/ports/chapter.sgml,v 1.44 2008/03/25 19:04:25 jkois Exp $
-     $FreeBSDde: de-docproj/books/handbook/ports/chapter.sgml,v 1.95 2008/03/02 10:34:35 jkois Exp $
-     basiert auf: 1.273
+     $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/ports/chapter.sgml,v 1.45 2008/03/26 19:02:45 jkois Exp $
+     $FreeBSDde: de-docproj/books/handbook/ports/chapter.sgml,v 1.96 2008/03/26 16:00:21 jkois Exp $
+     basiert auf: 1.278
 -->
 
 
@@ -566,6 +566,15 @@
 	      In der Ports-Sammlung befinden sich mehrere Versionen
 	        der Anwendung.
 	    
+
+            
+	      !
+	      Das installierte Paket ist zwar im Index enthalten,
+		aus irgendeinem Grund war pkg_version
+		aber dennoch nicht in der Lage, die Versionsnummer des
+		installierten Pakets mit der Versionsnummer des
+		entsprechenden Eintrags im Index zu vergleichen.
+	    
 	  
 	
       
@@ -646,44 +655,26 @@
 	  beschrieben.
 
 	
-	  Mit csup existiert eine in
-	    C geschriebene Neuimplementierung von
-	    CVSup, die ab &os; 6.2
-	    bereits im Basissystem enthalten ist.  Haben Sie
-	    &os; 6.2 installiert, können Sie Schritt 1
-	    überspringen und die im Basissystem enthaltene
-	    Version von csup einsetzen.
-	    Verwenden Sie eine ältere &os;-Version, können
+	  Die seit &os; 6.2 im Basissystem enthaltene Variante
+	    des CVSup-Protokolls heißt
+	    csup.  Verwenden Sie hingegen
+	    noch eine ältere &os;-Version, können
 	    Sie csup über den Port
-	    net/csup installieren.
-	    In beiden Fällen ersetzen Sie bitte in den folgenden
-	    Ausführungen cvsup durch
-	    csup.
+	    net/csup installieren.
 	
 
 	Achten Sie darauf, dass das Verzeichnis /usr/ports leer ist, bevor Sie
-	  CVSup das erste Mal ausführen!
+	  csup das erste Mal ausführen!
 	  Haben Sie die Ports-Sammlung zuvor schon aus einer anderen
-	  Quelle installiert, wird CVSup
+	  Quelle installiert, wird csup
 	  bereits aus dem Repository entfernte Patches nicht aus der
 	  lokalen Kopie der Ports-Sammlung löschen.
 
 	
-	  Installieren Sie das Paket net/cvsup-without-gui:
+	  Rufen Sie csup auf:
 
-	  &prompt.root; pkg_add -r cvsup-without-gui
-
-	  Weitere Informationen finden Sie im Abschnitt
-	    Installation von CVSup
-	    des Handbuchs.
-	
-
-	
-	  Danach rufen Sie cvsup auf:
-
-	  &prompt.root; cvsup -L 2 -h cvsup.FreeBSD.org /usr/share/examples/cvsup/ports-supfile
+	  &prompt.root; csup -L 2 -h cvsup.FreeBSD.org /usr/share/examples/cvsup/ports-supfile
 
 	  Ersetzen Sie
 	    cvsup.FreeBSD.org durch einen
@@ -725,17 +716,17 @@
 	      
 
 	      
-	        Nun können Sie cvsup mit
+	        Nun können Sie csup mit
 	          folgender Syntax starten:
 
-	        &prompt.root; cvsup -L 2 /root/ports-supfile
+	        &prompt.root; csup -L 2 /root/ports-supfile
 	      
 	    
 	  
         
 
 	
-	  Mit &man.cvsup.1; können Sie später auch die
+	  Mit &man.csup.1; können Sie später auch die
 	    Ports-Sammlung aktualisieren.  Die installierten Ports werden
 	    mit diesem Kommando allerdings nicht aktualisiert.
 	
@@ -1385,6 +1376,106 @@
 	Weitere Informationen finden Sie in der Manualpage
 	  &man.portmanager.1;.
       
+
+      
+	Ports mit Portmaster aktualisieren
+
+	
+	  portmaster
+	
+
+	Bei Portmaster handelt es sich
+	  um ein weiteres Werkzeug zum Aktualisieren von Ports.
+	  Portmaster nutzt nur Werkzeuge, die
+	  bereits im Basissystem vorhanden sind (ist also nicht von
+	  weiteren Ports abhängig).  Es verwendet Informationen
+	  in /var/db/pkg/, um
+	  festzustellen, welche Ports aktualisiert werden sollen.
+	  Sie können dieses Program über den Port
+	  ports-mgmt/portmaster
+	  installieren:
+
+	&prompt.root; cd /usr/ports/ports-mgmt/portmaster
+&prompt.root; make install clean
+
+	Portmaster teilt Ports in vier
+	  Kategorien ein:
+
+	
+	  
+	    Root ports (no dependencies, not depended on)
+	    
+	  
+	    Trunk ports (no dependencies, are depended on)
+	    
+	  
+	    Branch ports (have dependencies, are depended on)
+	    
+	  
+	    Leaf ports (have dependencies, not depended on)
+	    
+	
+
+	Um eine Liste aller installierter Ports anzuzeigen (und nach
+	  neueren Versionen zu suchen, verwenden Sie die Option
+	  :
+
+	&prompt.root; portmaster -L
+===>>> Root ports (No dependencies, not depended on)
+===>>> ispell-3.2.06_18
+===>>> screen-4.0.3
+        ===>>> New version available: screen-4.0.3_1
+===>>> tcpflow-0.21_1
+===>>> 7 root ports
+...
+===>>> Branch ports (Have dependencies, are depended on)
+===>>> apache-2.2.3
+        ===>>> New version available: apache-2.2.8
+...
+===>>> Leaf ports (Have dependencies, not depended on)
+===>>> automake-1.9.6_2
+===>>> bash-3.1.17
+        ===>>> New version available: bash-3.2.33
+...
+===>>> 32 leaf ports
+
+===>>> 137 total installed ports
+        ===>>> 83 have new versions available
+	
+
+	Um alle derzeit installierten Ports zu aktualisieren,
+	  verwenden Sie einfach den folgenden Befehl:
+
+	&prompt.root; portmaster -a
+
+	In der Voreinstellung erzeugt
+	  Portmaster eine Sicherheitskopie,
+	  bevor ein installierter Port gelöscht wird.  Ist die
+	  Installation der neuen Version erfolgreich, wird dieses
+	  Backup wieder gelöscht.  Wollen Sie das Backup lieber
+	  manuell löschen, verwenden Sie die Option
+	   beim Aufruf von
+	  Portmaster.  Durch die Verwendung
+	  der Option  wird
+	  Portmaster im interaktiven
+	  Modus gestartet und fragt bei jedem zu aktualisierenden Port
+	  nach, wie Sie vorgehen wollen.
+
+	Treten während der Aktualisierung Fehler auf, können
+	  Sie die Option  verwenden, um alle Ports zu
+	  aktualisieren beziehungsweise neu zu bauen:
+
+	&prompt.root; portmaster -af
+
+	Portmaster ist auch in der Lage,
+	  neue Ports zu installieren, wobei zuvor alle abhängigen Ports
+	  aktualisiert werden:
+
+	&prompt.root; portmaster shells/bash
+
+	Weiterführende Informationen finden Sie in der Manualpage
+	  &man.portmaster.8;.
+      
     
 
     

==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/printing/chapter.sgml#4 (text+ko) ====

@@ -1,9 +1,9 @@
 
 
 
@@ -1817,9 +1817,9 @@
               
                 filter-name
                 -c
-                -wwidth
-                -llength
-                -iindent
+                -w width
+                -l length
+                -i indent
                 -n login
                 -h host
                 acct-file
@@ -1922,8 +1922,8 @@
               
                 filter-name
                 -xpixel-width
-                -ypixel-height
+                  choice="plain">-x pixel-width
+                -y pixel-height
                 -n login
                 -h host
                 acct-file
@@ -1947,8 +1947,8 @@
 
               
                 filter-name
-                -wwidth
-                -llength
+                -w width
+                -l length
               
 
               Beide Argumente entsprechen den Optionen
@@ -2065,7 +2065,11 @@
 	  lprps die Datei an den Drucker senden.
 
 	lprps ist in der FreeBSD
-	  Ports-Sammlung enthalten.  Nach
+	  Ports-Sammlung enthalten.  Je
+	  nach der von Ihnen verwendeten Papiergröße
+	  installieren Sie dazu den Port print/lprps-a4 oder print/lprps-letter.  Nach
 	  der Installation müssen Sie nur noch den Pfad zum
 	  Programm psif angeben, das als Teil von
 	  lprps installiert wird.  Haben Sie
@@ -2077,9 +2081,9 @@
         :if=/usr/local/libexec/psif:
 
 	Zusätzlich sollten Sie die
-	  rw-Fähigkeit aktivieren.  Dadurch
-	  wird LPD im Schreib- und Lesemodus
-	  geöffnet.
+	  rw-Fähigkeit aktivieren, um
+	  LPD im Schreib- und Lesemodus
+	  zu öffnen.
 
 	Haben Sie hingegen einen parallelen &postscript;-Drucker,
 	 was eine Zweiwegekommunikation mit Ihrem Drucker (auf die
@@ -2137,21 +2141,26 @@
 	  hat Aladdin Enterprises daher eine freie
 	  &postscript;-ähnliche Implementierung namens
 	  Ghostscript entwickelt, die auch
-	  unter FreeBSD lauffähig ist.  Ghostscript kann fast jede
+	  unter FreeBSD lauffähig ist.
+	  Ghostscript kann fast jede
 	  &postscript;-Datei lesen und auf den verschiedensten
 	  Geräten ausgeben, darunter auch auf vielen
 	  Nicht-&postscript;-Druckern.  Durch die Installation von
-	  Ghostscript und die Nutzung eines speziellen Textfilters
+	  Ghostscript und die Nutzung eines
+	  speziellen Textfilters
 	  erreichen Sie, dass sich Ihr Nicht-&postscript;-Drucker
 	  wie ein echter &postscript;-Drucker verhält.
 
-	Ghostscript ist in der FreeBSD Ports-Sammlung enhalten
-	  und kann daher einfach installiert werden.
+	Ghostscript ist in
+	  verschiedenen Versionen in der FreeBSD Ports-Sammlung enhalten,
+	  die am häfigsten verwendete Version ist print/ghostscript-gpl.
 
 	Um &postscript; zu emulieren, muss der Textfilter
 	  erkennen, ob er eine &postscript;-Datei drucken soll.  Ist
 	  dies nicht der Fall, wird die Datei direkt an den Drucker
-	  geschickt.  Anderenfalls wird die Datei an Ghostscript
+	  geschickt.  Anderenfalls wird die Datei an
+	  Ghostscript
 	  übergeben, das die Datei in ein Format konvertiert,
 	  das Ihr Drucker versteht.
 
@@ -2160,9 +2169,9 @@
 	  Sie einen anderen Drucker, müssen Sie die Option
 	   beim Aufruf von gs
 	  (Ghostscript) entsprechend anpassen.  Eine Liste der von
-	  Ghostscript unterstützten Geräte erhalten Sie durch
-	  die Eingabe von gs -h auf der
-	  Kommandozeile.
+	  Ghostscript unterstützten
+	  Geräte erhalten Sie durch die Eingabe von
+	  gs -h auf der Kommandozeile.
 
         #!/bin/sh
 #
@@ -2725,8 +2734,8 @@
 
 	    
 	      filter-name
-	      -wwidth
-	      -llength
+	      -w width
+	      -l length
 	    
 
 	    width basiert auf der
@@ -3618,7 +3627,8 @@
 	  eingesetzt werden.  Das folgende Beispiel verwendet den
 	  an ein Netzwerk angeschlossenen Zeilendrucker Diablo 750-N.
 	  Dieser Drucker empfängt zu druckende Daten auf dem
-	  Port 5100.  Der Hostname des Druckers lautet scrivener.
+	  Port 5100.  Der Hostname des Druckers lautet
+	  scrivener.
 	  Daher sieht der Textfilter für diesen Drucker wie folgt
 	  aus:
 

==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/security/chapter.sgml#12 (text+ko) ====

@@ -2,9 +2,9 @@
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
 
-     $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/security/chapter.sgml,v 1.53 2008/01/14 08:36:47 miwi Exp $
-     $FreeBSDde: de-docproj/books/handbook/security/chapter.sgml,v 1.156 2007/10/23 09:24:47 jkois Exp $
-     basiert auf: 1.316
+     $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/security/chapter.sgml,v 1.54 2008/03/26 19:02:45 jkois Exp $
+     $FreeBSDde: de-docproj/books/handbook/security/chapter.sgml,v 1.157 2008/03/26 14:26:57 jkois Exp $
+     basiert auf: 1.320
 -->
 
 
@@ -69,7 +69,7 @@
 
       
 	TCP-Wrapper für
-	  inetd einrichten können.
+	  inetd einrichten können.
       
 
       
@@ -400,49 +400,35 @@
 	Obwohl der wheel-Mechanismus besser als
 	gar nichts ist, ist er nicht unbedingt die sicherste Lösung.
 
-      Indirekt können Sie die Accounts von Mitarbeitern und
-        damit auch den Zugriff auf root schützen,
-	indem Sie eine alternative Zugangsmethode verwenden und die
-	Accounts der Mitarbeiter mit einem ungültigen verschlüsselten
-	Passwort versehen.  Mit &man.vipw.8; können Sie jedes
-	verschlüsselte Passwort mit einem
-	* Zeichen ersetzen.  Das Kommando
-	wird /etc/master.passwd und die
-	Benutzer/Passwort Datenbank aktualisieren und die Passwort
-	Authentifizierung abstellen.
+      Um ein Konto komplett zu sperren, verwenden Sie den Befehl
+	&man.pw.8;:
+
+      &prompt.root;pw lock staff
+
+      Danach ist es diesem Benutzer nicht mehr möglich (auch
+	nicht mit &man.ssh.1;), sich anzumelden.
 
-      Ein Account wie
+      Eine weitere Möglichkeit, bestimmte Benutzer zu sperren,
+	ist es, das verschlüsselte Passwort durch das Zeichen
+	* zu ersetzen.  Da ein
+	verschlüsseltes Passwort niemals diesem Zeichen entsprechen
+	kann, kann sich der betroffene Benutzer ebenfalls nicht mehr
+	anmelden.  Beispielsweise müsste dazu das Konto
 
       foobar:R9DT/Fa1/LV9U:1000:1000::0:0:Foo Bar:/home/foobar:/usr/local/bin/tcsh
 
-      sollte wie folgt abgeändert werden:
+      wie folgt abgeändert werden:
 
       foobar:*:1000:1000::0:0:Foo Bar:/home/foobar:/usr/local/bin/tcsh
 
-      Da ein verschlüsseltes Passwort niemals
-	ein * sein kann, verhindert dies
-	die normale Anmeldung.  Damit müssen sich die Mitarbeiter
-	mit anderen Mechanismen wie &man.kerberos.1; oder &man.ssh.1;
-	authentifizieren.  Wenn Sie etwas wie
-	Kerberos benutzen, müssen Sie
-	die Maschinen, die die Kerberos-Server
-	beheimaten und die Maschinen der Benutzer absichern.  Wenn Sie
-	öffentliche/private Schlüssel mit
-	SSH benutzen, muss die Maschine
-	von der die Anmeldung gestartet wird, gesichert
-	werden.  Als zusätzliche Sicherheitsschicht können Sie
-	das Schlüsselpaar beim Erstellen mit &man.ssh-keygen.1; durch
-	ein Passwort schützen.  Dadurch, dass Sie die
-	Passwörter Ihrer Mitarbeiter als ungültig markiert
-	haben, stellen Sie sicher, dass sich die Mitarbeiter nur mit
-	den sicheren Methoden, die Sie aufgesetzt haben, anmelden können.
-	Dies zwingt alle Mitarbeiter, verschlüsselte Verbindungen
-	für ihre Sitzungen zu verwenden, und schließt ein
-	wichtiges Loch, dass gerne von Angreifern ausgenutzt wird:
-	Das Abhören des Netzwerks von einer anderen weniger gesicherten
-	Maschine.
+      Durch diese Änderung wird der Benutzer
+	foobar daran gehindert, sich auf

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Wed Mar 26 21:59:58 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B6BDA1065672; Wed, 26 Mar 2008 21:59: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 5B3D9106564A
	for ; Wed, 26 Mar 2008 21:59:57 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 4CA448FC1D
	for ; Wed, 26 Mar 2008 21:59:57 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2QLxv6V098502
	for ; Wed, 26 Mar 2008 21:59:57 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2QLxutv098500
	for perforce@freebsd.org; Wed, 26 Mar 2008 21:59:56 GMT
	(envelope-from jb@freebsd.org)
Date: Wed, 26 Mar 2008 21:59:56 GMT
Message-Id: <200803262159.m2QLxutv098500@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138671 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 26 Mar 2008 21:59:58 -0000

http://perforce.freebsd.org/chv.cgi?CH=138671

Change 138671 by jb@jb_freebsd1 on 2008/03/26 21:59:30

	Regen after IFC

Affected files ...

.. //depot/projects/dtrace/src/sys/kern/init_sysent.c#30 edit
.. //depot/projects/dtrace/src/sys/kern/syscalls.c#29 edit
.. //depot/projects/dtrace/src/sys/kern/systrace_args.c#25 edit
.. //depot/projects/dtrace/src/sys/sys/syscall.h#27 edit
.. //depot/projects/dtrace/src/sys/sys/syscall.mk#27 edit
.. //depot/projects/dtrace/src/sys/sys/sysproto.h#27 edit

Differences ...

==== //depot/projects/dtrace/src/sys/kern/init_sysent.c#30 (text+ko) ====

@@ -2,7 +2,7 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/kern/init_sysent.c,v 1.237 2008/03/26 15:24:02 dfr Exp $
+ * $FreeBSD$
  * created from FreeBSD: src/sys/kern/syscalls.master,v 1.241 2008/03/26 15:23:09 dfr Exp 
  */
 

==== //depot/projects/dtrace/src/sys/kern/syscalls.c#29 (text+ko) ====

@@ -2,7 +2,7 @@
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/kern/syscalls.c,v 1.221 2008/03/26 15:24:02 dfr Exp $
+ * $FreeBSD$
  * created from FreeBSD: src/sys/kern/syscalls.master,v 1.241 2008/03/26 15:23:09 dfr Exp 
  */
 

==== //depot/projects/dtrace/src/sys/kern/systrace_args.c#25 (text+ko) ====

@@ -2,7 +2,7 @@
  * System call argument to DTrace register array converstion.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/kern/systrace_args.c,v 1.21 2008/03/26 15:24:02 dfr Exp $
+ * $FreeBSD$
  * This file is part of the DTrace syscall provider.
  */
 
@@ -2906,3 +2906,4770 @@
 		break;
 	};
 }
+static void
+systrace_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
+{
+	const char *p = NULL;
+	switch (sysnum) {
+	/* nosys */
+	case 0:
+		break;
+	/* sys_exit */
+	case 1:
+		switch(ndx) {
+		case 0:
+			p = "int";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* fork */
+	case 2:
+		break;
+	/* read */
+	case 3:
+		switch(ndx) {
+		case 0:
+			p = "int";
+			break;
+		case 1:
+			p = "void *";
+			break;
+		case 2:
+			p = "size_t";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* write */
+	case 4:
+		switch(ndx) {
+		case 0:
+			p = "int";
+			break;
+		case 1:
+			p = "const void *";
+			break;
+		case 2:
+			p = "size_t";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* open */
+	case 5:
+		switch(ndx) {
+		case 0:
+			p = "char *";
+			break;
+		case 1:
+			p = "int";
+			break;
+		case 2:
+			p = "int";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* close */
+	case 6:
+		switch(ndx) {
+		case 0:
+			p = "int";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* wait4 */
+	case 7:
+		switch(ndx) {
+		case 0:
+			p = "int";
+			break;
+		case 1:
+			p = "int *";
+			break;
+		case 2:
+			p = "int";
+			break;
+		case 3:
+			p = "struct rusage *";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* link */
+	case 9:
+		switch(ndx) {
+		case 0:
+			p = "char *";
+			break;
+		case 1:
+			p = "char *";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* unlink */
+	case 10:
+		switch(ndx) {
+		case 0:
+			p = "char *";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* chdir */
+	case 12:
+		switch(ndx) {
+		case 0:
+			p = "char *";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* fchdir */
+	case 13:
+		switch(ndx) {
+		case 0:
+			p = "int";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* mknod */
+	case 14:
+		switch(ndx) {
+		case 0:
+			p = "char *";
+			break;
+		case 1:
+			p = "int";
+			break;
+		case 2:
+			p = "int";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* chmod */
+	case 15:
+		switch(ndx) {
+		case 0:
+			p = "char *";
+			break;
+		case 1:
+			p = "int";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* chown */
+	case 16:
+		switch(ndx) {
+		case 0:
+			p = "char *";
+			break;
+		case 1:
+			p = "int";
+			break;
+		case 2:
+			p = "int";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* obreak */
+	case 17:
+		switch(ndx) {
+		case 0:
+			p = "char *";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* getpid */
+	case 20:
+		break;
+	/* mount */
+	case 21:
+		switch(ndx) {
+		case 0:
+			p = "char *";
+			break;
+		case 1:
+			p = "char *";
+			break;
+		case 2:
+			p = "int";
+			break;
+		case 3:
+			p = "caddr_t";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* unmount */
+	case 22:
+		switch(ndx) {
+		case 0:
+			p = "char *";
+			break;
+		case 1:
+			p = "int";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* setuid */
+	case 23:
+		switch(ndx) {
+		case 0:
+			p = "uid_t";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* getuid */
+	case 24:
+		break;
+	/* geteuid */
+	case 25:
+		break;
+	/* ptrace */
+	case 26:
+		switch(ndx) {
+		case 0:
+			p = "int";
+			break;
+		case 1:
+			p = "pid_t";
+			break;
+		case 2:
+			p = "caddr_t";
+			break;
+		case 3:
+			p = "int";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* recvmsg */
+	case 27:
+		switch(ndx) {
+		case 0:
+			p = "int";
+			break;
+		case 1:
+			p = "struct msghdr *";
+			break;
+		case 2:
+			p = "int";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* sendmsg */
+	case 28:
+		switch(ndx) {
+		case 0:
+			p = "int";
+			break;
+		case 1:
+			p = "struct msghdr *";
+			break;
+		case 2:
+			p = "int";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* recvfrom */
+	case 29:
+		switch(ndx) {
+		case 0:
+			p = "int";
+			break;
+		case 1:
+			p = "caddr_t";
+			break;
+		case 2:
+			p = "size_t";
+			break;
+		case 3:
+			p = "int";
+			break;
+		case 4:
+			p = "struct sockaddr *__restrict";
+			break;
+		case 5:
+			p = "__socklen_t *__restrict";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* accept */
+	case 30:
+		switch(ndx) {
+		case 0:
+			p = "int";
+			break;
+		case 1:
+			p = "struct sockaddr *__restrict";
+			break;
+		case 2:
+			p = "__socklen_t *__restrict";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* getpeername */
+	case 31:
+		switch(ndx) {
+		case 0:
+			p = "int";
+			break;
+		case 1:
+			p = "struct sockaddr *__restrict";
+			break;
+		case 2:
+			p = "__socklen_t *__restrict";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* getsockname */
+	case 32:
+		switch(ndx) {
+		case 0:
+			p = "int";
+			break;
+		case 1:
+			p = "struct sockaddr *__restrict";
+			break;
+		case 2:
+			p = "__socklen_t *__restrict";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* access */
+	case 33:
+		switch(ndx) {
+		case 0:
+			p = "char *";
+			break;
+		case 1:
+			p = "int";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* chflags */
+	case 34:
+		switch(ndx) {
+		case 0:
+			p = "char *";
+			break;
+		case 1:
+			p = "int";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* fchflags */
+	case 35:
+		switch(ndx) {
+		case 0:
+			p = "int";
+			break;
+		case 1:
+			p = "int";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* sync */
+	case 36:
+		break;
+	/* kill */
+	case 37:
+		switch(ndx) {
+		case 0:
+			p = "int";
+			break;
+		case 1:
+			p = "int";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* getppid */
+	case 39:
+		break;
+	/* dup */
+	case 41:
+		switch(ndx) {
+		case 0:
+			p = "u_int";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* pipe */
+	case 42:
+		break;
+	/* getegid */
+	case 43:
+		break;
+	/* profil */
+	case 44:
+		switch(ndx) {
+		case 0:
+			p = "caddr_t";
+			break;
+		case 1:
+			p = "size_t";
+			break;
+		case 2:
+			p = "size_t";
+			break;
+		case 3:
+			p = "u_int";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* ktrace */
+	case 45:
+		switch(ndx) {
+		case 0:
+			p = "const char *";
+			break;
+		case 1:
+			p = "int";
+			break;
+		case 2:
+			p = "int";
+			break;
+		case 3:
+			p = "int";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* getgid */
+	case 47:
+		break;
+	/* getlogin */
+	case 49:
+		switch(ndx) {
+		case 0:
+			p = "char *";
+			break;
+		case 1:
+			p = "u_int";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* setlogin */
+	case 50:
+		switch(ndx) {
+		case 0:
+			p = "char *";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* acct */
+	case 51:
+		switch(ndx) {
+		case 0:
+			p = "char *";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* sigaltstack */
+	case 53:
+		switch(ndx) {
+		case 0:
+			p = "stack_t *";
+			break;
+		case 1:
+			p = "stack_t *";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* ioctl */
+	case 54:
+		switch(ndx) {
+		case 0:
+			p = "int";
+			break;
+		case 1:
+			p = "u_long";
+			break;
+		case 2:
+			p = "caddr_t";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* reboot */
+	case 55:
+		switch(ndx) {
+		case 0:
+			p = "int";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* revoke */
+	case 56:
+		switch(ndx) {
+		case 0:
+			p = "char *";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* symlink */
+	case 57:
+		switch(ndx) {
+		case 0:
+			p = "char *";
+			break;
+		case 1:
+			p = "char *";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* readlink */
+	case 58:
+		switch(ndx) {
+		case 0:
+			p = "char *";
+			break;
+		case 1:
+			p = "char *";
+			break;
+		case 2:
+			p = "size_t";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* execve */
+	case 59:
+		switch(ndx) {
+		case 0:
+			p = "char *";
+			break;
+		case 1:
+			p = "char **";
+			break;
+		case 2:
+			p = "char **";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* umask */
+	case 60:
+		switch(ndx) {
+		case 0:
+			p = "int";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* chroot */
+	case 61:
+		switch(ndx) {
+		case 0:
+			p = "char *";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* msync */
+	case 65:
+		switch(ndx) {
+		case 0:
+			p = "void *";
+			break;
+		case 1:
+			p = "size_t";
+			break;
+		case 2:
+			p = "int";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* vfork */
+	case 66:
+		break;
+	/* sbrk */
+	case 69:
+		switch(ndx) {
+		case 0:
+			p = "int";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* sstk */
+	case 70:
+		switch(ndx) {
+		case 0:
+			p = "int";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* ovadvise */
+	case 72:
+		switch(ndx) {
+		case 0:
+			p = "int";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* munmap */
+	case 73:
+		switch(ndx) {
+		case 0:
+			p = "void *";
+			break;
+		case 1:
+			p = "size_t";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* mprotect */
+	case 74:
+		switch(ndx) {
+		case 0:
+			p = "const void *";
+			break;
+		case 1:
+			p = "size_t";
+			break;
+		case 2:
+			p = "int";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* madvise */
+	case 75:
+		switch(ndx) {
+		case 0:
+			p = "void *";
+			break;
+		case 1:
+			p = "size_t";
+			break;
+		case 2:
+			p = "int";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* mincore */
+	case 78:
+		switch(ndx) {
+		case 0:
+			p = "const void *";
+			break;
+		case 1:
+			p = "size_t";
+			break;
+		case 2:
+			p = "char *";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* getgroups */
+	case 79:
+		switch(ndx) {
+		case 0:
+			p = "u_int";
+			break;
+		case 1:
+			p = "gid_t *";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* setgroups */
+	case 80:
+		switch(ndx) {
+		case 0:
+			p = "u_int";
+			break;
+		case 1:
+			p = "gid_t *";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* getpgrp */
+	case 81:
+		break;
+	/* setpgid */
+	case 82:
+		switch(ndx) {
+		case 0:
+			p = "int";
+			break;
+		case 1:
+			p = "int";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* setitimer */
+	case 83:
+		switch(ndx) {
+		case 0:
+			p = "u_int";
+			break;
+		case 1:
+			p = "struct itimerval *";
+			break;
+		case 2:
+			p = "struct itimerval *";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* swapon */
+	case 85:
+		switch(ndx) {
+		case 0:
+			p = "char *";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* getitimer */
+	case 86:
+		switch(ndx) {
+		case 0:
+			p = "u_int";
+			break;
+		case 1:
+			p = "struct itimerval *";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* getdtablesize */
+	case 89:
+		break;
+	/* dup2 */
+	case 90:
+		switch(ndx) {
+		case 0:
+			p = "u_int";
+			break;
+		case 1:
+			p = "u_int";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* fcntl */
+	case 92:
+		switch(ndx) {
+		case 0:
+			p = "int";
+			break;
+		case 1:
+			p = "int";
+			break;
+		case 2:
+			p = "long";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* select */
+	case 93:
+		switch(ndx) {
+		case 0:
+			p = "int";
+			break;
+		case 1:
+			p = "fd_set *";
+			break;
+		case 2:
+			p = "fd_set *";
+			break;
+		case 3:
+			p = "fd_set *";
+			break;
+		case 4:
+			p = "struct timeval *";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* fsync */
+	case 95:
+		switch(ndx) {
+		case 0:
+			p = "int";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* setpriority */
+	case 96:
+		switch(ndx) {
+		case 0:
+			p = "int";
+			break;
+		case 1:
+			p = "int";
+			break;
+		case 2:
+			p = "int";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* socket */
+	case 97:
+		switch(ndx) {
+		case 0:
+			p = "int";
+			break;
+		case 1:
+			p = "int";
+			break;
+		case 2:
+			p = "int";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* connect */
+	case 98:
+		switch(ndx) {
+		case 0:
+			p = "int";
+			break;
+		case 1:
+			p = "caddr_t";
+			break;
+		case 2:
+			p = "int";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* getpriority */
+	case 100:
+		switch(ndx) {
+		case 0:
+			p = "int";
+			break;
+		case 1:
+			p = "int";
+			break;
+		default:

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Wed Mar 26 23:08:13 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4D511106566C; Wed, 26 Mar 2008 23:08:13 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E697B106564A
	for ; Wed, 26 Mar 2008 23:08:12 +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 D78C58FC1B
	for ; Wed, 26 Mar 2008 23:08:12 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2QN8CqV006650
	for ; Wed, 26 Mar 2008 23:08:12 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2QN8CIn006648
	for perforce@freebsd.org; Wed, 26 Mar 2008 23:08:12 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 26 Mar 2008 23:08:12 GMT
Message-Id: <200803262308.m2QN8CIn006648@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 138681 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 26 Mar 2008 23:08:13 -0000

http://perforce.freebsd.org/chv.cgi?CH=138681

Change 138681 by sam@sam_ebb on 2008/03/26 23:07:56

	checkpoint; can associate and pass traffic with a netgear ma401
	but my intersil cards lock up after sending auth

Affected files ...

.. //depot/projects/vap/sys/dev/wi/if_wi.c#13 edit
.. //depot/projects/vap/sys/dev/wi/if_wi_pci.c#6 edit
.. //depot/projects/vap/sys/dev/wi/if_wivar.h#10 edit

Differences ...

==== //depot/projects/vap/sys/dev/wi/if_wi.c#13 (text+ko) ====

@@ -114,6 +114,7 @@
 		const uint8_t bssid[IEEE80211_ADDR_LEN],
 		const uint8_t mac[IEEE80211_ADDR_LEN]);
 static void wi_vap_delete(struct ieee80211vap *vap);
+static void wi_stop_locked(struct wi_softc *sc, int disable);
 static void wi_start_locked(struct ifnet *);
 static void wi_start(struct ifnet *);
 static int  wi_start_tx(struct ifnet *ifp, struct wi_frame *frmhdr,
@@ -122,7 +123,7 @@
 		const struct ieee80211_bpf_params *);
 static void wi_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m,
 		int subtype, int rssi, int noise, u_int32_t rstamp);
-static int  wi_reset(struct ifnet *);
+static int  wi_reset(struct wi_softc *);
 static void wi_watchdog(void *);
 static int  wi_ioctl(struct ifnet *, u_long, caddr_t);
 static void wi_media_status(struct ifnet *, struct ifmediareq *);
@@ -271,7 +272,7 @@
 	sc->sc_firmware_type = WI_NOTYPE;
 	sc->wi_cmd_count = 500;
 	/* Reset the NIC. */
-	if (wi_reset(ifp) != 0) {
+	if (wi_reset(sc) != 0) {
 		wi_free(dev);
 		return ENXIO;		/* XXX */
 	}
@@ -436,8 +437,7 @@
 
 	sc->sc_max_datalen = 2304;
 	sc->sc_system_scale = 1;
-	sc->sc_cnfauthmode = IEEE80211_AUTH_OPEN;
-	sc->sc_roaming_mode = 1;
+	sc->sc_roaming_mode = 2;	/* NB: host decides */
 	sc->sc_portnum = WI_DEFAULT_PORT;
 	sc->sc_authtype = WI_DEFAULT_AUTHTYPE;
 
@@ -489,7 +489,7 @@
 	/* check if device was removed */
 	sc->wi_gone |= !bus_child_present(dev);
 
-	wi_stop(ifp, 0);
+	wi_stop_locked(sc, 0);
 	WI_UNLOCK(sc);
 #if NBPFILTER > 0
 	bpfdetach(ifp);
@@ -577,7 +577,7 @@
 {
 	struct wi_softc *sc = device_get_softc(dev);
 
-	wi_stop(sc->sc_ifp, 1);
+	wi_stop(sc, 1);
 }
 
 void
@@ -620,31 +620,26 @@
 	return;
 }
 
-void
-wi_init(void *arg)
+static void
+wi_enable(struct wi_softc *sc)
+{
+	/* enable port */
+	wi_cmd(sc, WI_CMD_ENABLE | sc->sc_portnum, 0, 0, 0);
+	sc->sc_enabled = 1;
+}
+
+static int
+wi_init_locked(struct wi_softc *sc, uint8_t mac[IEEE80211_ADDR_LEN])
 {
-	struct wi_softc *sc = arg;
-	struct ifnet *ifp = sc->sc_ifp;
-	struct ieee80211com *ic = &sc->sc_ic;
 	int i;
-	int error = 0, wasenabled;
 
-	if (sc->wi_gone) 
-		return;
-
-	if ((wasenabled = sc->sc_enabled))
-		wi_stop(ifp, 1);
+	wi_reset(sc);
 
-	WI_LOCK(sc);
-	wi_reset(ifp);
-
 	wi_write_val(sc, WI_RID_PORTTYPE, sc->sc_porttype);
-	wi_write_val(sc, WI_RID_CREATE_IBSS, 0);
+	wi_write_val(sc, WI_RID_CREATE_IBSS, 3);	/* join only, don't create */
 	wi_write_val(sc, WI_RID_MAX_DATALEN, sc->sc_max_datalen);
-#if 0
 	/* NB: for IEEE80211_BPF_NOACK */
 	wi_write_val(sc, WI_RID_ALT_RETRY_CNT, 0);
-#endif
 	if (sc->sc_flags & WI_FLAGS_HAS_SYSSCALE)
 		wi_write_val(sc, WI_RID_SYSTEM_SCALE, sc->sc_system_scale);
 	if (sc->sc_flags & WI_FLAGS_HAS_ROAMING)
@@ -652,30 +647,52 @@
 	if (sc->sc_flags & WI_FLAGS_HAS_MOR)
 		wi_write_val(sc, WI_RID_MICROWAVE_OVEN, sc->sc_microwave_oven);
 
-	IEEE80211_ADDR_COPY(ic->ic_myaddr, IF_LLADDR(ifp));
-	wi_write_rid(sc, WI_RID_MAC_NODE, ic->ic_myaddr, IEEE80211_ADDR_LEN);
+	wi_write_rid(sc, WI_RID_MAC_NODE, mac, IEEE80211_ADDR_LEN);
 
 	/* Allocate fids for the card */
-	if (!wasenabled) {
-		sc->sc_buflen = IEEE80211_MAX_LEN + sizeof(struct wi_frame);
-		for (i = 0; i < sc->sc_ntxbuf; i++) {
-			error = wi_alloc_fid(sc, sc->sc_buflen,
-			    &sc->sc_txd[i].d_fid);
-			if (error) {
-				device_printf(sc->sc_dev,
-				    "tx buffer allocation failed (error %u)\n",
-				    error);
-				goto out;
-			}
-			sc->sc_txd[i].d_len = 0;
+	sc->sc_buflen = IEEE80211_MAX_LEN + sizeof(struct wi_frame);
+	for (i = 0; i < sc->sc_ntxbuf; i++) {
+		int error = wi_alloc_fid(sc, sc->sc_buflen,
+		    &sc->sc_txd[i].d_fid);
+		if (error) {
+			device_printf(sc->sc_dev,
+			    "tx buffer allocation failed (error %u)\n",
+			    error);
+			return error;
 		}
+		sc->sc_txd[i].d_len = 0;
 	}
 	sc->sc_txcur = sc->sc_txnext = 0;
 
-	/* Enable desired port */
-	wi_cmd(sc, WI_CMD_ENABLE | sc->sc_portnum, 0, 0, 0);
+	return 0;
+}
+
+void
+wi_init(void *arg)
+{
+	struct wi_softc *sc = arg;
+	struct ifnet *ifp = sc->sc_ifp;
+	struct ieee80211com *ic = &sc->sc_ic;
+	int wasenabled;
+
+	WI_LOCK(sc);
+	if (sc->wi_gone) {
+		WI_UNLOCK(sc);
+		return;
+	}
+	wasenabled = sc->sc_enabled;
+	if (wasenabled)
+		wi_stop_locked(sc, 1);
+
+	IEEE80211_ADDR_COPY(ic->ic_myaddr, IF_LLADDR(ifp));
+	if (wi_init_locked(sc, ic->ic_myaddr) != 0) {
+		if_printf(ifp, "interface not running\n");
+		wi_stop_locked(sc, 1);
+		WI_UNLOCK(sc);
+		return;
+	}
+	wi_enable(sc);			/* Enable desired port */
 
-	sc->sc_enabled = 1;
 	ifp->if_drv_flags |= IFF_DRV_RUNNING;
 	ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
 
@@ -686,23 +703,15 @@
 	ieee80211_start_all(ic);
 
 	callout_reset(&sc->sc_watchdog, hz, wi_watchdog, sc);
-	return;
-out:
-	if (error) {
-		if_printf(ifp, "interface not running\n");
-		wi_stop(ifp, 1);
-	}
-	WI_UNLOCK(sc);
-	DPRINTF(("wi_init: return %d\n", error));
-	return;
 }
 
-void
-wi_stop(struct ifnet *ifp, int disable)
+static void
+wi_stop_locked(struct wi_softc *sc, int disable)
 {
-	struct wi_softc *sc = ifp->if_softc;
+	struct ifnet *ifp = sc->sc_ifp;
+
+	WI_LOCK_ASSERT(sc);
 
-	WI_LOCK(sc);
 	if (sc->sc_enabled && !sc->wi_gone) {
 		CSR_WRITE_2(sc, WI_INT_EN, 0);
 		wi_cmd(sc, WI_CMD_DISABLE | sc->sc_portnum, 0, 0, 0);
@@ -716,7 +725,13 @@
 	sc->sc_false_syns = 0;
 
 	ifp->if_drv_flags &= ~(IFF_DRV_OACTIVE | IFF_DRV_RUNNING);
+}
 
+void
+wi_stop(struct wi_softc *sc, int disable)
+{
+	WI_LOCK(sc);
+	wi_stop_locked(sc, disable);
 	WI_UNLOCK(sc);
 }
 
@@ -726,24 +741,25 @@
 	struct ifnet *ifp = ic->ic_ifp;
 	struct wi_softc *sc = ifp->if_softc;
 
+	DPRINTF(("%s: channel %d, %sscanning\n", __func__,
+	    ieee80211_chan2ieee(ic, ic->ic_curchan),
+	    ic->ic_flags & IEEE80211_F_SCAN ? "" : "!"));
+
 	WI_LOCK(sc);
+	/*
+	 * Don't force the channel if we're not scanning; we may
+	 * be called back on entering the AUTH and/or RUN state
+	 * but the firmware gets unhappy as it's join primitive
+	 * handles the channel change.
+	 */
 	wi_write_val(sc, WI_RID_OWN_CHNL,
 	    ieee80211_chan2ieee(ic, ic->ic_curchan));
-
 #if NBPFILTER > 0
 	sc->sc_tx_th.wt_chan_freq = sc->sc_rx_th.wr_chan_freq =
 		htole16(ic->ic_curchan->ic_freq);
 	sc->sc_tx_th.wt_chan_flags = sc->sc_rx_th.wr_chan_flags =
 		htole16(ic->ic_curchan->ic_flags);
 #endif
-
-	if ((ic->ic_flags & IEEE80211_F_SCAN) == 0 &&
-	    ic->ic_opmode == IEEE80211_M_HOSTAP &&
-	    sc->sc_firmware_type == WI_INTERSIL) {
-		/* XXX: some cards need to be re-enabled */
-		wi_cmd(sc, WI_CMD_DISABLE | WI_PORT0, 0, 0, 0);
-		wi_cmd(sc, WI_CMD_ENABLE | WI_PORT0, 0, 0, 0);
-	}
 	WI_UNLOCK(sc);
 }
 
@@ -754,6 +770,8 @@
 	struct wi_softc *sc = ifp->if_softc;
 	struct ieee80211_scan_state *ss = ic->ic_scan;
 
+	DPRINTF(("%s\n", __func__));
+
 	WI_LOCK(sc);
 	/*
 	 * Switch device to monitor mode.
@@ -766,9 +784,12 @@
 		wi_write_val(sc, WI_RID_PORTTYPE, WI_PORTTYPE_APSILENT);
 		break;
 	}
-	wi_cmd(sc, WI_CMD_DEBUG | (WI_TEST_MONITOR << 8), 0, 0, 0);
-
-	ss->ss_mindwell = ss->ss_maxdwell = msecs_to_ticks(400); /* 400ms */
+	if (sc->sc_firmware_type == WI_INTERSIL) {
+		wi_cmd(sc, WI_CMD_DISABLE | WI_PORT0, 0, 0, 0);
+		wi_cmd(sc, WI_CMD_ENABLE | WI_PORT0, 0, 0, 0);
+	}
+	/* force full dwell time to compensate for firmware overhead */
+	ss->ss_mindwell = ss->ss_maxdwell = msecs_to_ticks(400);
 	WI_UNLOCK(sc);
 
 }
@@ -779,9 +800,14 @@
 	struct ifnet *ifp = ic->ic_ifp;
 	struct wi_softc *sc = ifp->if_softc;
 
+	DPRINTF(("%s: restore port type %d\n", __func__, sc->sc_porttype));
+
 	WI_LOCK(sc);
-	wi_cmd(sc, WI_CMD_DEBUG, 0, 0, 0);
 	wi_write_val(sc, WI_RID_PORTTYPE, sc->sc_porttype);
+	if (sc->sc_firmware_type == WI_INTERSIL) {
+		wi_cmd(sc, WI_CMD_DISABLE | WI_PORT0, 0, 0, 0);
+		wi_cmd(sc, WI_CMD_ENABLE | WI_PORT0, 0, 0, 0);
+	}
 	WI_UNLOCK(sc);
 }
 
@@ -816,8 +842,30 @@
 	if (nstate == IEEE80211_S_AUTH) {
 		struct ieee80211_node *bss = vap->iv_bss;
 
-		wi_write_ssid(sc, WI_RID_DESIRED_SSID,
-		    bss->ni_essid, bss->ni_esslen);
+		wi_init_locked(sc, vap->iv_myaddr);
+
+		if (vap->iv_flags & IEEE80211_F_PMGTON) {
+			wi_write_val(sc, WI_RID_MAX_SLEEP, ic->ic_lintval);
+			wi_write_val(sc, WI_RID_PM_ENABLED, 1);
+		}
+		wi_write_val(sc, WI_RID_RTS_THRESH, vap->iv_rtsthreshold);
+		if (sc->sc_flags & WI_FLAGS_HAS_FRAGTHR)
+			wi_write_val(sc, WI_RID_FRAG_THRESH,
+			    vap->iv_fragthreshold);
+		wi_write_txrate(sc, vap);
+
+		/* Configure WEP. */
+		if (ic->ic_caps & IEEE80211_C_WEP)
+			wi_write_wep(sc, vap);
+		else
+			sc->sc_encryption = 0;
+
+		wi_write_ssid(sc, WI_RID_DESIRED_SSID, bss->ni_essid, bss->ni_esslen);
+		wi_write_val(sc, WI_RID_OWN_CHNL,
+		    ieee80211_chan2ieee(ic, bss->ni_chan));
+
+		wi_enable(sc);		/* enable port */
+
 		/* Lucent firmware does not support the JOIN RID. */
 		if (sc->sc_firmware_type == WI_INTERSIL) {
 			struct wi_joinreq join;
@@ -827,8 +875,6 @@
 			join.wi_chan = htole16(
 			    ieee80211_chan2ieee(ic, bss->ni_chan));
 			wi_write_rid(sc, WI_RID_JOIN_REQ, &join, sizeof(join));
-		} else {
-			wi_write_val(sc, WI_RID_CREATE_IBSS, 0);
 		}
 		/* NB: don't go through 802.11 layer, it'll send auth frame */
 		vap->iv_state = nstate;
@@ -840,32 +886,29 @@
 	if (nstate == IEEE80211_S_RUN && vap->iv_state != IEEE80211_S_RUN) {
 		if (vap->iv_opmode == IEEE80211_M_MONITOR)
 			wi_cmd(sc, WI_CMD_DEBUG | (WI_TEST_MONITOR << 8), 0, 0, 0);
-		wi_write_val(sc, WI_RID_MAX_SLEEP, ic->ic_lintval);
-		if (ic->ic_caps & IEEE80211_C_PMGT)
-			wi_write_val(sc, WI_RID_PM_ENABLED,
-			    (vap->iv_flags & IEEE80211_F_PMGTON) ? 1 : 0);
-		wi_write_val(sc, WI_RID_RTS_THRESH, vap->iv_rtsthreshold);
-		if (sc->sc_flags & WI_FLAGS_HAS_FRAGTHR)
-			wi_write_val(sc, WI_RID_FRAG_THRESH,
-			    vap->iv_fragthreshold);
-		wi_write_txrate(sc, vap);
+		if (vap->iv_opmode == IEEE80211_M_HOSTAP) {
+			wi_write_val(sc, WI_RID_RTS_THRESH, vap->iv_rtsthreshold);
+			if (sc->sc_flags & WI_FLAGS_HAS_FRAGTHR)
+				wi_write_val(sc, WI_RID_FRAG_THRESH,
+				    vap->iv_fragthreshold);
+			wi_write_txrate(sc, vap);
 
-		/* Configure WEP. */
-		if (ic->ic_caps & IEEE80211_C_WEP) {
-			sc->sc_cnfauthmode = vap->iv_bss->ni_authmode;
-			wi_write_wep(sc, vap);
-		} else
-			sc->sc_encryption = 0;
+			/* Configure WEP. */
+			if (ic->ic_caps & IEEE80211_C_WEP) {
+				sc->sc_cnfauthmode = vap->iv_bss->ni_authmode;
+				wi_write_wep(sc, vap);
+			} else
+				sc->sc_encryption = 0;
 
-		if (vap->iv_opmode == IEEE80211_M_HOSTAP &&
-		    sc->sc_firmware_type == WI_INTERSIL) {
+			/* NB: only Intersil supports HOSTAP so this works for now */
 			wi_write_ssid(sc, WI_RID_OWN_SSID,
 			    vap->iv_des_ssid[0].ssid, vap->iv_des_ssid[0].len);
 			wi_write_val(sc, WI_RID_OWN_BEACON_INT, ic->ic_bintval);
 			wi_write_val(sc, WI_RID_BASIC_RATE, 0x03);   /* 1, 2 */
 			wi_write_val(sc, WI_RID_SUPPORT_RATE, 0x0f); /* 1, 2, 5.5, 11 */
 			wi_write_val(sc, WI_RID_DTIM_PERIOD, vap->iv_dtim_period);
-			/* XXX: some card need to be re-enabled for hostap */
+
+			/* XXX: some cards need to be re-enabled for hostap */
 			wi_cmd(sc, WI_CMD_DISABLE | WI_PORT0, 0, 0, 0);
 			wi_cmd(sc, WI_CMD_ENABLE | WI_PORT0, 0, 0, 0);
 		}
@@ -1066,21 +1109,20 @@
 }
 
 static int
-wi_reset(struct ifnet *ifp)
+wi_reset(struct wi_softc *sc)
 {
 #define WI_INIT_TRIES 3
-	struct wi_softc *sc = ifp->if_softc;
-	int i;
-	int error = 0;
+	int i, error = 0;
 
 	for (i = 0; i < WI_INIT_TRIES; i++) {
-		if ((error = wi_cmd(sc, WI_CMD_INI, 0, 0, 0)) == 0)
+		error = wi_cmd(sc, WI_CMD_INI, 0, 0, 0);
+		if (error == 0)
 			break;
 		DELAY(WI_DELAY * 1000);
 	}
 	sc->sc_reset = 1;
 	if (i == WI_INIT_TRIES) {
-		if_printf(ifp, "init failed\n");
+		if_printf(sc->sc_ifp, "reset failed\n");
 		return error;
 	}
 
@@ -1142,7 +1184,7 @@
 				wi_init(sc);
 		} else {
 			if (ifp->if_drv_flags & IFF_DRV_RUNNING)
-				wi_stop(ifp, 1);
+				wi_stop_locked(sc, 1);
 			sc->wi_gone = 0;
 		}
 		sc->sc_if_flags = ifp->if_flags;
@@ -1462,11 +1504,11 @@
 			IEEE80211_UNLOCK(ic);
 			break;
 		case WI_INFO_LINK_STAT_AP_INR:
+		case WI_INFO_LINK_STAT_DISCONNECTED:
 			break;
 		case WI_INFO_LINK_STAT_AP_OOR:
 			ieee80211_beacon_miss(ic);
 			break;
-		case WI_INFO_LINK_STAT_DISCONNECTED:
 		case WI_INFO_LINK_STAT_ASSOC_FAILED:
 			if (vap->iv_opmode == IEEE80211_M_STA)
 				ieee80211_new_state(vap, IEEE80211_S_SCAN,
@@ -1748,7 +1790,7 @@
 				wi_write_val(sc, WI_RID_PROMISC, 1);
 			}
 			wi_write_val(sc, WI_RID_CNFAUTHMODE,
-			    sc->sc_cnfauthmode);
+			    vap->iv_bss->ni_authmode);
 			/* XXX should honor IEEE80211_F_DROPUNENC */
 			val = PRIVACY_INVOKED | EXCLUDE_UNENCRYPTED;
 			/*

==== //depot/projects/vap/sys/dev/wi/if_wi_pci.c#6 (text+ko) ====

@@ -246,10 +246,8 @@
 wi_pci_suspend(device_t dev)
 {
 	struct wi_softc	*sc = device_get_softc(dev);
-	struct ieee80211com *ic = &sc->sc_ic;
-	struct ifnet *ifp = ic->ic_ifp;
 
-	wi_stop(ifp, 1);
+	wi_stop(sc, 1);
 	
 	return (0);
 }

==== //depot/projects/vap/sys/dev/wi/if_wivar.h#10 (text+ko) ====

@@ -194,4 +194,4 @@
 void	wi_init(void *);
 void	wi_intr(void *);
 int	wi_mgmt_xmit(struct wi_softc *, caddr_t, int);
-void	wi_stop(struct ifnet *, int);
+void	wi_stop(struct wi_softc *, int);

From owner-p4-projects@FreeBSD.ORG  Wed Mar 26 23:26:34 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 225FA1065679; Wed, 26 Mar 2008 23:26: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 D54571065670
	for ; Wed, 26 Mar 2008 23:26:33 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C78F48FC21
	for ; Wed, 26 Mar 2008 23:26:33 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2QNQX4b007774
	for ; Wed, 26 Mar 2008 23:26:33 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2QNQXlI007772
	for perforce@freebsd.org; Wed, 26 Mar 2008 23:26:33 GMT
	(envelope-from jb@freebsd.org)
Date: Wed, 26 Mar 2008 23:26:33 GMT
Message-Id: <200803262326.m2QNQXlI007772@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138684 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 26 Mar 2008 23:26:34 -0000

http://perforce.freebsd.org/chv.cgi?CH=138684

Change 138684 by jb@jb_freebsd1 on 2008/03/26 23:26:32

	Allow an application to set FOPEN_MAX when building.

Affected files ...

.. //depot/projects/dtrace/src/include/stdio.h#6 edit

Differences ...

==== //depot/projects/dtrace/src/include/stdio.h#6 (text+ko) ====

@@ -181,7 +181,9 @@
  * (which could fail).  Do not use this for anything.
  */
 				/* must be == _POSIX_STREAM_MAX  */
+#ifndef FOPEN_MAX
 #define	FOPEN_MAX	20	/* must be <= OPEN_MAX  */
+#endif
 #define	FILENAME_MAX	1024	/* must be <= PATH_MAX  */
 
 /* System V/ANSI C; this is the wrong way to do this, do *not* use these. */

From owner-p4-projects@FreeBSD.ORG  Wed Mar 26 23:43:58 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 55EBC1065671; Wed, 26 Mar 2008 23:43: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 14CE2106566B
	for ; Wed, 26 Mar 2008 23:43: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 9679E8FC1B
	for ; Wed, 26 Mar 2008 23:43:57 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2QNhvnG008461
	for ; Wed, 26 Mar 2008 23:43:57 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2QNhv30008459
	for perforce@freebsd.org; Wed, 26 Mar 2008 23:43:57 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 26 Mar 2008 23:43:57 GMT
Message-Id: <200803262343.m2QNhv30008459@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 138685 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 26 Mar 2008 23:43:58 -0000

http://perforce.freebsd.org/chv.cgi?CH=138685

Change 138685 by sam@sam_ebb on 2008/03/26 23:43:50

	o set roaming mode to disabled to get intersil card kinda working
	o cleanup more old cruft that can go away w/ symbol support

Affected files ...

.. //depot/projects/vap/sys/dev/wi/if_wi.c#14 edit
.. //depot/projects/vap/sys/dev/wi/if_wivar.h#11 edit

Differences ...

==== //depot/projects/vap/sys/dev/wi/if_wi.c#14 (text+ko) ====

@@ -183,12 +183,10 @@
 	    0, "control debugging printfs");
 
 #define	DPRINTF(X)	if (wi_debug) printf X
-#define	DPRINTF2(X)	if (wi_debug > 1) printf X
 #define	IFF_DUMPPKTS(_ifp) \
 	(((_ifp)->if_flags & (IFF_DEBUG|IFF_LINK2)) == (IFF_DEBUG|IFF_LINK2))
 #else
 #define	DPRINTF(X)
-#define	DPRINTF2(X)
 #define	IFF_DUMPPKTS(_ifp)	0
 #endif
 
@@ -369,11 +367,11 @@
 	switch (sc->sc_firmware_type) {
 	case WI_LUCENT:
 		sc->sc_ntxbuf = 1;
-		sc->sc_flags |= WI_FLAGS_HAS_SYSSCALE
-			     |  WI_FLAGS_HAS_MOR;
+		sc->sc_flags |= WI_FLAGS_HAS_MOR;
 		ic->ic_caps |= IEEE80211_C_IBSS;
 
-		sc->sc_ibss_port = htole16(1);
+		sc->sc_ibss_port = WI_PORTTYPE_BSS;
+		sc->sc_monitor_port = WI_PORTTYPE_ADHOC;
 		sc->sc_min_rssi = WI_LUCENT_MIN_RSSI;
 		sc->sc_max_rssi = WI_LUCENT_MAX_RSSI;
 		sc->sc_dbm_offset = WI_LUCENT_DBM_OFFSET;
@@ -381,8 +379,7 @@
 	case WI_INTERSIL:
 		sc->sc_ntxbuf = WI_NTXBUF;
 		sc->sc_flags |= WI_FLAGS_HAS_FRAGTHR
-			     |  WI_FLAGS_HAS_ROAMING
-			     |  WI_FLAGS_HAS_SYSSCALE;
+			     |  WI_FLAGS_HAS_ROAMING;
 		/*
 		 * Old firmware are slow, so give peace a chance.
 		 */
@@ -399,7 +396,8 @@
 		 */
 		ic->ic_caps |= IEEE80211_C_HOSTAP;
 
-		sc->sc_ibss_port = htole16(0);
+		sc->sc_ibss_port = WI_PORTTYPE_IBSS;
+		sc->sc_monitor_port = WI_PORTTYPE_APSILENT;
 		sc->sc_min_rssi = WI_PRISM_MIN_RSSI;
 		sc->sc_max_rssi = WI_PRISM_MAX_RSSI;
 		sc->sc_dbm_offset = WI_PRISM_DBM_OFFSET;
@@ -435,11 +433,7 @@
 		sc->sc_dbm_offset = le16toh(val);
 	}
 
-	sc->sc_max_datalen = 2304;
-	sc->sc_system_scale = 1;
-	sc->sc_roaming_mode = 2;	/* NB: host decides */
 	sc->sc_portnum = WI_DEFAULT_PORT;
-	sc->sc_authtype = WI_DEFAULT_AUTHTYPE;
 
 	ieee80211_ifattach(ic);
 	ic->ic_raw_xmit = wi_raw_xmit;
@@ -544,14 +538,7 @@
 		sc->sc_porttype = WI_PORTTYPE_HOSTAP;
 		break;
 	case IEEE80211_M_MONITOR:
-		switch (sc->sc_firmware_type) {
-		case WI_LUCENT:
-			sc->sc_porttype = WI_PORTTYPE_ADHOC;
-			break;
-		case WI_INTERSIL:
-			sc->sc_porttype = WI_PORTTYPE_APSILENT;
-			break;
-		}
+		sc->sc_porttype = sc->sc_monitor_port;
 		break;
 	default:
 		break;
@@ -637,13 +624,11 @@
 
 	wi_write_val(sc, WI_RID_PORTTYPE, sc->sc_porttype);
 	wi_write_val(sc, WI_RID_CREATE_IBSS, 3);	/* join only, don't create */
-	wi_write_val(sc, WI_RID_MAX_DATALEN, sc->sc_max_datalen);
+	wi_write_val(sc, WI_RID_MAX_DATALEN, 2304);
 	/* NB: for IEEE80211_BPF_NOACK */
 	wi_write_val(sc, WI_RID_ALT_RETRY_CNT, 0);
-	if (sc->sc_flags & WI_FLAGS_HAS_SYSSCALE)
-		wi_write_val(sc, WI_RID_SYSTEM_SCALE, sc->sc_system_scale);
 	if (sc->sc_flags & WI_FLAGS_HAS_ROAMING)
-		wi_write_val(sc, WI_RID_ROAMING_MODE, sc->sc_roaming_mode);
+		wi_write_val(sc, WI_RID_ROAMING_MODE, 3); /* NB: disabled */
 	if (sc->sc_flags & WI_FLAGS_HAS_MOR)
 		wi_write_val(sc, WI_RID_MICROWAVE_OVEN, sc->sc_microwave_oven);
 
@@ -746,12 +731,6 @@
 	    ic->ic_flags & IEEE80211_F_SCAN ? "" : "!"));
 
 	WI_LOCK(sc);
-	/*
-	 * Don't force the channel if we're not scanning; we may
-	 * be called back on entering the AUTH and/or RUN state
-	 * but the firmware gets unhappy as it's join primitive
-	 * handles the channel change.
-	 */
 	wi_write_val(sc, WI_RID_OWN_CHNL,
 	    ieee80211_chan2ieee(ic, ic->ic_curchan));
 #if NBPFILTER > 0
@@ -776,14 +755,7 @@
 	/*
 	 * Switch device to monitor mode.
 	 */
-	switch (sc->sc_firmware_type) {
-	case WI_LUCENT:
-		wi_write_val(sc, WI_RID_PORTTYPE, WI_PORTTYPE_ADHOC);
-		break;
-	case WI_INTERSIL:
-		wi_write_val(sc, WI_RID_PORTTYPE, WI_PORTTYPE_APSILENT);
-		break;
-	}
+	wi_write_val(sc, WI_RID_PORTTYPE, sc->sc_monitor_port);
 	if (sc->sc_firmware_type == WI_INTERSIL) {
 		wi_cmd(sc, WI_CMD_DISABLE | WI_PORT0, 0, 0, 0);
 		wi_cmd(sc, WI_CMD_ENABLE | WI_PORT0, 0, 0, 0);
@@ -894,10 +866,9 @@
 			wi_write_txrate(sc, vap);
 
 			/* Configure WEP. */
-			if (ic->ic_caps & IEEE80211_C_WEP) {
-				sc->sc_cnfauthmode = vap->iv_bss->ni_authmode;
+			if (ic->ic_caps & IEEE80211_C_WEP)
 				wi_write_wep(sc, vap);
-			} else
+			else
 				sc->sc_encryption = 0;
 
 			/* NB: only Intersil supports HOSTAP so this works for now */

==== //depot/projects/vap/sys/dev/wi/if_wivar.h#11 (text+ko) ====

@@ -115,13 +115,9 @@
 
 	int			sc_porttype;
 	u_int16_t		sc_portnum;
-	u_int16_t		sc_max_datalen;
-	u_int16_t		sc_system_scale;
-	u_int16_t		sc_cnfauthmode;
-	u_int16_t		sc_roaming_mode;
 	u_int16_t		sc_microwave_oven;
-	u_int16_t		sc_authtype;
 	u_int16_t		sc_encryption;
+	u_int16_t		sc_monitor_port;
 
 	/* RSSI interpretation */
 	u_int16_t		sc_min_rssi;	/* clamp sc_min_rssi < RSSI */
@@ -159,7 +155,6 @@
 #define	WI_FLAGS_HAS_MOR		0x0010
 #define	WI_FLAGS_HAS_ROAMING		0x0020
 #define	WI_FLAGS_HAS_DIVERSITY		0x0040
-#define	WI_FLAGS_HAS_SYSSCALE		0x0080
 #define	WI_FLAGS_BUG_AUTOINC		0x0100
 #define	WI_FLAGS_HAS_FRAGTHR		0x0200
 #define	WI_FLAGS_HAS_DBMADJUST		0x0400

From owner-p4-projects@FreeBSD.ORG  Wed Mar 26 23:59:17 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5DDF81065675; Wed, 26 Mar 2008 23:59: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 035F2106564A
	for ; Wed, 26 Mar 2008 23:59:17 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E95468FC16
	for ; Wed, 26 Mar 2008 23:59:16 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2QNxGRC009872
	for ; Wed, 26 Mar 2008 23:59:16 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2QNxGWd009870
	for perforce@freebsd.org; Wed, 26 Mar 2008 23:59:16 GMT
	(envelope-from piso@freebsd.org)
Date: Wed, 26 Mar 2008 23:59:16 GMT
Message-Id: <200803262359.m2QNxGWd009870@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	piso@freebsd.org using -f
From: Paolo Pisati 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138687 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 26 Mar 2008 23:59:17 -0000

http://perforce.freebsd.org/chv.cgi?CH=138687

Change 138687 by piso@piso_newluxor on 2008/03/26 23:59:16

	Pullup the data before using it.

Affected files ...

.. //depot/projects/soc2005/libalias/sys/netinet/ip_fw_nat.c#3 edit

Differences ...

==== //depot/projects/soc2005/libalias/sys/netinet/ip_fw_nat.c#3 (text+ko) ====

@@ -245,18 +245,16 @@
 static int
 ipfw_nat(struct ip_fw_args *args, struct cfg_nat *t, struct mbuf *m)
 {
-	struct mbuf *mcl;
 	struct ip *ip;
 	/* XXX - libalias duct tape */
 	int ldt, retval;
-	char *c;
 
 	ldt = 0;
 	retval = 0;
-	if ((mcl = m_pullup(m, sizeof(struct ip))) ==
+	if ((m = m_pullup(m, sizeof(struct ip))) ==
 	    NULL)
 		goto badnat;
-	ip = mtod(mcl, struct ip *);
+	ip = mtod(m, struct ip *);
 	if (args->eh == NULL) {
 		ip->ip_len = htons(ip->ip_len);
 		ip->ip_off = htons(ip->ip_off);
@@ -310,27 +308,34 @@
 	 * it can handle delayed checksum and tso)
 	 */
 
-	if (mcl->m_pkthdr.rcvif == NULL && 
-	    mcl->m_pkthdr.csum_flags & 
+	if (m->m_pkthdr.rcvif == NULL && 
+	    m->m_pkthdr.csum_flags & 
 	    CSUM_DELAY_DATA)
 		ldt = 1;
 
-	c = mtod(mcl, char *);
 	if (args->oif == NULL)
-		retval = LibAliasIn(t->lib, &mcl, 
-				    MCLBYTES);
+		retval = LibAliasIn(t->lib, &m,
+		    MCLBYTES);
 	else
-		retval = LibAliasOut(t->lib, &mcl, 
-				     MCLBYTES);
+		retval = LibAliasOut(t->lib, &m,
+		    MCLBYTES);
 	if (retval != PKT_ALIAS_OK) {
+		printf("retval: ");
 		/* XXX - should i add some logging? */
-		m_free(mcl);
+		m_free(m);
 	badnat:
+		printf("badnat ");
+		if (args->oif == NULL)
+			printf("LibAliasIn");
+		else
+			printf("LibAliasOut");
+		printf("\n");
 		args->m = NULL;
 		return (IP_FW_DENY);
 	}
-	mcl->m_pkthdr.len = mcl->m_len = 
-	    ntohs(ip->ip_len);
+	m = m_pullup(m, sizeof(struct ip));
+	ip = mtod(m, struct ip *);
+	m->m_pkthdr.len = ntohs(ip->ip_len);
 
 	/* 
 	 * XXX - libalias checksum offload 
@@ -341,6 +346,10 @@
 	    ip->ip_p == IPPROTO_TCP) {
 		struct tcphdr 	*th; 
 
+		if ((m = m_pullup(m, (ip->ip_hl << 2) +
+			sizeof(struct tcphdr))) == NULL)
+			goto badnat;
+		ip = mtod(m, struct ip *);
 		th = (struct tcphdr *)(ip + 1);
 		if (th->th_x2) 
 			ldt = 1;
@@ -360,6 +369,9 @@
 					
 		switch (ip->ip_p) {
 		case IPPROTO_TCP:
+			if ((m = m_pullup(m, (ip->ip_hl << 2) + sizeof(struct tcphdr))) == NULL)
+				goto badnat;
+			ip = mtod(m, struct ip *);
 			th = (struct tcphdr *)(ip + 1);
 			/* 
 			 * Maybe it was set in 
@@ -367,13 +379,16 @@
 			 */
 			th->th_x2 = 0;
 			th->th_sum = cksum;
-			mcl->m_pkthdr.csum_data = 
+			m->m_pkthdr.csum_data = 
 			    offsetof(struct tcphdr, th_sum);
 			break;
 		case IPPROTO_UDP:
+			    if ((m = m_pullup(m, (ip->ip_hl << 2) + sizeof(struct udphdr))) == NULL)
+				goto badnat;
+			ip = mtod(m, struct ip *);
 			uh = (struct udphdr *)(ip + 1);
 			uh->uh_sum = cksum;
-			mcl->m_pkthdr.csum_data = 
+			m->m_pkthdr.csum_data = 
 			    offsetof(struct udphdr, uh_sum);
 			break;						
 		}
@@ -381,10 +396,10 @@
 		 * No hw checksum offloading: do it 
 		 * by ourself. 
 		 */
-		if ((mcl->m_pkthdr.csum_flags & 
+		if ((m->m_pkthdr.csum_flags & 
 		     CSUM_DELAY_DATA) == 0) {
-			in_delayed_cksum(mcl);
-			mcl->m_pkthdr.csum_flags &= 
+			in_delayed_cksum(m);
+			m->m_pkthdr.csum_flags &= 
 			    ~CSUM_DELAY_DATA;
 		}
 		ip->ip_len = htons(ip->ip_len);
@@ -395,7 +410,7 @@
 		ip->ip_off = ntohs(ip->ip_off);
 	}
 
-	args->m = mcl;
+	args->m = m;
 	return (IP_FW_NAT);
 }
 

From owner-p4-projects@FreeBSD.ORG  Thu Mar 27 00:06:25 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0A0491065674; Thu, 27 Mar 2008 00:06: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 BE131106566B
	for ; Thu, 27 Mar 2008 00:06:24 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B01D58FC15
	for ; Thu, 27 Mar 2008 00:06:24 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2R06O9G011828
	for ; Thu, 27 Mar 2008 00:06:24 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2R06OCD011826
	for perforce@freebsd.org; Thu, 27 Mar 2008 00:06:24 GMT
	(envelope-from piso@freebsd.org)
Date: Thu, 27 Mar 2008 00:06:24 GMT
Message-Id: <200803270006.m2R06OCD011826@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	piso@freebsd.org using -f
From: Paolo Pisati 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138688 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 27 Mar 2008 00:06:25 -0000

http://perforce.freebsd.org/chv.cgi?CH=138688

Change 138688 by piso@piso_newluxor on 2008/03/27 00:06:17

	Adapt ng_nat to the new libalias API.

Affected files ...

.. //depot/projects/soc2005/libalias/sys/netgraph/ng_nat.c#15 edit

Differences ...

==== //depot/projects/soc2005/libalias/sys/netgraph/ng_nat.c#15 (text+ko) ====

@@ -675,7 +675,6 @@
 	struct mbuf	*m;
 	struct ip	*ip;
 	int rval, error = 0;
-	char *c;
 
 	/* We have no required hooks. */
 	if (!(priv->flags & NGNAT_CONNECTED)) {
@@ -689,7 +688,7 @@
 
 	m = NGI_M(item);
 
-	if ((m = m_megapullup(m, m->m_pkthdr.len)) == NULL) {
+	if ((m = m_pullup(m, sizeof(struct ip))) == NULL) {
 		NGI_M(item) = NULL;	/* avoid double free */
 		NG_FREE_ITEM(item);
 		return (ENOBUFS);
@@ -697,21 +696,20 @@
 
 	NGI_M(item) = m;
 
-	c = mtod(m, char *);
 	ip = mtod(m, struct ip *);
 
 	KASSERT(m->m_pkthdr.len == ntohs(ip->ip_len),
 	    ("ng_nat: ip_len != m_pkthdr.len"));
 
 	if (hook == priv->in) {
-		rval = LibAliasIn(priv->lib, c, MCLBYTES);
+		rval = LibAliasIn(priv->lib, &m, MCLBYTES);
 		if (rval != PKT_ALIAS_OK &&
 		    rval != PKT_ALIAS_FOUND_HEADER_FRAGMENT) {
 			NG_FREE_ITEM(item);
 			return (EINVAL);
 		}
 	} else if (hook == priv->out) {
-		rval = LibAliasOut(priv->lib, c, MCLBYTES);
+		rval = LibAliasOut(priv->lib, &m, MCLBYTES);
 		if (rval != PKT_ALIAS_OK) {
 			NG_FREE_ITEM(item);
 			return (EINVAL);
@@ -719,11 +717,30 @@
 	} else
 		panic("ng_nat: unknown hook!\n");
 
-	m->m_pkthdr.len = m->m_len = ntohs(ip->ip_len);
+
+        if ((m = m_pullup(m, sizeof(struct ip))) == NULL) {
+                NGI_M(item) = NULL;     /* avoid double free */
+                NG_FREE_ITEM(item);
+                return (ENOBUFS);
+        }
+
+        NGI_M(item) = m;
+
+        ip = mtod(m, struct ip *);
+	m->m_pkthdr.len = ntohs(ip->ip_len);
 
 	if ((ip->ip_off & htons(IP_OFFMASK)) == 0 &&
 	    ip->ip_p == IPPROTO_TCP) {
-		struct tcphdr *th = (struct tcphdr *)((caddr_t)ip +
+		struct tcphdr *th;
+		if ((m = m_pullup(m, (ip->ip_hl << 2) 
+		    + sizeof(struct tcphdr))) == NULL) {
+                	NGI_M(item) = NULL;     /* avoid double free */
+                	NG_FREE_ITEM(item);
+                	return (ENOBUFS);
+	 	}
+		NGI_M(item) = m;
+		ip = mtod(m, struct ip *);
+		th = (struct tcphdr *)((caddr_t)ip +
 		    (ip->ip_hl << 2));
 
 		/*

From owner-p4-projects@FreeBSD.ORG  Thu Mar 27 00:08:27 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4C417106567E; Thu, 27 Mar 2008 00:08: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 09761106567A
	for ; Thu, 27 Mar 2008 00:08:27 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id EA3778FC1C
	for ; Thu, 27 Mar 2008 00:08:26 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2R08QLj012319
	for ; Thu, 27 Mar 2008 00:08:26 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2R08Q8Z012317
	for perforce@freebsd.org; Thu, 27 Mar 2008 00:08:26 GMT
	(envelope-from jb@freebsd.org)
Date: Thu, 27 Mar 2008 00:08:26 GMT
Message-Id: <200803270008.m2R08Q8Z012317@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138689 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 27 Mar 2008 00:08:27 -0000

http://perforce.freebsd.org/chv.cgi?CH=138689

Change 138689 by jb@jb_freebsd1 on 2008/03/27 00:08:14

	Reset a file to match the vendor branch so that it won't appear
	in the cvs commit. And therefore won't induce a million emails
	from one person regarding the end of the world.

Affected files ...

.. //depot/projects/dtrace/src/contrib/one-true-awk/run.c#6 edit

Differences ...

==== //depot/projects/dtrace/src/contrib/one-true-awk/run.c#6 (text+ko) ====

@@ -63,8 +63,6 @@
 /* #ifndef RAND_MAX */
 /* #define RAND_MAX	32767 */	/* all that ansi guarantees */
 /* #endif */
-#undef FOPEN_MAX
-#define FOPEN_MAX	40
 
 jmp_buf env;
 extern	int	pairstack[];

From owner-p4-projects@FreeBSD.ORG  Thu Mar 27 00:19:39 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B96DD1065670; Thu, 27 Mar 2008 00:19: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 79B7F106564A
	for ; Thu, 27 Mar 2008 00:19:39 +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 6BCB58FC1B
	for ; Thu, 27 Mar 2008 00:19:39 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2R0Jd1d013005
	for ; Thu, 27 Mar 2008 00:19:39 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2R0Jdis013000
	for perforce@freebsd.org; Thu, 27 Mar 2008 00:19:39 GMT
	(envelope-from sam@freebsd.org)
Date: Thu, 27 Mar 2008 00:19:39 GMT
Message-Id: <200803270019.m2R0Jdis013000@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 138691 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 27 Mar 2008 00:19:40 -0000

http://perforce.freebsd.org/chv.cgi?CH=138691

Change 138691 by sam@sam_ebb on 2008/03/27 00:19:17

	o things work much better when interrupts are enabled
	o clear out yet more cruft

Affected files ...

.. //depot/projects/vap/sys/dev/wi/if_wi.c#15 edit
.. //depot/projects/vap/sys/dev/wi/if_wivar.h#12 edit

Differences ...

==== //depot/projects/vap/sys/dev/wi/if_wi.c#15 (text+ko) ====

@@ -367,7 +367,6 @@
 	switch (sc->sc_firmware_type) {
 	case WI_LUCENT:
 		sc->sc_ntxbuf = 1;
-		sc->sc_flags |= WI_FLAGS_HAS_MOR;
 		ic->ic_caps |= IEEE80211_C_IBSS;
 
 		sc->sc_ibss_port = WI_PORTTYPE_BSS;
@@ -613,6 +612,9 @@
 	/* enable port */
 	wi_cmd(sc, WI_CMD_ENABLE | sc->sc_portnum, 0, 0, 0);
 	sc->sc_enabled = 1;
+
+	/* Enable interrupts */
+	CSR_WRITE_2(sc, WI_INT_EN, WI_INTRS);
 }
 
 static int
@@ -629,8 +631,6 @@
 	wi_write_val(sc, WI_RID_ALT_RETRY_CNT, 0);
 	if (sc->sc_flags & WI_FLAGS_HAS_ROAMING)
 		wi_write_val(sc, WI_RID_ROAMING_MODE, 3); /* NB: disabled */
-	if (sc->sc_flags & WI_FLAGS_HAS_MOR)
-		wi_write_val(sc, WI_RID_MICROWAVE_OVEN, sc->sc_microwave_oven);
 
 	wi_write_rid(sc, WI_RID_MAC_NODE, mac, IEEE80211_ADDR_LEN);
 
@@ -676,13 +676,11 @@
 		WI_UNLOCK(sc);
 		return;
 	}
-	wi_enable(sc);			/* Enable desired port */
 
 	ifp->if_drv_flags |= IFF_DRV_RUNNING;
 	ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
 
-	/* Enable interrupts */
-	CSR_WRITE_2(sc, WI_INT_EN, WI_INTRS);
+	wi_enable(sc);			/* Enable desired port */
 	WI_UNLOCK(sc);
 
 	ieee80211_start_all(ic);
@@ -875,8 +873,6 @@
 			wi_write_ssid(sc, WI_RID_OWN_SSID,
 			    vap->iv_des_ssid[0].ssid, vap->iv_des_ssid[0].len);
 			wi_write_val(sc, WI_RID_OWN_BEACON_INT, ic->ic_bintval);
-			wi_write_val(sc, WI_RID_BASIC_RATE, 0x03);   /* 1, 2 */
-			wi_write_val(sc, WI_RID_SUPPORT_RATE, 0x0f); /* 1, 2, 5.5, 11 */
 			wi_write_val(sc, WI_RID_DTIM_PERIOD, vap->iv_dtim_period);
 
 			/* XXX: some cards need to be re-enabled for hostap */

==== //depot/projects/vap/sys/dev/wi/if_wivar.h#12 (text+ko) ====

@@ -115,7 +115,6 @@
 
 	int			sc_porttype;
 	u_int16_t		sc_portnum;
-	u_int16_t		sc_microwave_oven;
 	u_int16_t		sc_encryption;
 	u_int16_t		sc_monitor_port;
 
@@ -152,10 +151,7 @@
 /* maximum consecutive false change-of-BSSID indications */
 #define	WI_MAX_FALSE_SYNS		10	
 
-#define	WI_FLAGS_HAS_MOR		0x0010
 #define	WI_FLAGS_HAS_ROAMING		0x0020
-#define	WI_FLAGS_HAS_DIVERSITY		0x0040
-#define	WI_FLAGS_BUG_AUTOINC		0x0100
 #define	WI_FLAGS_HAS_FRAGTHR		0x0200
 #define	WI_FLAGS_HAS_DBMADJUST		0x0400
 

From owner-p4-projects@FreeBSD.ORG  Thu Mar 27 01:27:53 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C315F106566C; Thu, 27 Mar 2008 01:27: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 81CCB106564A
	for ; Thu, 27 Mar 2008 01:27:53 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5A1A18FC12
	for ; Thu, 27 Mar 2008 01:27:53 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2R1Rr4S026495
	for ; Thu, 27 Mar 2008 01:27:53 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2R1Rrcb026493
	for perforce@freebsd.org; Thu, 27 Mar 2008 01:27:53 GMT
	(envelope-from jb@freebsd.org)
Date: Thu, 27 Mar 2008 01:27:53 GMT
Message-Id: <200803270127.m2R1Rrcb026493@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138695 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 27 Mar 2008 01:27:54 -0000

http://perforce.freebsd.org/chv.cgi?CH=138695

Change 138695 by jb@jb_freebsd1 on 2008/03/27 01:27:14

	Handle 64 open files rather than just 20. Welcome to the 1990's.

Affected files ...

.. //depot/projects/dtrace/src/usr.bin/awk/Makefile#8 edit

Differences ...

==== //depot/projects/dtrace/src/usr.bin/awk/Makefile#8 (text+ko) ====

@@ -6,7 +6,7 @@
 PROG=	awk
 SRCS=	awkgram.y b.c lex.c lib.c main.c parse.c proctab.c run.c tran.c ytab.h
 
-CFLAGS+= -DHAS_ISBLANK -I. -I${AWKSRC}
+CFLAGS+= -DHAS_ISBLANK -I. -I${AWKSRC} -DFOPEN_MAX=64
 
 DPADD=	${LIBM}
 LDADD=	-lm

From owner-p4-projects@FreeBSD.ORG  Thu Mar 27 02:03:30 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B9DDE1065676; Thu, 27 Mar 2008 02:03: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 5ED8B1065674
	for ; Thu, 27 Mar 2008 02:03:30 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 502D18FC1B
	for ; Thu, 27 Mar 2008 02:03:30 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2R23UIK029254
	for ; Thu, 27 Mar 2008 02:03:30 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2R23UHc029252
	for perforce@freebsd.org; Thu, 27 Mar 2008 02:03:30 GMT
	(envelope-from jb@freebsd.org)
Date: Thu, 27 Mar 2008 02:03:30 GMT
Message-Id: <200803270203.m2R23UHc029252@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138698 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 27 Mar 2008 02:03:31 -0000

http://perforce.freebsd.org/chv.cgi?CH=138698

Change 138698 by jb@jb_freebsd1 on 2008/03/27 02:03:08

	IFC

Affected files ...

.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#11 integrate
.. //depot/projects/dtrace/ports/KNOBS#13 integrate
.. //depot/projects/dtrace/src/etc/rc.d/ppp#9 integrate
.. //depot/projects/dtrace/src/include/stdio.h#7 integrate
.. //depot/projects/dtrace/src/lib/libc/gen/sysctl.3#7 integrate
.. //depot/projects/dtrace/src/share/man/man5/rc.conf.5#25 integrate
.. //depot/projects/dtrace/src/sys/amd64/conf/NOTES#17 integrate
.. //depot/projects/dtrace/src/sys/amd64/isa/clock.c#10 integrate
.. //depot/projects/dtrace/src/sys/conf/options.amd64#10 integrate
.. //depot/projects/dtrace/src/sys/conf/options.i386#10 integrate
.. //depot/projects/dtrace/src/sys/conf/options.pc98#8 integrate
.. //depot/projects/dtrace/src/sys/i386/conf/NOTES#20 integrate
.. //depot/projects/dtrace/src/sys/i386/isa/clock.c#12 integrate
.. //depot/projects/dtrace/src/sys/isa/syscons_isa.c#6 integrate
.. //depot/projects/dtrace/src/sys/kern/init_sysent.c#31 integrate
.. //depot/projects/dtrace/src/sys/kern/makesyscalls.sh#13 integrate
.. //depot/projects/dtrace/src/sys/kern/syscalls.c#30 integrate
.. //depot/projects/dtrace/src/sys/kern/systrace_args.c#26 integrate
.. //depot/projects/dtrace/src/sys/netsmb/smb_iod.c#8 integrate
.. //depot/projects/dtrace/src/sys/pc98/cbus/clock.c#7 integrate
.. //depot/projects/dtrace/src/sys/pc98/cbus/syscons_cbus.c#7 integrate
.. //depot/projects/dtrace/src/sys/pc98/conf/NOTES#10 integrate
.. //depot/projects/dtrace/src/sys/sys/syscall.h#28 integrate
.. //depot/projects/dtrace/src/sys/sys/syscall.mk#28 integrate
.. //depot/projects/dtrace/src/sys/sys/sysproto.h#28 integrate
.. //depot/projects/dtrace/src/usr.bin/awk/Makefile#9 integrate
.. //depot/projects/dtrace/www/en/projects/ideas/ideas.xml#15 integrate

Differences ...

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#11 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
 
@@ -2080,7 +2080,7 @@
             entry for the printer named bamboo.  Here is
             the example /etc/printcap file again, with
             the new df capability for the printer
-            bamboo.
+            bamboo:
 
           #
 #  /etc/printcap for host rose - added df filter for bamboo
@@ -2116,15 +2116,15 @@
               linkend="printing-advanced-if-conversion">Accommodating Plain
               Text Jobs on &postscript; Printers) with the arguments 
 	    LPD
-            passed to this script. lprps will use those
+            passed to this script. The lprps utility will use those
             arguments to account for the pages printed.
         
             
         
           More Conversion Filter Examples
               
-          Since there is no fixed set of steps to install conversion
-            filters, let me instead provide more examples.  Use these as
+          There is no fixed set of steps to install conversion
+            filters, some working examples are described in this section.  Use these as
             guidance to making your own filters.  Use them directly, if
             appropriate.
               

==== //depot/projects/dtrace/ports/KNOBS#13 (text+ko) ====

@@ -1,7 +1,7 @@
 #
 # KNOBS - A list of popular knobs and their descriptions
 #
-# $FreeBSD: ports/KNOBS,v 1.24 2008/03/20 12:34:56 danfe Exp $
+# $FreeBSD: ports/KNOBS,v 1.26 2008/03/27 00:05:09 danfe Exp $
 #
 # Rules for adding knobs:
 #
@@ -39,7 +39,7 @@
 DVDNAV			Enables DVD Menu support
 DVDREAD			Enables DVD support
 ESOUND			Adds support for Esound
-EXAMPLES		Installs optional example code, graphics, etc
+EXAMPLES		Installs optional example code, graphics, etc.
 EXIF			Support for EXIF headers in JPEG or TIFF files
 FAAC			FAAC AAC and MP4 audio encoder support
 FAAD			FAAD AAC and MP4 audio decoder support
@@ -66,6 +66,7 @@
 LDAP			Adds LDAP support
 LINUX			Adds support for Linux
 LIVEMEDIA		LiveMedia rstp/rtp/sdp support
+LUA			Lua scripting support
 LZO			LZO data compression support
 MAD			Mad MP3 audio decoder support
 MATROSKA		Matroska multimedia container support

==== //depot/projects/dtrace/src/etc/rc.d/ppp#9 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/ppp,v 1.16 2008/01/26 14:02:19 mtm Exp $
+# $FreeBSD: src/etc/rc.d/ppp,v 1.17 2008/03/26 21:54:48 brooks Exp $
 #
 
 # PROVIDE: ppp
@@ -21,17 +21,22 @@
 	local _ppp_profile _ppp_mode _ppp_nat
 
 	_ppp_profile=$1
+	_ppp_profile_cleaned=$1
+	_punct=". - / +"
+	for _punct_c in $_punct; do
+		_ppp_profile_cleaned=`ltr ${_ppp_profile_cleaned} ${_punct_c} '_'`
+	done
 
 	# Check for ppp profile mode override.
 	#
-	eval _ppp_mode=\$ppp_${_ppp_profile}_mode
+	eval _ppp_mode=\$ppp_${_ppp_profile_cleaned}_mode
 	if [ -z "$_ppp_mode" ]; then
 		_ppp_mode=$ppp_mode
 	fi
 
 	# Check for ppp profile nat override.
 	#
-	eval _ppp_nat=\$ppp_${_ppp_profile}_nat
+	eval _ppp_nat=\$ppp_${_ppp_profile_cleaned}_nat
 	if [ -z "$_ppp_nat" ]; then
 		_ppp_nat=$ppp_nat
 	fi

==== //depot/projects/dtrace/src/include/stdio.h#7 (text+ko) ====

@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)stdio.h	8.5 (Berkeley) 4/29/95
- * $FreeBSD: src/include/stdio.h,v 1.60 2007/04/07 16:02:30 pjd Exp $
+ * $FreeBSD: src/include/stdio.h,v 1.61 2008/03/26 23:43:11 jb Exp $
  */
 
 #ifndef	_STDIO_H_

==== //depot/projects/dtrace/src/lib/libc/gen/sysctl.3#7 (text+ko) ====

@@ -26,9 +26,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sysctl.3	8.4 (Berkeley) 5/9/95
-.\" $FreeBSD: src/lib/libc/gen/sysctl.3,v 1.74 2007/10/16 11:29:13 ru Exp $
+.\" $FreeBSD: src/lib/libc/gen/sysctl.3,v 1.75 2008/03/26 23:02:17 ru Exp $
 .\"
-.Dd October 16, 2007
+.Dd March 27, 2008
 .Dt SYSCTL 3
 .Os
 .Sh NAME
@@ -534,17 +534,6 @@
 followed by the vnode itself
 .Va struct vnode .
 .El
-.Ss CTL_MACHDEP
-The set of variables defined is architecture dependent.
-The following variables are defined for the i386 architecture.
-.Bl -column "CONSOLE_DEVICEXXX" "struct bootinfoXXX" -offset indent
-.It Sy "Second level name	Type	Changeable"
-.It Li "CPU_CONSDEV	dev_t	no"
-.It Li "CPU_ADJKERNTZ	int	yes"
-.It Li "CPU_DISRTCSET	int	yes"
-.It Li "CPU_BOOTINFO	struct bootinfo	no"
-.It Li "CPU_WALLCLOCK	int	yes"
-.El
 .Ss CTL_NET
 The string and integer information available for the CTL_NET level
 is detailed below.

==== //depot/projects/dtrace/src/share/man/man5/rc.conf.5#25 (text+ko) ====

@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.335 2008/03/05 18:32:58 brooks Exp $
+.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.336 2008/03/26 21:54:48 brooks Exp $
 .\"
 .Dd January 27, 2008
 .Dt RC.CONF 5
@@ -1315,11 +1315,30 @@
 run the
 .Xr ppp 8
 daemon.
+.It Va ppp_profile
+.Pq Vt str
+The name of the profile to use from
+.Pa /etc/ppp/ppp.conf .
+Also used for per-profile overrides of
+.Va ppp_mode
+and
+.Va ppp_nat .
+When the profile name contains any of the characters
+.Dq Li .-/+
+they are translated to
+.Dq Li _
+for the proposes of the override variable names.
 .It Va ppp_mode
 .Pq Vt str
 Mode in which to run the
 .Xr ppp 8
 daemon.
+.It Va ppp_ Ns Ao Ar profile Ac Ns _mode
+.Pq Vt str
+Overrides the global
+.Va ppp_mode
+for
+.Ar profile .
 Accepted modes are
 .Dq Li auto ,
 .Dq Li ddial ,
@@ -1336,10 +1355,12 @@
 .Va gateway_enable
 allows hosts on private network addresses access to the Internet using
 this host as a network address translating router.
-.It Va ppp_profile
+.It Va ppp_ Ns Ao Ar profile Ac Ns _nat
 .Pq Vt str
-The name of the profile to use from
-.Pa /etc/ppp/ppp.conf .
+Overrides the global
+.Va ppp_nat
+for
+.Ar profile .
 .It Va ppp_user
 .Pq Vt str
 The name of the user under which

==== //depot/projects/dtrace/src/sys/amd64/conf/NOTES#17 (text+ko) ====

@@ -4,7 +4,7 @@
 # This file contains machine dependent kernel configuration notes.  For
 # machine independent notes, look in /sys/conf/NOTES.
 #
-# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.76 2008/03/24 22:23:21 jkim Exp $
+# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.77 2008/03/26 22:11:58 phk Exp $
 #
 
 #
@@ -88,19 +88,6 @@
 #####################################################################
 # CLOCK OPTIONS
 
-# The following options are used for debugging clock behavior only, and
-# should not be used for production systems.
-
-# CLK_CALIBRATION_LOOP causes clock calibration to be run in a loop at
-# startup until the user presses a key.  (The i8254 clock is always
-# calibrated relative to the RTC (mc146818a) and this option causes the
-# calibration to be repeated.)
-options 	CLK_CALIBRATION_LOOP
-
-# CLK_USE_I8254_CALIBRATION causes the calibrated frequency of the i8254
-# clock to actually be used.
-options 	CLK_USE_I8254_CALIBRATION
-
 # Provide read/write access to the memory in the clock chip.
 device		nvram		# Access to rtc cmos via /dev/nvram
 

==== //depot/projects/dtrace/src/sys/amd64/isa/clock.c#10 (text+ko) ====

@@ -33,7 +33,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.240 2008/03/26 20:26:12 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.241 2008/03/26 22:11:59 phk Exp $");
 
 /*
  * Routines to handle clock hardware.
@@ -430,86 +430,6 @@
 	return(bcd2bin(rtcin(port)));
 }
 
-static u_int
-calibrate_clocks(void)
-{
-	u_int count, prev_count, tot_count;
-	int sec, start_sec, timeout;
-
-	if (bootverbose)
-	        printf("Calibrating clock(s) ... ");
-	if (!(rtcin(RTC_STATUSD) & RTCSD_PWR))
-		goto fail;
-	timeout = 100000000;
-
-	/* Read the mc146818A seconds counter. */
-	for (;;) {
-		if (!(rtcin(RTC_STATUSA) & RTCSA_TUP)) {
-			sec = rtcin(RTC_SEC);
-			break;
-		}
-		if (--timeout == 0)
-			goto fail;
-	}
-
-	/* Wait for the mC146818A seconds counter to change. */
-	start_sec = sec;
-	for (;;) {
-		if (!(rtcin(RTC_STATUSA) & RTCSA_TUP)) {
-			sec = rtcin(RTC_SEC);
-			if (sec != start_sec)
-				break;
-		}
-		if (--timeout == 0)
-			goto fail;
-	}
-
-	/* Start keeping track of the i8254 counter. */
-	prev_count = getit();
-	if (prev_count == 0 || prev_count > i8254_max_count)
-		goto fail;
-	tot_count = 0;
-
-	/*
-	 * Wait for the mc146818A seconds counter to change.  Read the i8254
-	 * counter for each iteration since this is convenient and only
-	 * costs a few usec of inaccuracy. The timing of the final reads
-	 * of the counters almost matches the timing of the initial reads,
-	 * so the main cause of inaccuracy is the varying latency from 
-	 * inside getit() or rtcin(RTC_STATUSA) to the beginning of the
-	 * rtcin(RTC_SEC) that returns a changed seconds count.  The
-	 * maximum inaccuracy from this cause is < 10 usec on 486's.
-	 */
-	start_sec = sec;
-	for (;;) {
-		if (!(rtcin(RTC_STATUSA) & RTCSA_TUP))
-			sec = rtcin(RTC_SEC);
-		count = getit();
-		if (count == 0 || count > i8254_max_count)
-			goto fail;
-		if (count > prev_count)
-			tot_count += prev_count - (count - i8254_max_count);
-		else
-			tot_count += prev_count - count;
-		prev_count = count;
-		if (sec != start_sec)
-			break;
-		if (--timeout == 0)
-			goto fail;
-	}
-
-	if (bootverbose) {
-	        printf("i8254 clock: %u Hz\n", tot_count);
-	}
-	return (tot_count);
-
-fail:
-	if (bootverbose)
-	        printf("failed, using default i8254 clock of %u Hz\n",
-		       i8254_freq);
-	return (i8254_freq);
-}
-
 static void
 set_i8254_freq(u_int freq, int intr_freq)
 {
@@ -547,42 +467,10 @@
 void
 startrtclock()
 {
-	u_int delta, freq;
 
 	writertc(RTC_STATUSA, rtc_statusa);
 	writertc(RTC_STATUSB, RTCSB_24HR);
 
-	freq = calibrate_clocks();
-#ifdef CLK_CALIBRATION_LOOP
-	if (bootverbose) {
-		printf(
-		"Press a key on the console to abort clock calibration\n");
-		while (cncheckc() == -1)
-			calibrate_clocks();
-	}
-#endif
-
-	/*
-	 * Use the calibrated i8254 frequency if it seems reasonable.
-	 * Otherwise use the default, and don't use the calibrated i586
-	 * frequency.
-	 */
-	delta = freq > i8254_freq ? freq - i8254_freq : i8254_freq - freq;
-	if (delta < i8254_freq / 100) {
-#ifndef CLK_USE_I8254_CALIBRATION
-		if (bootverbose)
-			printf(
-"CLK_USE_I8254_CALIBRATION not specified - using default frequency\n");
-		freq = i8254_freq;
-#endif
-		i8254_freq = freq;
-	} else {
-		if (bootverbose)
-			printf(
-		    "%d Hz differs from default of %d Hz by more than 1%%\n",
-			       freq, i8254_freq);
-	}
-
 	set_i8254_freq(i8254_freq, hz);
 	tc_init(&i8254_timecounter);
 

==== //depot/projects/dtrace/src/sys/conf/options.amd64#10 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options.amd64,v 1.30 2007/11/30 21:45:06 peter Exp $
+# $FreeBSD: src/sys/conf/options.amd64,v 1.31 2008/03/26 22:11:59 phk Exp $
 # Options specific to AMD64 platform kernels
 
 AUTO_EOI_1		opt_auto_eoi.h
@@ -21,8 +21,6 @@
 LINSYSFS		opt_dontuse.h
 NDISAPI			opt_dontuse.h
 
-CLK_CALIBRATION_LOOP		opt_clock.h
-CLK_USE_I8254_CALIBRATION	opt_clock.h
 TIMER_FREQ			opt_clock.h
 
 # options for serial support

==== //depot/projects/dtrace/src/sys/conf/options.i386#10 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options.i386,v 1.239 2007/11/30 21:45:06 peter Exp $
+# $FreeBSD: src/sys/conf/options.i386,v 1.240 2008/03/26 22:11:59 phk Exp $
 # Options specific to the i386 platform kernels
 
 AUTO_EOI_1		opt_auto_eoi.h
@@ -36,8 +36,6 @@
 # Physical address extensions and support for >4G ram.  As above.
 PAE			opt_global.h
 
-CLK_CALIBRATION_LOOP		opt_clock.h
-CLK_USE_I8254_CALIBRATION	opt_clock.h
 TIMER_FREQ			opt_clock.h
 
 CPU_ATHLON_SSE_HACK		opt_cpu.h

==== //depot/projects/dtrace/src/sys/conf/options.pc98#8 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options.pc98,v 1.201 2007/07/04 00:18:38 bz Exp $
+# $FreeBSD: src/sys/conf/options.pc98,v 1.202 2008/03/26 22:11:59 phk Exp $
 # Options specific to the pc98 platform kernels
 
 AUTO_EOI_1		opt_auto_eoi.h
@@ -31,8 +31,6 @@
 # Change KVM size.  Changes things all over the kernel.
 KVA_PAGES		opt_global.h
 
-CLK_CALIBRATION_LOOP		opt_clock.h
-CLK_USE_I8254_CALIBRATION	opt_clock.h
 TIMER_FREQ			opt_clock.h
 
 # options for serial support

==== //depot/projects/dtrace/src/sys/i386/conf/NOTES#20 (text+ko) ====

@@ -4,7 +4,7 @@
 # This file contains machine dependent kernel configuration notes.  For
 # machine independent notes, look in /sys/conf/NOTES.
 #
-# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1251 2008/03/24 22:23:22 jkim Exp $
+# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1252 2008/03/26 22:11:59 phk Exp $
 #
 
 #
@@ -259,19 +259,6 @@
 #####################################################################
 # CLOCK OPTIONS
 
-# The following options are used for debugging clock behavior only, and
-# should not be used for production systems.
-
-# CLK_CALIBRATION_LOOP causes clock calibration to be run in a loop at
-# startup until the user presses a key.  (The i8254 clock is always
-# calibrated relative to the RTC (mc146818a) and this option causes the
-# calibration to be repeated.)
-options 	CLK_CALIBRATION_LOOP
-
-# CLK_USE_I8254_CALIBRATION causes the calibrated frequency of the i8254
-# clock to actually be used.
-options 	CLK_USE_I8254_CALIBRATION
-
 # Provide read/write access to the memory in the clock chip.
 device		nvram		# Access to rtc cmos via /dev/nvram
 

==== //depot/projects/dtrace/src/sys/i386/isa/clock.c#12 (text+ko) ====

@@ -33,7 +33,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/i386/isa/clock.c,v 1.244 2008/03/26 20:09:19 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/isa/clock.c,v 1.245 2008/03/26 22:11:59 phk Exp $");
 
 /*
  * Routines to handle clock hardware.
@@ -57,34 +57,24 @@
 #include 
 #include 
 #include 
-#include 
-#include 
 #include 
 #include 
 #include 
 #include 
-#include 
 #include 
-#include 
 #include 
-#include 
 #include 
 #include 
 #include 
-#include 
-#include 
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
-#include 
 #ifdef DEV_APIC
 #include 
 #endif
-#include 
 #include 
 #include 
 
@@ -462,86 +452,6 @@
 	return(bcd2bin(rtcin(port)));
 }
 
-static u_int
-calibrate_clocks(void)
-{
-	u_int count, prev_count, tot_count;
-	int sec, start_sec, timeout;
-
-	if (bootverbose)
-	        printf("Calibrating clock(s) ... ");
-	if (!(rtcin(RTC_STATUSD) & RTCSD_PWR))
-		goto fail;
-	timeout = 100000000;
-
-	/* Read the mc146818A seconds counter. */
-	for (;;) {
-		if (!(rtcin(RTC_STATUSA) & RTCSA_TUP)) {
-			sec = rtcin(RTC_SEC);
-			break;
-		}
-		if (--timeout == 0)
-			goto fail;
-	}
-
-	/* Wait for the mC146818A seconds counter to change. */
-	start_sec = sec;
-	for (;;) {
-		if (!(rtcin(RTC_STATUSA) & RTCSA_TUP)) {
-			sec = rtcin(RTC_SEC);
-			if (sec != start_sec)
-				break;
-		}
-		if (--timeout == 0)
-			goto fail;
-	}
-
-	/* Start keeping track of the i8254 counter. */
-	prev_count = getit();
-	if (prev_count == 0 || prev_count > i8254_max_count)
-		goto fail;
-	tot_count = 0;
-
-	/*
-	 * Wait for the mc146818A seconds counter to change.  Read the i8254
-	 * counter for each iteration since this is convenient and only
-	 * costs a few usec of inaccuracy. The timing of the final reads
-	 * of the counters almost matches the timing of the initial reads,
-	 * so the main cause of inaccuracy is the varying latency from 
-	 * inside getit() or rtcin(RTC_STATUSA) to the beginning of the
-	 * rtcin(RTC_SEC) that returns a changed seconds count.  The
-	 * maximum inaccuracy from this cause is < 10 usec on 486's.
-	 */
-	start_sec = sec;
-	for (;;) {
-		if (!(rtcin(RTC_STATUSA) & RTCSA_TUP))
-			sec = rtcin(RTC_SEC);
-		count = getit();
-		if (count == 0 || count > i8254_max_count)
-			goto fail;
-		if (count > prev_count)
-			tot_count += prev_count - (count - i8254_max_count);
-		else
-			tot_count += prev_count - count;
-		prev_count = count;
-		if (sec != start_sec)
-			break;
-		if (--timeout == 0)
-			goto fail;
-	}
-
-	if (bootverbose) {
-	        printf("i8254 clock: %u Hz\n", tot_count);
-	}
-	return (tot_count);
-
-fail:
-	if (bootverbose)
-	        printf("failed, using default i8254 clock of %u Hz\n",
-		       i8254_freq);
-	return (i8254_freq);
-}
-
 static void
 set_i8254_freq(u_int freq, int intr_freq)
 {
@@ -618,42 +528,10 @@
 void
 startrtclock()
 {
-	u_int delta, freq;
 
 	writertc(RTC_STATUSA, rtc_statusa);
 	writertc(RTC_STATUSB, RTCSB_24HR);
 
-	freq = calibrate_clocks();
-#ifdef CLK_CALIBRATION_LOOP
-	if (bootverbose) {
-		printf(
-		"Press a key on the console to abort clock calibration\n");
-		while (cncheckc() == -1)
-			calibrate_clocks();
-	}
-#endif
-
-	/*
-	 * Use the calibrated i8254 frequency if it seems reasonable.
-	 * Otherwise use the default, and don't use the calibrated i586
-	 * frequency.
-	 */
-	delta = freq > i8254_freq ? freq - i8254_freq : i8254_freq - freq;
-	if (delta < i8254_freq / 100) {
-#ifndef CLK_USE_I8254_CALIBRATION
-		if (bootverbose)
-			printf(
-"CLK_USE_I8254_CALIBRATION not specified - using default frequency\n");
-		freq = i8254_freq;
-#endif
-		i8254_freq = freq;
-	} else {
-		if (bootverbose)
-			printf(
-		    "%d Hz differs from default of %d Hz by more than 1%%\n",
-			       freq, i8254_freq);
-	}
-
 	set_i8254_freq(i8254_freq, hz);
 	tc_init(&i8254_timecounter);
 

==== //depot/projects/dtrace/src/sys/isa/syscons_isa.c#6 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/isa/syscons_isa.c,v 1.31 2008/03/26 20:09:19 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/isa/syscons_isa.c,v 1.32 2008/03/26 22:02:50 phk Exp $");
 
 #include "opt_syscons.h"
 
@@ -43,8 +43,6 @@
 
 #include 
 #include 
-#include 
-#include 
 #include 
 
 #include 
@@ -272,18 +270,12 @@
 int
 sc_tone(int herz)
 {
-#if defined(__i386__) || defined(__amd64__)
+#if defined(HAS_TIMER_SPKR)
 	if (herz) {
-		/* set command for counter 2, 2 byte write */
 		if (timer_spkr_acquire())
 			return EBUSY;
-		/* set pitch */
 		timer_spkr_setfreq(herz);
-		/* enable counter 2 output to speaker */
-		ppi_spkr_on();
 	} else {
-		/* disable counter 2 output to speaker */
-		ppi_spkr_off();
 		timer_spkr_release();
 	}
 #endif

==== //depot/projects/dtrace/src/sys/kern/init_sysent.c#31 (text+ko) ====

@@ -2,7 +2,7 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/init_sysent.c,v 1.238 2008/03/27 01:55:05 jb Exp $
  * created from FreeBSD: src/sys/kern/syscalls.master,v 1.241 2008/03/26 15:23:09 dfr Exp 
  */
 

==== //depot/projects/dtrace/src/sys/kern/makesyscalls.sh#13 (text+ko) ====

@@ -1,6 +1,6 @@
 #! /bin/sh -
 #	@(#)makesyscalls.sh	8.1 (Berkeley) 6/10/93
-# $FreeBSD: src/sys/kern/makesyscalls.sh,v 1.69 2008/03/25 09:11:53 ru Exp $
+# $FreeBSD: src/sys/kern/makesyscalls.sh,v 1.70 2008/03/27 01:53:44 jb Exp $
 
 set -e
 

==== //depot/projects/dtrace/src/sys/kern/syscalls.c#30 (text+ko) ====

@@ -2,7 +2,7 @@
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/syscalls.c,v 1.222 2008/03/27 01:55:05 jb Exp $
  * created from FreeBSD: src/sys/kern/syscalls.master,v 1.241 2008/03/26 15:23:09 dfr Exp 
  */
 

==== //depot/projects/dtrace/src/sys/kern/systrace_args.c#26 (text+ko) ====

@@ -2,7 +2,7 @@
  * System call argument to DTrace register array converstion.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/systrace_args.c,v 1.22 2008/03/27 01:55:05 jb Exp $
  * This file is part of the DTrace syscall provider.
  */
 

==== //depot/projects/dtrace/src/sys/netsmb/smb_iod.c#8 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/netsmb/smb_iod.c,v 1.20 2008/03/25 09:39:00 ru Exp $");
+__FBSDID("$FreeBSD: src/sys/netsmb/smb_iod.c,v 1.21 2008/03/27 01:23:59 attilio Exp $");
  
 #include 
 #include 
@@ -652,6 +652,8 @@
 {
 	struct smbiod *iod = arg;
 
+	mtx_lock(&Giant);
+
 	/*
 	 * Here we assume that the thread structure will be the same
 	 * for an entire kthread (kproc, to be more precise) life.
@@ -665,6 +667,7 @@
 			break;
 		tsleep(&iod->iod_flags, PWAIT, "90idle", iod->iod_sleeptimo);
 	}
+	mtx_unlock(&Giant);
 	kproc_exit(0);
 }
 

==== //depot/projects/dtrace/src/sys/pc98/cbus/clock.c#7 (text+ko) ====

@@ -33,7 +33,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/pc98/cbus/clock.c,v 1.165 2008/03/26 20:09:20 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/pc98/cbus/clock.c,v 1.166 2008/03/26 22:12:00 phk Exp $");
 
 /*
  * Routines to handle clock hardware.
@@ -69,7 +69,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 
 #include 
@@ -325,71 +324,6 @@
 #endif
 }
 
-static u_int
-calibrate_clocks(void)
-{
-	int timeout;
-	u_int count, prev_count, tot_count;
-	u_short	sec, start_sec;
-
-	if (bootverbose)
-	        printf("Calibrating clock(s) ... ");
-	/* Check ARTIC. */
-	if (!(PC98_SYSTEM_PARAMETER(0x458) & 0x80) &&
-	    !(PC98_SYSTEM_PARAMETER(0x45b) & 0x04))
-		goto fail;
-	timeout = 100000000;
-
-	/* Read the ARTIC. */
-	sec = inw(0x5e);
-
-	/* Wait for the ARTIC to changes. */
-	start_sec = sec;
-	for (;;) {
-		sec = inw(0x5e);
-		if (sec != start_sec)
-			break;
-		if (--timeout == 0)
-			goto fail;
-	}
-
-	/* Start keeping track of the i8254 counter. */
-	prev_count = getit();
-	if (prev_count == 0 || prev_count > i8254_max_count)
-		goto fail;
-	tot_count = 0;
-
-	start_sec = sec;
-	for (;;) {
-		sec = inw(0x5e);
-		count = getit();
-		if (count == 0 || count > i8254_max_count)
-			goto fail;
-		if (count > prev_count)
-			tot_count += prev_count - (count - i8254_max_count);
-		else
-			tot_count += prev_count - count;
-		prev_count = count;
-		if ((sec == start_sec + 1200) || /* 1200 = 307.2KHz >> 8 */
-		    (sec < start_sec &&
-		        (u_int)sec + 0x10000 == (u_int)start_sec + 1200))
-			break;
-		if (--timeout == 0)
-			goto fail;
-	}
-
-	if (bootverbose) {
-	        printf("i8254 clock: %u Hz\n", tot_count);
-	}
-	return (tot_count);
-
-fail:
-	if (bootverbose)
-	        printf("failed, using default i8254 clock of %u Hz\n",
-		       i8254_freq);
-	return (i8254_freq);
-}
-
 static void
 set_i8254_freq(u_int freq, int intr_freq)
 {
@@ -459,38 +393,6 @@
 void
 startrtclock()
 {
-	u_int delta, freq;
-
-	freq = calibrate_clocks();
-#ifdef CLK_CALIBRATION_LOOP
-	if (bootverbose) {
-		printf(
-		"Press a key on the console to abort clock calibration\n");
-		while (cncheckc() == -1)
-			calibrate_clocks();
-	}
-#endif
-
-	/*
-	 * Use the calibrated i8254 frequency if it seems reasonable.
-	 * Otherwise use the default, and don't use the calibrated i586
-	 * frequency.
-	 */
-	delta = freq > i8254_freq ? freq - i8254_freq : i8254_freq - freq;
-	if (delta < i8254_freq / 100) {
-#ifndef CLK_USE_I8254_CALIBRATION
-		if (bootverbose)
-			printf(
-"CLK_USE_I8254_CALIBRATION not specified - using default frequency\n");
-		freq = i8254_freq;
-#endif
-		i8254_freq = freq;
-	} else {
-		if (bootverbose)
-			printf(
-		    "%d Hz differs from default of %d Hz by more than 1%%\n",
-			       freq, i8254_freq);
-	}
 
 	set_i8254_freq(i8254_freq, hz);
 	tc_init(&i8254_timecounter);

==== //depot/projects/dtrace/src/sys/pc98/cbus/syscons_cbus.c#7 (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/pc98/cbus/syscons_cbus.c,v 1.26 2008/03/26 20:09:20 phk Exp $
+ * $FreeBSD: src/sys/pc98/cbus/syscons_cbus.c,v 1.27 2008/03/26 22:02:51 phk Exp $
  */
 
 #include "opt_syscons.h"
@@ -38,8 +38,6 @@
 #include 
 
 #include 
-#include 
-#include 
 
 #include 
 
@@ -227,16 +225,10 @@
 {
 
 	if (herz) {
-		/* enable counter 1 */
-		ppi_spkr_on();
-		/* set command for counter 1, 2 byte write */
 		if (timer_spkr_acquire())
 			return EBUSY;
-		/* set pitch */
 		timer_spkr_setfreq(herz);
 	} else {
-		/* disable counter 1 */
-		ppi_spkr_off();
 		timer_spkr_release();
 	}
 	return 0;

==== //depot/projects/dtrace/src/sys/pc98/conf/NOTES#10 (text+ko) ====

@@ -4,7 +4,7 @@
 # This file contains machine dependent kernel configuration notes.  For
 # machine independent notes, look in /sys/conf/NOTES.
 #
-# $FreeBSD: src/sys/pc98/conf/NOTES,v 1.86 2008/03/24 22:23:22 jkim Exp $
+# $FreeBSD: src/sys/pc98/conf/NOTES,v 1.87 2008/03/26 22:12:00 phk Exp $
 #
 
 #
@@ -197,23 +197,6 @@
 
 
 #####################################################################
-# CLOCK OPTIONS
-
-# The following options are used for debugging clock behavior only, and
-# should not be used for production systems.
-
-# CLK_CALIBRATION_LOOP causes clock calibration to be run in a loop at
-# startup until the user presses a key.  (The i8254 clock is always
-# calibrated relative to the RTC (mc146818a) and this option causes the
-# calibration to be repeated.)
-options 	CLK_CALIBRATION_LOOP
-
-# CLK_USE_I8254_CALIBRATION causes the calibrated frequency of the i8254
-# clock to actually be used.
-options 	CLK_USE_I8254_CALIBRATION
-
-
-#####################################################################

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Thu Mar 27 02:58:37 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C6D661065673; Thu, 27 Mar 2008 02:58: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 86BC4106566C
	for ; Thu, 27 Mar 2008 02:58:36 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 78F008FC19
	for ; Thu, 27 Mar 2008 02:58:36 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2R2waS5032545
	for ; Thu, 27 Mar 2008 02:58:36 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2R2waRJ032543
	for perforce@freebsd.org; Thu, 27 Mar 2008 02:58:36 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Thu, 27 Mar 2008 02:58:36 GMT
Message-Id: <200803270258.m2R2waRJ032543@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 138699 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 27 Mar 2008 02:58:37 -0000

http://perforce.freebsd.org/chv.cgi?CH=138699

Change 138699 by pgj@disznohal on 2008/03/27 02:58:00

	Fix typos and composition.
	
	Suggested by:	gabor (mentor)

Affected files ...

.. //depot/projects/docproj_hu/books/handbook/audit/chapter.sgml#6 edit
.. //depot/projects/docproj_hu/books/handbook/book.sgml#6 edit

Differences ...

==== //depot/projects/docproj_hu/books/handbook/audit/chapter.sgml#6 (text+ko) ====

@@ -29,7 +29,8 @@
 
     AUDIT
     
-      Biztonsági események vizsgálata
+      Biztonsági események
+	vizsgálata
       MAC
     
 
@@ -38,11 +39,11 @@
       események aprólékos
       vizsgálatát.  Ezzel egy megbízható,
       részletes és jól konfigurálható
-      naplózási rendszert társítanak a
-      rendszerben található biztonságot
-      igénylõ események széles
-      köréhez, beleértve a bejelentkezéseket,
-      a konfigurációs állományokban
+      naplózási rendszert nyújtanak a rendszerben
+      található biztonságot igénylõ
+      események széles köréhez,
+      beleértve a bejelentkezéseket, a
+      konfigurációs állományokban
       bekövetkezõ változásokat,
       állomány- és hálózati
       hozzáféréseket.  Az így
@@ -85,9 +86,9 @@
       
 
       
-	hogyan értelmezzük egy vizsgálati
-	  nyomokat a vizsgálatot szûkítõ és
-	  -elemzõ segédprogramok
+	hogyan értelmezzük a vizsgálati
+	  nyomokat a vizsgálatot szûkítõ
+	  és -elemzõ segédprogramok
 	  segítségével
       
     
@@ -118,18 +119,17 @@
       A &os; 6.X verziójaiban
 	jelenlevõ biztonsági vizsgálat még
 	csak kísérleti jelleggel szerepel, éles
-	környezetben kizárólag csak az ilyen fajta
-	szoftverekkel kapcsolatos kockázatok tudatában
-	és elfogadásával javasolt használni.
-	Ismert korlátozások: nem mindegyik
-	biztonságot érintõ esemény
-	vizsgálható, mint mondjuk az egyes
-	bejelentkezési típusok, mivel azok nem
-	megfelelõen hitelesítik a belépõ
-	felhasználókat.  Ilyenek például az
-	X11-alapú felületek és az egyéb, erre
-	a célra alkalmas, más által fejlesztett
-	démonok.
+	környezetben kizárólag csak az ebbõl
+	eredõ kockázatok tudatában és
+	elfogadásával javasolt használni.  Ismert
+	korlátozások: nem mindegyik biztonságot
+	érintõ esemény vizsgálható,
+	mint mondjuk az egyes bejelentkezési típusok,
+	mivel azok nem megfelelõen hitelesítik a
+	belépõ felhasználókat.  Ilyenek
+	például az X11-alapú felületek
+	és az egyéb, erre a célra alkalmas,
+	más által fejlesztett démonok.
     
 
     
@@ -175,7 +175,7 @@
 	  visszakövethetõ valamelyik hitelesített
 	  felhasználóhoz, vagy nem
 	  jellegzetes, ha ez nem lehetséges.  Nem
-	  jellegzetes események lehet például
+	  jellegzetes esemény lehet például
 	  minden olyan esemény, amely egy bejelentkezési
 	  folyamat hitelesítési lépése
 	  elõtt történik, ilyenek a hibás
@@ -227,7 +227,7 @@
       
 	szûrési feltétel:
 	  Szûrési feltételnek nevezünk egy olyan
-	  sztringet, amelyet események
+	  karakterláncot, amelyet események
 	  szûrésére használunk, és
 	  módosítókat valamint
 	  eseményosztályok neveit tartalmazza.
@@ -336,12 +336,12 @@
 
       
 	audit_control - a vizsgálati
-	  alrendszer különbözõ területei
+	  alrendszer különbözõ területeit
 	  vezérli, többek közt az
 	  alapértelmezett vizsgálati osztályokat,
 	  az vizsgálati adatok tárhelyén
-	  meghagyandó minimális lemezterület, a
-	  vizsgálati nyom maximális mérete,
+	  fenntartandó minimális lemezterületet, a
+	  vizsgálati nyom maximális méretét,
 	  stb.
       
 
@@ -369,10 +369,9 @@
 	  segítségével a
 	  szélsõséges helyzetekben figyelmeztetõ
 	  üzeneteket tudunk generálni, mint mondjuk amikor a
-	  rekordok számára fenntartott hely
-	  elfogyóban van, vagy amikor a nyomokat
-	  tartalmazó állományt
-	  archiváltuk.
+	  rekordok számára fenntartott hely hamarosan
+	  elfogy, vagy amikor a nyomokat tartalmazó
+	  állományt archiváltuk.
       
     
 
@@ -546,7 +545,7 @@
 	  nt - network
 	    (hálózat) - a
 	    hálózathoz tartozó események
-	    vizsgálata, mint pl.  a &man.connect.2; és
+	    vizsgálata, mint pl.  a &man.connect.2; és az
 	    &man.accept.2;.
 	
 
@@ -560,12 +559,12 @@
 	  pc - process
 	    (folyamat) - a folyamatokkal kapcsolatos
 	    mûveletek, mint például az &man.exec.3;
-	    és &man.exit.3; vizsgálata.
+	    és az &man.exit.3; vizsgálata.
 	
       
 
       Az imént felsorolt eseményosztályok az
-	audit_class és
+	audit_class és az
 	audit_event állományok
 	módosításával igény szerint
 	testreszabhatóak.
@@ -616,7 +615,7 @@
       
 
       Az alábbi példa egy olyan szûrési
-	feltételt mutat be, amely a ki/bejelentkezések
+	feltételt mutat be, amely a ki- és bejelentkezések
 	közül megadja a sikereset és a sikerteleneket,
 	viszont a programindítások közül csak a
 	sikereseket:
@@ -717,7 +716,7 @@
 	  rendszerhívás parancssori paramétereit is
 	  megvizsgálja.
 
-	A  opció meghatározza
+	A  opció határozza meg
 	  a vizsgálati nyom automatikus
 	  szétvágása és
 	  archiválása elõtti maximális
@@ -754,7 +753,7 @@
 	A most következõ audit_user
 	  példában vizsgáljuk a
 	  root felhasználó
-	  ki/bejelentkezéseit és sikeres
+	  ki- és bejelentkezéseit és sikeres
 	  programindításait, valamint a
 	  www felhasználó
 	  állománylétrehozásait és
@@ -810,7 +809,7 @@
 
       ahol az
 	AUDITFILE a
-	kiíratandó vizsgálati napló.
+	kiírandó vizsgálati napló.
 
       A vizsgálati nyomok tokenekbõl
 	összeállított vizsgálati rekordok,
@@ -935,7 +934,7 @@
 	miatt megszakadó eseményfolyamokból
 	adódó problémák.  Az élõ
 	eseményfolyamra az alábbi parancs
-	kiadásával rácsatlakozni:
+	kiadásával lehet rácsatlakozni:
 
       &prompt.root; praudit /dev/auditpipe
 
@@ -966,7 +965,7 @@
 	  hálózati forgalmat egyszerre vizsgáljuk
 	  és a &man.praudit.1; egy SSH-munkameneten
 	  keresztül fut, akkor a vizsgálati események
-	  töménytelen áradata indul meg, mivel minden
+	  töméntelen áradata indul meg, mivel minden
 	  kiírandó esemény egy újabb
 	  eseményt indukál.  Ennek elkerülése
 	  érdekében ajánlott a
@@ -1065,7 +1064,7 @@
         gzip -9 $2
 fi
 
-      Egyéb archiválás
+      Egyéb archiválási
 	tevékenységek lehetnek még: a nyomok
 	felmásolása egy központi szerverre, a
 	régebbi nyomok törlése, vagy a meglevõ

==== //depot/projects/docproj_hu/books/handbook/book.sgml#6 (text+ko) ====

@@ -136,7 +136,7 @@
 	kézikönyv tartalmán számos
 	független fejlesztõ folyamatosan
 	dolgozik.  Emiatt elképzelhetõ, hogy
-	bizonyos fejezetek már elévültek és
+	bizonyos fejezetek már elavultak és
 	aktualizálásra szorulnak.  Amennyiben úgy
 	érezzük, hogy segíteni tudnánk a
 	projekt munkájában, értesítsük

From owner-p4-projects@FreeBSD.ORG  Thu Mar 27 03:21:00 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B959E1065671; Thu, 27 Mar 2008 03:21: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 75864106564A
	for ; Thu, 27 Mar 2008 03:21:00 +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 68BC48FC18
	for ; Thu, 27 Mar 2008 03:21:00 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2R3L0ex035534
	for ; Thu, 27 Mar 2008 03:21:00 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2R3L0nh035528
	for perforce@freebsd.org; Thu, 27 Mar 2008 03:21:00 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Thu, 27 Mar 2008 03:21:00 GMT
Message-Id: <200803270321.m2R3L0nh035528@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 138700 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 27 Mar 2008 03:21:01 -0000

http://perforce.freebsd.org/chv.cgi?CH=138700

Change 138700 by pgj@disznohal on 2008/03/27 03:20:31

	Fix typo (missed from the previous submit --sorry!)

Affected files ...

.. //depot/projects/docproj_hu/books/handbook/audit/chapter.sgml#7 edit

Differences ...

==== //depot/projects/docproj_hu/books/handbook/audit/chapter.sgml#7 (text+ko) ====

@@ -724,7 +724,7 @@
 	  alapértelmezett értéke a 0, amely
 	  kikapcsolja ezt az archiválást.  Ha az itt
 	  megadott állományméret nem nulla
-	  és a minimálisan elvárt 512 kb alatt van,
+	  és a minimálisan elvárt 512 KB alatt van,
 	  akkor a rendszer figyelmen kívül hagyja és
 	  errõl egy figyelmeztetést ad.
       

From owner-p4-projects@FreeBSD.ORG  Thu Mar 27 04:22:06 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5CD611065670; Thu, 27 Mar 2008 04:22: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 1ADED106564A
	for ; Thu, 27 Mar 2008 04:22:06 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0D9778FC1D
	for ; Thu, 27 Mar 2008 04:22:06 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2R4M5tT040999
	for ; Thu, 27 Mar 2008 04:22:05 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2R4M5kW040997
	for perforce@freebsd.org; Thu, 27 Mar 2008 04:22:05 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Thu, 27 Mar 2008 04:22:05 GMT
Message-Id: <200803270422.m2R4M5kW040997@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 138702 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 27 Mar 2008 04:22:06 -0000

http://perforce.freebsd.org/chv.cgi?CH=138702

Change 138702 by pgj@disznohal on 2008/03/27 04:22:02

	Fix translation.

Affected files ...

.. //depot/projects/docproj_hu/books/handbook/basics/chapter.sgml#4 edit

Differences ...

==== //depot/projects/docproj_hu/books/handbook/basics/chapter.sgml#4 (text+ko) ====

@@ -702,7 +702,7 @@
 	  
 	    (ki)
 	    u
-	    felhasználók
+	    tulajdonos
 	  
 
 	  
@@ -714,7 +714,7 @@
 	  
 	    (ki)
 	    o
-	    tulajdonos
+	    egyéb
 	  
 
 	  

From owner-p4-projects@FreeBSD.ORG  Thu Mar 27 04:23:07 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 89A4C1065671; Thu, 27 Mar 2008 04:23: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 49152106566C
	for ; Thu, 27 Mar 2008 04:23:07 +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 3BE818FC19
	for ; Thu, 27 Mar 2008 04:23:07 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2R4N7WX041012
	for ; Thu, 27 Mar 2008 04:23:07 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2R4N7TJ041010
	for perforce@freebsd.org; Thu, 27 Mar 2008 04:23:07 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Thu, 27 Mar 2008 04:23:07 GMT
Message-Id: <200803270423.m2R4N7TJ041010@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 138703 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 27 Mar 2008 04:23:07 -0000

http://perforce.freebsd.org/chv.cgi?CH=138703

Change 138703 by pgj@disznohal on 2008/03/27 04:23:00

	Fix example titles (colons removed).

Affected files ...

.. //depot/projects/docproj_hu/books/handbook/disks/chapter.sgml#4 edit
.. //depot/projects/docproj_hu/books/handbook/mirrors/chapter.sgml#6 edit

Differences ...

==== //depot/projects/docproj_hu/books/handbook/disks/chapter.sgml#4 (text+ko) ====

@@ -3367,7 +3367,7 @@
 
       
 	A <command>dump</command> használata
-	  <application>ssh</application>-n keresztül:
+	  ssh-n keresztül
 
 	&prompt.root; /sbin/dump -0uan -f - /usr | gzip -2 | ssh -c blowfish \
           célfelhasználó@cél.gép.hu dd of=/mybigfiles/dump-usr-l0.gz
@@ -3384,7 +3384,7 @@
 	A <command>dump</command> használata
 	  <application>ssh</application>-n keresztül, az
 	  <envar>RSH</envar> környezeti változó
-	  beállításával:
+	  beállításával
 
 	&prompt.root; RSH=/usr/bin/ssh /sbin/dump -0uan -f célfelhasználó@cél.gép.hu:/dev/sa0 /usr
 

==== //depot/projects/docproj_hu/books/handbook/mirrors/chapter.sgml#6 (text+ko) ====

@@ -513,7 +513,7 @@
 
 	
 	  Valami (az &man.ls.1;) kikérése a
-	    -CURRENT ágból:
+	    -CURRENT ágból
 	  &prompt.user; setenv CVSROOT :pserver:anoncvs@anoncvs.tw.FreeBSD.org:/home/ncvs
 &prompt.user; cvs login
 Jelszóként ezután bármit megadhatunk.
@@ -523,7 +523,7 @@
 
 	
 	  Az <filename>src/</filename> fa kikérése
-	    SSH-n keresztül:
+	    SSH-n keresztül
 	  &prompt.user; cvs -d freebsdanoncvs@anoncvs.FreeBSD.org:/home/ncvs co src
 The authenticity of host 'anoncvs.freebsd.org (128.46.156.46)' can't be established.
 DSA key fingerprint is 52:02:38:1a:2f:a8:71:d3:f5:83:93:8d:aa:00:6f:65.
@@ -533,7 +533,7 @@
 
 	
 	  Az &man.ls.1; 6-STABLE ágban szereplõ
-	    változatának kikérése:
+	    változatának kikérése
 
 	  &prompt.user; setenv CVSROOT :pserver:anoncvs@anoncvs.tw.FreeBSD.org:/home/ncvs
 &prompt.user; cvs login
@@ -545,7 +545,7 @@
 	
 	  Az &man.ls.1; változásainak (Unified Diff
 	    formátumban történõ)
-	    listázása:
+	    listázása
 
 	  &prompt.user; setenv CVSROOT :pserver:anoncvs@anoncvs.tw.FreeBSD.org:/home/ncvs
 &prompt.user; cvs login
@@ -556,7 +556,7 @@
 
 	
 	  A használható modulok nevének
-	    kiderítése:
+	    kiderítése
 
 	  &prompt.user; setenv CVSROOT :pserver:anoncvs@anoncvs.tw.FreeBSD.org:/home/ncvs
 &prompt.user; cvs login

From owner-p4-projects@FreeBSD.ORG  Thu Mar 27 04:29:14 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CC517106566C; Thu, 27 Mar 2008 04:29: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 8C1DC106564A
	for ; Thu, 27 Mar 2008 04:29:13 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 7ECE98FC18
	for ; Thu, 27 Mar 2008 04:29:13 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2R4TDLj041155
	for ; Thu, 27 Mar 2008 04:29:13 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2R4TDSO041153
	for perforce@freebsd.org; Thu, 27 Mar 2008 04:29:13 GMT
	(envelope-from jb@freebsd.org)
Date: Thu, 27 Mar 2008 04:29:13 GMT
Message-Id: <200803270429.m2R4TDSO041153@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138704 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 27 Mar 2008 04:29:14 -0000

http://perforce.freebsd.org/chv.cgi?CH=138704

Change 138704 by jb@jb_freebsd1 on 2008/03/27 04:28:56

	IFopensolaris

Affected files ...

.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/dtrace.1#1 branch
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/include/debug.h#13 integrate
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/messages/sgs.ident#7 integrate

Differences ...

==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/include/debug.h#13 (text) ====

@@ -696,11 +696,11 @@
 extern	void	Dbg_file_output(Ofl_desc *);
 extern	void	Dbg_file_preload(Lm_list *, const char *);
 extern	void	Dbg_file_prot(Rt_map *, int);
-extern	void	Dbg_file_rejected(Lm_list *, Rej_desc *);
+extern	void	Dbg_file_rejected(Lm_list *, Rej_desc *, Half mach);
 extern	void	Dbg_file_reuse(Lm_list *, const char *, const char *);
 extern	void	Dbg_file_skip(Lm_list *, const char *, const char *);
 
-extern	void	Dbg_got_display(Ofl_desc *, Off, int);
+extern	void	Dbg_got_display(Ofl_desc *, Off, int, Word, size_t);
 
 extern	void	Dbg_libs_audit(Lm_list *, const char *, const char *);
 extern	void	Dbg_libs_find(Lm_list *, const char *);
@@ -973,8 +973,8 @@
 
 extern	void	Elf_ehdr(Lm_list *, Ehdr *, Shdr *);
 
-extern	void	Elf_got_entry(Lm_list *, Sword, Addr, Xword, Half, Word, void *,
-		    const char *);
+extern	void	Elf_got_entry(Lm_list *, Sword, Addr, Xword, Half,
+		    uchar_t, uchar_t, Word, void *, const char *);
 extern	void	Elf_got_title(Lm_list *);
 
 extern	void	Elf_phdr(Lm_list *, Half, Phdr *);

==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/messages/sgs.ident#7 (text) ====

@@ -1,5 +1,5 @@
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # CDDL HEADER START
@@ -50,7 +50,6 @@
 MSG_ID_CRLE		23	SUNW_OST_SGS		/* sgs/crle */
 MSG_ID_ELFDUMP		24	SUNW_OST_SGS		/* sgs/elfdump */
 MSG_ID_MOE		25	SUNW_OST_SGS		/* sgs/moe */
-
 MSG_ID_ELFEDIT		26	SUNW_OST_SGS		/* sgs/elfedit */
 MSG_ID_ELFEDIT_CAP	27	SUNW_OST_SGS		/* 	cap: */
 MSG_ID_ELFEDIT_DYN	27	SUNW_OST_SGS		/*	dyn: */
@@ -60,3 +59,4 @@
 MSG_ID_ELFEDIT_STR	27	SUNW_OST_SGS		/*	str: */
 MSG_ID_ELFEDIT_SYM	27	SUNW_OST_SGS		/*	sym: */
 MSG_ID_ELFEDIT_SYMINFO	27	SUNW_OST_SGS		/*	syminfo: */
+MSG_ID_ELFWRAP		28	SUNW_OST_SGS		/* sgs/elfwrap */

From owner-p4-projects@FreeBSD.ORG  Thu Mar 27 04:31:16 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1FD181065672; Thu, 27 Mar 2008 04:31: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 D3AAE106566C
	for ; Thu, 27 Mar 2008 04:31:15 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id AC7758FC15
	for ; Thu, 27 Mar 2008 04:31:15 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2R4VFVh041268
	for ; Thu, 27 Mar 2008 04:31:15 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2R4VF2u041266
	for perforce@freebsd.org; Thu, 27 Mar 2008 04:31:15 GMT
	(envelope-from jb@freebsd.org)
Date: Thu, 27 Mar 2008 04:31:15 GMT
Message-Id: <200803270431.m2R4VF2u041266@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138705 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 27 Mar 2008 04:31:17 -0000

http://perforce.freebsd.org/chv.cgi?CH=138705

Change 138705 by jb@jb_freebsd1 on 2008/03/27 04:30:22

	Install the Solaris dtrace man page. We might need to update this
	for FreeBSD, but it's a start.

Affected files ...

.. //depot/projects/dtrace/src/cddl/usr.sbin/dtrace/Makefile#9 edit

Differences ...

==== //depot/projects/dtrace/src/cddl/usr.sbin/dtrace/Makefile#9 (text+ko) ====

@@ -34,6 +34,4 @@
 
 #DPADD+= ${LIBDTRACE} ${LIBPTHREAD} ${LIBL} ${LIBY} ${LIBZ}
 
-NO_MAN=
-
 .include 

From owner-p4-projects@FreeBSD.ORG  Thu Mar 27 05:21:11 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 21CEC1065670; Thu, 27 Mar 2008 05:21: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 BA887106566B
	for ; Thu, 27 Mar 2008 05:21:10 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id ABB8B8FC18
	for ; Thu, 27 Mar 2008 05:21:10 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2R5LA2u054091
	for ; Thu, 27 Mar 2008 05:21:10 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2R5L908054082
	for perforce@freebsd.org; Thu, 27 Mar 2008 05:21:09 GMT
	(envelope-from jb@freebsd.org)
Date: Thu, 27 Mar 2008 05:21:09 GMT
Message-Id: <200803270521.m2R5L908054082@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138710 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 27 Mar 2008 05:21:11 -0000

http://perforce.freebsd.org/chv.cgi?CH=138710

Change 138710 by jb@jb_freebsd1 on 2008/03/27 05:20:19

	IFC

Affected files ...

.. //depot/projects/dtrace/src/etc/newsyslog.conf#4 integrate
.. //depot/projects/dtrace/src/sys/amd64/include/param.h#6 integrate
.. //depot/projects/dtrace/src/sys/arm/include/param.h#6 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/pmap.c#31 integrate
.. //depot/projects/dtrace/src/sys/i386/include/param.h#6 integrate
.. //depot/projects/dtrace/src/sys/i386/include/pmap.h#13 integrate
.. //depot/projects/dtrace/src/sys/ia64/include/param.h#6 integrate
.. //depot/projects/dtrace/src/sys/powerpc/include/param.h#6 integrate
.. //depot/projects/dtrace/src/sys/sparc64/include/param.h#7 integrate
.. //depot/projects/dtrace/src/sys/sun4v/include/param.h#7 integrate

Differences ...

==== //depot/projects/dtrace/src/etc/newsyslog.conf#4 (text+ko) ====

@@ -1,5 +1,5 @@
 # configuration file for newsyslog
-# $FreeBSD: src/etc/newsyslog.conf,v 1.50 2005/03/02 00:40:55 brooks Exp $
+# $FreeBSD: src/etc/newsyslog.conf,v 1.51 2008/03/27 03:30:14 brooks Exp $
 #
 # Entries which do not specify the '/pid_file' field will cause the
 # syslogd process to be signalled when that log file is rotated.  This
@@ -33,7 +33,7 @@
 /var/log/ppp.log	root:network	640  3	   100	*     JC
 /var/log/security			600  10	   100	*     JC
 /var/log/sendmail.st			640  10	   *	168   B
-/var/log/slip.log	root:network	640  3	   100	*     JC
+/var/log/slip.log	root:network	640  3	   100	*     J
 /var/log/weekly.log			640  5	   1	$W6D0 JN
 /var/log/wtmp				644  3	   *	@01T05 B
 /var/log/xferlog			600  7	   100	*     JC

==== //depot/projects/dtrace/src/sys/amd64/include/param.h#6 (text+ko) ====

@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)param.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/amd64/include/param.h,v 1.20 2006/01/09 06:05:56 imp Exp $
+ * $FreeBSD: src/sys/amd64/include/param.h,v 1.21 2008/03/27 05:03:24 jb Exp $
  */
 
 /*

==== //depot/projects/dtrace/src/sys/arm/include/param.h#6 (text+ko) ====

@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)param.h	5.8 (Berkeley) 6/28/91
- * $FreeBSD: src/sys/arm/include/param.h,v 1.11 2006/01/09 06:05:56 imp Exp $
+ * $FreeBSD: src/sys/arm/include/param.h,v 1.12 2008/03/27 05:03:25 jb Exp $
  */
 
 /*
@@ -76,7 +76,7 @@
 #define MAXCPU		2
 #else
 #define	MAXCPU		1
-#endif /* SMP */
+#endif /* SMP || KLD_MODULE */
 
 #define	ALIGNBYTES	_ALIGNBYTES
 #define	ALIGN(p)	_ALIGN(p)

==== //depot/projects/dtrace/src/sys/i386/i386/pmap.c#31 (text+ko) ====

@@ -5,7 +5,7 @@
  * All rights reserved.
  * Copyright (c) 1994 David Greenman
  * All rights reserved.
- * Copyright (c) 2005 Alan L. Cox 
+ * Copyright (c) 2005-2008 Alan L. Cox 
  * All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
@@ -75,7 +75,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.609 2008/03/23 07:07:27 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.610 2008/03/27 04:34:17 alc Exp $");
 
 /*
  *	Manages physical address maps.
@@ -112,6 +112,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -135,6 +136,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -171,6 +173,9 @@
 #define PV_STAT(x)	do { } while (0)
 #endif
 
+#define	pa_index(pa)	((pa) >> PDRSHIFT)
+#define	pa_to_pvh(pa)	(&pv_table[pa_index(pa)])
+
 /*
  * Get PDEs and PTEs for user/kernel address space
  */
@@ -206,10 +211,17 @@
 static uma_zone_t pdptzone;
 #endif
 
+SYSCTL_NODE(_vm, OID_AUTO, pmap, CTLFLAG_RD, 0, "VM/pmap parameters");
+
+static int pg_ps_enabled;
+SYSCTL_INT(_vm_pmap, OID_AUTO, pg_ps_enabled, CTLFLAG_RD, &pg_ps_enabled, 0,
+    "Are large page mappings enabled?");
+
 /*
  * Data for the pv entry allocation mechanism
  */
 static int pv_entry_count = 0, pv_entry_max = 0, pv_entry_high_water = 0;
+static struct md_page *pv_table;
 static int shpgperproc = PMAP_SHPGPERPROC;
 
 struct pv_chunk *pv_chunkbase;		/* KVA block for pv_chunks */
@@ -259,11 +271,29 @@
 
 static void	free_pv_entry(pmap_t pmap, pv_entry_t pv);
 static pv_entry_t get_pv_entry(pmap_t locked_pmap, int try);
+static void	pmap_pv_demote_pde(pmap_t pmap, vm_offset_t va, vm_paddr_t pa);
+static boolean_t pmap_pv_insert_pde(pmap_t pmap, vm_offset_t va, vm_page_t m);
+static void	pmap_pv_promote_pde(pmap_t pmap, vm_offset_t va, vm_paddr_t pa);
+static void	pmap_pvh_free(struct md_page *pvh, pmap_t pmap, vm_offset_t va);
+static pv_entry_t pmap_pvh_remove(struct md_page *pvh, pmap_t pmap,
+		    vm_offset_t va);
 
+static boolean_t pmap_demote_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va);
+static boolean_t pmap_enter_pde(pmap_t pmap, vm_offset_t va, vm_page_t m,
+    vm_prot_t prot);
 static vm_page_t pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va,
     vm_page_t m, vm_prot_t prot, vm_page_t mpte);
+static void pmap_insert_pt_page(pmap_t pmap, vm_page_t mpte);
+static boolean_t pmap_is_modified_pvh(struct md_page *pvh);
+static vm_page_t pmap_lookup_pt_page(pmap_t pmap, vm_offset_t va);
+static void pmap_promote_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va);
+static boolean_t pmap_protect_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t sva,
+    vm_prot_t prot);
+static void pmap_remove_pde(pmap_t pmap, pd_entry_t *pdq, vm_offset_t sva,
+    vm_page_t *free);
 static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, vm_offset_t sva,
     vm_page_t *free);
+static void pmap_remove_pt_page(pmap_t pmap, vm_page_t mpte);
 static void pmap_remove_page(struct pmap *pmap, vm_offset_t va,
     vm_page_t *free);
 static void pmap_remove_entry(struct pmap *pmap, vm_page_t m,
@@ -351,6 +381,7 @@
 #ifdef PAE
 	kernel_pmap->pm_pdpt = (pdpt_entry_t *) (KERNBASE + (u_int)IdlePDPT);
 #endif
+	kernel_pmap->pm_root = NULL;
 	kernel_pmap->pm_active = -1;	/* don't allow deactivation */
 	TAILQ_INIT(&kernel_pmap->pm_pvchunk);
 	LIST_INIT(&allpmaps);
@@ -599,8 +630,24 @@
 void
 pmap_init(void)
 {
+	vm_page_t mpte;
+	vm_size_t s;
+	int i, pv_npg;
 
 	/*
+	 * Initialize the vm page array entries for the kernel pmap's
+	 * page table pages.
+	 */ 
+	for (i = 0; i < nkpt; i++) {
+		mpte = PHYS_TO_VM_PAGE(PTD[i + KPTDI] & PG_FRAME);
+		KASSERT(mpte >= vm_page_array &&
+		    mpte < &vm_page_array[vm_page_array_size],
+		    ("pmap_init: page table page is out of range"));
+		mpte->pindex = i + KPTDI;
+		mpte->phys_addr = PTD[i + KPTDI] & PG_FRAME;
+	}
+
+	/*
 	 * Initialize the address space (zone) for the pv entries.  Set a
 	 * high water mark so that the system can recover from excessive
 	 * numbers of pv entries.
@@ -611,6 +658,26 @@
 	pv_entry_max = roundup(pv_entry_max, _NPCPV);
 	pv_entry_high_water = 9 * (pv_entry_max / 10);
 
+	/*
+	 * Are large page mappings enabled?
+	 */
+	TUNABLE_INT_FETCH("vm.pmap.pg_ps_enabled", &pg_ps_enabled);
+
+	/*
+	 * Calculate the size of the pv head table for superpages.
+	 */
+	for (i = 0; phys_avail[i + 1]; i += 2);
+	pv_npg = round_4mpage(phys_avail[(i - 2) + 1]) / NBPDR;
+
+	/*
+	 * Allocate memory for the pv head table for superpages.
+	 */
+	s = (vm_size_t)(pv_npg * sizeof(struct md_page));
+	s = round_page(s);
+	pv_table = (struct md_page *)kmem_alloc(kernel_map, s);
+	for (i = 0; i < pv_npg; i++)
+		TAILQ_INIT(&pv_table[i].pv_list);
+
 	pv_maxchunks = MAX(pv_entry_max / _NPCPV, maxproc);
 	pv_chunkbase = (struct pv_chunk *)kmem_alloc_nofault(kernel_map,
 	    PAGE_SIZE * pv_maxchunks);
@@ -626,12 +693,30 @@
 }
 
 
-SYSCTL_NODE(_vm, OID_AUTO, pmap, CTLFLAG_RD, 0, "VM/pmap parameters");
 SYSCTL_INT(_vm_pmap, OID_AUTO, pv_entry_max, CTLFLAG_RD, &pv_entry_max, 0,
 	"Max number of PV entries");
 SYSCTL_INT(_vm_pmap, OID_AUTO, shpgperproc, CTLFLAG_RD, &shpgperproc, 0,
 	"Page share factor per proc");
 
+SYSCTL_NODE(_vm_pmap, OID_AUTO, pde, CTLFLAG_RD, 0,
+    "2/4MB page mapping counters");
+
+static u_long pmap_pde_demotions;
+SYSCTL_ULONG(_vm_pmap_pde, OID_AUTO, demotions, CTLFLAG_RD,
+    &pmap_pde_demotions, 0, "2/4MB page demotions");
+
+static u_long pmap_pde_mappings;
+SYSCTL_ULONG(_vm_pmap_pde, OID_AUTO, mappings, CTLFLAG_RD,
+    &pmap_pde_mappings, 0, "2/4MB page mappings");
+
+static u_long pmap_pde_p_failures;
+SYSCTL_ULONG(_vm_pmap_pde, OID_AUTO, p_failures, CTLFLAG_RD,
+    &pmap_pde_p_failures, 0, "2/4MB page promotion failures");
+
+static u_long pmap_pde_promotions;
+SYSCTL_ULONG(_vm_pmap_pde, OID_AUTO, promotions, CTLFLAG_RD,
+    &pmap_pde_promotions, 0, "2/4MB page promotions");
+
 /***************************************************
  * Low level helper routines.....
  ***************************************************/
@@ -1154,8 +1239,101 @@
 	while (free != NULL) {
 		m = free;
 		free = m->right;
-		vm_page_free_zero(m);
+		/* Preserve the page's PG_ZERO setting. */
+		vm_page_free_toq(m);
+	}
+}
+
+/*
+ * Schedule the specified unused page table page to be freed.  Specifically,
+ * add the page to the specified list of pages that will be released to the
+ * physical memory manager after the TLB has been updated.
+ */
+static __inline void
+pmap_add_delayed_free_list(vm_page_t m, vm_page_t *free, boolean_t set_PG_ZERO)
+{
+
+	if (set_PG_ZERO)
+		m->flags |= PG_ZERO;
+	else
+		m->flags &= ~PG_ZERO;
+	m->right = *free;
+	*free = m;
+}
+
+/*
+ * Inserts the specified page table page into the specified pmap's collection
+ * of idle page table pages.  Each of a pmap's page table pages is responsible
+ * for mapping a distinct range of virtual addresses.  The pmap's collection is
+ * ordered by this virtual address range.
+ */
+static void
+pmap_insert_pt_page(pmap_t pmap, vm_page_t mpte)
+{
+	vm_page_t root;
+
+	PMAP_LOCK_ASSERT(pmap, MA_OWNED);
+	root = pmap->pm_root;
+	if (root == NULL) {
+		mpte->left = NULL;
+		mpte->right = NULL;
+	} else {
+		root = vm_page_splay(mpte->pindex, root);
+		if (mpte->pindex < root->pindex) {
+			mpte->left = root->left;
+			mpte->right = root;
+			root->left = NULL;
+		} else if (mpte->pindex == root->pindex)
+			panic("pmap_insert_pt_page: pindex already inserted");
+		else {
+			mpte->right = root->right;
+			mpte->left = root;
+			root->right = NULL;
+		}
+	}
+	pmap->pm_root = mpte;
+}
+
+/*
+ * Looks for a page table page mapping the specified virtual address in the
+ * specified pmap's collection of idle page table pages.  Returns NULL if there
+ * is no page table page corresponding to the specified virtual address.
+ */
+static vm_page_t
+pmap_lookup_pt_page(pmap_t pmap, vm_offset_t va)
+{
+	vm_page_t mpte;
+	vm_pindex_t pindex = va >> PDRSHIFT;
+
+	PMAP_LOCK_ASSERT(pmap, MA_OWNED);
+	if ((mpte = pmap->pm_root) != NULL && mpte->pindex != pindex) {
+		mpte = vm_page_splay(pindex, mpte);
+		if ((pmap->pm_root = mpte)->pindex != pindex)
+			mpte = NULL;
+	}
+	return (mpte);
+}
+
+/*
+ * Removes the specified page table page from the specified pmap's collection
+ * of idle page table pages.  The specified page table page must be a member of
+ * the pmap's collection.
+ */
+static void
+pmap_remove_pt_page(pmap_t pmap, vm_page_t mpte)
+{
+	vm_page_t root;
+
+	PMAP_LOCK_ASSERT(pmap, MA_OWNED);
+	if (mpte != pmap->pm_root)
+		vm_page_splay(mpte->pindex, pmap->pm_root);
+	if (mpte->left == NULL)
+		root = mpte->right;
+	else {
+		root = vm_page_splay(mpte->pindex, mpte->left);
+		root->right = mpte->right;
 	}
+	pmap->pm_root = root;
 }
 
 /*
@@ -1202,8 +1380,7 @@
 	 * Put page on a list so that it is released after
 	 * *ALL* TLB shootdown is done
 	 */
-	m->right = *free;
-	*free = m;
+	pmap_add_delayed_free_list(m, free, TRUE);
 
 	return 1;
 }
@@ -1234,6 +1411,7 @@
 #ifdef PAE
 	pmap->pm_pdpt = (pdpt_entry_t *)(KERNBASE + (vm_offset_t)IdlePDPT);
 #endif
+	pmap->pm_root = NULL;
 	pmap->pm_active = 0;
 	PCPU_SET(curpmap, pmap);
 	TAILQ_INIT(&pmap->pm_pvchunk);
@@ -1277,7 +1455,10 @@
 		KASSERT(pmap_kextract((vm_offset_t)pmap->pm_pdpt) < (4ULL<<30),
 		    ("pmap_pinit: pdpt above 4g"));
 #endif
+		pmap->pm_root = NULL;
 	}
+	KASSERT(pmap->pm_root == NULL,
+	    ("pmap_pinit: pmap has reserved page table page(s)"));
 
 	/*
 	 * allocate the page directory page(s)
@@ -1398,10 +1579,8 @@
 	 * normal 4K page.
 	 */
 	if (ptepa & PG_PS) {
-		pmap->pm_pdir[ptepindex] = 0;
-		ptepa = 0;
-		pmap->pm_stats.resident_count -= NBPDR / PAGE_SIZE;
-		pmap_invalidate_all(kernel_pmap);
+		(void)pmap_demote_pde(pmap, &pmap->pm_pdir[ptepindex], va);
+		ptepa = pmap->pm_pdir[ptepindex];
 	}
 
 	/*
@@ -1535,6 +1714,8 @@
 	KASSERT(pmap->pm_stats.resident_count == 0,
 	    ("pmap_release: pmap resident count %ld != 0",
 	    pmap->pm_stats.resident_count));
+	KASSERT(pmap->pm_root == NULL,
+	    ("pmap_release: pmap has reserved page table page(s)"));
 
 	pmap_lazyfix(pmap);
 	mtx_lock_spin(&allpmaps_lock);
@@ -1716,6 +1897,8 @@
 static void
 pmap_collect(pmap_t locked_pmap, struct vpgqueues *vpq)
 {
+	struct md_page *pvh;
+	pd_entry_t *pde;
 	pmap_t pmap;
 	pt_entry_t *pte, tpte;
 	pv_entry_t next_pv, pv;
@@ -1735,25 +1918,27 @@
 			else if (pmap != locked_pmap && !PMAP_TRYLOCK(pmap))
 				continue;
 			pmap->pm_stats.resident_count--;
+			pde = pmap_pde(pmap, va);
+			KASSERT((*pde & PG_PS) == 0, ("pmap_collect: found"
+			    " a 4mpage in page %p's pv list", m));
 			pte = pmap_pte_quick(pmap, va);
 			tpte = pte_load_clear(pte);
 			KASSERT((tpte & PG_W) == 0,
 			    ("pmap_collect: wired pte %#jx", (uintmax_t)tpte));
 			if (tpte & PG_A)
 				vm_page_flag_set(m, PG_REFERENCED);
-			if (tpte & PG_M) {
-				KASSERT((tpte & PG_RW),
-	("pmap_collect: modified page not writable: va: %#x, pte: %#jx",
-				    va, (uintmax_t)tpte));
+			if ((tpte & (PG_M | PG_RW)) == (PG_M | PG_RW))
 				vm_page_dirty(m);
-			}
 			free = NULL;
 			pmap_unuse_pt(pmap, va, &free);
 			pmap_invalidate_page(pmap, va);
 			pmap_free_zero_pages(free);
 			TAILQ_REMOVE(&m->md.pv_list, pv, pv_list);
-			if (TAILQ_EMPTY(&m->md.pv_list))
-				vm_page_flag_clear(m, PG_WRITEABLE);
+			if (TAILQ_EMPTY(&m->md.pv_list)) {
+				pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m));
+				if (TAILQ_EMPTY(&pvh->pv_list))
+					vm_page_flag_clear(m, PG_WRITEABLE);
+			}
 			free_pv_entry(pmap, pv);
 			if (pmap != locked_pmap)
 				PMAP_UNLOCK(pmap);
@@ -1895,24 +2080,112 @@
 	return (pv);
 }
 
-static void
-pmap_remove_entry(pmap_t pmap, vm_page_t m, vm_offset_t va)
+static __inline pv_entry_t
+pmap_pvh_remove(struct md_page *pvh, pmap_t pmap, vm_offset_t va)
 {
 	pv_entry_t pv;
 
-	PMAP_LOCK_ASSERT(pmap, MA_OWNED);
 	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
-	TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) {
-		if (pmap == PV_PMAP(pv) && va == pv->pv_va)
+	TAILQ_FOREACH(pv, &pvh->pv_list, pv_list) {
+		if (pmap == PV_PMAP(pv) && va == pv->pv_va) {
+			TAILQ_REMOVE(&pvh->pv_list, pv, pv_list);
 			break;
+		}
 	}
-	KASSERT(pv != NULL, ("pmap_remove_entry: pv not found"));
-	TAILQ_REMOVE(&m->md.pv_list, pv, pv_list);
-	if (TAILQ_EMPTY(&m->md.pv_list))
-		vm_page_flag_clear(m, PG_WRITEABLE);
+	return (pv);
+}
+
+static void
+pmap_pv_demote_pde(pmap_t pmap, vm_offset_t va, vm_paddr_t pa)
+{
+	struct md_page *pvh;
+	pv_entry_t pv;
+	vm_offset_t va_last;
+	vm_page_t m;
+
+	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+	KASSERT((pa & PDRMASK) == 0,
+	    ("pmap_pv_demote_pde: pa is not 4mpage aligned"));
+
+	/*
+	 * Transfer the 4mpage's pv entry for this mapping to the first
+	 * page's pv list.
+	 */
+	pvh = pa_to_pvh(pa);
+	va = trunc_4mpage(va);
+	pv = pmap_pvh_remove(pvh, pmap, va);
+	KASSERT(pv != NULL, ("pmap_pv_demote_pde: pv not found"));
+	m = PHYS_TO_VM_PAGE(pa);
+	TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list);
+	/* Instantiate the remaining NPTEPG - 1 pv entries. */
+	va_last = va + NBPDR - PAGE_SIZE;
+	do {
+		m++;
+		KASSERT((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0,
+		    ("pmap_pv_demote_pde: page %p is not managed", m));
+		va += PAGE_SIZE;
+		pmap_insert_entry(pmap, va, m);
+	} while (va < va_last);
+}
+
+static void
+pmap_pv_promote_pde(pmap_t pmap, vm_offset_t va, vm_paddr_t pa)
+{
+	struct md_page *pvh;
+	pv_entry_t pv;
+	vm_offset_t va_last;
+	vm_page_t m;
+
+	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+	KASSERT((pa & PDRMASK) == 0,
+	    ("pmap_pv_promote_pde: pa is not 4mpage aligned"));
+
+	/*
+	 * Transfer the first page's pv entry for this mapping to the
+	 * 4mpage's pv list.  Aside from avoiding the cost of a call
+	 * to get_pv_entry(), a transfer avoids the possibility that
+	 * get_pv_entry() calls pmap_collect() and that pmap_collect()
+	 * removes one of the mappings that is being promoted.
+	 */
+	m = PHYS_TO_VM_PAGE(pa);
+	va = trunc_4mpage(va);
+	pv = pmap_pvh_remove(&m->md, pmap, va);
+	KASSERT(pv != NULL, ("pmap_pv_promote_pde: pv not found"));
+	pvh = pa_to_pvh(pa);
+	TAILQ_INSERT_TAIL(&pvh->pv_list, pv, pv_list);
+	/* Free the remaining NPTEPG - 1 pv entries. */
+	va_last = va + NBPDR - PAGE_SIZE;
+	do {
+		m++;
+		va += PAGE_SIZE;
+		pmap_pvh_free(&m->md, pmap, va);
+	} while (va < va_last);
+}
+
+static void
+pmap_pvh_free(struct md_page *pvh, pmap_t pmap, vm_offset_t va)
+{
+	pv_entry_t pv;
+
+	pv = pmap_pvh_remove(pvh, pmap, va);
+	KASSERT(pv != NULL, ("pmap_pvh_free: pv not found"));
 	free_pv_entry(pmap, pv);
 }
 
+static void
+pmap_remove_entry(pmap_t pmap, vm_page_t m, vm_offset_t va)
+{
+	struct md_page *pvh;
+
+	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+	pmap_pvh_free(&m->md, pmap, va);
+	if (TAILQ_EMPTY(&m->md.pv_list)) {
+		pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m));
+		if (TAILQ_EMPTY(&pvh->pv_list))
+			vm_page_flag_clear(m, PG_WRITEABLE);
+	}
+}
+
 /*
  * Create a pv entry for page at pa for
  * (pmap, va).
@@ -1949,6 +2222,222 @@
 }
 
 /*
+ * Create the pv entries for each of the pages within a superpage.
+ */
+static boolean_t
+pmap_pv_insert_pde(pmap_t pmap, vm_offset_t va, vm_page_t m)
+{
+	struct md_page *pvh;
+	pv_entry_t pv;
+
+	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+	if (pv_entry_count < pv_entry_high_water && 
+	    (pv = get_pv_entry(pmap, TRUE)) != NULL) {
+		pv->pv_va = va;
+		pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m));
+		TAILQ_INSERT_TAIL(&pvh->pv_list, pv, pv_list);
+		return (TRUE);
+	} else
+		return (FALSE);
+}
+
+/*
+ * Tries to demote a 2- or 4MB page mapping.
+ */
+static boolean_t
+pmap_demote_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va)
+{
+	pd_entry_t newpde, oldpde;
+	pmap_t allpmaps_entry;
+	pt_entry_t *firstpte, newpte, *pte;
+	vm_paddr_t mptepa;
+	vm_page_t free, mpte;
+
+	PMAP_LOCK_ASSERT(pmap, MA_OWNED);
+	mpte = pmap_lookup_pt_page(pmap, va);
+	if (mpte != NULL)
+		pmap_remove_pt_page(pmap, mpte);
+	else {
+		KASSERT((*pde & PG_W) == 0,
+		    ("pmap_demote_pde: page table page for a wired mapping"
+		    " is missing"));
+		free = NULL;
+		pmap_remove_pde(pmap, pde, trunc_4mpage(va), &free);
+		pmap_invalidate_page(pmap, trunc_4mpage(va));
+		pmap_free_zero_pages(free);
+		CTR2(KTR_PMAP, "pmap_demote_pde: failure for va %#x"
+		    " in pmap %p", va, pmap);
+		return (FALSE);
+	}
+	mptepa = VM_PAGE_TO_PHYS(mpte);
+
+	/*
+	 * Temporarily map the page table page (mpte) into the kernel's
+	 * address space at either PADDR1 or PADDR2.
+	 */
+	if (curthread->td_pinned > 0 && mtx_owned(&vm_page_queue_mtx)) {
+		if ((*PMAP1 & PG_FRAME) != mptepa) {
+			*PMAP1 = mptepa | PG_RW | PG_V | PG_A | PG_M;
+#ifdef SMP
+			PMAP1cpu = PCPU_GET(cpuid);
+#endif
+			invlcaddr(PADDR1);
+			PMAP1changed++;
+		} else
+#ifdef SMP
+		if (PMAP1cpu != PCPU_GET(cpuid)) {
+			PMAP1cpu = PCPU_GET(cpuid);
+			invlcaddr(PADDR1);
+			PMAP1changedcpu++;
+		} else
+#endif
+			PMAP1unchanged++;
+		firstpte = PADDR1;
+	} else {
+		mtx_lock(&PMAP2mutex);
+		if ((*PMAP2 & PG_FRAME) != mptepa) {
+			*PMAP2 = mptepa | PG_RW | PG_V | PG_A | PG_M;
+			pmap_invalidate_page(kernel_pmap, (vm_offset_t)PADDR2);
+		}
+		firstpte = PADDR2;
+	}
+	oldpde = *pde;
+	newpde = mptepa | PG_M | PG_A | (oldpde & PG_U) | PG_RW | PG_V;
+	KASSERT((oldpde & (PG_A | PG_V)) == (PG_A | PG_V),
+	    ("pmap_demote_pde: oldpde is missing PG_A and/or PG_V"));
+	KASSERT((oldpde & (PG_M | PG_RW)) != PG_RW,
+	    ("pmap_demote_pde: oldpde is missing PG_M"));
+	KASSERT((oldpde & PG_PS) != 0,
+	    ("pmap_demote_pde: oldpde is missing PG_PS"));
+	newpte = oldpde & ~PG_PS;
+	if ((newpte & PG_PDE_PAT) != 0)
+		newpte ^= PG_PDE_PAT | PG_PTE_PAT;
+
+	/*
+	 * If the mapping has changed attributes, update the page table
+	 * entries.
+	 */ 
+	KASSERT((*firstpte & PG_FRAME) == (newpte & PG_FRAME),
+	    ("pmap_demote_pde: firstpte and newpte map different physical"
+	    " addresses"));
+	if ((*firstpte & PG_PTE_PROMOTE) != (newpte & PG_PTE_PROMOTE))
+		for (pte = firstpte; pte < firstpte + NPTEPG; pte++) {
+			*pte = newpte;	
+			newpte += PAGE_SIZE;
+		}
+	
+	/*
+	 * Demote the mapping.  This pmap is locked.  The old PDE has
+	 * PG_A set.  If the old PDE has PG_RW set, it also has PG_M
+	 * set.  Thus, there is no danger of a race with another
+	 * processor changing the setting of PG_A and/or PG_M between
+	 * the read above and the store below. 
+	 */
+	if (pmap == kernel_pmap) {
+		/*
+		 * A harmless race exists between this loop and the bcopy()
+		 * in pmap_pinit() that initializes the kernel segment of
+		 * the new page table.  Specifically, that bcopy() may copy
+		 * the new PDE from the PTD, which is first in allpmaps, to
+		 * the new page table before this loop updates that new
+		 * page table.
+		 */
+		mtx_lock_spin(&allpmaps_lock);
+		LIST_FOREACH(allpmaps_entry, &allpmaps, pm_list) {
+			pde = pmap_pde(allpmaps_entry, va);
+			KASSERT(*pde == newpde || (*pde & PG_PTE_PROMOTE) ==
+			    (oldpde & PG_PTE_PROMOTE),
+			    ("pmap_demote_pde: pde was %#jx, expected %#jx",
+			    (uintmax_t)*pde, (uintmax_t)oldpde));
+			pde_store(pde, newpde);
+		}
+		mtx_unlock_spin(&allpmaps_lock);
+	} else
+		pde_store(pde, newpde);	
+	if (firstpte == PADDR2)
+		mtx_unlock(&PMAP2mutex);
+
+	/*
+	 * Invalidate the recursive mapping of the page table page.
+	 */
+	pmap_invalidate_page(pmap, (vm_offset_t)vtopte(va));
+
+	/*
+	 * Demote the pv entry.  This depends on the earlier demotion
+	 * of the mapping.  Specifically, the (re)creation of a per-
+	 * page pv entry might trigger the execution of pmap_collect(),
+	 * which might reclaim a newly (re)created per-page pv entry
+	 * and destroy the associated mapping.  In order to destroy
+	 * the mapping, the PDE must have already changed from mapping
+	 * the 2mpage to referencing the page table page.
+	 */
+	if ((oldpde & PG_MANAGED) != 0)
+		pmap_pv_demote_pde(pmap, va, oldpde & PG_FRAME);
+
+	pmap_pde_demotions++;
+	CTR2(KTR_PMAP, "pmap_demote_pde: success for va %#x"
+	    " in pmap %p", va, pmap);
+	return (TRUE);
+}
+
+/*
+ * pmap_remove_pde: do the things to unmap a superpage in a process
+ */
+static void
+pmap_remove_pde(pmap_t pmap, pd_entry_t *pdq, vm_offset_t sva,
+    vm_page_t *free)
+{
+	struct md_page *pvh;
+	pd_entry_t oldpde;
+	vm_offset_t eva, va;
+	vm_page_t m, mpte;
+
+	PMAP_LOCK_ASSERT(pmap, MA_OWNED);
+	KASSERT((sva & PDRMASK) == 0,
+	    ("pmap_remove_pde: sva is not 4mpage aligned"));
+	oldpde = pte_load_clear(pdq);
+	if (oldpde & PG_W)
+		pmap->pm_stats.wired_count -= NBPDR / PAGE_SIZE;
+
+	/*
+	 * Machines that don't support invlpg, also don't support
+	 * PG_G.
+	 */
+	if (oldpde & PG_G)
+		pmap_invalidate_page(kernel_pmap, sva);
+	pmap->pm_stats.resident_count -= NBPDR / PAGE_SIZE;
+	if (oldpde & PG_MANAGED) {
+		pvh = pa_to_pvh(oldpde & PG_FRAME);
+		pmap_pvh_free(pvh, pmap, sva);
+		eva = sva + NBPDR;
+		for (va = sva, m = PHYS_TO_VM_PAGE(oldpde & PG_FRAME);
+		    va < eva; va += PAGE_SIZE, m++) {
+			if ((oldpde & (PG_M | PG_RW)) == (PG_M | PG_RW))
+				vm_page_dirty(m);
+			if (oldpde & PG_A)
+				vm_page_flag_set(m, PG_REFERENCED);
+			if (TAILQ_EMPTY(&m->md.pv_list) &&
+			    TAILQ_EMPTY(&pvh->pv_list))
+				vm_page_flag_clear(m, PG_WRITEABLE);
+		}
+	}
+	if (pmap == kernel_pmap) {
+		if (!pmap_demote_pde(pmap, pdq, sva))
+			panic("pmap_remove_pde: failed demotion");
+	} else {
+		mpte = pmap_lookup_pt_page(pmap, sva);
+		if (mpte != NULL) {
+			pmap_remove_pt_page(pmap, mpte);
+			KASSERT(mpte->wire_count == NPTEPG,
+			    ("pmap_remove_pde: pte page wire count error"));
+			mpte->wire_count = 0;
+			pmap_add_delayed_free_list(mpte, free, FALSE);
+			atomic_subtract_int(&cnt.v_wire_count, 1);
+		}
+	}
+}
+
+/*
  * pmap_remove_pte: do the things to unmap a page in a process
  */
 static int
@@ -1971,12 +2460,8 @@
 	pmap->pm_stats.resident_count -= 1;
 	if (oldpte & PG_MANAGED) {
 		m = PHYS_TO_VM_PAGE(oldpte & PG_FRAME);
-		if (oldpte & PG_M) {
-			KASSERT((oldpte & PG_RW),
-	("pmap_remove_pte: modified page not writable: va: %#x, pte: %#jx",
-			    va, (uintmax_t)oldpte));
+		if ((oldpte & (PG_M | PG_RW)) == (PG_M | PG_RW))
 			vm_page_dirty(m);
-		}
 		if (oldpte & PG_A)
 			vm_page_flag_set(m, PG_REFERENCED);
 		pmap_remove_entry(pmap, m, va);
@@ -2065,10 +2550,25 @@
 		 * Check for large page.
 		 */
 		if ((ptpaddr & PG_PS) != 0) {
-			pmap->pm_pdir[pdirindex] = 0;
-			pmap->pm_stats.resident_count -= NBPDR / PAGE_SIZE;
-			anyvalid = 1;
-			continue;
+			/*
+			 * Are we removing the entire large page?  If not,
+			 * demote the mapping and fall through.
+			 */
+			if (sva + NBPDR == pdnxt && eva >= pdnxt) {
+				/*
+				 * The TLB entry for a PG_G mapping is
+				 * invalidated by pmap_remove_pde().
+				 */
+				if ((ptpaddr & PG_G) == 0)
+					anyvalid = 1;
+				pmap_remove_pde(pmap,
+				    &pmap->pm_pdir[pdirindex], sva, &free);
+				continue;
+			} else if (!pmap_demote_pde(pmap,
+			    &pmap->pm_pdir[pdirindex], sva)) {
+				/* The large page mapping was destroyed. */
+				continue;
+			}
 		}
 
 		/*
@@ -2119,19 +2619,34 @@
 void
 pmap_remove_all(vm_page_t m)
 {
+	struct md_page *pvh;
 	pv_entry_t pv;
 	pmap_t pmap;
 	pt_entry_t *pte, tpte;
+	pd_entry_t *pde;
+	vm_offset_t va;
 	vm_page_t free;
 
 	KASSERT((m->flags & PG_FICTITIOUS) == 0,
 	    ("pmap_remove_all: page %p is fictitious", m));
 	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
 	sched_pin();
+	pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m));
+	while ((pv = TAILQ_FIRST(&pvh->pv_list)) != NULL) {
+		va = pv->pv_va;
+		pmap = PV_PMAP(pv);
+		PMAP_LOCK(pmap);
+		pde = pmap_pde(pmap, va);
+		(void)pmap_demote_pde(pmap, pde, va);
+		PMAP_UNLOCK(pmap);
+	}
 	while ((pv = TAILQ_FIRST(&m->md.pv_list)) != NULL) {
 		pmap = PV_PMAP(pv);
 		PMAP_LOCK(pmap);
 		pmap->pm_stats.resident_count--;
+		pde = pmap_pde(pmap, pv->pv_va);
+		KASSERT((*pde & PG_PS) == 0, ("pmap_remove_all: found"
+		    " a 4mpage in page %p's pv list", m));
 		pte = pmap_pte_quick(pmap, pv->pv_va);
 		tpte = pte_load_clear(pte);
 		if (tpte & PG_W)
@@ -2142,12 +2657,8 @@
 		/*
 		 * Update the vm_page_t clean and reference bits.
 		 */
-		if (tpte & PG_M) {
-			KASSERT((tpte & PG_RW),
-	("pmap_remove_all: modified page not writable: va: %#x, pte: %#jx",
-			    pv->pv_va, (uintmax_t)tpte));
+		if ((tpte & (PG_M | PG_RW)) == (PG_M | PG_RW))
 			vm_page_dirty(m);
-		}
 		free = NULL;
 		pmap_unuse_pt(pmap, pv->pv_va, &free);
 		pmap_invalidate_page(pmap, pv->pv_va);
@@ -2161,6 +2672,56 @@
 }
 
 /*
+ * pmap_protect_pde: do the things to protect a 4mpage in a process
+ */
+static boolean_t
+pmap_protect_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t sva, vm_prot_t prot)
+{
+	pd_entry_t newpde, oldpde;
+	vm_offset_t eva, va;
+	vm_page_t m;
+	boolean_t anychanged;
+
+	PMAP_LOCK_ASSERT(pmap, MA_OWNED);
+	KASSERT((sva & PDRMASK) == 0,
+	    ("pmap_protect_pde: sva is not 4mpage aligned"));
+	anychanged = FALSE;
+retry:
+	oldpde = newpde = *pde;
+	if (oldpde & PG_MANAGED) {
+		eva = sva + NBPDR;
+		for (va = sva, m = PHYS_TO_VM_PAGE(oldpde & PG_FRAME);
+		    va < eva; va += PAGE_SIZE, m++) {
+			/*
+			 * In contrast to the analogous operation on a 4KB page
+			 * mapping, the mapping's PG_A flag is not cleared and
+			 * the page's PG_REFERENCED flag is not set.  The
+			 * reason is that pmap_demote_pde() expects that a 2/4MB
+			 * page mapping with a stored page table page has PG_A
+			 * set.
+			 */
+			if ((oldpde & (PG_M | PG_RW)) == (PG_M | PG_RW))
+				vm_page_dirty(m);
+		}
+	}
+	if ((prot & VM_PROT_WRITE) == 0)
+		newpde &= ~(PG_RW | PG_M);
+#ifdef PAE
+	if ((prot & VM_PROT_EXECUTE) == 0)
+		newpde |= pg_nx;
+#endif
+	if (newpde != oldpde) {
+		if (!pde_cmpset(pde, oldpde, newpde))
+			goto retry;
+		if (oldpde & PG_G)
+			pmap_invalidate_page(pmap, sva);
+		else
+			anychanged = TRUE;
+	}
+	return (anychanged);
+}
+
+/*
  *	Set the physical protection on the
  *	specified range of this map as requested.
  */
@@ -2213,14 +2774,24 @@
 		 * Check for large page.
 		 */
 		if ((ptpaddr & PG_PS) != 0) {
-			if ((prot & VM_PROT_WRITE) == 0)
-				pmap->pm_pdir[pdirindex] &= ~(PG_M|PG_RW);
-#ifdef PAE
-			if ((prot & VM_PROT_EXECUTE) == 0)
-				pmap->pm_pdir[pdirindex] |= pg_nx;
-#endif
-			anychanged = 1;
-			continue;
+			/*
+			 * Are we protecting the entire large page?  If not,
+			 * demote the mapping and fall through.
+			 */
+			if (sva + NBPDR == pdnxt && eva >= pdnxt) {
+				/*
+				 * The TLB entry for a PG_G mapping is
+				 * invalidated by pmap_protect_pde().
+				 */
+				if (pmap_protect_pde(pmap,
+				    &pmap->pm_pdir[pdirindex], sva, prot))
+					anychanged = 1;
+				continue;
+			} else if (!pmap_demote_pde(pmap,
+			    &pmap->pm_pdir[pdirindex], sva)) {
+				/* The large page mapping was destroyed. */
+				continue;
+			}
 		}
 
 		if (pdnxt > eva)
@@ -2246,7 +2817,7 @@
 					vm_page_flag_set(m, PG_REFERENCED);
 					pbits &= ~PG_A;
 				}
-				if ((pbits & PG_M) != 0) {
+				if ((pbits & (PG_M | PG_RW)) == (PG_M | PG_RW)) {
 					if (m == NULL)
 						m = PHYS_TO_VM_PAGE(pbits & PG_FRAME);
 					vm_page_dirty(m);
@@ -2284,6 +2855,127 @@
 }
 
 /*
+ * Tries to promote the 512 or 1024, contiguous 4KB page mappings that are
+ * within a single page table page to a single 2- or 4MB page mapping.  For
+ * promotion to occur, two conditions must be met: (1) the 4KB page mappings
+ * must map aligned, contiguous physical memory and (2) the 4KB page mappings

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Thu Mar 27 20:05:07 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0C1881065672; Thu, 27 Mar 2008 20:05: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 BE417106566C
	for ; Thu, 27 Mar 2008 20:05:06 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B11028FC14
	for ; Thu, 27 Mar 2008 20:05:06 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2RK564H050585
	for ; Thu, 27 Mar 2008 20:05:06 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2RK56n9050583
	for perforce@freebsd.org; Thu, 27 Mar 2008 20:05:06 GMT
	(envelope-from jb@freebsd.org)
Date: Thu, 27 Mar 2008 20:05:06 GMT
Message-Id: <200803272005.m2RK56n9050583@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138740 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 27 Mar 2008 20:05:07 -0000

http://perforce.freebsd.org/chv.cgi?CH=138740

Change 138740 by jb@jb_freebsd1 on 2008/03/27 20:04:44

	Turn off CTF conversion on the lib32 part of the build for now.
	There is a build tool issue with enabling this.

Affected files ...

.. //depot/projects/dtrace/src/Makefile.inc1#42 edit

Differences ...

==== //depot/projects/dtrace/src/Makefile.inc1#42 (text+ko) ====

@@ -285,7 +285,7 @@
 
 LIB32WMAKE=	${LIB32WMAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \
 		-DWITHOUT_BIND -DWITHOUT_MAN -DWITHOUT_NLS -DWITHOUT_INFO \
-		-DWITHOUT_HTML DESTDIR=${LIB32TMP}
+		-DWITHOUT_HTML -DNO_CTF DESTDIR=${LIB32TMP}
 LIB32IMAKE=	${LIB32WMAKE:NINSTALL=*:NDESTDIR=*} -DNO_INCS
 .endif
 

From owner-p4-projects@FreeBSD.ORG  Thu Mar 27 20:07:09 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 286CE1065681; Thu, 27 Mar 2008 20:07: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 DC4F2106568A
	for ; Thu, 27 Mar 2008 20:07:08 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id CDD778FC21
	for ; Thu, 27 Mar 2008 20:07:08 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2RK78rS050696
	for ; Thu, 27 Mar 2008 20:07:08 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2RK78xx050694
	for perforce@freebsd.org; Thu, 27 Mar 2008 20:07:08 GMT
	(envelope-from jb@freebsd.org)
Date: Thu, 27 Mar 2008 20:07:08 GMT
Message-Id: <200803272007.m2RK78xx050694@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138741 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 27 Mar 2008 20:07:09 -0000

http://perforce.freebsd.org/chv.cgi?CH=138741

Change 138741 by jb@jb_freebsd1 on 2008/03/27 20:06:15

	IFC

Affected files ...

.. //depot/projects/dtrace/ports/Mk/bsd.sites.mk#25 integrate
.. //depot/projects/dtrace/src/sys/amd64/conf/GENERIC#36 integrate
.. //depot/projects/dtrace/src/sys/arm/conf/AVILA#8 integrate
.. //depot/projects/dtrace/src/sys/arm/conf/BWCT#3 integrate
.. //depot/projects/dtrace/src/sys/arm/conf/CRB#3 integrate
.. //depot/projects/dtrace/src/sys/arm/conf/EP80219#6 integrate
.. //depot/projects/dtrace/src/sys/arm/conf/HL200#3 integrate
.. //depot/projects/dtrace/src/sys/arm/conf/IQ31244#8 integrate
.. //depot/projects/dtrace/src/sys/arm/conf/KB920X#10 integrate
.. //depot/projects/dtrace/src/sys/arm/conf/SIMICS#8 integrate
.. //depot/projects/dtrace/src/sys/arm/conf/SKYEYE#8 integrate
.. //depot/projects/dtrace/src/sys/i386/conf/GENERIC#33 integrate
.. //depot/projects/dtrace/src/sys/i386/conf/XBOX#6 integrate
.. //depot/projects/dtrace/src/sys/ia64/conf/GENERIC#14 integrate
.. //depot/projects/dtrace/src/sys/modules/Makefile#38 integrate
.. //depot/projects/dtrace/src/sys/modules/krpc/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/nfslockd/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/net/if.h#10 integrate
.. //depot/projects/dtrace/src/sys/nlm/nlm_prot_impl.c#2 integrate
.. //depot/projects/dtrace/src/sys/pc98/conf/GENERIC#16 integrate
.. //depot/projects/dtrace/src/sys/powerpc/conf/GENERIC#16 integrate
.. //depot/projects/dtrace/src/sys/rpc/rpc_generic.c#2 integrate
.. //depot/projects/dtrace/src/sys/sparc64/conf/GENERIC#19 integrate
.. //depot/projects/dtrace/src/sys/sun4v/conf/GENERIC#20 integrate
.. //depot/projects/dtrace/src/usr.sbin/rpc.lockd/lockd.c#9 integrate
.. //depot/projects/dtrace/src/usr.sbin/rpc.lockd/rpc.lockd.8#7 integrate
.. //depot/projects/dtrace/www/en/releases/6.3R/errata.html#5 integrate
.. //depot/projects/dtrace/www/share/sgml/news.xml#44 integrate

Differences ...

==== //depot/projects/dtrace/ports/Mk/bsd.sites.mk#25 (text+ko) ====

@@ -20,7 +20,7 @@
 #
 # Note: all entries should terminate with a slash.
 #
-# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.440 2008/03/13 11:21:27 edwin Exp $
+# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.441 2008/03/27 16:43:21 ehaupt Exp $
 #
 
 # Where to put distfiles that don't have any other master site
@@ -137,6 +137,13 @@
 	ftp://ftp.uu.net/usenet/comp.sources.%SUBDIR%/
 .endif
 
+.if !defined(IGNORE_MASTER_SITE_CRITICAL)
+MASTER_SITE_CRITICAL+=	\
+	http://critical.ch/distfiles/%SUBDIR%/ \
+	http://energy.critical.ch/distfiles/%SUBDIR%/ \
+	http://sauerkraut.critical.ch/distfiles/%SUBDIR%/
+.endif
+
 .if !defined(IGNORE_MASTER_SITE_CSME)
 MASTER_SITE_CSME+=	${MASTER_SITE_CENKES}
 .endif

==== //depot/projects/dtrace/src/sys/amd64/conf/GENERIC#36 (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.494 2008/03/05 14:13:29 rink Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.495 2008/03/27 11:54:17 dfr Exp $
 
 cpu		HAMMER
 ident		GENERIC
@@ -39,6 +39,7 @@
 options 	MD_ROOT			# MD is a potential root device
 options 	NFSCLIENT		# Network Filesystem Client
 options 	NFSSERVER		# Network Filesystem Server
+options 	NFSLOCKD		# Network Lock Manager
 options 	NFS_ROOT		# NFS usable as /, requires NFSCLIENT
 options 	NTFS			# NT File System
 options 	MSDOSFS			# MSDOS Filesystem

==== //depot/projects/dtrace/src/sys/arm/conf/AVILA#8 (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/arm/conf/AVILA,v 1.10 2008/03/20 17:44:58 sam Exp $
+# $FreeBSD: src/sys/arm/conf/AVILA,v 1.11 2008/03/27 11:54:17 dfr Exp $
 
 machine		arm
 ident		AVILA
@@ -57,6 +57,7 @@
 options 	UFS_DIRHASH		#Improve performance on big directories
 options 	NFSCLIENT		#Network Filesystem Client
 options 	NFSSERVER		#Network Filesystem Server
+options 	NFSLOCKD		#Network Lock Manager
 options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
 #options 	MSDOSFS			#MSDOS Filesystem
 options 	CD9660			#ISO 9660 Filesystem

==== //depot/projects/dtrace/src/sys/arm/conf/BWCT#3 (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/arm/conf/BWCT,v 1.3 2007/12/02 13:10:41 cognet Exp $
+# $FreeBSD: src/sys/arm/conf/BWCT,v 1.4 2008/03/27 11:54:17 dfr Exp $
 
 machine		arm
 ident		BWCT
@@ -48,6 +48,7 @@
 #options 	ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\"
 options 	NFSCLIENT		#Network Filesystem Client
 #options 	NFSSERVER		#Network Filesystem Server
+#options 	NFSLOCKD		#Network Lock Manager
 options		NFS_ROOT		#NFS usable as /, requires NFSCLIENT
 options		BOOTP_NFSROOT
 options	BOOTP

==== //depot/projects/dtrace/src/sys/arm/conf/CRB#3 (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/arm/conf/CRB,v 1.3 2007/12/02 13:10:41 cognet Exp $
+# $FreeBSD: src/sys/arm/conf/CRB,v 1.4 2008/03/27 11:54:17 dfr Exp $
 
 machine		arm
 ident		CRB
@@ -45,6 +45,7 @@
 options 	UFS_DIRHASH		#Improve performance on big directories
 options 	NFSCLIENT		#Network Filesystem Client
 options 	NFSSERVER		#Network Filesystem Server
+options 	NFSLOCKD		#Network Lock Manager
 options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
 #options 	MSDOSFS			#MSDOS Filesystem
 options 	CD9660			#ISO 9660 Filesystem

==== //depot/projects/dtrace/src/sys/arm/conf/EP80219#6 (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/arm/conf/EP80219,v 1.6 2007/12/02 13:10:41 cognet Exp $
+# $FreeBSD: src/sys/arm/conf/EP80219,v 1.7 2008/03/27 11:54:17 dfr Exp $
 
 machine	arm
 ident		EP80219
@@ -44,6 +44,7 @@
 options 	UFS_DIRHASH		#Improve performance on big directories
 options 	NFSCLIENT		#Network Filesystem Client
 options 	NFSSERVER		#Network Filesystem Server
+options 	NFSLOCKD		#Network Lock Manager
 options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
 #options 	MSDOSFS			#MSDOS Filesystem
 options 	CD9660			#ISO 9660 Filesystem

==== //depot/projects/dtrace/src/sys/arm/conf/HL200#3 (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/arm/conf/HL200,v 1.2 2007/12/02 13:10:41 cognet Exp $
+# $FreeBSD: src/sys/arm/conf/HL200,v 1.3 2008/03/27 11:54:18 dfr Exp $
 
 machine		arm
 ident		HL200
@@ -51,6 +51,7 @@
 #options 	ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\"
 options 	NFSCLIENT		#Network Filesystem Client
 #options 	NFSSERVER		#Network Filesystem Server
+#options 	NFSLOCKD		#Network Lock Manager
 options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
 options	BOOTP_NFSROOT
 options	BOOTP

==== //depot/projects/dtrace/src/sys/arm/conf/IQ31244#8 (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/arm/conf/IQ31244,v 1.20 2007/12/02 13:10:41 cognet Exp $
+# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.21 2008/03/27 11:54:18 dfr Exp $
 
 machine		arm
 ident		IQ31244
@@ -45,6 +45,7 @@
 options 	UFS_DIRHASH		#Improve performance on big directories
 options 	NFSCLIENT		#Network Filesystem Client
 options 	NFSSERVER		#Network Filesystem Server
+options 	NFSLOCKD		#Network Lock Manager
 options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
 #options 	MSDOSFS			#MSDOS Filesystem
 options 	CD9660			#ISO 9660 Filesystem

==== //depot/projects/dtrace/src/sys/arm/conf/KB920X#10 (text) ====

@@ -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/arm/conf/KB920X,v 1.14 2007/12/02 13:10:41 cognet Exp $
+# $FreeBSD: src/sys/arm/conf/KB920X,v 1.15 2008/03/27 11:54:18 dfr Exp $
 
 machine		arm
 ident		KB920X
@@ -42,6 +42,7 @@
 options 	ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\"
 options 	NFSCLIENT		#Network Filesystem Client
 #options 	NFSSERVER		#Network Filesystem Server
+#options 	NFSLOCKD		#Network Lock Manager
 #options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
 #options	BOOTP_NFSROOT
 #options	BOOTP

==== //depot/projects/dtrace/src/sys/arm/conf/SIMICS#8 (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/arm/conf/SIMICS,v 1.14 2007/12/02 13:10:42 cognet Exp $
+# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.15 2008/03/27 11:54:18 dfr Exp $
 
 machine		arm
 ident		SIMICS
@@ -43,6 +43,7 @@
 options		ROOTDEVNAME=\"ufs:md0\"
 options 	NFSCLIENT		#Network Filesystem Client
 options 	NFSSERVER		#Network Filesystem Server
+options 	NFSLOCKD		#Network Lock Manager
 options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
 #options 	MSDOSFS			#MSDOS Filesystem
 options 	CD9660			#ISO 9660 Filesystem

==== //depot/projects/dtrace/src/sys/arm/conf/SKYEYE#8 (text) ====

@@ -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/arm/conf/SKYEYE,v 1.8 2007/12/02 13:10:42 cognet Exp $
+# $FreeBSD: src/sys/arm/conf/SKYEYE,v 1.9 2008/03/27 11:54:18 dfr Exp $
 
 machine		arm
 ident		KB920X
@@ -46,6 +46,7 @@
 options		ROOTDEVNAME=\"ufs:md0\"
 options 	NFSCLIENT		#Network Filesystem Client
 options 	NFSSERVER		#Network Filesystem Server
+options 	NFSLOCKD		#Network Lock Manager
 options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
 #options 	MSDOSFS			#MSDOS Filesystem
 options 	CD9660			#ISO 9660 Filesystem

==== //depot/projects/dtrace/src/sys/i386/conf/GENERIC#33 (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/i386/conf/GENERIC,v 1.482 2008/03/05 14:13:30 rink Exp $
+# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.483 2008/03/27 11:54:18 dfr Exp $
 
 cpu		I486_CPU
 cpu		I586_CPU
@@ -41,6 +41,7 @@
 options 	MD_ROOT			# MD is a potential root device
 options 	NFSCLIENT		# Network Filesystem Client
 options 	NFSSERVER		# Network Filesystem Server
+options 	NFSLOCKD		# Network Lock Manager
 options 	NFS_ROOT		# NFS usable as /, requires NFSCLIENT
 options 	MSDOSFS			# MSDOS Filesystem
 options 	CD9660			# ISO 9660 Filesystem

==== //depot/projects/dtrace/src/sys/i386/conf/XBOX#6 (text+ko) ====

@@ -1,7 +1,7 @@
 #
 # XBOX -- kernel for an XBOX
 #
-# $FreeBSD: src/sys/i386/conf/XBOX,v 1.8 2007/11/28 05:50:44 attilio Exp $
+# $FreeBSD: src/sys/i386/conf/XBOX,v 1.9 2008/03/27 11:54:18 dfr Exp $
 cpu		I686_CPU		# Celeron
 ident		XBOX
 
@@ -29,6 +29,7 @@
 #options 	MD_ROOT			# MD is a potential root device
 options 	NFSCLIENT		# Network Filesystem Client
 #options 	NFSSERVER		# Network Filesystem Server
+#options 	NFSLOCKD		# Network Lock Manager
 #options 	NFS_ROOT		# NFS usable as /, requires NFSCLIENT
 #options 	MSDOSFS			# MSDOS Filesystem
 options 	CD9660			# ISO 9660 Filesystem

==== //depot/projects/dtrace/src/sys/ia64/conf/GENERIC#14 (text+ko) ====

@@ -18,7 +18,7 @@
 #
 # For hardware specific information check HARDWARE.TXT
 #
-# $FreeBSD: src/sys/ia64/conf/GENERIC,v 1.95 2008/02/16 18:30:58 marcel Exp $
+# $FreeBSD: src/sys/ia64/conf/GENERIC,v 1.96 2008/03/27 11:54:18 dfr Exp $
 
 cpu		ITANIUM
 ident		GENERIC
@@ -44,6 +44,7 @@
 options 	MSDOSFS		# MSDOS Filesystem
 options 	NFSCLIENT	# Network Filesystem Client
 options 	NFSSERVER	# Network Filesystem Server
+options 	NFSLOCKD	# Network Lock Manager
 options 	NFS_ROOT	# NFS usable as root device
 options 	PROCFS		# Process filesystem (/proc)
 options 	PSEUDOFS	# Pseudo-filesystem framework

==== //depot/projects/dtrace/src/sys/modules/Makefile#38 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/modules/Makefile,v 1.558 2008/03/06 08:09:45 rink Exp $
+# $FreeBSD: src/sys/modules/Makefile,v 1.559 2008/03/27 11:54:18 dfr Exp $
 
 .include 
 
@@ -144,6 +144,7 @@
 	${_ixgb} \
 	joy \
 	kbdmux \
+	krpc \
 	kue \
 	le \
 	lge \
@@ -188,6 +189,7 @@
 	netgraph \
 	${_nfe} \
 	nfsclient \
+	nfslockd \
 	nfsserver \
 	nge \
 	nmdm \

==== //depot/projects/dtrace/src/sys/net/if.h#10 (text+ko) ====

@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/net/if.h,v 1.112 2007/12/15 22:06:23 kmacy Exp $
+ * $FreeBSD: src/sys/net/if.h,v 1.113 2008/03/27 18:02:30 iedowse Exp $
  */
 
 #ifndef _NET_IF_H_
@@ -163,7 +163,8 @@
 /* flags set internally only: */
 #define	IFF_CANTCHANGE \
 	(IFF_BROADCAST|IFF_POINTOPOINT|IFF_DRV_RUNNING|IFF_DRV_OACTIVE|\
-	    IFF_SIMPLEX|IFF_MULTICAST|IFF_ALLMULTI|IFF_SMART|IFF_PROMISC)
+	    IFF_SIMPLEX|IFF_MULTICAST|IFF_ALLMULTI|IFF_SMART|IFF_PROMISC|\
+	    IFF_NEEDSGIANT)
 
 /*
  * Values for if_link_state.

==== //depot/projects/dtrace/src/sys/nlm/nlm_prot_impl.c#2 (text+ko) ====

@@ -28,7 +28,7 @@
 #include "opt_inet6.h"
 
 #include 
-__FBSDID("$FreeBSD: src/sys/nlm/nlm_prot_impl.c,v 1.1 2008/03/26 15:23:10 dfr Exp $");
+__FBSDID("$FreeBSD: src/sys/nlm/nlm_prot_impl.c,v 1.2 2008/03/27 11:54:19 dfr Exp $");
 
 #include 
 #include 
@@ -1781,3 +1781,23 @@
 
 	return (nlm_lockd);
 }
+
+/*
+ * Kernel module glue
+ */
+static int
+nfslockd_modevent(module_t mod, int type, void *data)
+{
+
+	return (0);
+}
+static moduledata_t nfslockd_mod = {
+	"nfslockd",
+	nfslockd_modevent,
+	NULL,
+};
+DECLARE_MODULE(nfslockd, nfslockd_mod, SI_SUB_VFS, SI_ORDER_ANY);
+
+/* So that loader and kldload(2) can find us, wherever we are.. */
+MODULE_DEPEND(nfslockd, krpc, 1, 1, 1);
+MODULE_VERSION(nfslockd, 1);

==== //depot/projects/dtrace/src/sys/pc98/conf/GENERIC#16 (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/pc98/conf/GENERIC,v 1.301 2008/03/10 12:25:04 nyan Exp $
+# $FreeBSD: src/sys/pc98/conf/GENERIC,v 1.302 2008/03/27 11:54:19 dfr Exp $
 
 cpu		I486_CPU
 cpu		I586_CPU
@@ -41,6 +41,7 @@
 options 	MD_ROOT			# MD is a potential root device
 options 	NFSCLIENT		# Network Filesystem Client
 options 	NFSSERVER		# Network Filesystem Server
+options 	NFSLOCKD		# Network Lock Manager
 options 	NFS_ROOT		# NFS usable as /, requires NFSCLIENT
 options 	MSDOSFS			# MSDOS Filesystem
 options 	CD9660			# ISO 9660 Filesystem

==== //depot/projects/dtrace/src/sys/powerpc/conf/GENERIC#16 (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/powerpc/conf/GENERIC,v 1.76 2008/02/16 17:59:27 marcel Exp $
+# $FreeBSD: src/sys/powerpc/conf/GENERIC,v 1.77 2008/03/27 11:54:19 dfr Exp $
 
 cpu		AIM
 ident		GENERIC
@@ -42,6 +42,7 @@
 options 	MD_ROOT			#MD is a potential root device
 options 	NFSCLIENT		#Network Filesystem Client
 options 	NFSSERVER		#Network Filesystem Server
+options 	NFSLOCKD		#Network Lock Manager
 options 	NFS_ROOT		#NFS usable as root device
 options 	MSDOSFS			#MSDOS Filesystem
 options 	CD9660			#ISO 9660 Filesystem

==== //depot/projects/dtrace/src/sys/rpc/rpc_generic.c#2 (text+ko) ====

@@ -34,7 +34,7 @@
 
 /* #pragma ident	"@(#)rpc_generic.c	1.17	94/04/24 SMI" */
 #include 
-__FBSDID("$FreeBSD: src/sys/rpc/rpc_generic.c,v 1.1 2008/03/26 15:23:10 dfr Exp $");
+__FBSDID("$FreeBSD: src/sys/rpc/rpc_generic.c,v 1.2 2008/03/27 11:54:19 dfr Exp $");
 
 /*
  * rpc_generic.c, Miscl routines for RPC.
@@ -44,7 +44,9 @@
 #include "opt_inet6.h"
 
 #include 
+#include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -714,3 +716,22 @@
 
 	return bound;
 }
+
+/*
+ * Kernel module glue
+ */
+static int
+krpc_modevent(module_t mod, int type, void *data)
+{
+
+	return (0);
+}
+static moduledata_t krpc_mod = {
+	"krpc",
+	krpc_modevent,
+	NULL,
+};
+DECLARE_MODULE(krpc, krpc_mod, SI_SUB_VFS, SI_ORDER_ANY);
+
+/* So that loader and kldload(2) can find us, wherever we are.. */
+MODULE_VERSION(krpc, 1);

==== //depot/projects/dtrace/src/sys/sparc64/conf/GENERIC#19 (text+ko) ====

@@ -18,7 +18,7 @@
 #
 # For hardware specific information check HARDWARE.TXT
 #
-# $FreeBSD: src/sys/sparc64/conf/GENERIC,v 1.132 2008/03/11 05:09:03 yongari Exp $
+# $FreeBSD: src/sys/sparc64/conf/GENERIC,v 1.133 2008/03/27 11:54:19 dfr Exp $
 
 cpu		SUN4U
 ident		GENERIC
@@ -44,6 +44,7 @@
 options 	MD_ROOT			# MD is a potential root device
 options 	NFSCLIENT		# Network Filesystem Client
 options 	NFSSERVER		# Network Filesystem Server
+options 	NFSLOCKD		# Network Lock Manager
 options 	NFS_ROOT		# NFS usable as /, requires NFSCLIENT
 #options 	MSDOSFS			# MSDOS Filesystem
 options 	CD9660			# ISO 9660 Filesystem

==== //depot/projects/dtrace/src/sys/sun4v/conf/GENERIC#20 (text+ko) ====

@@ -18,7 +18,7 @@
 #
 # For hardware specific information check HARDWARE.TXT
 #
-# $FreeBSD: src/sys/sun4v/conf/GENERIC,v 1.16 2007/12/02 20:40:35 rwatson Exp $
+# $FreeBSD: src/sys/sun4v/conf/GENERIC,v 1.17 2008/03/27 11:54:19 dfr Exp $
 
 cpu		SUN4V
 ident		GENERIC
@@ -42,6 +42,7 @@
 options 	MD_ROOT			# MD is a potential root device
 options 	NFSCLIENT		# Network Filesystem Client
 options 	NFSSERVER		# Network Filesystem Server
+options 	NFSLOCKD		# Network Lock Manager
 options 	NFS_ROOT		# NFS usable as /, requires NFSCLIENT
 #options 	MSDOSFS			# MSDOS Filesystem
 options		NULLFS

==== //depot/projects/dtrace/src/usr.sbin/rpc.lockd/lockd.c#9 (text+ko) ====

@@ -1,5 +1,5 @@
 /*	$NetBSD: lockd.c,v 1.7 2000/08/12 18:08:44 thorpej Exp $	*/
-/*	$FreeBSD: src/usr.sbin/rpc.lockd/lockd.c,v 1.23 2008/03/26 15:23:12 dfr Exp $ */
+/*	$FreeBSD: src/usr.sbin/rpc.lockd/lockd.c,v 1.25 2008/03/27 15:11:02 dfr Exp $ */
 
 /*
  * Copyright (c) 1995
@@ -46,7 +46,9 @@
  * The actual program logic is in the file lock_proc.c
  */
 
-#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 
@@ -116,7 +118,7 @@
 	int maxrec = RPC_MAXDATASIZE;
 	in_port_t svcport = 0;
 
-	while ((ch = getopt(argc, argv, "d:g:h:kp:")) != (-1)) {
+	while ((ch = getopt(argc, argv, "d:g:h:p:")) != (-1)) {
 		switch (ch) {
 		case 'd':
 			debug_level = atoi(optarg);
@@ -153,9 +155,6 @@
 				out_of_mem();
 			}
 			break;
-		case 'k':
-			kernel_lockd = TRUE;
-			break;
 		case 'p':
 			endptr = NULL;
 			svcport = (in_port_t)strtoul(optarg, &endptr, 10);
@@ -175,6 +174,16 @@
 		exit(1);
         }
 
+	kernel_lockd = FALSE;
+	if (modfind("nfslockd") < 0) {
+		if (kldload("nfslockd") < 0) {
+			fprintf(stderr, "Can't find or load kernel support for rpc.lockd - using non-kernel implementation\n");
+		}
+		kernel_lockd = TRUE;
+	} else {
+		kernel_lockd = TRUE;
+	}
+
 	(void)rpcb_unset(NLM_PROG, NLM_SM, NULL);
 	(void)rpcb_unset(NLM_PROG, NLM_VERS, NULL);
 	(void)rpcb_unset(NLM_PROG, NLM_VERSX, NULL);
@@ -743,7 +752,7 @@
 void
 usage()
 {
-	errx(1, "usage: rpc.lockd [-k] [-d ]"
+	errx(1, "usage: rpc.lockd [-d ]"
 	    " [-g ] [-h ] [-p ]");
 }
 

==== //depot/projects/dtrace/src/usr.sbin/rpc.lockd/rpc.lockd.8#7 (text+ko) ====

@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/usr.sbin/rpc.lockd/rpc.lockd.8,v 1.19 2008/03/26 15:23:12 dfr Exp $
+.\" $FreeBSD: src/usr.sbin/rpc.lockd/rpc.lockd.8,v 1.20 2008/03/27 11:54:20 dfr Exp $
 .\"
 .Dd November 2, 2007
 .Dt RPC.LOCKD 8
@@ -41,7 +41,6 @@
 .Nd NFS file locking daemon
 .Sh SYNOPSIS
 .Nm
-.Op Fl k
 .Op Fl d Ar debug_level
 .Op Fl g Ar grace period
 .Op Fl h Ar bindip
@@ -59,11 +58,6 @@
 Options and operands available for
 .Nm :
 .Bl -tag -width indent
-.It Fl k
-The
-.Fl k
-option specifies the use of the kernel-resident NFS lock manager, if
-possible.
 .It Fl d
 The
 .Fl d

==== //depot/projects/dtrace/www/en/releases/6.3R/errata.html#5 (text+ko) ====

@@ -20,7 +20,7 @@
 2008 The FreeBSD Documentation Project

 
 
$FreeBSD: src/release/doc/en_US.ISO8859-1/errata/article.sgml,v
-1.73.2.55 2008/03/07 16:42:16 bmah Exp $

+1.73.2.56 2008/03/27 04:55:06 bmah Exp $

 

 
 

@@ -95,7 +95,7 @@
 
[20080204] Contrary to the release notes, ipfwpcap(8) is not a feature included in FreeBSD 6.3-RELEASE. It was merged
 to the 6-STABLE codeline after the release branch was created. This utility will be
-incldued subsequent snapshots of 6-STABLE and in 6.4-RELEASE.

+included in subsequent snapshots of 6-STABLE and in 6.4-RELEASE.

 
 
[20080229] The release notes gave an incorrect version number for KDE. The correct
 version number is 3.5.8.


==== //depot/projects/dtrace/www/share/sgml/news.xml#44 (text+ko) ====

@@ -20,7 +20,7 @@
 
   
     
-      $FreeBSD: www/share/sgml/news.xml,v 1.156 2008/03/17 21:21:49 murray Exp $
+      $FreeBSD: www/share/sgml/news.xml,v 1.157 2008/03/27 05:02:39 murray Exp $
     
   
 
@@ -31,6 +31,24 @@
       3
 
       
+	26
+	
+	  Now Accepting Student Applications for Google Summer of Code
+
+          
The student application period for the Google Summer of
+	    Code 2008 program has begun.  Please peruse our list
+	    of FreeBSD specific projects and
+	    potential mentors and prepare your application before
+	    the March 31 deadline.  Earlier applications are
+	    encouraged as this provides an opportunity for potential
+	    mentors to work on improving the applications with
+	    students before the deadline.

+        
+      
+
+      
 	17
 	
 	  Participating in Google Summer of Code

From owner-p4-projects@FreeBSD.ORG  Thu Mar 27 20:40:44 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B5EE31065679; Thu, 27 Mar 2008 20:40: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 7356E1065675
	for ; Thu, 27 Mar 2008 20:40:44 +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 651BF8FC17
	for ; Thu, 27 Mar 2008 20:40:44 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2RKeinj059306
	for ; Thu, 27 Mar 2008 20:40:44 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2RKeiTe059304
	for perforce@freebsd.org; Thu, 27 Mar 2008 20:40:44 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Thu, 27 Mar 2008 20:40:44 GMT
Message-Id: <200803272040.m2RKeiTe059304@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 138744 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 27 Mar 2008 20:40:45 -0000

http://perforce.freebsd.org/chv.cgi?CH=138744

Change 138744 by gonzo@gonzo_jeeves on 2008/03/27 20:40:11

	o Redefine atomic_cmpset_acq_long/atomic_cmpset_rel_long
	    for mips32 using type casts.

Affected files ...

.. //depot/projects/mips2-jnpr/src/sys/mips/include/atomic.h#7 edit

Differences ...

==== //depot/projects/mips2-jnpr/src/sys/mips/include/atomic.h#7 (text+ko) ====

@@ -405,8 +405,12 @@
 #define	atomic_subtract_acq_long	atomic_subtract_acq_32
 #define	atomic_subtract_rel_long	atomic_subtract_rel_32
 #define	atomic_cmpset_long	atomic_cmpset_32
-#define	atomic_cmpset_acq_long	atomic_cmpset_acq_32
-#define	atomic_cmpset_rel_long	atomic_cmpset_rel_32
+#define	atomic_cmpset_acq_long(p, cmpval, newval) \
+	atomic_cmpset_acq_32((volatile u_int *)(p), \
+	    (u_int)(cmpval), (u_int)(newval))
+#define	atomic_cmpset_rel_long(p, cmpval, newval) \
+	atomic_cmpset_rel_32((volatile u_int *)(p), \
+	    (u_int)(cmpval), (u_int)(newval))
 #define	atomic_load_acq_long	atomic_load_acq_32
 #define	atomic_store_rel_long	atomic_store_rel_32
 #define	atomic_fetchadd_long(p, v) \

From owner-p4-projects@FreeBSD.ORG  Thu Mar 27 20:40:45 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 19F271065719; Thu, 27 Mar 2008 20:40: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 992801065677
	for ; Thu, 27 Mar 2008 20:40:44 +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 8AAC38FC18
	for ; Thu, 27 Mar 2008 20:40:44 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2RKeixZ059311
	for ; Thu, 27 Mar 2008 20:40:44 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2RKei3l059309
	for perforce@freebsd.org; Thu, 27 Mar 2008 20:40:44 GMT
	(envelope-from sam@freebsd.org)
Date: Thu, 27 Mar 2008 20:40:44 GMT
Message-Id: <200803272040.m2RKei3l059309@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 138745 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 27 Mar 2008 20:40:45 -0000

http://perforce.freebsd.org/chv.cgi?CH=138745

Change 138745 by sam@sam_ebb on 2008/03/27 20:40:23

	correct reporting of transmit rate

Affected files ...

.. //depot/projects/vap/tools/tools/net80211/wlanstats/wlanstats.c#6 edit

Differences ...

==== //depot/projects/vap/tools/tools/net80211/wlanstats/wlanstats.c#6 (text+ko) ====

@@ -491,12 +491,10 @@
 wlan_getinfo(struct wlanstatfoo_p *wf, int s, char b[], size_t bs)
 {
 	const struct ieee80211req_sta_info *si = &wf->u_info.info.info[0];
-	uint8_t r;
 
 	switch (s) {
 	case S_RATE:
-		r = si->isi_rates[si->isi_txrate];
-		snprintf(b, bs, "%uM", (r &~ 0x80) / 2);
+		snprintf(b, bs, "%uM", si->isi_txmbps/2);
 		return 1;
 	case S_RSSI:
 		snprintf(b, bs, "%d", si->isi_rssi);

From owner-p4-projects@FreeBSD.ORG  Thu Mar 27 20:47:53 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CEA0A1065689; Thu, 27 Mar 2008 20:47:52 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8CBBB1065671
	for ; Thu, 27 Mar 2008 20:47:52 +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 7E74E8FC20
	for ; Thu, 27 Mar 2008 20:47:52 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2RKlqFM068604
	for ; Thu, 27 Mar 2008 20:47:52 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2RKlqGL068602
	for perforce@freebsd.org; Thu, 27 Mar 2008 20:47:52 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Thu, 27 Mar 2008 20:47:52 GMT
Message-Id: <200803272047.m2RKlqGL068602@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 138747 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 27 Mar 2008 20:47:54 -0000

http://perforce.freebsd.org/chv.cgi?CH=138747

Change 138747 by gonzo@gonzo_jeeves on 2008/03/27 20:47:06

	o Redefine mips_tcb_set to be "no operation", not NULL 
	    in order to stop gcc complaining about meaningless 
	    operation.

Affected files ...

.. //depot/projects/mips2-jnpr/src/sys/mips/include/sysarch.h#5 edit

Differences ...

==== //depot/projects/mips2-jnpr/src/sys/mips/include/sysarch.h#5 (text+ko) ====

@@ -41,7 +41,7 @@
 #if 0
 /* Something useful for each MIPS platform. */
 #else
-#define	mips_tcb_set(tcb)	NULL
+#define	mips_tcb_set(tcb)	do {} while (0)
 #define	mips_tcb_get()		NULL
 #endif /* _MIPS_ARCH_XLR */
 

From owner-p4-projects@FreeBSD.ORG  Thu Mar 27 20:49:55 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 34A4C1065673; Thu, 27 Mar 2008 20:49: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 E86C51065670
	for ; Thu, 27 Mar 2008 20:49:54 +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 DA31E8FC13
	for ; Thu, 27 Mar 2008 20:49:54 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2RKnsOn068658
	for ; Thu, 27 Mar 2008 20:49:54 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2RKnsiU068656
	for perforce@freebsd.org; Thu, 27 Mar 2008 20:49:54 GMT
	(envelope-from sam@freebsd.org)
Date: Thu, 27 Mar 2008 20:49:54 GMT
Message-Id: <200803272049.m2RKnsiU068656@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 138748 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 27 Mar 2008 20:49:56 -0000

http://perforce.freebsd.org/chv.cgi?CH=138748

Change 138748 by sam@sam_ebb on 2008/03/27 20:49:38

	interpret WI_INFO_LINK_STAT_DISCONNECTED in RUN state to mean the
	ap dropped us--clock the state machine as we would if we actually
	received the DEAUTH frame

Affected files ...

.. //depot/projects/vap/sys/dev/wi/if_wi.c#16 edit

Differences ...

==== //depot/projects/vap/sys/dev/wi/if_wi.c#16 (text+ko) ====

@@ -1471,7 +1471,13 @@
 			IEEE80211_UNLOCK(ic);
 			break;
 		case WI_INFO_LINK_STAT_AP_INR:
+			break;
 		case WI_INFO_LINK_STAT_DISCONNECTED:
+			/* we dropped off the net; e.g. due to deauth/disassoc */
+			if (vap->iv_state == IEEE80211_S_RUN) {
+				vap->iv_stats.is_rx_deauth++;
+				ieee80211_new_state(vap, IEEE80211_S_SCAN, 0);
+			}
 			break;
 		case WI_INFO_LINK_STAT_AP_OOR:
 			ieee80211_beacon_miss(ic);

From owner-p4-projects@FreeBSD.ORG  Thu Mar 27 20:52:59 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D15AC1065672; Thu, 27 Mar 2008 20:52: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 8DAC1106566B
	for ; Thu, 27 Mar 2008 20:52:58 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 7D0ED8FC1A
	for ; Thu, 27 Mar 2008 20:52:58 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2RKqwgm068781
	for ; Thu, 27 Mar 2008 20:52:58 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2RKqwx6068779
	for perforce@freebsd.org; Thu, 27 Mar 2008 20:52:58 GMT
	(envelope-from jb@freebsd.org)
Date: Thu, 27 Mar 2008 20:52:58 GMT
Message-Id: <200803272052.m2RKqwx6068779@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138749 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 27 Mar 2008 20:53:00 -0000

http://perforce.freebsd.org/chv.cgi?CH=138749

Change 138749 by jb@jb_freebsd1 on 2008/03/27 20:52:40

	IFC

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/kern/opensolaris_kstat.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/kern/opensolaris_string.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/machine/endian.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/rpc/xdr.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/acl.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/atomic.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/bitmap.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/byteorder.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/callb.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/cmn_err.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/cpupart.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/cpuvar.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/cred.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/cyclic.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/debug.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/dirent.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/dkio.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/dnlc.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/elf.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/kcondvar.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/kmem.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/kobj.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/kstat.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/lock.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/misc.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/mman.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/mntent.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/mnttab.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/modctl.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/mount.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/mutex.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/objfs.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/param.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/pcpu.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/policy.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/proc.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/random.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/rwlock.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/sdt.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/stat.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/string.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/sunddi.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/sysmacros.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/systm.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/taskq.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/taskq_impl.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/time.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/types.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/uio.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/varargs.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/vfs.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/vnode.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/zone.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/common/atomic/ia64/atomic.S#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/common/avl/avl.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/Makefile.files#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/gzip.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/unique.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/os/callb.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/os/list.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/os/taskq.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_mem.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/asm_linkage.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/avl_impl.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/bitmap.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/byteorder.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/callb.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/ccompile.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/compress.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/cred.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/dkio.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/dklabel.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/errorq.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/feature_tests.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/protocol.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/util.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/gfs.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/list.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/list_impl.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/note.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair_impl.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/processor.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/procset.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/sdt.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/synch.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/vmem.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/zmod.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/zmod/adler32.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/zmod/deflate.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/zmod/deflate.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inffast.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inffast.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inffixed.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inflate.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inflate.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inftrees.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inftrees.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/zmod/trees.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zconf.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zlib.h#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod_subr.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zutil.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zutil.h#1 branch
.. //depot/projects/dtrace/src/sys/netgraph/ng_car.c#3 integrate

Differences ...

==== //depot/projects/dtrace/src/sys/netgraph/ng_car.c#3 (text+ko) ====

@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/netgraph/ng_car.c,v 1.5 2007/12/19 22:50:14 mav Exp $
+ * $FreeBSD: src/sys/netgraph/ng_car.c,v 1.6 2008/03/27 20:04:20 mav Exp $
  */
 
 /*
@@ -58,7 +58,7 @@
 
 	int64_t 	tc;		/* commited token bucket counter */
 	int64_t 	te;		/* exceeded/peak token bucket counter */
-	struct timeval	lastRefill;	/* last token refill time */
+	struct bintime	lastRefill;	/* last token refill time */
 
 	struct ng_car_hookconf conf;	/* hook configuration */
 	struct ng_car_hookstats stats;	/* hook stats */
@@ -206,7 +206,7 @@
 	priv->upper.conf.yellow_action = NG_CAR_ACTION_FORWARD;
 	priv->upper.conf.red_action = NG_CAR_ACTION_DROP;
 	priv->upper.conf.mode = 0;
-	getmicrotime(&priv->upper.lastRefill);
+	getbinuptime(&priv->upper.lastRefill);
 	priv->upper.q_first = 0;
 	priv->upper.q_last = 0;
 	ng_callout_init(&priv->upper.q_callout);
@@ -592,57 +592,58 @@
 static void
 ng_car_refillhook(struct hookinfo *h)
 {
-	struct timeval newt, deltat;
-	int64_t deltat_us;
-	int64_t	delta;
+	struct bintime newt, deltat;
+	unsigned int deltat_us;
 
 	/* Get current time. */
-	getmicrotime(&newt);
+	getbinuptime(&newt);
+
+	/* Get time delta since last refill. */
+	deltat = newt;
+	bintime_sub(&deltat, &h->lastRefill);
 
 	/* Time must go forward. */
-	if (timevalcmp(&newt, &h->lastRefill, <= )) {
+	if (deltat.sec < 0) {
 	    h->lastRefill = newt;
 	    return;
 	}
 
-	/* Get time delta since last refill. */
-	deltat = newt;
-	timevalsub(&deltat, &h->lastRefill);
-
-	/* Sanity check */
-	if (deltat.tv_sec > 1000) {
-	    deltat_us = 1000000000;
+	/* But not too far forward. */
+	if (deltat.sec >= 1000) {
+	    deltat_us = (1000 << 20);
 	} else {
-	    deltat_us = ((int64_t)deltat.tv_sec) * 1000000 + deltat.tv_usec;
+	    /* convert bintime to the 1/(2^20) of sec */
+	    deltat_us = (deltat.sec << 20) + (deltat.frac >> 44);
 	}
 
 	if (h->conf.mode == NG_CAR_SINGLE_RATE) {
+		int64_t	delta;
 		/* Refill commited token bucket. */
-		h->tc += h->conf.cir * deltat_us / 8000000;
+		h->tc += (h->conf.cir * deltat_us) >> 23;
 		delta = h->tc - h->conf.cbs;
 		if (delta > 0) {
 			h->tc = h->conf.cbs;
 
 			/* Refill exceeded token bucket. */
 			h->te += delta;
-			if (h->te > h->conf.ebs)
+			if (h->te > ((int64_t)h->conf.ebs))
 				h->te = h->conf.ebs;
 		}
 
 	} else if (h->conf.mode == NG_CAR_DOUBLE_RATE) {
 		/* Refill commited token bucket. */
-		h->tc += h->conf.cir * deltat_us / 8000000;
-		if (h->tc > h->conf.cbs)
+		h->tc += (h->conf.cir * deltat_us) >> 23;
+		if (h->tc > ((int64_t)h->conf.cbs))
 			h->tc = h->conf.cbs;
 
 		/* Refill peak token bucket. */
-		h->te += h->conf.pir * deltat_us / 8000000;
-		if (h->te > h->conf.ebs)
+		h->te += (h->conf.pir * deltat_us) >> 23;
+		if (h->te > ((int64_t)h->conf.ebs))
 			h->te = h->conf.ebs;
 
 	} else { /* RED or SHAPE mode. */
 		/* Refill commited token bucket. */
-		h->tc += h->conf.cir * deltat_us / 8000000;
+		h->tc += (h->conf.cir * deltat_us) >> 23;
 		if (h->tc > ((int64_t)h->conf.cbs))
 			h->tc = h->conf.cbs;
 	}

From owner-p4-projects@FreeBSD.ORG  Thu Mar 27 21:15:22 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5AFEA1065673; Thu, 27 Mar 2008 21:15:22 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1AFEE106566C
	for ; Thu, 27 Mar 2008 21:15:22 +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 E61FA8FC18
	for ; Thu, 27 Mar 2008 21:15:21 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2RLFLLX070930
	for ; Thu, 27 Mar 2008 21:15:21 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2RLFLnd070928
	for perforce@freebsd.org; Thu, 27 Mar 2008 21:15:21 GMT
	(envelope-from sam@freebsd.org)
Date: Thu, 27 Mar 2008 21:15:21 GMT
Message-Id: <200803272115.m2RLFLnd070928@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 138751 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 27 Mar 2008 21:15:22 -0000

http://perforce.freebsd.org/chv.cgi?CH=138751

Change 138751 by sam@sam_ebb on 2008/03/27 21:15:14

	clear potentially dangling ptr on vap detach

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_scan.c#18 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_scan.c#18 (text+ko) ====

@@ -190,6 +190,7 @@
 			ss->ss_ops->scan_detach(ss);
 			ss->ss_ops = NULL;
 		}
+		ss->ss_vap = NULL;
 	}
 	IEEE80211_UNLOCK(ic);
 }

From owner-p4-projects@FreeBSD.ORG  Thu Mar 27 22:03:13 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C59101065674; Thu, 27 Mar 2008 22:03: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 859A5106564A
	for ; Thu, 27 Mar 2008 22:03:12 +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 5B7388FC1C
	for ; Thu, 27 Mar 2008 22:03:12 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2RM3CxY078569
	for ; Thu, 27 Mar 2008 22:03:12 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2RM3C5Y078567
	for perforce@freebsd.org; Thu, 27 Mar 2008 22:03:12 GMT
	(envelope-from sam@freebsd.org)
Date: Thu, 27 Mar 2008 22:03:12 GMT
Message-Id: <200803272203.m2RM3C5Y078567@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 138753 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 27 Mar 2008 22:03:13 -0000

http://perforce.freebsd.org/chv.cgi?CH=138753

Change 138753 by sam@sam_ebb on 2008/03/27 22:02:35

	honor explicit promisc request on parent device

Affected files ...

.. //depot/projects/vap/sys/dev/ath/if_ath.c#49 edit

Differences ...

==== //depot/projects/vap/sys/dev/ath/if_ath.c#49 (text+ko) ====

@@ -2492,6 +2492,8 @@
 	if (ic->ic_opmode != IEEE80211_M_HOSTAP &&
 	    (ifp->if_flags & IFF_PROMISC))
 		rfilt |= HAL_RX_FILTER_PROM;
+	if (ifp->if_flags & IFF_PPROMISC)
+		rfilt |= HAL_RX_FILTER_PROM;
 	if (ic->ic_opmode == IEEE80211_M_STA ||
 	    sc->sc_opmode == HAL_M_IBSS ||
 	    sc->sc_swbmiss || sc->sc_scanning)

From owner-p4-projects@FreeBSD.ORG  Thu Mar 27 22:17:27 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5DA251065670; Thu, 27 Mar 2008 22:17: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 1D40B106564A
	for ; Thu, 27 Mar 2008 22:17: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 E69C08FC14
	for ; Thu, 27 Mar 2008 22:17:26 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2RMHQqU079706
	for ; Thu, 27 Mar 2008 22:17:26 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2RMHQTG079704
	for perforce@freebsd.org; Thu, 27 Mar 2008 22:17:26 GMT
	(envelope-from sam@freebsd.org)
Date: Thu, 27 Mar 2008 22:17:26 GMT
Message-Id: <200803272217.m2RMHQTG079704@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 138754 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 27 Mar 2008 22:17:27 -0000

http://perforce.freebsd.org/chv.cgi?CH=138754

Change 138754 by sam@sam_ebb on 2008/03/27 22:17:13

	fix debug msg

Affected files ...

.. //depot/projects/vap/sys/dev/ath/if_ath.c#50 edit

Differences ...

==== //depot/projects/vap/sys/dev/ath/if_ath.c#50 (text+ko) ====

@@ -2543,7 +2543,7 @@
 	} else
 		mfilt[0] = mfilt[1] = ~0;
 	ath_hal_setmcastfilter(sc->sc_ah, mfilt[0], mfilt[1]);
-	DPRINTF(sc, ATH_DEBUG_MODE, "%s: , MC filter %08x:%08x\n",
+	DPRINTF(sc, ATH_DEBUG_MODE, "%s: MC filter %08x:%08x\n",
 		__func__, mfilt[0], mfilt[1]);
 }
 

From owner-p4-projects@FreeBSD.ORG  Thu Mar 27 22:36:50 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B79ED1065671; Thu, 27 Mar 2008 22:36: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 6362A106566C
	for ; Thu, 27 Mar 2008 22:36:49 +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 52CD48FC13
	for ; Thu, 27 Mar 2008 22:36:49 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2RManVd080377
	for ; Thu, 27 Mar 2008 22:36:49 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2RManpf080375
	for perforce@freebsd.org; Thu, 27 Mar 2008 22:36:49 GMT
	(envelope-from sam@freebsd.org)
Date: Thu, 27 Mar 2008 22:36:49 GMT
Message-Id: <200803272236.m2RManpf080375@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 138755 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 27 Mar 2008 22:36:50 -0000

http://perforce.freebsd.org/chv.cgi?CH=138755

Change 138755 by sam@sam_ebb on 2008/03/27 22:36:21

	must explicitly enable interrupts for RUN transition of monitor
	mode vaps to handle case of a single monitor mode vap

Affected files ...

.. //depot/projects/vap/sys/dev/ath/if_ath.c#51 edit

Differences ...

==== //depot/projects/vap/sys/dev/ath/if_ath.c#51 (text+ko) ====

@@ -5624,6 +5624,14 @@
 			 */
 			sc->sc_syncbeacon = 1;
 			break;
+		case IEEE80211_M_MONITOR:
+			/*
+			 * Monitor mode vaps have only INIT->RUN and RUN->RUN
+			 * transitions so we must re-enable interrupts here to
+			 * handle the case of a single monitor mode vap.
+			 */
+			ath_hal_intrset(ah, sc->sc_imask);
+			break;
 		case IEEE80211_M_WDS:
 			break;
 		default:

From owner-p4-projects@FreeBSD.ORG  Thu Mar 27 22:38:52 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DE7DD1065672; Thu, 27 Mar 2008 22:38:51 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9DA1F1065671
	for ; Thu, 27 Mar 2008 22:38: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 8D3888FC13
	for ; Thu, 27 Mar 2008 22:38:51 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2RMcpkj080434
	for ; Thu, 27 Mar 2008 22:38:51 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2RMcpr9080432
	for perforce@freebsd.org; Thu, 27 Mar 2008 22:38:51 GMT
	(envelope-from sam@freebsd.org)
Date: Thu, 27 Mar 2008 22:38:51 GMT
Message-Id: <200803272238.m2RMcpr9080432@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 138756 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 27 Mar 2008 22:38:52 -0000

http://perforce.freebsd.org/chv.cgi?CH=138756

Change 138756 by sam@sam_ebb on 2008/03/27 22:38:21

	handle promisc/mcast driver callbacks in ieee80211_syncifflag_locked
	as this is typically where they should occur; note they are done under
	the com lock which may be a problem for some drivers so we may need
	to push them up to the caller to allow dropping the com lock
	
	this fixes propagation of IFF_PROMISC bit

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211.c#30 edit
.. //depot/projects/vap/sys/net80211/ieee80211_scan_sta.c#22 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211.c#30 (text+ko) ====

@@ -532,8 +532,9 @@
 void
 ieee80211_syncifflag_locked(struct ieee80211com *ic, int flag)
 {
+	struct ifnet *ifp = ic->ic_ifp;
 	struct ieee80211vap *vap;
-	int bit;
+	int bit, oflags;
 
 	IEEE80211_LOCK_ASSERT(ic);
 
@@ -543,10 +544,20 @@
 			bit = 1;
 			break;
 		}
+	oflags = ifp->if_flags;
 	if (bit)
-		ic->ic_ifp->if_flags |= flag;
+		ifp->if_flags |= flag;
 	else
-		ic->ic_ifp->if_flags &= ~flag;
+		ifp->if_flags &= ~flag;
+	if ((ifp->if_flags ^ oflags) & flag) {
+		/* XXX should we return 1/0 and let caller do this? */
+		if (ifp->if_drv_flags & IFF_DRV_RUNNING) {
+			if (flag == IFF_PROMISC)
+				ic->ic_update_promisc(ifp);
+			else if (flag == IFF_ALLMULTI)
+				ic->ic_update_mcast(ifp);
+		}
+	}
 }
 
 /*

==== //depot/projects/vap/sys/net80211/ieee80211_scan_sta.c#22 (text+ko) ====

@@ -1473,11 +1473,8 @@
 static void
 ap_reset_promisc(struct ieee80211com *ic)
 {
-	struct ifnet *ifp = ic->ic_ifp;
-
 	IEEE80211_LOCK(ic);
 	ieee80211_syncifflag_locked(ic, IFF_PROMISC);
-	ic->ic_update_promisc(ifp);
 	IEEE80211_UNLOCK(ic);
 }
 

From owner-p4-projects@FreeBSD.ORG  Fri Mar 28 00:17:39 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6D3A51065672; Fri, 28 Mar 2008 00:17: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 129AE106564A
	for ; Fri, 28 Mar 2008 00:17:39 +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 E90378FC20
	for ; Fri, 28 Mar 2008 00:17:38 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2S0HcL4088183
	for ; Fri, 28 Mar 2008 00:17:38 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2S0Hcq7088181
	for perforce@freebsd.org; Fri, 28 Mar 2008 00:17:38 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 28 Mar 2008 00:17:38 GMT
Message-Id: <200803280017.m2S0Hcq7088181@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 138765 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 28 Mar 2008 00:17:40 -0000

http://perforce.freebsd.org/chv.cgi?CH=138765

Change 138765 by sam@sam_ebb on 2008/03/28 00:17:20

	Checkpoint:
	o set WI_RID_ALT_RETRY_CNT back to 2; 0 was causing poor performance
	  in sta mode
	o enable interrupts before enabling port; the spec says this is the
	  correct order
	o add missing locking in wi_newstate
	o fixup hostap setup on RUN state transition

Affected files ...

.. //depot/projects/vap/sys/dev/wi/if_wi.c#17 edit

Differences ...

==== //depot/projects/vap/sys/dev/wi/if_wi.c#17 (text+ko) ====

@@ -609,26 +609,27 @@
 static void
 wi_enable(struct wi_softc *sc)
 {
+	/* Enable interrupts */
+	CSR_WRITE_2(sc, WI_INT_EN, WI_INTRS);
+
 	/* enable port */
 	wi_cmd(sc, WI_CMD_ENABLE | sc->sc_portnum, 0, 0, 0);
 	sc->sc_enabled = 1;
-
-	/* Enable interrupts */
-	CSR_WRITE_2(sc, WI_INT_EN, WI_INTRS);
 }
 
 static int
-wi_init_locked(struct wi_softc *sc, uint8_t mac[IEEE80211_ADDR_LEN])
+wi_init_locked(struct wi_softc *sc, int porttype, int mode,
+	uint8_t mac[IEEE80211_ADDR_LEN])
 {
 	int i;
 
 	wi_reset(sc);
 
-	wi_write_val(sc, WI_RID_PORTTYPE, sc->sc_porttype);
-	wi_write_val(sc, WI_RID_CREATE_IBSS, 3);	/* join only, don't create */
+	wi_write_val(sc, WI_RID_PORTTYPE, porttype);
+	wi_write_val(sc, WI_RID_CREATE_IBSS, mode);
 	wi_write_val(sc, WI_RID_MAX_DATALEN, 2304);
-	/* NB: for IEEE80211_BPF_NOACK */
-	wi_write_val(sc, WI_RID_ALT_RETRY_CNT, 0);
+	/* XXX IEEE80211_BPF_NOACK wants 0 */
+	wi_write_val(sc, WI_RID_ALT_RETRY_CNT, 2);
 	if (sc->sc_flags & WI_FLAGS_HAS_ROAMING)
 		wi_write_val(sc, WI_RID_ROAMING_MODE, 3); /* NB: disabled */
 
@@ -670,7 +671,7 @@
 		wi_stop_locked(sc, 1);
 
 	IEEE80211_ADDR_COPY(ic->ic_myaddr, IF_LLADDR(ifp));
-	if (wi_init_locked(sc, ic->ic_myaddr) != 0) {
+	if (wi_init_locked(sc, sc->sc_porttype, 3, ic->ic_myaddr) != 0) {
 		if_printf(ifp, "interface not running\n");
 		wi_stop_locked(sc, 1);
 		WI_UNLOCK(sc);
@@ -802,6 +803,7 @@
 {
 	struct ieee80211com *ic = vap->iv_ic;
 	struct ifnet *ifp = ic->ic_ifp;
+	struct ieee80211_node *bss;
 	struct wi_softc *sc = ifp->if_softc;
 	int error;
 
@@ -810,10 +812,9 @@
 		ieee80211_state_name[nstate]));
 
 	if (nstate == IEEE80211_S_AUTH) {
-		struct ieee80211_node *bss = vap->iv_bss;
+		WI_LOCK(sc);
+		wi_init_locked(sc, WI_PORTTYPE_BSS, 3, vap->iv_myaddr);
 
-		wi_init_locked(sc, vap->iv_myaddr);
-
 		if (vap->iv_flags & IEEE80211_F_PMGTON) {
 			wi_write_val(sc, WI_RID_MAX_SLEEP, ic->ic_lintval);
 			wi_write_val(sc, WI_RID_PM_ENABLED, 1);
@@ -824,16 +825,17 @@
 			    vap->iv_fragthreshold);
 		wi_write_txrate(sc, vap);
 
+		bss = vap->iv_bss;
+		wi_write_ssid(sc, WI_RID_DESIRED_SSID, bss->ni_essid, bss->ni_esslen);
+		wi_write_val(sc, WI_RID_OWN_CHNL,
+		    ieee80211_chan2ieee(ic, bss->ni_chan));
+
 		/* Configure WEP. */
 		if (ic->ic_caps & IEEE80211_C_WEP)
 			wi_write_wep(sc, vap);
 		else
 			sc->sc_encryption = 0;
 
-		wi_write_ssid(sc, WI_RID_DESIRED_SSID, bss->ni_essid, bss->ni_esslen);
-		wi_write_val(sc, WI_RID_OWN_CHNL,
-		    ieee80211_chan2ieee(ic, bss->ni_chan));
-
 		wi_enable(sc);		/* enable port */
 
 		/* Lucent firmware does not support the JOIN RID. */
@@ -846,6 +848,8 @@
 			    ieee80211_chan2ieee(ic, bss->ni_chan));
 			wi_write_rid(sc, WI_RID_JOIN_REQ, &join, sizeof(join));
 		}
+		WI_UNLOCK(sc);
+
 		/* NB: don't go through 802.11 layer, it'll send auth frame */
 		vap->iv_state = nstate;
 		return EINPROGRESS;
@@ -854,14 +858,30 @@
 	error = WI_VAP(vap)->wv_newstate(vap, nstate, arg);
 
 	if (nstate == IEEE80211_S_RUN && vap->iv_state != IEEE80211_S_RUN) {
+		WI_LOCK(sc);
 		if (vap->iv_opmode == IEEE80211_M_MONITOR)
 			wi_cmd(sc, WI_CMD_DEBUG | (WI_TEST_MONITOR << 8), 0, 0, 0);
 		if (vap->iv_opmode == IEEE80211_M_HOSTAP) {
+			wi_init_locked(sc, WI_PORTTYPE_HOSTAP, 0, vap->iv_myaddr);
+
+			bss = vap->iv_bss;
+			wi_write_ssid(sc, WI_RID_OWN_SSID,
+			    bss->ni_essid, bss->ni_esslen);
+			wi_write_val(sc, WI_RID_OWN_CHNL,
+			    ieee80211_chan2ieee(ic, bss->ni_chan));
+			wi_write_val(sc, WI_RID_BASIC_RATE, 0x3);
+			wi_write_val(sc, WI_RID_SUPPORT_RATE, 0xf);
+			wi_write_txrate(sc, vap);
+
+			wi_write_val(sc, WI_RID_OWN_BEACON_INT, bss->ni_intval);
+			wi_write_val(sc, WI_RID_DTIM_PERIOD, vap->iv_dtim_period);
+
 			wi_write_val(sc, WI_RID_RTS_THRESH, vap->iv_rtsthreshold);
 			if (sc->sc_flags & WI_FLAGS_HAS_FRAGTHR)
 				wi_write_val(sc, WI_RID_FRAG_THRESH,
 				    vap->iv_fragthreshold);
-			wi_write_txrate(sc, vap);
+
+			wi_write_val(sc, WI_RID_PROMISC, 0);
 
 			/* Configure WEP. */
 			if (ic->ic_caps & IEEE80211_C_WEP)
@@ -869,16 +889,15 @@
 			else
 				sc->sc_encryption = 0;
 
-			/* NB: only Intersil supports HOSTAP so this works for now */
-			wi_write_ssid(sc, WI_RID_OWN_SSID,
-			    vap->iv_des_ssid[0].ssid, vap->iv_des_ssid[0].len);
-			wi_write_val(sc, WI_RID_OWN_BEACON_INT, ic->ic_bintval);
-			wi_write_val(sc, WI_RID_DTIM_PERIOD, vap->iv_dtim_period);
-
-			/* XXX: some cards need to be re-enabled for hostap */
-			wi_cmd(sc, WI_CMD_DISABLE | WI_PORT0, 0, 0, 0);
-			wi_cmd(sc, WI_CMD_ENABLE | WI_PORT0, 0, 0, 0);
+			wi_enable(sc);		/* enable port */
+#if 0
+			if (sc->sc_firmware_type == WI_INTERSIL) {
+				wi_cmd(sc, WI_CMD_DISABLE | WI_PORT0, 0, 0, 0);
+				wi_cmd(sc, WI_CMD_ENABLE | WI_PORT0, 0, 0, 0);
+			}
+#endif
 		}
+		WI_UNLOCK(sc);
 		return WI_VAP(vap)->wv_newstate(vap, nstate, arg);
 	}
 	return 0;

From owner-p4-projects@FreeBSD.ORG  Fri Mar 28 01:06:38 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3213D1065678; Fri, 28 Mar 2008 01:06: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 E434F1065676
	for ; Fri, 28 Mar 2008 01:06:37 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id CE9C48FC1F
	for ; Fri, 28 Mar 2008 01:06:37 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2S16bqH000436
	for ; Fri, 28 Mar 2008 01:06:37 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2S16bJA000434
	for perforce@freebsd.org; Fri, 28 Mar 2008 01:06:37 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 28 Mar 2008 01:06:37 GMT
Message-Id: <200803280106.m2S16bJA000434@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138770 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 28 Mar 2008 01:06:38 -0000

http://perforce.freebsd.org/chv.cgi?CH=138770

Change 138770 by jb@jb_freebsd1 on 2008/03/28 01:05:59

	IFC

Affected files ...

.. //depot/projects/dtrace/src/cddl/Makefile.inc#9 integrate
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/alloca.h#1 branch
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/devid.h#1 branch
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/fcntl.h#1 branch
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/fsshare.h#1 branch
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/libintl.h#1 branch
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/mnttab.h#1 branch
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/priv.h#1 branch
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/solaris.h#1 branch
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/stdio.h#1 branch
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/stdlib.h#1 branch
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/strings.h#1 branch
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/unistd.h#1 branch
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/zone.h#1 branch
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/lib/libumem/umem.c#1 branch
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/lib/libumem/umem.h#1 branch
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/misc/deviceid.c#1 branch
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/misc/fsshare.c#1 branch
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/misc/mkdirp.c#1 branch
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/misc/mnttab.c#1 branch
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/misc/zmount.c#1 branch
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/misc/zone.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/zdb/zdb.8#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/zdb/zdb.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/zfs/zfs.8#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/zfs/zfs_util.h#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/zpool/zpool.8#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/zpool/zpool_iter.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/zpool/zpool_util.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/ztest/ztest.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/head/assert.h#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/head/atomic.h#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/head/libintl.h#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/head/stdio_ext.h#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/head/synch.h#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/head/thread.h#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.h#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libnvpair/nvpair_alloc_system.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libuutil/common/libuutil.h#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libuutil/common/libuutil_impl.h#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_avl.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_ident.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_list.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_misc.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_open.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_pname.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_strtoint.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libzpool/common/util.c#1 branch
.. //depot/projects/dtrace/src/cddl/lib/libavl/Makefile#3 integrate
.. //depot/projects/dtrace/src/cddl/lib/libnvpair/Makefile#4 integrate
.. //depot/projects/dtrace/src/cddl/lib/libumem/Makefile#2 integrate
.. //depot/projects/dtrace/src/cddl/lib/libuutil/Makefile#2 integrate
.. //depot/projects/dtrace/src/cddl/lib/libzfs/Makefile#2 integrate
.. //depot/projects/dtrace/src/cddl/lib/libzpool/Makefile#2 integrate
.. //depot/projects/dtrace/src/cddl/sbin/zfs/Makefile#3 integrate
.. //depot/projects/dtrace/src/cddl/sbin/zpool/Makefile#3 integrate
.. //depot/projects/dtrace/src/cddl/usr.bin/ztest/Makefile#3 integrate
.. //depot/projects/dtrace/src/cddl/usr.sbin/zdb/Makefile#3 integrate
.. //depot/projects/dtrace/src/compat/opensolaris/include/alloca.h#4 delete
.. //depot/projects/dtrace/src/compat/opensolaris/include/devid.h#2 delete
.. //depot/projects/dtrace/src/compat/opensolaris/include/fcntl.h#4 delete
.. //depot/projects/dtrace/src/compat/opensolaris/include/fsshare.h#2 delete
.. //depot/projects/dtrace/src/compat/opensolaris/include/libintl.h#2 delete
.. //depot/projects/dtrace/src/compat/opensolaris/include/mnttab.h#2 delete
.. //depot/projects/dtrace/src/compat/opensolaris/include/priv.h#2 delete
.. //depot/projects/dtrace/src/compat/opensolaris/include/solaris.h#2 delete
.. //depot/projects/dtrace/src/compat/opensolaris/include/stdio.h#4 delete
.. //depot/projects/dtrace/src/compat/opensolaris/include/stdlib.h#4 delete
.. //depot/projects/dtrace/src/compat/opensolaris/include/strings.h#4 delete
.. //depot/projects/dtrace/src/compat/opensolaris/include/unistd.h#4 delete
.. //depot/projects/dtrace/src/compat/opensolaris/include/zone.h#2 delete
.. //depot/projects/dtrace/src/compat/opensolaris/lib/libumem/umem.c#2 delete
.. //depot/projects/dtrace/src/compat/opensolaris/lib/libumem/umem.h#2 delete
.. //depot/projects/dtrace/src/compat/opensolaris/misc/deviceid.c#2 delete
.. //depot/projects/dtrace/src/compat/opensolaris/misc/fsshare.c#2 delete
.. //depot/projects/dtrace/src/compat/opensolaris/misc/mkdirp.c#2 delete
.. //depot/projects/dtrace/src/compat/opensolaris/misc/mnttab.c#2 delete
.. //depot/projects/dtrace/src/compat/opensolaris/misc/zmount.c#2 delete
.. //depot/projects/dtrace/src/compat/opensolaris/misc/zone.c#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/kern/opensolaris_atomic.c#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/kern/opensolaris_kmem.c#7 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/kern/opensolaris_kobj.c#4 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/kern/opensolaris_kstat.c#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/kern/opensolaris_misc.c#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/kern/opensolaris_policy.c#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/kern/opensolaris_string.c#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#5 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/kern/opensolaris_zone.c#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/rpc/xdr.h#4 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/acl.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/atomic.h#7 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/bitmap.h#4 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/byteorder.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/callb.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/cmn_err.h#4 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/cpupart.h#3 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/cpuvar.h#9 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/cred.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/cyclic.h#3 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/debug.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/dirent.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/dkio.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/dnlc.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/elf.h#4 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/kcondvar.h#3 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/kmem.h#5 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/kobj.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/kstat.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/lock.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/misc.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/mman.h#4 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/mntent.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/mnttab.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/modctl.h#4 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/mount.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/mutex.h#3 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/objfs.h#3 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/param.h#4 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/pcpu.h#7 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/policy.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/proc.h#4 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/random.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/rwlock.h#3 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/stat.h#4 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/string.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/sunddi.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/sysmacros.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/systm.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/taskq.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/taskq_impl.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/time.h#6 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/types.h#4 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/uio.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/varargs.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/vfs.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/vnode.h#4 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/zone.h#2 delete
.. //depot/projects/dtrace/src/sys/modules/bktr/bktr/Makefile#4 integrate
.. //depot/projects/dtrace/src/sys/modules/em/Makefile#6 integrate
.. //depot/projects/dtrace/src/sys/modules/igb/Makefile#2 integrate
.. //depot/projects/dtrace/src/sys/modules/ixgbe/Makefile#2 integrate
.. //depot/projects/dtrace/src/sys/modules/sound/driver/emu10kx/Makefile#6 integrate
.. //depot/projects/dtrace/src/sys/modules/uslcom/Makefile#2 integrate
.. //depot/projects/dtrace/src/sys/modules/wpi/Makefile#3 integrate
.. //depot/projects/dtrace/src/sys/modules/zfs/Makefile#6 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_base.c#17 integrate
.. //depot/projects/dtrace/src/sys/sys/buf.h#13 integrate
.. //depot/projects/dtrace/src/usr.bin/fstat/zfs/Makefile#4 integrate

Differences ...

==== //depot/projects/dtrace/src/cddl/Makefile.inc#9 (text+ko) ====

@@ -1,6 +1,6 @@
-# $FreeBSD: src/cddl/Makefile.inc,v 1.3 2007/11/28 22:58:09 jb Exp $
+# $FreeBSD: src/cddl/Makefile.inc,v 1.4 2008/03/27 23:21:23 jb Exp $
 
-OPENSOLARIS_USR_DISTDIR= ${.CURDIR}/../../../contrib/opensolaris
-OPENSOLARIS_SYS_DISTDIR= ${.CURDIR}/../../../sys/contrib/opensolaris
+OPENSOLARIS_USR_DISTDIR= ${.CURDIR}/../../../cddl/contrib/opensolaris
+OPENSOLARIS_SYS_DISTDIR= ${.CURDIR}/../../../sys/cddl/contrib/opensolaris
 
 IGNORE_PRAGMA=	YES

==== //depot/projects/dtrace/src/cddl/lib/libavl/Makefile#3 (text+ko) ====

@@ -1,10 +1,10 @@
-# $FreeBSD: src/cddl/lib/libavl/Makefile,v 1.2 2007/04/16 21:20:24 ru Exp $
+# $FreeBSD: src/cddl/lib/libavl/Makefile,v 1.3 2008/03/27 23:21:23 jb Exp $
 
-.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/avl
+.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/avl
 
 LIB=	avl
 SRCS=	avl.c
-CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
 
 .include 

==== //depot/projects/dtrace/src/cddl/lib/libnvpair/Makefile#4 (text+ko) ====

@@ -1,7 +1,7 @@
-# $FreeBSD: src/cddl/lib/libnvpair/Makefile,v 1.3 2007/11/28 22:58:09 jb Exp $
+# $FreeBSD: src/cddl/lib/libnvpair/Makefile,v 1.4 2008/03/27 23:21:23 jb Exp $
 
-.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair
-.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/nvpair
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
+.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/nvpair
 
 LIB=	nvpair
 
@@ -10,8 +10,8 @@
 	nvpair_alloc_fixed.c \
 	nvpair.c
 
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include
-CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
 
 .include 

==== //depot/projects/dtrace/src/cddl/lib/libumem/Makefile#2 (text+ko) ====

@@ -1,9 +1,9 @@
-# $FreeBSD: src/cddl/lib/libumem/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $
+# $FreeBSD: src/cddl/lib/libumem/Makefile,v 1.3 2008/03/27 23:21:23 jb Exp $
 
-.PATH: ${.CURDIR}/../../../compat/opensolaris/lib/libumem
+.PATH: ${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
 
 LIB=	umem
 SRCS=	umem.c
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
 
 .include 

==== //depot/projects/dtrace/src/cddl/lib/libuutil/Makefile#2 (text+ko) ====

@@ -1,7 +1,7 @@
-# $FreeBSD: src/cddl/lib/libuutil/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $
+# $FreeBSD: src/cddl/lib/libuutil/Makefile,v 1.3 2008/03/27 23:21:24 jb Exp $
 
-.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common
-.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/avl
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
+.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/avl
 
 LIB=	uutil
 SRCS=	avl.c \
@@ -16,10 +16,10 @@
 	uu_strtoint.c
 
 CFLAGS+= -DNATIVE_BUILD
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common
-CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
 
 .include 

==== //depot/projects/dtrace/src/cddl/lib/libzfs/Makefile#2 (text+ko) ====

@@ -1,9 +1,9 @@
-# $FreeBSD: src/cddl/lib/libzfs/Makefile,v 1.3 2007/05/06 01:39:38 pjd Exp $
+# $FreeBSD: src/cddl/lib/libzfs/Makefile,v 1.4 2008/03/27 23:21:24 jb Exp $
 
-.PATH: ${.CURDIR}/../../../compat/opensolaris/misc
-.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs
-.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
-.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common
+.PATH: ${.CURDIR}/../../../cddl/compat/opensolaris/misc
+.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
+.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
 
 LIB=	zfs
 DPADD=	${LIBUTIL}
@@ -31,17 +31,17 @@
 CFLAGS+= -DZFS_NO_ACL
 CFLAGS+= -I${.CURDIR}/../../../sbin/mount
 CFLAGS+= -I${.CURDIR}/../../../cddl/lib/libumem
-CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
 
 .include 

==== //depot/projects/dtrace/src/cddl/lib/libzpool/Makefile#2 (text+ko) ====

@@ -1,21 +1,21 @@
-# $FreeBSD: src/cddl/lib/libzpool/Makefile,v 1.5 2007/06/08 12:35:45 pjd Exp $
+# $FreeBSD: src/cddl/lib/libzpool/Makefile,v 1.6 2008/03/27 23:21:24 jb Exp $
 
-.include "${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/Makefile.files"
+.include "${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/Makefile.files"
 
 # ZFS_COMMON_SRCS
-.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
+.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
 # ZFS_SHARED_SRCS
-.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs
+.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
 # KERNEL_SRCS
-.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
 # LIST_SRCS
-.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/os
+.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/os
 # ATOMIC_SRCS
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64"
-.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/atomic/${MACHINE_ARCH}
+.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}
 ATOMIC_SRCS=	atomic.S
 .else
-.PATH: ${.CURDIR}/../../../sys/compat/opensolaris/kern
+.PATH: ${.CURDIR}/../../../sys/cddl/compat/opensolaris/kern
 ATOMIC_SRCS=	opensolaris_atomic.c
 .endif
 
@@ -29,17 +29,17 @@
 SRCS=		${ZFS_COMMON_SRCS} ${ZFS_SHARED_SRCS} \
 		${KERNEL_SRCS} ${LIST_SRCS} ${ATOMIC_SRCS}
 
-CFLAGS+=	-I${.CURDIR}/../../../sys/compat/opensolaris
-CFLAGS+=	-I${.CURDIR}/../../../compat/opensolaris/include
-CFLAGS+=	-I${.CURDIR}/../../../compat/opensolaris/lib/libumem
-CFLAGS+=	-I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common
-CFLAGS+=	-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
-CFLAGS+=	-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
-CFLAGS+=	-I${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs
-CFLAGS+=	-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
-CFLAGS+=	-I${.CURDIR}/../../../contrib/opensolaris/head
+CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/compat/opensolaris
+CFLAGS+=	-I${.CURDIR}/../../../cddl/compat/opensolaris/include
+CFLAGS+=	-I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
+CFLAGS+=	-I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
+CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
+CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
+CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
+CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+=	-I${.CURDIR}/../../../cddl/contrib/opensolaris/head
 CFLAGS+=	-I${.CURDIR}/../../../cddl/lib/libumem
-CFLAGS+=	-I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair
+CFLAGS+=	-I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
 
 DPADD=		${LIBPTHREAD} ${LIBZ}
 LDADD=		-lpthread -lz

==== //depot/projects/dtrace/src/cddl/sbin/zfs/Makefile#3 (text+ko) ====

@@ -1,23 +1,23 @@
-# $FreeBSD: src/cddl/sbin/zfs/Makefile,v 1.3 2007/10/01 18:17:23 ru Exp $
+# $FreeBSD: src/cddl/sbin/zfs/Makefile,v 1.4 2008/03/27 23:21:24 jb Exp $
 
-.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zfs
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zfs
 
 PROG=	zfs
 MAN=	zfs.8
 SRCS=	zfs_main.c zfs_iter.c
 
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem
-CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libumem/common
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libumem/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
 
 DPADD=	${LIBZFS} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} \
 	${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL}

==== //depot/projects/dtrace/src/cddl/sbin/zpool/Makefile#3 (text+ko) ====

@@ -1,23 +1,23 @@
-# $FreeBSD: src/cddl/sbin/zpool/Makefile,v 1.3 2007/10/01 18:17:23 ru Exp $
+# $FreeBSD: src/cddl/sbin/zpool/Makefile,v 1.4 2008/03/27 23:21:24 jb Exp $
 
-.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zpool
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zpool
 
 PROG=	zpool
 MAN=	zpool.8
 SRCS=	zpool_main.c zpool_vdev.c zpool_iter.c zpool_util.c
 
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem
-CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libumem/common
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libumem/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
 
 DPADD=	${LIBAVL} ${LIBZFS} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} \
 	${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL}

==== //depot/projects/dtrace/src/cddl/usr.bin/ztest/Makefile#3 (text+ko) ====

@@ -1,18 +1,18 @@
-# $FreeBSD: src/cddl/usr.bin/ztest/Makefile,v 1.4 2007/10/01 18:17:23 ru Exp $
+# $FreeBSD: src/cddl/usr.bin/ztest/Makefile,v 1.5 2008/03/27 23:21:24 jb Exp $
 
-.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/ztest
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/ztest
 
 PROG=	ztest
 NO_MAN=
 
-CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
 CFLAGS+= -I${.CURDIR}/../../lib/libumem
 
 DPADD=	${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \

==== //depot/projects/dtrace/src/cddl/usr.sbin/zdb/Makefile#3 (text+ko) ====

@@ -1,19 +1,19 @@
-# $FreeBSD: src/cddl/usr.sbin/zdb/Makefile,v 1.4 2007/10/01 18:17:23 ru Exp $
+# $FreeBSD: src/cddl/usr.sbin/zdb/Makefile,v 1.5 2008/03/27 23:21:25 jb Exp $
 
-.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zdb
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zdb
 
 PROG=	zdb
 MAN=	zdb.8
 SRCS=	zdb.c zdb_il.c
 
-CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
 CFLAGS+= -I${.CURDIR}/../../lib/libumem
 
 DPADD=	${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \

==== //depot/projects/dtrace/src/sys/modules/bktr/bktr/Makefile#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/modules/bktr/bktr/Makefile,v 1.9 2006/01/27 09:08:32 jmg Exp $
+# $FreeBSD: src/sys/modules/bktr/bktr/Makefile,v 1.10 2008/03/27 20:38:02 antoine Exp $
 
 # Makefile for the bktr Brooktree Bt848/Bt878 PCI video capture device
 
@@ -6,7 +6,7 @@
 
 KMOD=	bktr 
 SRCS=	bktr_core.c bktr_os.c bktr_audio.c bktr_tuner.c bktr_card.c msp34xx.c \
-	opt_devfs.h opt_bktr.h bus_if.h device_if.h \
+	opt_bktr.h bus_if.h device_if.h \
 	pci_if.h
 
 CFLAGS+= -DBKTR_FREEBSD_MODULE

==== //depot/projects/dtrace/src/sys/modules/em/Makefile#6 (text+ko) ====

@@ -1,7 +1,7 @@
-# $FreeBSD: src/sys/modules/em/Makefile,v 1.10 2008/02/29 21:50:11 jfv Exp $
+# $FreeBSD: src/sys/modules/em/Makefile,v 1.11 2008/03/27 20:38:03 antoine Exp $
 .PATH:  ${.CURDIR}/../../dev/em
 KMOD    = if_em
-SRCS    = device_if.h bus_if.h pci_if.h opt_bdg.h
+SRCS    = device_if.h bus_if.h pci_if.h
 SRCS    += if_em.c $(SHARED_SRCS)
 SHARED_SRCS = e1000_api.c e1000_phy.c e1000_nvm.c e1000_mac.c e1000_manage.c
 SHARED_SRCS += e1000_80003es2lan.c e1000_82542.c e1000_82541.c e1000_82543.c
@@ -13,7 +13,7 @@
 #CFLAGS  += -DDEVICE_POLLING
 
 clean:
-	rm -f opt_bdg.h device_if.h bus_if.h pci_if.h setdef*
+	rm -f device_if.h bus_if.h pci_if.h setdef*
 	rm -f *.o *.kld *.ko
 	rm -f @ machine
 	rm -f ${CLEANFILES}

==== //depot/projects/dtrace/src/sys/modules/igb/Makefile#2 (text+ko) ====

@@ -1,7 +1,7 @@
-#$FreeBSD: src/sys/modules/igb/Makefile,v 1.1 2008/02/29 21:50:11 jfv Exp $
+#$FreeBSD: src/sys/modules/igb/Makefile,v 1.2 2008/03/27 20:38:03 antoine Exp $
 .PATH:  ${.CURDIR}/../../dev/igb
 KMOD    = if_igb
-SRCS    = device_if.h bus_if.h pci_if.h opt_bdg.h
+SRCS    = device_if.h bus_if.h pci_if.h
 SRCS    += if_igb.c $(SHARED_SRCS)
 SHARED_SRCS = e1000_api.c e1000_phy.c e1000_nvm.c e1000_mac.c e1000_manage.c
 SHARED_SRCS += e1000_82575.c
@@ -13,7 +13,7 @@
 #CFLAGS  += -DDEVICE_POLLING
 
 clean:
-	rm -f opt_bdg.h device_if.h bus_if.h pci_if.h setdef*
+	rm -f device_if.h bus_if.h pci_if.h setdef*
 	rm -f *.o *.kld *.ko
 	rm -f @ machine
 	rm -f ${CLEANFILES}

==== //depot/projects/dtrace/src/sys/modules/ixgbe/Makefile#2 (text+ko) ====

@@ -1,14 +1,14 @@
-#$FreeBSD: src/sys/modules/ixgbe/Makefile,v 1.1 2007/09/04 02:31:35 jfv Exp $
+#$FreeBSD: src/sys/modules/ixgbe/Makefile,v 1.2 2008/03/27 20:38:03 antoine Exp $
 .PATH:  ${.CURDIR}/../../dev/ixgbe
 KMOD    = ixgbe
-SRCS    = device_if.h bus_if.h pci_if.h opt_bdg.h
+SRCS    = device_if.h bus_if.h pci_if.h
 SRCS    += ixgbe.c 
 # Shared source
 SRCS    += ixgbe_common.c ixgbe_api.c ixgbe_phy.c ixgbe_82598.c
 CFLAGS+= -I${.CURDIR}/../../dev/ixgbe
 
 clean:
-	rm -f opt_bdg.h device_if.h bus_if.h pci_if.h setdef* *_StripErr
+	rm -f device_if.h bus_if.h pci_if.h setdef* *_StripErr
 	rm -f *.o *.kld *.ko
 	rm -f @ machine
 

==== //depot/projects/dtrace/src/sys/modules/sound/driver/emu10kx/Makefile#6 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/modules/sound/driver/emu10kx/Makefile,v 1.5 2008/02/21 11:09:59 ru Exp $
+# $FreeBSD: src/sys/modules/sound/driver/emu10kx/Makefile,v 1.6 2008/03/27 20:38:03 antoine Exp $
 .PATH: ${.CURDIR}/../../../../dev/sound/pci \
        ${.CURDIR}/../../../../gnu/dev/sound/pci
 
@@ -6,7 +6,7 @@
 
 SRCS=	device_if.h bus_if.h pci_if.h
 SRCS+=	isa_if.h channel_if.h ac97_if.h mixer_if.h mpufoi_if.h
-SRCS+=	vnode_if.h opt_emu10kx.h
+SRCS+=	vnode_if.h
 # Master, PCM and MIDI devices
 SRCS+=	emu10kx.c
 SRCS+=	emu10kx-pcm.c

==== //depot/projects/dtrace/src/sys/modules/uslcom/Makefile#2 (text+ko) ====

@@ -1,10 +1,10 @@
-# $FreeBSD: src/sys/modules/uslcom/Makefile,v 1.1 2008/03/05 14:13:30 rink Exp $
+# $FreeBSD: src/sys/modules/uslcom/Makefile,v 1.2 2008/03/27 20:38:03 antoine Exp $
 
 S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
 
 KMOD=	uslcom
-SRCS=	uslcom.c opt_usb.h opt_uslcom.h \
+SRCS=	uslcom.c opt_usb.h \
 	device_if.h bus_if.h usbdevs.h
 
 .include 

==== //depot/projects/dtrace/src/sys/modules/wpi/Makefile#3 (text+ko) ====

@@ -1,8 +1,8 @@
-# $FreeBSD: src/sys/modules/wpi/Makefile,v 1.2 2007/11/08 22:02:38 benjsc Exp $
+# $FreeBSD: src/sys/modules/wpi/Makefile,v 1.3 2008/03/27 20:38:03 antoine Exp $
 
 .PATH:  ${.CURDIR}/../../dev/wpi
 
 KMOD    = if_wpi
-SRCS    = if_wpi.c opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS    = if_wpi.c device_if.h bus_if.h pci_if.h
 
 .include 

==== //depot/projects/dtrace/src/sys/modules/zfs/Makefile#6 (text+ko) ====

@@ -1,10 +1,10 @@
-# $FreeBSD: src/sys/modules/zfs/Makefile,v 1.9 2008/03/08 19:14:43 obrien Exp $
+# $FreeBSD: src/sys/modules/zfs/Makefile,v 1.10 2008/03/27 23:21:25 jb Exp $
 
 KMOD=	zfs
 
 SRCS=	vnode_if.h
 
-SUNW=	${.CURDIR}/../../contrib/opensolaris
+SUNW=	${.CURDIR}/../../cddl/contrib/opensolaris
 
 .PATH:	${SUNW}/common/acl
 SRCS+=	acl_common.c
@@ -13,7 +13,7 @@
 .PATH:	${SUNW}/common/nvpair
 SRCS+=	nvpair.c
 
-.PATH:	${.CURDIR}/../../compat/opensolaris/kern
+.PATH:	${.CURDIR}/../../cddl/compat/opensolaris/kern
 SRCS+=	opensolaris_kmem.c
 SRCS+=	opensolaris_kobj.c
 SRCS+=	opensolaris_kstat.c
@@ -27,7 +27,7 @@
 .PATH:	${SUNW}/common/atomic/${MACHINE_ARCH}
 SRCS+=	atomic.S
 .else
-.PATH:	${.CURDIR}/../../compat/opensolaris/kern
+.PATH:	${.CURDIR}/../../cddl/compat/opensolaris/kern
 SRCS+=	opensolaris_atomic.c
 .endif
 
@@ -70,7 +70,7 @@
 # Use FreeBSD's namecache.
 CFLAGS+=-DFREEBSD_NAMECACHE
 
-CFLAGS+=-I${.CURDIR}/../../compat/opensolaris
+CFLAGS+=-I${.CURDIR}/../../cddl/compat/opensolaris
 CFLAGS+=-I${SUNW}/uts/common/fs/zfs
 CFLAGS+=-I${SUNW}/uts/common/zmod
 CFLAGS+=-I${SUNW}/uts/common

==== //depot/projects/dtrace/src/sys/netgraph/ng_base.c#17 (text+ko) ====

@@ -38,7 +38,7 @@
  * Authors: Julian Elischer 
  *          Archie Cobbs 
  *
- * $FreeBSD: src/sys/netgraph/ng_base.c,v 1.151 2008/03/16 23:12:17 mav Exp $
+ * $FreeBSD: src/sys/netgraph/ng_base.c,v 1.152 2008/03/27 23:02:30 mav Exp $
  * $Whistle: ng_base.c,v 1.39 1999/01/28 23:54:53 julian Exp $
  */
 
@@ -1996,13 +1996,6 @@
 		 * we don't need to change the PENDING flag.
 		 */
 		atomic_add_long(&ngq->q_flags, add_arg);
-		/*
-		 * If we see more doable work, make sure we are
-		 * on the work queue.
-		 */
-		if (NEXT_QUEUED_ITEM_CAN_PROCEED(ngq)) {
-			ng_setisr(ngq->q_node);
-		}
 	}
 	CTR6(KTR_NET, "%20s: node [%x] (%p) returning item %p as %s; "
 	    "queue flags 0x%lx", __func__,
@@ -3385,10 +3378,6 @@
 		 * All this time, keep the reference
 		 * that lets us be sure that the node still exists.
 		 * Let the reference go at the last minute.
-		 * ng_dequeue will put us back on the worklist
-		 * if there is more too do. This may be of use if there
-		 * are Multiple Processors and multiple Net threads in the
-		 * future.
 		 */
 		for (;;) {
 			int rw;

==== //depot/projects/dtrace/src/sys/sys/buf.h#13 (text+ko) ====

@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)buf.h	8.9 (Berkeley) 3/30/95
- * $FreeBSD: src/sys/sys/buf.h,v 1.204 2008/03/22 09:15:16 jeff Exp $
+ * $FreeBSD: src/sys/sys/buf.h,v 1.205 2008/03/28 00:14:33 attilio Exp $
  */
 
 #ifndef _SYS_BUF_H_
@@ -261,22 +261,22 @@
 /*
  * Initialize a lock.
  */
-#define BUF_LOCKINIT(bp) \
+#define BUF_LOCKINIT(bp)						\
 	lockinit(&(bp)->b_lock, PRIBIO + 4, buf_wmesg, 0, 0)
 /*
  *
  * Get a lock sleeping non-interruptably until it becomes available.
  */
 static __inline int
-BUF_LOCK(struct buf *bp, int locktype, struct mtx *interlock);
-static __inline int
-BUF_LOCK(struct buf *bp, int locktype, struct mtx *interlock)
+_BUF_LOCK(struct buf *bp, int locktype, struct mtx *interlock, const char *file,
+    int line)
 {
 	int res;
 
 	if (locktype & LK_INTERLOCK)
 		bp->b_waiters++;
-	res = lockmgr(&bp->b_lock, locktype, interlock);
+	res = _lockmgr_args(&bp->b_lock, locktype, interlock, LK_WMESG_DEFAULT,
+	    LK_PRIO_DEFAULT, LK_TIMO_DEFAULT, file, line);
 	if (locktype & LK_INTERLOCK)
 		bp->b_waiters--;
 	return (res);
@@ -286,18 +286,15 @@
  * Get a lock sleeping with specified interruptably and timeout.
  */
 static __inline int
-BUF_TIMELOCK(struct buf *bp, int locktype, struct mtx *interlock,
-    const char *wmesg, int catch, int timo);
-static __inline int
-BUF_TIMELOCK(struct buf *bp, int locktype, struct mtx *interlock,
-    const char *wmesg, int catch, int timo)
+_BUF_TIMELOCK(struct buf *bp, int locktype, struct mtx *interlock,
+    const char *wmesg, int catch, int timo, const char *file, int line)
 {
 	int res;
 
 	if (locktype & LK_INTERLOCK)
 		bp->b_waiters++;
-	res = lockmgr_args(&bp->b_lock, locktype | LK_TIMELOCK, interlock,
-	    wmesg, (PRIBIO + 4) | catch, timo);
+	res = _lockmgr_args(&bp->b_lock, locktype | LK_TIMELOCK, interlock,
+	    wmesg, (PRIBIO + 4) | catch, timo, file, line);
 	if (locktype & LK_INTERLOCK)
 		bp->b_waiters--;
 	return (res);
@@ -307,35 +304,40 @@
  * Release a lock. Only the acquiring process may free the lock unless
  * it has been handed off to biodone.
  */
-static __inline void BUF_UNLOCK(struct buf *);
-static __inline void
-BUF_UNLOCK(struct buf *bp)
-{
-	int s;
+#define	BUF_UNLOCK(bp) do {						\
+	KASSERT(((bp)->b_flags & B_REMFREE) == 0,			\
+	    ("BUF_UNLOCK %p while B_REMFREE is still set.", (bp)));	\
+									\
+	(void)_lockmgr_args(&(bp)->b_lock, LK_RELEASE, NULL,		\
+	    LK_WMESG_DEFAULT, LK_PRIO_DEFAULT, LK_TIMO_DEFAULT,		\
+	    LOCK_FILE, LOCK_LINE);					\
+} while (0)
 
-	s = splbio();
-	KASSERT((bp->b_flags & B_REMFREE) == 0,
-	    ("BUF_UNLOCK %p while B_REMFREE is still set.", bp));
-	lockmgr(&(bp)->b_lock, LK_RELEASE, NULL);
-	splx(s);
-}
-
 /*
  * Check if a buffer lock is recursed.
  */
 #define	BUF_LOCKRECURSED(bp)						\
-	(lockmgr_recursed(&(bp)->b_lock))
+	lockmgr_recursed(&(bp)->b_lock)
 
 /*
  * Check if a buffer lock is currently held.
  */
 #define	BUF_ISLOCKED(bp)						\
-	(lockstatus(&(bp)->b_lock))
+	lockstatus(&(bp)->b_lock)
 /*
  * Free a buffer lock.
  */
 #define BUF_LOCKFREE(bp) 						\
-	(lockdestroy(&(bp)->b_lock))
+	lockdestroy(&(bp)->b_lock)
+
+/*
+ * Use macro wrappers in order to exploit consumers tracking.
+ */
+#define	BUF_LOCK(bp, locktype, interlock)				\
+	_BUF_LOCK((bp), (locktype), (interlock), LOCK_FILE, LOCK_LINE)
+#define	BUF_TIMELOCK(bp, locktype, interlock, wmesg, catch, timo)	\
+	_BUF_TIMELOCK((bp), (locktype), (interlock), (wmesg), (catch),	\
+	    (timo), LOCK_FILE, LOCK_LINE)
 
 /*
  * Buffer lock assertions.
@@ -349,10 +351,8 @@
 	_lockmgr_assert(&(bp)->b_lock, KA_XLOCKED, LOCK_FILE, LOCK_LINE)
 #define	BUF_ASSERT_UNLOCKED(bp)						\
 	_lockmgr_assert(&(bp)->b_lock, KA_UNLOCKED, LOCK_FILE, LOCK_LINE)
-#define	BUF_ASSERT_HELD(bp)						\
-	_lockmgr_assert(&(bp)->b_lock, KA_HELD, LOCK_FILE, LOCK_LINE)
-#define	BUF_ASSERT_UNHELD(bp)						\
-	_lockmgr_assert(&(bp)->b_lock, KA_UNHELD, LOCK_FILE, LOCK_LINE)
+#define	BUF_ASSERT_HELD(bp)
+#define	BUF_ASSERT_UNHELD(bp)
 #else
 #define	BUF_ASSERT_LOCKED(bp)
 #define	BUF_ASSERT_SLOCKED(bp)
@@ -369,13 +369,8 @@
  * original owning process can no longer acquire it recursively, but must
  * wait until the I/O is completed and the lock has been freed by biodone.
  */
-static __inline void BUF_KERNPROC(struct buf *);
-static __inline void
-BUF_KERNPROC(struct buf *bp)
-{
-
-	lockmgr_disown(&bp->b_lock);
-}
+#define	BUF_KERNPROC(bp)						\
+	_lockmgr_disown(&(bp)->b_lock, LOCK_FILE, LOCK_LINE)
 #endif
 
 #endif /* _KERNEL */

==== //depot/projects/dtrace/src/usr.bin/fstat/zfs/Makefile#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/usr.bin/fstat/zfs/Makefile,v 1.3 2008/01/24 07:24:30 ru Exp $
+# $FreeBSD: src/usr.bin/fstat/zfs/Makefile,v 1.4 2008/03/27 23:21:25 jb Exp $
 
 .PATH: ${.CURDIR}/..
 
@@ -6,14 +6,14 @@
 OBJS=	zfs.o
 WARNS?=	1
 
-CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
 CFLAGS+= -I${.CURDIR}/..
 
 all: ${OBJS}

From owner-p4-projects@FreeBSD.ORG  Fri Mar 28 01:28:03 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 18F851065675; Fri, 28 Mar 2008 01:28: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 C94FE1065673
	for ; Fri, 28 Mar 2008 01:28:02 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9B35F8FC17
	for ; Fri, 28 Mar 2008 01:28:02 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2S1S28i004777
	for ; Fri, 28 Mar 2008 01:28:02 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2S1S2nZ004775
	for perforce@freebsd.org; Fri, 28 Mar 2008 01:28:02 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 28 Mar 2008 01:28:02 GMT
Message-Id: <200803280128.m2S1S2nZ004775@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138774 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 28 Mar 2008 01:28:03 -0000

http://perforce.freebsd.org/chv.cgi?CH=138774

Change 138774 by jb@jb_freebsd1 on 2008/03/28 01:27:52

	Add some compat headers in the new location.

Affected files ...

.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/dtrace.h#1 add
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/libproc.h#1 add

Differences ...

From owner-p4-projects@FreeBSD.ORG  Fri Mar 28 01:30:05 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 25A0E106566C; Fri, 28 Mar 2008 01:30: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 D24D0106564A
	for ; Fri, 28 Mar 2008 01:30:04 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id BB7888FC1A
	for ; Fri, 28 Mar 2008 01:30:04 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2S1U4um006091
	for ; Fri, 28 Mar 2008 01:30:04 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2S1U4YB006089
	for perforce@freebsd.org; Fri, 28 Mar 2008 01:30:04 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 28 Mar 2008 01:30:04 GMT
Message-Id: <200803280130.m2S1U4YB006089@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138775 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 28 Mar 2008 01:30:05 -0000

http://perforce.freebsd.org/chv.cgi?CH=138775

Change 138775 by jb@jb_freebsd1 on 2008/03/28 01:29:30

	Re-integration from OpenSolaris to get get the files in the new place.

Affected files ...

.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/Makefile#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/Makefile.subdirs#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/README#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/Makefile#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/Makefile#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/baddof.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/badioctl/Makefile#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/badioctl/badioctl.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/Makefile#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/Makefile.com#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/amd64/Makefile#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/chkargs.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/i386/Makefile#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/sparc/Makefile#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/sparcv9/Makefile#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/Getopt.java#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/JDTrace.java#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/Makefile#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/jdtrace.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/manifest/jdtrace.jar-manifest#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/Makefile#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/Makefile#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/Makefile.com#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/Makefile#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_FUNC.bad.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_MDIM.bad.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_NULL.bad.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_REDEF.redef.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.avgtoofew.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.maxnoarg.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.mintoofew.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.quantizetoofew.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.sumtoofew.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_AGGARG.bad.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_PROTO.bad.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_IDENT.bad.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_UNDEF.badaggfunc.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badexpr.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badkey3.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.noeffect.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey1.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey2.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey4.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqbad1.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqshort.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASEVAL.bad.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMTYPE.lqbad1.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMVAL.bad.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.order.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.order.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHSTEP.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MISMATCH.lqbadarg.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPLARGE.lqtoofew.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPSMALL.bad.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPTYPE.lqbadinc.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPVAL.bad.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_AGGARG.bad.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_PROTO.bad.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_SCALAR.bad.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_ARG.lquantizetoofew.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgnoarg.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgtoomany.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.counttoomany.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizenoarg.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizetoomany.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxnoarg.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxtoomany.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.minnoarg.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.mintoomany.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizenoarg.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizetoomany.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumnoarg.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumtoomany.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_AGGARG.bad.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badmany.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badnone.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_SCALAR.bad.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg_neg.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg_neg.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count3.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.goodkey.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max_neg.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max_neg.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min_neg.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min_neg.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs1.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signature.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.subr.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_1.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_2.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.modby0.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.addmin.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.divmin.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muladd.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muldiv.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.basics.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.complex.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_ARR_BADREF.bad.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRBIG.toobig.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRNULL.bad.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRSUB.bad.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_PROTO_TYPE.badtuple.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_IDENT_UNDEF.badureg.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic1.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic2.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic3.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic4.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic5.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic6.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.uregsarray.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.this.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_ARG.badsig.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toofew.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toomany.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_SYNTAX.errassign.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.tupoflow.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.cpyarray.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.diffprofile.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.initialize.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.invalidref.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.misc.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.orthogonality.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.this.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.valassign.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.begin.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.tick.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_ADDROF_BITFIELD.BitfieldAddress.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.NegBitField.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.ZeroBitField.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.ExceedBaseType.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.GreaterThan64.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFTYPE.badtype.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_OFFSETOF_BITFIELD.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_SIZEOF_BITFIELD.SizeofBitfield.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.BitFieldPromotion.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.SizeofBitField.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.end.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize1.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize2.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize3.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.zerobuf.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.alignring.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.cputime.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.dynvarsize.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize1.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize2.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize3.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring1.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.smallring.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.cpuusage.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.nice.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.priority.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.prsize.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.rssize.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0clause.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8clause.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller1.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid1.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno1.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.execname.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.hpriority.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id1.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl1.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo1.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid1.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo1.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid1.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.timestamp.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.vtimestamp.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggfun.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggtup.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.arrtup.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.body.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.both.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.pred.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.nopred.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.pred.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predfirst.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predlast.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LOCASSC.NonLocalAssoc.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LONGINT.LongStruct.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PARMCLASS.BadStorageClass.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_NAME.VoidName.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_TYPE.Dyn.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VARARGS.VarLenArgs.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VOID.NonSoleVoid.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_SIGNINT.UnsignedStruct.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_VOIDATTR.ShortVoidDecl.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.arrays.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.basics.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.funcs.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.pointers.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.varargsfuncs.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/badptr.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/countdown.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/counter.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/errorpath.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/hello.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/kstat.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/ksyms.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/renormalize.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rtime.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rw.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwinfo.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwtime.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/specopen.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/truss.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/trussrw.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/userfunc.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_AGGREGATION.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DBLERROR.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DYNAMIC.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.end.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPEC.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPECUNAVAIL.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_STKSTROVERFLOW.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/err.D_PDESC_ZERO.InvalidDescription1.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.APIVersion.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.AddSearchPath.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.CoalesceTrace.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ELFGeneration.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.IncludedFilePath.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithFunctions#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithIDs#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithModules#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithNames#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithProviders#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ShowCompilerCode.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceFunctions#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceIDs#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceModule#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceNames#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceProvider#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.VerboseStabilityReport.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.AddSearchPath.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeGiga.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeKilo.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeMega.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeTera.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel32.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel64.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithoutW.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationOut.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationWithO.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus1.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus2.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExtraneousProbeIds.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName1.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName2.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId1.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId2.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId3.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule1.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule2.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule3.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule4.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProbeIdentifier.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider1.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider2.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider3.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider4.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc1.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc2.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc3.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc4.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc5.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc6.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc7.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc8.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc9.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID1.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID2.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID3.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID4.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID5.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID6.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID7.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule1.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule2.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule3.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule4.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule5.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule6.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule7.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule8.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName1.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName2.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName3.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName4.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName5.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName6.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName7.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName8.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName9.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider1.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider2.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider3.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider4.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider5.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.MultipleInvalidProbeId.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.PreprocessorStatement.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.UnDefineNameWithCPP.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbeIdentfier.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbesWithoutZ.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/err.D_IDENT_UNDEF.timespent.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.end.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.endwithoutbegin.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multibeginend.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multiend.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_DECL_IDRED.EnumSameName.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_UNKNOWN.RepeatIdentifiers.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumEquality.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumSameValue.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumValAssign.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_BADADDR.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_DIVZERO.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_UNKNOWN.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.error.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.errorend.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.D_PROTO_LEN.noarg.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.exitarg1.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/tst.basic1.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/err.D_PDESC_ZERO.notreturn.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.basic.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionentry.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionreturnvalue.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.ioctlargs.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offset.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offsetzero.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return0.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.tailcall.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_FUNC_UNDEF.progenyofbad1.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_OP_VFPTR.badop.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.chillbadarg.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.copyoutbadarg.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.mobadarg.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.raisebadarg.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.allocanoarg.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.badbreakpoint.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoofew.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoomany.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrbadarg.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrtoofew.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoofew.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoomany.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoofew.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoomany.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtabadarg.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoofew.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoomany.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.panicbadarg.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.progenyofbad2.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.stopbadarg.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_STRINGOF_TYPE.badstringof.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_VAR_UNDEF.badvar.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca2.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy1.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy2.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy3.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy4.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy5.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy6.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badchill.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.chillbadarg.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyout.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutbadaddr.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutstrbadaddr.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntoa6badaddr.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntoabadaddr.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntopbadaddr.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntopbadarg.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.badfreopen.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.bcopy.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.chill.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.cleanpath.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.cleanpath.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.copyin.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.copyinto.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ddi_pathname.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.default.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.freopen.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ftruncate.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ftruncate.ksh.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.hton.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.index.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.index.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa6.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa6.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostr.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostr.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owned.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owner.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_type_adaptive.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.progenyof.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.rand.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strchr.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strchr.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strstr.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strstr.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok_null.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/err.D_ADDROF_LVAL.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/err.D_EMPTY.empty.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/tst.clauses.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/tst.stmts.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_DECL_IDRED.redef1.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_DECL_IDRED.redef2.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_IDENT_UNDEF.recur.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef1.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef2.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.badxlate.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineDataAssign.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineExpression.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineKinds.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineKinds.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineTypedef.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineWritableAssign.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/Makefile#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/manifest/test.jar-manifest#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestAbort.java#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestBean.java#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestClose.java#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestDrop.java#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestEnable.java#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestFunctionLookup.java#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestMaxConsumers.java#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestMultiAggPrinta.java#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestProbeData.java#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestProbeDescription.java#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestStateMachine.java#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestStopLock.java#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Abort.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Abort.ksh.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Bean.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Bean.ksh.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Close.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Close.ksh.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Drop.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Drop.ksh.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Enable.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Enable.ksh.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.ksh.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MaxConsumers.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MaxConsumers.ksh.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MultiAggPrinta.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MultiAggPrinta.ksh.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.ksh.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeDescription.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeDescription.ksh.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StateMachine.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StateMachine.ksh.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StopLock.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StopLock.ksh.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.printa.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.printa.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NL.char.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NULL.char.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_INT_DIGIT.InvalidDigit.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_INT_OFLOW.BigInt.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_STR_NL.string.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brace1.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brace2.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack1.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack2.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack3.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren1.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren2.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren3.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/tst.D_MACRO_OFLOW.ParIntOvflow.d.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/mdb/tst.dtracedcmd.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.icmp.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.tcp.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.udp.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/err.D_PRAGMA_OPTSET.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.badopt.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.boolopt.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.boolopt.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dynopt.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dynopt.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.enablerace.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.haslam.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.include.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.roch.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.schrock.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/err.D_PRINTA_AGGKEY.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/err.D_PRINTA_AGGPROTO.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.many.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.many.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.same.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.same.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sort.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sort.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sortpos.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sortpos.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.tuplecompat.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.tuplecompat.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero2.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero2.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero3.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero3.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call3.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call3.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_BITFIELD.bitfield.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_TYPE.badtype.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_TYPE.notsou.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.OffsetofNULL.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.badmemb.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofAlias.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofArith.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofUnion.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.struct.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.struct.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.union.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.union.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/operators/tst.ternary.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/operators/tst.ternary.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.exe#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badproc1.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_BADPID.badproc2.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_CREATEFAIL.many.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_CREATEFAIL.many.exe#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.exe#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.exe#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.exe#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.exe#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.exe#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.exe#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.addprobes.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.exe#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.exe#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.float.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.float.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.main.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.manypids.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.probemod.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex1.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex2.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex2.ksh.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex3.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex3.ksh.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex4.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex4.ksh.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.exe#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.exe#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.BadAlign.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.ArrayVar.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.DynamicVar.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.agg.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_DEREF_NONPTR.noptr.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_DEREF_VOID.VoidPointerDeref.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_ARRFUN.ArrayAssignment.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_INCOMPAT.VoidPointerArith.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_LVAL.AddressChange.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_PTR.NonPointerAccess.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_PTR.badpointer.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_SOU.BadPointerAccess.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_SOU.badpointer.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress1.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress2.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress3.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress4.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress5.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer1.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer2.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer3.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.GlobalVar.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.IntegerArithmetic1.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic1.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic2.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic3.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerAssignment.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ValidPointer1.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ValidPointer2.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.VoidCast.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.basic1.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.basic2.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGERR.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_INVAL.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_MALFORM.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_UNUSED.UnusedPragma.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.circlibdep.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.invalidlibdep.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libdep.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libdepfullyconnected.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_PRED_SCALAR.NonScalarPred.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_SYNTAX.invalid.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_SYNTAX.operr.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.argsnotcached.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.basics.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.basics.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.complex.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.complex.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.predcache.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_IDENT_UNDEF.afterprobe.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_PRAGCTL_INVAL.tabdefine.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_SYNTAX.withoutpound.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.defincomp.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefelsenotendif.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefincomp.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefnotendif.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.incompelse.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.mulelse.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifdef.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifdef.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifndef.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifndef.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifnotdef.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifnotdef.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicaland.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicaland.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalandor.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalandor.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalor.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalor.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.muland.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.muland.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.mulor.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.mulor.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.precondi.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.precondi.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.predicatedeclare.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexp.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexp.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpelse.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpelse.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpif.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpif.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpifelse.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpifelse.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.withinprobe.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badagg.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badfmt.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badval.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_PROTO.bad.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.jstack.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.stack.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.ustack.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.basics.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.basics.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.def.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.def.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.dynwidth.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.dynwidth.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.fmt.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.fmt.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.many.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.manyval.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.manyval.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.stack.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.tuple.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.tuple.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_AGG_CONV.aggfmt.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_EXTRA.toomany.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_EXTRA.widths.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_FMT.badfmt.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_PROTO.novalue.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_TYPE.aggarg.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_TYPE.recursive.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_PROTO.noprec.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_PROTO.nowidth.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_TYPE.badprec.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_TYPE.badwidth.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PROTO_LEN.toofew.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv1.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv2.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv3.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.flags.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.flags.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.hello.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.hello.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.ints.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.ints.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.precs.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.precs.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.print-f.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.print-f.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printT.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printT.ksh.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printY.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printY.ksh.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printcont.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printcont.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printeE.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printeE.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printgG.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printgG.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.rawfmt.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.rawfmt.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.uints.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.uints.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths1.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.wp.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.wp.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.func_access.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.op_access.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.unpriv_funcs.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.probeqtn.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.probestar.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.tickstar.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.assign.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.declare.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.declarein.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.lbraces.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.probespec.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.rbraces.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.recdec.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.basic1.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.check.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.declare.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.declareafter.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.emptyprobe.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragma.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmaaftertab.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmainside.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmaoutside.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.probestar.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.create.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.discard.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exec.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ENOENT.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitcore.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitexit.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitkilled.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.signal.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.startexit.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZERO.profile.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROonens.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROonensec.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROoneus.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROoneusec.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.argtest.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.argtest.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.basic.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.basic.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.func.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.mod.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilehz.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilehz.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilems.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilems.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilemsec.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilemsec.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilenhz.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilenhz.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilens.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilens.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilensec.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilensec.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profiles.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profiles.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilesec.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilesec.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileus.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileus.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileusec.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileusec.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.sym.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufuncsort.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufuncsort.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufuncsort.ksh.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_INVAL.wrongdec4.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.nonprofile.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.wrongdec1.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.wrongdec2.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.wrongdec3.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.basics.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.basics.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.beginexit.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.beginprof.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.beginprof.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probattrs.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probattrs.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probefunc.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probefunc.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probemod.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probemod.d.out#1 branch

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Fri Mar 28 01:48:24 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 667011065673; Fri, 28 Mar 2008 01:48: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 242A51065671
	for ; Fri, 28 Mar 2008 01:48: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 0D6438FC26
	for ; Fri, 28 Mar 2008 01:48:24 +0000 (UTC)
	(envelope-from julian@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2S1mOjS006857
	for ; Fri, 28 Mar 2008 01:48:24 GMT
	(envelope-from julian@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2S1mNTc006854
	for perforce@freebsd.org; Fri, 28 Mar 2008 01:48:23 GMT
	(envelope-from julian@freebsd.org)
Date: Fri, 28 Mar 2008 01:48:23 GMT
Message-Id: <200803280148.m2S1mNTc006854@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 138776 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 28 Mar 2008 01:48:24 -0000

http://perforce.freebsd.org/chv.cgi?CH=138776

Change 138776 by julian@julian_trafmon1 on 2008/03/28 01:47:36

	Integ to 138773
	is will allow generation of good diffs using teh suplied script.

Affected files ...

.. //depot/projects/qingli_mpath/src/Makefile#3 integrate
.. //depot/projects/qingli_mpath/src/ObsoleteFiles.inc#3 integrate
.. //depot/projects/qingli_mpath/src/cddl/Makefile.inc#2 integrate
.. //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/include/alloca.h#1 branch
.. //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/include/devid.h#1 branch
.. //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/include/fcntl.h#1 branch
.. //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/include/fsshare.h#1 branch
.. //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/include/libintl.h#1 branch
.. //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/include/mnttab.h#1 branch
.. //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/include/priv.h#1 branch
.. //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/include/solaris.h#1 branch
.. //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/include/stdio.h#1 branch
.. //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/include/stdlib.h#1 branch
.. //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/include/strings.h#1 branch
.. //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/include/unistd.h#1 branch
.. //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/include/zone.h#1 branch
.. //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/lib/libumem/umem.c#1 branch
.. //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/lib/libumem/umem.h#1 branch
.. //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/misc/deviceid.c#1 branch
.. //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/misc/fsshare.c#1 branch
.. //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/misc/mkdirp.c#1 branch
.. //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/misc/mnttab.c#1 branch
.. //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/misc/zmount.c#1 branch
.. //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/misc/zone.c#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/cmd/zdb/zdb.8#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/cmd/zdb/zdb.c#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/cmd/zfs/zfs.8#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/cmd/zfs/zfs_util.h#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/cmd/zpool/zpool.8#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/cmd/zpool/zpool_iter.c#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/cmd/zpool/zpool_util.c#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/cmd/ztest/ztest.c#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/head/assert.h#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/head/atomic.h#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/head/libintl.h#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/head/stdio_ext.h#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/head/synch.h#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/head/thread.h#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.h#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/lib/libnvpair/nvpair_alloc_system.c#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/lib/libuutil/common/libuutil.h#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/lib/libuutil/common/libuutil_impl.h#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_avl.c#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_ident.c#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_list.c#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_misc.c#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_open.c#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_pname.c#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_strtoint.c#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c#1 branch
.. //depot/projects/qingli_mpath/src/cddl/contrib/opensolaris/lib/libzpool/common/util.c#1 branch
.. //depot/projects/qingli_mpath/src/cddl/lib/libavl/Makefile#2 integrate
.. //depot/projects/qingli_mpath/src/cddl/lib/libnvpair/Makefile#2 integrate
.. //depot/projects/qingli_mpath/src/cddl/lib/libumem/Makefile#2 integrate
.. //depot/projects/qingli_mpath/src/cddl/lib/libuutil/Makefile#2 integrate
.. //depot/projects/qingli_mpath/src/cddl/lib/libzfs/Makefile#2 integrate
.. //depot/projects/qingli_mpath/src/cddl/lib/libzpool/Makefile#2 integrate
.. //depot/projects/qingli_mpath/src/cddl/sbin/zfs/Makefile#2 integrate
.. //depot/projects/qingli_mpath/src/cddl/sbin/zpool/Makefile#2 integrate
.. //depot/projects/qingli_mpath/src/cddl/usr.bin/ztest/Makefile#2 integrate
.. //depot/projects/qingli_mpath/src/cddl/usr.sbin/zdb/Makefile#2 integrate
.. //depot/projects/qingli_mpath/src/compat/opensolaris/include/alloca.h#2 delete
.. //depot/projects/qingli_mpath/src/compat/opensolaris/include/devid.h#2 delete
.. //depot/projects/qingli_mpath/src/compat/opensolaris/include/fcntl.h#2 delete
.. //depot/projects/qingli_mpath/src/compat/opensolaris/include/fsshare.h#2 delete
.. //depot/projects/qingli_mpath/src/compat/opensolaris/include/libintl.h#2 delete
.. //depot/projects/qingli_mpath/src/compat/opensolaris/include/mnttab.h#2 delete
.. //depot/projects/qingli_mpath/src/compat/opensolaris/include/priv.h#2 delete
.. //depot/projects/qingli_mpath/src/compat/opensolaris/include/solaris.h#2 delete
.. //depot/projects/qingli_mpath/src/compat/opensolaris/include/stdio.h#2 delete
.. //depot/projects/qingli_mpath/src/compat/opensolaris/include/stdlib.h#2 delete
.. //depot/projects/qingli_mpath/src/compat/opensolaris/include/strings.h#2 delete
.. //depot/projects/qingli_mpath/src/compat/opensolaris/include/unistd.h#2 delete
.. //depot/projects/qingli_mpath/src/compat/opensolaris/include/zone.h#2 delete
.. //depot/projects/qingli_mpath/src/compat/opensolaris/lib/libumem/umem.c#2 delete
.. //depot/projects/qingli_mpath/src/compat/opensolaris/lib/libumem/umem.h#2 delete
.. //depot/projects/qingli_mpath/src/compat/opensolaris/misc/deviceid.c#2 delete
.. //depot/projects/qingli_mpath/src/compat/opensolaris/misc/fsshare.c#2 delete
.. //depot/projects/qingli_mpath/src/compat/opensolaris/misc/mkdirp.c#2 delete
.. //depot/projects/qingli_mpath/src/compat/opensolaris/misc/mnttab.c#2 delete
.. //depot/projects/qingli_mpath/src/compat/opensolaris/misc/zmount.c#2 delete
.. //depot/projects/qingli_mpath/src/compat/opensolaris/misc/zone.c#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/OPENSOLARIS.LICENSE#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/cmd/zdb/zdb.8#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/cmd/zdb/zdb.c#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/cmd/zdb/zdb_il.c#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/cmd/zfs/zfs.8#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/cmd/zfs/zfs_iter.c#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/cmd/zfs/zfs_iter.h#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/cmd/zfs/zfs_main.c#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/cmd/zfs/zfs_util.h#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/cmd/zpool/zpool.8#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/cmd/zpool/zpool_iter.c#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/cmd/zpool/zpool_main.c#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/cmd/zpool/zpool_util.c#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/cmd/zpool/zpool_util.h#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/cmd/zpool/zpool_vdev.c#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/cmd/ztest/ztest.c#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/head/assert.h#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/head/atomic.h#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/head/libintl.h#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/head/stdio_ext.h#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/head/synch.h#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/head/thread.h#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/lib/libnvpair/libnvpair.c#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/lib/libnvpair/libnvpair.h#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/lib/libnvpair/nvpair_alloc_system.c#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/lib/libuutil/common/libuutil.h#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/lib/libuutil/common/libuutil_impl.h#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/lib/libuutil/common/uu_avl.c#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/lib/libuutil/common/uu_ident.c#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/lib/libuutil/common/uu_list.c#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/lib/libuutil/common/uu_misc.c#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/lib/libuutil/common/uu_open.c#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/lib/libuutil/common/uu_pname.c#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/lib/libuutil/common/uu_strtoint.c#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/lib/libzfs/common/libzfs.h#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/lib/libzpool/common/kernel.c#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/lib/libzpool/common/taskq.c#2 delete
.. //depot/projects/qingli_mpath/src/contrib/opensolaris/lib/libzpool/common/util.c#2 delete
.. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/main.c#3 integrate
.. //depot/projects/qingli_mpath/src/contrib/wpa_supplicant/wpa_supplicant.c#3 integrate
.. //depot/projects/qingli_mpath/src/etc/freebsd-update.conf#2 integrate
.. //depot/projects/qingli_mpath/src/etc/newsyslog.conf#2 integrate
.. //depot/projects/qingli_mpath/src/etc/periodic/security/410.logincheck#2 integrate
.. //depot/projects/qingli_mpath/src/etc/rc.d/ppp#3 integrate
.. //depot/projects/qingli_mpath/src/include/stdio.h#2 integrate
.. //depot/projects/qingli_mpath/src/lib/libc/gen/lockf.c#2 integrate
.. //depot/projects/qingli_mpath/src/lib/libc/gen/sysctl.3#2 integrate
.. //depot/projects/qingli_mpath/src/lib/libc/include/namespace.h#3 integrate
.. //depot/projects/qingli_mpath/src/lib/libc/include/un-namespace.h#3 integrate
.. //depot/projects/qingli_mpath/src/lib/libc/sys/Symbol.map#3 integrate
.. //depot/projects/qingli_mpath/src/lib/libc/sys/fcntl.2#3 integrate
.. //depot/projects/qingli_mpath/src/lib/libc/yp/xdryp.c#2 integrate
.. //depot/projects/qingli_mpath/src/lib/libc_r/uthread/uthread_sig.c#2 integrate
.. //depot/projects/qingli_mpath/src/lib/libelf/libelf_convert.m4#2 integrate
.. //depot/projects/qingli_mpath/src/lib/libkse/thread/thr_sig.c#2 integrate
.. //depot/projects/qingli_mpath/src/lib/libthr/Makefile#3 integrate
.. //depot/projects/qingli_mpath/src/lib/libthr/thread/thr_attr.c#3 integrate
.. //depot/projects/qingli_mpath/src/lib/libthr/thread/thr_exit.c#3 integrate
.. //depot/projects/qingli_mpath/src/lib/libthr/thread/thr_mutex.c#3 integrate
.. //depot/projects/qingli_mpath/src/libexec/talkd/announce.c#2 integrate
.. //depot/projects/qingli_mpath/src/share/man/man4/malo.4#1 branch
.. //depot/projects/qingli_mpath/src/share/man/man5/rc.conf.5#3 integrate
.. //depot/projects/qingli_mpath/src/share/man/man7/security.7#2 integrate
.. //depot/projects/qingli_mpath/src/share/man/man9/malloc.9#2 integrate
.. //depot/projects/qingli_mpath/src/share/man/man9/mbchain.9#2 integrate
.. //depot/projects/qingli_mpath/src/share/man/man9/mbuf.9#3 integrate
.. //depot/projects/qingli_mpath/src/sys/amd64/amd64/prof_machdep.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/amd64/conf/GENERIC#3 integrate
.. //depot/projects/qingli_mpath/src/sys/amd64/conf/NOTES#4 integrate
.. //depot/projects/qingli_mpath/src/sys/amd64/include/clock.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/amd64/include/param.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/amd64/include/timerreg.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/amd64/isa/clock.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/arm/conf/AVILA#4 integrate
.. //depot/projects/qingli_mpath/src/sys/arm/conf/BWCT#2 integrate
.. //depot/projects/qingli_mpath/src/sys/arm/conf/CRB#2 integrate
.. //depot/projects/qingli_mpath/src/sys/arm/conf/EP80219#2 integrate
.. //depot/projects/qingli_mpath/src/sys/arm/conf/HL200#2 integrate
.. //depot/projects/qingli_mpath/src/sys/arm/conf/IQ31244#2 integrate
.. //depot/projects/qingli_mpath/src/sys/arm/conf/KB920X#2 integrate
.. //depot/projects/qingli_mpath/src/sys/arm/conf/SIMICS#2 integrate
.. //depot/projects/qingli_mpath/src/sys/arm/conf/SKYEYE#2 integrate
.. //depot/projects/qingli_mpath/src/sys/arm/include/param.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/boot/i386/cdboot/cdboot.s#2 integrate
.. //depot/projects/qingli_mpath/src/sys/boot/pc98/cdboot/cdboot.s#2 integrate
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/kern/opensolaris_kstat.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/kern/opensolaris_string.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/machine/endian.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/rpc/xdr.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/acl.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/atomic.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/bitmap.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/byteorder.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/callb.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/cmn_err.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/cpupart.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/cpuvar.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/cred.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/cyclic.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/debug.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/dirent.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/dkio.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/dnlc.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/elf.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/kcondvar.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/kmem.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/kobj.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/kstat.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/lock.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/misc.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/mman.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/mntent.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/mnttab.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/modctl.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/mount.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/mutex.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/objfs.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/param.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/pcpu.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/policy.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/proc.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/random.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/rwlock.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/sdt.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/stat.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/string.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/sunddi.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/sysmacros.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/systm.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/taskq.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/taskq_impl.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/time.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/types.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/uio.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/varargs.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/vfs.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/vnode.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/zone.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/common/atomic/ia64/atomic.S#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/common/avl/avl.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/Makefile.files#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/gzip.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/unique.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/os/callb.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/os/list.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/os/taskq.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_mem.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/sys/asm_linkage.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/sys/avl_impl.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/sys/bitmap.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/sys/byteorder.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/sys/callb.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/sys/ccompile.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/sys/compress.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/sys/cred.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/sys/dkio.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/sys/dklabel.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/sys/errorq.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/sys/feature_tests.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/protocol.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/util.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/sys/gfs.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/sys/list.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/sys/list_impl.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/sys/note.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair_impl.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/sys/processor.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/sys/procset.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/sys/sdt.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/sys/synch.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/sys/vmem.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/sys/zmod.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/zmod/adler32.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/zmod/deflate.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/zmod/deflate.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inffast.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inffast.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inffixed.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inflate.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inflate.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inftrees.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inftrees.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/zmod/trees.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zconf.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zlib.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod_subr.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zutil.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zutil.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/compat/freebsd32/freebsd32_proto.h#3 integrate
.. //depot/projects/qingli_mpath/src/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate
.. //depot/projects/qingli_mpath/src/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/compat/freebsd32/syscalls.master#3 integrate
.. //depot/projects/qingli_mpath/src/sys/compat/linux/linux_file.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/compat/linux/linux_misc.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/kern/opensolaris_atomic.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/kern/opensolaris_kmem.c#3 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/kern/opensolaris_kobj.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/kern/opensolaris_kstat.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/kern/opensolaris_misc.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/kern/opensolaris_policy.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/kern/opensolaris_string.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/kern/opensolaris_zone.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/machine/endian.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/rpc/xdr.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/sys/acl.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/sys/atomic.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/sys/bitmap.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/sys/byteorder.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/sys/callb.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/sys/cmn_err.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/sys/cpupart.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/sys/cpuvar.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/sys/cred.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/sys/cyclic.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/sys/debug.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/sys/dirent.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/sys/dkio.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/sys/dnlc.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/sys/elf.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/sys/kcondvar.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/sys/kmem.h#3 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/sys/kobj.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/sys/kstat.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/sys/lock.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/sys/misc.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/sys/mman.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/sys/mntent.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/sys/mnttab.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/sys/modctl.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/sys/mount.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/sys/mutex.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/sys/objfs.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/sys/param.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/sys/pcpu.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/sys/policy.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/sys/proc.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/sys/random.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/sys/rwlock.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/sys/sdt.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/sys/stat.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/sys/string.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/sys/sunddi.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/sys/sysmacros.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/sys/systm.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/sys/taskq.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/sys/taskq_impl.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/sys/time.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/sys/types.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/sys/uio.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/sys/varargs.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/sys/vfs.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/sys/vnode.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/opensolaris/sys/zone.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/compat/svr4/svr4_fcntl.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/conf/NOTES#4 integrate
.. //depot/projects/qingli_mpath/src/sys/conf/files#5 integrate
.. //depot/projects/qingli_mpath/src/sys/conf/options#4 integrate
.. //depot/projects/qingli_mpath/src/sys/conf/options.amd64#2 integrate
.. //depot/projects/qingli_mpath/src/sys/conf/options.i386#2 integrate
.. //depot/projects/qingli_mpath/src/sys/conf/options.pc98#2 integrate
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/OPENSOLARIS.LICENSE#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/common/acl/acl_common.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/common/acl/acl_common.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/common/atomic/i386/atomic.S#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/common/atomic/ia64/atomic.S#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/common/avl/avl.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/common/nvpair/nvpair.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/common/zfs/zfs_namecheck.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/common/zfs/zfs_namecheck.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/common/zfs/zfs_prop.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/common/zfs/zfs_prop.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/Makefile.files#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/gfs.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#3 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/bplist.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/gzip.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/refcount.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/sha256.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/space_map.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/txg.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/unique.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/os/callb.c#3 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/os/list.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/os/taskq.c#3 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/rpc/xdr.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/rpc/xdr.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/rpc/xdr_array.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/rpc/xdr_mem.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/sys/asm_linkage.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/sys/avl.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/sys/avl_impl.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/sys/bitmap.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/sys/byteorder.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/sys/callb.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/sys/ccompile.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/sys/compress.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/sys/cred.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/sys/debug.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/sys/dkio.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/sys/dklabel.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/sys/errorq.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/sys/feature_tests.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/sys/fm/protocol.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/sys/fm/util.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/sys/gfs.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/sys/list.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/sys/list_impl.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/sys/note.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/sys/nvpair.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/sys/nvpair_impl.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/sys/processor.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/sys/procset.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/sys/sdt.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/sys/synch.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/sys/sysevent.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/sys/vmem.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/sys/zmod.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/zmod/adler32.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/zmod/crc32.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/zmod/crc32.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/zmod/deflate.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/zmod/deflate.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/zmod/inffast.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/zmod/inffast.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/zmod/inffixed.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/zmod/inflate.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/zmod/inflate.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/zmod/inftrees.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/zmod/inftrees.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/zmod/trees.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/zmod/zconf.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/zmod/zlib.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/zmod/zmod.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/zmod/zmod_subr.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/zmod/zutil.c#2 delete
.. //depot/projects/qingli_mpath/src/sys/contrib/opensolaris/uts/common/zmod/zutil.h#2 delete
.. //depot/projects/qingli_mpath/src/sys/ddb/db_command.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/ddb/db_ps.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/ddb/ddb.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/aac/aac.c#5 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/aac/aac_disk.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/aac/aacreg.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/aac/aacvar.h#3 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/en/midway.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/fatm/if_fatm.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/firewire/if_fwe.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/firewire/if_fwip.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/iscsi/initiator/isc_soc.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/malo/if_malo.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/dev/malo/if_malo.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/dev/malo/if_malo_pci.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/dev/malo/if_malohal.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/dev/malo/if_malohal.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/dev/malo/if_maloioctl.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/dev/re/if_re.c#4 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/speaker/spkr.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/syscons/syscons.c#4 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/ti/if_ti.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/usb/ucom.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/usb/ucomvar.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/usb/usbdevs#4 integrate
.. //depot/projects/qingli_mpath/src/sys/fs/msdosfs/msdosfs_vnops.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/fs/tmpfs/tmpfs_vnops.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/i386/conf/GENERIC#3 integrate
.. //depot/projects/qingli_mpath/src/sys/i386/conf/NOTES#4 integrate
.. //depot/projects/qingli_mpath/src/sys/i386/conf/XBOX#2 integrate
.. //depot/projects/qingli_mpath/src/sys/i386/i386/pmap.c#4 integrate
.. //depot/projects/qingli_mpath/src/sys/i386/i386/trap.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/i386/ibcs2/ibcs2_fcntl.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/i386/include/clock.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/i386/include/param.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/i386/include/pmap.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/i386/include/timerreg.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/i386/include/vmparam.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/i386/isa/clock.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/i386/isa/prof_machdep.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/i386/isa/vesa.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/ia64/conf/GENERIC#3 integrate
.. //depot/projects/qingli_mpath/src/sys/ia64/ia64/machdep.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/ia64/include/clock.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/ia64/include/param.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/isa/syscons_isa.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/kern/init_sysent.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/kern/kern_cpuset.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/kern/kern_descrip.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/kern/kern_lockf.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/kern/makesyscalls.sh#2 integrate
.. //depot/projects/qingli_mpath/src/sys/kern/subr_mchain.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/kern/subr_taskqueue.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/kern/syscalls.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/kern/syscalls.master#3 integrate
.. //depot/projects/qingli_mpath/src/sys/kern/systrace_args.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/kern/tty_cons.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/kern/uipc_mbuf.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/kern/uipc_socket.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/kern/uipc_syscalls.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/kern/vnode_if.src#3 integrate
.. //depot/projects/qingli_mpath/src/sys/modules/Makefile#3 integrate
.. //depot/projects/qingli_mpath/src/sys/modules/bktr/bktr/Makefile#2 integrate
.. //depot/projects/qingli_mpath/src/sys/modules/em/Makefile#3 integrate
.. //depot/projects/qingli_mpath/src/sys/modules/igb/Makefile#2 integrate
.. //depot/projects/qingli_mpath/src/sys/modules/ixgbe/Makefile#2 integrate
.. //depot/projects/qingli_mpath/src/sys/modules/krpc/Makefile#1 branch
.. //depot/projects/qingli_mpath/src/sys/modules/malo/Makefile#1 branch
.. //depot/projects/qingli_mpath/src/sys/modules/nfslockd/Makefile#1 branch
.. //depot/projects/qingli_mpath/src/sys/modules/sound/driver/emu10kx/Makefile#3 integrate
.. //depot/projects/qingli_mpath/src/sys/modules/uslcom/Makefile#2 integrate
.. //depot/projects/qingli_mpath/src/sys/modules/wpi/Makefile#2 integrate
.. //depot/projects/qingli_mpath/src/sys/modules/zfs/Makefile#3 integrate
.. //depot/projects/qingli_mpath/src/sys/net/bpf.c#4 integrate
.. //depot/projects/qingli_mpath/src/sys/net/bpf_zerocopy.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/net/if.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/net/if.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/net/if_ef.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/net/if_fddisubr.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/net/if_iso88025subr.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/net/if_media.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/net/if_sl.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/net/if_var.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/net/raw_cb.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/netatalk/aarp.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/netatm/port.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/netgraph/ng_base.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/netgraph/ng_car.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/netgraph/ng_pptpgre.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/netinet/ip_output.c#4 integrate
.. //depot/projects/qingli_mpath/src/sys/netinet6/ip6_output.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/netncp/ncp_sock.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/netsmb/smb_iod.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/netsmb/smb_rq.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/netsmb/smb_trantcp.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/nfs/nfs_common.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/nfs4client/nfs4_vnops.c#4 integrate
.. //depot/projects/qingli_mpath/src/sys/nfsclient/krpc_subr.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/nfsclient/nfs_lock.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/nfsclient/nfs_socket.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/nfsclient/nfs_subs.c#4 integrate
.. //depot/projects/qingli_mpath/src/sys/nfsclient/nfs_vnops.c#4 integrate
.. //depot/projects/qingli_mpath/src/sys/nfsserver/nfs_serv.c#4 integrate
.. //depot/projects/qingli_mpath/src/sys/nfsserver/nfs_srvcache.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/nfsserver/nfs_srvsock.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/nfsserver/nfs_srvsubs.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/nfsserver/nfs_syscalls.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/nlm/nlm.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/nlm/nlm_prot.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/nlm/nlm_prot_clnt.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/nlm/nlm_prot_impl.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/nlm/nlm_prot_server.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/nlm/nlm_prot_svc.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/nlm/nlm_prot_xdr.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/nlm/sm_inter.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/nlm/sm_inter_xdr.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/pc98/cbus/clock.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/pc98/cbus/syscons_cbus.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/pc98/conf/GENERIC#3 integrate
.. //depot/projects/qingli_mpath/src/sys/pc98/conf/NOTES#3 integrate
.. //depot/projects/qingli_mpath/src/sys/pc98/include/clock.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/pc98/include/timerreg.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/pci/if_mn.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/powerpc/aim/clock.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/powerpc/booke/clock.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/powerpc/conf/GENERIC#3 integrate
.. //depot/projects/qingli_mpath/src/sys/powerpc/include/clock.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/powerpc/include/param.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/rpc/auth.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/rpc/auth_none.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/rpc/auth_unix.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/rpc/authunix_prot.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/rpc/clnt.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/rpc/clnt_dg.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/rpc/clnt_rc.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/rpc/clnt_stat.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/rpc/clnt_vc.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/rpc/getnetconfig.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/rpc/inet_ntop.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/rpc/inet_pton.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/rpc/netconfig.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/rpc/nettype.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/rpc/pmap_prot.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/rpc/rpc.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/rpc/rpc_callmsg.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/rpc/rpc_com.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/rpc/rpc_generic.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/rpc/rpc_msg.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/rpc/rpc_prot.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/rpc/rpcb_clnt.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/rpc/rpcb_clnt.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/rpc/rpcb_prot.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/rpc/rpcb_prot.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/rpc/rpcclnt.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/rpc/svc.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/rpc/svc.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/rpc/svc_auth.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/rpc/svc_auth.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/rpc/svc_auth_unix.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/rpc/svc_dg.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/rpc/svc_generic.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/rpc/svc_vc.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/rpc/types.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/rpc/xdr.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/sparc64/conf/GENERIC#3 integrate
.. //depot/projects/qingli_mpath/src/sys/sparc64/include/clock.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/sparc64/include/param.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/sparc64/sparc64/clock.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/sun4v/conf/GENERIC#2 integrate
.. //depot/projects/qingli_mpath/src/sys/sun4v/include/clock.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/sun4v/include/cpu.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/sun4v/include/param.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/sys/buf.h#4 integrate
.. //depot/projects/qingli_mpath/src/sys/sys/cdefs.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/sys/cpuset.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/sys/fcntl.h#3 integrate
.. //depot/projects/qingli_mpath/src/sys/sys/lockf.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/sys/mbuf.h#4 integrate
.. //depot/projects/qingli_mpath/src/sys/sys/param.h#4 integrate
.. //depot/projects/qingli_mpath/src/sys/sys/syscall.h#3 integrate
.. //depot/projects/qingli_mpath/src/sys/sys/syscall.mk#3 integrate
.. //depot/projects/qingli_mpath/src/sys/sys/sysproto.h#3 integrate
.. //depot/projects/qingli_mpath/src/sys/sys/systm.h#3 integrate
.. //depot/projects/qingli_mpath/src/sys/sys/taskqueue.h#3 integrate
.. //depot/projects/qingli_mpath/src/sys/ufs/ffs/ffs_vfsops.c#4 integrate
.. //depot/projects/qingli_mpath/src/sys/ufs/ufs/ufs_vnops.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/xdr/xdr.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/xdr/xdr_array.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/xdr/xdr_mbuf.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/xdr/xdr_mem.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/xdr/xdr_reference.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/xdr/xdr_sizeof.c#1 branch
.. //depot/projects/qingli_mpath/src/tools/regression/file/flock/Makefile#1 branch
.. //depot/projects/qingli_mpath/src/tools/regression/file/flock/flock.c#1 branch
.. //depot/projects/qingli_mpath/src/usr.bin/awk/Makefile#3 integrate
.. //depot/projects/qingli_mpath/src/usr.bin/checknr/checknr.c#2 integrate
.. //depot/projects/qingli_mpath/src/usr.bin/fstat/zfs/Makefile#3 integrate
.. //depot/projects/qingli_mpath/src/usr.bin/xlint/lint1/lint1.h#2 integrate
.. //depot/projects/qingli_mpath/src/usr.sbin/Makefile#3 integrate
.. //depot/projects/qingli_mpath/src/usr.sbin/clear_locks/Makefile#1 branch
.. //depot/projects/qingli_mpath/src/usr.sbin/clear_locks/clear_locks.8#1 branch
.. //depot/projects/qingli_mpath/src/usr.sbin/clear_locks/clear_locks.c#1 branch
.. //depot/projects/qingli_mpath/src/usr.sbin/freebsd-update/freebsd-update.sh#3 integrate
.. //depot/projects/qingli_mpath/src/usr.sbin/rpc.lockd/lockd.c#2 integrate
.. //depot/projects/qingli_mpath/src/usr.sbin/rpc.lockd/rpc.lockd.8#2 integrate

Differences ...

==== //depot/projects/qingli_mpath/src/Makefile#3 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile,v 1.345 2008/01/30 19:33:18 jhb Exp $
+# $FreeBSD: src/Makefile,v 1.346 2008/03/25 15:47:22 ru Exp $
 #
 # The user-driven targets are:
 #
@@ -172,6 +172,10 @@
 .MAIN:	all
 
 STARTTIME!= LC_ALL=C date
+CHECK_TIME!= find ${.CURDIR}/sys/sys/param.h -mtime -0
+.if !empty(CHECK_TIME)
+.error check your date/time: ${STARTTIME}
+.endif
 
 .if defined(HISTORICAL_MAKE_WORLD) || defined(DESTDIR)
 #

==== //depot/projects/qingli_mpath/src/ObsoleteFiles.inc#3 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.133 2008/03/13 18:17:46 brueffer Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.134 2008/03/26 06:45:28 remko Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -1103,6 +1103,9 @@
 OLD_FILES+=usr/sbin/ntptimeset
 OLD_FILES+=usr/share/man/man8/kernbb.8.gz
 OLD_FILES+=usr/share/man/man8/ntp-genkeys.8.gz
+# 20040627: usbdevs.h and usbdevs_data.h removal
+OLD_FILES+=usr/include/dev/usb/usbdevs.h
+OLD_FILES+=usr/include/dev/usb/usbdevs_data.h
 # 200406XX
 OLD_FILES+=usr/bin/gasp
 OLD_FILES+=usr/bin/gdbreplay
@@ -3551,8 +3554,6 @@
 OLD_FILES+=usr/bin/hesinfo
 OLD_FILES+=usr/include/c++/3.4/ext/demangle.h
 OLD_FILES+=usr/include/cam/cam_extend.h
-OLD_FILES+=usr/include/dev/usb/usbdevs.h
-OLD_FILES+=usr/include/dev/usb/usbdevs_data.h
 OLD_FILES+=usr/include/dev/wi/wi_hostap.h
 OLD_FILES+=usr/include/disktab.h
 OLD_FILES+=usr/include/g++/FlexLexer.h

==== //depot/projects/qingli_mpath/src/cddl/Makefile.inc#2 (text+ko) ====

@@ -1,6 +1,6 @@
-# $FreeBSD: src/cddl/Makefile.inc,v 1.3 2007/11/28 22:58:09 jb Exp $
+# $FreeBSD: src/cddl/Makefile.inc,v 1.4 2008/03/27 23:21:23 jb Exp $
 
-OPENSOLARIS_USR_DISTDIR= ${.CURDIR}/../../../contrib/opensolaris
-OPENSOLARIS_SYS_DISTDIR= ${.CURDIR}/../../../sys/contrib/opensolaris
+OPENSOLARIS_USR_DISTDIR= ${.CURDIR}/../../../cddl/contrib/opensolaris
+OPENSOLARIS_SYS_DISTDIR= ${.CURDIR}/../../../sys/cddl/contrib/opensolaris
 
 IGNORE_PRAGMA=	YES

==== //depot/projects/qingli_mpath/src/cddl/lib/libavl/Makefile#2 (text+ko) ====

@@ -1,10 +1,10 @@

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Fri Mar 28 02:02:40 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 329B91065670; Fri, 28 Mar 2008 02:02: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 E5B02106566B
	for ; Fri, 28 Mar 2008 02:02:39 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id CF2528FC13
	for ; Fri, 28 Mar 2008 02:02:39 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2S22d8o007695
	for ; Fri, 28 Mar 2008 02:02:39 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2S22d3M007693
	for perforce@freebsd.org; Fri, 28 Mar 2008 02:02:39 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 28 Mar 2008 02:02:39 GMT
Message-Id: <200803280202.m2S22d3M007693@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138779 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 28 Mar 2008 02:02:40 -0000

http://perforce.freebsd.org/chv.cgi?CH=138779

Change 138779 by jb@jb_freebsd1 on 2008/03/28 02:02:01

	Apply the FreeBSD changes to the files in their new location.

Affected files ...

.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo.d#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo1.d#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.hton.d#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa.d#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa6.d#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owned.d#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owner.d#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_type_adaptive.d#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.create.ksh#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exec.ksh#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ENOENT.ksh#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ksh#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitcore.ksh#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitexit.ksh#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.d#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.rw.d#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/trace/tst.misc.d#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/tst.rootvp.d#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/mdb/tools/common/die.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/mdb/tools/common/util.h#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/sgs/include/alist.h#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/sgs/include/sgs.h#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/sgs/tools/common/findprime.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libctf/common/ctf_lib.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libctf/common/ctf_subr.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cg.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dof.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_error.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_errtags.h#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_handle.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_ident.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_map.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pragma.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.h#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_program.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_work.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrtags.sh#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/mknames.sh#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libgen/common/gmatch.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/common/list.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/common/memory.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/alist.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/alist.h#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/barrier.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/barrier.h#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/ctfconvert.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/ctftools.h#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/fixup_tdescs.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/hash.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/iidesc.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/input.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/output.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/st_parse.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/stabs.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/strtab.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/strtab.h#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/tdata.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/traverse.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/traverse.h#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/util.c#2 edit
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/dump/dump.c#2 edit
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/d.out#1 add
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/outputFile#1 add
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/sleep.core#1 add

Differences ...

==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c#2 (text) ====

@@ -34,15 +34,20 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
 #include 
 #include 
 #include 
+#if defined(sun)
 #include 
+#endif
 #include 
+#if defined(sun)
 #include 
+#endif
 
 typedef struct dtrace_cmd {
 	void (*dc_func)(struct dtrace_cmd *);	/* function to compile arg */
@@ -92,8 +97,9 @@
 static int g_status = E_SUCCESS;
 static int g_grabanon = 0;
 static const char *g_ofile = NULL;
-static FILE *g_ofp = stdout;
+static FILE *g_ofp;
 static dtrace_hdl_t *g_dtp;
+#if defined(sun)
 static char *g_etcfile = "/etc/system";
 static const char *g_etcbegin = "* vvvv Added by DTrace";
 static const char *g_etcend = "* ^^^^ Added by DTrace";
@@ -108,6 +114,7 @@
 "* chapter of the Solaris Dynamic Tracing Guide for details.",
 "*",
 NULL };
+#endif
 
 static int
 usage(FILE *fp)
@@ -195,6 +202,10 @@
 static void
 dfatal(const char *fmt, ...)
 {
+#if !defined(sun) && defined(NEED_ERRLOC)
+	char *p_errfile = NULL;
+	int errline = 0;
+#endif
 	va_list ap;
 
 	va_start(ap, fmt);
@@ -212,6 +223,11 @@
 		(void) fprintf(stderr, "%s\n",
 		    dtrace_errmsg(g_dtp, dtrace_errno(g_dtp)));
 	}
+#if !defined(sun) && defined(NEED_ERRLOC)
+	dt_get_errloc(g_dtp, &p_errfile, &errline);
+	if (p_errfile != NULL)
+		printf("File '%s', line %d\n", p_errfile, errline);
+#endif
 
 	/*
 	 * Close the DTrace handle to ensure that any controlled processes are
@@ -372,6 +388,7 @@
 	free(buf);
 }
 
+#if defined(sun)
 static void
 etcsystem_prune(void)
 {
@@ -482,6 +499,7 @@
 
 	error("added forceload directives to %s\n", g_ofile);
 }
+#endif
 
 static void
 print_probe_info(const dtrace_probeinfo_t *p)
@@ -611,12 +629,26 @@
 	p = (uchar_t *)dof;
 	q = p + dof->dofh_loadsz;
 
+#if defined(sun)
 	oprintf("dof-data-%d=0x%x", n, *p++);
 
 	while (p < q)
 		oprintf(",0x%x", *p++);
 
 	oprintf(";\n");
+#else
+	/*
+	 * On FreeBSD, the DOF data is handled as a kernel environment (kenv)
+	 * string. We use two hex characters per DOF byte.
+	 */
+	oprintf("dof-data-%d=%02x", n, *p++);
+
+	while (p < q)
+		oprintf("%02x", *p++);
+
+	oprintf("\n");
+#endif
+
 	dtrace_dof_destroy(g_dtp, dof);
 }
 
@@ -741,6 +773,8 @@
 static void
 prochandler(struct ps_prochandle *P, const char *msg, void *arg)
 {
+fatal("DOODAD in function %s, file %s, line %d\n",__FUNCTION__,__FILE__,__LINE__);
+#ifdef DOODAD
 	const psinfo_t *prp = Ppsinfo(P);
 	int pid = Pstatus(P)->pr_pid;
 	char name[SIG2STR_MAX];
@@ -778,6 +812,7 @@
 		g_pslive--;
 		break;
 	}
+#endif
 }
 
 /*ARGSUSED*/
@@ -1159,9 +1194,10 @@
 	dtrace_optval_t opt;
 	dtrace_cmd_t *dcp;
 
+	g_ofp = stdout;
 	int done = 0, mode = 0;
-	int err, i;
-	char c, *p, **v;
+	int err, i, c;
+	char *p, **v;
 	struct ps_prochandle *P;
 	pid_t pid;
 
@@ -1188,7 +1224,7 @@
 	 * options into g_argv[], and abort if any invalid options are found.
 	 */
 	for (optind = 1; optind < argc; optind++) {
-		while ((c = getopt(argc, argv, DTRACE_OPTSTR)) != EOF) {
+		while ((c = getopt(argc, argv, DTRACE_OPTSTR)) != -1) {
 			switch (c) {
 			case '3':
 				if (strcmp(optarg, "2") != 0) {
@@ -1337,8 +1373,14 @@
 		    dtrace_errmsg(NULL, err));
 	}
 
+#if defined(__i386__)
+	/* XXX The 32-bit seems to need more buffer space by default -sson */
+	(void) dtrace_setopt(g_dtp, "bufsize", "12m");
+	(void) dtrace_setopt(g_dtp, "aggsize", "12m");
+#else
 	(void) dtrace_setopt(g_dtp, "bufsize", "4m");
 	(void) dtrace_setopt(g_dtp, "aggsize", "4m");
+#endif
 
 	/*
 	 * If -G is specified, enable -xlink=dynamic and -xunodefs to permit
@@ -1371,7 +1413,7 @@
 	 * this time; these will compiled as part of the fourth processing pass.
 	 */
 	for (optind = 1; optind < argc; optind++) {
-		while ((c = getopt(argc, argv, DTRACE_OPTSTR)) != EOF) {
+		while ((c = getopt(argc, argv, DTRACE_OPTSTR)) != -1) {
 			switch (c) {
 			case 'a':
 				if (dtrace_setopt(g_dtp, "grabanon", 0) != 0)
@@ -1528,7 +1570,7 @@
 	 * may been affected by any library options set by the second pass.
 	 */
 	for (optind = 1; optind < argc; optind++) {
-		while ((c = getopt(argc, argv, DTRACE_OPTSTR)) != EOF) {
+		while ((c = getopt(argc, argv, DTRACE_OPTSTR)) != -1) {
 			switch (c) {
 			case 'c':
 				if ((v = make_argv(optarg)) == NULL)
@@ -1616,10 +1658,21 @@
 
 	case DMODE_ANON:
 		if (g_ofile == NULL)
+#if defined(sun)
 			g_ofile = "/kernel/drv/dtrace.conf";
+#else
+			/*
+			 * On FreeBSD, anonymous DOF data is written to
+			 * the DTrace DOF file that the boot loader will
+			 * read if booting with the DTrace option.
+			 */
+			g_ofile = "/boot/dtrace.dof";
+#endif
 
 		dof_prune(g_ofile); /* strip out any old DOF directives */
+#if defined(sun)
 		etcsystem_prune(); /* string out any forceload directives */
+#endif
 
 		if (g_cmdc == 0) {
 			dtrace_close(g_dtp);
@@ -1650,8 +1703,10 @@
 		 * that itself contains a #pragma D option quiet.
 		 */
 		error("saved anonymous enabling in %s\n", g_ofile);
+#if defined(sun)
 		etcsystem_add();
 		error("run update_drv(1M) or reboot to enable changes\n");
+#endif
 
 		dtrace_close(g_dtp);
 		return (g_status);
@@ -1780,6 +1835,11 @@
 	if (sigaction(SIGTERM, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
 		(void) sigaction(SIGTERM, &act, NULL);
 
+#if !defined(sun)
+	if (sigaction(SIGUSR1, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
+		(void) sigaction(SIGUSR1, &act, NULL);
+#endif
+
 	/*
 	 * Now that tracing is active and we are ready to consume trace data,
 	 * continue any grabbed or created processes, setting them running

==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl#2 (text+ko) ====

@@ -1,4 +1,4 @@
-#!/usr/perl5/bin/perl
+#!/usr/local/bin/perl
 #
 # CDDL HEADER START
 #

==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#2 (text+ko) ====

@@ -1,4 +1,4 @@
-#!/usr/perl5/bin/perl
+#!/usr/local/bin/perl
 #
 # CDDL HEADER START
 #
@@ -43,7 +43,7 @@
 
 @dtrace_argv = ();
 
-$ksh_path = '/usr/bin/ksh';
+$ksh_path = '/bin/sh';
 
 @files = ();
 %exceptions = ();
@@ -273,7 +273,7 @@
 		}
 
 		$fullname = "$dir/$name";
-		$exe = "$dir/$base.exe";
+		$exe = "./$base.exe";
 		$exe_pid = -1;
 
 		if ($opt_a && ($status != 0 || $tag != 0 || $droptag != 0 ||
@@ -592,7 +592,7 @@
 # Ensure that $PATH contains a cc(1) so that we can execute the
 # test programs that require compilation of C code.
 #
-$ENV{'PATH'} = $ENV{'PATH'} . ':/ws/onnv-tools/SUNWspro/SS11/bin';
+#$ENV{'PATH'} = $ENV{'PATH'} . ':/ws/onnv-tools/SUNWspro/SS11/bin';
 
 if ($opt_b) {
 	logmsg("badioctl'ing ... ");

==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d#2 (text+ko) ====

@@ -40,3 +40,8 @@
 	x[123] = `kmem_flags;
 	x[456] = *`rootvp;
 }
+
+ERROR
+{
+	exit(1);
+}

==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d#2 (text+ko) ====

@@ -40,3 +40,8 @@
 	self->x[123] = `kmem_flags;
 	self->x[456] = *`rootvp;
 }
+
+ERROR
+{
+	exit(1);
+}

==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo.d#2 (text+ko) ====

@@ -53,3 +53,8 @@
 	printf("address of process = %u\n", curpsinfo->pr_addr);
 	exit (0);
 }
+
+ERROR
+{
+	exit(1);
+}

==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo1.d#2 (text+ko) ====

@@ -49,3 +49,8 @@
 	printf("address of process = %u\n", curpsinfo->pr_addr);
 	exit (0);
 }
+
+ERROR
+{
+	exit(1);
+}

==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh#2 (text+ko) ====

@@ -46,7 +46,7 @@
 dtrace=$1
 
 $dtrace -qZm wassup'{printf("Iamkool");}' \
--qm unix'{printf("I am done"); exit(0);}'
+-qm BEGIN'{printf("I am done"); exit(0);}'
 
 status=$?
 

==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.hton.d#2 (text+ko) ====

@@ -30,7 +30,9 @@
  * ASSERTION: Test network byte-ordering routines.
  */
 
-#include 
+#if defined(__amd64__) || defined(__i386__)
+#define _LITTLE_ENDIAN
+#endif
 
 BEGIN
 {

==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa.d#2 (text+ko) ====

@@ -28,17 +28,17 @@
 
 #pragma D option quiet
 
-ipaddr_t *ip4a;
-ipaddr_t *ip4b;
-ipaddr_t *ip4c;
-ipaddr_t *ip4d;
+in_addr_t *ip4a;
+in_addr_t *ip4b;
+in_addr_t *ip4c;
+in_addr_t *ip4d;
 
 BEGIN
 {
-	this->buf4a = alloca(sizeof (ipaddr_t));
-	this->buf4b = alloca(sizeof (ipaddr_t));
-	this->buf4c = alloca(sizeof (ipaddr_t));
-	this->buf4d = alloca(sizeof (ipaddr_t));
+	this->buf4a = alloca(sizeof (in_addr_t));
+	this->buf4b = alloca(sizeof (in_addr_t));
+	this->buf4c = alloca(sizeof (in_addr_t));
+	this->buf4d = alloca(sizeof (in_addr_t));
 	ip4a = this->buf4a;
 	ip4b = this->buf4b;
 	ip4c = this->buf4c;

==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa6.d#2 (text+ko) ====

@@ -53,35 +53,35 @@
 	ip6f = this->buf6f;
 	ip6g = this->buf6g;
 
-	ip6a->_S6_un._S6_u8[0] = 0xfe;
-	ip6a->_S6_un._S6_u8[1] = 0x80;
-	ip6a->_S6_un._S6_u8[8] = 0x02;
-	ip6a->_S6_un._S6_u8[9] = 0x14;
-	ip6a->_S6_un._S6_u8[10] = 0x4f;
-	ip6a->_S6_un._S6_u8[11] = 0xff;
-	ip6a->_S6_un._S6_u8[12] = 0xfe;
-	ip6a->_S6_un._S6_u8[13] = 0x0b;
-	ip6a->_S6_un._S6_u8[14] = 0x76;
-	ip6a->_S6_un._S6_u8[15] = 0xc8;
-	ip6b->_S6_un._S6_u8[0] = 0x10;
-	ip6b->_S6_un._S6_u8[1] = 0x80;
-	ip6b->_S6_un._S6_u8[10] = 0x08;
-	ip6b->_S6_un._S6_u8[11] = 0x08;
-	ip6b->_S6_un._S6_u8[13] = 0x20;
-	ip6b->_S6_un._S6_u8[13] = 0x0c;
-	ip6b->_S6_un._S6_u8[14] = 0x41;
-	ip6b->_S6_un._S6_u8[15] = 0x7a;
-	ip6c->_S6_un._S6_u8[15] = 0x01;
-	ip6e->_S6_un._S6_u8[12] = 0x7f;
-	ip6e->_S6_un._S6_u8[15] = 0x01;
-	ip6f->_S6_un._S6_u8[10] = 0xff;
-	ip6f->_S6_un._S6_u8[11] = 0xff;
-	ip6f->_S6_un._S6_u8[12] = 0x7f;
-	ip6f->_S6_un._S6_u8[15] = 0x01;
-	ip6g->_S6_un._S6_u8[10] = 0xff;
-	ip6g->_S6_un._S6_u8[11] = 0xfe;
-	ip6g->_S6_un._S6_u8[12] = 0x7f;
-	ip6g->_S6_un._S6_u8[15] = 0x01;
+	ip6a->__u6_addr.__u6_addr8[0] = 0xfe;
+	ip6a->__u6_addr.__u6_addr8[1] = 0x80;
+	ip6a->__u6_addr.__u6_addr8[8] = 0x02;
+	ip6a->__u6_addr.__u6_addr8[9] = 0x14;
+	ip6a->__u6_addr.__u6_addr8[10] = 0x4f;
+	ip6a->__u6_addr.__u6_addr8[11] = 0xff;
+	ip6a->__u6_addr.__u6_addr8[12] = 0xfe;
+	ip6a->__u6_addr.__u6_addr8[13] = 0x0b;
+	ip6a->__u6_addr.__u6_addr8[14] = 0x76;
+	ip6a->__u6_addr.__u6_addr8[15] = 0xc8;
+	ip6b->__u6_addr.__u6_addr8[0] = 0x10;
+	ip6b->__u6_addr.__u6_addr8[1] = 0x80;
+	ip6b->__u6_addr.__u6_addr8[10] = 0x08;
+	ip6b->__u6_addr.__u6_addr8[11] = 0x08;
+	ip6b->__u6_addr.__u6_addr8[13] = 0x20;
+	ip6b->__u6_addr.__u6_addr8[13] = 0x0c;
+	ip6b->__u6_addr.__u6_addr8[14] = 0x41;
+	ip6b->__u6_addr.__u6_addr8[15] = 0x7a;
+	ip6c->__u6_addr.__u6_addr8[15] = 0x01;
+	ip6e->__u6_addr.__u6_addr8[12] = 0x7f;
+	ip6e->__u6_addr.__u6_addr8[15] = 0x01;
+	ip6f->__u6_addr.__u6_addr8[10] = 0xff;
+	ip6f->__u6_addr.__u6_addr8[11] = 0xff;
+	ip6f->__u6_addr.__u6_addr8[12] = 0x7f;
+	ip6f->__u6_addr.__u6_addr8[15] = 0x01;
+	ip6g->__u6_addr.__u6_addr8[10] = 0xff;
+	ip6g->__u6_addr.__u6_addr8[11] = 0xfe;
+	ip6g->__u6_addr.__u6_addr8[12] = 0x7f;
+	ip6g->__u6_addr.__u6_addr8[15] = 0x01;
 
 	printf("%s\n", inet_ntoa6(ip6a));
 	printf("%s\n", inet_ntoa6(ip6b));

==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d#2 (text+ko) ====

@@ -28,10 +28,13 @@
 
 #pragma D option quiet
 
-ipaddr_t *ip4a;
-ipaddr_t *ip4b;
-ipaddr_t *ip4c;
-ipaddr_t *ip4d;
+inline int AF_INET = 2;
+inline int AF_INET6 = 28;
+
+in_addr_t *ip4a;
+in_addr_t *ip4b;
+in_addr_t *ip4c;
+in_addr_t *ip4d;
 struct in6_addr *ip6a;
 struct in6_addr *ip6b;
 struct in6_addr *ip6c;
@@ -43,10 +46,10 @@
 
 BEGIN
 {
-	this->buf4a = alloca(sizeof (ipaddr_t));
-	this->buf4b = alloca(sizeof (ipaddr_t));
-	this->buf4c = alloca(sizeof (ipaddr_t));
-	this->buf4d = alloca(sizeof (ipaddr_t));
+	this->buf4a = alloca(sizeof (in_addr_t));
+	this->buf4b = alloca(sizeof (in_addr_t));
+	this->buf4c = alloca(sizeof (in_addr_t));
+	this->buf4d = alloca(sizeof (in_addr_t));
 	this->buf6a = alloca(sizeof (struct in6_addr));
 	this->buf6b = alloca(sizeof (struct in6_addr));
 	this->buf6c = alloca(sizeof (struct in6_addr));
@@ -72,51 +75,51 @@
 	*ip4b = htonl(0x7f000001);
 	*ip4c = htonl(0xffffffff);
 	*ip4d = htonl(0x00000000);
-	ip6a->_S6_un._S6_u8[0] = 0xfe;
-	ip6a->_S6_un._S6_u8[1] = 0x80;
-	ip6a->_S6_un._S6_u8[8] = 0x02;
-	ip6a->_S6_un._S6_u8[9] = 0x14;
-	ip6a->_S6_un._S6_u8[10] = 0x4f;
-	ip6a->_S6_un._S6_u8[11] = 0xff;
-	ip6a->_S6_un._S6_u8[12] = 0xfe;
-	ip6a->_S6_un._S6_u8[13] = 0x0b;
-	ip6a->_S6_un._S6_u8[14] = 0x76;
-	ip6a->_S6_un._S6_u8[15] = 0xc8;
-	ip6b->_S6_un._S6_u8[0] = 0x10;
-	ip6b->_S6_un._S6_u8[1] = 0x80;
-	ip6b->_S6_un._S6_u8[10] = 0x08;
-	ip6b->_S6_un._S6_u8[11] = 0x08;
-	ip6b->_S6_un._S6_u8[13] = 0x20;
-	ip6b->_S6_un._S6_u8[13] = 0x0c;
-	ip6b->_S6_un._S6_u8[14] = 0x41;
-	ip6b->_S6_un._S6_u8[15] = 0x7a;
-	ip6c->_S6_un._S6_u8[15] = 0x01;
-	ip6e->_S6_un._S6_u8[12] = 0x7f;
-	ip6e->_S6_un._S6_u8[15] = 0x01;
-	ip6f->_S6_un._S6_u8[10] = 0xff;
-	ip6f->_S6_un._S6_u8[11] = 0xff;
-	ip6f->_S6_un._S6_u8[12] = 0x7f;
-	ip6f->_S6_un._S6_u8[15] = 0x01;
-	ip6g->_S6_un._S6_u8[10] = 0xff;
-	ip6g->_S6_un._S6_u8[11] = 0xfe;
-	ip6g->_S6_un._S6_u8[12] = 0x7f;
-	ip6g->_S6_un._S6_u8[15] = 0x01;
-	ip6h->_S6_un._S6_u8[0] = 0xff;
-	ip6h->_S6_un._S6_u8[1] = 0xff;
-	ip6h->_S6_un._S6_u8[2] = 0xff;
-	ip6h->_S6_un._S6_u8[3] = 0xff;
-	ip6h->_S6_un._S6_u8[4] = 0xff;
-	ip6h->_S6_un._S6_u8[5] = 0xff;
-	ip6h->_S6_un._S6_u8[6] = 0xff;
-	ip6h->_S6_un._S6_u8[7] = 0xff;
-	ip6h->_S6_un._S6_u8[8] = 0xff;
-	ip6h->_S6_un._S6_u8[9] = 0xff;
-	ip6h->_S6_un._S6_u8[10] = 0xff;
-	ip6h->_S6_un._S6_u8[11] = 0xff;
-	ip6h->_S6_un._S6_u8[12] = 0xff;
-	ip6h->_S6_un._S6_u8[13] = 0xff;
-	ip6h->_S6_un._S6_u8[14] = 0xff;
-	ip6h->_S6_un._S6_u8[15] = 0xff;
+	ip6a->__u6_addr.__u6_addr8[0] = 0xfe;
+	ip6a->__u6_addr.__u6_addr8[1] = 0x80;
+	ip6a->__u6_addr.__u6_addr8[8] = 0x02;
+	ip6a->__u6_addr.__u6_addr8[9] = 0x14;
+	ip6a->__u6_addr.__u6_addr8[10] = 0x4f;
+	ip6a->__u6_addr.__u6_addr8[11] = 0xff;
+	ip6a->__u6_addr.__u6_addr8[12] = 0xfe;
+	ip6a->__u6_addr.__u6_addr8[13] = 0x0b;
+	ip6a->__u6_addr.__u6_addr8[14] = 0x76;
+	ip6a->__u6_addr.__u6_addr8[15] = 0xc8;
+	ip6b->__u6_addr.__u6_addr8[0] = 0x10;
+	ip6b->__u6_addr.__u6_addr8[1] = 0x80;
+	ip6b->__u6_addr.__u6_addr8[10] = 0x08;
+	ip6b->__u6_addr.__u6_addr8[11] = 0x08;
+	ip6b->__u6_addr.__u6_addr8[13] = 0x20;
+	ip6b->__u6_addr.__u6_addr8[13] = 0x0c;
+	ip6b->__u6_addr.__u6_addr8[14] = 0x41;
+	ip6b->__u6_addr.__u6_addr8[15] = 0x7a;
+	ip6c->__u6_addr.__u6_addr8[15] = 0x01;
+	ip6e->__u6_addr.__u6_addr8[12] = 0x7f;
+	ip6e->__u6_addr.__u6_addr8[15] = 0x01;
+	ip6f->__u6_addr.__u6_addr8[10] = 0xff;
+	ip6f->__u6_addr.__u6_addr8[11] = 0xff;
+	ip6f->__u6_addr.__u6_addr8[12] = 0x7f;
+	ip6f->__u6_addr.__u6_addr8[15] = 0x01;
+	ip6g->__u6_addr.__u6_addr8[10] = 0xff;
+	ip6g->__u6_addr.__u6_addr8[11] = 0xfe;
+	ip6g->__u6_addr.__u6_addr8[12] = 0x7f;
+	ip6g->__u6_addr.__u6_addr8[15] = 0x01;
+	ip6h->__u6_addr.__u6_addr8[0] = 0xff;
+	ip6h->__u6_addr.__u6_addr8[1] = 0xff;
+	ip6h->__u6_addr.__u6_addr8[2] = 0xff;
+	ip6h->__u6_addr.__u6_addr8[3] = 0xff;
+	ip6h->__u6_addr.__u6_addr8[4] = 0xff;
+	ip6h->__u6_addr.__u6_addr8[5] = 0xff;
+	ip6h->__u6_addr.__u6_addr8[6] = 0xff;
+	ip6h->__u6_addr.__u6_addr8[7] = 0xff;
+	ip6h->__u6_addr.__u6_addr8[8] = 0xff;
+	ip6h->__u6_addr.__u6_addr8[9] = 0xff;
+	ip6h->__u6_addr.__u6_addr8[10] = 0xff;
+	ip6h->__u6_addr.__u6_addr8[11] = 0xff;
+	ip6h->__u6_addr.__u6_addr8[12] = 0xff;
+	ip6h->__u6_addr.__u6_addr8[13] = 0xff;
+	ip6h->__u6_addr.__u6_addr8[14] = 0xff;
+	ip6h->__u6_addr.__u6_addr8[15] = 0xff;
 
 	printf("%s\n", inet_ntop(AF_INET, ip4a));
 	printf("%s\n", inet_ntop(AF_INET, ip4b));

==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owned.d#2 (text+ko) ====

@@ -38,8 +38,8 @@
 
 lockstat:::adaptive-acquire
 {
-	this->owned = mutex_owned((kmutex_t *)arg0);
-	this->owner = mutex_owner((kmutex_t *)arg0);
+	this->owned = mutex_owned((struct mtx *)arg0);
+	this->owner = mutex_owner((struct mtx *)arg0);
 }
 
 lockstat:::adaptive-acquire

==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owner.d#2 (text+ko) ====

@@ -41,17 +41,17 @@
 
 #pragma D option quiet
 
-kthread_t *ptr;
+struct thread *ptr;
 
 BEGIN
 {
 	i = 0;
 }
 
-lockstat:genunix:mutex_enter:adaptive-acquire
+lockstat::mtx_lock:adaptive-acquire
 {
 
-	ptr = mutex_owner((kmutex_t *)arg0);
+	ptr = mutex_owner((struct mtx *)arg0);
 	i++;
 }
 

==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_type_adaptive.d#2 (text+ko) ====

@@ -44,9 +44,9 @@
 	ret = -99;
 }
 
-mutex_enter:adaptive-acquire
+mtx_lock:adaptive-acquire
 {
-	ret = mutex_type_adaptive((kmutex_t *)arg0);
+	ret = mutex_type_adaptive((struct mtx *)arg0);
 	i++;
 }
 

==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.create.ksh#2 (text+ko) ====

@@ -36,7 +36,7 @@
 {
 	$dtrace -s /dev/stdin <pr_ppid == $child && pid == $child/
+	/args[0]->p_pptr->p_pid == $child && pid == $child/
 	{
 		exit(0);
 	}
@@ -46,7 +46,7 @@
 sleeper()
 {
 	while true; do
-		/usr/bin/sleep 1
+		/bin/sleep 1
 	done
 }
 

==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exec.ksh#2 (text+ko) ====

@@ -36,12 +36,12 @@
 {
 	$dtrace -s /dev/stdin <pr_ppid == $child && args[0] == "/usr/bin/sleep"/
+	/curpsinfo->pr_ppid == $child && args[0] == "/bin/sleep"/
 	{
 		self->exec = 1;
 	}
 
-	proc:::exec-success
+	proc:::exec_success
 	/self->exec/
 	{
 		exit(0);
@@ -52,7 +52,7 @@
 sleeper()
 {
 	while true; do
-		/usr/bin/sleep 1
+		/bin/sleep 1
 	done
 }
 

==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ENOENT.ksh#2 (text+ko) ====

@@ -42,7 +42,7 @@
 		self->exec = 1;
 	}
 
-	proc:::exec-failure
+	proc:::exec_failure
 	/self->exec && args[0] == ENOENT/
 	{
 		exit(0);
@@ -53,7 +53,7 @@
 sleeper()
 {
 	while true; do
-		/usr/bin/sleep 1
+		/bin/sleep 1
 		$badexec
 	done
 }

==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ksh#2 (text+ko) ====

@@ -45,7 +45,7 @@
 		self->exec = 1;
 	}
 
-	proc:::exec-failure
+	proc:::exec_failure
 	/self->exec/
 	{
 		exit(0);
@@ -56,7 +56,7 @@
 sleeper()
 {
 	while true; do
-		/usr/bin/sleep 1
+		/bin/sleep 1
 		$badexec
 	done
 }

==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitcore.ksh#2 (text+ko) ====

@@ -43,18 +43,16 @@
 	$dtrace -s /dev/stdin <pr_ppid == $child &&
-	    curpsinfo->pr_psargs == "$longsleep" && args[0] == CLD_DUMPED/
+	    execargs == "$longsleep" && args[0] == CLD_DUMPED/
 	{
 		exit(0);
 	}
 
 	proc:::exit
 	/curpsinfo->pr_ppid == $child &&
-	    curpsinfo->pr_psargs == "$longsleep" && args[0] != CLD_DUMPED/
+	    execargs == "$longsleep" && args[0] != CLD_DUMPED/
 	{
-		printf("Child process could not dump core.  Check coreadm(1M)");
-		printf(" settings; either per-process or global core dumps ");
-		printf("must be enabled for this test to work properly.");
+		printf("Child process could did dump core.");
 		exit(1);
 	}
 EOF
@@ -62,13 +60,12 @@
 
 sleeper()
 {
-	/usr/bin/coreadm -p $corefile
 	while true; do
 		$longsleep &
-		/usr/bin/sleep 1
+		/bin/sleep 1
 		kill -SEGV $!
 	done
-	/usr/bin/rm -f $corefile
+	/bin/rm -f $corefile
 }
 
 if [ $# != 1 ]; then
@@ -77,8 +74,8 @@
 fi
 
 dtrace=$1
-longsleep="/usr/bin/sleep 10000"
-corefile=/tmp/core.$$
+longsleep="/bin/sleep 10000"
+corefile=/tmp/sleep.core
 
 sleeper &
 child=$!
@@ -86,10 +83,10 @@
 script
 status=$?
 
-pstop $child
-pkill -P $child
+#pstop $child
+#pkill -P $child
 kill $child
-prun $child
+#prun $child
 
-/usr/bin/rm -f $corefile
+/bin/rm -f $corefile
 exit $status

==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitexit.ksh#2 (text+ko) ====

@@ -46,7 +46,7 @@
 sleeper()
 {
 	while true; do
-		/usr/bin/sleep 1
+		/bin/sleep 1
 	done
 }
 

==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.c#2 (text+ko) ====

@@ -33,6 +33,8 @@
 #include 
 #include 
 
+#define NANOSEC	1000000000
+
 int
 main(int argc, char **argv)
 {
@@ -41,6 +43,7 @@
 	sigset_t set;
 	timer_t tid;
 	char *cmd = argv[0];
+	int sig;
 
 	ev.sigev_notify = SIGEV_SIGNAL;
 	ev.sigev_signo = SIGUSR1;
@@ -66,9 +69,9 @@
 		exit(EXIT_FAILURE);
 	}
 
-	for (;;) {
-		(void) sigwait(&set);
-	}
+	do {
+		(void) sigwait(&set, &sig);
+	} while(sig != SIGUSR1);
 
 	/*NOTREACHED*/
 	return (0);

==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.d#2 (text+ko) ====

@@ -28,13 +28,13 @@
 
 #pragma D option destructive
 
-proc:::signal-send
-/pid == 0 && args[1]->pr_pid == $1 && args[2] == SIGUSR1/
+proc:::signal_send
+/args[1]->p_pid == $1 && args[2] == SIGUSR1/
 {
 	sent = 1;
 }
 
-proc:::signal-clear
+proc:::signal_clear
 /pid == $1 && args[0] == SIGUSR1 && sent/
 {
 	exit(0);

==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d#2 (text+ko) ====

@@ -54,7 +54,7 @@
 	timeout = timestamp + 500000000;
 }
 
-syscall::rexit:entry
+syscall::exit:entry
 {
 	exit(0);
 }

==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.c#2 (text+ko) ====

@@ -28,6 +28,7 @@
 
 #include 
 #include 
+#include 
 
 static void
 handle(int sig)

==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d#2 (text+ko) ====

@@ -54,7 +54,7 @@
 	timeout = timestamp + 500000000;
 }
 
-syscall::rexit:entry
+syscall::exit:entry
 {
 	exit(0);
 }

==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.c#2 (text+ko) ====

@@ -28,6 +28,7 @@
 
 #include 
 #include 
+#include 
 

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Fri Mar 28 02:03:44 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D40811065670; Fri, 28 Mar 2008 02:03: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 93C86106566B
	for ; Fri, 28 Mar 2008 02:03:43 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 655B68FC12
	for ; Fri, 28 Mar 2008 02:03:43 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2S23hcM008904
	for ; Fri, 28 Mar 2008 02:03:43 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2S23huB008902
	for perforce@freebsd.org; Fri, 28 Mar 2008 02:03:43 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 28 Mar 2008 02:03:43 GMT
Message-Id: <200803280203.m2S23huB008902@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138780 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 28 Mar 2008 02:03:44 -0000

http://perforce.freebsd.org/chv.cgi?CH=138780

Change 138780 by jb@jb_freebsd1 on 2008/03/28 02:03:15

	Reference the test files from their new location.

Affected files ...

.. //depot/projects/dtrace/src/tools/test/dtrace/Makefile#31 edit

Differences ...

==== //depot/projects/dtrace/src/tools/test/dtrace/Makefile#31 (text+ko) ====

@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSRCDIR=	${.CURDIR}/../../../contrib/opensolaris/cmd/dtrace/test
+TESTSRCDIR=	${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/dtrace/test
 DTEST=		${TESTSRCDIR}/cmd/scripts/dtest.pl -n
 
 IGNORE=		\

From owner-p4-projects@FreeBSD.ORG  Fri Mar 28 02:04:45 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 100681065671; Fri, 28 Mar 2008 02:04: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 C432A106566C
	for ; Fri, 28 Mar 2008 02:04:44 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 95CE08FC15
	for ; Fri, 28 Mar 2008 02:04:44 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2S24irZ008930
	for ; Fri, 28 Mar 2008 02:04:44 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2S24iGh008928
	for perforce@freebsd.org; Fri, 28 Mar 2008 02:04:44 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 28 Mar 2008 02:04:44 GMT
Message-Id: <200803280204.m2S24iGh008928@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138781 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 28 Mar 2008 02:04:45 -0000

http://perforce.freebsd.org/chv.cgi?CH=138781

Change 138781 by jb@jb_freebsd1 on 2008/03/28 02:04:27

	Remove files that have already been moved to their new location.

Affected files ...

.. //depot/projects/dtrace/src/compat/opensolaris/include/dtrace.h#2 delete
.. //depot/projects/dtrace/src/compat/opensolaris/include/libproc.h#5 delete

Differences ...

From owner-p4-projects@FreeBSD.ORG  Fri Mar 28 02:17:59 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2FEE31065679; Fri, 28 Mar 2008 02:17: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 E3EA61065677
	for ; Fri, 28 Mar 2008 02:17:58 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B547A8FC22
	for ; Fri, 28 Mar 2008 02:17:58 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2S2Hw3X009394
	for ; Fri, 28 Mar 2008 02:17:58 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2S2HwxJ009392
	for perforce@freebsd.org; Fri, 28 Mar 2008 02:17:58 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 28 Mar 2008 02:17:58 GMT
Message-Id: <200803280217.m2S2HwxJ009392@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138782 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 28 Mar 2008 02:17:59 -0000

http://perforce.freebsd.org/chv.cgi?CH=138782

Change 138782 by jb@jb_freebsd1 on 2008/03/28 02:17:49

	These files aren't required anymore.

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/sdt.h#2 delete
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/vmem.h#2 delete

Differences ...

From owner-p4-projects@FreeBSD.ORG  Fri Mar 28 02:25:09 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8AAF71065674; Fri, 28 Mar 2008 02:25: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 4A8A41065672
	for ; Fri, 28 Mar 2008 02:25:09 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 3587B8FC1B
	for ; Fri, 28 Mar 2008 02:25:09 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2S2P9SL009638
	for ; Fri, 28 Mar 2008 02:25:09 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2S2P9mS009636
	for perforce@freebsd.org; Fri, 28 Mar 2008 02:25:09 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 28 Mar 2008 02:25:09 GMT
Message-Id: <200803280225.m2S2P9mS009636@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138783 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 28 Mar 2008 02:25:10 -0000

http://perforce.freebsd.org/chv.cgi?CH=138783

Change 138783 by jb@jb_freebsd1 on 2008/03/28 02:24:14

	IFC

Affected files ...

.. //depot/projects/dtrace/src/sys/dev/re/if_re.c#18 integrate

Differences ...

==== //depot/projects/dtrace/src/sys/dev/re/if_re.c#18 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.111 2008/03/23 05:35:18 yongari Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.112 2008/03/28 01:21:21 yongari Exp $");
 
 /*
  * RealTek 8139C+/8169/8169S/8110S/8168/8111/8101E PCI NIC driver
@@ -2167,16 +2167,12 @@
 	 * need to send a really small IP fragment that's less than 60
 	 * bytes in size, and IP header checksumming is enabled, the
 	 * resulting ethernet frame that appears on the wire will
-	 * have garbled payload. To work around this, if TX checksum
+	 * have garbled payload. To work around this, if TX IP checksum
 	 * offload is enabled, we always manually pad short frames out
 	 * to the minimum ethernet frame size.
-	 *
-	 * Note: this appears unnecessary for TCP, and doing it for TCP
-	 * with PCIe adapters seems to result in bad checksums.
 	 */
-	if ((*m_head)->m_pkthdr.csum_flags & (CSUM_IP | CSUM_UDP) &&
-	    ((*m_head)->m_pkthdr.csum_flags & CSUM_TCP) == 0 &&
-            (*m_head)->m_pkthdr.len < RL_MIN_FRAMELEN) {
+	if ((*m_head)->m_pkthdr.len < RL_MIN_FRAMELEN &&
+	    ((*m_head)->m_pkthdr.csum_flags & CSUM_IP) != 0) {
 		padlen = RL_MIN_FRAMELEN - (*m_head)->m_pkthdr.len;
 		if (M_WRITABLE(*m_head) == 0) {
 			/* Get a writable copy. */
@@ -2257,12 +2253,18 @@
 		    ((uint32_t)(*m_head)->m_pkthdr.tso_segsz <<
 		    RL_TDESC_CMD_MSSVAL_SHIFT);
 	else {
-		if ((*m_head)->m_pkthdr.csum_flags & CSUM_IP)
+		/*
+		 * Unconditionally enable IP checksum if TCP or UDP
+		 * checksum is required. Otherwise, TCP/UDP checksum
+		 * does't make effects.
+		 */
+		if (((*m_head)->m_pkthdr.csum_flags & RE_CSUM_FEATURES) != 0) {
 			csum_flags |= RL_TDESC_CMD_IPCSUM;
-		if ((*m_head)->m_pkthdr.csum_flags & CSUM_TCP)
-			csum_flags |= RL_TDESC_CMD_TCPCSUM;
-		if ((*m_head)->m_pkthdr.csum_flags & CSUM_UDP)
-			csum_flags |= RL_TDESC_CMD_UDPCSUM;
+			if (((*m_head)->m_pkthdr.csum_flags & CSUM_TCP) != 0)
+				csum_flags |= RL_TDESC_CMD_TCPCSUM;
+			if (((*m_head)->m_pkthdr.csum_flags & CSUM_UDP) != 0)
+				csum_flags |= RL_TDESC_CMD_UDPCSUM;
+		}
 	}
 
 	/*

From owner-p4-projects@FreeBSD.ORG  Fri Mar 28 02:26:10 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BCD1E1065673; Fri, 28 Mar 2008 02: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 61AFD106566B
	for ; Fri, 28 Mar 2008 02:26:10 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 4AF708FC17
	for ; Fri, 28 Mar 2008 02:26:10 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2S2QAvx009693
	for ; Fri, 28 Mar 2008 02:26:10 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2S2QAGN009689
	for perforce@freebsd.org; Fri, 28 Mar 2008 02:26:10 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 28 Mar 2008 02:26:10 GMT
Message-Id: <200803280226.m2S2QAGN009689@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138784 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 28 Mar 2008 02:26:11 -0000

http://perforce.freebsd.org/chv.cgi?CH=138784

Change 138784 by jb@jb_freebsd1 on 2008/03/28 02:25:16

	Files have moved to their new locations.

Affected files ...

.. //depot/projects/dtrace/src/sys/compat/opensolaris/kern/opensolaris.c#5 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/kern/opensolaris_cmn_err.c#3 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/cpuvar_defs.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/cyclic_impl.h#4 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/feature_tests.h#4 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/sema.h#2 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/OPENSOLARIS.LICENSE#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/acl/acl_common.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/acl/acl_common.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/atomic/i386/atomic.S#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/atomic/ia64/atomic.S#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/avl/avl.c#15 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_create.c#9 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_decl.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_error.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_hash.c#7 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_impl.h#8 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_labels.c#7 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_lookup.c#9 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_open.c#7 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_types.c#7 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_util.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/nvpair/nvpair.c#7 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/zfs/zfs_namecheck.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/zfs/zfs_namecheck.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/zfs/zfs_prop.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/zfs/zfs_prop.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/Makefile.files#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/ctf/ctf_mod.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/ctf/ctf_subr.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#46 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/fasttrap.c#4 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/lockstat.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/profile.c#4 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/sdt_subr.c#6 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/systrace.c#4 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/gfs.c#6 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#8 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/bplist.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/gzip.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/refcount.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sha256.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/space_map.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#7 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/txg.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/unique.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#6 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#7 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#6 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#7 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#6 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#6 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#6 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#6 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#6 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#6 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#7 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#7 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#7 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#7 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#7 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/os/callb.c#6 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/os/list.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/os/taskq.c#6 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/rpc/xdr.c#7 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/rpc/xdr.h#7 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/rpc/xdr_array.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/rpc/xdr_mem.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/asm_linkage.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/avl.h#6 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/avl_impl.h#6 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/bitmap.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/byteorder.h#7 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/callb.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/ccompile.h#6 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/cmn_err.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/compress.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/cpupart.h#4 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/cpuvar.h#6 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/cred.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/ctf.h#9 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/ctf_api.h#12 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/debug.h#6 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dkio.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dklabel.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dtrace.h#36 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dtrace_impl.h#19 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/errorq.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/fasttrap.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/fasttrap_impl.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/feature_tests.h#9 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/fm/protocol.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/fm/util.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/gfs.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#15 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/list.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/list_impl.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/note.h#6 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/nvpair.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/nvpair_impl.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/processor.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/procset.h#7 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/synch.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/sysevent.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#7 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/zmod.h#7 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/zmod/adler32.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/zmod/crc32.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/zmod/crc32.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/zmod/deflate.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/zmod/deflate.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/zmod/inffast.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/zmod/inffast.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/zmod/inffixed.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/zmod/inflate.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/zmod/inflate.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/zmod/inftrees.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/zmod/inftrees.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/zmod/trees.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/zmod/zconf.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/zmod/zlib.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/zmod/zmod.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/zmod/zmod_subr.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/zmod/zutil.c#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/zmod/zutil.h#5 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/intel/sys/fasttrap_isa.h#6 delete
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/sparc/sys/fasttrap_isa.h#5 delete

Differences ...

From owner-p4-projects@FreeBSD.ORG  Fri Mar 28 02:36:21 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 59C571065677; Fri, 28 Mar 2008 02:36: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 188EB106566B
	for ; Fri, 28 Mar 2008 02:36:21 +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 DDE888FC31
	for ; Fri, 28 Mar 2008 02:36:20 +0000 (UTC)
	(envelope-from julian@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2S2aKXJ010170
	for ; Fri, 28 Mar 2008 02:36:20 GMT
	(envelope-from julian@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2S2aK5j010168
	for perforce@freebsd.org; Fri, 28 Mar 2008 02:36:20 GMT
	(envelope-from julian@freebsd.org)
Date: Fri, 28 Mar 2008 02:36:20 GMT
Message-Id: <200803280236.m2S2aK5j010168@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 138785 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 28 Mar 2008 02:36:21 -0000

http://perforce.freebsd.org/chv.cgi?CH=138785

Change 138785 by julian@julian_trafmon1 on 2008/03/28 02:36:11

	Add scripts to make real diffs etc.

Affected files ...

.. //depot/projects/qingli_mpath/makediff.pl#1 add
.. //depot/projects/qingli_mpath/update.sh#1 add

Differences ...

From owner-p4-projects@FreeBSD.ORG  Fri Mar 28 02:38:23 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 91F831065673; Fri, 28 Mar 2008 02:38: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 354D2106566C
	for ; Fri, 28 Mar 2008 02:38:23 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 1FF5D8FC21
	for ; Fri, 28 Mar 2008 02:38:23 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2S2cNkU010242
	for ; Fri, 28 Mar 2008 02:38:23 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2S2cN7v010240
	for perforce@freebsd.org; Fri, 28 Mar 2008 02:38:23 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 28 Mar 2008 02:38:23 GMT
Message-Id: <200803280238.m2S2cN7v010240@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138786 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 28 Mar 2008 02:38:24 -0000

http://perforce.freebsd.org/chv.cgi?CH=138786

Change 138786 by jb@jb_freebsd1 on 2008/03/28 02:37:24

	Update to reference files in the new location.

Affected files ...

.. //depot/projects/dtrace/src/cddl/lib/drti/Makefile#2 edit
.. //depot/projects/dtrace/src/cddl/lib/libctf/Makefile#6 edit
.. //depot/projects/dtrace/src/cddl/lib/libdtrace/Makefile#23 edit
.. //depot/projects/dtrace/src/cddl/usr.bin/ctfconvert/Makefile#15 edit
.. //depot/projects/dtrace/src/cddl/usr.bin/ctfdump/Makefile#7 edit
.. //depot/projects/dtrace/src/cddl/usr.bin/ctfmerge/Makefile#12 edit
.. //depot/projects/dtrace/src/cddl/usr.bin/sgsmsg/Makefile#11 edit
.. //depot/projects/dtrace/src/cddl/usr.sbin/dtrace/Makefile#10 edit

Differences ...

==== //depot/projects/dtrace/src/cddl/lib/drti/Makefile#2 (text+ko) ====

@@ -13,8 +13,8 @@
 WARNS?=		6
 CLEANFILES=	${FILES}
 
-CFLAGS+=	-I${.CURDIR}/../../../sys/compat/opensolaris \
-		-I${.CURDIR}/../../../compat/opensolaris/include \
+CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
+		-I${.CURDIR}/../../../cddl/compat/opensolaris/include \
 		-I${OPENSOLARIS_USR_DISTDIR}/head \
 		-I${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common \
 		-I${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common \

==== //depot/projects/dtrace/src/cddl/lib/libctf/Makefile#6 (text+ko) ====

@@ -23,11 +23,10 @@
 
 CFLAGS+=	-DCTF_OLD_VERSIONS
 
-CFLAGS+=	-I${.CURDIR}/../../../sys/compat/opensolaris \
-		-I${.CURDIR}/../../../compat/opensolaris/include \
+CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
+		-I${.CURDIR}/../../../cddl/compat/opensolaris/include \
 		-I${OPENSOLARIS_USR_DISTDIR}/head \
 		-I${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common \
-		-I${OPENSOLARIS_SYS_DISTDIR}/common/ctf \
 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
 
 .include 

==== //depot/projects/dtrace/src/cddl/lib/libdtrace/Makefile#23 (text+ko) ====

@@ -55,8 +55,8 @@
 .PATH:		${OPENSOLARIS_USR_DISTDIR}/lib/libgen/common
 
 CFLAGS+=	-I${.OBJDIR} \
-		-I${.CURDIR}/../../../sys/compat/opensolaris \
-		-I${.CURDIR}/../../../compat/opensolaris/include \
+		-I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
+		-I${.CURDIR}/../../../cddl/compat/opensolaris/include \
 		-I${OPENSOLARIS_USR_DISTDIR}/head \
 		-I${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common \
 		-I${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common \

==== //depot/projects/dtrace/src/cddl/usr.bin/ctfconvert/Makefile#15 (text+ko) ====

@@ -31,8 +31,8 @@
 
 WARNS?=		6
 
-CFLAGS+=	-I${.CURDIR}/../../../sys/compat/opensolaris \
-		-I${.CURDIR}/../../../compat/opensolaris/include \
+CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
+		-I${.CURDIR}/../../../cddl/compat/opensolaris/include \
 		-I${OPENSOLARIS_USR_DISTDIR} \
 		-I${OPENSOLARIS_SYS_DISTDIR} \
 		-I${OPENSOLARIS_USR_DISTDIR}/head \

==== //depot/projects/dtrace/src/cddl/usr.bin/ctfdump/Makefile#7 (text+ko) ====

@@ -14,8 +14,8 @@
 		-I${OPENSOLARIS_SYS_DISTDIR} \
 		-I${OPENSOLARIS_USR_DISTDIR}/head \
 		-I${OPENSOLARIS_USR_DISTDIR}/cmd/mdb/tools/common \
-		-I${.CURDIR}/../../../sys/compat/opensolaris \
-		-I${.CURDIR}/../../../compat/opensolaris/include \
+		-I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
+		-I${.CURDIR}/../../../cddl/compat/opensolaris/include \
 		-I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common \
 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
 

==== //depot/projects/dtrace/src/cddl/usr.bin/ctfmerge/Makefile#12 (text+ko) ====

@@ -28,8 +28,8 @@
 
 WARNS?=		6
 
-CFLAGS+=	-I${.CURDIR}/../../../sys/compat/opensolaris \
-		-I${.CURDIR}/../../../compat/opensolaris/include \
+CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
+		-I${.CURDIR}/../../../cddl/compat/opensolaris/include \
 		-I${OPENSOLARIS_USR_DISTDIR} \
 		-I${OPENSOLARIS_SYS_DISTDIR} \
 		-I${OPENSOLARIS_USR_DISTDIR}/head \

==== //depot/projects/dtrace/src/cddl/usr.bin/sgsmsg/Makefile#11 (text+ko) ====

@@ -7,8 +7,8 @@
 
 SRCS=		avl.c sgsmsg.c string_table.c findprime.c
 
-CFLAGS+=	-I${.CURDIR}/../../../sys/compat/opensolaris \
-		-I${.CURDIR}/../../../compat/opensolaris/include \
+CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
+		-I${.CURDIR}/../../../cddl/compat/opensolaris/include \
 		-I${OPENSOLARIS_USR_DISTDIR}/cmd/sgs/include \
 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
 

==== //depot/projects/dtrace/src/cddl/usr.sbin/dtrace/Makefile#10 (text+ko) ====

@@ -10,8 +10,8 @@
 
 WARNS=		1
 
-CFLAGS+=	-I${.CURDIR}/../../../sys/compat/opensolaris \
-		-I${.CURDIR}/../../../compat/opensolaris/include \
+CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
+		-I${.CURDIR}/../../../cddl/compat/opensolaris/include \
 		-I${OPENSOLARIS_USR_DISTDIR}/head \
 		-I${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common \
 		-I${OPENSOLARIS_USR_DISTDIR}/lib/libproc/common \

From owner-p4-projects@FreeBSD.ORG  Fri Mar 28 02:38:24 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E7CFE1065711; Fri, 28 Mar 2008 02:38: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 518261065672
	for ; Fri, 28 Mar 2008 02:38:23 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 3A10C8FC23
	for ; Fri, 28 Mar 2008 02:38:23 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2S2cNh9010247
	for ; Fri, 28 Mar 2008 02:38:23 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2S2cNTo010245
	for perforce@freebsd.org; Fri, 28 Mar 2008 02:38:23 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 28 Mar 2008 02:38:23 GMT
Message-Id: <200803280238.m2S2cNTo010245@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138787 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 28 Mar 2008 02:38:24 -0000

http://perforce.freebsd.org/chv.cgi?CH=138787

Change 138787 by jb@jb_freebsd1 on 2008/03/28 02:38:01

	Yes more merges int the moved files.

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#2 edit
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 edit
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 edit
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 edit
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/ctf.h#2 edit
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/ctf_api.h#2 edit
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h#2 edit
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h#2 edit
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h#2 edit
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#3 edit

Differences ...

==== //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#2 (text) ====

@@ -66,34 +66,66 @@
  * on capital-f functions.
  */
 #include 
+#if !defined(sun)
+#include 
+#endif
 #include 
 #include 
 #include 
 #include 
+#if defined(sun)
 #include 
 #include 
+#endif
 #include 
 #include 
+#if defined(sun)
 #include 
+#endif
 #include 
 #include 
 #include 
 #include 
+#if defined(sun)
 #include 
 #include 
+#endif
 #include 
+#if defined(sun)
 #include 
 #include 
+#endif
 #include 
+#if defined(sun)
 #include 
 #include 
+#endif
 #include 
+#if defined(sun)
 #include 
 #include 
+#endif
 #include 
 #include 
 #include 
 
+/* FreeBSD includes: */
+#if !defined(sun)
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include "dtrace_cddl.h"
+#include "dtrace_debug.c"
+#endif
+
 /*
  * DTrace Tunable Variables
  *
@@ -161,17 +193,25 @@
 /*
  * DTrace Internal Variables
  */
+#if defined(sun)
 static dev_info_t	*dtrace_devi;		/* device info */
+#endif
+#if defined(sun)
 static vmem_t		*dtrace_arena;		/* probe ID arena */
 static vmem_t		*dtrace_minor;		/* minor number arena */
 static taskq_t		*dtrace_taskq;		/* task queue */
+#else
+static struct unrhdr	*dtrace_arena;		/* Probe ID number.     */
+#endif
 static dtrace_probe_t	**dtrace_probes;	/* array of all probes */
 static int		dtrace_nprobes;		/* number of probes */
 static dtrace_provider_t *dtrace_provider;	/* provider list */
 static dtrace_meta_t	*dtrace_meta_pid;	/* user-land meta provider */
 static int		dtrace_opens;		/* number of opens */
 static int		dtrace_helpers;		/* number of helpers */
+#if defined(sun)
 static void		*dtrace_softstate;	/* softstate pointer */
+#endif
 static dtrace_hash_t	*dtrace_bymod;		/* probes hashed by module */
 static dtrace_hash_t	*dtrace_byfunc;		/* probes hashed by function */
 static dtrace_hash_t	*dtrace_byname;		/* probes hashed by name */
@@ -187,6 +227,14 @@
 static dtrace_helpers_t *dtrace_deferred_pid;	/* deferred helper list */
 static dtrace_enabling_t *dtrace_retained;	/* list of retained enablings */
 static dtrace_dynvar_t	dtrace_dynhash_sink;	/* end of dynamic hash chains */
+#if !defined(sun)
+static struct mtx	dtrace_unr_mtx;
+MTX_SYSINIT(dtrace_unr_mtx, &dtrace_unr_mtx, "Unique resource identifier", MTX_DEF);
+int		dtrace_in_probe;	/* non-zero if executing a probe */
+#if defined(__i386__) || defined(__amd64__)
+uintptr_t	dtrace_in_probe_addr;	/* Address of invop when already in probe */
+#endif
+#endif
 
 /*
  * DTrace Locking
@@ -222,6 +270,37 @@
 static kmutex_t		dtrace_provider_lock;	/* provider state lock */
 static kmutex_t		dtrace_meta_lock;	/* meta-provider state lock */
 
+#if !defined(sun)
+/* XXX FreeBSD hacks. */
+static kmutex_t		mod_lock;
+
+#define cr_suid		cr_svuid
+#define cr_sgid		cr_svgid
+#define	ipaddr_t	in_addr_t
+#define mod_modname	pathname
+#define vuprintf	vprintf
+#define ttoproc(_a)	((_a)->td_proc)
+#define crgetzoneid(_a)	0
+#define	NCPU		MAXCPU
+#define SNOCD		0
+#define CPU_ON_INTR(_a)	0
+
+#define PRIV_EFFECTIVE		(1 << 0)
+#define PRIV_DTRACE_KERNEL	(1 << 1)
+#define PRIV_DTRACE_PROC	(1 << 2)
+#define PRIV_DTRACE_USER	(1 << 3)
+#define PRIV_PROC_OWNER		(1 << 4)
+#define PRIV_PROC_ZONE		(1 << 5)
+#define PRIV_ALL		~0
+
+SYSCTL_NODE(_debug, OID_AUTO, dtrace, CTLFLAG_RD, 0, "DTrace Information");
+#endif
+
+#if defined(sun)
+#define curcpu	CPU->cpu_id
+#endif
+
+
 /*
  * DTrace Provider Variables
  *
@@ -241,8 +320,8 @@
 {}
 
 static dtrace_pops_t	dtrace_provider_ops = {
-	(void (*)(void *, const dtrace_probedesc_t *))dtrace_nullop,
-	(void (*)(void *, struct modctl *))dtrace_nullop,
+	(void (*)(void *, dtrace_probedesc_t *))dtrace_nullop,
+	(void (*)(void *, modctl_t *))dtrace_nullop,
 	(void (*)(void *, dtrace_id_t, void *))dtrace_nullop,
 	(void (*)(void *, dtrace_id_t, void *))dtrace_nullop,
 	(void (*)(void *, dtrace_id_t, void *))dtrace_nullop,
@@ -327,6 +406,7 @@
  * no way for a global variable key signature to match a thread-local key
  * signature.
  */
+#if defined(sun)
 #define	DTRACE_TLS_THRKEY(where) { \
 	uint_t intr = 0; \
 	uint_t actv = CPU->cpu_intr_actv >> (LOCK_LEVEL + 1); \
@@ -336,6 +416,18 @@
 	(where) = ((curthread->t_did + DIF_VARIABLE_MAX) & \
 	    (((uint64_t)1 << 61) - 1)) | ((uint64_t)intr << 61); \
 }
+#else
+#define	DTRACE_TLS_THRKEY(where) { \
+	solaris_cpu_t *_c = &solaris_cpu[curcpu]; \
+	uint_t intr = 0; \
+	uint_t actv = _c->cpu_intr_actv; \
+	for (; actv; actv >>= 1) \
+		intr++; \
+	ASSERT(intr < (1 << 3)); \
+	(where) = ((curthread->td_tid + DIF_VARIABLE_MAX) & \
+	    (((uint64_t)1 << 61) - 1)) | ((uint64_t)intr << 61); \
+}
+#endif
 
 #define	DT_BSWAP_8(x)	((x) & 0xff)
 #define	DT_BSWAP_16(x)	((DT_BSWAP_8(x) << 8) | DT_BSWAP_8((x) >> 8))
@@ -351,7 +443,7 @@
 #define	DTRACE_ALIGNCHECK(addr, size, flags)				\
 	if (addr & (size - 1)) {					\
 		*flags |= CPU_DTRACE_BADALIGN;				\
-		cpu_core[CPU->cpu_id].cpuc_dtrace_illval = addr;	\
+		cpu_core[curcpu].cpuc_dtrace_illval = addr;	\
 		return (0);						\
 	}
 #else
@@ -390,7 +482,7 @@
 	uint##bits##_t rval;						\
 	int i;								\
 	volatile uint16_t *flags = (volatile uint16_t *)		\
-	    &cpu_core[CPU->cpu_id].cpuc_dtrace_flags;			\
+	    &cpu_core[curcpu].cpuc_dtrace_flags;			\
 									\
 	DTRACE_ALIGNCHECK(addr, size, flags);				\
 									\
@@ -405,7 +497,7 @@
 		 * This address falls within a toxic region; return 0.	\
 		 */							\
 		*flags |= CPU_DTRACE_BADADDR;				\
-		cpu_core[CPU->cpu_id].cpuc_dtrace_illval = addr;	\
+		cpu_core[curcpu].cpuc_dtrace_illval = addr;		\
 		return (0);						\
 	}								\
 									\
@@ -448,22 +540,35 @@
 	((act)->dta_kind == DTRACEACT_DIFEXPR &&			\
 	(act)->dta_difo->dtdo_rtype.dtdt_kind == DIF_TYPE_STRING)
 
+/* Function prototype definitions: */
 static size_t dtrace_strlen(const char *, size_t);
 static dtrace_probe_t *dtrace_probe_lookup_id(dtrace_id_t id);
 static void dtrace_enabling_provide(dtrace_provider_t *);
 static int dtrace_enabling_match(dtrace_enabling_t *, int *);
 static void dtrace_enabling_matchall(void);
 static dtrace_state_t *dtrace_anon_grab(void);
+#if defined(sun)
 static uint64_t dtrace_helper(int, dtrace_mstate_t *,
     dtrace_state_t *, uint64_t, uint64_t);
 static dtrace_helpers_t *dtrace_helpers_create(proc_t *);
+#endif
 static void dtrace_buffer_drop(dtrace_buffer_t *);
 static intptr_t dtrace_buffer_reserve(dtrace_buffer_t *, size_t, size_t,
     dtrace_state_t *, dtrace_mstate_t *);
 static int dtrace_state_option(dtrace_state_t *, dtrace_optid_t,
     dtrace_optval_t);
 static int dtrace_ecb_create_enable(dtrace_probe_t *, void *);
+#if defined(sun)
 static void dtrace_helper_provider_destroy(dtrace_helper_provider_t *);
+#endif
+uint16_t dtrace_load16(uintptr_t);
+uint32_t dtrace_load32(uintptr_t);
+uint64_t dtrace_load64(uintptr_t);
+uint8_t dtrace_load8(uintptr_t);
+void dtrace_dynvar_clean(dtrace_dstate_t *);
+dtrace_dynvar_t *dtrace_dynvar(dtrace_dstate_t *, uint_t, dtrace_key_t *,
+    size_t, dtrace_dynvar_op_t, dtrace_mstate_t *, dtrace_vstate_t *);
+uintptr_t dtrace_dif_varstr(uintptr_t, dtrace_state_t *, dtrace_mstate_t *);
 
 /*
  * DTrace Probe Context Functions
@@ -674,7 +779,7 @@
 dtrace_canload(uint64_t addr, size_t sz, dtrace_mstate_t *mstate,
     dtrace_vstate_t *vstate)
 {
-	volatile uintptr_t *illval = &cpu_core[CPU->cpu_id].cpuc_dtrace_illval;
+	volatile uintptr_t *illval = &cpu_core[curcpu].cpuc_dtrace_illval;
 
 	/*
 	 * If we hold the privilege to read from kernel memory, then
@@ -766,7 +871,7 @@
 	if (s1 == s2 || limit == 0)
 		return (0);
 
-	flags = (volatile uint16_t *)&cpu_core[CPU->cpu_id].cpuc_dtrace_flags;
+	flags = (volatile uint16_t *)&cpu_core[curcpu].cpuc_dtrace_flags;
 
 	do {
 		if (s1 == NULL) {
@@ -820,13 +925,13 @@
 
 		if (kaddr - taddr < tsize) {
 			DTRACE_CPUFLAG_SET(CPU_DTRACE_BADADDR);
-			cpu_core[CPU->cpu_id].cpuc_dtrace_illval = kaddr;
+			cpu_core[curcpu].cpuc_dtrace_illval = kaddr;
 			return (1);
 		}
 
 		if (taddr - kaddr < size) {
 			DTRACE_CPUFLAG_SET(CPU_DTRACE_BADADDR);
-			cpu_core[CPU->cpu_id].cpuc_dtrace_illval = taddr;
+			cpu_core[curcpu].cpuc_dtrace_illval = taddr;
 			return (1);
 		}
 	}
@@ -910,7 +1015,7 @@
 {
 	volatile uint16_t *flags;
 
-	flags = (volatile uint16_t *)&cpu_core[CPU->cpu_id].cpuc_dtrace_flags;
+	flags = (volatile uint16_t *)&cpu_core[curcpu].cpuc_dtrace_flags;
 
 	if (s1 == s2)
 		return (0);
@@ -1066,6 +1171,7 @@
 static int
 dtrace_priv_proc_common_zone(dtrace_state_t *state)
 {
+#if defined(sun)
 	cred_t *cr, *s_cr = state->dts_cred.dcr_cred;
 
 	/*
@@ -1079,6 +1185,9 @@
 		return (1);
 
 	return (0);
+#else
+	return (1);
+#endif
 }
 
 /*
@@ -1086,7 +1195,7 @@
  * verify that the process has not setuid or changed credentials.
  */
 static int
-dtrace_priv_proc_common_nocd()
+dtrace_priv_proc_common_nocd(void)
 {
 	proc_t *proc;
 
@@ -1117,7 +1226,7 @@
 	return (1);
 
 bad:
-	cpu_core[CPU->cpu_id].cpuc_dtrace_flags |= CPU_DTRACE_UPRIV;
+	cpu_core[curcpu].cpuc_dtrace_flags |= CPU_DTRACE_UPRIV;
 
 	return (0);
 }
@@ -1133,7 +1242,7 @@
 	    dtrace_priv_proc_common_nocd())
 		return (1);
 
-	cpu_core[CPU->cpu_id].cpuc_dtrace_flags |= CPU_DTRACE_UPRIV;
+	cpu_core[curcpu].cpuc_dtrace_flags |= CPU_DTRACE_UPRIV;
 
 	return (0);
 }
@@ -1144,7 +1253,7 @@
 	if (state->dts_cred.dcr_action & DTRACE_CRA_PROC)
 		return (1);
 
-	cpu_core[CPU->cpu_id].cpuc_dtrace_flags |= CPU_DTRACE_UPRIV;
+	cpu_core[curcpu].cpuc_dtrace_flags |= CPU_DTRACE_UPRIV;
 
 	return (0);
 }
@@ -1155,7 +1264,7 @@
 	if (state->dts_cred.dcr_action & DTRACE_CRA_KERNEL)
 		return (1);
 
-	cpu_core[CPU->cpu_id].cpuc_dtrace_flags |= CPU_DTRACE_KPRIV;
+	cpu_core[curcpu].cpuc_dtrace_flags |= CPU_DTRACE_KPRIV;
 
 	return (0);
 }
@@ -1166,7 +1275,7 @@
 	if (state->dts_cred.dcr_action & DTRACE_CRA_KERNEL_DESTRUCTIVE)
 		return (1);
 
-	cpu_core[CPU->cpu_id].cpuc_dtrace_flags |= CPU_DTRACE_KPRIV;
+	cpu_core[curcpu].cpuc_dtrace_flags |= CPU_DTRACE_KPRIV;
 
 	return (0);
 }
@@ -1277,7 +1386,7 @@
 	uint64_t hashval = DTRACE_DYNHASH_VALID;
 	dtrace_dynhash_t *hash = dstate->dtds_hash;
 	dtrace_dynvar_t *free, *new_free, *next, *dvar, *start, *prev = NULL;
-	processorid_t me = CPU->cpu_id, cpu = me;
+	processorid_t me = curcpu, cpu = me;
 	dtrace_dstate_percpu_t *dcpu = &dstate->dtds_percpu[me];
 	size_t bucket, ksize;
 	size_t chunksize = dstate->dtds_chunksize;
@@ -1368,8 +1477,8 @@
 			while ((lock = *lockp) & 1)
 				continue;
 
-			if (dtrace_casptr((void *)lockp,
-			    (void *)lock, (void *)(lock + 1)) == (void *)lock)
+			if (dtrace_casptr((volatile void *)lockp,
+			    (volatile void *)lock, (volatile void *)(lock + 1)) == (void *)lock)
 				break;
 		}
 
@@ -2165,7 +2274,7 @@
 	dtrace_speculation_t *spec;
 	dtrace_buffer_t *src, *dest;
 	uintptr_t daddr, saddr, dlimit;
-	dtrace_speculation_state_t current, new;
+	dtrace_speculation_state_t current, new = 0;
 	intptr_t offs;
 
 	if (which == 0)
@@ -2301,7 +2410,7 @@
     dtrace_specid_t which)
 {
 	dtrace_speculation_t *spec;
-	dtrace_speculation_state_t current, new;
+	dtrace_speculation_state_t current, new = 0;
 	dtrace_buffer_t *buf;
 
 	if (which == 0)
@@ -2359,7 +2468,7 @@
 dtrace_speculation_clean_here(dtrace_state_t *state)
 {
 	dtrace_icookie_t cookie;
-	processorid_t cpu = CPU->cpu_id;
+	processorid_t cpu = curcpu;
 	dtrace_buffer_t *dest = &state->dts_buffer[cpu];
 	dtrace_specid_t i;
 
@@ -2463,7 +2572,7 @@
     dtrace_specid_t which)
 {
 	dtrace_speculation_t *spec;
-	dtrace_speculation_state_t current, new;
+	dtrace_speculation_state_t current, new = 0;
 	dtrace_buffer_t *buf;
 
 	if (which == 0)
@@ -2556,7 +2665,7 @@
 	if (mstate->dtms_scratch_ptr + strsz >
 	    mstate->dtms_scratch_base + mstate->dtms_scratch_size) {
 		DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH);
-		return (NULL);
+		return (0);
 	}
 
 	dtrace_strcpy((const void *)addr, (void *)mstate->dtms_scratch_ptr,
@@ -2567,6 +2676,44 @@
 }
 
 /*
+ * Return a string from a memoy address which is known to have one or
+ * more concatenated, individually zero terminated, sub-strings.
+ * In the event that the user lacks the privilege to access
+ * arbitrary kernel memory, we copy the string out to scratch memory so that we
+ * don't fail access checking.
+ *
+ * dtrace_dif_variable() uses this routine as a helper for various
+ * builtin values such as 'execargs'.
+ */
+static uintptr_t
+dtrace_dif_varstrz(uintptr_t addr, size_t strsz, dtrace_state_t *state,
+    dtrace_mstate_t *mstate)
+{
+	char *p;
+	size_t i;
+	uintptr_t ret;
+
+	if (mstate->dtms_scratch_ptr + strsz >
+	    mstate->dtms_scratch_base + mstate->dtms_scratch_size) {
+		DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH);
+		return (0);
+	}
+
+	dtrace_bcopy((const void *)addr, (void *)mstate->dtms_scratch_ptr,
+	    strsz);
+
+	/* Replace sub-string termination characters with a space. */
+	for (p = (char *) mstate->dtms_scratch_ptr, i = 0; i < strsz - 1;
+	    p++, i++)
+		if (*p == '\0')
+			*p = ' ';
+
+	ret = mstate->dtms_scratch_ptr;
+	mstate->dtms_scratch_ptr += strsz;
+	return (ret);
+}
+
+/*
  * This function implements the DIF emulator's variable lookups.  The emulator
  * passes a reserved variable identifier and optional built-in array index.
  */
@@ -2617,6 +2764,7 @@
 
 		return (mstate->dtms_arg[ndx]);
 
+#if defined(sun)
 	case DIF_VAR_UREGS: {
 		klwp_t *lwp;
 
@@ -2625,12 +2773,14 @@
 
 		if ((lwp = curthread->t_lwp) == NULL) {
 			DTRACE_CPUFLAG_SET(CPU_DTRACE_BADADDR);
-			cpu_core[CPU->cpu_id].cpuc_dtrace_illval = NULL;
+			cpu_core[curcpu].cpuc_dtrace_illval = NULL;
 			return (0);
 		}
 
 		return (dtrace_getreg(lwp->lwp_regs, ndx));
+		return (0);
 	}
+#endif
 
 	case DIF_VAR_CURTHREAD:
 		if (!dtrace_priv_kernel(state))
@@ -2655,6 +2805,7 @@
 		}
 		return (mstate->dtms_walltimestamp);
 
+#if defined(sun)
 	case DIF_VAR_IPL:
 		if (!dtrace_priv_kernel(state))
 			return (0);
@@ -2663,6 +2814,7 @@
 			mstate->dtms_present |= DTRACE_MSTATE_IPL;
 		}
 		return (mstate->dtms_ipl);
+#endif
 
 	case DIF_VAR_EPID:
 		ASSERT(mstate->dtms_present & DTRACE_MSTATE_EPID);
@@ -2683,6 +2835,7 @@
 		}
 		return (mstate->dtms_stackdepth);
 
+#if defined(sun)
 	case DIF_VAR_USTACKDEPTH:
 		if (!dtrace_priv_proc(state))
 			return (0);
@@ -2702,6 +2855,7 @@
 			mstate->dtms_present |= DTRACE_MSTATE_USTACKDEPTH;
 		}
 		return (mstate->dtms_ustackdepth);
+#endif
 
 	case DIF_VAR_CALLER:
 		if (!dtrace_priv_kernel(state))
@@ -2716,7 +2870,7 @@
 				 * dtrace_caller() only guarantees correct
 				 * results for anchored probes.
 				 */
-				pc_t caller[2];
+				pc_t caller[2] = {0, 0};
 
 				dtrace_getpcstack(caller, 2, aframes,
 				    (uint32_t *)(uintptr_t)mstate->dtms_arg[0]);
@@ -2728,7 +2882,7 @@
 				 * we must resort to the slower approach of
 				 * calling dtrace_getpcstack().
 				 */
-				pc_t caller;
+				pc_t caller = 0;
 
 				dtrace_getpcstack(&caller, 1, aframes, NULL);
 				mstate->dtms_caller = caller;
@@ -2738,6 +2892,7 @@
 		}
 		return (mstate->dtms_caller);
 
+#if defined(sun)
 	case DIF_VAR_UCALLER:
 		if (!dtrace_priv_proc(state))
 			return (0);
@@ -2752,7 +2907,7 @@
 			 * uint64_t will contain the caller, which is what
 			 * we're after.
 			 */
-			ustack[2] = NULL;
+			ustack[2] = 0;
 			DTRACE_CPUFLAG_SET(CPU_DTRACE_NOFAULT);
 			dtrace_getupcstack(ustack, 3);
 			DTRACE_CPUFLAG_CLEAR(CPU_DTRACE_NOFAULT);
@@ -2761,6 +2916,7 @@
 		}
 
 		return (mstate->dtms_ucaller);
+#endif
 
 	case DIF_VAR_PROBEPROV:
 		ASSERT(mstate->dtms_present & DTRACE_MSTATE_PROBE);
@@ -2790,6 +2946,7 @@
 		if (!dtrace_priv_proc(state))
 			return (0);
 
+#if defined(sun)
 		/*
 		 * Note that we are assuming that an unanchored probe is
 		 * always due to a high-level interrupt.  (And we're assuming
@@ -2807,11 +2964,15 @@
 		 * they leave that task to whomever reaps them.)
 		 */
 		return ((uint64_t)curthread->t_procp->p_pidp->pid_id);
+#else
+		return ((uint64_t)curproc->p_pid);
+#endif
 
 	case DIF_VAR_PPID:
 		if (!dtrace_priv_proc(state))
 			return (0);
 
+#if defined(sun)
 		/*
 		 * See comment in DIF_VAR_PID.
 		 */
@@ -2825,17 +2986,30 @@
 		 * state -- they leave that task to whomever reaps them.)
 		 */
 		return ((uint64_t)curthread->t_procp->p_ppid);
+#else
+		return ((uint64_t)curproc->p_pptr->p_pid);
+#endif
 
 	case DIF_VAR_TID:
+#if defined(sun)
 		/*
 		 * See comment in DIF_VAR_PID.
 		 */
 		if (DTRACE_ANCHORED(mstate->dtms_probe) && CPU_ON_INTR(CPU))
 			return (0);
+#endif
 
 		return ((uint64_t)curthread->t_tid);
 
+	case DIF_VAR_EXECARGS: {
+		struct pargs *p_args = curthread->td_proc->p_args;
+
+		return (dtrace_dif_varstrz(
+		    (uintptr_t) p_args->ar_args, p_args->ar_length, state, mstate));
+	}
+
 	case DIF_VAR_EXECNAME:
+#if defined(sun)
 		if (!dtrace_priv_proc(state))
 			return (0);
 
@@ -2854,8 +3028,13 @@
 		return (dtrace_dif_varstr(
 		    (uintptr_t)curthread->t_procp->p_user.u_comm,
 		    state, mstate));
+#else
+		return (dtrace_dif_varstr(
+		    (uintptr_t) curthread->td_proc->p_comm, state, mstate));
+#endif
 
 	case DIF_VAR_ZONENAME:
+#if defined(sun)
 		if (!dtrace_priv_proc(state))
 			return (0);
 
@@ -2874,16 +3053,21 @@
 		return (dtrace_dif_varstr(
 		    (uintptr_t)curthread->t_procp->p_zone->zone_name,
 		    state, mstate));
+#else
+		return (0);
+#endif
 
 	case DIF_VAR_UID:
 		if (!dtrace_priv_proc(state))
 			return (0);
 
+#if defined(sun)
 		/*
 		 * See comment in DIF_VAR_PID.
 		 */
 		if (DTRACE_ANCHORED(mstate->dtms_probe) && CPU_ON_INTR(CPU))
 			return ((uint64_t)p0.p_cred->cr_uid);
+#endif
 
 		/*
 		 * It is always safe to dereference one's own t_procp pointer:
@@ -2900,11 +3084,13 @@
 		if (!dtrace_priv_proc(state))
 			return (0);
 
+#if defined(sun)
 		/*
 		 * See comment in DIF_VAR_PID.
 		 */
 		if (DTRACE_ANCHORED(mstate->dtms_probe) && CPU_ON_INTR(CPU))
 			return ((uint64_t)p0.p_cred->cr_gid);
+#endif
 
 		/*
 		 * It is always safe to dereference one's own t_procp pointer:
@@ -2918,6 +3104,7 @@
 		return ((uint64_t)curthread->t_procp->p_cred->cr_gid);
 
 	case DIF_VAR_ERRNO: {
+#if defined(sun)
 		klwp_t *lwp;
 		if (!dtrace_priv_proc(state))
 			return (0);
@@ -2938,6 +3125,9 @@
 			return (0);
 
 		return ((uint64_t)lwp->lwp_errno);
+#else
+		return (curthread->td_errno);
+#endif
 	}
 	default:
 		DTRACE_CPUFLAG_SET(CPU_DTRACE_ILLOP);
@@ -2957,10 +3147,11 @@
     dtrace_key_t *tupregs, int nargs,
     dtrace_mstate_t *mstate, dtrace_state_t *state)
 {
-	volatile uint16_t *flags = &cpu_core[CPU->cpu_id].cpuc_dtrace_flags;
-	volatile uintptr_t *illval = &cpu_core[CPU->cpu_id].cpuc_dtrace_illval;
+	volatile uint16_t *flags = &cpu_core[curcpu].cpuc_dtrace_flags;
+	volatile uintptr_t *illval = &cpu_core[curcpu].cpuc_dtrace_illval;
 	dtrace_vstate_t *vstate = &state->dts_vstate;
 
+#if defined(sun)
 	union {
 		mutex_impl_t mi;
 		uint64_t mx;
@@ -2970,16 +3161,27 @@
 		krwlock_t ri;
 		uintptr_t rw;
 	} r;
+#else
+	union {
+		struct mtx *mi;
+		uintptr_t mx;
+	} m;
+	union {
+		struct sx *si;
+		uintptr_t sx;
+	} s;
+#endif
 
 	switch (subr) {
 	case DIF_SUBR_RAND:
 		regs[rd] = (dtrace_gethrtime() * 2416 + 374441) % 1771875;
 		break;
 
+#if defined(sun)
 	case DIF_SUBR_MUTEX_OWNED:
 		if (!dtrace_canload(tupregs[0].dttk_value, sizeof (kmutex_t),
 		    mstate, vstate)) {
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -2993,7 +3195,7 @@
 	case DIF_SUBR_MUTEX_OWNER:
 		if (!dtrace_canload(tupregs[0].dttk_value, sizeof (kmutex_t),
 		    mstate, vstate)) {
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -3008,7 +3210,7 @@
 	case DIF_SUBR_MUTEX_TYPE_ADAPTIVE:
 		if (!dtrace_canload(tupregs[0].dttk_value, sizeof (kmutex_t),
 		    mstate, vstate)) {
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -3019,7 +3221,7 @@
 	case DIF_SUBR_MUTEX_TYPE_SPIN:
 		if (!dtrace_canload(tupregs[0].dttk_value, sizeof (kmutex_t),
 		    mstate, vstate)) {
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -3032,7 +3234,7 @@
 
 		if (!dtrace_canload(tupregs[0].dttk_value, sizeof (uintptr_t),
 		    mstate, vstate)) {
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -3044,7 +3246,7 @@
 	case DIF_SUBR_RW_WRITE_HELD:
 		if (!dtrace_canload(tupregs[0].dttk_value, sizeof (krwlock_t),
 		    mstate, vstate)) {
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -3055,7 +3257,7 @@
 	case DIF_SUBR_RW_ISWRITER:
 		if (!dtrace_canload(tupregs[0].dttk_value, sizeof (krwlock_t),
 		    mstate, vstate)) {
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -3063,6 +3265,77 @@
 		regs[rd] = _RW_ISWRITER(&r.ri);
 		break;
 
+#else
+	/* 
+         * XXX - The following code works because mutex, rwlocks, & sxlocks
+         *       all have similar data structures in FreeBSD.  This may not be
+         *	 good if someone changes one of the lock data structures.
+	 * 	 Ideally, it would be nice if all these shared a common lock 
+	 * 	 object.
+         */
+	case DIF_SUBR_MUTEX_OWNED:
+		/* XXX - need to use dtrace_canload() and dtrace_loadptr() */ 
+		m.mx = tupregs[0].dttk_value;
+
+		if (LO_CLASSINDEX(&(m.mi->lock_object)) < 2) { 
+			regs[rd] = !(m.mi->mtx_lock & MTX_UNOWNED);
+		} else {	
+			regs[rd] = !(m.mi->mtx_lock & SX_UNLOCKED);
+		}
+		break;
+
+	case DIF_SUBR_MUTEX_OWNER:
+		/* XXX - need to use dtrace_canload() and dtrace_loadptr() */ 
+		m.mx = tupregs[0].dttk_value;
+
+		if (LO_CLASSINDEX(&(m.mi->lock_object)) < 2) { 
+			regs[rd] = m.mi->mtx_lock & ~MTX_FLAGMASK;
+		} else {
+			if (!(m.mi->mtx_lock & SX_LOCK_SHARED)) 
+				regs[rd] = SX_OWNER(m.mi->mtx_lock);
+			else
+				regs[rd] = 0;
+		}
+		break;
+
+	case DIF_SUBR_MUTEX_TYPE_ADAPTIVE:
+		/* XXX - need to use dtrace_canload() and dtrace_loadptr() */ 
+		m.mx = tupregs[0].dttk_value;
+
+		regs[rd] = (LO_CLASSINDEX(&(m.mi->lock_object)) != 0);
+		break;
+
+	case DIF_SUBR_MUTEX_TYPE_SPIN:
+		/* XXX - need to use dtrace_canload() and dtrace_loadptr() */ 
+		m.mx = tupregs[0].dttk_value;
+
+		regs[rd] = (LO_CLASSINDEX(&(m.mi->lock_object)) == 0);
+		break;
+
+	case DIF_SUBR_RW_READ_HELD: 
+	case DIF_SUBR_SX_SHARED_HELD: 
+		/* XXX - need to use dtrace_canload() and dtrace_loadptr() */ 
+		s.sx = tupregs[0].dttk_value;
+		regs[rd] = ((s.si->sx_lock & SX_LOCK_SHARED)  && 
+			    (SX_OWNER(s.si->sx_lock) >> SX_SHARERS_SHIFT) != 0);
+		break;
+
+	case DIF_SUBR_RW_WRITE_HELD:
+	case DIF_SUBR_SX_EXCLUSIVE_HELD:
+		/* XXX - need to use dtrace_canload() and dtrace_loadptr() */ 
+		s.sx = tupregs[0].dttk_value;
+		regs[rd] = (SX_OWNER(s.si->sx_lock) == (uintptr_t) curthread); 
+		break;
+
+	case DIF_SUBR_RW_ISWRITER:
+	case DIF_SUBR_SX_ISEXCLUSIVE:
+		/* XXX - need to use dtrace_canload() and dtrace_loadptr() */ 
+		s.sx = tupregs[0].dttk_value;
+		regs[rd] = ((s.si->sx_lock & SX_LOCK_EXCLUSIVE_WAITERS) ||
+		            !(s.si->sx_lock & SX_LOCK_SHARED));
+		break;
+#endif /* ! defined(sun) */
+
 	case DIF_SUBR_BCOPY: {
 		/*
 		 * We need to be sure that the destination is in the scratch
@@ -3079,7 +3352,7 @@
 		}
 
 		if (!dtrace_canload(src, size, mstate, vstate)) {
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -3107,7 +3380,7 @@
 		if (scratch_size < size ||
 		    !DTRACE_INSCRATCH(mstate, scratch_size)) {
 			DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH);
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -3157,7 +3430,7 @@
 		 */
 		if (!DTRACE_INSCRATCH(mstate, size)) {
 			DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH);
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -3171,6 +3444,7 @@
 		break;
 	}
 
+#if defined(sun)
 	case DIF_SUBR_MSGSIZE:
 	case DIF_SUBR_MSGDSIZE: {
 		uintptr_t baddr = tupregs[0].dttk_value, daddr;
@@ -3178,11 +3452,11 @@
 		size_t count = 0;
 		int cont = 0;
 
-		while (baddr != NULL && !(*flags & CPU_DTRACE_FAULT)) {
+		while (baddr != 0 && !(*flags & CPU_DTRACE_FAULT)) {
 
 			if (!dtrace_canload(baddr, sizeof (mblk_t), mstate,
 			    vstate)) {
-				regs[rd] = NULL;
+				regs[rd] = 0;
 				break;
 			}
 
@@ -3228,6 +3502,7 @@
 
 		break;
 	}
+#endif
 
 	case DIF_SUBR_PROGENYOF: {
 		pid_t pid = tupregs[0].dttk_value;
@@ -3237,7 +3512,11 @@
 		DTRACE_CPUFLAG_SET(CPU_DTRACE_NOFAULT);
 
 		for (p = curthread->t_procp; p != NULL; p = p->p_parent) {
+#if defined(sun)
 			if (p->p_pidp->pid_id == pid) {
+#else
+			if (p->p_pid == pid) {
+#endif
 				rval = 1;
 				break;
 			}
@@ -3290,7 +3569,7 @@
 		    state->dts_options[DTRACEOPT_STRSIZE]);
 
 		if (!dtrace_canload(addr, sz + 1, mstate, vstate)) {
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -3313,7 +3592,7 @@
 		uintptr_t limit = addr + state->dts_options[DTRACEOPT_STRSIZE];
 		char c, target = (char)tupregs[1].dttk_value;
 
-		for (regs[rd] = NULL; addr < limit; addr++) {
+		for (regs[rd] = 0; addr < limit; addr++) {
 			if ((c = dtrace_load8(addr)) == target) {
 				regs[rd] = addr;
 
@@ -3326,7 +3605,7 @@
 		}
 
 		if (!dtrace_canload(saddr, addr - saddr, mstate, vstate)) {
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -3357,13 +3636,13 @@
 		regs[rd] = notfound;
 
 		if (!dtrace_canload((uintptr_t)addr, len + 1, mstate, vstate)) {
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
 		if (!dtrace_canload((uintptr_t)substr, sublen + 1, mstate,
 		    vstate)) {
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Fri Mar 28 03:31:18 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 76BEB1065675; Fri, 28 Mar 2008 03:31: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 32CFD1065672
	for ; Fri, 28 Mar 2008 03:31:18 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0320C8FC12
	for ; Fri, 28 Mar 2008 03:31:18 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2S3VHsY013266
	for ; Fri, 28 Mar 2008 03:31:17 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2S3VHVn013264
	for perforce@freebsd.org; Fri, 28 Mar 2008 03:31:17 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 28 Mar 2008 03:31:17 GMT
Message-Id: <200803280331.m2S3VHVn013264@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138789 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 28 Mar 2008 03:31:18 -0000

http://perforce.freebsd.org/chv.cgi?CH=138789

Change 138789 by jb@jb_freebsd1 on 2008/03/28 03:30:28

	Add an include path.

Affected files ...

.. //depot/projects/dtrace/src/cddl/lib/libctf/Makefile#7 edit

Differences ...

==== //depot/projects/dtrace/src/cddl/lib/libctf/Makefile#7 (text+ko) ====

@@ -26,6 +26,7 @@
 CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
 		-I${.CURDIR}/../../../cddl/compat/opensolaris/include \
 		-I${OPENSOLARIS_USR_DISTDIR}/head \
+		-I${OPENSOLARIS_USR_DISTDIR}/common/ctf \
 		-I${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common \
 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
 

From owner-p4-projects@FreeBSD.ORG  Fri Mar 28 03:31:19 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C09D9106570F; Fri, 28 Mar 2008 03:31: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 43E971065673
	for ; Fri, 28 Mar 2008 03:31:18 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 2E0818FC15
	for ; Fri, 28 Mar 2008 03:31:18 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2S3VIt1013271
	for ; Fri, 28 Mar 2008 03:31:18 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2S3VIpg013269
	for perforce@freebsd.org; Fri, 28 Mar 2008 03:31:18 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 28 Mar 2008 03:31:18 GMT
Message-Id: <200803280331.m2S3VIpg013269@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138790 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 28 Mar 2008 03:31:19 -0000

http://perforce.freebsd.org/chv.cgi?CH=138790

Change 138790 by jb@jb_freebsd1 on 2008/03/28 03:30:55

	Update to match the current cyclic timer design.

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/cyclic.h#2 edit

Differences ...

==== //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/cyclic.h#2 (text+ko) ====

@@ -1,31 +1,31 @@
 /*
- * Copyright (C) 2007 John Birrell 
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY 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 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.
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
  *
- * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/cyclic.h,v 1.1 2007/11/28 21:50:40 jb Exp $
+ * $FreeBSD$
  *
  */
+/*
+ * Copyright (c) 1999-2001 by Sun Microsystems, Inc.
+ * All rights reserved.
+ */
 
 #ifndef _COMPAT_OPENSOLARIS_SYS_CYCLIC_H_
 #define _COMPAT_OPENSOLARIS_SYS_CYCLIC_H_
@@ -34,6 +34,46 @@
 typedef	void	cpu_t;
 #endif
 
-#include_next 
+
+#ifndef _ASM
+#include 
+#include 
+#endif /* !_ASM */
+
+#ifndef _ASM
+
+typedef uintptr_t cyclic_id_t;
+typedef int cyc_index_t;
+typedef uint16_t cyc_level_t;
+typedef void (*cyc_func_t)(void *);
+typedef void *cyb_arg_t;
+
+#define	CYCLIC_NONE		((cyclic_id_t)0)
+
+typedef struct cyc_handler {
+	cyc_func_t cyh_func;
+	void *cyh_arg;
+} cyc_handler_t;
+
+typedef struct cyc_time {
+	hrtime_t cyt_when;
+	hrtime_t cyt_interval;
+} cyc_time_t;
+
+typedef struct cyc_omni_handler {
+	void (*cyo_online)(void *, cpu_t *, cyc_handler_t *, cyc_time_t *);
+	void (*cyo_offline)(void *, cpu_t *, void *);
+	void *cyo_arg;
+} cyc_omni_handler_t;
+
+#ifdef _KERNEL
+
+cyclic_id_t cyclic_add(cyc_handler_t *, cyc_time_t *);
+cyclic_id_t cyclic_add_omni(cyc_omni_handler_t *);
+void cyclic_remove(cyclic_id_t);
+
+#endif /* _KERNEL */
+
+#endif /* !_ASM */
 
 #endif

From owner-p4-projects@FreeBSD.ORG  Fri Mar 28 05:05:59 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7B20C1065673; Fri, 28 Mar 2008 05:05: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 3BD2F1065672
	for ; Fri, 28 Mar 2008 05:05:59 +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 0BEA28FC18
	for ; Fri, 28 Mar 2008 05:05:59 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2S55wUh028348
	for ; Fri, 28 Mar 2008 05:05:58 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2S55wJ0028346
	for perforce@freebsd.org; Fri, 28 Mar 2008 05:05:58 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 28 Mar 2008 05:05:58 GMT
Message-Id: <200803280505.m2S55wJ0028346@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 138793 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 28 Mar 2008 05:05:59 -0000

http://perforce.freebsd.org/chv.cgi?CH=138793

Change 138793 by sam@sam_ebb on 2008/03/28 05:05:54

	classify ProbeReq frames as BE

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_output.c#42 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_output.c#42 (text+ko) ====

@@ -1705,6 +1705,8 @@
 		sa, da, bssid);
 	/* XXX power management? */
 
+	M_WME_SETAC(m, WME_AC_BE);
+
 	IEEE80211_NODE_STAT(ni, tx_probereq);
 	IEEE80211_NODE_STAT(ni, tx_mgmt);
 

From owner-p4-projects@FreeBSD.ORG  Fri Mar 28 05:07:00 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A46DF1065674; Fri, 28 Mar 2008 05:07: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 63CFE106566C
	for ; Fri, 28 Mar 2008 05:07:00 +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 4D9668FC1B
	for ; Fri, 28 Mar 2008 05:07:00 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2S570Ba028421
	for ; Fri, 28 Mar 2008 05:07:00 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2S570IQ028419
	for perforce@freebsd.org; Fri, 28 Mar 2008 05:07:00 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 28 Mar 2008 05:07:00 GMT
Message-Id: <200803280507.m2S570IQ028419@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 138794 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 28 Mar 2008 05:07:01 -0000

http://perforce.freebsd.org/chv.cgi?CH=138794

Change 138794 by sam@sam_ebb on 2008/03/28 05:06:40

	remove the old ic_mgtq; all the drivers now support the raw
	xmit path so no reason to keep it around

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_ddb.c#8 edit
.. //depot/projects/vap/sys/net80211/ieee80211_ht.c#19 edit
.. //depot/projects/vap/sys/net80211/ieee80211_proto.c#26 edit
.. //depot/projects/vap/sys/net80211/ieee80211_var.h#34 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_ddb.c#8 (text+ko) ====

@@ -469,7 +469,6 @@
 	db_printf("\n");
 	db_printf("\tifp %p", ic->ic_ifp);
 	db_printf(" comlock %p", &ic->ic_comlock);
-	db_printf(" mgtq %p", &ic->ic_mgtq);
 	db_printf("\n");
 	_db_show_stats(&ic->ic_stats);
 	db_printf("\theadroom %d", ic->ic_headroom);

==== //depot/projects/vap/sys/net80211/ieee80211_ht.c#19 (text+ko) ====

@@ -1718,7 +1718,6 @@
 } while (0)
 	struct ieee80211vap *vap = ni->ni_vap;
 	struct ieee80211com *ic = ni->ni_ic;
-	struct ifnet *ifp = ic->ic_ifp;
 	struct ieee80211_frame_min *wh;
 	struct mbuf *m;
 	uint8_t *frm;
@@ -1755,17 +1754,15 @@
 	ADDSHORT(frm, barseqctl);
 	m->m_pkthdr.len = m->m_len = frm - mtod(m, uint8_t *);
 
+	M_WME_SETAC(m, WME_AC_VO);
+
 	IEEE80211_NODE_STAT(ni, tx_mgmt);	/* XXX tx_ctl? */
 
 	IEEE80211_NOTE(vap, IEEE80211_MSG_DEBUG | IEEE80211_MSG_DUMPPKTS,
 	    ni, "send bar frame (tid %u start %u) on channel %u",
 	    tid, tap->txa_start, ieee80211_chan2ieee(ic, ic->ic_curchan));
 
-	m->m_pkthdr.rcvif = (void *)ni;
-	IF_ENQUEUE(&ic->ic_mgtq, m);		/* cheat */
-	if_start(ifp);
-
-	return 0;
+	return ic->ic_raw_xmit(ni, m, NULL);
 bad:
 	ieee80211_free_node(ni);
 	return ret;

==== //depot/projects/vap/sys/net80211/ieee80211_proto.c#26 (text+ko) ====

@@ -98,21 +98,15 @@
 static int ieee80211_new_state_locked(struct ieee80211vap *,
 	enum ieee80211_state, int);
 
-/*
- * This routine is for old drivers that expect mgt frames
- * to come in through the ic_mgtq.  Drivers that are
- * prepared to handle queing themselves should override
- * ic_raw_xmit and handle dispatch themselves.
- */
 static int
-raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
+null_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
 	const struct ieee80211_bpf_params *params)
 {
-	struct ieee80211com *ic = ni->ni_ic;
+	struct ifnet *ifp = ni->ni_ic->ic_ifp;
 
-	m->m_pkthdr.rcvif = (void *) ni;
-	IF_HANDOFF(&ic->ic_mgtq, m, ic->ic_ifp);
-	return 0;
+	if_printf(ifp, "missing ic_raw_xmit callback, drop frame\n");
+	m_freem(m);
+	return ENETDOWN;
 }
 
 void
@@ -132,7 +126,6 @@
 		max_hdr = max_linkhdr + max_protohdr;
 		max_datalen = MHLEN - max_hdr;
 	}
-	mtx_init(&ic->ic_mgtq.ifq_mtx, ifp->if_xname, "mgmt send q", MTX_DEF);
 	ic->ic_protmode = IEEE80211_PROT_CTSONLY;
 
 	ic->ic_wme.wme_hipri_switch_hysteresis =
@@ -140,8 +133,7 @@
 
 	/* initialize management frame handlers */
 	ic->ic_send_mgmt = ieee80211_send_mgmt;
-	/* NB: setup helper for old-style drivers */
-	ic->ic_raw_xmit = raw_xmit;
+	ic->ic_raw_xmit = null_raw_xmit;
 
 	ieee80211_adhoc_attach(ic);
 	ieee80211_sta_attach(ic);
@@ -158,9 +150,6 @@
 	ieee80211_wds_detach(ic);
 	ieee80211_adhoc_detach(ic);
 	ieee80211_sta_detach(ic);
-
-	ieee80211_drain_ifq(&ic->ic_mgtq);
-	mtx_destroy(&ic->ic_mgtq.ifq_mtx);
 }
 
 static void
@@ -1509,12 +1498,8 @@
 		 */
 		ieee80211_scan_flush(vap);
 
-		/* XXX can skip this if not using ic_mgtq */
-		/* flush any frames for this vap in the shared q's */
-		ieee80211_flush_ifq(&ic->ic_mgtq, vap);
 		/* XXX NB: cast for altq */
-		ieee80211_flush_ifq((struct ifqueue *)
-		    &ic->ic_ifp->if_snd, vap);
+		ieee80211_flush_ifq((struct ifqueue *)&ic->ic_ifp->if_snd, vap);
 	}
 	vap->iv_newstate_cb = NULL;
 }

==== //depot/projects/vap/sys/net80211/ieee80211_var.h#34 (text+ko) ====

@@ -109,7 +109,6 @@
 	struct ifnet		*ic_ifp;	/* associated device */
 	ieee80211_com_lock_t	ic_comlock;	/* state update lock */
 	TAILQ_HEAD(, ieee80211vap) ic_vaps;	/* list of vap instances */
-	struct ifqueue		ic_mgtq;	/* only need one */
 	struct ieee80211_stats	ic_stats;	/* statistics */
 	int			ic_headroom;	/* driver tx headroom needs */
 	enum ieee80211_phytype	ic_phytype;	/* XXX wrong for multi-mode */

From owner-p4-projects@FreeBSD.ORG  Fri Mar 28 05:17:11 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 401AC1065672; Fri, 28 Mar 2008 05:17: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 F420E106564A
	for ; Fri, 28 Mar 2008 05:17:10 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C42968FC20
	for ; Fri, 28 Mar 2008 05:17:10 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2S5HAbo028829
	for ; Fri, 28 Mar 2008 05:17:10 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2S5HAqM028827
	for perforce@freebsd.org; Fri, 28 Mar 2008 05:17:10 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 28 Mar 2008 05:17:10 GMT
Message-Id: <200803280517.m2S5HAqM028827@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138795 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 28 Mar 2008 05:17:11 -0000

http://perforce.freebsd.org/chv.cgi?CH=138795

Change 138795 by jb@jb_freebsd1 on 2008/03/28 05:16:14

	Remove a header that breaks FreeBSD's headers.

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/machine/endian.h#2 delete

Differences ...

From owner-p4-projects@FreeBSD.ORG  Fri Mar 28 05:43:39 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D403F106567A; Fri, 28 Mar 2008 05:43: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 9381A1065678
	for ; Fri, 28 Mar 2008 05:43:38 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 2EC158FC1E
	for ; Fri, 28 Mar 2008 05:43:38 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2S5hckt029746
	for ; Fri, 28 Mar 2008 05:43:38 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2S5hcI3029744
	for perforce@freebsd.org; Fri, 28 Mar 2008 05:43:38 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 28 Mar 2008 05:43:38 GMT
Message-Id: <200803280543.m2S5hcI3029744@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138797 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 28 Mar 2008 05:43:39 -0000

http://perforce.freebsd.org/chv.cgi?CH=138797

Change 138797 by jb@jb_freebsd1 on 2008/03/28 05:42:55

	We have our own one of these.

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/sdt.h#2 delete

Differences ...

From owner-p4-projects@FreeBSD.ORG  Fri Mar 28 08:45:01 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3397E1065673; Fri, 28 Mar 2008 08:45: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 E7804106566B
	for ; Fri, 28 Mar 2008 08:45:00 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B612E8FC13
	for ; Fri, 28 Mar 2008 08:45:00 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2S8j0vQ039914
	for ; Fri, 28 Mar 2008 08:45:00 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2S8j0rE039910
	for perforce@freebsd.org; Fri, 28 Mar 2008 08:45:00 GMT
	(envelope-from imp@freebsd.org)
Date: Fri, 28 Mar 2008 08:45:00 GMT
Message-Id: <200803280845.m2S8j0rE039910@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138816 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 28 Mar 2008 08:45:01 -0000

http://perforce.freebsd.org/chv.cgi?CH=138816

Change 138816 by imp@imp_lighthouse on 2008/03/28 08:44:50

	Add mcount

Affected files ...

.. //depot/projects/mips2-jnpr/src/sys/TODO#20 edit

Differences ...

==== //depot/projects/mips2-jnpr/src/sys/TODO#20 (text+ko) ====

@@ -74,4 +74,4 @@
 
  
 
-
+o MCOUNT

From owner-p4-projects@FreeBSD.ORG  Fri Mar 28 19:00:03 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0F1381065673; Fri, 28 Mar 2008 19:00: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 C13881065671
	for ; Fri, 28 Mar 2008 19:00:02 +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 A9C9D8FC14
	for ; Fri, 28 Mar 2008 19:00:02 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2SJ02pM009986
	for ; Fri, 28 Mar 2008 19:00:02 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2SJ020J009960
	for perforce@freebsd.org; Fri, 28 Mar 2008 19:00:02 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Fri, 28 Mar 2008 19:00:02 GMT
Message-Id: <200803281900.m2SJ020J009960@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 138844 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 28 Mar 2008 19:00:03 -0000

http://perforce.freebsd.org/chv.cgi?CH=138844

Change 138844 by pgj@disznohal on 2008/03/28 18:59:25

	Fix localised images to be conformant with the rest of the
	Documentation Project. Thank you for your remark regarding
	this, Marc! :)
	
	Pointed out by:	blackend (doceng)

Affected files ...

.. //depot/projects/docproj_hu/books/handbook/Makefile#5 edit
.. //depot/projects/docproj_hu/books/handbook/advanced-networking/isdn-bus.eps#1 add
.. //depot/projects/docproj_hu/books/handbook/advanced-networking/isdn-twisted-pair.eps#1 add
.. //depot/projects/docproj_hu/books/handbook/advanced-networking/natd.eps#1 add
.. //depot/projects/docproj_hu/books/handbook/advanced-networking/net-routing.pic#1 add
.. //depot/projects/docproj_hu/books/handbook/advanced-networking/static-routes.pic#1 add
.. //depot/projects/docproj_hu/books/handbook/geom/striping.pic#1 add
.. //depot/projects/docproj_hu/books/handbook/install/disk-layout.eps#1 add
.. //depot/projects/docproj_hu/books/handbook/install/example-dir1.eps#1 add
.. //depot/projects/docproj_hu/books/handbook/install/example-dir2.eps#1 add
.. //depot/projects/docproj_hu/books/handbook/install/example-dir3.eps#1 add
.. //depot/projects/docproj_hu/books/handbook/install/example-dir4.eps#1 add
.. //depot/projects/docproj_hu/books/handbook/install/example-dir5.eps#1 add
.. //depot/projects/docproj_hu/books/handbook/mail/mutt1.scr#1 add
.. //depot/projects/docproj_hu/books/handbook/mail/mutt2.scr#1 add
.. //depot/projects/docproj_hu/books/handbook/mail/mutt3.scr#1 add
.. //depot/projects/docproj_hu/books/handbook/mail/pine3.scr#1 add
.. //depot/projects/docproj_hu/books/handbook/mail/pine4.scr#1 add
.. //depot/projects/docproj_hu/books/handbook/mail/pine5.scr#1 add
.. //depot/projects/docproj_hu/books/handbook/security/ipsec-crypt-pkt.pic#1 add
.. //depot/projects/docproj_hu/books/handbook/security/ipsec-encap-pkt.pic#1 add
.. //depot/projects/docproj_hu/books/handbook/security/ipsec-network.pic#1 add
.. //depot/projects/docproj_hu/books/handbook/security/ipsec-out-pkt.pic#1 add
.. //depot/projects/docproj_hu/books/handbook/vinum/vinum-concat.pic#1 add
.. //depot/projects/docproj_hu/books/handbook/vinum/vinum-mirrored-vol.pic#1 add
.. //depot/projects/docproj_hu/books/handbook/vinum/vinum-raid10-vol.pic#1 add
.. //depot/projects/docproj_hu/books/handbook/vinum/vinum-raid5-org.pic#1 add
.. //depot/projects/docproj_hu/books/handbook/vinum/vinum-simple-vol.pic#1 add
.. //depot/projects/docproj_hu/books/handbook/vinum/vinum-striped-vol.pic#1 add
.. //depot/projects/docproj_hu/books/handbook/vinum/vinum-striped.pic#1 add
.. //depot/projects/docproj_hu/share/images/books/handbook/advanced-networking/isdn-bus.eps#3 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/advanced-networking/isdn-twisted-pair.eps#3 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/advanced-networking/natd.eps#3 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/advanced-networking/net-routing.pic#3 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/advanced-networking/static-routes.pic#3 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/geom/striping.pic#3 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/adduser1.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/adduser2.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/adduser3.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/boot-loader-menu.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/boot-mgr.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/config-country.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/console-saver1.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/console-saver2.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/console-saver3.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/console-saver4.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/desktop.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/disk-layout.eps#3 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/disklabel-auto.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/disklabel-ed1.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/disklabel-ed2.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/disklabel-fs.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/disklabel-root1.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/disklabel-root2.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/disklabel-root3.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/dist-set.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/dist-set2.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/docmenu1.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/ed0-conf.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/ed0-conf2.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/edit-inetd-conf.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/example-dir1.eps#3 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/example-dir2.eps#3 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/example-dir3.eps#3 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/example-dir4.eps#3 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/example-dir5.eps#3 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/fdisk-drive1.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/fdisk-drive2.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/fdisk-edit1.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/fdisk-edit2.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/ftp-anon1.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/ftp-anon2.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/hdwrconf.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/keymap.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/main-doc.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/main-keymap.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/main-options.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/main-std.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/main1.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/mainexit.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/media.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/mouse1.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/mouse2.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/mouse3.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/mouse4.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/mouse5.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/mouse6.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/mta-main.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/net-config-menu1.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/net-config-menu2.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/nfs-server-edit.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/ntp-config.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/options.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/pkg-cat.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/pkg-confirm.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/pkg-install.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/pkg-sel.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/probstart.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/routed.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/security.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/sysinstall-exit.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/timezone1.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/timezone2.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/timezone3.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/userconfig.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/userconfig2.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/install/xf86setup.scr#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/mail/mutt1.scr#3 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/mail/mutt2.scr#3 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/mail/mutt3.scr#3 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/mail/pine1.scr#3 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/mail/pine2.scr#3 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/mail/pine3.scr#3 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/mail/pine4.scr#3 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/mail/pine5.scr#3 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/security/ipsec-crypt-pkt.pic#3 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/security/ipsec-encap-pkt.pic#3 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/security/ipsec-network.pic#3 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/security/ipsec-out-pkt.pic#3 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/vinum/vinum-concat.pic#3 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/vinum/vinum-mirrored-vol.pic#3 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/vinum/vinum-raid10-vol.pic#3 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/vinum/vinum-raid5-org.pic#3 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/vinum/vinum-simple-vol.pic#3 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/vinum/vinum-striped-vol.pic#3 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/vinum/vinum-striped.pic#3 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/parallels-freebsd1.png#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/parallels-freebsd10.png#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/parallels-freebsd11.png#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/parallels-freebsd12.png#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/parallels-freebsd13.png#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/parallels-freebsd2.png#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/parallels-freebsd3.png#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/parallels-freebsd4.png#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/parallels-freebsd5.png#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/parallels-freebsd6.png#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/parallels-freebsd7.png#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/parallels-freebsd8.png#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/parallels-freebsd9.png#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/virtualpc-freebsd1.png#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/virtualpc-freebsd10.png#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/virtualpc-freebsd11.png#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/virtualpc-freebsd12.png#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/virtualpc-freebsd13.png#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/virtualpc-freebsd2.png#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/virtualpc-freebsd3.png#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/virtualpc-freebsd4.png#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/virtualpc-freebsd5.png#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/virtualpc-freebsd6.png#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/virtualpc-freebsd7.png#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/virtualpc-freebsd8.png#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/virtualpc-freebsd9.png#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/vmware-freebsd01.png#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/vmware-freebsd02.png#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/vmware-freebsd03.png#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/vmware-freebsd04.png#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/vmware-freebsd05.png#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/vmware-freebsd06.png#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/vmware-freebsd07.png#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/vmware-freebsd08.png#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/vmware-freebsd09.png#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/vmware-freebsd10.png#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/vmware-freebsd11.png#2 delete
.. //depot/projects/docproj_hu/share/images/books/handbook/virtualization/vmware-freebsd12.png#2 delete

Differences ...

==== //depot/projects/docproj_hu/books/handbook/Makefile#5 (text+ko) ====

@@ -44,14 +44,12 @@
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
-IMAGES_EN_DIR=${.CURDIR}/../../share/images
-
-IMAGES_EN = advanced-networking/isdn-bus.eps
-IMAGES_EN+= advanced-networking/isdn-twisted-pair.eps
-IMAGES_EN+= advanced-networking/natd.eps
-IMAGES_EN+= advanced-networking/net-routing.pic
-IMAGES_EN+= advanced-networking/static-routes.pic
-IMAGES_EN+= geom/striping.pic
+IMAGES = advanced-networking/isdn-bus.eps
+IMAGES+= advanced-networking/isdn-twisted-pair.eps
+IMAGES+= advanced-networking/natd.eps
+IMAGES+= advanced-networking/net-routing.pic
+IMAGES+= advanced-networking/static-routes.pic
+IMAGES+= geom/striping.pic
 IMAGES_EN+= install/adduser1.scr
 IMAGES_EN+= install/adduser2.scr
 IMAGES_EN+= install/adduser3.scr
@@ -69,7 +67,7 @@
 IMAGES_EN+= install/disklabel-root1.scr
 IMAGES_EN+= install/disklabel-root2.scr
 IMAGES_EN+= install/disklabel-root3.scr
-IMAGES_EN+= install/disk-layout.eps
+IMAGES+= install/disk-layout.eps
 IMAGES_EN+= install/dist-set.scr
 IMAGES_EN+= install/dist-set2.scr
 IMAGES_EN+= install/docmenu1.scr
@@ -116,31 +114,31 @@
 IMAGES_EN+= install/timezone3.scr
 IMAGES_EN+= install/userconfig.scr
 IMAGES_EN+= install/userconfig2.scr
-IMAGES_EN+= mail/mutt1.scr
-IMAGES_EN+= mail/mutt2.scr
-IMAGES_EN+= mail/mutt3.scr
+IMAGES+= mail/mutt1.scr
+IMAGES+= mail/mutt2.scr
+IMAGES+= mail/mutt3.scr
 IMAGES_EN+= mail/pine1.scr
 IMAGES_EN+= mail/pine2.scr
-IMAGES_EN+= mail/pine3.scr
-IMAGES_EN+= mail/pine4.scr
-IMAGES_EN+= mail/pine5.scr
+IMAGES+= mail/pine3.scr
+IMAGES+= mail/pine4.scr
+IMAGES+= mail/pine5.scr
 
-IMAGES_EN+= install/example-dir1.eps
-IMAGES_EN+= install/example-dir2.eps
-IMAGES_EN+= install/example-dir3.eps
-IMAGES_EN+= install/example-dir4.eps
-IMAGES_EN+= install/example-dir5.eps
-IMAGES_EN+= security/ipsec-network.pic
-IMAGES_EN+= security/ipsec-crypt-pkt.pic
-IMAGES_EN+= security/ipsec-encap-pkt.pic
-IMAGES_EN+= security/ipsec-out-pkt.pic
-IMAGES_EN+= vinum/vinum-concat.pic
-IMAGES_EN+= vinum/vinum-mirrored-vol.pic
-IMAGES_EN+= vinum/vinum-raid10-vol.pic
-IMAGES_EN+= vinum/vinum-raid5-org.pic
-IMAGES_EN+= vinum/vinum-simple-vol.pic
-IMAGES_EN+= vinum/vinum-striped-vol.pic
-IMAGES_EN+= vinum/vinum-striped.pic
+IMAGES+= install/example-dir1.eps
+IMAGES+= install/example-dir2.eps
+IMAGES+= install/example-dir3.eps
+IMAGES+= install/example-dir4.eps
+IMAGES+= install/example-dir5.eps
+IMAGES+= security/ipsec-network.pic
+IMAGES+= security/ipsec-crypt-pkt.pic
+IMAGES+= security/ipsec-encap-pkt.pic
+IMAGES+= security/ipsec-out-pkt.pic
+IMAGES+= vinum/vinum-concat.pic
+IMAGES+= vinum/vinum-mirrored-vol.pic
+IMAGES+= vinum/vinum-raid10-vol.pic
+IMAGES+= vinum/vinum-raid5-org.pic
+IMAGES+= vinum/vinum-simple-vol.pic
+IMAGES+= vinum/vinum-striped-vol.pic
+IMAGES+= vinum/vinum-striped.pic
 IMAGES_EN+= virtualization/parallels-freebsd1.png
 IMAGES_EN+= virtualization/parallels-freebsd2.png
 IMAGES_EN+= virtualization/parallels-freebsd3.png

From owner-p4-projects@FreeBSD.ORG  Fri Mar 28 19:15:20 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0CF081065676; Fri, 28 Mar 2008 19:15: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 BFCFC1065674
	for ; Fri, 28 Mar 2008 19:15:19 +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 AD1788FC1B
	for ; Fri, 28 Mar 2008 19:15:19 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2SJFJGv011851
	for ; Fri, 28 Mar 2008 19:15:19 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2SJFJR6011849
	for perforce@freebsd.org; Fri, 28 Mar 2008 19:15:19 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Fri, 28 Mar 2008 19:15:19 GMT
Message-Id: <200803281915.m2SJFJR6011849@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 138847 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 28 Mar 2008 19:15:20 -0000

http://perforce.freebsd.org/chv.cgi?CH=138847

Change 138847 by pgj@disznohal on 2008/03/28 19:15:06

	(disks) MFen: 1.281 --> 1.282

Affected files ...

.. //depot/projects/docproj_hu/books/handbook/disks/chapter.sgml#5 edit

Differences ...

==== //depot/projects/docproj_hu/books/handbook/disks/chapter.sgml#5 (text+ko) ====

@@ -1,12 +1,12 @@
 
 
 
+     Original Revision: 1.282                     -->
 
 
   Háttértárak
@@ -461,7 +461,7 @@
 	&prompt.root; dd if=/dev/zero of=/dev/da1 bs=1k count=1
 &prompt.root; bsdlabel -Bw da1 auto
 &prompt.root; bsdlabel -e da1				# létrehozzuk az `e' partíciót
-&prompt.root; newfs -d0 /dev/da1e
+&prompt.root; newfs /dev/da1e
 &prompt.root; mkdir -p /1
 &prompt.root; vi /etc/fstab				# felvesszük a /dev/da1e partíciót
 &prompt.root; mount /1
@@ -2452,7 +2452,7 @@
 	  állományrendszerrel töltjük
 	  fel:
 
-	&prompt.root; dd if=/dev/zero of=/dev/acd0 count=2
+	&prompt.root; dd if=/dev/zero of=/dev/acd0 bs=2k count=1
 &prompt.root; bsdlabel -Bw acd0
 &prompt.root; newfs /dev/acd0
 

From owner-p4-projects@FreeBSD.ORG  Fri Mar 28 19:21:26 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 90EC71065672; Fri, 28 Mar 2008 19:21:26 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 506C9106566B
	for ; Fri, 28 Mar 2008 19:21:26 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 3DEF48FC13
	for ; Fri, 28 Mar 2008 19:21:26 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2SJLQG4012047
	for ; Fri, 28 Mar 2008 19:21:26 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2SJLQjl012045
	for perforce@freebsd.org; Fri, 28 Mar 2008 19:21:26 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Fri, 28 Mar 2008 19:21:26 GMT
Message-Id: <200803281921.m2SJLQjl012045@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 138848 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 28 Mar 2008 19:21:27 -0000

http://perforce.freebsd.org/chv.cgi?CH=138848

Change 138848 by pgj@disznohal on 2008/03/28 19:20:36

	(jails) MFen: 1.14 --> 1.15

Affected files ...

.. //depot/projects/docproj_hu/books/handbook/jails/chapter.sgml#5 edit

Differences ...

==== //depot/projects/docproj_hu/books/handbook/jails/chapter.sgml#5 (text+ko) ====

@@ -1,12 +1,12 @@
 
 
+    Original Revision: 1.15                      -->
 
 
   
@@ -360,7 +360,7 @@
 &prompt.root; cd etc/ Ez a
 lépés nem szükséges a &os; 6.0-ás vagy annál újabb verziójában.
 &prompt.root; make distribution DESTDIR=$D 
-&prompt.root; mount_devfs devfs $D/dev 
+&prompt.root; mount -t devfs devfs $D/dev 
 
     
       

From owner-p4-projects@FreeBSD.ORG  Fri Mar 28 19:23:29 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 06AD51065671; Fri, 28 Mar 2008 19:23: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 BA5121065670
	for ; Fri, 28 Mar 2008 19:23:28 +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 A7D198FC12
	for ; Fri, 28 Mar 2008 19:23:28 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2SJNSCD012130
	for ; Fri, 28 Mar 2008 19:23:28 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2SJNSLk012128
	for perforce@freebsd.org; Fri, 28 Mar 2008 19:23:28 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 28 Mar 2008 19:23:28 GMT
Message-Id: <200803281923.m2SJNSLk012128@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 138849 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 28 Mar 2008 19:23:29 -0000

http://perforce.freebsd.org/chv.cgi?CH=138849

Change 138849 by sam@sam_ebb on 2008/03/28 19:22:28

	filter out PROMISC on hostap vaps so each driver doesn't need to
	do this (as was historically done to workaround the bridge)

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211.c#31 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211.c#31 (text+ko) ====

@@ -541,6 +541,14 @@
 	bit = 0;
 	TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next)
 		if (vap->iv_ifp->if_flags & flag) {
+			/*
+			 * XXX the bridge sets PROMISC but we don't want to
+			 * enable it on the device, discard here so all the
+			 * drivers don't need to special-case it
+			 */
+			if (flag == IFF_PROMISC &&
+			    vap->iv_opmode == IEEE80211_M_HOSTAP)
+				continue;
 			bit = 1;
 			break;
 		}

From owner-p4-projects@FreeBSD.ORG  Fri Mar 28 19:25:31 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 76D3A1065675; Fri, 28 Mar 2008 19:25: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 35D88106564A
	for ; Fri, 28 Mar 2008 19:25:31 +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 D93628FC16
	for ; Fri, 28 Mar 2008 19:25:30 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2SJPUts012213
	for ; Fri, 28 Mar 2008 19:25:30 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2SJPUEi012211
	for perforce@freebsd.org; Fri, 28 Mar 2008 19:25:30 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 28 Mar 2008 19:25:30 GMT
Message-Id: <200803281925.m2SJPUEi012211@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 138850 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 28 Mar 2008 19:25:32 -0000

http://perforce.freebsd.org/chv.cgi?CH=138850

Change 138850 by sam@sam_ebb on 2008/03/28 19:25:21

	o add promisc mode driver callback
	o when calculating the rx filter honor IFF_PROMISC directly
	  as net80211 now filters out settings for ap mode vaps
	o automatically enable promiscuous mode when operating in
	  monitor mode (otherwise we won't see many frames as the
	  device will drop most frames for mismatched bssid)

Affected files ...

.. //depot/projects/vap/sys/dev/ath/if_ath.c#52 edit

Differences ...

==== //depot/projects/vap/sys/dev/ath/if_ath.c#52 (text+ko) ====

@@ -143,6 +143,7 @@
 static void	ath_key_update_begin(struct ieee80211vap *);
 static void	ath_key_update_end(struct ieee80211vap *);
 static void	ath_update_mcast(struct ifnet *);
+static void	ath_update_promisc(struct ifnet *);
 static void	ath_mode_init(struct ath_softc *);
 static void	ath_setslottime(struct ath_softc *);
 static void	ath_updateslot(struct ifnet *);
@@ -627,6 +628,7 @@
 	ic->ic_vap_delete = ath_vap_delete;
 	ic->ic_raw_xmit = ath_raw_xmit;
 	ic->ic_update_mcast = ath_update_mcast;
+	ic->ic_update_promisc = ath_update_promisc;
 	ic->ic_node_alloc = ath_node_alloc;
 	sc->sc_node_free = ic->ic_node_free;
 	ic->ic_node_free = ath_node_free;
@@ -2455,7 +2457,9 @@
  *       of sight and we need to blindly preserve them
  * o probe request frames are accepted only when operating in
  *   hostap, adhoc, or monitor modes
- * o enable promiscuous mode according to the interface state
+ * o enable promiscuous mode
+ *   - when in monitor mode
+ *   - if interface marked PROMISC (assumes bridge setting is filtered)
  * o accept beacons:
  *   - when operating in station mode for collecting rssi data when
  *     the station is otherwise quiet, or
@@ -2463,7 +2467,7 @@
  *     node table entries for peers,
  *   - when scanning
  *   - when doing s/w beacon miss (e.g. for ap+sta)
- *   - when operatin in ap mode in 11g to detect overlapping bss that
+ *   - when operating in ap mode in 11g to detect overlapping bss that
  *     require protection
  * o accept control frames:
  *   - when in monitor mode
@@ -2489,11 +2493,8 @@
 #endif
 	if (ic->ic_opmode != IEEE80211_M_STA)
 		rfilt |= HAL_RX_FILTER_PROBEREQ;
-	if (ic->ic_opmode != IEEE80211_M_HOSTAP &&
-	    (ifp->if_flags & IFF_PROMISC))
+	if (ic->ic_opmode == IEEE80211_M_MONITOR || (ifp->if_flags & IFF_PROMISC))
 		rfilt |= HAL_RX_FILTER_PROM;
-	if (ifp->if_flags & IFF_PPROMISC)
-		rfilt |= HAL_RX_FILTER_PROM;
 	if (ic->ic_opmode == IEEE80211_M_STA ||
 	    sc->sc_opmode == HAL_M_IBSS ||
 	    sc->sc_swbmiss || sc->sc_scanning)
@@ -2508,10 +2509,25 @@
 		rfilt |= HAL_RX_FILTER_BEACON;
 	if (ic->ic_opmode == IEEE80211_M_MONITOR)
 		rfilt |= HAL_RX_FILTER_CONTROL;
+	DPRINTF(sc, ATH_DEBUG_MODE, "%s: RX filter 0x%x, %s if_flags 0x%x\n",
+	    __func__, rfilt, ieee80211_opmode_name[ic->ic_opmode], ifp->if_flags);
 	return rfilt;
 }
 
 static void
+ath_update_promisc(struct ifnet *ifp)
+{
+	struct ath_softc *sc = ifp->if_softc;
+	u_int32_t rfilt;
+
+	/* configure rx filter */
+	rfilt = ath_calcrxfilter(sc);
+	ath_hal_setrxfilter(sc->sc_ah, rfilt);
+
+	DPRINTF(sc, ATH_DEBUG_MODE, "%s: RX filter 0x%x\n", __func__, rfilt);
+}
+
+static void
 ath_update_mcast(struct ifnet *ifp)
 {
 	struct ath_softc *sc = ifp->if_softc;
@@ -2558,7 +2574,6 @@
 	/* configure rx filter */
 	rfilt = ath_calcrxfilter(sc);
 	ath_hal_setrxfilter(ah, rfilt);
-	DPRINTF(sc, ATH_DEBUG_MODE, "%s: RX filter 0x%x\n", __func__, rfilt);
 
 	/* configure operational mode */
 	ath_hal_setopmode(ah);

From owner-p4-projects@FreeBSD.ORG  Fri Mar 28 19:37:45 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 912D71065677; Fri, 28 Mar 2008 19:37: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 4FD7C106564A
	for ; Fri, 28 Mar 2008 19:37:45 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 2315B8FC28
	for ; Fri, 28 Mar 2008 19:37:45 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2SJbi4l012716
	for ; Fri, 28 Mar 2008 19:37:44 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2SJbiSK012714
	for perforce@freebsd.org; Fri, 28 Mar 2008 19:37:44 GMT
	(envelope-from jhb@freebsd.org)
Date: Fri, 28 Mar 2008 19:37:44 GMT
Message-Id: <200803281937.m2SJbiSK012714@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138851 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 28 Mar 2008 19:37:46 -0000

http://perforce.freebsd.org/chv.cgi?CH=138851

Change 138851 by jhb@jhb_tool on 2008/03/28 19:37:39

	Install to /boot/modules.

Affected files ...

.. //depot/projects/smpng/sys/modules/panic/Makefile#2 edit

Differences ...

==== //depot/projects/smpng/sys/modules/panic/Makefile#2 (text+ko) ====

@@ -2,5 +2,6 @@
 
 KMOD=	panic
 SRCS=	panic.c
+KMODDIR=/boot/modules
 
 .include 

From owner-p4-projects@FreeBSD.ORG  Fri Mar 28 20:21:30 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 117541065671; Fri, 28 Mar 2008 20:21: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 BEBBB1065670
	for ; Fri, 28 Mar 2008 20:21:29 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id ABA978FC12
	for ; Fri, 28 Mar 2008 20:21:29 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2SKLTNj016784
	for ; Fri, 28 Mar 2008 20:21:29 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2SKLT6n016782
	for perforce@freebsd.org; Fri, 28 Mar 2008 20:21:29 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Fri, 28 Mar 2008 20:21:29 GMT
Message-Id: <200803282021.m2SKLT6n016782@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 138852 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 28 Mar 2008 20:21:30 -0000

http://perforce.freebsd.org/chv.cgi?CH=138852

Change 138852 by pgj@disznohal on 2008/03/28 20:20:42

	(network-servers) MFen: 1.102 --> 1.103

Affected files ...

.. //depot/projects/docproj_hu/books/handbook/network-servers/chapter.sgml#4 edit

Differences ...

==== //depot/projects/docproj_hu/books/handbook/network-servers/chapter.sgml#4 (text+ko) ====

@@ -1,12 +1,12 @@
 
 
 
+     Original Revision: 1.103                     -->
 
 
   
@@ -5432,28 +5432,144 @@
       
 
       
-	Dinamikus oldalak létrehozása a Perl
-	  és a PHP segítségével
+	Kapcsolódás nyelvekhez
+
+	Mindegyik nagyobb szkriptnyelvhez létezik egy
+	  külön Apache-modul, amelyek
+	  segítségével komplett
+	  Apache-modulokat tudunk
+	  készíteni az adott nyelven.  Gyakran a dinamikus
+	  honlapok is így próbálják a
+	  szerverbe épített belsõ
+	  értelmezõn keresztül a külsõ
+	  értelmezõ indításából
+	  és benne a szkriptek
+	  lefuttatásából fakadó
+	  költségeket megspórolni, ahogy errõl a
+	  következõ szakaszokban olvashatunk.
+      
+    
+
+    
+      Dinamikus honlapok
+
+      
+	webszerverek
+	dinamikus
+      
+
+      Az utóbbi évtizedben egyre több
+	vállalkozás fordult az internet felé
+	bevételeik és részesedéseinek
+	növelésének reményében, amivel
+	egyre jobban megnõtt az igény a dinamikus honlapokra
+	is.  Miközben bizonyos cégek, mint mondjuk a
+	µsoft;, a saját fejlesztésû
+	termékeikbe építettek be ehhez
+	támogatást, addig a nyílt
+	forrásokkal foglalkozó közösség
+	sem maradt tétlen és felvette a kesztyût.  A
+	dinamikus tartalom létrehozásához
+	többek közt Django, Ruby on Rails, a
+	mod_perl és a
+	mod_php modulok
+	használhatóak.
+
+      
+	Django
+
+	Python
+	Django
+
+	A Django egy BSD típusú licensszel
+	  rendelkezõ keretrendszer, aminek
+	  használatával a nagy
+	  teljesítményû és elegáns
+	  webes alkalmazásokat tudunk gyorsan kifejleszteni.
+	  Tartalmaz egy objektum-relációs
+	  leképezõt, így az adattípusokat
+	  Python-objektumokként tudjuk leírni, és
+	  ezekhez az objektumokhoz egy sokrétû, dinamikus
+	  adatbázis hozzáférést
+	  nyújtó alkalmazásfejlesztõi
+	  felületet, így a fejlesztõknek egyetlen SQL
+	  utasítást sem kell megírniuk.
+	  Találhatunk még benne továbbá egy
+	  bõvíthetõ sablonrendszert, aminek
+	  köszönhetõen az alkalmazás belsõ
+	  mûködése elválasztható a
+	  HTML-beli megjelenésétõl.
+
+	A Django-nak mûködéséhez a
+	  mod_python modulra, az
+	  Apache szerverre és egy
+	  tetszõlegesen választott SQL alapú
+	  adatbázisrendszerre van szüksége.  A
+	  hozzátartozó &os; port mindezeket automatikusan
+	  feltelepíti a megadott beállítások
+	  szerint.
+
+	
+	  A Django telepítése az Apache,
+	    mod_python3 és a PostgreSQL
+	    használatával
+
+	  &prompt.root; cd /usr/ports/www/py-django; make all install clean -DWITH_MOD_PYTHON3 -DWITH_POSTGRESQL
+	
+
+	Miután a Django és a hozzá
+	  szükséges komponensek felkerültek
+	  rendszerünkre, hozzunk létre egy
+	  könyvtárat a leendõ Django projektünknek
+	  és állítsuk be az Apache szervert, hogy
+	  az oldalunk belül a megadott linkekre a saját
+	  alkalmazásunkat hívja meg a beágyazott
+	  Python-értelmezõn keresztül.
+
+	
+	  Az Apache beállítása a Django
+	    és mod_python használatához
+
+	  A következõ sort kell hozzátennünk
+	    a httpd.conf állományhoz,
+	    hogy az Apache bizonyos linkeket a webes alkalmazás
+	    felé irányítson át:
+
+	  <Location "/">
+    SetHandler python-program
+    PythonPath "['/a/django/csomagok/helye/'] + sys.path"
+    PythonHandler django.core.handlers.modpython
+    SetEnv DJANGO_SETTINGS_MODULE azoldalam.beallitasai
+    PythonAutoReload On
+    PythonDebug On
+</Location>
+	
+
+      
+
+      
+	Ruby on Rails
+
+	Ruby on Rails
+
+	A Ruby on Rails egy olyan másik nyílt
+	  forráskódú keretrendszer, amivel
+	  lényegében egy teljes fejlesztõi
+	  készletet kapunk és kifejezetten arra
+	  élezték ki, hogy
+	  segítségével a webfejlesztõk
+	  sokkalta termelékenyebbek legyenek és a
+	  komolyabb alkalmazások gyorsabb
+	  elkészítése se okozzon nekik gondot.  A
+	  portrendszerbõl pillanatok alatt
+	  feltelepíthetõ.
+
+	&prompt.root; cd /usr/ports/www/rubygem-rails; make all install clean
 
-	Az utóbbi néhány évben egyre
-	  több vállalkozás fordult az internet
-	  felé bevételeik és
-	  részesedéseinek növelésének
-	  reményében, amivel egyre jobban megnõtt az
-	  igény a dinamikus honlapokra is.  Miközben
-	  bizonyos cégek, mint mondjuk a µsoft;, a
-	  saját fejlesztésû termékeikbe
-	  építettek be ehhez támogatást,
-	  addig a nyílt forrásokkal foglalkozó
-	  közösség sem maradt tétlen és
-	  felvette a kesztyût.  A dinamikus tartalom
-	  létrehozásához többek közt a
-	  mod_perl és a
-	  mod_php modulok
-	  használhatóak.
+      
 
-	
-	  mod_perl
+      
+	mod_perl
 
 	
 	  mod_perl
@@ -5495,10 +5611,10 @@
 	  role="package">www/mod_perl2 portból
 	  rakható fel.
 
-	
+      
 
-	
-	  
+      
+	
 	  
 	    
 	      Tom
@@ -5506,7 +5622,7 @@
 	      Írta: 
 	    
 	  
-	
+	
 
 	mod_php
 
@@ -5515,78 +5631,78 @@
 	  PHP
 	
 
-	  A PHP, vagy másik nevén
-	    PHP, a hipertext feldolgozó egy
-	    általános célú szkriptnyelv,
-	    amit kifejezetten honlapok fejlesztéséhez
-	    hoztak létre.  A szabványos
-	    HTML ágyazható nyelv
-	    felépítésében a C, &java;
-	    és Perl nyelveket ötvözi annak
-	    elérése érdekében, hogy ezzel
-	    segítse a fejlesztõket a dinamikusan
-	    generált oldalak minél gyorsabb
-	    megírásában.
+	A PHP, vagy másik nevén
+	  PHP, a hipertext feldolgozó egy
+	  általános célú szkriptnyelv,
+	  amit kifejezetten honlapok fejlesztéséhez
+	  hoztak létre.  A szabványos
+	  HTML ágyazható nyelv
+	  felépítésében a C, &java;
+	  és Perl nyelveket ötvözi annak
+	  elérése érdekében, hogy ezzel
+	  segítse a fejlesztõket a dinamikusan
+	  generált oldalak minél gyorsabb
+	  megírásában.
 
-	  A PHP5
-	    támogatását úgy tudjuk
-	    hozzáadni az Apache
-	    webszerverhez, ha feltelepítjük a lang/php5 portot.
+	A PHP5
+	  támogatását úgy tudjuk
+	  hozzáadni az Apache
+	  webszerverhez, ha feltelepítjük a lang/php5 portot.
 
-	  Ha a lang/php5
-	    portot most telepítjük elõször, akkor
-	    a vele kapcsolatos beállításokat
-	    tartalmazó OPTIONS menü
-	    automatikusan megjelenik.  Ha ezzel nem
-	    találkoznánk, mert mondjuk valamikor
-	    korábban már felraktuk volna a lang/php5 portot, akkor a port
-	    könyvtárában következõ parancs
-	    kiadásával tudjuk újra
-	    visszahozni:
+	Ha a lang/php5
+	  portot most telepítjük elõször, akkor
+	  a vele kapcsolatos beállításokat
+	  tartalmazó OPTIONS menü
+	  automatikusan megjelenik.  Ha ezzel nem
+	  találkoznánk, mert mondjuk valamikor
+	  korábban már felraktuk volna a lang/php5 portot, akkor a port
+	  könyvtárában következõ parancs
+	  kiadásával tudjuk újra
+	  visszahozni:
 
-	  &prompt.root; make config
+	&prompt.root; make config
 
-	  A beállítások között
-	    jelöljük be az APACHE
-	    opciót, aminek eredményeképpen
-	    létrejön az Apache
-	    webszerverhez használható
-	    mod_php5 betölthetõ
-	    modul.
+	A beállítások között
+	  jelöljük be az APACHE
+	  opciót, aminek eredményeképpen
+	  létrejön az Apache
+	  webszerverhez használható
+	  mod_php5 betölthetõ
+	  modul.
 
-	  
-	    A PHP4 modult még ma is
-	      rengeteg zerver használja több
-	      különbözõ okból (mondjuk
-	      kompatibilitási problémák vagy a
-	      már korábban kiadott tartalom miatt).  Ha
-	      tehát a mod_php5 helyett
-	      inkább a mod_php4
-	      modulra lenne szükségünk, akkor a
-	      lang/php4 portot
-	      használjuk.  A lang/php4 portnál is
-	      megtalálhatjuk a lang/php5
-	      fordítási idejû
-	      beállításainak nagy
-	      részét.
-	  
+	
+	  A PHP4 modult még ma is
+	    rengeteg zerver használja több
+	    különbözõ okból (mondjuk
+	    kompatibilitási problémák vagy a
+	    már korábban kiadott tartalom miatt).  Ha
+	    tehát a mod_php5 helyett
+	    inkább a mod_php4
+	    modulra lenne szükségünk, akkor a
+	    lang/php4 portot
+	    használjuk.  A lang/php4 portnál is
+	    megtalálhatjuk a lang/php5
+	    fordítási idejû
+	    beállításainak nagy
+	    részét.
+	
 
-	  Az iméntiek révén
+	Az iméntiek révén
 	  feltelepülnek és beállítódnak
-	    a dinamikus PHP alkalmazások
-	    támogatásához szükséges
-	    mouldok.  Az
-	    /usr/local/etc/apache/httpd.conf
-	    állományban ellenõrizni is tudjuk, hogy
-	    az alábbi részek megjelentek-e:
+	  a dinamikus PHP alkalmazások
+	  támogatásához szükséges
+	  mouldok.  Az
+	  /usr/local/etc/apache/httpd.conf
+	  állományban ellenõrizni is tudjuk, hogy
+	  az alábbi részek megjelentek-e:
 
-	  LoadModule php5_module        libexec/apache/libphp5.so
+	LoadModule php5_module        libexec/apache/libphp5.so
 
-	  AddModule mod_php5.c
+	AddModule mod_php5.c
     <IfModule mod_php5.c>
         DirectoryIndex index.php index.html
     </IfModule>
@@ -5595,53 +5711,52 @@
         AddType application/x-httpd-php-source .phps
     </IfModule>
 
-	  Ahogy befejezõdött a mûvelet, a
-	    PHP modul betöltéséhez
-	    mindösszesen az apachectl paranccsal
-	    kell óvatosan újraindítanunk a
-	    webszervert:
+	Ahogy befejezõdött a mûvelet, a
+	  PHP modul betöltéséhez
+	  mindösszesen az apachectl paranccsal
+	  kell óvatosan újraindítanunk a
+	  webszervert:
 
-	  &prompt.root; apachectl graceful
+	&prompt.root; apachectl graceful
 
-	  A PHP jövõbeni
-	    frissítéseihez már nem lesz
-	    szükségünk a make config
-	    parancsra, mivel a korábban kiválasztott
-	    OPTIONS menün belüli
-	    beállítasainkat a &os;
-	    Portgyûjteményéhez tartozó
-	    keretrendszer automatikusan elmenti.
+	A PHP jövõbeni
+	  frissítéseihez már nem lesz
+	  szükségünk a make config
+	  parancsra, mivel a korábban kiválasztott
+	  OPTIONS menün belüli
+	  beállítasainkat a &os;
+	  Portgyûjteményéhez tartozó
+	  keretrendszer automatikusan elmenti.
 
-	  A PHP &os;-ben
-	    megtalálható támogatása
-	    kifejezetten moduláris, ezért az alap
-	    telepítése igencsak korlátozott.  A
-	    további elemek hozzáadásához a
-	    lang/php5-extensions
-	    portot tudjuk használni.  A port egy
-	    menüvezérelt felületet nyújt a
-	    PHP különbözõ
-	    bõvítményeinek
-	    telepítéséhez.  De az egyes
-	    bõvítményeket a megfelelõ portok
-	    használatával is fel tudjuk rakni.
+	A PHP &os;-ben
+	  megtalálható támogatása
+	  kifejezetten moduláris, ezért az alap
+	  telepítése igencsak korlátozott.  A
+	  további elemek hozzáadásához a
+	  lang/php5-extensions
+	  portot tudjuk használni.  A port egy
+	  menüvezérelt felületet nyújt a
+	  PHP különbözõ
+	  bõvítményeinek
+	  telepítéséhez.  De az egyes
+	  bõvítményeket a megfelelõ portok
+	  használatával is fel tudjuk rakni.
 
-	  Például PHP5 modulhoz
-	    úgy tudunk támogatást adni a
-	    MySQL adatbázis
-	    szerverhez, ha feltelepítjük a databases/php5-mysql
-	    portot.
+	Például PHP5 modulhoz
+	  úgy tudunk támogatást adni a
+	  MySQL adatbázis
+	  szerverhez, ha feltelepítjük a databases/php5-mysql
+	  portot.
 
-	  Miután feltelepítettünk egy
+	 Miután feltelepítettünk egy
 	  bõvítményt, az
-	    Apache szerverrel újra be
-	    kell töltetnünk a megváltozott
-	    beállításokat:
+	  Apache szerverrel újra be
+	  kell töltetnünk a megváltozott
+	  beállításokat:
 
-	  &prompt.root; apachectl graceful
+	&prompt.root; apachectl graceful
 
-	
       
     
   

From owner-p4-projects@FreeBSD.ORG  Fri Mar 28 20:28:37 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A58CA1065673; Fri, 28 Mar 2008 20:28: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 69012106564A
	for ; Fri, 28 Mar 2008 20:28:37 +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 56FE88FC37
	for ; Fri, 28 Mar 2008 20:28:37 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2SKSb6q017601
	for ; Fri, 28 Mar 2008 20:28:37 GMT
	(envelope-from rpaulo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2SKSb3c017599
	for perforce@freebsd.org; Fri, 28 Mar 2008 20:28:37 GMT
	(envelope-from rpaulo@FreeBSD.org)
Date: Fri, 28 Mar 2008 20:28:37 GMT
Message-Id: <200803282028.m2SKSb3c017599@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 138853 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 28 Mar 2008 20:28:38 -0000

http://perforce.freebsd.org/chv.cgi?CH=138853

Change 138853 by rpaulo@rpaulo_epsilon on 2008/03/28 20:27:38

	Initialize sc_max before calling bm_attach().
	
	Reported by:	  ahze

Affected files ...

.. //depot/projects/soc2007/rpaulo-macbook/dev/backlight/backlight.c#15 edit

Differences ...

==== //depot/projects/soc2007/rpaulo-macbook/dev/backlight/backlight.c#15 (text+ko) ====

@@ -23,7 +23,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/backlight/backlight.c#14 $
+ * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/backlight/backlight.c#15 $
  *
  */
 
@@ -206,12 +206,10 @@
 	int error;
 
 	model = backlight_match(dev);
-
+	sc->sc_max = model->bm_max;
 	error = model->bm_attach(dev);
 	if (error)
 		return (error);
-
-	sc->sc_max = model->bm_max;
 	
 	SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev),
 	    SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),

From owner-p4-projects@FreeBSD.ORG  Fri Mar 28 21:06:16 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 694F51065673; Fri, 28 Mar 2008 21:06: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 28C5A106564A
	for ; Fri, 28 Mar 2008 21:06:16 +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 163ED8FC12
	for ; Fri, 28 Mar 2008 21:06:16 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2SL6Gke035525
	for ; Fri, 28 Mar 2008 21:06:16 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2SL6GOS035523
	for perforce@freebsd.org; Fri, 28 Mar 2008 21:06:16 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Fri, 28 Mar 2008 21:06:16 GMT
Message-Id: <200803282106.m2SL6GOS035523@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 138854 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 28 Mar 2008 21:06:16 -0000

http://perforce.freebsd.org/chv.cgi?CH=138854

Change 138854 by pgj@disznohal on 2008/03/28 21:05:31

	(ports) MFen: 1.274 --> 1.278

Affected files ...

.. //depot/projects/docproj_hu/books/handbook/ports/chapter.sgml#4 edit

Differences ...

==== //depot/projects/docproj_hu/books/handbook/ports/chapter.sgml#4 (text+ko) ====

@@ -1,12 +1,12 @@
 
 
 
+     Original Revision: 1.278                     -->
 
 
   Alkalmazások telepítése: csomagok
@@ -815,7 +815,7 @@
 	<title>Elérés CVSup
 	  használatával
 
-	A CVSup
+	A CVSup protokoll
 	  használatával viszonylag gyorsan el tudjuk
 	  érni és naprakészen tudjuk tartani a
 	  Portgyûjtemény egy példányát.
@@ -825,52 +825,29 @@
 	  függelékben ismerhetjük meg.
 
 	
-	  A csup segédprogram az
-	    eredeti CVSup C nyelven
-	    újraírt változata, mely a &os; 6.2 vagy
-	    újabb verzióihoz érhetõ el.
-	    Ezeken a rendszereken tehát használhatjuk az
-	    alaprendszerben helyet foglaló
-	    csup-ot is feladat
-	    elvégzésére.  Ekkor hagyjuk ki az
-	    elsõ lépést és
-	    cseréljük ki a példákban
-	    szereplõ cvsup parancsokat
-	    csup parancsokra.  A korábbi
-	    kiadások esetén is fel tudjuk
-	    telepíteni a csup-ot a
-	    net/csup porton vagy
-	    csomagon keresztül.
+	  A &os; 6.2 változatától kezdve az
+	    alaprendszerben a CVSup protokollt
+	    a csup valósítja
+	    meg.  A &os; korábbi változatának
+	    használói ezt a programot a net/csup porton vagy csomagon
+	    keresztül tudják feltelepíteni.
 	
 
 	Gondoskodjunk róla, hogy a /usr/ports üres a
-	  CVSup elsõ futtatása
+	  csup elsõ futtatása
 	  elõtt!  Ha már más forrásból
 	  felraktuk ide a Portgyûjteményt, a
-	  CVSup nem fogja lenyesegetni az
+	  csup nem fogja lenyesegetni az
 	  javításokat tartalmazó
 	  eltávolított állományokat.
 
 	
-	  Telepítsük fel a net/cvsup-without-gui
-	    csomagot:
+	  Futtassuk a csup programot:
 
-	  &prompt.root; pkg_add -r cvsup-without-gui
-
-	  A részleteket ld. A CVSup
-	    telepítése () címû
-	    szakaszban.
-	
+	  &prompt.root; csup -L 2 -h cvsup.FreeBSD.org /usr/share/examples/cvsup/ports-supfile
 
-	
-	  Futtassuk a cvsup-ot:
-
-	  &prompt.root; cvsup -L 2 -h cvsup.FreeBSD.org /usr/share/examples/cvsup/ports-supfile
-
 	  Itt írjuk át a
 	    cvsup.FreeBSD.org
 	    címét a hozzánk (leg)közelebb
@@ -923,18 +900,18 @@
 
 	      
 		És most indítsuk el a
-		  cvsup parancsot az alábbi
+		  csup parancsot az alábbi
 		  módon:
 
-		&prompt.root; cvsup -L 2 /root/ports-supfile
+		&prompt.root; csup -L 2 /root/ports-supfile
 	      
 	    
 	  
 	
 
 	
-	  A &man.cvsup.1; parancs késõbbi
-	    futása során már letölti és
+	  A &man.csup.1; parancs késõbbi futása
+	    során már letölti és
 	    érvényesíti az észlelt
 	    változtatásokat a saját
 	    Portgyûjteményünkben, de a
@@ -1772,6 +1749,128 @@
 	Bõvebb információkért ld.
 	  &man.portmanager.1;.
       
+
+      
+	Portok frissítése a Portmasterrel
+
+	portmaster
+
+	A Portmaster szintén a
+	  portok frissítésére alkalmas
+	  segédprogram.  A Portmaster
+	  esetében a hangsúly az
+	  alaprendszerben is megtalálható
+	  eszközök használatán van (tehát
+	  nem függ semmilyen más porttól) és a
+	  /var/db/pkg/
+	  könyvtárban található
+	  információk alapján dönti el, hogy
+	  milyen portokat kell frissítenie.  A ports-mgmt/portmaster portból
+	  érhetõ el:
+
+	&prompt.root; cd /usr/ports/ports-mgmt/portmaster
+&prompt.root; make install clean
+
+	A Portmaster a portokat az
+	  alábbi négy kategória
+	  valamelyikébe sorolja be:
+
+	
+	  
+	    Gyökér (root) portok (nem függenek
+	      semmitõl, semmi sem függ tõlük)
+	  
+	  
+	    Törzs (trunk) portok (nem függenek
+	      semmitõl, de mások függenek
+	      tõlük)
+	  
+	  
+	    Ág (branch) portok (vannak
+	      függõségeik és mások is
+	      függenek tõlük)
+	  
+	  
+	    Levél (leaf) portok (vannak
+	      függõségeik, de semmi sem függ
+	      tõlük)
+	  
+	
+
+	A következõ paranccsal le tudjuk kérni az
+	  összes telepített portot és az
+	   kapcsolóval
+	  frissítéseket keresni hozzájuk:
+
+&prompt.root; portmaster -L
+===>>> Root ports (No dependencies, not depended on)
+===>>> ispell-3.2.06_18
+===>>> screen-4.0.3
+        ===>>> New version available: screen-4.0.3_1
+===>>> tcpflow-0.21_1
+===>>> 7 root ports
+...
+===>>> Branch ports (Have dependencies, are depended on)
+===>>> apache-2.2.3
+        ===>>> New version available: apache-2.2.8
+...
+===>>> Leaf ports (Have dependencies, not depended on)
+===>>> automake-1.9.6_2
+===>>> bash-3.1.17
+        ===>>> New version available: bash-3.2.33
+...
+===>>> 32 leaf ports
+
+===>>> 137 total installed ports
+        ===>>> 83 have new versions available
+
+
+	Az összes telepített port egyetlen
+	  egyszerû paranccsal frissíthetõ:
+
+	&prompt.root; portmaster -a
+
+	
+	  A Portmaster
+	    alapértelmezés szerint minden egyes
+	    törlendõ korábbi portról
+	    biztonsági másolatot készít.
+	    Amikor az új változat telepítése
+	    sikeresen lezajlott, akkor a
+	    Portmaster ezt a másolatot
+	    megsemmisíti.  A 
+	    paraméterrel azonban megkérhetjük, hogy
+	    ne törölje le a biztonsági mentést.
+	    A  megadásával a
+	    Portmaster interaktív
+	    módban indul el, és minden port
+	    frissítése elõtt a
+	    felhasználó
+	    megerõsítését fogja
+	    kérni.
+	
+
+	Amennyiben valamilyen hiba lép fel a
+	  frissítés folyamán, az 
+	  opció megadásával kérhetjük
+	  az összes port frissítését és
+	  újrafordítását is:
+
+	&prompt.root; portmaster -af
+
+	A Portmaster
+	  használatával új portokat is fel tudunk
+	  telepíteni a rendszerre úgy, hogy annak
+	  függõségeit is igyekszik frissíteni a
+	  lefordítása elõtt:
+
+	&prompt.root; portmaster shells/bash
+
+	A további részleteket a &man.portmaster.8;
+	  man oldalon találjuk.
+
+      
     
 
     

From owner-p4-projects@FreeBSD.ORG  Fri Mar 28 21:16:27 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E0A901065670; Fri, 28 Mar 2008 21:16:26 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A3DFD106564A
	for ; Fri, 28 Mar 2008 21:16:26 +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 925358FC17
	for ; Fri, 28 Mar 2008 21:16:26 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2SLGQaL036789
	for ; Fri, 28 Mar 2008 21:16:26 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2SLGQaP036787
	for perforce@freebsd.org; Fri, 28 Mar 2008 21:16:26 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 28 Mar 2008 21:16:26 GMT
Message-Id: <200803282116.m2SLGQaP036787@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 138855 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 28 Mar 2008 21:16:27 -0000

http://perforce.freebsd.org/chv.cgi?CH=138855

Change 138855 by sam@sam_ebb on 2008/03/28 21:15:53

	blech, make the node table lock recursive until I can sort out
	locking for the mlme ops

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_freebsd.h#21 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_freebsd.h#21 (text+ko) ====

@@ -33,7 +33,8 @@
  */
 typedef struct mtx ieee80211_com_lock_t;
 #define	IEEE80211_LOCK_INIT(_ic, _name) \
-	mtx_init(&(_ic)->ic_comlock, _name, "802.11 com lock", MTX_DEF | MTX_RECURSE)
+	mtx_init(&(_ic)->ic_comlock, _name, "802.11 com lock", \
+	    MTX_DEF | MTX_RECURSE)
 #define	IEEE80211_LOCK_DESTROY(_ic) mtx_destroy(&(_ic)->ic_comlock)
 #define	IEEE80211_LOCK(_ic)	   mtx_lock(&(_ic)->ic_comlock)
 #define	IEEE80211_UNLOCK(_ic)	   mtx_unlock(&(_ic)->ic_comlock)
@@ -54,12 +55,11 @@
 
 /*
  * Node locking definitions.
- * NB: MTX_DUPOK is because we don't generate per-interface strings.
  */
 typedef struct mtx ieee80211_node_lock_t;
 #define	IEEE80211_NODE_LOCK_INIT(_nt, _name) \
 	mtx_init(&(_nt)->nt_nodelock, _name, "802.11 node table", \
-		MTX_DEF | MTX_DUPOK)
+	    MTX_DEF | MTX_RECURSE)
 #define	IEEE80211_NODE_LOCK_DESTROY(_nt)	mtx_destroy(&(_nt)->nt_nodelock)
 #define	IEEE80211_NODE_LOCK(_nt)		mtx_lock(&(_nt)->nt_nodelock)
 #define	IEEE80211_NODE_IS_LOCKED(_nt)		mtx_owned(&(_nt)->nt_nodelock)

From owner-p4-projects@FreeBSD.ORG  Fri Mar 28 21:17:28 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5EFD51065676; Fri, 28 Mar 2008 21:17: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 EFF7C1065670
	for ; Fri, 28 Mar 2008 21:17: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 DEB008FC17
	for ; Fri, 28 Mar 2008 21:17:27 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2SLHRgi036874
	for ; Fri, 28 Mar 2008 21:17:27 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2SLHRNG036872
	for perforce@freebsd.org; Fri, 28 Mar 2008 21:17:27 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 28 Mar 2008 21:17:27 GMT
Message-Id: <200803282117.m2SLHRNG036872@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 138857 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 28 Mar 2008 21:17:28 -0000

http://perforce.freebsd.org/chv.cgi?CH=138857

Change 138857 by sam@sam_ebb on 2008/03/28 21:17:11

	close races between mlme ops and the rx path; this introduces
	at least one LOR that will need to be sorted out with the
	locking problem

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#47 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#47 (text+ko) ====

@@ -1271,6 +1271,7 @@
 	const uint8_t mac[IEEE80211_ADDR_LEN], int reason)
 {
 	struct ieee80211com *ic = vap->iv_ic;
+	struct ieee80211_node_table *nt = &ic->ic_sta;
 	struct ieee80211_node *ni;
 	struct mlmeop mlmeop;
 	int error;
@@ -1289,9 +1290,10 @@
 			mlmeop.vap = vap;
 			mlmeop.op = op;
 			mlmeop.reason = reason;
+			IEEE80211_NODE_LOCK(nt);
 			/* NB: the broadcast address means do 'em all */
 			if (!IEEE80211_ADDR_EQ(mac, ic->ic_ifp->if_broadcastaddr)) {
-				ni = ieee80211_find_node(&ic->ic_sta, mac);
+				ni = ieee80211_find_node_locked(nt, mac);
 				if (ni != NULL) {
 					domlme(&mlmeop, ni);
 					ieee80211_free_node(ni);
@@ -1301,6 +1303,7 @@
 				ieee80211_iterate_nodes(&ic->ic_sta,
 						domlme, &mlmeop);
 			}
+			IEEE80211_NODE_UNLOCK(nt);
 			break;
 		case IEEE80211_M_WDS:
 			/* XXX user app should send raw frame? */
@@ -1333,6 +1336,7 @@
 			error = EINVAL;
 			break;
 		}
+		IEEE80211_NODE_LOCK(nt);
 		ni = ieee80211_find_vap_node(&ic->ic_sta, vap, mac);
 		if (ni != NULL) {
 			mlmedebug(vap, mac, op, reason);
@@ -1343,12 +1347,14 @@
 			ieee80211_free_node(ni);
 		} else
 			error = ENOENT;
+		IEEE80211_NODE_UNLOCK(nt);
 		break;
 	case IEEE80211_MLME_AUTH:
 		if (vap->iv_opmode != IEEE80211_M_HOSTAP) {
 			error = EINVAL;
 			break;
 		}
+		IEEE80211_NODE_LOCK(nt);
 		ni = ieee80211_find_vap_node(&ic->ic_sta, vap, mac);
 		if (ni != NULL) {
 			mlmedebug(vap, mac, op, reason);
@@ -1373,6 +1379,7 @@
 			ieee80211_free_node(ni);
 		} else
 			error = ENOENT;
+		IEEE80211_NODE_UNLOCK(nt);
 		break;
 	default:
 		error = EINVAL;

From owner-p4-projects@FreeBSD.ORG  Fri Mar 28 21:19:30 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 722401065671; Fri, 28 Mar 2008 21:19: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 2E220106564A
	for ; Fri, 28 Mar 2008 21:19:30 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 1C3068FC12
	for ; Fri, 28 Mar 2008 21:19:30 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2SLJUeS036952
	for ; Fri, 28 Mar 2008 21:19:30 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2SLJU3c036950
	for perforce@freebsd.org; Fri, 28 Mar 2008 21:19:30 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Fri, 28 Mar 2008 21:19:30 GMT
Message-Id: <200803282119.m2SLJU3c036950@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 138858 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 28 Mar 2008 21:19:30 -0000

http://perforce.freebsd.org/chv.cgi?CH=138858

Change 138858 by pgj@disznohal on 2008/03/28 21:18:31

	(printing) MFen: 1.107 --> 1.110

Affected files ...

.. //depot/projects/docproj_hu/books/handbook/printing/chapter.sgml#4 edit

Differences ...

==== //depot/projects/docproj_hu/books/handbook/printing/chapter.sgml#4 (text+ko) ====

@@ -1,12 +1,12 @@
 
 
 
+     Original Revision: 1.110                     -->
 
 
   
@@ -2507,9 +2507,13 @@
 	Az lprps a &os;
 	  Portgyûjteményének része (ld.  A Portgyûjtemény),
-	  ezért pillanatok alatt magunktól is
-	  letölhetjük, fordíthatjuk és
-	  telepíthetjük.  Az lprps
+	  ezért a használni kívánt
+	  papír méretétõl függõen
+	  pillanatok alatt magunk is letölhetjük,
+	  fordíthatjuk és telepíthetjük a
+	  print/lprps-a4 és
+	  print/lprps-letter
+	  csomagok valamelyikét.  Az lprps
 	  telepítése után egyszerûen csak
 	  adjuk meg psif elérési
 	  útvonalát.  Ha tehát
@@ -2591,17 +2595,20 @@
 	  hála azonban létezik egy hozzá
 	  hasonló szabad szoftver, a
 	  Ghostscript, amely képes
-	  &os;-n is futni.  A Ghostscript képes a legtöbb
-	  &postscript; állomány olvasására,
+	  &os;-n is futni.  A Ghostscript
+	  képes a legtöbb &postscript;
+	  állomány olvasására,
 	  megjelenítésére mindenféle
 	  eszközökön, beleértve a postscriptet nem
-	  ismerõ nyomtatókat is.  A Ghostscript és
-	  egy speciális szövegszûrõ
+	  ismerõ nyomtatókat is.  A
+	  Ghostscript és egy
+	  speciális szövegszûrõ
 	  telepítésével el tudjuk érni, hogy
 	  egy nem &postscript; nyomtató valódi
 	  &postscript; nyomtatóként viselkedjen.
 
-	Ha telepíteni szeretnénk, a Ghostscript
+	Ha telepíteni szeretnénk, a
+	  Ghostscript
 	  megtalálható a &os;
 	  Portgyûjteményében.  Innen tehát
 	  magunk is könnyedén le tudjuk tölteni,
@@ -2615,21 +2622,22 @@
 	  készülünk kinyomtatni.  Ha nem ilyen a
 	  nyomtatandó munka, akkor egyenesen a nyomtatóra
 	  küldjük, azonban minden más esetben
-	  elõször a Ghostscript
+	  elõször a Ghostscript
 	  segítségével átalakítjuk
 	  egy olyan formátumba, amit a nyomtató is
 	  képes feldolgozni.
 
 	Nézzünk erre egy példát: a most
-	  következõ szövegszûrõ a Hewlett Packard
-	  DeskJet 500-as nyomtatóihoz használható.
-	  Más nyomtató esetén cseréljük
-	  ki a gs (Ghostscript) parancs
+	  következõ szövegszûrõ a Hewlett
+	  Packard DeskJet 500-as nyomtatóihoz
+	  használható.  Más nyomtató
+	  esetén cseréljük ki a gs
+	  (Ghostscript) parancs
 	   paraméterét a neki
-	  megfelelõre.  (A telepített Ghostscript
-	  által ismert nyomtatók listáját a
-	  gs -h paranccsal kérdezhetjük
-	  le.)
+	  megfelelõre.  (A telepített
+	  Ghostscript által ismert
+	  nyomtatók listáját a gs
+	  -h paranccsal kérdezhetjük le.)
 
 	#!/bin/sh
 #
@@ -2900,7 +2908,7 @@
 	    /etc/printcap állományt,
 	    ahol most azonban a bamboo-nál
 	    hozzáadtunk egy df
-	    tulajdonságot.
+	    tulajdonságot:
 
 	  #
 #  /etc/printcap (rose) -  egy df szûrõ hozzáadása a bamboo-hoz
@@ -2949,11 +2957,11 @@
 	  További példák konverziós
 	    szûrõkre
 
-	  Mivel a konverziós szûrõk
+	  A konverziós szûrõk
 	    telepítésének nincs bevált
-	    recepetje, ezért néhány példa
-	    segítségével igyekszünk
-	    illusztrálni õket.  Ezeket tudjuk
+	    receptje, ezért ebben a szakaszban bemutatunk
+	    rájuk néhány mûködõ
+	    illusztrációt.  Ezeket tudjuk
 	    felhasználni saját szûrõk
 	    elkészítésére.  Vagy ha
 	    megtehetjük, használjuk közvetlenül

From owner-p4-projects@FreeBSD.ORG  Fri Mar 28 22:49:04 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 00E091065674; Fri, 28 Mar 2008 22:49: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 B51281065671
	for ; Fri, 28 Mar 2008 22:49:03 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A4D8F8FC30
	for ; Fri, 28 Mar 2008 22:49:03 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2SMn3FU044164
	for ; Fri, 28 Mar 2008 22:49:03 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2SMn30L044162
	for perforce@freebsd.org; Fri, 28 Mar 2008 22:49:03 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 28 Mar 2008 22:49:03 GMT
Message-Id: <200803282249.m2SMn30L044162@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 138863 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 28 Mar 2008 22:49:04 -0000

http://perforce.freebsd.org/chv.cgi?CH=138863

Change 138863 by sam@sam_ebb on 2008/03/28 22:48:36

	force ENETRESET work when plumbing the WPA ie's so if the ifnet
	is UP the beacon frame will get rebuilt; this is really a workaround
	for hostapd doing things in the wrong order

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#48 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#48 (text+ko) ====

@@ -2211,9 +2211,16 @@
 				    appie->ie_len - (2 + data[1]));
 			}
 			if (vap->iv_opmode == IEEE80211_M_HOSTAP ||
-			    vap->iv_opmode == IEEE80211_M_IBSS)
-				ieee80211_beacon_notify(vap,
-				    IEEE80211_BEACON_APPIE);
+			    vap->iv_opmode == IEEE80211_M_IBSS) {
+				/*
+				 * Must rebuild beacon frame as the update
+				 * mechanism doesn't handle WPA/RSN ie's.
+				 * Could extend it but it doesn't normally
+				 * change; this is just to deal with hostapd
+				 * plumbing the ie after the interface is up.
+				 */
+				error = ENETRESET;
+			}
 		}
 		break;
 	default:

From owner-p4-projects@FreeBSD.ORG  Fri Mar 28 22:59:16 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3A7F51065678; Fri, 28 Mar 2008 22:59: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 D212D1065675
	for ; Fri, 28 Mar 2008 22:59:15 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id BFEE98FC2F
	for ; Fri, 28 Mar 2008 22:59:15 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2SMxFdF044480
	for ; Fri, 28 Mar 2008 22:59:15 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2SMxFsP044478
	for perforce@freebsd.org; Fri, 28 Mar 2008 22:59:15 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 28 Mar 2008 22:59:15 GMT
Message-Id: <200803282259.m2SMxFsP044478@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138866 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 28 Mar 2008 22:59:16 -0000

http://perforce.freebsd.org/chv.cgi?CH=138866

Change 138866 by jb@jb_freebsd1 on 2008/03/28 22:59:04

	IFC

Affected files ...

.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#14 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#62 integrate
.. //depot/projects/dtrace/doc/share/sgml/man-refs.ent#29 integrate
.. //depot/projects/dtrace/ports/UPDATING#61 integrate
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/alloca.h#2 integrate
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/fcntl.h#2 integrate
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/fsshare.h#2 integrate
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/stdio.h#2 integrate
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/stdlib.h#2 integrate
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/strings.h#2 integrate
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/unistd.h#2 integrate
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/misc/deviceid.c#2 integrate
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/misc/fsshare.c#2 integrate
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/misc/mnttab.c#2 integrate
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/misc/zmount.c#2 integrate
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/misc/zone.c#2 integrate
.. //depot/projects/dtrace/src/etc/network.subr#12 integrate
.. //depot/projects/dtrace/src/etc/rc.d/ppp#10 integrate
.. //depot/projects/dtrace/src/lib/libc/sys/mincore.2#5 integrate
.. //depot/projects/dtrace/src/share/man/man4/ubsa.4#6 integrate
.. //depot/projects/dtrace/src/share/man/man5/rc.conf.5#26 integrate
.. //depot/projects/dtrace/src/share/man/man9/Makefile#29 integrate
.. //depot/projects/dtrace/src/share/man/man9/lock.9#13 integrate
.. //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#37 integrate
.. //depot/projects/dtrace/src/sys/boot/forth/loader.conf#13 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/kern/opensolaris_kstat.c#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/machine/endian.h#3 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/atomic.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/cmn_err.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/cred.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/cyclic.h#3 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/debug.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/dirent.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/dnlc.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/elf.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/kcondvar.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/kmem.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/kobj.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/kstat.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/lock.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/misc.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/mman.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/mnttab.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/modctl.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/mount.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/mutex.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/param.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/pcpu.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/policy.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/proc.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/random.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/rwlock.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/sdt.h#3 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/stat.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/string.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/sunddi.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/systm.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/time.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/types.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/uio.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/varargs.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/vfs.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/vnode.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/zone.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/common/atomic/ia64/atomic.S#2 integrate
.. //depot/projects/dtrace/src/sys/conf/NOTES#44 integrate
.. //depot/projects/dtrace/src/sys/conf/files#80 integrate
.. //depot/projects/dtrace/src/sys/conf/options#45 integrate
.. //depot/projects/dtrace/src/sys/dev/aac/aac.c#15 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/ubsa.c#8 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/usbdevs#28 integrate
.. //depot/projects/dtrace/src/sys/geom/geom_subr.c#8 integrate
.. //depot/projects/dtrace/src/sys/geom/part/g_part_pc98.c#1 branch
.. //depot/projects/dtrace/src/sys/i386/i386/busdma_machdep.c#10 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/pmap.c#32 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_bio.c#24 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_subr.c#35 integrate
.. //depot/projects/dtrace/src/sys/modules/cyclic/Makefile#11 edit
.. //depot/projects/dtrace/src/sys/modules/geom/geom_part/Makefile#3 integrate
.. //depot/projects/dtrace/src/sys/modules/geom/geom_part/geom_part_pc98/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/opensolaris/Makefile#3 edit
.. //depot/projects/dtrace/src/sys/nlm/nlm_prot_clnt.c#2 integrate
.. //depot/projects/dtrace/src/sys/nlm/nlm_prot_impl.c#3 integrate
.. //depot/projects/dtrace/src/sys/nlm/nlm_prot_server.c#2 integrate
.. //depot/projects/dtrace/src/sys/nlm/nlm_prot_svc.c#2 integrate
.. //depot/projects/dtrace/src/sys/nlm/nlm_prot_xdr.c#2 integrate
.. //depot/projects/dtrace/src/sys/nlm/sm_inter_xdr.c#2 integrate
.. //depot/projects/dtrace/src/sys/rpc/auth_unix.c#2 integrate
.. //depot/projects/dtrace/src/sys/rpc/authunix_prot.c#2 integrate
.. //depot/projects/dtrace/src/sys/rpc/clnt_dg.c#2 integrate
.. //depot/projects/dtrace/src/sys/rpc/clnt_rc.c#2 integrate
.. //depot/projects/dtrace/src/sys/rpc/clnt_vc.c#2 integrate
.. //depot/projects/dtrace/src/sys/rpc/inet_ntop.c#2 integrate
.. //depot/projects/dtrace/src/sys/rpc/inet_pton.c#2 integrate
.. //depot/projects/dtrace/src/sys/rpc/rpc_generic.c#3 integrate
.. //depot/projects/dtrace/src/sys/rpc/rpcb_clnt.c#2 integrate
.. //depot/projects/dtrace/src/sys/rpc/svc.c#2 integrate
.. //depot/projects/dtrace/src/sys/rpc/svc_auth_unix.c#2 integrate
.. //depot/projects/dtrace/src/sys/rpc/svc_dg.c#2 integrate
.. //depot/projects/dtrace/src/sys/rpc/svc_generic.c#2 integrate
.. //depot/projects/dtrace/src/sys/rpc/svc_vc.c#2 integrate
.. //depot/projects/dtrace/src/sys/sys/aac_ioctl.h#5 integrate
.. //depot/projects/dtrace/src/sys/sys/buf.h#14 integrate
.. //depot/projects/dtrace/src/sys/sys/lockmgr.h#18 integrate
.. //depot/projects/dtrace/src/sys/sys/mman.h#5 integrate
.. //depot/projects/dtrace/src/sys/sys/param.h#46 integrate
.. //depot/projects/dtrace/www/en/gnome/docs/faq2.sgml#17 integrate

Differences ...

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#14 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
 
@@ -4054,18 +4054,101 @@
       
 
       
-        Dynamic Websites with Perl & PHP
-        In the past few years, more businesses have turned to the
+        Language Bindings
+
+        There are Apache modules for most major scripting
+          languages.  These modules typically make it possible to
+          write Apache modules entirely in
+          a scripting language.  They are also often used as a
+          persistent interpreter embedded into the server that avoids
+          the overhead of starting an external interpreter and the
+          startup-time penalty for dynamic websites, as described in
+          the next section.
+      
+    
+
+    
+      Dynamic Websites
+
+      web servers
+        dynamic
+
+      In the last decade, more businesses have turned to the
           Internet in order to enhance their revenue and increase
           exposure.  This has also increased the need for interactive
-          web content.  While some companies, such as µsoft;, have
-          introduced solutions into their proprietary products, the
-          open source community answered the call.  Two options for
-          dynamic web content include
-          mod_perl &
+          web content.  While some companies, such as µsoft;,
+          have introduced solutions into their proprietary products,
+          the open source community answered the call.  Modern options
+          for dynamic web content include Django, Ruby on Rails,
+          mod_perl, and
           mod_php.
 
-        
+      
+        Django
+
+	Python
+	Django
+
+        Django is a BSD licensed framework designed to allow
+          developers to write high performance, elegant web
+          applications quickly.  It provides an object-relational
+          mapper so that data types are developed as Python objects,
+          and a rich dynamic database-access API is provided for those
+          objects without the developer ever having to write SQL.  It
+          also provides an extensible template system so that the
+          logic of the application is separated from the HTML
+          presentation.
+
+        Django depends on mod_python,
+          Apache, and an SQL database
+          engine of your choice.  The FreeBSD Port will install all of
+          these pre-requisites for you with the appropriate flags.
+
+	
+	  Installing Django with Apache2, mod_python3, and PostgreSQL
+
+	  &prompt.root; cd /usr/ports/www/py-django; make all install clean -DWITH_MOD_PYTHON3 -DWITH_POSTGRESQL
+        
+
+	Once Django and these pre-requisites are installed, you
+	  will need to create a Django project directory and then
+	  configure Apache to use the embedded Python interpreter to
+	  call your application for specific URLs on your site.
+
+	
+	  Apache Configuration for Django/mod_python
+
+          You will need to add a line to the apache
+            httpd.conf file to configure Apache
+            to pass requests for certain URLs to your web
+            application:
+
+      <Location "/">
+    SetHandler python-program
+    PythonPath "['/dir/to/your/django/packages/'] + sys.path"
+    PythonHandler django.core.handlers.modpython
+    SetEnv DJANGO_SETTINGS_MODULE mysite.settings
+    PythonAutoReload On
+    PythonDebug On
+</Location>
+	
+      
+
+      
+        Ruby on Rails
+
+	Ruby on Rails
+
+	Ruby on Rails is another open source web framework that
+	  provides a full development stack and is optimized to make
+	  web developers more productive and capable of writing
+	  powerful applications quickly.  It can be installed easily
+	  from the ports system.
+
+	  &prompt.root; cd /usr/ports/www/rubygem-rails; make all install clean
+                
+
+      
         mod_perl
 
 	
@@ -4093,10 +4176,10 @@
             www/apache13-modperl.
             mod_perl 2.0 is avaliable in
             www/mod_perl2.
-        
+        
 
-        
-          
+        
+          
 	  
 	    
 	      Tom
@@ -4104,7 +4187,7 @@
 	      Written by 
 	    
 	  
-        
+        
         mod_php
 
 	
@@ -4203,7 +4286,6 @@
               pick up the new configuration changes:
 
 	&prompt.root; apachectl graceful
-        
       
     
   

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#62 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
 
 	Using X11 related variables in port
-	# Use X11 libraries and depend on
+	# Use some X11 libraries and depend on
 # font server as well as cyrillic fonts.
-RUN_DEPENDS=   ${X11BASE}/bin/xfs:${X_FONTSERVER_PORT} \
-               ${X11BASE}/lib/X11/fonts/cyrillic/crox1c.pcf.gz:${X_FONTS_CYRILLIC_PORT}
+RUN_DEPENDS=   ${LOCALBASE}/bin/xfs:${X_FONTSERVER_PORT} \
+               ${LOCALBASE}/lib/X11/fonts/cyrillic/crox1c.pcf.gz:${X_FONTS_CYRILLIC_PORT}
 
-USE_XLIB=      yes
+USE_XORG=      x11 xpm
       
 
       
@@ -5430,7 +5430,7 @@
 	X11 fonts
 
 	If your port installs fonts for the X Window System, put them in
-	  X11BASE/lib/X11/fonts/local.
+	  LOCALBASE/lib/X11/fonts/local.
 
       
 
@@ -5853,8 +5853,8 @@
 	      add directories to the include and library searchpaths
 	      via the commandline, for example:
 
-	    ${QMAKE} -unix PREFIX=${PREFIX} INCLUDEPATH+=${X11BASE}/include \
-	LIBS+=-L${X11BASE}/lib sillyapp.pro
+	    ${QMAKE} -unix PREFIX=${PREFIX} INCLUDEPATH+=${LOCALBASE}/include \
+	LIBS+=-L${LOCALBASE}/lib sillyapp.pro
 	  
 
 	  
@@ -7553,7 +7553,7 @@
 	      
 		relative
 
-		--with-wx=${X11BASE}
+		--with-wx=${LOCALBASE}
 		    --with-wx-config=${WX_CONFIG:T}
 	      
 	    
@@ -8227,9 +8227,8 @@
 	. %%RC_SUBR%%, because older versions of &os;
 	do not have an /etc/rc.subr file.  Standard
 	SUB_LIST expansions are used too.
-	Use of the %%PREFIX%%,
-	%%LOCALBASE%%, and
-	%%X11BASE%% expansions is strongly encouraged as well.
+	Use of the %%PREFIX%% and
+	%%LOCALBASE%% expansions is strongly encouraged as well.
 	More on
 	SUB_LIST in the relevant section.
@@ -8794,7 +8793,7 @@
 	  with VALUE in each file listed in
 	  SUB_FILES.  Several common pairs are
 	  automatically defined: PREFIX,
-	  LOCALBASE, X11BASE,
+	  LOCALBASE,
 	  DATADIR, DOCSDIR,
 	  EXAMPLESDIR.  Any line beginning with
 	  @comment will be deleted from resulting files
@@ -8915,10 +8914,6 @@
 	The value of PREFIX will be set
 	  to LOCALBASE (default
 	  /usr/local).  If
-	  USE_X_PREFIX or USE_IMAKE is
-	  set, PREFIX will be X11BASE
-	  (default LOCALBASE for compatibility reasons,
-	  but it is going to be completely removed later).  If
 	  USE_LINUX_PREFIX is set, PREFIX
 	  will be LINUXBASE (default
 	  /compat/linux).
@@ -8951,10 +8946,6 @@
 	/var/tmp/$(make -V PORTNAME)
 	to do that while you have it installed would do that.
 
-	Do not set USE_X_PREFIX unless your port
-	  truly requires it (i.e., it needs to
-	  reference files in X11BASE).
-
 	The variable PREFIX can be reassigned in your
 	  Makefile or in the user's environment.
 	  However, it is strongly discouraged for individual ports to set this
@@ -12001,17 +11992,43 @@
 		    800019
 		  
 		  
+		    8.0-CURRENT after introduction of
+		      &man.lockmgr.assert.9; and
+		      BUF_ASSERT functions.
+		    800020
+		  
+		  
+		    8.0-CURRENT after introduction of
+		      &man.lockmgr.args.9; and LK_INTERNAL flag
+		      removal.
+		    800021
+		  
+		  
 		    8.0-CURRENT after changing the default system ar
-		      to BSD ar(1).
+		      to BSD &man.ar.1;.
 		    800022
 		  
-
+		  
+		    8.0-CURRENT after changing the prototypes of
+		      &man.lockstatus.9; and &man.VOP.ISLOCKED.9;, more
+		      specifically retiring the
+		      struct thread argument.
+		    800023
+		  
+		  
+		    8.0-CURRENT after axing out the
+		      lockwaiters and
+		      BUF_LOCKWAITERS functions,
+		      changing the return value fo brelvp
+		      from void to int and introducing new flags for
+		      &man.lockinit.9;.
+		    800024
+		  
 		  
 		    8.0-CURRENT after adding F_DUP2FD command
 		      to &man.fcntl.2;.
 		    800025
 		  
-
 		  
 		    8.0-CURRENT after changing the priority parameter
 		      to cv_broadcastpri such that 0 means no priority.
@@ -12024,6 +12041,17 @@
 		    
 		    800027
 		  
+		  
+		    8.0-CURRENT after adding l_sysid to struct flock.
+		    
+		    800028
+		   
+		  
+		    8.0-CURRENT after reintegration of the
+		      BUF_LOCKWAITERS function and the
+		      addition of &man.lockmgr.waiters.9;.
+		    800029
+		   
 		
 	      
 	    
@@ -12119,12 +12147,6 @@
 	      
 
 	      
-		X11BASE
-		The base of the X11 tree (e.g.,
-		  /usr/X11R6)
-	      
-
-	      
 		PREFIX
 		Where the port installs itself (see more on
@@ -12416,8 +12438,7 @@
 
 	      
 		installs files outside of
-		  ${LOCALBASE} and
-		  ${X11BASE}
+		  ${LOCALBASE}
 	      
 
 	      

==== //depot/projects/dtrace/doc/share/sgml/man-refs.ent#29 (text+ko) ====

@@ -20,7 +20,7 @@
      lexicographical order by the entity (i.e., the dots used in place of
      special characters should not be expanded when comparing).
 
-     $FreeBSD: doc/share/sgml/man-refs.ent,v 1.454 2008/03/24 18:56:12 remko Exp $
+     $FreeBSD: doc/share/sgml/man-refs.ent,v 1.456 2008/03/28 21:33:18 brueffer Exp $
 -->
 
 
@@ -4905,9 +4905,14 @@
 
 
 
+
 
+
+
 
 
+
+
 
 
 

==== //depot/projects/dtrace/ports/UPDATING#61 (text+ko) ====

@@ -68,11 +68,14 @@
   1. Make sure there are no running linux applications.
   2. Unmount linprocfs (umount /compat/linux/proc)
   3. Uninstall your current linux_base port
-  4. Unload linux kernel module (kldunload linux.ko)
-  5. Set appropriate sysctl (sysctl compat.linux.osrelease=2.6.16)
-  6. Install emulators/linux_base-fc6
-  4  Remount linprocfs (mount /compat/linux/proc)
-  5. Add compat.linux.osrelease=2.6.16 to etc/sysctl.conf
+  4. Set appropriate sysctl (sysctl compat.linux.osrelease=2.6.16)
+  5. Install emulators/linux_base-fc6
+  6  Remount linprocfs (mount /compat/linux/proc)
+  7. Add compat.linux.osrelease=2.6.16 to etc/sysctl.conf
+  8. Add OVERRIDE_LINUX_BASE_PORT=f6 to /etc/make.conf
+
+  Note: These instructions also apply to linux_base-f8, please use the same
+  osrelease.
 
   For FreeBSD versions 5.x and 6.x:
   Please use the legacy version net/skype12
@@ -6250,4 +6253,4 @@
   2) Update all p5-* modules.
 	portupgrade -f p5-\*
 
-$FreeBSD: ports/UPDATING,v 1.606 2008/03/26 13:47:49 bsam Exp $
+$FreeBSD: ports/UPDATING,v 1.607 2008/03/28 05:38:32 beech Exp $

==== //depot/projects/dtrace/src/cddl/compat/opensolaris/include/alloca.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/cddl/compat/opensolaris/include/alloca.h,v 1.1 2007/11/28 21:40:07 jb Exp $
+ * $FreeBSD: src/cddl/compat/opensolaris/include/alloca.h,v 1.2 2008/03/28 22:16:04 jb Exp $
  *
  */
 

==== //depot/projects/dtrace/src/cddl/compat/opensolaris/include/fcntl.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/cddl/compat/opensolaris/include/fcntl.h,v 1.1 2007/11/28 21:40:07 jb Exp $
+ * $FreeBSD: src/cddl/compat/opensolaris/include/fcntl.h,v 1.2 2008/03/28 22:16:04 jb Exp $
  *
  */
 

==== //depot/projects/dtrace/src/cddl/compat/opensolaris/include/fsshare.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/cddl/compat/opensolaris/include/fsshare.h,v 1.1 2007/04/06 01:08:58 pjd Exp $
+ * $FreeBSD: src/cddl/compat/opensolaris/include/fsshare.h,v 1.2 2008/03/28 22:16:04 jb Exp $
  */
 
 #ifndef _OPENSOLARIS_FSSHARE_H_

==== //depot/projects/dtrace/src/cddl/compat/opensolaris/include/stdio.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/cddl/compat/opensolaris/include/stdio.h,v 1.1 2007/11/28 21:40:07 jb Exp $
+ * $FreeBSD: src/cddl/compat/opensolaris/include/stdio.h,v 1.2 2008/03/28 22:16:04 jb Exp $
  *
  */
 

==== //depot/projects/dtrace/src/cddl/compat/opensolaris/include/stdlib.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/cddl/compat/opensolaris/include/stdlib.h,v 1.1 2007/11/28 21:40:07 jb Exp $
+ * $FreeBSD: src/cddl/compat/opensolaris/include/stdlib.h,v 1.2 2008/03/28 22:16:04 jb Exp $
  *
  */
 

==== //depot/projects/dtrace/src/cddl/compat/opensolaris/include/strings.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/cddl/compat/opensolaris/include/strings.h,v 1.1 2007/11/28 21:40:07 jb Exp $
+ * $FreeBSD: src/cddl/compat/opensolaris/include/strings.h,v 1.2 2008/03/28 22:16:04 jb Exp $
  *
  */
 

==== //depot/projects/dtrace/src/cddl/compat/opensolaris/include/unistd.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/cddl/compat/opensolaris/include/unistd.h,v 1.1 2007/11/28 21:40:07 jb Exp $
+ * $FreeBSD: src/cddl/compat/opensolaris/include/unistd.h,v 1.2 2008/03/28 22:16:04 jb Exp $
  *
  */
 

==== //depot/projects/dtrace/src/cddl/compat/opensolaris/misc/deviceid.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/deviceid.c,v 1.1 2007/05/06 01:39:38 pjd Exp $");
+__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/deviceid.c,v 1.2 2008/03/28 22:16:05 jb Exp $");
 
 #include 
 #include 

==== //depot/projects/dtrace/src/cddl/compat/opensolaris/misc/fsshare.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/fsshare.c,v 1.2 2007/04/21 13:17:23 pjd Exp $");
+__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/fsshare.c,v 1.3 2008/03/28 22:16:05 jb Exp $");
 
 #include 
 #include 

==== //depot/projects/dtrace/src/cddl/compat/opensolaris/misc/mnttab.c#2 (text+ko) ====

@@ -30,7 +30,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/mnttab.c,v 1.1 2007/04/06 01:08:59 pjd Exp $");
+__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/mnttab.c,v 1.2 2008/03/28 22:16:05 jb Exp $");
 
 #include 
 #include 

==== //depot/projects/dtrace/src/cddl/compat/opensolaris/misc/zmount.c#2 (text+ko) ====

@@ -29,7 +29,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/zmount.c,v 1.1 2007/04/06 01:08:59 pjd Exp $");
+__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/zmount.c,v 1.2 2008/03/28 22:16:05 jb Exp $");
 
 #include 
 #include 

==== //depot/projects/dtrace/src/cddl/compat/opensolaris/misc/zone.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/cddl/compat/opensolaris/misc/zone.c,v 1.1 2007/04/06 01:08:59 pjd Exp $
+ * $FreeBSD: src/cddl/compat/opensolaris/misc/zone.c,v 1.2 2008/03/28 22:16:05 jb Exp $
  */
 
 #include 

==== //depot/projects/dtrace/src/etc/network.subr#12 (text+ko) ====

@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/etc/network.subr,v 1.181 2007/11/05 06:13:06 thompsa Exp $
+# $FreeBSD: src/etc/network.subr,v 1.182 2008/03/28 06:50:06 brooks Exp $
 #
 
 #
@@ -472,14 +472,6 @@
 }
 
 gif_up() {
-	# The following must be removed once RELENG_7 is branched.
-	case ${gif_interfaces} in
-	[Nn][Oo])
-		warn "gif_interfaces=\"NO\" is deprecated, use gif_interfaces=\"\" instead."
-		gif_interfaces=""
-		;;
-	esac
-
 	for i in ${gif_interfaces}; do
 		peers=`get_if_var $i gifconfig_IF`
 		case ${peers} in
@@ -487,7 +479,12 @@
 			continue
 			;;
 		*)
-			ifconfig $i create >/dev/null 2>&1
+			if expr $i : 'gif[0-9][0-9]*$' >/dev/null 2>&1; then
+				ifconfig $i create >/dev/null 2>&1
+			else
+				gif=`ifconfig gif create`
+				ifconfig $gif name $i
+			fi
 			ifconfig $i tunnel ${peers}
 			ifconfig $i up
 			;;

==== //depot/projects/dtrace/src/etc/rc.d/ppp#10 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/ppp,v 1.17 2008/03/26 21:54:48 brooks Exp $
+# $FreeBSD: src/etc/rc.d/ppp,v 1.18 2008/03/28 07:57:51 brooks Exp $
 #
 
 # PROVIDE: ppp
@@ -18,7 +18,7 @@
 
 ppp_start_profile()
 {
-	local _ppp_profile _ppp_mode _ppp_nat
+	local _ppp_profile _ppp_mode _ppp_nat _ppp_unit
 
 	_ppp_profile=$1
 	_ppp_profile_cleaned=$1
@@ -59,6 +59,13 @@
 		;;
 	esac
 
+	# Check for hard wired unit
+	eval _ppp_unit=\$ppp_${_ppp_profile_cleaned}_unit
+	if [ -n "_ppp_unit" ]; then
+		_ppp_unit="-unit${_ppp_unit}"
+	fi
+	rc_flags="$rc_flags $_ppp_unit"
+
 	# Run!
 	#
 	su -m $ppp_user -c "$command ${rc_flags} ${_ppp_profile}"

==== //depot/projects/dtrace/src/lib/libc/sys/mincore.2#5 (text+ko) ====

@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mincore.2	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD: src/lib/libc/sys/mincore.2,v 1.26 2007/01/09 00:28:15 imp Exp $
+.\" $FreeBSD: src/lib/libc/sys/mincore.2,v 1.27 2008/03/28 04:29:27 ps Exp $
 .\"
 .Dd January 17, 2003
 .Dt MINCORE 2
@@ -72,6 +72,8 @@
 Page has been referenced.
 .It Dv MINCORE_MODIFIED_OTHER
 Page has been modified.
+.It Dv MINCORE_SUPER
+Page is part of a "super" page. (only i386 & amd64)
 .El
 .Pp
 The information returned by

==== //depot/projects/dtrace/src/share/man/man4/ubsa.4#6 (text+ko) ====

@@ -33,9 +33,9 @@
 .\" 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/ubsa.4,v 1.10 2007/05/08 18:51:40 maxim Exp $
+.\" $FreeBSD: src/share/man/man4/ubsa.4,v 1.11 2008/03/28 15:28:59 rpaulo Exp $
 .\"
-.Dd May 8, 2007
+.Dd March 28, 2008
 .Dt UBSA 4
 .Os
 .Sh NAME
@@ -96,6 +96,8 @@
 Option Globetrotter 3G Fusion Quad (no WLAN support)
 .It
 Peracom single port serial adapter
+.It
+Qualcomm, Inc. ZTE CDMA Technologies MSM
 .El
 .Pp
 The supported 3G cards provide the necessary modem port for ppp,

==== //depot/projects/dtrace/src/share/man/man5/rc.conf.5#26 (text+ko) ====

@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.336 2008/03/26 21:54:48 brooks Exp $
+.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.337 2008/03/28 07:57:52 brooks Exp $
 .\"
 .Dd January 27, 2008
 .Dt RC.CONF 5
@@ -1322,7 +1322,9 @@
 Also used for per-profile overrides of
 .Va ppp_mode
 and
-.Va ppp_nat .
+.Va ppp_nat ,
+and
+.Va ppp_ Ns Ao Ar profile Ac Ns _unit .
 When the profile name contains any of the characters
 .Dq Li .-/+
 they are translated to
@@ -1361,6 +1363,12 @@
 .Va ppp_nat
 for
 .Ar profile .
+.It Va ppp_ Ns Ao Ar profile Ac Ns _unit
+.Pq Vt int
+Set the unit number to be used for this profile.
+See the manual description of
+.Fl unit Ns Ar N
+for details.
 .It Va ppp_user
 .Pq Vt str
 The name of the user under which

==== //depot/projects/dtrace/src/share/man/man9/Makefile#29 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/man/man9/Makefile,v 1.332 2008/03/14 13:13:37 rwatson Exp $
+# $FreeBSD: src/share/man/man9/Makefile,v 1.333 2008/03/28 21:30:37 brueffer Exp $
 
 MAN=	accept_filter.9 \
 	accf_data.9 \
@@ -723,6 +723,7 @@
 	lock.9 lockmgr_disown.9 \
 	lock.9 lockmgr_printinfo.9 \
 	lock.9 lockmgr_recursed.9 \
+	lock.9 lockmgr_waiters.9 \
 	lock.9 lockstatus.9
 MLINKS+=LOCK_PROFILING.9 MUTEX_PROFILING.9
 MLINKS+=make_dev.9 destroy_dev.9 \

==== //depot/projects/dtrace/src/share/man/man9/lock.9#13 (text+ko) ====

@@ -24,9 +24,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man9/lock.9,v 1.30 2008/03/02 20:07:48 brueffer Exp $
+.\" $FreeBSD: src/share/man/man9/lock.9,v 1.31 2008/03/28 21:30:37 brueffer Exp $
 .\"
-.Dd March 1, 2008
+.Dd March 28, 2008
 .Dt LOCK 9
 .Os
 .Sh NAME
@@ -37,6 +37,7 @@
 .Nm lockmgr_disown ,
 .Nm lockmgr_printinfo ,
 .Nm lockmgr_recursed ,
+.Nm lockmgr_waiters ,
 .Nm lockstatus ,
 .Nm lockmgr_assert
 .Nd "lockmgr family of functions"
@@ -59,6 +60,8 @@
 .Ft int
 .Fn lockmgr_recursed "struct lock *lkp"
 .Ft int
+.Fn lockmgr_waiters "struct lock *lkp"
+.Ft int
 .Fn lockstatus "struct lock *lkp"
 .Pp
 .Cd "options INVARIANTS"
@@ -220,6 +223,10 @@
 otherwise.
 .Pp
 The
+.Fn lockmgr_waiters
+function returns true if the lock has waiters, 0 otherwise.
+.Pp
+The
 .Fn lockstatus
 function returns the status of the lock in relation to the current thread.
 .Pp

==== //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#37 (text+ko) ====

@@ -77,7 +77,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.609 2008/03/23 23:04:09 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.610 2008/03/28 04:29:27 ps Exp $");
 
 /*
  *	Manages physical address maps.
@@ -4371,6 +4371,7 @@
 	if (pdep != NULL && (*pdep & PG_V)) {
 		if (*pdep & PG_PS) {
 			pte = *pdep;
+			val = MINCORE_SUPER;
 			/* Compute the physical address of the 4KB page. */
 			pa = ((*pdep & PG_PS_FRAME) | (addr & PDRMASK)) &
 			    PG_FRAME;
@@ -4385,7 +4386,7 @@
 	PMAP_UNLOCK(pmap);
 
 	if (pte != 0) {
-		val = MINCORE_INCORE;
+		val |= MINCORE_INCORE;
 		if ((pte & PG_MANAGED) == 0)
 			return val;
 

==== //depot/projects/dtrace/src/sys/boot/forth/loader.conf#13 (text+ko) ====

@@ -6,7 +6,7 @@
 #
 # All arguments must be in double quotes.
 #
-# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.122 2007/09/26 08:38:25 ru Exp $
+# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.123 2008/03/28 18:13:09 brueffer Exp $
 
 ##############################################################
 ###  Basic configuration options  ############################
@@ -234,10 +234,12 @@
 if_gem_load="NO"		# Sun GEM/Sun ERI/Apple GMAC
 if_hme_load="NO"		# Sun Microelectronics STP2002-STQ Ethernet
 if_ie_load="NO"			# Intel 82586
+if_igb_load="NO"		# Intel(R) PRO/1000 Gigabit Ethernet
 if_ipw_load="NO"		# Intel PRO/Wireless 2100 wireless
 if_iwi_load="NO"		# Intel PRO/Wireless 2200BG/2225BG/2915ABG
 				# wireless
 if_ixgb_load="NO"		# Intel PRO/10Gb Ethernet
+if_ixgbe_load="NO"		# Intel PRO/10Gb Ethernet PCI Express
 if_le_load="NO"			# AMD Am7900 LANCE and Am79C9xx PCnet
 if_lge_load="NO"		# Level 1 LXT1001 NetCellerator PCI Gigabit
 				# Ethernet
@@ -247,8 +249,10 @@
 if_nfe_load="NO"		# NVIDIA nForce MCP Networking Adapter
 if_nge_load="NO"		# National Semiconductor PCI Gigabit Ethernet
 if_nve_load="NO"		# NVIDIA nForce MCP Networking Adapter
+if_nxge_load="NO"		# Neterion Xframe 10Gb Ethernet
 if_oltr_load="NO"		# Olicom
 if_pcn_load="NO"		# AMD PCnet PCI
+if_ral_load="NO"		# Ralink Technology wireless
 if_ray_load="NO"		# Raytheon Raylink/Webgear Aviator PCCard
 if_re_load="NO"			# RealTek 8139C+/8169/8169S/8110S
 if_rl_load="NO"			# RealTek 8129/8139
@@ -267,10 +271,12 @@
 if_txp_load="NO"		# 3Com 3XP Typhoon/Sidewinder (3CR990)
 if_vge_load="NO"		# VIA VT6122 PCI Gigabit Ethernet
 if_udav_load="NO"		# Davicom DM9601 USB Ethernet
+if_ural_load="NO"		# Ralink Technology USB wireless
 if_vr_load="NO"			# VIA Rhine I and Rhine II
 if_vx_load="NO"			# 3Com 3C590 family
 if_wb_load="NO"			# Winbond W89C840F
 if_wi_load="NO"			# WaveLAN/IEEE 802.11 wireless NICs
+if_wpi_load="NO"		# Intel 3945ABG Wireless LAN IEEE 802.11
 if_xe_load="NO"			# Xircom CreditCard PCMCIA
 if_xl_load="NO"			# 3Com Etherlink XL (3c900, 3c905, 3c905B)
 

==== //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c,v 1.1 2007/06/08 12:35:45 pjd Exp $");
+__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c,v 1.2 2008/03/28 22:16:05 jb Exp $");
 
 #include 
 #include 

==== //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c,v 1.3 2008/01/24 11:21:54 pjd Exp $");
+__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c,v 1.4 2008/03/28 22:16:05 jb Exp $");
 
 #include 
 #include 
@@ -40,6 +40,8 @@
 #include 
 #include 
 
+#define KMEM_DEBUG
+
 #ifdef KMEM_DEBUG
 #include 
 #include 
@@ -93,6 +95,10 @@
 zfs_kmem_free(void *buf, size_t size __unused)
 {
 #ifdef KMEM_DEBUG
+	if (buf == NULL) {
+		printf("%s: attempt to free NULL\n",__func__);
+		return;
+	}
 	struct kmem_item *i;

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Fri Mar 28 23:02:19 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 79AF51065679; Fri, 28 Mar 2008 23:02: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 01B371065678
	for ; Fri, 28 Mar 2008 23:02:19 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E2B958FC26
	for ; Fri, 28 Mar 2008 23:02:18 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2SN2J55044614
	for ; Fri, 28 Mar 2008 23:02:19 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2SN2IFr044612
	for perforce@freebsd.org; Fri, 28 Mar 2008 23:02:18 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 28 Mar 2008 23:02:18 GMT
Message-Id: <200803282302.m2SN2IFr044612@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138867 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 28 Mar 2008 23:02:20 -0000

http://perforce.freebsd.org/chv.cgi?CH=138867

Change 138867 by jb@jb_freebsd1 on 2008/03/28 23:01:31

	Delete files that have moved.

Affected files ...

.. //depot/projects/dtrace/src/contrib/opensolaris/OPENSOLARIS.LICENSE#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/dtrace.1#2 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/dtrace.c#18 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/README#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/baddof.c#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/badioctl/badioctl.c#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/Makefile#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/Makefile.com#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/amd64/Makefile#2 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/chkargs.c#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/i386/Makefile#2 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/sparc/Makefile#2 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/sparcv9/Makefile#2 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/Getopt.java#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/JDTrace.java#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/Makefile#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/jdtrace.c#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/manifest/jdtrace.jar-manifest#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#11 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/Makefile.com#8 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/Makefile#10 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_FUNC.bad.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_MDIM.bad.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_NULL.bad.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_REDEF.redef.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.avgtoofew.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.maxnoarg.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.mintoofew.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.quantizetoofew.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.sumtoofew.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_AGGARG.bad.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_PROTO.bad.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_IDENT.bad.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_UNDEF.badaggfunc.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badexpr.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badkey3.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.noeffect.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey1.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey2.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey4.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqbad1.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqshort.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASEVAL.bad.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMTYPE.lqbad1.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMVAL.bad.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.order.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.order.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHSTEP.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MISMATCH.lqbadarg.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPLARGE.lqtoofew.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPSMALL.bad.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPTYPE.lqbadinc.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPVAL.bad.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_AGGARG.bad.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_PROTO.bad.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_SCALAR.bad.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_ARG.lquantizetoofew.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgnoarg.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgtoomany.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.counttoomany.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizenoarg.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizetoomany.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxnoarg.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxtoomany.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.minnoarg.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.mintoomany.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizenoarg.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizetoomany.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumnoarg.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumtoomany.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_AGGARG.bad.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badmany.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badnone.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_SCALAR.bad.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg_neg.d#2 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg_neg.d.out#2 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d.out#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count3.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.goodkey.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max_neg.d#2 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max_neg.d.out#2 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min_neg.d#2 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min_neg.d.out#2 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs1.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signature.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.d#2 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.d.out#2 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.subr.d#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_1.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_2.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.modby0.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.addmin.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.divmin.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muladd.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muldiv.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.basics.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.complex.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_ARR_BADREF.bad.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRBIG.toobig.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRNULL.bad.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRSUB.bad.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_PROTO_TYPE.badtuple.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_IDENT_UNDEF.badureg.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic1.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic2.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic3.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic4.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic5.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic6.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.uregsarray.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.this.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_ARG.badsig.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toofew.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toomany.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_SYNTAX.errassign.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.tupoflow.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.cpyarray.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.diffprofile.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.initialize.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.invalidref.d#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.misc.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.orthogonality.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.this.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.valassign.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.begin.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.tick.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_ADDROF_BITFIELD.BitfieldAddress.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.NegBitField.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.ZeroBitField.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.ExceedBaseType.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.GreaterThan64.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFTYPE.badtype.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_OFFSETOF_BITFIELD.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_SIZEOF_BITFIELD.SizeofBitfield.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.BitFieldPromotion.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.SizeofBitField.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.end.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize1.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize2.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize3.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.zerobuf.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.alignring.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.cputime.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.dynvarsize.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize1.d#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize2.d#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize3.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring1.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.smallring.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.cpuusage.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.nice.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.priority.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.prsize.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.rssize.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0clause.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8clause.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller1.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid1.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno1.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.execname.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.hpriority.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id1.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl1.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo1.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid1.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo.d#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo1.d#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid1.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.timestamp.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.vtimestamp.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggfun.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggtup.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.arrtup.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.body.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.both.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.pred.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.nopred.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.pred.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predfirst.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predlast.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LOCASSC.NonLocalAssoc.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LONGINT.LongStruct.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PARMCLASS.BadStorageClass.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_NAME.VoidName.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_TYPE.Dyn.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VARARGS.VarLenArgs.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VOID.NonSoleVoid.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_SIGNINT.UnsignedStruct.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_VOIDATTR.ShortVoidDecl.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.arrays.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.basics.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.funcs.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.pointers.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.varargsfuncs.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/badptr.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/countdown.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/counter.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/errorpath.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/hello.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/kstat.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/ksyms.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/renormalize.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rtime.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rw.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwinfo.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwtime.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/specopen.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/truss.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/trussrw.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/userfunc.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_AGGREGATION.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DBLERROR.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DYNAMIC.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.end.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPEC.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPECUNAVAIL.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_STKSTROVERFLOW.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/d.out#2 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/err.D_PDESC_ZERO.InvalidDescription1.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.APIVersion.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.AddSearchPath.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.CoalesceTrace.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ELFGeneration.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.IncludedFilePath.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithFunctions#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithIDs#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithModules#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithNames#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithProviders#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ShowCompilerCode.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceFunctions#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceIDs#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceModule#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceNames#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceProvider#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.VerboseStabilityReport.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/outputFile#2 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.AddSearchPath.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeGiga.d.ksh#7 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeKilo.d.ksh#7 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeMega.d.ksh#7 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeTera.d.ksh#7 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel32.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel64.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithoutW.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationOut.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationWithO.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus1.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus2.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExtraneousProbeIds.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName1.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName2.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId1.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId2.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId3.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule1.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule2.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule3.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule4.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProbeIdentifier.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider1.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider2.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider3.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider4.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc1.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc2.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc3.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc4.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc5.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc6.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc7.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc8.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc9.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID1.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID2.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID3.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID4.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID5.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID6.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID7.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule1.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule2.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule3.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule4.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule5.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule6.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule7.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule8.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName1.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName2.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName3.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName4.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName5.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName6.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName7.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName8.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName9.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider1.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider2.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider3.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider4.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider5.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.MultipleInvalidProbeId.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.PreprocessorStatement.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.UnDefineNameWithCPP.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh#7 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbeIdentfier.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbesWithoutZ.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/end/err.D_IDENT_UNDEF.timespent.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.end.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.endwithoutbegin.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multibeginend.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multiend.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_DECL_IDRED.EnumSameName.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_UNKNOWN.RepeatIdentifiers.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumEquality.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumSameValue.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumValAssign.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_BADADDR.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_DIVZERO.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_UNKNOWN.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.error.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.errorend.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.D_PROTO_LEN.noarg.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.exitarg1.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/tst.basic1.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/err.D_PDESC_ZERO.notreturn.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.basic.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionentry.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionreturnvalue.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.ioctlargs.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offset.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offsetzero.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return0.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.tailcall.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_FUNC_UNDEF.progenyofbad1.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_OP_VFPTR.badop.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.chillbadarg.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.copyoutbadarg.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.mobadarg.d#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.raisebadarg.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.allocanoarg.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.badbreakpoint.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoofew.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoomany.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrbadarg.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrtoofew.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoofew.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoomany.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoofew.d#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoomany.d#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtabadarg.d#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoofew.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoomany.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.panicbadarg.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.progenyofbad2.d#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.stopbadarg.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_STRINGOF_TYPE.badstringof.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_VAR_UNDEF.badvar.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca.d#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca2.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy.d#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy1.d#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy2.d#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy3.d#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy4.d#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy5.d#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy6.d#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badchill.d#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.chillbadarg.ksh#7 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyout.d#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutbadaddr.ksh#7 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutstrbadaddr.ksh#7 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntoa6badaddr.d#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntoabadaddr.d#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntopbadaddr.d#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntopbadarg.d#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.badfreopen.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.bcopy.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.chill.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.cleanpath.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.cleanpath.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.copyin.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.copyinto.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ddi_pathname.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.default.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.freopen.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ftruncate.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ftruncate.ksh.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.hton.d#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.index.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.index.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa6.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa6.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostr.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostr.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owned.d#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owner.d#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_type_adaptive.d#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.progenyof.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.rand.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strchr.d#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strchr.d.out#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strstr.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strstr.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok_null.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/err.D_ADDROF_LVAL.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/err.D_EMPTY.empty.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/tst.clauses.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/tst.stmts.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_DECL_IDRED.redef1.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_DECL_IDRED.redef2.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_IDENT_UNDEF.recur.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef1.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef2.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.badxlate.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineDataAssign.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineExpression.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineKinds.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineKinds.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineTypedef.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineWritableAssign.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/Makefile#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/manifest/test.jar-manifest#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestAbort.java#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestBean.java#7 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestClose.java#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestDrop.java#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestEnable.java#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestFunctionLookup.java#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestMaxConsumers.java#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestMultiAggPrinta.java#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestProbeData.java#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestProbeDescription.java#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestStateMachine.java#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestStopLock.java#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Abort.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Abort.ksh.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Bean.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Bean.ksh.out#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Close.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Close.ksh.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Drop.ksh#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Drop.ksh.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Enable.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Enable.ksh.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.c#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.ksh.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MaxConsumers.ksh#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MaxConsumers.ksh.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MultiAggPrinta.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MultiAggPrinta.ksh.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.c#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.ksh.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeDescription.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeDescription.ksh.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StateMachine.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StateMachine.ksh.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StopLock.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StopLock.ksh.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.printa.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.printa.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NL.char.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NULL.char.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_INT_DIGIT.InvalidDigit.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_INT_OFLOW.BigInt.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_STR_NL.string.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brace1.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brace2.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack1.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack2.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack3.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren1.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren2.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren3.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/tst.D_MACRO_OFLOW.ParIntOvflow.d.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/mdb/tst.dtracedcmd.ksh#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.icmp.ksh#7 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.tcp.ksh#7 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.udp.ksh#7 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/err.D_PRAGMA_OPTSET.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.badopt.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.boolopt.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.boolopt.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dynopt.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dynopt.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.enablerace.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.haslam.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.include.ksh#7 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.roch.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.schrock.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/err.D_PRINTA_AGGKEY.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/err.D_PRINTA_AGGPROTO.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.many.d#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.many.d.out#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.same.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.same.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sort.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sort.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sortpos.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sortpos.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.tuplecompat.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.tuplecompat.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero2.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero2.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero3.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero3.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call.c#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call.d#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call3.c#2 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call3.d#2 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_BITFIELD.bitfield.d#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_TYPE.badtype.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_TYPE.notsou.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.OffsetofNULL.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.badmemb.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofAlias.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofArith.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofUnion.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.struct.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.struct.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.union.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.union.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/operators/tst.ternary.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/operators/tst.ternary.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.exe#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badproc1.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_BADPID.badproc2.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_CREATEFAIL.many.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_CREATEFAIL.many.exe#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.exe#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.exe#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.exe#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.exe#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.exe#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.exe#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.addprobes.ksh#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.c#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.exe#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.exe#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.float.c#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.float.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.c#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.d#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.c#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.main.ksh#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.manypids.ksh#7 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.probemod.ksh#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex1.ksh#2 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex2.ksh#2 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex2.ksh.out#2 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex3.ksh#2 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex3.ksh.out#2 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex4.ksh#2 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex4.ksh.out#2 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.c#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.c#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.c#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.c#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.exe#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.exe#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.BadAlign.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.ArrayVar.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.DynamicVar.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.agg.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_DEREF_NONPTR.noptr.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_DEREF_VOID.VoidPointerDeref.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_ARRFUN.ArrayAssignment.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_INCOMPAT.VoidPointerArith.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_LVAL.AddressChange.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_PTR.NonPointerAccess.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_PTR.badpointer.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_SOU.BadPointerAccess.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_SOU.badpointer.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress1.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress2.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress3.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress4.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress5.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer1.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer2.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer3.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.GlobalVar.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.IntegerArithmetic1.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic1.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic2.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic3.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerAssignment.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ValidPointer1.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ValidPointer2.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.VoidCast.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.basic1.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.basic2.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGERR.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_INVAL.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_MALFORM.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_UNUSED.UnusedPragma.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.circlibdep.ksh#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.invalidlibdep.ksh#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libdep.ksh#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libdepfullyconnected.ksh#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_PRED_SCALAR.NonScalarPred.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_SYNTAX.invalid.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_SYNTAX.operr.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.argsnotcached.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.basics.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.basics.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.complex.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.complex.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.predcache.ksh#7 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_IDENT_UNDEF.afterprobe.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_PRAGCTL_INVAL.tabdefine.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_SYNTAX.withoutpound.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.defincomp.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefelsenotendif.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefincomp.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefnotendif.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.incompelse.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.mulelse.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifdef.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifdef.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifndef.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifndef.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifnotdef.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifnotdef.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicaland.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicaland.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalandor.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalandor.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalor.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalor.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.muland.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.muland.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.mulor.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.mulor.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.precondi.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.precondi.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.predicatedeclare.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexp.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexp.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpelse.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpelse.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpif.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpif.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpifelse.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpifelse.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.withinprobe.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badagg.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badfmt.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badval.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_PROTO.bad.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.jstack.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.stack.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.ustack.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.basics.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.basics.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.def.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.def.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.dynwidth.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.dynwidth.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.fmt.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.fmt.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.many.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.manyval.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.manyval.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.stack.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.tuple.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.tuple.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_AGG_CONV.aggfmt.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_EXTRA.toomany.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_EXTRA.widths.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_FMT.badfmt.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_PROTO.novalue.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_TYPE.aggarg.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_TYPE.recursive.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_PROTO.noprec.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_PROTO.nowidth.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_TYPE.badprec.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_TYPE.badwidth.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PROTO_LEN.toofew.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv1.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv2.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv3.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.flags.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.flags.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.hello.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.hello.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.ints.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.ints.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.precs.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.precs.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.print-f.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.print-f.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printT.ksh#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printT.ksh.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printY.ksh#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printY.ksh.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printcont.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printcont.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printeE.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printeE.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printgG.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printgG.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.rawfmt.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.rawfmt.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.uints.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.uints.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths1.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.wp.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.wp.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.func_access.ksh#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.op_access.ksh#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.unpriv_funcs.ksh#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.probeqtn.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.probestar.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.tickstar.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.assign.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.declare.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.declarein.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.lbraces.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.probespec.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.rbraces.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.recdec.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.basic1.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.check.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.declare.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.declareafter.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.emptyprobe.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragma.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmaaftertab.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmainside.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmaoutside.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.probestar.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/sleep.core#2 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.create.ksh#8 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.discard.ksh#7 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exec.ksh#8 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ENOENT.ksh#8 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ksh#8 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitcore.ksh#8 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitexit.ksh#8 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitkilled.ksh#7 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.signal.ksh#7 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.c#7 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.d#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.startexit.ksh#7 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZERO.profile.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROonens.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROonensec.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROoneus.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROoneusec.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.argtest.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.argtest.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.basic.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.basic.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.func.ksh#7 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.mod.ksh#7 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilehz.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilehz.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilems.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilems.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilemsec.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilemsec.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilenhz.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilenhz.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilens.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilens.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilensec.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilensec.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profiles.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profiles.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilesec.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilesec.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileus.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileus.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileusec.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileusec.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.sym.ksh#7 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh#7 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufuncsort.c#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufuncsort.ksh#6 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufuncsort.ksh.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh#7 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh#7 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_INVAL.wrongdec4.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.nonprofile.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.wrongdec1.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.wrongdec2.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.wrongdec3.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.basics.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.basics.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.beginexit.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.beginprof.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.beginprof.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probattrs.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probattrs.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probefunc.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probefunc.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probemod.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probemod.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probename.d#5 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probename.d.out#4 delete
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probprov.d#5 delete

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Sat Mar 29 00:34:59 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 972491065673; Sat, 29 Mar 2008 00:34: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 56F44106564A
	for ; Sat, 29 Mar 2008 00:34:59 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 2CEFA8FC1A
	for ; Sat, 29 Mar 2008 00:34:59 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2T0YxYi050185
	for ; Sat, 29 Mar 2008 00:34:59 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2T0Yx1E050183
	for perforce@freebsd.org; Sat, 29 Mar 2008 00:34:59 GMT
	(envelope-from jb@freebsd.org)
Date: Sat, 29 Mar 2008 00:34:59 GMT
Message-Id: <200803290034.m2T0Yx1E050183@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138871 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 29 Mar 2008 00:35:00 -0000

http://perforce.freebsd.org/chv.cgi?CH=138871

Change 138871 by jb@jb_freebsd1 on 2008/03/29 00:34:46

	This file interferes with the endian definions in FreeBSD's headers.

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/machine/endian.h#4 delete

Differences ...

From owner-p4-projects@FreeBSD.ORG  Sat Mar 29 03:04:48 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CDBCA1065672; Sat, 29 Mar 2008 03:04: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 8827B1065670
	for ; Sat, 29 Mar 2008 03:04:47 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 777708FC13
	for ; Sat, 29 Mar 2008 03:04:47 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2T34lMg071733
	for ; Sat, 29 Mar 2008 03:04:47 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2T34i5e071731
	for perforce@freebsd.org; Sat, 29 Mar 2008 03:04:44 GMT
	(envelope-from marcel@freebsd.org)
Date: Sat, 29 Mar 2008 03:04:44 GMT
Message-Id: <200803290304.m2T34i5e071731@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138877 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 29 Mar 2008 03:04:48 -0000

http://perforce.freebsd.org/chv.cgi?CH=138877

Change 138877 by marcel@marcel_xcllnt on 2008/03/29 03:03:55

	IFC @138873

Affected files ...

.. //depot/projects/powerpc/Makefile#7 integrate
.. //depot/projects/powerpc/ObsoleteFiles.inc#18 integrate
.. //depot/projects/powerpc/bin/sh/options.c#2 integrate
.. //depot/projects/powerpc/cddl/Makefile.inc#4 integrate
.. //depot/projects/powerpc/cddl/compat/opensolaris/include/alloca.h#1 branch
.. //depot/projects/powerpc/cddl/compat/opensolaris/include/devid.h#1 branch
.. //depot/projects/powerpc/cddl/compat/opensolaris/include/fcntl.h#1 branch
.. //depot/projects/powerpc/cddl/compat/opensolaris/include/fsshare.h#1 branch
.. //depot/projects/powerpc/cddl/compat/opensolaris/include/libintl.h#1 branch
.. //depot/projects/powerpc/cddl/compat/opensolaris/include/mnttab.h#1 branch
.. //depot/projects/powerpc/cddl/compat/opensolaris/include/priv.h#1 branch
.. //depot/projects/powerpc/cddl/compat/opensolaris/include/solaris.h#1 branch
.. //depot/projects/powerpc/cddl/compat/opensolaris/include/stdio.h#1 branch
.. //depot/projects/powerpc/cddl/compat/opensolaris/include/stdlib.h#1 branch
.. //depot/projects/powerpc/cddl/compat/opensolaris/include/strings.h#1 branch
.. //depot/projects/powerpc/cddl/compat/opensolaris/include/unistd.h#1 branch
.. //depot/projects/powerpc/cddl/compat/opensolaris/include/zone.h#1 branch
.. //depot/projects/powerpc/cddl/compat/opensolaris/lib/libumem/umem.c#1 branch
.. //depot/projects/powerpc/cddl/compat/opensolaris/lib/libumem/umem.h#1 branch
.. //depot/projects/powerpc/cddl/compat/opensolaris/misc/deviceid.c#1 branch
.. //depot/projects/powerpc/cddl/compat/opensolaris/misc/fsshare.c#1 branch
.. //depot/projects/powerpc/cddl/compat/opensolaris/misc/mkdirp.c#1 branch
.. //depot/projects/powerpc/cddl/compat/opensolaris/misc/mnttab.c#1 branch
.. //depot/projects/powerpc/cddl/compat/opensolaris/misc/zmount.c#1 branch
.. //depot/projects/powerpc/cddl/compat/opensolaris/misc/zone.c#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/cmd/zdb/zdb.8#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/cmd/zdb/zdb.c#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/cmd/zfs/zfs.8#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/cmd/zfs/zfs_util.h#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/cmd/zpool/zpool.8#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/cmd/zpool/zpool_iter.c#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/cmd/zpool/zpool_util.c#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/cmd/ztest/ztest.c#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/head/assert.h#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/head/atomic.h#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/head/libintl.h#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/head/stdio_ext.h#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/head/synch.h#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/head/thread.h#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.h#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/lib/libnvpair/nvpair_alloc_system.c#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/lib/libuutil/common/libuutil.h#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/lib/libuutil/common/libuutil_impl.h#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/lib/libuutil/common/uu_avl.c#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/lib/libuutil/common/uu_ident.c#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/lib/libuutil/common/uu_list.c#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/lib/libuutil/common/uu_misc.c#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/lib/libuutil/common/uu_open.c#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/lib/libuutil/common/uu_pname.c#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/lib/libuutil/common/uu_strtoint.c#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c#1 branch
.. //depot/projects/powerpc/cddl/contrib/opensolaris/lib/libzpool/common/util.c#1 branch
.. //depot/projects/powerpc/cddl/lib/libavl/Makefile#3 integrate
.. //depot/projects/powerpc/cddl/lib/libnvpair/Makefile#4 integrate
.. //depot/projects/powerpc/cddl/lib/libumem/Makefile#3 integrate
.. //depot/projects/powerpc/cddl/lib/libuutil/Makefile#3 integrate
.. //depot/projects/powerpc/cddl/lib/libzfs/Makefile#4 integrate
.. //depot/projects/powerpc/cddl/lib/libzpool/Makefile#4 integrate
.. //depot/projects/powerpc/cddl/sbin/zfs/Makefile#4 integrate
.. //depot/projects/powerpc/cddl/sbin/zpool/Makefile#4 integrate
.. //depot/projects/powerpc/cddl/usr.bin/ztest/Makefile#4 integrate
.. //depot/projects/powerpc/cddl/usr.sbin/zdb/Makefile#4 integrate
.. //depot/projects/powerpc/compat/opensolaris/include/alloca.h#2 delete
.. //depot/projects/powerpc/compat/opensolaris/include/devid.h#3 delete
.. //depot/projects/powerpc/compat/opensolaris/include/fcntl.h#2 delete
.. //depot/projects/powerpc/compat/opensolaris/include/fsshare.h#2 delete
.. //depot/projects/powerpc/compat/opensolaris/include/libintl.h#2 delete
.. //depot/projects/powerpc/compat/opensolaris/include/mnttab.h#2 delete
.. //depot/projects/powerpc/compat/opensolaris/include/priv.h#2 delete
.. //depot/projects/powerpc/compat/opensolaris/include/solaris.h#2 delete
.. //depot/projects/powerpc/compat/opensolaris/include/stdio.h#2 delete
.. //depot/projects/powerpc/compat/opensolaris/include/stdlib.h#2 delete
.. //depot/projects/powerpc/compat/opensolaris/include/strings.h#2 delete
.. //depot/projects/powerpc/compat/opensolaris/include/unistd.h#2 delete
.. //depot/projects/powerpc/compat/opensolaris/include/zone.h#2 delete
.. //depot/projects/powerpc/compat/opensolaris/lib/libumem/umem.c#2 delete
.. //depot/projects/powerpc/compat/opensolaris/lib/libumem/umem.h#2 delete
.. //depot/projects/powerpc/compat/opensolaris/misc/deviceid.c#2 delete
.. //depot/projects/powerpc/compat/opensolaris/misc/fsshare.c#3 delete
.. //depot/projects/powerpc/compat/opensolaris/misc/mkdirp.c#2 delete
.. //depot/projects/powerpc/compat/opensolaris/misc/mnttab.c#2 delete
.. //depot/projects/powerpc/compat/opensolaris/misc/zmount.c#2 delete
.. //depot/projects/powerpc/compat/opensolaris/misc/zone.c#2 delete
.. //depot/projects/powerpc/contrib/bzip2/CHANGES#3 integrate
.. //depot/projects/powerpc/contrib/bzip2/FREEBSD-upgrade#3 integrate
.. //depot/projects/powerpc/contrib/bzip2/FREEBSD-vendor#1 branch
.. //depot/projects/powerpc/contrib/bzip2/LICENSE#3 integrate
.. //depot/projects/powerpc/contrib/bzip2/Makefile#3 integrate
.. //depot/projects/powerpc/contrib/bzip2/Makefile-libbz2_so#3 integrate
.. //depot/projects/powerpc/contrib/bzip2/README#3 integrate
.. //depot/projects/powerpc/contrib/bzip2/README.COMPILATION.PROBLEMS#3 integrate
.. //depot/projects/powerpc/contrib/bzip2/blocksort.c#3 integrate
.. //depot/projects/powerpc/contrib/bzip2/bzip2.c#3 integrate
.. //depot/projects/powerpc/contrib/bzip2/bzip2recover.c#3 integrate
.. //depot/projects/powerpc/contrib/bzip2/bzlib.c#3 integrate
.. //depot/projects/powerpc/contrib/bzip2/bzlib.h#3 integrate
.. //depot/projects/powerpc/contrib/bzip2/bzlib_private.h#3 integrate
.. //depot/projects/powerpc/contrib/bzip2/compress.c#3 integrate
.. //depot/projects/powerpc/contrib/bzip2/crctable.c#3 integrate
.. //depot/projects/powerpc/contrib/bzip2/decompress.c#3 integrate
.. //depot/projects/powerpc/contrib/bzip2/huffman.c#3 integrate
.. //depot/projects/powerpc/contrib/bzip2/randtable.c#3 integrate
.. //depot/projects/powerpc/contrib/bzip2/spewG.c#3 integrate
.. //depot/projects/powerpc/contrib/bzip2/unzcrash.c#3 integrate
.. //depot/projects/powerpc/contrib/cvs/ChangeLog#3 integrate
.. //depot/projects/powerpc/contrib/cvs/FAQ#3 integrate
.. //depot/projects/powerpc/contrib/cvs/HACKING#3 integrate
.. //depot/projects/powerpc/contrib/cvs/INSTALL#3 integrate
.. //depot/projects/powerpc/contrib/cvs/Makefile.in#3 integrate
.. //depot/projects/powerpc/contrib/cvs/NEWS#3 integrate
.. //depot/projects/powerpc/contrib/cvs/README#3 integrate
.. //depot/projects/powerpc/contrib/cvs/TODO#3 integrate
.. //depot/projects/powerpc/contrib/cvs/aclocal.m4#3 integrate
.. //depot/projects/powerpc/contrib/cvs/compile#2 integrate
.. //depot/projects/powerpc/contrib/cvs/config.h.in#3 integrate
.. //depot/projects/powerpc/contrib/cvs/configure#3 integrate
.. //depot/projects/powerpc/contrib/cvs/configure.in#3 integrate
.. //depot/projects/powerpc/contrib/cvs/contrib/Makefile.in#3 integrate
.. //depot/projects/powerpc/contrib/cvs/depcomp#2 integrate
.. //depot/projects/powerpc/contrib/cvs/diff/Makefile.in#3 integrate
.. //depot/projects/powerpc/contrib/cvs/doc/ChangeLog#3 integrate
.. //depot/projects/powerpc/contrib/cvs/doc/HACKING.DOCS#1 branch
.. //depot/projects/powerpc/contrib/cvs/doc/Makefile.in#3 integrate
.. //depot/projects/powerpc/contrib/cvs/doc/cvs.1#3 integrate
.. //depot/projects/powerpc/contrib/cvs/doc/cvs.texinfo#3 integrate
.. //depot/projects/powerpc/contrib/cvs/doc/cvsclient.texi#3 integrate
.. //depot/projects/powerpc/contrib/cvs/doc/mdate-sh#2 integrate
.. //depot/projects/powerpc/contrib/cvs/doc/mkman.pl#2 integrate
.. //depot/projects/powerpc/contrib/cvs/doc/stamp-1#3 integrate
.. //depot/projects/powerpc/contrib/cvs/doc/stamp-vti#3 integrate
.. //depot/projects/powerpc/contrib/cvs/doc/version-client.texi#3 integrate
.. //depot/projects/powerpc/contrib/cvs/doc/version.texi#3 integrate
.. //depot/projects/powerpc/contrib/cvs/install-sh#2 integrate
.. //depot/projects/powerpc/contrib/cvs/lib/ChangeLog#3 integrate
.. //depot/projects/powerpc/contrib/cvs/lib/Makefile.in#3 integrate
.. //depot/projects/powerpc/contrib/cvs/lib/xsize.h#2 integrate
.. //depot/projects/powerpc/contrib/cvs/man/Makefile.in#3 integrate
.. //depot/projects/powerpc/contrib/cvs/missing#2 integrate
.. //depot/projects/powerpc/contrib/cvs/mkinstalldirs#2 integrate
.. //depot/projects/powerpc/contrib/cvs/src/ChangeLog#3 integrate
.. //depot/projects/powerpc/contrib/cvs/src/Makefile.in#3 integrate
.. //depot/projects/powerpc/contrib/cvs/src/add.c#3 integrate
.. //depot/projects/powerpc/contrib/cvs/src/classify.c#3 integrate
.. //depot/projects/powerpc/contrib/cvs/src/client.c#3 integrate
.. //depot/projects/powerpc/contrib/cvs/src/client.h#3 integrate
.. //depot/projects/powerpc/contrib/cvs/src/cvs.h#3 integrate
.. //depot/projects/powerpc/contrib/cvs/src/edit.c#3 integrate
.. //depot/projects/powerpc/contrib/cvs/src/edit.h#2 integrate
.. //depot/projects/powerpc/contrib/cvs/src/hash.h#3 integrate
.. //depot/projects/powerpc/contrib/cvs/src/import.c#3 integrate
.. //depot/projects/powerpc/contrib/cvs/src/lock.c#3 integrate
.. //depot/projects/powerpc/contrib/cvs/src/log.c#4 integrate
.. //depot/projects/powerpc/contrib/cvs/src/login.c#3 integrate
.. //depot/projects/powerpc/contrib/cvs/src/main.c#3 integrate
.. //depot/projects/powerpc/contrib/cvs/src/mkmodules.c#3 integrate
.. //depot/projects/powerpc/contrib/cvs/src/modules.c#3 integrate
.. //depot/projects/powerpc/contrib/cvs/src/parseinfo.c#3 integrate
.. //depot/projects/powerpc/contrib/cvs/src/rcs.c#3 integrate
.. //depot/projects/powerpc/contrib/cvs/src/recurse.c#3 integrate
.. //depot/projects/powerpc/contrib/cvs/src/root.c#3 integrate
.. //depot/projects/powerpc/contrib/cvs/src/root.h#3 integrate
.. //depot/projects/powerpc/contrib/cvs/src/sanity.sh#3 integrate
.. //depot/projects/powerpc/contrib/cvs/src/server.c#3 integrate
.. //depot/projects/powerpc/contrib/cvs/src/update.c#3 integrate
.. //depot/projects/powerpc/contrib/cvs/src/vers_ts.c#3 integrate
.. //depot/projects/powerpc/contrib/cvs/tools/Makefile.in#3 integrate
.. //depot/projects/powerpc/contrib/hostapd/ChangeLog#3 integrate
.. //depot/projects/powerpc/contrib/hostapd/Makefile#3 integrate
.. //depot/projects/powerpc/contrib/hostapd/README#3 integrate
.. //depot/projects/powerpc/contrib/hostapd/aes_wrap.c#3 integrate
.. //depot/projects/powerpc/contrib/hostapd/aes_wrap.h#3 integrate
.. //depot/projects/powerpc/contrib/hostapd/common.c#3 integrate
.. //depot/projects/powerpc/contrib/hostapd/common.h#3 integrate
.. //depot/projects/powerpc/contrib/hostapd/defconfig#3 integrate
.. //depot/projects/powerpc/contrib/hostapd/driver.h#3 integrate
.. //depot/projects/powerpc/contrib/hostapd/driver_test.c#3 integrate
.. //depot/projects/powerpc/contrib/hostapd/eap_aka.c#2 integrate
.. //depot/projects/powerpc/contrib/hostapd/eap_gpsk.c#2 integrate
.. //depot/projects/powerpc/contrib/hostapd/eap_gpsk_common.c#2 integrate
.. //depot/projects/powerpc/contrib/hostapd/eap_gpsk_common.h#2 integrate
.. //depot/projects/powerpc/contrib/hostapd/eap_sim.c#3 integrate
.. //depot/projects/powerpc/contrib/hostapd/eap_sim_common.c#3 integrate
.. //depot/projects/powerpc/contrib/hostapd/eap_sim_db.c#3 integrate
.. //depot/projects/powerpc/contrib/hostapd/eap_tls_common.c#3 integrate
.. //depot/projects/powerpc/contrib/hostapd/eapol_version.patch#2 delete
.. //depot/projects/powerpc/contrib/hostapd/hostapd.c#3 integrate
.. //depot/projects/powerpc/contrib/hostapd/hostapd.conf#3 integrate
.. //depot/projects/powerpc/contrib/hostapd/ieee802_11.c#3 integrate
.. //depot/projects/powerpc/contrib/hostapd/ieee802_11_auth.c#3 integrate
.. //depot/projects/powerpc/contrib/hostapd/ieee802_1x.c#3 integrate
.. //depot/projects/powerpc/contrib/hostapd/madwifi.conf#2 integrate
.. //depot/projects/powerpc/contrib/hostapd/os.h#2 integrate
.. //depot/projects/powerpc/contrib/hostapd/os_unix.c#2 integrate
.. //depot/projects/powerpc/contrib/hostapd/radius.c#3 integrate
.. //depot/projects/powerpc/contrib/hostapd/radius.h#3 integrate
.. //depot/projects/powerpc/contrib/hostapd/radius_client.c#3 integrate
.. //depot/projects/powerpc/contrib/hostapd/radius_server.c#3 integrate
.. //depot/projects/powerpc/contrib/hostapd/tls_openssl.c#3 integrate
.. //depot/projects/powerpc/contrib/hostapd/version.h#3 integrate
.. //depot/projects/powerpc/contrib/hostapd/wpa.c#3 integrate
.. //depot/projects/powerpc/contrib/opensolaris/OPENSOLARIS.LICENSE#2 delete
.. //depot/projects/powerpc/contrib/opensolaris/cmd/zdb/zdb.8#2 delete
.. //depot/projects/powerpc/contrib/opensolaris/cmd/zdb/zdb.c#4 delete
.. //depot/projects/powerpc/contrib/opensolaris/cmd/zdb/zdb_il.c#2 delete
.. //depot/projects/powerpc/contrib/opensolaris/cmd/zfs/zfs.8#2 delete
.. //depot/projects/powerpc/contrib/opensolaris/cmd/zfs/zfs_iter.c#2 delete
.. //depot/projects/powerpc/contrib/opensolaris/cmd/zfs/zfs_iter.h#2 delete
.. //depot/projects/powerpc/contrib/opensolaris/cmd/zfs/zfs_main.c#2 delete
.. //depot/projects/powerpc/contrib/opensolaris/cmd/zfs/zfs_util.h#2 delete
.. //depot/projects/powerpc/contrib/opensolaris/cmd/zpool/zpool.8#2 delete
.. //depot/projects/powerpc/contrib/opensolaris/cmd/zpool/zpool_iter.c#2 delete
.. //depot/projects/powerpc/contrib/opensolaris/cmd/zpool/zpool_main.c#2 delete
.. //depot/projects/powerpc/contrib/opensolaris/cmd/zpool/zpool_util.c#2 delete
.. //depot/projects/powerpc/contrib/opensolaris/cmd/zpool/zpool_util.h#2 delete
.. //depot/projects/powerpc/contrib/opensolaris/cmd/zpool/zpool_vdev.c#3 delete
.. //depot/projects/powerpc/contrib/opensolaris/cmd/ztest/ztest.c#2 delete
.. //depot/projects/powerpc/contrib/opensolaris/head/assert.h#2 delete
.. //depot/projects/powerpc/contrib/opensolaris/head/atomic.h#2 delete
.. //depot/projects/powerpc/contrib/opensolaris/head/libintl.h#2 delete
.. //depot/projects/powerpc/contrib/opensolaris/head/stdio_ext.h#2 delete
.. //depot/projects/powerpc/contrib/opensolaris/head/synch.h#2 delete
.. //depot/projects/powerpc/contrib/opensolaris/head/thread.h#2 delete
.. //depot/projects/powerpc/contrib/opensolaris/lib/libnvpair/libnvpair.c#2 delete
.. //depot/projects/powerpc/contrib/opensolaris/lib/libnvpair/libnvpair.h#2 delete
.. //depot/projects/powerpc/contrib/opensolaris/lib/libnvpair/nvpair_alloc_system.c#2 delete
.. //depot/projects/powerpc/contrib/opensolaris/lib/libuutil/common/libuutil.h#2 delete
.. //depot/projects/powerpc/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#2 delete
.. //depot/projects/powerpc/contrib/opensolaris/lib/libuutil/common/libuutil_impl.h#2 delete
.. //depot/projects/powerpc/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#2 delete
.. //depot/projects/powerpc/contrib/opensolaris/lib/libuutil/common/uu_avl.c#2 delete
.. //depot/projects/powerpc/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#2 delete
.. //depot/projects/powerpc/contrib/opensolaris/lib/libuutil/common/uu_ident.c#2 delete
.. //depot/projects/powerpc/contrib/opensolaris/lib/libuutil/common/uu_list.c#2 delete
.. //depot/projects/powerpc/contrib/opensolaris/lib/libuutil/common/uu_misc.c#2 delete
.. //depot/projects/powerpc/contrib/opensolaris/lib/libuutil/common/uu_open.c#2 delete
.. //depot/projects/powerpc/contrib/opensolaris/lib/libuutil/common/uu_pname.c#2 delete
.. //depot/projects/powerpc/contrib/opensolaris/lib/libuutil/common/uu_strtoint.c#2 delete
.. //depot/projects/powerpc/contrib/opensolaris/lib/libzfs/common/libzfs.h#2 delete
.. //depot/projects/powerpc/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#3 delete
.. //depot/projects/powerpc/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#3 delete
.. //depot/projects/powerpc/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#2 delete
.. //depot/projects/powerpc/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#2 delete
.. //depot/projects/powerpc/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#2 delete
.. //depot/projects/powerpc/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#3 delete
.. //depot/projects/powerpc/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#2 delete
.. //depot/projects/powerpc/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#2 delete
.. //depot/projects/powerpc/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#2 delete
.. //depot/projects/powerpc/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#2 delete
.. //depot/projects/powerpc/contrib/opensolaris/lib/libzpool/common/kernel.c#3 delete
.. //depot/projects/powerpc/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#5 delete
.. //depot/projects/powerpc/contrib/opensolaris/lib/libzpool/common/taskq.c#2 delete
.. //depot/projects/powerpc/contrib/opensolaris/lib/libzpool/common/util.c#2 delete
.. //depot/projects/powerpc/contrib/pf/pfctl/pfctl_altq.c#3 integrate
.. //depot/projects/powerpc/contrib/pf/pfctl/pfctl_qstats.c#2 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/ChangeLog#3 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/FREEBSD-Xlist#3 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/FREEBSD-upgrade#3 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/Makefile#3 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/README#3 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/aes_wrap.c#3 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/aes_wrap.h#3 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/asn1.c#2 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/common.c#3 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/common.h#3 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/config.c#3 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/config_ssid.h#3 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/config_winreg.c#2 delete
.. //depot/projects/powerpc/contrib/wpa_supplicant/ctrl_iface.c#3 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/ctrl_iface_dbus.c#2 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.c#2 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.h#2 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/ctrl_iface_named_pipe.c#2 delete
.. //depot/projects/powerpc/contrib/wpa_supplicant/ctrl_iface_unix.c#2 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/dbus-wpa_supplicant.conf#2 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/dbus-wpa_supplicant.service#1 branch
.. //depot/projects/powerpc/contrib/wpa_supplicant/defconfig#3 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/doc/ctrl_iface.doxygen#3 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/doc/docbook/wpa_background.8#3 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/doc/docbook/wpa_cli.8#3 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/doc/docbook/wpa_cli.sgml#3 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.8#3 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.8#3 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5#3 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.sgml#3 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/driver_hostap.h#3 delete
.. //depot/projects/powerpc/contrib/wpa_supplicant/driver_ndis.c#3 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/eap_gpsk.c#2 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/eap_gpsk_common.c#2 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/eap_gpsk_common.h#2 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/eap_peap.c#3 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/eap_sim.c#3 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/eap_sim_common.c#3 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/eap_tlv.c#3 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/eap_tlv.h#3 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/eapol_sm.c#3 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/eapol_test.c#3 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/eloop_win.c#2 delete
.. //depot/projects/powerpc/contrib/wpa_supplicant/events.c#3 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/main.c#4 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/os.h#2 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/os_unix.c#2 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/pcsc_funcs.c#3 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/radius.c#3 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/radius.h#3 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/radius_client.c#3 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/tests/test_aes.c#1 branch
.. //depot/projects/powerpc/contrib/wpa_supplicant/tests/test_eap_sim_common.c#1 branch
.. //depot/projects/powerpc/contrib/wpa_supplicant/tests/test_md4.c#1 branch
.. //depot/projects/powerpc/contrib/wpa_supplicant/tests/test_md5.c#1 branch
.. //depot/projects/powerpc/contrib/wpa_supplicant/tests/test_ms_funcs.c#1 branch
.. //depot/projects/powerpc/contrib/wpa_supplicant/tests/test_sha1.c#1 branch
.. //depot/projects/powerpc/contrib/wpa_supplicant/tests/test_sha256.c#1 branch
.. //depot/projects/powerpc/contrib/wpa_supplicant/tests/test_x509v3.c#1 branch
.. //depot/projects/powerpc/contrib/wpa_supplicant/tls_openssl.c#3 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/version.h#3 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/wpa.c#3 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/wpa_cli.c#3 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp#2 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.cpp#2 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h#3 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/wpa_gui/setup-mingw-cross-compiling#2 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h#3 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/wpa_supplicant.c#3 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/wpa_supplicant.conf#3 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/wpa_supplicant_i.h#3 integrate
.. //depot/projects/powerpc/contrib/wpa_supplicant/x509v3.c#2 integrate
.. //depot/projects/powerpc/etc/freebsd-update.conf#4 integrate
.. //depot/projects/powerpc/etc/network.subr#6 integrate
.. //depot/projects/powerpc/etc/newsyslog.conf#2 integrate
.. //depot/projects/powerpc/etc/periodic/security/410.logincheck#2 integrate
.. //depot/projects/powerpc/etc/rc.d/ppp#5 integrate
.. //depot/projects/powerpc/etc/rc.d/zfs#4 integrate
.. //depot/projects/powerpc/gnu/usr.bin/Makefile#4 integrate
.. //depot/projects/powerpc/gnu/usr.bin/cvs/lib/Makefile#2 integrate
.. //depot/projects/powerpc/gnu/usr.bin/cvs/lib/config.h.proto#2 integrate
.. //depot/projects/powerpc/include/pthread.h#3 integrate
.. //depot/projects/powerpc/include/stdio.h#3 integrate
.. //depot/projects/powerpc/include/time.h#2 integrate
.. //depot/projects/powerpc/lib/libarchive/Makefile#13 integrate
.. //depot/projects/powerpc/lib/libc/gen/lockf.c#2 integrate
.. //depot/projects/powerpc/lib/libc/gen/sysctl.3#5 integrate
.. //depot/projects/powerpc/lib/libc/include/namespace.h#3 integrate
.. //depot/projects/powerpc/lib/libc/include/un-namespace.h#3 integrate
.. //depot/projects/powerpc/lib/libc/sys/Symbol.map#8 integrate
.. //depot/projects/powerpc/lib/libc/sys/fcntl.2#4 integrate
.. //depot/projects/powerpc/lib/libc/sys/mincore.2#3 integrate
.. //depot/projects/powerpc/lib/libc/yp/xdryp.c#2 integrate
.. //depot/projects/powerpc/lib/libc_r/uthread/uthread_sig.c#3 integrate
.. //depot/projects/powerpc/lib/libelf/elf_update.3#4 integrate
.. //depot/projects/powerpc/lib/libelf/elf_update.c#5 integrate
.. //depot/projects/powerpc/lib/libelf/libelf_convert.m4#4 integrate
.. //depot/projects/powerpc/lib/libfetch/common.c#5 integrate
.. //depot/projects/powerpc/lib/libkse/thread/thr_sig.c#3 integrate
.. //depot/projects/powerpc/lib/libsdp/sdp.h#4 integrate
.. //depot/projects/powerpc/lib/libthr/Makefile#9 integrate
.. //depot/projects/powerpc/lib/libthr/pthread.map#8 integrate
.. //depot/projects/powerpc/lib/libthr/thread/Makefile.inc#3 integrate
.. //depot/projects/powerpc/lib/libthr/thread/thr_affinity.c#2 integrate
.. //depot/projects/powerpc/lib/libthr/thread/thr_attr.c#4 integrate
.. //depot/projects/powerpc/lib/libthr/thread/thr_create.c#6 integrate
.. //depot/projects/powerpc/lib/libthr/thread/thr_exit.c#6 integrate
.. //depot/projects/powerpc/lib/libthr/thread/thr_getcpuclockid.c#1 branch
.. //depot/projects/powerpc/lib/libthr/thread/thr_mutex.c#11 integrate
.. //depot/projects/powerpc/lib/libthr/thread/thr_mutexattr.c#3 integrate
.. //depot/projects/powerpc/lib/libthr/thread/thr_rtld.c#3 integrate
.. //depot/projects/powerpc/lib/libthread_db/Makefile#5 integrate
.. //depot/projects/powerpc/lib/libthread_db/kse.h#1 branch
.. //depot/projects/powerpc/lib/libthread_db/libc_r_db.c#2 integrate
.. //depot/projects/powerpc/lib/libthread_db/libpthread_db.c#2 integrate
.. //depot/projects/powerpc/lib/libthread_db/libthr_db.c#2 integrate
.. //depot/projects/powerpc/lib/libthread_db/thread_db.c#2 integrate
.. //depot/projects/powerpc/libexec/talkd/announce.c#2 integrate
.. //depot/projects/powerpc/release/doc/en_US.ISO8859-1/relnotes/article.sgml#17 integrate
.. //depot/projects/powerpc/sbin/bsdlabel/bsdlabel.c#3 integrate
.. //depot/projects/powerpc/sbin/devd/token.l#2 integrate
.. //depot/projects/powerpc/sbin/dhclient/dhclient.c#3 integrate
.. //depot/projects/powerpc/sbin/newfs/newfs.8#4 integrate
.. //depot/projects/powerpc/sbin/route/route.c#3 integrate
.. //depot/projects/powerpc/share/man/man4/arcmsr.4#3 integrate
.. //depot/projects/powerpc/share/man/man4/bpf.4#3 integrate
.. //depot/projects/powerpc/share/man/man4/malo.4#1 branch
.. //depot/projects/powerpc/share/man/man4/man4.i386/streams.4#3 integrate
.. //depot/projects/powerpc/share/man/man4/ubsa.4#4 integrate
.. //depot/projects/powerpc/share/man/man5/rc.conf.5#12 integrate
.. //depot/projects/powerpc/share/man/man7/security.7#2 integrate
.. //depot/projects/powerpc/share/man/man9/Makefile#14 integrate
.. //depot/projects/powerpc/share/man/man9/lock.9#9 integrate
.. //depot/projects/powerpc/share/man/man9/malloc.9#2 integrate
.. //depot/projects/powerpc/share/man/man9/mbchain.9#2 integrate
.. //depot/projects/powerpc/share/man/man9/mbuf.9#5 integrate
.. //depot/projects/powerpc/share/mk/bsd.cpu.mk#7 integrate
.. //depot/projects/powerpc/share/zoneinfo/asia#5 integrate
.. //depot/projects/powerpc/share/zoneinfo/backward#4 integrate
.. //depot/projects/powerpc/share/zoneinfo/northamerica#6 integrate
.. //depot/projects/powerpc/share/zoneinfo/southamerica#7 integrate
.. //depot/projects/powerpc/share/zoneinfo/zone.tab#6 integrate
.. //depot/projects/powerpc/sys/amd64/amd64/cpu_switch.S#6 integrate
.. //depot/projects/powerpc/sys/amd64/amd64/genassym.c#7 integrate
.. //depot/projects/powerpc/sys/amd64/amd64/nexus.c#8 integrate
.. //depot/projects/powerpc/sys/amd64/amd64/pmap.c#13 integrate
.. //depot/projects/powerpc/sys/amd64/amd64/prof_machdep.c#4 integrate
.. //depot/projects/powerpc/sys/amd64/conf/GENERIC#15 integrate
.. //depot/projects/powerpc/sys/amd64/conf/NOTES#11 integrate
.. //depot/projects/powerpc/sys/amd64/ia32/ia32_signal.c#3 integrate
.. //depot/projects/powerpc/sys/amd64/include/clock.h#4 integrate
.. //depot/projects/powerpc/sys/amd64/include/param.h#2 integrate
.. //depot/projects/powerpc/sys/amd64/include/pcb.h#3 integrate
.. //depot/projects/powerpc/sys/amd64/include/timerreg.h#2 integrate
.. //depot/projects/powerpc/sys/amd64/isa/atpic.c#5 integrate
.. //depot/projects/powerpc/sys/amd64/isa/clock.c#8 integrate
.. //depot/projects/powerpc/sys/arm/arm/elf_trampoline.c#4 integrate
.. //depot/projects/powerpc/sys/arm/conf/AVILA#8 integrate
.. //depot/projects/powerpc/sys/arm/conf/AVILA.hints#2 integrate
.. //depot/projects/powerpc/sys/arm/conf/BWCT#3 integrate
.. //depot/projects/powerpc/sys/arm/conf/CRB#4 integrate
.. //depot/projects/powerpc/sys/arm/conf/EP80219#4 integrate
.. //depot/projects/powerpc/sys/arm/conf/HL200#2 integrate
.. //depot/projects/powerpc/sys/arm/conf/IQ31244#4 integrate
.. //depot/projects/powerpc/sys/arm/conf/KB920X#5 integrate
.. //depot/projects/powerpc/sys/arm/conf/SIMICS#4 integrate
.. //depot/projects/powerpc/sys/arm/conf/SKYEYE#3 integrate
.. //depot/projects/powerpc/sys/arm/include/param.h#4 integrate
.. //depot/projects/powerpc/sys/arm/xscale/ixp425/if_npe.c#7 integrate
.. //depot/projects/powerpc/sys/arm/xscale/ixp425/ixdp425_pci.c#2 integrate
.. //depot/projects/powerpc/sys/boot/forth/loader.conf#10 integrate
.. //depot/projects/powerpc/sys/boot/i386/cdboot/cdboot.s#5 integrate
.. //depot/projects/powerpc/sys/boot/pc98/cdboot/cdboot.s#4 integrate
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/kern/opensolaris_kstat.c#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/kern/opensolaris_string.c#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/machine/endian.h#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/rpc/xdr.h#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/sys/acl.h#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/sys/atomic.h#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/sys/bitmap.h#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/sys/byteorder.h#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/sys/callb.h#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/sys/cmn_err.h#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/sys/cpupart.h#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/sys/cpuvar.h#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/sys/cred.h#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/sys/cyclic.h#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/sys/debug.h#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/sys/dirent.h#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/sys/dkio.h#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/sys/dnlc.h#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/sys/elf.h#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/sys/kcondvar.h#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/sys/kmem.h#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/sys/kobj.h#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/sys/kstat.h#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/sys/lock.h#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/sys/misc.h#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/sys/mman.h#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/sys/mntent.h#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/sys/mnttab.h#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/sys/modctl.h#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/sys/mount.h#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/sys/mutex.h#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/sys/objfs.h#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/sys/param.h#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/sys/pcpu.h#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/sys/policy.h#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/sys/proc.h#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/sys/random.h#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/sys/rwlock.h#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/sys/sdt.h#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/sys/stat.h#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/sys/string.h#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/sys/sunddi.h#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/sys/sysmacros.h#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/sys/systm.h#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/sys/taskq.h#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/sys/taskq_impl.h#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/sys/time.h#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/sys/types.h#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/sys/uio.h#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/sys/varargs.h#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/sys/vfs.h#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/sys/vnode.h#1 branch
.. //depot/projects/powerpc/sys/cddl/compat/opensolaris/sys/zone.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/common/atomic/ia64/atomic.S#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/common/avl/avl.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/Makefile.files#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/gzip.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/unique.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/os/callb.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/os/list.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/os/taskq.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_mem.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/sys/asm_linkage.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/sys/avl_impl.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/sys/bitmap.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/sys/byteorder.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/sys/callb.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/sys/ccompile.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/sys/compress.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/sys/cred.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/sys/dkio.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/sys/dklabel.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/sys/errorq.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/sys/feature_tests.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/sys/fm/protocol.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/sys/fm/util.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/sys/gfs.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/sys/list.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/sys/list_impl.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/sys/note.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair_impl.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/sys/processor.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/sys/procset.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/sys/sdt.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/sys/synch.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/sys/vmem.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/sys/zmod.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/zmod/adler32.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/zmod/deflate.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/zmod/deflate.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/zmod/inffast.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/zmod/inffast.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/zmod/inffixed.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/zmod/inflate.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/zmod/inflate.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/zmod/inftrees.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/zmod/inftrees.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/zmod/trees.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/zmod/zconf.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/zmod/zlib.h#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod_subr.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/zmod/zutil.c#1 branch
.. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/zmod/zutil.h#1 branch
.. //depot/projects/powerpc/sys/compat/freebsd32/freebsd32_proto.h#10 integrate
.. //depot/projects/powerpc/sys/compat/freebsd32/freebsd32_syscall.h#10 integrate
.. //depot/projects/powerpc/sys/compat/freebsd32/freebsd32_syscalls.c#10 integrate
.. //depot/projects/powerpc/sys/compat/freebsd32/freebsd32_sysent.c#10 integrate
.. //depot/projects/powerpc/sys/compat/freebsd32/syscalls.master#10 integrate
.. //depot/projects/powerpc/sys/compat/linux/linux_file.c#11 integrate
.. //depot/projects/powerpc/sys/compat/linux/linux_futex.c#5 integrate
.. //depot/projects/powerpc/sys/compat/linux/linux_futex.h#3 integrate
.. //depot/projects/powerpc/sys/compat/linux/linux_misc.c#15 integrate
.. //depot/projects/powerpc/sys/compat/opensolaris/kern/opensolaris_atomic.c#2 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/kern/opensolaris_kmem.c#3 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/kern/opensolaris_kobj.c#5 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/kern/opensolaris_kstat.c#3 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/kern/opensolaris_misc.c#3 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/kern/opensolaris_policy.c#3 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/kern/opensolaris_string.c#2 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/kern/opensolaris_vfs.c#7 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/kern/opensolaris_zone.c#2 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/machine/endian.h#2 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/rpc/xdr.h#3 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/sys/acl.h#2 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/sys/atomic.h#3 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/sys/bitmap.h#2 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/sys/byteorder.h#2 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/sys/callb.h#2 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/sys/cmn_err.h#2 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/sys/cpupart.h#2 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/sys/cpuvar.h#2 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/sys/cred.h#2 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/sys/cyclic.h#2 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/sys/debug.h#2 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/sys/dirent.h#2 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/sys/dkio.h#2 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/sys/dnlc.h#2 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/sys/elf.h#2 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/sys/kcondvar.h#3 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/sys/kmem.h#4 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/sys/kobj.h#2 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/sys/kstat.h#2 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/sys/lock.h#2 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/sys/misc.h#3 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/sys/mman.h#2 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/sys/mntent.h#2 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/sys/mnttab.h#2 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/sys/modctl.h#2 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/sys/mount.h#2 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/sys/mutex.h#4 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/sys/objfs.h#2 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/sys/param.h#2 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/sys/pcpu.h#2 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/sys/policy.h#2 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/sys/proc.h#5 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/sys/random.h#2 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/sys/rwlock.h#4 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/sys/sdt.h#2 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/sys/stat.h#2 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/sys/string.h#2 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/sys/sunddi.h#2 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/sys/sysmacros.h#2 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/sys/systm.h#2 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/sys/taskq.h#2 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/sys/taskq_impl.h#2 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/sys/time.h#3 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/sys/types.h#4 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/sys/uio.h#2 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/sys/varargs.h#2 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/sys/vfs.h#3 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/sys/vnode.h#5 delete
.. //depot/projects/powerpc/sys/compat/opensolaris/sys/zone.h#2 delete
.. //depot/projects/powerpc/sys/compat/svr4/svr4_fcntl.c#9 integrate
.. //depot/projects/powerpc/sys/conf/NOTES#23 integrate
.. //depot/projects/powerpc/sys/conf/files#27 integrate
.. //depot/projects/powerpc/sys/conf/options#25 integrate
.. //depot/projects/powerpc/sys/conf/options.amd64#4 integrate
.. //depot/projects/powerpc/sys/conf/options.i386#7 integrate
.. //depot/projects/powerpc/sys/conf/options.pc98#6 integrate
.. //depot/projects/powerpc/sys/contrib/opensolaris/OPENSOLARIS.LICENSE#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/common/acl/acl_common.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/common/acl/acl_common.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#3 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/common/atomic/i386/atomic.S#3 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/common/atomic/ia64/atomic.S#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/common/avl/avl.c#3 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/common/nvpair/nvpair.c#3 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/common/zfs/zfs_namecheck.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/common/zfs/zfs_namecheck.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/common/zfs/zfs_prop.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/common/zfs/zfs_prop.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/Makefile.files#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/gfs.c#5 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#6 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/bplist.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#3 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/dmu.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#3 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/dnode.c#3 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#3 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#3 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/gzip.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/refcount.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sha256.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#4 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#4 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/space_map.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#3 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/txg.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/unique.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#4 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#3 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#4 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#3 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#3 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#3 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#3 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#3 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#5 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#3 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#3 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#5 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#3 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#4 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#7 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#8 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#7 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#4 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#4 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#4 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/os/callb.c#3 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/os/list.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/os/taskq.c#3 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/rpc/xdr.c#3 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/rpc/xdr.h#3 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/rpc/xdr_array.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/rpc/xdr_mem.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/asm_linkage.h#3 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/avl.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/avl_impl.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/bitmap.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/byteorder.h#3 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/callb.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/ccompile.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/compress.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/cred.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/debug.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/dkio.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/dklabel.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/errorq.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/feature_tests.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/fm/protocol.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/fm/util.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/gfs.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#3 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/list.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/list_impl.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/note.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/nvpair.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/nvpair_impl.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/processor.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/procset.h#3 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/sdt.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/synch.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/sysevent.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#3 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/vmem.h#3 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/zmod.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/zmod/adler32.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/zmod/crc32.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/zmod/crc32.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/zmod/deflate.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/zmod/deflate.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/zmod/inffast.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/zmod/inffast.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/zmod/inffixed.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/zmod/inflate.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/zmod/inflate.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/zmod/inftrees.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/zmod/inftrees.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/zmod/trees.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/zmod/zconf.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/zmod/zlib.h#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/zmod/zmod.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/zmod/zmod_subr.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/zmod/zutil.c#2 delete
.. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/zmod/zutil.h#2 delete
.. //depot/projects/powerpc/sys/contrib/pf/net/pf_if.c#5 integrate
.. //depot/projects/powerpc/sys/contrib/pf/net/pf_ioctl.c#6 integrate
.. //depot/projects/powerpc/sys/contrib/pf/net/pfvar.h#3 integrate
.. //depot/projects/powerpc/sys/ddb/db_command.c#7 integrate
.. //depot/projects/powerpc/sys/ddb/db_ps.c#6 integrate
.. //depot/projects/powerpc/sys/ddb/ddb.h#5 integrate
.. //depot/projects/powerpc/sys/dev/aac/aac.c#12 integrate
.. //depot/projects/powerpc/sys/dev/aac/aac_cam.c#8 integrate
.. //depot/projects/powerpc/sys/dev/aac/aac_debug.c#6 integrate
.. //depot/projects/powerpc/sys/dev/aac/aac_disk.c#5 integrate
.. //depot/projects/powerpc/sys/dev/aac/aac_pci.c#9 integrate
.. //depot/projects/powerpc/sys/dev/aac/aacreg.h#6 integrate
.. //depot/projects/powerpc/sys/dev/aac/aacvar.h#7 integrate
.. //depot/projects/powerpc/sys/dev/ata/ata-raid.c#7 integrate
.. //depot/projects/powerpc/sys/dev/ath/if_ath.c#13 integrate
.. //depot/projects/powerpc/sys/dev/cxgb/cxgb_main.c#15 integrate
.. //depot/projects/powerpc/sys/dev/cxgb/cxgb_offload.h#6 integrate
.. //depot/projects/powerpc/sys/dev/cxgb/cxgb_sge.c#14 integrate
.. //depot/projects/powerpc/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#4 integrate
.. //depot/projects/powerpc/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#6 integrate
.. //depot/projects/powerpc/sys/dev/dc/if_dc.c#6 integrate
.. //depot/projects/powerpc/sys/dev/dc/if_dcreg.h#3 integrate
.. //depot/projects/powerpc/sys/dev/drm/drm_pciids.h#3 integrate
.. //depot/projects/powerpc/sys/dev/drm/i915_dma.c#3 integrate
.. //depot/projects/powerpc/sys/dev/en/midway.c#6 integrate
.. //depot/projects/powerpc/sys/dev/fatm/if_fatm.c#3 integrate
.. //depot/projects/powerpc/sys/dev/firewire/if_fwe.c#4 integrate
.. //depot/projects/powerpc/sys/dev/firewire/if_fwip.c#6 integrate

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Sat Mar 29 03:12:56 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7FD291065675; Sat, 29 Mar 2008 03:12:56 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3F0FF1065673
	for ; Sat, 29 Mar 2008 03:12:56 +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 310488FC1B
	for ; Sat, 29 Mar 2008 03:12:56 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2T3CtoJ072009
	for ; Sat, 29 Mar 2008 03:12:55 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2T3CtZt072007
	for perforce@freebsd.org; Sat, 29 Mar 2008 03:12:55 GMT
	(envelope-from sam@freebsd.org)
Date: Sat, 29 Mar 2008 03:12:55 GMT
Message-Id: <200803290312.m2T3CtZt072007@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 138878 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 29 Mar 2008 03:12:56 -0000

http://perforce.freebsd.org/chv.cgi?CH=138878

Change 138878 by sam@sam_ebb on 2008/03/29 03:12:30

	add TMPDIR to control where we create files

Affected files ...

.. //depot/projects/vap/tools/tools/net80211/scripts/config#2 edit
.. //depot/projects/vap/tools/tools/net80211/scripts/setup.tsn#2 edit
.. //depot/projects/vap/tools/tools/net80211/scripts/setup.updown.wpa#2 edit
.. //depot/projects/vap/tools/tools/net80211/scripts/setup.wdsmain#2 edit
.. //depot/projects/vap/tools/tools/net80211/scripts/setup.wpa#2 edit
.. //depot/projects/vap/tools/tools/net80211/scripts/setup.wpa1.aes#2 edit
.. //depot/projects/vap/tools/tools/net80211/scripts/setup.wpa1.tkip#2 edit
.. //depot/projects/vap/tools/tools/net80211/scripts/setup.wpa2#2 edit
.. //depot/projects/vap/tools/tools/net80211/scripts/setup.wpa2.tkip#2 edit

Differences ...

==== //depot/projects/vap/tools/tools/net80211/scripts/config#2 (text+ko) ====

@@ -39,3 +39,6 @@
 HOSTAPD=/usr/sbin/hostapd
 WLANWATCH=/usr/local/bin/wlanwatch
 WLANWDS=/usr/local/bin/wlanwds
+
+# directory to create files like hostapd.conf
+TMPDIR=.

==== //depot/projects/vap/tools/tools/net80211/scripts/setup.tsn#2 (text+ko) ====

@@ -10,7 +10,7 @@
 BRIDGE=bridge0
 SSID=$SSID-tsn
 WLAN=wlan0
-CONF=tsn-$WLAN.conf
+CONF=$TMPDIR/tsn-$WLAN.conf
 
 makeconf()
 {

==== //depot/projects/vap/tools/tools/net80211/scripts/setup.updown.wpa#2 (text+ko) ====

@@ -12,7 +12,7 @@
 BRIDGE=bridge0
 SSID=$SSID-wpa
 WLAN=wlan0
-CONF=bsd-$WLAN.conf
+CONF=$TMPDIR/bsd-$WLAN.conf
 
 makeconf()
 {

==== //depot/projects/vap/tools/tools/net80211/scripts/setup.wdsmain#2 (text+ko) ====

@@ -14,7 +14,7 @@
 . config
 
 SSID='freebsd+wdsmain'
-WDSUP=/tmp/wdsup$$
+WDSUP=$TMPDIR/wdsup$$
 
 #mwldebug state+node+reset+xmit+recv+beacon+hal+hal2
 WLAN_AP=`ifconfig wlan create wlanmode hostap wlandev $WIRELESS`

==== //depot/projects/vap/tools/tools/net80211/scripts/setup.wpa#2 (text+ko) ====

@@ -9,7 +9,7 @@
 
 BRIDGE=bridge0
 WLAN=wlan0
-CONF=bsd-$WLAN.conf
+CONF=$TMPDIR/bsd-$WLAN.conf
 SSID=$SSID-wpa
 
 makeconf()

==== //depot/projects/vap/tools/tools/net80211/scripts/setup.wpa1.aes#2 (text+ko) ====

@@ -10,7 +10,7 @@
 BRIDGE=bridge0
 WLAN=wlan0
 SSID=$SSID-wpa
-CONF=bsd-$WLAN.conf
+CONF=$TMPDIR/bsd-$WLAN.conf
 
 makeconf()
 {

==== //depot/projects/vap/tools/tools/net80211/scripts/setup.wpa1.tkip#2 (text+ko) ====

@@ -10,7 +10,7 @@
 BRIDGE=bridge0
 WLAN=wlan0
 SSID=$SSID-wpa
-CONF=bsd-$WLAN.conf
+CONF=$TMPDIR/bsd-$WLAN.conf
 
 makeconf()
 {

==== //depot/projects/vap/tools/tools/net80211/scripts/setup.wpa2#2 (text+ko) ====

@@ -10,7 +10,7 @@
 BRIDGE=bridge0
 WLAN=wlan0
 SSID=$SSID-wpa
-CONF=bsd-$WLAN.conf
+CONF=$TMPDIR/bsd-$WLAN.conf
 
 makeconf()
 {

==== //depot/projects/vap/tools/tools/net80211/scripts/setup.wpa2.tkip#2 (text+ko) ====

@@ -10,7 +10,7 @@
 BRIDGE=bridge0
 WLAN=wlan0
 SSID=$SSID-wpa
-CONF=bsd-$WLAN.conf
+CONF=$TMPDIR/bsd-$WLAN.conf
 
 makeconf()
 {

From owner-p4-projects@FreeBSD.ORG  Sat Mar 29 03:53:38 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 711E51065673; Sat, 29 Mar 2008 03:53: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 30097106566B
	for ; Sat, 29 Mar 2008 03:53:38 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 083368FC1D
	for ; Sat, 29 Mar 2008 03:53:38 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2T3rcLS073318
	for ; Sat, 29 Mar 2008 03:53:38 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2T3rbAF073316
	for perforce@freebsd.org; Sat, 29 Mar 2008 03:53:37 GMT
	(envelope-from jb@freebsd.org)
Date: Sat, 29 Mar 2008 03:53:37 GMT
Message-Id: <200803290353.m2T3rbAF073316@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138879 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 29 Mar 2008 03:53:38 -0000

http://perforce.freebsd.org/chv.cgi?CH=138879

Change 138879 by jb@jb_freebsd1 on 2008/03/29 03:53:34

	Make this script executable again.

Affected files ...

.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#3 edit

Differences ...

==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#3 (xtext/text+ko) ====


From owner-p4-projects@FreeBSD.ORG  Sat Mar 29 14:58:14 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 44BB01065670; Sat, 29 Mar 2008 14:58: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 04407106566B
	for ; Sat, 29 Mar 2008 14:58:13 +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 74D9D8FC17
	for ; Sat, 29 Mar 2008 14:58:13 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2TEwDBg044987
	for ; Sat, 29 Mar 2008 14:58:13 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2TEwDce044985
	for perforce@freebsd.org; Sat, 29 Mar 2008 14:58:13 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Sat, 29 Mar 2008 14:58:13 GMT
Message-Id: <200803291458.m2TEwDce044985@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 138897 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 29 Mar 2008 14:58:14 -0000

http://perforce.freebsd.org/chv.cgi?CH=138897

Change 138897 by pgj@disznohal on 2008/03/29 14:58:07

	Shorten a sentence.
	
	Submitted by:	gabor (mentor)

Affected files ...

.. //depot/projects/docproj_hu/books/handbook/bibliography/chapter.sgml#4 edit

Differences ...

==== //depot/projects/docproj_hu/books/handbook/bibliography/chapter.sgml#4 (text+ko) ====

@@ -4,22 +4,22 @@
 -->
 
 
+     Translated by: PALI, Gabor 
+     Original Revision: 1.85                      -->
 
 
   Irodalomjegyzék
-  
-  Míg a man oldalak a &os; operációs rendszer egyes
-    önálló részeihez adnak odaillõ
-    hivatkozásokat, ismert a tény, hogy arról
-    egyáltalán nem szólnak, miképpen illeszkednek
-    egymáshoz ezek az alkotóelemek, és ezáltal
-    hogyan mûködik maga az operációs rendszer.  Erre a
-    célra egyedül csak egy jó &unix;-os
-    rendszeradminisztrációs szakkönyv és egy
-    jó felhasználói kézikönyv
-    alkalmas.
+
+  Míg a man oldalak a &os; operációs rendszer
+    egyes önálló részeit
+    tárgyalják, ismert a tény, hogy arról
+    egyáltalán nem szólnak, miképpen
+    illeszkednek egymáshoz ezek az alkotóelemek, és
+    ezáltal hogyan mûködik maga az
+    operációs rendszer.  Erre a célra egyedül
+    csak egy jó &unix;-os rendszeradminisztrációs
+    szakkönyv és egy jó felhasználói
+    kézikönyv alkalmas.
 
   
     A &os;-rõl szóló könyvek és

From owner-p4-projects@FreeBSD.ORG  Sat Mar 29 15:07:28 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B96171065673; Sat, 29 Mar 2008 15:07: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 79373106566C
	for <perforce@FreeBSD.org>; Sat, 29 Mar 2008 15:07:28 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 49A348FC19
	for <perforce@FreeBSD.org>; Sat, 29 Mar 2008 15:07:28 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2TF7RAZ046847
	for <perforce@FreeBSD.org>; Sat, 29 Mar 2008 15:07:27 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2TF7RTX046845
	for perforce@freebsd.org; Sat, 29 Mar 2008 15:07:27 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Sat, 29 Mar 2008 15:07:27 GMT
Message-Id: <200803291507.m2TF7RTX046845@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	pgj@FreeBSD.org using -f
From: Gabor Pali <pgj@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 138898 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 29 Mar 2008 15:07:29 -0000

http://perforce.freebsd.org/chv.cgi?CH=138898

Change 138898 by pgj@disznohal on 2008/03/29 15:07:05

	Fix spelling and translation.
	
	Suggested by:	gabor (mentor)

Affected files ...

.. //depot/projects/docproj_hu/books/handbook/pgpkeys/chapter.sgml#3 edit

Differences ...

==== //depot/projects/docproj_hu/books/handbook/pgpkeys/chapter.sgml#3 (text+ko) ====

@@ -3,25 +3,28 @@
      $FreeBSD: doc/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml,v 1.286 2006/01/07 23:43:35 remko Exp $
 -->
 <!-- The FreeBSD Hungarian Documentation Project
-	 Translated by: PALI, Gabor <pgj@FreeBSD.org>
-	 Original Revision: v1.286					  -->
+     Translated by: PALI, Gabor <pgj@FreeBSD.org>
+     Original Revision: v1.286                    -->
 
 <appendix id="pgpkeys" lang="hu">
-  <title>PGP kulcsok
+  PGP-kulcsok
+
+  pgp-kulcsok
 
-  pgp keys
-  
-  Arra az esetre, ha ellenõriznünk kellene a tisztek
-  	vagy fejlesztõk aláírását, esetleg titkosított e-mailt
-	szeretnénk küldeni nekik, ebben a fejezetben mellékeljük
-	az ehhez szükséges kulcsokat.  A 
-	FreeBSD.org összes
-	felhasználójának kulcsa letölthetõ a
-	http://www.FreeBSD.org/doc/pgpkeyring.txt
+  Arra az esetre, ha ellenõriznünk kellene a
+	tisztségviselõk vagy fejlesztõk
+	aláírását, esetleg
+	titkosított e-mailt szeretnénk küldeni nekik,
+	ebben a fejezetben mellékeljük az ehhez
+	szükséges kulcsokat.  A FreeBSD.org összes
+	felhasználójának kulcsa
+	letölthetõ a http://www.FreeBSD.org/doc/pgpkeyring.txt
 	címrõl.
 
   
-    Tisztek
+    Tisztségviselõk
 
     §ion.pgpkeys-officers;
   

From owner-p4-projects@FreeBSD.ORG  Sat Mar 29 15:25:47 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2E9F91065673; Sat, 29 Mar 2008 15:25: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 E23BC1065670
	for ; Sat, 29 Mar 2008 15:25:46 +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 CD0EF8FC23
	for ; Sat, 29 Mar 2008 15:25:46 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2TFPkms047424
	for ; Sat, 29 Mar 2008 15:25:46 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2TFPkJL047422
	for perforce@freebsd.org; Sat, 29 Mar 2008 15:25:46 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Sat, 29 Mar 2008 15:25:46 GMT
Message-Id: <200803291525.m2TFPkJL047422@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 138899 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 29 Mar 2008 15:25:47 -0000

http://perforce.freebsd.org/chv.cgi?CH=138899

Change 138899 by pgj@disznohal on 2008/03/29 15:24:57

	Fix typos, reword some sentences.
	
	Submitted by:	gabor (mentor)

Affected files ...

.. //depot/projects/docproj_hu/books/handbook/geom/chapter.sgml#6 edit

Differences ...

==== //depot/projects/docproj_hu/books/handbook/geom/chapter.sgml#6 (text+ko) ====

@@ -43,9 +43,8 @@
       az alapjául szolgáló alrendszer vagy hogy
       néz ki annak forráskódja.  Az ilyen
       jellegû információk a &man.geom.4; man oldalon,
-      valamint az ott felsorolt hivatkozott helyeken
-      találhatóak meg.  Továbbá, ez a
-      fejezet magukról a
+      valamint az ott felsorolt helyeken találhatóak meg.
+      Továbbá, ez a fejezet magukról a
       RAID-konfigurációkról sem
       ad pontos tájékoztatást.
       Kizárólag csak a GEOM által is
@@ -65,8 +64,8 @@
 
       
 	hogyan kell használni a rendszer által
-	  nyújtott alapvetõ segédeszközöket a
-	  különféle RAID -szintek
+	  nyújtott alapvetõ segédeszközöket
+	  a különféle RAID-szintek
 	  konfigurálásához,
 	  karbantartásához és
 	  kezeléséhez.
@@ -262,7 +261,7 @@
 
     &prompt.root; mount /dev/stripe/st0a /mnt
 
-    A csíkozott állományrendszer a
+    A csíkozott állományrendszert a
       rendszerindítás folyamán automatikusan
       becsatlakoztathatjuk, ha elhelyezzük az alábbi
       kötetinformációkat az
@@ -334,9 +333,9 @@
 
     Indítsuk újra a
       számítógépet és várjuk
-      meg, amíg a rendszer teljesen fel nem áll.  Amint ez a
-      folyamat véget ért, jelentkezzük be a
-      root felhasználóval.
+      meg, amíg a rendszer teljesen készen nem áll.
+      Amint ez a folyamat véget ért, jelentkezzük be
+      a root felhasználóval.
 
     Hozzuk létre a /dev/mirror/gm
       eszközt és kössük hozzá a
@@ -425,7 +424,7 @@
       és távolítsuk el vagy csak kommentezzük
       ki belõle a lapozóállományt
       
-	Megjegyezzük, hogy ez az fstab
+	Megjegyezzük, hogy az fstab
 	  állományból kiszedett bejegyzés
 	  miatt valószínûleg más módon
 	  kell majd engedélyeznünk a
@@ -510,7 +509,7 @@
 	  rendszerindító menüben válasszuk a
 	  hatodik opciót (6).  Ennek
 	  eredményeképpen megkapjuk a &man.loader.8;
-	  parancssorát.  Töltsük be a kernelmodult
+	  parancssorát.  Töltsük be a modult
 	  manuálisan:
 
 	OK? load geom_mirror
@@ -542,16 +541,15 @@
       szolgáló segédprogramjaival, hasonlóan
       az NFS-hez.
 
-    Kezdésként létre kell hozni az
+    Kezdésként létre kell hozni a
       megosztást elõsegítõ
       állományt.  Ez az állomány
       határozza meg, ki és milyen szinten jogosult
-      használni az megosztott erõforrásokat.
-      Mondjuk, ha megosztjuk az elsõ
+      használni a megosztott erõforrásokat.
+      Például ha megosztjuk az elsõ
       SCSI-lemezen a negyedik slice-ot, az
       alábbi /etc/gg.exports
-      állomány több, mint
-      tökéletes:
+      állomány tökéletesen megfelel:
 
     192.168.1.0/24 RW /dev/da0s4d
 
@@ -583,7 +581,7 @@
 
     
       Fontos kiemelnünk, hogy ez a mûvelet
-	eredménytelen akkor, ha az adott eszközt vagy maga a
+	eredménytelen, ha az adott eszközt vagy maga a
 	szerver, vagy pedig valamelyik másik kliens már
 	korábban csatolta.
     
@@ -607,11 +605,11 @@
     
 
     A rendszer indítása közben a &os;
-      rendszermagja a talált eszközöknek megfelelõen
-      létrehoz mindegyikõjüknek egy-egy
-      eszközleírót.  Ez a
-      próbálgatásos módszer magával
-      hoz néhány gondot, például mi
+      rendszermagja a talált eszközöknek
+      megfelelõen mindegyiknek létrehoz egy-egy
+      eszközleírót.  Ezzel a
+      próbálgatásos módszerrel együtt
+      jár néhány gond, például mi
       történik akkor, ha az új lemezes eszközt
       USB-n keresztül adjuk a rendszerhez?
       Nagyon valószínû, hogy ez az eszköz
@@ -682,15 +680,16 @@
 	példák
 
       A címkéknek két típusa
-	létezik, az általános címke és
-	az állományrendszer-címke.  A kettõ
-	közötti eltérés az állandó
-	címkékkel kapcsolatos automatikus
-	detektálás, illetve a tény, hogy ez a
-	típus címke az újraindítás
-	után is megmarad.  Ezeknek a címkéknek van
-	egy külön, az állományrendszerük
-	szerint elnevezett könyvtára a /dev könyvtáron
 	belül.  Mondjuk az UFS2
 	állományrendszer-címkék a 
 
       Egy általános címke a
-	következõ induláskor elveszik.  Ezeket a
+	következõ induláskor elveszik.  Ezek a
 	címkék a /dev/label könyvtárban
 	keletkeznek, és ideálisak a
@@ -744,12 +743,11 @@
       &prompt.root; mount /home
 
       Ettõl a ponttól kezdve, amíg a
-	geom_label.ko kernelmodul
-	betöltõdik a rendszerindítás
-	során a /boot/loader.conf
-	állományon keresztül, vagy a
-	GEOM_LABEL opció
-	megtalálható a rendszermag
+	geom_label.ko modul betöltõdik a
+	rendszerindítás során a
+	/boot/loader.conf állományon
+	keresztül, vagy a GEOM_LABEL
+	opció megtalálható a rendszermag
 	konfigurációs állományában,
 	az eszközleíró a rendszerre nézve
 	minden komolyabb következmény nélkül
@@ -790,10 +788,11 @@
       könnyedén beállítható.
 
     Mit is jelent a naplózás?  A
-      naplózás támogatásával a rendszer
-      egy napló vezet az állományrendszert
-      érintõ tranzakciókról — pl.  az
-      olyan változtatásokról, amelyek egy komplett
+      naplózás támogatásával a
+      rendszer egy naplót vezet az
+      állományrendszert érintõ
+      tranzakciókról — pl.  az olyan
+      változtatásokról, amelyek egy komplett
       írási mûveletet eredményeznek —
       mielõtt még a metaadatok és
       lemezírási mûveletek szabályosan

From owner-p4-projects@FreeBSD.ORG  Sat Mar 29 16:05:31 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B26941065675; Sat, 29 Mar 2008 16:05: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 71E91106564A
	for ; Sat, 29 Mar 2008 16:05:31 +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 5D9948FC27
	for ; Sat, 29 Mar 2008 16:05:31 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2TG5Vrv050125
	for ; Sat, 29 Mar 2008 16:05:31 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2TG5VcZ050123
	for perforce@freebsd.org; Sat, 29 Mar 2008 16:05:31 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Sat, 29 Mar 2008 16:05:31 GMT
Message-Id: <200803291605.m2TG5VcZ050123@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 138901 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 29 Mar 2008 16:05:32 -0000

http://perforce.freebsd.org/chv.cgi?CH=138901

Change 138901 by pgj@disznohal on 2008/03/29 16:05:17

	Fix typos, composition, style, spelling.
	
	Submitted by:	gabor (mentor)
	             	Miklos QUARTUS 
	
	
	Synch chapter titles.

Affected files ...

.. //depot/projects/docproj_hu/books/handbook/preface/preface.sgml#4 edit

Differences ...

==== //depot/projects/docproj_hu/books/handbook/preface/preface.sgml#4 (text+ko) ====

@@ -14,16 +14,17 @@
   A &os;-t még nem ismerõk felfedezhetik, hogy a
     könyv elsõ része a &os;
     telepítésének folyamatán vezeti
-    keresztül a felhasználót, valamint finoman
-    bemutatja az ezt alátámasztó &unix;-os
-    alapfogalmakat és szabályokat.  Ennek a résznek
-    az végigjárása nem kíván
+    keresztül a felhasználót, valamint
+    érintõlegesen bemutatja az ezt
+    alátámasztó &unix;-os alapfogalmakat és
+    szabályokat.  Ennek a résznek a
+    végigjárása nem kíván
     többet, csupán egy kis felfedezõ kedvet, illetve a
     menetközben bemutatott új fogalmak
     befogadását.
 
   Ha túljutottunk rajta, a kézikönyv
-    második, jóval vaskosabb, része a &os;-t
+    második, jóval terjedelmesebb része a &os;-t
     használó rendszergazdák számára
     nyújt mindenféle témában minden
     részletre kiterjedõ referenciát.  Ezek
@@ -72,7 +73,7 @@
       , az elrendelõ
 	hozzáférésvezérlésrõl
 	(MAC-rõl) szóló fejezet teljesen új
-	ebben a kiadásban.  Bemutatja, mi is a MAC és
+	ebben a kiadásban.  Bemutatja, mi is az a MAC és
 	hogyan hasznosítható egy &os;-s rendszer
 	biztonságossá tételében.
     
@@ -92,7 +93,7 @@
 
     
       , a Vinum egy új fejezet
-	ebben a kiadásban.  Bemutatja a Vinum, a logikai
+	ebben a kiadásban.  Bemutatja a Vinum logikai
 	kötet-kezelõ használatát, aminek
 	segítségével eszköztõl
 	független módon hozhatunk létre logikai
@@ -174,11 +175,11 @@
   
     
       Bekerült egy teljes tárgy- és
-      névmutató.
+	névmutató.
     
     
       Mindegyik ASCII-ábrát grafikusak
-      váltották fel.
+	váltották fel.
     
     
       Mindegyik fejezet elejére odakerült egy
@@ -190,7 +191,7 @@
     
     
       A tartalmat felosztottuk logikailag három
-      részre:
+	részre:
 	Bevezetés,
 	Rendszeradminisztráció és
 	Függelék.
@@ -204,9 +205,9 @@
 	érdekében.
     
     
-      A  (&unix; alapok)
-	rész kiegészült a folyamatokról,
-	daemonokról és szignálokról
+      A  (A &unix; alapjai)
+	rész kiegészült a futó programokról,
+	démonokról és jelzésekrõl
 	szóló további hasznos
 	információkkal.
     
@@ -229,7 +230,7 @@
     
     
       A  (A &os;
-	rendszerindítása folyamata)
+	rendszerindítási folyamata)
 	kibõvült.
     
     
@@ -247,19 +248,21 @@
 	belekerült.
     
     
-      A  (Soros
+      A  (Soros vonali
 	kommunikáció) teljes
 	átszervezésre került, valamint a &os; 4.X/5.X
 	verziókhoz igazítottuk.
     
     
-      A  (PPP és
-	SLIP) lényegesen fejlõdött.
+      A  (A PPP és a
+	SLIP) lényegesen sokat
+	fejlõdött.
     
     
       Számos új rész került a be (Haladó
-	hálózati ismeretek).
+	linkend="advanced-networking">be (Egyéb
+	haladó hálózati
+	témák).
     
     
       A  (Elektronikus
@@ -270,7 +273,7 @@
 	információkkal.
     
     
-      A  (&linux;
+      A  (Bináris Linux
 	kompatibilitás) kiegészült az
 	&oracle; és a
 	&sap.r3;
@@ -332,7 +335,7 @@
 
     
       ,
-      Bemutatás
+	Bemutatkozás
       
 	A &os; bemutatkozik az új
 	  felhasználóknak.  Szó esik a &os; Projekt
@@ -343,7 +346,7 @@
     
     
       ,
-      Telepítés
+	A &os; telepítése
       
 	Végigvezetjük a felhasználót a
 	  telepítési folyamat egészén.
@@ -354,10 +357,10 @@
       
     
     
-      , Alapvetõ &unix;-os
-      ismeretek
+      , A &unix;
+	alapjai
       
-	Sorravesszük a &os; operációs rendszer
+	Sorra vesszük a &os; operációs rendszer
 	  alapvetõ parancsait és lehetõségeit.
 	  Amennyiben már jártasak vagyunk valamilyen
 	  szinten a &linux; vagy más &unix;-típusú
@@ -367,19 +370,20 @@
     
     
       , Alkalmazások
-      telepítése
+	telepítése: csomagok és
+	portok
       
 	Megismerhetjük, miként tudunk külsõ
 	  cégek által fejlesztett alkalmazásokat
-	  telepíteni a &os;
-	  Portgyûjteménye vagy a megszokott
-	  bináris csomagok használatán
-	  keresztül.
+	  telepíteni a &os; portjainak
+	  gyûjteményén (&os; Ports
+	  Collection) vagy a megszokott bináris csomagok
+	  használatán keresztül.
       
     
     
-      , The X Window
-      System
+      , Az X Window
+	System
       
 	Általános bemutatásra kerül az X
 	  Window System, valamint az X11 használata a &os;-n.
@@ -394,7 +398,7 @@
 
     
       , Asztali
-      alkalmazások
+	alkalmazások
       
 	Felsoroljuk az ismertebb asztali alkalmazásokat:
 	  webböngészõket és alkalmazói
@@ -404,7 +408,7 @@
     
     
       ,
-      Multimédia
+	Multimédia
       
 	Megtudhatjuk, hogyan állítsuk be a zene-
 	  és videólejátszást
@@ -415,14 +419,13 @@
       
     
     
-      , A &os; rendszer
-	konfigurálása
+      , A &os; rendszermag
+	testreszabása
       
 	Kifejtjük, miért lehet
 	  szükségünk egy új rendszermag
 	  konfigurálására, és
-	  részletesen végigjárjuk egy
-	  felparaméterezett rendszermag
+	  részletesen végigjárjuk egy rendszermag
 	  konfigurációjának,
 	  fordításának és
 	  telepítésének
@@ -431,7 +434,7 @@
     
     
       ,
-      Nyomtatás
+	Nyomtatás
       
 	Ismertetjük, hogyan lehet nyomtatókat
 	  használni &os; alatt, beleértve a munkalapok, a
@@ -442,7 +445,7 @@
     
     
       , Bináris
-      kompatibilitás a &linux;-szal
+	Linux kompatibilitás
       
 	Megismerhetjük a &os; bináris
 	  &linux;-kompabilitásához kapcsolódó
@@ -461,8 +464,8 @@
 
     
       ,
-      Konfigurálás és
-      tuningolás
+	Beállítás és
+	finomhangolás
       
 	Megismerhetjük a &os; azon paramétereit,
 	  amelyek a rendszergazdák által bevethetõek az
@@ -474,20 +477,19 @@
       
     
     
-      , A
-      rendszerindítás folyamata
+      , A &os;
+	rendszerindítási folyamata
       
 	Tartalmazza a &os; rendszerindítási
 	  folyamatának leírását, és
 	  elmagyarázza, miként lehet ezt vezérelni
 	  a konfigurációs beállítások
-	  mentén.
+	  segítségével.
       
     
     
-      , A
-	felhasználók és a
-	hozzáférések alapvetõ
+      , Felhasználók
+	és hozzáférések alapvetõ
 	kezelése
       
 	Bemutatja a felhasználói fiókok
@@ -501,10 +503,10 @@
     
     
       ,
-      Biztonság
+	Biztonság
       
 	Bemutatásra kerül a &os; rendszerünk
-	  biztonságossá tételére alkalmas,
+	  biztonságossá tételére alkalmas
 	  számos különféle eszköz,
 	  többek közt a Kerberos, IPsec és az
 	  OpenSSH.
@@ -512,18 +514,18 @@
     
     
       ,
-      Elzárás
+	A jail alrendszer
       
-	Megtudhatjuk, hogyan mûködik az
-	  elzárásért felelõs alrendszer,
-	  valamint miben emelkedik ki a &os;-ben is
-	  megtalálható hagyományos
-	  megoldással szemben.
+	Megtudhatjuk, hogyan mûködik az az
+	  alkalmazások elzárásért
+	  felelõs jail alrendszer, valamint miben emelkedik ki a
+	  &os;-ben is megtalálható hagyományos
+	  chroot megoldással szemben.
       
     
     
       , Kötelezõ
-      hozzáférésvezérlés
+	hozzáférésvezérlés
       
 	Megismerhetjük a kötelezõ
 	  hozzáférésvezérlést (MAC-et),
@@ -532,8 +534,8 @@
       
     
     
-      , Események
-      biztonsági vizsgálata
+      , Biztonsági
+	események vizsgálata
       
 	Kiderül, mit jelent a &os;-ben az események
 	  vizsgálata, illetve mindez hogyan
@@ -545,7 +547,7 @@
 
     
       ,
-      Háttértárak
+	Háttértárak
       
 	Bemutatásra kerül, miként
 	  kezelhetjük a háttértárolókat
@@ -558,7 +560,8 @@
       
     
     
-      , GEOM
+      , GEOM: A moduláris
+	lemezszervezõ rendszer
       
 	Megismerhetjük a &os;-ben jelenlevõ GEOM
 	  alrendszert és az általa támogatott
@@ -567,8 +570,8 @@
       
     
     
-      ,
-      Vinum
+      , A Vinum
+	kötetkezelõ
       
 	Megtudhatjuk, hogyan használjuk a Vinumot, a
 	  logikai kötet-kezelõt, amely eszközfüggetlen
@@ -578,7 +581,7 @@
     
     
       ,
-      Virtualizáció
+	Virtualizáció
       
 	Tartalmazza a virtualizációs rendszerek
 	  által felkínált lehetõségek
@@ -587,8 +590,9 @@
       
     
     
-      ,
-      Honosítás
+      , Honosítás: Az
+	I18N/L10N használata és
+	beállítása
       
 	Bemutatja, hogyan használjuk a &os;-t
 	  angoltól eltérõ nyelveken, a rendszer
@@ -597,7 +601,7 @@
     
     
       , Az
-      élvonal
+	élvonal
       
 	Elmagyarázza, mik az alapvetõ
 	  különbségek a &os;-STABLE, &os;-CURRENT
@@ -614,7 +618,7 @@
 
     
       , Soros
-      kommunikáció
+	vonali kommunikáció
       
 	Kifejti, hogyan csatlakoztassunk terminált vagy
 	  modemet a &os; rendszerünkhöz, ha behívó
@@ -623,17 +627,17 @@
       
     
     
-      , PPP és a
-      SLIP
+      , A PPP és a
+	SLIP
       
 	Bemutatja, miként tudjuk PPP-n, SLIP-en és
-	  PPP-vel Etherneten keresztül (PPPoE) összekapcsolni a
-	  &os;-t távoli rendszerekkel.
+	  Etherneten keresztüli PPP-vel (PPPoE) összekapcsolni
+	  a &os;-t távoli rendszerekkel.
       
     
     
       , Elektronikus
-      levelezés
+	levelezés
       
 	Megismerhetjük egy elektronikus levelezõszerver
 	  különféle komponenseit, és
@@ -646,23 +650,22 @@
     
     
       ,
-      Hálózati kiszolgálók
+	Hálózati szerverek
       
-	Részletekbe és példa
-	konfigurációs állományokba
-	  menõen bemutatja, miként tudunk
-	  hálózati állományrendszer
-	  kiszolgálónak, névszervernek,
-	  hálózati információs rendszer
-	  kiszolgálónak vagy
-	  idõszinkronizációs szervernek
+	Részletekbe menõen és
+	  konfigurációs példákkal mutatja be,
+	  miként tudunk hálózati
+	  állományrendszer kiszolgálónak,
+	  névszervernek, hálózati
+	  információs rendszer kiszolgálónak
+	  vagy idõszinkronizációs szervernek
 	  beállítani egy &os;-s
 	  számítógépet.
       
     
     
       ,
-      Tûzfalak
+	Tûzfalak
       
 	Kifejti a szoftveres tûzfalak mögött
 	  álló filozófiát, valamint
@@ -672,12 +675,12 @@
       
     
     
-      ,
-      Haladó hálózati
-      témák
+      , Egyéb
+	haladó hálózati
+	témák
       
 	Feldolgoz számos hálózati
-	  témát, beleértve az Internet-kapcsolat
+	  témát, beleértve az internet kapcsolat
 	  helyi hálózaton (LAN-on) keresztül
 	  történõ megosztását több
 	  számítógép között,
@@ -694,17 +697,17 @@
 
     
       , A &os;
-      beszerzése
+	beszerzése
       
-	Felsorolja azokat a forrásokat, ahonnan a &os;
-	  CDROM-on vagy DVD-n beszerezhetõ, valamint azokat a
-	  honlapokat, ahonnan letölthetõ vagy
-	  telepíthetõ a &os;.
+	Felsorolja azokat a forrásokat, ahonnan a &os; CD-n
+	  vagy DVD-n beszerezhetõ, valamint azokat a honlapokat,
+	  ahonnan letölthetõ vagy telepíthetõ a
+	  &os;.
       
     
     
       ,
-      Irodalomjegyzék
+	Irodalomjegyzék
       
 	A könyv sok tekintetben olyan témákat
 	  is érint, amelyek felkelthetik az olvasó
@@ -716,8 +719,8 @@
       
     
     
-      , Lelõhelyek az
-      Interneten
+      ,
+	Erõforrások az interneten
       
 	Tartalmazza a &os; felhasználók
 	  számára elérhetõ azon
@@ -728,9 +731,9 @@
     
     
       ,
-      PGP-kulcsok
+	PGP-kulcsok
       
-	Az egyes &os; fejlesztõk PGP-ujjlenyomatait sorolja
+	Az egyes &os; fejlesztõk PGP-kulcsait sorolja
 	  fel.
       
     
@@ -788,7 +791,7 @@
 
   A billentyûket
     félkövérrel írjuk, hogy
-    elüssenek a szöveg többi részétõl.
+    kiemelkedjenek a szöveg többi részébõl.
     Az egyszerre megnyomni kívánt billentyûk
     kombinációját a `+'
     jelöléssel adjuk meg, mint például:
@@ -833,19 +836,19 @@
 
   A E:\> kijelzéssel
     kezdõdõ példák egy &ms-dos; parancsot
-    jelölnek.  Hacsak másképpen nem
-    említjük, ezeket a parancsokat a modern
-    µsoft.windows;-okban található
-    Parancssorból kell kiadni.
+    jelölnek.  Ha másképpen nem említjük,
+    ezeket a parancsokat a modern µsoft.windows;-okban
+    található Parancssorból kell
+    kiadni.
 
   E:\> tools\fdimage floppies\kern.flp A:
 
   A &prompt.root; kijelzéssel kezdõdõ
-    példák a &os;-ben rendszeradminisztrátori jogokat
-    igénylõ parancsok kiadását jelentik.
-    Ehhez bejelentkezhetünk a root
+    példák a &os;-ben rendszeradminisztrátori
+    jogokat igénylõ parancsok kiadását
+    jelentik.  Ehhez bejelentkezhetünk a root
     felhasználóval, vagy felvethetjük a
-    rendszeradminisztrátori jogokat a a saját
+    rendszeradminisztrátori jogokat a saját
     felhasználói fiókunkból a &man.su.1;
     használatával is.
 
@@ -856,8 +859,8 @@
     normál felhasználói fiókból
     érdemes kiadni.  Hacsak másképpen nem
     jelezzük, a C-shell szintaxisát használjuk a
-    környezeti változók és egyéb
-    shellbeli parancsok megadásakor.
+    környezeti változók és egyéb shell
+    parancsok megadásakor.
 
   &prompt.user; top
 
@@ -892,9 +895,9 @@
     novemberében jelent meg (ISBN 1-57176-303-1).  2003-2004
     folyamán a FreeBSD
     Mall, Inc. támogatott anyagilag számos
-    hozzájárulót a kézikönyv
-    körüli bábáskodásban, a harmadik
-    nyomtatott kiadásra történõ
+    hozzájárulót a kézikönyvet
+    illetõ munkájáért, a harmadik nyomtatott
+    kiadásra történõ
     elõkészítésben.
 
 

From owner-p4-projects@FreeBSD.ORG  Sat Mar 29 16:28:56 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0BBE01065688; Sat, 29 Mar 2008 16:28:56 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9EF6F1065671
	for ; Sat, 29 Mar 2008 16:28:55 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 8B7EF8FC18
	for ; Sat, 29 Mar 2008 16:28:55 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2TGStGF053215
	for ; Sat, 29 Mar 2008 16:28:55 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2TGStGM053213
	for perforce@freebsd.org; Sat, 29 Mar 2008 16:28:55 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Sat, 29 Mar 2008 16:28:55 GMT
Message-Id: <200803291628.m2TGStGM053213@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 138904 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 29 Mar 2008 16:28:56 -0000

http://perforce.freebsd.org/chv.cgi?CH=138904

Change 138904 by pgj@disznohal on 2008/03/29 16:28:29

	Fix typos, format, composition.
	
	Submitted by:	gabor (mentor)

Affected files ...

.. //depot/projects/docproj_hu/books/handbook/virtualization/chapter.sgml#7 edit

Differences ...

==== //depot/projects/docproj_hu/books/handbook/virtualization/chapter.sgml#7 (text+ko) ====

@@ -12,7 +12,7 @@
   
     
       
-        Murray
+	Murray
 	Stokely
 	Írta: 
       
@@ -37,30 +37,31 @@
 
     
       
-	A gazda- és a vendég operációs
-	  rendszerek közti különbségeket.
+	a gazda- és a vendég operációs
+	  rendszerek közti különbségeket
       
 
       
-	Hogyan telepítsünk &os;-t egy
+	hogyan telepítsünk &os;-t egy
 	  &intel;-alapú &apple; &macintosh;
-	  számítógépre.
+	  számítógépre
       
 
       
-	Hogyan telepítsünk a &xen;
-	  használatával &os;-t &linux;-ra.
+	hogyan telepítsünk a &xen;
+	  használatával &os;-t &linux;-ra
       
 
       
-	Hogyan telepítsünk a Virtual
-	  PC &os;-t µsoft.windows;-ra.
+	hogyan telepítsünk a Virtual
+	  PC használatával &os;-t
+	  µsoft.windows;-ra
       
 
       
-	Hogyan hozzuk ki a legtöbbet &os;
+	hogyan hozzuk ki a legtöbbet &os;
 	  rendszerünkbõl virtualizáció
-	  alatt.
+	  alatt
       
 
     
@@ -70,24 +71,25 @@
     
       
 	alapvetõ &unix;-os és &os;-s ismeretek ().
+	  linkend="basics">)
       
 
       
 	a &os; telepítésének ismerete ().
+	  linkend="install">)
       
 
       
 	a hálózati kapcsolatok
 	  beállításának ismerete ().
+	  linkend="advanced-networking">)
       
 
       
 	külsõs alkalmazások
 	  telepítésének ismerete ().
+	  linkend="ports">)
+      
     
 
   
@@ -121,15 +123,15 @@
 	    készítenünk kell egy új
 	    virtuális számítógépet.
 	    A létrehozás során válasszuk a
-	    Vendég operációs rendszer
-	    típusá-nak a
+	    Guest OS Type-nak (a vendég
+	    operációs rendszer típusának) a
 	    &os;-t:
 
 	  
-            
+	    
 	      
-            
-          
+	    
+	  
 
 	  Ezután adjunk meg egy nagyjából
 	    elfogadható méretet a virtuális
@@ -168,7 +170,7 @@
 
 	  Válasszuk ki a
 	    hálózatkezelés típusát
-	    és a hálózati csatolót:
+	    és a hálózati csatolót.
 
 	  
 	    
@@ -183,7 +185,7 @@
 	  
 
 	  Mentsük el és fejezzük be a
-	    konfigurálást:
+	    konfigurálást.
 
 	  
 	    
@@ -192,10 +194,10 @@
 	  
 
 	  
-            
+	    
 	      
-            
-          
+	    
+	  
 
 	  Miután a &os;-s virtuális
 	    gépünk elkészült,
@@ -239,11 +241,10 @@
 	    telepítõlemezt és a
 	    sysinstall
 	    segítségével megkezdi a
-	    telepítést a 
-	    részben leírtak szerint.  Ha
-	    szükségünk van rá,
-	    telepíthetjük az X11-et is, de egyelõre
-	    még ne próbáljuk
+	    telepítést a ben
+	    leírtak szerint.  Ha szükségünk van
+	    rá, telepíthetjük az X11-et is, de
+	    egyelõre még ne próbáljuk
 	    beállítani.
 
 	  
@@ -344,7 +345,6 @@
           
 
       
-
     
 
     
@@ -396,11 +396,11 @@
 	    
 	      Bontsuk ki a csomagot
 
-              &prompt.root; cd xen-3.0.4_1-src
+	      &prompt.root; cd xen-3.0.4_1-src
 &prompt.root; KERNELS="linux-2.6-xen0 linux-2.6-xenU" make world
 &prompt.root; make install
 
-            
+	    
 	      A rendszermagot így tudjuk dom0 módban
 		újrafordítani:
 
@@ -429,9 +429,9 @@
 root (hd0,0)
 kernel /boot/xen-3.0.4-1.gz dom0_mem=262144
 module /boot/vmlinuz-2.6.16.33-xen0 root=/dev/hda1 ro
-            
+	    
 
-            
+	    
 	      Indítsuk újra a gépet
 		és aktiváljuk a &xen;-t
 
@@ -445,20 +445,20 @@
 	      Ezután el is indíthatjuk a
 		&xen;-t:
 
-              &prompt.root; /etc/init.d/xend start
+	      &prompt.root; /etc/init.d/xend start
 &prompt.root; /etc/init.d/xendomains start
 
 	      Láthatjuk, hogy a dom0 tartomány most
 		már aktív:
 
-              &prompt.root; xm list
+	      &prompt.root; xm list
 Name                                      ID   Mem VCPUs      State   Time(s)
 Domain-0                                   0   256     1     r-----  54452.9
-            
-          
-        
+	    
+	  
+	
 
-        
+	
 	  A &os; 7-CURRENT mint domU
 
 	  Töltsük le a &os; &xen;
@@ -673,7 +673,6 @@
                                                         peth0
                                                         vif1.0
       
-
     
 
     
@@ -688,7 +687,7 @@
 	µsoft.windows;-ra a Virtual PC
 	alkalmazást, be kell állítanunk egy
 	virtuális gépet, majd telepítenünk
-	rá a kívánt vendég
+	kell rá a kívánt vendég
 	operációs rendszert.
 
 	
@@ -703,7 +702,7 @@
 	    Ehhez válasszuk ki a menübõl a
 	    Create a virtual machine
 	    (Virtuális gép létrehozása)
-	    pontot:
+	    pontot.
 
 	  
 	    
@@ -721,7 +720,7 @@
 	    system (Operációs rendszer)
 	    beállításánál az
 	    Other (Egyéb)
-	    opciót:
+	    opciót.
 
 	  
 	    
@@ -738,7 +737,7 @@
 	    futtatásához 4 GB-nyi lemezterület
 	    és 512 MB RAM beállítása a
 	    legtöbb esetben kiválóan
-	    megfelelõ:
+	    megfelelõ.
 
 	  
 	    
@@ -753,7 +752,7 @@
 	  
 
 	  Mentsük el és fejezzük be a
-	    konfigurációt:
+	    konfigurációt.
 
 	  
 	    
@@ -767,7 +766,7 @@
 	    (Beállítások) menüre és
 	    állítsuk be hálózati
 	    csatoló és hálózatkezelés
-	    típusát:
+	    típusát.
 
 	  
 	    
@@ -841,7 +840,7 @@
 	    telepítõeszközét fogja
 	    megtalálni és megkezdi a ben ismertetett szokásos,
-	    sysinstallra alapuló
+	    sysinstall-ra alapuló
 	    telepítési eljárást.  Ennek
 	    során az X11-et is feltelepíthetjük,
 	    habár egyelõre még ne
@@ -969,7 +968,7 @@
 	rendszert.
 
       
-	A &os; telepítése a &macos; X/VMWare-re
+	A &os; telepítése a &macos; X/VMWare-re
 
 	Elõször indítsuk el a VMWare Fusion-t,
 	  aminek eredményeképpen betöltõdik a
@@ -1131,7 +1130,7 @@
       
 
       
-	A &os; beállítása a &macos; X/VMWare-en
+	A &os; beállítása a &macos; X/VMWare-en
 
 	Ahogy a &os;-t sikeresen telepítettük a
 	  &macos; X alatt futó
@@ -1143,7 +1142,7 @@
 
 	
 	  
-	    A rendszertöltő változóinak beállítása
+	    A rendszertöltõ változóinak beállítása
 
 	    A legfontosabb lépés talán a
 	       változó
@@ -1215,10 +1214,10 @@
       gazda operációs rendszerként, de sokan
       használják a VMware
       régebbi verzióit ilyen megfontolásból.
-      Ezenkívül folynak munkálatok abból a
-      célból, hogy a &xen;-t
-      felkészítsék a &os; történõ
-      futattásra.
+      Emellett már dolgoznak azon, hogy a
+      &xen; rendszert
+      felkészítsék a &os; alatti
+      mûködésre.
 
   
 

From owner-p4-projects@FreeBSD.ORG  Sat Mar 29 16:48:17 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 592F11065674; Sat, 29 Mar 2008 16:48: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 1746B106564A
	for ; Sat, 29 Mar 2008 16:48:17 +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 03A5F8FC1C
	for ; Sat, 29 Mar 2008 16:48:17 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2TGmGJJ063143
	for ; Sat, 29 Mar 2008 16:48:16 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2TGmGto063141
	for perforce@freebsd.org; Sat, 29 Mar 2008 16:48:16 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Sat, 29 Mar 2008 16:48:16 GMT
Message-Id: <200803291648.m2TGmGto063141@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 138911 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 29 Mar 2008 16:48:17 -0000

http://perforce.freebsd.org/chv.cgi?CH=138911

Change 138911 by pgj@disznohal on 2008/03/29 16:47:55

	Fix typos, format and reword sentences.
	
	Submitted by:	gabor (mentor)

Affected files ...

.. //depot/projects/docproj_hu/books/handbook/boot/chapter.sgml#3 edit

Differences ...

==== //depot/projects/docproj_hu/books/handbook/boot/chapter.sgml#3 (text+ko) ====

@@ -9,133 +9,133 @@
      Original Revision: 1.65                      -->
 
 
-  A &os; rendszerindítási folyamata
+  A &os; rendszerindítási folyamata
 
   
-    Áttekintés
-    rendszerindítás
-    rendszertöltõ
+    Áttekintés
+    rendszerindítás
+    rendszertöltő
 
-    A számítógép
-      indulását és a rajta található
-      operációs rendszer
-      betöltõdését
-      rendszertöltési folyamatnak
-      nevezzük, vagy egyszerûen csak
-      bootolásnak.  A &os;
-      rendszerindítási folyamata
-      nagymértékû rugalmasságot
-      kínál a rendszer indulását
-      követõ események vezérlését
-      illetõen, legyen az a
-      számítógépre telepített
-      különféle operációs rendszerek
-      egyikének kiválasztása, vagy pedig ugyazon
-      operációs rendszer valamelyik
-      változatának vagy rendszermagjának
-      kiválasztása.
+    A számítógép
+      indulását és a rajta található
+      operációs rendszer
+      betöltődését
+      rendszerindítási folyamatnak
+      nevezzük, vagy egyszerűen csak
+      bootolásnak.  A &os;
+      rendszerindítási folyamata
+      nagymértékű rugalmasságot
+      kínál a rendszer indulását
+      követő események vezérlését
+      illetően, legyen az a
+      számítógépre telepített
+      különféle operációs rendszerek
+      egyikének kiválasztása, vagy pedig ugyanazon
+      operációs rendszer valamelyik
+      változatának vagy rendszermagjának
+      kiválasztása.
 
-    Ez a fejezet részleteiben bemutatja a
-      rendszerindításhoz kapcsolódó
-      konfigurációs opciókat, ill.  a &os;
-      bootolásának
-      testreszabhatóságát.  Ebbe minden
-      beleértendõ, ami a &os; rendszermag beindulása
-      és az eszközök keresése során
-      történik, majd az &man.init.8;
-      elindításával zárul.  Ha nem vagyunk
-      teljesen biztosak benne, ez pontosan mikor is következik be,
-      figyeljük, amikor a szöveg színe
-      fehérrõl szürkére vált.
+    Ez a fejezet részleteiben bemutatja a
+      rendszerindításhoz kapcsolódó
+      konfigurációs opciókat, ill.  a &os;
+      bootolásának
+      testreszabhatóságát.  Ebbe minden
+      beleértendő, ami a &os; rendszermag beindulása
+      és az eszközök keresése során
+      történik, majd az &man.init.8;
+      elindításával zárul.  Ha nem vagyunk
+      teljesen biztosak benne, ez pontosan mikor is következik be,
+      figyeljük, amikor a szöveg színe
+      fehérről szürkére vált.
 
-    A fejezet elolvasása során
-      megismerjük:
+    A fejezet elolvasása során
+      megismerjük:
 
     
       
-	Milyen elemekbõl áll a &os;
-	  rendszertöltõ alrendszere, és ezek
-	  miként kapcsolódnak egymáshoz.
+	milyen elemekből áll a &os;
+	  rendszertöltő alrendszere, és ezek
+	  miként kapcsolódnak egymáshoz
      
 
       
-	Melyek azok a &os; rendszertöltésében
-	  résztvevõ elemeknek átadható
-	  opciók, amikkel vezérelhetõ a
-	  bootolás folyamata.
+	melyek azok a &os;
+	  rendszerindításában résztvevõ
+	  elemeknek átadható opciók, amelyekkel
+	  vezérelhetõ ez a folyamat
      
 
       
-        A &man.device.hints.5; alapjait.
+	a &man.device.hints.5; alapjait
       
     
 
     
       Csak x86
 
-      Ez a fejezet kizárólag csak az &intel; x86
-	típusú architektúráján
-	futó &os; rendszerindítási
-	folyamatát mutatja be.
+      Ez a fejezet kizárólag csak az &intel; x86
+	típusú architektúráján
+	futó &os; rendszerindítási
+	folyamatát mutatja be.
 
    
   
 
   
-    A rendszerindítás
-      problémája
+    A rendszerindítás
+      problémája
 
-    Az operációs rendszer elindítása a
-      számítógép bekapcsolása
-      után egy felettébb érdekes
-      problémát vet fel.  Definíció szerint
-      a számítógép ugyanis egy
-      lépést sem tud megtenni az operációs
-      rendszer elindulása nélkül.
-      Például nem programokat futtatni a lemezrõl.
-      Így aztán, ha a
-      számítógépünk nem programokat
-      futtatni a lemezrõl az operációs rendszer
-      segítsége nélkül, viszont az
-      operációs rendszer programjai a lemezen vannak,
-      mégis hogyan képes elindulni maga az
-      operációs rendszer?
+    Az operációs rendszer elindítása a
+      számítógép bekapcsolása
+      után egy felettébb érdekes
+      problémát vet fel.  Definíció szerint
+      a számítógép ugyanis egy
+      lépést sem tud megtenni az operációs
+      rendszer elindulása nélkül.
+      Például nem tud programokat futtatni a
+      lemezről.  Eszerint ha a
+      számítógépünk nem képes
+      programokat futtatni a lemezről az operációs
+      rendszer segítsége nélkül, viszont az
+      operációs rendszer programjai a lemezen vannak,
+      mégis hogyan képes elindulni maga az
+      operációs rendszer?
 
-    Maga a probléma a Münchausen
-      báró kalandjai c.  könyvben
-      leírtakhoz hasonló.  A történet szerint
-      ugyanis a fõszereplõ egy mocsárban ragad
-      derék lovával, azonban sikerült kihúznia
-      magát belõle a saját hajánál
-      fogva.  Ez a motívum vált a
-      számítógépek hõskorában a
-      rendszertöltés
-      alapjává, vagyis ahogyan
-      betöltötték az operációs
+    Maga a probléma a Münchausen
+      báró kalandjai c.  könyvben
+      leírtakhoz hasonló.  A történet szerint
+      ugyanis a főszereplő egy mocsárban ragadt
+      derék lovával, azonban sikerült kihúznia
+      magát belőle a saját hajánál
+      fogva.  Ez a motívum vált a
+      számítógépek hőskorában a
+      rendszerbetöltés
+      alapjává, vagyis ahogyan
+      betöltötték az operációs
       rendszereket.  (Ford.: ezt az angolban bootstrappingnek
-      hívják, mivel a történet angol
-      változata szerint a csizmáján (boot)
-      emelkedett ki.  Ebbõl alakult ki késõbb az
-      elterjedt bootolás szó is.)
+      hívják, mivel a történet angol
+      változata szerint a csizmáján (boot)
+      emelkedett ki.  Ebből alakult ki később az
+      elterjedt bootolás szó is.)
 
       BIOS
 
-    Alapvetõ be- és kimeneti
+    Alapvető be- és kimeneti
       rendszerBIOS
 
-    Az x86-os konfigurációkon az alapvetõ be-
-      és kimeneti rendszer (Basic Input/Output System, BIOS)
-      felelõs az operációs rendszer
-      betöltéséért.  Ehhez a BIOS
-      elõször megkeresi a merevlemezen, egy speciális
-      helyen található Master Boot Record-ot (MBR).  A
-      BIOS elegendõ tudással rendelkezik az MBR
-      beolvasásához és
-      lefuttatásához, és feltételezi, hogy
-      az MBR majd elvégzi az operációs rendszer
-      betöltéséhez szükséges
-      további feladatokat, helyenként a BIOS
-      közremûködésével.
+    Az x86-os konfigurációkon a BIOS (Basic
+      Input/Output System, avagy alapvető be- és
+      kimeneti rendszer) felelős az operációs
+      rendszer betöltéséért.  Ehhez a BIOS
+      először megkeresi a merevlemezen egy speciális
+      helyén található Master Boot Record-ot (MBR).  A
+      BIOS elegendő tudással rendelkezik az MBR
+      beolvasásához és
+      lefuttatásához, és feltételezi, hogy
+      az MBR majd elvégzi az operációs rendszer
+      betöltéséhez szükséges
+      további feladatokat, helyenként a BIOS
+      közreműködésével.
 
     Master Boot Record (MBR)
 
@@ -143,93 +143,93 @@
 
     Boot Loader
 
-    Az MBR-ben található programkódot
-      hívják általában boot
-      managernek, kiváltképp abban az esetben,
-      amikor az a felhasználóval is kommunikál.
-      Ilyenkor a boot manager többnyire további kódot
-      tartalmaz a lemez elsõ
-      sávján vagy az egyik
-      állományrendszerben.  (A boot managereket
-      néha boot loadernek is nevezzük,
-      de a &os;-s terminológia ezt a kifejezést a
-      rendszerindítás egy késõbbi
-      fokozatára használja.) Népszerûbb boot
+    Az MBR-ben található programkódot
+      hívják általában boot
+      managernek, kiváltképp abban az esetben,
+      amikor az a felhasználóval is kommunikál.
+      Ilyenkor a boot manager többnyire további kódot
+      tartalmaz a lemez első
+      sávján vagy az egyik
+      állományrendszerben.  (A boot managereket
+      néha boot loadernek is nevezzük,
+      de a &os;-s terminológia ezt a kifejezést a
+      rendszerindítás egy későbbi
+      fokozatára használja.) Népszerűbb boot
       managerek: boot0 (avagy
-      Boot Easy, a &os; alapvetõ boot
+      Boot Easy, a &os; alapvető boot
       managere), GRUB,
-      GAG és a
-      LILO.  (Ezek közül
-      egyedül csak a boot0 fér el
+      GAG és a
+      LILO.  (Ezek közül
+      egyedül csak a boot0 fér el
       az MBR-ben.)
 
-    Amennyiben merevlemezeinken csupán egyetlen
-      operációs rendszer foglal helyet, akkor egy
-      szabványos MBR tökéletes megfelelõ.  Ez az
-      MBR megkeresi az elsõ indítható (más
-      néven aktív) slice-ot a lemezen, majd lefuttatja a
-      benne található indítókódot az
-      operációs rendszer többi részének
-      felélesztéséhez.  Az &man.fdisk.8;
-      által alapértelmezés szerint
-      telepített MBR pontosan ilyen.  Ennek alapja a
-      /boot/mbr állomány.
+    Amennyiben merevlemezeinken csupán egyetlen
+      operációs rendszer foglal helyet, akkor egy
+      szabványos MBR tökéletes megfelelő.  Ez az
+      MBR megkeresi az első indítható (más
+      néven aktív) slice-ot a lemezen, majd lefuttatja a
+      benne található indítókódot az
+      operációs rendszer többi részének
+      felélesztéséhez.  Az &man.fdisk.8;
+      által alapértelmezés szerint
+      telepített MBR pontosan ilyen.  Ennek alapja a
+      /boot/mbr állomány.
 
-    Ha viszont több operációs rendszert is
-      telepítettünk a lemezeinkre, akkor egy ettõl
-      eltérõ boot managert érdemes
-      használnunk, olyat, amely képes felsorolni a
-      rendelkezésre álló operációs
-      rendszereket, lehetõvé téve, hogy
-      választani lehessen az indításuk
-      között.  Ezek közül kettõrõl esik
-      szó a következõ alfejezetekben.
+    Ha viszont több operációs rendszert is
+      telepítettünk a lemezeinkre, akkor egy ettől
+      eltérő boot managert érdemes
+      használnunk, olyat, amely képes felsorolni a
+      rendelkezésre álló operációs
+      rendszereket, lehetővé téve, hogy
+      választani lehessen az indításuk
+      között.  Ezek közül kettőről esik
+      szó a következő alfejezetekben.
 
-    A &os; rendszertöltõ alrendszerének
-      fennmaradó része három fokozatra
-      bontható.  Az elsõ fokozatot az MBR indítja el,
+    A &os; rendszertöltő alrendszerének
+      fennmaradó része három fokozatra
+      bontható.  Az első fokozatot az MBR indítja el,
       amely pontosan eleget tud ahhoz, hogy a
-      számítógépet egy elõre megadott
-      állapotba hozza és lefutassa rajta a második
-      fokozatot.  A második fokozat ennél már egy
-      kicsivel többre képes, majd ezt követi a harmadik
-      fokozat.  Ez a fokozat zárja le végül az
-      operációs rendszer betöltésének
-      feladatát.  A munka tehát ezen három fokozat
-      között oszlik meg, mivel a PC-szabványok komoly
-      korlátozásokat tesznek az elsõ ill.
-      második fokozatban futtatható programok
-      méretére.  A feladatok ilyen módon
-      történõ összefûzése azonban a
-      &os; számára egy sokkalta rugalmasabb
-      betöltõt eredményez.
+      számítógépet egy előre megadott
+      állapotba hozza és lefutassa rajta a második
+      fokozatot.  A második fokozat ennél már egy
+      kicsivel többre képes, majd ezt követi a harmadik
+      fokozat.  Ez a fokozat zárja le végül az
+      operációs rendszer betöltésének
+      feladatát.  A munka tehát ezen három fokozat
+      között oszlik meg, mivel a PC-szabványok komoly
+      korlátozásokat tesznek az első ill.
+      második fokozatban futtatható programok
+      méretére.  A feladatok ilyen módon
+      történő összefűzése azonban a
+      &os; számára egy sokkalta rugalmasabb
+      betöltőt eredményez.
 
     rendszermag
     init
 
-    Ezután beindul a rendszermag (más néven
-      kernel), és nekilát a
-      számítógépben rendelkezésre
-      álló hardvereszközök
-      keresésének, majd elõkészíti
-      õket a használatra.  Ahogy a rendszermag
-      beindításának folyamata véget
-      ért, az átadja a vezérlést az
-      &man.init.8; nevû felhasználói programnak,
+    Ezután beindul a rendszermag (más néven
+      kernel), és nekilát a
+      számítógépben rendelkezésre
+      álló hardvereszközök
+      keresésének, majd előkészíti
+      őket a használatra.  Ahogy a rendszermag
+      beindításának folyamata véget
+      ért, az átadja a vezérlést az
+      &man.init.8; nevű felhasználói programnak,
       amely megbizonyosodik a lemezek
-      használhatóságáról.  Az
-      &man.init.8; ezt követõen megkezdi az
-      erõforrások felhasználói szintû
-      bekonfigurálását: csatlakoztatja az
-      állományrendszereket, beállítja a
-      hálózati kártyá(ka)t, és
-      elindítja mindazon programokat, amelyeknek egy &os;
-      rendszer indulásakor futnia kell.
+      használhatóságáról.  Az
+      &man.init.8; ezt követően megkezdi az
+      erőforrások felhasználói szintű
+      bekonfigurálását: csatlakoztatja az
+      állományrendszereket, beállítja a
+      hálózati kártyá(ka)t, és
+      elindítja mindazon programokat, amelyeknek egy &os;
+      rendszer indulásakor futnia kell.
 
  
 
   
-    A boot manager és az indulás fokozatai
+    A boot manager és az indulás fokozatai
 
     Boot Manager
 
@@ -237,33 +237,33 @@
       A boot manager
       Master Boot Record (MBR)
 
-      Az MBR-ben található programkódot,
-	avagy boot managert, sokszor csak a rendszerindítás
-	nulladik fokozataként emlegetik.  Ez
-	az alfejezet a korábban említett két boot
-	managert tárgyalja: a boot0-t
-	és a LILO-t.
+      Az MBR-ben található programkódot,
+	avagy boot managert, sokszor csak a rendszerindítás
+	nulladik fokozataként emlegetik.  Ez
+	az alfejezet a korábban említett két boot
+	managert tárgyalja: a boot0-t
+	és a LILO-t.
 
       A <application>boot0</application> boot manager:
-	A &os; telepítõje vagy a &man.boot0cfg.8;
-	  által kialakított MBR alapértelmezett
-	  állapotban a /boot/boot0
-	  állományon alapszik.  (A
-	  boot0 program nagyon egyszerû,
-	  hiszen az MBR-ben elhelyezhetõ
-	  kód csak 446 byte hosszúságú
-	  lehet, mert a végében még el kell
-	  férnie a slice-táblának és az
-	  0x55AA azonosítónak.) Ha
-	  telepítettük a boot0-t
-	  és lemezeinken több operációs
-	  rendszer is megtalálható, akkor a
-	  rendszerindítás során egy hasonló
-	  képet kell látnunk:
+	A &os; telepítője vagy a &man.boot0cfg.8;
+	  által kialakított MBR alapértelmezett
+	  állapotban a /boot/boot0
+	  állományon alapszik.  (A
+	  boot0 program nagyon egyszerű,
+	  hiszen az MBR-ben elhelyezhető
+	  kód csak 446 byte hosszúságú
+	  lehet, mert a végében még el kell
+	  férnie a slice-táblának és az
+	  0x55AA azonosítónak.) Ha
+	  telepítettük a boot0-t
+	  és a lemezeinken több operációs
+	  rendszer is megtalálható, akkor a
+	  rendszerindítás során egy hasonló
+	  képet kell látnunk:
       
 
       
-	A <filename>boot0</filename> munkában
+	A <filename>boot0</filename> munkában
 
 	F1 DOS
 F2 FreeBSD
@@ -274,39 +274,39 @@
 Default: F2
       
 
-      Más operációs rendszerek,
-	különösen a &windows;,
-	telepítésük során
-	felülírják a már meglevõ MBR-t a
-	sajátjukkal.  Ha ez történne, vagy
-	egyszerûen csak szeretnénk a meglevõ MBR-t
-	lecserélni a &os; MBR-jével, adjuk ki a
-	következõ parancsot:
+      Más operációs rendszerek,
+	különösen a &windows;,
+	telepítésük során
+	felülírják a már meglevő MBR-t a
+	sajátjukkal.  Ha ez történne, vagy
+	egyszerűen csak szeretnénk a meglevő MBR-t
+	lecserélni a &os; MBR-jével, adjuk ki a
+	következő parancsot:
 
       &prompt.root; fdisk -B -b /boot/boot0 eszköznév
 
-      ahol az eszköznév
-	annak az eszköznek a neve, ahonnan a rendszert
-	indítani szeretnénk, tehát pl.
-	ad0 az elsõ IDE-lemez
-	esetén, vagy ad2 a
-	második IDE-vezérlõn található
-	elsõ IDE-lemez esetén, ill.
-	da0 az elsõ SCSI-lemez
-	esetén és így tovább.  Vagy ha
-	testre akarjuk szabni az MBR-t, használjuk a
+      ahol az eszköznév
+	annak az eszköznek a neve, ahonnan a rendszert
+	indítani szeretnénk, tehát pl.
+	ad0 az első IDE-lemez
+	esetén, vagy ad2 a
+	második IDE-vezérlőn található
+	első IDE-lemez esetén, ill.
+	da0 az első SCSI-lemez
+	esetén, és így tovább.  Ha testre
+	akarjuk szabni az MBR-t, használjuk a
 	&man.boot0cfg.8;-t.
 
-      A LILO boot manager:
+      
+	A LILO boot manager:
 
-	Ezen boot manager telepítéséhez
-	  és beállításához,
-	  elsõként indítsuk el a &linux;-ot és
-	  vegyük hozzá az alábbi sort a
-	  rendszerünkben található
+	Ezen boot manager telepítéséhez
+	  és beállításához,
+	  elsőként indítsuk el a &linux;-ot és
+	  vegyük hozzá az alábbi sort a
+	  rendszerünkben található
 	  /etc/lilo.conf
-	  konfigurációs állományhoz:
-
+	  konfigurációs állományhoz:
       
 
       other=/dev/hdXY
@@ -314,118 +314,119 @@
 loader=/boot/chain.b
 label=FreeBSD
 
-      A fenti sablont kiegészítve, a &linux;-os
-	konvenciók szerint adjuk meg a &os; elsõdleges
-	partícióját és
-	meghajtóját úgy, hogy a
-	X-et átírjuk a
-	&linux;-os meghajtó betûjelére és az
-	Y-t átírjuk a &linux;
-	elsõdleges partíciójának
-	számára.  Ha
-	SCSI-meghajtót használunk, a
-	/dev/hd részt is át
-	kell írnunk az iméntiekkel mellett
+      A fenti sablont kiegészítve, a &linux;-os
+	konvenciók szerint adjuk meg a &os; elsődleges
+	partícióját és
+	meghajtóját úgy, hogy a
+	X-et átírjuk a
+	&linux;-os meghajtó betűjelére és az
+	Y-t átírjuk a &linux;
+	elsődleges partíciójának
+	számára.  Ha
+	SCSI-meghajtót használunk, a
+	/dev/hd részt is át
+	kell írnunk az előbbiek mellett
 	/dev/sd-re.  A
-	 sor elhagyható
-	abban az esetben, ha mind a két operációs
-	rendszer ugyanazon a meghajtón található.
-	Ha befejeztük a módosítást, futtassuk
+	 sor elhagyható
+	abban az esetben, ha mind a két operációs
+	rendszer ugyanazon a meghajtón található.
+	Ha befejeztük a módosítást, futtassuk
 	le a /sbin/lilo -v parancsot a
-	változtatásaink életbe
-	léptetéséhez.  Ezt
-	ellenõrizhetjük is a képernyõn
-	megjelenõ üzenetek alapján.
+	változtatásaink életbe
+	léptetéséhez.  Ezt
+	ellenőrizhetjük is a képernyőn
+	megjelenő üzenetek alapján.
 
     
 
     
-      Az elsõ fokozat (<filename>/boot/boot1</filename>)
-	és a második fokozat
+      <title>Az első fokozat (<filename>/boot/boot1</filename>)
+	és a második fokozat
 	(<filename>/boot/boot2</filename>)
 
-      Az elsõ és a második fokozat fogalmilag
-	ugyannak a programnak a része, a lemezen ugyanott
-	helyezkedik el.  A tárbeli megszorítások
-	miatt ugyan el kellett választani õket
-	egymástól, de a telepítésük
-	mindig egy helyre történik.  A telepítõ
+      Az első és a második fokozat fogalmilag
+	ugyanannak a programnak a része, a lemezen ugyanott
+	helyezkedik el.  A tárbeli megszorítások
+	miatt ugyan el kellett választani őket
+	egymástól, de a telepítésük
+	mindig egy helyre történik.  A telepítő
 	vagy a bsdlabel (ld.  lentebb)
-	használata során a /boot/boot
-	nevû kombinált állományból
-	másolódnak ki.
+	használata során a /boot/boot
+	nevű kombinált állományból
+	másolódnak ki.
 
-      Az állományrendszereken kívül
-	találhatóak, az aktív slice elsõ
-	sávjában, annak elsõ
-	szektorától kezdõdõen.  Ez az a hely,
+      Az állományrendszereken kívül
+	találhatóak, az aktív slice első
+	sávjában, annak első
+	szektorától kezdődően.  Ez az a hely,
 	ahol a boot0 ill.  a
-	többi boot manager is keresi a
-	rendszerindítás folytatására
-	alkalmas programot.  A felhasznált szektorok száma
-	könnyedén kideríthetõ a
+	többi boot manager is keresi a
+	rendszerindítás folytatására
+	alkalmas programot.  A felhasznált szektorok száma
+	könnyedén kideríthető a
 	/boot/boot
-	méretébõl.
+	méretéből.
 
-      Legfeljebb 512 byte-os méreténél fogva
-	a boot1 állomány nagyon
-	egyszerû felépítésû, és
-	éppen csak annyit tud a slice-ra vonatkozó
-	információkat tároló &os;
-	bsdlabel-rõl, hogy megtalálja
-	a boot2-t és
-	elindítsa.
+      Legfeljebb 512 byte-os méreténél fogva
+	a boot1 állomány nagyon
+	egyszerű felépítésű, és
+	éppen csak annyit tud a slice-ra vonatkozó
+	információkat tároló &os;
+	bsdlabel-ről, hogy megtalálja
+	a boot2-t és
+	elindítsa.
 
-      A boot2 már egy kicsivel
-	ügyesebb, és ismeri eléggé a &os;
-	állományrendszerét ahhoz, hogy
-	megtaláljon rajta állományokat, valamint
-	képes egy egyszerû felületet nyújtani a
-	rendszermag vagy a betöltõ
-	megválasztásához.
+      A boot2 már egy kicsivel
+	ügyesebb, és ismeri eléggé a &os;
+	állományrendszerét ahhoz, hogy
+	megtaláljon rajta állományokat, valamint
+	képes egy egyszerű felületet nyújtani a
+	rendszermag vagy a betöltő
+	megválasztásához.
 
-      Mivel a betöltõ
-	pedig már ennél is okosabb, és egy
-	könnyen használható
-	rendszerindítási konfigurációt tud a
-	felhasználó számára nyújtani,
-	ezért a boot2
-	általában ezt indítja el, de elõtte
-	közvetlenül a rendszermag futtatását
-	végzi el.
+      Mivel a betöltő
+	pedig már ennél is okosabb, és egy
+	könnyen használható
+	rendszerindítási konfigurációt tud a
+	felhasználó számára nyújtani,
+	ezért a boot2
+	általában ezt indítja el, de előtte
+	közvetlenül a rendszermag futtatását
+	végzi el.
 
       
-	A <filename>boot2</filename> mûködés
-	  közben
+	A <filename>boot2</filename> működés
+	  közben
 
 	>> FreeBSD/i386 BOOT
 Default: 0:ad(0,a)/boot/loader
 boot:
       
 
-      Ha le kellene váltani a korábban
-	telepített boot1 és
-	boot2 fokozatokat, használjuk a
+      Ha le kellene váltani a korábban
+	telepített boot1 és
+	boot2 fokozatokat, használjuk a
 	&man.bsdlabel.8;-t:
 
       &prompt.root; bsdlabel -B lemezslice
 
       ahol a lemezslice annak a
-	lemeznek és slice-nak a kombinációja,
-	ahonnan indítjuk a rendszerünket, pl.  az elsõ
-	IDE-lemez elsõ slice-a esetén ez az
+	lemeznek és slice-nak a kombinációja,
+	ahonnan indítjuk a rendszerünket, pl.  az első
+	IDE-lemez első slice-a esetén ez az
 	ad0s1.
 
       
-	A veszélyesen dedikált mód
+	A veszélyesen dedikált mód
+	  (Dangerously Dedicated Mode)
 
-	Amikor a &man.bsdlabel.8; meghívásakor csak
-	  a lemez nevét használjuk, pl.
+	Amikor a &man.bsdlabel.8; meghívásakor csak
+	  a lemez nevét használjuk, pl.
 	  ad0-t, a parancs egy
-	  veszélyesen dedikált lemezt hoz létre,
-	  slice-ok nélkül!  Szinte biztos, hogy nem ez az,
-	  amire szükségünk lenne, ezért mindig
-	  ellenõrizzük kiadása elõtt a
+	  veszélyesen dedikált lemezt hoz létre,
+	  slice-ok nélkül!  Szinte biztos, hogy nem ez az,
+	  amire szükségünk lenne, ezért mindig
+	  ellenőrizzük kiadása előtt a
 	  &man.bsdlabel.8; parancsot!
       
     
@@ -435,100 +436,102 @@
       (/boot/loader)
 
     boot-loader
-    A betöltõ a három fokozatú
-      rendszertöltés utolsó állomása.  Az
-      állományrendszerben
-      /boot/loader néven találhatjuk
+    A betöltő a három fokozatú
+      rendszertöltés utolsó állomása.  Az
+      állományrendszerben
+      /boot/loader néven találhatjuk
       meg.
 
-    A rendszertöltõt az egyszerû
-      konfigurálhatóságot támogató,
-      felhasználóbarát eszköznek
-      tervezték, és könnyen megtanulható,
-      beépített parancsokat használ, melyek
-      mögött egy összetettebb parancsokat ismerõ,
-      erõsebb értelmezõ áll.
+    A rendszertöltőt az egyszerű
+      konfigurálhatóságot támogató,
+      felhasználóbarát eszköznek
+      tervezték, és könnyen megtanulható,
+      beépített parancsokat használ, melyek
+      mögött egy összetettebb parancsokat ismerő,
+      erősebb értelmező áll.
 
     
-      A rendszertöltõ mûködése
+      A rendszertöltő működése
+
+      Az inicializálás során a
+	rendszertöltő megpróbálja megkeresni a
+	konzolt és a lemezek közül igyekszik
+	megtalálni azt, amelyikről elindult a rendszer.  A
+	keresések eredményének megfelelően
+	beállítja a változókat, majd elindul
+	egy értelmező, ahol vagy szkriptből olvasva
+	vagy pedig interaktívan feldolgozásra
+	kerülnek a parancsok.
 
-      Az inicializálás során a
-	rendszertöltõ megpróbálja megkeresni a
-	konzolt és a lemezek közül igyekszik
-	megtalálni azt, amelyrõl elindult a rendszer.  A
-	keresések eredményének megfelelõen
-	beállítja a változókat, majd elindul
-	egy értelmezõ, ahol vagy szkriptbõl olvasva
-	vagy pedig interaktívan feldolgozásra
-	kerülnek a parancsok.
-      rendszertöltõ
-      a rendszertöltõ
-	konfigurációja
+      rendszertöltő
+      a rendszertöltő
+	konfigurációja
 
-      A rendszertöltõ ezt követõen beolvassa a
-	/boot/loader.rc állományt,
-	ami pedig alapértelmezés szerint feldolgozza a
+      A rendszertöltő ezt követően beolvassa a
+	/boot/loader.rc állományt,
+	ami pedig alapértelmezés szerint feldolgozza a
 	/boot/defaults/loader.conf
-	állományt, ahol a változók
-	értelmes kezdõértéket kapnak, valamint
-	feldolgozza még a /boot/loader.conf
-	állományt is, ahol a változók
-	értékeit változtathatjuk meg.
-	Miután ez lezajlott, a loader.rc a
-	változók értékeinek megfelelõen
-	cselekszik, betöltve az ily módon
-	kiválasztott rendszermagot és a hozzá
-	választott modulokat.
+	állományt, ahol a változók
+	értelmes kezdőértéket kapnak, valamint
+	feldolgozza még a /boot/loader.conf
+	állományt is, ahol a változók
+	értékeit változtathatjuk meg.
+	Miután ez lezajlott, a loader.rc a
+	változók értékeinek megfelelően
+	cselekszik, betöltve az ily módon
+	kiválasztott rendszermagot és a hozzá
+	választott modulokat.
 
-      Végezetül, a rendszertöltõ beiktat
-	egy, alapértelmezés szerint 10 másodperces,
-	várakozást, majd elindítja a rendszermagot,
-	ha azt meg nem szakítjuk egy billentyû
-	lenyomásával.  Ha megszakítjuk ezt a
-	várakozást, a rendszertöltõ egy
-	parancssort ad, amin keresztül egyszerû parancsokat
-	adhatunk ki neki: állíthatjuk a
-	változók értékeit, kidobathatjuk a
-	modulokat a memóriából, modulokat
-	töltethetünk be, elindíthatjuk a rendszert vagy
-	újraindíthatjuk a
-	számítógépet.
+      Végezetül, a rendszertöltő beiktat
+	egy, alapértelmezés szerint 10 másodperces
+	várakozási szünetet, majd elindítja a
+	rendszermagot, ha azt meg nem szakítjuk egy
+	billentyű lenyomásával.  Ha
+	megszakítjuk ezt a várakozást, a
+	rendszertöltő egy parancssort ad, amin keresztül
+	egyszerű parancsokat adhatunk ki neki:
+	állíthatjuk a változók
+	értékeit, modulokat távolíthatunk el
+	a memóriából, modulokat
+	töltethetünk be, elindíthatjuk a rendszert vagy
+	újraindíthatjuk a
+	számítógépet.
 
     
 
     
-      A rendszertöltõ beépített
+      <title>A rendszertöltő beépített
 	parancsai
 
-      Következzenek a leggyakrabban használt parancsok
-	a rendszertöltõben.  Az összes itt
-	elérhetõ parancsot a &man.loader.8; man oldalon
-	találjuk meg.
+      Következzenek a leggyakrabban használt parancsok
+	a rendszertöltőben.  Az összes itt
+	elérhető parancsot a &man.loader.8; man oldalon
+	találjuk meg.
 
       
 	
 	  autoboot
-	    másodperc
+	    másodperc
 
 	  
-	    Megkezdi a rendszermag betöltését,
-	      ha nem szakítjuk meg a várakozást
-	      másodpercekben megadott idõtartam alatt.
-	      Ekkor egy visszaszámlálást
-	      láthatunk, ami az alapértelmezés
-	      szerint 10 másodperctõl indul.
+	    Megkezdi a rendszermag betöltését,
+	      ha nem szakítjuk meg a várakozást
+	      másodpercekben megadott időtartam alatt.
+	      Ekkor egy visszaszámlálást
+	      láthatunk, ami az alapértelmezés
+	      szerint 10 másodperctől indul.
 	  
 	
 
 	
 	  boot
-	    -opciók
+	    -opciók
 	    rendszermag
 
 	  
-	    Amennyiben léteznek, a megadott
-	      opciókkal azonnal megkezdi a megadott rendszermag
-	      betöltését.
+	    Amennyiben léteznek, a megadott
+	      opciókkal azonnal megkezdi a megadott rendszermag
+	      betöltését.
 	  
 	
 
@@ -536,84 +539,84 @@
 	  boot-conf
 
 	  
-	    Végigmegy a modulok ugyanazon automatikus
-	      konfigurációján, ahogy az a
-	      normális rendszerindítás során
-	      is történik.  Ezen parancs
-	      használatának csak akkor van értelme,
-	      ha elõtte az unload parancsot
-	      használjuk, megváltoztatunk egy-két
-	      változót, általában a
+	    Végigmegy a modulok ugyanazon automatikus
+	      konfigurációján, ahogy az a
+	      normális rendszerindítás során
+	      is történik.  Ezen parancs
+	      használatának csak akkor van értelme,
+	      ha előtte az unload parancsot
+	      használjuk, megváltoztatunk egy-két
+	      változót, általában a
 	      kernel-t.
 	  
 	
 
 	
 	  help
-	    témakör
+	    témakör
 
 	  
 	    A /boot/loader.help
-	      állományban fellelhetõ
-	      súgóüzeneteket mutatja meg.  Ha
-	      témakörnek indexet adunk
-	      meg, akkor az elérhetõ
-	      témakörök listáját kapjuk
+	      állományban fellelhető
+	      súgóüzeneteket mutatja meg.  Ha
+	      témakörnek indexet adunk
+	      meg, akkor az elérhető
+	      témakörök listáját kapjuk
 	      meg.
 	  
 	
 
 	
 	  include
-	    állománynév
+	    állománynév
 	    …
 
 	  
-	    Feldolgozza a megnevezett állományt:
-	      beolvassa, majd sorról-sorra értelmezi.  Hiba
-	      esetén azonnal megállítja a
-	      feldolgozást.
+	    Feldolgozza a megnevezett állományt:
+	      beolvassa, majd sorról-sorra értelmezi.  Hiba
+	      esetén azonnal megállítja a
+	      feldolgozást.
 	  
 	
 	
 	  load 
-	    típus
-	    állománynév
+	    típus
+	    állománynév
 
 	  
-	    A név alapján betölti a
-	      rendszermagot, modult vagy az adott típusú
-	      állományt.  Az
-	      állománynév után megadott
-	      további paraméterek az
-	      állománynak adódnak át.
+	    A név alapján betölti a
+	      rendszermagot, modult vagy az adott típusú
+	      állományt.  Az
+	      állománynév után megadott
+	      további paraméterek az
+	      állománynak adódnak át.
 	  
 	
 	
 	  ls 
-	    elérési
-	    útvonal
+	    elérési
+	    útvonal
 
 	  
-	    Kilistázza a megadott elérési
-	      útvonalon található
-	      állományokat, vagy ennek
-	      hiányában a gyökér
-	      tartalmát.  Ha hozzátesszük a
-	       kapcsolót, az
-	      állományok mérete is
-	      látható válik.
+	    Kilistázza a megadott elérési
+	      útvonalon található
+	      állományokat, vagy ennek

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Sat Mar 29 16:49:18 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8E0F71065671; Sat, 29 Mar 2008 16:49: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 31CD2106564A
	for ; Sat, 29 Mar 2008 16:49:18 +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 1E27E8FC19
	for ; Sat, 29 Mar 2008 16:49:18 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2TGnI98063169
	for ; Sat, 29 Mar 2008 16:49:18 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2TGnID2063167
	for perforce@freebsd.org; Sat, 29 Mar 2008 16:49:18 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Sat, 29 Mar 2008 16:49:18 GMT
Message-Id: <200803291649.m2TGnID2063167@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 138912 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 29 Mar 2008 16:49:19 -0000

http://perforce.freebsd.org/chv.cgi?CH=138912

Change 138912 by pgj@disznohal on 2008/03/29 16:49:07

	Fix of a fix: restore NCRized text.

Affected files ...

.. //depot/projects/docproj_hu/books/handbook/boot/chapter.sgml#4 edit

Differences ...

==== //depot/projects/docproj_hu/books/handbook/boot/chapter.sgml#4 (text+ko) ====

@@ -9,53 +9,53 @@
      Original Revision: 1.65                      -->
 
 
-  A &os; rendszerindítási folyamata
+  A &os; rendszerindítási folyamata
 
   
-    Áttekintés
-    rendszerindítás
-    rendszertöltő
+    Áttekintés
+    rendszerindítás
+    rendszertöltõ
 
-    A számítógép
-      indulását és a rajta található
-      operációs rendszer
-      betöltődését
-      rendszerindítási folyamatnak
-      nevezzük, vagy egyszerűen csak
-      bootolásnak.  A &os;
-      rendszerindítási folyamata
-      nagymértékű rugalmasságot
-      kínál a rendszer indulását
-      követő események vezérlését
-      illetően, legyen az a
-      számítógépre telepített
-      különféle operációs rendszerek
-      egyikének kiválasztása, vagy pedig ugyanazon
-      operációs rendszer valamelyik
-      változatának vagy rendszermagjának
-      kiválasztása.
+    A számítógép
+      indulását és a rajta található
+      operációs rendszer
+      betöltõdését
+      rendszerindítási folyamatnak
+      nevezzük, vagy egyszerûen csak
+      bootolásnak.  A &os;
+      rendszerindítási folyamata
+      nagymértékû rugalmasságot
+      kínál a rendszer indulását
+      követõ események vezérlését
+      illetõen, legyen az a
+      számítógépre telepített
+      különféle operációs rendszerek
+      egyikének kiválasztása, vagy pedig ugyanazon
+      operációs rendszer valamelyik
+      változatának vagy rendszermagjának
+      kiválasztása.
 
-    Ez a fejezet részleteiben bemutatja a
-      rendszerindításhoz kapcsolódó
-      konfigurációs opciókat, ill.  a &os;
-      bootolásának
-      testreszabhatóságát.  Ebbe minden
-      beleértendő, ami a &os; rendszermag beindulása
-      és az eszközök keresése során
-      történik, majd az &man.init.8;
-      elindításával zárul.  Ha nem vagyunk
-      teljesen biztosak benne, ez pontosan mikor is következik be,
-      figyeljük, amikor a szöveg színe
-      fehérről szürkére vált.
+    Ez a fejezet részleteiben bemutatja a
+      rendszerindításhoz kapcsolódó
+      konfigurációs opciókat, ill.  a &os;
+      bootolásának
+      testreszabhatóságát.  Ebbe minden
+      beleértendõ, ami a &os; rendszermag beindulása
+      és az eszközök keresése során
+      történik, majd az &man.init.8;
+      elindításával zárul.  Ha nem vagyunk
+      teljesen biztosak benne, ez pontosan mikor is következik be,
+      figyeljük, amikor a szöveg színe
+      fehérrõl szürkére vált.
 
-    A fejezet elolvasása során
-      megismerjük:
+    A fejezet elolvasása során
+      megismerjük:
 
     
       
-	milyen elemekből áll a &os;
-	  rendszertöltő alrendszere, és ezek
-	  miként kapcsolódnak egymáshoz
+	milyen elemekbõl áll a &os;
+	  rendszertöltõ alrendszere, és ezek
+	  miként kapcsolódnak egymáshoz
      
 
       
@@ -73,69 +73,69 @@
     
       Csak x86
 
-      Ez a fejezet kizárólag csak az &intel; x86
-	típusú architektúráján
-	futó &os; rendszerindítási
-	folyamatát mutatja be.
+      Ez a fejezet kizárólag csak az &intel; x86
+	típusú architektúráján
+	futó &os; rendszerindítási
+	folyamatát mutatja be.
 
    
   
 
   
-    A rendszerindítás
-      problémája
+    A rendszerindítás
+      problémája
 
-    Az operációs rendszer elindítása a
-      számítógép bekapcsolása
-      után egy felettébb érdekes
-      problémát vet fel.  Definíció szerint
-      a számítógép ugyanis egy
-      lépést sem tud megtenni az operációs
-      rendszer elindulása nélkül.
-      Például nem tud programokat futtatni a
-      lemezről.  Eszerint ha a
-      számítógépünk nem képes
-      programokat futtatni a lemezről az operációs
-      rendszer segítsége nélkül, viszont az
-      operációs rendszer programjai a lemezen vannak,
-      mégis hogyan képes elindulni maga az
-      operációs rendszer?
+    Az operációs rendszer elindítása a
+      számítógép bekapcsolása
+      után egy felettébb érdekes
+      problémát vet fel.  Definíció szerint
+      a számítógép ugyanis egy
+      lépést sem tud megtenni az operációs
+      rendszer elindulása nélkül.
+      Például nem tud programokat futtatni a
+      lemezrõl.  Eszerint ha a
+      számítógépünk nem képes
+      programokat futtatni a lemezrõl az operációs
+      rendszer segítsége nélkül, viszont az
+      operációs rendszer programjai a lemezen vannak,
+      mégis hogyan képes elindulni maga az
+      operációs rendszer?
 
-    Maga a probléma a Münchausen
-      báró kalandjai c.  könyvben
-      leírtakhoz hasonló.  A történet szerint
-      ugyanis a főszereplő egy mocsárban ragadt
-      derék lovával, azonban sikerült kihúznia
-      magát belőle a saját hajánál
-      fogva.  Ez a motívum vált a
-      számítógépek hőskorában a
-      rendszerbetöltés
-      alapjává, vagyis ahogyan
-      betöltötték az operációs
+    Maga a probléma a Münchausen
+      báró kalandjai c.  könyvben
+      leírtakhoz hasonló.  A történet szerint
+      ugyanis a fõszereplõ egy mocsárban ragadt
+      derék lovával, azonban sikerült kihúznia
+      magát belõle a saját hajánál
+      fogva.  Ez a motívum vált a
+      számítógépek hõskorában a
+      rendszerbetöltés
+      alapjává, vagyis ahogyan
+      betöltötték az operációs
       rendszereket.  (Ford.: ezt az angolban bootstrappingnek
-      hívják, mivel a történet angol
-      változata szerint a csizmáján (boot)
-      emelkedett ki.  Ebből alakult ki később az
-      elterjedt bootolás szó is.)
+      hívják, mivel a történet angol
+      változata szerint a csizmáján (boot)
+      emelkedett ki.  Ebbõl alakult ki késõbb az
+      elterjedt bootolás szó is.)
 
       BIOS
 
-    Alapvető be- és kimeneti
+    Alapvetõ be- és kimeneti
       rendszerBIOS
 
-    Az x86-os konfigurációkon a BIOS (Basic
-      Input/Output System, avagy alapvető be- és
-      kimeneti rendszer) felelős az operációs
-      rendszer betöltéséért.  Ehhez a BIOS
-      először megkeresi a merevlemezen egy speciális
-      helyén található Master Boot Record-ot (MBR).  A
-      BIOS elegendő tudással rendelkezik az MBR
-      beolvasásához és
-      lefuttatásához, és feltételezi, hogy
-      az MBR majd elvégzi az operációs rendszer
-      betöltéséhez szükséges
-      további feladatokat, helyenként a BIOS
-      közreműködésével.
+    Az x86-os konfigurációkon a BIOS (Basic
+      Input/Output System, avagy alapvetõ be- és
+      kimeneti rendszer) felelõs az operációs
+      rendszer betöltéséért.  Ehhez a BIOS
+      elõször megkeresi a merevlemezen egy speciális
+      helyén található Master Boot Record-ot (MBR).  A
+      BIOS elegendõ tudással rendelkezik az MBR
+      beolvasásához és
+      lefuttatásához, és feltételezi, hogy
+      az MBR majd elvégzi az operációs rendszer
+      betöltéséhez szükséges
+      további feladatokat, helyenként a BIOS
+      közremûködésével.
 
     Master Boot Record (MBR)
 
@@ -143,93 +143,93 @@
 
     Boot Loader
 
-    Az MBR-ben található programkódot
-      hívják általában boot
-      managernek, kiváltképp abban az esetben,
-      amikor az a felhasználóval is kommunikál.
-      Ilyenkor a boot manager többnyire további kódot
-      tartalmaz a lemez első
-      sávján vagy az egyik
-      állományrendszerben.  (A boot managereket
-      néha boot loadernek is nevezzük,
-      de a &os;-s terminológia ezt a kifejezést a
-      rendszerindítás egy későbbi
-      fokozatára használja.) Népszerűbb boot
+    Az MBR-ben található programkódot
+      hívják általában boot
+      managernek, kiváltképp abban az esetben,
+      amikor az a felhasználóval is kommunikál.
+      Ilyenkor a boot manager többnyire további kódot
+      tartalmaz a lemez elsõ
+      sávján vagy az egyik
+      állományrendszerben.  (A boot managereket
+      néha boot loadernek is nevezzük,
+      de a &os;-s terminológia ezt a kifejezést a
+      rendszerindítás egy késõbbi
+      fokozatára használja.) Népszerûbb boot
       managerek: boot0 (avagy
-      Boot Easy, a &os; alapvető boot
+      Boot Easy, a &os; alapvetõ boot
       managere), GRUB,
-      GAG és a
-      LILO.  (Ezek közül
-      egyedül csak a boot0 fér el
+      GAG és a
+      LILO.  (Ezek közül
+      egyedül csak a boot0 fér el
       az MBR-ben.)
 
-    Amennyiben merevlemezeinken csupán egyetlen
-      operációs rendszer foglal helyet, akkor egy
-      szabványos MBR tökéletes megfelelő.  Ez az
-      MBR megkeresi az első indítható (más
-      néven aktív) slice-ot a lemezen, majd lefuttatja a
-      benne található indítókódot az
-      operációs rendszer többi részének
-      felélesztéséhez.  Az &man.fdisk.8;
-      által alapértelmezés szerint
-      telepített MBR pontosan ilyen.  Ennek alapja a
-      /boot/mbr állomány.
+    Amennyiben merevlemezeinken csupán egyetlen
+      operációs rendszer foglal helyet, akkor egy
+      szabványos MBR tökéletes megfelelõ.  Ez az
+      MBR megkeresi az elsõ indítható (más
+      néven aktív) slice-ot a lemezen, majd lefuttatja a
+      benne található indítókódot az
+      operációs rendszer többi részének
+      felélesztéséhez.  Az &man.fdisk.8;
+      által alapértelmezés szerint
+      telepített MBR pontosan ilyen.  Ennek alapja a
+      /boot/mbr állomány.
 
-    Ha viszont több operációs rendszert is
-      telepítettünk a lemezeinkre, akkor egy ettől
-      eltérő boot managert érdemes
-      használnunk, olyat, amely képes felsorolni a
-      rendelkezésre álló operációs
-      rendszereket, lehetővé téve, hogy
-      választani lehessen az indításuk
-      között.  Ezek közül kettőről esik
-      szó a következő alfejezetekben.
+    Ha viszont több operációs rendszert is
+      telepítettünk a lemezeinkre, akkor egy ettõl
+      eltérõ boot managert érdemes
+      használnunk, olyat, amely képes felsorolni a
+      rendelkezésre álló operációs
+      rendszereket, lehetõvé téve, hogy
+      választani lehessen az indításuk
+      között.  Ezek közül kettõrõl esik
+      szó a következõ alfejezetekben.
 
-    A &os; rendszertöltő alrendszerének
-      fennmaradó része három fokozatra
-      bontható.  Az első fokozatot az MBR indítja el,
+    A &os; rendszertöltõ alrendszerének
+      fennmaradó része három fokozatra
+      bontható.  Az elsõ fokozatot az MBR indítja el,
       amely pontosan eleget tud ahhoz, hogy a
-      számítógépet egy előre megadott
-      állapotba hozza és lefutassa rajta a második
-      fokozatot.  A második fokozat ennél már egy
-      kicsivel többre képes, majd ezt követi a harmadik
-      fokozat.  Ez a fokozat zárja le végül az
-      operációs rendszer betöltésének
-      feladatát.  A munka tehát ezen három fokozat
-      között oszlik meg, mivel a PC-szabványok komoly
-      korlátozásokat tesznek az első ill.
-      második fokozatban futtatható programok
-      méretére.  A feladatok ilyen módon
-      történő összefűzése azonban a
-      &os; számára egy sokkalta rugalmasabb
-      betöltőt eredményez.
+      számítógépet egy elõre megadott
+      állapotba hozza és lefutassa rajta a második
+      fokozatot.  A második fokozat ennél már egy
+      kicsivel többre képes, majd ezt követi a harmadik
+      fokozat.  Ez a fokozat zárja le végül az
+      operációs rendszer betöltésének
+      feladatát.  A munka tehát ezen három fokozat
+      között oszlik meg, mivel a PC-szabványok komoly
+      korlátozásokat tesznek az elsõ ill.
+      második fokozatban futtatható programok
+      méretére.  A feladatok ilyen módon
+      történõ összefûzése azonban a
+      &os; számára egy sokkalta rugalmasabb
+      betöltõt eredményez.
 
     rendszermag
     init
 
-    Ezután beindul a rendszermag (más néven
-      kernel), és nekilát a
-      számítógépben rendelkezésre
-      álló hardvereszközök
-      keresésének, majd előkészíti
-      őket a használatra.  Ahogy a rendszermag
-      beindításának folyamata véget
-      ért, az átadja a vezérlést az
-      &man.init.8; nevű felhasználói programnak,
+    Ezután beindul a rendszermag (más néven
+      kernel), és nekilát a
+      számítógépben rendelkezésre
+      álló hardvereszközök
+      keresésének, majd elõkészíti
+      õket a használatra.  Ahogy a rendszermag
+      beindításának folyamata véget
+      ért, az átadja a vezérlést az
+      &man.init.8; nevû felhasználói programnak,
       amely megbizonyosodik a lemezek
-      használhatóságáról.  Az
-      &man.init.8; ezt követően megkezdi az
-      erőforrások felhasználói szintű
-      bekonfigurálását: csatlakoztatja az
-      állományrendszereket, beállítja a
-      hálózati kártyá(ka)t, és
-      elindítja mindazon programokat, amelyeknek egy &os;
-      rendszer indulásakor futnia kell.
+      használhatóságáról.  Az
+      &man.init.8; ezt követõen megkezdi az
+      erõforrások felhasználói szintû
+      bekonfigurálását: csatlakoztatja az
+      állományrendszereket, beállítja a
+      hálózati kártyá(ka)t, és
+      elindítja mindazon programokat, amelyeknek egy &os;
+      rendszer indulásakor futnia kell.
 
  
 
   
-    A boot manager és az indulás fokozatai
+    A boot manager és az indulás fokozatai
 
     Boot Manager
 
@@ -237,33 +237,33 @@
       A boot manager
       Master Boot Record (MBR)
 
-      Az MBR-ben található programkódot,
-	avagy boot managert, sokszor csak a rendszerindítás
-	nulladik fokozataként emlegetik.  Ez
-	az alfejezet a korábban említett két boot
-	managert tárgyalja: a boot0-t
-	és a LILO-t.
+      Az MBR-ben található programkódot,
+	avagy boot managert, sokszor csak a rendszerindítás
+	nulladik fokozataként emlegetik.  Ez
+	az alfejezet a korábban említett két boot
+	managert tárgyalja: a boot0-t
+	és a LILO-t.
 
       A <application>boot0</application> boot manager:
-	A &os; telepítője vagy a &man.boot0cfg.8;
-	  által kialakított MBR alapértelmezett
-	  állapotban a /boot/boot0
-	  állományon alapszik.  (A
-	  boot0 program nagyon egyszerű,
-	  hiszen az MBR-ben elhelyezhető
-	  kód csak 446 byte hosszúságú
-	  lehet, mert a végében még el kell
-	  férnie a slice-táblának és az
-	  0x55AA azonosítónak.) Ha
-	  telepítettük a boot0-t
-	  és a lemezeinken több operációs
-	  rendszer is megtalálható, akkor a
-	  rendszerindítás során egy hasonló
-	  képet kell látnunk:
+	A &os; telepítõje vagy a &man.boot0cfg.8;
+	  által kialakított MBR alapértelmezett
+	  állapotban a /boot/boot0
+	  állományon alapszik.  (A
+	  boot0 program nagyon egyszerû,
+	  hiszen az MBR-ben elhelyezhetõ
+	  kód csak 446 byte hosszúságú
+	  lehet, mert a végében még el kell
+	  férnie a slice-táblának és az
+	  0x55AA azonosítónak.) Ha
+	  telepítettük a boot0-t
+	  és a lemezeinken több operációs
+	  rendszer is megtalálható, akkor a
+	  rendszerindítás során egy hasonló
+	  képet kell látnunk:
       
 
       
-	A <filename>boot0</filename> munkában
+	A <filename>boot0</filename> munkában
 
 	F1 DOS
 F2 FreeBSD
@@ -274,39 +274,39 @@
 Default: F2
       
 
-      Más operációs rendszerek,
-	különösen a &windows;,
-	telepítésük során
-	felülírják a már meglevő MBR-t a
-	sajátjukkal.  Ha ez történne, vagy
-	egyszerűen csak szeretnénk a meglevő MBR-t
-	lecserélni a &os; MBR-jével, adjuk ki a
-	következő parancsot:
+      Más operációs rendszerek,
+	különösen a &windows;,
+	telepítésük során
+	felülírják a már meglevõ MBR-t a
+	sajátjukkal.  Ha ez történne, vagy
+	egyszerûen csak szeretnénk a meglevõ MBR-t
+	lecserélni a &os; MBR-jével, adjuk ki a
+	következõ parancsot:
 
-      &prompt.root; fdisk -B -b /boot/boot0 eszköznév
+      &prompt.root; fdisk -B -b /boot/boot0 eszköznév
 
-      ahol az eszköznév
-	annak az eszköznek a neve, ahonnan a rendszert
-	indítani szeretnénk, tehát pl.
-	ad0 az első IDE-lemez
-	esetén, vagy ad2 a
-	második IDE-vezérlőn található
-	első IDE-lemez esetén, ill.
-	da0 az első SCSI-lemez
-	esetén, és így tovább.  Ha testre
-	akarjuk szabni az MBR-t, használjuk a
+      ahol az eszköznév
+	annak az eszköznek a neve, ahonnan a rendszert
+	indítani szeretnénk, tehát pl.
+	ad0 az elsõ IDE-lemez
+	esetén, vagy ad2 a
+	második IDE-vezérlõn található
+	elsõ IDE-lemez esetén, ill.
+	da0 az elsõ SCSI-lemez
+	esetén, és így tovább.  Ha testre
+	akarjuk szabni az MBR-t, használjuk a
 	&man.boot0cfg.8;-t.
 
       
 	A LILO boot manager:
 
-	Ezen boot manager telepítéséhez
-	  és beállításához,
-	  elsőként indítsuk el a &linux;-ot és
-	  vegyük hozzá az alábbi sort a
-	  rendszerünkben található
+	Ezen boot manager telepítéséhez
+	  és beállításához,
+	  elsõként indítsuk el a &linux;-ot és
+	  vegyük hozzá az alábbi sort a
+	  rendszerünkben található
 	  /etc/lilo.conf
-	  konfigurációs állományhoz:
+	  konfigurációs állományhoz:
       
 
       other=/dev/hdXY
@@ -314,119 +314,119 @@
 loader=/boot/chain.b
 label=FreeBSD
 
-      A fenti sablont kiegészítve, a &linux;-os
-	konvenciók szerint adjuk meg a &os; elsődleges
-	partícióját és
-	meghajtóját úgy, hogy a
-	X-et átírjuk a
-	&linux;-os meghajtó betűjelére és az
-	Y-t átírjuk a &linux;
-	elsődleges partíciójának
-	számára.  Ha
-	SCSI-meghajtót használunk, a
-	/dev/hd részt is át
-	kell írnunk az előbbiek mellett
+      A fenti sablont kiegészítve, a &linux;-os
+	konvenciók szerint adjuk meg a &os; elsõdleges
+	partícióját és
+	meghajtóját úgy, hogy a
+	X-et átírjuk a
+	&linux;-os meghajtó betûjelére és az
+	Y-t átírjuk a &linux;
+	elsõdleges partíciójának
+	számára.  Ha
+	SCSI-meghajtót használunk, a
+	/dev/hd részt is át
+	kell írnunk az elõbbiek mellett
 	/dev/sd-re.  A
-	 sor elhagyható
-	abban az esetben, ha mind a két operációs
-	rendszer ugyanazon a meghajtón található.
-	Ha befejeztük a módosítást, futtassuk
+	 sor elhagyható
+	abban az esetben, ha mind a két operációs
+	rendszer ugyanazon a meghajtón található.
+	Ha befejeztük a módosítást, futtassuk
 	le a /sbin/lilo -v parancsot a
-	változtatásaink életbe
-	léptetéséhez.  Ezt
-	ellenőrizhetjük is a képernyőn
-	megjelenő üzenetek alapján.
+	változtatásaink életbe
+	léptetéséhez.  Ezt
+	ellenõrizhetjük is a képernyõn
+	megjelenõ üzenetek alapján.
 
     
 
     
-      Az első fokozat (<filename>/boot/boot1</filename>)
-	és a második fokozat
+      <title>Az elsõ fokozat (<filename>/boot/boot1</filename>)
+	és a második fokozat
 	(<filename>/boot/boot2</filename>)
 
-      Az első és a második fokozat fogalmilag
-	ugyanannak a programnak a része, a lemezen ugyanott
-	helyezkedik el.  A tárbeli megszorítások
-	miatt ugyan el kellett választani őket
-	egymástól, de a telepítésük
-	mindig egy helyre történik.  A telepítő
+      Az elsõ és a második fokozat fogalmilag
+	ugyanannak a programnak a része, a lemezen ugyanott
+	helyezkedik el.  A tárbeli megszorítások
+	miatt ugyan el kellett választani õket
+	egymástól, de a telepítésük
+	mindig egy helyre történik.  A telepítõ
 	vagy a bsdlabel (ld.  lentebb)
-	használata során a /boot/boot
-	nevű kombinált állományból
-	másolódnak ki.
+	használata során a /boot/boot
+	nevû kombinált állományból
+	másolódnak ki.
 
-      Az állományrendszereken kívül
-	találhatóak, az aktív slice első
-	sávjában, annak első
-	szektorától kezdődően.  Ez az a hely,
+      Az állományrendszereken kívül
+	találhatóak, az aktív slice elsõ
+	sávjában, annak elsõ
+	szektorától kezdõdõen.  Ez az a hely,
 	ahol a boot0 ill.  a
-	többi boot manager is keresi a
-	rendszerindítás folytatására
-	alkalmas programot.  A felhasznált szektorok száma
-	könnyedén kideríthető a
+	többi boot manager is keresi a
+	rendszerindítás folytatására
+	alkalmas programot.  A felhasznált szektorok száma
+	könnyedén kideríthetõ a
 	/boot/boot
-	méretéből.
+	méretébõl.
 
-      Legfeljebb 512 byte-os méreténél fogva
-	a boot1 állomány nagyon
-	egyszerű felépítésű, és
-	éppen csak annyit tud a slice-ra vonatkozó
-	információkat tároló &os;
-	bsdlabel-ről, hogy megtalálja
-	a boot2-t és
-	elindítsa.
+      Legfeljebb 512 byte-os méreténél fogva
+	a boot1 állomány nagyon
+	egyszerû felépítésû, és
+	éppen csak annyit tud a slice-ra vonatkozó
+	információkat tároló &os;
+	bsdlabel-rõl, hogy megtalálja
+	a boot2-t és
+	elindítsa.
 
-      A boot2 már egy kicsivel
-	ügyesebb, és ismeri eléggé a &os;
-	állományrendszerét ahhoz, hogy
-	megtaláljon rajta állományokat, valamint
-	képes egy egyszerű felületet nyújtani a
-	rendszermag vagy a betöltő
-	megválasztásához.
+      A boot2 már egy kicsivel
+	ügyesebb, és ismeri eléggé a &os;
+	állományrendszerét ahhoz, hogy
+	megtaláljon rajta állományokat, valamint
+	képes egy egyszerû felületet nyújtani a
+	rendszermag vagy a betöltõ
+	megválasztásához.
 
-      Mivel a betöltő
-	pedig már ennél is okosabb, és egy
-	könnyen használható
-	rendszerindítási konfigurációt tud a
-	felhasználó számára nyújtani,
-	ezért a boot2
-	általában ezt indítja el, de előtte
-	közvetlenül a rendszermag futtatását
-	végzi el.
+      Mivel a betöltõ
+	pedig már ennél is okosabb, és egy
+	könnyen használható
+	rendszerindítási konfigurációt tud a
+	felhasználó számára nyújtani,
+	ezért a boot2
+	általában ezt indítja el, de elõtte
+	közvetlenül a rendszermag futtatását
+	végzi el.
 
       
-	A <filename>boot2</filename> működés
-	  közben
+	A <filename>boot2</filename> mûködés
+	  közben
 
 	>> FreeBSD/i386 BOOT
 Default: 0:ad(0,a)/boot/loader
 boot:
       
 
-      Ha le kellene váltani a korábban
-	telepített boot1 és
-	boot2 fokozatokat, használjuk a
+      Ha le kellene váltani a korábban
+	telepített boot1 és
+	boot2 fokozatokat, használjuk a
 	&man.bsdlabel.8;-t:
 
       &prompt.root; bsdlabel -B lemezslice
 
       ahol a lemezslice annak a
-	lemeznek és slice-nak a kombinációja,
-	ahonnan indítjuk a rendszerünket, pl.  az első
-	IDE-lemez első slice-a esetén ez az
+	lemeznek és slice-nak a kombinációja,
+	ahonnan indítjuk a rendszerünket, pl.  az elsõ
+	IDE-lemez elsõ slice-a esetén ez az
 	ad0s1.
 
       
-	A veszélyesen dedikált mód
+	<title>A veszélyesen dedikált mód
 	  (Dangerously Dedicated Mode)
 
-	Amikor a &man.bsdlabel.8; meghívásakor csak
-	  a lemez nevét használjuk, pl.
+	Amikor a &man.bsdlabel.8; meghívásakor csak
+	  a lemez nevét használjuk, pl.
 	  ad0-t, a parancs egy
-	  veszélyesen dedikált lemezt hoz létre,
-	  slice-ok nélkül!  Szinte biztos, hogy nem ez az,
-	  amire szükségünk lenne, ezért mindig
-	  ellenőrizzük kiadása előtt a
+	  veszélyesen dedikált lemezt hoz létre,
+	  slice-ok nélkül!  Szinte biztos, hogy nem ez az,
+	  amire szükségünk lenne, ezért mindig
+	  ellenõrizzük kiadása elõtt a
 	  &man.bsdlabel.8; parancsot!
       
     
@@ -436,102 +436,102 @@
       (/boot/loader)
 
     boot-loader
-    A betöltő a három fokozatú
-      rendszertöltés utolsó állomása.  Az
-      állományrendszerben
-      /boot/loader néven találhatjuk
+    A betöltõ a három fokozatú
+      rendszertöltés utolsó állomása.  Az
+      állományrendszerben
+      /boot/loader néven találhatjuk
       meg.
 
-    A rendszertöltőt az egyszerű
-      konfigurálhatóságot támogató,
-      felhasználóbarát eszköznek
-      tervezték, és könnyen megtanulható,
-      beépített parancsokat használ, melyek
-      mögött egy összetettebb parancsokat ismerő,
-      erősebb értelmező áll.
+    A rendszertöltõt az egyszerû
+      konfigurálhatóságot támogató,
+      felhasználóbarát eszköznek
+      tervezték, és könnyen megtanulható,
+      beépített parancsokat használ, melyek
+      mögött egy összetettebb parancsokat ismerõ,
+      erõsebb értelmezõ áll.
 
     
-      A rendszertöltő működése
+      A rendszertöltõ mûködése
 
-      Az inicializálás során a
-	rendszertöltő megpróbálja megkeresni a
-	konzolt és a lemezek közül igyekszik
-	megtalálni azt, amelyikről elindult a rendszer.  A
-	keresések eredményének megfelelően
-	beállítja a változókat, majd elindul
-	egy értelmező, ahol vagy szkriptből olvasva
-	vagy pedig interaktívan feldolgozásra
-	kerülnek a parancsok.
+      Az inicializálás során a
+	rendszertöltõ megpróbálja megkeresni a
+	konzolt és a lemezek közül igyekszik
+	megtalálni azt, amelyikrõl elindult a rendszer.  A
+	keresések eredményének megfelelõen
+	beállítja a változókat, majd elindul
+	egy értelmezõ, ahol vagy szkriptbõl olvasva
+	vagy pedig interaktívan feldolgozásra
+	kerülnek a parancsok.
 
-      rendszertöltő
-      a rendszertöltő
-	konfigurációja
+      rendszertöltõ
+      a rendszertöltõ
+	konfigurációja
 
-      A rendszertöltő ezt követően beolvassa a
-	/boot/loader.rc állományt,
-	ami pedig alapértelmezés szerint feldolgozza a
+      A rendszertöltõ ezt követõen beolvassa a
+	/boot/loader.rc állományt,
+	ami pedig alapértelmezés szerint feldolgozza a
 	/boot/defaults/loader.conf
-	állományt, ahol a változók
-	értelmes kezdőértéket kapnak, valamint
-	feldolgozza még a /boot/loader.conf
-	állományt is, ahol a változók
-	értékeit változtathatjuk meg.
-	Miután ez lezajlott, a loader.rc a
-	változók értékeinek megfelelően
-	cselekszik, betöltve az ily módon
-	kiválasztott rendszermagot és a hozzá
-	választott modulokat.
+	állományt, ahol a változók
+	értelmes kezdõértéket kapnak, valamint
+	feldolgozza még a /boot/loader.conf
+	állományt is, ahol a változók
+	értékeit változtathatjuk meg.
+	Miután ez lezajlott, a loader.rc a
+	változók értékeinek megfelelõen
+	cselekszik, betöltve az ily módon
+	kiválasztott rendszermagot és a hozzá
+	választott modulokat.
 
-      Végezetül, a rendszertöltő beiktat
-	egy, alapértelmezés szerint 10 másodperces
-	várakozási szünetet, majd elindítja a
-	rendszermagot, ha azt meg nem szakítjuk egy
-	billentyű lenyomásával.  Ha
-	megszakítjuk ezt a várakozást, a
-	rendszertöltő egy parancssort ad, amin keresztül
-	egyszerű parancsokat adhatunk ki neki:
-	állíthatjuk a változók
-	értékeit, modulokat távolíthatunk el
-	a memóriából, modulokat
-	töltethetünk be, elindíthatjuk a rendszert vagy
-	újraindíthatjuk a
-	számítógépet.
+      Végezetül, a rendszertöltõ beiktat
+	egy, alapértelmezés szerint 10 másodperces
+	várakozási szünetet, majd elindítja a
+	rendszermagot, ha azt meg nem szakítjuk egy
+	billentyû lenyomásával.  Ha
+	megszakítjuk ezt a várakozást, a
+	rendszertöltõ egy parancssort ad, amin keresztül
+	egyszerû parancsokat adhatunk ki neki:
+	állíthatjuk a változók
+	értékeit, modulokat távolíthatunk el
+	a memóriából, modulokat
+	töltethetünk be, elindíthatjuk a rendszert vagy
+	újraindíthatjuk a
+	számítógépet.
 
     
 
     
-      A rendszertöltő beépített
+      <title>A rendszertöltõ beépített
 	parancsai
 
-      Következzenek a leggyakrabban használt parancsok
-	a rendszertöltőben.  Az összes itt
-	elérhető parancsot a &man.loader.8; man oldalon
-	találjuk meg.
+      Következzenek a leggyakrabban használt parancsok
+	a rendszertöltõben.  Az összes itt
+	elérhetõ parancsot a &man.loader.8; man oldalon
+	találjuk meg.
 
       
 	
 	  autoboot
-	    másodperc
+	    másodperc
 
 	  
-	    Megkezdi a rendszermag betöltését,
-	      ha nem szakítjuk meg a várakozást
-	      másodpercekben megadott időtartam alatt.
-	      Ekkor egy visszaszámlálást
-	      láthatunk, ami az alapértelmezés
-	      szerint 10 másodperctől indul.
+	    Megkezdi a rendszermag betöltését,
+	      ha nem szakítjuk meg a várakozást
+	      másodpercekben megadott idõtartam alatt.
+	      Ekkor egy visszaszámlálást
+	      láthatunk, ami az alapértelmezés
+	      szerint 10 másodperctõl indul.
 	  
 	
 
 	
 	  boot
-	    -opciók
+	    -opciók
 	    rendszermag
 
 	  
-	    Amennyiben léteznek, a megadott
-	      opciókkal azonnal megkezdi a megadott rendszermag
-	      betöltését.
+	    Amennyiben léteznek, a megadott
+	      opciókkal azonnal megkezdi a megadott rendszermag
+	      betöltését.
 	  
 	
 
@@ -539,84 +539,84 @@
 	  boot-conf
 
 	  
-	    Végigmegy a modulok ugyanazon automatikus
-	      konfigurációján, ahogy az a
-	      normális rendszerindítás során
-	      is történik.  Ezen parancs
-	      használatának csak akkor van értelme,
-	      ha előtte az unload parancsot
-	      használjuk, megváltoztatunk egy-két
-	      változót, általában a
+	    Végigmegy a modulok ugyanazon automatikus
+	      konfigurációján, ahogy az a
+	      normális rendszerindítás során
+	      is történik.  Ezen parancs
+	      használatának csak akkor van értelme,
+	      ha elõtte az unload parancsot
+	      használjuk, megváltoztatunk egy-két
+	      változót, általában a
 	      kernel-t.
 	  
 	
 
 	
 	  help
-	    témakör
+	    témakör
 
 	  
 	    A /boot/loader.help
-	      állományban fellelhető
-	      súgóüzeneteket mutatja meg.  Ha
-	      témakörnek indexet adunk
-	      meg, akkor az elérhető
-	      témakörök listáját kapjuk
+	      állományban fellelhetõ
+	      súgóüzeneteket mutatja meg.  Ha
+	      témakörnek indexet adunk
+	      meg, akkor az elérhetõ
+	      témakörök listáját kapjuk
 	      meg.
 	  
 	
 
 	
 	  include
-	    állománynév
+	    állománynév
 	    …
 
 	  
-	    Feldolgozza a megnevezett állományt:
-	      beolvassa, majd sorról-sorra értelmezi.  Hiba
-	      esetén azonnal megállítja a
-	      feldolgozást.
+	    Feldolgozza a megnevezett állományt:
+	      beolvassa, majd sorról-sorra értelmezi.  Hiba
+	      esetén azonnal megállítja a
+	      feldolgozást.
 	  
 	
 	
 	  load 
-	    típus
-	    állománynév
+	    típus
+	    állománynév
 
 	  
-	    A név alapján betölti a
-	      rendszermagot, modult vagy az adott típusú
-	      állományt.  Az
-	      állománynév után megadott
-	      további paraméterek az
-	      állománynak adódnak át.
+	    A név alapján betölti a
+	      rendszermagot, modult vagy az adott típusú
+	      állományt.  Az
+	      állománynév után megadott
+	      további paraméterek az
+	      állománynak adódnak át.
 	  
 	
 	
 	  ls 
-	    elérési
-	    útvonal
+	    elérési
+	    útvonal
 
 	  
-	    Kilistázza a megadott elérési
-	      útvonalon található
-	      állományokat, vagy ennek
-	      hiányában a gyökér
-	      tartalmát.  Ha hozzátesszük a
-	       kapcsolót, az
-	      állományok mérete is
-	      látható válik.
+	    Kilistázza a megadott elérési
+	      útvonalon található
+	      állományokat, vagy ennek
+	      hiányában a gyökér
+	      tartalmát.  Ha hozzátesszük a
+	       kapcsolót, az
+	      állományok mérete is
+	      látható válik.
 	  
 	
 	
 	  lsdev 
 
 	  
-	    Kilistázza az összes olyan eszközt,
-	      ahonnan modulokat tölthetünk be.  Amennyiben a
-	       kapcsolót is megadjuk,
-	      további részleteket tudhatunk meg
-	      róluk.
+	    Kilistázza az összes olyan eszközt,

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Sat Mar 29 17:20:53 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D2CA4106566B; Sat, 29 Mar 2008 17:20:52 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 916C31065672
	for ; Sat, 29 Mar 2008 17:20:52 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 7EC4D8FC1A
	for ; Sat, 29 Mar 2008 17:20:52 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2THKqXb065172
	for ; Sat, 29 Mar 2008 17:20:52 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2THKqx4065170
	for perforce@freebsd.org; Sat, 29 Mar 2008 17:20:52 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Sat, 29 Mar 2008 17:20:52 GMT
Message-Id: <200803291720.m2THKqx4065170@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 138914 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 29 Mar 2008 17:20:53 -0000

http://perforce.freebsd.org/chv.cgi?CH=138914

Change 138914 by pgj@disznohal on 2008/03/29 17:20:04

	Fix typos, composition, reword sentences. 
	
	Submitted by:	gabor (mentor)

Affected files ...

.. //depot/projects/docproj_hu/books/handbook/desktop/chapter.sgml#4 edit

Differences ...

==== //depot/projects/docproj_hu/books/handbook/desktop/chapter.sgml#4 (text+ko) ====

@@ -25,11 +25,12 @@
 
     &os;-n asztali alkalmazások széles
       spektrumát lehet futtatni, például
-      böngészõket, szövegszerkesztõket.
-      Legtöbbjük csomagként áll
-      rendelkezésre, ill.  automatizált módon
-      lefordíthatóak a portgyûjteménybõl.
-      Az új felhasználók közül sokan
+      böngészõket és
+      szövegszerkesztõket.  Legtöbbjük
+      csomagként áll rendelkezésre, ill.
+      automatizált módon lefordíthatóak a
+      Portgyûjteménybõl.  Az új
+      felhasználók közül sokan
       szeretnének ilyen fajta alkalmazásokat
       használni, ezért ez a fejezet bemutatja,
       miként lehet a népszerûbb asztali
@@ -39,7 +40,7 @@
       a Portgyûjteményben megtalálható
       formájukról.
 
-    Vegyük észre, hogy amikor portként
+    Vegyük figyelembe, hogy amikor portként
       telepítünk egy programot, a
       forráskódját fordítjuk le.  Ez
       bizonyos esetekben nagyon sokáig is eltarthat attól
@@ -55,22 +56,23 @@
       lefordított csomagból is
       telepíthetjük.
 
-    Mivel a &os; kínál fel
-      &linux;-kompatibilitást, számos, eredetileg &linux;-ra
-      fejlesztett alkalmazás is elérhetõvé
-      válik az asztali környezetünkre.  Azonban
-      határozottan javasoljuk, hogy a &linux;-os
-      alkalmazások használatához elõször
-      figyelmesen olvassa át a et.  A
-      &linux;-os bináris kompabilitást
-      használó portok neve általában a
-      linux- elõtaggal kezdõdik.  Ezt ne
-      felejtsük el figyelembe venni, amikor pl.  a &man.whereis.1;
-      segítségével keresünk egy portot.  A
-      fejezet további részében
-      feltételezzük, hogy aktiváltuk a bináris
-      &linux;-kompatibilitást a &linux;-os alkalmazások
-      telepítése elõtt.
+    Mivel a &os; rendelkezik Linux kompatibilitással,
+      számos, eredetileg &linux;-ra fejlesztett alkalmazás
+      is elérhetõvé válik az asztali
+      környezetünkön történõ
+      használatra.  Azonban határozottan javasoljuk, hogy
+      a &linux;-os alkalmazások használatához
+      elõször figyelmesen olvassa át a et.  A &linux;-os bináris
+      kompabilitást használó portok neve
+      általában a linux- elõtaggal
+      kezdõdik.  Ezt ne felejtsük el figyelembe venni, amikor
+      pl.  a &man.whereis.1; segítségével
+      keresünk egy portot.  A fejezet további
+      részében feltételezzük, hogy
+      aktiváltuk a bináris &linux;-kompatibilitást
+      a &linux;-os alkalmazások telepítése
+      elõtt.
 
     Íme a fejezetben tárgyalt
       kategóriák:
@@ -85,7 +87,7 @@
       
 
       
-	Termelõeszközök (mint a
+	Irodai eszközök (mint a
 	  KOffice,
 	  AbiWord, The
 	  GIMP,
@@ -93,7 +95,7 @@
       
 
       
-	Dokumentumnézegetõk (mint az
+	Dokumentum-megjelenítõk (mint az
 	  &acrobat.reader;,
 	  gv,
 	  Xpdf,
@@ -112,7 +114,7 @@
 
     
       
-	A külsõs alkalmazások
+	A külsõ alkalmazások
 	  telepítésének ismerete ().
       
@@ -145,12 +147,12 @@
       böngészõ.  Helyette keressük meg a
       Portgyûjteményben a www
-      könyvtárat, ahol viszont már rengeteg
+      könyvtárat, ahol ezzel szemben rengeteg
       böngészõ áll telepítésre
       készen.  Csomagolt formában is
       elérhetõek, ha nem lenne idõnk mindent
-      lefordítani (egyes esetekben termérdek idõnkbe
-      is kerülhet).
+      lefordítani (ami egyes esetekben akár rengeteg
+      idõnkbe is kerülhet).
 
     A KDE-hez és a
       GNOME-hoz eleve tartoznak
@@ -158,10 +160,10 @@
       asztalkörnyezetek beállításához a
       t olvassuk el.
 
-    Ha viszont csak pehelysúlyú
-      böngészõkre vágyunk, érdemes
-      megnéznünk a Portgyûjteményben
-      található Ha viszont csak egy kevés erõforrást
+      igénylõ böngészõkre vágyunk,
+      érdemes megnéznünk a
+      Portgyûjteményben található www/dillo, www/links vagy www/w3m portokat.
@@ -236,7 +238,7 @@
 	felhasználók felfedezhetnek némi
 	hasonlóságot a
 	Communicator programcsomaggal, mivel
-	ez a két böngészõ egykoron ugyanaz
+	ez a két böngészõ valaha ugyanaz
 	volt.
 
       233 MHz-nél lassabb processzorral vagy 64
@@ -340,9 +342,9 @@
       A &os; alapítvány megegyezett a Sun
 	Microsystems-szel, hogy terjesztheti a &java;
 	futtatókörnyezet (&jre;) és a &java;
-	fejlesztõkörnyezet (&jdk;) &os;-s bináris
-	változatait.  Ezek a csomagok elérhetõek a
-	&os;
 	alapítvány
 	honlapjáról.
@@ -450,10 +452,10 @@
 	mindent mást.  Ennek ellenére az
 	Opera viszonylag
 	pehelysúlyúnak és gyorsanak
-	számít.  Két fajta kiszerelésben is
+	számít.  Két fajta módon is
 	használható: létezik
 	natív &os;-s változata, valamint a
-	&linux;-emulációval futó
+	&linux; emulációval futó
 	változata.
 
       Az Opera &os;-s
@@ -516,15 +518,19 @@
   
 
   
-    Termelõeszközök
+    Irodai eszközök
 
-    Ha termelésrõl van szó, az új
-      felhasználók gyakorta keresnek egy jó irodai
-      programcsomagot vagy egy baratságos
-      szövegszerkesztõt.  Miközben a
-      különféle asztalkörnyzetek, mint mondjuk a
-      KDE
+    Amikor irodai felhasználásról van
+      szó, az új felhasználók gyakorta
+      keresnek egy jó irodai programcsomagot vagy egy
+      baratságos szövegszerkesztõt.  Habár az
+      egyes asztalkörnyezetek, mint
+      mondjuk a KDE, gyakran saját
+      irodai eszközöket is tartalmaznak, &os; alatt nincs
+      alapértelmezett irodai programcsomag.  A rendszer az
+      asztalkörnyezetektõl függetlenül igyekszik
+      felkínálni mindazt, amire
+      szükségünk lehet.
 
     Ebben a részben a következõ
       alkalmazásokról esik szó:
@@ -627,7 +633,7 @@
 
       Az AbiWord egy szabad
 	szövegszerkesztõ program, a µsoft;
-	Wordéhez hasonló kinézettel.
+	Word-höz hasonló kinézettel.
 	Remekül használható levelek,
 	beszámolók, feljegyzések, cikkek stb.
 	írásához.  Nagyon gyors, rengeteg
@@ -689,7 +695,7 @@
 	url="http://www.FreeBSD.org/ports/graphics.html">graphics
 	könyvtárában ezen felül
 	fellelhetjük a The Gimp Manualt,
-	vagyis The GIMP
+	vagyis a The GIMP
 	kézikönyvét.  Innen így kell õket
 	telepíteni:
 
@@ -724,9 +730,8 @@
 
       Az OpenOffice.org tartalmaz
 	minden olyan elengedhetetlenül fontos alkalmazást,
-	amelyek napjaink bármelyik irodai
-	termelõeszközéhez hozzátartoznak: egy
-	szövegszerkesztõt, egy
+	amelyek napjaink bármelyik irodájához
+	hozzátartoznak: egy szövegszerkesztõt, egy
 	táblázatkezelõt, egy
 	prezentációszerkesztõt és egy
 	rajzolóprogramot.  A felhasználói
@@ -753,7 +758,7 @@
 	&solaris;-on, &linux;-on, &os;-n és &macos; X-en.
 	Az OpenOffice.org-ról
 	bõvebb információt a saját
+	url="http://www.openoffice.org/">projekt saját
 	honlapján találhatunk.  A &os;-s
 	változatra vonatkozó információkat
 	és a csomagokat pedig a 
 
   
-    Dokumentumnézgetõk
+    Dokumentum-megjelenítõk
 
     A &unix; megjelenése óta néhány
       új népszerû dokumentumformátum is
       felbukkant, melyek szabványos megjelenítõi nem
       minden esetben részei az alaprendszernek.  Ebben a
       részben azt tekintjük át, hogyan lehet ilyen
-      nézegetõket telepíteni.
+      megjelenítõket telepíteni.
 
-    A rész az alábbi alkalmazásokat mutatja
-      be:
+    Ez a rész az alábbi alkalmazásokat
+      említi:
 
     
       
@@ -895,15 +900,15 @@
       
       
 	PDF
-	nézegetõ
+	megjelenítõ
       
 
       A dokumentumok többsége manapság PDF
-	állományok formájában terjed, avagy a
-	Portable Document Format (hordozható
-	dokumentumformátum)ban.  Az ilyen
-	típusú állományok
-	megnézésére az egyik legalkalmasabb az
+	(Portable Document Format, avagy hordozható
+	dokumentumformátum) állományok
+	formájában terjed.  Az ilyen típusú
+	állományok megnézésére az
+	egyik legalkalmasabb alkalmazás az
 	&acrobat.reader;, melyet az Adobe
 	adott ki &linux;-ra.  De mivel a &os; képes &linux;
 	binárisok futtatására, így &os;-re
@@ -916,8 +921,8 @@
       &prompt.root; cd /usr/ports/print/acroread7
 &prompt.root; make install clean
 
-      Csomag licenszelési megszorítások miatt
-	nem áll rendelkezésre.
+      Licenszelési megszorítások miatt a
+	csomag nem áll rendelkezésre.
 
     
 
@@ -928,15 +933,15 @@
       
       
 	PDF
-	nézegetõ
+	megjelenítõ
       
       
 	PostScript
-	nézegetõ
+	megjelenítõ
       
 
       A gv egy &postscript; és
-	PDF nézegetõ.  Eredetileg a
+	PDF megjelenítõ.  Eredetileg a
 	ghostview alapján
 	készült, de a Xaw3d-nek
 	köszönhetõen sokkal szebben néz ki.  Gyors
@@ -946,8 +951,8 @@
 	tájolása, a papírméret,
 	skálázás és az
 	élsimítás.  Szinte bármelyik
-	mûvelet elvégezhetõ vagy csak
-	billentyûzetrõl, vagy csak egérrel.
+	mûvelet elvégezhetõ csak
+	billentyûzetrõl vagy egérrel.
 
       A gv csomagjának
 	telepítéséhez a következõ parancsot
@@ -969,17 +974,18 @@
       
       
 	PDF
-	nézegetõ
+	megjelenítõ
       
 
-      Ha egy aprócska &os;-s PDF nézegetõre
+      Ha egy egyszerû &os;-s PDF megjelenítõre
 	lenne szükségünk, az
-	Xpdf pontosan egy ilyen
-	pehelysúlyú és hatékony eszköz.
-	Nagyon kevés erõforrást igényel
-	és nagyon megbízható.  A szabványos
-	X-beli betûtípusokat használja, és
-	nincs szüksége sem a
+	Xpdf pontosan egy ilyen kis
+	erõforrás-igényû és
+	hatékony eszköz.  Nagyon kevés
+	erõforrást igényel és nagyon
+	megbízható.  A szabványos X-beli
+	betûtípusokat használja, és nincs
+	szüksége sem a
 	&motif;-ra, sem pedig más X
 	eszközrendszerre.
 
@@ -1042,12 +1048,12 @@
   
     Pénzügyi szoftverek
 
-    Ha bármilyen ok folytán szeretnénk a
-      &os;-vel kezeli személyes pénzügyeinket, akadnak
-      olyan kellõen komoly és könnyen kezelhetõ
-      alkalmazások, amelyek csak a
-      telepítésükre várnak.
-      Néhány közülük kompatibilisek az
+    Ha bármilyen ok folytán a &os;-vel
+      szeretnénk kezeli személyes
+      pénzügyeinket, akadnak olyan kellõen komoly
+      és könnyen kezelhetõ alkalmazások, amelyek
+      csak a telepítésükre várnak.
+      Néhányuk közülük kompatibilis az
       elterjedtebb állományformátumokkal, mint
       mondjuk amiben a Quicken és az
@@ -1162,13 +1168,12 @@
 	alkalmazkodva automatikusan kitalálni a
 	felhasználó gondolatait a cellák
 	formátumának megfelelõ automatikus
-	kiegészítõ rendszerével.  Be tudja
-	olvasni jó néhány népszerûbb
-	formátumot, mint mondjuk az
-	Excel, Lotus
-	1-2-3 vagy a Quattro
-	Pro állományait.  A
-	Gnumeric a Excel,
+	Lotus 1-2-3 vagy a
+	Quattro Pro
+	állományait.  A math/guppi
 	grafikonkészítõ programon keresztül
 	támogatja grafikonok rajzolását is.  Nagy
@@ -1202,7 +1207,7 @@
 
       Az Abacus egy kicsi és
 	egyszerûen használható
-	táblázatkezelõ program.  Sok-sok olyan
+	táblázatkezelõ program.  Számos olyan
 	funkciót tartalmaz beépítve, amelyek
 	kifejezetten hasznosnak bizonyulhatnak a statisztika,
 	pénzügyek és a matematika
@@ -1293,8 +1298,8 @@
       környezetet tudjuk kiépíteni.
 
     Íme egy rövidke emlékeztetõ
-      azokról az asztali alkalmazásokról, melyeket a
-      fejezetben tárgyaltuk:
+      azokról az asztali alkalmazásokról, melyeket
+      a fejezetben tárgyaltunk:
 
     
       

From owner-p4-projects@FreeBSD.ORG  Sat Mar 29 18:13:00 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0426C1065674; Sat, 29 Mar 2008 18:13: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 9B3F5106566B
	for ; Sat, 29 Mar 2008 18:12:59 +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 88A278FC16
	for ; Sat, 29 Mar 2008 18:12:59 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2TICxeO070544
	for ; Sat, 29 Mar 2008 18:12:59 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2TICxIa070542
	for perforce@freebsd.org; Sat, 29 Mar 2008 18:12:59 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Sat, 29 Mar 2008 18:12:59 GMT
Message-Id: <200803291812.m2TICxIa070542@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 138921 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 29 Mar 2008 18:13:00 -0000

http://perforce.freebsd.org/chv.cgi?CH=138921

Change 138921 by pgj@disznohal on 2008/03/29 18:12:04

	Fix typos, refactor translation of "jail", remove slang :)
	
	Submitted by:	gabor (mentor)

Affected files ...

.. //depot/projects/docproj_hu/books/handbook/jails/chapter.sgml#6 edit

Differences ...

==== //depot/projects/docproj_hu/books/handbook/jails/chapter.sgml#6 (text+ko) ====

@@ -19,18 +19,17 @@
     
   
 
-  Elzárás
+  A jail alrendszer
 
-  elzárás
+  jail
 
   
     Áttekintés
 
-    Ez a fejezet a &os;-ben található
-      elzárási mechanizmust, valamint annak
-      használatát mutatja be közelebbrõl.  Az
-      elzárás (jail), melyet gyakran csak úgy
-      emlegetik, mint a chroot környezetek
+    Ez a fejezet a &os;-ben található jail
+      alrendszert, valamint annak használatát mutatja be
+      közelebbrõl.  Az jail, melyet gyakran csak úgy
+      emlegetnek, mint a chroot környezetek
       továbbfejlesztését, a rendszergazdák
       számára ajánlott, nagyon sokoldalú
       eszköz, de a haladó felhasználók is
@@ -41,63 +40,62 @@
 
     
       
-	Mi az elzárás, milyen célra
-	  használható a &os;-ben.
+	mi is az a jail, milyen célra
+	  használható a &os;-ben
       
 
       
-	Hogyan fordítsuk, indítsuk el és
-	  állítsuk le az elzárást.
+	hogyan hozzunk létre, indítsunk el és
+	  állítsunk le jaileket
       
 
       
-	A létrehozott elzárások
-	  karbantartásainak alapjait, az elzárásokon
-	  belülrõl és kívülrõl
-	  egyaránt.
+	a létrehozott jailek karbantartásainak
+	  alapjait, a jailek belülrõl és
+	  kívülrõl egyaránt
       
     
 
-    Az elzárásról még több
-      hasznos információt a következõ
-      helyekrõl tudhatunk meg:
+    A jail alrendszerrõl még több hasznos
+      információt a következõ helyekrõl
+      tudhatunk meg:
 
     
       
-	A &man.jail.8; man oldal.  Ez tartalmazza a
+	a &man.jail.8; man oldal.  Ez tartalmazza a
 	  jail segédprogram teljes
 	  referenciáját — ez az a
 	  karbantartásra használható eszköz,
 	  amellyel el tudjuk indítani, le tudjuk
-	  állítani és vezérelni tudjuk az
-	  elzárásokat a &os;-ben.
+	  állítani és vezérelni tudjuk a
+	  jaileket a &os;-ben
       
 
       
-	A levelezési listák és azok
-	  archívumai.  A &a.questions; archívuma és a
-	  &a.mailman.lists;en található többi
-	  levelezési lista halomnyi olvasnivalót tartogat
-	  az elzárásokkal kapcsolatban.  Mindig
-	  érdemes keresni ezekben az archívumokban, vagy
-	  beküldeni a kérdésünket a
-	  &a.questions.name; levelezési listára.
+	a levelezési listák és azok
+	  archívumai.  A &a.questions; archívuma és
+	  a &a.mailman.lists;en található többi
+	  levelezési lista rengeteg olvasnivalót tartogat
+	  a jailekkel kapcsolatban.  Mindig érdemes keresni
+	  ezekben az archívumokban, vagy beküldeni a
+	  kérdésünket a &a.questions.name;
+	  levelezési listára
       
     
 
   
 
   
-    Az elzáráshoz kapcsolódó
+    <title>A jail alrendszerhez kapcsolódó
       fogalmak
 
-    A &os;-ben található elzáráshoz
+    A &os;-ben található jail alrendszerhez
       tartozó részek és azok belsõ
       mûködésének, valamint a rendszer
-      többi részéhez történõ
-      kapcsolatának minél jobb megértése
-      érdekében az alábbi fogalmakat fogjuk
-      innentõl használni a fejezetben:
+      többi részével történõ
+      együttmûködésének minél jobb
+      megértése érdekében az alábbi
+      fogalmakat használjuk a fejezetben:
 
     
       
@@ -131,7 +129,7 @@
 	
 	  Az a rendszerkarbantartó segédprogram,
 	    amely lehetõvé teszi program
-	    elindítását egy elzárt
+	    elindítását elzárt
 	    környezetben.
 	
       
@@ -162,9 +160,8 @@
 	  stb.)
 	
 	  Olyan program, felhasználó vagy más
-	    egyéb egyed, amely csak egy elzáráson
-	    keresztül, korlátozottan tud
-	    hozzáférni az
+	    egyéb egyed, amely csak egy jailen keresztül,
+	    korlátozottan tud hozzáférni az
 	    erõforrásokhoz.
 	
       
@@ -182,32 +179,32 @@
       telepítését,
       beállítását és
       karbantartását igyekeznek valamilyen módon
-      jobbítani.  A rendszergazdák egyik feladata, hogy a
-      gondoskodjanak a biztonságról, miközben a
-      rendszer képes legyen ellátni az eredeti
+      jobbá tenni.  A rendszergazdák egyik feladata
+      úgy gondoskodni a biztonságról, hogy
+      közben a rendszer képes legyen ellátni eredeti
       feladatát.
 
     A &os; rendszerek biztonságosságának
-      növelését hivatott egyik ilyen eszköz az
-      elzárás (jails).
-      Elõször a &os; 4.X verziójában
-      bukkant fel, de jelentõs fejlõdésen ment
-      keresztül a &os; 5.X verziókban, aminek
-      köszönhetõen sokkal erõteljesebb és
-      rugalmasabb alrendszerré vált.  A fejlesztése
-      természetesen most is folytatódik tovább,
-      állandóan fejlõdik a
-      használhatósága, teljesítménye,
-      megbízhatósága és
-      biztonságossága.
+      növelését hivatott egyik ilyen eszköz a
+      jails.  Elõször a &os; 4.X
+      verziójában bukkant fel, de jelentõs
+      fejlõdésen ment keresztül a &os; 5.X
+      verziókban, aminek köszönhetõen sokkal
+      erõteljesebb és rugalmasabb alrendszerré
+      vált.  A fejlesztése természetesen most is
+      folytatódik tovább, állandóan
+      fejlõdik a használhatósága,
+      teljesítménye, megbízhatósága
+      és biztonságossága.
 
     
-      Mi is egy elzárás
+      Mi is az a jail?
 
       A BSD-szerû operációs rendszerekben
 	már a 4.2BSD óta megtalálható volt a
-	&man.chroot.2;.  A &man.chroot.8; segédprogrammal tudjuk
-	megváltoztatni adott programok számára a
+	&man.chroot.2;.  A &man.chroot.8; segédprogrammal meg
+	tudjuk megváltoztatni adott programok
+	számára a
 	gyökérkönyvtárat, és ezzel egy
 	biztonságos környezetet teremteni, távol a
 	rendszer többi részétõl.  A chroot-tal
@@ -236,24 +233,24 @@
 	alrendszert kellett kiépíteni.
 
       Ez az egyik oka annak, amiért az
-	elzárást
+	jaileket
 	  kifejlesztették.
 
-      Az elzárás ötlete több
-	szempontból is a hagyományos &man.chroot.2;
-	környezet elvén alapszik.  Egy hagyományos
-	&man.chroot.2; környezetben futó programok
-	korlátozása csupán abban merül ki,
-	hogy az állományrendszer melyik
+      A jailek által képviselt elzárás
+	ötlete több szempontból is a hagyományos
+	&man.chroot.2; környezet elvén alapszik.  Egy
+	hagyományos &man.chroot.2; környezetben futó
+	programok korlátozása csupán abban
+	merül ki, hogy az állományrendszer melyik
 	részét láthatják.  A rendszer
 	többi erõforrása (mint mondjuk a
 	felhasználók, futó programok vagy a
 	hálózati alrendszer) azonban továbbra is
 	megosztva marad a chroot környezetben és a
 	befogadó rendszerben futó programok
-	között.  Az elzárás kibõvíti
-	ezt a modellt, és nem csak az
-	állományrendszerre vonatkozó
+	között.  A jailek által alkalmazott
+	megoldás kibõvíti ezt a modellt, és
+	nem csak az állományrendszerre vonatkozó
 	hozzáférést virtualizálja, hanem
 	több más dolog mellett kiterjeszti ezt a
 	felhasználókra és a &os;
@@ -264,43 +261,41 @@
 	bõvebben a ban esik
 	szó.
 
-      Az elzárásokat az alább négy
-	elem írja le:
+      A jaileket az alább négy elem írja
+	le:
 
       
 	
 	  A könyvtárszerkezet egy
 	    részfája — attól a
-	    résztõl indulva, ahonnan az elzárás
-	    kezdõdik.  Az elzáráson belül
-	    futó programok nem léphetnek ki ebbõl a
+	    résztõl indulva, ahonnan a jail kezdõdik.
+	    A jailen belül futó programok nem
+	    léphetnek ki ebbõl a
 	    részfából.  Az eredeti &man.chroot.2;
 	    kialakításában merengõ
 	    biztonsági hibák lehetõségei nem
-	    veszélyeztetik a &os;
-	    elzárásait.
+	    veszélyeztetik a többi &os; jailt.
 	
 
 	
-	  A rendszer neve — a név, amelyet az
-	    elzáráson belül használunk.  Mivel
-	    az elzárásokat elsõsorban
-	    hálózati szolgáltatások
-	    kordában tartására használjuk,
-	    az elzárásokhoz tartozó beszédes
-	    rendszernevek sokat tudnak segíteni a
-	    rendszergazdák munkájában.
+	  A rendszer neve — a név, amelyet a jailen
+	    belül használunk.  Mivel a jaileket
+	    elsõsorban hálózati
+	    szolgáltatások kordában
+	    tartására használjuk, a jailekhez
+	    tartozó beszédes rendszernevek sokat tudnak
+	    segíteni a rendszergazdák
+	    munkájában.
 	
 
 	
-	  Egy IP-cím — ez fog
-	    tartozni az elzáráshoz és nem is
-	    változtatható meg a mûködése
-	    során.  Egy elzárás IP-címe
-	    általában egy már létezõ
-	    hálózati csatoló másik
-	    címe, de ez nem szükségszerûen igaz
-	    minden esetben.
+	  Egy IP-cím — a jailhez
+	    tartozik és nem változtatható meg a
+	    mûködése során.  Egy jail
+	    IP-címe általában egy már
+	    létezõ hálózati csatoló
+	    másik címe, de ez nem
+	    szükségszerûen igaz minden esetben.
 	
 
 	
@@ -314,9 +309,9 @@
 	
       
 
-      Ezektõl eltekintve az elzárások
-	rendelkezhetnek saját felhasználókkal
-	és lehetnek saját root
+      Ezektõl eltekintve a jailek rendelkezhetnek
+	saját felhasználókkal és lehetnek
+	saját root
 	felhasználóik is.  Természetesen a
 	root hatásköre csak az
 	elzárt környezetre korlátozódik,
@@ -332,53 +327,54 @@
 	korlátozásairól lentiekben bõvebben is
 	említést teszünk a ban.
+
     
   
 
   
-    Az elzárások létrehozása
-      és vezérlése
+    A jailek létrehozása és
+      vezérlése
 
-    Egyes rendszergazdák az elzárásokat a
-      következõ két típusba sorolják:
-      teljes elzárás, mely egy
-      valódi &os; rendszerre emlékeztet, és a
-      szolgáltatás elzárás,
-      mely egyetlen, feltehetõen kiemelt jogokkal futó
+    Egyes rendszergazdák a jaileket a következõ
+      két típusba sorolják: teljes
+      jail, mely egy valódi &os; rendszerre emlékeztet,
+      és a szolgáltatás jail, mely
+      egyetlen, feltehetõen kiemelt jogokkal futó
       alkalmazás vagy szolgáltatás
       számára van elõkészítve.  Ez a
-      besorolás csupán fogalmi szintû, az
-      elzárás felépítésének
-      módját nem befolyásolja.  A &man.jail.8; man
-      oldal vegytisztán ismerteti az elzárások
-      létrehozását:
+      besorolás csupán fogalmi szintû, a jail
+      felépítésének módját nem
+      befolyásolja.  A &man.jail.8; man oldal részletesen
+      ismerteti a jailek létrehozását:
 
-      &prompt.root; setenv D /itt/lesz/az/elzárás
+      &prompt.root; setenv D /itt/lesz/a/jail
 &prompt.root; mkdir -p $D 
 &prompt.root; cd /usr/src
 &prompt.root; make world DESTDIR=$D 
-&prompt.root; cd etc/ Ez a
-lépés nem szükséges a &os; 6.0-ás vagy annál újabb verziójában.
+&prompt.root; cd etc/
+
+  Ez a lépés nem szükséges a &os;
+    6.0-ás vagy annál újabb
+    verziójában.
+
 &prompt.root; make distribution DESTDIR=$D 
 &prompt.root; mount -t devfs devfs $D/dev 
 
     
       
-	Érdemes elõször az elzárás
-	  helyét megválasztani.  Itt fog fizikailag helyet
-	  foglalni a befogadó rendszer
-	  állományrendszerén belül az
-	  elzárás.  Jó választás
-	  lehet erre a /usr/jail/elzárás,
-	  ahol a elzárás az
-	  elzárást azonosító
-	  rendszernév.  A Érdemes elõször a jail helyét
+	  megválasztani.  Itt fog fizikailag helyet foglalni a
+	  befogadó rendszer
+	  állományrendszerén belül a jail.
+	  Jó választás lehet erre a /usr/jail/jailnév,
+	  ahol a jailnév a jailt
+	  azonosító rendszernév.  A /usr/
 	  állományrendszeren általában
-	  elegendõ hely jut az elzárás
+	  elegendõ hely jut a jail
 	  állományrendszerének, ami egy
-	  teljes elzárás esetén
+	  teljes jail esetén
 	  lényegében a &os; alaprendszer
 	  alapértelmezett telepítésében
 	  megtalálható összes állomány
@@ -386,8 +382,8 @@
       
 
       
-	Ez a parancs fogja felmásolni az
-	  elzárás fizikai helyének választott
+	Ez a parancs fogja felmásolni a jail fizikai
+	  helyének választott
 	  könyvtár-részfába a
 	  mûködéshez szükséges programokat,
 	  függvénykönyvtárakat, man oldalakat
@@ -408,15 +404,15 @@
 	  szólva, átmásolja az összes
 	  telepíhetõ állományt a /usr/src/etc/
-	  könyvtárból az elzárás
-	  /etc
+	  könyvtárból a jail /etc
 	  alkönyvtárába, vagyis a $D/etc/
 	  könyvtárba.
       
 
       
-	Az elzáráson belül a &man.devfs.8;
+	A jaileken belül a &man.devfs.8;
 	  csatlakoztatása nem kötelezõ.
 	  Másrészt azonban majdnem mindegyik
 	  alkalmazás, a feladatától
@@ -424,11 +420,10 @@
 	  hozzá akar férni.  Nagyon fontos, hogy a
 	  kezünkbe vegyük a eszközök
 	  hozzáférésének
-	  irányítását az
-	  elzáráson belül, mivel a helytelen
-	  beállítások révén a
-	  támadók csúnya dolgokat tudnak majd
-	  mûvelni.  A &man.devfs.8;
+	  irányítását a jaileken belül,
+	  mivel a helytelen beállítások
+	  révén a támadók csúnya
+	  dolgokat tudnak majd mûvelni.  A &man.devfs.8;
 	  mûködését a &man.devfs.8; és
 	  &man.devfs.conf.5; man oldalakon is ismertetett
 	  szabályrendszerek
@@ -436,16 +431,16 @@
       
     
 
-    Ahogy az elzárást telepítettük, a
-      &man.jail.8; segédprogrammal tudjuk elindítani.  A
-      &man.jail.8; négy kötelezõ paramétert
-      vár, melyekre a ban ki is
+    Ahogy a jailt telepítettük, a &man.jail.8;
+      segédprogrammal tudjuk elindítani.  A &man.jail.8;
+      négy kötelezõ paramétert vár,
+      melyekre a ban ki is
       térünk.  Más paraméterek is
       megadhatóak, pl.  az elzárt program egy adott
       felhasználó jogaival történõ
       futtatásához.  A
       
-      paraméter használata az elzárás
+      paraméter használata a jail
       típusától függ: egy
       virtuális rendszer esetében a
       /etc/rc jó választásnak
@@ -456,43 +451,42 @@
       szól, az adott szolgáltatástól vagy
       alkalmazástól függ.
 
-    A elzárásokat gyakran már a
-      rendszerindítás során elindítják,
-      amit a &os; rc mechanizmusa nagyban meg is
+    A jaileket gyakran már a rendszerindítás
+      során elindítják, amit a &os;
+      rc mechanizmusa nagyban meg is
       könnyít.
 
     
       
 	A rendszer indítása során
-	  aktiválandó elzárások
-	  listáját vegyük hozzá a
-	  &man.rc.conf.5; állományhoz:
+	  aktiválandó jailek listáját
+	  vegyük hozzá a &man.rc.conf.5;
+	  állományhoz:
 
 	jail_enable="YES"   # Ide NO-t írjunk, ha ki akarjuk kapcsolni
-jail_list="www"     # Szóközzel elválasztva soroljuk fel az elzárásokat
+jail_list="www"     # Szóközzel elválasztva soroljuk fel a jaileket
       
 
       
 	A jail_list-ben szereplõ
-	  összes elzárás meg kell adnunk az õket
+	  összes jailt meg kell adnunk az õket
 	  leíró &man.rc.conf.5;-beli
 	  beállításokat:
 
-	jail_www_rootdir="/usr/jail/www"     # az elzárás gyökérkönyvtára
-jail_www_hostname="www.example.org"  # az elzárás neve
-jail_www_ip="192.168.0.10"           # az elzárás IP-címe
-jail_www_devfs_enable="YES"          # legyen-e devfs az elzáráson belül
+	jail_www_rootdir="/usr/jail/www"     # a jail gyökérkönyvtára
+jail_www_hostname="www.example.org"  # a jail neve
+jail_www_ip="192.168.0.10"           # a jail IP-címe
+jail_www_devfs_enable="YES"          # legyen-e devfs a jailen belül
 jail_www_devfs_ruleset="www_ruleset" # az alkalmazott devfs szabályrendszer
 
 	Az &man.rc.conf.5; állományban szereplõ
-	  elzárások esetén a
-	  /etc/rc szkript fut le, tehát
-	  feltételezi, hogy az így megadott
-	  elzárás egy teljes virtuális rendszer.  A
-	  szolgáltatások elzárásához
-	  meg kell változtatnunk az elzárás
-	  alapértelmezett parancsát is.  Ezt a
-	  jail_elzárás_exec_start
+	  jailek esetén a /etc/rc szkript
+	  fut le, tehát feltételezi, hogy az így
+	  megadott jail egy teljes virtuális rendszer.  A
+	  szolgáltatások jailbe foglalásához
+	  meg kell változtatnunk a jail alapértelmezett
+	  parancsát is.  Ezt a
+	  jail_jailnév_exec_start
 	  opció megfelelõ
 	  beállításával tudjuk
 	  megtenni.
@@ -506,7 +500,7 @@
     Ha léteznek a megfelelõ bejegyzések az
       rc.conf állományban, az
       /etc/rc.d/jail szkript is
-      használható az elzárások kézzel
+      használható a jailek kézzel
       történõ elindítására vagy
       leállítására:
 
@@ -517,63 +511,62 @@
       pillanatban még nem érhetõ el szabályos
       módszer.  Ez azért van, mert a szabályos
       rendszerleállítást elvégzõ
-      parancsok nem használhatóak az
-      elzáráson belül.  Emiatt az
-      elzárásokat a legtisztábban úgy tudjuk
-      leállítani, ha kadjuk az alábbi parancsot
-      magában az elzárásban vagy pedig a
-      &man.jexec.8; segédprogrammal az elzáráson
-      kívülrõl:
+      parancsok nem használhatóak a jailen belül.
+      Emiatt a jaileket a legtisztábban úgy tudjuk
+      leállítani, ha kiadjuk az alábbi parancsot
+      magában a jailben vagy pedig a &man.jexec.8;
+      segédprogrammal a jailen kívülrõl:
 
     &prompt.root; sh /etc/rc.shutdown
 
     Errõl a témáról többet a
       &man.jail.8; man oldalon olvashatunk.
+
   
 
   
     Finomhangolás és karbantartás
 
-    Számos opció állítható be
-      az elzárásoknál, és sokféle
-      módon vegyíthetjük a befogadó &os;
-      rendszerünket az elzárásokkal, ami által
-      magasabb szintû alkalmazásokat hozhatunk létre.
-      Ebben a részben bemutatunk:
+    Számos opció állítható be a
+      jaileknél, és sokféle módon
+      vegyíthetjük a befogadó &os; rendszerünket
+      a jailekkel, ami által magasabb szintû
+      alkalmazásokat hozhatunk létre.  Ebben a
+      részben bemutatunk:
 
     
       
 	Néhány olyan
 	  beállítást, amellyel finomhangolhatjuk a
-	  telepített elzárások által
+	  telepített jailek által
 	  megvalósított biztonsági
 	  megszorítások viselkedését.
       
 
       
-	Az elzárások kezelésére
-	  alkalmas néhány olyan magasabb szintû
+	A jailek kezelésére alkalmas
+	  néhány olyan magasabb szintû
 	  alkalmazást, amelyek elérhetõek a &os;
 	  Portgyûjteményén keresztül, és
-	  általános elzárás alapú
-	  megoldások kialakításához
+	  általános jail alapú megoldások
+	  kialakításához
 	  használhatóak.
+	    
     
 
     
       A &os;-ben található finomhangoló
 	eszközök
 
-      Az elzárások
-	beállításainak finomhangolását
-	túlnyomórészt &man.sysctl.8;
-	változókkal végezhetjük el.  A
-	sysctl-en belül egy speciális
+      A jailek beállításainak
+	finomhangolását túlnyomórészt
+	&man.sysctl.8; változókkal végezhetjük
+	el.  A sysctl-en belül egy speciális
 	részfában találhatunk erre alkalmas
 	beállításokat: ez a a &os; rendszermag
 	opciói között megtalálható
 	security.jail.*.  Itt közüljük
-	az elzárásokra vonatkozó fontosabb sysctl
+	a jailekre vonatkozó fontosabb sysctl
 	változók listáját, az
 	alapértelmezett értékeikkel együtt.  A
 	nevek minden bizonnyal sokat elárulnak, de ha többet
@@ -637,20 +630,18 @@
 	szintjének) értékét.
 
       A &os; alaprendszere tartalmazza a rendszerben aktív
-	elzárások információit
-	megjelenítõ és a hozzájuk
-	történõ csatlakozásra
-	használható segédeszközöket.  A
-	&man.jls.8; és &man.jexec.8; parancsok részei az
-	alap &os; rendszernek, segítségükkel
-	elvégezhetõek az alábbi egyszerû
-	feladatokat:
+	jailek információit megjelenítõ
+	és a hozzájuk történõ
+	csatlakozásra használható
+	segédeszközöket.  A &man.jls.8; és
+	&man.jexec.8; parancsok részei az alap &os; rendszernek,
+	segítségükkel elvégezhetõek az
+	alábbi egyszerû feladatokat:
 
       
 	
-	  Ki tudjuk íratni az aktív
-	    elzárásokat és hozzájuk
-	    tartozó azonosítókat
+	  Ki tudjuk íratni az aktív jailek és
+	    hozzájuk tartozó azonosítókat
 	    (JID-eket),
 	    IP-címeket, neveket és
 	    útvonalakat.
@@ -658,42 +649,42 @@
 
 	
 	  A befogadó rendszerbõl hozzá tudunk
-	    csatlakozni egy futó elzáráshoz,
-	    és parancsokat tudunk futtatni az
-	    elzáráson belül vagy karbantartási
-	    feladatokat tudunk elvégezni magán az
-	    elzáráson belül.  Ez
+	    csatlakozni egy futó jailhez, és parancsokat
+	    tudunk futtatni a jailen belül vagy
+	    karbantartási feladatokat tudunk elvégezni
+	    magán a jailen belül.  Ez
 	    különösen hasznosnak bizonyulhat, amikor a
 	    root felhasználó
-	    szabályosan le akarja állítani az
-	    elzárást.  A &man.jexec.8;
-	    segédprogrammal el tudunk indítani egy
-	    parancsértelmezõt az elzáráson
+	    szabályosan le akarja állítani a jailt.
+	    A &man.jexec.8; segédprogrammal el tudunk
+	    indítani egy parancsértelmezõt a jailen
 	    belül, amibõl aztán
 	    irányíthatjuk.  Példa:
 
 	  &prompt.root; jexec 1 tcsh
 	
       
+
     
 
     
       Magasszintû karbantartó eszközök a
 	&os; Portgyûjteményében
 
-    A sok külsõs karbantartó eszköz
-      közül az egyik legteljesebb és leghasznosabb a
-      sysutils/jailutils.  Sok
-      kisebb alkalmazást tartalmaz, melyek kibõvítik
-      a &man.jail.8;
-      irányíthatóságát.  Bõvebb
-      információkért kérjük,
-      látogassa meg a hozzátartozó honlapot.
+      A sok külsõ karbantartó eszköz
+	közül az egyik legteljesebb és leghasznosabb a
+	sysutils/jailutils.  Sok
+	kisebb alkalmazást tartalmaz, melyek kibõvítik
+	a &man.jail.8;
+	irányíthatóságát.  Bõvebb
+	információkért kérjük,
+	látogassa meg a hozzátartozó honlapot.
+
     
   
 
   
-    Az elzárások alkalmazása
+    A jailek alkalmazása
 
     
       
@@ -706,16 +697,16 @@
 	
       
 
-      Szolgáltatások elzárása
+      Szolgáltatások jailbe
+	foglalása
 
-      Ez a rész eredetileg &a.simon;
-	írásán, melyet megtalálhatunk a 
-	címen, valamint Ken Tom (locals@gmail.com)
-	átdolgozott cikkén alapul.  Itt
-	megismerhetjük, hogyan állítsunk a &os;
-	rendszerünk felé egy biztonsági
-	réteget a &man.jail.8;
+      Ez a rész eredetileg &a.simon;  oldalon
+	található írásán, valamint
+	Ken Tom (locals@gmail.com) átdolgozott
+	cikkén alapul.  Itt megismerhetjük, hogyan
+	állítsunk be a &os; rendszerünkben egy
+	biztonsági réteget a &man.jail.8;
 	felhasználásával.  Továbbá
 	feltételezzük, hogy ez a rendszer legalább
 	RELENG_6_0 verziójú és a fejezetben
@@ -723,43 +714,40 @@
 	mértékben megértette.
 
       
-       A kialakítás
+	A kialakítás
 
-	Az elzárások egyik legnagyobb gondja a
-	  frissítés folyamatának
-	  lebonyolítása.  Azért jelent ez egyre
-	  inkább gondot, mert minden egyes elzárást
+	A jailek egyik legnagyobb gondja a frissítés
+	  folyamatának lebonyolítása.  Azért
+	  jelent ez egyre inkább gondot, mert minden egyes jailt
 	  újra fel kell építenünk a
 	  frissítése során.  Ez többnyire nem
-	  okoz gondot egyetlen elzárás használata
-	  során, mivel maga a frissítési folyamat
+	  okoz gondot egyetlen jail használata során,
+	  mivel maga a frissítési folyamat
 	  meglehetõsen egyszerû, azonban igen
 	  idõigényessé és
 	  fárasztóvá tud válni több
-	  elzárás esetében.
+	  jail esetében.
 
 	
-	  Ez a példa a &os; és
-	    képességeinek haladó szintû
-	    ismeretét követeli meg.  Amennyiben az itt
-	    bemutatott lépesek túlságosan is
-	    bonyolultnak tûnnének, érdemes olyan
-	    egyszerûbb rendszerek után nézni, mint
-	    mondjuk a sysutils/ezjail, amely egy
-	    egyszerûbb módszert kínál fel a
-	    &os;-ben használt elzárások
+	  Ez a példa a &os; képességeinek
+	    haladó szintû ismeretét követeli
+	    meg.  Amennyiben az itt bemutatott lépesek
+	    túlságosan is bonyolultnak
+	    tûnnének, érdemes olyan egyszerûbb
+	    rendszerek után nézni, mint mondjuk a
+	    sysutils/ezjail, amely
+	    egy egyszerûbb módszert kínál fel
+	    a &os;-ben használt jailek
 	    karbantartására, és nem is annyira
-	    szájbarágós, mint ez a
-	    példa.
+	    bonyolult, mint ez a példa.
 	
 
 	A bemutatandó példa célja, hogy
 	  feloldja az ilyen jellegû problémákat,
-	  és ezért igyekszik az elzárások
-	  között mindent megosztani, ami csak
-	  lehetséges.  Mindezt biztonságosan éri el
-	  — írásvédett &man.mount.nullfs.8;
+	  és ezért igyekszik a jailek között
+	  mindent megosztani, ami csak lehetséges.  Mindezt
+	  biztonságosan éri el —
+	  írásvédett &man.mount.nullfs.8;
 	  állományrendszer használatával,
 	  aminek köszönhetõen a frissítés
 	  maga egyszerûbbé, az egyes
@@ -767,17 +755,18 @@
 	  különzárása pedig
 	  vonzóbbá válik.  Ráadásul
 	  egyúttal egy nagyon egyszerû módszert mutat
-	  új elzárások
-	  hozzáadására és a régi
-	  törlésére ugyanúgy, mint a
+	  az új jailek hozzáadására
+	  és a régi törlésére
+	  ugyanúgy, mint a
 	  frissítésükre.
 
 	
 	  Például ilyen
 	    szolgáltatásokat kívánunk
-	    szabályozni: egy HTTP szervert, egy
-	    DNS szervert, egy SMTP
-	    szervert és így tovább.
+	    szabályozni: egy HTTP szervert,
+	    egy DNS szervert, egy
+	    SMTP szervert és így
+	    tovább.
 	
 
 	Az itt szereplõ beállítás
@@ -787,23 +776,21 @@
 	  
 	    Készítsünk egy egyszerûen
 	      és könnyen átlátható
-	      elzárási rendszert.  Ebbõl tehát
+	      jailkezelési rendszert.  Ebbõl tehát
 	      következik, hogy ne kelljen
 	      lefuttatni a teljes rendszer
 	      telepítését minden egyes
-	      elzárásra.
+	      jailre.
 	  
 	  
-	    Könnyítsük meg az új
-	      elzárások hozzáadását
-	      és a régiek
+	    Könnyítsük meg az új jailek
+	      hozzáadását és a régiek
 	      eltávolítását.
 	  
 	  
 	    Könnyítsük meg a már
-	      létezõ elzárások
-	      frissítését és
-	      cseréjét.
+	      létezõ jailek frissítését
+	      és cseréjét.
 	  
 	  
 	    Tegyük lehetõvé saját &os;
@@ -812,8 +799,8 @@
 	  
 	    Legyünk különösen
 	      körültekintõek a biztonság
-	      tekintetében, és igyekezzünk minél
-	      jobban csökkenteni veszély
+	      tekintetében, és igyekezzünk
+	      minél jobban csökkenteni veszély
 	      kockázatát.
 	  
 	  
@@ -828,10 +815,9 @@
 	  építkezik egyetlen fõ sablonra, amely
 	  írásvédetten kerül
 	  csatlakoztatásra (nullfsen
-	  keresztül) az egyes elzárásokban, valamint
-	  elzárásonként egy-egy
-	  írható-olvasható eszközre.  Ez az
-	  eszköz lehet egy külön fizikai lemez, egy
+	  keresztül) az egyes jailekben, valamint jailenként
+	  egy-egy írható-olvasható eszközre.
+	  Ez az eszköz lehet egy külön fizikai lemez, egy
 	  partíció vagy egy vnode alapú &man.md.4;
 	  eszköz.  Ebben a példában
 	  írható-olvasható
@@ -843,37 +829,36 @@
 
 	
 	  
-	    Minden elzárást a Minden jailt a /home/j
 	      könyvtárban csatlakoztatunk.
 	  
 	  
 	    A /home/j/mroot
-	      lesz az összes elzárás sablonja
-	      és mindegyikük számára
+	      lesz az összes jail sablonja és
+	      mindegyikük számára
 	      írásvédett.
 	  
 	  
-	    Minden elzárásnak létrehozunk egy
-	      üres alkönyvtárat a /home/j"
+	    Minden jailnek létrehozunk egy üres
+	      alkönyvtárat a /home/j
 	      könyvtárban.
 	  
 	  
-	    Minden elzárásnak lesz egy Minden jailnek lesz egy /s alkönyvtára,
 	      amelyet a rendszer írható-olvasható
 	      részére irányítunk.
 	  
 	  
-	    Minden elzárásnak lesz egy saját
-	      írható-olvasható része, amely a
-	      /home/j/skel
+	    Minden jailnek lesz egy saját
+	      írható-olvasható része, amely
+	      a /home/j/skel
 	      könyvtáron alapszik.
 	  
 	  
-	    Mindegyik elzárt terület (az
-	      elzárások
+	    Mindegyik elzárt terület (a jailek
 	      írható-olvasható része) a
 	      /home/js
 	      könyvtárban jön létre.
@@ -881,14 +866,15 @@
 	
 
 	
-	  Ez a kiosztás feltételezi, hogy az
-	    elzárásokat a /home partíción
-	    hozzuk létre.  Ez természetesen bármi
-	    másra megváltoztatható, de akkor
-	    figyelnünk kell erre minden egyes parancs
-	    kiadása elõtt.
+	  Ez a kiosztás feltételezi, hogy a jaileket
+	    a /home
+	    partíción hozzuk létre.  Ez
+	    természetesen bármi másra
+	    megváltoztatható, de akkor figyelnünk
+	    kell erre minden egyes parancs kiadása
+	    elõtt.
 	
+
       
 
       
@@ -896,9 +882,8 @@
 
 	Ez a rész leírja a fõ sablon
 	  létrehozásához szükséges
-	  lépéseket.  Ez az elzárások
-	  számára írásvédett
-	  lesz.
+	  lépéseket.  Ez a jailek számára
+	  írásvédett lesz.
 
 	Érdemes mindig frissíteni a &os;
 	  rendszerünket a legújabb -RELEASE ágra.
@@ -923,10 +908,9 @@
 	      az írásvédett
 	      állományrendszer
 	      könyvtárszerkezetét, amely majd
-	      tartalmazni fogja az elzárások által
-	      használt &os;-s programokat.  Ezután
-	      lépjünk be a &os;
-	      forrásfájának
+	      tartalmazni fogja a jailek által használt
+	      &os;-s programokat.  Ezután lépjünk be
+	      a &os; forrásfájának
 	      könyvtárába és
 	      telepítsük fel az
 	      írásvédett
@@ -936,10 +920,11 @@
 &prompt.root; cd /usr/src
 &prompt.root; make installworld DESTDIR=/home/j/mroot
 	  
+
 	  
 	    Ezt követõen készítsük
-	      elõ az elzárások számára a
-	      &os; Portgyûjteményt és &os;
+	      elõ a jailek számára a &os;
+	      Portgyûjteményt és &os;
 	      forrásfát, melyek kellenek a
 	      mergemaster
 	      használatához:
@@ -949,6 +934,7 @@

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Sat Mar 29 18:16:04 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2E43E1065672; Sat, 29 Mar 2008 18:16: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 E22DD106564A
	for ; Sat, 29 Mar 2008 18:16:03 +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 B74878FC27
	for ; Sat, 29 Mar 2008 18:16:03 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2TIG3Ub070682
	for ; Sat, 29 Mar 2008 18:16:03 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2TIG3Ge070680
	for perforce@freebsd.org; Sat, 29 Mar 2008 18:16:03 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Sat, 29 Mar 2008 18:16:03 GMT
Message-Id: <200803291816.m2TIG3Ge070680@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 138922 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 29 Mar 2008 18:16:04 -0000

http://perforce.freebsd.org/chv.cgi?CH=138922

Change 138922 by pgj@disznohal on 2008/03/29 18:15:36

	Remove — from title.

Affected files ...

.. //depot/projects/docproj_hu/books/handbook/l10n/chapter.sgml#3 edit

Differences ...

==== //depot/projects/docproj_hu/books/handbook/l10n/chapter.sgml#3 (text+ko) ====

@@ -25,7 +25,7 @@
     
   
 
-  Honosítás &mdash Az I18N/L10N használata
+  <title>Honosítás: Az I18N/L10N használata
     és beállítása
 
   

From owner-p4-projects@FreeBSD.ORG  Sat Mar 29 18:53:44 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DDCBC1065673; Sat, 29 Mar 2008 18:53: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 819C8106566C
	for ; Sat, 29 Mar 2008 18:53: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 6FFEB8FC23
	for ; Sat, 29 Mar 2008 18:53:43 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2TIrhlm071883
	for ; Sat, 29 Mar 2008 18:53:43 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2TIrhNW071881
	for perforce@freebsd.org; Sat, 29 Mar 2008 18:53:43 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Sat, 29 Mar 2008 18:53:43 GMT
Message-Id: <200803291853.m2TIrhNW071881@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 138924 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 29 Mar 2008 18:53:44 -0000

http://perforce.freebsd.org/chv.cgi?CH=138924

Change 138924 by pgj@disznohal on 2008/03/29 18:53:09

	Fix typos, spelling, translation. Reword sentences.
	
	   Submitted by:  gabor (mentor)
	                  Miklos QUARTUS 

Affected files ...

.. //depot/projects/docproj_hu/books/handbook/introduction/chapter.sgml#4 edit

Differences ...

==== //depot/projects/docproj_hu/books/handbook/introduction/chapter.sgml#4 (text+ko) ====

@@ -37,22 +37,22 @@
 
     
       
-	Hogyan viszonyul a &os; más operációs
-	  rendszerekhez.
+	hogyan viszonyul a &os; más operációs
+	  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ú
-	  fejlesztési modelljének alapjait.
+	a &os; nyílt forráskódú
+	  fejlesztési modelljének alapjait
       
       
-	És természetesen: hogyan is keletkezett a
-	  &os; név.
+	és természetesen: hogyan is keletkezett a
+	  &os; név
       
     
 
@@ -60,6 +60,7 @@
 
   
     Üdvözöljük a &os;-ben!
+
     4.4BSD-Lite
 
     A &os; egy 4.4BSD-Lite alapú operációs
@@ -70,11 +71,12 @@
       architektúrákra.  Olvashatunk a &os; történetérõl
       vagy éppen az aktuális
-      kiadásáról.  Ha szeretnénk adni
-      valamit a projektnek (forráskód, hardver vagy
-      pénz), olvassuk el a .  Ha szeretnénk
+      hozzájárulni a projekt
+      fejlõdéséhez (forráskód, hardver
+      vagy pénz), olvassuk el a Hozzájárulás
-      a &os;-hez c. cikket.
+      a &os;-hez c.  cikket.
 
     
       Mire képes a &os;?
@@ -86,6 +88,7 @@
       
 	preemptív
 	  ütemezés
+
 	
 	  A preemptív
 	    ütemezés dinamikusan
@@ -100,6 +103,7 @@
 
 	többfelhasználós
 	  rendszer
+
 	
 	  Többfelhasználós
 	    rendszerként lehetõvé teszi,
@@ -121,27 +125,30 @@
 	
 
 	TCP/IP protokoll
+
 	
 	  A TCP/IP hálózati
-	    protokoll gyors és megbízható
-	    implementációja, ill.  a legfontosabb ipari
-	    szabványok, mint az SCTP, DHCP, NFS, NIS, PPP, SLIP,
-	    IPsec és IPv6 támogatása.
-	    Ezáltal egy &os;-s gép könnyedén
+	    protokoll gyors és
+	    megbízható implementációja, ill.
+	    a legfontosabb ipari szabványok, mint az SCTP, DHCP,
+	    NFS, NIS, PPP, SLIP, IPsec és IPv6
+	    támogatása.  Ezáltal egy &os;-s
+	    számítógép könnyedén
 	    képes együttmûködni más
 	    rendszerekkel vagy akár vállalati
 	    szerverként is üzemelni.  Megbirkózik az
 	    NFS (távoli
 	    állományelérés) és az
 	    elektronikus levelezés megszervezésével
-	    ugyanúgy, ahogy a szervezetünk Internetes
-	    megjelenésével a WWW, FTP és
+	    ugyanúgy, ahogy a vállalatunk internetes
+	    elvárásaival a WWW, FTP és
 	    forgalomirányítási protokollokon
-	    keresztül és tûzfalazási
+	    keresztül és tûzfal iránti
 	    (biztonsági) igényeivel is.
 	
 
 	memóriavédelem
+
 	
 	  A memóriavédelem
 	    megvalósítása gondoskodik róla,
@@ -161,14 +168,14 @@
 	
 
 	
-    X Window System
-    XFree86
-  
+	  X Window System
+	  XFree86
+	
 
 	
 	  A X Window System ipari
-	    szabványa (X11R7) alapján szolgáltatja a
-	    grafikus felhasználói felületet (GUI)
+	    szabványa (X11R7) alapján szolgáltatja
+	    a grafikus felhasználói felületet (GUI)
 	    bármelyik VGA-kártyán és
 	    monitoron, ill.  annak teljes forráskódja is
 	    elérhetõ.
@@ -194,6 +201,7 @@
 	  bináris kompatibilitás
 	  NetBSD
 	
+
 	
 	  Bináris szintû
 	    kompatibilitás a &linux;-ra, SCO-ra,
@@ -214,7 +222,7 @@
 	
 	  További könnyen
 	    portolható alkalmazások ezrei
-	    állnak rendelkezésre az Interneten.  A &os;
+	    állnak rendelkezésre az interneten.  A &os;
 	    forráskódja kompatibilis a legtöbb
 	    elterjedt kereskedelmi &unix; rendszerével, aminek
 	    köszönhetõen az alkalmazások nagy
@@ -226,6 +234,7 @@
 
 	virtuális
 	  memória
+
 	
 	  Az igény szerinti lapozással
 	    mûködõ virtuális
@@ -242,6 +251,7 @@
 	  Többprocesszoros (SMP) rendszerek
 	    támogatása
 	
+
 	
 	  Az SMP támogatása a
 	    több processzorral rendelkezõ
@@ -253,14 +263,17 @@
 	  fordítóprogramok
 	  C
 	
+
 	
 	  fordítóprogramok
 	  C++
 	
+
 	
 	  fordítóprogramok
 	  FORTRAN
 	
+
 	
 	  C, C++
 	    és Fortran fejlesztõi
@@ -273,6 +286,7 @@
 	
 
 	forráskód
+
 	
 	  Az egész rendszer
 	    forráskódjának
@@ -280,13 +294,13 @@
 	    fokú irányítást
 	    élvezhessük a környezetünk felett.
 	    Miért is bíznánk magunkat egy
-	    zárt rendszert fejlesztõ cég kegyeire,
-	    mikor lehetne egy igazán nyílt
+	    zárt rendszert fejlesztõ cégre, mikor
+	    lehetne egy igazán nyílt
 	    rendszerünk?
 	
 
 	
-	  Nagy mennyiségû Internetes
+	  Nagy mennyiségû internetes
 	    dokumentáció.
 	
 
@@ -296,12 +310,12 @@
 	
       
 
-      4.4BSD-Lite
-      
-	Számítógépes rendszerek
+	4.4BSD-Lite
+	Számítógépes rendszerek
 	  kutatói csoport (CSRG)
-      
-      Berkeley
+	
+	Berkeley
+
       A &os; kaliforniai Berkeley Egyetem
 	Számítógépes rendszerek
 	kutatócsoportja által fejlesztett 4.4BSD-Lite
@@ -323,14 +337,14 @@
 	ezeket!
 
       Kizárólag csak a képzeletünk
-	szabhat gátat annak, hogy mire is tudjuk használni a
-	&os;-t.  Szoftverfejlesztéstõl kezdve, a
+	szabhat gátat annak, hogy mire is tudjuk használni
+	a &os;-t.  Szoftverfejlesztéstõl kezdve, a
 	gyári automatizáláson és
 	készletnyilvántartáson át a
 	mûholdas antennák tájolásáig
 	szinte mindenre: ha ezt eddig egy kereskedelmi &unix;-al is meg
 	tudtuk tenni, akkor nagyon valószínû, hogy a
-	&os;-vel is képesek leszünk erre!  A &os; ezeken
+	&os;-vel is képesek leszünk erre!  A &os; ezen
 	felül nagyban profitál a világban
 	található különbözõ
 	kutatóközpontok és egyetemek által
@@ -341,16 +355,16 @@
 	képviseltetik magukat minden nap.
 
       Mivel a &os; forráskódja
-	általánosan elérhetõ, a rendszer szinte
-	tetszõleges mértékben testreszabható a
-	különleges elvárásokat
-	támasztó alkalmazások vagy projektek
-	számára.  Ez a nagyobb kereskedelmi
-	fejlesztõk operációs rendszereivel majdnem
-	teljesen elképzelhetetlen.  Íme csupán
-	néhány példája azon
-	alkalmazásoknak, melyek jelenleg is &os;-t
-	használnak:
+	általánosan elérhetõ, a rendszer
+	szinte tetszõleges mértékben
+	testreszabható a különleges
+	elvárásokat támasztó
+	alkalmazások vagy projektek számára.  Ez a
+	nagyobb kereskedelmi fejlesztõk operációs
+	rendszereivel majdnem teljesen elképzelhetetlen.
+	Íme csupán néhány
+	példája azon alkalmazásoknak, melyek
+	jelenleg is &os;-t használnak:
 
       
 	
@@ -358,7 +372,7 @@
 	    szolgáltatások: A &os;-be
 	    épített szilárd TCP/IP alapú
 	    hálózatkezelés
-	    különféle Internetes
+	    különféle internetes
 	    szolgáltatások számára teszi
 	    ideális platformmá:
 
@@ -381,6 +395,7 @@
 
 	    tûzfal
 	    NAT
+
 	    
 	      Tûzfalak és NAT (IP
 		maszkolás),
@@ -391,14 +406,14 @@
 	      elektronikus levelezés
 	      e-mail
 	    
-	    
-	      e-mail
-	    
+	    e-mail
+
 	    
 	      Elektronikus levelezõ szerverek
 	    
 
 	    USENET
+
 	    
 	      USENET hír- és
 		hirdetményrendszer
@@ -417,13 +432,14 @@
 	
 
 	
-	  Oktatás: Netalán
-	    informatikával vagy mûszaki informatikával
-	    foglalkozik?  Nem is lehetne jobban a &os; által
-	    felkínált élményeken
-	    kívül máshogy megismerkedni
-	    elsõkézbõl az operációs
-	    rendszerek, számítógépes
+	  Oktatás: Esetleg
+	    informatikával vagy mûszaki
+	    informatikával foglalkozik?  Nem is lehetne jobban a
+	    &os; által felkínált
+	    élményeken kívül máshogy
+	    megismerkedni elsõkézbõl az
+	    operációs rendszerek,
+	    számítógépes
 	    architektúrák és
 	    hálózatok mûködésével.
 	    Rengeteg szabadon használható mûszaki,
@@ -439,7 +455,7 @@
 	  Kutatás: Miután a
 	    teljes &os; rendszer forráskódja bárki
 	    számára elérhetõ,
-	    tökéletes kiindulást ad az
+	    tökéletes kiindulási pontot ad az
 	    operációs rendszerek
 	    témakörében vagy a
 	    számítástudomány egyéb
@@ -457,9 +473,11 @@
 
 	forgalomirányító
 	DNS szerver
+
 	
 	  Hálózatépítés:
-	    Szüksége van egy új routerre?  Esetleg egy
+	    Szüksége van egy új
+	    útválasztóra?  Esetleg egy
 	    névszerverre (DNS)?  Egy tûzfalra, mely
 	    távoltartja a nemkívánatos
 	    egyéneket a belsõ
@@ -479,6 +497,7 @@
 	  X Window System
 	  Accelerated-X
 	
+
 	
 	  X Window
 	    munkaállomás: A &os; a szabadon
@@ -498,9 +517,11 @@
 	    válik.
 	
 
-	GNU Compiler Collection
+	GNU Compiler
+	  Collection
+
 	
-	  Szoftverfejlesztés:Az alap
+	  Szoftverfejlesztés: Az alap
 	    &os; rendszer fejlesztõeszközök
 	    tömkelegével, többek közt a
 	    híres GNU C/C++ fordítóval és
@@ -514,6 +535,7 @@
 	beszerzésével kapcsolatos bõvebb
 	információkért olvassuk el a t.
+
     
 
     
@@ -521,72 +543,84 @@
 
       
 	felhasználók
-	&os;-t használó nagy oldalak
+	&os;-t használó nagy
+	  oldalak
       
 
-      A &os;-t az Interneten található nagyobb
+      A &os;-t az interneten található nagyobb
 	oldalak közül sokan használják, mint
 	például:
 
       
 	Yahoo!
+
 	
 	  Yahoo!
 	
 
 	Apache
+
 	
 	  Apache
 	
 
 	Blue Mountain Arts
+
 	
 	  Blue Mountain
 	    Arts
 	
 
 	Pair Networks
+
 	
 	  Pair
 	    Networks
 	
 
 	Sony Japan
+
 	
 	  Sony
 	    Japan
 	
 
 	Netcraft
+
 	
 	  Netcraft
 	    
 	
 
 	Weathernews
+
 	
 	  Weathernews
 	
 
 	Supervalu
+
 	
 	  Supervalu
 	
 
 	TELEHOUSE America
+
 	
 	  TELEHOUSE
 	    America
 	
 
 	Sophos Anti-Virus
+
 	
 	  Sophos
 	    Anti-Virus
 	
 
 	JMA Wired
+
 	
 	  JMA Wired
@@ -594,8 +628,8 @@
       
 
       és még sokan mások.
+
     
-
   
 
   
@@ -625,9 +659,10 @@
       Williams, Nate
       Grimes, Rod
       
-        &os; project
-        történet
+	&os; project
+	történet
       
+
       A &os; projekt valamikor 1993 kezdetérõl
 	eredeztethetõ, és részben a Nem
 	hivatalos 386BSD Patchkit-bõl nõtt ki, a
@@ -636,6 +671,7 @@
 	köszönhetõen.
 
       386BSD
+
       Eredeti célunk a 386BSD köztes
 	állapotainak rögzítése lett volna,
 	amitõl olyan problémák
@@ -648,10 +684,11 @@
 	hivatkoztak.
 
       Jolitz, Bill
+
       A 386BSD Bill Jolitz operációs rendszere volt,
 	mely ennél a pontnál már közel egy
-	éve nem került ápolásra.  Mivel a a
-	hozzátartozó patchkit pedig napról napra
+	éve nem került ápolásra.  Mivel a
+	hozzátartozó patchkit pedig napról-napra
 	duzzadt, egyre kényelmetlenebbé vált a
 	karbantartása.  Ezért egyhangúan úgy
 	döntöttünk, hogy segítünk Billnek
@@ -666,6 +703,7 @@
 
       Greenman, David
       Walnut Creek
+
       Nem tartott sokáig eldöntenünk, hogy ez a
 	cél továbbra is megéri a
 	fáradtságot, még Bill
@@ -680,16 +718,15 @@
 	kapcsolatot a Walnut Creek-kel, terjesztési mód
 	után nézve azokra számára, akik nem
 	tudtak akkoriban könnyedén hozzáférni
-	az Internethez.  A Walnut Creek nem csak támogatta a &os;
+	az internethez.  A Walnut Creek nem csak támogatta a &os;
 	CD-n történõ terjesztését, hanem
 	még egy számítógépet
-	és egy gyors Internet-kapcsolatot is a projekt
-	számára rendelkezésre bocsátott.  A
-	Walnut Creek szinte példátlan
-	mértékû, egy akkoriban teljesen ismeretlen
-	projektbe vetett hitével nagyon nehezen lenne
-	elképzelhetõ, hogy a &os; olyan messzire jutott
-	volna el, ahol ma is tart.
+	és egy gyors internet kapcsolatot is a projekt
+	számára bocsátott.  A Walnut Creek szinte
+	példátlan mértékû, egy
+	akkoriban teljesen ismeretlen projektbe vetett hitével
+	nagyon nehezen lenne elképzelhetõ, hogy a &os; olyan
+	messzire jutott volna el, ahol ma is tart.
 
       4.3BSD-Lite
       Net/2
@@ -697,9 +734,10 @@
       386BSD
       Szabad szoftver
 	alapítvány
-      Az elsõ CD-s (és általános
-	széleskörû netes) változat a &os; 1.0
-	volt, amely 1993.  decemberében jelent meg.  A
+
+      Az elsõ CD-lemezen (és széles körben
+	az interneten is megjelenõ) változat a &os; 1.0
+	volt, amely 1993 decemberében jelent meg.  A
 	Berkeley-rõl származó 4.3BSD-Lite
 	(Net/2) szalagokon található
 	források alapján készült,
@@ -708,30 +746,31 @@
 	származó komponensekkel.  Elsõ
 	kiadásként igen méltányos sikert
 	könyvelhetett el, melyet a még inkább sikeres
-	&os; 1.1-el folytattunk 1994.
+	&os; 1.1-el folytattunk 1994
 	májusában.
 
       Novell
       Berkeley
       Net/2
       AT&T
+
       Nagyjából ekkortájt
-	néhány váratlan sötét felhõ
-	bukkant fel az égbolton, ahogy a Novell és a
-	Berkeley hosszantartó pereskedése lezárult
-	a Berkeley Net/2 szalagjainak jogi formáját
-	illetõen.  Ennek eredményeképpen a Berkeley
-	elfogadta, hogy a Net/2 nagy része
-	jelzáloggalt terhelt és a Novell
-	tulajdona, aki pedig valamivel korábban az
-	AT&T-tõl szerezte.  Ezért cserébe a
-	Berkeley megkapta a Novell
+	néhány váratlan sötét
+	felhõ bukkant fel az égbolton, ahogy a Novell
+	és a Berkeley hosszantartó pereskedése
+	lezárult a Berkeley Net/2 szalagjainak jogi
+	formáját illetõen.  Ennek
+	eredményeképpen a Berkeley elfogadta, hogy a Net/2
+	nagy része jelzáloggalt terhelt
+	és a Novell tulajdona, aki pedig valamivel
+	korábban az AT&T-tõl szerezte.  Ezért
+	cserébe a Berkeley megkapta a Novell
 	áldását a 4.4BSD-Lite
 	kiadásra, és amikor az véglesen kijön,
 	megszûnik a rajta levõ jelzálog.  Emiatt az
 	összes Net/2 felhasználónak erõsen
 	javasolt volt váltani.  Ez érintette magát
-	a &os;-t is, és így a projekt 1994.
+	a &os;-t is, és így a projekt 1994
 	júliusáig kapott határidõt, hogy
 	leállítsa a Net/2 alapú termékeinek
 	szállítását.  A megegyezés
@@ -740,52 +779,53 @@
 	amely végül a &os; 1.1.5.1 lett.
 
       A &os;-nek ekkor szembesülnie kellett azzal a
-	nehéz feladattal, hogy lényegében újra
-	fel kellett találnia magát, a teljesen új
-	és meglehetõsen hiányos 4.4BSD-Lite
+	nehéz feladattal, hogy lényegében
+	újra fel kellett találnia magát, a teljesen
+	új és meglehetõsen hiányos 4.4BSD-Lite
 	bitjeitõl elindulva.  A Lite
-	(egyszerûsített) kiadások abban
-	részben az értelemben számítottak
-	egyszerûbbnek, hogy a Berkeley kutatói (a
-	különbözõ jogi követelések
-	miatt) eltávolították a ténylegesen
+	(egyszerûsített) kiadások abban az
+	értelemben számítottak egyszerûbbnek,
+	hogy a Berkeley kutatói (a különbözõ
+	jogi követelések miatt)
+	eltávolították a ténylegesen
 	beindítható rendszerhez szükséges
-	programrészek nagy részét, ill.  a 4.4-es
-	verzió Intel processzorokra készített
-	portja nagyon is befejezetlen volt.  A projektnek egészen
-	1994.  novemberéig tartott, hogy megtegye ezt a
-	lépést, ugyanis ekkor jelent meg a &os; 2.0 a
-	neten és (december vége felé) CD-n.  Annak
-	ellenére, hogy még némileg érdes
-	maradt bizonyos helyeken, ez a kiadás jelentõs
-	sikereket ért el.  Ezt követte 1995.
-	júniusában a sokkalta szilárdabb és
-	könnyebben telepíthetõ &os; 2.0.5.
+	programrészek nagyobb részét, ill.  a
+	4.4-es verzió Intel processzorokra
+	készített portja nagyon is befejezetlen volt.  A
+	projektnek egészen 1994 novemberéig tartott, hogy
+	megtegye ezt a lépést, ugyanis ekkor jelent meg a
+	&os; 2.0 az interneten és (december vége
+	felé) CD-n.  Annak ellenére, hogy még
+	némileg érdes maradt bizonyos helyeken, ez a
+	kiadás jelentõs sikereket ért el.  Ezt
+	követte 1995 júniusában a sokkalta stabilabb
+	és könnyebben telepíthetõ
+	&os; 2.0.5.
 
-      A &os; 2.1.5-öt 1996.  augusztusában adtuk
+      A &os; 2.1.5-öt 1996 augusztusában adtuk
 	ki, mely akkora népszerûségnek örvendett
-	az Internetszolgáltatók és kereskedelmi
+	az internetszolgáltatók és kereskedelmi
 	közösségek körében, hogy a a
-	2.1-STABLE ág mentén egy újabb
+	2.1-STABLE elágazásból egy újabb
 	kiadást készítettünk.  Ez volt a
-	&os; 2.1.7.1, amely 1997.  februárjában
-	jelent meg és ezzel együtt a 2.1-STABLE
+	&os; 2.1.7.1, amely 1997 februárjában jelent
+	meg és ezzel együtt a 2.1-STABLE
 	fejlesztését is zárta.  Most már
 	csak karbantartást végzünk rajta, és
 	csak a biztonsági és egyéb kritikus
 	hibajavítások kerülnek bele
 	(RELENG_2_1_0).
 
-      A &os; 2.2 fejlesztése 1996.
-	novemberében ágazott le az akkori fejlesztõi
+      A &os; 2.2 fejlesztése 1996 novemberében
+	ágazott le az akkori fejlesztõi
 	(-CURRENT) ágból, mint a
 	RELENG_2_2-es ág.  Ebbõl az elsõ teljes
-	kiadás (2.2.1) 1997.  áprilisában jelent
-	meg.  A 2.2-es ág mentén további
-	kiadások 1997 nyarán és õszén
+	kiadás (2.2.1) 1997 áprilisában jelent meg.
+	A 2.2-es ág mentén további kiadások
+	1997 nyarán és õszén
 	készültek, melyek közül az utolsó
-	(2.2.8) 1998.  novemberében jelent meg.  Az elsõ
-	hivatalos 3.0-ás kiadás 1998.
+	(2.2.8) 1998 novemberében jelent meg.  Az elsõ
+	hivatalos 3.0-ás kiadás 1998
 	októberében jött ki, ami egyúttal a
 	2.2-es ág befejezésének kezdetét
 	jelentette.
@@ -807,10 +847,9 @@
 	március 13-án történt, mellyel
 	életre kelt a 4.X-STABLE ág.  Ebbõl
 	aztán számos kiadás született: a
-	4.0-RELEASE 2000.  márciusában mutatkozott be, az
-	utolsó 4.11-RELEASE pedig 2005.
-	januárjában látott
-	napvilágot.
+	4.0-RELEASE 2000 márciusában mutatkozott be, az
+	utolsó 4.11-RELEASE pedig 2005 januárjában
+	látott napvilágot.
 
       A várva várt 5.0-RELEASE 2003.  január
 	19-én került bejelentésre.  Közel
@@ -822,12 +861,12 @@
 	útján, valamint az &ultrasparc; és
 	ia64 platformok támogatása is
 	itt jelent meg elõször.  Ezt a kiadást a 5.1
-	követte 2003.  júniusában.  A
+	követte 2003 júniusában.  A
 	hozzátartozó -CURRENT ágból az
-	utolsó kiadás az 5.2.1-RELEASE volt, amely 2004.
+	utolsó kiadás az 5.2.1-RELEASE volt, amely 2004
 	februárjában mutatkozott be.
 
-      A 2004.  augusztusában, a RELENG_5 ág
+      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
@@ -835,45 +874,47 @@
 	ágból már nem fog készülni
 	több kiadás.
 
-      A fejlesztési fa ezután 2005.
+      A fejlesztési fa ezután 2005
 	júliusában ágazott el ismét,
 	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
+	2005 novemberében jelent meg.  A legújabb
 	&rel.current;-RELEASE &rel.current.date;jában
 	jelentkezett.  A RELENG_6 á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 7.X-CURRENT (törzs) ágban
+	kapnak helyet, és a 7.X-bõl készült
 	idõközönkénti pillanatkiadások
 	folyamatosan elérhetõek CD-n (és
 	természetesen neten keresztül is) a
 	pillanatkiadásokat tároló
 	szerverrõl.
+
     
 
     
       
-        
+	
 	  
 	    Jordan
 	    Hubbard
 	    Írta: 
 	  
-        
+	
       
 
       A &os; projekt céljai
 
       
-        &os; project
-        célok
+	&os; project
+	célok
       
-      A &os; projekt célja olyan szoftverek
-	nyújtása, amelyek tetszõlegesen,
+
+      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.
 	Sokunk jelentõs energiát fektet a programokba
@@ -898,18 +939,21 @@
       
         GNU Lesser General Public License (LGPL)
       
-      BSD Copyright
+      BSD licensz
+
       A forrásfánkban található GNU
-	General Public License (GPL) vagy a Libraray General Public
-	License (LGPL) alá esõ kódokra viszont
-	már némileg több megszorítás
+	General Public License (GPL) vagy a Library General Public
+	License (LGPL) alá esõ kódok
+	hozzáférhetõségére ezzel
+	szemben némileg több megszorítás
 	vonatkozik, legalább is inkább ami a
-	hozzáférhetõséget illeti.  Azonban,
-	mivel a GPL-es szoftverek kereskedelmi használata
-	további bonyodalmakat vethet fel, ha
-	lehetõségünk adódik rá,
-	inkább a sokkal enyhébb BSD copyrighttal
-	rendelkezõ szoftvereket választjuk.
+	hozzáférhetõséget illeti.  Mivel a
+	GPL-es szoftverek kereskedelmi használata további
+	bonyodalmakat vethet fel, ha lehetõségünk
+	adódik rá, inkább a sokkal enyhébb
+	BSD licensszel rendelkezõ szoftvereket
+	választjuk.
+
     
 
     
@@ -929,6 +973,7 @@
 	&os; projekt
 	fejlesztési modell
       
+
       A &os; fejlesztése egy nagyon nyitott és
 	rugalmas folyamat, szó szerint a világ minden
 	tájáról érkezõ
@@ -938,12 +983,12 @@
 	url="&url.articles.contributors;/article.html">résztvevõink
 	listáján.  A &os; fejlesztési
 	infrastruktúrája lehetõvé teszi, hogy
-	ez a többszáznyi résztvevõ az Interneten
+	ez a többszáznyi résztvevõ az interneten
 	keresztül mûködjön együtt.
 	Folyamatosan várjuk az új fejlesztõket
 	és ötleteket, és mindazok, akik komolyabban
 	érdeklõdnek a projekt iránt, egyszerûen
-	csak vegyék fel velünk a kapcsolatot a &a.hackers;
+	felvehetik velünk a kapcsolatot a &a.hackers;
 	címén.  Egy &a.announce; is elérhetõ
 	azok számára, akik értesíteni
 	kívánják a többi &os;
@@ -958,28 +1003,28 @@
 
       
 	
-	  A CVS tárházA CVS repository
 
 	  
 	    CVS
-	    tárház
+	    repository
 	  
 	  
 	    Concurrent Versions System
 	    CVS
 	  
+
 	  
 	    A &os; központi forrásfáját
-	      CVS
-	      (Concurrent Versions System)-en keresztül
-	      tartják karban, amely egy, a &os;-vel is
-	      érkezõ, szabadon elérhetõ
-	      forráskód-kezelõ eszköz.  Az
-	      elsõdleges 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 CVS
-	      tárház egy Santa Clara-i
-	      (California, USA) számítógépen
+	      repository egy Santa Clara-i (California, USA)
+	      számítógépen
 	      található, ahonnan a világban
 	      található rengeteg tükörre
 	      másolódik.  A CVS-fa, mely tartalmazza a
@@ -989,28 +1034,29 @@
 	      számítógépünkre is.
 	      Ennek részleteirõl bõvebben a A forrásfa
-	      szinkronizálása c. részben
+	      szinkronizálása c.  részben
 	      olvashatunk.
 	  
 	
 
 	
-	  A kommitterek listájaA committerek listája
 
-	  kommitterek
+	  committerek
+
 	  
-	    A kommitterek azok az emberek,
+	    A committerek azok az emberek,
 	      akik a CVS-fához írási joggal
 	      rendelkeznek, tehát módosítást
 	      hajthatnak végre a &os; forrásaiban (a
-	      kommitter kifejezés a &man.cvs.1;
+	      committer kifejezés a &man.cvs.1;
 	      commit parancsából
 	      származik, amelyet arra használunk, hogy
 	      felvigyük a módosításainkat a
-	      CVS tárházba).  Javaslatainkat legjobban a
+	      CVS repository-ba).  Javaslatainkat legjobban a
 	      &man.send-pr.1; használatával tudjuk a
-	      kommitterek elé tárni.  Ha valamiért
+	      committerek elé tárni.  Ha valamiért
 	      ez mégsem mûködne,
 	      megpróbálhatjuk õket elérni
 	      közvetlenül a &a.committers;
@@ -1024,6 +1070,7 @@
 
 	  irányító
 	    csoport
+
 	  
 	    Ha a &os; projekt egy vállalat lenne, akkor a
 	      &os; irányító
@@ -1035,22 +1082,22 @@
 	      irányba haladjon.  Az irányító
 	      csoportnak ugyanígy feladata a
 	      megbízható és odaadó
-	      kommitterek tömörítése és
+	      committerek tömörítése és
 	      az új tagok beszervezése, ha a
 	      csoportból kilépne valaki.  A jelenlegi
-	      irányító csoport tagjait 2006.
+	      irányító csoport tagjait 2006
 	      júliusában választották meg.
 	      A választásokat kétévente
 	      tartják.
 
 	    Ebben a csoportban egyes tagoknak ezen felül
-	      még bizonyos területekre felügyelniük
-	      is kell.  Ez azt jelenti, hogy felelõsek a rendszer
-	      valamelyik nagyobb részének az
-	      elõírásoknak megfelelõ
-	      mûködéséért.  A &os;
-	      fejlesztõk teljes felsorolása és a
-	      hozzájuk tartozó területek
+	      még bizonyos területekre
+	      felügyelniük is kell.  Ez azt jelenti, hogy
+	      felelõsek a rendszer valamelyik nagyobb
+	      részének az elõírásoknak
+	      megfelelõ mûködéséért.
+	      A &os; fejlesztõk teljes felsorolása és
+	      a hozzájuk tartozó területek
 	      megtalálhatóak A
 	      résztvevõk listjában.
@@ -1078,6 +1125,7 @@
 	  Külsõ résztvevõk
 
 	  résztvevõk
+
 	  
 	    Végül, de nem utoljára,
 	      következzen a fejlesztõk legnagyobb csoportja:
@@ -1133,6 +1181,7 @@
 	kérünk a leendõ &os; fejlesztõinktõl,
 	hogy legyenek legalább annyira elszántak, mint a
 	jelenlegi tagjaink!
+
     
 
     
@@ -1148,6 +1197,7 @@
 	Számítógépes rendszerek
 	  kutatócsoport
       
+
       A &os; egy szabadon elérhetõ, teljes
 	forráskóddal érkezõ 4.4BSD-Lite
 	alapú kiadás Intel &i386;, &i486;, &pentium;,
@@ -1174,7 +1224,7 @@
 	teljesítményt növeli, hanem csökkenti a
 	&os; memóriaigényét is, jobban
 	elfogadhatóvá téve ezzel az 5 MB-os
-	minimumomot.  A további fejlesztések
+	minimumot.  A további fejlesztések
 	között találjuk a teljes NIS szerver és
 	kliens támogatást, az átviteli TCP
 	támogatását, az igény szerint
@@ -1228,7 +1278,7 @@
       A &os; telepítésérõl és
 	használatáról most már számos
 	további nagyon hasznos dokumentumot találhatunk
-	bármelyik &os;-s gép
+	bármelyik &os;-s számítógép
 	/usr/share/doc

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Sat Mar 29 19:36:56 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7F2DE1065671; Sat, 29 Mar 2008 19:36:56 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3BD15106566C
	for ; Sat, 29 Mar 2008 19:36:56 +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 11D248FC1B
	for ; Sat, 29 Mar 2008 19:36:56 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2TJatTI074564
	for ; Sat, 29 Mar 2008 19:36:55 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2TJatIn074562
	for perforce@freebsd.org; Sat, 29 Mar 2008 19:36:55 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Sat, 29 Mar 2008 19:36:55 GMT
Message-Id: <200803291936.m2TJatIn074562@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 138926 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 29 Mar 2008 19:36:57 -0000

http://perforce.freebsd.org/chv.cgi?CH=138926

Change 138926 by pgj@disznohal on 2008/03/29 19:35:56

	Fix a typo missed earlier.
	
	Submitted by:	gabor (mentor)

Affected files ...

.. //depot/projects/docproj_hu/books/handbook/introduction/chapter.sgml#5 edit

Differences ...

==== //depot/projects/docproj_hu/books/handbook/introduction/chapter.sgml#5 (text+ko) ====

@@ -534,7 +534,7 @@
 	bináris formátumban is.  A &os;
 	beszerzésével kapcsolatos bõvebb
 	információkért olvassuk el a t.
+	linkend="mirrors">et.
 
     
 

From owner-p4-projects@FreeBSD.ORG  Sat Mar 29 22:34:01 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B67551065672; Sat, 29 Mar 2008 22:34: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 761AB1065670
	for ; Sat, 29 Mar 2008 22:34: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 6669D8FC12
	for ; Sat, 29 Mar 2008 22:34:01 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2TMY1ai092501
	for ; Sat, 29 Mar 2008 22:34:01 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2TMY1BL092499
	for perforce@freebsd.org; Sat, 29 Mar 2008 22:34:01 GMT
	(envelope-from sam@freebsd.org)
Date: Sat, 29 Mar 2008 22:34:01 GMT
Message-Id: <200803292234.m2TMY1BL092499@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 138932 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 29 Mar 2008 22:34:02 -0000

http://perforce.freebsd.org/chv.cgi?CH=138932

Change 138932 by sam@sam_ebb on 2008/03/29 22:33:43

	Checkpoint work:
	o split newstate method per opmode
	o fix ap mode
	o add wpa
	o add "enhanced security" (hidessid)
	o do all crypto on the host for now
	o include function name in diagnostic msgs

Affected files ...

.. //depot/projects/vap/sys/dev/wi/if_wavelan_ieee.h#5 edit
.. //depot/projects/vap/sys/dev/wi/if_wi.c#18 edit
.. //depot/projects/vap/sys/dev/wi/if_wivar.h#13 edit

Differences ...

==== //depot/projects/vap/sys/dev/wi/if_wavelan_ieee.h#5 (text+ko) ====

@@ -241,10 +241,13 @@
 #define WI_RID_CNFAUTHMODE	0xFC2A
 #define WI_RID_ROAMING_MODE	0xFC2D
 #define WI_RID_OWN_BEACON_INT	0xFC33 /* beacon xmit time for BSS creation */
+#define	WI_RID_ENH_SECURITY	0xFC43 /* enhanced security (AP mode) */
 #define WI_RID_CNF_DBM_ADJUST	0xFC46
 #define WI_RID_DBM_ADJUST	0xFC46 /* RSSI - WI_RID_DBM_ADJUST ~ dBm */
+#define	WI_RID_WPA_DATA		0xFC48 /* WPA IE */
 #define WI_RID_BASIC_RATE	0xFCB3
 #define WI_RID_SUPPORT_RATE	0xFCB4
+#define	WI_RID_WPA_HANDLING	0xFCBB /* WPA handling procedures */
 
 /*
  * Network parameters, dynamic configuration entities

==== //depot/projects/vap/sys/dev/wi/if_wi.c#18 (text+ko) ====

@@ -121,6 +121,8 @@
 		struct mbuf *m0);
 static int  wi_raw_xmit(struct ieee80211_node *, struct mbuf *,
 		const struct ieee80211_bpf_params *);
+static int  wi_newstate_sta(struct ieee80211vap *, enum ieee80211_state, int);
+static int  wi_newstate_hostap(struct ieee80211vap *, enum ieee80211_state, int);
 static void wi_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m,
 		int subtype, int rssi, int noise, u_int32_t rstamp);
 static int  wi_reset(struct wi_softc *);
@@ -152,8 +154,6 @@
 static int  wi_read_rid(struct wi_softc *, int, void *, int *);
 static int  wi_write_rid(struct wi_softc *, int, void *, int);
 
-static int  wi_newstate(struct ieee80211vap *, enum ieee80211_state, int);
-
 static void wi_dump_pkt(struct wi_frame *, struct ieee80211_node *, int rssi);
 
 static void wi_scan_start(struct ieee80211com *);
@@ -394,6 +394,15 @@
 		 * monitor mode so this is irrelevant.
 		 */
 		ic->ic_caps |= IEEE80211_C_HOSTAP;
+		if (sc->sc_sta_firmware_ver >= 10603)
+			sc->sc_flags |= WI_FLAGS_HAS_ENHSECURITY;
+		if (sc->sc_sta_firmware_ver >= 10700) {
+			/*
+			 * 1.7.0+ have the necessary support for sta mode WPA.
+			 */
+			sc->sc_flags |= WI_FLAGS_HAS_WPASUPPORT;
+			ic->ic_caps |= IEEE80211_C_WPA;
+		}
 
 		sc->sc_ibss_port = WI_PORTTYPE_IBSS;
 		sc->sc_monitor_port = WI_PORTTYPE_APSILENT;
@@ -515,10 +524,6 @@
 	vap = &wvp->wv_vap;
 	ieee80211_vap_setup(ic, vap, name, unit, opmode, flags, bssid, mac);
 
-	wvp->wv_recv_mgmt = vap->iv_recv_mgmt;
-	vap->iv_recv_mgmt = wi_recv_mgmt;
-	wvp->wv_newstate = vap->iv_newstate;
-	vap->iv_newstate = wi_newstate;
 	wvp->wv_key_alloc = vap->iv_key_alloc;
 	vap->iv_key_alloc = wi_key_alloc;
 	vap->iv_max_aid = WI_MAX_AID;
@@ -526,15 +531,24 @@
 	switch (opmode) {
 	case IEEE80211_M_STA:
 		sc->sc_porttype = WI_PORTTYPE_BSS;
+		wvp->wv_newstate = vap->iv_newstate;
+		vap->iv_newstate = wi_newstate_sta;
+		/* need to filter mgt frames to avoid confusing state machine */
+		wvp->wv_recv_mgmt = vap->iv_recv_mgmt;
+		vap->iv_recv_mgmt = wi_recv_mgmt;
 		break;
 	case IEEE80211_M_IBSS:
 		sc->sc_porttype = sc->sc_ibss_port;
+		wvp->wv_newstate = vap->iv_newstate;
+		vap->iv_newstate = wi_newstate_sta;
 		break;
 	case IEEE80211_M_AHDEMO:
 		sc->sc_porttype = WI_PORTTYPE_ADHOC;
 		break;
 	case IEEE80211_M_HOSTAP:
 		sc->sc_porttype = WI_PORTTYPE_HOSTAP;
+		wvp->wv_newstate = vap->iv_newstate;
+		vap->iv_newstate = wi_newstate_hostap;
 		break;
 	case IEEE80211_M_MONITOR:
 		sc->sc_porttype = sc->sc_monitor_port;
@@ -799,13 +813,12 @@
 }
 
 static int
-wi_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
+wi_newstate_sta(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
 {
 	struct ieee80211com *ic = vap->iv_ic;
 	struct ifnet *ifp = ic->ic_ifp;
 	struct ieee80211_node *bss;
 	struct wi_softc *sc = ifp->if_softc;
-	int error;
 
 	DPRINTF(("%s: %s -> %s\n", __func__,
 		ieee80211_state_name[vap->iv_state],
@@ -836,6 +849,17 @@
 		else
 			sc->sc_encryption = 0;
 
+		if ((sc->sc_flags & WI_FLAGS_HAS_WPASUPPORT) &&
+		    (vap->iv_flags & IEEE80211_F_WPA)) {
+			wi_write_val(sc, WI_RID_WPA_HANDLING, 1);
+			if (vap->iv_appie_wpa != NULL) {
+printf("%s: wpa ie %p %d\n", __func__, vap->iv_appie_wpa->ie_data, vap->iv_appie_wpa->ie_len); 
+				wi_write_rid(sc, WI_RID_WPA_DATA,
+				    vap->iv_appie_wpa->ie_data, 
+				    vap->iv_appie_wpa->ie_len); 
+			}
+		}
+
 		wi_enable(sc);		/* enable port */
 
 		/* Lucent firmware does not support the JOIN RID. */
@@ -850,57 +874,73 @@
 		}
 		WI_UNLOCK(sc);
 
-		/* NB: don't go through 802.11 layer, it'll send auth frame */
+		/*
+		 * NB: don't go through 802.11 layer, it'll send auth frame;
+		 * instead we drive the state machine from the link status
+		 * notification we get on association.
+		 */
 		vap->iv_state = nstate;
 		return EINPROGRESS;
 	}
+	return WI_VAP(vap)->wv_newstate(vap, nstate, arg);
+}
+
+static int
+wi_newstate_hostap(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
+{
+	struct ieee80211com *ic = vap->iv_ic;
+	struct ifnet *ifp = ic->ic_ifp;
+	struct ieee80211_node *bss;
+	struct wi_softc *sc = ifp->if_softc;
+	int error;
+
+	DPRINTF(("%s: %s -> %s\n", __func__,
+		ieee80211_state_name[vap->iv_state],
+		ieee80211_state_name[nstate]));
 
 	error = WI_VAP(vap)->wv_newstate(vap, nstate, arg);
+	if (error == 0 && nstate == IEEE80211_S_RUN) {
+		WI_LOCK(sc);
+		wi_init_locked(sc, WI_PORTTYPE_HOSTAP, 0, vap->iv_myaddr);
 
-	if (nstate == IEEE80211_S_RUN && vap->iv_state != IEEE80211_S_RUN) {
-		WI_LOCK(sc);
-		if (vap->iv_opmode == IEEE80211_M_MONITOR)
-			wi_cmd(sc, WI_CMD_DEBUG | (WI_TEST_MONITOR << 8), 0, 0, 0);
-		if (vap->iv_opmode == IEEE80211_M_HOSTAP) {
-			wi_init_locked(sc, WI_PORTTYPE_HOSTAP, 0, vap->iv_myaddr);
+		bss = vap->iv_bss;
+		wi_write_ssid(sc, WI_RID_OWN_SSID,
+		    bss->ni_essid, bss->ni_esslen);
+		wi_write_val(sc, WI_RID_OWN_CHNL,
+		    ieee80211_chan2ieee(ic, bss->ni_chan));
+		wi_write_val(sc, WI_RID_BASIC_RATE, 0x3);
+		wi_write_val(sc, WI_RID_SUPPORT_RATE, 0xf);
+		wi_write_txrate(sc, vap);
 
-			bss = vap->iv_bss;
-			wi_write_ssid(sc, WI_RID_OWN_SSID,
-			    bss->ni_essid, bss->ni_esslen);
-			wi_write_val(sc, WI_RID_OWN_CHNL,
-			    ieee80211_chan2ieee(ic, bss->ni_chan));
-			wi_write_val(sc, WI_RID_BASIC_RATE, 0x3);
-			wi_write_val(sc, WI_RID_SUPPORT_RATE, 0xf);
-			wi_write_txrate(sc, vap);
+		wi_write_val(sc, WI_RID_OWN_BEACON_INT, bss->ni_intval);
+		wi_write_val(sc, WI_RID_DTIM_PERIOD, vap->iv_dtim_period);
 
-			wi_write_val(sc, WI_RID_OWN_BEACON_INT, bss->ni_intval);
-			wi_write_val(sc, WI_RID_DTIM_PERIOD, vap->iv_dtim_period);
+		wi_write_val(sc, WI_RID_RTS_THRESH, vap->iv_rtsthreshold);
+		if (sc->sc_flags & WI_FLAGS_HAS_FRAGTHR)
+			wi_write_val(sc, WI_RID_FRAG_THRESH,
+			    vap->iv_fragthreshold);
 
-			wi_write_val(sc, WI_RID_RTS_THRESH, vap->iv_rtsthreshold);
-			if (sc->sc_flags & WI_FLAGS_HAS_FRAGTHR)
-				wi_write_val(sc, WI_RID_FRAG_THRESH,
-				    vap->iv_fragthreshold);
+		if ((sc->sc_flags & WI_FLAGS_HAS_ENHSECURITY) &&
+		    (vap->iv_flags & IEEE80211_F_HIDESSID)) {
+			/*
+			 * bit 0 means hide SSID in beacons,
+			 * bit 1 means don't respond to bcast probe req
+			 */
+			wi_write_val(sc, WI_RID_ENH_SECURITY, 0x3);
+		}
 
-			wi_write_val(sc, WI_RID_PROMISC, 0);
+		wi_write_val(sc, WI_RID_PROMISC, 0);
 
-			/* Configure WEP. */
-			if (ic->ic_caps & IEEE80211_C_WEP)
-				wi_write_wep(sc, vap);
-			else
-				sc->sc_encryption = 0;
+		/* Configure WEP. */
+		if (ic->ic_caps & IEEE80211_C_WEP)
+			wi_write_wep(sc, vap);
+		else
+			sc->sc_encryption = 0;
 
-			wi_enable(sc);		/* enable port */
-#if 0
-			if (sc->sc_firmware_type == WI_INTERSIL) {
-				wi_cmd(sc, WI_CMD_DISABLE | WI_PORT0, 0, 0, 0);
-				wi_cmd(sc, WI_CMD_ENABLE | WI_PORT0, 0, 0, 0);
-			}
-#endif
-		}
+		wi_enable(sc);		/* enable port */
 		WI_UNLOCK(sc);
-		return WI_VAP(vap)->wv_newstate(vap, nstate, arg);
 	}
-	return 0;
+	return error;
 }
 
 static void
@@ -1767,6 +1807,7 @@
 		break;
 
 	case WI_INTERSIL:
+		val = HOST_ENCRYPT | HOST_DECRYPT;
 		if (vap->iv_flags & IEEE80211_F_PRIVACY) {
 			/*
 			 * ONLY HWB3163 EVAL-CARD Firmware version
@@ -1783,17 +1824,9 @@
 			}
 			wi_write_val(sc, WI_RID_CNFAUTHMODE,
 			    vap->iv_bss->ni_authmode);
-			/* XXX should honor IEEE80211_F_DROPUNENC */
-			val = PRIVACY_INVOKED | EXCLUDE_UNENCRYPTED;
-			/*
-			 * Encryption firmware has a bug for HostAP mode.
-			 */
-			if (vap->iv_opmode == IEEE80211_M_HOSTAP)
-				val |= HOST_ENCRYPT;
+			val |= PRIVACY_INVOKED;
 		} else {
-			wi_write_val(sc, WI_RID_CNFAUTHMODE,
-			    IEEE80211_AUTH_OPEN);
-			val = HOST_ENCRYPT | HOST_DECRYPT;
+			wi_write_val(sc, WI_RID_CNFAUTHMODE, IEEE80211_AUTH_OPEN);
 		}
 		error = wi_write_val(sc, WI_RID_P2_ENCRYPTION, val);
 		if (error)
@@ -1860,7 +1893,8 @@
 		DELAY(1*1000);	/* 1ms */
 	}
 	if (i == 0) {
-		device_printf(sc->sc_dev, "wi_cmd: busy bit won't clear.\n" );
+		device_printf(sc->sc_dev, "%s: busy bit won't clear, cmd 0x%x\n",
+		   __func__, cmd);
 		sc->wi_gone = 1;
 		return(ETIMEDOUT);
 	}
@@ -1893,8 +1927,8 @@
 	}
 
 	if (i == WI_TIMEOUT) {
-		device_printf(sc->sc_dev,
-		    "timeout in wi_cmd 0x%04x; event status 0x%04x\n", cmd, s);
+		device_printf(sc->sc_dev, "%s: timeout on cmd 0x%04x; "
+		    "event status 0x%04x\n", __func__, cmd, s);
 		if (s == 0xffff)
 			sc->wi_gone = 1;
 		return(ETIMEDOUT);
@@ -1915,8 +1949,8 @@
 		if ((status & WI_OFF_BUSY) == 0)
 			break;
 		if (i == WI_TIMEOUT) {
-			device_printf(sc->sc_dev, "timeout in wi_seek to %x/%x\n",
-			    id, off);
+			device_printf(sc->sc_dev, "%s: timeout, id %x off %x\n",
+			    __func__, id, off);
 			sc->sc_bap_off = WI_OFF_ERR;	/* invalidate */
 			if (status == 0xffff)
 				sc->wi_gone = 1;
@@ -1925,7 +1959,8 @@
 		DELAY(1);
 	}
 	if (status & WI_OFF_ERR) {
-		device_printf(sc->sc_dev, "failed in wi_seek to %x/%x\n", id, off);
+		device_printf(sc->sc_dev, "%s: error, id %x off %x\n",
+		    __func__, id, off);
 		sc->sc_bap_off = WI_OFF_ERR;	/* invalidate */
 		return EIO;
 	}
@@ -2009,8 +2044,8 @@
 	int i;
 
 	if (wi_cmd(sc, WI_CMD_ALLOC_MEM, len, 0, 0)) {
-		device_printf(sc->sc_dev, "failed to allocate %d bytes on NIC\n",
-		    len);
+		device_printf(sc->sc_dev, "%s: failed to allocate %d bytes on NIC\n",
+		    __func__, len);
 		return ENOMEM;
 	}
 
@@ -2020,7 +2055,7 @@
 		DELAY(1);
 	}
 	if (i == WI_TIMEOUT) {
-		device_printf(sc->sc_dev, "timeout in alloc\n");
+		device_printf(sc->sc_dev, "%s: timeout in alloc\n", __func__);
 		return ETIMEDOUT;
 	}
 	*idp = CSR_READ_2(sc, WI_ALLOC_FID);
@@ -2069,11 +2104,17 @@
 	ltbuf[1] = htole16(rid);
 
 	error = wi_write_bap(sc, rid, 0, ltbuf, sizeof(ltbuf));
-	if (error)
+	if (error) {
+		device_printf(sc->sc_dev, "%s: bap0 write failure, rid 0x%x\n",
+		    __func__, rid);
 		return error;
+	}
 	error = wi_write_bap(sc, rid, sizeof(ltbuf), buf, buflen);
-	if (error)
+	if (error) {
+		device_printf(sc->sc_dev, "%s: bap1 write failure, rid 0x%x\n",
+		    __func__, rid);
 		return error;
+	}
 
 	return wi_cmd(sc, WI_CMD_ACCESS | WI_ACCESS_WRITE, rid, 0, 0);
 }

==== //depot/projects/vap/sys/dev/wi/if_wivar.h#13 (text+ko) ====

@@ -151,6 +151,8 @@
 /* maximum consecutive false change-of-BSSID indications */
 #define	WI_MAX_FALSE_SYNS		10	
 
+#define	WI_FLAGS_HAS_ENHSECURITY	0x0001
+#define	WI_FLAGS_HAS_WPASUPPORT		0x0002
 #define	WI_FLAGS_HAS_ROAMING		0x0020
 #define	WI_FLAGS_HAS_FRAGTHR		0x0200
 #define	WI_FLAGS_HAS_DBMADJUST		0x0400

From owner-p4-projects@FreeBSD.ORG  Sat Mar 29 22:37:05 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0E1E91065672; Sat, 29 Mar 2008 22:37: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 C05E0106566C
	for ; Sat, 29 Mar 2008 22:37:04 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B068E8FC1A
	for ; Sat, 29 Mar 2008 22:37:04 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2TMb4VZ092610
	for ; Sat, 29 Mar 2008 22:37:04 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2TMb4sU092608
	for perforce@freebsd.org; Sat, 29 Mar 2008 22:37:04 GMT
	(envelope-from jb@freebsd.org)
Date: Sat, 29 Mar 2008 22:37:04 GMT
Message-Id: <200803292237.m2TMb4sU092608@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138933 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 29 Mar 2008 22:37:05 -0000

http://perforce.freebsd.org/chv.cgi?CH=138933

Change 138933 by jb@jb_freebsd1 on 2008/03/29 22:37:03

	IFC

Affected files ...

.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/geom/chapter.sgml#11 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#14 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/disks/chapter.sgml#4 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/geom/chapter.sgml#5 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/jails/chapter.sgml#3 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/ports/chapter.sgml#5 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/printing/chapter.sgml#5 integrate
.. //depot/projects/dtrace/doc/share/sgml/man-refs.ent#30 integrate
.. //depot/projects/dtrace/ports/UPDATING#62 integrate
.. //depot/projects/dtrace/src/Makefile.inc1#43 integrate
.. //depot/projects/dtrace/src/ObsoleteFiles.inc#41 integrate
.. //depot/projects/dtrace/src/cddl/lib/Makefile#12 integrate
.. //depot/projects/dtrace/src/cddl/usr.bin/Makefile#7 integrate
.. //depot/projects/dtrace/src/cddl/usr.sbin/Makefile#6 integrate
.. //depot/projects/dtrace/src/contrib/pf/pfctl/pfctl_altq.c#6 integrate
.. //depot/projects/dtrace/src/contrib/pf/pfctl/pfctl_qstats.c#4 integrate
.. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/kld.c#3 integrate
.. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/main.c#6 integrate
.. //depot/projects/dtrace/src/lib/libc/gen/Makefile.inc#14 integrate
.. //depot/projects/dtrace/src/lib/libc/gen/modf.3#5 integrate
.. //depot/projects/dtrace/src/lib/libc/sys/Makefile.inc#8 integrate
.. //depot/projects/dtrace/src/lib/libc/sys/cpuset.2#1 branch
.. //depot/projects/dtrace/src/lib/libc/sys/cpuset_getaffinity.2#1 branch
.. //depot/projects/dtrace/src/lib/libthr/Makefile#17 integrate
.. //depot/projects/dtrace/src/lib/msun/src/e_log.c#7 integrate
.. //depot/projects/dtrace/src/lib/msun/src/e_logf.c#6 integrate
.. //depot/projects/dtrace/src/lib/msun/src/s_expm1.c#6 integrate
.. //depot/projects/dtrace/src/lib/msun/src/s_expm1f.c#6 integrate
.. //depot/projects/dtrace/src/lib/msun/src/s_fmaf.c#4 integrate
.. //depot/projects/dtrace/src/lib/msun/src/s_log1p.c#5 integrate
.. //depot/projects/dtrace/src/lib/msun/src/s_log1pf.c#6 integrate
.. //depot/projects/dtrace/src/rescue/rescue/Makefile#11 integrate
.. //depot/projects/dtrace/src/sbin/ggate/Makefile#9 integrate
.. //depot/projects/dtrace/src/share/man/man3/Makefile#7 integrate
.. //depot/projects/dtrace/src/share/man/man4/arcmsr.4#6 integrate
.. //depot/projects/dtrace/src/share/man/man4/ng_pptpgre.4#4 integrate
.. //depot/projects/dtrace/src/share/man/man5/src.conf.5#14 integrate
.. //depot/projects/dtrace/src/share/mk/bsd.own.mk#21 integrate
.. //depot/projects/dtrace/src/sys/contrib/pf/net/pf_if.c#7 integrate
.. //depot/projects/dtrace/src/sys/contrib/pf/net/pf_ioctl.c#11 integrate
.. //depot/projects/dtrace/src/sys/contrib/pf/net/pfvar.h#5 integrate
.. //depot/projects/dtrace/src/sys/geom/part/g_part.h#6 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/pmap.c#33 integrate
.. //depot/projects/dtrace/src/sys/vm/vm_object.c#21 integrate
.. //depot/projects/dtrace/src/tools/build/mk/OptionalObsoleteFiles.inc#14 integrate
.. //depot/projects/dtrace/src/tools/build/options/WITHOUT_LIBKSE#2 delete
.. //depot/projects/dtrace/src/usr.bin/Makefile#16 integrate
.. //depot/projects/dtrace/src/usr.sbin/Makefile#24 integrate
.. //depot/projects/dtrace/src/usr.sbin/amd/amd/Makefile#5 integrate
.. //depot/projects/dtrace/src/usr.sbin/clear_locks/Makefile#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/ngctl/Makefile#9 integrate
.. //depot/projects/dtrace/www/en/gnome/docs/faq2.sgml#18 integrate
.. //depot/projects/dtrace/www/en/projects/ideas/ideas.xml#16 integrate
.. //depot/projects/dtrace/www/hu/about.sgml#3 integrate
.. //depot/projects/dtrace/www/hu/administration.sgml#4 integrate
.. //depot/projects/dtrace/www/hu/docproj/sgml.sgml#2 integrate
.. //depot/projects/dtrace/www/hu/docs/books.sgml#4 integrate
.. //depot/projects/dtrace/www/hu/docs/webresources.sgml#2 integrate
.. //depot/projects/dtrace/www/hu/features.sgml#4 integrate
.. //depot/projects/dtrace/www/hu/index.xsl#5 integrate
.. //depot/projects/dtrace/www/hu/platforms/i386.sgml#3 integrate
.. //depot/projects/dtrace/www/hu/search/search.sgml#3 integrate
.. //depot/projects/dtrace/www/hu/search/web.atoz#3 integrate
.. //depot/projects/dtrace/www/hu/share/sgml/navibar.l10n.ent#4 integrate
.. //depot/projects/dtrace/www/hu/where.sgml#5 integrate

Differences ...

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/geom/chapter.sgml#11 (text+ko) ====

@@ -1,6 +1,6 @@
 
 
@@ -510,7 +510,7 @@
 	/dev, which will be named
 	based on their file system type.  For example,
 	UFS2 file system labels will be created in
-	the /dev/ufs2
+	the /dev/ufs
 	directory.
 
       A generic label will go away with the next reboot. These
@@ -537,10 +537,10 @@
       
 
       A label should now exist in
-	/dev/ufs2 which may be
+	/dev/ufs which may be
 	added to /etc/fstab:
 
-      /dev/ufs2/home		/home            ufs     rw              2      2
+      /dev/ufs/home		/home            ufs     rw              2      2
 
       
 	The file system must not be mounted while attempting

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#14 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
 
@@ -1371,7 +1371,7 @@
 
 	&prompt.root; portmaster shells/bash
 
-	Please see &man.portmaster.8; from more information.
+	Please see &man.portmaster.8; for more information.
       
     
 

==== //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/disks/chapter.sgml#4 (text+ko) ====

@@ -1,9 +1,9 @@
 
 
 
@@ -331,7 +331,7 @@
 	&prompt.root; dd if=/dev/zero of=/dev/da1 bs=1k count=1
 &prompt.root; bsdlabel -Bw da1 auto
 &prompt.root; bsdlabel -e da1				# create the `e' partition
-&prompt.root; newfs -d0 /dev/da1e
+&prompt.root; newfs /dev/da1e
 &prompt.root; mkdir -p /1
 &prompt.root; vi /etc/fstab				# add an entry for /dev/da1e
 &prompt.root; mount /1
@@ -1765,7 +1765,7 @@
 	эхлэхээсээ өмнө бэлдэгдсэн байх ёстой. Жишээн дээр дискний 
 	бүх зай стандарт UFS2 файлын системтэй ашиглагдана:
 
-	&prompt.root; dd if=/dev/zero of=/dev/acd0 count=2
+	&prompt.root; dd if=/dev/zero of=/dev/acd0 bs=2k count=1
 &prompt.root; bsdlabel -Bw acd0
 &prompt.root; newfs /dev/acd0
 

==== //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/geom/chapter.sgml#5 (text+ko) ====

@@ -1,9 +1,9 @@
 
 
 
@@ -498,7 +498,7 @@
 	үлддэг явдал юм. Эдгээр хаяг/шошгонуудад тэдгээрийн файлын системийн төрөл 
 	дээр суурилсан нэр бүхий тусгай сан /dev 
 	сан дотор өгөгддөг. Жишээ нь UFS2 файлын системийн 
-	хаяг/шошгонууд /dev/ufs2 санд 
+	хаяг/шошгонууд /dev/ufs санд 
 	үүсгэгддэг.
 
       Ерөнхий хаяг/шошго нь дараагийн удаа ачаалахад арилдаг. Эдгээр хаяг/шошгонууд 
@@ -522,11 +522,11 @@
 	явдал юм.
       
 
-      Хаяг/шошго одоо /dev/ufs2 санд 
+      Хаяг/шошго одоо /dev/ufs санд 
 	үүссэн байх ёстой бөгөөд түүнийг /etc/fstab файлд нэмж 
 	болох юм:
 
-      /dev/ufs2/home		/home            ufs     rw              2      2
+      /dev/ufs/home		/home            ufs     rw              2      2
 
       
 	tunefs-г ажиллуулахдаа файлын системийг 

==== //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/jails/chapter.sgml#3 (text+ko) ====

@@ -1,9 +1,9 @@
 
 
   
@@ -244,7 +244,7 @@
 &prompt.root; cd etc/ Энэ алхам нь 
 &os; 6.0 болон түүнээс хойшх хувиилбаруудад шаардлагагүй.
 &prompt.root; make distribution DESTDIR=$D 
-&prompt.root; mount_devfs devfs $D/dev 
+&prompt.root; mount -t devfs devfs $D/dev 
 
     
       

==== //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/ports/chapter.sgml#5 (text+ko) ====

@@ -1,9 +1,9 @@
 
 
 
@@ -535,47 +535,29 @@
       
 	CVSup арга
 
-	Энэ арга нь CVSup-г ашиглан 
+	Энэ арга нь CVSup протоколыг ашиглан 
 	портын цуглуулгаа суулгаж мөн байнга шинэчилж болох хамгийн түргэн арга юм.
 	  Хэрэв та CVSup-н талаар дэлгэрэнгүй мэдэхийг
 	хүсэж байвал  CVSup-г хэрэглэх нь хэсгээс хараарай.
 
-         
-           csup гэдэг програм нь 
-			CVSup програмыг C програм дээр
-			дахин бичсэн хувилбар нь бөгөөд &os;-н 6.2 юм уу эсвэл 
-			түүнээс дээшхи хувилбарт боломжтой буй. 
-             csup нь үндсэн суулгацтай хамт
-			суулгагддаг болохоор #1 дүгээр алхмыг алгасаад 
-             cvsup-н оронд 
-             csup гэж бичиж хэрэглэх хэрэгтэй. 
-			Хуучны хувилбаруудад 
-             csup-Đł 
-             net/csup сан дотроос 
-             порт/багц хэлбэрээс суулгаж болно.
-         
+	
+	  &os; системд орсон CVSup протоколын 
+	    шийдэл нь csup гэж нэрлэгддэг. 
+	    Энэ нь &os; 6.2-т анх удаа орсон. Хуучин &os; хувилбарын хэрэглэгчид 
+	    үүнийг net/csup порт/багцын 
+	    тусламжтайгаар суулгаж болно.
+	
 
-	CVSup-г анх удаагаа ажиллуулахынхаа өмнө
+	csup-г анх удаагаа ажиллуулахынхаа өмнө
 	  /usr/ports санг хоосон байлгах хэрэгтэй.
 	  Хэрэв уг сан дотор өөр эх сурвалжаас суулгасан портын цуглуулга байвал,
-	  CVSup  нь уг файлуудыг шинэчилж нөхдөггүй билээ.
+	  csup нь уг файлуудыг шинэчилж нөхдөггүй билээ.
 	  
 
 	
-	  net/cvsup-without-gui багцыг эхлээд суулгана:
+	  csup тушаалыг ажиллуулна:
 
-	  &prompt.root; pkg_add -r cvsup-without-gui
-
-	  CVSup-г суулгах () хэсгээс нэмэлт мэдээллийг харна уу.
-	
-
-	
-	  cvsup-г аМиННууНна:
-
-	  &prompt.root; cvsup -L 2 -h cvsup.FreeBSD.org /usr/share/examples/cvsup/ports-supfile
+&prompt.root; csup -L 2 -h cvsup.FreeBSD.org /usr/share/examples/cvsup/ports-supfile
 
 	  
 	    cvsup.FreeBSD.org гэдгийг
@@ -614,16 +596,16 @@
 	      
 
 	      
-		Одоо cvsup-г ажиллуулахын тулд дараах алхмыг хийх хэрэгтэй:
+		Одоо csup-г ажиллуулахын тулд дараах алхмыг хийх хэрэгтэй:
 
-		&prompt.root; cvsup -L 2 /root/ports-supfile
+		&prompt.root; csup -L 2 /root/ports-supfile
 	      
 	    
 	  
 	
 
 	
-	  Дараа нь &man.cvsup.1; тушаалыг ажиллуулснаар тухайн үед хөрвүүлж байгаа
+	  Дараа нь &man.csup.1; тушаалыг ажиллуулснаар тухайн үед хөрвүүлж байгаа
 		портуудыг эс оруулаад бүх портын цуглуулгыг татаж аван сүүлд орсон өөрчлөлтүүдийг мөн шинэчилдэг.
 	
       
@@ -1216,44 +1198,97 @@
 
 	Дэлгэрэнгүй мэдээллийг 
 	  &man.portmanager.1;-с харна уу.
-
+	Дэлгэрэнгүй мэдээллийг &man.portmaster.8;-с үзнэ үү.
       
     
 

==== //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/printing/chapter.sgml#5 (text+ko) ====

@@ -1,9 +1,9 @@
 
 
 
@@ -1778,8 +1778,10 @@
             
         lprps нь FreeBSD-ийн портын цуглуулгад 
 	байдаг (Портын цуглуулга бүлгийг үзнэ үү). 
-	Мэдээж та өөрөө татаж аван бүтээж суулгаж болно. lprps-г 
-	суулгасны дараа lprps-ийн хэсэг болох psif 
+	Ашиглах цаасны хэмжээний дагуу print/lprps-a4 
+	болон print/lprps-letter портын аль нэгийг 
+	суулгаж та болно. lprps-г суулгасны дараа 
+	lprps-ийн хэсэг болох psif 
 	програмд замыг зааж өгөх хэрэгтэй. Хэрэв та lprps-г 
 	портын цуглуулгаас суулгасан бол доор дурдсаныг /etc/printcap 
 	файл дахь цуваа &postscript; хэвлэгчийн оруулгад ашиглах хэрэгтэй:
@@ -1841,26 +1843,26 @@
 	үнэтэй стандарт юм. 
 	Aladdin Enterprises-ийн ачаар харин чөлөөтэй &postscript;-тэй төстэй, 
 	FreeBSD дээр ажилладаг Ghostscript гэгддэг 
-	програм байдаг. Ghostscript нь ихэнх &postscript; файлуудыг уншиж чаддаг бөгөөд 
-	тэдгээрийн хуудаснуудыг PostScript биш хэвлэгчдийн олон загваруудыг оролцуулаад 
-	төрөл бүрийн төхөөрөмжүүд рүү амилуулж чаддаг. Ghostscript-г суулгаж 
+	програм байдаг. Ghostscript нь ихэнх &postscript; файлуудыг уншиж чаддаг бөгөөд 
+	тэдгээрийн хуудаснуудыг &postscript; биш хэвлэгчдийн олон загваруудыг оролцуулаад 
+	төрөл бүрийн төхөөрөмжүүд рүү амилуулж чаддаг. Ghostscript-г суулгаж 
 	өөрийн хэвлэгчийн хувьд тусгай текстийн шүүлтүүрийг ашиглан та өөрийн &postscript; 
 	биш хэвлэгчийг жинхэнэ &postscript; хэвлэгч шигээр ажиллуулах боломжтой 
 	йаКдаг.
             
-        Ghostscript нь FreeBSD-ийн портын цуглуулгад байдаг учир хэрэв та үүнийг 
-	суулгахыг хүсвэл тэндээс суулгаж болно. Та өөрөө үүнийг хялбархнаар татан авч, бүтээн 
-	суулгаж бас болох юм.
+        Ghostscript нь FreeBSD-ийн портын цуглуулгад байдаг.
+	Олон хувилбар байдаг бөгөөд хамгийн ихээр ашиглагддаг хувилбар нь 
+	print/ghostscript-gpl юм.
             
         &postscript; шиг дүр үзүүлэхийн тулд &postscript; файл хэвлэж байна уу 
 	гэдгийг илрүүлэх текст шүүлтүүр бидэнд байна. Хэрэв энэ нь тийм биш бол шүүлтүүр нь 
 	файлыг хэвлэгч уруу шууд дамжуулна; үгүй бол энэ нь файлыг хэвлэгчийн ойлгодог 
-	хэлбэр уруу эхлээд хувиргах Ghostscript-г ашиглах болно.
+	хэлбэр уруу эхлээд хувиргах Ghostscript-г ашиглах болно.
             
         Энд жишээ байна: дараах скрипт нь Hewlett Packard DeskJet 500 
 	хэвлэгчдэд зориулсан текст шүүлтүүр юм. Бусад хэвлэгчдийн хувьд 
-	 нэмэлт өгөгдлийг сольж gs (Ghostscript) 
-	тушаал уруу өгөх хэрэгтэй. (Ghostscript-ийн тухайн үеийн суулгацын дэмждэг төхөөрөмжүүдийн 
+	 нэмэлт өгөгдлийг сольж gs (Ghostscript) 
+	тушаал уруу өгөх хэрэгтэй. (Ghostscript-ийн тухайн үеийн суулгацын дэмждэг төхөөрөмжүүдийн 
 	жагсаалтыг авахын тулд gs -h гэж бичих хэрэгтэй.
 
         #!/bin/sh
@@ -2067,7 +2069,7 @@
 		оруулгад DVI хувиргах шүүлтүүрийг бид нэмэх болно. bamboo 
 		хэвлэгчийн хувьд шинэ df боломжийг оруулсан 
 		/etc/printcap файлын жишээг энд дахин 
-		үзүүлэв.
+		үзүүлэв:
 
           #
 #  /etc/printcap for host rose - added df filter for bamboo
@@ -2111,7 +2113,7 @@
           Хувиргах шүүлтүүрийн зарим жишээнүүд
               
           Хувиргах шүүлтүүрүүдийг суулгах тогтмол алхмууд байдаггүй болохоор 
-		зарим жишээнүүдийг энд дурдъя. Эдгээрийг өөрийн шүүлтүүрийг 
+		энэ хэсэгт зарим нэг ажилладаг жишээнүүдийг энд дурдъя. Эдгээрийг өөрийн шүүлтүүрийг 
 		хийхдээ заавар болгон ашиглаарай. Тохирохоор бол шууд ашиглах 
 		хэрэгтэй.
               

==== //depot/projects/dtrace/doc/share/sgml/man-refs.ent#30 (text+ko) ====

@@ -20,7 +20,7 @@
      lexicographical order by the entity (i.e., the dots used in place of
      special characters should not be expanded when comparing).
 
-     $FreeBSD: doc/share/sgml/man-refs.ent,v 1.456 2008/03/28 21:33:18 brueffer Exp $
+     $FreeBSD: doc/share/sgml/man-refs.ent,v 1.457 2008/03/29 15:29:23 bmah Exp $
 -->
 
 
@@ -191,6 +191,7 @@
 
 
 
+
 
 
 
@@ -651,6 +652,7 @@
 
 
 
+
 
 
 
@@ -752,6 +754,7 @@
 
 
 
+
 
 
 
@@ -3466,6 +3469,7 @@
 
 
 
+
 
 
 

==== //depot/projects/dtrace/ports/UPDATING#62 (text+ko) ====

@@ -6,6 +6,20 @@
 time you update your ports collection, before attempting any port
 upgrades.
 
+20080329:
+  AFFECTS: users of www/phpadsnew
+  AUTHOR: beech@FreeBSD.org
+
+  Phpadsnew has been replaced with www/openx. 
+  To upgrade please do the following:
+
+  1. Install www/openx
+  2. Copy the configuration file from phpadsnew to the var directory
+     of www/openx.
+  3. Copy your banner images from phpadsnew/www/images to openx/www/images
+  4. Access openx on your browser and follow the instructions for upgrading.
+  5. When you are satisfied everthing is working properly remove www/phpadsnew
+
 20080326:
   AFFECTS: users of emulators/linux_base-f8
   AUTHOR: bsam@FreeBSD.org
@@ -6253,4 +6267,4 @@
   2) Update all p5-* modules.
 	portupgrade -f p5-\*
 
-$FreeBSD: ports/UPDATING,v 1.607 2008/03/28 05:38:32 beech Exp $
+$FreeBSD: ports/UPDATING,v 1.608 2008/03/29 19:50:39 beech Exp $

==== //depot/projects/dtrace/src/Makefile.inc1#43 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.601 2008/03/02 11:10:46 ru Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.602 2008/03/29 17:44:38 ru Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -1067,18 +1067,14 @@
 		${_lib_cddl} ${_lib_libgssapi} ${_lib_libipx} \
 		lib/libkiconv lib/libkvm lib/libmd \
 		lib/ncurses/ncurses lib/ncurses/ncursesw \
-		lib/libopie lib/libpam ${_default_thread_lib} \
+		lib/libopie lib/libpam ${_lib_libthr} \
 		lib/libradius lib/libsbuf lib/libtacplus lib/libutil \
 		${_lib_libypclnt} lib/libz lib/msun \
 		${_secure_lib_libcrypto} ${_secure_lib_libssh} \
 		${_secure_lib_libssl} lib/libdwarf lib/libproc
 
-.if ${MK_LIBTHR} != "no" && ${MK_LIBKSE} != "no"
-_default_thread_lib=	lib/${DEFAULT_THREAD_LIB}
-.elif ${MK_LIBTHR} != "no"
-_default_thread_lib=	lib/libthr
-.elif ${MK_LIBKSE} != "no"
-_default_thread_lib=	lib/libkse
+.if ${MK_LIBTHR} != "no"
+_lib_libthr=	lib/libthr
 .endif
 
 _generic_libs=	${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib

==== //depot/projects/dtrace/src/ObsoleteFiles.inc#41 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.134 2008/03/26 06:45:28 remko Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.135 2008/03/29 17:44:38 ru Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -30,7 +30,6 @@
 # 20071201: Removal of XRPU driver
 OLD_FILES+=usr/include/sys/xrpuio.h
 # 20071129: Disabled static versions of libkse by default
-.if ${DEFAULT_THREAD_LIB} != "libkse" && ${MK_LIBTHR} != "no"
 OLD_FILES+=usr/lib/libkse.a
 OLD_FILES+=usr/lib/libkse_p.a
 OLD_FILES+=usr/lib/libkse_pic.a
@@ -39,7 +38,6 @@
 OLD_FILES+=usr/lib32/libkse_p.a
 OLD_FILES+=usr/lib32/libkse_pic.a
 .endif
-.endif
 # 20071129: Removed a Solaris compatibility header
 OLD_FILES+=usr/include/sys/_elf_solaris.h
 # 20071125: Renamed to pmc_get_msr()

==== //depot/projects/dtrace/src/cddl/lib/Makefile#12 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/lib/Makefile,v 1.7 2007/10/09 23:31:09 obrien Exp $
+# $FreeBSD: src/cddl/lib/Makefile,v 1.8 2008/03/29 17:44:40 ru Exp $
 
 .include 
 
@@ -14,7 +14,7 @@
 
 .if ${MK_ZFS} != "no"
 _libzfs=	libzfs
-.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no"
+.if ${MK_LIBTHR} != "no"
 _libzpool=	libzpool
 .endif
 .endif

==== //depot/projects/dtrace/src/cddl/usr.bin/Makefile#7 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.7 2007/10/09 23:31:09 obrien Exp $
+# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.8 2008/03/29 17:44:40 ru Exp $
 
 .include 
 
@@ -10,7 +10,7 @@
 	${_ztest}
 
 .if ${MK_ZFS} != "no"
-.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no"
+.if ${MK_LIBTHR} != "no"
 _ztest=	ztest
 .endif
 .endif

==== //depot/projects/dtrace/src/cddl/usr.sbin/Makefile#6 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.7 2007/10/09 23:31:09 obrien Exp $
+# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.8 2008/03/29 17:44:40 ru Exp $
 
 .include 
 
@@ -6,7 +6,7 @@
 	${_zdb}
 
 .if ${MK_ZFS} != "no"
-.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no"
+.if ${MK_LIBTHR} != "no"
 _zdb=	zdb
 .endif
 .endif

==== //depot/projects/dtrace/src/contrib/pf/pfctl/pfctl_altq.c#6 (text+ko) ====

@@ -19,7 +19,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pfctl_altq.c,v 1.9 2007/07/03 12:30:02 mlaier Exp $");
+__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pfctl_altq.c,v 1.10 2008/03/29 00:24:36 mlaier Exp $");
 
 #include 
 #include 
@@ -153,6 +153,10 @@
 		return;
 	}
 
+#ifdef __FreeBSD__
+	if (a->local_flags & PFALTQ_FLAG_IF_REMOVED)
+		printf("INACTIVE ");
+#endif
 	printf("altq on %s ", a->ifname);
 
 	switch (a->scheduler) {
@@ -187,6 +191,10 @@
 {
 	unsigned	i;
 
+#ifdef __FreeBSD__
+	if (a->local_flags & PFALTQ_FLAG_IF_REMOVED)
+		printf("INACTIVE ");
+#endif
 	printf("queue ");
 	for (i = 0; i < level; ++i)
 		printf(" ");
@@ -1145,7 +1153,11 @@
 	    sizeof(ifr.ifr_name))
 		errx(1, "getifmtu: strlcpy");
 	if (ioctl(s, SIOCGIFMTU, (caddr_t)&ifr) == -1)
+#ifdef __FreeBSD__
+		ifr.ifr_mtu = 1500;
+#else
 		err(1, "SIOCGIFMTU");
+#endif
 	if (shutdown(s, SHUT_RDWR) == -1)
 		err(1, "shutdown");
 	if (close(s))

==== //depot/projects/dtrace/src/contrib/pf/pfctl/pfctl_qstats.c#4 (text+ko) ====

@@ -17,7 +17,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pfctl_qstats.c,v 1.6 2005/05/03 16:55:20 mlaier Exp $");
+__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pfctl_qstats.c,v 1.7 2008/03/29 00:24:36 mlaier Exp $");
 
 #include 
 #include 
@@ -118,6 +118,10 @@
 		for (node = root; node != NULL; node = node->next) {
 			if (iface != NULL && strcmp(node->altq.ifname, iface))
 				continue;
+#ifdef __FreeBSD__
+			if (node->altq.local_flags & PFALTQ_FLAG_IF_REMOVED)
+				continue;
+#endif
 			pfctl_print_altq_node(dev, node, 0, opts);
 		}
 	}
@@ -157,7 +161,12 @@
 			warn("DIOCGETALTQ");
 			return (-1);
 		}
+#ifdef __FreeBSD__
+		if (pa.altq.qid > 0 &&
+		    !(pa.altq.local_flags & PFALTQ_FLAG_IF_REMOVED)) {
+#else
 		if (pa.altq.qid > 0) {
+#endif
 			pq.nr = nr;
 			pq.ticket = pa.ticket;
 			pq.buf = &qstats.data;
@@ -175,6 +184,19 @@
 				pfctl_insert_altq_node(root, pa.altq, qstats);
 			}
 		}
+#ifdef __FreeBSD__
+		  else if (pa.altq.local_flags & PFALTQ_FLAG_IF_REMOVED) {
+		  	memset(&qstats.data, 0, sizeof(qstats.data));
+			if ((node = pfctl_find_altq_node(*root, pa.altq.qname,
+			    pa.altq.ifname)) != NULL) {
+				memcpy(&node->qstats.data, &qstats.data,
+				    sizeof(qstats.data));
+				update_avg(node);
+			} else {
+				pfctl_insert_altq_node(root, pa.altq, qstats);
+			}		
+		}
+#endif
 	}
 	return (mnr);
 }
@@ -280,6 +302,10 @@
 {
 	if (a->altq.qid == 0)
 		return;
+#ifdef __FreeBSD__
+	if (a->altq.local_flags & PFALTQ_FLAG_IF_REMOVED)
+		return;
+#endif
 
 	switch (a->altq.scheduler) {
 	case ALTQT_CBQ:

==== //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/kld.c#3 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kld.c,v 1.6 2008/01/29 23:44:34 jhb Exp $");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kld.c,v 1.7 2008/03/29 03:48:06 jhb Exp $");
 
 #include 
 #include 
@@ -331,6 +331,7 @@
 	char *path;
 	int error;
 
+	head = NULL;
 	prev = &head;
 
 	/*

==== //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/main.c#6 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/main.c,v 1.14 2008/01/29 23:37:59 jhb Exp $");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/main.c,v 1.15 2008/03/29 17:46:03 jhb Exp $");
 
 #include 
 #include 
@@ -59,6 +59,7 @@
 #include 
 #include 
 #include 
+#include 
 
 extern void (*init_ui_hook)(char *);
 
@@ -188,13 +189,15 @@
 	char *s;
 	CORE_ADDR n;
 
-	s = strdup(exp);
-	old_chain = make_cleanup(free_current_contents, &expr);
-	expr = parse_expression(s);
-	val = (expr != NULL) ? evaluate_expression(expr) : NULL;
-	n = (val != NULL) ? value_as_address(val) : 0;
+	n = 0;
+	s = xstrdup(exp);
+	old_chain = make_cleanup(xfree, s);
+	if (gdb_parse_exp_1(&s, NULL, 0, &expr) && *s == '\0') {
+		make_cleanup(free_current_contents, &expr);
+		if (gdb_evaluate_expression(expr, &val))
+		    n = value_as_address(val);
+	}
 	do_cleanups(old_chain);
-	free(s);
 	return (n);
 }
 

==== //depot/projects/dtrace/src/lib/libc/gen/Makefile.inc#14 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.6 (Berkeley) 5/4/95
-# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.132 2008/03/12 02:33:17 davidxu Exp $
+# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.133 2008/03/29 16:19:35 das Exp $
 
 # machine-independent gen sources
 .PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen
@@ -120,6 +120,7 @@
 	isgreater.3 isunordered.3
 MLINKS+=ldexp.3 ldexpf.3 ldexp.3 ldexpl.3
 MLINKS+=makecontext.3 swapcontext.3
+MLINKS+=modf.3 modff.3 modf.3 modfl.3
 MLINKS+=popen.3 pclose.3
 MLINKS+=psignal.3 strsignal.3 psignal.3 sys_siglist.3 psignal.3 sys_signame.3
 MLINKS+=pwcache.3 group_from_gid.3 pwcache.3 user_from_uid.3

==== //depot/projects/dtrace/src/lib/libc/gen/modf.3#5 (text+ko) ====

@@ -30,35 +30,42 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)modf.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/gen/modf.3,v 1.9 2007/01/09 00:27:54 imp Exp $
+.\" $FreeBSD: src/lib/libc/gen/modf.3,v 1.10 2008/03/29 16:19:35 das Exp $
 .\"
-.Dd June 4, 1993
+.Dd March 29, 2008
 .Dt MODF 3
 .Os
 .Sh NAME
-.Nm modf
+.Nm modf ,
+.Nm modff ,
+.Nm modfl
 .Nd extract signed integral and fractional values from floating-point number
 .Sh LIBRARY
-.Lb libc
+.Lb libm
 .Sh SYNOPSIS
 .In math.h
 .Ft double
 .Fn modf "double value" "double *iptr"
+.Ft float
+.Fn modff "float value" "float *iptr"
+.Ft long double
+.Fn modfl "long double value" "long double *iptr"
 .Sh DESCRIPTION
 The
-.Fn modf
-function breaks the argument
+.Fn modf ,
+.Fn modff ,
+and
+.Fn modfl
+functions break the argument
 .Fa value
 into integral and fractional parts, each of which has the
 same sign as the argument.
 It stores the integral part as a
-.Vt double
+floating point number
 in the object pointed to by
 .Fa iptr .
 .Sh RETURN VALUES
-The
-.Fn modf
-function returns the signed fractional part of
+These functions return the signed fractional part of
 .Fa value .
 .Sh SEE ALSO
 .Xr frexp 3 ,
@@ -66,6 +73,9 @@
 .Xr math 3
 .Sh STANDARDS
 The
-.Fn modf
-function conforms to
-.St -isoC .
+.Fn modf ,
+.Fn modff ,
+and
+.Fn modfl
+functions conform to
+.St -isoC-99 .

==== //depot/projects/dtrace/src/lib/libc/sys/Makefile.inc#8 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.3 (Berkeley) 10/24/94
-# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.130 2008/03/12 10:12:22 jeff Exp $
+# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.132 2008/03/29 10:26:29 jeff Exp $
 
 # sys sources
 .PATH: ${.CURDIR}/${MACHINE_ARCH}/sys ${.CURDIR}/sys
@@ -63,8 +63,8 @@
 	aio_suspend.2 aio_waitcomplete.2 aio_write.2 \
 	bind.2 brk.2 chdir.2 chflags.2 \
 	chmod.2 chown.2 chroot.2 clock_gettime.2 close.2 \
-	connect.2 dup.2 execve.2 extattr_get_file.2 \
-	fcntl.2 fhopen.2 flock.2 fork.2 fsync.2 \
+	connect.2 cpuset.2 cpuset_getaffinity.2 dup.2 execve.2 \
+	extattr_get_file.2 fcntl.2 fhopen.2 flock.2 fork.2 fsync.2 \
 	getdirentries.2 getdtablesize.2 \
 	getfh.2 getfsstat.2 getgid.2 getgroups.2 getitimer.2 getlogin.2 \
 	getpeername.2 getpgrp.2 getpid.2 getpriority.2 getrlimit.2 \
@@ -104,6 +104,8 @@
 MLINKS+=chmod.2 fchmod.2 chmod.2 lchmod.2
 MLINKS+=chown.2 fchown.2 chown.2 lchown.2
 MLINKS+=clock_gettime.2 clock_getres.2 clock_gettime.2 clock_settime.2
+MLINKS+=cpuset.2 cpuset_setid.2 cpuset.2 cpuset_getid.2
+MLINKS+=cpuset_getaffinity.2 cpuset_setaffinity.2
 MLINKS+=dup.2 dup2.2
 MLINKS+=extattr_get_file.2 extattr.2 \
 	extattr_get_file.2 extattr_delete_fd.2 \

==== //depot/projects/dtrace/src/lib/libthr/Makefile#17 (text+ko) ====

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Sat Mar 29 23:43:26 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 384A71065675; Sat, 29 Mar 2008 23:43:26 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E7F4B1065671
	for ; Sat, 29 Mar 2008 23:43:25 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D82AF8FC18
	for ; Sat, 29 Mar 2008 23:43:25 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2TNhPrc096879
	for ; Sat, 29 Mar 2008 23:43:25 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2TNhHkj096868
	for perforce@freebsd.org; Sat, 29 Mar 2008 23:43:17 GMT
	(envelope-from jb@freebsd.org)
Date: Sat, 29 Mar 2008 23:43:17 GMT
Message-Id: <200803292343.m2TNhHkj096868@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 138946 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 29 Mar 2008 23:43:26 -0000

http://perforce.freebsd.org/chv.cgi?CH=138946

Change 138946 by jb@jb_freebsd1 on 2008/03/29 23:42:30

	IF7

Affected files ...

.. //depot/projects/dtrace7/src/Makefile#3 integrate
.. //depot/projects/dtrace7/src/Makefile.inc1#5 integrate
.. //depot/projects/dtrace7/src/ObsoleteFiles.inc#6 integrate
.. //depot/projects/dtrace7/src/UPDATING#3 integrate
.. //depot/projects/dtrace7/src/bin/Makefile#2 integrate
.. //depot/projects/dtrace7/src/bin/chflags/chflags.1#2 integrate
.. //depot/projects/dtrace7/src/bin/chflags/chflags.c#2 integrate
.. //depot/projects/dtrace7/src/bin/realpath/realpath.1#2 integrate
.. //depot/projects/dtrace7/src/bin/realpath/realpath.c#2 integrate
.. //depot/projects/dtrace7/src/bin/uuidgen/Makefile#1 branch
.. //depot/projects/dtrace7/src/bin/uuidgen/uuidgen.1#1 branch
.. //depot/projects/dtrace7/src/bin/uuidgen/uuidgen.c#1 branch
.. //depot/projects/dtrace7/src/contrib/bsnmp/snmpd/main.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/file/Magdir/bFLT#2 delete
.. //depot/projects/dtrace7/src/contrib/file/Magdir/chi#2 delete
.. //depot/projects/dtrace7/src/contrib/file/Magdir/cvs#2 delete
.. //depot/projects/dtrace7/src/contrib/file/Magdir/hdf#2 delete
.. //depot/projects/dtrace7/src/contrib/file/Magdir/impulse#2 delete
.. //depot/projects/dtrace7/src/contrib/file/Magdir/wordperfect#2 delete
.. //depot/projects/dtrace7/src/contrib/file/acconfig.h#2 delete
.. //depot/projects/dtrace7/src/contrib/file/magic.c#3 integrate
.. //depot/projects/dtrace7/src/contrib/file/missing#2 delete
.. //depot/projects/dtrace7/src/contrib/file/stamp-h.in#2 delete
.. //depot/projects/dtrace7/src/contrib/gcc/config/sparc/freebsd.h#2 integrate
.. //depot/projects/dtrace7/src/contrib/pf/man/pf.conf.5#2 integrate
.. //depot/projects/dtrace7/src/contrib/tcpdump/print-802_11.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/top/top.c#2 integrate
.. //depot/projects/dtrace7/src/crypto/openssl/crypto/engine/eng_cryptodev.c#2 integrate
.. //depot/projects/dtrace7/src/etc/defaults/rc.conf#5 integrate
.. //depot/projects/dtrace7/src/etc/mail/access.sample#2 integrate
.. //depot/projects/dtrace7/src/etc/namedb/named.root#2 integrate
.. //depot/projects/dtrace7/src/etc/periodic/security/100.chksetuid#3 integrate
.. //depot/projects/dtrace7/src/etc/periodic/security/410.logincheck#2 integrate
.. //depot/projects/dtrace7/src/etc/rc.d/dhclient#3 integrate
.. //depot/projects/dtrace7/src/etc/rc.d/mountcritlocal#3 integrate
.. //depot/projects/dtrace7/src/etc/rc.d/mountlate#2 integrate
.. //depot/projects/dtrace7/src/etc/rc.firewall#3 integrate
.. //depot/projects/dtrace7/src/etc/sendmail/freebsd.mc#3 integrate
.. //depot/projects/dtrace7/src/gnu/usr.bin/diff/Makefile#2 integrate
.. //depot/projects/dtrace7/src/gnu/usr.bin/gdb/kgdb/Makefile#2 integrate
.. //depot/projects/dtrace7/src/gnu/usr.bin/gdb/kgdb/kgdb.h#3 integrate
.. //depot/projects/dtrace7/src/gnu/usr.bin/gdb/kgdb/kld.c#1 branch
.. //depot/projects/dtrace7/src/gnu/usr.bin/gdb/kgdb/kthr.c#3 integrate
.. //depot/projects/dtrace7/src/gnu/usr.bin/gdb/kgdb/main.c#2 integrate
.. //depot/projects/dtrace7/src/gnu/usr.bin/gdb/kgdb/trgt.c#2 integrate
.. //depot/projects/dtrace7/src/gnu/usr.bin/gdb/kgdb/trgt_i386.c#3 integrate
.. //depot/projects/dtrace7/src/gnu/usr.bin/sort/Makefile#2 integrate
.. //depot/projects/dtrace7/src/include/stdio.h#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/Makefile#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive.h.in#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_endian.h#1 branch
.. //depot/projects/dtrace7/src/lib/libarchive/archive_entry.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_entry.h#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_entry_link_resolver.c#1 branch
.. //depot/projects/dtrace7/src/lib/libarchive/archive_entry_private.h#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_entry_strmode.c#1 branch
.. //depot/projects/dtrace7/src/lib/libarchive/archive_platform.h#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_read.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_read_extract.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_read_open_filename.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_read_private.h#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_read_support_compression_bzip2.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_read_support_compression_gzip.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_read_support_compression_none.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_read_support_format_all.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_read_support_format_ar.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_read_support_format_cpio.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_read_support_format_iso9660.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_read_support_format_mtree.c#1 branch
.. //depot/projects/dtrace7/src/lib/libarchive/archive_read_support_format_tar.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_read_support_format_zip.c#3 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_util.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_write_disk.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_write_open_filename.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_write_set_compression_bzip2.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_write_set_compression_gzip.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_write_set_compression_none.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_write_set_format_ar.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_write_set_format_cpio.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_write_set_format_cpio_newc.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_write_set_format_pax.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_write_set_format_ustar.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/config_freebsd.h#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/cpio.5#1 branch
.. //depot/projects/dtrace7/src/lib/libarchive/filter_fork.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/libarchive-formats.5#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/libarchive_internals.3#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/test/Makefile#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/test/README#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/test/main.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/test/read_open_memory.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/test/test.h#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_compat_gtar.c#1 branch
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_compat_gtar_1.tgz.uu#1 branch
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_compat_tar_hardlink.c#1 branch
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_compat_tar_hardlink_1.tar.uu#1 branch
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_compat_zip.c#1 branch
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_compat_zip_1.zip.uu#1 branch
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_empty_write.c#1 branch
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_entry_strmode.c#1 branch
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_read_format_cpio_odc.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_read_format_gtar_sparse.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_read_format_gtar_sparse_1_13.tgz.uu#1 branch
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_read_format_gtar_sparse_1_17.tgz.uu#1 branch
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tgz.uu#1 branch
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tgz.uu#1 branch
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tgz.uu#1 branch
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu#1 branch
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_read_format_isorr_bz2.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_read_format_mtree.c#1 branch
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_read_format_tar.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_read_format_zip.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_read_pax_truncated.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_tar_filenames.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_tar_large.c#1 branch
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_write_disk.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_write_disk_hardlink.c#1 branch
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_write_disk_perms.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_write_format_cpio.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_write_format_cpio_newc.c#1 branch
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_write_format_cpio_odc.c#1 branch
.. //depot/projects/dtrace7/src/lib/libc/gen/Makefile.inc#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/gen/Symbol.map#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/gen/sem_timedwait.3#1 branch
.. //depot/projects/dtrace7/src/lib/libc/gen/sysconf.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/locale/setrunelocale.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/resolv/res_comp.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/stdio/fdopen.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/stdio/fopen.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/stdio/freopen.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/stdlib/getenv.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/stdlib/malloc.3#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/stdlib/malloc.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/sys/Makefile.inc#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/sys/access.2#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/sys/clock_gettime.2#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/sys/kldunload.2#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/sys/mq_close.2#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/sys/mq_getattr.2#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/sys/mq_notify.2#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/sys/mq_open.2#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/sys/mq_receive.2#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/sys/mq_send.2#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/sys/mq_setattr.2#2 integrate
.. //depot/projects/dtrace7/src/lib/libdisk/disk.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libelf/elf.3#3 integrate
.. //depot/projects/dtrace7/src/lib/libelf/gelf_fsize.3#3 integrate
.. //depot/projects/dtrace7/src/lib/libelf/libelf_data.c#4 integrate
.. //depot/projects/dtrace7/src/lib/libfetch/common.c#3 integrate
.. //depot/projects/dtrace7/src/lib/libfetch/fetch.3#3 integrate
.. //depot/projects/dtrace7/src/lib/libfetch/ftp.c#3 integrate
.. //depot/projects/dtrace7/src/lib/libfetch/http.c#3 integrate
.. //depot/projects/dtrace7/src/lib/libkse/kse.map#2 integrate
.. //depot/projects/dtrace7/src/lib/libkse/sys/lock.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libkse/sys/lock.h#2 integrate
.. //depot/projects/dtrace7/src/lib/libkse/thread/thr_cond.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libkse/thread/thr_init.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libkse/thread/thr_kern.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libkse/thread/thr_mutex.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libkse/thread/thr_rtld.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libkvm/kvm.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libmilter/Makefile#2 integrate
.. //depot/projects/dtrace7/src/lib/libsdp/sdp.h#2 integrate
.. //depot/projects/dtrace7/src/lib/libthr/arch/amd64/Makefile.inc#2 integrate
.. //depot/projects/dtrace7/src/lib/libthr/arch/arm/Makefile.inc#2 integrate
.. //depot/projects/dtrace7/src/lib/libthr/arch/arm/include/pthread_md.h#2 integrate
.. //depot/projects/dtrace7/src/lib/libthr/arch/i386/Makefile.inc#2 integrate
.. //depot/projects/dtrace7/src/lib/libthr/arch/ia64/Makefile.inc#2 integrate
.. //depot/projects/dtrace7/src/lib/libthr/arch/powerpc/Makefile.inc#2 integrate
.. //depot/projects/dtrace7/src/lib/libthr/arch/sparc64/Makefile.inc#2 integrate
.. //depot/projects/dtrace7/src/lib/libthr/arch/sparc64/include/pthread_md.h#2 integrate
.. //depot/projects/dtrace7/src/lib/libthr/pthread.map#2 integrate
.. //depot/projects/dtrace7/src/lib/libthr/thread/thr_mutex.c#3 integrate
.. //depot/projects/dtrace7/src/lib/libthr/thread/thr_once.c#2 integrate
.. //depot/projects/dtrace7/src/lib/ncurses/ncurses/Makefile#2 integrate
.. //depot/projects/dtrace7/src/release/doc/en_US.ISO8859-1/errata/article.sgml#2 integrate
.. //depot/projects/dtrace7/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#3 integrate
.. //depot/projects/dtrace7/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#5 integrate
.. //depot/projects/dtrace7/src/release/doc/en_US.ISO8859-1/share/sgml/release.dsl#2 integrate
.. //depot/projects/dtrace7/src/release/doc/share/misc/dev.archlist.txt#3 integrate
.. //depot/projects/dtrace7/src/release/doc/share/sgml/release.ent#4 integrate
.. //depot/projects/dtrace7/src/release/doc/zh_CN.GB2312/errata/article.sgml#2 integrate
.. //depot/projects/dtrace7/src/release/fixit.profile#4 integrate
.. //depot/projects/dtrace7/src/sbin/bsdlabel/bsdlabel.8#2 integrate
.. //depot/projects/dtrace7/src/sbin/dhclient/dhclient-script#2 integrate
.. //depot/projects/dtrace7/src/sbin/ffsinfo/ffsinfo.c#2 integrate
.. //depot/projects/dtrace7/src/sbin/geom/class/multipath/gmultipath.8#2 integrate
.. //depot/projects/dtrace7/src/sbin/geom/core/geom.8#2 integrate
.. //depot/projects/dtrace7/src/sbin/geom/core/geom.c#2 integrate
.. //depot/projects/dtrace7/src/sbin/gpt/gpt.8#3 integrate
.. //depot/projects/dtrace7/src/sbin/gpt/gpt.c#3 integrate
.. //depot/projects/dtrace7/src/sbin/gpt/migrate.c#2 integrate
.. //depot/projects/dtrace7/src/sbin/gpt/show.c#3 integrate
.. //depot/projects/dtrace7/src/sbin/ifconfig/ifieee80211.c#2 integrate
.. //depot/projects/dtrace7/src/sbin/init/init.c#2 integrate
.. //depot/projects/dtrace7/src/sbin/ipfw/ipfw.8#3 integrate
.. //depot/projects/dtrace7/src/sbin/ipfw/ipfw2.c#3 integrate
.. //depot/projects/dtrace7/src/sbin/iscontrol/misc.c#2 integrate
.. //depot/projects/dtrace7/src/sbin/md5/md5.c#2 integrate
.. //depot/projects/dtrace7/src/sbin/natd/natd.8#2 integrate
.. //depot/projects/dtrace7/src/sbin/newfs/newfs.8#2 integrate
.. //depot/projects/dtrace7/src/sbin/route/route.8#2 integrate
.. //depot/projects/dtrace7/src/sbin/route/route.c#3 integrate
.. //depot/projects/dtrace7/src/sbin/setkey/parse.y#2 integrate
.. //depot/projects/dtrace7/src/secure/usr.bin/ssh/Makefile#2 integrate
.. //depot/projects/dtrace7/src/secure/usr.sbin/sshd/Makefile#2 integrate
.. //depot/projects/dtrace7/src/share/colldef/el_GR.ISO8859-7.src#2 integrate
.. //depot/projects/dtrace7/src/share/examples/cvsup/cvs-supfile#2 integrate
.. //depot/projects/dtrace7/src/share/man/man3/Makefile#2 integrate
.. //depot/projects/dtrace7/src/share/man/man3/queue.3#2 integrate
.. //depot/projects/dtrace7/src/share/man/man3/tree.3#2 integrate
.. //depot/projects/dtrace7/src/share/man/man4/Makefile#5 integrate
.. //depot/projects/dtrace7/src/share/man/man4/axe.4#2 integrate
.. //depot/projects/dtrace7/src/share/man/man4/ciss.4#2 integrate
.. //depot/projects/dtrace7/src/share/man/man4/ddb.4#2 integrate
.. //depot/projects/dtrace7/src/share/man/man4/fwohci.4#2 integrate
.. //depot/projects/dtrace7/src/share/man/man4/hptiop.4#2 integrate
.. //depot/projects/dtrace7/src/share/man/man4/hptrr.4#2 integrate
.. //depot/projects/dtrace7/src/share/man/man4/man4.i386/ar.4#2 integrate
.. //depot/projects/dtrace7/src/share/man/man4/man4.i386/linux.4#2 integrate
.. //depot/projects/dtrace7/src/share/man/man4/man4.i386/pnp.4#2 integrate
.. //depot/projects/dtrace7/src/share/man/man4/man4.i386/scd.4#2 integrate
.. //depot/projects/dtrace7/src/share/man/man4/man4.i386/streams.4#2 integrate
.. //depot/projects/dtrace7/src/share/man/man4/man4.i386/svr4.4#2 integrate
.. //depot/projects/dtrace7/src/share/man/man4/msk.4#3 integrate
.. //depot/projects/dtrace7/src/share/man/man4/mxge.4#3 integrate
.. //depot/projects/dtrace7/src/share/man/man4/ng_nat.4#2 integrate
.. //depot/projects/dtrace7/src/share/man/man4/ng_pppoe.4#2 integrate
.. //depot/projects/dtrace7/src/share/man/man4/nve.4#2 integrate
.. //depot/projects/dtrace7/src/share/man/man4/puc.4#2 integrate
.. //depot/projects/dtrace7/src/share/man/man4/rr232x.4#2 delete
.. //depot/projects/dtrace7/src/share/man/man4/ucycom.4#2 integrate
.. //depot/projects/dtrace7/src/share/man/man5/hosts.equiv.5#2 integrate
.. //depot/projects/dtrace7/src/share/man/man5/rc.conf.5#3 integrate
.. //depot/projects/dtrace7/src/share/man/man9/Makefile#3 integrate
.. //depot/projects/dtrace7/src/share/man/man9/ieee80211_radiotap.9#2 integrate
.. //depot/projects/dtrace7/src/share/man/man9/style.9#2 integrate
.. //depot/projects/dtrace7/src/share/mk/bsd.cpu.mk#3 integrate
.. //depot/projects/dtrace7/src/share/termcap/termcap.src#2 integrate
.. //depot/projects/dtrace7/src/share/zoneinfo/asia#3 integrate
.. //depot/projects/dtrace7/src/share/zoneinfo/backward#3 integrate
.. //depot/projects/dtrace7/src/share/zoneinfo/leapseconds#2 integrate
.. //depot/projects/dtrace7/src/share/zoneinfo/northamerica#3 integrate
.. //depot/projects/dtrace7/src/share/zoneinfo/southamerica#3 integrate
.. //depot/projects/dtrace7/src/share/zoneinfo/zone.tab#3 integrate
.. //depot/projects/dtrace7/src/sys/amd64/acpica/madt.c#2 integrate
.. //depot/projects/dtrace7/src/sys/amd64/amd64/amd64_mem.c#2 integrate
.. //depot/projects/dtrace7/src/sys/amd64/amd64/busdma_machdep.c#2 integrate
.. //depot/projects/dtrace7/src/sys/amd64/amd64/intr_machdep.c#3 integrate
.. //depot/projects/dtrace7/src/sys/amd64/amd64/machdep.c#4 integrate
.. //depot/projects/dtrace7/src/sys/amd64/amd64/mem.c#2 integrate
.. //depot/projects/dtrace7/src/sys/amd64/amd64/nexus.c#2 integrate
.. //depot/projects/dtrace7/src/sys/amd64/conf/GENERIC#6 integrate
.. //depot/projects/dtrace7/src/sys/amd64/conf/NOTES#4 integrate
.. //depot/projects/dtrace7/src/sys/amd64/ia32/ia32_signal.c#2 integrate
.. //depot/projects/dtrace7/src/sys/amd64/include/pc/bios.h#2 integrate
.. //depot/projects/dtrace7/src/sys/amd64/include/proc.h#2 integrate
.. //depot/projects/dtrace7/src/sys/amd64/include/specialreg.h#2 integrate
.. //depot/projects/dtrace7/src/sys/amd64/isa/clock.c#2 integrate
.. //depot/projects/dtrace7/src/sys/amd64/linux32/linux32_machdep.c#2 integrate
.. //depot/projects/dtrace7/src/sys/amd64/linux32/linux32_sysvec.c#2 integrate
.. //depot/projects/dtrace7/src/sys/arm/arm/busdma_machdep.c#2 integrate
.. //depot/projects/dtrace7/src/sys/arm/arm/uio_machdep.c#2 integrate
.. //depot/projects/dtrace7/src/sys/arm/include/_bus.h#2 integrate
.. //depot/projects/dtrace7/src/sys/arm/xscale/ixp425/if_npe.c#2 integrate
.. //depot/projects/dtrace7/src/sys/arm/xscale/ixp425/ixp425.c#2 integrate
.. //depot/projects/dtrace7/src/sys/boot/i386/boot2/boot2.c#2 integrate
.. //depot/projects/dtrace7/src/sys/boot/i386/btx/btx/Makefile#2 integrate
.. //depot/projects/dtrace7/src/sys/boot/i386/btx/btx/btx.S#2 integrate
.. //depot/projects/dtrace7/src/sys/boot/i386/gptboot/gptboot.c#2 integrate
.. //depot/projects/dtrace7/src/sys/boot/i386/libi386/biosdisk.c#3 integrate
.. //depot/projects/dtrace7/src/sys/boot/i386/libi386/biosmem.c#2 integrate
.. //depot/projects/dtrace7/src/sys/boot/i386/libi386/biossmap.c#2 integrate
.. //depot/projects/dtrace7/src/sys/cam/cam_xpt.c#2 integrate
.. //depot/projects/dtrace7/src/sys/cam/scsi/scsi_da.c#2 integrate
.. //depot/projects/dtrace7/src/sys/compat/linux/linux_futex.c#2 integrate
.. //depot/projects/dtrace7/src/sys/compat/linux/linux_futex.h#2 integrate
.. //depot/projects/dtrace7/src/sys/compat/linux/linux_misc.c#2 integrate
.. //depot/projects/dtrace7/src/sys/compat/linux/linux_misc.h#2 integrate
.. //depot/projects/dtrace7/src/sys/conf/NOTES#3 integrate
.. //depot/projects/dtrace7/src/sys/conf/files#6 integrate
.. //depot/projects/dtrace7/src/sys/conf/files.amd64#4 integrate
.. //depot/projects/dtrace7/src/sys/conf/files.i386#4 integrate
.. //depot/projects/dtrace7/src/sys/conf/files.sparc64#2 integrate
.. //depot/projects/dtrace7/src/sys/conf/kmod.mk#2 integrate
.. //depot/projects/dtrace7/src/sys/conf/newvers.sh#5 integrate
.. //depot/projects/dtrace7/src/sys/conf/options#3 integrate
.. //depot/projects/dtrace7/src/sys/ddb/db_capture.c#1 branch
.. //depot/projects/dtrace7/src/sys/ddb/db_command.c#2 integrate
.. //depot/projects/dtrace7/src/sys/ddb/db_input.c#2 integrate
.. //depot/projects/dtrace7/src/sys/ddb/db_main.c#2 integrate
.. //depot/projects/dtrace7/src/sys/ddb/db_output.c#2 integrate
.. //depot/projects/dtrace7/src/sys/ddb/ddb.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/aac/aac.c#4 integrate
.. //depot/projects/dtrace7/src/sys/dev/acpica/acpi.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/acpica/acpi_cpu.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/acpica/acpi_thermal.c#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/aic7xxx/aic79xx_osm.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/ath/if_ath.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/bce/if_bce.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/bfe/if_bfe.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/bfe/if_bfereg.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/bge/if_bge.c#4 integrate
.. //depot/projects/dtrace7/src/sys/dev/bge/if_bgereg.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/ciss/ciss.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/coretemp/coretemp.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/cxgb_main.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/sys/mvec.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/sys/uipc_mvec.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/dc/dcphy.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/dc/if_dc.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/drm/drm_pciids.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/drm/i915_dma.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/gem/if_gem.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/gem/if_gem_pci.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/gem/if_gemreg.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/gem/if_gemvar.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/hptiop/hptiop.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/hptiop/hptiop.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/hptrr/amd64-elf.hptrr_lib.o.uu#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/hptrr/array.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/hptrr/him.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/hptrr/himfuncs.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/hptrr/hptintf.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/hptrr/hptrr_config.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/hptrr/hptrr_config.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/hptrr/hptrr_os_bsd.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/hptrr/hptrr_osm_bsd.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/hptrr/i386-elf.hptrr_lib.o.uu#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/hptrr/ldm.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/hptrr/list.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/hptrr/os_bsd.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/hptrr/osm.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/ichwd/ichwd.c#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/ichwd/ichwd.h#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/if_ndis/if_ndis.c#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/lge/if_lge.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/md/md.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/mfi/mfi.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/mfi/mfireg.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/mii/amphy.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/mii/brgphy.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/mii/e1000phy.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/mii/miidevs#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/mii/nsphy.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/mii/nsphyter.c#1 branch
.. //depot/projects/dtrace7/src/sys/dev/mii/nsphyterreg.h#1 branch
.. //depot/projects/dtrace7/src/sys/dev/mii/rlphy.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/mii/tdkphy.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/mii/ukphy_subr.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/msk/if_msk.c#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/msk/if_mskreg.h#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/mxge/if_mxge.c#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/mxge/if_mxge_var.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/mxge/mxge_lro.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/mxge/mxge_mcp.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/mxge/mxge_rss_eth_z8e.c#1 branch
.. //depot/projects/dtrace7/src/sys/dev/mxge/mxge_rss_ethp_z8e.c#1 branch
.. //depot/projects/dtrace7/src/sys/dev/mxge/rss_eth_z8e.h#1 branch
.. //depot/projects/dtrace7/src/sys/dev/mxge/rss_ethp_z8e.h#1 branch
.. //depot/projects/dtrace7/src/sys/dev/nfe/if_nfe.c#4 integrate
.. //depot/projects/dtrace7/src/sys/dev/nge/if_nge.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/nve/if_nve.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/pci/pci.c#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/puc/pucdata.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/ral/rt2560.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/ral/rt2560reg.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/ral/rt2560var.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/re/if_re.c#5 integrate
.. //depot/projects/dtrace7/src/sys/dev/rr232x/LICENSE#2 delete
.. //depot/projects/dtrace7/src/sys/dev/rr232x/README#2 delete
.. //depot/projects/dtrace7/src/sys/dev/rr232x/amd64-elf.rr232x_lib.o.uu#2 delete
.. //depot/projects/dtrace7/src/sys/dev/rr232x/array.h#2 delete
.. //depot/projects/dtrace7/src/sys/dev/rr232x/him.h#2 delete
.. //depot/projects/dtrace7/src/sys/dev/rr232x/himfuncs.h#2 delete
.. //depot/projects/dtrace7/src/sys/dev/rr232x/hptintf.h#2 delete
.. //depot/projects/dtrace7/src/sys/dev/rr232x/i386-elf.rr232x_lib.o.uu#2 delete
.. //depot/projects/dtrace7/src/sys/dev/rr232x/ldm.h#2 delete
.. //depot/projects/dtrace7/src/sys/dev/rr232x/list.h#2 delete
.. //depot/projects/dtrace7/src/sys/dev/rr232x/os_bsd.c#2 delete
.. //depot/projects/dtrace7/src/sys/dev/rr232x/os_bsd.h#2 delete
.. //depot/projects/dtrace7/src/sys/dev/rr232x/osm.h#2 delete
.. //depot/projects/dtrace7/src/sys/dev/rr232x/osm_bsd.c#2 delete
.. //depot/projects/dtrace7/src/sys/dev/rr232x/rr232x_config.c#2 delete
.. //depot/projects/dtrace7/src/sys/dev/rr232x/rr232x_config.h#2 delete
.. //depot/projects/dtrace7/src/sys/dev/sk/if_sk.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/stge/if_stge.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/syscons/syscons.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/tdfx/tdfx_pci.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/ti/if_ti.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/twe/twe.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/txp/if_txp.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/usb/ehci_pci.c#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/usb/if_rum.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/usb/ucom.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/usb/umass.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/usb/ums.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/usb/usbdevs#4 integrate
.. //depot/projects/dtrace7/src/sys/dev/usb/uscanner.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/vge/if_vge.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/vx/if_vx_pci.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/wpi/if_wpi.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/wpi/if_wpireg.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/wpi/if_wpivar.h#2 integrate
.. //depot/projects/dtrace7/src/sys/fs/coda/TODO#2 integrate
.. //depot/projects/dtrace7/src/sys/fs/coda/cnode.h#3 integrate
.. //depot/projects/dtrace7/src/sys/fs/coda/coda_fbsd.c#2 integrate
.. //depot/projects/dtrace7/src/sys/fs/coda/coda_io.h#2 integrate
.. //depot/projects/dtrace7/src/sys/fs/coda/coda_kernel.h#2 delete
.. //depot/projects/dtrace7/src/sys/fs/coda/coda_namecache.c#2 delete
.. //depot/projects/dtrace7/src/sys/fs/coda/coda_namecache.h#3 delete
.. //depot/projects/dtrace7/src/sys/fs/coda/coda_opstats.h#2 integrate
.. //depot/projects/dtrace7/src/sys/fs/coda/coda_pioctl.h#2 integrate
.. //depot/projects/dtrace7/src/sys/fs/coda/coda_psdev.c#3 integrate
.. //depot/projects/dtrace7/src/sys/fs/coda/coda_psdev.h#2 integrate
.. //depot/projects/dtrace7/src/sys/fs/coda/coda_subr.c#2 integrate
.. //depot/projects/dtrace7/src/sys/fs/coda/coda_subr.h#2 integrate
.. //depot/projects/dtrace7/src/sys/fs/coda/coda_venus.c#2 integrate
.. //depot/projects/dtrace7/src/sys/fs/coda/coda_venus.h#2 integrate
.. //depot/projects/dtrace7/src/sys/fs/coda/coda_vfsops.c#3 integrate
.. //depot/projects/dtrace7/src/sys/fs/coda/coda_vfsops.h#2 integrate
.. //depot/projects/dtrace7/src/sys/fs/coda/coda_vnops.c#3 integrate
.. //depot/projects/dtrace7/src/sys/fs/coda/coda_vnops.h#2 integrate
.. //depot/projects/dtrace7/src/sys/fs/devfs/devfs_rule.c#2 integrate
.. //depot/projects/dtrace7/src/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate
.. //depot/projects/dtrace7/src/sys/fs/ntfs/ntfs_subr.c#2 integrate
.. //depot/projects/dtrace7/src/sys/fs/udf/udf_vfsops.c#3 integrate
.. //depot/projects/dtrace7/src/sys/geom/geom_bsd_enc.c#2 integrate
.. //depot/projects/dtrace7/src/sys/geom/part/g_part.c#3 integrate
.. //depot/projects/dtrace7/src/sys/geom/part/g_part.h#3 integrate
.. //depot/projects/dtrace7/src/sys/geom/part/g_part_bsd.c#1 branch
.. //depot/projects/dtrace7/src/sys/geom/part/g_part_mbr.c#2 integrate
.. //depot/projects/dtrace7/src/sys/geom/part/g_part_vtoc8.c#1 branch
.. //depot/projects/dtrace7/src/sys/geom/vinum/geom_vinum_drive.c#2 integrate
.. //depot/projects/dtrace7/src/sys/i386/acpica/madt.c#2 integrate
.. //depot/projects/dtrace7/src/sys/i386/conf/GENERIC#3 integrate
.. //depot/projects/dtrace7/src/sys/i386/conf/NOTES#4 integrate
.. //depot/projects/dtrace7/src/sys/i386/cpufreq/est.c#2 integrate
.. //depot/projects/dtrace7/src/sys/i386/i386/busdma_machdep.c#2 integrate
.. //depot/projects/dtrace7/src/sys/i386/i386/i686_mem.c#2 integrate
.. //depot/projects/dtrace7/src/sys/i386/i386/identcpu.c#2 integrate
.. //depot/projects/dtrace7/src/sys/i386/i386/initcpu.c#2 integrate
.. //depot/projects/dtrace7/src/sys/i386/i386/intr_machdep.c#3 integrate
.. //depot/projects/dtrace7/src/sys/i386/i386/k6_mem.c#2 integrate
.. //depot/projects/dtrace7/src/sys/i386/i386/machdep.c#3 integrate
.. //depot/projects/dtrace7/src/sys/i386/include/pc/bios.h#2 integrate
.. //depot/projects/dtrace7/src/sys/i386/include/proc.h#2 integrate
.. //depot/projects/dtrace7/src/sys/i386/include/specialreg.h#2 integrate
.. //depot/projects/dtrace7/src/sys/i386/isa/clock.c#2 integrate
.. //depot/projects/dtrace7/src/sys/i386/linux/linux_machdep.c#3 integrate
.. //depot/projects/dtrace7/src/sys/i386/linux/linux_sysvec.c#2 integrate
.. //depot/projects/dtrace7/src/sys/i386/svr4/svr4_machdep.c#2 integrate
.. //depot/projects/dtrace7/src/sys/ia64/ia64/busdma_machdep.c#2 integrate
.. //depot/projects/dtrace7/src/sys/ia64/ia64/machdep.c#3 integrate
.. //depot/projects/dtrace7/src/sys/ia64/ia64/pmap.c#3 integrate
.. //depot/projects/dtrace7/src/sys/kern/kern_conf.c#3 integrate
.. //depot/projects/dtrace7/src/sys/kern/kern_descrip.c#2 integrate
.. //depot/projects/dtrace7/src/sys/kern/kern_fork.c#4 integrate
.. //depot/projects/dtrace7/src/sys/kern/kern_jail.c#2 integrate
.. //depot/projects/dtrace7/src/sys/kern/kern_mib.c#3 integrate
.. //depot/projects/dtrace7/src/sys/kern/kern_mutex.c#3 integrate
.. //depot/projects/dtrace7/src/sys/kern/kern_rwlock.c#3 integrate
.. //depot/projects/dtrace7/src/sys/kern/kern_sig.c#3 integrate
.. //depot/projects/dtrace7/src/sys/kern/link_elf.c#3 integrate
.. //depot/projects/dtrace7/src/sys/kern/link_elf_obj.c#3 integrate
.. //depot/projects/dtrace7/src/sys/kern/subr_autoconf.c#2 integrate
.. //depot/projects/dtrace7/src/sys/kern/subr_bus.c#2 integrate
.. //depot/projects/dtrace7/src/sys/kern/subr_sleepqueue.c#3 integrate
.. //depot/projects/dtrace7/src/sys/kern/tty_pts.c#2 integrate
.. //depot/projects/dtrace7/src/sys/kern/uipc_debug.c#2 integrate
.. //depot/projects/dtrace7/src/sys/kern/uipc_mbuf.c#2 integrate
.. //depot/projects/dtrace7/src/sys/kern/uipc_sockbuf.c#2 integrate
.. //depot/projects/dtrace7/src/sys/kern/uipc_socket.c#2 integrate
.. //depot/projects/dtrace7/src/sys/kern/uipc_syscalls.c#2 integrate
.. //depot/projects/dtrace7/src/sys/kern/uipc_usrreq.c#3 integrate
.. //depot/projects/dtrace7/src/sys/modules/Makefile#6 integrate
.. //depot/projects/dtrace7/src/sys/modules/coda/Makefile#2 integrate
.. //depot/projects/dtrace7/src/sys/modules/coda5/Makefile#2 integrate
.. //depot/projects/dtrace7/src/sys/modules/ipfw_nat/Makefile#1 branch
.. //depot/projects/dtrace7/src/sys/modules/mii/Makefile#2 integrate
.. //depot/projects/dtrace7/src/sys/modules/mxge/Makefile#2 integrate
.. //depot/projects/dtrace7/src/sys/modules/mxge/mxge_rss_eth_z8e/Makefile#1 branch
.. //depot/projects/dtrace7/src/sys/modules/mxge/mxge_rss_ethp_z8e/Makefile#1 branch
.. //depot/projects/dtrace7/src/sys/modules/rr232x/Makefile#2 delete
.. //depot/projects/dtrace7/src/sys/net/netisr.h#2 integrate
.. //depot/projects/dtrace7/src/sys/net/route.c#3 integrate
.. //depot/projects/dtrace7/src/sys/net80211/ieee80211_ht.c#3 integrate
.. //depot/projects/dtrace7/src/sys/net80211/ieee80211_ht.h#2 integrate
.. //depot/projects/dtrace7/src/sys/net80211/ieee80211_input.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netgraph/netflow/ng_netflow.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netgraph/netgraph.h#3 integrate
.. //depot/projects/dtrace7/src/sys/netgraph/ng_base.c#3 integrate
.. //depot/projects/dtrace7/src/sys/netgraph/ng_bpf.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netgraph/ng_car.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netgraph/ng_car.h#2 integrate
.. //depot/projects/dtrace7/src/sys/netgraph/ng_iface.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netgraph/ng_ksocket.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netgraph/ng_l2tp.c#3 integrate
.. //depot/projects/dtrace7/src/sys/netgraph/ng_nat.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netgraph/ng_nat.h#2 integrate
.. //depot/projects/dtrace7/src/sys/netgraph/ng_ppp.c#4 integrate
.. //depot/projects/dtrace7/src/sys/netgraph/ng_pppoe.c#3 integrate
.. //depot/projects/dtrace7/src/sys/netgraph/ng_socket.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netgraph/ng_tee.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netinet/in.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netinet/in_pcb.c#3 integrate
.. //depot/projects/dtrace7/src/sys/netinet/ip_fw.h#3 integrate
.. //depot/projects/dtrace7/src/sys/netinet/ip_fw2.c#3 integrate
.. //depot/projects/dtrace7/src/sys/netinet/ip_fw_nat.c#1 branch
.. //depot/projects/dtrace7/src/sys/netinet/ip_ipsec.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netinet/ip_options.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netinet/ip_output.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netinet/libalias/alias_irc.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netinet/sctp_auth.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netinet/sctp_bsd_addr.c#3 integrate
.. //depot/projects/dtrace7/src/sys/netinet/sctp_indata.c#3 integrate
.. //depot/projects/dtrace7/src/sys/netinet/sctp_input.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netinet/sctp_output.c#3 integrate
.. //depot/projects/dtrace7/src/sys/netinet/sctp_pcb.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netinet/sctp_peeloff.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netinet/sctp_usrreq.c#3 integrate
.. //depot/projects/dtrace7/src/sys/netinet/sctputil.c#4 integrate
.. //depot/projects/dtrace7/src/sys/netinet/tcp_input.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netinet/tcp_output.c#4 integrate
.. //depot/projects/dtrace7/src/sys/netinet/tcp_usrreq.c#3 integrate
.. //depot/projects/dtrace7/src/sys/netinet/tcp_var.h#3 integrate
.. //depot/projects/dtrace7/src/sys/netinet6/in6.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netinet6/in6_src.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netinet6/ip6_ipsec.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netinet6/ip6_ipsec.h#2 integrate
.. //depot/projects/dtrace7/src/sys/netinet6/ip6_output.c#3 integrate
.. //depot/projects/dtrace7/src/sys/netinet6/ip6_var.h#2 integrate
.. //depot/projects/dtrace7/src/sys/netinet6/raw_ip6.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netinet6/udp6_usrreq.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netipsec/ipsec.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netipsec/ipsec.h#2 integrate
.. //depot/projects/dtrace7/src/sys/netipsec/ipsec6.h#2 integrate
.. //depot/projects/dtrace7/src/sys/netipsec/ipsec_output.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netipsec/key.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netipsec/key_debug.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netsmb/smb_conn.h#2 integrate
.. //depot/projects/dtrace7/src/sys/netsmb/smb_iod.c#2 integrate
.. //depot/projects/dtrace7/src/sys/nfsclient/nfs_socket.c#3 integrate
.. //depot/projects/dtrace7/src/sys/nfsclient/nfs_subs.c#2 integrate
.. //depot/projects/dtrace7/src/sys/nfsclient/nfsm_subs.h#2 integrate
.. //depot/projects/dtrace7/src/sys/nfsserver/nfs_serv.c#2 integrate
.. //depot/projects/dtrace7/src/sys/nfsserver/nfs_srvsubs.c#3 integrate
.. //depot/projects/dtrace7/src/sys/pc98/pc98/machdep.c#3 integrate
.. //depot/projects/dtrace7/src/sys/pci/agp_i810.c#3 integrate
.. //depot/projects/dtrace7/src/sys/pci/agp_nvidia.c#2 integrate
.. //depot/projects/dtrace7/src/sys/pci/if_rl.c#3 integrate
.. //depot/projects/dtrace7/src/sys/pci/if_sf.c#2 integrate
.. //depot/projects/dtrace7/src/sys/pci/if_ste.c#2 integrate
.. //depot/projects/dtrace7/src/sys/pci/if_vr.c#2 integrate
.. //depot/projects/dtrace7/src/sys/pci/if_xl.c#2 integrate
.. //depot/projects/dtrace7/src/sys/powerpc/conf/GENERIC#2 integrate
.. //depot/projects/dtrace7/src/sys/security/audit/audit_bsm.c#2 integrate
.. //depot/projects/dtrace7/src/sys/security/audit/audit_syscalls.c#2 integrate
.. //depot/projects/dtrace7/src/sys/security/audit/audit_worker.c#2 integrate
.. //depot/projects/dtrace7/src/sys/security/mac_mls/mac_mls.c#2 integrate
.. //depot/projects/dtrace7/src/sys/sparc64/include/md_var.h#2 integrate
.. //depot/projects/dtrace7/src/sys/sparc64/sparc64/ata_machdep.c#1 branch
.. //depot/projects/dtrace7/src/sys/sparc64/sparc64/iommu.c#2 integrate
.. //depot/projects/dtrace7/src/sys/sys/aac_ioctl.h#2 integrate
.. //depot/projects/dtrace7/src/sys/sys/bus.h#2 integrate
.. //depot/projects/dtrace7/src/sys/sys/conf.h#3 integrate
.. //depot/projects/dtrace7/src/sys/sys/disklabel.h#2 integrate
.. //depot/projects/dtrace7/src/sys/sys/kernel.h#5 integrate
.. //depot/projects/dtrace7/src/sys/sys/mbuf.h#2 integrate
.. //depot/projects/dtrace7/src/sys/sys/param.h#5 integrate
.. //depot/projects/dtrace7/src/sys/sys/priv.h#2 integrate
.. //depot/projects/dtrace7/src/sys/sys/socketvar.h#2 integrate
.. //depot/projects/dtrace7/src/sys/sys/tree.h#2 integrate
.. //depot/projects/dtrace7/src/sys/sys/vtoc.h#1 branch
.. //depot/projects/dtrace7/src/sys/ufs/ffs/ffs_alloc.c#3 integrate
.. //depot/projects/dtrace7/src/sys/ufs/ffs/ffs_balloc.c#3 integrate
.. //depot/projects/dtrace7/src/sys/ufs/ffs/ffs_inode.c#2 integrate
.. //depot/projects/dtrace7/src/sys/ufs/ffs/ffs_snapshot.c#2 integrate
.. //depot/projects/dtrace7/src/sys/ufs/ffs/ffs_softdep.c#2 integrate
.. //depot/projects/dtrace7/src/sys/ufs/ffs/ffs_vfsops.c#2 integrate
.. //depot/projects/dtrace7/src/sys/ufs/ffs/ffs_vnops.c#2 integrate
.. //depot/projects/dtrace7/src/sys/ufs/ufs/ufs_bmap.c#2 integrate
.. //depot/projects/dtrace7/src/sys/ufs/ufs/ufs_extattr.c#2 integrate
.. //depot/projects/dtrace7/src/sys/ufs/ufs/ufs_lookup.c#2 integrate
.. //depot/projects/dtrace7/src/sys/ufs/ufs/ufs_vnops.c#2 integrate
.. //depot/projects/dtrace7/src/sys/vm/vm_mmap.c#2 integrate
.. //depot/projects/dtrace7/src/tools/tools/editing/freebsd.vim#1 branch
.. //depot/projects/dtrace7/src/tools/tools/tinybsd/tinybsd#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/Makefile#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/awk/Makefile#3 integrate
.. //depot/projects/dtrace7/src/usr.bin/gzip/gzip.c#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/logger/logger.c#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/make/Makefile#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/make/job.c#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/netstat/atalk.c#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/netstat/bpf.c#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/netstat/if.c#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/netstat/inet.c#3 integrate
.. //depot/projects/dtrace7/src/usr.bin/netstat/inet6.c#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/netstat/ipsec.c#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/netstat/ipx.c#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/netstat/main.c#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/netstat/mbuf.c#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/netstat/mcast.c#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/netstat/mroute.c#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/netstat/mroute6.c#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/netstat/netgraph.c#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/netstat/netstat.h#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/netstat/pfkey.c#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/netstat/route.c#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/netstat/sctp.c#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/netstat/unix.c#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/tar/COPYING#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/tar/Makefile#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/tar/bsdtar.1#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/tar/bsdtar.c#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/tar/bsdtar_platform.h#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/tar/config_freebsd.h#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/top/machine.c#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/uniq/uniq.c#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/uuidgen/Makefile#2 delete
.. //depot/projects/dtrace7/src/usr.bin/uuidgen/uuidgen.1#2 delete
.. //depot/projects/dtrace7/src/usr.bin/uuidgen/uuidgen.c#2 delete
.. //depot/projects/dtrace7/src/usr.sbin/adduser/adduser.8#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/adduser/adduser.sh#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/bluetooth/sdpd/Makefile#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/bluetooth/sdpd/gn.c#1 branch
.. //depot/projects/dtrace7/src/usr.sbin/bluetooth/sdpd/lan.c#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/bluetooth/sdpd/nap.c#1 branch
.. //depot/projects/dtrace7/src/usr.sbin/bluetooth/sdpd/panu.c#1 branch
.. //depot/projects/dtrace7/src/usr.sbin/bluetooth/sdpd/profile.c#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/bluetooth/sdpd/profile.h#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/bootparamd/bootparamd/bootparamd.c#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/bootparamd/bootparamd/main.c#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/bootparamd/callbootd/callbootd.c#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/mixer/mixer.8#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/mixer/mixer.c#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/mountd/mountd.8#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/mountd/mountd.c#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/moused/moused.c#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/newsyslog/newsyslog.c#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/pkg_install/add/main.c#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/pkg_install/add/pkg_add.1#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/portsnap/phttpget/phttpget.c#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/pw/pw.8#3 integrate
.. //depot/projects/dtrace7/src/usr.sbin/pw/pw.c#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/pw/pw_group.c#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/rpc.lockd/lockd.c#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/rpc.lockd/rpc.lockd.8#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/sade/sade.8#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/sysinstall/disks.c#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/sysinstall/media.c#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/sysinstall/system.c#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/syslogd/syslogd.c#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/timed/timed/timed.8#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/watch/watch.c#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8#2 integrate

Differences ...

==== //depot/projects/dtrace7/src/Makefile#3 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile,v 1.341.2.1 2007/11/22 01:33:08 delphij Exp $
+# $FreeBSD: src/Makefile,v 1.341.2.2 2008/02/12 20:17:53 jhb Exp $
 #
 # The user-driven targets are:
 #
@@ -75,6 +75,8 @@
 # developer convenience only.  They are intentionally not documented and
 # completely subject to change without notice.
 #
+# For more information, see the build(7) manual page.
+#
 TGTS=	all all-man buildenv buildenvvars buildkernel buildworld \
 	check-old check-old-dirs check-old-files check-old-libs \
 	checkdpadd clean cleandepend cleandir \

==== //depot/projects/dtrace7/src/Makefile.inc1#5 (text+ko) ====

@@ -1,4 +1,5 @@
-# $FreeBSD: src/Makefile.inc1,v 1.596 2008/01/23 22:21:36 ru Exp $
+#
+# $FreeBSD: src/Makefile.inc1,v 1.588.2.4 2008/02/24 14:31:41 remko Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -327,8 +328,9 @@
 .endif
 .else
 	rm -rf ${WORLDTMP}/legacy/usr/include
-#	XXX - These two can depend on any header file.
+#	XXX - These three can depend on any header file.
 	rm -f ${OBJTREE}${.CURDIR}/usr.bin/kdump/ioctl.c
+	rm -f ${OBJTREE}${.CURDIR}/usr.bin/kdump/kdump_subr.c
 	rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c
 .endif
 .for _dir in \

==== //depot/projects/dtrace7/src/ObsoleteFiles.inc#6 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.112.2.8 2008/01/30 17:58:15 brueffer Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.112.2.11 2008/03/29 13:53:07 remko Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -1028,6 +1028,9 @@
 OLD_FILES+=usr/sbin/ntptimeset
 OLD_FILES+=usr/share/man/man8/kernbb.8.gz
 OLD_FILES+=usr/share/man/man8/ntp-genkeys.8.gz
+# 20040627: usbdevs.h and usbdevs_data.h removal
+OLD_FILES+=usr/include/dev/usb/usbdevs.h
+OLD_FILES+=usr/include/dev/usb/usbdevs_data.h
 # 200406XX
 OLD_FILES+=usr/bin/gasp
 OLD_FILES+=usr/bin/gdbreplay
@@ -3476,8 +3479,6 @@
 OLD_FILES+=usr/bin/hesinfo
 OLD_FILES+=usr/include/c++/3.4/ext/demangle.h
 OLD_FILES+=usr/include/cam/cam_extend.h
-OLD_FILES+=usr/include/dev/usb/usbdevs.h
-OLD_FILES+=usr/include/dev/usb/usbdevs_data.h
 OLD_FILES+=usr/include/dev/wi/wi_hostap.h
 OLD_FILES+=usr/include/disktab.h
 OLD_FILES+=usr/include/g++/FlexLexer.h

==== //depot/projects/dtrace7/src/UPDATING#3 (text+ko) ====

@@ -8,6 +8,12 @@
 /usr/ports/UPDATING.  Please read that file before running
 portupgrade.
 
+20080226:
+	FreeBSD 7.0-RELEASE
+
+20080208:
+	Note the addition of m_collapse for compacting mbuf chains.
+
 20071126:
 	The AT keyboard emulation of sunkbd(4) has been turned on
 	by default. In order to make the special symbols of the Sun
@@ -919,4 +925,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.507.2.3 2007/11/26 20:07:19 marius Exp $
+$FreeBSD: src/UPDATING,v 1.507.2.5 2008/02/24 05:16:55 kensmith Exp $

==== //depot/projects/dtrace7/src/bin/Makefile#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/bin/Makefile,v 1.26 2006/03/17 18:54:20 ru Exp $
+# $FreeBSD: src/bin/Makefile,v 1.26.2.1 2008/03/16 07:04:03 obrien Exp $
 
 .include 
 
@@ -37,7 +37,8 @@
 	sleep \
 	stty \
 	sync \
-	test
+	test \
+	uuidgen
 
 .if ${MK_RCMDS} != "no"
 _rcp=	rcp

==== //depot/projects/dtrace7/src/bin/chflags/chflags.1#2 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)chflags.1	8.4 (Berkeley) 5/2/95
-.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.29 2007/05/28 04:23:09 pjd Exp $
+.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.29.2.1 2008/03/16 18:54:53 rwatson Exp $
 .\"
 .Dd March 3, 2006
 .Dt CHFLAGS 1
@@ -40,7 +40,7 @@
 .Nd change file flags
 .Sh SYNOPSIS
 .Nm
-.Op Fl h
+.Op Fl fhv
 .Oo
 .Fl R
 .Op Fl H | Fl L | Fl P
@@ -57,6 +57,12 @@
 .Pp
 The options are as follows:
 .Bl -tag -width indent
+.It Fl f
+Do not display a diagnostic message if
+.Nm
+could not modify the flags for
+.Va file ,
+nor modify the exit status to reflect such failures.
 .It Fl H
 If the
 .Fl R
@@ -79,6 +85,14 @@
 .It Fl R
 Change the file flags for the file hierarchies rooted
 in the files instead of just the files themselves.
+.It Fl v
+Cause
+.Nm
+to be verbose, showing filenames as the flags are modified.
+If the
+.Fl v
+option is specified more than once, the old and new flags of the file
+will also be printed, in octal notation.
 .El
 .Pp
 The flags are specified as an octal number or a comma separated list

==== //depot/projects/dtrace7/src/bin/chflags/chflags.c#2 (text+ko) ====

@@ -40,7 +40,7 @@
 #endif
 
 #include 
-__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.23 2005/05/14 23:23:10 dd Exp $");
+__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.23.10.1 2008/03/16 18:54:53 rwatson Exp $");
 
 #include 
 #include 
@@ -60,14 +60,15 @@
 {
 	FTS *ftsp;
 	FTSENT *p;
-	u_long clear, set;
+	u_long clear, newflags, set;
 	long val;
-	int Hflag, Lflag, Rflag, hflag, ch, fts_options, oct, rval;
+	int Hflag, Lflag, Rflag, fflag, hflag, vflag;
+	int ch, fts_options, oct, rval;
 	char *flags, *ep;
 	int (*change_flags)(const char *, unsigned long);
 
-	Hflag = Lflag = Rflag = hflag = 0;
-	while ((ch = getopt(argc, argv, "HLPRh")) != -1)
+	Hflag = Lflag = Rflag = fflag = hflag = vflag = 0;
+	while ((ch = getopt(argc, argv, "HLPRfhv")) != -1)
 		switch (ch) {
 		case 'H':
 			Hflag = 1;
@@ -83,9 +84,15 @@
 		case 'R':
 			Rflag = 1;
 			break;
+		case 'f':
+			fflag = 1;
+			break;
 		case 'h':
 			hflag = 1;
 			break;
+		case 'v':
+			vflag++;
+			break;
 		case '?':
 		default:
 			usage();
@@ -166,18 +173,23 @@
 		default:
 			break;
 		}
-		if (oct) {
-			if (!(*change_flags)(p->fts_accpath, set))
-				continue;
-		} else {
-			p->fts_statp->st_flags |= set;
-			p->fts_statp->st_flags &= clear;
-			if (!(*change_flags)(p->fts_accpath,
-				    (u_long)p->fts_statp->st_flags))
-				continue;
+		if (oct)
+			newflags = set;
+		else
+			newflags = (p->fts_statp->st_flags | set) & clear;
+		if (newflags == p->fts_statp->st_flags)
+			continue;
+		if ((*change_flags)(p->fts_accpath, newflags) && !fflag) {
+			warn("%s", p->fts_path);
+			rval = 1;
+		} else if (vflag) {
+			(void)printf("%s", p->fts_path);
+			if (vflag > 1)
+				(void)printf(": 0%lo -> 0%lo",
+				    (u_long)p->fts_statp->st_flags,
+				    newflags);
+			(void)printf("\n");
 		}
-		warn("%s", p->fts_path);
-		rval = 1;
 	}
 	if (errno)
 		err(1, "fts_read");
@@ -188,6 +200,6 @@
 usage(void)
 {
 	(void)fprintf(stderr,
-	    "usage: chflags [-h] [-R [-H | -L | -P]] flags file ...\n");
+	    "usage: chflags [-fhv] [-R [-H | -L | -P]] flags file ...\n");
 	exit(1);
 }

==== //depot/projects/dtrace7/src/bin/realpath/realpath.1#2 (text+ko) ====

@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)pwd.1	8.2 (Berkeley) 4/28/95
 .\" From: src/bin/pwd/pwd.1,v 1.11 2000/11/20 11:39:39 ru Exp
-.\" $FreeBSD: src/bin/realpath/realpath.1,v 1.10 2005/01/16 16:41:58 ru Exp $
+.\" $FreeBSD: src/bin/realpath/realpath.1,v 1.10.10.1 2008/03/16 18:55:56 rwatson Exp $
 .\"
 .Dd November 24, 2000
 .Dt REALPATH 1
@@ -41,7 +41,9 @@
 .Nd return resolved physical path
 .Sh SYNOPSIS
 .Nm
+.Op Fl q
 .Ar path
+.Op Ar ...
 .Sh DESCRIPTION
 The
 .Nm
@@ -55,6 +57,12 @@
 .Pa /../
 in
 .Ar path .
+.Pp
+If
+.Fl q
+is specified, warnings will not be printed when
+.Xr realpath 3
+fails.
 .Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO

==== //depot/projects/dtrace7/src/bin/realpath/realpath.c#2 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/bin/realpath/realpath.c,v 1.6 2004/04/06 20:06:50 markm Exp $");
+__FBSDID("$FreeBSD: src/bin/realpath/realpath.c,v 1.6.18.1 2008/03/16 18:55:56 rwatson Exp $");
 
 #include 
 
@@ -44,20 +44,39 @@
 {
 	char buf[PATH_MAX];
 	char *p;
+	int ch, i, qflag, rval;
 
-	if (argc == 2) {
-		if ((p = realpath(argv[1], buf)) == NULL)
-			err(1, "%s", buf);
-	} else
+	qflag = 0;
+	while ((ch = getopt(argc, argv, "q")) != -1) {
+		switch (ch) {
+		case 'q':
+			qflag = 1;
+			break;
+		case '?':
+		default:
+			usage();
+		}
+	}
+	argc -= optind;
+	argv += optind;
+	if (argc < 1)
 		usage();
-	(void)printf("%s\n", p);
-	exit(0);
+	rval  = 0;
+	for (i = 0; i < argc; i++) {
+		if ((p = realpath(argv[i], buf)) == NULL) {
+			if (!qflag)
+				warn("%s", argv[i]);
+			rval = 1;
+		} else
+			(void)printf("%s\n", p);

>>> TRUNCATED FOR MAIL (1000 lines) <<<